From guengel at users.sourceforge.net  Sun Jan  1 13:01:37 2012
From: guengel at users.sourceforge.net (guengel at users.sourceforge.net)
Date: Sun, 01 Jan 2012 12:01:37 +0000
Subject: [csw-devel] SF.net SVN: gar:[16636]
 csw/mgar/pkg/postgresql/branches/postgresql-8. 3-raos
Message-ID: <E1RhK6b-0003KG-3I@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 16636
          http://gar.svn.sourceforge.net/gar/?rev=16636&view=rev
Author:   guengel
Date:     2012-01-01 12:01:36 +0000 (Sun, 01 Jan 2012)
Log Message:
-----------
postgresql/branches/postgresql-8.3-raos: Fixed LDFLAGS output of pg_config. Included libpgport.a which is required when using pg_config.

Modified Paths:
--------------
    csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/Makefile

Added Paths:
-----------
    csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/0000-Use-plain-rpath.patch

Modified: csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/Makefile
===================================================================
--- csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/Makefile	2011-12-31 22:14:45 UTC (rev 16635)
+++ csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/Makefile	2012-01-01 12:01:36 UTC (rev 16636)
@@ -216,6 +216,9 @@
 # Test running on a NFS may fail. Thus we let the test run in
 # /var/tmp/pgsql/tmp_check
 PATCHFILES += 0002-Run-tests-in-var-tmp-pgsql-tmp_check.patch
+# By default, src/makefiles/Makefile.solaris uses -Wl,-R'$(rpathdir)'
+# which isn't properly digested by Sun's ld
+PATCHFILES += 0000-Use-plain-rpath.patch
 
 INITSMF = $(sysconfdir)/init\.d/$(INITSCRIPTFILE_VERSIONED)
 USERGROUP = $(USERGROUPDIR)/$(USERGROUPFILE_VERSIONED)
@@ -324,6 +327,8 @@
 PKGFILES_CSW$(NAME)-dev += .*/alternatives/$(NAME)_dev.*
 PKGFILES_CSW$(NAME)-dev += .*/CSW$(NAME)-dev.postmsg
 PKGFILES_CSW$(NAME)-dev += .*$(docdir)/$(NAME)_dev/README.CSW
+# See `post-merge-modulated:'
+PKGFILES_CSW$(NAME)-dev += .*/libpgport\.a$
 RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWlibecpg-compat3
 RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWlibecpg6
 RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWlibpq5
@@ -475,6 +480,16 @@
 	$(INSTALL_ENV) gmake -C $(WORKSRC)/contrib DESTDIR=$(DESTDIR) install
 	@$(MAKECOOKIE)
 
+# We suck in the libpgport.a since pg_config is emitting
+# -lpgport. Unfortunately, there is no shared lib version, and I'm too
+# lazzy to adjust the build system to generate one...
+post-merge-modulated:
+ifeq ($(ISA),$(ISA_DEFAULT64))
+	ginstall $(WORKSRC)/src/port/libpgport.a $(PKGROOT)/$(libpath_install)/$(ISA_DEFAULT64)/
+else
+	ginstall $(WORKSRC)/src/port/libpgport.a $(PKGROOT)/$(libdir)/
+endif
+
 post-merge:  $(foreach n,$(POSTMSG),$(PKGROOT)/$(n)) test-installation
 # Create my alternatives files. Development alternatives have stripped
 # off the version

Added: csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/0000-Use-plain-rpath.patch
===================================================================
--- csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/0000-Use-plain-rpath.patch	                        (rev 0)
+++ csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/0000-Use-plain-rpath.patch	2012-01-01 12:01:36 UTC (rev 16636)
@@ -0,0 +1,25 @@
+From ea3087bf5e1a881624e84233f9b1d6f48e141c76 Mon Sep 17 00:00:00 2001
+From: Rafael Ostertag <rafisol at opencsw.org>
+Date: Sun, 1 Jan 2012 12:41:52 +0100
+Subject: [PATCH] Use plain rpath
+
+---
+ src/makefiles/Makefile.solaris |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/makefiles/Makefile.solaris b/src/makefiles/Makefile.solaris
+index 79c92bc..00358f1 100644
+--- a/src/makefiles/Makefile.solaris
++++ b/src/makefiles/Makefile.solaris
+@@ -6,7 +6,7 @@ ifeq ($(with_gnu_ld), yes)
+ export_dynamic = -Wl,-E
+ rpath = -Wl,-rpath,'$(rpathdir)'
+ else
+-rpath = -Wl,-R'$(rpathdir)'
++rpath = -R$(rpathdir)
+ endif
+ 
+ DLSUFFIX = .so
+-- 
+1.7.6.1
+

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


From guengel at users.sourceforge.net  Sun Jan  1 18:39:18 2012
From: guengel at users.sourceforge.net (guengel at users.sourceforge.net)
Date: Sun, 01 Jan 2012 17:39:18 +0000
Subject: [csw-devel] SF.net SVN: gar:[16637]
 csw/mgar/pkg/postgresql/branches/postgresql-8. 4-raos
Message-ID: <E1RhPNO-0000LS-MT@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 16637
          http://gar.svn.sourceforge.net/gar/?rev=16637&view=rev
Author:   guengel
Date:     2012-01-01 17:39:18 +0000 (Sun, 01 Jan 2012)
Log Message:
-----------
postgresql/branches/postgresql-8.4-raos: Fixed LDFLAGS output of pg_config. Included libpgport.a which is required when using "pg_config --libs".

Modified Paths:
--------------
    csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/Makefile

Added Paths:
-----------
    csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/files/0000-Use-plain-rpath.patch

Modified: csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/Makefile
===================================================================
--- csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/Makefile	2012-01-01 12:01:36 UTC (rev 16636)
+++ csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/Makefile	2012-01-01 17:39:18 UTC (rev 16637)
@@ -218,6 +218,9 @@
 # Test running on a NFS may fail. Thus we let the test run in
 # /var/tmp/pgsql/tmp_check
 PATCHFILES += 0002-Run-tests-in-var-tmp-pgsql-tmp_check.patch
+# By default, src/makefiles/Makefile.solaris uses -Wl,-R'$(rpathdir)'
+# which isn't properly digested by Sun's ld
+PATCHFILES += 0000-Use-plain-rpath.patch
 
 INITSMF = $(sysconfdir)/init\.d/$(INITSCRIPTFILE_VERSIONED)
 USERGROUP = $(USERGROUPDIR)/$(USERGROUPFILE_VERSIONED)
@@ -326,6 +329,8 @@
 PKGFILES_CSW$(NAME)-dev += .*/alternatives/$(NAME)_dev.*
 PKGFILES_CSW$(NAME)-dev += .*/CSW$(NAME)-dev.postmsg
 PKGFILES_CSW$(NAME)-dev += .*$(docdir)/$(NAME)_dev/README.CSW
+# See `post-merge-modulated:'
+PKGFILES_CSW$(NAME)-dev += .*/libpgport\.a$
 RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWlibecpg-compat3
 RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWlibecpg6
 RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWlibpq5
@@ -477,6 +482,16 @@
 	$(INSTALL_ENV) gmake -C $(WORKSRC)/contrib DESTDIR=$(DESTDIR) install
 	@$(MAKECOOKIE)
 
+# We suck in the libpgport.a since pg_config is emitting
+# -lpgport. Unfortunately, there is no shared lib version, and I'm too
+# lazzy to adjust the build system to generate one...
+post-merge-modulated:
+ifeq ($(ISA),$(ISA_DEFAULT64))
+	ginstall $(WORKSRC)/src/port/libpgport.a $(PKGROOT)/$(libpath_install)/$(ISA_DEFAULT64)/
+else
+	ginstall $(WORKSRC)/src/port/libpgport.a $(PKGROOT)/$(libdir)/
+endif
+
 post-merge:  $(foreach n,$(POSTMSG),$(PKGROOT)/$(n)) test-installation
 # Create my alternatives files. Development alternatives have stripped
 # off the version

Added: csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/files/0000-Use-plain-rpath.patch
===================================================================
--- csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/files/0000-Use-plain-rpath.patch	                        (rev 0)
+++ csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/files/0000-Use-plain-rpath.patch	2012-01-01 17:39:18 UTC (rev 16637)
@@ -0,0 +1,25 @@
+From 3e5748b6bc287f4036c2f619c143b9e467b84c29 Mon Sep 17 00:00:00 2001
+From: Rafael Ostertag <rafisol at opencsw.org>
+Date: Sun, 1 Jan 2012 17:35:00 +0100
+Subject: [PATCH] Use plain rpath
+
+---
+ src/makefiles/Makefile.solaris |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/makefiles/Makefile.solaris b/src/makefiles/Makefile.solaris
+index bb56830..89d83df 100644
+--- a/src/makefiles/Makefile.solaris
++++ b/src/makefiles/Makefile.solaris
+@@ -6,7 +6,7 @@ ifeq ($(with_gnu_ld), yes)
+ export_dynamic = -Wl,-E
+ rpath = -Wl,-rpath,'$(rpathdir)'
+ else
+-rpath = -Wl,-R'$(rpathdir)'
++rpath = -R$(rpathdir)
+ endif
+ 
+ DLSUFFIX = .so
+-- 
+1.7.6.1
+

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


From guengel at users.sourceforge.net  Sun Jan  1 18:39:45 2012
From: guengel at users.sourceforge.net (guengel at users.sourceforge.net)
Date: Sun, 01 Jan 2012 17:39:45 +0000
Subject: [csw-devel] SF.net SVN: gar:[16638]
 csw/mgar/pkg/postgresql/branches/postgresql-9. 0-raos
Message-ID: <E1RhPNp-0000Ls-8H@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 16638
          http://gar.svn.sourceforge.net/gar/?rev=16638&view=rev
Author:   guengel
Date:     2012-01-01 17:39:45 +0000 (Sun, 01 Jan 2012)
Log Message:
-----------
postgresql/branches/postgresql-9.0-raos: Fixed LDFLAGS output of pg_config. Included libpgport.a which is required when using "pg_config --libs".

Modified Paths:
--------------
    csw/mgar/pkg/postgresql/branches/postgresql-9.0-raos/Makefile

Added Paths:
-----------
    csw/mgar/pkg/postgresql/branches/postgresql-9.0-raos/files/0000-Use-plain-rpath.patch

Modified: csw/mgar/pkg/postgresql/branches/postgresql-9.0-raos/Makefile
===================================================================
--- csw/mgar/pkg/postgresql/branches/postgresql-9.0-raos/Makefile	2012-01-01 17:39:18 UTC (rev 16637)
+++ csw/mgar/pkg/postgresql/branches/postgresql-9.0-raos/Makefile	2012-01-01 17:39:45 UTC (rev 16638)
@@ -218,6 +218,9 @@
 # Test running on a NFS may fail. Thus we let the test run in
 # /var/tmp/pgsql/tmp_check
 PATCHFILES += 0000-Run-tests-in-var-tmp-pgsql-tmp_check.patch
+# By default, src/makefiles/Makefile.solaris uses -Wl,-R'$(rpathdir)'
+# which isn't properly digested by Sun's ld
+PATCHFILES += 0000-Use-plain-rpath.patch
 
 INITSMF = $(sysconfdir)/init\.d/$(INITSCRIPTFILE_VERSIONED)
 USERGROUP = $(USERGROUPDIR)/$(USERGROUPFILE_VERSIONED)
@@ -321,6 +324,8 @@
 PKGFILES_CSW$(NAME)-dev += .*/alternatives/$(NAME)_dev.*
 PKGFILES_CSW$(NAME)-dev += .*/CSW$(NAME)-dev.postmsg
 PKGFILES_CSW$(NAME)-dev += .*$(docdir)/$(NAME)_dev/README.CSW
+# See `post-merge-modulated:'
+PKGFILES_CSW$(NAME)-dev += .*/libpgport\.a$
 RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWlibecpg-compat3
 RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWlibecpg6
 RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWlibpq5
@@ -474,6 +479,16 @@
 	$(INSTALL_ENV) gmake -C $(WORKSRC) DESTDIR=$(DESTDIR) install-docs
 	@$(MAKECOOKIE)
 
+# We suck in the libpgport.a since pg_config is emitting
+# -lpgport. Unfortunately, there is no shared lib version, and I'm too
+# lazzy to adjust the build system to generate one...
+post-merge-modulated:
+ifeq ($(ISA),$(ISA_DEFAULT64))
+	ginstall $(WORKSRC)/src/port/libpgport.a $(PKGROOT)/$(libpath_install)/$(ISA_DEFAULT64)/
+else
+	ginstall $(WORKSRC)/src/port/libpgport.a $(PKGROOT)/$(libdir)/
+endif
+
 post-merge:  $(foreach n,$(POSTMSG),$(PKGROOT)/$(n)) test-installation
 # Create my alternatives files. Development alternatives have stripped
 # off the version

Added: csw/mgar/pkg/postgresql/branches/postgresql-9.0-raos/files/0000-Use-plain-rpath.patch
===================================================================
--- csw/mgar/pkg/postgresql/branches/postgresql-9.0-raos/files/0000-Use-plain-rpath.patch	                        (rev 0)
+++ csw/mgar/pkg/postgresql/branches/postgresql-9.0-raos/files/0000-Use-plain-rpath.patch	2012-01-01 17:39:45 UTC (rev 16638)
@@ -0,0 +1,25 @@
+From 3e5748b6bc287f4036c2f619c143b9e467b84c29 Mon Sep 17 00:00:00 2001
+From: Rafael Ostertag <rafisol at opencsw.org>
+Date: Sun, 1 Jan 2012 17:35:00 +0100
+Subject: [PATCH] Use plain rpath
+
+---
+ src/makefiles/Makefile.solaris |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/makefiles/Makefile.solaris b/src/makefiles/Makefile.solaris
+index bb56830..89d83df 100644
+--- a/src/makefiles/Makefile.solaris
++++ b/src/makefiles/Makefile.solaris
+@@ -6,7 +6,7 @@ ifeq ($(with_gnu_ld), yes)
+ export_dynamic = -Wl,-E
+ rpath = -Wl,-rpath,'$(rpathdir)'
+ else
+-rpath = -Wl,-R'$(rpathdir)'
++rpath = -R$(rpathdir)
+ endif
+ 
+ DLSUFFIX = .so
+-- 
+1.7.6.1
+

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


From guengel at users.sourceforge.net  Sun Jan  1 18:40:21 2012
From: guengel at users.sourceforge.net (guengel at users.sourceforge.net)
Date: Sun, 01 Jan 2012 17:40:21 +0000
Subject: [csw-devel] SF.net SVN: gar:[16639]
 csw/mgar/pkg/postgresql/branches/postgresql-9. 1-raos
Message-ID: <E1RhPOP-0000NX-Iz@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 16639
          http://gar.svn.sourceforge.net/gar/?rev=16639&view=rev
Author:   guengel
Date:     2012-01-01 17:40:21 +0000 (Sun, 01 Jan 2012)
Log Message:
-----------
postgresql/branches/postgresql-9.1-raos: Fixed LDFLAGS output of pg_config. Included libpgport.a which is required when using "pg_config --libs".

Modified Paths:
--------------
    csw/mgar/pkg/postgresql/branches/postgresql-9.1-raos/Makefile

Added Paths:
-----------
    csw/mgar/pkg/postgresql/branches/postgresql-9.1-raos/files/0000-Use-plain-rpath.patch

Modified: csw/mgar/pkg/postgresql/branches/postgresql-9.1-raos/Makefile
===================================================================
--- csw/mgar/pkg/postgresql/branches/postgresql-9.1-raos/Makefile	2012-01-01 17:39:45 UTC (rev 16638)
+++ csw/mgar/pkg/postgresql/branches/postgresql-9.1-raos/Makefile	2012-01-01 17:40:21 UTC (rev 16639)
@@ -266,6 +266,9 @@
 # Test running on a NFS may fail. Thus we let the test run in
 # /var/tmp/pgsql/tmp_check
 PATCHFILES += 0000-Run-tests-in-var-tmp-pgsql-tmp_check.patch
+# By default, src/makefiles/Makefile.solaris uses -Wl,-R'$(rpathdir)'
+# which isn't properly digested by Sun's ld
+PATCHFILES += 0000-Use-plain-rpath.patch
 
 INITSMF = $(sysconfdir)/init\.d/$(INITSCRIPTFILE_VERSIONED)
 USERGROUP = $(USERGROUPDIR)/$(USERGROUPFILE_VERSIONED)
@@ -373,6 +376,8 @@
 PKGFILES_CSW$(NAME)-dev += .*/alternatives/$(NAME)_dev.*
 PKGFILES_CSW$(NAME)-dev += .*/CSW$(NAME)-dev.postmsg
 PKGFILES_CSW$(NAME)-dev += .*$(docdir)/$(NAME)_dev/README.CSW
+# See `post-merge-modulated:'
+PKGFILES_CSW$(NAME)-dev += .*/libpgport\.a$
 RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWlibecpg-compat3
 RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWlibecpg6
 RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWlibpq5
@@ -537,6 +542,16 @@
 	$(INSTALL_ENV) gmake -C $(WORKSRC) DESTDIR=$(DESTDIR) install-docs
 	@$(MAKECOOKIE)
 
+# We suck in the libpgport.a since pg_config is emitting
+# -lpgport. Unfortunately, there is no shared lib version, and I'm too
+# lazzy to adjust the build system to generate one...
+post-merge-modulated:
+ifeq ($(ISA),$(ISA_DEFAULT64))
+	ginstall $(WORKSRC)/src/port/libpgport.a $(PKGROOT)/$(libpath_install)/$(ISA_DEFAULT64)/
+else
+	ginstall $(WORKSRC)/src/port/libpgport.a $(PKGROOT)/$(libdir)/
+endif
+
 post-merge:  $(foreach n,$(POSTMSG),$(PKGROOT)/$(n)) test-installation
 # Create my alternatives files. Development alternatives have stripped
 # off the version

Added: csw/mgar/pkg/postgresql/branches/postgresql-9.1-raos/files/0000-Use-plain-rpath.patch
===================================================================
--- csw/mgar/pkg/postgresql/branches/postgresql-9.1-raos/files/0000-Use-plain-rpath.patch	                        (rev 0)
+++ csw/mgar/pkg/postgresql/branches/postgresql-9.1-raos/files/0000-Use-plain-rpath.patch	2012-01-01 17:40:21 UTC (rev 16639)
@@ -0,0 +1,25 @@
+From 3e5748b6bc287f4036c2f619c143b9e467b84c29 Mon Sep 17 00:00:00 2001
+From: Rafael Ostertag <rafisol at opencsw.org>
+Date: Sun, 1 Jan 2012 17:35:00 +0100
+Subject: [PATCH] Use plain rpath
+
+---
+ src/makefiles/Makefile.solaris |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/makefiles/Makefile.solaris b/src/makefiles/Makefile.solaris
+index bb56830..89d83df 100644
+--- a/src/makefiles/Makefile.solaris
++++ b/src/makefiles/Makefile.solaris
+@@ -6,7 +6,7 @@ ifeq ($(with_gnu_ld), yes)
+ export_dynamic = -Wl,-E
+ rpath = -Wl,-rpath,'$(rpathdir)'
+ else
+-rpath = -Wl,-R'$(rpathdir)'
++rpath = -R$(rpathdir)
+ endif
+ 
+ DLSUFFIX = .so
+-- 
+1.7.6.1
+

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


From cgrzemba at users.sourceforge.net  Mon Jan  2 11:46:23 2012
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Mon, 02 Jan 2012 10:46:23 +0000
Subject: [csw-devel] SF.net SVN: gar:[16640] csw/mgar/pkg
Message-ID: <E1RhfPL-0007jh-2f@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 16640
          http://gar.svn.sourceforge.net/gar/?rev=16640&view=rev
Author:   cgrzemba
Date:     2012-01-02 10:46:22 +0000 (Mon, 02 Jan 2012)
Log Message:
-----------
mozldap/trunk: first release, without pkg_config

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

Added: csw/mgar/pkg/mozldap/Makefile
===================================================================
--- csw/mgar/pkg/mozldap/Makefile	                        (rev 0)
+++ csw/mgar/pkg/mozldap/Makefile	2012-01-02 10:46:22 UTC (rev 16640)
@@ -0,0 +1,2 @@
+%:
+	$(MAKE) -C trunk $*


Property changes on: csw/mgar/pkg/mozldap/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/mozldap/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mozldap/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/mozldap/trunk/Makefile	2012-01-02 10:46:22 UTC (rev 16640)
@@ -0,0 +1,171 @@
+# $Id$
+#
+NAME = mozldap
+MAJOR_VERSION = 6
+MIN_VERSION = 0.7
+VERSION = $(MAJOR_VERSION).$(MIN_VERSION)
+GARTYPE = v2
+CATEGORIES = lib
+# remove this before release !!
+
+DESCRIPTION = Mozilla LDAP C-SDK
+define BLURB
+The Mozilla LDAP C SDK is a set of libraries that
+allow applications to communicate with LDAP directory
+servers.  These libraries are derived from the University
+of Michigan and Netscape LDAP libraries.  They use Mozilla
+NSPR and NSS for crypto.
+endef
+
+MASTER_SITES = http://ftp.mozilla.org/pub/mozilla.org/directory/c-sdk/releases/v6.0.7/src
+DISTFILES  = $(NAME)-$(VERSION).tar.gz
+DISTFILES += COPYING
+
+PACKAGING_PLATFORMS += solaris10-sparc
+# PACKAGING_PLATFORMS += solaris10-i386
+
+PACKAGES += CSWlibldap60
+CATALOGNAME_CSWlibldap60 = libldap60
+PKGFILES_CSWlibldap60 += $(call baseisadirs,$(libdir),libldap60\.so)
+PKGFILES_CSWlibldap60 += $(call baseisadirs,$(libdir),libldap60\.so(\.\d+)*)
+SPKG_DESC_CSWlibldap60 += $(DESCRIPTION), libldap60.so
+RUNTIME_DEP_PKGS_CSWlibldap60 += CSWsasl
+CHECKPKG_OVERRIDES_CSWlibldap60 += soname-equals-filename|file=/opt/csw/lib/libldap60.so
+CHECKPKG_OVERRIDES_CSWlibldap60 += soname-equals-filename|file=/opt/csw/lib/sparcv9/libldap60.so
+
+PACKAGES += CSWlibldif60
+CATALOGNAME_CSWlibldif60 = libldif60
+PKGFILES_CSWlibldif60 += $(call baseisadirs,$(libdir),libldif60\.so)
+PKGFILES_CSWlibldif60 += $(call baseisadirs,$(libdir),libldif60\.so(\.\d+)*)
+SPKG_DESC_CSWlibldif60 += $(DESCRIPTION), libldif60.so
+CHECKPKG_OVERRIDES_CSWlibldif60 += soname-equals-filename|file=/opt/csw/lib/libldif60.so
+CHECKPKG_OVERRIDES_CSWlibldif60 += soname-equals-filename|file=/opt/csw/lib/sparcv9/libldif60.so
+
+PACKAGES += CSWlibprldap60
+CATALOGNAME_CSWlibprldap60 = libprldap60
+PKGFILES_CSWlibprldap60 += $(call baseisadirs,$(libdir),libprldap60\.so)
+PKGFILES_CSWlibprldap60 += $(call baseisadirs,$(libdir),libprldap60\.so(\.\d+)*)
+SPKG_DESC_CSWlibprldap60 += $(DESCRIPTION), libprldap60.so
+RUNTIME_DEP_PKGS_CSWlibprldap60 += CSWlibnspr4
+RUNTIME_DEP_PKGS_CSWlibprldap60 += CSWlibplc4
+RUNTIME_DEP_PKGS_CSWlibprldap60 += CSWlibplds4
+RUNTIME_DEP_PKGS_CSWlibprldap60 += CSWlibldap60
+CHECKPKG_OVERRIDES_CSWlibprldap60 += soname-equals-filename|file=/opt/csw/lib/libprldap60.so
+CHECKPKG_OVERRIDES_CSWlibprldap60 += soname-equals-filename|file=/opt/csw/lib/sparcv9/libprldap60.so
+
+PACKAGES += CSWlibssldap60
+CATALOGNAME_CSWlibssldap60 = libssldap60
+PKGFILES_CSWlibssldap60 += $(call baseisadirs,$(libdir),libssldap60\.so)
+PKGFILES_CSWlibssldap60 += $(call baseisadirs,$(libdir),libssldap60\.so(\.\d+)*)
+SPKG_DESC_CSWlibssldap60 += $(DESCRIPTION), libssldap60.so
+RUNTIME_DEP_PKGS_CSWlibssldap60 += CSWlibnspr4
+RUNTIME_DEP_PKGS_CSWlibssldap60 += CSWlibnss3
+RUNTIME_DEP_PKGS_CSWlibssldap60 += CSWlibplc4
+RUNTIME_DEP_PKGS_CSWlibssldap60 += CSWlibplds4
+RUNTIME_DEP_PKGS_CSWlibssldap60 += CSWlibldap60
+RUNTIME_DEP_PKGS_CSWlibssldap60 += CSWlibprldap60
+CHECKPKG_OVERRIDES_CSWlibssldap60 += soname-equals-filename|file=/opt/csw/lib/libssldap60.so
+CHECKPKG_OVERRIDES_CSWlibssldap60 += soname-equals-filename|file=/opt/csw/lib/sparcv9/libssldap60.so
+
+PACKAGES += CSWmozldap-tools
+CATALOGNAME_CSWmozldap-tools= mozldap_tools
+SPKG_DESC_CSWmozldap-tools += $(DESCRIPTION), command line utilities
+PKGFILES_CSWmozldap-tools = $(call pkgfiles_bin,ldapsearch)
+PKGFILES_CSWmozldap-tools = $(call pkgfiles_bin,ldapmodify)
+PKGFILES_CSWmozldap-tools = $(call pkgfiles_bin,ldapdelete)
+PKGFILES_CSWmozldap-tools = $(call pkgfiles_bin,ldapadd)
+PKGFILES_CSWmozldap-tools = $(call pkgfiles_bin,ldapcmp)
+PKGFILES_CSWmozldap-tools = $(call pkgfiles_bin,ldapcompare)
+PKGFILES_CSWmozldap-tools = $(call pkgfiles_bin,ldappasswd)
+PKGFILES_CSWmozldap-tools = $(call pkgfiles_etc,ldapfilter.conf)
+PKGFILES_CSWmozldap-tools = $(call pkgfiles_etc,ldapsearchprefs.conf)
+PKGFILES_CSWmozldap-tools = $(call pkgfiles_etc,ldaptemplates.conf)
+PKGFILES_CSWmozldap-tools = $(call pkgfiles_etc,ldapfriendly)
+RUNTIME_DEP_PKGS_CSWmozldap-tools += CSWlibssldap60
+RUNTIME_DEP_PKGS_CSWmozldap-tools += CSWlibprldap60
+RUNTIME_DEP_PKGS_CSWmozldap-tools += CSWlibldif60
+RUNTIME_DEP_PKGS_CSWmozldap-tools += CSWlibldap60
+RUNTIME_DEP_PKGS_CSWmozldap-tools += CSWlibnspr4
+RUNTIME_DEP_PKGS_CSWmozldap-tools += CSWlibnss3
+RUNTIME_DEP_PKGS_CSWmozldap-tools += CSWlibplc4
+RUNTIME_DEP_PKGS_CSWmozldap-tools += CSWlibsvrcore0
+RUNTIME_DEP_PKGS_CSWmozldap-tools += CSWsasl
+RUNTIME_DEP_PKGS_CSWmozldap-tools += CSWlibplds4
+INCOMPATIBLE_PKGS_CSWmozldap-tools = CSWoldapclient
+
+PACKAGES += CSWmozldap-dev
+CATALOGNAME_CSWmozldap-dev = mozldap_dev
+SPKG_DESC_CSWmozldap-dev += $(DESCRIPTION), development files
+PKGFILES_DEVEL_SHAREDLIBLINK =
+PKGFILES_CSWmozldap-dev = $(PKGFILES_DEVEL_INCLUDEDIR)
+ARCHALL_CSWmozldap-dev = 1
+RUNTIME_DEP_PKGS_CSWmozldap-dev += CSWlibssldap60
+RUNTIME_DEP_PKGS_CSWmozldap-dev += CSWlibprldap60
+RUNTIME_DEP_PKGS_CSWmozldap-dev += CSWlibldif60
+RUNTIME_DEP_PKGS_CSWmozldap-dev += CSWlibldap60
+# its a hack
+CHECKPKG_OVERRIDES_CSWmozldap-dev += archall-devel-package
+
+# Move the include files to include/nspr to prevent polluting the main
+# header file namespace.
+
+CONFIGURE_ARGS  = $(DIRPATHS)
+CONFIGURE_ARGS_isa-sparcv9 = --enable-64bit
+CONFIGURE_ARGS_isa-amd64 = --enable-64bit
+CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(MODULATION))
+CONFIGURE_ARGS_OPT += --with-sasl
+CONFIGURE_ARGS_OPT += --with-sasl-lib=$(libdir)
+CONFIGURE_ARGS_OPT += --enable-clu
+CONFIGURE_ARGS_OPT += --with-system-svrcore
+CONFIGURE_ARGS_OPT += --enable-optimize="-xO3"
+CONFIGURE_ARGS_OPT += --disable-debug
+CONFIGURE_ARGS_OPT += --enable-strip
+CONFIGURE_ARGS_OPT += --with-nss-inc=$(includedir)/nss
+CONFIGURE_ARGS_OPT += --with-nss-lib=$(libdir)
+CONFIGURE_ARGS_OPT += --with-nspr-inc=$(includedir)/nspr
+CONFIGURE_ARGS_OPT += --with-nspr-lib=$(libdir)
+CONFIGURE_ARGS_OPT += --with-svrcore-inc=$(includedir)/nspr
+CONFIGURE_ARGS_OPT += --with-svrcore-lib=$(libdir)
+CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARFLAVOR))
+
+CONFIGURE_SCRIPTS = c-sdk
+BUILD_SCRIPTS = c-sdk
+INSTALL_SCRIPTS = c-sdk
+TEST_TARGET = 
+TEST_SCRIPTS = 
+EXTRA_LDFLAGS = -L/opt/csw/lib
+BUILD64 = 1
+
+configure-c-sdk:
+	(cd $(WORKSRC) && mkdir -p build inst)
+	(cd $(WORKSRC)/build && $(CONFIGURE_ENV) ../c-sdk/configure $(CONFIGURE_ARGS))
+	@$(MAKECOOKIE)
+
+build-c-sdk:
+	(cd $(WORKSRC)/build && $(BUILD_ENV) gmake)
+
+install-c-sdk:
+	ginstall -m 755 -d $(DESTDIR)/$(bindir)
+	ginstall -m 755 -d $(DESTDIR)/$(libdir)
+	ginstall -m 755 -d $(DESTDIR)/$(sysconfdir)
+	ginstall -m 755 -d $(DESTDIR)/$(includedir)
+	ginstall -m 755 $(WORKSRC)/../dist/lib/libldif60.so $(DESTDIR)$(libdir)
+	ginstall -m 755 $(WORKSRC)/../dist/lib/libldap60.so $(DESTDIR)$(libdir)
+	ginstall -m 755 $(WORKSRC)/../dist/lib/libprldap60.so $(DESTDIR)$(libdir)
+	ginstall -m 755 $(WORKSRC)/../dist/lib/libssldap60.so $(DESTDIR)$(libdir)
+	ginstall -m 755 $(WORKSRC)/../dist/bin/ldapsearch $(DESTDIR)$(bindir)
+	ginstall -m 755 $(WORKSRC)/../dist/bin/ldapmodify $(DESTDIR)$(bindir)
+	ginstall -m 755 $(WORKSRC)/../dist/bin/ldapdelete $(DESTDIR)$(bindir)
+	ginstall -m 755 $(WORKSRC)/../dist/bin/ldapcmp $(DESTDIR)$(bindir)
+	ginstall -m 755 $(WORKSRC)/../dist/bin/ldappasswd $(DESTDIR)$(bindir)
+	@for f in $(WORKSRC)/../dist/etc/*; do \
+		ginstall -m 644 $$f  $(DESTDIR)$(sysconfdir); \
+	done
+	@for f in $(WORKSRC)/../dist/public/ldap/*h; do \
+		ginstall -m 644 $$f  $(DESTDIR)$(includedir); \
+	done
+	@$(MAKECOOKIE)
+
+include gar/category.mk
+
+


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

Added: csw/mgar/pkg/mozldap/trunk/checksums
===================================================================
--- csw/mgar/pkg/mozldap/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/mozldap/trunk/checksums	2012-01-02 10:46:22 UTC (rev 16640)
@@ -0,0 +1 @@
+6e1b8ace4931a6839fe4cb027d23b5ac  mozldap-6.0.7.tar.gz

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


From cgrzemba at users.sourceforge.net  Mon Jan  2 11:52:13 2012
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Mon, 02 Jan 2012 10:52:13 +0000
Subject: [csw-devel] SF.net SVN: gar:[16641]
	csw/mgar/pkg/mozldap/trunk/files/COPYING
Message-ID: <E1RhfUz-0007pM-A1@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 16641
          http://gar.svn.sourceforge.net/gar/?rev=16641&view=rev
Author:   cgrzemba
Date:     2012-01-02 10:52:12 +0000 (Mon, 02 Jan 2012)
Log Message:
-----------
add license

Added Paths:
-----------
    csw/mgar/pkg/mozldap/trunk/files/COPYING

Added: csw/mgar/pkg/mozldap/trunk/files/COPYING
===================================================================
--- csw/mgar/pkg/mozldap/trunk/files/COPYING	                        (rev 0)
+++ csw/mgar/pkg/mozldap/trunk/files/COPYING	2012-01-02 10:52:12 UTC (rev 16641)
@@ -0,0 +1,33 @@
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 1998
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either of the GNU General Public License Version 2 or later (the "GPL"),
+# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#

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


From guengel at users.sourceforge.net  Mon Jan  2 11:58:34 2012
From: guengel at users.sourceforge.net (guengel at users.sourceforge.net)
Date: Mon, 02 Jan 2012 10:58:34 +0000
Subject: [csw-devel] SF.net SVN: gar:[16642]
 csw/mgar/pkg/postgresql/branches/postgresql-8. 3-raos/Makefile
Message-ID: <E1Rhfb8-0001kn-3k@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 16642
          http://gar.svn.sourceforge.net/gar/?rev=16642&view=rev
Author:   guengel
Date:     2012-01-02 10:58:33 +0000 (Mon, 02 Jan 2012)
Log Message:
-----------
postgresql/branches/postgresql-8.3-raos: Cleanup. Removed alternatives for -dev since the binaries will go into standard places.

Modified Paths:
--------------
    csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/Makefile

Modified: csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/Makefile
===================================================================
--- csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/Makefile	2012-01-02 10:52:12 UTC (rev 16641)
+++ csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/Makefile	2012-01-02 10:58:33 UTC (rev 16642)
@@ -1,5 +1,3 @@
-# Copyright 2009 OpenCSW
-# Distributed under the terms of the GNU General Public License v2
 # $Id$
 #
 # Note 1
@@ -76,17 +74,18 @@
 #    CSW$(NAME)$(BASE_VERSION_NODOT) for files that have slipped by and put
 #    them in the proper place.
 #
-# 8. Make sure the proper version numbers are used for the library packages.
 #
-#
 # Note 5: Development package
 # ------
 #
 # The development package is not versioned, i.e. named CSW$(NAME)-dev,
 # since we can only support one set of header files with a reasonable
 # amount of effort.
+#
+# Further, it does not use alternatives and puts binaries in $(bindir)
+# (see 'post-merge-modulated:'). This will make it easier for
+# maintainers to use `pg_config'.
 
-
 NAME = postgresql
 BASE_VERSION = 8.3
 VERSION_NODOT = $(subst .,_,$(BASE_VERSION))
@@ -110,6 +109,9 @@
 #
 # These variables control many aspects of the build
 #
+sysconfdir-suffix-64	= /64
+sysconfdir		= /etc/opt/csw$(sysconfdir-suffix-$(MEMORYMODEL))
+PGSYSCONFDIR		= $(sysconfdir)/$(NAME)/$(BASE_VERSION_NODOT)
 PGBINDIR		= $(libexecdir)/$(NAME)/$(BASE_VERSION_NODOT)
 PGSBINDIR		= $(libexecdir)/$(NAME)/$(BASE_VERSION_NODOT)
 PGDATADIR		= $(datadir)/$(NAME)/$(BASE_VERSION_NODOT)
@@ -183,14 +185,11 @@
 # These are the alternatives provided for the packages.  I use them in the
 # recipe to iterate over all possible alternatives (see 'post-merge:')
 #
-# Please note that these should correspond to the package suffices.
-myALTERNATIVES = server client dev contrib
+# Please note that these should correspond to the package suffixes.
+myALTERNATIVES = server client contrib
 
 POSTMSG = $(foreach n,$(myALTERNATIVES),\
-	$(if $(subst dev,,$(n)),\
-		$(docdir)/$(NAME)$(BASE_VERSION_NODOT)_$(n)/CSW$(NAME)$(BASE_VERSION_NODOT)-$(n).postmsg,\
-		$(docdir)/$(NAME)_$(n)/CSW$(NAME)-$(n).postmsg \
-	)\
+	$(docdir)/$(NAME)$(BASE_VERSION_NODOT)_$(n)/CSW$(NAME)$(BASE_VERSION_NODOT)-$(n).postmsg\
 )
 
 MASTER_SITES = http://ftp.postgresql.org/pub/source/v$(VERSION)/
@@ -323,8 +322,6 @@
 PKGFILES_CSW$(NAME)-dev += $(PKGFILES_DEVEL)
 PKGFILES_CSW$(NAME)-dev += $(foreach n,$(BIN_NAMES_DEVEL),.*$(n)$$)
 PKGFILES_CSW$(NAME)-dev += $(foreach n,$(BIN_NAMES_DEVEL),.*/man1/$(n)\.1$$)
-# Alternatives for -dev have no version appended
-PKGFILES_CSW$(NAME)-dev += .*/alternatives/$(NAME)_dev.*
 PKGFILES_CSW$(NAME)-dev += .*/CSW$(NAME)-dev.postmsg
 PKGFILES_CSW$(NAME)-dev += .*$(docdir)/$(NAME)_dev/README.CSW
 # See `post-merge-modulated:'
@@ -344,12 +341,14 @@
 CHECKPKG_OVERRIDES_CSW$(NAME)-dev += $(foreach i,$(NEEDED_ISAS), $(subst $(ISA_DEFAULT)/,,file-with-bad-content|/usr/local|root$(libdir)/$(i)/$(NAME)/$(BASE_VERSION_NODOT)/pgxs/src/Makefile.shlib) )
 # That's ok too, it's docbook stuff which we don't use in this build
 CHECKPKG_OVERRIDES_CSW$(NAME)-dev += $(foreach i,$(NEEDED_ISAS), $(subst $(ISA_DEFAULT)/,,file-with-bad-content|/usr/share|root$(libdir)/$(i)/$(NAME)/$(BASE_VERSION_NODOT)/pgxs/src/Makefile.global) )
-#ALTERNATIVES_CSW$(NAME)-dev = $(foreach i,$(NEEDED_ISAS), dev_$(i))
+# See `post-merge-modulated:' for those overrides
+CHECKPKG_OVERRIDES_CSWpostgresql-dev += discouraged-path-in-pkgmap|/opt/csw/lib/libpgport.a
+CHECKPKG_OVERRIDES_CSWpostgresql-dev += discouraged-path-in-pkgmap|/opt/csw/lib/$(ISA_DEFAULT64)/libpgport.a
 
 PACKAGES += CSW$(NAME)$(BASE_VERSION_NODOT)-doc
 ARCHALL_CSW$(NAME)$(BASE_VERSION_NODOT)-doc = 1
 SPKG_DESC_CSW$(NAME)$(BASE_VERSION_NODOT)-doc = PostgreSQL $(VERSION), Documentation Files
-PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-doc  =  .*/doc/$(NAME)/$(BASE_VERSION_NODOT)/.*\.(html|css)
+PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-doc  = .*/doc/$(NAME)/$(BASE_VERSION_NODOT)/.*\.(html|css)
 PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-doc += .*/man5/.*
 
 PACKAGES += CSWlibecpg-compat3
@@ -396,14 +395,12 @@
 # supported, so IMHO, binaries should go to --libexecdir
 CONFIGURE_ARGS += --bindir=$(PGBINDIR)
 CONFIGURE_ARGS += --sbindir=$(PGSBINDIR)
-
+CONFIGURE_ARGS += --sysconfdir=$(PGSYSCONFDIR)
 CONFIGURE_ARGS += --datadir=$(PGDATADIR)
 CONFIGURE_ARGS += --localstatedir=$(PGDATA)
 CONFIGURE_ARGS += --with-includes=$(includedir)
 CONFIGURE_ARGS += --with-libraries=$(libdir)
 CONFIGURE_ARGS += --with-docdir=$(PGDOCDIR)
-# configure complains that we are not thread-safe, wtf? --raos
-#CONFIGURE_ARGS += --enable-thread-safety
 
 CONFIGURE_ARGS += --with-gssapi
 CONFIGURE_ARGS += --with-pam
@@ -422,8 +419,6 @@
 # The uppercase_* variables are used to translate the lowercase
 # $(myALTERNATIVES) to uppercase.
 #
-# -dev is handled separately further below
-#
 # How it does create the alternatives:
 #
 # for pkg in $(myALTERNATIVES)
@@ -437,17 +432,13 @@
 #   end alt
 # end pkg
 #
-# The same approach is used for -dev, but the enclosing outer loop is
-# not used, and the alternatives are not having the BASE_VERSION_NODOT
-# to their file names appended.
-#
 # In the post-merge target, the alternatives are written to their
 # respective files
 
 uppercase_server = SERVER
 uppercase_client = CLIENT
 uppercase_contrib = CONTRIB
-$(foreach pkg,$(filter-out dev,$(myALTERNATIVES)),\
+$(foreach pkg,$(myALTERNATIVES),\
 	$(eval alt_priority = 20) \
 	$(foreach alt,$(NEEDED_ISAS), \
 		$(eval alt_priority=$(shell expr $(alt_priority) + 10)) \
@@ -455,28 +446,23 @@
 		$(eval ALTERNATIVE_$(pkg)_$(alt) += $(subst /$(ISA_DEFAULT)/,/,$(foreach n,$(wordlist 2,$(words $(BIN_NAMES_$(uppercase_$(pkg)))),$(BIN_NAMES_$(uppercase_$(pkg)))),$(bindir)/$(n)-$(BASE_VERSION_NODOT) $(NAME)$(BASE_VERSION_NODOT)-$(pkg) $(libexecdir)/$(alt)/$(NAME)/$(BASE_VERSION_NODOT)/$(n)))) \
 	)\
 )
-# Devel is handled separately, since it does not use
-# $(BASE_VERSION_NODOT)
-alt_priority = 20
-$(foreach alt,$(NEEDED_ISAS),\
-	$(eval alt_priority=$(shell expr $(alt_priority) + 10)) \
-	$(eval ALTERNATIVE_dev_$(alt) = $(subst /$(ISA_DEFAULT)/,/,$(foreach n,$(firstword $(BIN_NAMES_DEVEL)),$(bindir)/$(n) $(NAME)-dev $(libexecdir)/$(alt)/$(NAME)/$(BASE_VERSION_NODOT)/$(n))) $(alt_priority)) \
-	$(eval ALTERNATIVE_dev_$(alt) += $(subst /$(ISA_DEFAULT)/,/,$(foreach n,$(wordlist 2,$(words $(BIN_NAMES_DEVEL)),$(BIN_NAMES_DEVEL)),$(bindir)/$(n) $(NAME)-dev $(libexecdir)/$(alt)/$(NAME)/$(BASE_VERSION_NODOT)/$(n))))\
-)
 
 # We adjust the $(pkglibdir) found in $(WORKSRC)/src/Makefile.global.in, so
 # that it should be possible to install 8.x and 8.y concurrently
 pre-configure-modulated:
-	if [ -r $(WORKSRC)/src/Makefile.global.in ] ; then \
+	@echo " ===> Adjusting pkglibdir in $(WORKSRC)/src/Makefile.global.in"
+	@if [ -r $(WORKSRC)/src/Makefile.global.in ] ; then \
 		gsed -i -r -e 's|^(pkglibdir[[:space:]]*=[[:space:]]*)\$$\(libdir\).*$$|\1$$(libdir)/postgresql/$(BASE_VERSION_NODOT)|' $(WORKSRC)/src/Makefile.global.in ; \
 	fi
 	@$(MAKECOOKIE)
 
 post-build-modulated:
+	@echo " ===> Building contrib stuff"
 	$(BUILD_ENV) gmake -C $(WORKSRC)/contrib all
 	@$(MAKECOOKIE)
 
 post-install-modulated:
+	@echo " ===> Installing contrib stuff"
 	$(INSTALL_ENV) gmake -C $(WORKSRC)/contrib DESTDIR=$(DESTDIR) install
 	@$(MAKECOOKIE)
 
@@ -485,19 +471,25 @@
 # lazzy to adjust the build system to generate one...
 post-merge-modulated:
 ifeq ($(ISA),$(ISA_DEFAULT64))
-	ginstall $(WORKSRC)/src/port/libpgport.a $(PKGROOT)/$(libpath_install)/$(ISA_DEFAULT64)/
+	ginstall $(WORKSRC)/src/port/libpgport.a $(PKGROOT)$(libpath_install)/$(ISA_DEFAULT64)/
 else
-	ginstall $(WORKSRC)/src/port/libpgport.a $(PKGROOT)/$(libdir)/
+	ginstall $(WORKSRC)/src/port/libpgport.a $(PKGROOT)$(libdir)/
 endif
+# Move the development binaries to the standard location
+	ginstall -d $(PKGROOT)$(bindir)/
+	for f in $(BIN_NAMES_DEVEL) ; do \
+		gmv -v $(PKGROOT)$(libexecdir)/$(NAME)/$(BASE_VERSION_NODOT)/$$f $(PKGROOT)$(bindir)/ ; \
+	done
 
 post-merge:  $(foreach n,$(POSTMSG),$(PKGROOT)/$(n)) test-installation
-# Create my alternatives files. Development alternatives have stripped
-# off the version
-	$(foreach a,$(myALTERNATIVES), $(foreach i,$(NEEDED_ISAS), $(shell ginstall -d $(PKGROOT)$(sharedstatedir)/alternatives ; echo "$(ALTERNATIVE_$(a)_$(i))" > $(if $(subst dev,,$(a)),$(PKGROOT)$(sharedstatedir)/alternatives/$(NAME)$(BASE_VERSION_NODOT)_$(a)_$(i),$(PKGROOT)$(sharedstatedir)/alternatives/$(NAME)_$(a)_$(i)) ) ) )
+# Create my alternatives files.
+	$(foreach a,$(myALTERNATIVES), $(foreach i,$(NEEDED_ISAS), $(info ===> Create alternative $(i) $(a)) $(shell ginstall -d $(PKGROOT)$(sharedstatedir)/alternatives ; echo "$(ALTERNATIVE_$(a)_$(i))" > $(PKGROOT)$(sharedstatedir)/alternatives/$(NAME)$(BASE_VERSION_NODOT)_$(a)_$(i) ) ) )
 # Create the PGDATA directory
-	ginstall -d $(PKGROOT)$(PGDATA)
+	@echo " ===> Create pgdata directory"
+	@ginstall -d $(PKGROOT)$(PGDATA)
 # Adjust the man page names.
-	for i in 1 5 ; do \
+	@echo " ===> Adjusting man page file names"
+	@for i in 1 5 ; do \
 		test -d $(PKGROOT)$(datadir)/man/man$$i || continue ; \
 		for f in $(PKGROOT)$(datadir)/man/man$$i/* ; do \
 			suffix="`echo $$f | awk 'BEGIN { FS="." } { print $$NF }'`" ; \
@@ -514,65 +506,73 @@
 		done ;\
 	done
 # Change path names in documentation
-	for f in $(PKGROOT)$(docdir)/$(NAME)/$(BASE_VERSION_NODOT)/html/*.html $(PKGROOT)$(mandir)/man1/*.1 $(PKGROOT)$(datadir)/$(NAME)/$(BASE_VERSION_NODOT)/*.sample ; do \
+	@echo " ===> Adjust path names in documentation"
+	@for f in $(PKGROOT)$(docdir)/$(NAME)/$(BASE_VERSION_NODOT)/html/*.html $(PKGROOT)$(mandir)/man1/*.1 $(PKGROOT)$(datadir)/$(NAME)/$(BASE_VERSION_NODOT)/*.sample ; do \
 		gsed -i -e 's|/usr/local/pgsql/data|$(localstatedir)/$(NAME)/$(BASE_VERSION_NODOT)|g' \
 			-e 's|/usr/local/pgsql/|$(prefix)/|g' \
 			-e 's|/usr/local|$(prefix)|g' \
 			-e 's|/usr/share|$(datadir)|g' $$f ; \
 	done
+	@echo " ===> Install postmsg"
 	$(foreach n,$(POSTMSG), $(shell ginstall -d $(PKGROOT)$(dir $(n))) $(shell ginstall $(WORKDIR)/$(notdir $(n)) $(PKGROOT)$(n)))
 	@$(MAKECOOKIE)
 
-
 pre-package:
 # The postinstall for the server package
-	ginstall $(WORKDIR)/$(SERVERPOSTINSTTMPL) $(WORKDIR)/$(SERVERPOSTINST_VERSIONED)
+	@echo " ===> Install postinstall script"
+	@ginstall $(WORKDIR)/$(SERVERPOSTINSTTMPL) $(WORKDIR)/$(SERVERPOSTINST_VERSIONED)
 # The usergroup file
-	ginstall -d $(PKGROOT)$(USERGROUPDIR)
-	ginstall $(WORKDIR)/$(USERGROUPFILETMPL) $(PKGROOT)$(USERGROUPDIR)/$(USERGROUPFILE_VERSIONED)
+	@echo " ===> Install usergroup file"
+	@ginstall -d $(PKGROOT)$(USERGROUPDIR)
+	@ginstall $(WORKDIR)/$(USERGROUPFILETMPL) $(PKGROOT)$(USERGROUPDIR)/$(USERGROUPFILE_VERSIONED)
 # The init script
-	ginstall -d $(PKGROOT)$(sysconfdir)/init.d
-	ginstall $(WORKDIR)/$(INITSCRIPTFILETMPL) $(PKGROOT)$(sysconfdir)/init.d/$(INITSCRIPTFILE_VERSIONED)
-	chmod 0755 $(PKGROOT)$(sysconfdir)/init.d/$(INITSCRIPTFILE_VERSIONED)
+	@echo " ===> Install init script"
+	@ginstall -d $(PKGROOT)$(sysconfdir)/init.d
+	@ginstall $(WORKDIR)/$(INITSCRIPTFILETMPL) $(PKGROOT)$(sysconfdir)/init.d/$(INITSCRIPTFILE_VERSIONED)
+	@chmod 0755 $(PKGROOT)$(sysconfdir)/init.d/$(INITSCRIPTFILE_VERSIONED)
 # The init script config
-	ginstall $(WORKDIR)/$(CSWPGSQLCONFFILETMPL) $(PKGROOT)$(sysconfdir)/$(CSWPGSQLCONFFILE_VERSIONED).CSW
+	@echo " ===> Install init script config"
+	@ginstall $(WORKDIR)/$(CSWPGSQLCONFFILETMPL) $(PKGROOT)$(sysconfdir)/$(CSWPGSQLCONFFILE_VERSIONED).CSW
 # Remove all the README.CSW, since they have not expanded the
 # variables, and copy only the one's we're interested in
-	for f in $(PKGROOT)$(docdir)/*/README.CSW ; do \
+	@echo " ===> Remove all README.CSW"
+	@for f in $(PKGROOT)$(docdir)/*/README.CSW ; do \
 		rm $$f ; \
 	done
-	for d in $(foreach n,$(subst dev,,$(myALTERNATIVES)),$(NAME)$(BASE_VERSION_NODOT)_$(n)) $(NAME)$(BASE_VERSION_NODOT) ; do \
+	@echo " ==> Install variable expanded README.CSW"
+	@for d in $(foreach n,$(myALTERNATIVES),$(NAME)$(BASE_VERSION_NODOT)_$(n)) $(NAME)$(BASE_VERSION_NODOT) ; do \
 		ginstall $(WORKDIR)/README.CSW $(PKGROOT)$(docdir)/$$d/ ; \
 	done
 	@$(MAKECOOKIE)
 
 $(foreach n,$(POSTMSG),$(PKGROOT)/$(n)):
-	ginstall -d $(dir $@)
-	@echo "Linking Post Messages"
-	ln $(DOWNLOADDIR)/$(notdir $@) $@
+	@echo " ===> Linking Post Messages"
+	@ginstall -d $(dir $@)
+	@ln $(DOWNLOADDIR)/$(notdir $@) $@
 
 $(foreach n,$(POSTMSG),$(DOWNLOADDIR)/$(notdir $(n))):
-	@echo " ==> Generating $(notdir $@)"
-	echo "" > $@
-	echo "---" >> $@
-	echo "" >> $@
-	echo "There are 32bit and 64bit versions of $(NAME) $(VERSION) binaries on the system installed:" >> $@
-	echo "" >> $@
-	echo "You can easily select between the versions with the alternatives(8)" >> $@
-	echo "system by executing" >> $@
-	echo "" >> $@
-	echo "  /opt/csw/sbin/alternatives --config $(subst .postmsg,,$(subst CSW,,$(notdir $@)))" >> $@
-	echo "" >> $@
-	echo "See http://www.opencsw.org/packages/alternatives for details." >> $@
-	echo "" >> $@
-	echo "---" >> $@
-	echo "" >> $@
+	@echo " ===> Generating $(notdir $@)"
+	@echo "" > $@
+	@echo "---" >> $@
+	@echo "" >> $@
+	@echo "There are 32bit and 64bit versions of $(NAME) $(VERSION) binaries on the system installed:" >> $@
+	@echo "" >> $@
+	@echo "You can easily select between the versions with the alternatives(8)" >> $@
+	@echo "system by executing" >> $@
+	@echo "" >> $@
+	@echo "  /opt/csw/sbin/alternatives --config $(subst .postmsg,,$(subst CSW,,$(notdir $@)))" >> $@
+	@echo "" >> $@
+	@echo "See http://www.opencsw.org/packages/alternatives for details." >> $@
+	@echo "" >> $@
+	@echo "---" >> $@
+	@echo "" >> $@
 	@$(MAKECOOKIE)
 
 test-installation:
 # Check if all binaries and libraries defined in the variables
 # BIN_NAMES_* and SO_NAMES_* are there
-	for n in $(BIN_NAMES_SERVER) $(BIN_NAMES_DEVEL) $(BIN_NAMES_CLIENT) $(BIN_NAMES_CONTRIB) ; do \
+	@echo " ===> Checking for extra binaries in BIN_NAMES_*"
+	@for n in $(BIN_NAMES_SERVER) $(BIN_NAMES_CLIENT) $(BIN_NAMES_CONTRIB) ; do \
 		if [ -f $(PKGROOT)$(PGBINDIR)/$$n ] ; then\
 			: ; \
 		else \
@@ -580,7 +580,8 @@
 			exit 1 ; \
 		fi ; \
 	done
-	for n in $(SO_NAMES_SERVER) $(SO_NAMES_CONTRIB) ; do \
+	@echo " ===> Checking for extra libraries in SO_NAMES_*"
+	@for n in $(SO_NAMES_SERVER) $(SO_NAMES_CONTRIB) ; do \
 		if [ -f $(PKGROOT)$(libdir)/$(NAME)/$(BASE_VERSION_NODOT)/$$n ] ; then\
 			: ; \
 		else \
@@ -590,8 +591,9 @@
 	done
 # Check if all binaries and libraries in the pkgroot are contained in
 # the respective recipe variables.
-	for n in `gfind $(PKGROOT)$(PGBINDIR) -maxdepth 1 -type f` ; do \
-		echo "$(BIN_NAMES_SERVER) $(BIN_NAMES_DEVEL) $(BIN_NAMES_CLIENT) $(BIN_NAMES_CONTRIB)" | grep `basename $$n` >/dev/null 2>&1 ; \
+	@echo " ===> Checking for missing binaries in BIN_NAMES_*"
+	@for n in `gfind $(PKGROOT)$(PGBINDIR) -maxdepth 1 -type f` ; do \
+		echo "$(BIN_NAMES_SERVER) $(BIN_NAMES_CLIENT) $(BIN_NAMES_CONTRIB)" | grep `basename $$n` >/dev/null 2>&1 ; \
 		if [ $$? -eq 0 ] ; then \
 			: ; \
 		else \
@@ -599,7 +601,8 @@
 			exit 1 ; \
 		fi ; \
 	done
-	for n in `gfind $(PKGROOT)$(libdir)/$(NAME)/$(BASE_VERSION_NODOT) -maxdepth 1 -type f` ; do \
+	@echo " ===> Checking for missing binaries in SO_NAMES_*"
+	@for n in `gfind $(PKGROOT)$(libdir)/$(NAME)/$(BASE_VERSION_NODOT) -maxdepth 1 -type f` ; do \
 		echo "$(SO_NAMES_SERVER) $(SO_NAMES_CONTRIB)" | grep `basename $$n` >/dev/null 2>&1 ; \
 		if [ $$? -eq 0 ] ; then \
 			: ; \

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


From guengel at users.sourceforge.net  Mon Jan  2 11:58:55 2012
From: guengel at users.sourceforge.net (guengel at users.sourceforge.net)
Date: Mon, 02 Jan 2012 10:58:55 +0000
Subject: [csw-devel] SF.net SVN: gar:[16643]
 csw/mgar/pkg/postgresql/branches/postgresql-8. 4-raos/Makefile
Message-ID: <E1RhfbT-0001lP-60@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 16643
          http://gar.svn.sourceforge.net/gar/?rev=16643&view=rev
Author:   guengel
Date:     2012-01-02 10:58:54 +0000 (Mon, 02 Jan 2012)
Log Message:
-----------
postgresql/branches/postgresql-8.4-raos: Cleanup. Removed alternatives for -dev since the binaries will go into standard places.

Modified Paths:
--------------
    csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/Makefile

Modified: csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/Makefile
===================================================================
--- csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/Makefile	2012-01-02 10:58:33 UTC (rev 16642)
+++ csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/Makefile	2012-01-02 10:58:54 UTC (rev 16643)
@@ -1,5 +1,3 @@
-# Copyright 2009 OpenCSW
-# Distributed under the terms of the GNU General Public License v2
 # $Id$
 #
 # Note 1
@@ -76,17 +74,18 @@
 #    CSW$(NAME)$(BASE_VERSION_NODOT) for files that have slipped by and put
 #    them in the proper place.
 #
-# 8. Make sure the proper version numbers are used for the library packages.
 #
-#
 # Note 5: Development package
 # ------
 #
 # The development package is not versioned, i.e. named CSW$(NAME)-dev,
 # since we can only support one set of header files with a reasonable
 # amount of effort.
+#
+# Further, it does not use alternatives and puts binaries in $(bindir)
+# (see 'post-merge-modulated:'). This will make it easier for
+# maintainers to use `pg_config'.
 
-
 NAME = postgresql
 BASE_VERSION = 8.4
 VERSION_NODOT = $(subst .,_,$(BASE_VERSION))
@@ -110,6 +109,9 @@
 #
 # These variables control many aspects of the build
 #
+sysconfdir-suffix-64	= /64
+sysconfdir		= /etc/opt/csw$(sysconfdir-suffix-$(MEMORYMODEL))
+PGSYSCONFDIR		= $(sysconfdir)/$(NAME)/$(BASE_VERSION_NODOT)
 PGBINDIR		= $(libexecdir)/$(NAME)/$(BASE_VERSION_NODOT)
 PGSBINDIR		= $(libexecdir)/$(NAME)/$(BASE_VERSION_NODOT)
 PGDATADIR		= $(datadir)/$(NAME)/$(BASE_VERSION_NODOT)
@@ -185,14 +187,11 @@
 # These are the alternatives provided for the packages.  I use them in the
 # recipe to iterate over all possible alternatives (see 'post-merge:')
 #
-# Please note that these should correspond to the package suffices.
-myALTERNATIVES = server client dev contrib
+# Please note that these should correspond to the package suffixes.
+myALTERNATIVES = server client contrib
 
 POSTMSG = $(foreach n,$(myALTERNATIVES),\
-	$(if $(subst dev,,$(n)),\
-		$(docdir)/$(NAME)$(BASE_VERSION_NODOT)_$(n)/CSW$(NAME)$(BASE_VERSION_NODOT)-$(n).postmsg,\
-		$(docdir)/$(NAME)_$(n)/CSW$(NAME)-$(n).postmsg \
-	)\
+	$(docdir)/$(NAME)$(BASE_VERSION_NODOT)_$(n)/CSW$(NAME)$(BASE_VERSION_NODOT)-$(n).postmsg\
 )
 
 MASTER_SITES = http://ftp.postgresql.org/pub/source/v$(VERSION)/
@@ -325,8 +324,6 @@
 PKGFILES_CSW$(NAME)-dev += $(PKGFILES_DEVEL)
 PKGFILES_CSW$(NAME)-dev += $(foreach n,$(BIN_NAMES_DEVEL),.*$(n)$$)
 PKGFILES_CSW$(NAME)-dev += $(foreach n,$(BIN_NAMES_DEVEL),.*/man1/$(n)\.1$$)
-# Alternatives for -dev have no version appended
-PKGFILES_CSW$(NAME)-dev += .*/alternatives/$(NAME)_dev.*
 PKGFILES_CSW$(NAME)-dev += .*/CSW$(NAME)-dev.postmsg
 PKGFILES_CSW$(NAME)-dev += .*$(docdir)/$(NAME)_dev/README.CSW
 # See `post-merge-modulated:'
@@ -346,12 +343,14 @@
 CHECKPKG_OVERRIDES_CSW$(NAME)-dev += $(foreach i,$(NEEDED_ISAS), $(subst $(ISA_DEFAULT)/,,file-with-bad-content|/usr/local|root$(libdir)/$(i)/$(NAME)/$(BASE_VERSION_NODOT)/pgxs/src/Makefile.shlib) )
 # That's ok too, it's docbook stuff which we don't use in this build
 CHECKPKG_OVERRIDES_CSW$(NAME)-dev += $(foreach i,$(NEEDED_ISAS), $(subst $(ISA_DEFAULT)/,,file-with-bad-content|/usr/share|root$(libdir)/$(i)/$(NAME)/$(BASE_VERSION_NODOT)/pgxs/src/Makefile.global) )
-#ALTERNATIVES_CSW$(NAME)-dev = $(foreach i,$(NEEDED_ISAS), dev_$(i))
+# See `post-merge-modulated:' for those overrides
+CHECKPKG_OVERRIDES_CSWpostgresql-dev += discouraged-path-in-pkgmap|/opt/csw/lib/libpgport.a
+CHECKPKG_OVERRIDES_CSWpostgresql-dev += discouraged-path-in-pkgmap|/opt/csw/lib/$(ISA_DEFAULT64)/libpgport.a
 
 PACKAGES += CSW$(NAME)$(BASE_VERSION_NODOT)-doc
 ARCHALL_CSW$(NAME)$(BASE_VERSION_NODOT)-doc = 1
 SPKG_DESC_CSW$(NAME)$(BASE_VERSION_NODOT)-doc = PostgreSQL $(VERSION), Documentation Files
-PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-doc  =  .*/doc/$(NAME)/$(BASE_VERSION_NODOT)/.*\.(html|css)
+PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-doc  = .*/doc/$(NAME)/$(BASE_VERSION_NODOT)/.*\.(html|css)
 PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-doc += .*/man5/.*
 
 PACKAGES += CSWlibecpg-compat3
@@ -398,14 +397,12 @@
 # supported, so IMHO, binaries should go to --libexecdir
 CONFIGURE_ARGS += --bindir=$(PGBINDIR)
 CONFIGURE_ARGS += --sbindir=$(PGSBINDIR)
-
+CONFIGURE_ARGS += --sysconfdir=$(PGSYSCONFDIR)
 CONFIGURE_ARGS += --datadir=$(PGDATADIR)
 CONFIGURE_ARGS += --localstatedir=$(PGDATA)
 CONFIGURE_ARGS += --with-includes=$(includedir)
 CONFIGURE_ARGS += --with-libraries=$(libdir)
 CONFIGURE_ARGS += --docdir=$(PGDOCDIR)
-# configure complains that we are not thread-safe, wtf? --raos
-#CONFIGURE_ARGS += --enable-thread-safety
 
 CONFIGURE_ARGS += --with-gssapi
 CONFIGURE_ARGS += --with-pam
@@ -424,8 +421,6 @@
 # The uppercase_* variables are used to translate the lowercase
 # $(myALTERNATIVES) to uppercase.
 #
-# -dev is handled separately further below
-#
 # How it does create the alternatives:
 #
 # for pkg in $(myALTERNATIVES)
@@ -439,17 +434,13 @@
 #   end alt
 # end pkg
 #
-# The same approach is used for -dev, but the enclosing outer loop is
-# not used, and the alternatives are not having the BASE_VERSION_NODOT
-# to their file names appended.
-#
 # In the post-merge target, the alternatives are written to their
 # respective files
 
 uppercase_server = SERVER
 uppercase_client = CLIENT
 uppercase_contrib = CONTRIB
-$(foreach pkg,$(filter-out dev,$(myALTERNATIVES)),\
+$(foreach pkg,$(myALTERNATIVES),\
 	$(eval alt_priority = 20) \
 	$(foreach alt,$(NEEDED_ISAS), \
 		$(eval alt_priority=$(shell expr $(alt_priority) + 10)) \
@@ -457,28 +448,23 @@
 		$(eval ALTERNATIVE_$(pkg)_$(alt) += $(subst /$(ISA_DEFAULT)/,/,$(foreach n,$(wordlist 2,$(words $(BIN_NAMES_$(uppercase_$(pkg)))),$(BIN_NAMES_$(uppercase_$(pkg)))),$(bindir)/$(n)-$(BASE_VERSION_NODOT) $(NAME)$(BASE_VERSION_NODOT)-$(pkg) $(libexecdir)/$(alt)/$(NAME)/$(BASE_VERSION_NODOT)/$(n)))) \
 	)\
 )
-# Devel is handled separately, since it does not use
-# $(BASE_VERSION_NODOT)
-alt_priority = 20
-$(foreach alt,$(NEEDED_ISAS),\
-	$(eval alt_priority=$(shell expr $(alt_priority) + 10)) \
-	$(eval ALTERNATIVE_dev_$(alt) = $(subst /$(ISA_DEFAULT)/,/,$(foreach n,$(firstword $(BIN_NAMES_DEVEL)),$(bindir)/$(n) $(NAME)-dev $(libexecdir)/$(alt)/$(NAME)/$(BASE_VERSION_NODOT)/$(n))) $(alt_priority)) \
-	$(eval ALTERNATIVE_dev_$(alt) += $(subst /$(ISA_DEFAULT)/,/,$(foreach n,$(wordlist 2,$(words $(BIN_NAMES_DEVEL)),$(BIN_NAMES_DEVEL)),$(bindir)/$(n) $(NAME)-dev $(libexecdir)/$(alt)/$(NAME)/$(BASE_VERSION_NODOT)/$(n))))\
-)
 
 # We adjust the $(pkglibdir) found in $(WORKSRC)/src/Makefile.global.in, so
 # that it should be possible to install 8.x and 8.y concurrently
 pre-configure-modulated:
-	if [ -r $(WORKSRC)/src/Makefile.global.in ] ; then \
+	@echo " ===> Adjusting pkglibdir in $(WORKSRC)/src/Makefile.global.in"
+	@if [ -r $(WORKSRC)/src/Makefile.global.in ] ; then \
 		gsed -i -r -e 's|^(pkglibdir[[:space:]]*=[[:space:]]*)\$$\(libdir\).*$$|\1$$(libdir)/postgresql/$(BASE_VERSION_NODOT)|' $(WORKSRC)/src/Makefile.global.in ; \
 	fi
 	@$(MAKECOOKIE)
 
 post-build-modulated:
+	@echo " ===> Building contrib stuff"
 	$(BUILD_ENV) gmake -C $(WORKSRC)/contrib all
 	@$(MAKECOOKIE)
 
 post-install-modulated:
+	@echo " ===> Installing contrib stuff"
 	$(INSTALL_ENV) gmake -C $(WORKSRC)/contrib DESTDIR=$(DESTDIR) install
 	@$(MAKECOOKIE)
 
@@ -487,19 +473,25 @@
 # lazzy to adjust the build system to generate one...
 post-merge-modulated:
 ifeq ($(ISA),$(ISA_DEFAULT64))
-	ginstall $(WORKSRC)/src/port/libpgport.a $(PKGROOT)/$(libpath_install)/$(ISA_DEFAULT64)/
+	ginstall $(WORKSRC)/src/port/libpgport.a $(PKGROOT)$(libpath_install)/$(ISA_DEFAULT64)/
 else
-	ginstall $(WORKSRC)/src/port/libpgport.a $(PKGROOT)/$(libdir)/
+	ginstall $(WORKSRC)/src/port/libpgport.a $(PKGROOT)$(libdir)/
 endif
+# Move the development binaries to the standard location
+	ginstall -d $(PKGROOT)$(bindir)/
+	for f in $(BIN_NAMES_DEVEL) ; do \
+		gmv -v $(PKGROOT)$(libexecdir)/$(NAME)/$(BASE_VERSION_NODOT)/$$f $(PKGROOT)$(bindir)/ ; \
+	done
 
 post-merge:  $(foreach n,$(POSTMSG),$(PKGROOT)/$(n)) test-installation
-# Create my alternatives files. Development alternatives have stripped
-# off the version
-	$(foreach a,$(myALTERNATIVES), $(foreach i,$(NEEDED_ISAS), $(shell ginstall -d $(PKGROOT)$(sharedstatedir)/alternatives ; echo "$(ALTERNATIVE_$(a)_$(i))" > $(if $(subst dev,,$(a)),$(PKGROOT)$(sharedstatedir)/alternatives/$(NAME)$(BASE_VERSION_NODOT)_$(a)_$(i),$(PKGROOT)$(sharedstatedir)/alternatives/$(NAME)_$(a)_$(i)) ) ) )
+# Create my alternatives files.
+	$(foreach a,$(myALTERNATIVES), $(foreach i,$(NEEDED_ISAS), $(info ===> Create alternative $(i) $(a)) $(shell ginstall -d $(PKGROOT)$(sharedstatedir)/alternatives ; echo "$(ALTERNATIVE_$(a)_$(i))" > $(PKGROOT)$(sharedstatedir)/alternatives/$(NAME)$(BASE_VERSION_NODOT)_$(a)_$(i) ) ) )
 # Create the PGDATA directory
-	ginstall -d $(PKGROOT)$(PGDATA)
+	@echo " ===> Create pgdata directory"
+	@ginstall -d $(PKGROOT)$(PGDATA)
 # Adjust the man page names.
-	for i in 1 5 ; do \
+	@echo " ===> Adjusting man page file names"
+	@for i in 1 5 ; do \
 		test -d $(PKGROOT)$(datadir)/man/man$$i || continue ; \
 		for f in $(PKGROOT)$(datadir)/man/man$$i/* ; do \
 			suffix="`echo $$f | awk 'BEGIN { FS="." } { print $$NF }'`" ; \
@@ -516,64 +508,73 @@
 		done ;\
 	done
 # Change path names in documentation
-	for f in $(PKGROOT)$(docdir)/$(NAME)/$(BASE_VERSION_NODOT)/html/*.html $(PKGROOT)$(mandir)/man1/*.1 $(PKGROOT)$(datadir)/$(NAME)/$(BASE_VERSION_NODOT)/*.sample ; do \
+	@echo " ===> Adjust path names in documentation"
+	@for f in $(PKGROOT)$(docdir)/$(NAME)/$(BASE_VERSION_NODOT)/html/*.html $(PKGROOT)$(mandir)/man1/*.1 $(PKGROOT)$(datadir)/$(NAME)/$(BASE_VERSION_NODOT)/*.sample ; do \
 		gsed -i -e 's|/usr/local/pgsql/data|$(localstatedir)/$(NAME)/$(BASE_VERSION_NODOT)|g' \
 			-e 's|/usr/local/pgsql/|$(prefix)/|g' \
 			-e 's|/usr/local|$(prefix)|g' \
 			-e 's|/usr/share|$(datadir)|g' $$f ; \
 	done
+	@echo " ===> Install postmsg"
 	$(foreach n,$(POSTMSG), $(shell ginstall -d $(PKGROOT)$(dir $(n))) $(shell ginstall $(WORKDIR)/$(notdir $(n)) $(PKGROOT)$(n)))
 	@$(MAKECOOKIE)
 
 pre-package:
 # The postinstall for the server package
-	ginstall $(WORKDIR)/$(SERVERPOSTINSTTMPL) $(WORKDIR)/$(SERVERPOSTINST_VERSIONED)
+	@echo " ===> Install postinstall script"
+	@ginstall $(WORKDIR)/$(SERVERPOSTINSTTMPL) $(WORKDIR)/$(SERVERPOSTINST_VERSIONED)
 # The usergroup file
-	ginstall -d $(PKGROOT)$(USERGROUPDIR)
-	ginstall $(WORKDIR)/$(USERGROUPFILETMPL) $(PKGROOT)$(USERGROUPDIR)/$(USERGROUPFILE_VERSIONED)
+	@echo " ===> Install usergroup file"
+	@ginstall -d $(PKGROOT)$(USERGROUPDIR)
+	@ginstall $(WORKDIR)/$(USERGROUPFILETMPL) $(PKGROOT)$(USERGROUPDIR)/$(USERGROUPFILE_VERSIONED)
 # The init script
-	ginstall -d $(PKGROOT)$(sysconfdir)/init.d
-	ginstall $(WORKDIR)/$(INITSCRIPTFILETMPL) $(PKGROOT)$(sysconfdir)/init.d/$(INITSCRIPTFILE_VERSIONED)
-	chmod 0755 $(PKGROOT)$(sysconfdir)/init.d/$(INITSCRIPTFILE_VERSIONED)
+	@echo " ===> Install init script"
+	@ginstall -d $(PKGROOT)$(sysconfdir)/init.d
+	@ginstall $(WORKDIR)/$(INITSCRIPTFILETMPL) $(PKGROOT)$(sysconfdir)/init.d/$(INITSCRIPTFILE_VERSIONED)
+	@chmod 0755 $(PKGROOT)$(sysconfdir)/init.d/$(INITSCRIPTFILE_VERSIONED)
 # The init script config
-	ginstall $(WORKDIR)/$(CSWPGSQLCONFFILETMPL) $(PKGROOT)$(sysconfdir)/$(CSWPGSQLCONFFILE_VERSIONED).CSW
+	@echo " ===> Install init script config"
+	@ginstall $(WORKDIR)/$(CSWPGSQLCONFFILETMPL) $(PKGROOT)$(sysconfdir)/$(CSWPGSQLCONFFILE_VERSIONED).CSW
 # Remove all the README.CSW, since they have not expanded the
 # variables, and copy only the one's we're interested in
-	for f in $(PKGROOT)$(docdir)/*/README.CSW ; do \
+	@echo " ===> Remove all README.CSW"
+	@for f in $(PKGROOT)$(docdir)/*/README.CSW ; do \
 		rm $$f ; \
 	done
-	for d in $(foreach n,$(subst dev,,$(myALTERNATIVES)),$(NAME)$(BASE_VERSION_NODOT)_$(n)) $(NAME)$(BASE_VERSION_NODOT) ; do \
+	@echo " ==> Install variable expanded README.CSW"
+	@for d in $(foreach n,$(myALTERNATIVES),$(NAME)$(BASE_VERSION_NODOT)_$(n)) $(NAME)$(BASE_VERSION_NODOT) ; do \
 		ginstall $(WORKDIR)/README.CSW $(PKGROOT)$(docdir)/$$d/ ; \
 	done
 	@$(MAKECOOKIE)
 
 $(foreach n,$(POSTMSG),$(PKGROOT)/$(n)):
-	ginstall -d $(dir $@)
-	@echo "Linking Post Messages"
-	ln $(DOWNLOADDIR)/$(notdir $@) $@
+	@echo " ===> Linking Post Messages"
+	@ginstall -d $(dir $@)
+	@ln $(DOWNLOADDIR)/$(notdir $@) $@
 
 $(foreach n,$(POSTMSG),$(DOWNLOADDIR)/$(notdir $(n))):
-	@echo " ==> Generating $(notdir $@)"
-	echo "" > $@
-	echo "---" >> $@
-	echo "" >> $@
-	echo "There are 32bit and 64bit versions of $(NAME) $(VERSION) binaries on the system installed:" >> $@
-	echo "" >> $@
-	echo "You can easily select between the versions with the alternatives(8)" >> $@
-	echo "system by executing" >> $@
-	echo "" >> $@
-	echo "  /opt/csw/sbin/alternatives --config $(subst .postmsg,,$(subst CSW,,$(notdir $@)))" >> $@
-	echo "" >> $@
-	echo "See http://www.opencsw.org/packages/alternatives for details." >> $@
-	echo "" >> $@
-	echo "---" >> $@
-	echo "" >> $@
+	@echo " ===> Generating $(notdir $@)"
+	@echo "" > $@
+	@echo "---" >> $@
+	@echo "" >> $@
+	@echo "There are 32bit and 64bit versions of $(NAME) $(VERSION) binaries on the system installed:" >> $@
+	@echo "" >> $@
+	@echo "You can easily select between the versions with the alternatives(8)" >> $@
+	@echo "system by executing" >> $@
+	@echo "" >> $@
+	@echo "  /opt/csw/sbin/alternatives --config $(subst .postmsg,,$(subst CSW,,$(notdir $@)))" >> $@
+	@echo "" >> $@
+	@echo "See http://www.opencsw.org/packages/alternatives for details." >> $@
+	@echo "" >> $@
+	@echo "---" >> $@
+	@echo "" >> $@
 	@$(MAKECOOKIE)
 
 test-installation:
 # Check if all binaries and libraries defined in the variables
 # BIN_NAMES_* and SO_NAMES_* are there
-	for n in $(BIN_NAMES_SERVER) $(BIN_NAMES_DEVEL) $(BIN_NAMES_CLIENT) $(BIN_NAMES_CONTRIB) ; do \
+	@echo " ===> Checking for extra binaries in BIN_NAMES_*"
+	@for n in $(BIN_NAMES_SERVER) $(BIN_NAMES_CLIENT) $(BIN_NAMES_CONTRIB) ; do \
 		if [ -f $(PKGROOT)$(PGBINDIR)/$$n ] ; then\
 			: ; \
 		else \
@@ -581,7 +582,8 @@
 			exit 1 ; \
 		fi ; \
 	done
-	for n in $(SO_NAMES_SERVER) $(SO_NAMES_CONTRIB) ; do \
+	@echo " ===> Checking for extra libraries in SO_NAMES_*"
+	@for n in $(SO_NAMES_SERVER) $(SO_NAMES_CONTRIB) ; do \
 		if [ -f $(PKGROOT)$(libdir)/$(NAME)/$(BASE_VERSION_NODOT)/$$n ] ; then\
 			: ; \
 		else \
@@ -591,8 +593,9 @@
 	done
 # Check if all binaries and libraries in the pkgroot are contained in
 # the respective recipe variables.
-	for n in `gfind $(PKGROOT)$(PGBINDIR) -maxdepth 1 -type f` ; do \
-		echo "$(BIN_NAMES_SERVER) $(BIN_NAMES_DEVEL) $(BIN_NAMES_CLIENT) $(BIN_NAMES_CONTRIB)" | grep `basename $$n` >/dev/null 2>&1 ; \
+	@echo " ===> Checking for missing binaries in BIN_NAMES_*"
+	@for n in `gfind $(PKGROOT)$(PGBINDIR) -maxdepth 1 -type f` ; do \
+		echo "$(BIN_NAMES_SERVER) $(BIN_NAMES_CLIENT) $(BIN_NAMES_CONTRIB)" | grep `basename $$n` >/dev/null 2>&1 ; \
 		if [ $$? -eq 0 ] ; then \
 			: ; \
 		else \
@@ -600,7 +603,8 @@
 			exit 1 ; \
 		fi ; \
 	done
-	for n in `gfind $(PKGROOT)$(libdir)/$(NAME)/$(BASE_VERSION_NODOT) -maxdepth 1 -type f` ; do \
+	@echo " ===> Checking for missing binaries in SO_NAMES_*"
+	@for n in `gfind $(PKGROOT)$(libdir)/$(NAME)/$(BASE_VERSION_NODOT) -maxdepth 1 -type f` ; do \
 		echo "$(SO_NAMES_SERVER) $(SO_NAMES_CONTRIB)" | grep `basename $$n` >/dev/null 2>&1 ; \
 		if [ $$? -eq 0 ] ; then \
 			: ; \

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


From guengel at users.sourceforge.net  Mon Jan  2 11:59:12 2012
From: guengel at users.sourceforge.net (guengel at users.sourceforge.net)
Date: Mon, 02 Jan 2012 10:59:12 +0000
Subject: [csw-devel] SF.net SVN: gar:[16644]
 csw/mgar/pkg/postgresql/branches/postgresql-9. 0-raos/Makefile
Message-ID: <E1Rhfbk-0001lj-Lp@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 16644
          http://gar.svn.sourceforge.net/gar/?rev=16644&view=rev
Author:   guengel
Date:     2012-01-02 10:59:12 +0000 (Mon, 02 Jan 2012)
Log Message:
-----------
postgresql/branches/postgresql-9.0-raos: Cleanup. Removed alternatives for -dev since the binaries will go into standard places.

Modified Paths:
--------------
    csw/mgar/pkg/postgresql/branches/postgresql-9.0-raos/Makefile

Modified: csw/mgar/pkg/postgresql/branches/postgresql-9.0-raos/Makefile
===================================================================
--- csw/mgar/pkg/postgresql/branches/postgresql-9.0-raos/Makefile	2012-01-02 10:58:54 UTC (rev 16643)
+++ csw/mgar/pkg/postgresql/branches/postgresql-9.0-raos/Makefile	2012-01-02 10:59:12 UTC (rev 16644)
@@ -74,17 +74,18 @@
 #    CSW$(NAME)$(BASE_VERSION_NODOT) for files that have slipped by and put
 #    them in the proper place.
 #
-# 8. Make sure the proper version numbers are used for the library packages.
 #
-#
 # Note 5: Development package
 # ------
 #
 # The development package is not versioned, i.e. named CSW$(NAME)-dev,
 # since we can only support one set of header files with a reasonable
 # amount of effort.
+#
+# Further, it does not use alternatives and puts binaries in $(bindir)
+# (see 'post-merge-modulated:'). This will make it easier for
+# maintainers to use `pg_config'.
 
-
 NAME = postgresql
 BASE_VERSION = 9.0
 VERSION_NODOT = $(subst .,_,$(BASE_VERSION))
@@ -108,6 +109,9 @@
 #
 # These variables control many aspects of the build
 #
+sysconfdir-suffix-64	= /64
+sysconfdir		= /etc/opt/csw$(sysconfdir-suffix-$(MEMORYMODEL))
+PGSYSCONFDIR		= $(sysconfdir)/$(NAME)/$(BASE_VERSION_NODOT)
 PGBINDIR		= $(libexecdir)/$(NAME)/$(BASE_VERSION_NODOT)
 PGSBINDIR		= $(libexecdir)/$(NAME)/$(BASE_VERSION_NODOT)
 PGDATADIR		= $(datadir)/$(NAME)/$(BASE_VERSION_NODOT)
@@ -185,14 +189,11 @@
 # These are the alternatives provided for the packages.  I use them in the
 # recipe to iterate over all possible alternatives (see 'post-merge:')
 #
-# Please note that these should correspond to the package suffices.
-myALTERNATIVES = server client dev contrib
+# Please note that these should correspond to the package suffixes.
+myALTERNATIVES = server client contrib
 
 POSTMSG = $(foreach n,$(myALTERNATIVES),\
-	$(if $(subst dev,,$(n)),\
-		$(docdir)/$(NAME)$(BASE_VERSION_NODOT)_$(n)/CSW$(NAME)$(BASE_VERSION_NODOT)-$(n).postmsg,\
-		$(docdir)/$(NAME)_$(n)/CSW$(NAME)-$(n).postmsg \
-	)\
+	$(docdir)/$(NAME)$(BASE_VERSION_NODOT)_$(n)/CSW$(NAME)$(BASE_VERSION_NODOT)-$(n).postmsg\
 )
 
 MASTER_SITES = http://ftp.postgresql.org/pub/source/v$(VERSION)/
@@ -320,8 +321,6 @@
 PKGFILES_CSW$(NAME)-dev += $(PKGFILES_DEVEL)
 PKGFILES_CSW$(NAME)-dev += $(foreach n,$(BIN_NAMES_DEVEL),.*$(n)$$)
 PKGFILES_CSW$(NAME)-dev += $(foreach n,$(BIN_NAMES_DEVEL),.*/man1/$(n)\.1$$)
-# Alternatives for -dev have no version appended
-PKGFILES_CSW$(NAME)-dev += .*/alternatives/$(NAME)_dev.*
 PKGFILES_CSW$(NAME)-dev += .*/CSW$(NAME)-dev.postmsg
 PKGFILES_CSW$(NAME)-dev += .*$(docdir)/$(NAME)_dev/README.CSW
 # See `post-merge-modulated:'
@@ -341,7 +340,9 @@
 CHECKPKG_OVERRIDES_CSW$(NAME)-dev += $(foreach i,$(NEEDED_ISAS), $(subst $(ISA_DEFAULT)/,,file-with-bad-content|/usr/local|root$(libdir)/$(i)/$(NAME)/$(BASE_VERSION_NODOT)/pgxs/src/Makefile.shlib) )
 # That's ok too, it's docbook stuff which we don't use in this build
 CHECKPKG_OVERRIDES_CSW$(NAME)-dev += $(foreach i,$(NEEDED_ISAS), $(subst $(ISA_DEFAULT)/,,file-with-bad-content|/usr/share|root$(libdir)/$(i)/$(NAME)/$(BASE_VERSION_NODOT)/pgxs/src/Makefile.global) )
-#ALTERNATIVES_CSW$(NAME)-dev = $(foreach i,$(NEEDED_ISAS), dev_$(i))
+# See `post-merge-modulated:' for those overrides
+CHECKPKG_OVERRIDES_CSWpostgresql-dev += discouraged-path-in-pkgmap|/opt/csw/lib/libpgport.a
+CHECKPKG_OVERRIDES_CSWpostgresql-dev += discouraged-path-in-pkgmap|/opt/csw/lib/$(ISA_DEFAULT64)/libpgport.a
 
 PACKAGES += CSW$(NAME)$(BASE_VERSION_NODOT)-doc
 ARCHALL_CSW$(NAME)$(BASE_VERSION_NODOT)-doc = 1
@@ -396,7 +397,7 @@
 # supported, so IMHO, binaries should go to --libexecdir
 CONFIGURE_ARGS += --bindir=$(PGBINDIR)
 CONFIGURE_ARGS += --sbindir=$(PGSBINDIR)
-
+CONFIGURE_ARGS += --sysconfdir=$(PGSYSCONFDIR)
 CONFIGURE_ARGS += --datadir=$(PGDATADIR)
 CONFIGURE_ARGS += --localstatedir=$(PGDATA)
 CONFIGURE_ARGS += --with-includes=$(includedir)
@@ -420,8 +421,6 @@
 # The uppercase_* variables are used to translate the lowercase
 # $(myALTERNATIVES) to uppercase.
 #
-# -dev is handled separately further below
-#
 # How it does create the alternatives:
 #
 # for pkg in $(myALTERNATIVES)
@@ -435,17 +434,13 @@
 #   end alt
 # end pkg
 #
-# The same approach is used for -dev, but the enclosing outer loop is
-# not used, and the alternatives are not having the BASE_VERSION_NODOT
-# to their file names appended.
-#
 # In the post-merge target, the alternatives are written to their
 # respective files
 
 uppercase_server = SERVER
 uppercase_client = CLIENT
 uppercase_contrib = CONTRIB
-$(foreach pkg,$(filter-out dev,$(myALTERNATIVES)),\
+$(foreach pkg,$(myALTERNATIVES),\
 	$(eval alt_priority = 20) \
 	$(foreach alt,$(NEEDED_ISAS), \
 		$(eval alt_priority=$(shell expr $(alt_priority) + 10)) \
@@ -453,28 +448,23 @@
 		$(eval ALTERNATIVE_$(pkg)_$(alt) += $(subst /$(ISA_DEFAULT)/,/,$(foreach n,$(wordlist 2,$(words $(BIN_NAMES_$(uppercase_$(pkg)))),$(BIN_NAMES_$(uppercase_$(pkg)))),$(bindir)/$(n)-$(BASE_VERSION_NODOT) $(NAME)$(BASE_VERSION_NODOT)-$(pkg) $(libexecdir)/$(alt)/$(NAME)/$(BASE_VERSION_NODOT)/$(n)))) \
 	)\
 )
-# Devel is handled separately, since it does not use
-# $(BASE_VERSION_NODOT)
-alt_priority = 20
-$(foreach alt,$(NEEDED_ISAS),\
-	$(eval alt_priority=$(shell expr $(alt_priority) + 10)) \
-	$(eval ALTERNATIVE_dev_$(alt) = $(subst /$(ISA_DEFAULT)/,/,$(foreach n,$(firstword $(BIN_NAMES_DEVEL)),$(bindir)/$(n) $(NAME)-dev $(libexecdir)/$(alt)/$(NAME)/$(BASE_VERSION_NODOT)/$(n))) $(alt_priority)) \
-	$(eval ALTERNATIVE_dev_$(alt) += $(subst /$(ISA_DEFAULT)/,/,$(foreach n,$(wordlist 2,$(words $(BIN_NAMES_DEVEL)),$(BIN_NAMES_DEVEL)),$(bindir)/$(n) $(NAME)-dev $(libexecdir)/$(alt)/$(NAME)/$(BASE_VERSION_NODOT)/$(n))))\
-)
 
 # We adjust the $(pkglibdir) found in $(WORKSRC)/src/Makefile.global.in, so
 # that it should be possible to install 8.x and 8.y concurrently
 pre-configure-modulated:
-	if [ -r $(WORKSRC)/src/Makefile.global.in ] ; then \
+	@echo " ===> Adjusting pkglibdir in $(WORKSRC)/src/Makefile.global.in"
+	@if [ -r $(WORKSRC)/src/Makefile.global.in ] ; then \
 		gsed -i -r -e 's|^(pkglibdir[[:space:]]*=[[:space:]]*)\$$\(libdir\).*$$|\1$$(libdir)/postgresql/$(BASE_VERSION_NODOT)|' $(WORKSRC)/src/Makefile.global.in ; \
 	fi
 	@$(MAKECOOKIE)
 
 post-build-modulated:
+	@echo " ===> Building contrib stuff"
 	$(BUILD_ENV) gmake -C $(WORKSRC)/contrib all
 	@$(MAKECOOKIE)
 
 post-install-modulated:
+	@echo " ===> Installing contrib stuff"
 	$(INSTALL_ENV) gmake -C $(WORKSRC)/contrib DESTDIR=$(DESTDIR) install
 	$(INSTALL_ENV) gmake -C $(WORKSRC) DESTDIR=$(DESTDIR) install-docs
 	@$(MAKECOOKIE)
@@ -484,19 +474,25 @@
 # lazzy to adjust the build system to generate one...
 post-merge-modulated:
 ifeq ($(ISA),$(ISA_DEFAULT64))
-	ginstall $(WORKSRC)/src/port/libpgport.a $(PKGROOT)/$(libpath_install)/$(ISA_DEFAULT64)/
+	ginstall $(WORKSRC)/src/port/libpgport.a $(PKGROOT)$(libpath_install)/$(ISA_DEFAULT64)/
 else
-	ginstall $(WORKSRC)/src/port/libpgport.a $(PKGROOT)/$(libdir)/
+	ginstall $(WORKSRC)/src/port/libpgport.a $(PKGROOT)$(libdir)/
 endif
+# Move the development binaries to the standard location
+	ginstall -d $(PKGROOT)$(bindir)/
+	for f in $(BIN_NAMES_DEVEL) ; do \
+		gmv -v $(PKGROOT)$(libexecdir)/$(NAME)/$(BASE_VERSION_NODOT)/$$f $(PKGROOT)$(bindir)/ ; \
+	done
 
 post-merge:  $(foreach n,$(POSTMSG),$(PKGROOT)/$(n)) test-installation
-# Create my alternatives files. Development alternatives have stripped
-# off the version
-	$(foreach a,$(myALTERNATIVES), $(foreach i,$(NEEDED_ISAS), $(shell ginstall -d $(PKGROOT)$(sharedstatedir)/alternatives ; echo "$(ALTERNATIVE_$(a)_$(i))" > $(if $(subst dev,,$(a)),$(PKGROOT)$(sharedstatedir)/alternatives/$(NAME)$(BASE_VERSION_NODOT)_$(a)_$(i),$(PKGROOT)$(sharedstatedir)/alternatives/$(NAME)_$(a)_$(i)) ) ) )
+# Create my alternatives files.
+	$(foreach a,$(myALTERNATIVES), $(foreach i,$(NEEDED_ISAS), $(info ===> Create alternative $(i) $(a)) $(shell ginstall -d $(PKGROOT)$(sharedstatedir)/alternatives ; echo "$(ALTERNATIVE_$(a)_$(i))" > $(PKGROOT)$(sharedstatedir)/alternatives/$(NAME)$(BASE_VERSION_NODOT)_$(a)_$(i) ) ) )
 # Create the PGDATA directory
-	ginstall -d $(PKGROOT)$(PGDATA)
+	@echo " ===> Create pgdata directory"
+	@ginstall -d $(PKGROOT)$(PGDATA)
 # Adjust the man page names.
-	for i in 1 5 ; do \
+	@echo " ===> Adjusting man page file names"
+	@for i in 1 5 ; do \
 		test -d $(PKGROOT)$(datadir)/man/man$$i || continue ; \
 		for f in $(PKGROOT)$(datadir)/man/man$$i/* ; do \
 			suffix="`echo $$f | awk 'BEGIN { FS="." } { print $$NF }'`" ; \
@@ -513,64 +509,73 @@
 		done ;\
 	done
 # Change path names in documentation
-	for f in $(PKGROOT)$(docdir)/$(NAME)/$(BASE_VERSION_NODOT)/html/*.html $(PKGROOT)$(mandir)/man1/*.1 $(PKGROOT)$(datadir)/$(NAME)/$(BASE_VERSION_NODOT)/*.sample ; do \
+	@echo " ===> Adjust path names in documentation"
+	@for f in $(PKGROOT)$(docdir)/$(NAME)/$(BASE_VERSION_NODOT)/html/*.html $(PKGROOT)$(mandir)/man1/*.1 $(PKGROOT)$(datadir)/$(NAME)/$(BASE_VERSION_NODOT)/*.sample ; do \
 		gsed -i -e 's|/usr/local/pgsql/data|$(localstatedir)/$(NAME)/$(BASE_VERSION_NODOT)|g' \
 			-e 's|/usr/local/pgsql/|$(prefix)/|g' \
 			-e 's|/usr/local|$(prefix)|g' \
 			-e 's|/usr/share|$(datadir)|g' $$f ; \
 	done
+	@echo " ===> Install postmsg"
 	$(foreach n,$(POSTMSG), $(shell ginstall -d $(PKGROOT)$(dir $(n))) $(shell ginstall $(WORKDIR)/$(notdir $(n)) $(PKGROOT)$(n)))
 	@$(MAKECOOKIE)
 
 pre-package:
 # The postinstall for the server package
-	ginstall $(WORKDIR)/$(SERVERPOSTINSTTMPL) $(WORKDIR)/$(SERVERPOSTINST_VERSIONED)
+	@echo " ===> Install postinstall script"
+	@ginstall $(WORKDIR)/$(SERVERPOSTINSTTMPL) $(WORKDIR)/$(SERVERPOSTINST_VERSIONED)
 # The usergroup file
-	ginstall -d $(PKGROOT)$(USERGROUPDIR)
-	ginstall $(WORKDIR)/$(USERGROUPFILETMPL) $(PKGROOT)$(USERGROUPDIR)/$(USERGROUPFILE_VERSIONED)
+	@echo " ===> Install usergroup file"
+	@ginstall -d $(PKGROOT)$(USERGROUPDIR)
+	@ginstall $(WORKDIR)/$(USERGROUPFILETMPL) $(PKGROOT)$(USERGROUPDIR)/$(USERGROUPFILE_VERSIONED)
 # The init script
-	ginstall -d $(PKGROOT)$(sysconfdir)/init.d
-	ginstall $(WORKDIR)/$(INITSCRIPTFILETMPL) $(PKGROOT)$(sysconfdir)/init.d/$(INITSCRIPTFILE_VERSIONED)
-	chmod 0755 $(PKGROOT)$(sysconfdir)/init.d/$(INITSCRIPTFILE_VERSIONED)
+	@echo " ===> Install init script"
+	@ginstall -d $(PKGROOT)$(sysconfdir)/init.d
+	@ginstall $(WORKDIR)/$(INITSCRIPTFILETMPL) $(PKGROOT)$(sysconfdir)/init.d/$(INITSCRIPTFILE_VERSIONED)
+	@chmod 0755 $(PKGROOT)$(sysconfdir)/init.d/$(INITSCRIPTFILE_VERSIONED)
 # The init script config
-	ginstall $(WORKDIR)/$(CSWPGSQLCONFFILETMPL) $(PKGROOT)$(sysconfdir)/$(CSWPGSQLCONFFILE_VERSIONED).CSW
+	@echo " ===> Install init script config"
+	@ginstall $(WORKDIR)/$(CSWPGSQLCONFFILETMPL) $(PKGROOT)$(sysconfdir)/$(CSWPGSQLCONFFILE_VERSIONED).CSW
 # Remove all the README.CSW, since they have not expanded the
 # variables, and copy only the one's we're interested in
-	for f in $(PKGROOT)$(docdir)/*/README.CSW ; do \
+	@echo " ===> Remove all README.CSW"
+	@for f in $(PKGROOT)$(docdir)/*/README.CSW ; do \
 		rm $$f ; \
 	done
-	for d in $(foreach n,$(subst dev,,$(myALTERNATIVES)),$(NAME)$(BASE_VERSION_NODOT)_$(n)) $(NAME)$(BASE_VERSION_NODOT) ; do \
+	@echo " ==> Install variable expanded README.CSW"
+	@for d in $(foreach n,$(myALTERNATIVES),$(NAME)$(BASE_VERSION_NODOT)_$(n)) $(NAME)$(BASE_VERSION_NODOT) ; do \
 		ginstall $(WORKDIR)/README.CSW $(PKGROOT)$(docdir)/$$d/ ; \
 	done
 	@$(MAKECOOKIE)
 
 $(foreach n,$(POSTMSG),$(PKGROOT)/$(n)):
-	ginstall -d $(dir $@)
-	@echo "Linking Post Messages"
-	ln $(DOWNLOADDIR)/$(notdir $@) $@
+	@echo " ===> Linking Post Messages"
+	@ginstall -d $(dir $@)
+	@ln $(DOWNLOADDIR)/$(notdir $@) $@
 
 $(foreach n,$(POSTMSG),$(DOWNLOADDIR)/$(notdir $(n))):
-	@echo " ==> Generating $(notdir $@)"
-	echo "" > $@
-	echo "---" >> $@
-	echo "" >> $@
-	echo "There are 32bit and 64bit versions of $(NAME) $(VERSION) binaries on the system installed:" >> $@
-	echo "" >> $@
-	echo "You can easily select between the versions with the alternatives(8)" >> $@
-	echo "system by executing" >> $@
-	echo "" >> $@
-	echo "  /opt/csw/sbin/alternatives --config $(subst .postmsg,,$(subst CSW,,$(notdir $@)))" >> $@
-	echo "" >> $@
-	echo "See http://www.opencsw.org/packages/alternatives for details." >> $@
-	echo "" >> $@
-	echo "---" >> $@
-	echo "" >> $@
+	@echo " ===> Generating $(notdir $@)"
+	@echo "" > $@
+	@echo "---" >> $@
+	@echo "" >> $@
+	@echo "There are 32bit and 64bit versions of $(NAME) $(VERSION) binaries on the system installed:" >> $@
+	@echo "" >> $@
+	@echo "You can easily select between the versions with the alternatives(8)" >> $@
+	@echo "system by executing" >> $@
+	@echo "" >> $@
+	@echo "  /opt/csw/sbin/alternatives --config $(subst .postmsg,,$(subst CSW,,$(notdir $@)))" >> $@
+	@echo "" >> $@
+	@echo "See http://www.opencsw.org/packages/alternatives for details." >> $@
+	@echo "" >> $@
+	@echo "---" >> $@
+	@echo "" >> $@
 	@$(MAKECOOKIE)
 
 test-installation:
 # Check if all binaries and libraries defined in the variables
 # BIN_NAMES_* and SO_NAMES_* are there
-	for n in $(BIN_NAMES_SERVER) $(BIN_NAMES_DEVEL) $(BIN_NAMES_CLIENT) $(BIN_NAMES_CONTRIB) ; do \
+	@echo " ===> Checking for extra binaries in BIN_NAMES_*"
+	@for n in $(BIN_NAMES_SERVER) $(BIN_NAMES_CLIENT) $(BIN_NAMES_CONTRIB) ; do \
 		if [ -f $(PKGROOT)$(PGBINDIR)/$$n ] ; then\
 			: ; \
 		else \
@@ -578,7 +583,8 @@
 			exit 1 ; \
 		fi ; \
 	done
-	for n in $(SO_NAMES_SERVER) $(SO_NAMES_CONTRIB) ; do \
+	@echo " ===> Checking for extra libraries in SO_NAMES_*"
+	@for n in $(SO_NAMES_SERVER) $(SO_NAMES_CONTRIB) ; do \
 		if [ -f $(PKGROOT)$(libdir)/$(NAME)/$(BASE_VERSION_NODOT)/$$n ] ; then\
 			: ; \
 		else \
@@ -588,8 +594,9 @@
 	done
 # Check if all binaries and libraries in the pkgroot are contained in
 # the respective recipe variables.
-	for n in `gfind $(PKGROOT)$(PGBINDIR) -maxdepth 1 -type f` ; do \
-		echo "$(BIN_NAMES_SERVER) $(BIN_NAMES_DEVEL) $(BIN_NAMES_CLIENT) $(BIN_NAMES_CONTRIB)" | grep `basename $$n` >/dev/null 2>&1 ; \
+	@echo " ===> Checking for missing binaries in BIN_NAMES_*"
+	@for n in `gfind $(PKGROOT)$(PGBINDIR) -maxdepth 1 -type f` ; do \
+		echo "$(BIN_NAMES_SERVER) $(BIN_NAMES_CLIENT) $(BIN_NAMES_CONTRIB)" | grep `basename $$n` >/dev/null 2>&1 ; \
 		if [ $$? -eq 0 ] ; then \
 			: ; \
 		else \
@@ -597,7 +604,8 @@
 			exit 1 ; \
 		fi ; \
 	done
-	for n in `gfind $(PKGROOT)$(libdir)/$(NAME)/$(BASE_VERSION_NODOT) -maxdepth 1 -type f` ; do \
+	@echo " ===> Checking for missing binaries in SO_NAMES_*"
+	@for n in `gfind $(PKGROOT)$(libdir)/$(NAME)/$(BASE_VERSION_NODOT) -maxdepth 1 -type f` ; do \
 		echo "$(SO_NAMES_SERVER) $(SO_NAMES_CONTRIB)" | grep `basename $$n` >/dev/null 2>&1 ; \
 		if [ $$? -eq 0 ] ; then \
 			: ; \

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


From guengel at users.sourceforge.net  Mon Jan  2 11:59:27 2012
From: guengel at users.sourceforge.net (guengel at users.sourceforge.net)
Date: Mon, 02 Jan 2012 10:59:27 +0000
Subject: [csw-devel] SF.net SVN: gar:[16645]
 csw/mgar/pkg/postgresql/branches/postgresql-9. 1-raos/Makefile
Message-ID: <E1Rhfbz-0001m2-E9@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 16645
          http://gar.svn.sourceforge.net/gar/?rev=16645&view=rev
Author:   guengel
Date:     2012-01-02 10:59:27 +0000 (Mon, 02 Jan 2012)
Log Message:
-----------
postgresql/branches/postgresql-9.1-raos: Cleanup. Removed alternatives for -dev since the binaries will go into standard places.

Modified Paths:
--------------
    csw/mgar/pkg/postgresql/branches/postgresql-9.1-raos/Makefile

Modified: csw/mgar/pkg/postgresql/branches/postgresql-9.1-raos/Makefile
===================================================================
--- csw/mgar/pkg/postgresql/branches/postgresql-9.1-raos/Makefile	2012-01-02 10:59:12 UTC (rev 16644)
+++ csw/mgar/pkg/postgresql/branches/postgresql-9.1-raos/Makefile	2012-01-02 10:59:27 UTC (rev 16645)
@@ -1,5 +1,3 @@
-# Copyright 2009 OpenCSW
-# Distributed under the terms of the GNU General Public License v2
 # $Id$
 #
 # Note 1
@@ -76,17 +74,18 @@
 #    CSW$(NAME)$(BASE_VERSION_NODOT) for files that have slipped by and put
 #    them in the proper place.
 #
-# 8. Make sure the proper version numbers are used for the library packages.
 #
-#
 # Note 5: Development package
 # ------
 #
 # The development package is not versioned, i.e. named CSW$(NAME)-dev,
 # since we can only support one set of header files with a reasonable
 # amount of effort.
+#
+# Further, it does not use alternatives and puts binaries in $(bindir)
+# (see 'post-merge-modulated:'). This will make it easier for
+# maintainers to use `pg_config'.
 
-
 NAME = postgresql
 BASE_VERSION = 9.1
 VERSION_NODOT = $(subst .,_,$(BASE_VERSION))
@@ -110,6 +109,9 @@
 #
 # These variables control many aspects of the build
 #
+sysconfdir-suffix-64	= /64
+sysconfdir		= /etc/opt/csw$(sysconfdir-suffix-$(MEMORYMODEL))
+PGSYSCONFDIR		= $(sysconfdir)/$(NAME)/$(BASE_VERSION_NODOT)
 PGBINDIR		= $(libexecdir)/$(NAME)/$(BASE_VERSION_NODOT)
 PGSBINDIR		= $(libexecdir)/$(NAME)/$(BASE_VERSION_NODOT)
 PGDATADIR		= $(datadir)/$(NAME)/$(BASE_VERSION_NODOT)
@@ -233,14 +235,11 @@
 # These are the alternatives provided for the packages.  I use them in the
 # recipe to iterate over all possible alternatives (see 'post-merge:')
 #
-# Please note that these should correspond to the package suffices.
-myALTERNATIVES = server client dev contrib
+# Please note that these should correspond to the package suffixes.
+myALTERNATIVES = server client contrib
 
 POSTMSG = $(foreach n,$(myALTERNATIVES),\
-	$(if $(subst dev,,$(n)),\
-		$(docdir)/$(NAME)$(BASE_VERSION_NODOT)_$(n)/CSW$(NAME)$(BASE_VERSION_NODOT)-$(n).postmsg,\
-		$(docdir)/$(NAME)_$(n)/CSW$(NAME)-$(n).postmsg \
-	)\
+	$(docdir)/$(NAME)$(BASE_VERSION_NODOT)_$(n)/CSW$(NAME)$(BASE_VERSION_NODOT)-$(n).postmsg\
 )
 
 MASTER_SITES = http://ftp.postgresql.org/pub/source/v$(VERSION)/
@@ -372,8 +371,6 @@
 PKGFILES_CSW$(NAME)-dev += $(PKGFILES_DEVEL)
 PKGFILES_CSW$(NAME)-dev += $(foreach n,$(BIN_NAMES_DEVEL),.*$(n)$$)
 PKGFILES_CSW$(NAME)-dev += $(foreach n,$(BIN_NAMES_DEVEL),.*/man1/$(n)\.1$$)
-# Alternatives for -dev have no version appended
-PKGFILES_CSW$(NAME)-dev += .*/alternatives/$(NAME)_dev.*
 PKGFILES_CSW$(NAME)-dev += .*/CSW$(NAME)-dev.postmsg
 PKGFILES_CSW$(NAME)-dev += .*$(docdir)/$(NAME)_dev/README.CSW
 # See `post-merge-modulated:'
@@ -393,7 +390,9 @@
 CHECKPKG_OVERRIDES_CSW$(NAME)-dev += $(foreach i,$(NEEDED_ISAS), $(subst $(ISA_DEFAULT)/,,file-with-bad-content|/usr/local|root$(libdir)/$(i)/$(NAME)/$(BASE_VERSION_NODOT)/pgxs/src/Makefile.shlib) )
 # That's ok too, it's docbook stuff which we don't use in this build
 CHECKPKG_OVERRIDES_CSW$(NAME)-dev += $(foreach i,$(NEEDED_ISAS), $(subst $(ISA_DEFAULT)/,,file-with-bad-content|/usr/share|root$(libdir)/$(i)/$(NAME)/$(BASE_VERSION_NODOT)/pgxs/src/Makefile.global) )
-#ALTERNATIVES_CSW$(NAME)-dev = $(foreach i,$(NEEDED_ISAS), dev_$(i))
+# See `post-merge-modulated:' for those overrides
+CHECKPKG_OVERRIDES_CSWpostgresql-dev += discouraged-path-in-pkgmap|/opt/csw/lib/libpgport.a
+CHECKPKG_OVERRIDES_CSWpostgresql-dev += discouraged-path-in-pkgmap|/opt/csw/lib/$(ISA_DEFAULT64)/libpgport.a
 
 PACKAGES += CSW$(NAME)$(BASE_VERSION_NODOT)-doc
 ARCHALL_CSW$(NAME)$(BASE_VERSION_NODOT)-doc = 1
@@ -401,7 +400,6 @@
 PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-doc  = .*/doc/$(NAME)/$(BASE_VERSION_NODOT)/.*\.(html|css)
 PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-doc += .*/man5/.*
 
-
 PACKAGES += CSWlibecpg-compat3
 SPKG_DESC_CSWlibecpg-compat3 = PostgreSQL $(VERSION), libecpg_compat
 PKGFILES_CSWlibecpg-compat3  = $(call pkgfiles_lib,libecpg_compat.so.3)
@@ -452,7 +450,7 @@
 # supported, so IMHO, binaries should go to --libexecdir
 CONFIGURE_ARGS += --bindir=$(PGBINDIR)
 CONFIGURE_ARGS += --sbindir=$(PGSBINDIR)
-
+CONFIGURE_ARGS += --sysconfdir=$(PGSYSCONFDIR)
 CONFIGURE_ARGS += --datadir=$(PGDATADIR)
 CONFIGURE_ARGS += --localstatedir=$(PGDATA)
 CONFIGURE_ARGS += --with-includes=$(includedir)
@@ -472,7 +470,7 @@
 include gar/category.mk
 
 # If the check is not called from within the $(WORKSRC) dir, it
-# fails...
+# fails. This behavior appeared with version 9.1.
 test-custom:
 	cd $(WORKSRC) ; $(BUILD_ENV) gmake check
 	@$(MAKECOOKIE)
@@ -483,8 +481,6 @@
 # The uppercase_* variables are used to translate the lowercase
 # $(myALTERNATIVES) to uppercase.
 #
-# -dev is handled separately further below
-#
 # How it does create the alternatives:
 #
 # for pkg in $(myALTERNATIVES)
@@ -498,17 +494,13 @@
 #   end alt
 # end pkg
 #
-# The same approach is used for -dev, but the enclosing outer loop is
-# not used, and the alternatives are not having the BASE_VERSION_NODOT
-# to their file names appended.
-#
 # In the post-merge target, the alternatives are written to their
 # respective files
 
 uppercase_server = SERVER
 uppercase_client = CLIENT
 uppercase_contrib = CONTRIB
-$(foreach pkg,$(filter-out dev,$(myALTERNATIVES)),\
+$(foreach pkg,$(myALTERNATIVES),\
 	$(eval alt_priority = 20) \
 	$(foreach alt,$(NEEDED_ISAS), \
 		$(eval alt_priority=$(shell expr $(alt_priority) + 10)) \
@@ -516,28 +508,23 @@
 		$(eval ALTERNATIVE_$(pkg)_$(alt) += $(subst /$(ISA_DEFAULT)/,/,$(foreach n,$(wordlist 2,$(words $(BIN_NAMES_$(uppercase_$(pkg)))),$(BIN_NAMES_$(uppercase_$(pkg)))),$(bindir)/$(n)-$(BASE_VERSION_NODOT) $(NAME)$(BASE_VERSION_NODOT)-$(pkg) $(libexecdir)/$(alt)/$(NAME)/$(BASE_VERSION_NODOT)/$(n)))) \
 	)\
 )
-# Devel is handled separately, since it does not use
-# $(BASE_VERSION_NODOT)
-alt_priority = 20
-$(foreach alt,$(NEEDED_ISAS),\
-	$(eval alt_priority=$(shell expr $(alt_priority) + 10)) \
-	$(eval ALTERNATIVE_dev_$(alt) = $(subst /$(ISA_DEFAULT)/,/,$(foreach n,$(firstword $(BIN_NAMES_DEVEL)),$(bindir)/$(n) $(NAME)-dev $(libexecdir)/$(alt)/$(NAME)/$(BASE_VERSION_NODOT)/$(n))) $(alt_priority)) \
-	$(eval ALTERNATIVE_dev_$(alt) += $(subst /$(ISA_DEFAULT)/,/,$(foreach n,$(wordlist 2,$(words $(BIN_NAMES_DEVEL)),$(BIN_NAMES_DEVEL)),$(bindir)/$(n) $(NAME)-dev $(libexecdir)/$(alt)/$(NAME)/$(BASE_VERSION_NODOT)/$(n))))\
-)
 
 # We adjust the $(pkglibdir) found in $(WORKSRC)/src/Makefile.global.in, so
 # that it should be possible to install 8.x and 8.y concurrently
 pre-configure-modulated:
-	if [ -r $(WORKSRC)/src/Makefile.global.in ] ; then \
+	@echo " ===> Adjusting pkglibdir in $(WORKSRC)/src/Makefile.global.in"
+	@if [ -r $(WORKSRC)/src/Makefile.global.in ] ; then \
 		gsed -i -r -e 's|^(pkglibdir[[:space:]]*=[[:space:]]*)\$$\(libdir\).*$$|\1$$(libdir)/postgresql/$(BASE_VERSION_NODOT)|' $(WORKSRC)/src/Makefile.global.in ; \
 	fi
 	@$(MAKECOOKIE)
 
 post-build-modulated:
+	@echo " ===> Building contrib stuff"
 	$(BUILD_ENV) gmake -C $(WORKSRC)/contrib all
 	@$(MAKECOOKIE)
 
 post-install-modulated:
+	@echo " ===> Installing contrib stuff"
 	$(INSTALL_ENV) gmake -C $(WORKSRC)/contrib DESTDIR=$(DESTDIR) install
 	$(INSTALL_ENV) gmake -C $(WORKSRC) DESTDIR=$(DESTDIR) install-docs
 	@$(MAKECOOKIE)
@@ -547,19 +534,25 @@
 # lazzy to adjust the build system to generate one...
 post-merge-modulated:
 ifeq ($(ISA),$(ISA_DEFAULT64))
-	ginstall $(WORKSRC)/src/port/libpgport.a $(PKGROOT)/$(libpath_install)/$(ISA_DEFAULT64)/
+	ginstall $(WORKSRC)/src/port/libpgport.a $(PKGROOT)$(libpath_install)/$(ISA_DEFAULT64)/
 else
-	ginstall $(WORKSRC)/src/port/libpgport.a $(PKGROOT)/$(libdir)/
+	ginstall $(WORKSRC)/src/port/libpgport.a $(PKGROOT)$(libdir)/
 endif
+# Move the development binaries to the standard location
+	ginstall -d $(PKGROOT)$(bindir)/
+	for f in $(BIN_NAMES_DEVEL) ; do \
+		gmv -v $(PKGROOT)$(libexecdir)/$(NAME)/$(BASE_VERSION_NODOT)/$$f $(PKGROOT)$(bindir)/ ; \
+	done
 
 post-merge:  $(foreach n,$(POSTMSG),$(PKGROOT)/$(n)) test-installation
-# Create my alternatives files. Development alternatives have stripped
-# off the version
-	$(foreach a,$(myALTERNATIVES), $(foreach i,$(NEEDED_ISAS), $(shell ginstall -d $(PKGROOT)$(sharedstatedir)/alternatives ; echo "$(ALTERNATIVE_$(a)_$(i))" > $(if $(subst dev,,$(a)),$(PKGROOT)$(sharedstatedir)/alternatives/$(NAME)$(BASE_VERSION_NODOT)_$(a)_$(i),$(PKGROOT)$(sharedstatedir)/alternatives/$(NAME)_$(a)_$(i)) ) ) )
+# Create my alternatives files.
+	$(foreach a,$(myALTERNATIVES), $(foreach i,$(NEEDED_ISAS), $(info ===> Create alternative $(i) $(a)) $(shell ginstall -d $(PKGROOT)$(sharedstatedir)/alternatives ; echo "$(ALTERNATIVE_$(a)_$(i))" > $(PKGROOT)$(sharedstatedir)/alternatives/$(NAME)$(BASE_VERSION_NODOT)_$(a)_$(i) ) ) )
 # Create the PGDATA directory
-	ginstall -d $(PKGROOT)$(PGDATA)
+	@echo " ===> Create pgdata directory"
+	@ginstall -d $(PKGROOT)$(PGDATA)
 # Adjust the man page names.
-	for i in 1 5 ; do \
+	@echo " ===> Adjusting man page file names"
+	@for i in 1 5 ; do \
 		test -d $(PKGROOT)$(datadir)/man/man$$i || continue ; \
 		for f in $(PKGROOT)$(datadir)/man/man$$i/* ; do \
 			suffix="`echo $$f | awk 'BEGIN { FS="." } { print $$NF }'`" ; \
@@ -576,64 +569,73 @@
 		done ;\
 	done
 # Change path names in documentation
-	for f in $(PKGROOT)$(docdir)/$(NAME)/$(BASE_VERSION_NODOT)/html/*.html $(PKGROOT)$(mandir)/man1/*.1 $(PKGROOT)$(datadir)/$(NAME)/$(BASE_VERSION_NODOT)/*.sample ; do \
+	@echo " ===> Adjust path names in documentation"
+	@for f in $(PKGROOT)$(docdir)/$(NAME)/$(BASE_VERSION_NODOT)/html/*.html $(PKGROOT)$(mandir)/man1/*.1 $(PKGROOT)$(datadir)/$(NAME)/$(BASE_VERSION_NODOT)/*.sample ; do \
 		gsed -i -e 's|/usr/local/pgsql/data|$(localstatedir)/$(NAME)/$(BASE_VERSION_NODOT)|g' \
 			-e 's|/usr/local/pgsql/|$(prefix)/|g' \
 			-e 's|/usr/local|$(prefix)|g' \
 			-e 's|/usr/share|$(datadir)|g' $$f ; \
 	done
+	@echo " ===> Install postmsg"
 	$(foreach n,$(POSTMSG), $(shell ginstall -d $(PKGROOT)$(dir $(n))) $(shell ginstall $(WORKDIR)/$(notdir $(n)) $(PKGROOT)$(n)))
 	@$(MAKECOOKIE)
 
 pre-package:
 # The postinstall for the server package
-	ginstall $(WORKDIR)/$(SERVERPOSTINSTTMPL) $(WORKDIR)/$(SERVERPOSTINST_VERSIONED)
+	@echo " ===> Install postinstall script"
+	@ginstall $(WORKDIR)/$(SERVERPOSTINSTTMPL) $(WORKDIR)/$(SERVERPOSTINST_VERSIONED)
 # The usergroup file
-	ginstall -d $(PKGROOT)$(USERGROUPDIR)
-	ginstall $(WORKDIR)/$(USERGROUPFILETMPL) $(PKGROOT)$(USERGROUPDIR)/$(USERGROUPFILE_VERSIONED)
+	@echo " ===> Install usergroup file"
+	@ginstall -d $(PKGROOT)$(USERGROUPDIR)
+	@ginstall $(WORKDIR)/$(USERGROUPFILETMPL) $(PKGROOT)$(USERGROUPDIR)/$(USERGROUPFILE_VERSIONED)
 # The init script
-	ginstall -d $(PKGROOT)$(sysconfdir)/init.d
-	ginstall $(WORKDIR)/$(INITSCRIPTFILETMPL) $(PKGROOT)$(sysconfdir)/init.d/$(INITSCRIPTFILE_VERSIONED)
-	chmod 0755 $(PKGROOT)$(sysconfdir)/init.d/$(INITSCRIPTFILE_VERSIONED)
+	@echo " ===> Install init script"
+	@ginstall -d $(PKGROOT)$(sysconfdir)/init.d
+	@ginstall $(WORKDIR)/$(INITSCRIPTFILETMPL) $(PKGROOT)$(sysconfdir)/init.d/$(INITSCRIPTFILE_VERSIONED)
+	@chmod 0755 $(PKGROOT)$(sysconfdir)/init.d/$(INITSCRIPTFILE_VERSIONED)
 # The init script config
-	ginstall $(WORKDIR)/$(CSWPGSQLCONFFILETMPL) $(PKGROOT)$(sysconfdir)/$(CSWPGSQLCONFFILE_VERSIONED).CSW
+	@echo " ===> Install init script config"
+	@ginstall $(WORKDIR)/$(CSWPGSQLCONFFILETMPL) $(PKGROOT)$(sysconfdir)/$(CSWPGSQLCONFFILE_VERSIONED).CSW
 # Remove all the README.CSW, since they have not expanded the
 # variables, and copy only the one's we're interested in
-	for f in $(PKGROOT)$(docdir)/*/README.CSW ; do \
+	@echo " ===> Remove all README.CSW"
+	@for f in $(PKGROOT)$(docdir)/*/README.CSW ; do \
 		rm $$f ; \
 	done
-	for d in $(foreach n,$(subst dev,,$(myALTERNATIVES)),$(NAME)$(BASE_VERSION_NODOT)_$(n)) $(NAME)$(BASE_VERSION_NODOT) ; do \
+	@echo " ==> Install variable expanded README.CSW"
+	@for d in $(foreach n,$(myALTERNATIVES),$(NAME)$(BASE_VERSION_NODOT)_$(n)) $(NAME)$(BASE_VERSION_NODOT) ; do \
 		ginstall $(WORKDIR)/README.CSW $(PKGROOT)$(docdir)/$$d/ ; \
 	done
 	@$(MAKECOOKIE)
 
 $(foreach n,$(POSTMSG),$(PKGROOT)/$(n)):
-	ginstall -d $(dir $@)
-	@echo "Linking Post Messages"
-	ln $(DOWNLOADDIR)/$(notdir $@) $@
+	@echo " ===> Linking Post Messages"
+	@ginstall -d $(dir $@)
+	@ln $(DOWNLOADDIR)/$(notdir $@) $@
 
 $(foreach n,$(POSTMSG),$(DOWNLOADDIR)/$(notdir $(n))):
-	@echo " ==> Generating $(notdir $@)"
-	echo "" > $@
-	echo "---" >> $@
-	echo "" >> $@
-	echo "There are 32bit and 64bit versions of $(NAME) $(VERSION) binaries on the system installed:" >> $@
-	echo "" >> $@
-	echo "You can easily select between the versions with the alternatives(8)" >> $@
-	echo "system by executing" >> $@
-	echo "" >> $@
-	echo "  /opt/csw/sbin/alternatives --config $(subst .postmsg,,$(subst CSW,,$(notdir $@)))" >> $@
-	echo "" >> $@
-	echo "See http://www.opencsw.org/packages/alternatives for details." >> $@
-	echo "" >> $@
-	echo "---" >> $@
-	echo "" >> $@
+	@echo " ===> Generating $(notdir $@)"
+	@echo "" > $@
+	@echo "---" >> $@
+	@echo "" >> $@
+	@echo "There are 32bit and 64bit versions of $(NAME) $(VERSION) binaries on the system installed:" >> $@
+	@echo "" >> $@
+	@echo "You can easily select between the versions with the alternatives(8)" >> $@
+	@echo "system by executing" >> $@
+	@echo "" >> $@
+	@echo "  /opt/csw/sbin/alternatives --config $(subst .postmsg,,$(subst CSW,,$(notdir $@)))" >> $@
+	@echo "" >> $@
+	@echo "See http://www.opencsw.org/packages/alternatives for details." >> $@
+	@echo "" >> $@
+	@echo "---" >> $@
+	@echo "" >> $@
 	@$(MAKECOOKIE)
 
 test-installation:
 # Check if all binaries and libraries defined in the variables
 # BIN_NAMES_* and SO_NAMES_* are there
-	for n in $(BIN_NAMES_SERVER) $(BIN_NAMES_DEVEL) $(BIN_NAMES_CLIENT) $(BIN_NAMES_CONTRIB) ; do \
+	@echo " ===> Checking for extra binaries in BIN_NAMES_*"
+	@for n in $(BIN_NAMES_SERVER) $(BIN_NAMES_CLIENT) $(BIN_NAMES_CONTRIB) ; do \
 		if [ -f $(PKGROOT)$(PGBINDIR)/$$n ] ; then\
 			: ; \
 		else \
@@ -641,7 +643,8 @@
 			exit 1 ; \
 		fi ; \
 	done
-	for n in $(SO_NAMES_SERVER) $(SO_NAMES_CONTRIB) ; do \
+	@echo " ===> Checking for extra libraries in SO_NAMES_*"
+	@for n in $(SO_NAMES_SERVER) $(SO_NAMES_CONTRIB) ; do \
 		if [ -f $(PKGROOT)$(libdir)/$(NAME)/$(BASE_VERSION_NODOT)/$$n ] ; then\
 			: ; \
 		else \
@@ -649,7 +652,8 @@
 			exit 1 ; \
 		fi ; \
 	done
-	for n in $(EXT_NAMES_SERVER) $(EXT_NAMES_CONTRIB) ; do \
+	@echo " ===> Checking for extra extensions in EXT_NAMES_*"
+	@for n in $(EXT_NAMES_SERVER) $(EXT_NAMES_CONTRIB) ; do \
 		if [ -f $(PKGROOT)$(sharedstatedir)/$(NAME)/$(BASE_VERSION_NODOT)/extension/$$n ] ; then\
 			: ; \
 		else \
@@ -659,30 +663,33 @@
 	done
 # Check if all binaries and libraries in the pkgroot are contained in
 # the respective recipe variables.
-	for n in `gfind $(PKGROOT)$(PGBINDIR) -maxdepth 1 -type f` ; do \
-		echo "$(BIN_NAMES_SERVER) $(BIN_NAMES_DEVEL) $(BIN_NAMES_CLIENT) $(BIN_NAMES_CONTRIB)" | grep `basename $$n` >/dev/null 2>&1 ; \
+	@echo " ===> Checking for missing binaries in BIN_NAMES_*"
+	@for n in `gfind $(PKGROOT)$(PGBINDIR) -maxdepth 1 -type f` ; do \
+		echo "$(BIN_NAMES_SERVER) $(BIN_NAMES_CLIENT) $(BIN_NAMES_CONTRIB)" | grep `basename $$n` >/dev/null 2>&1 ; \
 		if [ $$? -eq 0 ] ; then \
 			: ; \
 		else \
-			echo "Binary `basename $$n` not defined in recipe" ; \
+			echo "Binary `basename $$n` not defined" ; \
 			exit 1 ; \
 		fi ; \
 	done
-	for n in `gfind $(PKGROOT)$(libdir)/$(NAME)/$(BASE_VERSION_NODOT) -maxdepth 1 -type f` ; do \
+	@echo " ===> Checking for missing binaries in SO_NAMES_*"
+	@for n in `gfind $(PKGROOT)$(libdir)/$(NAME)/$(BASE_VERSION_NODOT) -maxdepth 1 -type f` ; do \
 		echo "$(SO_NAMES_SERVER) $(SO_NAMES_CONTRIB)" | grep `basename $$n` >/dev/null 2>&1 ; \
 		if [ $$? -eq 0 ] ; then \
 			: ; \
 		else \
-			echo "Library `basename $$n` not defined in recipe" ; \
+			echo "Library `basename $$n` not defined" ; \
 			exit 1 ; \
 		fi ; \
 	done
-	for n in `gfind $(PKGROOT)$(sharedstatedir)/$(NAME)/$(BASE_VERSION_NODOT)/extension -maxdepth 1 -type f` ; do \
+	@echo " ===> Checking for missing extensions in EXT_NAMES_*"
+	@for n in `gfind $(PKGROOT)$(sharedstatedir)/$(NAME)/$(BASE_VERSION_NODOT)/extension -maxdepth 1 -type f` ; do \
 		echo "$(EXT_NAMES_SERVER) $(EXT_NAMES_CONTRIB)" | grep `basename $$n` >/dev/null 2>&1 ; \
 		if [ $$? -eq 0 ] ; then \
 			: ; \
 		else \
-			echo "Extension `basename $$n` not defined in recipe" ; \
+			echo "Extension `basename $$n` not defined" ; \
 			exit 1 ; \
 		fi ; \
 	done

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


From cgrzemba at users.sourceforge.net  Mon Jan  2 13:54:00 2012
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Mon, 02 Jan 2012 12:54:00 +0000
Subject: [csw-devel] SF.net SVN: gar:[16646]
	csw/mgar/pkg/mozldap/trunk/Makefile
Message-ID: <E1RhhOq-0004qx-5l@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 16646
          http://gar.svn.sourceforge.net/gar/?rev=16646&view=rev
Author:   cgrzemba
Date:     2012-01-02 12:53:59 +0000 (Mon, 02 Jan 2012)
Log Message:
-----------
mozldap/trunk: unset CPPFLAGS because contention with openldap includes

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

Modified: csw/mgar/pkg/mozldap/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mozldap/trunk/Makefile	2012-01-02 10:59:27 UTC (rev 16645)
+++ csw/mgar/pkg/mozldap/trunk/Makefile	2012-01-02 12:53:59 UTC (rev 16646)
@@ -23,6 +23,7 @@
 
 PACKAGING_PLATFORMS += solaris10-sparc
 # PACKAGING_PLATFORMS += solaris10-i386
+GARCOMPILER = SOS12U2
 
 PACKAGES += CSWlibldap60
 CATALOGNAME_CSWlibldap60 = libldap60
@@ -120,14 +121,17 @@
 CONFIGURE_ARGS_OPT += --enable-optimize="-xO3"
 CONFIGURE_ARGS_OPT += --disable-debug
 CONFIGURE_ARGS_OPT += --enable-strip
-CONFIGURE_ARGS_OPT += --with-nss-inc=$(includedir)/nss
+CONFIGURE_ARGS_OPT += --with-nss-inc=$(prefix)/include/nss
 CONFIGURE_ARGS_OPT += --with-nss-lib=$(libdir)
-CONFIGURE_ARGS_OPT += --with-nspr-inc=$(includedir)/nspr
+CONFIGURE_ARGS_OPT += --with-nspr-inc=$(prefix)/include/nspr
 CONFIGURE_ARGS_OPT += --with-nspr-lib=$(libdir)
-CONFIGURE_ARGS_OPT += --with-svrcore-inc=$(includedir)/nspr
+CONFIGURE_ARGS_OPT += --with-svrcore-inc=$(prefix)/include/nspr
 CONFIGURE_ARGS_OPT += --with-svrcore-lib=$(libdir)
 CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARFLAVOR))
+CONFIGURE_ARGS_OPT += --includedir=$(prefix)/include/ldap
 
+CPPFLAGS=
+
 CONFIGURE_SCRIPTS = c-sdk
 BUILD_SCRIPTS = c-sdk
 INSTALL_SCRIPTS = c-sdk

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 Jan  2 17:17:46 2012
From: opk at users.sourceforge.net (opk at users.sourceforge.net)
Date: Mon, 02 Jan 2012 16:17:46 +0000
Subject: [csw-devel] SF.net SVN: gar:[16647] csw/mgar/pkg/nmh/trunk
Message-ID: <E1Rhka2-0008GA-1t@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 16647
          http://gar.svn.sourceforge.net/gar/?rev=16647&view=rev
Author:   opk
Date:     2012-01-02 16:17:45 +0000 (Mon, 02 Jan 2012)
Log Message:
-----------
update nmh to 1.4

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

Modified: csw/mgar/pkg/nmh/trunk/Makefile
===================================================================
--- csw/mgar/pkg/nmh/trunk/Makefile	2012-01-02 12:53:59 UTC (rev 16646)
+++ csw/mgar/pkg/nmh/trunk/Makefile	2012-01-02 16:17:45 UTC (rev 16647)
@@ -1,6 +1,6 @@
 # $Id$
 NAME = nmh
-VERSION = 1.3
+VERSION = 1.4
 CATEGORIES = apps
 
 DESCRIPTION = Powerful electronic mail handling system
@@ -20,6 +20,7 @@
 RUNTIME_DEP_PKGS += CSWiconv
 PATCHFILES += 0000-skip-chgrp-of-inc.patch
 LICENSE = COPYRIGHT
+PRESERVECONF = /opt/csw/etc/nmh/mts.conf
 
 CONFIGURE_ARGS = --enable-pop --enable-masquerade='' --with-mts=sendmail \
   --prefix=$(prefix) --mandir=$(mandir) --datadir=$(datadir)/nmh \

Modified: csw/mgar/pkg/nmh/trunk/checksums
===================================================================
--- csw/mgar/pkg/nmh/trunk/checksums	2012-01-02 12:53:59 UTC (rev 16646)
+++ csw/mgar/pkg/nmh/trunk/checksums	2012-01-02 16:17:45 UTC (rev 16647)
@@ -1 +1 @@
-a52d1f93e780d7a045207451ce6c9a4e  nmh-1.3.tar.gz
+ef55286a821c53dc52b8974977c011ca  nmh-1.4.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  Mon Jan  2 17:34:20 2012
From: opk at users.sourceforge.net (opk at users.sourceforge.net)
Date: Mon, 02 Jan 2012 16:34:20 +0000
Subject: [csw-devel] SF.net SVN: gar:[16648] csw/mgar/pkg/nmh/trunk/Makefile
Message-ID: <E1Rhkq4-00004w-G3@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 16648
          http://gar.svn.sourceforge.net/gar/?rev=16648&view=rev
Author:   opk
Date:     2012-01-02 16:34:20 +0000 (Mon, 02 Jan 2012)
Log Message:
-----------
update nmh dependencies as suggested by checkpkg

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

Modified: csw/mgar/pkg/nmh/trunk/Makefile
===================================================================
--- csw/mgar/pkg/nmh/trunk/Makefile	2012-01-02 16:17:45 UTC (rev 16647)
+++ csw/mgar/pkg/nmh/trunk/Makefile	2012-01-02 16:34:20 UTC (rev 16648)
@@ -17,7 +17,7 @@
 SPKG_SOURCEURL = http://www.nongnu.org/nmh/
 UFILES_REGEX = -(\d+(?:\.\d+)*).tar.gz
 
-RUNTIME_DEP_PKGS += CSWiconv
+RUNTIME_DEP_PKGS += CSWlibiconv2
 PATCHFILES += 0000-skip-chgrp-of-inc.patch
 LICENSE = COPYRIGHT
 PRESERVECONF = /opt/csw/etc/nmh/mts.conf

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


From phipsy at users.sourceforge.net  Mon Jan  2 18:25:45 2012
From: phipsy at users.sourceforge.net (phipsy at users.sourceforge.net)
Date: Mon, 02 Jan 2012 17:25:45 +0000
Subject: [csw-devel] SF.net SVN: gar:[16649] csw/mgar/pkg/augeas/trunk
Message-ID: <E1Rhldp-0000xD-8t@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 16649
          http://gar.svn.sourceforge.net/gar/?rev=16649&view=rev
Author:   phipsy
Date:     2012-01-02 17:25:44 +0000 (Mon, 02 Jan 2012)
Log Message:
-----------
augeas: let's see if we can get this to actually build

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

Added Paths:
-----------
    csw/mgar/pkg/augeas/trunk/files/0001-fix-compiling-on-solaris.patch

Removed Paths:
-------------
    csw/mgar/pkg/augeas/trunk/files/0001-fix-0.10.0-to-compile-on-solaris.patch
    csw/mgar/pkg/augeas/trunk/files/0002-second-aattempt-at-getting-it-to-build-on-solaris.patch

Modified: csw/mgar/pkg/augeas/trunk/Makefile
===================================================================
--- csw/mgar/pkg/augeas/trunk/Makefile	2012-01-02 16:34:20 UTC (rev 16648)
+++ csw/mgar/pkg/augeas/trunk/Makefile	2012-01-02 17:25:44 UTC (rev 16649)
@@ -19,8 +19,7 @@
 RUNTIME_DEP_PKGS += CSWlibreadline6 CSWlibxml2-2
 GARCOMPILER = GCC4
 EXTRA_LDFLAGS = -lgnugetopt
-PATCHFILES += 0001-fix-0.10.0-to-compile-on-solaris.patch
-PATCHFILES += 0002-second-aattempt-at-getting-it-to-build-on-solaris.patch
+PATCHFILES += 0001-fix-compiling-on-solaris.patch
 
 # Building on Solaris 10 doesn't work as it support C99 and the above fixes are
 # not necessary there.

Deleted: csw/mgar/pkg/augeas/trunk/files/0001-fix-0.10.0-to-compile-on-solaris.patch
===================================================================
--- csw/mgar/pkg/augeas/trunk/files/0001-fix-0.10.0-to-compile-on-solaris.patch	2012-01-02 16:34:20 UTC (rev 16648)
+++ csw/mgar/pkg/augeas/trunk/files/0001-fix-0.10.0-to-compile-on-solaris.patch	2012-01-02 17:25:44 UTC (rev 16649)
@@ -1,25 +0,0 @@
-From 025a79fcbf0c7bcb8a99e7c0444d1e4aac439200 Mon Sep 17 00:00:00 2001
-From: Mark Phillips <none at none>
-Date: Fri, 16 Dec 2011 14:15:23 +0100
-Subject: [PATCH] fix 0.10.0 to compile on solaris
-
----
- src/regexp.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/regexp.c b/src/regexp.c
-index cf0ea5d..811087d 100644
---- a/src/regexp.c
-+++ b/src/regexp.c
-@@ -50,7 +50,7 @@ char *regexp_escape(const struct regexp *r) {
-     ret = fa_restrict_alphabet(r->pattern->str, strlen(r->pattern->str),
-                                &nre, &nre_len, 2, 1);
-     if (ret == 0) {
--        pat = escape(nre, nre_len);
-+        pat = escape(nre, nre_len, RX_ESCAPES);
-         free(nre);
-     }
- #endif
--- 
-1.7.6.1
-

Added: csw/mgar/pkg/augeas/trunk/files/0001-fix-compiling-on-solaris.patch
===================================================================
--- csw/mgar/pkg/augeas/trunk/files/0001-fix-compiling-on-solaris.patch	                        (rev 0)
+++ csw/mgar/pkg/augeas/trunk/files/0001-fix-compiling-on-solaris.patch	2012-01-02 17:25:44 UTC (rev 16649)
@@ -0,0 +1,6169 @@
+From b0f9124974aacc33de9a86950ab148135c6bb78d Mon Sep 17 00:00:00 2001
+From: Mark Phillips <none at none>
+Date: Mon, 2 Jan 2012 18:22:44 +0100
+Subject: [PATCH] fix compiling on solaris
+
+---
+ ChangeLog                              |  596 ++++++++++++----------
+ Makefile.in                            |    2 +
+ aclocal.m4                             |  452 +-----------------
+ build/aux/config.guess                 |  858 ++++++++++++++++++--------------
+ build/aux/config.sub                   |  347 ++++++++++---
+ config.h.in                            |   12 +
+ configure                              |  181 +++++++-
+ doc/Makefile.in                        |    2 +
+ doc/naturaldocs/Makefile.in            |    2 +
+ examples/Makefile.in                   |    2 +
+ gnulib/lib/Makefile.am                 |   20 +-
+ gnulib/lib/Makefile.in                 |   27 +-
+ gnulib/m4/gnulib-comp.m4               |   22 +
+ gnulib/tests/Makefile.am               |   16 +
+ gnulib/tests/Makefile.in               |  118 +++--
+ gnulib/tests/test-readlink.h           |    2 +-
+ man/Makefile.in                        |    2 +
+ man/augparse.1                         |    2 +-
+ src/Makefile.in                        |    2 +
+ src/regexp.c                           |    2 +-
+ tests/Makefile.in                      |    2 +
+ tests/root/etc/crontab                 |    2 -
+ tests/root/etc/squirrelmail/config.php |    2 -
+ 23 files changed, 1419 insertions(+), 1254 deletions(-)
+ delete mode 100644 tests/root/etc/crontab
+ delete mode 100644 tests/root/etc/squirrelmail/config.php
+
+diff --git a/ChangeLog b/ChangeLog
+index a7764d4..e93e7a5 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,3 +1,7 @@
++2011-12-02  David Lutterkort  <lutter at redhat.com>
++
++	Version 0.10.0
++
+ 2011-12-02  Dominic Cleal  <dcleal at redhat.com>
+ 
+ 	Implement escape sequences for whitespace, quotes and square brackets in command arguments to match Puppet provider.
+@@ -19,7 +23,7 @@
+ 
+ 	Add documentation to test_aliases.aug
+ 
+-2011-12-01  David Lutterkort  <lutter at redhat.com>
++2011-12-02  David Lutterkort  <lutter at redhat.com>
+ 
+ 	* src/augtool.c (print_aug_error): print newline after error details
+ 
+@@ -56,6 +60,8 @@
+ 	  * src/augtool.c: call aug_init with AUG_NO_ERR_CLOSE and print errors on
+ 	    initialization failure
+ 
++2011-12-01  David Lutterkort  <lutter at redhat.com>
++
+ 	Update documentation for augtool/augrun and man page
+ 
+ 	Adjust more copyright notices
+@@ -115,32 +121,32 @@
+ 
+ 	Better integration of tests in NaturalDocs, verbatim code display in doc.
+ 
+-2011-11-30  Rapha?l Pinson  <raphink at gmail.com>
+-
+ 	Add unit tests for aug_to_xml
+ 
++2011-11-30  Rapha?l Pinson  <raphink at gmail.com>
++
+ 	libaugeas must now be linked to libxml, too.
+ 
+ 2011-11-30  Dominic Cleal  <dcleal at redhat.com>
+ 
+ 	* augeas.spec.in: add build req on libxml2-devel
+ 
+-2011-11-29  Rapha?l Pinson  <raphink at gmail.com>
++2011-11-30  Rapha?l Pinson  <raphink at gmail.com>
+ 
+ 	Add an Examples section to reprepro_uploaders.aug's header
+ 
+ 	ARG_CHECK errors when condition is met. Invert conditions in aug_to_xml.
+ 
+-2011-11-29  Francis Giraldeau  <francis.giraldeau at gmail.com>
++2011-11-30  Francis Giraldeau  <francis.giraldeau at gmail.com>
+ 
+ 	Sudoers: add more parameter flags/options
+ 	Fixes bug #143
+ 
+-2011-11-29  Rapha?l Pinson  <raphink at gmail.com>
++2011-11-30  Rapha?l Pinson  <raphink at gmail.com>
+ 
+ 	Add aug_to_xml to public API
+ 
+-2011-11-29  David Lutterkort  <lutter at redhat.com>
++2011-11-30  David Lutterkort  <lutter at redhat.com>
+ 
+ 	New error code AUG_EBADARG and ARG_CHECK macro
+ 	Use ARG_CHECK to check arguments passed through the public API for
+@@ -175,7 +181,7 @@
+ 
+ 	Improve CSS for NaturalDocs
+ 
+-2011-11-28  Dominic Cleal  <dcleal at redhat.com>
++2011-11-29  Dominic Cleal  <dcleal at redhat.com>
+ 
+ 	augtool: change readline tab completion to be context-aware
+ 
+@@ -184,10 +190,12 @@
+ 	changing relative paths into absolute paths.  The context is stored in
+ 	/augeas/context and defaults to the value "/files".
+ 
+-2011-11-28  David Lutterkort  <lutter at redhat.com>
++2011-11-29  David Lutterkort  <lutter at redhat.com>
+ 
+ 	* src/transform.c (load_file): fix segfault when storing span in NULL tree
+ 
++2011-11-28  David Lutterkort  <lutter at redhat.com>
++
+ 	* src/syntax.c (print_tree): print something for a NULL tree
+ 
+ 2011-11-28  Rapha?l Pinson  <raphink at gmail.com>
+@@ -218,8 +226,6 @@
+ 
+ 	Add elif support to shellvars.aug
+ 
+-2011-11-22  Rapha?l Pinson  <raphink at gmail.com>
+-
+ 	Add big WARNING to aptconf.aug
+ 
+ 	Register modules.aug with naturaldocs
+@@ -260,12 +266,12 @@
+ 
+ 	Refactor modprobe.aug: * Parse commands in install/remove stanzas; * Drop support for include as it is not documented in manpages and no unit tests are shipped.
+ 
+-2011-11-21  Rapha?l Pinson  <raphink at gmail.com>
+-
+ 	Fix unpriviliged into unpriviliged in test_postfix_master.aug, too.
+ 
+ 	Add one-liner unit test for shellvars.aug
+ 
++2011-11-21  Rapha?l Pinson  <raphink at gmail.com>
++
+ 	shellvars.aug: Refactor lens, add end-of-line comment support, if/then/else/fi conditionals, one-liners support
+ 
+ 	phpvars.aug: Add test for bash-style comment, improve eol comments, use generic_function in simple_function definition
+@@ -337,7 +343,7 @@
+ 
+ 	Fix origin entries in aptpreferences.aug
+ 
+-2011-11-15  Dominic Cleal  <dcleal at redhat.com>
++2011-11-16  Dominic Cleal  <dcleal at redhat.com>
+ 
+ 	Resolv: Permit end-of-line comments
+ 	Fixes ticket #223
+@@ -345,15 +351,15 @@
+ 	Krb5: Allow a [pam] section for pam_krb5 (possibly deprecated)
+ 	Fixes ticket #225
+ 
+-2011-11-15  Roman Rakus  <rrakus at redhat.com>
++2011-11-16  Roman Rakus  <rrakus at redhat.com>
+ 
+ 	Kdump: new lens and tests
+ 
+-2011-11-15  Dominic Cleal  <dcleal at redhat.com>
++2011-11-16  Dominic Cleal  <dcleal at redhat.com>
+ 
+ 	aug_srun: add 'insert' and 'move' command aliases to 'ins' and 'mv'
+ 
+-2011-11-15  Michael Chapman  <mike at very.puzzling.org>
++2011-11-16  Michael Chapman  <mike at very.puzzling.org>
+ 
+ 	Dhcpd: slashes must be double-quoted
+ 	In dhcpd.conf, tokens containing slashes must be double-quoted.
+@@ -381,7 +387,7 @@
+ 	RHEL 5 uses /etc/dhcpd.conf.
+ 	RHEL 6 uses /etc/dhcp/dhcpd.conf.
+ 
+-2011-11-15  David Lutterkort  <lutter at redhat.com>
++2011-11-16  David Lutterkort  <lutter at redhat.com>
+ 
+ 	Mdadm: use case-insensitive regexps
+ 
+@@ -393,15 +399,15 @@
+ 	totalize used to create transitions into the crash state that did
+ 	transition on upper case letters, violating the convention.
+ 
+-2011-11-13  David Lutterkort  <lutter at redhat.com>
++2011-11-14  David Lutterkort  <lutter at redhat.com>
+ 
+ 	* src/builtin.c (regexp_match): new helper to test a regexp
+ 
+-2011-11-13  Matthew Booth  <mbooth at redhat.com>
++2011-11-14  Matthew Booth  <mbooth at redhat.com>
+ 
+ 	Mdadm_conf: new lens for /etc/mdadm.conf
+ 
+-2011-11-13  David Lutterkort  <lutter at redhat.com>
++2011-11-14  David Lutterkort  <lutter at redhat.com>
+ 
+ 	* lenses/tests/test_iptables.aug: fix syntax error
+ 
+@@ -591,7 +597,7 @@
+ 
+ 	Add functionalities, refactor volume by type of disk_config entry and add tests to fai_diskconfig.aug
+ 
+-2011-09-01  David Lutterkort  <lutter at redhat.com>
++2011-09-02  David Lutterkort  <lutter at redhat.com>
+ 
+ 	* src/pathx.c (nodeset_as_regexp): match nothing if nodeset is empty
+ 	This makes sure that constructs like 'glob(no_such_node)' or
+@@ -604,8 +610,6 @@
+ 	This patch fixes autosave in the case only one command is provided as
+ 	arguments and adds a test that checks proper handling of this case.
+ 
+-2011-08-31  Francis Giraldeau  <francis.giraldeau at gmail.com>
+-
+ 	Disable autoload transform for the fai_diskconfig
+ 	Autoload transform with only standard exclude makes failing the glob_for_lens
+ 	xpath test. fai_diskconfig does this. As a temporary fix, we disable transform
+@@ -665,19 +669,21 @@
+ 	Spacevars: rename toplevel lens to lns
+ 	Leave simple_lns as an alias for backwards compatibility
+ 
+-2011-08-08  David Lutterkort  <lutter at redhat.com>
++2011-08-09  David Lutterkort  <lutter at redhat.com>
+ 
+ 	* examples/fadot.c: accept -h option to print usage
+ 
+-2011-07-25  David Lutterkort  <lutter at redhat.com>
++2011-07-26  David Lutterkort  <lutter at redhat.com>
+ 
+ 	.gitignore: ignore tests/test-run
+ 
+ 	Version 0.9.0
+ 
++2011-07-25  David Lutterkort  <lutter at redhat.com>
++
+ 	Minor fixes to make distcheck pass
+ 
+-2011-07-22  David Lutterkort  <lutter at redhat.com>
++2011-07-23  David Lutterkort  <lutter at redhat.com>
+ 
+ 	path expressions: parse [expr1 or expr2] correctly
+ 	Since commit ea010d85, we would interpret the predicate [e1 or e2] as
+@@ -687,6 +693,8 @@
+ 
+ 	Of course, this is a heinous hack.
+ 
++2011-07-22  David Lutterkort  <lutter at redhat.com>
++
+ 	Migrate tests from test-mv.sh into run.tests
+ 
+ 	aug_srun: new API call
+@@ -705,12 +713,12 @@
+ 
+ 	Aliases: allow spaces and commas in aliases; add docs
+ 
+-2011-07-11  Dominic Cleal  <dcleal at redhat.com>
++2011-07-12  Dominic Cleal  <dcleal at redhat.com>
+ 
+ 	Sudoers: support users:groups format in a Runas_Spec line for sudo -g
+ 	Fixes ticket #211
+ 
+-2011-07-11  David Lutterkort  <lutter at redhat.com>
++2011-07-12  David Lutterkort  <lutter at redhat.com>
+ 
+ 	* tests/test-bug-1.sh: fix test
+ 	The test caused an augtool failure for all the wrong reasons
+@@ -780,10 +788,12 @@
+ 
+ 	* examples/fadot.c: include <config.h>, link against GNULIB
+ 
+-2011-05-10  David Lutterkort  <lutter at redhat.com>
++2011-05-11  David Lutterkort  <lutter at redhat.com>
+ 
+ 	tests: expand what the valgrind target runs
+ 
++2011-05-10  David Lutterkort  <lutter at redhat.com>
++
+ 	* src/pathx.c: rename CHECK_ERROR{,_RET0} to RET{,0}_ON_ERROR
+ 	This should make it harder to misuse them and cause memory leaks
+ 
+@@ -838,10 +848,12 @@
+ 
+ 	Fixes BZ 700608
+ 
+-2011-04-15  David Lutterkort  <lutter at redhat.com>
++2011-04-16  David Lutterkort  <lutter at redhat.com>
+ 
+ 	Version 0.8.1
+ 
++2011-04-15  David Lutterkort  <lutter at redhat.com>
++
+ 	Iptables: handle --tcp-flags
+ 	Fixes bug #157
+ 
+@@ -891,8 +903,6 @@
+ 	Httpd: include /etc/httpd/conf/httpd.conf used on Fedora/RHEL
+ 	Fixes https://bugzilla.redhat.com/show_bug.cgi?id=688149
+ 
+-2011-03-22  David Lutterkort  <lutter at redhat.com>
+-
+ 	* src/lexer.l: fix a few compilation warnings
+ 
+ 	Eliminate global variable 'comment_depth' in lexer
+@@ -910,7 +920,7 @@
+ 
+ 	Add support for #includedir in sudoers.aug and test (ticket #188)
+ 
+-2011-03-17  Francis Giraldeau  <francis.giraldeau at gmail.com>
++2011-03-18  Francis Giraldeau  <francis.giraldeau at gmail.com>
+ 
+ 	Support sudoers in nsswitch.aug
+ 	nsswitch.conf support a configuration item to specify database backend, this
+@@ -938,7 +948,7 @@
+ 
+ 	Add FreeBSD /etc/rc.conf file to Shellvars lens.
+ 
+-2011-03-15  David Lutterkort  <lutter at redhat.com>
++2011-03-16  David Lutterkort  <lutter at redhat.com>
+ 
+ 	Replace erroneous assert(0) with proper error report
+ 	  * src/put.c (create_union): report an error to the user if none of the
+@@ -973,7 +983,7 @@
+ 	  * src/try: read commands from build/augcmds.txt rather than /tmp; use a
+ 	    more sensible default if augcmds.txt does not exist
+ 
+-2011-03-03  Matthew Booth  <mbooth at redhat.com>
++2011-03-04  Matthew Booth  <mbooth at redhat.com>
+ 
+ 	Use getopt-gnu from gnulib for AIX support
+ 
+@@ -1007,7 +1017,7 @@
+ 
+ 	Changes in nrpe.aug Remove wrong ^ in comment regex Use Util.comment_generic Use generic modules Improve NaturalDocs documentation
+ 
+-2011-02-23  David Lutterkort  <lutter at redhat.com>
++2011-02-24  David Lutterkort  <lutter at redhat.com>
+ 
+ 	Version 0.8.0
+ 
+@@ -1026,7 +1036,7 @@
+ 
+ 	Split Solaris multiboot argument for the kernel path into @path node (ticket #158)
+ 
+-2011-02-22  Francis Giraldeau  <francis.giraldeau at gmail.com>
++2011-02-23  Francis Giraldeau  <francis.giraldeau at gmail.com>
+ 
+ 	Add aug_span API function V2
+ 	aug_span API function provides information about the node of the specified
+@@ -1067,7 +1077,7 @@
+ 
+ 	Allow indentation for "iface" entries in interfaces.aug (Fix ticket #182) Add unit test for "iface" indentation
+ 
+-2011-02-16  Francis Giraldeau  <francis.giraldeau at gmail.com>
++2011-02-17  Francis Giraldeau  <francis.giraldeau at gmail.com>
+ 
+ 	Minor code format cleanup
+ 	  * Cut long lines to 80 chars
+@@ -1081,7 +1091,7 @@
+ 
+ 	Add comment_c_style and comment_multiline Add empty_generic and make empty a call to it Add empty_c_style to complement comment_c_style
+ 
+-2011-02-15  Francis Giraldeau  <francis.giraldeau at gmail.com>
++2011-02-16  Francis Giraldeau  <francis.giraldeau at gmail.com>
+ 
+ 	Fix segfault in get.c with L_MAYBE lens (bug#180)
+ 	When a L_MAYBE lens was the last child of a L_CONCAT inside a L_SUBTREE, then
+@@ -1100,17 +1110,17 @@
+ 
+ 	Improve vim syntax file
+ 
+-2011-02-14  David Lutterkort  <lutter at redhat.com>
++2011-02-15  David Lutterkort  <lutter at redhat.com>
+ 
+ 	man pages: update man page for augtool
+ 
+-2011-02-14  Rapha?l Pinson  <raphink at gmail.com>
++2011-02-15  Rapha?l Pinson  <raphink at gmail.com>
+ 
+ 	augtool: add --interactive option
+ 	This option runs an interactive shell after evaluating STDIN or an explicit
+ 	inputfile
+ 
+-2011-02-14  David Lutterkort  <lutter at redhat.com>
++2011-02-15  David Lutterkort  <lutter at redhat.com>
+ 
+ 	Mysql: change default comment delimiter from ';' to '#'
+ 	Fixes bug #181 reported by devzero
+@@ -1137,7 +1147,7 @@
+ 	* Allow directives without arguments in httpd.aug
+ 	* Adjust test_httpd.aug to test argument-less directives
+ 
+-2011-01-25  Francis Giraldeau  <francis.giraldeau at gmail.com>
++2011-01-26  Francis Giraldeau  <francis.giraldeau at gmail.com>
+ 
+ 	Fix httpd.aug doc, filter and add to checks
+ 	  * Added other contributors to authors
+@@ -1156,16 +1166,16 @@
+ 	are separated by spaces and it raises ambiguity when using unquoting. The lens
+ 	doesn't support either long lines splitted by backslash.
+ 
+-2011-01-25  David Lutterkort  <lutter at redhat.com>
++2011-01-26  David Lutterkort  <lutter at redhat.com>
+ 
+ 	* src/pathx.c (store_error): make sure pos_str is always NUL terminated
+ 	Fixes bug #178
+ 
+-2011-01-19  Fred  <frederic.lespez at free.fr>
++2011-01-20  Fred  <frederic.lespez at free.fr>
+ 
+ 	PuppetFileserver: new lens for Puppet's fileserver.conf
+ 
+-2011-01-19  David Lutterkort  <lutter at redhat.com>
++2011-01-20  David Lutterkort  <lutter at redhat.com>
+ 
+ 	* man/augtool.pod: fix typos
+ 	Fixes https://bugzilla.redhat.com/show_bug.cgi?id=628502
+@@ -1178,7 +1188,7 @@
+ 	  * src/pathx.c (coerce_to_bool, eval_pred): make sure we return something
+ 	    when assert(0) is compiled away
+ 
+-2011-01-13  Francis Giraldeau  <francis.giraldeau at gmail.com>
++2011-01-14  Francis Giraldeau  <francis.giraldeau at gmail.com>
+ 
+ 	Fix a small bashism from test script
+ 
+@@ -1189,7 +1199,7 @@
+ 
+ 	Fixes bug #175
+ 
+-2011-01-11  David Lutterkort  <lutter at redhat.com>
++2011-01-12  David Lutterkort  <lutter at redhat.com>
+ 
+ 	Replace augtest by test-augtool.sh
+ 	This removes the silly dependency on Ruby, since augtest was the only
+@@ -1224,8 +1234,6 @@
+ 
+ 	In autosave mode, print "save" when in echo or interactive mode. Remove comma at the end of enum list.
+ 
+-2011-01-10  Rapha?l Pinson  <raphink at gmail.com>
+-
+ 	Refactor augtool.c to use only readline
+ 
+ 	augtool: add --autosave option
+@@ -1236,7 +1244,7 @@
+ 
+ 	Fixes ticket #172
+ 
+-2011-01-07  David Lutterkort  <lutter at redhat.com>
++2011-01-08  David Lutterkort  <lutter at redhat.com>
+ 
+ 	bootstrap: add sys_wait module
+ 	Fixes bug #164
+@@ -1373,8 +1381,6 @@
+ 	  * tests/modules/pass_square.aug: unit tests to validate the square lens,
+ 	    regular and recursives
+ 
+-2010-12-09  Francis Giraldeau  <francis.giraldeau at usherbrooke.ca>
+-
+ 	Add test for lens-access.sh in Makefile
+ 
+ 2010-12-02  Rapha?l Pinson  <raphink at gmail.com>
+@@ -1389,7 +1395,7 @@
+ 
+ 	Fix GPL into LGPLv2+ for a series of lenses.
+ 
+-2010-11-24  Francis Giraldeau  <francis.giraldeau at gmail.com>
++2010-11-25  Francis Giraldeau  <francis.giraldeau at gmail.com>
+ 
+ 	Ignore eclipse project files
+ 
+@@ -1522,10 +1528,12 @@
+ 
+ 	Fix example in lens
+ 
+-2010-11-02  Raphael Pinson  <raphink at gmail.com>
++2010-11-03  Raphael Pinson  <raphink at gmail.com>
+ 
+ 	Add a few lenses to Menu.txt
+ 
++2010-11-02  Raphael Pinson  <raphink at gmail.com>
++
+ 	Add shells.aug and associated test
+ 
+ 2010-11-01  Raphael Pinson  <raphink at gmail.com>
+@@ -1552,17 +1560,19 @@
+ 
+ 	Use generic modules in bbhosts.aug
+ 
+-2010-10-26  Francis Giraldeau  <francis.giraldeau at gmail.com>
++2010-10-27  Francis Giraldeau  <francis.giraldeau at gmail.com>
+ 
+ 	Fixes bug #144: wrong behavior of iter concat
+ 	This patch fix the list_tail_cons macro to fastforward the tail list when
+ 	the first item is added to the list, otherwise if the first item added when
+ 	the list is NULL has two item, the tail points the the first item.
+ 
+-2010-10-26  Raphael Pinson  <raphink at gmail.com>
++2010-10-27  Raphael Pinson  <raphink at gmail.com>
+ 
+ 	Fix filter to use proper file
+ 
++2010-10-26  Raphael Pinson  <raphink at gmail.com>
++
+ 	Remove trailing whitespace
+ 
+ 	Add nsswitch.aug and associated test
+@@ -1620,11 +1630,9 @@
+ 
+ 	Improve keepalived.aug
+ 
+-2010-09-23  Rapha?l Pinson  <raphink at gmail.com>
+-
+ 	Add a lens for keepalived.conf and associated test
+ 
+-2010-09-23  David Lutterkort  <lutter at redhat.com>
++2010-09-24  David Lutterkort  <lutter at redhat.com>
+ 
+ 	Preserve parse errors under /augeas//error
+ 	With the changes in commit 5ee81630, a subtree in /augeas/files that is
+@@ -1651,7 +1659,7 @@
+ 
+ 	Odbc: new lens and tests.
+ 
+-2010-09-15  David Lutterkort  <lutter at redhat.com>
++2010-09-16  David Lutterkort  <lutter at redhat.com>
+ 
+ 	When setting a tree node to the value it already has, do not modify the tree
+ 
+@@ -1698,10 +1706,12 @@
+ 	* src/get.c (visit_exit): fix segfault from empty stack for L_MAYBE
+ 	Fixes bug #136
+ 
+-2010-08-06  David Lutterkort  <lutter at redhat.com>
++2010-08-07  David Lutterkort  <lutter at redhat.com>
+ 
+ 	Version 0.7.3
+ 
++2010-08-06  David Lutterkort  <lutter at redhat.com>
++
+ 	Fix behavior of aug_defnode
+ 	  (1) Make sure that the definition of the variable is recorded under
+ 	      /augeas/variables
+@@ -1754,7 +1764,7 @@
+ 	Limits: also look for files in /etc/security/limits.d
+ 	Suggested by David Timms
+ 
+-2010-07-23  Tim Stoop  <tim.stoop at gmail.com>
++2010-07-24  Tim Stoop  <tim.stoop at gmail.com>
+ 
+ 	Mysql: lens for MySQL's *.cnf files
+ 
+@@ -1785,10 +1795,12 @@
+ 	If the user writes 'let rec l = rhs' and the RHS does not mention l, just
+ 	mark the lens as regular and carry on.
+ 
+-2010-07-21  David Lutterkort  <lutter at redhat.com>
++2010-07-22  David Lutterkort  <lutter at redhat.com>
+ 
+ 	* src/syntax.c (load_module_file): make sure we report an error
+ 
++2010-07-21  David Lutterkort  <lutter at redhat.com>
++
+ 	Fix segfault in glue routines; add test for the fix
+ 	The tree_*_glue functions did not set the error struct when parsing a path;
+ 	this caused a segfault when trying to insert before/after a non-existant
+@@ -1824,11 +1836,11 @@
+ 
+ 	Adding is_scan in the condition to accept an item
+ 
+-2010-06-30  Matthew Booth  <mbooth at redhat.com>
++2010-07-01  Matthew Booth  <mbooth at redhat.com>
+ 
+ 	Device_map: new lens for grub's device.map
+ 
+-2010-06-29  David Lutterkort  <lutter at redhat.com>
++2010-06-30  David Lutterkort  <lutter at redhat.com>
+ 
+ 	Avoid unnecessary file parsing when reloading the tree
+ 	We used to reparse every file we knew about upon aug_load. Now, we only
+@@ -1861,6 +1873,8 @@
+ 	  * tests/cutest.c (run): add impl
+ 	  * tests/test-save.c (run): remove
+ 
++2010-06-29  David Lutterkort  <lutter at redhat.com>
++
+ 	Redefine all variables upon load
+ 	This is a slight change in behavior: before, we used to just discard the
+ 	contents of all variables upon load. Now, we redefine variables by
+@@ -1917,14 +1931,14 @@
+ 	* lenses/shellvars_array.aug: new lens
+ 	* lenses/tests/test_shellvars_array.aug: test for new lens
+ 
+-2010-05-13  David Lutterkort  <lutter at redhat.com>
++2010-05-14  David Lutterkort  <lutter at redhat.com>
+ 
+ 	Add modules_conf to naturaldocs Menu
+ 
+ 	Add /etc/modules.conf from hell
+ 	Actually, from http://www.janerob.com/rob/ts5100/modules.conf
+ 
+-2010-05-13  Matthew Booth  <mbooth at redhat.com>
++2010-05-14  Matthew Booth  <mbooth at redhat.com>
+ 
+ 	Modules_conf: new lens for modules.conf and conf.modules
+ 
+@@ -1989,8 +2003,6 @@
+ 	* tests/test-save.c: use proper includes for WIFEXITED
+ 	Without them, the build fails on FreeBSD
+ 
+-2010-04-20  David Lutterkort  <lutter at redhat.com>
+-
+ 	Debctrl (multi_line_entry): fix bad regexp
+ 	The lens 'del /^ / " "' is not valid, since we do not allow '^' as a meta
+ 	character. Changing that to 'del / / " "' exposed a typecheck problem in
+@@ -2005,13 +2017,15 @@
+ 
+ 	  * tests/fatest.c (testExpandCharRanges): test escaping of literal '|'
+ 
+-2010-04-19  David Lutterkort  <lutter at redhat.com>
++2010-04-20  David Lutterkort  <lutter at redhat.com>
+ 
+ 	* tests/fatest.c (print_regerror): do not use alloca
+ 
+ 	* bootstrap: pull in isblank explicitly
+ 	Fixes bug #111
+ 
++2010-04-19  David Lutterkort  <lutter at redhat.com>
++
+ 	* src/lens.c (lns_check_rec): fix refcounting mistake on error path
+ 	Fixes bug #120
+ 
+@@ -2043,30 +2057,30 @@
+ 
+ 	* src/jmt.c (build_tree): print debug output for build_nullable
+ 
+-2010-03-12  David Lutterkort  <lutter at redhat.com>
++2010-03-13  David Lutterkort  <lutter at redhat.com>
+ 
+ 	* lenses/tests/test_logrotate.aug: add test for files separated by newlines
+ 	This test the fix for bug #104, commit fe0453ce.
+ 
+-2010-03-11  David Lutterkort  <lutter at redhat.com>
++2010-03-12  David Lutterkort  <lutter at redhat.com>
+ 
+ 	* lenses/group.aug (password): remove backslashes
+ 	Backslashes in char classes are taken literally, they do not escape a
+ 	character.
+ 
+-2010-03-11  root  <root at lx200.costest.lrz.de>
++2010-03-12  root  <root at lx200.costest.lrz.de>
+ 
+ 	Group: Added disabled password support
+ 	* lenses/group.aug: '*' and '!' are allowed chars for disabled password
+ 	* lenses/tests/test_group.aug: added test for lens change
+ 
+-2010-03-11  David Lutterkort  <lutter at redhat.com>
++2010-03-12  David Lutterkort  <lutter at redhat.com>
+ 
+ 	* src/lens.c (lns_check_rec): avoid use of uninitialized 'result'
+ 	The ensures can fail, and we check whether result is NULL in the error
+ 	path.
+ 
+-2010-03-05  David Lutterkort  <lutter at redhat.com>
++2010-03-06  David Lutterkort  <lutter at redhat.com>
+ 
+ 	* src/lens.c (lns_format_atype): format L_REC lenses
+ 
+@@ -2081,7 +2095,7 @@
+ 
+ 	Approx: allow keywords starting with '$'
+ 
+-2010-03-04  David Lutterkort  <lutter at redhat.com>
++2010-03-05  David Lutterkort  <lutter at redhat.com>
+ 
+ 	Approx: lens and test for the approx proxy server
+ 
+@@ -2130,7 +2144,7 @@
+ 
+ 	Debctrl: new lens and test
+ 
+-2010-02-23  David Lutterkort  <lutter at redhat.com>
++2010-02-24  David Lutterkort  <lutter at redhat.com>
+ 
+ 	Ntp: add 'tinker' directive
+ 	Fixes bug #103
+@@ -2138,7 +2152,7 @@
+ 	Logrotate: tolerate whitespace at the end of a line
+ 	Fixes bug #101
+ 
+-2010-02-23  Raphael Pinson  <raphink at gmail.com>
++2010-02-24  Raphael Pinson  <raphink at gmail.com>
+ 
+ 	Dhclient: add rfc code parsing
+ 	Fixes bug #107
+@@ -2168,7 +2182,7 @@
+ 
+ 	Nagisocfg: lens and test for /etc/nagios3/nagios.cfg
+ 
+-2010-02-12  Ivana Hutarova Varekova  <varekova at redhat.com>
++2010-02-13  Ivana Hutarova Varekova  <varekova at redhat.com>
+ 
+ 	Cgrules: new lens and test
+ 	See cgrules.conf for http://libcg.sourceforge.net/
+@@ -2188,8 +2202,6 @@
+ 	Instead of dumping raw regular expressions for the tree encoding, print out
+ 	something resembling our tree notation.
+ 
+-2010-02-08  David Lutterkort  <lutter at redhat.com>
+-
+ 	libfa: handle the syntax r{min,} properly
+ 	  * src/fa.c (parse_repeated_regexp): set max = -1 when we see r{min,};
+ 	    (re_iter_as_string): when max == -1, print r{min,}
+@@ -2197,6 +2209,8 @@
+ 
+ 	* src/fa.c (parse_int): flag not parsing anything as an error
+ 
++2010-02-08  David Lutterkort  <lutter at redhat.com>
++
+ 	* src/jmt.c: add caller filtering
+ 	Caller filtering is needed to weed out seemingly ambiguous parse trees (see
+ 	Section 5.3 of Jim/Mandelbaum's paper)
+@@ -2221,7 +2235,7 @@
+ 
+ 	Sshd: allow optional arguments in subsystem commands
+ 
+-2010-01-27  David Lutterkort  <lutter at redhat.com>
++2010-01-28  David Lutterkort  <lutter at redhat.com>
+ 
+ 	* src/augeas.c (tree_replace): don't bother marking the new parent as dirty
+ 	We call tree_rm on it earlier, which already marks it as dirty.
+@@ -2234,7 +2248,7 @@
+ 	* src/get.c (no_match_error): initialize lname
+ 	Otherwise, gcc complains about a possibly uninitialized value with -O2
+ 
+-2010-01-25  David Lutterkort  <lutter at redhat.com>
++2010-01-26  David Lutterkort  <lutter at redhat.com>
+ 
+ 	Test for using a recursive lens inside other lenses
+ 
+@@ -2301,7 +2315,7 @@
+ 
+ 	* src/get.c (struct state): make info a pointer
+ 
+-2010-01-23  David Lutterkort  <lutter at redhat.com>
++2010-01-24  David Lutterkort  <lutter at redhat.com>
+ 
+ 	* src/lens.c (restrict_regexp): properly report OOM
+ 
+@@ -2309,7 +2323,7 @@
+ 
+ 	Document the basics of building from git
+ 
+-2010-01-15  David Lutterkort  <lutter at redhat.com>
++2010-01-16  David Lutterkort  <lutter at redhat.com>
+ 
+ 	* src/builtin.c: builtins for printing and inspecting lenses
+ 
+@@ -2330,10 +2344,12 @@
+ 	In analogy to 'label', this lens allows setting the value of a tree node to
+ 	a fixed string
+ 
+-2010-01-14  David Lutterkort  <lutter at redhat.com>
++2010-01-15  David Lutterkort  <lutter at redhat.com>
+ 
+ 	Version 0.7.0
+ 
++2010-01-14  David Lutterkort  <lutter at redhat.com>
++
+ 	Json: lens and tests for generic Json files
+ 
+ 	Tests for recursive (context free) lenses
+@@ -2447,7 +2463,7 @@
+ 
+ 	* src/lens.c (subtree_atype): new function
+ 
+-2010-01-07  David Lutterkort  <lutter at redhat.com>
++2010-01-08  David Lutterkort  <lutter at redhat.com>
+ 
+ 	Facelift for augtool
+ 	This makes augtool somewhat friendlier, mostly because
+@@ -2459,6 +2475,8 @@
+ 	    be enclosed in quotes if they have spaces with predicates, e.g. you can
+ 	    now type 'get /foo[ last() ]'
+ 
++2010-01-07  David Lutterkort  <lutter at redhat.com>
++
+ 	Record an error if more than one lens tries to load a file
+ 	  * src/transform.c (file_info): new function; (transform_load): detect if
+ 	    more than one lens tries to load a file and record error in
+@@ -2507,8 +2525,6 @@
+ 
+ 	Xinetd (name): fix bad '-' in character class
+ 
+-2010-01-05  David Lutterkort  <lutter at redhat.com>
+-
+ 	Do not choke on non-existing lens during save
+ 	  * src/transform.c (add_file_info): check that lens is non-NULL;
+ 	    (lens_from_name): provide detailed error message when lens lookup
+@@ -2543,7 +2559,7 @@
+ 
+ 	* src/regexp.c (print_regexp): clean the regexp with fa_restrict_alphabet
+ 
+-2009-12-18  David Lutterkort  <lutter at redhat.com>
++2009-12-19  David Lutterkort  <lutter at redhat.com>
+ 
+ 	* src/builtin.c (lens_get, lens_put): propagate errors as exceptions
+ 
+@@ -2565,7 +2581,7 @@
+ 
+ 	* doc/ftdetect/augeas.vim: fix syntax
+ 
+-2009-12-09  Partha Aji  <paji at redhat.com>
++2009-12-10  Partha Aji  <paji at redhat.com>
+ 
+ 	Made samba aug accept entry keys with ':' in them
+ 
+@@ -2598,7 +2614,7 @@
+ 	* src/parser.y: properly initialize yylloc
+ 	Fixes ticket #96
+ 
+-2009-11-25  David Lutterkort  <lutter at redhat.com>
++2009-11-26  David Lutterkort  <lutter at redhat.com>
+ 
+ 	Properly check regexp literals for syntax errors
+ 	  * src/regexp.h (regexp_check): new function
+@@ -2630,7 +2646,7 @@
+ 
+ 	Support version pins in apt_preferences
+ 
+-2009-11-23  David Lutterkort  <lutter at redhat.com>
++2009-11-24  David Lutterkort  <lutter at redhat.com>
+ 
+ 	* tests/Makefile.am (lens_tests): run postfix_access tests
+ 
+@@ -2661,8 +2677,6 @@
+ 	happened (e.g., out-of-memory) that has already been reported in the
+ 	central augeas->error instance.
+ 
+-2009-11-12  David Lutterkort  <lutter at redhat.com>
+-
+ 	* src/info.c (print_info): do not choke on NULL info
+ 
+ 	* src/internal.h: new macros MEMCMP and MEMMOVE
+@@ -2820,7 +2834,7 @@
+ 	/etc/ethers: new lens and test
+ 	The followings adds a new lens for /etc/ethers and associated test.
+ 
+-2009-09-30  David Lutterkort  <lutter at redhat.com>
++2009-10-01  David Lutterkort  <lutter at redhat.com>
+ 
+ 	* src/augparse.c: get error details from error API
+ 
+@@ -2873,6 +2887,8 @@
+ 	  - use the safe-alloc macros for allocations
+ 	  - abort the test when internal allocations fail
+ 
++2009-09-30  David Lutterkort  <lutter at redhat.com>
++
+ 	* src/hash.c (hash_alloc_insert): return 0/-1 for success/error
+ 
+ 	Use a proper function for make_ref
+@@ -2889,7 +2905,7 @@
+ 	* src/transform.c: do not include canonicalize.h anymore
+ 	The canonicalize-lgpl gnulib module doesn't require that anymore
+ 
+-2009-09-21  David Lutterkort  <lutter at redhat.com>
++2009-09-22  David Lutterkort  <lutter at redhat.com>
+ 
+ 	Path expressions: add regexp matching
+ 	Add a function regexp : string -> regexp and an operator
+@@ -2920,6 +2936,8 @@
+ 	parser/typechecker. Now functions like pathx_first etc. report errors
+ 	properly.
+ 
++2009-09-21  David Lutterkort  <lutter at redhat.com>
++
+ 	Store pathx parse errors in internal error struct
+ 	The pathx_parse function will now store error information in a struct
+ 	error; we pass the one from struct augeas in and save it in the pathx.
+@@ -2951,13 +2969,15 @@
+ 
+ 	Version 0.5.3
+ 
+-2009-09-11  David Lutterkort  <lutter at redhat.com>
++2009-09-12  David Lutterkort  <lutter at redhat.com>
+ 
+ 	Man pages: update to match current augtool and augparse
+ 
+ 	Add --version option to augtool and augparse
+ 	Fixes bug #88
+ 
++2009-09-11  David Lutterkort  <lutter at redhat.com>
++
+ 	A couple more files for the test root
+ 
+ 	Add preceding-sibling and following-sibling axes to path expressions
+@@ -2979,8 +2999,6 @@
+ 
+ 	* src/try: fix 'set annotate' for gdb
+ 
+-2009-09-03  David Lutterkort  <lutter at redhat.com>
+-
+ 	Transparent save of cross-device links
+ 	When saving to a file, we first write to a file with extension .augnew and
+ 	then rename that file to the actual file. This fails when the original is a
+@@ -2991,9 +3009,9 @@
+ 	e.g. when the original file is bindmounted - in that situation, we have to
+ 	copy.
+ 
+-	* src/syntax.c (print_value): use print_tree instead of dump_tree
++2009-09-03  David Lutterkort  <lutter at redhat.com>
+ 
+-2009-09-02  David Lutterkort  <lutter at redhat.com>
++	* src/syntax.c (print_value): use print_tree instead of dump_tree
+ 
+ 	* lenses/rx.aug (fspath): simplistic regex for filesystem paths
+ 
+@@ -3001,6 +3019,8 @@
+ 	When the typechecker finds lens overlap in a union's put direction, format
+ 	the generated example as a tree to make it more readable.
+ 
++2009-09-02  David Lutterkort  <lutter at redhat.com>
++
+ 	* src/lens.c(enc_format): remove extraneous quote
+ 
+ 	Make fa_example work for strings with embedded NUL's
+@@ -3069,7 +3089,7 @@
+ 
+ 	Fixes bug #68
+ 
+-2009-08-12  David Lutterkort  <lutter at redhat.com>
++2009-08-13  David Lutterkort  <lutter at redhat.com>
+ 
+ 	Do not assume how glob allocates gl_pathv
+ 	We assumed that the gl_pathv in a glob_t was allocated in a particular
+@@ -3077,7 +3097,7 @@
+ 
+ 	  * src/transform.c (filter_generate): make a copy of gl_pathv
+ 
+-2009-08-10  David Lutterkort  <lutter at redhat.com>
++2009-08-11  David Lutterkort  <lutter at redhat.com>
+ 
+ 	aug_load: cleanup variables when deleting /files
+ 	The first thing aug_load does is delete /augeas/files and /files. We need
+@@ -3093,7 +3113,7 @@
+ 
+ 	Pass symtab explicitly into pathx_symtab_remove_descendants
+ 
+-2009-08-06  David Lutterkort  <lutter at redhat.com>
++2009-08-07  David Lutterkort  <lutter at redhat.com>
+ 
+ 	Record new files under /augeas/files when they are saved
+ 	  * src/transform.c (transform_save): add file info with add_file_info
+@@ -3207,7 +3227,7 @@
+ 	ls -lZ $hosts | cut -d ' ' -f 5.  The latter fails with some
+ 	combinations of ls and SELinux.
+ 
+-2009-07-16  David Lutterkort  <lutter at redhat.com>
++2009-07-17  David Lutterkort  <lutter at redhat.com>
+ 
+ 	* src/Makefile.am: link libfa with gnulib, needed on AIX
+ 
+@@ -3215,11 +3235,11 @@
+ 
+ 	* doc/augeas.vim: vi syntax highlighting for .aug files
+ 
+-2009-07-13  David Lutterkort  <lutter at redhat.com>
++2009-07-14  David Lutterkort  <lutter at redhat.com>
+ 
+ 	Version 0.5.2
+ 
+-2009-07-09  David Lutterkort  <lutter at redhat.com>
++2009-07-10  David Lutterkort  <lutter at redhat.com>
+ 
+ 	tree handling: propagate dirty flag into root
+ 	We had an off-by-one error in tree_mark_dirty that lead to the root of the
+@@ -3234,13 +3254,15 @@
+ 
+ 	This bug was introduced in commit 7278965b
+ 
+-2009-07-08  David Lutterkort  <lutter at redhat.com>
++2009-07-09  David Lutterkort  <lutter at redhat.com>
+ 
+ 	Ntp: allow additional options for server etc.
+ 	Allow options listed on http://doc.ntp.org/4.2.4/confopt.html
+ 
+ 	Fixes bug #72 reported by Micah
+ 
++2009-07-08  David Lutterkort  <lutter at redhat.com>
++
+ 	Shellvars: allow backticks as quote characters
+ 	  * lenses/shellvars.aug (simple_value): allow backticks as quotes
+ 	  * lenses/tests/test_shellvars.aug: add tests
+@@ -3276,7 +3298,7 @@
+ 
+ 	Reported and fix suggested by Jeff Johnson <n3npq at mac.com>
+ 
+-2009-06-26  Jim Meyering  <meyering at redhat.com>
++2009-06-27  Jim Meyering  <meyering at redhat.com>
+ 
+ 	tests: divide test-lenses.sh into its 54 independent tests
+ 	This permits these tests to be run in parallel.
+@@ -3297,7 +3319,7 @@
+ 	* configure.ac: Require automake-1.11.
+ 	Enable color-tests parallel-tests.  Use AM_SILENT_RULES([yes])
+ 
+-2009-06-26  Marc Fournier  <marc.fournier at camptocamp.com>
++2009-06-27  Marc Fournier  <marc.fournier at camptocamp.com>
+ 
+ 	Yum: also read files in /etc/yum/pluginconf.d
+ 
+@@ -3321,7 +3343,7 @@
+ 	  * man/augtool.pod: document --echo option
+ 	  * man/augtool.1: regenerated
+ 
+-2009-06-15  Jim Meyering  <meyering at redhat.com>
++2009-06-16  Jim Meyering  <meyering at redhat.com>
+ 
+ 	build: fix "make distcheck" failure
+ 	* src/Makefile.am (EXTRA_DIST): Add fa_sym.version.
+@@ -3333,13 +3355,13 @@
+ 	* test-test-preserve.sh: work with BSD ls, as well as GNU ls
+ 	Needed to make the test pass on OS/X
+ 
+-2009-06-11  David Lutterkort  <lutter at redhat.com>
++2009-06-12  David Lutterkort  <lutter at redhat.com>
+ 
+ 	libfa: use linker script to only export public symbols
+ 	libfa was exporting all kinds of symbols that were meant to be internal;
+ 	now it only exports what's in fa.h
+ 
+-2009-06-11  Anders F Bj\xF6rklund  <afb at users.sourceforge.net>
++2009-06-12  Anders F Bj\xF6rklund  <afb at users.sourceforge.net>
+ 
+ 	configure: do not use version script if the linker doesn't support it
+ 	That is the case on OS X
+@@ -3355,7 +3377,7 @@
+ 	* src/augtool.c: add missing include for ctype.h
+ 	Part of fix for ticket #66
+ 
+-2009-06-09  David Lutterkort  <lutter at redhat.com>
++2009-06-10  David Lutterkort  <lutter at redhat.com>
+ 
+ 	Version 0.5.1
+ 
+@@ -3406,7 +3428,7 @@
+ 
+ 	* tests/root/etc/: add group and passwd files
+ 
+-2009-05-28  Matt Palmer  <matt at anchor.net.au>
++2009-05-29  Matt Palmer  <matt at anchor.net.au>
+ 
+ 	Interfaces: various bug fixes
+ 	* disallow end-of-line comments
+@@ -3415,7 +3437,7 @@
+ 	Interfaces: accept options containing '_'
+ 	Bug reported by Jonas Eriksson
+ 
+-2009-05-28  David Lutterkort  <lutter at redhat.com>
++2009-05-29  David Lutterkort  <lutter at redhat.com>
+ 
+ 	* tests/grub-rm-entry.rb: 'savedefault' indented by '\t', not ''
+ 
+@@ -3423,7 +3445,7 @@
+ 
+ 	Modprobe: handle comments at the end of a line
+ 
+-2009-04-13  David Lutterkort  <lutter at redhat.com>
++2009-04-14  David Lutterkort  <lutter at redhat.com>
+ 
+ 	Grub: allow optional argument for savedefault command
+ 
+@@ -3480,21 +3502,19 @@
+ 
+ 	Squid: allow indentation of entries
+ 
+-2009-04-07  Raphael Pinson  <raphink at gmail.com>
+-
+ 	Logrotate: allow = as a separator for value_to_eol
+ 	Fix ticket #61 by allowing "=" as a valid separator in value_to_eol.
+ 	"word" may not contain "=" anymore in this case.  Note that this is not
+ 	documented in "man logrotate" but is shipped by default in CentOS (cf
+ 	ticket #61).
+ 
+-2009-04-07  David Lutterkort  <lutter at redhat.com>
++2009-04-08  David Lutterkort  <lutter at redhat.com>
+ 
+ 	Ntp: fixes to make the default Fedora config work
+ 	Now enough of ntp.conf is understood so that the config from Fedora 10 with
+ 	all directives uncommented can be processed.
+ 
+-2009-04-07  Raphael Pinson  <raphink at gmail.com>
++2009-04-08  Raphael Pinson  <raphink at gmail.com>
+ 
+ 	Ntp: add fudge directive
+ 	Fixes ticket #59
+@@ -3507,7 +3527,7 @@
+ 
+ 	Bug reported by Michael Conigliaro <mike at conigliaro.org>
+ 
+-2009-04-03  David Lutterkort  <lutter at redhat.com>
++2009-04-04  David Lutterkort  <lutter at redhat.com>
+ 
+ 	* src/augtool.c: new option --noautoload
+ 
+@@ -3520,7 +3540,7 @@
+ 
+ 	Rx: remove \b and \d escapes
+ 
+-2009-04-03  Raphael Pinson  <raphink at gmail.com>
++2009-04-04  Raphael Pinson  <raphink at gmail.com>
+ 
+ 	Modify some existing lenses to use new utility modules
+ 	Changes Aliases, Exports, Fstab, Group, and Monit
+@@ -3544,7 +3564,7 @@
+ 	* handle empty lines
+ 	* find vsftpd.conf on Fedora/RHEL
+ 
+-2009-03-27  David Lutterkort  <lutter at redhat.com>
++2009-03-28  David Lutterkort  <lutter at redhat.com>
+ 
+ 	Iptables: fix ticket #51
+ 	 * allow more characters in chain names
+@@ -3558,6 +3578,8 @@
+ 
+ 	* src/get.c (get_quant_star): do not leak registers
+ 
++2009-03-27  David Lutterkort  <lutter at redhat.com>
++
+ 	Some more test files
+ 
+ 	Fix uninitialized variables found by optimizer
+@@ -3633,7 +3655,7 @@
+ 	The new API call aug_defvar allows defining variables that can later be
+ 	used in path expressions.
+ 
+-2009-03-22  David Lutterkort  <lutter at redhat.com>
++2009-03-23  David Lutterkort  <lutter at redhat.com>
+ 
+ 	Add FilterExpr to path expression grammar
+ 	This allows using constructs like $foo/some/path and $foo[2]
+@@ -3648,7 +3670,7 @@
+ 
+ 	* src/pathx.c (clone_value): new function
+ 
+-2009-03-21  David Lutterkort  <lutter at redhat.com>
++2009-03-22  David Lutterkort  <lutter at redhat.com>
+ 
+ 	* src/pathx.c (release_value): factor logic into separate function
+ 
+@@ -3661,10 +3683,12 @@
+ 
+ 	* examples/fadot: remove, checked in by mistake
+ 
+-2009-03-20  David Lutterkort  <lutter at redhat.com>
++2009-03-21  David Lutterkort  <lutter at redhat.com>
+ 
+ 	* .gitignore: ignore examples/fadot
+ 
++2009-03-20  David Lutterkort  <lutter at redhat.com>
++
+ 	* src/get.c: rename 'Short iteration' to a more helpful message
+ 
+ 	* src/transform.c (store_error): report which lens failed
+@@ -3682,7 +3706,7 @@
+ 	operations on FA's from the command line, like intersection and complement
+ 	of FA's.
+ 
+-2009-03-19  David Lutterkort  <lutter at redhat.com>
++2009-03-20  David Lutterkort  <lutter at redhat.com>
+ 
+ 	* src/pathx.c: call make_value before pop_value
+ 	Since make_value might realloc, pointers retrieved with pop_value may
+@@ -3692,6 +3716,8 @@
+ 
+ 	* src/augeas.c: create various /augeas nodes when they go missing
+ 
++2009-03-19  David Lutterkort  <lutter at redhat.com>
++
+ 	* src/put.c (create_concat): fix goofy error message
+ 
+ 	Update and refresh man pages
+@@ -3742,7 +3768,7 @@
+ 	legal iptables config file; what makes it basic is that it doesn't break
+ 	some of the values down as fine-grained as I would like to have them
+ 
+-2009-03-13  David Lutterkort  <lutter at redhat.com>
++2009-03-14  David Lutterkort  <lutter at redhat.com>
+ 
+ 	* configure.ac: bump major version of libfa
+ 
+@@ -3754,6 +3780,8 @@
+ 
+ 	* src/fa.h (fa_compile): pass in size of regexp
+ 
++2009-03-13  David Lutterkort  <lutter at redhat.com>
++
+ 	* src/fa.h: use 'struct fa *' instead of fa_t
+ 
+ 	* src/augeas.c: fix handling of dirty flag
+@@ -3766,14 +3794,14 @@
+ 
+ 	* Makefile.maint: different setup at home
+ 
+-2009-03-12  David Lutterkort  <lutter at redhat.com>
+-
+ 	* src/transform.c (transform_save): properly sync data to disk
+ 	Make sure the data we write into the .augnew file hits the disk before
+ 	renaming to the proper name
+ 
+ 	Modprobe: lens and tests for modprobe.conf
+ 
++2009-03-12  David Lutterkort  <lutter at redhat.com>
++
+ 	* src/fa.c (re_cset_as_string): turn '[^\n]' into '.'
+ 
+ 	Place Sudoers and Util under LGPLv2+
+@@ -3808,7 +3836,7 @@
+ 
+ 	cat /tmp/squid2.7 /tmp/squid3-HEAD | sort | uniq
+ 
+-2009-03-08  David Lutterkort  <lutter at redhat.com>
++2009-03-09  David Lutterkort  <lutter at redhat.com>
+ 
+ 	* tests/xpath.tests: Hosts lens puts comments into #comment nodes
+ 
+@@ -3832,20 +3860,22 @@
+ 
+ 	Sshd: add test showing how to add a Subsystem
+ 
+-2009-03-03  David Lutterkort  <lutter at redhat.com>
++2009-03-04  David Lutterkort  <lutter at redhat.com>
+ 
+ 	* Makefile.maint: add autogen target
+ 
+ 	* src/pathx.c (eval_rel): for numbers, '<' and '<=' were reversed
+ 
++2009-03-03  David Lutterkort  <lutter at redhat.com>
++
+ 	Postfix_main: handle continuation lines
+ 
+ 	* src/pathx.c: fix some comments
+ 
+-2009-03-02  David Lutterkort  <lutter at redhat.com>
+-
+ 	Version 0.4.1
+ 
++2009-03-02  David Lutterkort  <lutter at redhat.com>
++
+ 	* configure.ac: make default warning level 'maximum'
+ 	Using 'error' here is too unfriendly on weird platforms, since builds can
+ 	fail, e.g. because of broken system headers. When doing actual development,
+@@ -3864,7 +3894,7 @@
+ 
+ 	* src/pathx.c: it is an error if we don't consume the whole expression
+ 
+-2009-02-27  David Lutterkort  <lutter at redhat.com>
++2009-02-28  David Lutterkort  <lutter at redhat.com>
+ 
+ 	* tests/test-event-saved.sh: make sure fuiles are writable by owner
+ 
+@@ -3882,8 +3912,6 @@
+ 
+ 	* src/augeas.c (tree_find): helper for getting a tree node
+ 
+-2009-02-24  David Lutterkort  <lutter at redhat.com>
+-
+ 	* src/augeas.c: erase /augeas/events/saved only once
+ 	tree_save is called recursively; /augeas/events/saved must be reset
+ 	in aug_save, not tree_save
+@@ -3894,19 +3922,23 @@
+ 
+ 	* src/transform.h: move transform decls out of syntax.h
+ 
++2009-02-24  David Lutterkort  <lutter at redhat.com>
++
+ 	Util.stdexcl: exclude .augsave and .augnew files
+ 
+-2009-02-20  David Lutterkort  <lutter at redhat.com>
++2009-02-21  David Lutterkort  <lutter at redhat.com>
+ 
+ 	* src/lexer.l: correct location info for strings and regexps
+ 
+ 	* src/get.c: check for valid match before calling token()
+ 
+-2009-02-19  David Lutterkort  <lutter at redhat.com>
++2009-02-20  David Lutterkort  <lutter at redhat.com>
+ 
+ 	* src/parser.y: do not allow epsilon as a tree constant
+ 	This grammar mistake made epsilon a valid expression
+ 
++2009-02-19  David Lutterkort  <lutter at redhat.com>
++
+ 	* src/fa.c: cache hash values in the state
+ 	This gives about a 15% performance improvement in typechecking
+ 	the logrotate lens
+@@ -3997,7 +4029,7 @@
+ 
+ 	* src/augtool.c (cmd_match): check return from aug_match more defensively
+ 
+-2009-02-06  David Lutterkort  <lutter at redhat.com>
++2009-02-07  David Lutterkort  <lutter at redhat.com>
+ 
+ 	Version 0.4.0
+ 
+@@ -4007,6 +4039,8 @@
+ 	Fix compilation on OpenSolaris
+ 	* src/pathx.c (position): assert not marked as noreturn
+ 
++2009-02-06  David Lutterkort  <lutter at redhat.com>
++
+ 	* tests/test-xpath.c (run_one_test): allow results in   arbitrary order. Files on Fedora and Debian are enumerated   in different order, leading to spurious test failures
+ 
+ 	* src/pathx.c: remove the value() function, it's redundant with '.'
+@@ -4036,7 +4070,7 @@
+ 	Lens and tests for DarkIce
+ 	See http://darkice.tyrell.hu/
+ 
+-2009-02-01  David Lutterkort  <lutter at redhat.com>
++2009-02-02  David Lutterkort  <lutter at redhat.com>
+ 
+ 	* src/augeas.c: use ALLOC instead of CALLOC
+ 
+@@ -4048,7 +4082,7 @@
+ 
+ 	* src/augeas.c (init_root): check for failure of strdup
+ 
+-2009-01-30  David Lutterkort  <lutter at redhat.com>
++2009-01-31  David Lutterkort  <lutter at redhat.com>
+ 
+ 	* src/pathx.c: factor test if a step matches into step_matches
+ 	This also fixes a problem matching, test also included
+@@ -4114,7 +4148,7 @@
+ 
+ 	Grub: support color directive
+ 
+-2009-01-26  David Lutterkort  <lutter at redhat.com>
++2009-01-27  David Lutterkort  <lutter at redhat.com>
+ 
+ 	Version 0.3.6
+ 
+@@ -4138,15 +4172,15 @@
+ 
+ 	Report version and legal save modes in /augeas/version
+ 
+-2009-01-17  David Lutterkort  <lutter at redhat.com>
++2009-01-18  David Lutterkort  <lutter at redhat.com>
+ 
+ 	* ref.h: include limits.h, since we use UINT_MAX
+ 
+-2009-01-16  David Lutterkort  <lutter at redhat.com>
++2009-01-17  David Lutterkort  <lutter at redhat.com>
+ 
+ 	Mark up code in documentation comments for Dpkg and Exports
+ 
+-2009-01-16  Robin Lee Powell  <rlpowell at digitalkingdom.org>
++2009-01-17  Robin Lee Powell  <rlpowell at digitalkingdom.org>
+ 
+ 	Documentation for Exports and Dpkg
+ 
+@@ -4189,20 +4223,20 @@
+ 	* test-preserve.sh: Use cut -b1-10 to get mode from ls -l output.
+ 	Use ls -lZ (not ls -Z, which is not portable) to get SELinux context.
+ 
+-2009-01-04  Arnaud Gomes-do-Vale  <arnaud.gomes at ircam.fr>
++2009-01-05  Arnaud Gomes-do-Vale  <arnaud.gomes at ircam.fr>
+ 
+ 	* src/Makefile.am: fix bz #478619 - do not use abspath
+ 
+-2009-01-03  Robin Lee Powell  <rlpowell at digitalkingdom.org>
++2009-01-04  Robin Lee Powell  <rlpowell at digitalkingdom.org>
+ 
+ 	Dpkg: new lens and test
+ 
+-2009-01-03  David Lutterkort  <lutter at redhat.com>
++2009-01-04  David Lutterkort  <lutter at redhat.com>
+ 
+ 	Php: expand filter slightly
+ 	Suggested by Robin Lee Powell <rlpowell at digitalkingdom.org>
+ 
+-2008-12-29  David Lutterkort  <lutter at redhat.com>
++2008-12-30  David Lutterkort  <lutter at redhat.com>
+ 
+ 	Fix segfault when branch in a union does not have a ktype
+ 	* src/lens.c (lns_key_regexp): check for NULL ktype of branch
+@@ -4210,25 +4244,25 @@
+ 
+ 	Bug reported by Robin Lee Powell <rlpowell at digitalkingdom.org>
+ 
+-2008-12-27  Free Ekanayaka  <free at 64studio.com>
++2008-12-28  Free Ekanayaka  <free at 64studio.com>
+ 
+ 	Add soma lens and test
+ 
+ 	Add limits lens and test
+ 
+-2008-12-24  David Lutterkort  <lutter at redhat.com>
++2008-12-25  David Lutterkort  <lutter at redhat.com>
+ 
+ 	* autogen.sh: remove bogus argument to configure
+ 
+-2008-12-24  Marc Fournier  <marc.fournier at camptocamp.com>
++2008-12-25  Marc Fournier  <marc.fournier at camptocamp.com>
+ 
+ 	Php, Gdm: exclude literal ".anon" from title, not regexp /.anon/
+ 
+-2008-12-24  Free Ekanayaka  <free at 64studio.com>
++2008-12-25  Free Ekanayaka  <free at 64studio.com>
+ 
+ 	Phpvars: allow whitespaces before the \n in the <?php head line
+ 
+-2008-12-23  David Lutterkort  <lutter at redhat.com>
++2008-12-24  David Lutterkort  <lutter at redhat.com>
+ 
+ 	Version 0.3.5
+ 
+@@ -4240,11 +4274,11 @@
+ 	The list of users in a group is now split into individual 'user/'
+ 	nodes. If a group has no members, no user/ nodes are produced.
+ 
+-2008-12-23  Free Ekanayaka  <free at 64studio.com>
++2008-12-24  Free Ekanayaka  <free at 64studio.com>
+ 
+ 	Add lens and test for /etc/group
+ 
+-2008-12-23  David Lutterkort  <lutter at redhat.com>
++2008-12-24  David Lutterkort  <lutter at redhat.com>
+ 
+ 	Simpler interface and implementation for path_find_one
+ 
+@@ -4270,19 +4304,19 @@
+ 
+ 	Add an explicit parent pointer to the tree
+ 
+-2008-12-23  Free Ekanayaka  <free at 64studio.com>
++2008-12-24  Free Ekanayaka  <free at 64studio.com>
+ 
+ 	Lens and test for config files using PHP-style variables
+ 	Process /etc/squirrelmail/config.php
+ 
+-2008-12-23  Marc Fournier  <marc.fournier at camptocamp.com>
++2008-12-24  Marc Fournier  <marc.fournier at camptocamp.com>
+ 
+ 	New lens and tests for /etc/rsyncd.conf
+ 	rsyncd.conf is an ini file which allows indented
+ 	parameters (like smb.conf) as well as entries outside
+ 	any section (like php.ini).
+ 
+-2008-12-23  David Lutterkort  <lutter at redhat.com>
++2008-12-24  David Lutterkort  <lutter at redhat.com>
+ 
+ 	* fa.c: mark '.' as a special character that needs to be escaped
+ 
+@@ -4333,7 +4367,7 @@
+ 	* transform.c (transform_save): if rename fails because new/backup file
+ 	  and target file are on different devices, copy the files
+ 
+-2008-11-05  David Lutterkort  <lutter at redhat.com>
++2008-11-06  David Lutterkort  <lutter at redhat.com>
+ 
+ 	* Makefile.maint: add target tag-release
+ 
+@@ -4368,11 +4402,11 @@
+ 	build: use LIB_SELINUX as set by gnulib
+ 	* configure.ac: do not set up LIB_SELINUX, gnulib does that
+ 
+-2008-10-22  Sylvain Baubeau  <bob at glumol.com>
++2008-10-23  Sylvain Baubeau  <bob at glumol.com>
+ 
+ 	Grub: support "rootnoverify" and "chainloader" directives
+ 
+-2008-10-21  David Lutterkort  <lutter at redhat.com>
++2008-10-22  David Lutterkort  <lutter at redhat.com>
+ 
+ 	Version 0.3.2
+ 
+@@ -4380,6 +4414,8 @@
+ 
+ 	test-events-saved.sh: sort the list of saved files
+ 
++2008-10-21  David Lutterkort  <lutter at redhat.com>
++
+ 	aug_save: report saved files in /augeas/events/saved
+ 	aug_save now reports which files were changed on disk underneath
+ 	/augeas/events/saved; if multiple files are changed in one save operation,
+@@ -4397,8 +4433,6 @@
+ 	still create the file with whatever default user/group/mode the current
+ 	user has set.
+ 
+-2008-10-20  David Lutterkort  <lutter at redhat.com>
+-
+ 	aug_save: report the number of files that were changed
+ 	When the tree is saved, keep track of the number of files that were
+ 	actually changed and return that number.
+@@ -4434,11 +4468,11 @@
+ 
+ 	Add gdm lens and associated test
+ 
+-2008-10-02  David Lutterkort  <lutter at redhat.com>
++2008-10-03  David Lutterkort  <lutter at redhat.com>
+ 
+ 	Ignore files based on .hgignore
+ 
+-2008-10-01  David Lutterkort  <lutter at redhat.com>
++2008-10-02  David Lutterkort  <lutter at redhat.com>
+ 
+ 	Complain when nodes in the tree can not be put
+ 	When nodes are added to the tree that do not match the appropriate
+@@ -4451,14 +4485,16 @@
+ 	This also uncovered that the test rec-hosts-add.rb was broken, but still
+ 	passed.
+ 
+-2008-10-01  David Lutterkort  <dlutter at redhat.com>
++2008-10-02  David Lutterkort  <dlutter at redhat.com>
+ 
+ 	Pass --nostdinc properly when running under gdb
+ 
++2008-10-01  David Lutterkort  <dlutter at redhat.com>
++
+ 	Logrotate: parse tabooext into list; add processing of a number of options
+ 	Patch by Sean E. Millichamp
+ 
+-2008-09-22  David Lutterkort  <dlutter at redhat.com>
++2008-09-23  David Lutterkort  <dlutter at redhat.com>
+ 
+ 	Grub: add support for 'serial' and 'terminal'
+ 	Patch by Sean E. Millichamp
+@@ -4470,6 +4506,8 @@
+ 	Logrotate: add dateext flag
+ 	Patch by Sean E. Millichamp
+ 
++2008-09-22  David Lutterkort  <dlutter at redhat.com>
++
+ 	Various changes to the NaturalDocs support
+ 	This patch changes a few things around in the NaturalDocs support:
+ 
+@@ -4510,7 +4548,7 @@
+ 
+ 	Adapt augeas.h for NaturalDocs parsing
+ 
+-2008-09-08  David Lutterkort  <dlutter at redhat.com>
++2008-09-09  David Lutterkort  <dlutter at redhat.com>
+ 
+ 	Sshd: better handling of match blocks
+ 	Split match conditions into individual 'Condition' entries. Store the
+@@ -4525,7 +4563,7 @@
+ 	Ldap: merge with Spacevars. Spacevars: process havp.config
+ 	Adapt Test_ldap, since there is no Ldap.lns anymore
+ 
+-2008-09-08  David Lutterkort  <dlutter at redhat.com>
++2008-09-09  David Lutterkort  <dlutter at redhat.com>
+ 
+ 	Use --nostdinc in tests
+ 	We never want to use installed lenses in the tests; they should only be
+@@ -4555,12 +4593,12 @@
+ 
+ 	Shellvars: handle space at the end of a line
+ 
+-2008-09-04  David Lutterkort  <dlutter at redhat.com>
+-
+ 	Added tag release-0.3.1 for changeset 803c17b1833a
+ 
+ 	Release 0.3.1
+ 
++2008-09-04  David Lutterkort  <dlutter at redhat.com>
++
+ 	Sysctl: lens for sysctl.conf
+ 	Contributed by Sean Millichamp
+ 
+@@ -4623,7 +4661,7 @@
+ 	- When a union during 'put' does not match, produce an error instead of
+ 	  aborting
+ 
+-2008-08-28  David Lutterkort  <dlutter at redhat.com>
++2008-08-29  David Lutterkort  <dlutter at redhat.com>
+ 
+ 	Fix a bug with transferring skeletons
+ 	It is possible for a skeleton to move from one subtree lens to another, if
+@@ -4665,7 +4703,7 @@
+ 	See man dput.cf(5) from a recent dput version (Ubuntu/hardy or
+ 	Debian/lenny)
+ 
+-2008-08-26  David Lutterkort  <dlutter at redhat.com>
++2008-08-27  David Lutterkort  <dlutter at redhat.com>
+ 
+ 	Typecheck del lens
+ 	The builtin lens 'del RE STR' was missing a typecheck: the default string
+@@ -4708,7 +4746,7 @@
+ 	Adapt php.aug to support entries outside of sections and still map sections
+ 	as labels (Fix #9)
+ 
+-2008-08-15  David Lutterkort  <dlutter at redhat.com>
++2008-08-16  David Lutterkort  <dlutter at redhat.com>
+ 
+ 	Shellvars: one more cornercase with double quoted strings
+ 
+@@ -4722,12 +4760,12 @@
+ 	There is no point in trying to match against skel->text for a store lens
+ 	since that is always NULL.
+ 
++2008-08-15  David Lutterkort  <dlutter at redhat.com>
++
+ 	Fix syntax error in test
+ 
+ 	augl_error: Initialize info
+ 
+-2008-08-14  David Lutterkort  <dlutter at redhat.com>
+-
+ 	aug_mv: fix bug when moving at the root level
+ 	When moving from the root level, the source node needs to be removed from
+ 	aug->tree, not aug->tree->children. In addition, the list_remove macro must
+@@ -4769,7 +4807,7 @@
+ 
+ 	Sudoers: clean up comment definition
+ 
+-2008-08-12  David Lutterkort  <dlutter at redhat.com>
++2008-08-13  David Lutterkort  <dlutter at redhat.com>
+ 
+ 	Hosts: handle comments at the end of a host entry
+ 	Comments are put into the tree as part of that host node, i.e. will live as
+@@ -4840,7 +4878,7 @@
+ 	See regex(7) or
+ 	http://www.opengroup.org/onlinepubs/009695399/basedefs/xbd_chap09.html#tag_09_04
+ 
+-2008-08-09  David Lutterkort  <dlutter at redhat.com>
++2008-08-10  David Lutterkort  <dlutter at redhat.com>
+ 
+ 	Revamp the dict data structure
+ 	Dicts were simple linked lists of key/value pairs, and appending and
+@@ -4883,12 +4921,12 @@
+ 	list_reverse reverses a list in place. list_tail_cons appends to a list in
+ 	constant time, since it is given a pointer to the tail of the list.
+ 
+-2008-08-07  David Lutterkort  <dlutter at redhat.com>
+-
+ 	Added tag release-0.3.0 for changeset 60f2a13c2528
+ 
+ 	Release 0.3.0
+ 
++2008-08-07  David Lutterkort  <dlutter at redhat.com>
++
+ 	Mention the exit status
+ 
+ 	Version libfa and libaugeas
+@@ -4915,7 +4953,7 @@
+ 	failed. This is useful when piping multiple commands into augtool to check
+ 	that they all succeeded.
+ 
+-2008-07-29  David Lutterkort  <dlutter at redhat.com>
++2008-07-30  David Lutterkort  <dlutter at redhat.com>
+ 
+ 	Fix failures on FreeBSD
+ 	(1) Point augtool at the lenses in the source dir (not FreeBSD problem,
+@@ -4964,7 +5002,7 @@
+ 
+ 	Add a call to move a subtree to the public API
+ 
+-2008-07-26  David Lutterkort  <dlutter at redhat.com>
++2008-07-27  David Lutterkort  <dlutter at redhat.com>
+ 
+ 	Refactor tree_create
+ 
+@@ -5035,13 +5073,13 @@
+ 	Lens for Debian's dput files
+ 	Contributed by Raphael Pinson
+ 
+-2008-07-17  David Lutterkort  <dlutter at redhat.com>
+-
+ 	augtool: Print '(none)' when getting a path with no value
+ 	The output used to be mangled. Now it is 'path = value' if hte path has a
+ 	non-NULL value, 'path (none)' if the path exists but has a NULL value, and
+ 	'path (o)' if an error occurred.
+ 
++2008-07-17  David Lutterkort  <dlutter at redhat.com>
++
+ 	Added tag release-0.2.1 for changeset 13fdcd9bb18a
+ 
+ 	aliases.aug: Do not require whitespace after commas
+@@ -5075,7 +5113,7 @@
+ 	Otherwise, get and parse on an empty string will produce a 'short
+ 	iteration' error, even if the empty string is acceptable for that lens.
+ 
+-2008-07-07  David Lutterkort  <dlutter at redhat.com>
++2008-07-08  David Lutterkort  <dlutter at redhat.com>
+ 
+ 	Put the default dir for lenses into DATADIR (the real fix)
+ 	Reworks 527:14602e2757dd in a way that actually works and conforms to the
+@@ -5084,10 +5122,12 @@
+ 	Most of this fix suggested by Jim Meyering, I only touched it up a little
+ 	(and no doubt introduced all the bugs).
+ 
++2008-07-07  David Lutterkort  <dlutter at redhat.com>
++
+ 	Check for NULL values in the put direction of store
+ 	This is now flagged as an error instead of causing a segfault.
+ 
+-2008-07-03  David Lutterkort  <dlutter at redhat.com>
++2008-07-04  David Lutterkort  <dlutter at redhat.com>
+ 
+ 	Lens for /etc/exports
+ 
+@@ -5099,13 +5139,13 @@
+ 
+ 	Suppress generated manpages
+ 
+-2008-06-30  David Lutterkort  <dlutter at redhat.com>
+-
+ 	Put the default dir for lenses into DATADIR
+ 	Instead of hardcoding the default dir for lenses to somewhere in '/usr',
+ 	look in DATADIR - that's after all where the default lenses are installed
+ 	if DATADIR (or PREFIX) is changed.
+ 
++2008-06-30  David Lutterkort  <dlutter at redhat.com>
++
+ 	Man page for augparse
+ 
+ 	Put Augeas version into footer
+@@ -5132,10 +5172,10 @@
+ 	With this change, error messages contain an indication to where the error
+ 	happened that is a little closer to the actual trouble spot.
+ 
+-2008-06-12  David Lutterkort  <dlutter at redhat.com>
+-
+ 	Check that we take the right branch in a union
+ 
++2008-06-12  David Lutterkort  <dlutter at redhat.com>
++
+ 	Process /etc/sysconfig/selinux
+ 	Patch by Alan Pevec
+ 
+@@ -5166,7 +5206,7 @@
+ 
+ 	Release 0.2.0
+ 
+-2008-06-03  David Lutterkort  <dlutter at redhat.com>
++2008-06-04  David Lutterkort  <dlutter at redhat.com>
+ 
+ 	Remove bashisms from test scripts
+ 	Make tests scripts work with plain old sh; also, don't hardcode location of
+@@ -5387,8 +5427,6 @@
+ 	increased, as the calling conventions for builtin functions stipulate that
+ 	the returned value is owned by the caller
+ 
+-2008-05-14  David Lutterkort  <dlutter at redhat.com>
+-
+ 	Report errors more clearly in the tree
+ 	When an error happens during get/put, store additional info in the tree:
+ 	for get errors, store the position in the file where the error occured, for
+@@ -5399,7 +5437,7 @@
+ 	with the value associated with /augeas/F/error giving some indication about
+ 	the kind of error encountered.
+ 
+-2008-05-13  David Lutterkort  <dlutter at redhat.com>
++2008-05-14  David Lutterkort  <dlutter at redhat.com>
+ 
+ 	Report errors during put
+ 
+@@ -5417,6 +5455,8 @@
+ 	that "jumped branches", i.e. whose get used one branch of the union, and
+ 	the put uses the other branch because of changes to the tree.
+ 
++2008-05-13  David Lutterkort  <dlutter at redhat.com>
++
+ 	Reduce the number of calls to collect
+ 	We were calling collect way too often, which was slowing things down. Also
+ 	broke collect into separate subfunctions so we can see better when one of
+@@ -5435,12 +5475,14 @@
+ 
+ 	Fix up the existing lenses that violate that.
+ 
+-2008-05-09  David Lutterkort  <dlutter at redhat.com>
++2008-05-10  David Lutterkort  <dlutter at redhat.com>
+ 
+ 	Keep re_cset_as_string from including an explicit '\0'
+ 	We use NUL delimited strings; that means we can not use a CSET
+ 	representation that mentions '\0' explicitly.
+ 
++2008-05-09  David Lutterkort  <dlutter at redhat.com>
++
+ 	Use the new '-' operator for key_re
+ 
+ 	Add subtraction of regular expressions to the language
+@@ -5468,8 +5510,6 @@
+ 	There are lots of gyrations to keep the generated regexp reasonably short
+ 	(and syntactically correct)
+ 
+-2008-05-08  David Lutterkort  <dlutter at redhat.com>
+-
+ 	Check for (some) allocation failures
+ 
+ 	Reference count 'struct re' instances
+@@ -5512,8 +5552,6 @@
+ 	Small fixes to the specfile
+ 	Suggested by Michael Schwendt
+ 
+-2008-05-05  David Lutterkort  <dlutter at redhat.com>
+-
+ 	Lens and transform for xinetd.conf
+ 
+ 	Enclose the regexp for a key in (..) before adding a /
+@@ -5585,7 +5623,7 @@
+ 
+ 	do ldconfig in post/postun of the libs subpackage
+ 
+-2008-04-28  David Lutterkort  <dlutter at redhat.com>
++2008-04-29  David Lutterkort  <dlutter at redhat.com>
+ 
+ 	Free the value when freeing a tree node
+ 
+@@ -5615,8 +5653,6 @@
+ 	Note that the baseurl nodes have to be consecutive; otherwise, put will
+ 	fail.
+ 
+-2008-04-24  David Lutterkort  <dlutter at redhat.com>
+-
+ 	Fix lens selection in union
+ 	The logic in put to select the appropriate branch in unions got it wrong if
+ 	the first branch matched the empty word, because applies only checked that
+@@ -5630,6 +5666,8 @@
+ 	we unref STAR at the end, we need to take ownership of STAR->LENS when
+ 	constructing the concat of L and STAR->LENS
+ 
++2008-04-24  David Lutterkort  <dlutter at redhat.com>
++
+ 	* src/fa.c (string_extend): Handle realloc failure.
+ 	Patch by Jim Meyering
+ 
+@@ -5647,8 +5685,6 @@
+ 	Remove trailing whitespace from the end of lines
+ 	No functional change, only formatting.
+ 
+-2008-04-23  David Lutterkort  <dlutter at redhat.com>
+-
+ 	Remove aug_exists - it does not exist anymore
+ 
+ 	Delete old, outdated notes
+@@ -5673,6 +5709,8 @@
+ 	Also, parseline initializes all args as NULL now to guard against garbage
+ 	pointers accumulating from previous uses.
+ 
++2008-04-23  David Lutterkort  <dlutter at redhat.com>
++
+ 	Don't complain about missing optional args
+ 	For example, both 'print' and 'print PATH' are legal. Make sure we accept
+ 	either.
+@@ -5714,8 +5752,6 @@
+ 	Properly escape/unescape quotes in strings
+ 	Patch provided by Alan Pevec
+ 
+-2008-04-21  David Lutterkort  <dlutter at redhat.com>
+-
+ 	Updated for 0.0.8 and upcoming 0.1.0 release
+ 
+ 	Remove aug_exists from public API
+@@ -5740,6 +5776,8 @@
+ 	Parse network configs in /etc/sysconfig/ifcfg-*
+ 	Patch provided by Alan Pevec
+ 
++2008-04-21  David Lutterkort  <dlutter at redhat.com>
++
+ 	Don't mark ROOT for MAKE_PATH as const - it's not always true
+ 
+ 	Cap file reads (arbitrarily) at 32MB
+@@ -5766,25 +5804,25 @@
+ 
+ 	Add "2008" to the copyright in the headers
+ 
+-2008-04-19  David Lutterkort  <dlutter at redhat.com>
++2008-04-20  David Lutterkort  <dlutter at redhat.com>
+ 
+ 	Remove dependency on glib and use kazlib's hash table instead
+ 	The dependency on glib was only there for the hash tables used by
+ 	libfa. Rather than requiring all of glib just for that, use the hash table
+ 	implementation in hash.[ch] taken from kazlib.
+ 
+-2008-04-18  David Lutterkort  <dlutter at redhat.com>
++2008-04-19  David Lutterkort  <dlutter at redhat.com>
+ 
+ 	Hashtable from Kazlib 1.20
+ 	Available from http://users.footprints.net/~kaz/kazlib.html
+ 
+ 	Abort if failing assertions are not used
+ 
+-2008-04-19  David Lutterkort  <dlutter at redhat.com>
++2008-04-20  David Lutterkort  <dlutter at redhat.com>
+ 
+ 	Remove pathsplit symbol
+ 
+-2008-04-16  David Lutterkort  <dlutter at redhat.com>
++2008-04-17  David Lutterkort  <dlutter at redhat.com>
+ 
+ 	Added tag release-0.0.8 for changeset cb00aa18e518
+ 
+@@ -5794,6 +5832,8 @@
+ 
+ 	Install lens tests in lenses/tests/ not lenses/
+ 
++2008-04-16  David Lutterkort  <dlutter at redhat.com>
++
+ 	Use the right path expression to print the whole tree
+ 
+ 	Don't segfault when a test fails without producing any tree
+@@ -5802,8 +5842,6 @@
+ 
+ 	Call the node for a boot entry 'title'
+ 
+-2008-04-14  David Lutterkort  <dlutter at redhat.com>
+-
+ 	Remove the use in sequences in some places
+ 	Where indentation isn't important, we can flatten and simplify the tree by
+ 	not using seqs. Instead of something like aliases/1, aliases/2, ... we now
+@@ -5816,6 +5854,8 @@
+ 	Change the ins syntax to support insert before/after
+ 	This reflects the change to the aug_insert API
+ 
++2008-04-14  David Lutterkort  <dlutter at redhat.com>
++
+ 	Handle searching for the last() element properly
+ 	path_first didn't find anything when looking for 'element[last()]'
+ 
+@@ -5833,7 +5873,7 @@
+ 
+ 	Running a failing test fails loading the whole module
+ 
+-2008-04-11  David Lutterkort  <dlutter at redhat.com>
++2008-04-12  David Lutterkort  <dlutter at redhat.com>
+ 
+ 	Add path expressions allowing XPath-like path matching
+ 	Path expressions passed in through the public API can now contain indices
+@@ -5842,6 +5882,8 @@
+ 
+ 	Syntax and semantics follow XPath.
+ 
++2008-04-11  David Lutterkort  <dlutter at redhat.com>
++
+ 	Run all tests - don't abort after the first failure
+ 
+ 2008-04-10  David Lutterkort  <dlutter at redhat.com>
+@@ -5852,8 +5894,6 @@
+ 	It's enough to pass -c to augtool on the first test we run; doing it again
+ 	in later tests is completely redundant and just slows the test run down.
+ 
+-2008-04-09  David Lutterkort  <dlutter at redhat.com>
+-
+ 	Complain if a transform is built from a lens orphaning a key/value
+ 	Such a transform would lose information when applied and can't be
+ 	valid. Ideally, this check would be in the typechecker, but requires
+@@ -5874,6 +5914,8 @@
+ 
+ 	Update README
+ 
++2008-04-09  David Lutterkort  <dlutter at redhat.com>
++
+ 	Remove 'spec' files and tests that don't make sense any longer
+ 
+ 	Fail test scripts on _any_ unexpected error
+@@ -5916,8 +5958,6 @@
+ 	is already defined locally, everything works, and if it is not, an error is
+ 	produced.
+ 
+-2008-04-08  David Lutterkort  <dlutter at redhat.com>
+-
+ 	Typecheck the atype of concat and iter
+ 
+ 	Typecheck the atype of union
+@@ -5933,6 +5973,8 @@
+ 
+ 	Clearer error message
+ 
++2008-04-08  David Lutterkort  <dlutter at redhat.com>
++
+ 	Processing of pam.d
+ 
+ 	Pull some useful space deleters into Util
+@@ -5969,8 +6011,6 @@
+ 	identifier mentioned in the autoload must be defined in the enclosing
+ 	module.
+ 
+-2008-04-07  David Lutterkort  <dlutter at redhat.com>
+-
+ 	Builtins for filters and transforms
+ 	Three simple builtins to construct transforms:
+ 
+@@ -5978,12 +6018,8 @@
+ 	- excl : string -> filter -> filter excludes all files matching a glob
+ 	- transform: lens -> filter -> transform
+ 
+-2008-04-08  David Lutterkort  <dlutter at redhat.com>
+-
+ 	Implement free_lens
+ 
+-2008-04-07  David Lutterkort  <dlutter at redhat.com>
+-
+ 	A lens for yum
+ 
+ 	Fix bad free
+@@ -6006,13 +6042,15 @@
+ 
+ 	Add a 'gensym' builtin
+ 
++2008-04-07  David Lutterkort  <dlutter at redhat.com>
++
+ 	More ref ocunting fixes
+ 	- aug_close now releases the list of modules
+ 	- compile_bracket cleans up the arg
+ 	- augparse closes the augeas connection, mostly so that we can see leaks
+ 	  in valgrind better
+ 
+-2008-04-04  David Lutterkort  <dlutter at redhat.com>
++2008-04-05  David Lutterkort  <dlutter at redhat.com>
+ 
+ 	Fix major brainfart in ref counting lists
+ 	The way lists were reference counted (and particularly unref'd) was just
+@@ -6032,6 +6070,8 @@
+ 
+ 	Exceptions during compilation countas failure
+ 
++2008-04-04  David Lutterkort  <dlutter at redhat.com>
++
+ 	Fix how the key regexp for unions is calculated
+ 	Union would produce spurious empty keys, for example in the expression
+ 	  [ key /a/ . ([ l1 ] | [ l2 ]) ]
+@@ -6069,8 +6109,6 @@
+ 
+ 	Update yylloc for string/regexp constants
+ 
+-2008-04-03  David Lutterkort  <dlutter at redhat.com>
+-
+ 	When compile_exp produces an exn, bind it anyway
+ 	This avoids lots of trouble with NULL values
+ 
+@@ -6113,6 +6151,8 @@
+ 	automatically load it by looking for a file mod.aug on the module load
+ 	path.
+ 
++2008-04-03  David Lutterkort  <dlutter at redhat.com>
++
+ 	Rename struct env to struct module
+ 
+ 	Separate function composition from concatenation
+@@ -6131,8 +6171,6 @@
+ 	Fix reference problem
+ 	The wrong type was being unref'd
+ 
+-2008-04-02  David Lutterkort  <dlutter at redhat.com>
+-
+ 	Free the whole dictionary
+ 	While entries are looked up, dict->entry changes; dict->mark is the head of
+ 	the list of all entries that were ever in the dict.
+@@ -6160,6 +6198,8 @@
+ 	lns_get now reports parse errors in an lns_error struct, which is turned
+ 	into an exception in the interpreter.
+ 
++2008-04-02  David Lutterkort  <dlutter at redhat.com>
++
+ 	Added tag ml-syntax-start for changeset fcd6c04a1eed
+ 
+ 	A subtree without a key matches "/"
+@@ -6172,8 +6212,6 @@
+ 
+ 	Fill in subtree->atype with empty regexp
+ 
+-2008-04-01  David Lutterkort  <dlutter at redhat.com>
+-
+ 	Interpreter for the new file description syntax
+ 	This is by no means done, but done enough to allow incremental fixes from
+ 	now on. This checkin still contains lots of FIXME's and bugs. Very simple
+@@ -6182,7 +6220,7 @@
+ 	The syntax for describing files is now a very simple OCaml-like functional
+ 	language; the file syntax.c implements an interpreter for that language.
+ 
+-2008-03-25  David Lutterkort  <dlutter at redhat.com>
++2008-03-26  David Lutterkort  <dlutter at redhat.com>
+ 
+ 	Revamp the language
+ 
+@@ -6219,8 +6257,6 @@
+ 	with a single node matching FOO is wrongly split as if there was a COMMENT
+ 	(which, if it were there would have to have a NULL label)
+ 
+-2008-03-13  David Lutterkort  <dlutter at redhat.com>
+-
+ 	Defer allocating storage for a state_set as long as possible
+ 
+ 	Rename constants state_set_* to array_*
+@@ -6242,6 +6278,8 @@
+ 	individually, and since traversing and accessing transitions is a wee bit
+ 	faster.
+ 
++2008-03-13  David Lutterkort  <dlutter at redhat.com>
++
+ 	Remove unused macro
+ 
+ 	Clean up fa_iter some
+@@ -6265,13 +6303,13 @@
+ 	When order of states in a set doesn't matter, allow the set to be kept
+ 	sorted so that search can use binary search.
+ 
+-2008-03-12  David Lutterkort  <dlutter at redhat.com>
+-
+ 	Fix two memory leaks
+ 
+ 	Remove the last uses of FA_MAP
+ 	Use STATE_SET instead, since it's faster and lighterweight
+ 
++2008-03-12  David Lutterkort  <dlutter at redhat.com>
++
+ 	Rename structs fa_state and fa_trans to state and trans
+ 
+ 	[mq]: min_hopcroft.patch
+@@ -6300,8 +6338,6 @@
+ 	reducs the overhead from memory allocations, since the array is expanded by
+ 	doubling its size (up to some threshold)
+ 
+-2008-03-11  David Lutterkort  <dlutter at redhat.com>
+-
+ 	fa_star added a spurious epstrans loop on new initial
+ 
+ 	Mark live and reachable states
+@@ -6324,7 +6360,7 @@
+ 	Fix subtle bug in determinize
+ 	Fix a bug that would only hit if '\0' is ever in points.
+ 
+-2008-03-06  David Lutterkort  <dlutter at redhat.com>
++2008-03-07  David Lutterkort  <dlutter at redhat.com>
+ 
+ 	Add fa_ambig_example to generate ambiguous words
+ 	Generate an ambiguous string upv given two languages and directions on how
+@@ -6339,9 +6375,9 @@
+ 	preferences, so that for example, alnum characters are preferred over
+ 	printable ones, and those over nonprintable ones.
+ 
+-	Fix some cornercases in fa_example
++2008-03-06  David Lutterkort  <dlutter at redhat.com>
+ 
+-2008-03-05  David Lutterkort  <dlutter at redhat.com>
++	Fix some cornercases in fa_example
+ 
+ 	Add generators and tests for some basic languages
+ 	Basic languages are the empty language, the language containing only the
+@@ -6362,6 +6398,8 @@
+ 	Also added switches to augtool to set this from the command line, and to
+ 	set the filesystem root.
+ 
++2008-03-05  David Lutterkort  <dlutter at redhat.com>
++
+ 	Added tag release-0.0.5 for changeset 0efe2a620e39
+ 
+ 	Mark print_re as unused
+@@ -6374,8 +6412,6 @@
+ 	To make Augeas threadsafe, we need to move away from keeping stuff in
+ 	global variables.
+ 
+-2008-03-04  David Lutterkort  <dlutter at redhat.com>
+-
+ 	Add fa_example which produces an example string from a regular language
+ 
+ 	Add a test that performs Anders Moeller's ambiguity algorithm manually
+@@ -6387,6 +6423,8 @@
+ 
+ 	Also added tests to check these two problems.
+ 
++2008-03-04  David Lutterkort  <dlutter at redhat.com>
++
+ 	Fix handling of negated charsets
+ 	Negated charsets where handled entirely wrong. A character set is now
+ 	represented as a map from char -> {0, 1}. That map is rather big (one byte
+@@ -6406,10 +6444,10 @@
+ 
+ 	Add deciding unambiguously iterable based on ua concatenable
+ 
+-2008-03-03  David Lutterkort  <dlutter at redhat.com>
+-
+ 	Automatically free all automata allocated during a test
+ 
++2008-03-03  David Lutterkort  <dlutter at redhat.com>
++
+ 	Cleanup the returned FA in fa_intersect
+ 
+ 	Add a target to run fatest through valgrind
+@@ -6426,7 +6464,7 @@
+ 	Use a linker script instead. The visibility pragma is only available in gcc
+ 	>= 4.0, and thus imposes a pretty high burden to build Augeas.
+ 
+-2008-02-29  David Lutterkort  <dlutter at redhat.com>
++2008-03-01  David Lutterkort  <dlutter at redhat.com>
+ 
+ 	Reign in the number of symbols exported from libaugeas
+ 	Use visibility=hidden to keep most local symbols to ourselves. Still needs
+@@ -6444,6 +6482,8 @@
+ 
+ 	Add tests for language subsets and equality
+ 
++2008-02-29  David Lutterkort  <dlutter at redhat.com>
++
+ 	The beginnings of a finite automata library
+ 	The code is heavily based on the Java package dk.brics.automaton by Anders
+ 	Moeller (http://www.brics.dk/automaton/)
+@@ -6465,8 +6505,6 @@
+ 	When skipping nodes with NULL label, don't segfault if the whole tail of
+ 	the list has NULL labels
+ 
+-2008-02-25  David Lutterkort  <dlutter at redhat.com>
+-
+ 	Added tag release-0.0.4 for changeset d8e750d82f97
+ 
+ 	Version 0.0.4
+@@ -6496,6 +6534,8 @@
+ 
+ 	Rename AUGEAS_SPECLIB to AUGEAS_LENS_LIB
+ 
++2008-02-25  David Lutterkort  <dlutter at redhat.com>
++
+ 	Added tag release-0.0.2 for changeset f981ccccb0ab
+ 
+ 	Include the try script in the distribution
+@@ -6533,10 +6573,10 @@
+ 	The list of env vars for AcceptEnv was not being split into individual
+ 	pieces
+ 
+-2008-02-20  David Lutterkort  <dlutter at redhat.com>
+-
+ 	A (pretty kludgy) description for cmfm.conf
+ 
++2008-02-20  David Lutterkort  <dlutter at redhat.com>
++
+ 	Make printing of skel/dict optional
+ 
+ 	Print test results a tad prettier
+@@ -6574,8 +6614,6 @@
+ 
+ 	Allow escaping of a slash in tegular expressions
+ 
+-2008-02-18  David Lutterkort  <dlutter at redhat.com>
+-
+ 	Base parsing completely off regexp matching.
+ 	Parsing now uses regexp matching, and not the CFG-style parsing based on
+ 	first sets previously used. This actually makes it easier to write specs,
+@@ -6594,6 +6632,8 @@
+ 
+ 	Remove unused token T_FIELD
+ 
++2008-02-18  David Lutterkort  <dlutter at redhat.com>
++
+ 	Rename match.xaction to match.action
+ 	The field was named initially to avoid a clash with another 'action' field,
+ 	but that field is gone now.
+@@ -6629,7 +6669,7 @@
+ 	helps maintain the illusion for users that the split node is really just
+ 	one node.
+ 
+-2008-02-15  David Lutterkort  <dlutter at redhat.com>
++2008-02-16  David Lutterkort  <dlutter at redhat.com>
+ 
+ 	Report some information underneath /augeas
+ 	The root directory and information about how files were loaded into the
+@@ -6637,6 +6677,8 @@
+ 
+ 	Fix very bad use of realloc
+ 
++2008-02-15  David Lutterkort  <dlutter at redhat.com>
++
+ 	Adjust expected diff
+ 	Do not allow comments to disappear
+ 
+@@ -6688,8 +6730,6 @@
+ 
+ 	Properly handle a NULL value in aug_set. Make aug_insert deal with NULL labels.
+ 
+-2008-02-14  David Lutterkort  <dlutter at redhat.com>
+-
+ 	Fixed, nicely working tests
+ 
+ 	Readline completion
+@@ -6714,15 +6754,13 @@
+ 
+ 	This change is majorly broken.
+ 
+-2008-02-12  David Lutterkort  <dlutter at redhat.com>
+-
+ 	Better description of lenses
+ 
+ 	Different representation of the tree
+ 	The tree is now represented as a tree data structure, where each node in
+ 	the tree stores only a path component (label).
+ 
+-2008-02-08  David Lutterkort  <dlutter at redhat.com>
++2008-02-09  David Lutterkort  <dlutter at redhat.com>
+ 
+ 	Beginnings of a formal writeup
+ 
+@@ -6742,8 +6780,6 @@
+ 
+ 	Don't segfault when the parse matches nothing
+ 
+-2008-01-29  David Lutterkort  <dlutter at redhat.com>
+-
+ 	Another yum test
+ 
+ 	Remove more unneeded cruft
+@@ -6777,6 +6813,8 @@
+ 
+ 	Test that reordering of subtrees works
+ 
++2008-01-29  David Lutterkort  <dlutter at redhat.com>
++
+ 	Set the root of the tree from include
+ 
+ 	Respect ordering of nodes in the config tree.
+@@ -6838,7 +6876,7 @@
+ 
+ 	Docs
+ 
+-2008-01-24  David Lutterkort  <dlutter at redhat.com>
++2008-01-25  David Lutterkort  <dlutter at redhat.com>
+ 
+ 	Rough thoughts about emit
+ 
+@@ -6883,8 +6921,6 @@
+ 
+ 	Detect association of values with impossible paths
+ 
+-2008-01-17  David Lutterkort  <dlutter at redhat.com>
+-
+ 	Make augtest set AUGEAS_ROOT and AUGEAS_SPECLIB before running augtool.
+ 	augtest now copies test files into a separate subdirectory and points
+ 	augtool to that as its root. It also points augtool to ../spec for the spec
+@@ -6943,13 +6979,13 @@
+ 
+ 	Remove debug printing in augparse about loaded maps
+ 
+-2008-01-07  David Lutterkort  <dlutter at redhat.com>
++2008-01-08  David Lutterkort  <dlutter at redhat.com>
+ 
+ 	Free tokens entirely when freeing file
+ 
+ 	Set action in all path components
+ 
+-2008-01-03  David Lutterkort  <dlutter at redhat.com>
++2008-01-04  David Lutterkort  <dlutter at redhat.com>
+ 
+ 	Provider that uses specs
+ 	The spec provider is hooked into libaugeas and loaded. It reads spec files
+@@ -6969,7 +7005,7 @@
+ 
+ 	Compile regexps for multiline matching
+ 
+-2008-01-02  David Lutterkort  <dlutter at redhat.com>
++2008-01-03  David Lutterkort  <dlutter at redhat.com>
+ 
+ 	Fix syntax error; we want to test that missing defaults are noticed
+ 
+@@ -6979,6 +7015,8 @@
+ 
+ 	Print the filename in errors about tokens (abbrevs)
+ 
++2008-01-02  David Lutterkort  <dlutter at redhat.com>
++
+ 	Add name to grammars
+ 
+ 	Add -v switch for printing errors
+@@ -6990,7 +7028,7 @@
+ 	paths is maintained. References to values work with the exception of
+ 	references to rules.
+ 
+-2007-12-21  David Lutterkort  <dlutter at redhat.com>
++2007-12-22  David Lutterkort  <dlutter at redhat.com>
+ 
+ 	Check grammar acceptance/rejection
+ 
+@@ -7004,9 +7042,9 @@
+ 	  - the assignment part of the action is done after the field/group
+ 	    has been parsed
+ 
+-	Snapshot before changing the syntax of rule actions
++2007-12-21  David Lutterkort  <dlutter at redhat.com>
+ 
+-2007-12-20  David Lutterkort  <dlutter at redhat.com>
++	Snapshot before changing the syntax of rule actions
+ 
+ 	Remove unused keyword and token 'default'
+ 
+@@ -7031,6 +7069,8 @@
+ 	Produce tokens during parsing.
+ 	Also, nicer printing of the tokens read.
+ 
++2007-12-20  David Lutterkort  <dlutter at redhat.com>
++
+ 	Stricter checking for ambiguous rules
+ 	Check that all items in alternatives have non-overlapping first sets. Two
+ 	sets are overlapping if they both contain an entry pointing to the same
+@@ -7061,7 +7101,7 @@
+ 
+ 	Factor aug_make_file into internal.c
+ 
+-2007-12-01  David Lutterkort  <dlutter at redhat.com>
++2007-12-02  David Lutterkort  <dlutter at redhat.com>
+ 
+ 	Be more verbose about which tests were run
+ 
+@@ -7079,7 +7119,7 @@
+ 
+ 	Explain yourself
+ 
+-2007-11-30  David Lutterkort  <dlutter at redhat.com>
++2007-12-01  David Lutterkort  <dlutter at redhat.com>
+ 
+ 	Add a test that shows how to change the initdefault
+ 
+@@ -7099,6 +7139,8 @@
+ 
+ 	aug_rec_save: Check input parameters
+ 
++2007-11-30  David Lutterkort  <dlutter at redhat.com>
++
+ 	Major overhaul of record parsing
+ 	Use PCRE to split records with regexps, and abstract a major chunk of
+ 	functionality out so it is independent of parsing pam config files
+@@ -7111,7 +7153,7 @@
+ 
+ 	Basic tests for record parsing
+ 
+-2007-11-26  David Lutterkort  <dlutter at redhat.com>
++2007-11-27  David Lutterkort  <dlutter at redhat.com>
+ 
+ 	Trim trailing slashes from paths
+ 
+diff --git a/Makefile.in b/Makefile.in
+index d08d7e2..626b008 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -111,6 +111,7 @@ am__aclocal_m4_deps = $(top_srcdir)/gnulib/m4/00gnulib.m4 \
+ 	$(top_srcdir)/gnulib/m4/pathmax.m4 \
+ 	$(top_srcdir)/gnulib/m4/printf.m4 \
+ 	$(top_srcdir)/gnulib/m4/putenv.m4 \
++	$(top_srcdir)/gnulib/m4/rawmemchr.m4 \
+ 	$(top_srcdir)/gnulib/m4/readlink.m4 \
+ 	$(top_srcdir)/gnulib/m4/realloc.m4 \
+ 	$(top_srcdir)/gnulib/m4/regex.m4 \
+@@ -130,6 +131,7 @@ am__aclocal_m4_deps = $(top_srcdir)/gnulib/m4/00gnulib.m4 \
+ 	$(top_srcdir)/gnulib/m4/stdlib_h.m4 \
+ 	$(top_srcdir)/gnulib/m4/stpcpy.m4 \
+ 	$(top_srcdir)/gnulib/m4/stpncpy.m4 \
++	$(top_srcdir)/gnulib/m4/strchrnul.m4 \
+ 	$(top_srcdir)/gnulib/m4/string_h.m4 \
+ 	$(top_srcdir)/gnulib/m4/strndup.m4 \
+ 	$(top_srcdir)/gnulib/m4/strnlen.m4 \
+diff --git a/aclocal.m4 b/aclocal.m4
+index b3a5ed7..929c6d7 100644
+--- a/aclocal.m4
++++ b/aclocal.m4
+@@ -177,456 +177,6 @@ else
+ fi[]dnl
+ ])# PKG_CHECK_MODULES
+ 
+-# po.m4 serial 17 (gettext-0.18)
+-dnl Copyright (C) 1995-2010 Free Software Foundation, Inc.
+-dnl This file is free software; the Free Software Foundation
+-dnl gives unlimited permission to copy and/or distribute it,
+-dnl with or without modifications, as long as this notice is preserved.
+-dnl
+-dnl This file can can be used in projects which are not available under
+-dnl the GNU General Public License or the GNU Library General Public
+-dnl License but which still want to provide support for the GNU gettext
+-dnl functionality.
+-dnl Please note that the actual code of the GNU gettext library is covered
+-dnl by the GNU Library General Public License, and the rest of the GNU
+-dnl gettext package package is covered by the GNU General Public License.
+-dnl They are *not* in the public domain.
+-
+-dnl Authors:
+-dnl   Ulrich Drepper <drepper at cygnus.com>, 1995-2000.
+-dnl   Bruno Haible <haible at clisp.cons.org>, 2000-2003.
+-
+-AC_PREREQ([2.50])
+-
+-dnl Checks for all prerequisites of the po subdirectory.
+-AC_DEFUN([AM_PO_SUBDIRS],
+-[
+-  AC_REQUIRE([AC_PROG_MAKE_SET])dnl
+-  AC_REQUIRE([AC_PROG_INSTALL])dnl
+-  AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake
+-  AC_REQUIRE([AM_NLS])dnl
+-
+-  dnl Release version of the gettext macros. This is used to ensure that
+-  dnl the gettext macros and po/Makefile.in.in are in sync.
+-  AC_SUBST([GETTEXT_MACRO_VERSION], [0.18])
+-
+-  dnl Perform the following tests also if --disable-nls has been given,
+-  dnl because they are needed for "make dist" to work.
+-
+-  dnl Search for GNU msgfmt in the PATH.
+-  dnl The first test excludes Solaris msgfmt and early GNU msgfmt versions.
+-  dnl The second test excludes FreeBSD msgfmt.
+-  AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
+-    [$ac_dir/$ac_word --statistics /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 &&
+-     (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
+-    :)
+-  AC_PATH_PROG([GMSGFMT], [gmsgfmt], [$MSGFMT])
+-
+-  dnl Test whether it is GNU msgfmt >= 0.15.
+-changequote(,)dnl
+-  case `$MSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
+-    '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) MSGFMT_015=: ;;
+-    *) MSGFMT_015=$MSGFMT ;;
+-  esac
+-changequote([,])dnl
+-  AC_SUBST([MSGFMT_015])
+-changequote(,)dnl
+-  case `$GMSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
+-    '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) GMSGFMT_015=: ;;
+-    *) GMSGFMT_015=$GMSGFMT ;;
+-  esac
+-changequote([,])dnl
+-  AC_SUBST([GMSGFMT_015])
+-
+-  dnl Search for GNU xgettext 0.12 or newer in the PATH.
+-  dnl The first test excludes Solaris xgettext and early GNU xgettext versions.
+-  dnl The second test excludes FreeBSD xgettext.
+-  AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
+-    [$ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 &&
+-     (if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
+-    :)
+-  dnl Remove leftover from FreeBSD xgettext call.
+-  rm -f messages.po
+-
+-  dnl Test whether it is GNU xgettext >= 0.15.
+-changequote(,)dnl
+-  case `$XGETTEXT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
+-    '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) XGETTEXT_015=: ;;
+-    *) XGETTEXT_015=$XGETTEXT ;;
+-  esac
+-changequote([,])dnl
+-  AC_SUBST([XGETTEXT_015])
+-
+-  dnl Search for GNU msgmerge 0.11 or newer in the PATH.
+-  AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge,
+-    [$ac_dir/$ac_word --update -q /dev/null /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1], :)
+-
+-  dnl Installation directories.
+-  dnl Autoconf >= 2.60 defines localedir. For older versions of autoconf, we
+-  dnl have to define it here, so that it can be used in po/Makefile.
+-  test -n "$localedir" || localedir='${datadir}/locale'
+-  AC_SUBST([localedir])
+-
+-  dnl Support for AM_XGETTEXT_OPTION.
+-  test -n "${XGETTEXT_EXTRA_OPTIONS+set}" || XGETTEXT_EXTRA_OPTIONS=
+-  AC_SUBST([XGETTEXT_EXTRA_OPTIONS])
+-
+-  AC_CONFIG_COMMANDS([po-directories], [[
+-    for ac_file in $CONFIG_FILES; do
+-      # Support "outfile[:infile[:infile...]]"
+-      case "$ac_file" in
+-        *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
+-      esac
+-      # PO directories have a Makefile.in generated from Makefile.in.in.
+-      case "$ac_file" in */Makefile.in)
+-        # Adjust a relative srcdir.
+-        ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
+-        ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
+-        ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
+-        # In autoconf-2.13 it is called $ac_given_srcdir.
+-        # In autoconf-2.50 it is called $srcdir.
+-        test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
+-        case "$ac_given_srcdir" in
+-          .)  top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
+-          /*) top_srcdir="$ac_given_srcdir" ;;
+-          *)  top_srcdir="$ac_dots$ac_given_srcdir" ;;
+-        esac
+-        # Treat a directory as a PO directory if and only if it has a
+-        # POTFILES.in file. This allows packages to have multiple PO
+-        # directories under different names or in different locations.
+-        if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
+-          rm -f "$ac_dir/POTFILES"
+-          test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
+-          cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ 	]*\$/d" -e "s,.*,     $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES"
+-          POMAKEFILEDEPS="POTFILES.in"
+-          # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend
+-          # on $ac_dir but don't depend on user-specified configuration
+-          # parameters.
+-          if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
+-            # The LINGUAS file contains the set of available languages.
+-            if test -n "$OBSOLETE_ALL_LINGUAS"; then
+-              test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
+-            fi
+-            ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
+-            # Hide the ALL_LINGUAS assigment from automake < 1.5.
+-            eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
+-            POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
+-          else
+-            # The set of available languages was given in configure.in.
+-            # Hide the ALL_LINGUAS assigment from automake < 1.5.
+-            eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS'
+-          fi
+-          # Compute POFILES
+-          # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
+-          # Compute UPDATEPOFILES
+-          # as      $(foreach lang, $(ALL_LINGUAS), $(lang).po-update)
+-          # Compute DUMMYPOFILES
+-          # as      $(foreach lang, $(ALL_LINGUAS), $(lang).nop)
+-          # Compute GMOFILES
+-          # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo)
+-          case "$ac_given_srcdir" in
+-            .) srcdirpre= ;;
+-            *) srcdirpre='$(srcdir)/' ;;
+-          esac
+-          POFILES=
+-          UPDATEPOFILES=
+-          DUMMYPOFILES=
+-          GMOFILES=
+-          for lang in $ALL_LINGUAS; do
+-            POFILES="$POFILES $srcdirpre$lang.po"
+-            UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
+-            DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
+-            GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
+-          done
+-          # CATALOGS depends on both $ac_dir and the user's LINGUAS
+-          # environment variable.
+-          INST_LINGUAS=
+-          if test -n "$ALL_LINGUAS"; then
+-            for presentlang in $ALL_LINGUAS; do
+-              useit=no
+-              if test "%UNSET%" != "$LINGUAS"; then
+-                desiredlanguages="$LINGUAS"
+-              else
+-                desiredlanguages="$ALL_LINGUAS"
+-              fi
+-              for desiredlang in $desiredlanguages; do
+-                # Use the presentlang catalog if desiredlang is
+-                #   a. equal to presentlang, or
+-                #   b. a variant of presentlang (because in this case,
+-                #      presentlang can be used as a fallback for messages
+-                #      which are not translated in the desiredlang catalog).
+-                case "$desiredlang" in
+-                  "$presentlang"*) useit=yes;;
+-                esac
+-              done
+-              if test $useit = yes; then
+-                INST_LINGUAS="$INST_LINGUAS $presentlang"
+-              fi
+-            done
+-          fi
+-          CATALOGS=
+-          if test -n "$INST_LINGUAS"; then
+-            for lang in $INST_LINGUAS; do
+-              CATALOGS="$CATALOGS $lang.gmo"
+-            done
+-          fi
+-          test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile"
+-          sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@POMAKEFILEDEPS@|$POMAKEFILEDEPS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile"
+-          for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do
+-            if test -f "$f"; then
+-              case "$f" in
+-                *.orig | *.bak | *~) ;;
+-                *) cat "$f" >> "$ac_dir/Makefile" ;;
+-              esac
+-            fi
+-          done
+-        fi
+-        ;;
+-      esac
+-    done]],
+-   [# Capture the value of obsolete ALL_LINGUAS because we need it to compute
+-    # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS. But hide it
+-    # from automake < 1.5.
+-    eval 'OBSOLETE_ALL_LINGUAS''="$ALL_LINGUAS"'
+-    # Capture the value of LINGUAS because we need it to compute CATALOGS.
+-    LINGUAS="${LINGUAS-%UNSET%}"
+-   ])
+-])
+-
+-dnl Postprocesses a Makefile in a directory containing PO files.
+-AC_DEFUN([AM_POSTPROCESS_PO_MAKEFILE],
+-[
+-  # When this code is run, in config.status, two variables have already been
+-  # set:
+-  # - OBSOLETE_ALL_LINGUAS is the value of LINGUAS set in configure.in,
+-  # - LINGUAS is the value of the environment variable LINGUAS at configure
+-  #   time.
+-
+-changequote(,)dnl
+-  # Adjust a relative srcdir.
+-  ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
+-  ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
+-  ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
+-  # In autoconf-2.13 it is called $ac_given_srcdir.
+-  # In autoconf-2.50 it is called $srcdir.
+-  test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
+-  case "$ac_given_srcdir" in
+-    .)  top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
+-    /*) top_srcdir="$ac_given_srcdir" ;;
+-    *)  top_srcdir="$ac_dots$ac_given_srcdir" ;;
+-  esac
+-
+-  # Find a way to echo strings without interpreting backslash.
+-  if test "X`(echo '\t') 2>/dev/null`" = 'X\t'; then
+-    gt_echo='echo'
+-  else
+-    if test "X`(printf '%s\n' '\t') 2>/dev/null`" = 'X\t'; then
+-      gt_echo='printf %s\n'
+-    else
+-      echo_func () {
+-        cat <<EOT
+-$*
+-EOT
+-      }
+-      gt_echo='echo_func'
+-    fi
+-  fi
+-
+-  # A sed script that extracts the value of VARIABLE from a Makefile.
+-  sed_x_variable='
+-# Test if the hold space is empty.
+-x
+-s/P/P/
+-x
+-ta
+-# Yes it was empty. Look if we have the expected variable definition.
+-/^[	 ]*VARIABLE[	 ]*=/{
+-  # Seen the first line of the variable definition.
+-  s/^[	 ]*VARIABLE[	 ]*=//
+-  ba
+-}
+-bd
+-:a
+-# Here we are processing a line from the variable definition.
+-# Remove comment, more precisely replace it with a space.
+-s/#.*$/ /
+-# See if the line ends in a backslash.
+-tb
+-:b
+-s/\\$//
+-# Print the line, without the trailing backslash.
+-p
+-tc
+-# There was no trailing backslash. The end of the variable definition is
+-# reached. Clear the hold space.
+-s/^.*$//
+-x
+-bd
+-:c
+-# A trailing backslash means that the variable definition continues in the
+-# next line. Put a nonempty string into the hold space to indicate this.
+-s/^.*$/P/
+-x
+-:d
+-'
+-changequote([,])dnl
+-
+-  # Set POTFILES to the value of the Makefile variable POTFILES.
+-  sed_x_POTFILES=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e 's/VARIABLE/POTFILES/g'`
+-  POTFILES=`sed -n -e "$sed_x_POTFILES" < "$ac_file"`
+-  # Compute POTFILES_DEPS as
+-  #   $(foreach file, $(POTFILES), $(top_srcdir)/$(file))
+-  POTFILES_DEPS=
+-  for file in $POTFILES; do
+-    POTFILES_DEPS="$POTFILES_DEPS "'$(top_srcdir)/'"$file"
+-  done
+-  POMAKEFILEDEPS=""
+-
+-  if test -n "$OBSOLETE_ALL_LINGUAS"; then
+-    test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
+-  fi
+-  if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
+-    # The LINGUAS file contains the set of available languages.
+-    ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
+-    POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
+-  else
+-    # Set ALL_LINGUAS to the value of the Makefile variable LINGUAS.
+-    sed_x_LINGUAS=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e 's/VARIABLE/LINGUAS/g'`
+-    ALL_LINGUAS_=`sed -n -e "$sed_x_LINGUAS" < "$ac_file"`
+-  fi
+-  # Hide the ALL_LINGUAS assigment from automake < 1.5.
+-  eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
+-  # Compute POFILES
+-  # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
+-  # Compute UPDATEPOFILES
+-  # as      $(foreach lang, $(ALL_LINGUAS), $(lang).po-update)
+-  # Compute DUMMYPOFILES
+-  # as      $(foreach lang, $(ALL_LINGUAS), $(lang).nop)
+-  # Compute GMOFILES
+-  # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo)
+-  # Compute PROPERTIESFILES
+-  # as      $(foreach lang, $(ALL_LINGUAS), $(top_srcdir)/$(DOMAIN)_$(lang).properties)
+-  # Compute CLASSFILES
+-  # as      $(foreach lang, $(ALL_LINGUAS), $(top_srcdir)/$(DOMAIN)_$(lang).class)
+-  # Compute QMFILES
+-  # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).qm)
+-  # Compute MSGFILES
+-  # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(frob $(lang)).msg)
+-  # Compute RESOURCESDLLFILES
+-  # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(frob $(lang))/$(DOMAIN).resources.dll)
+-  case "$ac_given_srcdir" in
+-    .) srcdirpre= ;;
+-    *) srcdirpre='$(srcdir)/' ;;
+-  esac
+-  POFILES=
+-  UPDATEPOFILES=
+-  DUMMYPOFILES=
+-  GMOFILES=
+-  PROPERTIESFILES=
+-  CLASSFILES=
+-  QMFILES=
+-  MSGFILES=
+-  RESOURCESDLLFILES=
+-  for lang in $ALL_LINGUAS; do
+-    POFILES="$POFILES $srcdirpre$lang.po"
+-    UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
+-    DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
+-    GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
+-    PROPERTIESFILES="$PROPERTIESFILES \$(top_srcdir)/\$(DOMAIN)_$lang.properties"
+-    CLASSFILES="$CLASSFILES \$(top_srcdir)/\$(DOMAIN)_$lang.class"
+-    QMFILES="$QMFILES $srcdirpre$lang.qm"
+-    frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
+-    MSGFILES="$MSGFILES $srcdirpre$frobbedlang.msg"
+-    frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
+-    RESOURCESDLLFILES="$RESOURCESDLLFILES $srcdirpre$frobbedlang/\$(DOMAIN).resources.dll"
+-  done
+-  # CATALOGS depends on both $ac_dir and the user's LINGUAS
+-  # environment variable.
+-  INST_LINGUAS=
+-  if test -n "$ALL_LINGUAS"; then
+-    for presentlang in $ALL_LINGUAS; do
+-      useit=no
+-      if test "%UNSET%" != "$LINGUAS"; then
+-        desiredlanguages="$LINGUAS"
+-      else
+-        desiredlanguages="$ALL_LINGUAS"
+-      fi
+-      for desiredlang in $desiredlanguages; do
+-        # Use the presentlang catalog if desiredlang is
+-        #   a. equal to presentlang, or
+-        #   b. a variant of presentlang (because in this case,
+-        #      presentlang can be used as a fallback for messages
+-        #      which are not translated in the desiredlang catalog).
+-        case "$desiredlang" in
+-          "$presentlang"*) useit=yes;;
+-        esac
+-      done
+-      if test $useit = yes; then
+-        INST_LINGUAS="$INST_LINGUAS $presentlang"
+-      fi
+-    done
+-  fi
+-  CATALOGS=
+-  JAVACATALOGS=
+-  QTCATALOGS=
+-  TCLCATALOGS=
+-  CSHARPCATALOGS=
+-  if test -n "$INST_LINGUAS"; then
+-    for lang in $INST_LINGUAS; do
+-      CATALOGS="$CATALOGS $lang.gmo"
+-      JAVACATALOGS="$JAVACATALOGS \$(DOMAIN)_$lang.properties"
+-      QTCATALOGS="$QTCATALOGS $lang.qm"
+-      frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
+-      TCLCATALOGS="$TCLCATALOGS $frobbedlang.msg"
+-      frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
+-      CSHARPCATALOGS="$CSHARPCATALOGS $frobbedlang/\$(DOMAIN).resources.dll"
+-    done
+-  fi
+-
+-  sed -e "s|@POTFILES_DEPS@|$POTFILES_DEPS|g" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@PROPERTIESFILES@|$PROPERTIESFILES|g" -e "s|@CLASSFILES@|$CLASSFILES|g" -e "s|@QMFILES@|$QMFILES|g" -e "s|@MSGFILES@|$MSGFILES|g" -e "s|@RESOURCESDLLFILES@|$RESOURCESDLLFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@JAVACATALOGS@|$JAVACATALOGS|g" -e "s|@QTCATALOGS@|$QTCATALOGS|g" -e "s|@TCLCATALOGS@|$TCLCATALOGS|g" -e "s|@CSHARPCATALOGS@|$CSHARPCATALOGS|g" -e 's,^#distdir:,distdir:,' < "$ac_file" > "$ac_file.tmp"
+-  if grep -l '@TCLCATALOGS@' "$ac_file" > /dev/null; then
+-    # Add dependencies that cannot be formulated as a simple suffix rule.
+-    for lang in $ALL_LINGUAS; do
+-      frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
+-      cat >> "$ac_file.tmp" <<EOF
+-$frobbedlang.msg: $lang.po
+-	@echo "\$(MSGFMT) -c --tcl -d \$(srcdir) -l $lang $srcdirpre$lang.po"; \
+-	\$(MSGFMT) -c --tcl -d "\$(srcdir)" -l $lang $srcdirpre$lang.po || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
+-EOF
+-    done
+-  fi
+-  if grep -l '@CSHARPCATALOGS@' "$ac_file" > /dev/null; then
+-    # Add dependencies that cannot be formulated as a simple suffix rule.
+-    for lang in $ALL_LINGUAS; do
+-      frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
+-      cat >> "$ac_file.tmp" <<EOF
+-$frobbedlang/\$(DOMAIN).resources.dll: $lang.po
+-	@echo "\$(MSGFMT) -c --csharp -d \$(srcdir) -l $lang $srcdirpre$lang.po -r \$(DOMAIN)"; \
+-	\$(MSGFMT) -c --csharp -d "\$(srcdir)" -l $lang $srcdirpre$lang.po -r "\$(DOMAIN)" || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
+-EOF
+-    done
+-  fi
+-  if test -n "$POMAKEFILEDEPS"; then
+-    cat >> "$ac_file.tmp" <<EOF
+-Makefile: $POMAKEFILEDEPS
+-EOF
+-  fi
+-  mv "$ac_file.tmp" "$ac_file"
+-])
+-
+-dnl Initializes the accumulator used by AM_XGETTEXT_OPTION.
+-AC_DEFUN([AM_XGETTEXT_OPTION_INIT],
+-[
+-  XGETTEXT_EXTRA_OPTIONS=
+-])
+-
+-dnl Registers an option to be passed to xgettext in the po subdirectory.
+-AC_DEFUN([AM_XGETTEXT_OPTION],
+-[
+-  AC_REQUIRE([AM_XGETTEXT_OPTION_INIT])
+-  XGETTEXT_EXTRA_OPTIONS="$XGETTEXT_EXTRA_OPTIONS $1"
+-])
+-
+ # Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+@@ -1664,6 +1214,7 @@ m4_include([gnulib/m4/open.m4])
+ m4_include([gnulib/m4/pathmax.m4])
+ m4_include([gnulib/m4/printf.m4])
+ m4_include([gnulib/m4/putenv.m4])
++m4_include([gnulib/m4/rawmemchr.m4])
+ m4_include([gnulib/m4/readlink.m4])
+ m4_include([gnulib/m4/realloc.m4])
+ m4_include([gnulib/m4/regex.m4])
+@@ -1683,6 +1234,7 @@ m4_include([gnulib/m4/stdio_h.m4])
+ m4_include([gnulib/m4/stdlib_h.m4])
+ m4_include([gnulib/m4/stpcpy.m4])
+ m4_include([gnulib/m4/stpncpy.m4])
++m4_include([gnulib/m4/strchrnul.m4])
+ m4_include([gnulib/m4/string_h.m4])
+ m4_include([gnulib/m4/strndup.m4])
+ m4_include([gnulib/m4/strnlen.m4])
+diff --git a/build/aux/config.guess b/build/aux/config.guess
+index 0e30d56..dc84c68 100755
+--- a/build/aux/config.guess
++++ b/build/aux/config.guess
+@@ -1,9 +1,10 @@
+ #! /bin/sh

@@ 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 rthurner at users.sourceforge.net  Mon Jan  2 20:36:39 2012
From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net)
Date: Mon, 02 Jan 2012 19:36:39 +0000
Subject: [csw-devel] SF.net SVN: gar:[16650]
	csw/mgar/pkg/subversion/trunk/Makefile
Message-ID: <E1RhngV-0003C9-Fd@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 16650
          http://gar.svn.sourceforge.net/gar/?rev=16650&view=rev
Author:   rthurner
Date:     2012-01-02 19:36:39 +0000 (Mon, 02 Jan 2012)
Log Message:
-----------
subverison, remove cyclic dependency, and make cswpythonsvn depend on cswpython

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

Modified: csw/mgar/pkg/subversion/trunk/Makefile
===================================================================
--- csw/mgar/pkg/subversion/trunk/Makefile	2012-01-02 17:25:44 UTC (rev 16649)
+++ csw/mgar/pkg/subversion/trunk/Makefile	2012-01-02 19:36:39 UTC (rev 16650)
@@ -217,8 +217,7 @@
 RUNTIME_DEP_PKGS_CSWpythonsvn += CSWlibneon27
 RUNTIME_DEP_PKGS_CSWpythonsvn += CSWlibsqlite3-0
 RUNTIME_DEP_PKGS_CSWpythonsvn += CSWosslrt
-RUNTIME_DEP_PKGS_CSWsvn += CSWpythonsvn
-RUNTIME_DEP_PKGS_CSWsvn += CSWpython
+RUNTIME_DEP_PKGS_CSWpythonsvn += CSWpython
 
 
 DISTFILES += CSWsvn.checkinstall

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


From rthurner at users.sourceforge.net  Mon Jan  2 21:00:22 2012
From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net)
Date: Mon, 02 Jan 2012 20:00:22 +0000
Subject: [csw-devel] SF.net SVN: gar:[16651]
	csw/mgar/pkg/subversion/trunk/Makefile
Message-ID: <E1Rho3S-0008GS-Uc@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 16651
          http://gar.svn.sourceforge.net/gar/?rev=16651&view=rev
Author:   rthurner
Date:     2012-01-02 20:00:22 +0000 (Mon, 02 Jan 2012)
Log Message:
-----------
subversion, python files should go into pythonsvn

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

Modified: csw/mgar/pkg/subversion/trunk/Makefile
===================================================================
--- csw/mgar/pkg/subversion/trunk/Makefile	2012-01-02 19:36:39 UTC (rev 16650)
+++ csw/mgar/pkg/subversion/trunk/Makefile	2012-01-02 20:00:22 UTC (rev 16651)
@@ -202,6 +202,7 @@
 SPKG_DESC_CSWpythonsvn           = Subversion Python Language Binding
 CATALOGNAME_CSWpythonsvn         = pythonsvn
 PKGFILES_CSWpythonsvn            = $(libdir)/python.*
+PKGFILES_CSWpythonsvn            = $(SVNLIB)/python.*
 PKGFILES_CSWpythonsvn           += $(SVNLIB)/.*swig_py.*
 PKGFILES_CSWpythonsvn           += $(docdir)/$(CATALOGNAME_CSWpythonsvn)/changelog.CSW
 RUNTIME_DEP_PKGS_CSWpythonsvn += CSWlibmagic1

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


From rthurner at users.sourceforge.net  Mon Jan  2 21:17:25 2012
From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net)
Date: Mon, 02 Jan 2012 20:17:25 +0000
Subject: [csw-devel] SF.net SVN: gar:[16652]
	csw/mgar/pkg/subversion/trunk/Makefile
Message-ID: <E1RhoJx-0004qt-S8@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 16652
          http://gar.svn.sourceforge.net/gar/?rev=16652&view=rev
Author:   rthurner
Date:     2012-01-02 20:17:25 +0000 (Mon, 02 Jan 2012)
Log Message:
-----------
subversion, ignore file paths now in pythonsvn

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

Modified: csw/mgar/pkg/subversion/trunk/Makefile
===================================================================
--- csw/mgar/pkg/subversion/trunk/Makefile	2012-01-02 20:00:22 UTC (rev 16651)
+++ csw/mgar/pkg/subversion/trunk/Makefile	2012-01-02 20:17:25 UTC (rev 16652)
@@ -52,24 +52,6 @@
 SPKG_DESC_CSWsvn           = Version control rethought
 CATALOGNAME_CSWsvn         = subversion
 CHECKPKG_OVERRIDES_CSWsvn += catalogname-does-not-match-pkgname|pkgname=CSWsvn|catalogname=subversion|expected-catalogname=svn
-CHECKPKG_OVERRIDES_CSWsvn += discouraged-path-in-pkgmap|/opt/csw/lib/svn/python/site-packages/svn/repos.pyc
-CHECKPKG_OVERRIDES_CSWsvn += discouraged-path-in-pkgmap|/opt/csw/lib/svn/python/site-packages/svn/wc.pyc
-CHECKPKG_OVERRIDES_CSWsvn += discouraged-path-in-pkgmap|/opt/csw/lib/svn/python/site-packages/libsvn/__init__.pyc
-CHECKPKG_OVERRIDES_CSWsvn += discouraged-path-in-pkgmap|/opt/csw/lib/svn/python/site-packages/libsvn/client.pyc
-CHECKPKG_OVERRIDES_CSWsvn += discouraged-path-in-pkgmap|/opt/csw/lib/svn/python/site-packages/libsvn/core.pyc
-CHECKPKG_OVERRIDES_CSWsvn += discouraged-path-in-pkgmap|/opt/csw/lib/svn/python/site-packages/libsvn/delta.pyc
-CHECKPKG_OVERRIDES_CSWsvn += discouraged-path-in-pkgmap|/opt/csw/lib/svn/python/site-packages/libsvn/diff.pyc
-CHECKPKG_OVERRIDES_CSWsvn += discouraged-path-in-pkgmap|/opt/csw/lib/svn/python/site-packages/libsvn/fs.pyc
-CHECKPKG_OVERRIDES_CSWsvn += discouraged-path-in-pkgmap|/opt/csw/lib/svn/python/site-packages/libsvn/ra.pyc
-CHECKPKG_OVERRIDES_CSWsvn += discouraged-path-in-pkgmap|/opt/csw/lib/svn/python/site-packages/libsvn/repos.pyc
-CHECKPKG_OVERRIDES_CSWsvn += discouraged-path-in-pkgmap|/opt/csw/lib/svn/python/site-packages/libsvn/wc.pyc
-CHECKPKG_OVERRIDES_CSWsvn += discouraged-path-in-pkgmap|/opt/csw/lib/svn/python/site-packages/svn/__init__.pyc
-CHECKPKG_OVERRIDES_CSWsvn += discouraged-path-in-pkgmap|/opt/csw/lib/svn/python/site-packages/svn/client.pyc
-CHECKPKG_OVERRIDES_CSWsvn += discouraged-path-in-pkgmap|/opt/csw/lib/svn/python/site-packages/svn/core.pyc
-CHECKPKG_OVERRIDES_CSWsvn += discouraged-path-in-pkgmap|/opt/csw/lib/svn/python/site-packages/svn/delta.pyc
-CHECKPKG_OVERRIDES_CSWsvn += discouraged-path-in-pkgmap|/opt/csw/lib/svn/python/site-packages/svn/diff.pyc
-CHECKPKG_OVERRIDES_CSWsvn += discouraged-path-in-pkgmap|/opt/csw/lib/svn/python/site-packages/svn/fs.pyc
-CHECKPKG_OVERRIDES_CSWsvn += discouraged-path-in-pkgmap|/opt/csw/lib/svn/python/site-packages/svn/ra.pyc
 RUNTIME_DEP_PKGS_CSWsvn      = CSWbdb48
 RUNTIME_DEP_PKGS_CSWsvn      += CSWsasl
 RUNTIME_DEP_PKGS_CSWsvn += CSWlibmagic1
@@ -205,6 +187,24 @@
 PKGFILES_CSWpythonsvn            = $(SVNLIB)/python.*
 PKGFILES_CSWpythonsvn           += $(SVNLIB)/.*swig_py.*
 PKGFILES_CSWpythonsvn           += $(docdir)/$(CATALOGNAME_CSWpythonsvn)/changelog.CSW
+CHECKPKG_OVERRIDES_CSWpythonsvn += discouraged-path-in-pkgmap|/opt/csw/lib/svn/python/site-packages/svn/repos.pyc
+CHECKPKG_OVERRIDES_CSWpythonsvn += discouraged-path-in-pkgmap|/opt/csw/lib/svn/python/site-packages/svn/wc.pyc
+CHECKPKG_OVERRIDES_CSWpythonsvn += discouraged-path-in-pkgmap|/opt/csw/lib/svn/python/site-packages/libsvn/__init__.pyc
+CHECKPKG_OVERRIDES_CSWpythonsvn += discouraged-path-in-pkgmap|/opt/csw/lib/svn/python/site-packages/libsvn/client.pyc
+CHECKPKG_OVERRIDES_CSWpythonsvn += discouraged-path-in-pkgmap|/opt/csw/lib/svn/python/site-packages/libsvn/core.pyc
+CHECKPKG_OVERRIDES_CSWpythonsvn += discouraged-path-in-pkgmap|/opt/csw/lib/svn/python/site-packages/libsvn/delta.pyc
+CHECKPKG_OVERRIDES_CSWpythonsvn += discouraged-path-in-pkgmap|/opt/csw/lib/svn/python/site-packages/libsvn/diff.pyc
+CHECKPKG_OVERRIDES_CSWpythonsvn += discouraged-path-in-pkgmap|/opt/csw/lib/svn/python/site-packages/libsvn/fs.pyc
+CHECKPKG_OVERRIDES_CSWpythonsvn += discouraged-path-in-pkgmap|/opt/csw/lib/svn/python/site-packages/libsvn/ra.pyc
+CHECKPKG_OVERRIDES_CSWpythonsvn += discouraged-path-in-pkgmap|/opt/csw/lib/svn/python/site-packages/libsvn/repos.pyc
+CHECKPKG_OVERRIDES_CSWpythonsvn += discouraged-path-in-pkgmap|/opt/csw/lib/svn/python/site-packages/libsvn/wc.pyc
+CHECKPKG_OVERRIDES_CSWpythonsvn += discouraged-path-in-pkgmap|/opt/csw/lib/svn/python/site-packages/svn/__init__.pyc
+CHECKPKG_OVERRIDES_CSWpythonsvn += discouraged-path-in-pkgmap|/opt/csw/lib/svn/python/site-packages/svn/client.pyc
+CHECKPKG_OVERRIDES_CSWpythonsvn += discouraged-path-in-pkgmap|/opt/csw/lib/svn/python/site-packages/svn/core.pyc
+CHECKPKG_OVERRIDES_CSWpythonsvn += discouraged-path-in-pkgmap|/opt/csw/lib/svn/python/site-packages/svn/delta.pyc
+CHECKPKG_OVERRIDES_CSWpythonsvn += discouraged-path-in-pkgmap|/opt/csw/lib/svn/python/site-packages/svn/diff.pyc
+CHECKPKG_OVERRIDES_CSWpythonsvn += discouraged-path-in-pkgmap|/opt/csw/lib/svn/python/site-packages/svn/fs.pyc
+CHECKPKG_OVERRIDES_CSWpythonsvn += discouraged-path-in-pkgmap|/opt/csw/lib/svn/python/site-packages/svn/ra.pyc
 RUNTIME_DEP_PKGS_CSWpythonsvn += CSWlibmagic1
 RUNTIME_DEP_PKGS_CSWpythonsvn += CSWlibiconv2
 RUNTIME_DEP_PKGS_CSWpythonsvn += CSWlibexpat1

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


From rthurner at users.sourceforge.net  Mon Jan  2 21:24:10 2012
From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net)
Date: Mon, 02 Jan 2012 20:24:10 +0000
Subject: [csw-devel] SF.net SVN: gar:[16653]
	csw/mgar/pkg/subversion/trunk/Makefile
Message-ID: <E1RhoQU-0000Dj-EB@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 16653
          http://gar.svn.sourceforge.net/gar/?rev=16653&view=rev
Author:   rthurner
Date:     2012-01-02 20:24:10 +0000 (Mon, 02 Jan 2012)
Log Message:
-----------
subversion: remove unused override

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

Modified: csw/mgar/pkg/subversion/trunk/Makefile
===================================================================
--- csw/mgar/pkg/subversion/trunk/Makefile	2012-01-02 20:17:25 UTC (rev 16652)
+++ csw/mgar/pkg/subversion/trunk/Makefile	2012-01-02 20:24:10 UTC (rev 16653)
@@ -134,7 +134,6 @@
 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/rw7|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
 
 
 PACKAGES += CSWpmsvn

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


From rthurner at users.sourceforge.net  Mon Jan  2 21:32:43 2012
From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net)
Date: Mon, 02 Jan 2012 20:32:43 +0000
Subject: [csw-devel] SF.net SVN: gar:[16654]
	csw/mgar/pkg/subversion/trunk/Makefile
Message-ID: <E1RhoYl-0005J4-74@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 16654
          http://gar.svn.sourceforge.net/gar/?rev=16654&view=rev
Author:   rthurner
Date:     2012-01-02 20:32:42 +0000 (Mon, 02 Jan 2012)
Log Message:
-----------
subversion: undo, override is necessary on sparc

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

Modified: csw/mgar/pkg/subversion/trunk/Makefile
===================================================================
--- csw/mgar/pkg/subversion/trunk/Makefile	2012-01-02 20:24:10 UTC (rev 16653)
+++ csw/mgar/pkg/subversion/trunk/Makefile	2012-01-02 20:32:42 UTC (rev 16654)
@@ -134,8 +134,8 @@
 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/rw7|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
 
-
 PACKAGES += CSWpmsvn
 SPKG_DESC_CSWpmsvn         = Subversion Perl Language Binding
 CATALOGNAME_CSWpmsvn       = pm_subversion

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


From guengel at users.sourceforge.net  Mon Jan  2 21:52:56 2012
From: guengel at users.sourceforge.net (guengel at users.sourceforge.net)
Date: Mon, 02 Jan 2012 20:52:56 +0000
Subject: [csw-devel] SF.net SVN: gar:[16655]
 csw/mgar/pkg/postgresql/branches/postgresql-8. 3-raos
Message-ID: <E1RhosK-0002ck-Ml@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 16655
          http://gar.svn.sourceforge.net/gar/?rev=16655&view=rev
Author:   guengel
Date:     2012-01-02 20:52:56 +0000 (Mon, 02 Jan 2012)
Log Message:
-----------
postgresql/branches/postgresql-8.3-raos: Added section about migrating from CSWpostgresql. Location of log file can be configured now.

Modified Paths:
--------------
    csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/Makefile
    csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/README.CSW
    csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/cswpostgresql.tmpl
    csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/postgresql.conf.tmpl

Modified: csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/Makefile
===================================================================
--- csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/Makefile	2012-01-02 20:32:42 UTC (rev 16654)
+++ csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/Makefile	2012-01-02 20:52:56 UTC (rev 16655)
@@ -118,6 +118,10 @@
 PGDOCDIR		= $(datadir)/doc/$(NAME)/$(BASE_VERSION_NODOT)
 PGLOCALSTATEDIR_BASE	= $(localstatedir)/$(NAME)
 PGDATA			= $(PGLOCALSTATEDIR_BASE)/$(BASE_VERSION_NODOT)
+# This variable has been introduced for using in EXPANDVARS files
+PGNAMEVERSIONED		= $(NAME)$(BASE_VERSION_NODOT)
+# This variable has been introduced for using in EXPANDVARS files
+PGNAME_VERSIONED	= $(NAME)-$(BASE_VERSION_NODOT)
 # Those BIN_NAMES_* are used both, for package creation and alternatives
 BIN_NAMES_SERVER	= initdb ipcclean pg_controldata pg_ctl pg_resetxlog postmaster postgres
 BIN_NAMES_DEVEL		= ecpg pg_config

Modified: csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/README.CSW
===================================================================
--- csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/README.CSW	2012-01-02 20:32:42 UTC (rev 16654)
+++ csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/README.CSW	2012-01-02 20:52:56 UTC (rev 16655)
@@ -7,17 +7,35 @@
 
 OpenCSW's PostgreSQL allows for parallel installation of different
 PostgreSQL versions. Therefore, the binaries have appended the
-PostgreSQL version, e.g. PostgreSQL's @VERSION@ `psql' is named
+PostgreSQL version number, e.g. PostgreSQL's @VERSION@ `psql' is named
 `psql- at BASE_VERSION_NODOT@'. The same holds for manpages.
 
 The notable exception to this are development files. Development files
 are only available for the latest PostgreSQL version provided by
-OpenCSW and have no version appended.
+OpenCSW and have no version number appended.
 
 Please see also `Starting the PostgreSQL Server' below for caveat on
 running multiple PostgreSQL servers in parallel.
 
 
+Migrating from CSWpostgresql
+----------------------------
+
+CSWpostgresql has been superseeded by CSW at NAME@@BASE_VERSION_NODOT at .
+It is possible to have CSWpostgresql and CSW at NAME@@BASE_VERSION_NODOT@
+installed on the same system, though. Please refer to `Starting the
+PostgreSQL Server' below for more information on how to run multiple
+PostgreSQL instances on the same system.
+
+In order to migrate from CSWpostgresql to CSW at NAME@@BASE_VERSION_NODOT@,
+create a full dump of the CSWpostgresql database cluster as
+described in
+
+ http://www.postgresql.org/docs/@BASE_VERSION@/static/migration.html
+
+and transfer it to the CSW at NAME@@BASE_VERSION_NODOT@ database cluster.
+
+
 32/64-bit Binaries
 ------------------
 
@@ -56,7 +74,7 @@
 
  @sysconfdir@/postgresql- at BASE_VERSION_NODOT@.conf
 
-and the database server will not be started, allowing for
+and the database server will not be started, thus allowing for
 post-installation customization.
 
 In order to start the PostgreSQL server you can either use
@@ -91,13 +109,15 @@
 ------------------------------------
 
 Configuration of the server start-up options is done through a
-user-configuration file, `@sysconfdir@/postgresql- at BASE_VERSION_NODOT@.conf'.
-A sample template has been provided for you at `/etc/opt/csw/postgresql- at BASE_VERSION_NODOT@.conf.CSW'.
+user-configuration file, `@sysconfdir@/postgresql- at BASE_VERSION_NODOT@.conf', regardless of
+whether Solaris SMF or System V-style initialization is used.
 
-This file also defines the location of the PostgreSQL database
-cluster in `PGDATA', which is by default `/var/opt/csw/postgresql/@BASE_VERSION_NODOT@'.
+This file also defines the location of the PostgreSQL database cluster
+in `PGDATA', which is by default
 
+ /var/opt/csw/postgresql/@BASE_VERSION_NODOT@
 
+
 Initializing the Database Cluster
 ---------------------------------
 
@@ -112,7 +132,12 @@
 When installing PostgreSQL for the first time, the database cluster
 will be initialized using default values.
 
+Please note, that when changing the memory model of the server
+binaries, i.e. from 32-bit to 64-bit or vice versa, you have to
+re-initialize the database cluster (see also `32/64-bit Binaries'
+above).
 
+
 --
 That's all folks.
 

Modified: csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/cswpostgresql.tmpl
===================================================================
--- csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/cswpostgresql.tmpl	2012-01-02 20:32:42 UTC (rev 16654)
+++ csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/cswpostgresql.tmpl	2012-01-02 20:52:56 UTC (rev 16655)
@@ -32,6 +32,7 @@
 [ -z "${SHUTDOWNMODE}" ] && SHUTDOWNMODE=fast
 [ -z "${PGENCODING}" ] && PGENCODING=UTF8
 [ -z "${PGSUPERUSER}" ] && PGSUPERUSER=postgres
+[ -z "${PGLOGOUTPUT}" ] && PGLOGOUTPUT=${PGDATA}/postgresql.log
 
 if [ -n "${SERVEROPTS}" ]
 then
@@ -64,16 +65,16 @@
 	 echo "Starting PostgreSQL..."
 	 if [ -n "${SERVEROPTS}" ]
 	 then
-	     su postgres -c "${PGCTL} start -D ${PGDATA} -l ${PGDATA}/postgresql.log -o '${SERVEROPTS}'"
+	     su postgres -c "${PGCTL} start -D ${PGDATA} -l ${PGLOGOUTPUT} -o '${SERVEROPTS}'"
 	 else
-	     su postgres -c "${PGCTL} start -D ${PGDATA} -l ${PGDATA}/postgresql.log"
+	     su postgres -c "${PGCTL} start -D ${PGDATA} -l ${PGLOGOUTPUT}"
 	 fi
       fi
       ;;
 
 stop)
      echo "Stopping PostgreSQL database..."
-     su postgres -c "${PGCTL} stop -D ${PGDATA} -l ${PGDATA}/postgresql.log -m ${SHUTDOWNMODE}"
+     su postgres -c "${PGCTL} stop -D ${PGDATA} -l ${PGLOGOUTPUT} -m ${SHUTDOWNMODE}"
      true  # The previous command fails when there's no .pid file
      ;;
 
@@ -81,15 +82,15 @@
      echo "Restarting PostgreSQL database..."
      if [ -n "${SERVEROPTS}" ]
      then
-	 su postgres -c "${PGCTL} restart -D ${PGDATA} -l ${PGDATA}/postgresql.log -m ${SHUTDOWNMODE} -o '${SERVEROPTS}'"
+	 su postgres -c "${PGCTL} restart -D ${PGDATA} -l ${PGLOGOUTPUT} -m ${SHUTDOWNMODE} -o '${SERVEROPTS}'"
      else
-	 su postgres -c "${PGCTL} restart -D ${PGDATA} -l ${PGDATA}/postgresql.log -m ${SHUTDOWNMODE}"
+	 su postgres -c "${PGCTL} restart -D ${PGDATA} -l ${PGLOGOUTPUT} -m ${SHUTDOWNMODE}"
      fi
      ;;
 
 reload)
      echo "Reloading PostgreSQL database..."
-     su postgres -c "${PGCTL} reload -D ${PGDATA} -l ${PGDATA}/postgresql.log"
+     su postgres -c "${PGCTL} reload -D ${PGDATA} -l ${PGLOGOUTPUT}"
      ;;
 
 status)

Modified: csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/postgresql.conf.tmpl
===================================================================
--- csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/postgresql.conf.tmpl	2012-01-02 20:32:42 UTC (rev 16654)
+++ csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/postgresql.conf.tmpl	2012-01-02 20:52:56 UTC (rev 16655)
@@ -1,35 +1,37 @@
-# Example PostgreSQL server configuration file.
+# This is a shell script fragment.
 # 
-# Provided by the OpenCSW package of PostgreSQL.  This file is read by the
-# /etc/opt/csw/init.d/cswpostgres startup script, and can be used to override
-# the defaults.
+# This file is sourced by the /etc/opt/csw/init.d/csw at PGNAME_VERSIONED@
+# startup script, and can be used to override the defaults.
 #
 # Please use alternatives to choose between 32/64bit version of the
-# server (See also @docdir@/@NAME@@BASE_VERSION_NODOT at _server/README.CSW)
+# server (See also @docdir@/@PGNAMEVERSIONED at _server/README.CSW)
 
 # The location of the data directory.
+#
 # Default: @PGDATA@
 PGDATA=@PGDATA@
 
-# The shutdown mode used
+# Specifies the shutdown mode. mode can be smart, fast, or immediate,
+# or the first letter of one of these three.
 #
-# Shutdown modes are:
-#  smart       quit after all clients have disconnected
-#  fast        quit directly, with proper shutdown
-#  immediate   quit without complete shutdown; will lead to recovery on restart
-#
 # Default: fast
-SHUTDOWNMODE=fast
+#SHUTDOWNMODE=fast
 
+# Append the server log output to filename. If the file does not
+# exist, it is created. The umask is set to 077, so access to the log
+# file from other users is disallowed by default
+#
+# Default: ${PGDATA}/postgresql.log
+#PGLOGOUTPUT=${PGDATA}/postgresql.log
+
 # Additional options to pass to postmaster.
 #
 # Please note: it is no longer necessary to pass the '-o' option.
 #
 # SERVEROPTS="-i"
 
-
 ##
-## The following options are used by initdb when initializing the
+## The following variables are used by initdb when initializing the
 ## database cluster
 ##
 
@@ -41,7 +43,7 @@
 #  http://www.postgresql.org/docs/@BASE_VERSION@/static/multibyte.html#MULTIBYTE-CHARSET-SUPPORTED
 #
 # Default: UTF8
-PGENCODING=UTF8
+#PGENCODING=UTF8
 
 # The locale used to initialize the database cluster.
 #
@@ -58,4 +60,4 @@
 # name is different.
 #
 # Default: postgres
-PGSUPERUSER=postgres
+#PGSUPERUSER=postgres

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


From guengel at users.sourceforge.net  Mon Jan  2 21:54:25 2012
From: guengel at users.sourceforge.net (guengel at users.sourceforge.net)
Date: Mon, 02 Jan 2012 20:54:25 +0000
Subject: [csw-devel] SF.net SVN: gar:[16656]
 csw/mgar/pkg/postgresql/branches/postgresql-8. 4-raos
Message-ID: <E1Rhotl-0002eQ-0C@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 16656
          http://gar.svn.sourceforge.net/gar/?rev=16656&view=rev
Author:   guengel
Date:     2012-01-02 20:54:24 +0000 (Mon, 02 Jan 2012)
Log Message:
-----------
postgresql/branches/postgresql-8.4-raos: Added section about migrating from CSWpostgresql. Location of log file can be configured now.

Modified Paths:
--------------
    csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/Makefile

Added Paths:
-----------
    csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/files/README.CSW
    csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/files/cswpostgresql.tmpl
    csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/files/postgresql.conf.tmpl

Removed Paths:
-------------
    csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/files/README.CSW
    csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/files/cswpostgresql.tmpl
    csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/files/postgresql.conf.tmpl

Modified: csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/Makefile
===================================================================
--- csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/Makefile	2012-01-02 20:52:56 UTC (rev 16655)
+++ csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/Makefile	2012-01-02 20:54:24 UTC (rev 16656)
@@ -118,6 +118,10 @@
 PGDOCDIR		= $(datadir)/doc/$(NAME)/$(BASE_VERSION_NODOT)
 PGLOCALSTATEDIR_BASE	= $(localstatedir)/$(NAME)
 PGDATA			= $(PGLOCALSTATEDIR_BASE)/$(BASE_VERSION_NODOT)
+# This variable has been introduced for using in EXPANDVARS files
+PGNAMEVERSIONED		= $(NAME)$(BASE_VERSION_NODOT)
+# This variable has been introduced for using in EXPANDVARS files
+PGNAME_VERSIONED	= $(NAME)-$(BASE_VERSION_NODOT)
 # Those BIN_NAMES_* are used both, for package creation and alternatives.
 # 8.4 has removed ipcclean
 BIN_NAMES_SERVER	= initdb pg_controldata pg_ctl pg_resetxlog postmaster postgres

Deleted: csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/files/README.CSW
===================================================================
--- csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/files/README.CSW	2012-01-02 20:52:56 UTC (rev 16655)
+++ csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/files/README.CSW	2012-01-02 20:54:24 UTC (rev 16656)
@@ -1,120 +0,0 @@
-OpenCSW PostgreSQL
-==================
-
-
-Parallel Installations
-----------------------
-
-OpenCSW's PostgreSQL allows for parallel installation of different
-PostgreSQL versions. Therefore, the binaries have appended the
-PostgreSQL version, e.g. PostgreSQL's @VERSION@ `psql' is named
-`psql- at BASE_VERSION_NODOT@'. The same holds for manpages.
-
-The notable exception to this are development files. Development files
-are only available for the latest PostgreSQL version provided by
-OpenCSW and have no version appended.
-
-Please see also `Starting the PostgreSQL Server' below for caveat on
-running multiple PostgreSQL servers in parallel.
-
-
-32/64-bit Binaries
-------------------
-
-It can be chosen between 32-bit or 64-bit binaries using the
-alternatives mechanism (see the alternative's README.user). By
-default, PostgreSQL will use 64-bit binaries.
-
-Alternatives are provided for server, client, contrib, and dev
-binaries separately. This makes it possible to select different memory
-models for those binaries independently.
-
-In order to list the alternatives provided, issue
-
- /opt/csw/sbin/alternatives --list
-
-on the command line.
-
-Please note, that a database cluster initialized by the 32-bit server
-binaries cannot be used by the 64-bit versions and vice versa. If you
-want to switch the memory model of the server, you have to
-
- 1. dump the entire database cluster
- 2. switch the memory model of the server binaries
- 3. remove the database cluster
- 4. re-initialize the database cluster using `initdb- at BASE_VERSION_NODOT@'
-    (see also `Initializing the Database Cluster' below)
- 5. start the server and restore the database cluster from the dump
-    created in step 1.
-
-
-Starting the PostgreSQL Server
-------------------------------
-
-When installing the PostgreSQL server for the first time, only the
-database cluster will be initialized using default values provided by
-
- @sysconfdir@/postgresql- at BASE_VERSION_NODOT@.conf
-
-and the database server will not be started, allowing for
-post-installation customization.
-
-In order to start the PostgreSQL server you can either use
-
- svcadm enable cswpostgresql- at BASE_VERSION_NODOT@    # Solaris 10+ only
-
-or
-
- @sysconfdir@/init.d/cswpostgresql- at BASE_VERSION_NODOT@ start
-
-Please note, that when installing multiple PostgreSQL server versions
-in parallel, the above method will work for the first database server
-started only. Subsequent servers starts will fail unless the listening
-port is set to distinct values using the `SERVEROPTS' in
-
- @sysconfdir@/postgresql-XY.conf
-
-like
-
- SERVEROPTS="-p <portnum>"
-
-where `<portnum>' is the port number the server has to listen on,
-which is by default 5432. So, one could configure the servers, for
-instance, to make the first server listen on 5432, the second on 5433,
-and so on.
-
-Alternatively, one can use the `postgresql.conf' file in the database
-cluster directory to provide a different listening port.
-
-
-User Configuration of Server Options
-------------------------------------
-
-Configuration of the server start-up options is done through a
-user-configuration file, `@sysconfdir@/postgresql- at BASE_VERSION_NODOT@.conf'.
-A sample template has been provided for you at `/etc/opt/csw/postgresql- at BASE_VERSION_NODOT@.conf.CSW'.
-
-This file also defines the location of the PostgreSQL database
-cluster in `PGDATA', which is by default `/var/opt/csw/postgresql/@BASE_VERSION_NODOT@'.
-
-
-Initializing the Database Cluster
----------------------------------
-
-The startup script `/etc/opt/csw/init.d/cswpostgresql- at BASE_VERSION_NODOT@' allows to
-initialize the database cluster by providing the argument `init' as such
-
- /etc/opt/csw/init.d/cswpostgresql- at BASE_VERSION_NODOT@ init
-
-This will initialize the database cluster at the location specified in
-the `PGDATA' variable defined in `/etc/opt/csw/postgresql- at BASE_VERSION_NODOT@.conf'.
-
-When installing PostgreSQL for the first time, the database cluster
-will be initialized using default values.
-
-
---
-That's all folks.
-
-Rafael Ostertag
-raos at opencsw.org

Copied: csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/files/README.CSW (from rev 16646, csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/README.CSW)
===================================================================
--- csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/files/README.CSW	                        (rev 0)
+++ csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/files/README.CSW	2012-01-02 20:54:24 UTC (rev 16656)
@@ -0,0 +1,145 @@
+OpenCSW PostgreSQL
+==================
+
+
+Parallel Installations
+----------------------
+
+OpenCSW's PostgreSQL allows for parallel installation of different
+PostgreSQL versions. Therefore, the binaries have appended the
+PostgreSQL version number, e.g. PostgreSQL's @VERSION@ `psql' is named
+`psql- at BASE_VERSION_NODOT@'. The same holds for manpages.
+
+The notable exception to this are development files. Development files
+are only available for the latest PostgreSQL version provided by
+OpenCSW and have no version number appended.
+
+Please see also `Starting the PostgreSQL Server' below for caveat on
+running multiple PostgreSQL servers in parallel.
+
+
+Migrating from CSWpostgresql
+----------------------------
+
+CSWpostgresql has been superseeded by CSW at NAME@@BASE_VERSION_NODOT at .
+It is possible to have CSWpostgresql and CSW at NAME@@BASE_VERSION_NODOT@
+installed on the same system, though. Please refer to `Starting the
+PostgreSQL Server' below for more information on how to run multiple
+PostgreSQL instances on the same system.
+
+In order to migrate from CSWpostgresql to CSW at NAME@@BASE_VERSION_NODOT@,
+create a full dump of the CSWpostgresql database cluster as
+described in
+
+ http://www.postgresql.org/docs/@BASE_VERSION@/static/migration.html
+
+and transfer it to the CSW at NAME@@BASE_VERSION_NODOT@ database cluster.
+
+
+32/64-bit Binaries
+------------------
+
+It can be chosen between 32-bit or 64-bit binaries using the
+alternatives mechanism (see the alternative's README.user). By
+default, PostgreSQL will use 64-bit binaries.
+
+Alternatives are provided for server, client, contrib, and dev
+binaries separately. This makes it possible to select different memory
+models for those binaries independently.
+
+In order to list the alternatives provided, issue
+
+ /opt/csw/sbin/alternatives --list
+
+on the command line.
+
+Please note, that a database cluster initialized by the 32-bit server
+binaries cannot be used by the 64-bit versions and vice versa. If you
+want to switch the memory model of the server, you have to
+
+ 1. dump the entire database cluster
+ 2. switch the memory model of the server binaries
+ 3. remove the database cluster
+ 4. re-initialize the database cluster using `initdb- at BASE_VERSION_NODOT@'
+    (see also `Initializing the Database Cluster' below)
+ 5. start the server and restore the database cluster from the dump
+    created in step 1.
+
+
+Starting the PostgreSQL Server
+------------------------------
+
+When installing the PostgreSQL server for the first time, only the
+database cluster will be initialized using default values provided by
+
+ @sysconfdir@/postgresql- at BASE_VERSION_NODOT@.conf
+
+and the database server will not be started, thus allowing for
+post-installation customization.
+
+In order to start the PostgreSQL server you can either use
+
+ svcadm enable cswpostgresql- at BASE_VERSION_NODOT@    # Solaris 10+ only
+
+or
+
+ @sysconfdir@/init.d/cswpostgresql- at BASE_VERSION_NODOT@ start
+
+Please note, that when installing multiple PostgreSQL server versions
+in parallel, the above method will work for the first database server
+started only. Subsequent servers starts will fail unless the listening
+port is set to distinct values using the `SERVEROPTS' in
+
+ @sysconfdir@/postgresql-XY.conf
+
+like
+
+ SERVEROPTS="-p <portnum>"
+
+where `<portnum>' is the port number the server has to listen on,
+which is by default 5432. So, one could configure the servers, for
+instance, to make the first server listen on 5432, the second on 5433,
+and so on.
+
+Alternatively, one can use the `postgresql.conf' file in the database
+cluster directory to provide a different listening port.
+
+
+User Configuration of Server Options
+------------------------------------
+
+Configuration of the server start-up options is done through a
+user-configuration file, `@sysconfdir@/postgresql- at BASE_VERSION_NODOT@.conf', regardless of
+whether Solaris SMF or System V-style initialization is used.
+
+This file also defines the location of the PostgreSQL database cluster
+in `PGDATA', which is by default
+
+ /var/opt/csw/postgresql/@BASE_VERSION_NODOT@
+
+
+Initializing the Database Cluster
+---------------------------------
+
+The startup script `/etc/opt/csw/init.d/cswpostgresql- at BASE_VERSION_NODOT@' allows to
+initialize the database cluster by providing the argument `init' as such
+
+ /etc/opt/csw/init.d/cswpostgresql- at BASE_VERSION_NODOT@ init
+
+This will initialize the database cluster at the location specified in
+the `PGDATA' variable defined in `/etc/opt/csw/postgresql- at BASE_VERSION_NODOT@.conf'.
+
+When installing PostgreSQL for the first time, the database cluster
+will be initialized using default values.
+
+Please note, that when changing the memory model of the server
+binaries, i.e. from 32-bit to 64-bit or vice versa, you have to
+re-initialize the database cluster (see also `32/64-bit Binaries'
+above).
+
+
+--
+That's all folks.
+
+Rafael Ostertag
+raos at opencsw.org

Deleted: csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/files/cswpostgresql.tmpl
===================================================================
--- csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/files/cswpostgresql.tmpl	2012-01-02 20:52:56 UTC (rev 16655)
+++ csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/files/cswpostgresql.tmpl	2012-01-02 20:54:24 UTC (rev 16656)
@@ -1,116 +0,0 @@
-#!/bin/sh
-# $Id$
-#
-# PostgreSQL startup script - part of the CSWpostgresql package
-#
-# 2009-11-29  Maciej Blizinski (maciej at opencsw.org)
-#   - Parametrized file locations
-#   - Style changes
-#
-#
-#RC_KNUM 20         # Number used for kill script symlink, e.g. K20cswfoo
-#RC_SNUM 80         # Number used for start script symlink, e.g. S80cswfoo
-#RC_KLEV 0,1,2,S    # Run levels that should have a kill script symlink
-#RC_SLEV 3          # Run levels that should have a start script symlink
-#AUTOENABLE no      # If set to no will not enable service regardless of
-#                     local csw.conf, use when a package needs setup before
-#                     being useful, would otherwise leave service in
-#                     maintenance mode
-
-VERSION=@BASE_VERSION_NODOT@
-
-USERCONF=@CSWPGSQLCONFFILE_VERSIONED@
-PGCTL=@bindir@/pg_ctl-${VERSION}
-PGINIT=@bindir@/initdb-${VERSION}
-
-# Read in the user configuration file
-[ -s /opt/csw/etc/${USERCONF} ] && . /opt/csw/etc/${USERCONF}
-[ -s @sysconfdir@/${USERCONF} ] && . @sysconfdir@/${USERCONF}
-
-# Defaults
-[ -z "${PGDATA}" ] && PGDATA=@PGDATA@
-[ -z "${SHUTDOWNMODE}" ] && SHUTDOWNMODE=fast
-[ -z "${PGENCODING}" ] && PGENCODING=UTF8
-[ -z "${PGSUPERUSER}" ] && PGSUPERUSER=postgres
-
-if [ -n "${SERVEROPTS}" ]
-then
-    # Remove the -o option, we provide it later on
-    SERVEROPTS=`echo "${SERVEROPTS}" | sed 's/^-o[ ]*//'`
-fi
-if [ -n "${PGLOCALE}" ]
-then
-    PGLOCALE="--locale=${PGLOCALE}"
-fi
-
-
-# Exit if postgres user hasn't been created.
-# FIXME: This bit of code is old. It might be obsolete.
-if grep '^postgres:' /etc/passwd >/dev/null; then
-	echo > /dev/null
-else
-  getent passwd postgres >/dev/null
-  if [ $? -ne 0 ] ; then
-	 exit 0
-  fi
-fi
-
-cd /
-
-case "$1" in
-start)
-      if [ -d ${PGDATA} -a `ls -l ${PGDATA} 2> /dev/null | wc -l` -gt 1 ]; then
-	 # PostgreSQL data directory exists and is populated
-	 echo "Starting PostgreSQL..."
-	 if [ -n "${SERVEROPTS}" ]
-	 then
-	     su postgres -c "${PGCTL} start -D ${PGDATA} -l ${PGDATA}/postgresql.log -o '${SERVEROPTS}'"
-	 else
-	     su postgres -c "${PGCTL} start -D ${PGDATA} -l ${PGDATA}/postgresql.log"
-	 fi
-      fi
-      ;;
-
-stop)
-     echo "Stopping PostgreSQL database..."
-     su postgres -c "${PGCTL} stop -D ${PGDATA} -l ${PGDATA}/postgresql.log -m ${SHUTDOWNMODE}"
-     true  # The previous command fails when there's no .pid file
-     ;;
-
-restart)
-     echo "Restarting PostgreSQL database..."
-     if [ -n "${SERVEROPTS}" ]
-     then
-	 su postgres -c "${PGCTL} restart -D ${PGDATA} -l ${PGDATA}/postgresql.log -m ${SHUTDOWNMODE} -o '${SERVEROPTS}'"
-     else
-	 su postgres -c "${PGCTL} restart -D ${PGDATA} -l ${PGDATA}/postgresql.log -m ${SHUTDOWNMODE}"
-     fi
-     ;;
-
-reload)
-     echo "Reloading PostgreSQL database..."
-     su postgres -c "${PGCTL} reload -D ${PGDATA} -l ${PGDATA}/postgresql.log"
-     ;;
-
-status)
-     su postgres -c "${PGCTL} status -D ${PGDATA}"
-     ;;
-
-init)
-     # create and initialise data directory
-     echo "Creating PostgreSQL data directory at ${PGDATA}..."
-     # Create it, unless it's already there and empty
-     [ -d "${PGDATA}" -a `ls -l ${PGDATA} 2> /dev/null | wc -l` -eq 1 ] || mkdir -p "${PGDATA}"
-     chown postgres "${PGDATA}"
-     chmod 0700 "${PGDATA}"
-     echo "Initialising PostgreSQL database..."
-     su postgres -c "\"${PGINIT}\" -D \"${PGDATA}\" -E ${PGENCODING} -U ${PGSUPERUSER} ${PGLOCALE}"
-     ;;
-
-*)
-     echo "Usage: ${0} (init|start|stop|restart|reload|status)"
-     ;;
-
-esac
-
-# vim:set ft=sh sw=2 ts=2 sts=2 expandtab si ci:

Copied: csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/files/cswpostgresql.tmpl (from rev 16646, csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/cswpostgresql.tmpl)
===================================================================
--- csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/files/cswpostgresql.tmpl	                        (rev 0)
+++ csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/files/cswpostgresql.tmpl	2012-01-02 20:54:24 UTC (rev 16656)
@@ -0,0 +1,117 @@
+#!/bin/sh
+# $Id$
+#
+# PostgreSQL startup script - part of the CSWpostgresql package
+#
+# 2009-11-29  Maciej Blizinski (maciej at opencsw.org)
+#   - Parametrized file locations
+#   - Style changes
+#
+#
+#RC_KNUM 20         # Number used for kill script symlink, e.g. K20cswfoo
+#RC_SNUM 80         # Number used for start script symlink, e.g. S80cswfoo
+#RC_KLEV 0,1,2,S    # Run levels that should have a kill script symlink
+#RC_SLEV 3          # Run levels that should have a start script symlink
+#AUTOENABLE no      # If set to no will not enable service regardless of
+#                     local csw.conf, use when a package needs setup before
+#                     being useful, would otherwise leave service in
+#                     maintenance mode
+
+VERSION=@BASE_VERSION_NODOT@
+
+USERCONF=@CSWPGSQLCONFFILE_VERSIONED@
+PGCTL=@bindir@/pg_ctl-${VERSION}
+PGINIT=@bindir@/initdb-${VERSION}
+
+# Read in the user configuration file
+[ -s /opt/csw/etc/${USERCONF} ] && . /opt/csw/etc/${USERCONF}
+[ -s @sysconfdir@/${USERCONF} ] && . @sysconfdir@/${USERCONF}
+
+# Defaults
+[ -z "${PGDATA}" ] && PGDATA=@PGDATA@
+[ -z "${SHUTDOWNMODE}" ] && SHUTDOWNMODE=fast
+[ -z "${PGENCODING}" ] && PGENCODING=UTF8
+[ -z "${PGSUPERUSER}" ] && PGSUPERUSER=postgres
+[ -z "${PGLOGOUTPUT}" ] && PGLOGOUTPUT=${PGDATA}/postgresql.log
+
+if [ -n "${SERVEROPTS}" ]
+then
+    # Remove the -o option, we provide it later on
+    SERVEROPTS=`echo "${SERVEROPTS}" | sed 's/^-o[ ]*//'`
+fi
+if [ -n "${PGLOCALE}" ]
+then
+    PGLOCALE="--locale=${PGLOCALE}"
+fi
+
+
+# Exit if postgres user hasn't been created.
+# FIXME: This bit of code is old. It might be obsolete.
+if grep '^postgres:' /etc/passwd >/dev/null; then
+	echo > /dev/null
+else
+  getent passwd postgres >/dev/null
+  if [ $? -ne 0 ] ; then
+	 exit 0
+  fi
+fi
+
+cd /
+
+case "$1" in
+start)
+      if [ -d ${PGDATA} -a `ls -l ${PGDATA} 2> /dev/null | wc -l` -gt 1 ]; then
+	 # PostgreSQL data directory exists and is populated
+	 echo "Starting PostgreSQL..."
+	 if [ -n "${SERVEROPTS}" ]
+	 then
+	     su postgres -c "${PGCTL} start -D ${PGDATA} -l ${PGLOGOUTPUT} -o '${SERVEROPTS}'"
+	 else
+	     su postgres -c "${PGCTL} start -D ${PGDATA} -l ${PGLOGOUTPUT}"
+	 fi
+      fi
+      ;;
+
+stop)
+     echo "Stopping PostgreSQL database..."
+     su postgres -c "${PGCTL} stop -D ${PGDATA} -l ${PGLOGOUTPUT} -m ${SHUTDOWNMODE}"
+     true  # The previous command fails when there's no .pid file
+     ;;
+
+restart)
+     echo "Restarting PostgreSQL database..."
+     if [ -n "${SERVEROPTS}" ]
+     then
+	 su postgres -c "${PGCTL} restart -D ${PGDATA} -l ${PGLOGOUTPUT} -m ${SHUTDOWNMODE} -o '${SERVEROPTS}'"
+     else
+	 su postgres -c "${PGCTL} restart -D ${PGDATA} -l ${PGLOGOUTPUT} -m ${SHUTDOWNMODE}"
+     fi
+     ;;
+
+reload)
+     echo "Reloading PostgreSQL database..."
+     su postgres -c "${PGCTL} reload -D ${PGDATA} -l ${PGLOGOUTPUT}"
+     ;;
+
+status)
+     su postgres -c "${PGCTL} status -D ${PGDATA}"
+     ;;
+
+init)
+     # create and initialise data directory
+     echo "Creating PostgreSQL data directory at ${PGDATA}..."
+     # Create it, unless it's already there and empty
+     [ -d "${PGDATA}" -a `ls -l ${PGDATA} 2> /dev/null | wc -l` -eq 1 ] || mkdir -p "${PGDATA}"
+     chown postgres "${PGDATA}"
+     chmod 0700 "${PGDATA}"
+     echo "Initialising PostgreSQL database..."
+     su postgres -c "\"${PGINIT}\" -D \"${PGDATA}\" -E ${PGENCODING} -U ${PGSUPERUSER} ${PGLOCALE}"
+     ;;
+
+*)
+     echo "Usage: ${0} (init|start|stop|restart|reload|status)"
+     ;;
+
+esac
+
+# vim:set ft=sh sw=2 ts=2 sts=2 expandtab si ci:

Deleted: csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/files/postgresql.conf.tmpl
===================================================================
--- csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/files/postgresql.conf.tmpl	2012-01-02 20:52:56 UTC (rev 16655)
+++ csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/files/postgresql.conf.tmpl	2012-01-02 20:54:24 UTC (rev 16656)
@@ -1,61 +0,0 @@
-# Example PostgreSQL server configuration file.
-# 
-# Provided by the OpenCSW package of PostgreSQL.  This file is read by the
-# /etc/opt/csw/init.d/cswpostgres startup script, and can be used to override
-# the defaults.
-#
-# Please use alternatives to choose between 32/64bit version of the
-# server (See also @docdir@/@NAME@@BASE_VERSION_NODOT at _server/README.CSW)
-
-# The location of the data directory.
-# Default: @PGDATA@
-PGDATA=@PGDATA@
-
-# The shutdown mode used
-#
-# Shutdown modes are:
-#  smart       quit after all clients have disconnected
-#  fast        quit directly, with proper shutdown
-#  immediate   quit without complete shutdown; will lead to recovery on restart
-#
-# Default: fast
-SHUTDOWNMODE=fast
-
-# Additional options to pass to postmaster.
-#
-# Please note: it is no longer necessary to pass the '-o' option.
-#
-# SERVEROPTS="-i"
-
-
-##
-## The following options are used by initdb when initializing the
-## database cluster
-##
-
-# The PostgreSQL encoding of the database cluster. This is used when
-# initializing the database cluster using the init script.
-#
-# For a complete list of character sets supported, go to
-#
-#  http://www.postgresql.org/docs/@BASE_VERSION@/static/multibyte.html#MULTIBYTE-CHARSET-SUPPORTED
-#
-# Default: UTF8
-PGENCODING=UTF8
-
-# The locale used to initialize the database cluster.
-#
-# If none is specified, the locale is inherited from the environment
-# that initdb runs in.
-#
-# Default: <empty>
-#PGLOCALE=en_US.UTF-8
-
-# Selects the user name of the database superuser. This defaults to
-# the name of the effective user running initdb. It is really not
-# important what the superuser's name is, but one might choose to keep
-# the customary name postgres, even if the operating system user's
-# name is different.
-#
-# Default: postgres
-PGSUPERUSER=postgres

Copied: csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/files/postgresql.conf.tmpl (from rev 16646, csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/postgresql.conf.tmpl)
===================================================================
--- csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/files/postgresql.conf.tmpl	                        (rev 0)
+++ csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/files/postgresql.conf.tmpl	2012-01-02 20:54:24 UTC (rev 16656)
@@ -0,0 +1,63 @@
+# This is a shell script fragment.
+# 
+# This file is sourced by the /etc/opt/csw/init.d/csw at PGNAME_VERSIONED@
+# startup script, and can be used to override the defaults.
+#
+# Please use alternatives to choose between 32/64bit version of the
+# server (See also @docdir@/@PGNAMEVERSIONED at _server/README.CSW)
+
+# The location of the data directory.
+#
+# Default: @PGDATA@
+PGDATA=@PGDATA@
+
+# Specifies the shutdown mode. mode can be smart, fast, or immediate,
+# or the first letter of one of these three.
+#
+# Default: fast
+#SHUTDOWNMODE=fast
+
+# Append the server log output to filename. If the file does not
+# exist, it is created. The umask is set to 077, so access to the log
+# file from other users is disallowed by default
+#
+# Default: ${PGDATA}/postgresql.log
+#PGLOGOUTPUT=${PGDATA}/postgresql.log
+
+# Additional options to pass to postmaster.
+#
+# Please note: it is no longer necessary to pass the '-o' option.
+#
+# SERVEROPTS="-i"
+
+##
+## The following variables are used by initdb when initializing the
+## database cluster
+##
+
+# The PostgreSQL encoding of the database cluster. This is used when
+# initializing the database cluster using the init script.
+#
+# For a complete list of character sets supported, go to
+#
+#  http://www.postgresql.org/docs/@BASE_VERSION@/static/multibyte.html#MULTIBYTE-CHARSET-SUPPORTED
+#
+# Default: UTF8
+#PGENCODING=UTF8
+
+# The locale used to initialize the database cluster.
+#
+# If none is specified, the locale is inherited from the environment
+# that initdb runs in.
+#
+# Default: <empty>
+#PGLOCALE=en_US.UTF-8
+
+# Selects the user name of the database superuser. This defaults to
+# the name of the effective user running initdb. It is really not
+# important what the superuser's name is, but one might choose to keep
+# the customary name postgres, even if the operating system user's
+# name is different.
+#
+# Default: postgres
+#PGSUPERUSER=postgres

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


From guengel at users.sourceforge.net  Mon Jan  2 21:55:34 2012
From: guengel at users.sourceforge.net (guengel at users.sourceforge.net)
Date: Mon, 02 Jan 2012 20:55:34 +0000
Subject: [csw-devel] SF.net SVN: gar:[16657]
 csw/mgar/pkg/postgresql/branches/postgresql-9. 0-raos
Message-ID: <E1Rhous-0002fP-J3@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 16657
          http://gar.svn.sourceforge.net/gar/?rev=16657&view=rev
Author:   guengel
Date:     2012-01-02 20:55:34 +0000 (Mon, 02 Jan 2012)
Log Message:
-----------
postgresql/branches/postgresql-9.0-raos: Added section about migrating from CSWpostgresql. Location of log file can be configured now.

Modified Paths:
--------------
    csw/mgar/pkg/postgresql/branches/postgresql-9.0-raos/Makefile

Added Paths:
-----------
    csw/mgar/pkg/postgresql/branches/postgresql-9.0-raos/files/README.CSW
    csw/mgar/pkg/postgresql/branches/postgresql-9.0-raos/files/cswpostgresql.tmpl
    csw/mgar/pkg/postgresql/branches/postgresql-9.0-raos/files/postgresql.conf.tmpl

Removed Paths:
-------------
    csw/mgar/pkg/postgresql/branches/postgresql-9.0-raos/files/README.CSW
    csw/mgar/pkg/postgresql/branches/postgresql-9.0-raos/files/cswpostgresql.tmpl
    csw/mgar/pkg/postgresql/branches/postgresql-9.0-raos/files/postgresql.conf.tmpl

Modified: csw/mgar/pkg/postgresql/branches/postgresql-9.0-raos/Makefile
===================================================================
--- csw/mgar/pkg/postgresql/branches/postgresql-9.0-raos/Makefile	2012-01-02 20:54:24 UTC (rev 16656)
+++ csw/mgar/pkg/postgresql/branches/postgresql-9.0-raos/Makefile	2012-01-02 20:55:34 UTC (rev 16657)
@@ -118,6 +118,10 @@
 PGDOCDIR		= $(datadir)/doc/$(NAME)/$(BASE_VERSION_NODOT)
 PGLOCALSTATEDIR_BASE	= $(localstatedir)/$(NAME)
 PGDATA			= $(PGLOCALSTATEDIR_BASE)/$(BASE_VERSION_NODOT)
+# This variable has been introduced for using in EXPANDVARS files
+PGNAMEVERSIONED		= $(NAME)$(BASE_VERSION_NODOT)
+# This variable has been introduced for using in EXPANDVARS files
+PGNAME_VERSIONED	= $(NAME)-$(BASE_VERSION_NODOT)
 # Those BIN_NAMES_* are used both, for package creation and alternatives.
 # 8.4 has removed ipcclean
 BIN_NAMES_SERVER	= initdb pg_controldata pg_ctl pg_resetxlog postmaster postgres

Deleted: csw/mgar/pkg/postgresql/branches/postgresql-9.0-raos/files/README.CSW
===================================================================
--- csw/mgar/pkg/postgresql/branches/postgresql-9.0-raos/files/README.CSW	2012-01-02 20:54:24 UTC (rev 16656)
+++ csw/mgar/pkg/postgresql/branches/postgresql-9.0-raos/files/README.CSW	2012-01-02 20:55:34 UTC (rev 16657)
@@ -1,120 +0,0 @@
-OpenCSW PostgreSQL
-==================
-
-
-Parallel Installations
-----------------------
-
-OpenCSW's PostgreSQL allows for parallel installation of different
-PostgreSQL versions. Therefore, the binaries have appended the
-PostgreSQL version, e.g. PostgreSQL's @VERSION@ `psql' is named
-`psql- at BASE_VERSION_NODOT@'. The same holds for manpages.
-
-The notable exception to this are development files. Development files
-are only available for the latest PostgreSQL version provided by
-OpenCSW and have no version appended.
-
-Please see also `Starting the PostgreSQL Server' below for caveat on
-running multiple PostgreSQL servers in parallel.
-
-
-32/64-bit Binaries
-------------------
-
-It can be chosen between 32-bit or 64-bit binaries using the
-alternatives mechanism (see the alternative's README.user). By
-default, PostgreSQL will use 64-bit binaries.
-
-Alternatives are provided for server, client, contrib, and dev
-binaries separately. This makes it possible to select different memory
-models for those binaries independently.
-
-In order to list the alternatives provided, issue
-
- /opt/csw/sbin/alternatives --list
-
-on the command line.
-
-Please note, that a database cluster initialized by the 32-bit server
-binaries cannot be used by the 64-bit versions and vice versa. If you
-want to switch the memory model of the server, you have to
-
- 1. dump the entire database cluster
- 2. switch the memory model of the server binaries
- 3. remove the database cluster
- 4. re-initialize the database cluster using `initdb- at BASE_VERSION_NODOT@'
-    (see also `Initializing the Database Cluster' below)
- 5. start the server and restore the database cluster from the dump
-    created in step 1.
-
-
-Starting the PostgreSQL Server
-------------------------------
-
-When installing the PostgreSQL server for the first time, only the
-database cluster will be initialized using default values provided by
-
- @sysconfdir@/postgresql- at BASE_VERSION_NODOT@.conf
-
-and the database server will not be started, allowing for
-post-installation customization.
-
-In order to start the PostgreSQL server you can either use
-
- svcadm enable cswpostgresql- at BASE_VERSION_NODOT@    # Solaris 10+ only
-
-or
-
- @sysconfdir@/init.d/cswpostgresql- at BASE_VERSION_NODOT@ start
-
-Please note, that when installing multiple PostgreSQL server versions
-in parallel, the above method will work for the first database server
-started only. Subsequent servers starts will fail unless the listening
-port is set to distinct values using the `SERVEROPTS' in
-
- @sysconfdir@/postgresql-XY.conf
-
-like
-
- SERVEROPTS="-p <portnum>"
-
-where `<portnum>' is the port number the server has to listen on,
-which is by default 5432. So, one could configure the servers, for
-instance, to make the first server listen on 5432, the second on 5433,
-and so on.
-
-Alternatively, one can use the `postgresql.conf' file in the database
-cluster directory to provide a different listening port.
-
-
-User Configuration of Server Options
-------------------------------------
-
-Configuration of the server start-up options is done through a
-user-configuration file, `@sysconfdir@/postgresql- at BASE_VERSION_NODOT@.conf'.
-A sample template has been provided for you at `/etc/opt/csw/postgresql- at BASE_VERSION_NODOT@.conf.CSW'.
-
-This file also defines the location of the PostgreSQL database
-cluster in `PGDATA', which is by default `/var/opt/csw/postgresql/@BASE_VERSION_NODOT@'.
-
-
-Initializing the Database Cluster
----------------------------------
-
-The startup script `/etc/opt/csw/init.d/cswpostgresql- at BASE_VERSION_NODOT@' allows to
-initialize the database cluster by providing the argument `init' as such
-
- /etc/opt/csw/init.d/cswpostgresql- at BASE_VERSION_NODOT@ init
-
-This will initialize the database cluster at the location specified in
-the `PGDATA' variable defined in `/etc/opt/csw/postgresql- at BASE_VERSION_NODOT@.conf'.
-
-When installing PostgreSQL for the first time, the database cluster
-will be initialized using default values.
-
-
---
-That's all folks.
-
-Rafael Ostertag
-raos at opencsw.org

Copied: csw/mgar/pkg/postgresql/branches/postgresql-9.0-raos/files/README.CSW (from rev 16646, csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/README.CSW)
===================================================================
--- csw/mgar/pkg/postgresql/branches/postgresql-9.0-raos/files/README.CSW	                        (rev 0)
+++ csw/mgar/pkg/postgresql/branches/postgresql-9.0-raos/files/README.CSW	2012-01-02 20:55:34 UTC (rev 16657)
@@ -0,0 +1,145 @@
+OpenCSW PostgreSQL
+==================
+
+
+Parallel Installations
+----------------------
+
+OpenCSW's PostgreSQL allows for parallel installation of different
+PostgreSQL versions. Therefore, the binaries have appended the
+PostgreSQL version number, e.g. PostgreSQL's @VERSION@ `psql' is named
+`psql- at BASE_VERSION_NODOT@'. The same holds for manpages.
+
+The notable exception to this are development files. Development files
+are only available for the latest PostgreSQL version provided by
+OpenCSW and have no version number appended.
+
+Please see also `Starting the PostgreSQL Server' below for caveat on
+running multiple PostgreSQL servers in parallel.
+
+
+Migrating from CSWpostgresql
+----------------------------
+
+CSWpostgresql has been superseeded by CSW at NAME@@BASE_VERSION_NODOT at .
+It is possible to have CSWpostgresql and CSW at NAME@@BASE_VERSION_NODOT@
+installed on the same system, though. Please refer to `Starting the
+PostgreSQL Server' below for more information on how to run multiple
+PostgreSQL instances on the same system.
+
+In order to migrate from CSWpostgresql to CSW at NAME@@BASE_VERSION_NODOT@,
+create a full dump of the CSWpostgresql database cluster as
+described in
+
+ http://www.postgresql.org/docs/@BASE_VERSION@/static/migration.html
+
+and transfer it to the CSW at NAME@@BASE_VERSION_NODOT@ database cluster.
+
+
+32/64-bit Binaries
+------------------
+
+It can be chosen between 32-bit or 64-bit binaries using the
+alternatives mechanism (see the alternative's README.user). By
+default, PostgreSQL will use 64-bit binaries.
+
+Alternatives are provided for server, client, contrib, and dev
+binaries separately. This makes it possible to select different memory
+models for those binaries independently.
+
+In order to list the alternatives provided, issue
+
+ /opt/csw/sbin/alternatives --list
+
+on the command line.
+
+Please note, that a database cluster initialized by the 32-bit server
+binaries cannot be used by the 64-bit versions and vice versa. If you
+want to switch the memory model of the server, you have to
+
+ 1. dump the entire database cluster
+ 2. switch the memory model of the server binaries
+ 3. remove the database cluster
+ 4. re-initialize the database cluster using `initdb- at BASE_VERSION_NODOT@'
+    (see also `Initializing the Database Cluster' below)
+ 5. start the server and restore the database cluster from the dump
+    created in step 1.
+
+
+Starting the PostgreSQL Server
+------------------------------
+
+When installing the PostgreSQL server for the first time, only the
+database cluster will be initialized using default values provided by
+
+ @sysconfdir@/postgresql- at BASE_VERSION_NODOT@.conf
+
+and the database server will not be started, thus allowing for
+post-installation customization.
+
+In order to start the PostgreSQL server you can either use
+
+ svcadm enable cswpostgresql- at BASE_VERSION_NODOT@    # Solaris 10+ only
+
+or
+
+ @sysconfdir@/init.d/cswpostgresql- at BASE_VERSION_NODOT@ start
+
+Please note, that when installing multiple PostgreSQL server versions
+in parallel, the above method will work for the first database server
+started only. Subsequent servers starts will fail unless the listening
+port is set to distinct values using the `SERVEROPTS' in
+
+ @sysconfdir@/postgresql-XY.conf
+
+like
+
+ SERVEROPTS="-p <portnum>"
+
+where `<portnum>' is the port number the server has to listen on,
+which is by default 5432. So, one could configure the servers, for
+instance, to make the first server listen on 5432, the second on 5433,
+and so on.
+
+Alternatively, one can use the `postgresql.conf' file in the database
+cluster directory to provide a different listening port.
+
+
+User Configuration of Server Options
+------------------------------------
+
+Configuration of the server start-up options is done through a
+user-configuration file, `@sysconfdir@/postgresql- at BASE_VERSION_NODOT@.conf', regardless of
+whether Solaris SMF or System V-style initialization is used.
+
+This file also defines the location of the PostgreSQL database cluster
+in `PGDATA', which is by default
+
+ /var/opt/csw/postgresql/@BASE_VERSION_NODOT@
+
+
+Initializing the Database Cluster
+---------------------------------
+
+The startup script `/etc/opt/csw/init.d/cswpostgresql- at BASE_VERSION_NODOT@' allows to
+initialize the database cluster by providing the argument `init' as such
+
+ /etc/opt/csw/init.d/cswpostgresql- at BASE_VERSION_NODOT@ init
+
+This will initialize the database cluster at the location specified in
+the `PGDATA' variable defined in `/etc/opt/csw/postgresql- at BASE_VERSION_NODOT@.conf'.
+
+When installing PostgreSQL for the first time, the database cluster
+will be initialized using default values.
+
+Please note, that when changing the memory model of the server
+binaries, i.e. from 32-bit to 64-bit or vice versa, you have to
+re-initialize the database cluster (see also `32/64-bit Binaries'
+above).
+
+
+--
+That's all folks.
+
+Rafael Ostertag
+raos at opencsw.org

Deleted: csw/mgar/pkg/postgresql/branches/postgresql-9.0-raos/files/cswpostgresql.tmpl
===================================================================
--- csw/mgar/pkg/postgresql/branches/postgresql-9.0-raos/files/cswpostgresql.tmpl	2012-01-02 20:54:24 UTC (rev 16656)
+++ csw/mgar/pkg/postgresql/branches/postgresql-9.0-raos/files/cswpostgresql.tmpl	2012-01-02 20:55:34 UTC (rev 16657)
@@ -1,116 +0,0 @@
-#!/bin/sh
-# $Id$
-#
-# PostgreSQL startup script - part of the CSWpostgresql package
-#
-# 2009-11-29  Maciej Blizinski (maciej at opencsw.org)
-#   - Parametrized file locations
-#   - Style changes
-#
-#
-#RC_KNUM 20         # Number used for kill script symlink, e.g. K20cswfoo
-#RC_SNUM 80         # Number used for start script symlink, e.g. S80cswfoo
-#RC_KLEV 0,1,2,S    # Run levels that should have a kill script symlink
-#RC_SLEV 3          # Run levels that should have a start script symlink
-#AUTOENABLE no      # If set to no will not enable service regardless of
-#                     local csw.conf, use when a package needs setup before
-#                     being useful, would otherwise leave service in
-#                     maintenance mode
-
-VERSION=@BASE_VERSION_NODOT@
-
-USERCONF=@CSWPGSQLCONFFILE_VERSIONED@
-PGCTL=@bindir@/pg_ctl-${VERSION}
-PGINIT=@bindir@/initdb-${VERSION}
-
-# Read in the user configuration file
-[ -s /opt/csw/etc/${USERCONF} ] && . /opt/csw/etc/${USERCONF}
-[ -s @sysconfdir@/${USERCONF} ] && . @sysconfdir@/${USERCONF}
-
-# Defaults
-[ -z "${PGDATA}" ] && PGDATA=@PGDATA@
-[ -z "${SHUTDOWNMODE}" ] && SHUTDOWNMODE=fast
-[ -z "${PGENCODING}" ] && PGENCODING=UTF8
-[ -z "${PGSUPERUSER}" ] && PGSUPERUSER=postgres
-
-if [ -n "${SERVEROPTS}" ]
-then
-    # Remove the -o option, we provide it later on
-    SERVEROPTS=`echo "${SERVEROPTS}" | sed 's/^-o[ ]*//'`
-fi
-if [ -n "${PGLOCALE}" ]
-then
-    PGLOCALE="--locale=${PGLOCALE}"
-fi
-
-
-# Exit if postgres user hasn't been created.
-# FIXME: This bit of code is old. It might be obsolete.
-if grep '^postgres:' /etc/passwd >/dev/null; then
-	echo > /dev/null
-else
-  getent passwd postgres >/dev/null
-  if [ $? -ne 0 ] ; then
-	 exit 0
-  fi
-fi
-
-cd /
-
-case "$1" in
-start)
-      if [ -d ${PGDATA} -a `ls -l ${PGDATA} 2> /dev/null | wc -l` -gt 1 ]; then
-	 # PostgreSQL data directory exists and is populated
-	 echo "Starting PostgreSQL..."
-	 if [ -n "${SERVEROPTS}" ]
-	 then
-	     su postgres -c "${PGCTL} start -D ${PGDATA} -l ${PGDATA}/postgresql.log -o '${SERVEROPTS}'"
-	 else
-	     su postgres -c "${PGCTL} start -D ${PGDATA} -l ${PGDATA}/postgresql.log"
-	 fi
-      fi
-      ;;
-
-stop)
-     echo "Stopping PostgreSQL database..."
-     su postgres -c "${PGCTL} stop -D ${PGDATA} -l ${PGDATA}/postgresql.log -m ${SHUTDOWNMODE}"
-     true  # The previous command fails when there's no .pid file
-     ;;
-
-restart)
-     echo "Restarting PostgreSQL database..."
-     if [ -n "${SERVEROPTS}" ]
-     then
-	 su postgres -c "${PGCTL} restart -D ${PGDATA} -l ${PGDATA}/postgresql.log -m ${SHUTDOWNMODE} -o '${SERVEROPTS}'"
-     else
-	 su postgres -c "${PGCTL} restart -D ${PGDATA} -l ${PGDATA}/postgresql.log -m ${SHUTDOWNMODE}"
-     fi
-     ;;
-
-reload)
-     echo "Reloading PostgreSQL database..."
-     su postgres -c "${PGCTL} reload -D ${PGDATA} -l ${PGDATA}/postgresql.log"
-     ;;
-
-status)
-     su postgres -c "${PGCTL} status -D ${PGDATA}"
-     ;;
-
-init)
-     # create and initialise data directory
-     echo "Creating PostgreSQL data directory at ${PGDATA}..."
-     # Create it, unless it's already there and empty
-     [ -d "${PGDATA}" -a `ls -l ${PGDATA} 2> /dev/null | wc -l` -eq 1 ] || mkdir -p "${PGDATA}"
-     chown postgres "${PGDATA}"
-     chmod 0700 "${PGDATA}"
-     echo "Initialising PostgreSQL database..."
-     su postgres -c "\"${PGINIT}\" -D \"${PGDATA}\" -E ${PGENCODING} -U ${PGSUPERUSER} ${PGLOCALE}"
-     ;;
-
-*)
-     echo "Usage: ${0} (init|start|stop|restart|reload|status)"
-     ;;
-
-esac
-
-# vim:set ft=sh sw=2 ts=2 sts=2 expandtab si ci:

Copied: csw/mgar/pkg/postgresql/branches/postgresql-9.0-raos/files/cswpostgresql.tmpl (from rev 16646, csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/cswpostgresql.tmpl)
===================================================================
--- csw/mgar/pkg/postgresql/branches/postgresql-9.0-raos/files/cswpostgresql.tmpl	                        (rev 0)
+++ csw/mgar/pkg/postgresql/branches/postgresql-9.0-raos/files/cswpostgresql.tmpl	2012-01-02 20:55:34 UTC (rev 16657)
@@ -0,0 +1,117 @@
+#!/bin/sh
+# $Id$
+#
+# PostgreSQL startup script - part of the CSWpostgresql package
+#
+# 2009-11-29  Maciej Blizinski (maciej at opencsw.org)
+#   - Parametrized file locations
+#   - Style changes
+#
+#
+#RC_KNUM 20         # Number used for kill script symlink, e.g. K20cswfoo
+#RC_SNUM 80         # Number used for start script symlink, e.g. S80cswfoo
+#RC_KLEV 0,1,2,S    # Run levels that should have a kill script symlink
+#RC_SLEV 3          # Run levels that should have a start script symlink
+#AUTOENABLE no      # If set to no will not enable service regardless of
+#                     local csw.conf, use when a package needs setup before
+#                     being useful, would otherwise leave service in
+#                     maintenance mode
+
+VERSION=@BASE_VERSION_NODOT@
+
+USERCONF=@CSWPGSQLCONFFILE_VERSIONED@
+PGCTL=@bindir@/pg_ctl-${VERSION}
+PGINIT=@bindir@/initdb-${VERSION}
+
+# Read in the user configuration file
+[ -s /opt/csw/etc/${USERCONF} ] && . /opt/csw/etc/${USERCONF}
+[ -s @sysconfdir@/${USERCONF} ] && . @sysconfdir@/${USERCONF}
+
+# Defaults
+[ -z "${PGDATA}" ] && PGDATA=@PGDATA@
+[ -z "${SHUTDOWNMODE}" ] && SHUTDOWNMODE=fast
+[ -z "${PGENCODING}" ] && PGENCODING=UTF8
+[ -z "${PGSUPERUSER}" ] && PGSUPERUSER=postgres
+[ -z "${PGLOGOUTPUT}" ] && PGLOGOUTPUT=${PGDATA}/postgresql.log
+
+if [ -n "${SERVEROPTS}" ]
+then
+    # Remove the -o option, we provide it later on
+    SERVEROPTS=`echo "${SERVEROPTS}" | sed 's/^-o[ ]*//'`
+fi
+if [ -n "${PGLOCALE}" ]
+then
+    PGLOCALE="--locale=${PGLOCALE}"
+fi
+
+
+# Exit if postgres user hasn't been created.
+# FIXME: This bit of code is old. It might be obsolete.
+if grep '^postgres:' /etc/passwd >/dev/null; then
+	echo > /dev/null
+else
+  getent passwd postgres >/dev/null
+  if [ $? -ne 0 ] ; then
+	 exit 0
+  fi
+fi
+
+cd /
+
+case "$1" in
+start)
+      if [ -d ${PGDATA} -a `ls -l ${PGDATA} 2> /dev/null | wc -l` -gt 1 ]; then
+	 # PostgreSQL data directory exists and is populated
+	 echo "Starting PostgreSQL..."
+	 if [ -n "${SERVEROPTS}" ]
+	 then
+	     su postgres -c "${PGCTL} start -D ${PGDATA} -l ${PGLOGOUTPUT} -o '${SERVEROPTS}'"
+	 else
+	     su postgres -c "${PGCTL} start -D ${PGDATA} -l ${PGLOGOUTPUT}"
+	 fi
+      fi
+      ;;
+
+stop)
+     echo "Stopping PostgreSQL database..."
+     su postgres -c "${PGCTL} stop -D ${PGDATA} -l ${PGLOGOUTPUT} -m ${SHUTDOWNMODE}"
+     true  # The previous command fails when there's no .pid file
+     ;;
+
+restart)
+     echo "Restarting PostgreSQL database..."
+     if [ -n "${SERVEROPTS}" ]
+     then
+	 su postgres -c "${PGCTL} restart -D ${PGDATA} -l ${PGLOGOUTPUT} -m ${SHUTDOWNMODE} -o '${SERVEROPTS}'"
+     else
+	 su postgres -c "${PGCTL} restart -D ${PGDATA} -l ${PGLOGOUTPUT} -m ${SHUTDOWNMODE}"
+     fi
+     ;;
+
+reload)
+     echo "Reloading PostgreSQL database..."
+     su postgres -c "${PGCTL} reload -D ${PGDATA} -l ${PGLOGOUTPUT}"
+     ;;
+
+status)
+     su postgres -c "${PGCTL} status -D ${PGDATA}"
+     ;;
+
+init)
+     # create and initialise data directory
+     echo "Creating PostgreSQL data directory at ${PGDATA}..."
+     # Create it, unless it's already there and empty
+     [ -d "${PGDATA}" -a `ls -l ${PGDATA} 2> /dev/null | wc -l` -eq 1 ] || mkdir -p "${PGDATA}"
+     chown postgres "${PGDATA}"
+     chmod 0700 "${PGDATA}"
+     echo "Initialising PostgreSQL database..."
+     su postgres -c "\"${PGINIT}\" -D \"${PGDATA}\" -E ${PGENCODING} -U ${PGSUPERUSER} ${PGLOCALE}"
+     ;;
+
+*)
+     echo "Usage: ${0} (init|start|stop|restart|reload|status)"
+     ;;
+
+esac
+
+# vim:set ft=sh sw=2 ts=2 sts=2 expandtab si ci:

Deleted: csw/mgar/pkg/postgresql/branches/postgresql-9.0-raos/files/postgresql.conf.tmpl
===================================================================
--- csw/mgar/pkg/postgresql/branches/postgresql-9.0-raos/files/postgresql.conf.tmpl	2012-01-02 20:54:24 UTC (rev 16656)
+++ csw/mgar/pkg/postgresql/branches/postgresql-9.0-raos/files/postgresql.conf.tmpl	2012-01-02 20:55:34 UTC (rev 16657)
@@ -1,61 +0,0 @@
-# Example PostgreSQL server configuration file.
-# 
-# Provided by the OpenCSW package of PostgreSQL.  This file is read by the
-# /etc/opt/csw/init.d/cswpostgres startup script, and can be used to override
-# the defaults.
-#
-# Please use alternatives to choose between 32/64bit version of the
-# server (See also @docdir@/@NAME@@BASE_VERSION_NODOT at _server/README.CSW)
-
-# The location of the data directory.
-# Default: @PGDATA@
-PGDATA=@PGDATA@
-
-# The shutdown mode used
-#
-# Shutdown modes are:
-#  smart       quit after all clients have disconnected
-#  fast        quit directly, with proper shutdown
-#  immediate   quit without complete shutdown; will lead to recovery on restart
-#
-# Default: fast
-SHUTDOWNMODE=fast
-
-# Additional options to pass to postmaster.
-#
-# Please note: it is no longer necessary to pass the '-o' option.
-#
-# SERVEROPTS="-i"
-
-
-##
-## The following options are used by initdb when initializing the
-## database cluster
-##
-
-# The PostgreSQL encoding of the database cluster. This is used when
-# initializing the database cluster using the init script.
-#
-# For a complete list of character sets supported, go to
-#
-#  http://www.postgresql.org/docs/@BASE_VERSION@/static/multibyte.html#MULTIBYTE-CHARSET-SUPPORTED
-#
-# Default: UTF8
-PGENCODING=UTF8
-
-# The locale used to initialize the database cluster.
-#
-# If none is specified, the locale is inherited from the environment
-# that initdb runs in.
-#
-# Default: <empty>
-#PGLOCALE=en_US.UTF-8
-
-# Selects the user name of the database superuser. This defaults to
-# the name of the effective user running initdb. It is really not
-# important what the superuser's name is, but one might choose to keep
-# the customary name postgres, even if the operating system user's
-# name is different.
-#
-# Default: postgres
-PGSUPERUSER=postgres

Copied: csw/mgar/pkg/postgresql/branches/postgresql-9.0-raos/files/postgresql.conf.tmpl (from rev 16646, csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/postgresql.conf.tmpl)
===================================================================
--- csw/mgar/pkg/postgresql/branches/postgresql-9.0-raos/files/postgresql.conf.tmpl	                        (rev 0)
+++ csw/mgar/pkg/postgresql/branches/postgresql-9.0-raos/files/postgresql.conf.tmpl	2012-01-02 20:55:34 UTC (rev 16657)
@@ -0,0 +1,63 @@
+# This is a shell script fragment.
+# 
+# This file is sourced by the /etc/opt/csw/init.d/csw at PGNAME_VERSIONED@
+# startup script, and can be used to override the defaults.
+#
+# Please use alternatives to choose between 32/64bit version of the
+# server (See also @docdir@/@PGNAMEVERSIONED at _server/README.CSW)
+
+# The location of the data directory.
+#
+# Default: @PGDATA@
+PGDATA=@PGDATA@
+
+# Specifies the shutdown mode. mode can be smart, fast, or immediate,
+# or the first letter of one of these three.
+#
+# Default: fast
+#SHUTDOWNMODE=fast
+
+# Append the server log output to filename. If the file does not
+# exist, it is created. The umask is set to 077, so access to the log
+# file from other users is disallowed by default
+#
+# Default: ${PGDATA}/postgresql.log
+#PGLOGOUTPUT=${PGDATA}/postgresql.log
+
+# Additional options to pass to postmaster.
+#
+# Please note: it is no longer necessary to pass the '-o' option.
+#
+# SERVEROPTS="-i"
+
+##
+## The following variables are used by initdb when initializing the
+## database cluster
+##
+
+# The PostgreSQL encoding of the database cluster. This is used when
+# initializing the database cluster using the init script.
+#
+# For a complete list of character sets supported, go to
+#
+#  http://www.postgresql.org/docs/@BASE_VERSION@/static/multibyte.html#MULTIBYTE-CHARSET-SUPPORTED
+#
+# Default: UTF8
+#PGENCODING=UTF8
+
+# The locale used to initialize the database cluster.
+#
+# If none is specified, the locale is inherited from the environment
+# that initdb runs in.
+#
+# Default: <empty>
+#PGLOCALE=en_US.UTF-8
+
+# Selects the user name of the database superuser. This defaults to
+# the name of the effective user running initdb. It is really not
+# important what the superuser's name is, but one might choose to keep
+# the customary name postgres, even if the operating system user's
+# name is different.
+#
+# Default: postgres
+#PGSUPERUSER=postgres

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


From guengel at users.sourceforge.net  Mon Jan  2 21:57:05 2012
From: guengel at users.sourceforge.net (guengel at users.sourceforge.net)
Date: Mon, 02 Jan 2012 20:57:05 +0000
Subject: [csw-devel] SF.net SVN: gar:[16658]
 csw/mgar/pkg/postgresql/branches/postgresql-9. 1-raos
Message-ID: <E1RhowL-0002iP-IO@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 16658
          http://gar.svn.sourceforge.net/gar/?rev=16658&view=rev
Author:   guengel
Date:     2012-01-02 20:57:05 +0000 (Mon, 02 Jan 2012)
Log Message:
-----------
postgresql/branches/postgresql-9.1-raos: Added section about migrating from CSWpostgresql. Location of log file can be configured now.

Modified Paths:
--------------
    csw/mgar/pkg/postgresql/branches/postgresql-9.1-raos/Makefile

Added Paths:
-----------
    csw/mgar/pkg/postgresql/branches/postgresql-9.1-raos/files/README.CSW
    csw/mgar/pkg/postgresql/branches/postgresql-9.1-raos/files/cswpostgresql.tmpl
    csw/mgar/pkg/postgresql/branches/postgresql-9.1-raos/files/postgresql.conf.tmpl

Removed Paths:
-------------
    csw/mgar/pkg/postgresql/branches/postgresql-9.1-raos/files/README.CSW
    csw/mgar/pkg/postgresql/branches/postgresql-9.1-raos/files/cswpostgresql.tmpl
    csw/mgar/pkg/postgresql/branches/postgresql-9.1-raos/files/postgresql.conf.tmpl

Modified: csw/mgar/pkg/postgresql/branches/postgresql-9.1-raos/Makefile
===================================================================
--- csw/mgar/pkg/postgresql/branches/postgresql-9.1-raos/Makefile	2012-01-02 20:55:34 UTC (rev 16657)
+++ csw/mgar/pkg/postgresql/branches/postgresql-9.1-raos/Makefile	2012-01-02 20:57:05 UTC (rev 16658)
@@ -118,6 +118,10 @@
 PGDOCDIR		= $(datadir)/doc/$(NAME)/$(BASE_VERSION_NODOT)
 PGLOCALSTATEDIR_BASE	= $(localstatedir)/$(NAME)
 PGDATA			= $(PGLOCALSTATEDIR_BASE)/$(BASE_VERSION_NODOT)
+# This variable has been introduced for using in EXPANDVARS files
+PGNAMEVERSIONED		= $(NAME)$(BASE_VERSION_NODOT)
+# This variable has been introduced for using in EXPANDVARS files
+PGNAME_VERSIONED	= $(NAME)-$(BASE_VERSION_NODOT)
 # Those BIN_NAMES_* are used both, for package creation and alternatives.
 # 8.4 has removed ipcclean
 BIN_NAMES_SERVER	= initdb pg_controldata pg_ctl pg_resetxlog postmaster postgres

Deleted: csw/mgar/pkg/postgresql/branches/postgresql-9.1-raos/files/README.CSW
===================================================================
--- csw/mgar/pkg/postgresql/branches/postgresql-9.1-raos/files/README.CSW	2012-01-02 20:55:34 UTC (rev 16657)
+++ csw/mgar/pkg/postgresql/branches/postgresql-9.1-raos/files/README.CSW	2012-01-02 20:57:05 UTC (rev 16658)
@@ -1,120 +0,0 @@
-OpenCSW PostgreSQL
-==================
-
-
-Parallel Installations
-----------------------
-
-OpenCSW's PostgreSQL allows for parallel installation of different
-PostgreSQL versions. Therefore, the binaries have appended the
-PostgreSQL version, e.g. PostgreSQL's @VERSION@ `psql' is named
-`psql- at BASE_VERSION_NODOT@'. The same holds for manpages.
-
-The notable exception to this are development files. Development files
-are only available for the latest PostgreSQL version provided by
-OpenCSW and have no version appended.
-
-Please see also `Starting the PostgreSQL Server' below for caveat on
-running multiple PostgreSQL servers in parallel.
-
-
-32/64-bit Binaries
-------------------
-
-It can be chosen between 32-bit or 64-bit binaries using the
-alternatives mechanism (see the alternative's README.user). By
-default, PostgreSQL will use 64-bit binaries.
-
-Alternatives are provided for server, client, contrib, and dev
-binaries separately. This makes it possible to select different memory
-models for those binaries independently.
-
-In order to list the alternatives provided, issue
-
- /opt/csw/sbin/alternatives --list
-
-on the command line.
-
-Please note, that a database cluster initialized by the 32-bit server
-binaries cannot be used by the 64-bit versions and vice versa. If you
-want to switch the memory model of the server, you have to
-
- 1. dump the entire database cluster
- 2. switch the memory model of the server binaries
- 3. remove the database cluster
- 4. re-initialize the database cluster using `initdb- at BASE_VERSION_NODOT@'
-    (see also `Initializing the Database Cluster' below)
- 5. start the server and restore the database cluster from the dump
-    created in step 1.
-
-
-Starting the PostgreSQL Server
-------------------------------
-
-When installing the PostgreSQL server for the first time, only the
-database cluster will be initialized using default values provided by
-
- @sysconfdir@/postgresql- at BASE_VERSION_NODOT@.conf
-
-and the database server will not be started, allowing for
-post-installation customization.
-
-In order to start the PostgreSQL server you can either use
-
- svcadm enable cswpostgresql- at BASE_VERSION_NODOT@    # Solaris 10+ only
-
-or
-
- @sysconfdir@/init.d/cswpostgresql- at BASE_VERSION_NODOT@ start
-
-Please note, that when installing multiple PostgreSQL server versions
-in parallel, the above method will work for the first database server
-started only. Subsequent servers starts will fail unless the listening
-port is set to distinct values using the `SERVEROPTS' in
-
- @sysconfdir@/postgresql-XY.conf
-
-like
-
- SERVEROPTS="-p <portnum>"
-
-where `<portnum>' is the port number the server has to listen on,
-which is by default 5432. So, one could configure the servers, for
-instance, to make the first server listen on 5432, the second on 5433,
-and so on.
-
-Alternatively, one can use the `postgresql.conf' file in the database
-cluster directory to provide a different listening port.
-
-
-User Configuration of Server Options
-------------------------------------
-
-Configuration of the server start-up options is done through a
-user-configuration file, `@sysconfdir@/postgresql- at BASE_VERSION_NODOT@.conf'.
-A sample template has been provided for you at `/etc/opt/csw/postgresql- at BASE_VERSION_NODOT@.conf.CSW'.
-
-This file also defines the location of the PostgreSQL database
-cluster in `PGDATA', which is by default `/var/opt/csw/postgresql/@BASE_VERSION_NODOT@'.
-
-
-Initializing the Database Cluster
----------------------------------
-
-The startup script `/etc/opt/csw/init.d/cswpostgresql- at BASE_VERSION_NODOT@' allows to
-initialize the database cluster by providing the argument `init' as such
-
- /etc/opt/csw/init.d/cswpostgresql- at BASE_VERSION_NODOT@ init
-
-This will initialize the database cluster at the location specified in
-the `PGDATA' variable defined in `/etc/opt/csw/postgresql- at BASE_VERSION_NODOT@.conf'.
-
-When installing PostgreSQL for the first time, the database cluster
-will be initialized using default values.
-
-
---
-That's all folks.
-
-Rafael Ostertag
-raos at opencsw.org

Copied: csw/mgar/pkg/postgresql/branches/postgresql-9.1-raos/files/README.CSW (from rev 16646, csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/README.CSW)
===================================================================
--- csw/mgar/pkg/postgresql/branches/postgresql-9.1-raos/files/README.CSW	                        (rev 0)
+++ csw/mgar/pkg/postgresql/branches/postgresql-9.1-raos/files/README.CSW	2012-01-02 20:57:05 UTC (rev 16658)
@@ -0,0 +1,145 @@
+OpenCSW PostgreSQL
+==================
+
+
+Parallel Installations
+----------------------
+
+OpenCSW's PostgreSQL allows for parallel installation of different
+PostgreSQL versions. Therefore, the binaries have appended the
+PostgreSQL version number, e.g. PostgreSQL's @VERSION@ `psql' is named
+`psql- at BASE_VERSION_NODOT@'. The same holds for manpages.
+
+The notable exception to this are development files. Development files
+are only available for the latest PostgreSQL version provided by
+OpenCSW and have no version number appended.
+
+Please see also `Starting the PostgreSQL Server' below for caveat on
+running multiple PostgreSQL servers in parallel.
+
+
+Migrating from CSWpostgresql
+----------------------------
+
+CSWpostgresql has been superseeded by CSW at NAME@@BASE_VERSION_NODOT at .
+It is possible to have CSWpostgresql and CSW at NAME@@BASE_VERSION_NODOT@
+installed on the same system, though. Please refer to `Starting the
+PostgreSQL Server' below for more information on how to run multiple
+PostgreSQL instances on the same system.
+
+In order to migrate from CSWpostgresql to CSW at NAME@@BASE_VERSION_NODOT@,
+create a full dump of the CSWpostgresql database cluster as
+described in
+
+ http://www.postgresql.org/docs/@BASE_VERSION@/static/upgrading.html
+
+and transfer it to the CSW at NAME@@BASE_VERSION_NODOT@ database cluster.
+
+
+32/64-bit Binaries
+------------------
+
+It can be chosen between 32-bit or 64-bit binaries using the
+alternatives mechanism (see the alternative's README.user). By
+default, PostgreSQL will use 64-bit binaries.
+
+Alternatives are provided for server, client, contrib, and dev
+binaries separately. This makes it possible to select different memory
+models for those binaries independently.
+
+In order to list the alternatives provided, issue
+
+ /opt/csw/sbin/alternatives --list
+
+on the command line.
+
+Please note, that a database cluster initialized by the 32-bit server
+binaries cannot be used by the 64-bit versions and vice versa. If you
+want to switch the memory model of the server, you have to
+
+ 1. dump the entire database cluster
+ 2. switch the memory model of the server binaries
+ 3. remove the database cluster
+ 4. re-initialize the database cluster using `initdb- at BASE_VERSION_NODOT@'
+    (see also `Initializing the Database Cluster' below)
+ 5. start the server and restore the database cluster from the dump
+    created in step 1.
+
+
+Starting the PostgreSQL Server
+------------------------------
+
+When installing the PostgreSQL server for the first time, only the
+database cluster will be initialized using default values provided by
+
+ @sysconfdir@/postgresql- at BASE_VERSION_NODOT@.conf
+
+and the database server will not be started, thus allowing for
+post-installation customization.
+
+In order to start the PostgreSQL server you can either use
+
+ svcadm enable cswpostgresql- at BASE_VERSION_NODOT@    # Solaris 10+ only
+
+or
+
+ @sysconfdir@/init.d/cswpostgresql- at BASE_VERSION_NODOT@ start
+
+Please note, that when installing multiple PostgreSQL server versions
+in parallel, the above method will work for the first database server
+started only. Subsequent servers starts will fail unless the listening
+port is set to distinct values using the `SERVEROPTS' in
+
+ @sysconfdir@/postgresql-XY.conf
+
+like
+
+ SERVEROPTS="-p <portnum>"
+
+where `<portnum>' is the port number the server has to listen on,
+which is by default 5432. So, one could configure the servers, for
+instance, to make the first server listen on 5432, the second on 5433,
+and so on.
+
+Alternatively, one can use the `postgresql.conf' file in the database
+cluster directory to provide a different listening port.
+
+
+User Configuration of Server Options
+------------------------------------
+
+Configuration of the server start-up options is done through a
+user-configuration file, `@sysconfdir@/postgresql- at BASE_VERSION_NODOT@.conf', regardless of
+whether Solaris SMF or System V-style initialization is used.
+
+This file also defines the location of the PostgreSQL database cluster
+in `PGDATA', which is by default
+
+ /var/opt/csw/postgresql/@BASE_VERSION_NODOT@
+
+
+Initializing the Database Cluster
+---------------------------------
+
+The startup script `/etc/opt/csw/init.d/cswpostgresql- at BASE_VERSION_NODOT@' allows to
+initialize the database cluster by providing the argument `init' as such
+
+ /etc/opt/csw/init.d/cswpostgresql- at BASE_VERSION_NODOT@ init
+
+This will initialize the database cluster at the location specified in
+the `PGDATA' variable defined in `/etc/opt/csw/postgresql- at BASE_VERSION_NODOT@.conf'.
+
+When installing PostgreSQL for the first time, the database cluster
+will be initialized using default values.
+
+Please note, that when changing the memory model of the server
+binaries, i.e. from 32-bit to 64-bit or vice versa, you have to
+re-initialize the database cluster (see also `32/64-bit Binaries'
+above).
+
+
+--
+That's all folks.
+
+Rafael Ostertag
+raos at opencsw.org

Deleted: csw/mgar/pkg/postgresql/branches/postgresql-9.1-raos/files/cswpostgresql.tmpl
===================================================================
--- csw/mgar/pkg/postgresql/branches/postgresql-9.1-raos/files/cswpostgresql.tmpl	2012-01-02 20:55:34 UTC (rev 16657)
+++ csw/mgar/pkg/postgresql/branches/postgresql-9.1-raos/files/cswpostgresql.tmpl	2012-01-02 20:57:05 UTC (rev 16658)
@@ -1,116 +0,0 @@
-#!/bin/sh
-# $Id$
-#
-# PostgreSQL startup script - part of the CSWpostgresql package
-#
-# 2009-11-29  Maciej Blizinski (maciej at opencsw.org)
-#   - Parametrized file locations
-#   - Style changes
-#
-#
-#RC_KNUM 20         # Number used for kill script symlink, e.g. K20cswfoo
-#RC_SNUM 80         # Number used for start script symlink, e.g. S80cswfoo
-#RC_KLEV 0,1,2,S    # Run levels that should have a kill script symlink
-#RC_SLEV 3          # Run levels that should have a start script symlink
-#AUTOENABLE no      # If set to no will not enable service regardless of
-#                     local csw.conf, use when a package needs setup before
-#                     being useful, would otherwise leave service in
-#                     maintenance mode
-
-VERSION=@BASE_VERSION_NODOT@
-
-USERCONF=@CSWPGSQLCONFFILE_VERSIONED@
-PGCTL=@bindir@/pg_ctl-${VERSION}
-PGINIT=@bindir@/initdb-${VERSION}
-
-# Read in the user configuration file
-[ -s /opt/csw/etc/${USERCONF} ] && . /opt/csw/etc/${USERCONF}
-[ -s @sysconfdir@/${USERCONF} ] && . @sysconfdir@/${USERCONF}
-
-# Defaults
-[ -z "${PGDATA}" ] && PGDATA=@PGDATA@
-[ -z "${SHUTDOWNMODE}" ] && SHUTDOWNMODE=fast
-[ -z "${PGENCODING}" ] && PGENCODING=UTF8
-[ -z "${PGSUPERUSER}" ] && PGSUPERUSER=postgres
-
-if [ -n "${SERVEROPTS}" ]
-then
-    # Remove the -o option, we provide it later on
-    SERVEROPTS=`echo "${SERVEROPTS}" | sed 's/^-o[ ]*//'`
-fi
-if [ -n "${PGLOCALE}" ]
-then
-    PGLOCALE="--locale=${PGLOCALE}"
-fi
-
-
-# Exit if postgres user hasn't been created.
-# FIXME: This bit of code is old. It might be obsolete.
-if grep '^postgres:' /etc/passwd >/dev/null; then
-	echo > /dev/null
-else
-  getent passwd postgres >/dev/null
-  if [ $? -ne 0 ] ; then
-	 exit 0
-  fi
-fi
-
-cd /
-
-case "$1" in
-start)
-      if [ -d ${PGDATA} -a `ls -l ${PGDATA} 2> /dev/null | wc -l` -gt 1 ]; then
-	 # PostgreSQL data directory exists and is populated
-	 echo "Starting PostgreSQL..."
-	 if [ -n "${SERVEROPTS}" ]
-	 then
-	     su postgres -c "${PGCTL} start -D ${PGDATA} -l ${PGDATA}/postgresql.log -o '${SERVEROPTS}'"
-	 else
-	     su postgres -c "${PGCTL} start -D ${PGDATA} -l ${PGDATA}/postgresql.log"
-	 fi
-      fi
-      ;;
-
-stop)
-     echo "Stopping PostgreSQL database..."
-     su postgres -c "${PGCTL} stop -D ${PGDATA} -l ${PGDATA}/postgresql.log -m ${SHUTDOWNMODE}"
-     true  # The previous command fails when there's no .pid file
-     ;;
-
-restart)
-     echo "Restarting PostgreSQL database..."
-     if [ -n "${SERVEROPTS}" ]
-     then
-	 su postgres -c "${PGCTL} restart -D ${PGDATA} -l ${PGDATA}/postgresql.log -m ${SHUTDOWNMODE} -o '${SERVEROPTS}'"
-     else
-	 su postgres -c "${PGCTL} restart -D ${PGDATA} -l ${PGDATA}/postgresql.log -m ${SHUTDOWNMODE}"
-     fi
-     ;;
-
-reload)
-     echo "Reloading PostgreSQL database..."
-     su postgres -c "${PGCTL} reload -D ${PGDATA} -l ${PGDATA}/postgresql.log"
-     ;;
-
-status)
-     su postgres -c "${PGCTL} status -D ${PGDATA}"
-     ;;
-
-init)
-     # create and initialise data directory
-     echo "Creating PostgreSQL data directory at ${PGDATA}..."
-     # Create it, unless it's already there and empty
-     [ -d "${PGDATA}" -a `ls -l ${PGDATA} 2> /dev/null | wc -l` -eq 1 ] || mkdir -p "${PGDATA}"
-     chown postgres "${PGDATA}"
-     chmod 0700 "${PGDATA}"
-     echo "Initialising PostgreSQL database..."
-     su postgres -c "\"${PGINIT}\" -D \"${PGDATA}\" -E ${PGENCODING} -U ${PGSUPERUSER} ${PGLOCALE}"
-     ;;
-
-*)
-     echo "Usage: ${0} (init|start|stop|restart|reload|status)"
-     ;;
-
-esac
-
-# vim:set ft=sh sw=2 ts=2 sts=2 expandtab si ci:

Copied: csw/mgar/pkg/postgresql/branches/postgresql-9.1-raos/files/cswpostgresql.tmpl (from rev 16646, csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/cswpostgresql.tmpl)
===================================================================
--- csw/mgar/pkg/postgresql/branches/postgresql-9.1-raos/files/cswpostgresql.tmpl	                        (rev 0)
+++ csw/mgar/pkg/postgresql/branches/postgresql-9.1-raos/files/cswpostgresql.tmpl	2012-01-02 20:57:05 UTC (rev 16658)
@@ -0,0 +1,117 @@
+#!/bin/sh
+# $Id$
+#
+# PostgreSQL startup script - part of the CSWpostgresql package
+#
+# 2009-11-29  Maciej Blizinski (maciej at opencsw.org)
+#   - Parametrized file locations
+#   - Style changes
+#
+#
+#RC_KNUM 20         # Number used for kill script symlink, e.g. K20cswfoo
+#RC_SNUM 80         # Number used for start script symlink, e.g. S80cswfoo
+#RC_KLEV 0,1,2,S    # Run levels that should have a kill script symlink
+#RC_SLEV 3          # Run levels that should have a start script symlink
+#AUTOENABLE no      # If set to no will not enable service regardless of
+#                     local csw.conf, use when a package needs setup before
+#                     being useful, would otherwise leave service in
+#                     maintenance mode
+
+VERSION=@BASE_VERSION_NODOT@
+
+USERCONF=@CSWPGSQLCONFFILE_VERSIONED@
+PGCTL=@bindir@/pg_ctl-${VERSION}
+PGINIT=@bindir@/initdb-${VERSION}
+
+# Read in the user configuration file
+[ -s /opt/csw/etc/${USERCONF} ] && . /opt/csw/etc/${USERCONF}
+[ -s @sysconfdir@/${USERCONF} ] && . @sysconfdir@/${USERCONF}
+
+# Defaults
+[ -z "${PGDATA}" ] && PGDATA=@PGDATA@
+[ -z "${SHUTDOWNMODE}" ] && SHUTDOWNMODE=fast
+[ -z "${PGENCODING}" ] && PGENCODING=UTF8
+[ -z "${PGSUPERUSER}" ] && PGSUPERUSER=postgres
+[ -z "${PGLOGOUTPUT}" ] && PGLOGOUTPUT=${PGDATA}/postgresql.log
+
+if [ -n "${SERVEROPTS}" ]
+then
+    # Remove the -o option, we provide it later on
+    SERVEROPTS=`echo "${SERVEROPTS}" | sed 's/^-o[ ]*//'`
+fi
+if [ -n "${PGLOCALE}" ]
+then
+    PGLOCALE="--locale=${PGLOCALE}"
+fi
+
+
+# Exit if postgres user hasn't been created.
+# FIXME: This bit of code is old. It might be obsolete.
+if grep '^postgres:' /etc/passwd >/dev/null; then
+	echo > /dev/null
+else
+  getent passwd postgres >/dev/null
+  if [ $? -ne 0 ] ; then
+	 exit 0
+  fi
+fi
+
+cd /
+
+case "$1" in
+start)
+      if [ -d ${PGDATA} -a `ls -l ${PGDATA} 2> /dev/null | wc -l` -gt 1 ]; then
+	 # PostgreSQL data directory exists and is populated
+	 echo "Starting PostgreSQL..."
+	 if [ -n "${SERVEROPTS}" ]
+	 then
+	     su postgres -c "${PGCTL} start -D ${PGDATA} -l ${PGLOGOUTPUT} -o '${SERVEROPTS}'"
+	 else
+	     su postgres -c "${PGCTL} start -D ${PGDATA} -l ${PGLOGOUTPUT}"
+	 fi
+      fi
+      ;;
+
+stop)
+     echo "Stopping PostgreSQL database..."
+     su postgres -c "${PGCTL} stop -D ${PGDATA} -l ${PGLOGOUTPUT} -m ${SHUTDOWNMODE}"
+     true  # The previous command fails when there's no .pid file
+     ;;
+
+restart)
+     echo "Restarting PostgreSQL database..."
+     if [ -n "${SERVEROPTS}" ]
+     then
+	 su postgres -c "${PGCTL} restart -D ${PGDATA} -l ${PGLOGOUTPUT} -m ${SHUTDOWNMODE} -o '${SERVEROPTS}'"
+     else
+	 su postgres -c "${PGCTL} restart -D ${PGDATA} -l ${PGLOGOUTPUT} -m ${SHUTDOWNMODE}"
+     fi
+     ;;
+
+reload)
+     echo "Reloading PostgreSQL database..."
+     su postgres -c "${PGCTL} reload -D ${PGDATA} -l ${PGLOGOUTPUT}"
+     ;;
+
+status)
+     su postgres -c "${PGCTL} status -D ${PGDATA}"
+     ;;
+
+init)
+     # create and initialise data directory
+     echo "Creating PostgreSQL data directory at ${PGDATA}..."
+     # Create it, unless it's already there and empty
+     [ -d "${PGDATA}" -a `ls -l ${PGDATA} 2> /dev/null | wc -l` -eq 1 ] || mkdir -p "${PGDATA}"
+     chown postgres "${PGDATA}"
+     chmod 0700 "${PGDATA}"
+     echo "Initialising PostgreSQL database..."
+     su postgres -c "\"${PGINIT}\" -D \"${PGDATA}\" -E ${PGENCODING} -U ${PGSUPERUSER} ${PGLOCALE}"
+     ;;
+
+*)
+     echo "Usage: ${0} (init|start|stop|restart|reload|status)"
+     ;;
+
+esac
+
+# vim:set ft=sh sw=2 ts=2 sts=2 expandtab si ci:

Deleted: csw/mgar/pkg/postgresql/branches/postgresql-9.1-raos/files/postgresql.conf.tmpl
===================================================================
--- csw/mgar/pkg/postgresql/branches/postgresql-9.1-raos/files/postgresql.conf.tmpl	2012-01-02 20:55:34 UTC (rev 16657)
+++ csw/mgar/pkg/postgresql/branches/postgresql-9.1-raos/files/postgresql.conf.tmpl	2012-01-02 20:57:05 UTC (rev 16658)
@@ -1,61 +0,0 @@
-# Example PostgreSQL server configuration file.
-# 
-# Provided by the OpenCSW package of PostgreSQL.  This file is read by the
-# /etc/opt/csw/init.d/cswpostgres startup script, and can be used to override
-# the defaults.
-#
-# Please use alternatives to choose between 32/64bit version of the
-# server (See also @docdir@/@NAME@@BASE_VERSION_NODOT at _server/README.CSW)
-
-# The location of the data directory.
-# Default: @PGDATA@
-PGDATA=@PGDATA@
-
-# The shutdown mode used
-#
-# Shutdown modes are:
-#  smart       quit after all clients have disconnected
-#  fast        quit directly, with proper shutdown
-#  immediate   quit without complete shutdown; will lead to recovery on restart
-#
-# Default: fast
-SHUTDOWNMODE=fast
-
-# Additional options to pass to postmaster.
-#
-# Please note: it is no longer necessary to pass the '-o' option.
-#
-# SERVEROPTS="-i"
-
-
-##
-## The following options are used by initdb when initializing the
-## database cluster
-##
-
-# The PostgreSQL encoding of the database cluster. This is used when
-# initializing the database cluster using the init script.
-#
-# For a complete list of character sets supported, go to
-#
-#  http://www.postgresql.org/docs/@BASE_VERSION@/static/multibyte.html#MULTIBYTE-CHARSET-SUPPORTED
-#
-# Default: UTF8
-PGENCODING=UTF8
-
-# The locale used to initialize the database cluster.
-#
-# If none is specified, the locale is inherited from the environment
-# that initdb runs in.
-#
-# Default: <empty>
-#PGLOCALE=en_US.UTF-8
-
-# Selects the user name of the database superuser. This defaults to
-# the name of the effective user running initdb. It is really not
-# important what the superuser's name is, but one might choose to keep
-# the customary name postgres, even if the operating system user's
-# name is different.
-#
-# Default: postgres
-PGSUPERUSER=postgres

Copied: csw/mgar/pkg/postgresql/branches/postgresql-9.1-raos/files/postgresql.conf.tmpl (from rev 16646, csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/files/postgresql.conf.tmpl)
===================================================================
--- csw/mgar/pkg/postgresql/branches/postgresql-9.1-raos/files/postgresql.conf.tmpl	                        (rev 0)
+++ csw/mgar/pkg/postgresql/branches/postgresql-9.1-raos/files/postgresql.conf.tmpl	2012-01-02 20:57:05 UTC (rev 16658)
@@ -0,0 +1,63 @@
+# This is a shell script fragment.
+# 
+# This file is sourced by the /etc/opt/csw/init.d/csw at PGNAME_VERSIONED@
+# startup script, and can be used to override the defaults.
+#
+# Please use alternatives to choose between 32/64bit version of the
+# server (See also @docdir@/@PGNAMEVERSIONED at _server/README.CSW)
+
+# The location of the data directory.
+#
+# Default: @PGDATA@
+PGDATA=@PGDATA@
+
+# Specifies the shutdown mode. mode can be smart, fast, or immediate,
+# or the first letter of one of these three.
+#
+# Default: fast
+#SHUTDOWNMODE=fast
+
+# Append the server log output to filename. If the file does not
+# exist, it is created. The umask is set to 077, so access to the log
+# file from other users is disallowed by default
+#
+# Default: ${PGDATA}/postgresql.log
+#PGLOGOUTPUT=${PGDATA}/postgresql.log
+
+# Additional options to pass to postmaster.
+#
+# Please note: it is no longer necessary to pass the '-o' option.
+#
+# SERVEROPTS="-i"
+
+##
+## The following variables are used by initdb when initializing the
+## database cluster
+##
+
+# The PostgreSQL encoding of the database cluster. This is used when
+# initializing the database cluster using the init script.
+#
+# For a complete list of character sets supported, go to
+#
+#  http://www.postgresql.org/docs/@BASE_VERSION@/static/multibyte.html#MULTIBYTE-CHARSET-SUPPORTED
+#
+# Default: UTF8
+#PGENCODING=UTF8
+
+# The locale used to initialize the database cluster.
+#
+# If none is specified, the locale is inherited from the environment
+# that initdb runs in.
+#
+# Default: <empty>
+#PGLOCALE=en_US.UTF-8
+
+# Selects the user name of the database superuser. This defaults to
+# the name of the effective user running initdb. It is really not
+# important what the superuser's name is, but one might choose to keep
+# the customary name postgres, even if the operating system user's
+# name is different.
+#
+# Default: postgres
+#PGSUPERUSER=postgres

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


From rthurner at users.sourceforge.net  Tue Jan  3 09:12:52 2012
From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net)
Date: Tue, 03 Jan 2012 08:12:52 +0000
Subject: [csw-devel] SF.net SVN: gar:[16659]
	csw/mgar/pkg/mercurial/trunk/Makefile
Message-ID: <E1RhzUK-0002Wt-Nw@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 16659
          http://gar.svn.sourceforge.net/gar/?rev=16659&view=rev
Author:   rthurner
Date:     2012-01-03 08:12:52 +0000 (Tue, 03 Jan 2012)
Log Message:
-----------
mercurial: upgrade to hg-2.0.2

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

Modified: csw/mgar/pkg/mercurial/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mercurial/trunk/Makefile	2012-01-02 20:57:05 UTC (rev 16658)
+++ csw/mgar/pkg/mercurial/trunk/Makefile	2012-01-03 08:12:52 UTC (rev 16659)
@@ -1,5 +1,5 @@
 NAME = mercurial
-VERSION = 2.0.1
+VERSION = 2.0.2
 CATEGORIES = python
 
 DESCRIPTION = Fast, lightweight Source Control Management system

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


From rthurner at users.sourceforge.net  Tue Jan  3 09:14:33 2012
From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net)
Date: Tue, 03 Jan 2012 08:14:33 +0000
Subject: [csw-devel] SF.net SVN: gar:[16660]
	csw/mgar/pkg/mercurial/trunk/checksums
Message-ID: <E1RhzVx-0006ys-65@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 16660
          http://gar.svn.sourceforge.net/gar/?rev=16660&view=rev
Author:   rthurner
Date:     2012-01-03 08:14:32 +0000 (Tue, 03 Jan 2012)
Log Message:
-----------
mercurial: update 2.0.2 checksum

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

Modified: csw/mgar/pkg/mercurial/trunk/checksums
===================================================================
--- csw/mgar/pkg/mercurial/trunk/checksums	2012-01-03 08:12:52 UTC (rev 16659)
+++ csw/mgar/pkg/mercurial/trunk/checksums	2012-01-03 08:14:32 UTC (rev 16660)
@@ -1 +1 @@
-16576b3089a88a84a35edc30e17a03a9  mercurial-2.0.1.tar.gz
+226b45f19bebf73446fcd73ccb678c52  mercurial-2.0.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  Tue Jan  3 10:05:25 2012
From: opk at users.sourceforge.net (opk at users.sourceforge.net)
Date: Tue, 03 Jan 2012 09:05:25 +0000
Subject: [csw-devel] SF.net SVN: gar:[16661] csw/mgar/pkg/nmh/trunk/Makefile
Message-ID: <E1Ri0JB-0000PF-RB@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 16661
          http://gar.svn.sourceforge.net/gar/?rev=16661&view=rev
Author:   opk
Date:     2012-01-03 09:05:25 +0000 (Tue, 03 Jan 2012)
Log Message:
-----------
nmh config files have moved

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

Modified: csw/mgar/pkg/nmh/trunk/Makefile
===================================================================
--- csw/mgar/pkg/nmh/trunk/Makefile	2012-01-03 08:14:32 UTC (rev 16660)
+++ csw/mgar/pkg/nmh/trunk/Makefile	2012-01-03 09:05:25 UTC (rev 16661)
@@ -20,7 +20,7 @@
 RUNTIME_DEP_PKGS += CSWlibiconv2
 PATCHFILES += 0000-skip-chgrp-of-inc.patch
 LICENSE = COPYRIGHT
-PRESERVECONF = /opt/csw/etc/nmh/mts.conf
+PRESERVECONF = /etc/opt/csw/nmh/mts.conf
 
 CONFIGURE_ARGS = --enable-pop --enable-masquerade='' --with-mts=sendmail \
   --prefix=$(prefix) --mandir=$(mandir) --datadir=$(datadir)/nmh \

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


From wahwah at users.sourceforge.net  Tue Jan  3 12:19:39 2012
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Tue, 03 Jan 2012 11:19:39 +0000
Subject: [csw-devel] SF.net SVN: gar:[16662] csw/mgar/pkg/cmake/trunk
Message-ID: <E1Ri2P5-0001uY-Sy@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 16662
          http://gar.svn.sourceforge.net/gar/?rev=16662&view=rev
Author:   wahwah
Date:     2012-01-03 11:19:39 +0000 (Tue, 03 Jan 2012)
Log Message:
-----------
cmake/trunk: Style changes, shortening the build recipe

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

Modified: csw/mgar/pkg/cmake/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cmake/trunk/Makefile	2012-01-03 09:05:25 UTC (rev 16661)
+++ csw/mgar/pkg/cmake/trunk/Makefile	2012-01-03 11:19:39 UTC (rev 16662)
@@ -1,7 +1,7 @@
 # $Id$
 
 NAME = cmake
-VERSION = 2.8.6
+VERSION = 2.8.7
 CATEGORIES = devel
 
 DESCRIPTION = Cross-platform make
@@ -24,14 +24,10 @@
 CATALOGNAME_CSWcmake = cmake
 SPKG_DESC_CSWcmake = $(DESCRIPTION)
 
-RUNTIME_DEP_PKGS_CSWcmake  = CSWlibcurl4 CSWlibexpat1
+RUNTIME_DEP_PKGS_CSWcmake  = CSWlibcurl4
+RUNTIME_DEP_PKGS_CSWcmake += CSWlibexpat1
 RUNTIME_DEP_PKGS_CSWcmake += CSWlibz1
 
-
-# We define upstream file regex so we can be notifed of 
-# new upstream software release
-UFILES_REGEX = (\d+(?:\.\d+)*)
-
 datadir = /share/$(NAME)-$(VERSION)
 sharedstatedir = /share
 docdir = /share/doc/$(NAME)-$(VERSION)
@@ -39,84 +35,12 @@
 NOISALIST = 1
 CONFIGURE_ARGS = $(DIRPATHS) --docdir=$(docdir)
 
-# switch off tests as two of them fail
-TEST_TARGET  = 
+TEST_TARGET  = test
+# Some tests are failing.
+SKIPTEST = 1
 
-CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/bin/cmake
-CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/bin/ctest
-CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/bin/ccmake
-CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/bin/cpack
-CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/UseJava.cmake
-CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/FindSDL_image.cmake
-CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/FindSDL_sound.cmake
-CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/FindSDL_ttf.cmake
-CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/CMakeGenericSystem.cmake
-CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/GetPrerequisites.cmake
-CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/FindLAPACK.cmake
-CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/FindSDL_net.cmake
-CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/FindAVIFile.cmake
-CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/FindJava.cmake
-CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/FindProducer.cmake
-CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/FindFLTK.cmake
-CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/CMakeDetermineJavaCompiler.cmake
-CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/FindSelfPackers.cmake
-CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/FindPNG.cmake
-CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/FindPostgreSQL.cmake
-CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/FindFreetype.cmake
-CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/FindUnixCommands.cmake
-CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/FindSDL.cmake
-CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/FindLua50.cmake
-CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/FindTCL.cmake
-CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/FindMatlab.cmake
-CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/FindPhysFS.cmake
-CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/FindQt3.cmake
-CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/FindPike.cmake
-CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/FindwxWidgets.cmake
-CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/FindOpenAL.cmake
-CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/FindLua51.cmake
-CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/FindBLAS.cmake
-CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/FindPHP4.cmake
-CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/FindMPEG2.cmake
-CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/FindGTK.cmake
-CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/FindGTK2.cmake
-CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/FindSDL_mixer.cmake
-CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/FindCUDA.cmake
-CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/FindQt.cmake
-CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/CMakeDetermineSystem.cmake
-CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/FindKDE3.cmake
-CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/FindTclStub.cmake
-CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/FindFLTK2.cmake
-CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/FindJNI.cmake
-CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/FindMPEG.cmake
-CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/FindSquish.cmake
-CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/Platform/BlueGeneP-base.cmake
-CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/cmake-2.8.6/Modules/Platform/UnixPaths.cmake
-CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/cmake.1
-CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/cmakevars.1
-CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/cmakemodules.1
-CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/doc/cmake-2.8.6/cmake.html
-CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/doc/cmake-2.8.6/cmake-variables.txt
-CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/doc/cmake-2.8.6/cmake-modules.txt
-CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/doc/cmake-2.8.6/cmake.txt
-CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/doc/cmake-2.8.6/cmake-modules.html
-CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/doc/cmake-2.8.6/cmake-variables.html
-CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/local|root/opt/csw/share/doc/cmake-2.8.6/cmake.docbook
-CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/share|root/opt/csw/share/cmake-2.8.6/Modules/UseJava.cmake
-CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/share|root/opt/csw/share/cmake-2.8.6/Modules/FindJava.cmake
-CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/share|root/opt/csw/share/cmake-2.8.6/Modules/CMakeDetermineJavaCompiler.cmake
-CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/share|root/opt/csw/share/cmake-2.8.6/Modules/FindDart.cmake
-CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/share|root/opt/csw/share/cmake-2.8.6/Modules/FindQt3.cmake
-CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/share|root/opt/csw/share/cmake-2.8.6/Modules/FindOpenGL.cmake
-CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/share|root/opt/csw/share/cmake-2.8.6/Modules/FindQt.cmake
-CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/share|root/opt/csw/share/man/man1/cmake.1
-CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/share|root/opt/csw/share/man/man1/cmakemodules.1
-CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/share|root/opt/csw/share/doc/cmake-2.8.6/cmake.html
-CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/share|root/opt/csw/share/doc/cmake-2.8.6/cmake-modules.txt
-CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/share|root/opt/csw/share/doc/cmake-2.8.6/cmake.txt
-CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/share|root/opt/csw/share/doc/cmake-2.8.6/cmake-modules.html
-CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content|/usr/share|root/opt/csw/share/doc/cmake-2.8.6/cmake.docbook
+CHECKPKG_OVERRIDES_CSWcmake += file-with-bad-content
 
-
 include gar/category.mk
 
 FIXCONFIG_DIRS += $(DESTDIR)$(prefix)/share/$(NAME)-$(VERSION)/Modules
@@ -152,5 +76,3 @@
 	@(perl -i -plne 's/USE_SYSTEM_XMLRPC:BOOL=OFF/USE_SYSTEM_XMLRPC:BOOL=ON/' $(WORKSRC)/CMakeCache.txt)
 	@(perl -i -plne 's/USE_SYSTEM_ZLIB:BOOL=OFF/USE_SYSTEM_ZLIB:BOOL=ON/' $(WORKSRC)/CMakeCache.txt)
 	@$(MAKECOOKIE)
-
-

Modified: csw/mgar/pkg/cmake/trunk/checksums
===================================================================
--- csw/mgar/pkg/cmake/trunk/checksums	2012-01-03 09:05:25 UTC (rev 16661)
+++ csw/mgar/pkg/cmake/trunk/checksums	2012-01-03 11:19:39 UTC (rev 16662)
@@ -1 +1 @@
-2147da452fd9212bb9b4542a9eee9d5b  cmake-2.8.6.tar.gz
+e1b237aeaed880f65dec9c20602452f6  cmake-2.8.7.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 Jan  3 12:50:32 2012
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Tue, 03 Jan 2012 11:50:32 +0000
Subject: [csw-devel] SF.net SVN: gar:[16663]
	csw/mgar/pkg/cmake/trunk/Makefile
Message-ID: <E1Ri2sy-0004Qc-Eh@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 16663
          http://gar.svn.sourceforge.net/gar/?rev=16663&view=rev
Author:   wahwah
Date:     2012-01-03 11:50:32 +0000 (Tue, 03 Jan 2012)
Log Message:
-----------
cmake/trunk: Adding the dependency on OpenSSL (sadly, unsplit)

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

Modified: csw/mgar/pkg/cmake/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cmake/trunk/Makefile	2012-01-03 11:19:39 UTC (rev 16662)
+++ csw/mgar/pkg/cmake/trunk/Makefile	2012-01-03 11:50:32 UTC (rev 16663)
@@ -24,9 +24,10 @@
 CATALOGNAME_CSWcmake = cmake
 SPKG_DESC_CSWcmake = $(DESCRIPTION)
 
-RUNTIME_DEP_PKGS_CSWcmake  = CSWlibcurl4
+RUNTIME_DEP_PKGS_CSWcmake += CSWlibcurl4
 RUNTIME_DEP_PKGS_CSWcmake += CSWlibexpat1
 RUNTIME_DEP_PKGS_CSWcmake += CSWlibz1
+RUNTIME_DEP_PKGS_CSWcmake += CSWosslrt
 
 datadir = /share/$(NAME)-$(VERSION)
 sharedstatedir = /share

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


From cgrzemba at users.sourceforge.net  Tue Jan  3 13:01:02 2012
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Tue, 03 Jan 2012 12:01:02 +0000
Subject: [csw-devel] SF.net SVN: gar:[16664] csw/mgar/pkg
Message-ID: <E1Ri338-000204-Jo@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 16664
          http://gar.svn.sourceforge.net/gar/?rev=16664&view=rev
Author:   cgrzemba
Date:     2012-01-03 12:01:02 +0000 (Tue, 03 Jan 2012)
Log Message:
-----------
ldapjdk/trunk: first try

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

Added: csw/mgar/pkg/ldapjdk/Makefile
===================================================================
--- csw/mgar/pkg/ldapjdk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/ldapjdk/Makefile	2012-01-03 12:01:02 UTC (rev 16664)
@@ -0,0 +1,2 @@
+%:
+	$(MAKE) -C trunk $*


Property changes on: csw/mgar/pkg/ldapjdk/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/ldapjdk/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ldapjdk/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/ldapjdk/trunk/Makefile	2012-01-03 12:01:02 UTC (rev 16664)
@@ -0,0 +1,54 @@
+# $Id$
+# TODO (release-critical prefixed with !, non release-critical with *)
+#
+NAME = ldapsdk_java
+VERSION = 20020819
+GARTYPE = v2
+CATEGORIES = java
+
+DESCRIPTION = 389 Directory Server - Management Console
+define BLURB
+A Java based remote management console used for managing 389
+Administration Server and 389 Directory Server.
+endef
+
+# MASTER_SITES = http://ftp.mozilla.org/pub/mozilla.org/directory/java-sdk
+MASTER_SITES = http://www-archive.mozilla.org/directory
+DISTFILES  = $(NAME)_$(VERSION).tar.gz
+DISTFILES += COPYING
+
+PACKAGES = CSWldapsdk
+PACKAGING_PLATFORMS += solaris10-sparc
+PACKAGING_PLATFORMS += solaris10-i386
+
+
+ARCHALL = 1
+
+CATALOGNAME_CSWldapjdk = ldapjdk
+
+WORKSRC = $(WORKDIR)
+DISTDIR = mozilla/directory/java-sdk
+LICENSE = COPYING
+# LICENSE = $(WORKDIR)/$(DISTDIR)/relnotes.htm
+
+JAVA_HOME = /usr/j2sdk1.4.2_17
+
+CONFIGURE_SCRIPTS =
+BUILD_SCRIPTS = custom
+TEST_SCRIPTS =
+INSTALL_SCRIPTS = custom
+
+CHECKPKG_OVERRIDES_CSWldapsdk += pkginfo-description-not-starting-with-uppercase|389|Directory|Server|-|Management|Console
+
+include gar/category.mk
+
+install-custom: 
+	@ginstall -d $(DESTDIR)$(datadir)/java
+	@gcp -fp $(WORKSRC)/$(DISTDIR)/dist/packages/$(CATALOGNAME_CSWldapjdk).jar $(DESTDIR)$(datadir)/java
+	@$(MAKECOOKIE)
+
+build-custom:
+	@( cd $(WORKSRC)/$(DISTDIR); \
+	  JAVA_HOME=$(JAVA_HOME) gmake -f ldap.mk MOZ_SRC=. JAVA_VERSION=1.4 ; \
+	  JAVA_HOME=$(JAVA_HOME) gmake -f ldap.mk basepackage )
+	@$(MAKECOOKIE)


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

Added: csw/mgar/pkg/ldapjdk/trunk/checksums
===================================================================
--- csw/mgar/pkg/ldapjdk/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/ldapjdk/trunk/checksums	2012-01-03 12:01:02 UTC (rev 16664)
@@ -0,0 +1 @@
+f0eef8fc5c4961cdebdd9b9188228431  ldapsdk_java_20020819.tar.gz

Added: csw/mgar/pkg/ldapjdk/trunk/files/COPYING
===================================================================
--- csw/mgar/pkg/ldapjdk/trunk/files/COPYING	                        (rev 0)
+++ csw/mgar/pkg/ldapjdk/trunk/files/COPYING	2012-01-03 12:01:02 UTC (rev 16664)
@@ -0,0 +1,16 @@
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1999 Netscape Communications Corporation. All
+ * Rights Reserved.

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


From cgrzemba at users.sourceforge.net  Tue Jan  3 13:14:50 2012
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Tue, 03 Jan 2012 12:14:50 +0000
Subject: [csw-devel] SF.net SVN: gar:[16665]
	csw/mgar/pkg/ldapjdk/trunk/Makefile
Message-ID: <E1Ri3GU-00055c-EV@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 16665
          http://gar.svn.sourceforge.net/gar/?rev=16665&view=rev
Author:   cgrzemba
Date:     2012-01-03 12:14:50 +0000 (Tue, 03 Jan 2012)
Log Message:
-----------
ldapjdk/trunk: correct description

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

Modified: csw/mgar/pkg/ldapjdk/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ldapjdk/trunk/Makefile	2012-01-03 12:01:02 UTC (rev 16664)
+++ csw/mgar/pkg/ldapjdk/trunk/Makefile	2012-01-03 12:14:50 UTC (rev 16665)
@@ -6,10 +6,11 @@
 GARTYPE = v2
 CATEGORIES = java
 
-DESCRIPTION = 389 Directory Server - Management Console
+DESCRIPTION = Mozilla LDAP SDK for Java
 define BLURB
-A Java based remote management console used for managing 389
-Administration Server and 389 Directory Server.
+The source code for the Directory SDK for Java consists of the Java classes that implement the LDAP API. These include classes and methods that can establish sessions with LDAP servers, create and send LDAP requests to the servers, and retrieve responses from the servers. The SDK also includes classes for getting and editing schema information for the LDAP server.
+
+In the LDAP protocol, requests and responses are encoded using the Basic Encoding Rules (BER). The SDK source code include classes for encoding and decoding data, according to these rules.
 endef
 
 # MASTER_SITES = http://ftp.mozilla.org/pub/mozilla.org/directory/java-sdk

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


From cgrzemba at users.sourceforge.net  Tue Jan  3 13:57:44 2012
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Tue, 03 Jan 2012 12:57:44 +0000
Subject: [csw-devel] SF.net SVN: gar:[16666] csw/mgar/pkg
Message-ID: <E1Ri3w0-0006pW-2z@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 16666
          http://gar.svn.sourceforge.net/gar/?rev=16666&view=rev
Author:   cgrzemba
Date:     2012-01-03 12:57:43 +0000 (Tue, 03 Jan 2012)
Log Message:
-----------


Added Paths:
-----------
    csw/mgar/pkg/lang-java/
    csw/mgar/pkg/lang-java/jss/
    csw/mgar/pkg/lang-java/jss/Makefile
    csw/mgar/pkg/lang-java/jss/branches/
    csw/mgar/pkg/lang-java/jss/tags/
    csw/mgar/pkg/lang-java/jss/trunk/
    csw/mgar/pkg/lang-java/jss/trunk/Makefile
    csw/mgar/pkg/lang-java/jss/trunk/checksums
    csw/mgar/pkg/lang-java/jss/trunk/files/
    csw/mgar/pkg/lang-java/ldapjdk/
    csw/mgar/pkg/lang-java/ldapjdk/trunk/Makefile

Removed Paths:
-------------
    csw/mgar/pkg/lang-java/ldapjdk/trunk/Makefile

Added: csw/mgar/pkg/lang-java/jss/Makefile
===================================================================
--- csw/mgar/pkg/lang-java/jss/Makefile	                        (rev 0)
+++ csw/mgar/pkg/lang-java/jss/Makefile	2012-01-03 12:57:43 UTC (rev 16666)
@@ -0,0 +1,2 @@
+%:
+	$(MAKE) -C trunk $*


Property changes on: csw/mgar/pkg/lang-java/jss/trunk
___________________________________________________________________
Added: svn:ignore
   + cookies
download
work


Added: svn:externals
   + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2


Added: csw/mgar/pkg/lang-java/jss/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-java/jss/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/lang-java/jss/trunk/Makefile	2012-01-03 12:57:43 UTC (rev 16666)
@@ -0,0 +1,29 @@
+# $Id$
+# TODO (release-critical prefixed with !, non release-critical with *)
+#
+NAME = lang-java/jss
+VERSION = X.Y
+GARTYPE = v2
+CATEGORIES = category
+
+DESCRIPTION = Brief description
+define BLURB
+  Long description
+endef
+
+MASTER_SITES = 
+DISTFILES  = $(DISTNAME).tar.gz
+
+# File name regex to get notifications about upstream software releases
+# NOTE: Use this only if the automatic regex creation
+#       does not work for your package
+# UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
+
+# If the url used to check for software update is different of MASTER_SITES, then 
+# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES
+# UPSTREAM_MASTER_SITES = 
+
+CONFIGURE_ARGS = $(DIRPATHS)
+
+include gar/category.mk
+


Property changes on: csw/mgar/pkg/lang-java/jss/trunk/Makefile
___________________________________________________________________
Added: svn:keywords
   + Id

Added: csw/mgar/pkg/lang-java/jss/trunk/checksums
===================================================================
Deleted: csw/mgar/pkg/lang-java/ldapjdk/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ldapjdk/trunk/Makefile	2012-01-03 12:01:02 UTC (rev 16664)
+++ csw/mgar/pkg/lang-java/ldapjdk/trunk/Makefile	2012-01-03 12:57:43 UTC (rev 16666)
@@ -1,54 +0,0 @@
-# $Id$
-# TODO (release-critical prefixed with !, non release-critical with *)
-#
-NAME = ldapsdk_java
-VERSION = 20020819
-GARTYPE = v2
-CATEGORIES = java
-
-DESCRIPTION = 389 Directory Server - Management Console
-define BLURB
-A Java based remote management console used for managing 389
-Administration Server and 389 Directory Server.
-endef
-
-# MASTER_SITES = http://ftp.mozilla.org/pub/mozilla.org/directory/java-sdk
-MASTER_SITES = http://www-archive.mozilla.org/directory
-DISTFILES  = $(NAME)_$(VERSION).tar.gz
-DISTFILES += COPYING
-
-PACKAGES = CSWldapsdk
-PACKAGING_PLATFORMS += solaris10-sparc
-PACKAGING_PLATFORMS += solaris10-i386
-
-
-ARCHALL = 1
-
-CATALOGNAME_CSWldapjdk = ldapjdk
-
-WORKSRC = $(WORKDIR)
-DISTDIR = mozilla/directory/java-sdk
-LICENSE = COPYING
-# LICENSE = $(WORKDIR)/$(DISTDIR)/relnotes.htm
-
-JAVA_HOME = /usr/j2sdk1.4.2_17
-
-CONFIGURE_SCRIPTS =
-BUILD_SCRIPTS = custom
-TEST_SCRIPTS =
-INSTALL_SCRIPTS = custom
-
-CHECKPKG_OVERRIDES_CSWldapsdk += pkginfo-description-not-starting-with-uppercase|389|Directory|Server|-|Management|Console
-
-include gar/category.mk
-
-install-custom: 
-	@ginstall -d $(DESTDIR)$(datadir)/java
-	@gcp -fp $(WORKSRC)/$(DISTDIR)/dist/packages/$(CATALOGNAME_CSWldapjdk).jar $(DESTDIR)$(datadir)/java
-	@$(MAKECOOKIE)
-
-build-custom:
-	@( cd $(WORKSRC)/$(DISTDIR); \
-	  JAVA_HOME=$(JAVA_HOME) gmake -f ldap.mk MOZ_SRC=. JAVA_VERSION=1.4 ; \
-	  JAVA_HOME=$(JAVA_HOME) gmake -f ldap.mk basepackage )
-	@$(MAKECOOKIE)

Copied: csw/mgar/pkg/lang-java/ldapjdk/trunk/Makefile (from rev 16665, csw/mgar/pkg/ldapjdk/trunk/Makefile)
===================================================================
--- csw/mgar/pkg/lang-java/ldapjdk/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/lang-java/ldapjdk/trunk/Makefile	2012-01-03 12:57:43 UTC (rev 16666)
@@ -0,0 +1,55 @@
+# $Id$
+# TODO (release-critical prefixed with !, non release-critical with *)
+#
+NAME = ldapsdk_java
+VERSION = 20020819
+GARTYPE = v2
+CATEGORIES = java
+
+DESCRIPTION = Mozilla LDAP SDK for Java
+define BLURB
+The source code for the Directory SDK for Java consists of the Java classes that implement the LDAP API. These include classes and methods that can establish sessions with LDAP servers, create and send LDAP requests to the servers, and retrieve responses from the servers. The SDK also includes classes for getting and editing schema information for the LDAP server.
+
+In the LDAP protocol, requests and responses are encoded using the Basic Encoding Rules (BER). The SDK source code include classes for encoding and decoding data, according to these rules.
+endef
+
+# MASTER_SITES = http://ftp.mozilla.org/pub/mozilla.org/directory/java-sdk
+MASTER_SITES = http://www-archive.mozilla.org/directory
+DISTFILES  = $(NAME)_$(VERSION).tar.gz
+DISTFILES += COPYING
+
+PACKAGES = CSWldapsdk
+PACKAGING_PLATFORMS += solaris10-sparc
+PACKAGING_PLATFORMS += solaris10-i386
+
+
+ARCHALL = 1
+
+CATALOGNAME_CSWldapjdk = ldapjdk
+
+WORKSRC = $(WORKDIR)
+DISTDIR = mozilla/directory/java-sdk
+LICENSE = COPYING
+# LICENSE = $(WORKDIR)/$(DISTDIR)/relnotes.htm
+
+JAVA_HOME = /usr/j2sdk1.4.2_17
+
+CONFIGURE_SCRIPTS =
+BUILD_SCRIPTS = custom
+TEST_SCRIPTS =
+INSTALL_SCRIPTS = custom
+
+CHECKPKG_OVERRIDES_CSWldapsdk += pkginfo-description-not-starting-with-uppercase|389|Directory|Server|-|Management|Console
+
+include gar/category.mk
+
+install-custom: 
+	@ginstall -d $(DESTDIR)$(datadir)/java
+	@gcp -fp $(WORKSRC)/$(DISTDIR)/dist/packages/$(CATALOGNAME_CSWldapjdk).jar $(DESTDIR)$(datadir)/java
+	@$(MAKECOOKIE)
+
+build-custom:
+	@( cd $(WORKSRC)/$(DISTDIR); \
+	  JAVA_HOME=$(JAVA_HOME) gmake -f ldap.mk MOZ_SRC=. JAVA_VERSION=1.4 ; \
+	  JAVA_HOME=$(JAVA_HOME) gmake -f ldap.mk basepackage )
+	@$(MAKECOOKIE)

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


From cgrzemba at users.sourceforge.net  Tue Jan  3 14:17:14 2012
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Tue, 03 Jan 2012 13:17:14 +0000
Subject: [csw-devel] SF.net SVN: gar:[16667] csw/mgar/pkg/lang-java/jss/trunk
Message-ID: <E1Ri4Es-0003tT-BZ@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 16667
          http://gar.svn.sourceforge.net/gar/?rev=16667&view=rev
Author:   cgrzemba
Date:     2012-01-03 13:17:14 +0000 (Tue, 03 Jan 2012)
Log Message:
-----------
lang-java/jss/trunk: add JSS

Modified Paths:
--------------
    csw/mgar/pkg/lang-java/jss/trunk/Makefile
    csw/mgar/pkg/lang-java/jss/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/lang-java/jss/trunk/files/COPYING

Modified: csw/mgar/pkg/lang-java/jss/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-java/jss/trunk/Makefile	2012-01-03 12:57:43 UTC (rev 16666)
+++ csw/mgar/pkg/lang-java/jss/trunk/Makefile	2012-01-03 13:17:14 UTC (rev 16667)
@@ -1,29 +1,53 @@
 # $Id$
 # TODO (release-critical prefixed with !, non release-critical with *)
 #
-NAME = lang-java/jss
-VERSION = X.Y
+NAME = jss
+MAJOR_VERSION = 4
+FULLVERSION = 4.3.2
 GARTYPE = v2
-CATEGORIES = category
+CATEGORIES = java
 
-DESCRIPTION = Brief description
+DESCRIPTION = Mozilla SSL SDK for Java
 define BLURB
-  Long description
+Network Security Services for Java (JSS) is a Java interface to NSS. JSS supports most of the security standards and encryption technologies supported by NSS. JSS also provides a pure Java interface for ASN.1 types and BER/DER encoding.
+
+JSS offers a implementation of Java SSL sockets that uses NSS's SSL/TLS implementation rather than Sun's JSSE implementation.  You might want to use JSS own SSL classes if you want to use some of the capabilities found in NSS's SSL/TLS library but not found in JSSE.
+
+NSS is the cryptographic module where all cryptographic operations are performed. JSS essentially provides a Java JNI bridge to NSS C shared libraries. When NSS is put in FIPS mode, JSS ensures FIPS compliance by ensuring that all cryptographic operations are performed by the NSS cryptographic module.
+
+https://developer.mozilla.org/En/JSS
 endef
 
-MASTER_SITES = 
-DISTFILES  = $(DISTNAME).tar.gz
 
-# File name regex to get notifications about upstream software releases
-# NOTE: Use this only if the automatic regex creation
-#       does not work for your package
-# UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
 
-# If the url used to check for software update is different of MASTER_SITES, then 
-# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES
-# UPSTREAM_MASTER_SITES = 
+MASTER_SITES = http://ftp.mozilla.org/pub/mozilla.org/mozilla.org/mozilla.org/mozilla.org/security/jss/releases/JSS_4_3_2_RTM
+DISTFILES  = $(NAME)$(MAJOR_VERSION).jar
+DISTFILES += COPYING
 
-CONFIGURE_ARGS = $(DIRPATHS)
+PACKAGES = CSWjss4
+PACKAGING_PLATFORMS += solaris10-sparc
+PACKAGING_PLATFORMS += solaris10-i386
 
+
+ARCHALL = 1
+
+CATALOGNAME_CSWjss4 = jss4
+
+WORKSRC = $(WORKDIR)
+DISTDIR = mozilla/security/jss
+LICENSE = COPYING
+
+# JAVA_HOME = /usr/j2sdk1.4.2_17
+
+CONFIGURE_SCRIPTS =
+BUILD_SCRIPTS = 
+TEST_SCRIPTS =
+INSTALL_SCRIPTS = custom
+
 include gar/category.mk
 
+install-custom: 
+	@ginstall -d $(DESTDIR)$(datadir)/java
+	@gcp -fp $(WORKSRC)/$(CATALOGNAME_CSWjss4).jar $(DESTDIR)$(datadir)/java
+	@$(MAKECOOKIE)
+

Modified: csw/mgar/pkg/lang-java/jss/trunk/checksums
===================================================================
--- csw/mgar/pkg/lang-java/jss/trunk/checksums	2012-01-03 12:57:43 UTC (rev 16666)
+++ csw/mgar/pkg/lang-java/jss/trunk/checksums	2012-01-03 13:17:14 UTC (rev 16667)
@@ -0,0 +1 @@
+cd4b98830955491929d55ad0d7140fb7  jss4.jar

Added: csw/mgar/pkg/lang-java/jss/trunk/files/COPYING
===================================================================
--- csw/mgar/pkg/lang-java/jss/trunk/files/COPYING	                        (rev 0)
+++ csw/mgar/pkg/lang-java/jss/trunk/files/COPYING	2012-01-03 13:17:14 UTC (rev 16667)
@@ -0,0 +1,16 @@
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1999 Netscape Communications Corporation. All
+ * Rights Reserved.

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


From cgrzemba at users.sourceforge.net  Tue Jan  3 14:22:20 2012
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Tue, 03 Jan 2012 13:22:20 +0000
Subject: [csw-devel] SF.net SVN: gar:[16668]
	csw/mgar/pkg/lang-java/jss/trunk/Makefile
Message-ID: <E1Ri4Jo-0007EJ-11@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 16668
          http://gar.svn.sourceforge.net/gar/?rev=16668&view=rev
Author:   cgrzemba
Date:     2012-01-03 13:22:19 +0000 (Tue, 03 Jan 2012)
Log Message:
-----------
lang-java/jss/trunk: add description

Modified Paths:
--------------
    csw/mgar/pkg/lang-java/jss/trunk/Makefile

Modified: csw/mgar/pkg/lang-java/jss/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-java/jss/trunk/Makefile	2012-01-03 13:17:14 UTC (rev 16667)
+++ csw/mgar/pkg/lang-java/jss/trunk/Makefile	2012-01-03 13:22:19 UTC (rev 16668)
@@ -4,6 +4,7 @@
 NAME = jss
 MAJOR_VERSION = 4
 FULLVERSION = 4.3.2
+VERSION = 4
 GARTYPE = v2
 CATEGORIES = java
 

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


From dmichelsen at users.sourceforge.net  Tue Jan  3 14:54:32 2012
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Tue, 03 Jan 2012 13:54:32 +0000
Subject: [csw-devel] SF.net SVN: gar:[16669] csw/mgar/pkg/ldapvi/trunk
Message-ID: <E1Ri4oy-0007ij-MB@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 16669
          http://gar.svn.sourceforge.net/gar/?rev=16669&view=rev
Author:   dmichelsen
Date:     2012-01-03 13:54:32 +0000 (Tue, 03 Jan 2012)
Log Message:
-----------
ldapvi/trunk: Update to latest standards

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

Added Paths:
-----------
    csw/mgar/pkg/ldapvi/trunk/files/0001-Use-putenv-instead-of-setenv.patch

Removed Paths:
-------------
    csw/mgar/pkg/ldapvi/trunk/files/patch-putenv.diff

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


Property changes on: csw/mgar/pkg/ldapvi/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2


Modified: csw/mgar/pkg/ldapvi/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ldapvi/trunk/Makefile	2012-01-03 13:22:19 UTC (rev 16668)
+++ csw/mgar/pkg/ldapvi/trunk/Makefile	2012-01-03 13:54:32 UTC (rev 16669)
@@ -10,25 +10,25 @@
 endef
 
 MASTER_SITES = http://www.lichteblau.com/download/
-DISTFILES  = $(NAME)-$(VERSION).tar.gz
+DISTFILES += $(DISTNAME).tar.gz
+PATCHFILES += 0001-Use-putenv-instead-of-setenv.patch
 
-RUNTIME_DEP_PKGS = CSWggettextrt CSWreadline CSWglib2 CSWlibpopt
-RUNTIME_DEP_PKGS += CSWosslrt CSWsasl CSWoldaprt
+VENDOR_URL = http://www.lichteblau.com/ldapvi/
 
-# We define upstream file regex so we can be notifed of new upstream software release
-UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
-
-PATCHFILES = patch-putenv.diff
-
 BUILD_DEP_PKGS = CSWoldapdevel
 
-RUNPATHQUOTE = 1
-CONFIGURE_ARGS = $(DIRPATHS)
+PACKAGES += CSWldapvi
+SPKG_DESC_CSWldapvi = Interactive LDAP client for Unix terminals
+RUNTIME_DEP_PKGS_CSWldapvi += CSWlibpopt0
+RUNTIME_DEP_PKGS_CSWldapvi += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWldapvi += CSWlibreadline6
+RUNTIME_DEP_PKGS_CSWldapvi += CSWosslrt
+RUNTIME_DEP_PKGS_CSWldapvi += CSWoldaprt
+RUNTIME_DEP_PKGS_CSWldapvi += CSWglib2
 
+TEST_TARGET = test
 INSTALL_SCRIPTS = custom
 
-SPKG_SOURCEURL = http://www.lichteblau.com/ldapvi/
-
 include gar/category.mk
 
 install-custom:

Modified: csw/mgar/pkg/ldapvi/trunk/checksums
===================================================================
--- csw/mgar/pkg/ldapvi/trunk/checksums	2012-01-03 13:22:19 UTC (rev 16668)
+++ csw/mgar/pkg/ldapvi/trunk/checksums	2012-01-03 13:54:32 UTC (rev 16669)
@@ -1,2 +1 @@
-6dc2f5441ac5f1e2b5b036e3521012cc  download/ldapvi-1.7.tar.gz
-d1f0031d0db3b7bb68c258185a0c63ad  download/patch-putenv.diff
+6dc2f5441ac5f1e2b5b036e3521012cc  ldapvi-1.7.tar.gz

Added: csw/mgar/pkg/ldapvi/trunk/files/0001-Use-putenv-instead-of-setenv.patch
===================================================================
--- csw/mgar/pkg/ldapvi/trunk/files/0001-Use-putenv-instead-of-setenv.patch	                        (rev 0)
+++ csw/mgar/pkg/ldapvi/trunk/files/0001-Use-putenv-instead-of-setenv.patch	2012-01-03 13:54:32 UTC (rev 16669)
@@ -0,0 +1,25 @@
+From 3ecc8abf7b82e1dc359d788d0410c4e9d00a6302 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Tue, 3 Jan 2012 14:28:05 +0100
+Subject: [PATCH] Use putenv() instead of setenv()
+
+---
+ arguments.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/arguments.c b/arguments.c
+index a92fe10..3a03e14 100644
+--- a/arguments.c
++++ b/arguments.c
+@@ -686,7 +686,7 @@ parse_arguments(int argc, const char **argv, cmdline *result, GPtrArray *ctrls)
+ 	}		
+ 
+ 	if (result->profileonlyp)
+-		if (setenv("LDAPNOINIT", "thanks", 1)) syserr();
++		if (putenv("LDAPNOINIT=thanks")) syserr();
+ 
+ 	/* don't free! */
+ /* 	poptFreeContext(ctx); */
+-- 
+1.7.6.1
+

Deleted: csw/mgar/pkg/ldapvi/trunk/files/patch-putenv.diff
===================================================================
--- csw/mgar/pkg/ldapvi/trunk/files/patch-putenv.diff	2012-01-03 13:22:19 UTC (rev 16668)
+++ csw/mgar/pkg/ldapvi/trunk/files/patch-putenv.diff	2012-01-03 13:54:32 UTC (rev 16669)
@@ -1,13 +0,0 @@
-diff --git a/ldapvi/arguments.c b/ldapvi/arguments.c
-index a6cbb8e..63e6213 100644
---- ldapvi/arguments.c
-+++ ldapvi/arguments.c
-@@ -724,7 +724,7 @@ parse_arguments(int argc, const char **argv, cmdline *result, GPtrArray *ctrls)
- 	}
-
- 	if (result->profileonlyp)
--		if (setenv("LDAPNOINIT", "thanks", 1)) syserr();
-+		if (putenv("LDAPNOINIT=thanks")) syserr();
-
- 	/* don't free! */
- /* 	poptFreeContext(ctx); */

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


From dmichelsen at users.sourceforge.net  Tue Jan  3 15:33:37 2012
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Tue, 03 Jan 2012 14:33:37 +0000
Subject: [csw-devel] SF.net SVN: gar:[16670]
	csw/mgar/pkg/ldapvi/trunk/Makefile
Message-ID: <E1Ri5Qn-0000XN-OK@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 16670
          http://gar.svn.sourceforge.net/gar/?rev=16670&view=rev
Author:   dmichelsen
Date:     2012-01-03 14:33:37 +0000 (Tue, 03 Jan 2012)
Log Message:
-----------
ldapvi/trunk: Update deps to Solaris 10 and new glib2

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

Modified: csw/mgar/pkg/ldapvi/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ldapvi/trunk/Makefile	2012-01-03 13:54:32 UTC (rev 16669)
+++ csw/mgar/pkg/ldapvi/trunk/Makefile	2012-01-03 14:33:37 UTC (rev 16670)
@@ -15,8 +15,16 @@
 
 VENDOR_URL = http://www.lichteblau.com/ldapvi/
 
-BUILD_DEP_PKGS = CSWoldapdevel
+BUILD_DEP_PKGS += CSWlibpopt-dev
+BUILD_DEP_PKGS += CSWggettext-dev
+BUILD_DEP_PKGS += CSWlibreadline-dev
+BUILD_DEP_PKGS += CSWossldevel
+BUILD_DEP_PKGS += CSWoldapdevel
+BUILD_DEP_PKGS += CSWlibglib2-dev
 
+# Because new glib is only available on Solaris 10
+PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
+
 PACKAGES += CSWldapvi
 SPKG_DESC_CSWldapvi = Interactive LDAP client for Unix terminals
 RUNTIME_DEP_PKGS_CSWldapvi += CSWlibpopt0
@@ -24,7 +32,7 @@
 RUNTIME_DEP_PKGS_CSWldapvi += CSWlibreadline6
 RUNTIME_DEP_PKGS_CSWldapvi += CSWosslrt
 RUNTIME_DEP_PKGS_CSWldapvi += CSWoldaprt
-RUNTIME_DEP_PKGS_CSWldapvi += CSWglib2
+RUNTIME_DEP_PKGS_CSWldapvi += CSWlibglib2-0-0
 
 TEST_TARGET = test
 INSTALL_SCRIPTS = custom

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


From dmichelsen at users.sourceforge.net  Tue Jan  3 17:25:12 2012
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Tue, 03 Jan 2012 16:25:12 +0000
Subject: [csw-devel] SF.net SVN: gar:[16671] csw/mgar/pkg/xmlrpc_c/trunk
Message-ID: <E1Ri7Am-0006Vg-7o@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 16671
          http://gar.svn.sourceforge.net/gar/?rev=16671&view=rev
Author:   dmichelsen
Date:     2012-01-03 16:25:11 +0000 (Tue, 03 Jan 2012)
Log Message:
-----------
xmlrpc_c/trunk: Update to 1.16.39, general rework

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

Added Paths:
-----------
    csw/mgar/pkg/xmlrpc_c/trunk/files/0001-Remove-inclusion-of-curl-types.h.patch
    csw/mgar/pkg/xmlrpc_c/trunk/files/0002-Use-direct-unistd-for-close.patch

Removed Paths:
-------------
    csw/mgar/pkg/xmlrpc_c/trunk/files/mainpatch

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


Property changes on: csw/mgar/pkg/xmlrpc_c/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2


Modified: csw/mgar/pkg/xmlrpc_c/trunk/Makefile
===================================================================
--- csw/mgar/pkg/xmlrpc_c/trunk/Makefile	2012-01-03 14:33:37 UTC (rev 16670)
+++ csw/mgar/pkg/xmlrpc_c/trunk/Makefile	2012-01-03 16:25:11 UTC (rev 16671)
@@ -1,9 +1,8 @@
 NAME = xmlrpc-c
-VERSION = 1.16.13
-SVN_REVISION = 1679
+VERSION = 1.16.39
 CATEGORIES = lib
 
-DESCRIPTION = A lightweight RPC library based on XML and HTTP.
+DESCRIPTION = A lightweight RPC library based on XML and HTTP
 define BLURB
 	It's a spec and a set of implementations that allow software 
 	running on disparate operating systems, running in different 
@@ -14,34 +13,29 @@
 	processed and returned.
 endef
 
-MASTER_SITES  = svn-http://xmlrpc-c.svn.sourceforge.net/svnroot/xmlrpc-c/
-DISTFILES = stable
-DISTNAME = stable
-NOCHECKSUM = stable
-SVNHTTP_CO_ARGS = -r $(SVN_REVISION) --no-auth-cache --username guest --password guest
+MASTER_SITES  = $(SF_MIRROR)
+DISTFILES += $(DISTNAME).tgz
+PATCHFILES += 0001-Remove-inclusion-of-curl-types.h.patch
+PATCHFILES += 0002-Use-direct-unistd-for-close.patch
 
 LICENSE = doc/COPYING
 DOCFILES += CREDITS DEVELOPING HISTORY INSTALL SECURITY TESTING TODO
 
-SPKG_SOURCEURL = http://xmlrpc-c.sourceforge.net
+VENDOR_URL = http://xmlrpc-c.sourceforge.net
 
-PACKAGES = CSWxmlrpc-c
-CATALOGNAME_CSWxmlrpc-c = xmlrpc_c
+PACKAGES += CSWxmlrpc-c
 SPKG_DESC_CSWxmlrpc-c = $(DESCRIPTION)
 
-PATCHFILES = mainpatch
-
 RUNTIME_DEP_PKGS_CSWxmlrpc-c  = CSWcurlrt CSWlibidn CSWoldaprt CSWosslrt CSWzlib
 
-# We define upstream file regex so we can be notifed of 
-# new upstream software release
-#UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tgz
+EXTRA_CPPFLAGS += -D__EXTENSIONS__
 
-#BUILD64 = 1
-#NOISAEXEC = 1
+BUILD_OVERRIDE_VARS += CFLAGS_PERSONAL
+BUILD_OVERRIDE_VAR_CFLAGS_PERSONAL = $(CFLAGS) $(CPPFLAGS)
 
-CONFIGURE_ARGS  = $(DIRPATHS)
+TEST_OVERRIDE_VARS += LADD
+TEST_OVERRIDE_VAR_LADD = $(LDFLAGS) -lm
 
-TEST_TARGET = check 
+BUILD64 = 1
 
 include gar/category.mk

Modified: csw/mgar/pkg/xmlrpc_c/trunk/checksums
===================================================================
--- csw/mgar/pkg/xmlrpc_c/trunk/checksums	2012-01-03 14:33:37 UTC (rev 16670)
+++ csw/mgar/pkg/xmlrpc_c/trunk/checksums	2012-01-03 16:25:11 UTC (rev 16671)
@@ -1 +1 @@
-4b1ac60cca84678a9bdfb7c145bd227e  download/mainpatch
+e88c9ee202890d726405b3bdfb00cfaf  xmlrpc-c-1.16.39.tgz

Added: csw/mgar/pkg/xmlrpc_c/trunk/files/0001-Remove-inclusion-of-curl-types.h.patch
===================================================================
--- csw/mgar/pkg/xmlrpc_c/trunk/files/0001-Remove-inclusion-of-curl-types.h.patch	                        (rev 0)
+++ csw/mgar/pkg/xmlrpc_c/trunk/files/0001-Remove-inclusion-of-curl-types.h.patch	2012-01-03 16:25:11 UTC (rev 16671)
@@ -0,0 +1,50 @@
+From 2e285823a8dd35cd0be82d78338ab17a620a52b1 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Tue, 3 Jan 2012 16:41:16 +0100
+Subject: [PATCH] Remove inclusion of curl/types.h
+
+---
+ lib/curl_transport/curlmulti.c             |    1 -
+ lib/curl_transport/curltransaction.c       |    1 -
+ lib/curl_transport/xmlrpc_curl_transport.c |    1 -
+ 3 files changed, 0 insertions(+), 3 deletions(-)
+
+diff --git a/lib/curl_transport/curlmulti.c b/lib/curl_transport/curlmulti.c
+index 526a4db..5503b9f 100644
+--- a/lib/curl_transport/curlmulti.c
++++ b/lib/curl_transport/curlmulti.c
+@@ -17,7 +17,6 @@
+ #endif
+ 
+ #include <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+ #include <curl/multi.h>
+ 
+diff --git a/lib/curl_transport/curltransaction.c b/lib/curl_transport/curltransaction.c
+index 6b60b20..141fa5a 100644
+--- a/lib/curl_transport/curltransaction.c
++++ b/lib/curl_transport/curltransaction.c
+@@ -15,7 +15,6 @@
+ #include "version.h"
+ 
+ #include <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+ 
+ #include "curlversion.h"
+diff --git a/lib/curl_transport/xmlrpc_curl_transport.c b/lib/curl_transport/xmlrpc_curl_transport.c
+index 526381d..9b7b530 100644
+--- a/lib/curl_transport/xmlrpc_curl_transport.c
++++ b/lib/curl_transport/xmlrpc_curl_transport.c
+@@ -83,7 +83,6 @@
+ #include "xmlrpc-c/time_int.h"
+ 
+ #include <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+ #include <curl/multi.h>
+ 
+-- 
+1.7.6.1
+

Added: csw/mgar/pkg/xmlrpc_c/trunk/files/0002-Use-direct-unistd-for-close.patch
===================================================================
--- csw/mgar/pkg/xmlrpc_c/trunk/files/0002-Use-direct-unistd-for-close.patch	                        (rev 0)
+++ csw/mgar/pkg/xmlrpc_c/trunk/files/0002-Use-direct-unistd-for-close.patch	2012-01-03 16:25:11 UTC (rev 16671)
@@ -0,0 +1,25 @@
+From bd2e3e5b16548900f07cea4a775fbef255639961 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Tue, 3 Jan 2012 17:19:38 +0100
+Subject: [PATCH] Use direct unistd for close()
+
+---
+ src/cpp/test/server_abyss.cpp |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/cpp/test/server_abyss.cpp b/src/cpp/test/server_abyss.cpp
+index 4b236ef..a60cdbb 100644
+--- a/src/cpp/test/server_abyss.cpp
++++ b/src/cpp/test/server_abyss.cpp
+@@ -14,7 +14,7 @@
+ #ifdef WIN32
+   #include <winsock.h>
+ #else
+-  #include <sys/unistd.h>
++  #include <unistd.h>
+   #include <sys/socket.h>
+   #include <arpa/inet.h>
+ #endif
+-- 
+1.7.6.1
+

Deleted: csw/mgar/pkg/xmlrpc_c/trunk/files/mainpatch
===================================================================
--- csw/mgar/pkg/xmlrpc_c/trunk/files/mainpatch	2012-01-03 14:33:37 UTC (rev 16670)
+++ csw/mgar/pkg/xmlrpc_c/trunk/files/mainpatch	2012-01-03 16:25:11 UTC (rev 16671)
@@ -1,169 +0,0 @@
-diff -ru ../stable.orig/config.mk.in stable/config.mk.in
---- ../stable.orig/config.mk.in	2009-03-19 06:00:07.627856581 +0100
-+++ stable/config.mk.in	2009-03-19 09:12:13.567567079 +0100
-@@ -187,6 +187,7 @@
-   # Solaris compiler (Sun C 5.5) can't take multiple ld options as
-   # -Wl,-a,-b .  Ld sees -a,-b in that case.
-   LDFLAGS_SHLIB = -Wl,-Bdynamic -Wl,-G -Wl,-h -Wl,$(SONAME)
-+  CXXLDFLAGS_SHLIB = -Bdynamic -G -h $(SONAME)
-   CFLAGS_SHLIB = -Kpic
- endif
- 
-diff -ru ../stable.orig/lib/libutil/select.c stable/lib/libutil/select.c
---- ../stable.orig/lib/libutil/select.c	2009-03-19 05:59:43.875873563 +0100
-+++ stable/lib/libutil/select.c	2009-03-19 08:50:30.335123806 +0100
-@@ -1,4 +1,6 @@
-+#ifndef __sun
- #define _XOPEN_SOURCE 600  /* Get pselect() in <sys/select.h> */
-+#endif
- 
- #ifdef WIN32
- #include <winsock.h>
-diff -ru ../stable.orig/src/cpp/Makefile stable/src/cpp/Makefile
---- ../stable.orig/src/cpp/Makefile	2009-03-19 05:58:59.910486603 +0100
-+++ stable/src/cpp/Makefile	2009-03-19 09:13:04.787229910 +0100
-@@ -8,6 +8,8 @@
- 
- include $(BLDDIR)/config.mk
- 
-+LDFLAGS_SHLIB =$(CXXLDFLAGS_SHLIB)
-+
- default: all
- 
- # libxmlrpc_cpp is the legacy C++ wrapper library.  The others are the
-@@ -167,6 +169,8 @@
-    -L$(LIBXMLRPC_ABYSS_DIR) -lxmlrpc_abyss \
-    -L$(LIBXMLRPC_UTIL_DIR) -lxmlrpc_util \
- 
-+LIBXMLRPC_SERVER_CGIPP_SH = $(call shlibfn, libxmlrpc_server_cgi++)
-+
- $(LIBXMLRPC_SERVER_CGIPP_SH): $(LIBXMLRPC_SERVER_CGIPP_MODS:%=%.osh) \
-   $(call shliblefn, libxmlrpc_server++) \
-   $(call shliblefn, lib$(LIBXMLRPCPP_NAME)) \
-diff -ru ../stable.orig/src/cpp/client.cpp stable/src/cpp/client.cpp
---- ../stable.orig/src/cpp/client.cpp	2009-03-19 05:58:59.244697817 +0100
-+++ stable/src/cpp/client.cpp	2009-03-19 08:50:30.390788638 +0100
-@@ -456,7 +456,7 @@
- 
- 
- void
--clientXmlTransport::finishAsync(xmlrpc_c::timeout) {
-+clientXmlTransport::finishAsync(xmlrpc_c::timeout const) {
- 
-     // Since our start() does the whole thing, there's nothing for
-     // us to do.
-@@ -504,7 +504,7 @@
- 
- 
- void
--clientXmlTransport::setInterrupt(int *) {
-+clientXmlTransport::setInterrupt(int * const) {
- 
-     throwf("The client XML transport is not interruptible");
- }
-@@ -896,7 +896,7 @@
- 
- 
- void
--client_xml::setInterrupt(int * const interruptP) {
-+client_xml::setInterrupt(int * interruptP) {
- 
-     this->implP->transportP->setInterrupt(interruptP);
- }
-diff -ru ../stable.orig/src/cpp/libwww.cpp stable/src/cpp/libwww.cpp
---- ../stable.orig/src/cpp/libwww.cpp	2009-03-19 05:58:58.921926116 +0100
-+++ stable/src/cpp/libwww.cpp	2009-03-19 08:50:30.416995305 +0100
-@@ -141,7 +141,7 @@
- }
- 
- #else  // MUST_BUILD_LIBWWW_CLIENT
-- clientXmlTransport_libwww::clientXmlTransport_libwww(string, string) {
-+ clientXmlTransport_libwww::clientXmlTransport_libwww(string const, string const) {
- 
-     throw(error("There is no Libwww client XML transport "
-                 "in this XML-RPC client library"));
-diff -ru ../stable.orig/src/cpp/packetsocket.cpp stable/src/cpp/packetsocket.cpp
---- ../stable.orig/src/cpp/packetsocket.cpp	2009-03-19 05:58:59.387947753 +0100
-+++ stable/src/cpp/packetsocket.cpp	2009-03-19 08:50:30.441570893 +0100
-@@ -166,7 +166,7 @@
- 
- 
- 
--packetSocket::packetSocket(int const sockFd) {
-+packetSocket::packetSocket(int sockFd) {
- 
-     int dupRc;
- 
-diff -ru ../stable.orig/src/cpp/test/server_abyss.cpp stable/src/cpp/test/server_abyss.cpp
---- ../stable.orig/src/cpp/test/server_abyss.cpp	2009-03-19 05:58:55.789530607 +0100
-+++ stable/src/cpp/test/server_abyss.cpp	2009-03-19 08:50:30.466112632 +0100
-@@ -14,7 +14,11 @@
- #ifdef WIN32
-   #include <winsock.h>
- #else
--  #include <sys/unistd.h>
-+  #ifdef __sun
-+    #include <unistd.h>
-+  #else
-+    #include <sys/unistd.h>
-+  #endif
-   #include <sys/socket.h>
-   #include <arpa/inet.h>
- #endif
-diff -ru ../stable.orig/src/test/Makefile stable/src/test/Makefile
---- ../stable.orig/src/test/Makefile	2009-03-19 05:59:05.577343998 +0100
-+++ stable/src/test/Makefile	2009-03-19 08:50:30.490742022 +0100
-@@ -25,7 +25,7 @@
- 
- all: $(PROGS)
- 
--LDFLAGS = $(LADD)
-+LDFLAGS = $(LADD) -lm
- 
- TEST_OBJS = \
-   test.o \
-diff -ru ../stable.orig/src/test/cgi.c stable/src/test/cgi.c
---- ../stable.orig/src/test/cgi.c	2009-03-19 05:59:04.026249087 +0100
-+++ stable/src/test/cgi.c	2009-03-19 09:41:03.971988485 +0100
-@@ -42,8 +42,9 @@
-                        TESTDATA_DIR DIRSEP "sample_add_call.xml",
-                        "r");
- 
--    if (cgiOutputP == NULL)
-+    if (cgiOutputP == NULL) {
-         TEST_ERROR("Unable to run 'cgitest' program.");
-+		}
-     else {
-         unsigned char cgiResponse[4096];
-         size_t bytesRead;
-diff -ru ../stable.orig/src/test/test.h stable/src/test/test.h
---- ../stable.orig/src/test/test.h	2009-03-19 05:59:05.023815247 +0100
-+++ stable/src/test/test.h	2009-03-19 08:50:30.514813356 +0100
-@@ -76,9 +76,7 @@
- 
- 
- #define TEST_FAULT(envP, code) \
--    do { test_fault(envP, code, __FILE__, __LINE__); } while(0)
--
--;
-+    do { test_fault(envP, code, __FILE__, __LINE__); } while(0) ;
- 
- 
- static __inline__ void
-@@ -96,14 +94,10 @@
- 
- 
- #define TEST_NULL_STRING(string) \
--    do { test_null_string(string, __FILE__, __LINE__); } while(0)
--
--;
-+    do { test_null_string(string, __FILE__, __LINE__); } while(0) ;
- 
- #define TEST_ERROR(reason) \
- do { \
-     printf("Unable to test at %s/%u.  %s", __FILE__, __LINE__, reason); \
-     abort(); \
--   } while (0)
--
--;
-+   } while (0) ;

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


From dmichelsen at users.sourceforge.net  Wed Jan  4 11:01:03 2012
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Wed, 04 Jan 2012 10:01:03 +0000
Subject: [csw-devel] SF.net SVN: gar:[16672] csw/mgar/pkg/diffstat/trunk
Message-ID: <E1RiNeZ-00083t-Ir@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 16672
          http://gar.svn.sourceforge.net/gar/?rev=16672&view=rev
Author:   dmichelsen
Date:     2012-01-04 10:01:03 +0000 (Wed, 04 Jan 2012)
Log Message:
-----------
diffstat/trunk: Update to 1.55 and latest standards

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

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


Property changes on: csw/mgar/pkg/diffstat/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2


Modified: csw/mgar/pkg/diffstat/trunk/Makefile
===================================================================
--- csw/mgar/pkg/diffstat/trunk/Makefile	2012-01-03 16:25:11 UTC (rev 16671)
+++ csw/mgar/pkg/diffstat/trunk/Makefile	2012-01-04 10:01:03 UTC (rev 16672)
@@ -1,5 +1,5 @@
 NAME = diffstat
-VERSION = 1.54
+VERSION = 1.55
 CATEGORIES = utils
 
 DESCRIPTION = A utility which provides statistics based on the output of diff
@@ -7,18 +7,13 @@
 endef
 
 MASTER_SITES = ftp://invisible-island.net/diffstat/
-DISTFILES  = $(NAME)-$(VERSION).tgz
+DISTFILES += $(DISTNAME).tgz
 
-# We define upstream file regex so we can be notifed of new upstream software release
-UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tgz
+VENDOR_URL = http://invisible-island.net/diffstat/
 
-SPKG_SOURCEURL = http://invisible-island.net/diffstat/
-
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --with-install-prefix=$(DESTDIR)
 
-TEST_TARGET = check
-
 include gar/category.mk
 
 post-extract-modulated:

Modified: csw/mgar/pkg/diffstat/trunk/checksums
===================================================================
--- csw/mgar/pkg/diffstat/trunk/checksums	2012-01-03 16:25:11 UTC (rev 16671)
+++ csw/mgar/pkg/diffstat/trunk/checksums	2012-01-04 10:01:03 UTC (rev 16672)
@@ -1 +1 @@
-af08bef2eb37050ceb0c4fddedb2ee36  diffstat-1.54.tgz
+630d5278f1cd874dc3cc68cff3fddecf  diffstat-1.55.tgz

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


From phipsy at users.sourceforge.net  Wed Jan  4 12:01:10 2012
From: phipsy at users.sourceforge.net (phipsy at users.sourceforge.net)
Date: Wed, 04 Jan 2012 11:01:10 +0000
Subject: [csw-devel] SF.net SVN: gar:[16673] csw/mgar/pkg/augeas/trunk
Message-ID: <E1RiOak-0003kh-ES@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 16673
          http://gar.svn.sourceforge.net/gar/?rev=16673&view=rev
Author:   phipsy
Date:     2012-01-04 11:01:10 +0000 (Wed, 04 Jan 2012)
Log Message:
-----------
augeas:
* 0001-fix-compiling-on-solaris.patch: update patch using GAR's makepatch
* 0002-regexp-escape.patch: upstream commit 021ea39f, affects Solaris build
* 0003-Remove-Linux-isms-so-tests-can-run-on-Solaris.patch: upstream commits to
  support make check on Solaris
* 0004-pkg-config-Augeas-requires-libxml2.patch: upstream commit 11b00ad4, 
  affects dependent builds
* Makefile: include above patches, replace perl hack with 0003 above

Modified Paths:
--------------
    csw/mgar/pkg/augeas/trunk/Makefile
    csw/mgar/pkg/augeas/trunk/files/0001-fix-compiling-on-solaris.patch

Modified: csw/mgar/pkg/augeas/trunk/Makefile
===================================================================
--- csw/mgar/pkg/augeas/trunk/Makefile	2012-01-04 10:01:03 UTC (rev 16672)
+++ csw/mgar/pkg/augeas/trunk/Makefile	2012-01-04 11:01:10 UTC (rev 16673)
@@ -19,7 +19,10 @@
 RUNTIME_DEP_PKGS += CSWlibreadline6 CSWlibxml2-2
 GARCOMPILER = GCC4
 EXTRA_LDFLAGS = -lgnugetopt
-PATCHFILES += 0001-fix-compiling-on-solaris.patch
+PATCHFILES += 0001-fix-compiling-on-solaris.patch \
+  0002-regexp-escape.patch \
+  0003-Remove-Linux-isms-so-tests-can-run-on-Solaris.patch \
+  0004-pkg-config-Augeas-requires-libxml2.patch
 
 # Building on Solaris 10 doesn't work as it support C99 and the above fixes are
 # not necessary there.
@@ -41,8 +44,3 @@
 
 # Local bin/ for readlink, /opt/csw/gnu for GNU tail, diff
 PATH := $(abspath ./bin):/opt/csw/gnu:$(PATH)
-
-post-extract-modulated:
-	@# Tests are written in bash
-	-cd $(WORKSRC)/tests && perl -e 's,#! /bin/sh,#! /bin/bash,' -pi *.sh
-	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/augeas/trunk/files/0001-fix-compiling-on-solaris.patch
===================================================================
--- csw/mgar/pkg/augeas/trunk/files/0001-fix-compiling-on-solaris.patch	2012-01-04 10:01:03 UTC (rev 16672)
+++ csw/mgar/pkg/augeas/trunk/files/0001-fix-compiling-on-solaris.patch	2012-01-04 11:01:10 UTC (rev 16673)
@@ -1,35 +1,45 @@
-From b0f9124974aacc33de9a86950ab148135c6bb78d Mon Sep 17 00:00:00 2001
-From: Mark Phillips <none at none>
-Date: Mon, 2 Jan 2012 18:22:44 +0100
-Subject: [PATCH] fix compiling on solaris
+From 2ba932c4eae0e0750b21f72ca1952adaf110363a Mon Sep 17 00:00:00 2001
+From: Dominic Cleal <dcleal at redhat.com>
+Date: Wed, 4 Jan 2012 00:46:33 +0100
+Subject: [PATCH] Enabled strchrnul gnulib module and rebuilt auto*
 
+(upstream commit: 0d8d8882)
 ---
- ChangeLog                              |  596 ++++++++++++----------
- Makefile.in                            |    2 +
- aclocal.m4                             |  452 +-----------------
- build/aux/config.guess                 |  858 ++++++++++++++++++--------------
- build/aux/config.sub                   |  347 ++++++++++---
- config.h.in                            |   12 +
- configure                              |  181 +++++++-
- doc/Makefile.in                        |    2 +
- doc/naturaldocs/Makefile.in            |    2 +
- examples/Makefile.in                   |    2 +
- gnulib/lib/Makefile.am                 |   20 +-
- gnulib/lib/Makefile.in                 |   27 +-
- gnulib/m4/gnulib-comp.m4               |   22 +
- gnulib/tests/Makefile.am               |   16 +
- gnulib/tests/Makefile.in               |  118 +++--
- gnulib/tests/test-readlink.h           |    2 +-
- man/Makefile.in                        |    2 +
- man/augparse.1                         |    2 +-
- src/Makefile.in                        |    2 +
- src/regexp.c                           |    2 +-
- tests/Makefile.in                      |    2 +
- tests/root/etc/crontab                 |    2 -
- tests/root/etc/squirrelmail/config.php |    2 -
- 23 files changed, 1419 insertions(+), 1254 deletions(-)
- delete mode 100644 tests/root/etc/crontab
- delete mode 100644 tests/root/etc/squirrelmail/config.php
+ ChangeLog                     |  596 ++++++++++++++++++++++-------------------
+ Makefile.in                   |    2 +
+ aclocal.m4                    |  452 +-------------------------------
+ config.h.in                   |   12 +
+ configure                     |  181 ++++++++++++-
+ doc/Makefile.in               |    2 +
+ doc/naturaldocs/Makefile.in   |    2 +
+ examples/Makefile.in          |    2 +
+ gnulib/lib/Makefile.am        |   20 ++-
+ gnulib/lib/Makefile.in        |   27 ++-
+ gnulib/lib/rawmemchr.c        |  136 ++++++++++
+ gnulib/lib/rawmemchr.valgrind |   12 +
+ gnulib/lib/strchrnul.c        |  142 ++++++++++
+ gnulib/lib/strchrnul.valgrind |   12 +
+ gnulib/m4/gnulib-comp.m4      |   22 ++
+ gnulib/m4/rawmemchr.m4        |   21 ++
+ gnulib/m4/strchrnul.m4        |   21 ++
+ gnulib/tests/Makefile.am      |   16 ++
+ gnulib/tests/Makefile.in      |  118 +++++---
+ gnulib/tests/test-rawmemchr.c |   92 +++++++
+ gnulib/tests/test-readlink.h  |    2 +-
+ gnulib/tests/test-strchrnul.c |   86 ++++++
+ man/Makefile.in               |    2 +
+ man/augparse.1                |    2 +-
+ src/Makefile.in               |    2 +
+ tests/Makefile.in             |    2 +
+ 26 files changed, 1190 insertions(+), 794 deletions(-)
+ create mode 100644 gnulib/lib/rawmemchr.c
+ create mode 100644 gnulib/lib/rawmemchr.valgrind
+ create mode 100644 gnulib/lib/strchrnul.c
+ create mode 100644 gnulib/lib/strchrnul.valgrind
+ create mode 100644 gnulib/m4/rawmemchr.m4
+ create mode 100644 gnulib/m4/strchrnul.m4
+ create mode 100644 gnulib/tests/test-rawmemchr.c
+ create mode 100644 gnulib/tests/test-strchrnul.c
 
 diff --git a/ChangeLog b/ChangeLog
 index a7764d4..e93e7a5 100644
@@ -2928,2292 +2938,6 @@
  m4_include([gnulib/m4/string_h.m4])
  m4_include([gnulib/m4/strndup.m4])
  m4_include([gnulib/m4/strnlen.m4])
-diff --git a/build/aux/config.guess b/build/aux/config.guess
-index 0e30d56..dc84c68 100755
---- a/build/aux/config.guess
-+++ b/build/aux/config.guess
-@@ -1,9 +1,10 @@
- #! /bin/sh
- # Attempt to guess a canonical system name.
- #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
--#   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
-+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
-+#   Free Software Foundation, Inc.
- 
--timestamp='2003-07-02'
-+timestamp='2009-11-20'
- 
- # This file is free software; you can redistribute it and/or modify it
- # under the terms of the GNU General Public License as published by
-@@ -17,23 +18,25 @@ timestamp='2003-07-02'
- #
- # 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-+# 02110-1301, USA.
- #
- # As a special exception to the GNU General Public License, if you
- # distribute this file as part of a program that contains a
- # configuration script generated by Autoconf, you may include it under
- # the same distribution terms that you use for the rest of that program.
- 
--# Originally written by Per Bothner <per at bothner.com>.
--# Please send patches to <config-patches at gnu.org>.  Submit a context
--# diff and a properly formatted ChangeLog entry.
-+
-+# Originally written by Per Bothner.  Please send patches (context
-+# diff format) to <config-patches at gnu.org> and include a ChangeLog
-+# entry.
- #
- # This script attempts to guess a canonical system name similar to
- # config.sub.  If it succeeds, it prints the system name on stdout, and
- # exits with 0.  Otherwise, it exits with 1.
- #
--# The plan is that this can be called by configure scripts if you
--# don't specify an explicit build system type.
-+# You can get the latest version of this script from:
-+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
- 
- me=`echo "$0" | sed -e 's,.*/,,'`
- 
-@@ -53,8 +56,8 @@ version="\
- GNU config.guess ($timestamp)
- 
- Originally written by Per Bothner.
--Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
--Free Software Foundation, Inc.
-+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- 
- This is free software; see the source for copying conditions.  There is NO
- warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-@@ -66,11 +69,11 @@ Try \`$me --help' for more information."
- while test $# -gt 0 ; do
-   case $1 in
-     --time-stamp | --time* | -t )
--       echo "$timestamp" ; exit 0 ;;
-+       echo "$timestamp" ; exit ;;
-     --version | -v )
--       echo "$version" ; exit 0 ;;
-+       echo "$version" ; exit ;;
-     --help | --h* | -h )
--       echo "$usage"; exit 0 ;;
-+       echo "$usage"; exit ;;
-     -- )     # Stop option processing
-        shift; break ;;
-     - )	# Use stdin as input.
-@@ -104,7 +107,7 @@ set_cc_for_build='
- trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
- trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
- : ${TMPDIR=/tmp} ;
-- { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
-+ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
-  { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
-  { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
-  { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
-@@ -123,7 +126,7 @@ case $CC_FOR_BUILD,$HOST_CC,$CC in
- 	;;
-  ,,*)   CC_FOR_BUILD=$CC ;;
-  ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
--esac ;'
-+esac ; set_cc_for_build= ;'
- 
- # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
- # (ghazi at noc.rutgers.edu 1994-08-24)
-@@ -158,6 +161,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
- 	    arm*) machine=arm-unknown ;;
- 	    sh3el) machine=shl-unknown ;;
- 	    sh3eb) machine=sh-unknown ;;
-+	    sh5el) machine=sh5le-unknown ;;
- 	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
- 	esac
- 	# The Operating System including object format, if it has switched
-@@ -166,7 +170,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
- 	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
- 		eval $set_cc_for_build
- 		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
--			| grep __ELF__ >/dev/null
-+			| grep -q __ELF__
- 		then
- 		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
- 		    # Return netbsd for either.  FIX?
-@@ -196,50 +200,32 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
- 	# contains redundant information, the shorter form:
- 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
- 	echo "${machine}-${os}${release}"
--	exit 0 ;;
--    amiga:OpenBSD:*:*)
--	echo m68k-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
--    arc:OpenBSD:*:*)
--	echo mipsel-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
--    hp300:OpenBSD:*:*)
--	echo m68k-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
--    mac68k:OpenBSD:*:*)
--	echo m68k-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
--    macppc:OpenBSD:*:*)
--	echo powerpc-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
--    mvme68k:OpenBSD:*:*)
--	echo m68k-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
--    mvme88k:OpenBSD:*:*)
--	echo m88k-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
--    mvmeppc:OpenBSD:*:*)
--	echo powerpc-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
--    pmax:OpenBSD:*:*)
--	echo mipsel-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
--    sgi:OpenBSD:*:*)
--	echo mipseb-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
--    sun3:OpenBSD:*:*)
--	echo m68k-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
--    wgrisc:OpenBSD:*:*)
--	echo mipsel-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     *:OpenBSD:*:*)
--	echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
-+	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
-+	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
-+	exit ;;
-+    *:ekkoBSD:*:*)
-+	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
-+	exit ;;
-+    *:SolidBSD:*:*)
-+	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
-+	exit ;;
-+    macppc:MirBSD:*:*)
-+	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
-+	exit ;;
-+    *:MirBSD:*:*)
-+	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
-+	exit ;;
-     alpha:OSF1:*:*)
--	if test $UNAME_RELEASE = "V4.0"; then
-+	case $UNAME_RELEASE in
-+	*4.0)
- 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
--	fi
-+		;;
-+	*5.*)
-+	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
-+		;;
-+	esac
- 	# According to Compaq, /usr/sbin/psrinfo has been available on
- 	# OSF/1 and Tru64 systems produced since 1995.  I hope that
- 	# covers most systems running today.  This code pipes the CPU
-@@ -277,42 +263,49 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
- 	    "EV7.9 (21364A)")
- 		UNAME_MACHINE="alphaev79" ;;
- 	esac
-+	# A Pn.n version is a patched version.
- 	# A Vn.n version is a released version.
- 	# A Tn.n version is a released field test version.
- 	# A Xn.n version is an unreleased experimental baselevel.
- 	# 1.2 uses "1.2" for uname -r.
--	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
--	exit 0 ;;
--    Alpha*:OpenVMS:*:*)
--	echo alpha-hp-vms
--	exit 0 ;;
-+	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-+	exit ;;
-     Alpha\ *:Windows_NT*:*)
- 	# How do we know it's Interix rather than the generic POSIX subsystem?
- 	# Should we change UNAME_MACHINE based on the output of uname instead
- 	# of the specific Alpha model?
- 	echo alpha-pc-interix
--	exit 0 ;;
-+	exit ;;
-     21064:Windows_NT:50:3)
- 	echo alpha-dec-winnt3.5
--	exit 0 ;;
-+	exit ;;
-     Amiga*:UNIX_System_V:4.0:*)
- 	echo m68k-unknown-sysv4
--	exit 0;;
-+	exit ;;
-     *:[Aa]miga[Oo][Ss]:*:*)
- 	echo ${UNAME_MACHINE}-unknown-amigaos
--	exit 0 ;;
-+	exit ;;
-     *:[Mm]orph[Oo][Ss]:*:*)
- 	echo ${UNAME_MACHINE}-unknown-morphos
--	exit 0 ;;
-+	exit ;;
-     *:OS/390:*:*)
- 	echo i370-ibm-openedition
--	exit 0 ;;
-+	exit ;;
-+    *:z/VM:*:*)
-+	echo s390-ibm-zvmoe
-+	exit ;;
-+    *:OS400:*:*)
-+        echo powerpc-ibm-os400
-+	exit ;;
-     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
- 	echo arm-acorn-riscix${UNAME_RELEASE}
--	exit 0;;
-+	exit ;;
-+    arm:riscos:*:*|arm:RISCOS:*:*)
-+	echo arm-unknown-riscos
-+	exit ;;
-     SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
- 	echo hppa1.1-hitachi-hiuxmpp
--	exit 0;;
-+	exit ;;
-     Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
- 	# akee at wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
- 	if test "`(/bin/universe) 2>/dev/null`" = att ; then
-@@ -320,32 +313,51 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
- 	else
- 		echo pyramid-pyramid-bsd
- 	fi
--	exit 0 ;;
-+	exit ;;
-     NILE*:*:*:dcosx)
- 	echo pyramid-pyramid-svr4
--	exit 0 ;;
-+	exit ;;
-     DRS?6000:unix:4.0:6*)
- 	echo sparc-icl-nx6
--	exit 0 ;;
--    DRS?6000:UNIX_SV:4.2*:7*)
-+	exit ;;
-+    DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
- 	case `/usr/bin/uname -p` in
--	    sparc) echo sparc-icl-nx7 && exit 0 ;;
-+	    sparc) echo sparc-icl-nx7; exit ;;
- 	esac ;;
-+    s390x:SunOS:*:*)
-+	echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-+	exit ;;
-     sun4H:SunOS:5.*:*)
- 	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
--	exit 0 ;;
-+	exit ;;
-     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
- 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
--	exit 0 ;;
--    i86pc:SunOS:5.*:*)
--	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
--	exit 0 ;;
-+	exit ;;
-+    i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
-+	echo i386-pc-auroraux${UNAME_RELEASE}
-+	exit ;;
-+    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
-+	eval $set_cc_for_build
-+	SUN_ARCH="i386"
-+	# If there is a compiler, see if it is configured for 64-bit objects.
-+	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
-+	# This test works for both compilers.
-+	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
-+	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
-+		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
-+		grep IS_64BIT_ARCH >/dev/null
-+	    then
-+		SUN_ARCH="x86_64"
-+	    fi
-+	fi
-+	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-+	exit ;;
-     sun4*:SunOS:6*:*)
- 	# According to config.sub, this is the proper way to canonicalize
- 	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
- 	# it's likely to be more like Solaris than SunOS4.
- 	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
--	exit 0 ;;
-+	exit ;;
-     sun4*:SunOS:*:*)
- 	case "`/usr/bin/arch -k`" in
- 	    Series*|S4*)
-@@ -354,10 +366,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
- 	esac
- 	# Japanese Language versions have a version number like `4.1.3-JL'.
- 	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
--	exit 0 ;;
-+	exit ;;
-     sun3*:SunOS:*:*)
- 	echo m68k-sun-sunos${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     sun*:*:4.2BSD:*)
- 	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
- 	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
-@@ -369,10 +381,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
- 		echo sparc-sun-sunos${UNAME_RELEASE}
- 		;;
- 	esac
--	exit 0 ;;
-+	exit ;;
-     aushp:SunOS:*:*)
- 	echo sparc-auspex-sunos${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     # The situation for MiNT is a little confusing.  The machine name
-     # can be virtually everything (everything which is not
-     # "atarist" or "atariste" at least should have a processor
-@@ -383,37 +395,40 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
-     # be no problem.
-     atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
-         echo m68k-atari-mint${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
- 	echo m68k-atari-mint${UNAME_RELEASE}
--        exit 0 ;;
-+        exit ;;
-     *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-         echo m68k-atari-mint${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-         echo m68k-milan-mint${UNAME_RELEASE}
--        exit 0 ;;
-+        exit ;;
-     hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-         echo m68k-hades-mint${UNAME_RELEASE}
--        exit 0 ;;
-+        exit ;;
-     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-         echo m68k-unknown-mint${UNAME_RELEASE}
--        exit 0 ;;
-+        exit ;;
-+    m68k:machten:*:*)
-+	echo m68k-apple-machten${UNAME_RELEASE}
-+	exit ;;
-     powerpc:machten:*:*)
- 	echo powerpc-apple-machten${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     RISC*:Mach:*:*)
- 	echo mips-dec-mach_bsd4.3
--	exit 0 ;;
-+	exit ;;
-     RISC*:ULTRIX:*:*)
- 	echo mips-dec-ultrix${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     VAX*:ULTRIX*:*:*)
- 	echo vax-dec-ultrix${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     2020:CLIX:*:* | 2430:CLIX:*:*)
- 	echo clipper-intergraph-clix${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     mips:*:*:UMIPS | mips:*:*:RISCos)
- 	eval $set_cc_for_build
- 	sed 's/^	//' << EOF >$dummy.c
-@@ -437,32 +452,33 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
- 	  exit (-1);
- 	}
- EOF
--	$CC_FOR_BUILD -o $dummy $dummy.c \
--	  && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
--	  && exit 0
-+	$CC_FOR_BUILD -o $dummy $dummy.c &&
-+	  dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
-+	  SYSTEM_NAME=`$dummy $dummyarg` &&
-+	    { echo "$SYSTEM_NAME"; exit; }
- 	echo mips-mips-riscos${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     Motorola:PowerMAX_OS:*:*)
- 	echo powerpc-motorola-powermax
--	exit 0 ;;
-+	exit ;;
-     Motorola:*:4.3:PL8-*)
- 	echo powerpc-harris-powermax
--	exit 0 ;;
-+	exit ;;
-     Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
- 	echo powerpc-harris-powermax
--	exit 0 ;;
-+	exit ;;
-     Night_Hawk:Power_UNIX:*:*)
- 	echo powerpc-harris-powerunix
--	exit 0 ;;
-+	exit ;;
-     m88k:CX/UX:7*:*)
- 	echo m88k-harris-cxux7
--	exit 0 ;;
-+	exit ;;
-     m88k:*:4*:R4*)
- 	echo m88k-motorola-sysv4
--	exit 0 ;;
-+	exit ;;
-     m88k:*:3*:R3*)
- 	echo m88k-motorola-sysv3
--	exit 0 ;;
-+	exit ;;
-     AViiON:dgux:*:*)
-         # DG/UX returns AViiON for all architectures
-         UNAME_PROCESSOR=`/usr/bin/uname -p`
-@@ -478,29 +494,29 @@ EOF
- 	else
- 	    echo i586-dg-dgux${UNAME_RELEASE}
- 	fi
-- 	exit 0 ;;
-+ 	exit ;;
-     M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
- 	echo m88k-dolphin-sysv3
--	exit 0 ;;
-+	exit ;;
-     M88*:*:R3*:*)
- 	# Delta 88k system running SVR3
- 	echo m88k-motorola-sysv3
--	exit 0 ;;
-+	exit ;;
-     XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
- 	echo m88k-tektronix-sysv3
--	exit 0 ;;
-+	exit ;;
-     Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
- 	echo m68k-tektronix-bsd
--	exit 0 ;;
-+	exit ;;
-     *:IRIX*:*:*)
- 	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
--	exit 0 ;;
-+	exit ;;
-     ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
--	echo romp-ibm-aix      # uname -m gives an 8 hex-code CPU id
--	exit 0 ;;              # Note that: echo "'`uname -s`'" gives 'AIX '
-+	echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
-+	exit ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
-     i*86:AIX:*:*)
- 	echo i386-ibm-aix
--	exit 0 ;;
-+	exit ;;
-     ia64:AIX:*:*)
- 	if [ -x /usr/bin/oslevel ] ; then
- 		IBM_REV=`/usr/bin/oslevel`
-@@ -508,7 +524,7 @@ EOF
- 		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
- 	fi
- 	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
--	exit 0 ;;
-+	exit ;;
-     *:AIX:2:3)
- 	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
- 		eval $set_cc_for_build
-@@ -523,15 +539,19 @@ EOF
- 			exit(0);
- 			}
- EOF
--		$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
--		echo rs6000-ibm-aix3.2.5
-+		if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
-+		then
-+			echo "$SYSTEM_NAME"
-+		else
-+			echo rs6000-ibm-aix3.2.5
-+		fi
- 	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
- 		echo rs6000-ibm-aix3.2.4
- 	else
- 		echo rs6000-ibm-aix3.2
- 	fi
--	exit 0 ;;
--    *:AIX:*:[45])
-+	exit ;;
-+    *:AIX:*:[456])
- 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
- 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
- 		IBM_ARCH=rs6000
-@@ -544,28 +564,28 @@ EOF
- 		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
- 	fi
- 	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
--	exit 0 ;;
-+	exit ;;
-     *:AIX:*:*)
- 	echo rs6000-ibm-aix
--	exit 0 ;;
-+	exit ;;
-     ibmrt:4.4BSD:*|romp-ibm:BSD:*)
- 	echo romp-ibm-bsd4.4
--	exit 0 ;;
-+	exit ;;
-     ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
- 	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
--	exit 0 ;;                           # report: romp-ibm BSD 4.3
-+	exit ;;                             # report: romp-ibm BSD 4.3
-     *:BOSX:*:*)
- 	echo rs6000-bull-bosx
--	exit 0 ;;
-+	exit ;;
-     DPX/2?00:B.O.S.:*:*)
- 	echo m68k-bull-sysv3
--	exit 0 ;;
-+	exit ;;
-     9000/[34]??:4.3bsd:1.*:*)
- 	echo m68k-hp-bsd
--	exit 0 ;;
-+	exit ;;
-     hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
- 	echo m68k-hp-bsd4.4
--	exit 0 ;;
-+	exit ;;
-     9000/[34678]??:HP-UX:*:*)
- 	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
- 	case "${UNAME_MACHINE}" in
-@@ -627,9 +647,19 @@ EOF
- 	esac
- 	if [ ${HP_ARCH} = "hppa2.0w" ]
- 	then
--	    # avoid double evaluation of $set_cc_for_build
--	    test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
--	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null
-+	    eval $set_cc_for_build
-+
-+	    # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
-+	    # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
-+	    # generating 64-bit code.  GNU and HP use different nomenclature:
-+	    #
-+	    # $ CC_FOR_BUILD=cc ./config.guess
-+	    # => hppa2.0w-hp-hpux11.23
-+	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
-+	    # => hppa64-hp-hpux11.23
-+
-+	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
-+		grep -q __LP64__
- 	    then
- 		HP_ARCH="hppa2.0w"
- 	    else
-@@ -637,11 +667,11 @@ EOF
- 	    fi
- 	fi
- 	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
--	exit 0 ;;
-+	exit ;;
-     ia64:HP-UX:*:*)
- 	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
- 	echo ia64-hp-hpux${HPUX_REV}
--	exit 0 ;;
-+	exit ;;
-     3050*:HI-UX:*:*)
- 	eval $set_cc_for_build
- 	sed 's/^	//' << EOF >$dummy.c
-@@ -669,211 +699,248 @@ EOF
- 	  exit (0);
- 	}
- EOF
--	$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
-+	$CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
-+		{ echo "$SYSTEM_NAME"; exit; }
- 	echo unknown-hitachi-hiuxwe2
--	exit 0 ;;
-+	exit ;;
-     9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
- 	echo hppa1.1-hp-bsd
--	exit 0 ;;
-+	exit ;;
-     9000/8??:4.3bsd:*:*)
- 	echo hppa1.0-hp-bsd
--	exit 0 ;;
-+	exit ;;
-     *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
- 	echo hppa1.0-hp-mpeix
--	exit 0 ;;
-+	exit ;;
-     hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
- 	echo hppa1.1-hp-osf
--	exit 0 ;;
-+	exit ;;
-     hp8??:OSF1:*:*)
- 	echo hppa1.0-hp-osf
--	exit 0 ;;
-+	exit ;;
-     i*86:OSF1:*:*)
- 	if [ -x /usr/sbin/sysversion ] ; then
- 	    echo ${UNAME_MACHINE}-unknown-osf1mk
- 	else
- 	    echo ${UNAME_MACHINE}-unknown-osf1
- 	fi
--	exit 0 ;;
-+	exit ;;
-     parisc*:Lites*:*:*)
- 	echo hppa1.1-hp-lites
--	exit 0 ;;
-+	exit ;;
-     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
- 	echo c1-convex-bsd
--        exit 0 ;;
-+        exit ;;
-     C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
- 	if getsysinfo -f scalar_acc
- 	then echo c32-convex-bsd
- 	else echo c2-convex-bsd
- 	fi
--        exit 0 ;;
-+        exit ;;
-     C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
- 	echo c34-convex-bsd
--        exit 0 ;;
-+        exit ;;
-     C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
- 	echo c38-convex-bsd
--        exit 0 ;;
-+        exit ;;
-     C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
- 	echo c4-convex-bsd
--        exit 0 ;;
-+        exit ;;
-     CRAY*Y-MP:*:*:*)
- 	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
--	exit 0 ;;
-+	exit ;;
-     CRAY*[A-Z]90:*:*:*)
- 	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
- 	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
- 	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
- 	      -e 's/\.[^.]*$/.X/'
--	exit 0 ;;
-+	exit ;;
-     CRAY*TS:*:*:*)
- 	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
--	exit 0 ;;
-+	exit ;;
-     CRAY*T3E:*:*:*)
- 	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
--	exit 0 ;;
-+	exit ;;
-     CRAY*SV1:*:*:*)
- 	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
--	exit 0 ;;
-+	exit ;;
-     *:UNICOS/mp:*:*)
--	echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' 
--	exit 0 ;;
-+	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-+	exit ;;
-     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
- 	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-         FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-         FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-         echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
--        exit 0 ;;
-+        exit ;;
-+    5000:UNIX_System_V:4.*:*)
-+        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-+        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
-+        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-+	exit ;;
-     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
- 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     sparc*:BSD/OS:*:*)
- 	echo sparc-unknown-bsdi${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     *:BSD/OS:*:*)
- 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
--	exit 0 ;;
--    *:FreeBSD:*:*|*:GNU/FreeBSD:*:*)
--	# Determine whether the default compiler uses glibc.
--	eval $set_cc_for_build
--	sed 's/^	//' << EOF >$dummy.c
--	#include <features.h>
--	#if __GLIBC__ >= 2
--	LIBC=gnu
--	#else
--	LIBC=
--	#endif
--EOF
--	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
--	# GNU/FreeBSD systems have a "k" prefix to indicate we are using
--	# FreeBSD's kernel, but not the complete OS.
--	case ${LIBC} in gnu) kernel_only='k' ;; esac
--	echo ${UNAME_MACHINE}-unknown-${kernel_only}freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
--	exit 0 ;;
-+	exit ;;
-+    *:FreeBSD:*:*)
-+	case ${UNAME_MACHINE} in
-+	    pc98)
-+		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-+	    amd64)
-+		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-+	    *)
-+		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-+	esac
-+	exit ;;
-     i*:CYGWIN*:*)
- 	echo ${UNAME_MACHINE}-pc-cygwin
--	exit 0 ;;
--    i*:MINGW*:*)
-+	exit ;;
-+    *:MINGW*:*)
- 	echo ${UNAME_MACHINE}-pc-mingw32
--	exit 0 ;;
-+	exit ;;
-+    i*:windows32*:*)
-+    	# uname -m includes "-pc" on this system.
-+    	echo ${UNAME_MACHINE}-mingw32
-+	exit ;;
-     i*:PW*:*)
- 	echo ${UNAME_MACHINE}-pc-pw32
--	exit 0 ;;
--    x86:Interix*:[34]*)
--	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
--	exit 0 ;;
-+	exit ;;
-+    *:Interix*:*)
-+    	case ${UNAME_MACHINE} in
-+	    x86)
-+		echo i586-pc-interix${UNAME_RELEASE}
-+		exit ;;
-+	    authenticamd | genuineintel | EM64T)
-+		echo x86_64-unknown-interix${UNAME_RELEASE}
-+		exit ;;
-+	    IA64)
-+		echo ia64-unknown-interix${UNAME_RELEASE}
-+		exit ;;
-+	esac ;;
-     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
- 	echo i${UNAME_MACHINE}-pc-mks
--	exit 0 ;;
-+	exit ;;
-+    8664:Windows_NT:*)
-+	echo x86_64-pc-mks
-+	exit ;;
-     i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
- 	# How do we know it's Interix rather than the generic POSIX subsystem?
- 	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
- 	# UNAME_MACHINE based on the output of uname instead of i386?
- 	echo i586-pc-interix
--	exit 0 ;;
-+	exit ;;
-     i*:UWIN*:*)
- 	echo ${UNAME_MACHINE}-pc-uwin
--	exit 0 ;;
-+	exit ;;
-+    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
-+	echo x86_64-unknown-cygwin
-+	exit ;;
-     p*:CYGWIN*:*)
- 	echo powerpcle-unknown-cygwin
--	exit 0 ;;
-+	exit ;;
-     prep*:SunOS:5.*:*)
- 	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
--	exit 0 ;;
-+	exit ;;
-     *:GNU:*:*)
-+	# the GNU system
- 	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
--	exit 0 ;;
-+	exit ;;
-+    *:GNU/*:*:*)
-+	# other systems with GNU libc and userland
-+	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
-+	exit ;;
-     i*86:Minix:*:*)
- 	echo ${UNAME_MACHINE}-pc-minix
--	exit 0 ;;
-+	exit ;;
-+    alpha:Linux:*:*)
-+	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-+	  EV5)   UNAME_MACHINE=alphaev5 ;;
-+	  EV56)  UNAME_MACHINE=alphaev56 ;;
-+	  PCA56) UNAME_MACHINE=alphapca56 ;;
-+	  PCA57) UNAME_MACHINE=alphapca56 ;;
-+	  EV6)   UNAME_MACHINE=alphaev6 ;;
-+	  EV67)  UNAME_MACHINE=alphaev67 ;;
-+	  EV68*) UNAME_MACHINE=alphaev68 ;;
-+        esac
-+	objdump --private-headers /bin/sh | grep -q ld.so.1
-+	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-+	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-+	exit ;;
-     arm*:Linux:*:*)
-+	eval $set_cc_for_build
-+	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
-+	    | grep -q __ARM_EABI__
-+	then
-+	    echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	else
-+	    echo ${UNAME_MACHINE}-unknown-linux-gnueabi
-+	fi
-+	exit ;;
-+    avr32*:Linux:*:*)
- 	echo ${UNAME_MACHINE}-unknown-linux-gnu
--	exit 0 ;;
-+	exit ;;
-     cris:Linux:*:*)
- 	echo cris-axis-linux-gnu
--	exit 0 ;;
--    ia64:Linux:*:*)
--	echo ${UNAME_MACHINE}-unknown-linux-gnu
--	exit 0 ;;
--    m68*:Linux:*:*)
--	echo ${UNAME_MACHINE}-unknown-linux-gnu
--	exit 0 ;;
--    mips:Linux:*:*)
-+	exit ;;
-+    crisv32:Linux:*:*)
-+	echo crisv32-axis-linux-gnu
-+	exit ;;
-+    frv:Linux:*:*)
-+    	echo frv-unknown-linux-gnu
-+	exit ;;
-+    i*86:Linux:*:*)
-+	LIBC=gnu
- 	eval $set_cc_for_build
- 	sed 's/^	//' << EOF >$dummy.c
--	#undef CPU
--	#undef mips
--	#undef mipsel
--	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
--	CPU=mipsel
--	#else
--	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
--	CPU=mips
--	#else
--	CPU=
--	#endif
-+	#ifdef __dietlibc__
-+	LIBC=dietlibc
- 	#endif
- EOF
--	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
--	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
--	;;
--    mips64:Linux:*:*)
-+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
-+	echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
-+	exit ;;
-+    ia64:Linux:*:*)
-+	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	exit ;;
-+    m32r*:Linux:*:*)
-+	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	exit ;;
-+    m68*:Linux:*:*)
-+	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	exit ;;
-+    mips:Linux:*:* | mips64:Linux:*:*)
- 	eval $set_cc_for_build
- 	sed 's/^	//' << EOF >$dummy.c
- 	#undef CPU
--	#undef mips64
--	#undef mips64el
-+	#undef ${UNAME_MACHINE}
-+	#undef ${UNAME_MACHINE}el
- 	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
--	CPU=mips64el
-+	CPU=${UNAME_MACHINE}el
- 	#else
- 	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
--	CPU=mips64
-+	CPU=${UNAME_MACHINE}
- 	#else
- 	CPU=
- 	#endif
- 	#endif
- EOF
--	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
--	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
-+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
-+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
- 	;;
--    ppc:Linux:*:*)
--	echo powerpc-unknown-linux-gnu
--	exit 0 ;;
--    ppc64:Linux:*:*)
--	echo powerpc64-unknown-linux-gnu
--	exit 0 ;;
--    alpha:Linux:*:*)
--	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
--	  EV5)   UNAME_MACHINE=alphaev5 ;;
--	  EV56)  UNAME_MACHINE=alphaev56 ;;
--	  PCA56) UNAME_MACHINE=alphapca56 ;;
--	  PCA57) UNAME_MACHINE=alphapca56 ;;
--	  EV6)   UNAME_MACHINE=alphaev6 ;;
--	  EV67)  UNAME_MACHINE=alphaev67 ;;
--	  EV68*) UNAME_MACHINE=alphaev68 ;;
--        esac
--	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
--	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
--	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
--	exit 0 ;;
-+    or32:Linux:*:*)
-+	echo or32-unknown-linux-gnu
-+	exit ;;
-+    padre:Linux:*:*)
-+	echo sparc-unknown-linux-gnu
-+	exit ;;
-+    parisc64:Linux:*:* | hppa64:Linux:*:*)
-+	echo hppa64-unknown-linux-gnu
-+	exit ;;
-     parisc:Linux:*:* | hppa:Linux:*:*)
- 	# Look for CPU level
- 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-@@ -881,84 +948,40 @@ EOF
- 	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
- 	  *)    echo hppa-unknown-linux-gnu ;;
- 	esac
--	exit 0 ;;
--    parisc64:Linux:*:* | hppa64:Linux:*:*)
--	echo hppa64-unknown-linux-gnu
--	exit 0 ;;
-+	exit ;;
-+    ppc64:Linux:*:*)
-+	echo powerpc64-unknown-linux-gnu
-+	exit ;;
-+    ppc:Linux:*:*)
-+	echo powerpc-unknown-linux-gnu
-+	exit ;;
-     s390:Linux:*:* | s390x:Linux:*:*)
- 	echo ${UNAME_MACHINE}-ibm-linux
--	exit 0 ;;
-+	exit ;;
-     sh64*:Linux:*:*)
-     	echo ${UNAME_MACHINE}-unknown-linux-gnu
--	exit 0 ;;
-+	exit ;;
-     sh*:Linux:*:*)
- 	echo ${UNAME_MACHINE}-unknown-linux-gnu
--	exit 0 ;;
-+	exit ;;
-     sparc:Linux:*:* | sparc64:Linux:*:*)
- 	echo ${UNAME_MACHINE}-unknown-linux-gnu
--	exit 0 ;;
-+	exit ;;
-+    vax:Linux:*:*)
-+	echo ${UNAME_MACHINE}-dec-linux-gnu
-+	exit ;;
-     x86_64:Linux:*:*)
- 	echo x86_64-unknown-linux-gnu
--	exit 0 ;;
--    i*86:Linux:*:*)
--	# The BFD linker knows what the default object file format is, so
--	# first see if it will tell us. cd to the root directory to prevent
--	# problems with other programs or directories called `ld' in the path.
--	# Set LC_ALL=C to ensure ld outputs messages in English.
--	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
--			 | sed -ne '/supported targets:/!d
--				    s/[ 	][ 	]*/ /g
--				    s/.*supported targets: *//
--				    s/ .*//
--				    p'`
--        case "$ld_supported_targets" in
--	  elf32-i386)
--		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
--		;;
--	  a.out-i386-linux)
--		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
--		exit 0 ;;
--	  coff-i386)
--		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
--		exit 0 ;;
--	  "")
--		# Either a pre-BFD a.out linker (linux-gnuoldld) or
--		# one that does not give us useful --help.
--		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
--		exit 0 ;;
--	esac
--	# Determine whether the default compiler is a.out or elf
--	eval $set_cc_for_build
--	sed 's/^	//' << EOF >$dummy.c
--	#include <features.h>
--	#ifdef __ELF__
--	# ifdef __GLIBC__
--	#  if __GLIBC__ >= 2
--	LIBC=gnu
--	#  else
--	LIBC=gnulibc1
--	#  endif
--	# else
--	LIBC=gnulibc1
--	# endif
--	#else
--	#ifdef __INTEL_COMPILER
--	LIBC=gnu
--	#else
--	LIBC=gnuaout
--	#endif
--	#endif
--EOF
--	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
--	test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
--	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
--	;;
-+	exit ;;
-+    xtensa*:Linux:*:*)
-+    	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	exit ;;
-     i*86:DYNIX/ptx:4*:*)
- 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
- 	# earlier versions are messed up and put the nodename in both
- 	# sysname and nodename.
- 	echo i386-sequent-sysv4
--	exit 0 ;;
-+	exit ;;
-     i*86:UNIX_SV:4.2MP:2.*)
-         # Unixware is an offshoot of SVR4, but it has its own version
-         # number series starting with 2...
-@@ -966,24 +989,27 @@ EOF
- 	# I just have to hope.  -- rms.
-         # Use sysv4.2uw... so that sysv4* matches it.
- 	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
--	exit 0 ;;
-+	exit ;;
-     i*86:OS/2:*:*)
- 	# If we were able to find `uname', then EMX Unix compatibility
- 	# is probably installed.
- 	echo ${UNAME_MACHINE}-pc-os2-emx
--	exit 0 ;;
-+	exit ;;
-     i*86:XTS-300:*:STOP)
- 	echo ${UNAME_MACHINE}-unknown-stop
--	exit 0 ;;
-+	exit ;;
-     i*86:atheos:*:*)
- 	echo ${UNAME_MACHINE}-unknown-atheos
--	exit 0 ;;
--    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
-+	exit ;;
-+    i*86:syllable:*:*)
-+	echo ${UNAME_MACHINE}-pc-syllable
-+	exit ;;
-+    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
- 	echo i386-unknown-lynxos${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     i*86:*DOS:*:*)
- 	echo ${UNAME_MACHINE}-pc-msdosdjgpp
--	exit 0 ;;
-+	exit ;;
-     i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
- 	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
- 	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
-@@ -991,15 +1017,16 @@ EOF
- 	else
- 		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
- 	fi
--	exit 0 ;;
--    i*86:*:5:[78]*)
-+	exit ;;
-+    i*86:*:5:[678]*)
-+    	# UnixWare 7.x, OpenUNIX and OpenServer 6.
- 	case `/bin/uname -X | grep "^Machine"` in
- 	    *486*)	     UNAME_MACHINE=i486 ;;
- 	    *Pentium)	     UNAME_MACHINE=i586 ;;
- 	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
- 	esac
- 	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
--	exit 0 ;;
-+	exit ;;
-     i*86:*:3.2:*)
- 	if test -f /usr/options/cb.name; then
- 		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
-@@ -1017,73 +1044,86 @@ EOF
- 	else
- 		echo ${UNAME_MACHINE}-pc-sysv32
- 	fi
--	exit 0 ;;
-+	exit ;;
-     pc:*:*:*)
- 	# Left here for compatibility:
-         # uname -m prints for DJGPP always 'pc', but it prints nothing about
--        # the processor, so we play safe by assuming i386.
--	echo i386-pc-msdosdjgpp
--        exit 0 ;;
-+        # the processor, so we play safe by assuming i586.
-+	# Note: whatever this is, it MUST be the same as what config.sub
-+	# prints for the "djgpp" host, or else GDB configury will decide that
-+	# this is a cross-build.
-+	echo i586-pc-msdosdjgpp
-+        exit ;;
-     Intel:Mach:3*:*)
- 	echo i386-pc-mach3
--	exit 0 ;;
-+	exit ;;
-     paragon:*:*:*)
- 	echo i860-intel-osf1
--	exit 0 ;;
-+	exit ;;
-     i860:*:4.*:*) # i860-SVR4
- 	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
- 	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
- 	else # Add other i860-SVR4 vendors below as they are discovered.
- 	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
- 	fi
--	exit 0 ;;
-+	exit ;;
-     mini*:CTIX:SYS*5:*)
- 	# "miniframe"
- 	echo m68010-convergent-sysv
--	exit 0 ;;
-+	exit ;;
-     mc68k:UNIX:SYSTEM5:3.51m)
- 	echo m68k-convergent-sysv
--	exit 0 ;;
-+	exit ;;
-     M680?0:D-NIX:5.3:*)
- 	echo m68k-diab-dnix
--	exit 0 ;;
--    M68*:*:R3V[567]*:*)
--	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
--    3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0)
-+	exit ;;
-+    M68*:*:R3V[5678]*:*)
-+	test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
-+    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
- 	OS_REL=''
- 	test -r /etc/.relid \
- 	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
- 	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
--	  && echo i486-ncr-sysv4.3${OS_REL} && exit 0
-+	  && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
- 	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
--	  && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
-+	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
-     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
-         /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
--          && echo i486-ncr-sysv4 && exit 0 ;;
-+          && { echo i486-ncr-sysv4; exit; } ;;
-+    NCR*:*:4.2:* | MPRAS*:*:4.2:*)
-+	OS_REL='.3'
-+	test -r /etc/.relid \
-+	    && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
-+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-+	    && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
-+	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-+	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
-+	/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
-+	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
-     m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
- 	echo m68k-unknown-lynxos${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     mc68030:UNIX_System_V:4.*:*)
- 	echo m68k-atari-sysv4
--	exit 0 ;;
-+	exit ;;
-     TSUNAMI:LynxOS:2.*:*)
- 	echo sparc-unknown-lynxos${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     rs6000:LynxOS:2.*:*)
- 	echo rs6000-unknown-lynxos${UNAME_RELEASE}
--	exit 0 ;;
--    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
-+	exit ;;
-+    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
- 	echo powerpc-unknown-lynxos${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     SM[BE]S:UNIX_SV:*:*)
- 	echo mips-dde-sysv${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     RM*:ReliantUNIX-*:*:*)
- 	echo mips-sni-sysv4
--	exit 0 ;;
-+	exit ;;
-     RM*:SINIX-*:*:*)
- 	echo mips-sni-sysv4
--	exit 0 ;;
-+	exit ;;
-     *:SINIX-*:*:*)
- 	if uname -p 2>/dev/null >/dev/null ; then
- 		UNAME_MACHINE=`(uname -p) 2>/dev/null`
-@@ -1091,68 +1131,94 @@ EOF
- 	else
- 		echo ns32k-sni-sysv
- 	fi
--	exit 0 ;;
-+	exit ;;
-     PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-                       # says <Richard.M.Bartel at ccMail.Census.GOV>
-         echo i586-unisys-sysv4
--        exit 0 ;;
-+        exit ;;
-     *:UNIX_System_V:4*:FTX*)
- 	# From Gerald Hewes <hewes at openmarket.com>.
- 	# How about differentiating between stratus architectures? -djm
- 	echo hppa1.1-stratus-sysv4
--	exit 0 ;;
-+	exit ;;
-     *:*:*:FTX*)
- 	# From seanf at swdc.stratus.com.
- 	echo i860-stratus-sysv4
--	exit 0 ;;
-+	exit ;;
-+    i*86:VOS:*:*)
-+	# From Paul.Green at stratus.com.
-+	echo ${UNAME_MACHINE}-stratus-vos
-+	exit ;;
-     *:VOS:*:*)
- 	# From Paul.Green at stratus.com.
- 	echo hppa1.1-stratus-vos
--	exit 0 ;;
-+	exit ;;
-     mc68*:A/UX:*:*)
- 	echo m68k-apple-aux${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     news*:NEWS-OS:6*:*)
- 	echo mips-sony-newsos6
--	exit 0 ;;
-+	exit ;;
-     R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
- 	if [ -d /usr/nec ]; then
- 	        echo mips-nec-sysv${UNAME_RELEASE}
- 	else
- 	        echo mips-unknown-sysv${UNAME_RELEASE}
- 	fi
--        exit 0 ;;
-+        exit ;;
-     BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
- 	echo powerpc-be-beos
--	exit 0 ;;
-+	exit ;;
-     BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
- 	echo powerpc-apple-beos
--	exit 0 ;;
-+	exit ;;
-     BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
- 	echo i586-pc-beos
--	exit 0 ;;
-+	exit ;;
-+    BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
-+	echo i586-pc-haiku
-+	exit ;;
-     SX-4:SUPER-UX:*:*)
- 	echo sx4-nec-superux${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     SX-5:SUPER-UX:*:*)
- 	echo sx5-nec-superux${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     SX-6:SUPER-UX:*:*)
- 	echo sx6-nec-superux${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-+    SX-7:SUPER-UX:*:*)
-+	echo sx7-nec-superux${UNAME_RELEASE}
-+	exit ;;
-+    SX-8:SUPER-UX:*:*)
-+	echo sx8-nec-superux${UNAME_RELEASE}
-+	exit ;;
-+    SX-8R:SUPER-UX:*:*)
-+	echo sx8r-nec-superux${UNAME_RELEASE}
-+	exit ;;
-     Power*:Rhapsody:*:*)
- 	echo powerpc-apple-rhapsody${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     *:Rhapsody:*:*)
- 	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     *:Darwin:*:*)
--	case `uname -p` in
--	    *86) UNAME_PROCESSOR=i686 ;;
--	    powerpc) UNAME_PROCESSOR=powerpc ;;
-+	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
-+	case $UNAME_PROCESSOR in
-+	    i386)
-+		eval $set_cc_for_build
-+		if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
-+		  if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
-+		      (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
-+		      grep IS_64BIT_ARCH >/dev/null
-+		  then
-+		      UNAME_PROCESSOR="x86_64"
-+		  fi
-+		fi ;;
-+	    unknown) UNAME_PROCESSOR=powerpc ;;
- 	esac
- 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     *:procnto*:*:* | *:QNX:[0123456789]*:*)
- 	UNAME_PROCESSOR=`uname -p`
- 	if test "$UNAME_PROCESSOR" = "x86"; then
-@@ -1160,22 +1226,25 @@ EOF
- 		UNAME_MACHINE=pc
- 	fi
- 	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     *:QNX:*:4*)
- 	echo i386-pc-qnx
--	exit 0 ;;
--    NSR-[DGKLNPTVW]:NONSTOP_KERNEL:*:*)
-+	exit ;;
-+    NSE-?:NONSTOP_KERNEL:*:*)
-+	echo nse-tandem-nsk${UNAME_RELEASE}
-+	exit ;;
-+    NSR-?:NONSTOP_KERNEL:*:*)
- 	echo nsr-tandem-nsk${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     *:NonStop-UX:*:*)
- 	echo mips-compaq-nonstopux
--	exit 0 ;;
-+	exit ;;
-     BS2000:POSIX*:*:*)
- 	echo bs2000-siemens-sysv
--	exit 0 ;;
-+	exit ;;
-     DS/*:UNIX_System_V:*:*)
- 	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-     *:Plan9:*:*)
- 	# "uname -m" is not consistent, so use $cputype instead. 386
- 	# is converted to i386 for consistency with other x86
-@@ -1186,28 +1255,50 @@ EOF
- 	    UNAME_MACHINE="$cputype"
- 	fi
- 	echo ${UNAME_MACHINE}-unknown-plan9
--	exit 0 ;;
-+	exit ;;
-     *:TOPS-10:*:*)
- 	echo pdp10-unknown-tops10
--	exit 0 ;;
-+	exit ;;
-     *:TENEX:*:*)
- 	echo pdp10-unknown-tenex
--	exit 0 ;;
-+	exit ;;
-     KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
- 	echo pdp10-dec-tops20
--	exit 0 ;;
-+	exit ;;
-     XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
- 	echo pdp10-xkl-tops20
--	exit 0 ;;
-+	exit ;;
-     *:TOPS-20:*:*)
- 	echo pdp10-unknown-tops20
--	exit 0 ;;
-+	exit ;;
-     *:ITS:*:*)
- 	echo pdp10-unknown-its
--	exit 0 ;;
-+	exit ;;
-     SEI:*:*:SEIUX)
-         echo mips-sei-seiux${UNAME_RELEASE}
--	exit 0 ;;
-+	exit ;;
-+    *:DragonFly:*:*)
-+	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-+	exit ;;
-+    *:*VMS:*:*)
-+    	UNAME_MACHINE=`(uname -p) 2>/dev/null`
-+	case "${UNAME_MACHINE}" in
-+	    A*) echo alpha-dec-vms ; exit ;;
-+	    I*) echo ia64-dec-vms ; exit ;;
-+	    V*) echo vax-dec-vms ; exit ;;
-+	esac ;;
-+    *:XENIX:*:SysV)
-+	echo i386-pc-xenix
-+	exit ;;
-+    i*86:skyos:*:*)
-+	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
-+	exit ;;
-+    i*86:rdos:*:*)
-+	echo ${UNAME_MACHINE}-pc-rdos
-+	exit ;;
-+    i*86:AROS:*:*)
-+	echo ${UNAME_MACHINE}-pc-aros
-+	exit ;;
- esac
- 
- #echo '(No uname command or uname output not recognized.)' 1>&2
-@@ -1239,7 +1330,7 @@ main ()
- #endif
- 
- #if defined (__arm) && defined (__acorn) && defined (__unix)
--  printf ("arm-acorn-riscix"); exit (0);
-+  printf ("arm-acorn-riscix\n"); exit (0);
- #endif
- 
- #if defined (hp300) && !defined (hpux)
-@@ -1328,11 +1419,12 @@ main ()
- }
- EOF
- 
--$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
-+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
-+	{ echo "$SYSTEM_NAME"; exit; }
- 
- # Apollos put the system type in the environment.
- 
--test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
-+test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
- 
- # Convex versions that predate uname can use getsysinfo(1)
- 
-@@ -1341,22 +1433,22 @@ then
-     case `getsysinfo -f cpu_type` in
-     c1*)
- 	echo c1-convex-bsd
--	exit 0 ;;
-+	exit ;;
-     c2*)
- 	if getsysinfo -f scalar_acc
- 	then echo c32-convex-bsd
- 	else echo c2-convex-bsd
- 	fi
--	exit 0 ;;
-+	exit ;;
-     c34*)
- 	echo c34-convex-bsd
--	exit 0 ;;
-+	exit ;;
-     c38*)
- 	echo c38-convex-bsd
--	exit 0 ;;
-+	exit ;;
-     c4*)
- 	echo c4-convex-bsd
--	exit 0 ;;
-+	exit ;;
-     esac
- fi
- 
-@@ -1367,7 +1459,9 @@ This script, last modified $timestamp, has failed to recognize
- the operating system you are using. It is advised that you
- download the most up to date version of the config scripts from
- 
--    ftp://ftp.gnu.org/pub/gnu/config/
-+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
-+and
-+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
- 
- If the version you run ($0) is already up to date, please
- send the following data and any information you think might be
-diff --git a/build/aux/config.sub b/build/aux/config.sub
-index 9d7f733..2a55a50 100755
---- a/build/aux/config.sub
-+++ b/build/aux/config.sub
-@@ -1,9 +1,10 @@
- #! /bin/sh
- # Configuration validation subroutine script.
- #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
--#   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
-+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
-+#   Free Software Foundation, Inc.
- 
--timestamp='2003-07-04'
-+timestamp='2009-11-20'
- 
- # This file is (in principle) common to ALL GNU software.
- # The presence of a machine in this file suggests that SOME GNU software
-@@ -21,22 +22,26 @@ timestamp='2003-07-04'
- #
- # 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., 59 Temple Place - Suite 330,
--# Boston, MA 02111-1307, USA.
--
-+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-+# 02110-1301, USA.
-+#
- # As a special exception to the GNU General Public License, if you
- # distribute this file as part of a program that contains a
- # configuration script generated by Autoconf, you may include it under
- # the same distribution terms that you use for the rest of that program.
- 
-+
- # Please send patches to <config-patches at gnu.org>.  Submit a context
--# diff and a properly formatted ChangeLog entry.
-+# diff and a properly formatted GNU ChangeLog entry.
- #
- # Configuration subroutine to validate and canonicalize a configuration type.
- # Supply the specified configuration type as an argument.
- # If it is invalid, we print an error message on stderr and exit with code 1.
- # Otherwise, we print the canonical config type on stdout and succeed.
- 
-+# You can get the latest version of this script from:
-+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
-+
- # This file is supposed to be the same for all GNU packages
- # and recognize all the CPU types, system types and aliases
- # that are meaningful with *any* GNU software.
-@@ -70,8 +75,8 @@ Report bugs and patches to <config-patches at gnu.org>."
- version="\
- GNU config.sub ($timestamp)
- 
--Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
--Free Software Foundation, Inc.
-+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- 
- This is free software; see the source for copying conditions.  There is NO
- warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-@@ -83,11 +88,11 @@ Try \`$me --help' for more information."
- while test $# -gt 0 ; do
-   case $1 in
-     --time-stamp | --time* | -t )
--       echo "$timestamp" ; exit 0 ;;
-+       echo "$timestamp" ; exit ;;
-     --version | -v )
--       echo "$version" ; exit 0 ;;
-+       echo "$version" ; exit ;;
-     --help | --h* | -h )
--       echo "$usage"; exit 0 ;;
-+       echo "$usage"; exit ;;
-     -- )     # Stop option processing
-        shift; break ;;
-     - )	# Use stdin as input.
-@@ -99,7 +104,7 @@ while test $# -gt 0 ; do
-     *local*)
-        # First pass through any local machine types.
-        echo $1
--       exit 0;;
-+       exit ;;
- 
-     * )
-        break ;;
-@@ -118,7 +123,10 @@ esac
- # Here we must recognize all the valid KERNEL-OS combinations.
- maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
- case $maybe_os in
--  nto-qnx* | linux-gnu* | kfreebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
-+  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
-+  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
-+  kopensolaris*-gnu* | \
-+  storm-chaos* | os2-emx* | rtmk-nova*)
-     os=-$maybe_os
-     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
-     ;;
-@@ -144,10 +152,13 @@ case $os in
- 	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
- 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
- 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
--	-apple | -axis)
-+	-apple | -axis | -knuth | -cray | -microblaze)
- 		os=
- 		basic_machine=$1
- 		;;
-+        -bluegene*)
-+	        os=-cnk
-+		;;
- 	-sim | -cisco | -oki | -wec | -winbond)
- 		os=
- 		basic_machine=$1
-@@ -169,6 +180,10 @@ case $os in
- 	-hiux*)
- 		os=-hiuxwe2
- 		;;
-+	-sco6)
-+		os=-sco5v6
-+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-+		;;
- 	-sco5)
- 		os=-sco3.2v5
- 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-@@ -185,6 +200,10 @@ case $os in
- 		# Don't forget version if it is 3.2v4 or newer.
- 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
- 		;;
-+	-sco5v6*)
-+		# Don't forget version if it is 3.2v4 or newer.
-+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-+		;;
- 	-sco*)
- 		os=-sco3.2v2
- 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-@@ -228,53 +247,71 @@ case $basic_machine in
- 	| a29k \
- 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
- 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
--	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
-+	| am33_2.0 \
-+	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
-+	| bfin \
- 	| c4x | clipper \
- 	| d10v | d30v | dlx | dsp16xx \
--	| fr30 | frv \
-+	| fido | fr30 | frv \
- 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
- 	| i370 | i860 | i960 | ia64 \
--	| ip2k \
--	| m32r | m68000 | m68k | m88k | mcore \
-+	| ip2k | iq2000 \
-+	| lm32 \
-+	| m32c | m32r | m32rle | m68000 | m68k | m88k \
-+	| maxq | mb | microblaze | mcore | mep | metag \
- 	| mips | mipsbe | mipseb | mipsel | mipsle \
- 	| mips16 \
- 	| mips64 | mips64el \
--	| mips64vr | mips64vrel \
-+	| mips64octeon | mips64octeonel \
- 	| mips64orion | mips64orionel \
-+	| mips64r5900 | mips64r5900el \
-+	| mips64vr | mips64vrel \
- 	| mips64vr4100 | mips64vr4100el \
- 	| mips64vr4300 | mips64vr4300el \
- 	| mips64vr5000 | mips64vr5000el \
-+	| mips64vr5900 | mips64vr5900el \
- 	| mipsisa32 | mipsisa32el \
- 	| mipsisa32r2 | mipsisa32r2el \
- 	| mipsisa64 | mipsisa64el \
-+	| mipsisa64r2 | mipsisa64r2el \
- 	| mipsisa64sb1 | mipsisa64sb1el \
- 	| mipsisa64sr71k | mipsisa64sr71kel \
- 	| mipstx39 | mipstx39el \
- 	| mn10200 | mn10300 \
-+	| moxie \
-+	| mt \
- 	| msp430 \
-+	| nios | nios2 \
- 	| ns16k | ns32k \
--	| openrisc | or32 \
-+	| or32 \
- 	| pdp10 | pdp11 | pj | pjl \
- 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
- 	| pyramid \
--	| sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
-+	| rx \
-+	| score \
-+	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
- 	| sh64 | sh64le \
--	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
--	| strongarm \
-+	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
-+	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
-+	| spu | strongarm \
- 	| tahoe | thumb | tic4x | tic80 | tron \
-+	| ubicom32 \
- 	| v850 | v850e \
- 	| we32k \
--	| x86 | xscale | xstormy16 | xtensa \
--	| z8k)
-+	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
-+	| z8k | z80)
- 		basic_machine=$basic_machine-unknown
- 		;;
--	m6811 | m68hc11 | m6812 | m68hc12)
-+	m6811 | m68hc11 | m6812 | m68hc12 | picochip)
- 		# Motorola 68HC11/12.
- 		basic_machine=$basic_machine-unknown
- 		os=-none
- 		;;
- 	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
- 		;;
-+	ms1)
-+		basic_machine=mt-unknown
-+		;;
- 
- 	# We use `pc' rather than `unknown'
- 	# because (1) that's what they normally are, and
-@@ -292,56 +329,70 @@ case $basic_machine in
- 	| a29k-* \
- 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
- 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
--	| alphapca5[67]-* | alpha64pca5[67]-* | amd64-* | arc-* \
-+	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
- 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
--	| avr-* \
--	| bs2000-* \
-+	| avr-* | avr32-* \
-+	| bfin-* | bs2000-* \
- 	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
--	| clipper-* | cydra-* \
-+	| clipper-* | craynv-* | cydra-* \
- 	| d10v-* | d30v-* | dlx-* \
- 	| elxsi-* \
--	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
-+	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
- 	| h8300-* | h8500-* \
- 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
- 	| i*86-* | i860-* | i960-* | ia64-* \
--	| ip2k-* \
--	| m32r-* \
-+	| ip2k-* | iq2000-* \
-+	| lm32-* \
-+	| m32c-* | m32r-* | m32rle-* \
- 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
--	| m88110-* | m88k-* | mcore-* \
-+	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
- 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
- 	| mips16-* \
- 	| mips64-* | mips64el-* \
--	| mips64vr-* | mips64vrel-* \
-+	| mips64octeon-* | mips64octeonel-* \
- 	| mips64orion-* | mips64orionel-* \
-+	| mips64r5900-* | mips64r5900el-* \
-+	| mips64vr-* | mips64vrel-* \
- 	| mips64vr4100-* | mips64vr4100el-* \
- 	| mips64vr4300-* | mips64vr4300el-* \
- 	| mips64vr5000-* | mips64vr5000el-* \
-+	| mips64vr5900-* | mips64vr5900el-* \
- 	| mipsisa32-* | mipsisa32el-* \
- 	| mipsisa32r2-* | mipsisa32r2el-* \
- 	| mipsisa64-* | mipsisa64el-* \
-+	| mipsisa64r2-* | mipsisa64r2el-* \
- 	| mipsisa64sb1-* | mipsisa64sb1el-* \
- 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
- 	| mipstx39-* | mipstx39el-* \
-+	| mmix-* \
-+	| mt-* \
- 	| msp430-* \
--	| none-* | np1-* | nv1-* | ns16k-* | ns32k-* \
-+	| nios-* | nios2-* \
-+	| none-* | np1-* | ns16k-* | ns32k-* \
- 	| orion-* \
- 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
- 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
- 	| pyramid-* \
--	| romp-* | rs6000-* \
--	| sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
-+	| romp-* | rs6000-* | rx-* \
-+	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
- 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
--	| sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
--	| sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
-+	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
-+	| sparclite-* \
-+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
- 	| tahoe-* | thumb-* \
--	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
-+	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
- 	| tron-* \
-+	| ubicom32-* \
- 	| v850-* | v850e-* | vax-* \
- 	| we32k-* \
--	| x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
--	| xtensa-* \
-+	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
-+	| xstormy16-* | xtensa*-* \
- 	| ymp-* \
--	| z8k-*)
-+	| z8k-* | z80-*)
-+		;;
-+	# Recognize the basic CPU types without company name, with glob match.
-+	xtensa*)
-+		basic_machine=$basic_machine-unknown
- 		;;
- 	# Recognize the various machine names and aliases which stand
- 	# for a CPU type and a company and sometimes even an OS.
-@@ -359,6 +410,9 @@ case $basic_machine in
- 		basic_machine=a29k-amd
- 		os=-udi
- 		;;
-+    	abacus)
-+		basic_machine=abacus-unknown
-+		;;
- 	adobe68k)
- 		basic_machine=m68010-adobe
- 		os=-scout
-@@ -376,6 +430,9 @@ case $basic_machine in
- 	amd64)
- 		basic_machine=x86_64-pc
- 		;;
-+	amd64-*)
-+		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		;;
- 	amdahl)
- 		basic_machine=580-amdahl
- 		os=-sysv
-@@ -399,6 +456,10 @@ case $basic_machine in
- 		basic_machine=m68k-apollo
- 		os=-bsd
- 		;;
-+	aros)
-+		basic_machine=i386-pc
-+		os=-aros
-+		;;
- 	aux)
- 		basic_machine=m68k-apple
- 		os=-aux
-@@ -407,10 +468,26 @@ case $basic_machine in
- 		basic_machine=ns32k-sequent
- 		os=-dynix
- 		;;
-+	blackfin)
-+		basic_machine=bfin-unknown
-+		os=-linux
-+		;;
-+	blackfin-*)
-+		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		os=-linux
-+		;;
-+	bluegene*)
-+		basic_machine=powerpc-ibm
-+		os=-cnk
-+		;;
- 	c90)
- 		basic_machine=c90-cray
- 		os=-unicos
- 		;;
-+        cegcc)
-+		basic_machine=arm-unknown
-+		os=-cegcc
-+		;;
- 	convex-c1)
- 		basic_machine=c1-convex
- 		os=-bsd
-@@ -435,12 +512,27 @@ case $basic_machine in
- 		basic_machine=j90-cray
- 		os=-unicos
- 		;;
-+	craynv)
-+		basic_machine=craynv-cray
-+		os=-unicosmp
-+		;;
-+	cr16)
-+		basic_machine=cr16-unknown
-+		os=-elf
-+		;;
- 	crds | unos)
- 		basic_machine=m68k-crds
- 		;;
-+	crisv32 | crisv32-* | etraxfs*)
-+		basic_machine=crisv32-axis
-+		;;
- 	cris | cris-* | etrax*)
- 		basic_machine=cris-axis
- 		;;
-+	crx)
-+		basic_machine=crx-unknown
-+		os=-elf
-+		;;
- 	da30 | da30-*)
- 		basic_machine=m68k-da30
- 		;;
-@@ -463,6 +555,14 @@ case $basic_machine in
- 		basic_machine=m88k-motorola
- 		os=-sysv3
- 		;;
-+	dicos)
-+		basic_machine=i686-pc
-+		os=-dicos
-+		;;
-+	djgpp)
-+		basic_machine=i586-pc
-+		os=-msdosdjgpp
-+		;;
- 	dpx20 | dpx20-*)
- 		basic_machine=rs6000-bull
- 		os=-bosx
-@@ -613,6 +713,14 @@ case $basic_machine in
- 		basic_machine=m68k-isi
- 		os=-sysv
- 		;;
-+	m68knommu)
-+		basic_machine=m68k-unknown
-+		os=-linux
-+		;;
-+	m68knommu-*)
-+		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		os=-linux
-+		;;
- 	m88k-omron*)
- 		basic_machine=m88k-omron
- 		;;
-@@ -624,10 +732,17 @@ case $basic_machine in
- 		basic_machine=ns32k-utek
- 		os=-sysv
- 		;;
-+        microblaze)
-+		basic_machine=microblaze-xilinx
-+		;;
- 	mingw32)
- 		basic_machine=i386-pc
- 		os=-mingw32
- 		;;
-+	mingw32ce)
-+		basic_machine=arm-unknown
-+		os=-mingw32ce
-+		;;
- 	miniframe)
- 		basic_machine=m68000-convergent
- 		;;
-@@ -641,10 +756,6 @@ case $basic_machine in
- 	mips3*)
- 		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
- 		;;
--	mmix*)
--		basic_machine=mmix-knuth
--		os=-mmixware
--		;;
- 	monitor)
- 		basic_machine=m68k-rom68k
- 		os=-coff
-@@ -657,6 +768,9 @@ case $basic_machine in
- 		basic_machine=i386-pc
- 		os=-msdos
- 		;;
-+	ms1-*)
-+		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
-+		;;
- 	mvs)
- 		basic_machine=i370-ibm
- 		os=-mvs
-@@ -725,10 +839,6 @@ case $basic_machine in
- 	np1)
- 		basic_machine=np1-gould
- 		;;
--	nv1)
--		basic_machine=nv1-cray
--		os=-unicosmp
--		;;
- 	nsr-tandem)
- 		basic_machine=nsr-tandem
- 		;;
-@@ -736,9 +846,12 @@ case $basic_machine in
- 		basic_machine=hppa1.1-oki
- 		os=-proelf
- 		;;
--	or32 | or32-*)
-+	openrisc | openrisc-*)
- 		basic_machine=or32-unknown
--		os=-coff
-+		;;
-+	os400)
-+		basic_machine=powerpc-ibm
-+		os=-os400
- 		;;
- 	OSE68000 | ose68000)
- 		basic_machine=m68000-ericsson
-@@ -756,6 +869,14 @@ case $basic_machine in
- 		basic_machine=i860-intel
- 		os=-osf
- 		;;
-+	parisc)
-+		basic_machine=hppa-unknown
-+		os=-linux
-+		;;
-+	parisc-*)
-+		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		os=-linux
-+		;;
- 	pbd)
- 		basic_machine=sparc-tti
- 		;;
-@@ -765,6 +886,12 @@ case $basic_machine in
- 	pc532 | pc532-*)
- 		basic_machine=ns32k-pc532
- 		;;
-+	pc98)
-+		basic_machine=i386-pc
-+		;;
-+	pc98-*)
-+		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		;;
- 	pentium | p5 | k5 | k6 | nexgen | viac3)
- 		basic_machine=i586-pc
- 		;;
-@@ -821,6 +948,10 @@ case $basic_machine in
- 		basic_machine=i586-unknown
- 		os=-pw32
- 		;;
-+	rdos)
-+		basic_machine=i386-pc
-+		os=-rdos
-+		;;
- 	rom68k)
- 		basic_machine=m68k-rom68k
- 		os=-coff
-@@ -847,6 +978,10 @@ case $basic_machine in
- 	sb1el)
- 		basic_machine=mipsisa64sb1el-unknown
- 		;;
-+	sde)
-+		basic_machine=mipsisa32-sde
-+		os=-elf
-+		;;
- 	sei)
- 		basic_machine=mips-sei
- 		os=-seiux
-@@ -858,6 +993,9 @@ case $basic_machine in
- 		basic_machine=sh-hitachi
- 		os=-hms
- 		;;
-+	sh5el)
-+		basic_machine=sh5le-unknown
-+		;;
- 	sh64)
- 		basic_machine=sh64-unknown
- 		;;
-@@ -947,6 +1085,10 @@ case $basic_machine in
- 		basic_machine=tic6x-unknown
- 		os=-coff
- 		;;
-+	tile*)
-+		basic_machine=tile-unknown
-+		os=-linux-gnu
-+		;;
- 	tx39)
- 		basic_machine=mipstx39-unknown
- 		;;
-@@ -960,6 +1102,10 @@ case $basic_machine in
- 	tower | tower-32)
- 		basic_machine=m68k-ncr
- 		;;
-+	tpf)
-+		basic_machine=s390x-ibm
-+		os=-tpf
-+		;;
- 	udi29k)
- 		basic_machine=a29k-amd
- 		os=-udi
-@@ -1003,6 +1149,10 @@ case $basic_machine in
- 		basic_machine=hppa1.1-winbond
- 		os=-proelf
- 		;;
-+	xbox)
-+		basic_machine=i686-pc
-+		os=-mingw32
-+		;;
- 	xps | xps100)
- 		basic_machine=xps100-honeywell
- 		;;
-@@ -1014,6 +1164,10 @@ case $basic_machine in
- 		basic_machine=z8k-unknown
- 		os=-sim
- 		;;
-+	z80-*-coff)
-+		basic_machine=z80-unknown
-+		os=-sim
-+		;;
- 	none)
- 		basic_machine=none-none
- 		os=-none
-@@ -1033,6 +1187,9 @@ case $basic_machine in
- 	romp)
- 		basic_machine=romp-ibm
- 		;;
-+	mmix)
-+		basic_machine=mmix-knuth
-+		;;
- 	rs6000)
- 		basic_machine=rs6000-ibm
- 		;;
-@@ -1049,13 +1206,10 @@ case $basic_machine in
- 	we32k)
- 		basic_machine=we32k-att
- 		;;
--	sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
-+	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
- 		basic_machine=sh-unknown
- 		;;
--	sh64)
--		basic_machine=sh64-unknown
--		;;
--	sparc | sparcv9 | sparcv9b)
-+	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
- 		basic_machine=sparc-sun
- 		;;
- 	cydra)
-@@ -1102,6 +1256,9 @@ case $os in
-         # First match some system type aliases
-         # that might get confused with valid system types.
- 	# -solaris* is a basic system type, with this one exception.
-+        -auroraux)
-+	        os=-auroraux
-+		;;
- 	-solaris1 | -solaris1.*)
- 		os=`echo $os | sed -e 's|solaris1|sunos4|'`
- 		;;
-@@ -1122,25 +1279,30 @@ case $os in
- 	# Each alternative MUST END IN A *, to match a version number.
- 	# -sysv* is not here because it comes later, after sysvr4.
- 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
--	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
--	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
-+	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
-+	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
-+	      | -sym* | -kopensolaris* \
- 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
--	      | -aos* \
-+	      | -aos* | -aros* \
- 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
- 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
--	      | -hiux* | -386bsd* | -netbsd* | -openbsd* | -kfreebsd* | -freebsd* | -riscix* \
--	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
-+	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
-+	      | -openbsd* | -solidbsd* \
-+	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
-+	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
- 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
- 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
--	      | -chorusos* | -chorusrdb* \
-+	      | -chorusos* | -chorusrdb* | -cegcc* \
- 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
--	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
-+	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
-+	      | -uxpv* | -beos* | -mpeix* | -udk* \
- 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
- 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
- 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
- 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
- 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
--	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei*)
-+	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
- 	# Remember, each alternative MUST END IN *, to match a version number.
- 		;;
- 	-qnx*)
-@@ -1158,12 +1320,15 @@ case $os in
- 		os=`echo $os | sed -e 's|nto|nto-qnx|'`
- 		;;
- 	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
--	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
-+	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
- 	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
- 		;;
- 	-mac*)
- 		os=`echo $os | sed -e 's|mac|macos|'`
- 		;;
-+	-linux-dietlibc)
-+		os=-linux-dietlibc
-+		;;
- 	-linux*)
- 		os=`echo $os | sed -e 's|linux|linux-gnu|'`
- 		;;
-@@ -1176,6 +1341,9 @@ case $os in
- 	-opened*)
- 		os=-openedition
- 		;;
-+        -os400*)
-+		os=-os400
-+		;;
- 	-wince*)
- 		os=-wince
- 		;;
-@@ -1197,6 +1365,9 @@ case $os in
- 	-atheos*)
- 		os=-atheos
- 		;;
-+	-syllable*)
-+		os=-syllable
-+		;;
- 	-386bsd)
- 		os=-bsd
- 		;;
-@@ -1219,6 +1390,9 @@ case $os in
- 	-sinix*)
- 		os=-sysv4
- 		;;
-+        -tpf*)
-+		os=-tpf
-+		;;
- 	-triton*)
- 		os=-sysv3
- 		;;
-@@ -1255,6 +1429,12 @@ case $os in
- 	-kaos*)
- 		os=-kaos
- 		;;
-+	-zvmoe)
-+		os=-zvmoe
-+		;;
-+	-dicos*)
-+		os=-dicos
-+		;;
- 	-none)
- 		;;
- 	*)
-@@ -1277,6 +1457,12 @@ else
- # system, and we'll never get to this point.
- 
- case $basic_machine in
-+        score-*)
-+		os=-elf
-+		;;
-+        spu-*)
-+		os=-elf
-+		;;
- 	*-acorn)
- 		os=-riscix1.2
- 		;;
-@@ -1286,9 +1472,9 @@ case $basic_machine in
- 	arm*-semi)
- 		os=-aout
- 		;;
--    c4x-* | tic4x-*)
--        os=-coff
--        ;;
-+        c4x-* | tic4x-*)
-+        	os=-coff
-+		;;
- 	# This must come before the *-dec entry.
- 	pdp10-*)
- 		os=-tops20
-@@ -1314,6 +1500,9 @@ case $basic_machine in
- 	m68*-cisco)
- 		os=-aout
- 		;;
-+        mep-*)
-+		os=-elf
-+		;;
- 	mips*-cisco)
- 		os=-elf
- 		;;
-@@ -1332,9 +1521,15 @@ case $basic_machine in
- 	*-be)
- 		os=-beos
- 		;;
-+	*-haiku)
-+		os=-haiku
-+		;;
- 	*-ibm)
- 		os=-aix
- 		;;
-+    	*-knuth)
-+		os=-mmixware
-+		;;
- 	*-wec)
- 		os=-proelf
- 		;;
-@@ -1437,7 +1632,7 @@ case $basic_machine in
- 			-sunos*)
- 				vendor=sun
- 				;;
--			-aix*)
-+			-cnk*|-aix*)
- 				vendor=ibm
- 				;;
- 			-beos*)
-@@ -1467,9 +1662,15 @@ case $basic_machine in
- 			-mvs* | -opened*)
- 				vendor=ibm
- 				;;
-+			-os400*)
-+				vendor=ibm
-+				;;
- 			-ptx*)
- 				vendor=sequent
- 				;;
-+			-tpf*)
-+				vendor=ibm
-+				;;
- 			-vxsim* | -vxworks* | -windiss*)
- 				vendor=wrs
- 				;;
-@@ -1494,7 +1695,7 @@ case $basic_machine in
- esac
- 
- echo $basic_machine$os
--exit 0
-+exit
- 
- # Local variables:
- # eval: (add-hook 'write-file-hooks 'time-stamp)
 diff --git a/config.h.in b/config.h.in
 index adddf6f..3aad469 100644
 --- a/config.h.in
@@ -5677,6 +3401,332 @@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/strndup.Plo at am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/strnlen.Plo at am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/strnlen1.Plo at am__quote@
+diff --git a/gnulib/lib/rawmemchr.c b/gnulib/lib/rawmemchr.c
+new file mode 100644
+index 0000000..ef81f96
+--- /dev/null
++++ b/gnulib/lib/rawmemchr.c
+@@ -0,0 +1,136 @@
++/* Searching in a string.
++   Copyright (C) 2008-2011 Free Software Foundation, Inc.
++
++   This program is free software: you can redistribute it and/or modify
++   it under the terms of the GNU Lesser General Public License as published by
++   the Free Software Foundation; either version 2.1 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 Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public License
++   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
++
++#include <config.h>
++
++/* Specification.  */
++#include <string.h>
++
++/* Find the first occurrence of C in S.  */
++void *
++rawmemchr (const void *s, int c_in)
++{
++  /* On 32-bit hardware, choosing longword to be a 32-bit unsigned
++     long instead of a 64-bit uintmax_t tends to give better
++     performance.  On 64-bit hardware, unsigned long is generally 64
++     bits already.  Change this typedef to experiment with
++     performance.  */
++  typedef unsigned long int longword;
++
++  const unsigned char *char_ptr;
++  const longword *longword_ptr;
++  longword repeated_one;
++  longword repeated_c;
++  unsigned char c;
++
++  c = (unsigned char) c_in;
++
++  /* Handle the first few bytes by reading one byte at a time.
++     Do this until CHAR_PTR is aligned on a longword boundary.  */
++  for (char_ptr = (const unsigned char *) s;
++       (size_t) char_ptr % sizeof (longword) != 0;
++       ++char_ptr)
++    if (*char_ptr == c)
++      return (void *) char_ptr;
++
++  longword_ptr = (const longword *) char_ptr;
++
++  /* All these elucidatory comments refer to 4-byte longwords,
++     but the theory applies equally well to any size longwords.  */
++
++  /* Compute auxiliary longword values:
++     repeated_one is a value which has a 1 in every byte.
++     repeated_c has c in every byte.  */
++  repeated_one = 0x01010101;
++  repeated_c = c | (c << 8);
++  repeated_c |= repeated_c << 16;
++  if (0xffffffffU < (longword) -1)
++    {
++      repeated_one |= repeated_one << 31 << 1;
++      repeated_c |= repeated_c << 31 << 1;
++      if (8 < sizeof (longword))
++        {
++          size_t i;
++
++          for (i = 64; i < sizeof (longword) * 8; i *= 2)
++            {
++              repeated_one |= repeated_one << i;
++              repeated_c |= repeated_c << i;
++            }
++        }
++    }
++
++  /* Instead of the traditional loop which tests each byte, we will
++     test a longword at a time.  The tricky part is testing if *any of
++     the four* bytes in the longword in question are equal to NUL or
++     c.  We first use an xor with repeated_c.  This reduces the task
++     to testing whether *any of the four* bytes in longword1 is zero.
++
++     We compute tmp =
++       ((longword1 - repeated_one) & ~longword1) & (repeated_one << 7).
++     That is, we perform the following operations:
++       1. Subtract repeated_one.
++       2. & ~longword1.
++       3. & a mask consisting of 0x80 in every byte.
++     Consider what happens in each byte:
++       - If a byte of longword1 is zero, step 1 and 2 transform it into 0xff,
++         and step 3 transforms it into 0x80.  A carry can also be propagated
++         to more significant bytes.
++       - If a byte of longword1 is nonzero, let its lowest 1 bit be at
++         position k (0 <= k <= 7); so the lowest k bits are 0.  After step 1,
++         the byte ends in a single bit of value 0 and k bits of value 1.
++         After step 2, the result is just k bits of value 1: 2^k - 1.  After
++         step 3, the result is 0.  And no carry is produced.
++     So, if longword1 has only non-zero bytes, tmp is zero.
++     Whereas if longword1 has a zero byte, call j the position of the least
++     significant zero byte.  Then the result has a zero at positions 0, ...,
++     j-1 and a 0x80 at position j.  We cannot predict the result at the more
++     significant bytes (positions j+1..3), but it does not matter since we
++     already have a non-zero bit at position 8*j+7.
++
++     The test whether any byte in longword1 is zero is equivalent
++     to testing whether tmp is nonzero.
++
++     This test can read beyond the end of a string, depending on where
++     C_IN is encountered.  However, this is considered safe since the
++     initialization phase ensured that the read will be aligned,
++     therefore, the read will not cross page boundaries and will not
++     cause a fault.  */
++
++  while (1)
++    {
++      longword longword1 = *longword_ptr ^ repeated_c;
++
++      if ((((longword1 - repeated_one) & ~longword1)
++           & (repeated_one << 7)) != 0)
++        break;
++      longword_ptr++;
++    }
++
++  char_ptr = (const unsigned char *) longword_ptr;
++
++  /* At this point, we know that one of the sizeof (longword) bytes
++     starting at char_ptr is == c.  On little-endian machines, we
++     could determine the first such byte without any further memory
++     accesses, just by looking at the tmp result from the last loop
++     iteration.  But this does not work on big-endian machines.
++     Choose code that works in both cases.  */
++
++  char_ptr = (unsigned char *) longword_ptr;
++  while (*char_ptr != c)
++    char_ptr++;
++  return (void *) char_ptr;
++}
+diff --git a/gnulib/lib/rawmemchr.valgrind b/gnulib/lib/rawmemchr.valgrind
+new file mode 100644
+index 0000000..6363923
+--- /dev/null
++++ b/gnulib/lib/rawmemchr.valgrind
+@@ -0,0 +1,12 @@
++# Suppress a valgrind message about use of uninitialized memory in rawmemchr().
++# This use is OK because it provides only a speedup.
++{
++    rawmemchr-value4
++    Memcheck:Value4
++    fun:rawmemchr
++}
++{
++    rawmemchr-value8
++    Memcheck:Value8
++    fun:rawmemchr
++}
+diff --git a/gnulib/lib/strchrnul.c b/gnulib/lib/strchrnul.c
+new file mode 100644
+index 0000000..d3b077f
+--- /dev/null
++++ b/gnulib/lib/strchrnul.c
+@@ -0,0 +1,142 @@
++/* Searching in a string.
++   Copyright (C) 2003, 2007-2011 Free Software Foundation, Inc.
++
++   This program is free software: you can redistribute it and/or modify
++   it under the terms of the GNU Lesser General Public License as published by
++   the Free Software Foundation; either version 2.1 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 Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public License
++   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
++
++#include <config.h>
++
++/* Specification.  */
++#include <string.h>
++
++/* Find the first occurrence of C in S or the final NUL byte.  */
++char *
++strchrnul (const char *s, int c_in)
++{
++  /* On 32-bit hardware, choosing longword to be a 32-bit unsigned
++     long instead of a 64-bit uintmax_t tends to give better
++     performance.  On 64-bit hardware, unsigned long is generally 64
++     bits already.  Change this typedef to experiment with
++     performance.  */
++  typedef unsigned long int longword;
++
++  const unsigned char *char_ptr;
++  const longword *longword_ptr;
++  longword repeated_one;
++  longword repeated_c;
++  unsigned char c;
++
++  c = (unsigned char) c_in;
++  if (!c)
++    return rawmemchr (s, 0);
++
++  /* Handle the first few bytes by reading one byte at a time.
++     Do this until CHAR_PTR is aligned on a longword boundary.  */
++  for (char_ptr = (const unsigned char *) s;
++       (size_t) char_ptr % sizeof (longword) != 0;
++       ++char_ptr)
++    if (!*char_ptr || *char_ptr == c)
++      return (char *) char_ptr;
++
++  longword_ptr = (const longword *) char_ptr;
++
++  /* All these elucidatory comments refer to 4-byte longwords,
++     but the theory applies equally well to any size longwords.  */
++
++  /* Compute auxiliary longword values:
++     repeated_one is a value which has a 1 in every byte.
++     repeated_c has c in every byte.  */
++  repeated_one = 0x01010101;
++  repeated_c = c | (c << 8);
++  repeated_c |= repeated_c << 16;
++  if (0xffffffffU < (longword) -1)
++    {
++      repeated_one |= repeated_one << 31 << 1;
++      repeated_c |= repeated_c << 31 << 1;
++      if (8 < sizeof (longword))
++        {
++          size_t i;
++
++          for (i = 64; i < sizeof (longword) * 8; i *= 2)
++            {
++              repeated_one |= repeated_one << i;
++              repeated_c |= repeated_c << i;
++            }
++        }
++    }
++
++  /* Instead of the traditional loop which tests each byte, we will
++     test a longword at a time.  The tricky part is testing if *any of
++     the four* bytes in the longword in question are equal to NUL or
++     c.  We first use an xor with repeated_c.  This reduces the task
++     to testing whether *any of the four* bytes in longword1 or
++     longword2 is zero.
++
++     Let's consider longword1.  We compute tmp =
++       ((longword1 - repeated_one) & ~longword1) & (repeated_one << 7).
++     That is, we perform the following operations:
++       1. Subtract repeated_one.
++       2. & ~longword1.
++       3. & a mask consisting of 0x80 in every byte.
++     Consider what happens in each byte:
++       - If a byte of longword1 is zero, step 1 and 2 transform it into 0xff,
++         and step 3 transforms it into 0x80.  A carry can also be propagated
++         to more significant bytes.
++       - If a byte of longword1 is nonzero, let its lowest 1 bit be at
++         position k (0 <= k <= 7); so the lowest k bits are 0.  After step 1,
++         the byte ends in a single bit of value 0 and k bits of value 1.
++         After step 2, the result is just k bits of value 1: 2^k - 1.  After
++         step 3, the result is 0.  And no carry is produced.
++     So, if longword1 has only non-zero bytes, tmp is zero.
++     Whereas if longword1 has a zero byte, call j the position of the least
++     significant zero byte.  Then the result has a zero at positions 0, ...,
++     j-1 and a 0x80 at position j.  We cannot predict the result at the more
++     significant bytes (positions j+1..3), but it does not matter since we
++     already have a non-zero bit at position 8*j+7.
++
++     The test whether any byte in longword1 or longword2 is zero is equivalent
++     to testing whether tmp1 is nonzero or tmp2 is nonzero.  We can combine
++     this into a single test, whether (tmp1 | tmp2) is nonzero.
++
++     This test can read more than one byte beyond the end of a string,
++     depending on where the terminating NUL is encountered.  However,
++     this is considered safe since the initialization phase ensured
++     that the read will be aligned, therefore, the read will not cross
++     page boundaries and will not cause a fault.  */
++
++  while (1)
++    {
++      longword longword1 = *longword_ptr ^ repeated_c;
++      longword longword2 = *longword_ptr;
++
++      if (((((longword1 - repeated_one) & ~longword1)
++            | ((longword2 - repeated_one) & ~longword2))
++           & (repeated_one << 7)) != 0)
++        break;
++      longword_ptr++;
++    }
++
++  char_ptr = (const unsigned char *) longword_ptr;
++
++  /* At this point, we know that one of the sizeof (longword) bytes
++     starting at char_ptr is == 0 or == c.  On little-endian machines,
++     we could determine the first such byte without any further memory
++     accesses, just by looking at the tmp result from the last loop
++     iteration.  But this does not work on big-endian machines.
++     Choose code that works in both cases.  */
++
++  char_ptr = (unsigned char *) longword_ptr;
++  while (*char_ptr && (*char_ptr != c))
++    char_ptr++;
++  return (char *) char_ptr;
++}
+diff --git a/gnulib/lib/strchrnul.valgrind b/gnulib/lib/strchrnul.valgrind
+new file mode 100644
+index 0000000..b14fa13
+--- /dev/null
++++ b/gnulib/lib/strchrnul.valgrind
+@@ -0,0 +1,12 @@
++# Suppress a valgrind message about use of uninitialized memory in strchrnul().
++# This use is OK because it provides only a speedup.
++{
++    strchrnul-value4
++    Memcheck:Value4
++    fun:strchrnul
++}
++{
++    strchrnul-value8
++    Memcheck:Value8
++    fun:strchrnul
++}
 diff --git a/gnulib/m4/gnulib-comp.m4 b/gnulib/m4/gnulib-comp.m4
 index e42948b..2aca838 100644
 --- a/gnulib/m4/gnulib-comp.m4
@@ -5780,6 +3830,60 @@
    tests/test-string.c
    tests/test-strnlen.c
    tests/test-strstr.c
+diff --git a/gnulib/m4/rawmemchr.m4 b/gnulib/m4/rawmemchr.m4
+new file mode 100644
+index 0000000..542cba1
+--- /dev/null
++++ b/gnulib/m4/rawmemchr.m4
+@@ -0,0 +1,21 @@
++# rawmemchr.m4 serial 1
++dnl Copyright (C) 2003, 2007-2011 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_RAWMEMCHR],
++[
++  dnl Persuade glibc <string.h> to declare rawmemchr().
++  AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
++
++  AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS])
++  AC_REPLACE_FUNCS([rawmemchr])
++  if test $ac_cv_func_rawmemchr = no; then
++    HAVE_RAWMEMCHR=0
++    gl_PREREQ_RAWMEMCHR
++  fi
++])
++
++# Prerequisites of lib/strchrnul.c.
++AC_DEFUN([gl_PREREQ_RAWMEMCHR], [:])
+diff --git a/gnulib/m4/strchrnul.m4 b/gnulib/m4/strchrnul.m4
+new file mode 100644
+index 0000000..a64e805
+--- /dev/null
++++ b/gnulib/m4/strchrnul.m4
+@@ -0,0 +1,21 @@
++# strchrnul.m4 serial 7
++dnl Copyright (C) 2003, 2007, 2009-2011 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_STRCHRNUL],
++[
++  dnl Persuade glibc <string.h> to declare strchrnul().
++  AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
++
++  AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS])
++  AC_REPLACE_FUNCS([strchrnul])
++  if test $ac_cv_func_strchrnul = no; then
++    HAVE_STRCHRNUL=0
++    gl_PREREQ_STRCHRNUL
++  fi
++])
++
++# Prerequisites of lib/strchrnul.c.
++AC_DEFUN([gl_PREREQ_STRCHRNUL], [:])
 diff --git a/gnulib/tests/Makefile.am b/gnulib/tests/Makefile.am
 index 3676a7d..2331f4b 100644
 --- a/gnulib/tests/Makefile.am
@@ -6049,6 +4153,104 @@
  test-string.log: test-string$(EXEEXT)
  	@p='test-string$(EXEEXT)'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post)
  test-strnlen.log: test-strnlen$(EXEEXT)
+diff --git a/gnulib/tests/test-rawmemchr.c b/gnulib/tests/test-rawmemchr.c
+new file mode 100644
+index 0000000..be8feac
+--- /dev/null
++++ b/gnulib/tests/test-rawmemchr.c
+@@ -0,0 +1,92 @@
++/*
++ * Copyright (C) 2008-2011 Free Software Foundation, Inc.
++ * Written by Eric Blake and Bruno Haible
++ *
++ * This program is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 3 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
++
++#include <config.h>
++
++#include <string.h>
++
++#include "signature.h"
++SIGNATURE_CHECK (rawmemchr, void *, (void const *, int));
++
++#include <stdlib.h>
++
++#include "zerosize-ptr.h"
++#include "macros.h"
++
++/* Calculating void * + int is not portable, so this wrapper converts
++   to char * to make the tests easier to write.  */
++#define RAWMEMCHR (char *) rawmemchr
++
++int
++main (void)
++{
++  size_t n = 0x100000;
++  char *input = malloc (n + 1);
++  ASSERT (input);
++
++  input[0] = 'a';
++  input[1] = 'b';
++  memset (input + 2, 'c', 1024);
++  memset (input + 1026, 'd', n - 1028);
++  input[n - 2] = 'e';
++  input[n - 1] = 'a';
++  input[n] = '\0';
++
++  /* Basic behavior tests.  */
++  ASSERT (RAWMEMCHR (input, 'a') == input);
++  ASSERT (RAWMEMCHR (input, 'b') == input + 1);
++  ASSERT (RAWMEMCHR (input, 'c') == input + 2);
++  ASSERT (RAWMEMCHR (input, 'd') == input + 1026);
++
++  ASSERT (RAWMEMCHR (input + 1, 'a') == input + n - 1);
++  ASSERT (RAWMEMCHR (input + 1, 'e') == input + n - 2);
++  ASSERT (RAWMEMCHR (input + 1, 0x789abc00 | 'e') == input + n - 2);
++
++  ASSERT (RAWMEMCHR (input, '\0') == input + n);
++
++  /* Alignment tests.  */
++  {
++    int i, j;
++    for (i = 0; i < 32; i++)
++      {
++        for (j = 0; j < 256; j++)
++          input[i + j] = j;
++        for (j = 0; j < 256; j++)
++          {
++            ASSERT (RAWMEMCHR (input + i, j) == input + i + j);
++          }
++      }
++  }
++
++  /* Ensure that no unaligned oversized reads occur.  */
++  {
++    char *page_boundary = (char *) zerosize_ptr ();
++    size_t i;
++
++    if (!page_boundary)
++      page_boundary = input + 4096;
++    memset (page_boundary - 512, '1', 511);
++    page_boundary[-1] = '2';
++    for (i = 1; i <= 512; i++)
++      ASSERT (RAWMEMCHR (page_boundary - i, (i * 0x01010100) | '2')
++              == page_boundary - 1);
++  }
++
++  free (input);
++
++  return 0;
++}
 diff --git a/gnulib/tests/test-readlink.h b/gnulib/tests/test-readlink.h
 index 7247fc4..08d5662 100644
 --- a/gnulib/tests/test-readlink.h
@@ -6062,6 +4264,98 @@
    errno = 0;
    ASSERT (func (".", buf, sizeof buf) == -1);
    ASSERT (errno == EINVAL);
+diff --git a/gnulib/tests/test-strchrnul.c b/gnulib/tests/test-strchrnul.c
+new file mode 100644
+index 0000000..6ea8adc
+--- /dev/null
++++ b/gnulib/tests/test-strchrnul.c
+@@ -0,0 +1,86 @@
++/*
++ * Copyright (C) 2008-2011 Free Software Foundation, Inc.
++ * Written by Eric Blake and Bruno Haible
++ *
++ * This program is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 3 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
++
++#include <config.h>
++
++#include <string.h>
++
++#include "signature.h"
++SIGNATURE_CHECK (strchrnul, char *, (char const *, int));
++
++#include <stdlib.h>
++
++#include "macros.h"
++
++int
++main (void)
++{
++  size_t n = 0x100000;
++  char *input = malloc (n + 1);
++  ASSERT (input);
++
++  input[0] = 'a';
++  input[1] = 'b';
++  memset (input + 2, 'c', 1024);
++  memset (input + 1026, 'd', n - 1028);
++  input[n - 2] = 'e';
++  input[n - 1] = 'a';
++  input[n] = '\0';
++
++  /* Basic behavior tests.  */
++  ASSERT (strchrnul (input, 'a') == input);
++  ASSERT (strchrnul (input, 'b') == input + 1);
++  ASSERT (strchrnul (input, 'c') == input + 2);
++  ASSERT (strchrnul (input, 'd') == input + 1026);
++
++  ASSERT (strchrnul (input + 1, 'a') == input + n - 1);
++  ASSERT (strchrnul (input + 1, 'e') == input + n - 2);
++
++  ASSERT (strchrnul (input, 'f') == input + n);
++  ASSERT (strchrnul (input, '\0') == input + n);
++
++  /* Check that a very long haystack is handled quickly if the byte is
++     found near the beginning.  */
++  {
++    size_t repeat = 10000;
++    for (; repeat > 0; repeat--)
++      {
++        ASSERT (strchrnul (input, 'c') == input + 2);
++      }
++  }
++
++  /* Alignment tests.  */
++  {
++    int i, j;
++    for (i = 0; i < 32; i++)
++      {
++        for (j = 0; j < 256; j++)
++          input[i + j] = (j + 1) & 0xff;
++        for (j = 1; j < 256; j++)
++          {
++            ASSERT (strchrnul (input + i, j) == input + i + j - 1);
++            input[i + j - 1] = (j == 1 ? 2 : 1);
++            ASSERT (strchrnul (input + i, j) == input + i + 255);
++            input[i + j - 1] = j;
++          }
++      }
++  }
++
++  free (input);
++
++  return 0;
++}
 diff --git a/man/Makefile.in b/man/Makefile.in
 index ea5c7a1..86212c4 100644
 --- a/man/Makefile.in
@@ -6115,19 +4409,6 @@
  	$(top_srcdir)/gnulib/m4/string_h.m4 \
  	$(top_srcdir)/gnulib/m4/strndup.m4 \
  	$(top_srcdir)/gnulib/m4/strnlen.m4 \
-diff --git a/src/regexp.c b/src/regexp.c
-index cf0ea5d..811087d 100644
---- a/src/regexp.c
-+++ b/src/regexp.c
-@@ -50,7 +50,7 @@ char *regexp_escape(const struct regexp *r) {
-     ret = fa_restrict_alphabet(r->pattern->str, strlen(r->pattern->str),
-                                &nre, &nre_len, 2, 1);
-     if (ret == 0) {
--        pat = escape(nre, nre_len);
-+        pat = escape(nre, nre_len, RX_ESCAPES);
-         free(nre);
-     }
- #endif
 diff --git a/tests/Makefile.in b/tests/Makefile.in
 index a78da2c..f8b34a0 100644
 --- a/tests/Makefile.in
@@ -6148,22 +4429,6 @@
  	$(top_srcdir)/gnulib/m4/string_h.m4 \
  	$(top_srcdir)/gnulib/m4/strndup.m4 \
  	$(top_srcdir)/gnulib/m4/strnlen.m4 \
-diff --git a/tests/root/etc/crontab b/tests/root/etc/crontab
-deleted file mode 100644
-index 1ac6d26..0000000
---- a/tests/root/etc/crontab
-+++ /dev/null
-@@ -1,2 +0,0 @@
--0 0 * * * root echo hello
--1 0 * * * root echo hi
-diff --git a/tests/root/etc/squirrelmail/config.php b/tests/root/etc/squirrelmail/config.php
-deleted file mode 100644
-index acb6c35..0000000
---- a/tests/root/etc/squirrelmail/config.php
-+++ /dev/null
-@@ -1,2 +0,0 @@
--<?php
--?>
 -- 
 1.7.6.1
 

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


From phipsy at users.sourceforge.net  Wed Jan  4 12:06:42 2012
From: phipsy at users.sourceforge.net (phipsy at users.sourceforge.net)
Date: Wed, 04 Jan 2012 11:06:42 +0000
Subject: [csw-devel] SF.net SVN: gar:[16674] csw/mgar/pkg/augeas/trunk/files
Message-ID: <E1RiOg6-00066z-QB@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 16674
          http://gar.svn.sourceforge.net/gar/?rev=16674&view=rev
Author:   phipsy
Date:     2012-01-04 11:06:42 +0000 (Wed, 04 Jan 2012)
Log Message:
-----------
augeas: added patch files

Added Paths:
-----------
    csw/mgar/pkg/augeas/trunk/files/0002-regexp-escape.patch
    csw/mgar/pkg/augeas/trunk/files/0003-Remove-Linux-isms-so-tests-can-run-on-Solaris.patch
    csw/mgar/pkg/augeas/trunk/files/0004-pkg-config-Augeas-requires-libxml2.patch

Added: csw/mgar/pkg/augeas/trunk/files/0002-regexp-escape.patch
===================================================================
--- csw/mgar/pkg/augeas/trunk/files/0002-regexp-escape.patch	                        (rev 0)
+++ csw/mgar/pkg/augeas/trunk/files/0002-regexp-escape.patch	2012-01-04 11:06:42 UTC (rev 16674)
@@ -0,0 +1,26 @@
+From 021ea39f8e400225e2d01b4c62eb9d56404f2ecd Mon Sep 17 00:00:00 2001
+From: Michael Chapman <mike at very.puzzling.org>
+Date: Fri, 16 Dec 2011 21:30:07 +1100
+Subject: [PATCH] Add missing argument to escape()
+
+Fixes ticket #242.
+---
+ src/regexp.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/regexp.c b/src/regexp.c
+index cf0ea5d..811087d 100644
+--- a/src/regexp.c
++++ b/src/regexp.c
+@@ -50,7 +50,7 @@ char *regexp_escape(const struct regexp *r) {
+     ret = fa_restrict_alphabet(r->pattern->str, strlen(r->pattern->str),
+                                &nre, &nre_len, 2, 1);
+     if (ret == 0) {
+-        pat = escape(nre, nre_len);
++        pat = escape(nre, nre_len, RX_ESCAPES);
+         free(nre);
+     }
+ #endif
+-- 
+1.7.7.4
+

Added: csw/mgar/pkg/augeas/trunk/files/0003-Remove-Linux-isms-so-tests-can-run-on-Solaris.patch
===================================================================
--- csw/mgar/pkg/augeas/trunk/files/0003-Remove-Linux-isms-so-tests-can-run-on-Solaris.patch	                        (rev 0)
+++ csw/mgar/pkg/augeas/trunk/files/0003-Remove-Linux-isms-so-tests-can-run-on-Solaris.patch	2012-01-04 11:06:42 UTC (rev 16674)
@@ -0,0 +1,95 @@
+From 92b355588c88a09282a8a9bc255c1b24817ff64a Mon Sep 17 00:00:00 2001
+From: Dominic Cleal <dcleal at redhat.com>
+Date: Sat, 31 Dec 2011 00:10:37 +0000
+Subject: [PATCH 1/2] Remove Linux-isms so tests can run on Solaris
+
+* tests/test-augtool-modify-root.sh: /bin/sh -> /bin/bash
+* tests/test-augtool.sh: /bin/sh -> /bin/bash, use 'gsed' if available (GNU sed
+  is required)
+* tests/test-load.c: don't use GNU sed in-place extension
+* tests/test-preserve.sh: handle Solaris `ls -il` output
+
+(also include upstream d3c86096)
+---
+ tests/test-augtool-modify-root.sh |    2 +-
+ tests/test-augtool.sh             |    9 ++++++---
+ tests/test-load.c                 |    3 ++-
+ tests/test-preserve.sh            |    2 +-
+ 4 files changed, 10 insertions(+), 6 deletions(-)
+
+diff --git a/tests/test-augtool-modify-root.sh b/tests/test-augtool-modify-root.sh
+index b102965..4c92c83 100755
+--- a/tests/test-augtool-modify-root.sh
++++ b/tests/test-augtool-modify-root.sh
+@@ -1,4 +1,4 @@
+-#! /bin/sh
++#! /bin/bash
+ 
+ # Make sure changing the value of root works
+ 
+diff --git a/tests/test-augtool.sh b/tests/test-augtool.sh
+index a0d11f3..88fd779 100755
+--- a/tests/test-augtool.sh
++++ b/tests/test-augtool.sh
+@@ -1,4 +1,4 @@
+-#! /bin/sh
++#! /bin/bash
+ 
+ TOP_DIR=$(cd $(dirname $0)/.. && pwd)
+ TOP_BUILDDIR="$abs_top_builddir"
+@@ -13,6 +13,9 @@ export PATH="$TOP_BUILDDIR/src:${PATH}"
+ export AUGEAS_ROOT="$TOP_BUILDDIR/build/test-augtool"
+ export AUGEAS_LENS_LIB="$TOP_SRCDIR/lenses"
+ 
++GSED=sed
++type gsed >/dev/null 2>&1 && GSED=gsed
++
+ fail() {
+     [ -z "$failed" ] && echo FAIL
+     failed=yes
+@@ -67,13 +70,13 @@ quit"
+         fail "Expected file $file.augnew"
+     else
+         act=$(diff -u "$abs_file" "${abs_file}.augnew" \
+-            | sed -r -e "s/^ $//;s!^(---|\+\+\+) ${AUGEAS_ROOT}($file(\.augnew)?)(.*)\$!\1 \2!;s/\\t/\\\\t/g")
++            | $GSED -r -e "s/^ $//;s!^(---|\+\+\+) ${AUGEAS_ROOT}($file(\.augnew)?)(.*)\$!\1 \2!;s/\\t/\\\\t/g")
+ 
+         if [ "$act" != "$diff" ] ; then
+             fail "$act"
+         fi
+     fi
+-    other_files=$(find "$AUGEAS_ROOT" -name \*.augnew -not -path "$abs_file.augnew")
++    other_files=$(find "$AUGEAS_ROOT" -name \*.augnew | grep -v "$abs_file.augnew")
+     [ -n "$other_files" ] && fail "Unexpected file(s) $other_files"
+     [ -z "$failed" ] && echo OK
+ done
+diff --git a/tests/test-load.c b/tests/test-load.c
+index b1018e1..f3c7cda 100644
+--- a/tests/test-load.c
++++ b/tests/test-load.c
+@@ -437,7 +437,8 @@ static void testReloadExternalMod(CuTest *tc) {
+     r = aug_get(aug, "/augeas/root", &aug_root);
+     CuAssertIntEquals(tc, 1, r);
+ 
+-    run(tc, "sed -i -e '1,2d' %setc/hosts", aug_root);
++    run(tc, "sed -e '1,2d' %setc/hosts > %setc/hosts.new", aug_root, aug_root);
++    run(tc, "mv %setc/hosts.new %setc/hosts", aug_root, aug_root);
+ 
+     /* Reload and save again */
+     r = aug_load(aug);
+diff --git a/tests/test-preserve.sh b/tests/test-preserve.sh
+index daafea3..042dab9 100755
+--- a/tests/test-preserve.sh
++++ b/tests/test-preserve.sh
+@@ -13,7 +13,7 @@ mkdir -p $(dirname $hosts)
+ }
+ 
+ stat_inode() {
+-ls -il $1 | cut -d ' ' -f 1
++ls -il $1 | awk '{ print $1 }'
+ }
+ 
+ AUGTOOL="augtool --nostdinc -r $root -I $abs_top_srcdir/lenses"
+-- 
+1.7.7.4
+

Added: csw/mgar/pkg/augeas/trunk/files/0004-pkg-config-Augeas-requires-libxml2.patch
===================================================================
--- csw/mgar/pkg/augeas/trunk/files/0004-pkg-config-Augeas-requires-libxml2.patch	                        (rev 0)
+++ csw/mgar/pkg/augeas/trunk/files/0004-pkg-config-Augeas-requires-libxml2.patch	2012-01-04 11:06:42 UTC (rev 16674)
@@ -0,0 +1,24 @@
+From 11b00ad49301ae6e246eae3e5ee64a80e2084a43 Mon Sep 17 00:00:00 2001
+From: "Richard W.M. Jones" <rjones at redhat.com>
+Date: Sat, 3 Dec 2011 14:21:50 +0000
+Subject: [PATCH] pkg-config: Augeas requires libxml2.
+
+---
+ augeas.pc.in |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/augeas.pc.in b/augeas.pc.in
+index c97847d..9e166db 100644
+--- a/augeas.pc.in
++++ b/augeas.pc.in
+@@ -6,6 +6,6 @@ includedir=@includedir@
+ Name: augeas
+ Version: @VERSION@
+ Description: Augeas configuration editing library
+-Requires:
++Requires.private: libxml-2.0
+ Libs: -L${libdir} -laugeas @LIBS@
+ Cflags: -I${includedir}
+-- 
+1.7.7.4
+

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


From dmichelsen at users.sourceforge.net  Wed Jan  4 13:26:07 2012
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Wed, 04 Jan 2012 12:26:07 +0000
Subject: [csw-devel] SF.net SVN: gar:[16675] csw/mgar/pkg/samba/trunk
Message-ID: <E1RiPux-0000cF-Oo@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 16675
          http://gar.svn.sourceforge.net/gar/?rev=16675&view=rev
Author:   dmichelsen
Date:     2012-01-04 12:26:07 +0000 (Wed, 04 Jan 2012)
Log Message:
-----------
samba/trunk: Relocate samba/locks, add overrides

Modified Paths:
--------------
    csw/mgar/pkg/samba/trunk/Makefile
    csw/mgar/pkg/samba/trunk/files/cswsamba

Modified: csw/mgar/pkg/samba/trunk/Makefile
===================================================================
--- csw/mgar/pkg/samba/trunk/Makefile	2012-01-04 11:06:42 UTC (rev 16674)
+++ csw/mgar/pkg/samba/trunk/Makefile	2012-01-04 12:26:07 UTC (rev 16675)
@@ -36,7 +36,7 @@
 RUNTIME_DEP_PKGS_CSWsamba += CSWlibz1
 RUNTIME_DEP_PKGS_CSWsamba += CSWlibintl8
 RUNTIME_DEP_PKGS_CSWsamba += CSWlibncurses5
-RUNTIME_DEP_PKGS_CSWsamba += CSWgamin
+RUNTIME_DEP_PKGS_CSWsamba += CSWlibfam0
 RUNTIME_DEP_PKGS_CSWsamba += CSWlibgssapi-krb5-2
 RUNTIME_DEP_PKGS_CSWsamba += CSWlibkrb5-3
 RUNTIME_DEP_PKGS_CSWsamba += CSWlibcom-err3
@@ -47,6 +47,16 @@
 RUNTIME_DEP_PKGS_CSWsamba += CSWoldaprt
 RUNTIME_DEP_PKGS_CSWsamba += CSWlibwbclient0
 
+# Just docs override for now
+CHECKPKG_OVERRIDES_CSWsamba += file-with-bad-content|/usr/local|root/opt/csw/share/man/man5/lmhosts.5
+CHECKPKG_OVERRIDES_CSWsamba += file-with-bad-content|/usr/local|root/opt/csw/share/man/man5/smb.conf.5
+CHECKPKG_OVERRIDES_CSWsamba += file-with-bad-content|/usr/local|root/opt/csw/share/man/man8/nmbd.8
+CHECKPKG_OVERRIDES_CSWsamba += file-with-bad-content|/usr/local|root/opt/csw/share/man/man8/smbd.8
+CHECKPKG_OVERRIDES_CSWsamba += file-with-bad-content|/usr/local|root/opt/csw/share/man/man8/tdbbackup.8
+CHECKPKG_OVERRIDES_CSWsamba += file-with-bad-content|/usr/local|root/opt/csw/share/man/man8/idmap_tdb2.8
+CHECKPKG_OVERRIDES_CSWsamba += file-with-bad-content|/usr/local|root/opt/csw/share/man/man8/net.8
+CHECKPKG_OVERRIDES_CSWsamba += file-with-bad-content|/usr/local|root/opt/csw/share/man/man8/swat.8
+
 # Make one unified package for now
 OBSOLETED_BY_CSWsamba += CSWsambacommon
 OBSOLETED_BY_CSWsamba += CSWsambadoc
@@ -74,6 +84,9 @@
 OBSOLETED_BY_CSWsamba-client += CSWsambaclient
 CATALOGNAME_CSWsambaclient = samba_client_stub
 
+# Just docs, override for now
+CHECKPKG_OVERRIDES_CSWsamba-client += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/smbclient.1
+
 #PACKAGES += CSWsambacommon
 SPKG_DESC_CSWsambacommon = Shared support files for samba
 RUNTIME_DEP_PKGS_CSWsambacommon += CSWsasl
@@ -186,6 +199,51 @@
 OBSOLETED_BY_CSWsamba-swat = CSWsambaswat
 CATALOGNAME_CSWsambaswat = samba_swat_stub
 
+# Just docs, override for now
+CHECKPKG_OVERRIDES_CSWsamba-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/Samba3-ByExample/ix01.html
+CHECKPKG_OVERRIDES_CSWsamba-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/Samba3-ByExample/appendix.html
+CHECKPKG_OVERRIDES_CSWsamba-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/Samba3-ByExample/upgrades.html
+CHECKPKG_OVERRIDES_CSWsamba-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/Samba3-ByExample/secure.html
+CHECKPKG_OVERRIDES_CSWsamba-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/Samba3-ByExample/nw4migration.html
+CHECKPKG_OVERRIDES_CSWsamba-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/Samba3-Developers-Guide/pwencrypt.html
+CHECKPKG_OVERRIDES_CSWsamba-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/Samba3-HOWTO/classicalprinting.html
+CHECKPKG_OVERRIDES_CSWsamba-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/Samba3-HOWTO/bugreport.html
+CHECKPKG_OVERRIDES_CSWsamba-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/Samba3-HOWTO/VFS.html
+CHECKPKG_OVERRIDES_CSWsamba-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/Samba3-HOWTO/compiling.html
+CHECKPKG_OVERRIDES_CSWsamba-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/Samba3-HOWTO/NetworkBrowsing.html
+CHECKPKG_OVERRIDES_CSWsamba-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/Samba3-HOWTO/domain-member.html
+CHECKPKG_OVERRIDES_CSWsamba-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/Samba3-HOWTO/SWAT.html
+CHECKPKG_OVERRIDES_CSWsamba-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/Samba3-HOWTO/locking.html
+CHECKPKG_OVERRIDES_CSWsamba-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/Samba3-HOWTO/ix01.html
+CHECKPKG_OVERRIDES_CSWsamba-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/Samba3-HOWTO/samba-pdc.html
+CHECKPKG_OVERRIDES_CSWsamba-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/Samba3-HOWTO/install.html
+CHECKPKG_OVERRIDES_CSWsamba-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/Samba3-HOWTO/diagnosis.html
+CHECKPKG_OVERRIDES_CSWsamba-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/Samba3-HOWTO/FastStart.html
+CHECKPKG_OVERRIDES_CSWsamba-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/Samba3-HOWTO/pam.html
+CHECKPKG_OVERRIDES_CSWsamba-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/Samba3-HOWTO/winbind.html
+CHECKPKG_OVERRIDES_CSWsamba-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/Samba3-HOWTO/AccessControls.html
+CHECKPKG_OVERRIDES_CSWsamba-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/manpages/swat.8.html
+CHECKPKG_OVERRIDES_CSWsamba-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/manpages/lmhosts.5.html
+CHECKPKG_OVERRIDES_CSWsamba-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/manpages/nmbd.8.html
+CHECKPKG_OVERRIDES_CSWsamba-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/manpages/idmap_tdb2.8.html
+CHECKPKG_OVERRIDES_CSWsamba-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/manpages/smb.conf.5.html
+CHECKPKG_OVERRIDES_CSWsamba-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/manpages/winbindd.8.html
+CHECKPKG_OVERRIDES_CSWsamba-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/manpages/smbd.8.html
+CHECKPKG_OVERRIDES_CSWsamba-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/manpages/net.8.html
+CHECKPKG_OVERRIDES_CSWsamba-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/manpages/tdbbackup.8.html
+CHECKPKG_OVERRIDES_CSWsamba-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/manpages/smbclient.1.html
+CHECKPKG_OVERRIDES_CSWsamba-swat += file-with-bad-content|/export/home|root/opt/csw/swat/help/Samba3-HOWTO/msdfs.html
+CHECKPKG_OVERRIDES_CSWsamba-swat += file-with-bad-content|/usr/share|root/opt/csw/swat/help/Samba3-ByExample/ix01.html
+CHECKPKG_OVERRIDES_CSWsamba-swat += file-with-bad-content|/usr/share|root/opt/csw/swat/help/Samba3-ByExample/appendix.html
+CHECKPKG_OVERRIDES_CSWsamba-swat += file-with-bad-content|/usr/share|root/opt/csw/swat/help/Samba3-ByExample/upgrades.html
+CHECKPKG_OVERRIDES_CSWsamba-swat += file-with-bad-content|/usr/share|root/opt/csw/swat/help/Samba3-ByExample/happy.html
+CHECKPKG_OVERRIDES_CSWsamba-swat += file-with-bad-content|/usr/share|root/opt/csw/swat/help/Samba3-HOWTO/VFS.html
+CHECKPKG_OVERRIDES_CSWsamba-swat += file-with-bad-content|/usr/share|root/opt/csw/swat/help/Samba3-HOWTO/CUPS-printing.html
+CHECKPKG_OVERRIDES_CSWsamba-swat += file-with-bad-content|/usr/share|root/opt/csw/swat/help/Samba3-HOWTO/SWAT.html
+CHECKPKG_OVERRIDES_CSWsamba-swat += file-with-bad-content|/usr/share|root/opt/csw/swat/help/Samba3-HOWTO/ix01.html
+CHECKPKG_OVERRIDES_CSWsamba-swat += file-with-bad-content|/usr/share|root/opt/csw/swat/help/Samba3-HOWTO/FastStart.html
+CHECKPKG_OVERRIDES_CSWsamba-swat += file-with-bad-content|/usr/share|root/opt/csw/swat/help/Samba3-HOWTO/ch-ldap-tls.html
+
 PACKAGES += CSWsamba-winbind
 SPKG_DESC_CSWsamba-winbind = Tools to authenticate users from active directory using winbind
 PKGFILES_CSWsamba-winbind += $(call baseisadirs,$(libdir),security/pam_winbind\.so)
@@ -210,12 +268,17 @@
 OBSOLETED_BY_CSWsamba-winbind += CSWsambawb
 CATALOGNAME_CSWsambawb = samba_wb_stub
 
+# Just docs, override for now
+CHECKPKG_OVERRIDES_CSWsamba-winbind += file-with-bad-content|/usr/local|root/opt/csw/share/man/man8/winbindd.8
+
 EXTRA_CFLAGS = -lintl
 EXTRA_LDFLAGS = -lintl
 
 BUILD64 = 1
 ISAEXEC = 1
 
+SMBLOCKDIR = $(localstatedir)/samba/locks
+
 CONFIGURE_SCRIPTS = $(WORKSRC)/source3/configure
 CONFIGURE_ARGS += $(DIRPATHS)
 CONFIGURE_ARGS += --enable-socket-wrapper
@@ -223,6 +286,11 @@
 CONFIGURE_ARGS += --with-privatedir=$(sysconfdir)/samba/private
 CONFIGURE_ARGS += --with-configdir=$(sysconfdir)/samba
 
+CONFIGURE_ARGS += --with-lockdir=$(SMBLOCKDIR)
+CONFIGURE_ARGS += --with-statedir=$(SMBLOCKDIR)
+CONFIGURE_ARGS += --with-cachedir=$(SMBLOCKDIR)
+CONFIGURE_ARGS += --with-piddir=$(SMBLOCKDIR)
+
 CONFIGURE_ARGS-64 +=  --disable-cups
 CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(MEMORYMODEL))
 

Modified: csw/mgar/pkg/samba/trunk/files/cswsamba
===================================================================
--- csw/mgar/pkg/samba/trunk/files/cswsamba	2012-01-04 11:06:42 UTC (rev 16674)
+++ csw/mgar/pkg/samba/trunk/files/cswsamba	2012-01-04 12:26:07 UTC (rev 16675)
@@ -29,8 +29,8 @@
 	;;
 	stop)
 		echo "Stopping Samba..."
-		kill "`cat @localstatedir@/locks/smbd.pid`"
-		kill "`cat @localstatedir@/locks/nmbd.pid`"
+		kill "`cat @SMBLOCKDIR@/smbd.pid`"
+		kill "`cat @SMBLOCKDIR@/nmbd.pid`"
 		if [ -f $KRBCONF ]; then
 		    echo "Stopping Winbind..."
 		fi    

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


From dmichelsen at users.sourceforge.net  Wed Jan  4 13:33:15 2012
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Wed, 04 Jan 2012 12:33:15 +0000
Subject: [csw-devel] SF.net SVN: gar:[16676] csw/mgar/pkg/giflib/trunk
Message-ID: <E1RiQ1r-0003aM-1B@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 16676
          http://gar.svn.sourceforge.net/gar/?rev=16676&view=rev
Author:   dmichelsen
Date:     2012-01-04 12:33:14 +0000 (Wed, 04 Jan 2012)
Log Message:
-----------
giflib/trunk: Remove OpenCSW X11 modulation, split library package

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

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


Property changes on: csw/mgar/pkg/giflib/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2


Modified: csw/mgar/pkg/giflib/trunk/Makefile
===================================================================
--- csw/mgar/pkg/giflib/trunk/Makefile	2012-01-04 12:26:07 UTC (rev 16675)
+++ csw/mgar/pkg/giflib/trunk/Makefile	2012-01-04 12:33:14 UTC (rev 16676)
@@ -12,88 +12,44 @@
 MASTER_SITES = $(SF_MIRRORS)
 DISTFILES  = $(NAME)-$(VERSION).tar.bz2
 
-# We define upstream file regex so we can be notifed of new upstream software release
-UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2
+VENDOR_URL = http://giflib.sourceforge.net/
 
-PACKAGES = CSWgiflib CSWgiflibrt CSWx11giflib CSWx11giflibrt CSWgiflibdoc CSWungif
-
-CATALOGNAME_CSWgiflib = giflib
-CATALOGNAME_CSWgiflibrt = giflib_rt
-CATALOGNAME_CSWx11giflib = x11_giflib
-CATALOGNAME_CSWx11giflibrt = x11_giflib_rt
-CATALOGNAME_CSWgiflibdoc = giflib_doc
-CATALOGNAME_CSWungif = libungif
-
+PACKAGES = CSWgiflib
 SPKG_DESC_CSWgiflib = A library for reading and writing gif images
-SPKG_DESC_CSWgiflibrt = Runtime library for giflib (Sun X11 binding)
-SPKG_DESC_CSWx11giflib = Package for giflib bound against OpenCSW X11
-SPKG_DESC_CSWx11giflibrt = Runtime libraries for giflib bound against OpenCSW X11
-SPKG_DESC_CSWgiflibdoc = Documentation for giflib
-SPKG_DESC_CSWungif = Stub which links to giflib now the patent is dropped
+# PKGFILES is catchall
+RUNTIME_DEP_PKGS_CSWgiflib += CSWlibgif4
+OBSOLETED_BY_CSWgiflib += CSWgiflibdoc
+CATALOGNAME_CSWgiflibdoc = giflib_doc_stub
 
-SPKG_SOURCEURL = http://giflib.sourceforge.net/
+# Just docs, override for now
+CHECKPKG_OVERRIDES_CSWgiflib += file-with-bad-content|/usr/local|root/opt/csw/share/doc/giflib/INSTALL
 
-BUILD_DEP_PKGS = CSWlibicedevel CSWlibsmdevel CSWlibx11devel
+PACKAGES += CSWlibgif4
+SPKG_DESC_CSWlibgif4 = A library for reading and writing GIF images, libgif.so.4
+PKGFILES_CSWlibgif4 += $(call pkgfiles_lib,libgif.so.4)
+OBSOLETED_BY_CSWlibgif4 += CSWgiflibrt
+CATALOGNAME_CSWgiflibrt = giflib_rt_stub
 
-RUNTIME_DEP_PKGS_CSWx11giflibrt = CSWlibice CSWlibsm CSWlibx11
-RUNTIME_DEP_PKGS_CSWx11giflib = CSWlibice CSWlibsm CSWlibx11 CSWx11giflibrt
-RUNTIME_DEP_PKGS_CSWgiflib = CSWgiflibrt
-RUNTIME_DEP_PKGS_CSWungif = CSWgiflib
+PACKAGES += CSWlibungif4
+SPKG_DESC_CSWlibungif4 = GIF access library, previously without compression, now a link to libgif.so.4, libungif.so.4
+PKGFILES_CSWlibungif4 += $(call pkgfiles_lib,libungif.so.4)
+ARCHALL_CSWlibungif4 = 1
+RUNTIME_DEP_PKGS_CSWlibungif4 += CSWlibgif4
+OBSOLETED_BY_CSWlibungif4 += CSWungif
+CATALOGNAME_CSWungif = libungif_stub
 
+PACKAGES += CSWlibgif-dev
+SPKG_DESC_CSWlibgif-dev = Development files for libgif.so.4 and legacy libungif.so.4
+PKGFILES_CSWlibgif-dev += $(PKGFILES_DEVEL)
+RUNTIME_DEP_PKGS_CSWlibgif-dev += CSWlibgif4
+RUNTIME_DEP_PKGS_CSWlibgif-dev += CSWlibungif4
 
-EXTRA_MODULATORS = X11
-MODULATIONS_X11 = sunwx11 cswx11
-
-# EXTRA_INC_cswx11 = $(prefix)/X11/include
-# EXTRA_LIB_cswx11 = $(prefix)/X11/lib
-# EXTRA_PKG_CONFIG_DIRS_cswx11 = $(prefix)/X11/lib
-
-# EXTRA_INC = $(EXTRA_INC_$(X11))
-# EXTRA_LIB = $(EXTRA_LIB_$(X11))
-# EXTRA_PKG_CONFIG_DIRS = $(EXTRA_PKG_CONFIG_DIRS_$(X11))
-
-STRIP_LIBTOOL = 1
-
 BUILD64 = 1
 
-prefix_cswx11 = $(BUILD_PREFIX)/X11
-prefix = $(or $(prefix_$(X11)),$(BUILD_PREFIX))
-
 CONFIGURE_ARGS = $(DIRPATHS)
+CONFIGURE_ARGS += --x-includes=/usr/openwin/include
+CONFIGURE_ARGS += --x-libraries=$(abspath /usr/openwin/lib/$(MM_LIBDIR))
 
-CONFIGURE_ARGS_sunwx11  = --x-includes=/usr/openwin/include
-CONFIGURE_ARGS_sunwx11 += --x-libraries=$(abspath /usr/openwin/lib/$(MM_LIBDIR))
-CONFIGURE_ARGS_cswx11  = --x-include=$(prefix)/include
-CONFIGURE_ARGS_cswx11 += --x-libraries=$(abspath $(prefix)/lib/$(MM_LIBDIR))
-CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(X11))
-
-TEST_TARGET = check
-
-# We don't want 64 bit executables as they gain no speed
-NOISAEXEC = 1
-
-MERGE_SCRIPTS_isa-default-x11-sunwx11 = copy-all
-MERGE_SCRIPTS_isa-default64-x11-sunwx11 = copy-relocated-only
-MERGE_DIRS_isa-default64-x11-sunwx11 = $(libdir)
-MERGE_SCRIPTS_isa-default-x11-cswx11 = copy-only
-MERGE_DIRS_isa-default-x11-cswx11 = $(libdir) $(bindir)
-MERGE_SCRIPTS_isa-default64-x11-cswx11 = copy-relocated-only
-MERGE_DIRS_isa-default64-x11-cswx11 = $(libdir)
-
-ARCHALL_CSWgiflibdoc = 1
-ARCHALL_CSWungif = 1
-
-PKGFILES_CSWgiflibrt = $(call baseisadirs,$(libdir),libgif\.so.*)
-PKGFILES_CSWx11giflibrt = $(call baseisadirs,$(prefix)/X11/lib,[^/]*\.so(\.\d+)*)
-PKGFILES_CSWx11giflib = $(prefix)/X11/bin/.*
-PKGFILES_CSWgiflibdoc = $(PKGFILES_DOC)
-PKGFILES_CSWungif = .*/libungif\..*
-
-CHECKPKG_OVERRIDES_CSWungif += surplus-dependency|CSWgiflib
-CHECKPKG_OVERRIDES_CSWgiflibrt += bad-rpath-entry|/usr/openwin/lib/64|opt/csw/lib/sparcv9/libgif.so.4.1.6
-CHECKPKG_OVERRIDES_CSWgiflibrt += bad-rpath-entry|/usr/openwin/lib/64|opt/csw/lib/amd64/libgif.so.4.1.6
-CHECKPKG_OVERRIDES_CSWgiflibrt += linked-against-discouraged-library|libgif.so.4.1.6|libX11.so.4
-
 include gar/category.mk
 
 DOCFILES = AUTHORS BUGS COPYING ChangeLog DEVELOPERS INSTALL NEWS ONEWS README TODO

Modified: csw/mgar/pkg/giflib/trunk/checksums
===================================================================
--- csw/mgar/pkg/giflib/trunk/checksums	2012-01-04 12:26:07 UTC (rev 16675)
+++ csw/mgar/pkg/giflib/trunk/checksums	2012-01-04 12:33:14 UTC (rev 16676)
@@ -1 +1 @@
-7125644155ae6ad33dbc9fc15a14735f  download/giflib-4.1.6.tar.bz2
+7125644155ae6ad33dbc9fc15a14735f  giflib-4.1.6.tar.bz2

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


From dmichelsen at users.sourceforge.net  Wed Jan  4 14:36:49 2012
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Wed, 04 Jan 2012 13:36:49 +0000
Subject: [csw-devel] SF.net SVN: gar:[16677] csw/mgar/pkg/automake/trunk
Message-ID: <E1RiR1N-0001e3-To@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 16677
          http://gar.svn.sourceforge.net/gar/?rev=16677&view=rev
Author:   dmichelsen
Date:     2012-01-04 13:36:49 +0000 (Wed, 04 Jan 2012)
Log Message:
-----------
automake/trunk: Update to 1.11.2

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

Modified: csw/mgar/pkg/automake/trunk/Makefile
===================================================================
--- csw/mgar/pkg/automake/trunk/Makefile	2012-01-04 12:33:14 UTC (rev 16676)
+++ csw/mgar/pkg/automake/trunk/Makefile	2012-01-04 13:36:49 UTC (rev 16677)
@@ -1,9 +1,9 @@
 NAME = automake
-VERSION = 1.11.1
+VERSION = 1.11.2
 CATEGORIES = devel
 
 EXTRA_MODULATORS = VERSION
-MODULATIONS_VERSION = 1.6.3 1.7.9 1.8.5 1.9.6 1.10.3 1.11.1
+MODULATIONS_VERSION = 1.6.3 1.7.9 1.8.5 1.9.6 1.10.3 1.11.2
 
 DESCRIPTION = A tool for automatically generating Makefiles.
 define BLURB
@@ -26,21 +26,36 @@
 NOCHECKSUM = $(notdir $(POSTMSG))
 NOEXTRACT = $(filter-out $(NAME)-$(VERSION).tar.gz, $(SOURCEFILES))
 
-SPKG_SOURCEURL = http://www.gnu.org/software/automake/
+VENDOR_URL = http://www.gnu.org/software/automake/
 
 RUNTIME_DEP_PKGS = CSWperl
 
-CONFIGURE_ARGS = $(DIRPATHS)
+# These are comments only
+CHECKPKG_OVERRIDES_CSWautomake += file-with-bad-content|/usr/share|root/opt/csw/bin/aclocal-1.10
+CHECKPKG_OVERRIDES_CSWautomake += file-with-bad-content|/usr/share|root/opt/csw/bin/aclocal-1.11
+# These are just docs, override for now
+CHECKPKG_OVERRIDES_CSWautomake += file-with-bad-content|/usr/share|root/opt/csw/share/automake-1.9/py-compile
+CHECKPKG_OVERRIDES_CSWautomake += file-with-bad-content|/usr/share|root/opt/csw/share/automake-1.10/py-compile
+CHECKPKG_OVERRIDES_CSWautomake += file-with-bad-content|/usr/share|root/opt/csw/share/info/automake.info-1
+CHECKPKG_OVERRIDES_CSWautomake += file-with-bad-content|/usr/share|root/opt/csw/share/automake-1.11/py-compile
+CHECKPKG_OVERRIDES_CSWautomake += file-with-bad-content|/usr/local|root/opt/csw/share/automake-1.9/INSTALL
+CHECKPKG_OVERRIDES_CSWautomake += file-with-bad-content|/usr/local|root/opt/csw/share/automake-1.10/texinfo.tex
+CHECKPKG_OVERRIDES_CSWautomake += file-with-bad-content|/usr/local|root/opt/csw/share/automake-1.10/INSTALL
+CHECKPKG_OVERRIDES_CSWautomake += file-with-bad-content|/usr/local|root/opt/csw/share/automake-1.7/INSTALL
+CHECKPKG_OVERRIDES_CSWautomake += file-with-bad-content|/usr/local|root/opt/csw/share/info/automake.info-2
+CHECKPKG_OVERRIDES_CSWautomake += file-with-bad-content|/usr/local|root/opt/csw/share/info/automake.info-1
+CHECKPKG_OVERRIDES_CSWautomake += file-with-bad-content|/usr/local|root/opt/csw/share/automake-1.8/INSTALL
+CHECKPKG_OVERRIDES_CSWautomake += file-with-bad-content|/usr/local|root/opt/csw/share/automake-1.11/texinfo.tex
+CHECKPKG_OVERRIDES_CSWautomake += file-with-bad-content|/usr/local|root/opt/csw/share/automake-1.11/INSTALL
+CHECKPKG_OVERRIDES_CSWautomake += file-with-bad-content|/usr/local|root/opt/csw/share/automake-1.6/INSTALL
 
-TEST_TARGET = check
-
 # Lots of test fail on Solaris, but they are safe to ignore for now:
 #   <http://lists.gnu.org/archive/html/bug-automake/2009-07/msg00001.html>
 SKIPTEST ?= 1
 
 ARCHALL = 1
 
-$(foreach VERSION,$(MODULATIONS_VERSION),$(eval MERGE_SCRIPTS_isa-$(ISA)-garversion-$(VERSION) = copy-all))
+$(foreach VERSION,$(MODULATIONS_VERSION),$(eval MERGE_SCRIPTS_isa-$(ISA)-version-$(VERSION) = copy-all))
 
 # These are hardlinks to the versioned versions and will confuse the merging
 EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv8-garversion-1.6.3 = $(bindir)/automake $(bindir)/aclocal $(infodir)/.*
@@ -48,6 +63,7 @@
 EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv8-garversion-1.8.5 = $(bindir)/automake $(bindir)/aclocal $(infodir)/.*
 EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv8-garversion-1.9.6 = $(bindir)/automake $(bindir)/aclocal $(infodir)/.*
 EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv8-garversion-1.10.3 = $(bindir)/automake $(bindir)/aclocal $(infodir)/.*
+EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv8-garversion-1.11.2 = $(bindir)/automake $(bindir)/aclocal $(infodir)/.*
 
 #     alternatives [options] --install link name path priority  [-
 #     -slave link name path]...  [--initscript service]

Modified: csw/mgar/pkg/automake/trunk/checksums
===================================================================
--- csw/mgar/pkg/automake/trunk/checksums	2012-01-04 12:33:14 UTC (rev 16676)
+++ csw/mgar/pkg/automake/trunk/checksums	2012-01-04 13:36:49 UTC (rev 16677)
@@ -1,5 +1,5 @@
 03bc9ebfa805f9ee5635f1f53fa1fa5f  automake-1.10.3.tar.gz
-4ee7f0ff5f0e467d58b6bd5da96b1c74  automake-1.11.1.tar.gz
+79ad64a9f6e83ea98d6964cef8d8a0bc  automake-1.11.2.tar.gz
 2bd506db63b6d10458cb644b6171ce93  automake-1.6.3.tar.gz
 eb25355e3cf00aac83c580dde970a0b4  automake-1.7.9.tar.gz
 ce0662da5df68014eb1683c184c47a8e  automake-1.8.5.tar.gz

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


From phipsy at users.sourceforge.net  Wed Jan  4 15:59:13 2012
From: phipsy at users.sourceforge.net (phipsy at users.sourceforge.net)
Date: Wed, 04 Jan 2012 14:59:13 +0000
Subject: [csw-devel] SF.net SVN: gar:[16678]
	csw/mgar/pkg/augeas/trunk/Makefile
Message-ID: <E1RiSJ7-00088t-Tx@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 16678
          http://gar.svn.sourceforge.net/gar/?rev=16678&view=rev
Author:   phipsy
Date:     2012-01-04 14:59:13 +0000 (Wed, 04 Jan 2012)
Log Message:
-----------
augeas: commit before rebuild (it now compiles!)

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

Modified: csw/mgar/pkg/augeas/trunk/Makefile
===================================================================
--- csw/mgar/pkg/augeas/trunk/Makefile	2012-01-04 13:36:49 UTC (rev 16677)
+++ csw/mgar/pkg/augeas/trunk/Makefile	2012-01-04 14:59:13 UTC (rev 16678)
@@ -15,7 +15,7 @@
 VENDOR_URL = http://augeas.net
 
 BUILD_DEP_PKGS    = CSWlibxml2-2 CSWlibxml2-dev
-RUNTIME_DEP_PKGS  = CSWgcc4corert CSWlibgnugetopt
+RUNTIME_DEP_PKGS  = CSWlibgnugetopt0 CSWlibgcc-s1
 RUNTIME_DEP_PKGS += CSWlibreadline6 CSWlibxml2-2
 GARCOMPILER = GCC4
 EXTRA_LDFLAGS = -lgnugetopt

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


From dmichelsen at users.sourceforge.net  Wed Jan  4 16:28:23 2012
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Wed, 04 Jan 2012 15:28:23 +0000
Subject: [csw-devel] SF.net SVN: gar:[16679] csw/mgar/pkg/samba/trunk
Message-ID: <E1RiSlL-0005h9-GB@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 16679
          http://gar.svn.sourceforge.net/gar/?rev=16679&view=rev
Author:   dmichelsen
Date:     2012-01-04 15:28:23 +0000 (Wed, 04 Jan 2012)
Log Message:
-----------
samba/trunk: Adjust log directory location

Modified Paths:
--------------
    csw/mgar/pkg/samba/trunk/Makefile
    csw/mgar/pkg/samba/trunk/files/smb.conf

Modified: csw/mgar/pkg/samba/trunk/Makefile
===================================================================
--- csw/mgar/pkg/samba/trunk/Makefile	2012-01-04 14:59:13 UTC (rev 16678)
+++ csw/mgar/pkg/samba/trunk/Makefile	2012-01-04 15:28:23 UTC (rev 16679)
@@ -15,6 +15,7 @@
 DISTFILES  = $(NAME)-$(VERSION).tar.gz
 DISTFILES += cswsamba
 EXPANDVARS += cswsamba
+EXPANDVARS += smb.conf
 
 # From http://www.reallylinux.com/docs/smb.conf
 DISTFILES += smb.conf
@@ -278,19 +279,24 @@
 ISAEXEC = 1
 
 SMBLOCKDIR = $(localstatedir)/samba/locks
+SMBLOGDIR = $(localstatedir)/samba/log
+SMBPRIVATEDIR = $(sysconfdir)/samba/private
+SMBCONFIGDIR = $(sysconfdir)/samba
 
 CONFIGURE_SCRIPTS = $(WORKSRC)/source3/configure
 CONFIGURE_ARGS += $(DIRPATHS)
 CONFIGURE_ARGS += --enable-socket-wrapper
 CONFIGURE_ARGS += --enable-nss-wrapper
-CONFIGURE_ARGS += --with-privatedir=$(sysconfdir)/samba/private
-CONFIGURE_ARGS += --with-configdir=$(sysconfdir)/samba
+CONFIGURE_ARGS += --with-privatedir=$(SMBPRIVATEDIR)
+CONFIGURE_ARGS += --with-configdir=$(SMBCONFIGDIR)
 
 CONFIGURE_ARGS += --with-lockdir=$(SMBLOCKDIR)
 CONFIGURE_ARGS += --with-statedir=$(SMBLOCKDIR)
 CONFIGURE_ARGS += --with-cachedir=$(SMBLOCKDIR)
 CONFIGURE_ARGS += --with-piddir=$(SMBLOCKDIR)
 
+CONFIGURE_ARGS += --with-logfilebase=$(SMBLOGDIR)
+
 CONFIGURE_ARGS-64 +=  --disable-cups
 CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(MEMORYMODEL))
 

Modified: csw/mgar/pkg/samba/trunk/files/smb.conf
===================================================================
--- csw/mgar/pkg/samba/trunk/files/smb.conf	2012-01-04 14:59:13 UTC (rev 16678)
+++ csw/mgar/pkg/samba/trunk/files/smb.conf	2012-01-04 15:28:23 UTC (rev 16679)
@@ -43,9 +43,9 @@
 
 # this tells Samba to use a separate log file for each machine
 # that connects
-	log file = /var/log/samba/%m.log
+	log file = @SMBLOGDIR@/%m.log
 # all log information in one file
-#   log file = /var/log/samba/smbd.log
+#   log file = @SMBLOGDIR@/smbd.log
 
 # Put a capping on the size of the log files (in Kb).
 	max log size = 50
@@ -64,7 +64,7 @@
 # ENCRYPTION.txt, Win95.txt and WinNT.txt in the Samba documentation.
 # Do not enable this option unless you have read those documents
 ;  encrypt passwords = yes
-;  smb passwd file = /etc/opt/csw/samba/smbpasswd
+;  smb passwd file = @SMBCONFIGDIF@/smbpasswd
 
 # The following are needed to allow password changing from Windows to
 # update the Linux system password also.
@@ -77,12 +77,12 @@
 ;  passwd chat = *New*UNIX*password* %n\n *ReType*new*UNIX*password* %n\n *passwd:*all*authentication*tokens*updated*successfully*
 
 # Unix users can map to different SMB User names
-;  username map = /etc/opt/csw/samba/smbusers
+;  username map = @SMBCONFIGDIR@/smbusers
 
 # Using the following line enables you to customise your configuration
 # on a per machine basis. The %m gets replaced with the netbios name
 # of the machine that is connecting
-;   include = /etc/opt/csw/samba/smb.conf.%m
+;   include = @SMBCONFIGDIR@/smb.conf.%m
 
 # Most people will find that this option gives better performance.
 # See speed.txt and the manual pages for details
@@ -178,7 +178,7 @@
 	idmap uid = 16777216-33554431
 	idmap gid = 16777216-33554431
 	template shell = /bin/false
-	username map = /etc/opt/csw/samba/smbusers
+	username map = @SMBCONFIGDIR@/smbusers
 	winbind use default domain = no
 [homes]
 	comment = Home Directories

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


From dmichelsen at users.sourceforge.net  Wed Jan  4 16:34:40 2012
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Wed, 04 Jan 2012 15:34:40 +0000
Subject: [csw-devel] SF.net SVN: gar:[16680] csw/mgar/pkg
Message-ID: <E1RiSrP-0005oj-W8@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 16680
          http://gar.svn.sourceforge.net/gar/?rev=16680&view=rev
Author:   dmichelsen
Date:     2012-01-04 15:34:39 +0000 (Wed, 04 Jan 2012)
Log Message:
-----------
jbigkit: Initial commit

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

Added: csw/mgar/pkg/jbigkit/Makefile
===================================================================
--- csw/mgar/pkg/jbigkit/Makefile	                        (rev 0)
+++ csw/mgar/pkg/jbigkit/Makefile	2012-01-04 15:34:39 UTC (rev 16680)
@@ -0,0 +1,2 @@
+%:
+	$(MAKE) -C trunk $*


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



Added: csw/mgar/pkg/jbigkit/trunk/Makefile
===================================================================
--- csw/mgar/pkg/jbigkit/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/jbigkit/trunk/Makefile	2012-01-04 15:34:39 UTC (rev 16680)
@@ -0,0 +1,68 @@
+# $Id$
+# TODO (release-critical prefixed with !, non release-critical with *)
+#
+NAME = jbigkit
+VERSION = 2.0
+GARTYPE = v2
+CATEGORIES = lib
+
+DESCRIPTION = JBIG kit, a data compression algorithm for bi-level high-resolution images
+define BLURB
+endef
+
+MASTER_SITES = http://www.cl.cam.ac.uk/~mgk25/download/
+DISTFILES += $(NAME)-$(VERSION).tar.gz
+DISTNAME = $(NAME)
+
+VENDOR_URL = http://www.cl.cam.ac.uk/~mgk25/jbigkit/
+
+PACKAGES += CSWlibjbig2
+SPKG_DESC_CSWlibjbig2 = A data compression library for bi-level high-resolution images, libjbig.so.2
+PKGFILES_CSWlibjbig2 += $(call pkgfiles_lib,libjbig.so.2)
+
+PACKAGES += CSWlibjbig-dev
+SPKG_DESC_CSWlibjbig-dev = Development files for libjbig.so.2
+PKGFILES_CSWlibjbig-dev += $(PKGFILES_DEVEL)
+RUNTIME_DEP_PKGS_CSWlibjbig-dev += CSWlibjbig2
+
+PACKAGES += CSWjbigkit
+SPKG_DESC_CSWjbigkit = JBIG kit, a data compression algorithm for bi-level high-resolution images
+# PKGFILES is catchall
+# This is a legacy dependency, the binaries are statically linked against libjbig
+RUNTIME_DEP_PKGS_CSWjbigkit += CSWlibjbig2
+CHECKPKG_OVERRIDES_CSWjbigkit += surplus-dependency|CSWlibjbig2
+
+BUILD64 = 1
+ISAEXEC = 1
+
+REINPLACEMENTS += gmake
+REINPLACE_MATCH_gmake = make
+REINPLACE_WITH_gmake = gmake
+REINPLACE_FILES_gmake += Makefile
+REINPLACE_FILES_gmake += pbmtools/Makefile
+
+# There is no configure
+CONFIGURE_SCRIPTS =
+
+BUILD_OVERRIDE_VARS = CC CCFLAGS
+BUILD_OVERRIDE_VAR_CC = $(CC)
+BUILD_OVERRIDE_VAR_CCFLAGS = $(CFLAGS)
+
+TEST_TARGET = test
+
+INSTALL_SCRIPTS = custom
+
+include gar/category.mk
+
+install-custom:
+	ginstall -d $(DESTDIR)$(includedir)
+	cd $(WORKSRC)/libjbig && ginstall jbig.h jbig_ar.h $(DESTDIR)$(includedir)
+	ginstall -d $(DESTDIR)$(bindir)
+	cd $(WORKSRC)/pbmtools && ginstall jbgtopbm jbgtopbm85 pbmtojbg pbmtojbg85 $(DESTDIR)$(bindir)
+	ginstall -d $(DESTDIR)$(libdir)
+	$(CC) $(LDFLAGS) -G -h libjbig.so.2 -o $(DESTDIR)$(libdir)/libjbig.so.2.0 $(WORKSRC)/libjbig/libjbig.a
+	gln -s libjbig.so.2 $(DESTDIR)$(libdir)/libjbig.so
+	gln -s libjbig.so.2.0 $(DESTDIR)$(libdir)/libjbig.so.2
+	ginstall -d $(DESTDIR)$(mandir)/man1
+	cd $(WORKSRC)/pbmtools && ginstall *.1 $(DESTDIR)$(mandir)/man1
+	@$(MAKECOOKIE)


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

Added: csw/mgar/pkg/jbigkit/trunk/checksums
===================================================================
--- csw/mgar/pkg/jbigkit/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/jbigkit/trunk/checksums	2012-01-04 15:34:39 UTC (rev 16680)
@@ -0,0 +1 @@
+3dd87f605abb1a97a22dc79d8b3e8f6c  jbigkit-2.0.tar.gz

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


From gadavis at users.sourceforge.net  Wed Jan  4 17:02:45 2012
From: gadavis at users.sourceforge.net (gadavis at users.sourceforge.net)
Date: Wed, 04 Jan 2012 16:02:45 +0000
Subject: [csw-devel] SF.net SVN: gar:[16681]
	csw/mgar/pkg/netcdf/trunk/Makefile
Message-ID: <E1RiTIb-0000st-9Z@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 16681
          http://gar.svn.sourceforge.net/gar/?rev=16681&view=rev
Author:   gadavis
Date:     2012-01-04 16:02:44 +0000 (Wed, 04 Jan 2012)
Log Message:
-----------
netcdf: remove surplus dependency on CSWlibnetcdf-c++5 by CSWnetcdf-dev

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

Modified: csw/mgar/pkg/netcdf/trunk/Makefile
===================================================================
--- csw/mgar/pkg/netcdf/trunk/Makefile	2012-01-04 15:34:39 UTC (rev 16680)
+++ csw/mgar/pkg/netcdf/trunk/Makefile	2012-01-04 16:02:44 UTC (rev 16681)
@@ -78,7 +78,6 @@
 PKGFILES_CSWnetcdf-dev += $(PKGFILES_DEVEL)
 RUNTIME_DEP_PKGS_CSWnetcdf-dev += CSWlibnetcdf6
 RUNTIME_DEP_PKGS_CSWnetcdf-dev += CSWlibnetcdff5
-RUNTIME_DEP_PKGS_CSWnetcdf-dev += CSWlibnetcdf-c++5
 RUNTIME_DEP_PKGS_CSWnetcdf-dev += CSWlibnetcdf7
 RUNTIME_DEP_PKGS_CSWnetcdf-dev += CSWlibnetcdf-c++4
 RUNTIME_DEP_PKGS_CSWnetcdf-dev += CSWnetcdf

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


From gadavis at users.sourceforge.net  Wed Jan  4 19:33:48 2012
From: gadavis at users.sourceforge.net (gadavis at users.sourceforge.net)
Date: Wed, 04 Jan 2012 18:33:48 +0000
Subject: [csw-devel] SF.net SVN: gar:[16682]
	csw/mgar/pkg/netcdf/trunk/Makefile
Message-ID: <E1RiVem-0000t1-92@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 16682
          http://gar.svn.sourceforge.net/gar/?rev=16682&view=rev
Author:   gadavis
Date:     2012-01-04 18:33:47 +0000 (Wed, 04 Jan 2012)
Log Message:
-----------
netcdf: remove outdated dependencies

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

Modified: csw/mgar/pkg/netcdf/trunk/Makefile
===================================================================
--- csw/mgar/pkg/netcdf/trunk/Makefile	2012-01-04 16:02:44 UTC (rev 16681)
+++ csw/mgar/pkg/netcdf/trunk/Makefile	2012-01-04 18:33:47 UTC (rev 16682)
@@ -39,6 +39,7 @@
 RUNTIME_DEP_PKGS_CSWlibnetcdf7 += CSWlibcurl4
 RUNTIME_DEP_PKGS_CSWlibnetcdf7 += CSWlibz1
 
+
 PACKAGES += CSWlibnetcdf-c++4
 CATALOGNAME_CSWlibnetcdf-c++4 = libnetcdf_c++4
 PKGFILES_CSWlibnetcdf-c++4 += $(call baseisadirs,$(libdir),libnetcdf_c\+\+\.so\.4\.1\.0)
@@ -48,7 +49,7 @@
 RUNTIME_DEP_PKGS_CSWlibnetcdf-c++4 += CSWlibz1
 RUNTIME_DEP_PKGS_CSWlibnetcdf-c++4 += CSWlibcurl4
 RUNTIME_DEP_PKGS_CSWlibnetcdf-c++4 += CSWlibhdf5hl7
-RUNTIME_DEP_PKGS_CSWlibnetcdf-c++4 += CSWlibnetcdf6
+RUNTIME_DEP_PKGS_CSWlibnetcdf-c++4 += CSWlibnetcdf7
 RUNTIME_DEP_PKGS_CSWlibnetcdf-c++4 += CSWlibstdc++6
 RUNTIME_DEP_PKGS_CSWlibnetcdf-c++4 += CSWlibgcc-s1
 
@@ -57,7 +58,6 @@
 PKGFILES_CSWlibnetcdff5 += $(call baseisadirs,$(libdir),libnetcdff\.so\.5\.0\.0)
 PKGFILES_CSWlibnetcdff5 += $(call baseisadirs,$(libdir),libnetcdff\.so\.5(\.\d+)*)
 SPKG_DESC_CSWlibnetcdff5 = Fortran shared libraries for netcdf - libnetcdff.so.5 
-RUNTIME_DEP_PKGS_CSWlibnetcdff5 += CSWlibnetcdf6
 RUNTIME_DEP_PKGS_CSWlibnetcdff5_i386 += CSWlibquadmath0
 # GARCH is either sparc or i386, covers 32 and 64 bit
 RUNTIME_DEP_PKGS_CSWlibnetcdff5 += $(RUNTIME_DEP_PKGS_CSWlibnetcdff5_$(GARCH))
@@ -67,6 +67,7 @@
 RUNTIME_DEP_PKGS_CSWlibnetcdff5 += CSWlibhdf5hl7
 RUNTIME_DEP_PKGS_CSWlibnetcdff5 += CSWlibgfortran3
 RUNTIME_DEP_PKGS_CSWlibnetcdff5 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibnetcdff5 += CSWlibnetcdf7
 
 
 PACKAGES += CSWnetcdf-dev

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


From gadavis at users.sourceforge.net  Wed Jan  4 19:37:15 2012
From: gadavis at users.sourceforge.net (gadavis at users.sourceforge.net)
Date: Wed, 04 Jan 2012 18:37:15 +0000
Subject: [csw-devel] SF.net SVN: gar:[16683]
	csw/mgar/pkg/netcdf/trunk/Makefile
Message-ID: <E1RiVi7-0003uv-QQ@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 16683
          http://gar.svn.sourceforge.net/gar/?rev=16683&view=rev
Author:   gadavis
Date:     2012-01-04 18:37:15 +0000 (Wed, 04 Jan 2012)
Log Message:
-----------
netcdf: no need to keep generating old devel package stub

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

Modified: csw/mgar/pkg/netcdf/trunk/Makefile
===================================================================
--- csw/mgar/pkg/netcdf/trunk/Makefile	2012-01-04 18:33:47 UTC (rev 16682)
+++ csw/mgar/pkg/netcdf/trunk/Makefile	2012-01-04 18:37:15 UTC (rev 16683)
@@ -82,7 +82,6 @@
 RUNTIME_DEP_PKGS_CSWnetcdf-dev += CSWlibnetcdf7
 RUNTIME_DEP_PKGS_CSWnetcdf-dev += CSWlibnetcdf-c++4
 RUNTIME_DEP_PKGS_CSWnetcdf-dev += CSWnetcdf
-OBSOLETED_BY_CSWnetcdf-dev = CSWnetcdf-devel
 
 GARCOMPILER = GCC4
 

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


From guengel at users.sourceforge.net  Wed Jan  4 21:32:59 2012
From: guengel at users.sourceforge.net (guengel at users.sourceforge.net)
Date: Wed, 04 Jan 2012 20:32:59 +0000
Subject: [csw-devel] SF.net SVN: gar:[16684] csw/mgar/pkg/sasl/trunk
Message-ID: <E1RiXW7-0004i0-NH@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 16684
          http://gar.svn.sourceforge.net/gar/?rev=16684&view=rev
Author:   guengel
Date:     2012-01-04 20:32:59 +0000 (Wed, 04 Jan 2012)
Log Message:
-----------
sasl/trunk: Added changelog.CSW. CSWsaslauthd now prints postmsg. sasldb2 password file will be migrate to /etc/opt/csw. READMEs improved.

Modified Paths:
--------------
    csw/mgar/pkg/sasl/trunk/Makefile
    csw/mgar/pkg/sasl/trunk/files/README.sasl
    csw/mgar/pkg/sasl/trunk/files/README.saslauthd

Added Paths:
-----------
    csw/mgar/pkg/sasl/trunk/files/CSWsaslauthd.postmsg
    csw/mgar/pkg/sasl/trunk/files/changelog.CSW

Modified: csw/mgar/pkg/sasl/trunk/Makefile
===================================================================
--- csw/mgar/pkg/sasl/trunk/Makefile	2012-01-04 18:37:15 UTC (rev 16683)
+++ csw/mgar/pkg/sasl/trunk/Makefile	2012-01-04 20:32:59 UTC (rev 16684)
@@ -21,7 +21,12 @@
 DISTFILES += saslauthd.conf.CSW
 DISTFILES += README.sasl
 DISTFILES += README.saslauthd
+DISTFILES += changelog.CSW
+DISTFILES += CSWsaslauthd.postmsg
 
+EXPANDVARS = CSWsaslauthd.postmsg
+POSTMSG = $(docdir)/saslauthd/CSWsaslauthd.postmsg
+
 # For some reason or another, plugins are installed in
 # $(prefix)/lib/sasl2, regardless of what --with-plugindir is set
 # to. This patch will make the install routine put the plugins to
@@ -59,6 +64,7 @@
 PKGFILES_CSWsaslauthd += $(docdir)/saslauthd/LDAP_SASLAUTHD
 PKGFILES_CSWsaslauthd += $(docdir)/saslauthd/README.saslauthd
 PKGFILES_CSWsaslauthd += $(docdir)/saslauthd/README.CSW
+PKGFILES_CSWsaslauthd += $(docdir)/saslauthd/CSWsaslauthd.postmsg
 PKGFILES_CSWsaslauthd += /var/opt/csw/saslauthd
 
 PACKAGES += CSWsaslgssapi
@@ -126,8 +132,8 @@
 
 EXTRA_BUILD_ENV = _REENTRANT=1
 
-EXTRA_INC  = /opt/csw/include/gssapi
-EXTRA_INC += /opt/csw/include/mysql
+EXTRA_INC  = $(includedir)/gssapi
+EXTRA_INC += $(includedir)/mysql
 EXTRA_INC += /opt/csw/postgresql/include
 
 # Do not use LD_OPTIONS as it breaks tests by using the installed libraries
@@ -189,7 +195,10 @@
 max_cmd_line=65535
 SED_USR_LOCAL= sed -e 's|/usr/local|/opt/csw|g'
 
-MIGRATECONF = saslauthd.conf sasldb2
+MIGRATE_FILES_CSWsasl      = "sasldb2"
+MIGRATE_FILES_CSWsaslauthd = "saslauthd.conf"
+MIGRATE_SOURCE_DIR	   = /opt/csw/etc
+MIGRATE_DEST_DIR	   = $(sysconfdir)
 PRESERVECONF = /etc/opt/csw/saslauthd.conf /etc/opt/csw/saslauthd.init
 
 INITSMF = /etc/opt/csw/init.d/cswsaslauthd
@@ -206,10 +215,11 @@
 
 
 post-install-modulated: install-doc fix-path-manpages install-sample
-	ginstall -d $(DESTDIR)/etc/opt/csw/init.d/
-	ginstall $(WORKDIR)/saslauthd.init.CSW $(DESTDIR)/etc/opt/csw/
-	ginstall $(WORKDIR)/saslauthd.conf.CSW $(DESTDIR)/etc/opt/csw/
-	ginstall $(WORKDIR)/cswsaslauthd.init $(DESTDIR)/etc/opt/csw/init.d/cswsaslauthd
+	ginstall -d $(DESTDIR)$(sysconfdir)/init.d/
+	ginstall $(WORKDIR)/saslauthd.init.CSW $(DESTDIR)$(sysconfdir)
+	ginstall $(WORKDIR)/saslauthd.conf.CSW $(DESTDIR)$(sysconfdir)
+	ginstall $(WORKDIR)/cswsaslauthd.init $(DESTDIR)$(sysconfdir)/init.d/cswsaslauthd
+	ginstall $(WORKDIR)/CSWsaslauthd.postmsg $(DESTDIR)$(docdir)/saslauthd/
 	@$(MAKECOOKIE)
 
 # The names 'client' and 'server' are a little generic, so we change

Added: csw/mgar/pkg/sasl/trunk/files/CSWsaslauthd.postmsg
===================================================================
--- csw/mgar/pkg/sasl/trunk/files/CSWsaslauthd.postmsg	                        (rev 0)
+++ csw/mgar/pkg/sasl/trunk/files/CSWsaslauthd.postmsg	2012-01-04 20:32:59 UTC (rev 16684)
@@ -0,0 +1,8 @@
+
+---
+
+Please adjust @sysconfdir@/saslauthd.init before starting saslauthd.
+
+See also @docdir@/saslauthd/README.CSW
+
+---

Modified: csw/mgar/pkg/sasl/trunk/files/README.sasl
===================================================================
--- csw/mgar/pkg/sasl/trunk/files/README.sasl	2012-01-04 18:37:15 UTC (rev 16683)
+++ csw/mgar/pkg/sasl/trunk/files/README.sasl	2012-01-04 20:32:59 UTC (rev 16684)
@@ -1,25 +1,8 @@
-List of changes in sasl-2.1.25
-- Included sasl-sample-client and sasl-sample-server to ease
-  testing of sasl setup.
+sasl README
+-----------
 
-- SASL application configuration files (e.g. Sendmail.conf) go into
-  /opt/csw/lib/sasl2 or /opt/csw/lib/64/sasl2 for 64-bit binaries.
+ * The location of `sasldb2' has been moved from /opt/csw/etc to
+   /etc/opt/csw.
 
-List of changes in sasl-2.1.22,REV=2007.06.10 
-- upgraded sasl to version 2.1.22
-- runpath was not applied for libraries [#1566][#1637][#1934][#2268] 
-
-List of changes in sasl-2.1.21,REV=2006.03.09
-- /opt/csw/etc/sasldb2 is a directory [#1393]
-- preinstall script is using PKG_INSTALL_ROOT variable instead of PKG_ROOT_DIR
-
-List of changes in sasl-2.1.21,REV=2005.09.07:
-- upgraded to version 2.1.21
-- included unsupported LOGIN SASL mechanism, because I received several
-  requests for this mechanism. Some mail clients (e.g. MS Outlook) only support
-  LOGIN mechanism.
-- included auxprop plugins for MySQL, PostreSQL and SQLLite
-- included kerberos mechanisms (GSSAPI)
-- CSWsasl creates a group 'sasl'. Any process which is not running as root,
-  must belong to this group to perform authentiaction against SASLdb or via saslauthd.
-
+ * SASL application configuration files (e.g. Sendmail.conf) go into
+   /opt/csw/lib/sasl2 or /opt/csw/lib/64/sasl2 for 64-bit binaries.

Modified: csw/mgar/pkg/sasl/trunk/files/README.saslauthd
===================================================================
--- csw/mgar/pkg/sasl/trunk/files/README.saslauthd	2012-01-04 18:37:15 UTC (rev 16683)
+++ csw/mgar/pkg/sasl/trunk/files/README.saslauthd	2012-01-04 20:32:59 UTC (rev 16684)
@@ -1,26 +1,21 @@
-Configuration file for saslauthd init/smf script is in /etc/opt/csw/saslauthd.init
-Configuration file for saslauthd is in /etc/opt/csw/saslauthd.conf
+saslauthd README
+----------------
 
-Details concerning /etc/opt/csw/saslauthd.conf can be found in
-/opt/csw/share/doc/saslauthd/LDAP_SASLAUTHD
+The configuration file for the saslauthd startup script is
 
-If you experience memory leak with PAM mechanism, then try to disable
-worker processes with -n 0. It may affect performance, because
-saslauthd will spawn a new process for each authentication.
+ /etc/opt/csw/saslauthd.init
 
+Please note, that prior starting the saslauthd daemon, you have to set
+a mechanism this file, or the saslauthd daemon won't start.
 
-List of changes in saslauthd-2.1.22,REV=2007.06.10
-- sasl updated to 2.1.22
-- sasl was built with invalid list of search directories for libraries [#2103]
-- man page was in postscript format [#2261] 
+The Configuration file for saslauthd daemon is located in
 
+ /etc/opt/csw/saslauthd.conf
 
-List of changes in saslauthd-2.1.21,REV=2006.03.09:
-- Communication with SASL is done with unix sockets because ipc doors mechanism is unreliable [#1222] [#1225] [#1227]
-- Authentification mechanism should be configureable without editing init.d script [#1221]
-- postinstall script is using PKG_INSTALL_ROOT variable instead of PKG_ROOT_DIR
+You may change this by ajdusting /etc/opt/csw/saslauth.init. Details
+concerning /etc/opt/csw/saslauthd.conf can be found in
+/opt/csw/share/doc/saslauthd/LDAP_SASLAUTHD
 
-
-List of changes in saslauthd-2.1.21,REV=2005.09.07:
-- updated to Cyrus SASL 2.1.21
-- /etc/init.d/CSWsaslauthd renamed to /etc/init.d/cswsaslauthd to be consistent with other blastwave packages
+If you experience memory leak with PAM mechanism, then try to disable
+worker processes with -n 0. It may affect performance, because
+saslauthd will spawn a new process for each authentication.

Added: csw/mgar/pkg/sasl/trunk/files/changelog.CSW
===================================================================
--- csw/mgar/pkg/sasl/trunk/files/changelog.CSW	                        (rev 0)
+++ csw/mgar/pkg/sasl/trunk/files/changelog.CSW	2012-01-04 20:32:59 UTC (rev 16684)
@@ -0,0 +1,70 @@
+sasl (2.1.25,REV=2012.01.04)
+
+  * README.sasl, README.saslauthd: moved changelog entries to
+    changelog.csw.
+
+  * README.saslauthd: improved documentation.
+
+  * sasldb2: file will be migrated from /opt/csw/etc/ to /etc/opt/csw.  
+
+ -- Rafael Ostertag <raos at opencsw.org>  Wed, 04 Jan 2012 19:41:27 +0100
+
+
+sasl (2.1.25,REV=2011.11.06)
+
+  * Included pluginviewer, sasl-sample-client, and sasl-sample-server
+    to ease testing of sasl setup.
+
+  * SASL application configuration files (e.g. Sendmail.conf) go into
+    /opt/csw/lib/sasl2 or /opt/csw/lib/64/sasl2 for 64-bit binaries.
+
+ -- Rafael Ostertag <raos at opencsw.org>  Wed, 04 Jan 2012 19:41:27 +0100
+
+
+sasl (2.1.22,REV=2007.06.10)
+
+  * sasl updated to 2.1.22
+
+  * runpath was not applied for libraries [#1566][#1637][#1934][#2268]
+
+  * saslauthd: sasl was built with invalid list of search directories for
+    libraries [#2103]
+
+  * saslauthd: man page was in postscript format [#2261]
+
+
+sasl (2.1.21,REV=2006.03.09)
+
+  * /opt/csw/etc/sasldb2 is a directory [#1393]
+
+  * preinstall script is using PKG_INSTALL_ROOT variable instead of
+    PKG_ROOT_DIR
+
+  * saslauthd: Communication with SASL is done with unix sockets because ipc
+    doors mechanism is unreliable [#1222] [#1225] [#1227]
+
+  * sasluthd: Authentification mechanism should be configureable without editing
+    init.d script [#1221]
+
+  * saslauthd: postinstall script is using PKG_INSTALL_ROOT variable instead of
+    PKG_ROOT_DIR
+
+
+sasl (2.1.21,REV=2005.09.07)
+
+  * upgraded to version 2.1.21
+
+  * included unsupported LOGIN SASL mechanism, because I received
+    several requests for this mechanism. Some mail clients (e.g. MS
+    Outlook) only support LOGIN mechanism.
+
+  * included auxprop plugins for MySQL, PostreSQL and SQLLite
+
+  * included kerberos mechanisms (GSSAPI)
+
+  * CSWsasl creates a group 'sasl'. Any process which is not running
+    as root, must belong to this group to perform authentiaction
+    against SASLdb or via saslauthd.
+
+  * saslauthd: /etc/init.d/CSWsaslauthd renamed to /etc/init.d/cswsaslauthd to be
+    consistent with other blastwave packages

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


From chninkel at users.sourceforge.net  Wed Jan  4 22:09:26 2012
From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net)
Date: Wed, 04 Jan 2012 21:09:26 +0000
Subject: [csw-devel] SF.net SVN: gar:[16685] csw/mgar/pkg/openssl/trunk
Message-ID: <E1RiY5O-0007eP-Jd@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 16685
          http://gar.svn.sourceforge.net/gar/?rev=16685&view=rev
Author:   chninkel
Date:     2012-01-04 21:09:26 +0000 (Wed, 04 Jan 2012)
Log Message:
-----------
openssl: updated to 0.9.8s

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

Modified: csw/mgar/pkg/openssl/trunk/Makefile
===================================================================
--- csw/mgar/pkg/openssl/trunk/Makefile	2012-01-04 20:32:59 UTC (rev 16684)
+++ csw/mgar/pkg/openssl/trunk/Makefile	2012-01-04 21:09:26 UTC (rev 16685)
@@ -16,7 +16,7 @@
 ###### Package information #######
 
 NAME = openssl
-VERSION = 0.9.8r
+VERSION = 0.9.8s
 CATEGORIES = lib
 
 DESCRIPTION = The Open Source toolkit for SSL and TLS

Modified: csw/mgar/pkg/openssl/trunk/files/changelog.CSW
===================================================================
--- csw/mgar/pkg/openssl/trunk/files/changelog.CSW	2012-01-04 20:32:59 UTC (rev 16684)
+++ csw/mgar/pkg/openssl/trunk/files/changelog.CSW	2012-01-04 21:09:26 UTC (rev 16685)
@@ -1,3 +1,9 @@
+openssl (0.9.8s,REV=2012.02.04) unstable
+
+  * New upstream release.
+  
+   -- Yann Rouillard <yann at opencsw.org>  Wed, 04 Jan 2012 22:06:46 +0100
+
 openssl (0.9.8r,REV=2011.09.19) unstable
 
   * Added patch block_diginotar.patch, taken from Debian, to always blocks 

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


From chninkel at users.sourceforge.net  Wed Jan  4 22:29:15 2012
From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net)
Date: Wed, 04 Jan 2012 21:29:15 +0000
Subject: [csw-devel] SF.net SVN: gar:[16686]
	csw/mgar/pkg/openssl/trunk/checksums
Message-ID: <E1RiYOZ-000226-Bz@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 16686
          http://gar.svn.sourceforge.net/gar/?rev=16686&view=rev
Author:   chninkel
Date:     2012-01-04 21:29:14 +0000 (Wed, 04 Jan 2012)
Log Message:
-----------
openssl: updated checksum

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

Modified: csw/mgar/pkg/openssl/trunk/checksums
===================================================================
--- csw/mgar/pkg/openssl/trunk/checksums	2012-01-04 21:09:26 UTC (rev 16685)
+++ csw/mgar/pkg/openssl/trunk/checksums	2012-01-04 21:29:14 UTC (rev 16686)
@@ -1 +1 @@
-0352932ea863bc02b056cda7c9ac5b79  openssl-0.9.8r.tar.gz
+fbf71e8e050bc1ec290b7468bab1a76e  openssl-0.9.8s.tar.gz

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


From dmichelsen at users.sourceforge.net  Thu Jan  5 10:17:47 2012
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu, 05 Jan 2012 09:17:47 +0000
Subject: [csw-devel] SF.net SVN: gar:[16687]
	csw/mgar/pkg/cpan/Term-ReadLine-Gnu/trunk
Message-ID: <E1RijSF-0004Nl-Ch@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 16687
          http://gar.svn.sourceforge.net/gar/?rev=16687&view=rev
Author:   dmichelsen
Date:     2012-01-05 09:17:47 +0000 (Thu, 05 Jan 2012)
Log Message:
-----------
cpan/Term-ReadLine-Gnu/trunk: Update to 1.20 and new package name

Modified Paths:
--------------
    csw/mgar/pkg/cpan/Term-ReadLine-Gnu/trunk/Makefile
    csw/mgar/pkg/cpan/Term-ReadLine-Gnu/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/cpan/Term-ReadLine-Gnu/trunk/files/COPYING

Removed Paths:
-------------
    csw/mgar/pkg/cpan/Term-ReadLine-Gnu/trunk/files/changelog.CSW
    csw/mgar/pkg/cpan/Term-ReadLine-Gnu/trunk/files/patch-readline.t

Property Changed:
----------------
    csw/mgar/pkg/cpan/Term-ReadLine-Gnu/trunk/


Property changes on: csw/mgar/pkg/cpan/Term-ReadLine-Gnu/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2


Modified: csw/mgar/pkg/cpan/Term-ReadLine-Gnu/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Term-ReadLine-Gnu/trunk/Makefile	2012-01-04 21:29:14 UTC (rev 16686)
+++ csw/mgar/pkg/cpan/Term-ReadLine-Gnu/trunk/Makefile	2012-01-05 09:17:47 UTC (rev 16687)
@@ -1,5 +1,5 @@
 NAME = Term-ReadLine-Gnu
-VERSION = 1.19
+VERSION = 1.20
 CATEGORIES = cpan
 AUTHOR = HAYASHI
 
@@ -9,19 +9,20 @@
   Library.
 endef
 
-PACKAGES = CSWpmtermreadlineg
-CATALOGNAME = pm_termreadlineg
+DISTFILES += COPYING
 
-RUNTIME_DEP_PKGS = CSWreadline
+BUILD_DEP_PKGS += CSWlibreadline-dev
 
-# readline.h (CSWreadline) is inconsistent and breaks our test, therefor we
-# will patch that test for the time beeing
-PATCHFILES = patch-readline.t
+PACKAGES += CSWpm-term-readline-gnu
+SPKG_DESC_CSWpm-term-readline-gnu = Perl extension for the GNU Readline library
+# PKGFILES is catchall
+RUNTIME_DEP_PKGS_CSWpm-term-readline-gnu += CSWlibreadline6
+OBSOLETED_BY_CSWpm-term-readline-gnu += CSWpmtermreadlineg
+CATALOGNAME_CSWpmtermreadlineg = pm_termreadlineg_stub
 
+REINPLACEMENTS += cswperl
+REINPLACE_MATCH_cswperl = \#!/usr/local/bin/perl
+REINPLACE_WITH_cswperl = \#!$(bindir)/perl
+REINPLACE_FILES_cswperl += Gnu/XS.pm
+
 include gar/category.mk
-
-post-install-modulated: DOCDEST=$(DESTDIR)$(docdir)/$(NAME)
-post-install-modulated:
-	@ginstall -d $(DOCDEST)
-	@cp $(FILEDIR)/changelog.CSW $(DOCDEST)
-	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/cpan/Term-ReadLine-Gnu/trunk/checksums
===================================================================
--- csw/mgar/pkg/cpan/Term-ReadLine-Gnu/trunk/checksums	2012-01-04 21:29:14 UTC (rev 16686)
+++ csw/mgar/pkg/cpan/Term-ReadLine-Gnu/trunk/checksums	2012-01-05 09:17:47 UTC (rev 16687)
@@ -1,2 +1 @@
-e591287af62e000256893c84d01abebe  Term-ReadLine-Gnu-1.19.tar.gz
-b264dd3244ea25cc8bf2474de7054c31  patch-readline.t
+fa33510193b89a2ada74fcef00816322  Term-ReadLine-Gnu-1.20.tar.gz

Added: csw/mgar/pkg/cpan/Term-ReadLine-Gnu/trunk/files/COPYING
===================================================================
--- csw/mgar/pkg/cpan/Term-ReadLine-Gnu/trunk/files/COPYING	                        (rev 0)
+++ csw/mgar/pkg/cpan/Term-ReadLine-Gnu/trunk/files/COPYING	2012-01-05 09:17:47 UTC (rev 16687)
@@ -0,0 +1,7 @@
+/*
+ *      Copyright (c) 2010 Hiroo Hayashi.  All rights reserved.
+ *
+ *      This program is free software; you can redistribute it and/or
+ *      modify it under the same terms as Perl itself.
+ */
+

Deleted: csw/mgar/pkg/cpan/Term-ReadLine-Gnu/trunk/files/changelog.CSW
===================================================================
--- csw/mgar/pkg/cpan/Term-ReadLine-Gnu/trunk/files/changelog.CSW	2012-01-04 21:29:14 UTC (rev 16686)
+++ csw/mgar/pkg/cpan/Term-ReadLine-Gnu/trunk/files/changelog.CSW	2012-01-05 09:17:47 UTC (rev 16687)
@@ -1,5 +0,0 @@
-pm_termreadlineg (1.19,REV=2009.06.22)
-
-  * Initial release.
-
- -- Sebastian Kayser <skayser at opencsw.org>  Mon, 22 Jun 2009 22:32:28 +0200

Deleted: csw/mgar/pkg/cpan/Term-ReadLine-Gnu/trunk/files/patch-readline.t
===================================================================
--- csw/mgar/pkg/cpan/Term-ReadLine-Gnu/trunk/files/patch-readline.t	2012-01-04 21:29:14 UTC (rev 16686)
+++ csw/mgar/pkg/cpan/Term-ReadLine-Gnu/trunk/files/patch-readline.t	2012-01-05 09:17:47 UTC (rev 16687)
@@ -1,11 +0,0 @@
---- Term-ReadLine-Gnu-1.19.orig/t/readline.t	2010-02-17 17:20:01.298647840 +0100
-+++ Term-ReadLine-Gnu-1.19/t/readline.t	2010-02-17 17:18:59.672212090 +0100
-@@ -90,7 +90,7 @@
- # 2.3 Readline Variables
- 
- my ($maj, $min) = $a->{library_version} =~ /(\d+)\.(\d+)/;
--my $version = $a->{readline_version};
-+my $version = $a->{readline_version} + 1;
- $res = ($version == 0x100 * $maj + $min); ok('readline_version');
- 
- # Version 2.0 is NOT supported.

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


From phipsy at users.sourceforge.net  Thu Jan  5 10:26:50 2012
From: phipsy at users.sourceforge.net (phipsy at users.sourceforge.net)
Date: Thu, 05 Jan 2012 09:26:50 +0000
Subject: [csw-devel] SF.net SVN: gar:[16688] csw/mgar/pkg/puppet/trunk/files
Message-ID: <E1Rijb0-0004V0-4J@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 16688
          http://gar.svn.sourceforge.net/gar/?rev=16688&view=rev
Author:   phipsy
Date:     2012-01-05 09:26:49 +0000 (Thu, 05 Jan 2012)
Log Message:
-----------
puppet: Patches for augeas 0.10.0

Added Paths:
-----------
    csw/mgar/pkg/puppet/trunk/files/0005-11414-Save-execute-changes-on-versions-of-Augeas-0.3.patch
    csw/mgar/pkg/puppet/trunk/files/0006-11414-Test-Augeas-versions-correctly-with-versioncmp.patch

Added: csw/mgar/pkg/puppet/trunk/files/0005-11414-Save-execute-changes-on-versions-of-Augeas-0.3.patch
===================================================================
--- csw/mgar/pkg/puppet/trunk/files/0005-11414-Save-execute-changes-on-versions-of-Augeas-0.3.patch	                        (rev 0)
+++ csw/mgar/pkg/puppet/trunk/files/0005-11414-Save-execute-changes-on-versions-of-Augeas-0.3.patch	2012-01-05 09:26:49 UTC (rev 16688)
@@ -0,0 +1,48 @@
+From 3239ab3f7776ba9c58fd6c87ed33ad31d3eb42b7 Mon Sep 17 00:00:00 2001
+From: Dominic Cleal <dcleal at redhat.com>
+Date: Fri, 16 Dec 2011 20:22:54 +0000
+Subject: [PATCH 1/2] (#11414) Save/execute changes on versions of Augeas <
+ 0.3.6
+
+Versions of Augeas prior to 0.3.6 didn't report their version number, so a
+fallback of executing changes once in need_to_run? and again in execute_changes
+is performed.  Otherwise a save is done in need_to_run? and this is re-used in
+execute_changes.
+
+The /augeas/events/saved node is used to tell whether the latter optimisation
+happened, but the return value of #match wasn't tested correctly (it's an empty
+array).
+---
+ lib/puppet/provider/augeas/augeas.rb     |    2 +-
+ spec/unit/provider/augeas/augeas_spec.rb |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/lib/puppet/provider/augeas/augeas.rb b/lib/puppet/provider/augeas/augeas.rb
+index 7214a8b..7098ebd 100644
+--- a/lib/puppet/provider/augeas/augeas.rb
++++ b/lib/puppet/provider/augeas/augeas.rb
+@@ -325,7 +325,7 @@ Puppet::Type.type(:augeas).provide(:augeas) do
+     begin
+       open_augeas
+       saved_files = @aug.match("/augeas/events/saved")
+-      if saved_files
++      unless saved_files.empty?
+         saved_files.each do |key|
+           root = resource[:root].sub(/^\/$/, "")
+           saved_file = @aug.get(key).to_s.sub(/^\/files/, root)
+diff --git a/spec/unit/provider/augeas/augeas_spec.rb b/spec/unit/provider/augeas/augeas_spec.rb
+index 874f70a..059f5aa 100755
+--- a/spec/unit/provider/augeas/augeas_spec.rb
++++ b/spec/unit/provider/augeas/augeas_spec.rb
+@@ -467,7 +467,7 @@ describe provider_class do
+       @augeas = stub("augeas")
+       @provider.aug= @augeas
+       @provider.stubs(:get_augeas_version).returns("0.3.5")
+-      @augeas.stubs(:match).with("/augeas/events/saved")
++      @augeas.stubs(:match).with("/augeas/events/saved").returns([])
+     end
+ 
+     it "should handle set commands" do
+-- 
+1.7.7.4
+

Added: csw/mgar/pkg/puppet/trunk/files/0006-11414-Test-Augeas-versions-correctly-with-versioncmp.patch
===================================================================
--- csw/mgar/pkg/puppet/trunk/files/0006-11414-Test-Augeas-versions-correctly-with-versioncmp.patch	                        (rev 0)
+++ csw/mgar/pkg/puppet/trunk/files/0006-11414-Test-Augeas-versions-correctly-with-versioncmp.patch	2012-01-05 09:26:49 UTC (rev 16688)
@@ -0,0 +1,72 @@
+From 735acad5ff07f3efa77097aa75d83d92b695fa9e Mon Sep 17 00:00:00 2001
+From: Dominic Cleal <dcleal at redhat.com>
+Date: Fri, 16 Dec 2011 20:32:27 +0000
+Subject: [PATCH 2/2] (#11414) Test Augeas versions correctly with versioncmp
+
+The release of Augeas 0.10.0 broke simplistic version comparisons with the >=
+operator, so now use versioncmp.
+---
+ lib/puppet/provider/augeas/augeas.rb     |    8 +++++---
+ spec/unit/provider/augeas/augeas_spec.rb |    2 +-
+ 2 files changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/lib/puppet/provider/augeas/augeas.rb b/lib/puppet/provider/augeas/augeas.rb
+index 7098ebd..703a01b 100644
+--- a/lib/puppet/provider/augeas/augeas.rb
++++ b/lib/puppet/provider/augeas/augeas.rb
+@@ -17,10 +17,12 @@ require 'augeas' if Puppet.features.augeas?
+ require 'strscan'
+ require 'puppet/util'
+ require 'puppet/util/diff'
++require 'puppet/util/package'
+ 
+ Puppet::Type.type(:augeas).provide(:augeas) do
+   include Puppet::Util
+   include Puppet::Util::Diff
++  include Puppet::Util::Package
+ 
+   confine :true => Puppet.features.augeas?
+ 
+@@ -149,7 +151,7 @@ Puppet::Type.type(:augeas).provide(:augeas) do
+       debug("Opening augeas with root #{root}, lens path #{load_path}, flags #{flags}")
+       @aug = Augeas::open(root, load_path,flags)
+ 
+-      debug("Augeas version #{get_augeas_version} is installed") if get_augeas_version >= "0.3.6"
++      debug("Augeas version #{get_augeas_version} is installed") if versioncmp(get_augeas_version, "0.3.6") >= 0
+ 
+       if resource[:incl]
+         aug.set("/augeas/load/Xfm/lens", resource[:lens])
+@@ -285,7 +287,7 @@ Puppet::Type.type(:augeas).provide(:augeas) do
+         # If we have a verison of augeas which is at least 0.3.6 then we
+         # can make the changes now, see if changes were made, and
+         # actually do the save.
+-        if return_value and get_augeas_version >= "0.3.6"
++        if return_value and versioncmp(get_augeas_version, "0.3.6") >= 0
+           debug("Will attempt to save and only run if files changed")
+           set_augeas_save_mode(SAVE_NEWFILE)
+           do_execute_changes
+@@ -337,7 +339,7 @@ Puppet::Type.type(:augeas).provide(:augeas) do
+         end
+       else
+         debug("No saved files, re-executing augeas")
+-        set_augeas_save_mode(SAVE_OVERWRITE) if get_augeas_version >= "0.3.6"
++        set_augeas_save_mode(SAVE_OVERWRITE) if versioncmp(get_augeas_version, "0.3.6") >= 0
+         do_execute_changes
+         success = @aug.save
+         fail("Save failed with return code #{success}") if success != true
+diff --git a/spec/unit/provider/augeas/augeas_spec.rb b/spec/unit/provider/augeas/augeas_spec.rb
+index 059f5aa..52ebb34 100755
+--- a/spec/unit/provider/augeas/augeas_spec.rb
++++ b/spec/unit/provider/augeas/augeas_spec.rb
+@@ -353,7 +353,7 @@ describe provider_class do
+         @augeas_stub = stub("augeas")
+         @provider.aug = @augeas_stub
+ 
+-        @augeas_stub.stubs("get").with("/augeas/version").returns("0.7.2")
++        @augeas_stub.stubs("get").with("/augeas/version").returns("0.10.0")
+         @augeas_stub.stubs(:set).returns(true)
+         @augeas_stub.stubs(:save).returns(true)
+       end
+-- 
+1.7.7.4
+

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


From cgrzemba at users.sourceforge.net  Thu Jan  5 11:55:00 2012
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Thu, 05 Jan 2012 10:55:00 +0000
Subject: [csw-devel] SF.net SVN: gar:[16689] csw/mgar/pkg/lang-java
Message-ID: <E1RikyK-000861-Q8@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 16689
          http://gar.svn.sourceforge.net/gar/?rev=16689&view=rev
Author:   cgrzemba
Date:     2012-01-05 10:55:00 +0000 (Thu, 05 Jan 2012)
Log Message:
-----------
lang-java/idm-console-base/trunk: Inital release

Added Paths:
-----------
    csw/mgar/pkg/lang-java/idm-console-base/
    csw/mgar/pkg/lang-java/idm-console-base/Makefile
    csw/mgar/pkg/lang-java/idm-console-base/branches/
    csw/mgar/pkg/lang-java/idm-console-base/tags/
    csw/mgar/pkg/lang-java/idm-console-base/trunk/
    csw/mgar/pkg/lang-java/idm-console-base/trunk/Makefile
    csw/mgar/pkg/lang-java/idm-console-base/trunk/checksums
    csw/mgar/pkg/lang-java/idm-console-base/trunk/files/

Added: csw/mgar/pkg/lang-java/idm-console-base/Makefile
===================================================================
--- csw/mgar/pkg/lang-java/idm-console-base/Makefile	                        (rev 0)
+++ csw/mgar/pkg/lang-java/idm-console-base/Makefile	2012-01-05 10:55:00 UTC (rev 16689)
@@ -0,0 +1,2 @@
+%:
+	$(MAKE) -C trunk $*


Property changes on: csw/mgar/pkg/lang-java/idm-console-base/trunk
___________________________________________________________________
Added: svn:ignore
   + cookies
download
work


Added: svn:externals
   + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2


Added: csw/mgar/pkg/lang-java/idm-console-base/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-java/idm-console-base/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/lang-java/idm-console-base/trunk/Makefile	2012-01-05 10:55:00 UTC (rev 16689)
@@ -0,0 +1,61 @@
+# $Id$
+# TODO (release-critical prefixed with !, non release-critical with *)
+#
+NAME = idm-console-framework
+VERSION = 1.1.7
+MAJOR_VERSION = 1.1
+GARTYPE = v2
+CATEGORIES = java
+
+DESCRIPTION = 389 Directory Server - Management Console Framework
+define BLURB
+A Java based remote management console used for managing 389
+Administration Server and 389 Directory Server.
+endef
+
+MASTER_SITES = http://port389/sources
+DISTFILES  = $(NAME)-$(VERSION).tar.bz2
+
+PACKAGES = CSWidmconsolebase
+# RUNTIME_DEP_PKGS = CSWldapjdk CSWjss4
+
+ARCHALL = 1
+
+CATALOGNAME_CSWidm-console-base = idm-console-base
+
+LICENSE = LICENSE
+
+WORKSRC = $(WORKDIR)
+
+CONFIGURE_SCRIPTS =
+BUILD_SCRIPTS = custom
+TEST_SCRIPTS =
+INSTALL_SCRIPTS = custom
+
+include gar/category.mk
+
+install-custom: 
+	@ginstall -d $(DESTDIR)$(datadir)/java
+	@gcp -fp $(WORKSRC)/$(DISTNAME)/built/release/jars/idm-console-base-$(VERSION).jar $(DESTDIR)$(datadir)/java
+	@gcp -fp $(WORKSRC)/$(DISTNAME)/built/release/jars/idm-console-mcc-$(VERSION).jar $(DESTDIR)$(datadir)/java
+	@gcp -fp $(WORKSRC)/$(DISTNAME)/built/release/jars/idm-console-mcc-$(VERSION)_en.jar $(DESTDIR)$(datadir)/java
+	@gcp -fp $(WORKSRC)/$(DISTNAME)/built/release/jars/idm-console-nmclf-$(VERSION).jar $(DESTDIR)$(datadir)/java
+	@gcp -fp $(WORKSRC)/$(DISTNAME)/built/release/jars/idm-console-nmclf-$(VERSION)_en.jar $(DESTDIR)$(datadir)/java
+	@( cd $(DESTDIR)$(datadir)/java ; \
+	   ln -s idm-console-base-$(VERSION).jar idm-console-base-$(MAJOR_VERSION).jar ; \
+	   ln -s idm-console-base-$(VERSION).jar idm-console-base.jar ; \
+	   ln -s idm-console-mcc-$(VERSION).jar idm-console-mcc-$(MAJOR_VERSION).jar ; \
+	   ln -s idm-console-mcc-$(VERSION).jar idm-console-mcc.jar ; \
+	   ln -s idm-console-mcc-$(VERSION)_en.jar idm-console-mcc-$(MAJOR_VERSION)_en.jar ; \
+	   ln -s idm-console-mcc-$(VERSION)_en.jar idm-console-mcc_en.jar ; \
+	   ln -s idm-console-nmclf-$(VERSION).jar idm-console-nmclf-$(MAJOR_VERSION).jar ; \
+	   ln -s idm-console-nmclf-$(VERSION).jar idm-console-nmclf.jar ; \
+	   ln -s idm-console-nmclf-$(VERSION)_en.jar idm-console-nmclf-$(MAJOR_VERSION)_en.jar ; \
+	   ln -s idm-console-nmclf-$(VERSION)_en.jar idm-console-nmclf_en.jar )
+	@$(MAKECOOKIE)
+
+build-custom:
+	@( cd $(WORKSRC)/$(DISTNAME); \
+	  pwd; \
+	  ant -Dbuilt.dir=`pwd`/built -Dldapjdk.local.location=/opt/csw/share/java -Djss.local.location=/opt/csw/share/java )
+	@$(MAKECOOKIE)


Property changes on: csw/mgar/pkg/lang-java/idm-console-base/trunk/Makefile
___________________________________________________________________
Added: svn:keywords
   + Id

Added: csw/mgar/pkg/lang-java/idm-console-base/trunk/checksums
===================================================================
--- csw/mgar/pkg/lang-java/idm-console-base/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/lang-java/idm-console-base/trunk/checksums	2012-01-05 10:55:00 UTC (rev 16689)
@@ -0,0 +1 @@
+14bfcf3848b57711a665b3cea45756ea  idm-console-framework-1.1.7.tar.bz2

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


From cgrzemba at users.sourceforge.net  Thu Jan  5 12:14:26 2012
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Thu, 05 Jan 2012 11:14:26 +0000
Subject: [csw-devel] SF.net SVN: gar:[16690]
 csw/mgar/pkg/lang-java/idm-console-base/trunk/ Makefile
Message-ID: <E1RilH8-0001hf-9Z@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 16690
          http://gar.svn.sourceforge.net/gar/?rev=16690&view=rev
Author:   cgrzemba
Date:     2012-01-05 11:14:25 +0000 (Thu, 05 Jan 2012)
Log Message:
-----------
lang-java/idm-console-base/trunk: fix MASTER_SITES

Modified Paths:
--------------
    csw/mgar/pkg/lang-java/idm-console-base/trunk/Makefile

Modified: csw/mgar/pkg/lang-java/idm-console-base/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-java/idm-console-base/trunk/Makefile	2012-01-05 10:55:00 UTC (rev 16689)
+++ csw/mgar/pkg/lang-java/idm-console-base/trunk/Makefile	2012-01-05 11:14:25 UTC (rev 16690)
@@ -13,7 +13,7 @@
 Administration Server and 389 Directory Server.
 endef
 
-MASTER_SITES = http://port389/sources
+MASTER_SITES = http://port389.org/sources
 DISTFILES  = $(NAME)-$(VERSION).tar.bz2
 
 PACKAGES = CSWidmconsolebase

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


From cgrzemba at users.sourceforge.net  Thu Jan  5 12:26:28 2012
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Thu, 05 Jan 2012 11:26:28 +0000
Subject: [csw-devel] SF.net SVN: gar:[16691]
	csw/mgar/pkg/lang-java/ldapjdk/trunk/Makefile
Message-ID: <E1RilSm-0004Vc-Gk@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 16691
          http://gar.svn.sourceforge.net/gar/?rev=16691&view=rev
Author:   cgrzemba
Date:     2012-01-05 11:26:28 +0000 (Thu, 05 Jan 2012)
Log Message:
-----------
lang-java/ldapjdk/trunk: fix package name

Modified Paths:
--------------
    csw/mgar/pkg/lang-java/ldapjdk/trunk/Makefile

Modified: csw/mgar/pkg/lang-java/ldapjdk/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-java/ldapjdk/trunk/Makefile	2012-01-05 11:14:25 UTC (rev 16690)
+++ csw/mgar/pkg/lang-java/ldapjdk/trunk/Makefile	2012-01-05 11:26:28 UTC (rev 16691)
@@ -18,7 +18,7 @@
 DISTFILES  = $(NAME)_$(VERSION).tar.gz
 DISTFILES += COPYING
 
-PACKAGES = CSWldapsdk
+PACKAGES = CSWldapjdk
 PACKAGING_PLATFORMS += solaris10-sparc
 PACKAGING_PLATFORMS += solaris10-i386
 
@@ -39,8 +39,6 @@
 TEST_SCRIPTS =
 INSTALL_SCRIPTS = custom
 
-CHECKPKG_OVERRIDES_CSWldapsdk += pkginfo-description-not-starting-with-uppercase|389|Directory|Server|-|Management|Console
-
 include gar/category.mk
 
 install-custom: 

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


From cgrzemba at users.sourceforge.net  Thu Jan  5 14:27:24 2012
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Thu, 05 Jan 2012 13:27:24 +0000
Subject: [csw-devel] SF.net SVN: gar:[16692] csw/mgar/pkg/lang-java
Message-ID: <E1RinLo-0003lE-6H@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 16692
          http://gar.svn.sourceforge.net/gar/?rev=16692&view=rev
Author:   cgrzemba
Date:     2012-01-05 13:27:23 +0000 (Thu, 05 Jan 2012)
Log Message:
-----------
lang-java/389-ds-console/trunk: prerelease

Added Paths:
-----------
    csw/mgar/pkg/lang-java/389-ds-console/
    csw/mgar/pkg/lang-java/389-ds-console/Makefile
    csw/mgar/pkg/lang-java/389-ds-console/branches/
    csw/mgar/pkg/lang-java/389-ds-console/tags/
    csw/mgar/pkg/lang-java/389-ds-console/trunk/
    csw/mgar/pkg/lang-java/389-ds-console/trunk/Makefile
    csw/mgar/pkg/lang-java/389-ds-console/trunk/checksums
    csw/mgar/pkg/lang-java/389-ds-console/trunk/files/

Added: csw/mgar/pkg/lang-java/389-ds-console/Makefile
===================================================================
--- csw/mgar/pkg/lang-java/389-ds-console/Makefile	                        (rev 0)
+++ csw/mgar/pkg/lang-java/389-ds-console/Makefile	2012-01-05 13:27:23 UTC (rev 16692)
@@ -0,0 +1,2 @@
+%:
+	$(MAKE) -C trunk $*


Property changes on: csw/mgar/pkg/lang-java/389-ds-console/trunk
___________________________________________________________________
Added: svn:ignore
   + cookies
download
work


Added: svn:externals
   + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2


Added: csw/mgar/pkg/lang-java/389-ds-console/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-java/389-ds-console/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/lang-java/389-ds-console/trunk/Makefile	2012-01-05 13:27:23 UTC (rev 16692)
@@ -0,0 +1,54 @@
+# $Id$
+# TODO (release-critical prefixed with !, non release-critical with *)
+#
+NAME = 389-ds-console
+SHORTNAME = 389-ds
+VERSION = 1.2.6
+GARTYPE = v2
+CATEGORIES = java
+
+DESCRIPTION = 389 Directory Server - Management Console
+define BLURB
+A Java based remote management console used for managing 389
+Administration Server and 389 Directory Server.
+endef
+
+MASTER_SITES = http://port389/sources
+DISTFILES  = $(NAME)-$(VERSION).tar.bz2
+
+PACKAGES = CSW389-ds-console
+RUNTIME_DEP_PKGS = CSWidm-console-base CSWldapjdk CSWjss4
+
+ARCHALL = 1
+
+CATALOGNAME_CSW389-ds-console = 389-ds-console
+
+LICENSE = LICENSE
+
+WORKSRC = $(WORKDIR)
+
+CONFIGURE_SCRIPTS =
+BUILD_SCRIPTS = custom
+TEST_SCRIPTS =
+INSTALL_SCRIPTS = custom
+
+include gar/category.mk
+
+install-custom: 
+	@ginstall -d $(DESTDIR)$(datadir)/dirsrv/html/java
+	@ginstall -d $(DESTDIR)$(datadir)/dirsrv/manual/en/admin/help
+	@gcp -fp $(WORKSRC)/$(DISTNAME)/built/package/$(SHORTNAME)* $(DESTDIR)$(datadir)/dirsrv/html/java
+	@gcp -fp $(WORKSRC)/$(DISTNAME)/help/en/*.html $(DESTDIR)$(datadir)/dirsrv/manual/en/admin
+	@gcp -fp $(WORKSRC)/$(DISTNAME)/help/en/tokens.map $(DESTDIR)$(datadir)/dirsrv/manual/en/admin
+	@gcp -fp $(WORKSRC)/$(DISTNAME)/help/en/help/*.html $(DESTDIR)$(datadir)/dirsrv/manual/en/admin/help
+	@( cd $(DESTDIR)$(datadir)/dirsrv/html/java ; \
+	   ln -s $(SHORTNAME)-$(VERSION).jar $(SHORTNAME)-$(MAJOR_VERSION).jar ; \
+	   ln -s $(SHORTNAME)-$(VERSION).jar $(SHORTNAME).jar ; \
+	   ln -s $(SHORTNAME)-$(VERSION)_en.jar $(SHORTNAME)-$(MAJOR_VERSION)_en.jar ; \
+	   ln -s $(SHORTNAME)-$(VERSION)_en.jar $(SHORTNAME)_en.jar )
+	@$(MAKECOOKIE)
+
+build-custom:
+	@( cd $(WORKSRC)/$(DISTNAME); \
+	  ant -Dbuilt.dir=`pwd`/built -Dconsole.location=/opt/csw/share/java )
+	@$(MAKECOOKIE)


Property changes on: csw/mgar/pkg/lang-java/389-ds-console/trunk/Makefile
___________________________________________________________________
Added: svn:keywords
   + Id

Added: csw/mgar/pkg/lang-java/389-ds-console/trunk/checksums
===================================================================
--- csw/mgar/pkg/lang-java/389-ds-console/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/lang-java/389-ds-console/trunk/checksums	2012-01-05 13:27:23 UTC (rev 16692)
@@ -0,0 +1 @@
+c53161badabc0715f78bdcefee810c40  389-ds-console-1.2.6.tar.bz2

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


From dmichelsen at users.sourceforge.net  Thu Jan  5 14:59:03 2012
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu, 05 Jan 2012 13:59:03 +0000
Subject: [csw-devel] SF.net SVN: gar:[16693] csw/mgar/gar/v2/gar.mk
Message-ID: <E1RinqR-0006xr-5R@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 16693
          http://gar.svn.sourceforge.net/gar/?rev=16693&view=rev
Author:   dmichelsen
Date:     2012-01-05 13:59:02 +0000 (Thu, 05 Jan 2012)
Log Message:
-----------
mGAR v2: Honour *_config besides *-config

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

Modified: csw/mgar/gar/v2/gar.mk
===================================================================
--- csw/mgar/gar/v2/gar.mk	2012-01-05 13:27:23 UTC (rev 16692)
+++ csw/mgar/gar/v2/gar.mk	2012-01-05 13:59:02 UTC (rev 16693)
@@ -943,10 +943,12 @@
 	)
 	@$(MAKECOOKIE)
 
+CONFIG_FILES ?= $(bindir)/.*_config $(bindir)/.*-config
+
 # Copy 
 merge-copy-config-only:
 	$(_DBG_MERGE)(cd $(INSTALLISADIR)$(if $(ALLOW_RELOCATE),$(RELOCATE_PREFIX)); umask 022 && pcopy \
-		-m -s ",^\(\.$(bindir)/.*-config\)\$$,\1,p" \
+		-m $(foreach C,$(CONFIG_FILES),-s ",^\(\.$C\)\$$,\1,p" ) \
 		. $(PKGROOT) \
 	)
 	@$(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 Jan  5 15:03:30 2012
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu, 05 Jan 2012 14:03:30 +0000
Subject: [csw-devel] SF.net SVN: gar:[16694] csw/mgar/pkg/samba/trunk
Message-ID: <E1Rinuk-0007FQ-FZ@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 16694
          http://gar.svn.sourceforge.net/gar/?rev=16694&view=rev
Author:   dmichelsen
Date:     2012-01-05 14:03:30 +0000 (Thu, 05 Jan 2012)
Log Message:
-----------
samba/trunk: Split off start script for winbind

Modified Paths:
--------------
    csw/mgar/pkg/samba/trunk/Makefile
    csw/mgar/pkg/samba/trunk/files/cswsamba

Added Paths:
-----------
    csw/mgar/pkg/samba/trunk/files/cswwinbind

Modified: csw/mgar/pkg/samba/trunk/Makefile
===================================================================
--- csw/mgar/pkg/samba/trunk/Makefile	2012-01-05 13:59:02 UTC (rev 16693)
+++ csw/mgar/pkg/samba/trunk/Makefile	2012-01-05 14:03:30 UTC (rev 16694)
@@ -14,7 +14,9 @@
 MASTER_SITES = http://samba.org/samba/ftp/stable/
 DISTFILES  = $(NAME)-$(VERSION).tar.gz
 DISTFILES += cswsamba
+DISTFILES += cswwinbind
 EXPANDVARS += cswsamba
+EXPANDVARS += cswwinbind
 EXPANDVARS += smb.conf
 
 # From http://www.reallylinux.com/docs/smb.conf
@@ -254,6 +256,7 @@
 PKGFILES_CSWsamba-winbind += $(mandir)/man8/pam_winbind\.8
 PKGFILES_CSWsamba-winbind += $(call baseisadirs,$(sbindir),winbindd)
 PKGFILES_CSWsamba-winbind += $(mandir)/man8/winbindd\.8
+PKGFILES_CSWsamba-winbind += /etc/opt/csw/init.d/cswwinbind
 RUNTIME_DEP_PKGS_CSWsamba-winbind += CSWlibpopt0
 RUNTIME_DEP_PKGS_CSWsamba-winbind += CSWlibiconv2
 RUNTIME_DEP_PKGS_CSWsamba-winbind += CSWlibz1
@@ -287,9 +290,12 @@
 CONFIGURE_ARGS += $(DIRPATHS)
 CONFIGURE_ARGS += --enable-socket-wrapper
 CONFIGURE_ARGS += --enable-nss-wrapper
+CONFIGURE_ARGS += --with-acl-support
+CONFIGURE_ARGS += --with-aio-support
+CONFIGURE_ARGS += --with-pam
+# CONFIGURE_ARGS += --with-krb5=$(prefix)
 CONFIGURE_ARGS += --with-privatedir=$(SMBPRIVATEDIR)
 CONFIGURE_ARGS += --with-configdir=$(SMBCONFIGDIR)
-
 CONFIGURE_ARGS += --with-lockdir=$(SMBLOCKDIR)
 CONFIGURE_ARGS += --with-statedir=$(SMBLOCKDIR)
 CONFIGURE_ARGS += --with-cachedir=$(SMBLOCKDIR)
@@ -311,9 +317,10 @@
 INSTALL_SCRIPTS = $(WORKSRC)/source3/Makefile
 
 INITSMF += /etc/opt/csw/init.d/cswsamba
+INITSMF += /etc/opt/csw/init.d/cswwinbind
 
 MIGRATE_FILES_CSWsamba += samba
-PRESERVECONF_CSWsamba += $(sysconfdir)/samba/smb.conf
+PRESERVECONF += $(sysconfdir)/samba/smb.conf
 
 include gar/category.mk
 

Modified: csw/mgar/pkg/samba/trunk/files/cswsamba
===================================================================
--- csw/mgar/pkg/samba/trunk/files/cswsamba	2012-01-05 13:59:02 UTC (rev 16693)
+++ csw/mgar/pkg/samba/trunk/files/cswsamba	2012-01-05 14:03:30 UTC (rev 16694)
@@ -4,14 +4,12 @@
 #RC_SNUM 89         # Number used for start script symlink, e.g. S80cswfoo
 #RC_KLEV 0,1,2,S    # Run levels that should have a kill script symlink
 #RC_SLEV 3          # Run levels that should have a start script symlink
+#AUTOENABLE no      # Before running always manual adjustment of smb.conf is needed
 
 PATH=/bin:/sbin:/usr/bin:/usr/sbin
 export PATH
 
 SMBCONF=@sysconfdir@/samba/smb.conf
-KRBCONF=@sysconfdir@/krb5.conf
-export SMBCONF
-export KRBCONF
 
 case "$1" in
 	start)
@@ -19,10 +17,6 @@
 			echo "Starting samba..."
 			@sbindir@/nmbd -D
 			@sbindir@/smbd -D
-			if [ -f $KRBCONF ]; then
-			    echo "Starting winbind..."
-			    @sbindir@/winbindd -B
-			fi    
 		else
 			echo "No $SMBCONF found. Not starting";
 		fi
@@ -31,9 +25,6 @@
 		echo "Stopping Samba..."
 		kill "`cat @SMBLOCKDIR@/smbd.pid`"
 		kill "`cat @SMBLOCKDIR@/nmbd.pid`"
-		if [ -f $KRBCONF ]; then
-		    echo "Stopping Winbind..."
-		fi    
 	;;
 	restart)
 		$0 stop

Copied: csw/mgar/pkg/samba/trunk/files/cswwinbind (from rev 16675, csw/mgar/pkg/samba/trunk/files/cswsamba)
===================================================================
--- csw/mgar/pkg/samba/trunk/files/cswwinbind	                        (rev 0)
+++ csw/mgar/pkg/samba/trunk/files/cswwinbind	2012-01-05 14:03:30 UTC (rev 16694)
@@ -0,0 +1,36 @@
+#!/bin/sh
+
+#RC_KNUM 03         # Number used for kill script symlink, e.g. K20cswfoo
+#RC_SNUM 89         # Number used for start script symlink, e.g. S80cswfoo
+#RC_KLEV 0,1,2,S    # Run levels that should have a kill script symlink
+#RC_SLEV 3          # Run levels that should have a start script symlink
+#AUTOENABLE no      # Before running always manual adjustment of smb.conf is needed
+
+PATH=/bin:/sbin:/usr/bin:/usr/sbin
+export PATH
+
+SMBCONF=@sysconfdir@/samba/smb.conf
+
+case "$1" in
+	start)
+		if [ -f $SMBCONF ]; then
+			echo "Starting winbind..."
+			@sbindir@/winbindd -D
+		else
+			echo "No $SMBCONF found. Not starting";
+		fi
+	;;
+	stop)
+		echo "Stopping Winbind..."
+		pkill winbindd
+	;;
+	restart)
+		$0 stop
+		$0 start
+	;;
+	*)
+		echo "$0 {start | stop | restart}"
+		exit 1;
+	;;
+esac
+

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


From dmichelsen at users.sourceforge.net  Thu Jan  5 15:11:48 2012
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu, 05 Jan 2012 14:11:48 +0000
Subject: [csw-devel] SF.net SVN: gar:[16695] csw/mgar/gar/v2/gar.conf.mk
Message-ID: <E1Rio2m-0007Bt-Ai@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 16695
          http://gar.svn.sourceforge.net/gar/?rev=16695&view=rev
Author:   dmichelsen
Date:     2012-01-05 14:11:48 +0000 (Thu, 05 Jan 2012)
Log Message:
-----------
mGAR v2: Add basic support for Sun Studio 12.3

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

Modified: csw/mgar/gar/v2/gar.conf.mk
===================================================================
--- csw/mgar/gar/v2/gar.conf.mk	2012-01-05 14:03:30 UTC (rev 16694)
+++ csw/mgar/gar/v2/gar.conf.mk	2012-01-05 14:11:48 UTC (rev 16695)
@@ -84,12 +84,12 @@
 
 # Select compiler
 # GARCOMPILER can be either GNU/SUN which selects the default
-# Sun or GNU compiler, or the specific verions SOS11/SOS12/SOS12U1/SOS12U2/GCC3/GCC4
+# Sun or GNU compiler, or the specific verions SOS11/SOS12/SOS12U1/SOS12U2/SOS12U3/GCC3/GCC4
 
 GARCOMPILER ?= SUN
 
 # We have parameters for the following compilers
-GARCOMPILERS = GCC3 GCC4 SOS11 SOS12 SOS12U1 SOS12U2
+GARCOMPILERS = GCC3 GCC4 SOS11 SOS12 SOS12U1 SOS12U2 SOS12U3
 
 ifeq ($(GARCOMPILER),SUN)
   GARCOMPILER = SOS12
@@ -228,6 +228,7 @@
   ARCHFLAGS_SOS12_sparcv9+fmuladd = -m64 -xarch=sparcfmaf -fma=fused
 ARCHFLAGS_SOS12U1_sparcv9+fmuladd = -m64 -xarch=sparcfmaf -fma=fused
 ARCHFLAGS_SOS12U2_sparcv9+fmuladd = -m64 -xarch=sparcfmaf -fma=fused
+ARCHFLAGS_SOS12U3_sparcv9+fmuladd = -m64 -xarch=sparcfmaf -fma=fused
    ARCHFLAGS_GCC3_sparcv9+fmuladd = ERROR
    ARCHFLAGS_GCC4_sparcv9+fmuladd = ERROR
       MEMORYMODEL_sparcv9+fmuladd = 64
@@ -236,6 +237,7 @@
      ARCHFLAGS_SOS12_sparcv9+vis2 = -m64 -xarch=sparcvis2
    ARCHFLAGS_SOS12U1_sparcv9+vis2 = -m64 -xarch=sparcvis2
    ARCHFLAGS_SOS12U2_sparcv9+vis2 = -m64 -xarch=sparcvis2
+   ARCHFLAGS_SOS12U3_sparcv9+vis2 = -m64 -xarch=sparcvis2
       ARCHFLAGS_GCC3_sparcv9+vis2 = ERROR
       ARCHFLAGS_GCC4_sparcv9+vis2 = ERROR
          MEMORYMODEL_sparcv9+vis2 = 64
@@ -244,6 +246,7 @@
       ARCHFLAGS_SOS12_sparcv9+vis = -m64 -xarch=sparcvis
     ARCHFLAGS_SOS12U1_sparcv9+vis = -m64 -xarch=sparcvis
     ARCHFLAGS_SOS12U2_sparcv9+vis = -m64 -xarch=sparcvis
+    ARCHFLAGS_SOS12U3_sparcv9+vis = -m64 -xarch=sparcvis
        ARCHFLAGS_GCC3_sparcv9+vis = -m64 -mcpu=ultrasparc -mvis
        ARCHFLAGS_GCC4_sparcv9+vis = -m64 -mcpu=ultrasparc -mvis
           MEMORYMODEL_sparcv9+vis = 64
@@ -252,6 +255,7 @@
           ARCHFLAGS_SOS12_sparcv9 = -m64 -xarch=sparc
         ARCHFLAGS_SOS12U1_sparcv9 = -m64 -xarch=sparc
         ARCHFLAGS_SOS12U2_sparcv9 = -m64 -xarch=sparc
+        ARCHFLAGS_SOS12U3_sparcv9 = -m64 -xarch=sparc
            ARCHFLAGS_GCC3_sparcv9 = -m64 -mcpu=v9
            ARCHFLAGS_GCC4_sparcv9 = -m64 -mcpu=v9
               MEMORYMODEL_sparcv9 = 64
@@ -260,6 +264,7 @@
   ARCHFLAGS_SOS12_sparcv8plus+fmuladd = -m32 -xarch=xparcfmaf -fma=fused
 ARCHFLAGS_SOS12U1_sparcv8plus+fmuladd = -m32 -xarch=xparcfmaf -fma=fused
 ARCHFLAGS_SOS12U2_sparcv8plus+fmuladd = -m32 -xarch=xparcfmaf -fma=fused
+ARCHFLAGS_SOS12U3_sparcv8plus+fmuladd = -m32 -xarch=xparcfmaf -fma=fused
    ARCHFLAGS_GCC3_sparcv8plus+fmuladd = ERROR
    ARCHFLAGS_GCC4_sparcv8plus+fmuladd = ERROR
       MEMORYMODEL_sparcv8plus+fmuladd = 32
@@ -268,6 +273,7 @@
   ARCHFLAGS_SOS12_sparcv8plus+vis2 = -m32 -xarch=sparcvis2
 ARCHFLAGS_SOS12U1_sparcv8plus+vis2 = -m32 -xarch=sparcvis2
 ARCHFLAGS_SOS12U2_sparcv8plus+vis2 = -m32 -xarch=sparcvis2
+ARCHFLAGS_SOS12U3_sparcv8plus+vis2 = -m32 -xarch=sparcvis2
    ARCHFLAGS_GCC3_sparcv8plus+vis2 = ERROR
    ARCHFLAGS_GCC4_sparcv8plus+vis2 = ERROR
       MEMORYMODEL_sparcv8plus+vis2 = 32
@@ -276,6 +282,7 @@
   ARCHFLAGS_SOS12_sparcv8plus+vis = -m32 -xarch=sparcvis
 ARCHFLAGS_SOS12U1_sparcv8plus+vis = -m32 -xarch=sparcvis
 ARCHFLAGS_SOS12U2_sparcv8plus+vis = -m32 -xarch=sparcvis
+ARCHFLAGS_SOS12U3_sparcv8plus+vis = -m32 -xarch=sparcvis
    ARCHFLAGS_GCC3_sparcv8plus+vis = -mcpu=v8 -mvis
    ARCHFLAGS_GCC4_sparcv8plus+vis = -mcpu=v8 -mvis
       MEMORYMODEL_sparcv8plus+vis = 32
@@ -284,6 +291,7 @@
       ARCHFLAGS_SOS12_sparcv8plus = -m32 -xarch=sparc
     ARCHFLAGS_SOS12U1_sparcv8plus = -m32 -xarch=sparc
     ARCHFLAGS_SOS12U2_sparcv8plus = -m32 -xarch=sparc
+    ARCHFLAGS_SOS12U3_sparcv8plus = -m32 -xarch=sparc
        ARCHFLAGS_GCC3_sparcv8plus = -mcpu=v8 -mv8plus
        ARCHFLAGS_GCC4_sparcv8plus = -mcpu=v8 -mv8plus
           MEMORYMODEL_sparcv8plus = 32
@@ -292,6 +300,7 @@
           ARCHFLAGS_SOS12_sparcv8 = -m32 -xarch=v8
         ARCHFLAGS_SOS12U1_sparcv8 = -m32 -xarch=v8
         ARCHFLAGS_SOS12U2_sparcv8 = -m32 -xarch=v8
+        ARCHFLAGS_SOS12U3_sparcv8 = -m32 -xarch=v8
            ARCHFLAGS_GCC3_sparcv8 = -mcpu=v8
            ARCHFLAGS_GCC4_sparcv8 = -mcpu=v8
               MEMORYMODEL_sparcv8 = 32
@@ -300,6 +309,7 @@
    ARCHFLAGS_SOS12_sparcv8-fsmuld = -m32 -xarch=v8a
  ARCHFLAGS_SOS12U1_sparcv8-fsmuld = -m32 -xarch=v8a
  ARCHFLAGS_SOS12U2_sparcv8-fsmuld = -m32 -xarch=v8a
+ ARCHFLAGS_SOS12U3_sparcv8-fsmuld = -m32 -xarch=v8a
     ARCHFLAGS_GCC3_sparcv8-fsmuld = ERROR
     ARCHFLAGS_GCC4_sparcv8-fsmuld = ERROR
        MEMORYMODEL_sparcv8-fsmuld = 32
@@ -308,6 +318,7 @@
             ARCHFLAGS_SOS12_amd64 = -m64 -xarch=sse2
           ARCHFLAGS_SOS12U1_amd64 = -m64 -xarch=sse2
           ARCHFLAGS_SOS12U2_amd64 = -m64 -xarch=sse2
+          ARCHFLAGS_SOS12U3_amd64 = -m64 -xarch=sse2
              ARCHFLAGS_GCC3_amd64 = -m64 -march=opteron
              ARCHFLAGS_GCC4_amd64 = -m64 -march=opteron
                 MEMORYMODEL_amd64 = 64
@@ -316,6 +327,7 @@
   ARCHFLAGS_SOS12_pentium_pro+mmx = -m32 -xarch=pentium_proa
 ARCHFLAGS_SOS12U1_pentium_pro+mmx = -m32 -xarch=pentium_proa
 ARCHFLAGS_SOS12U2_pentium_pro+mmx = -m32 -xarch=pentium_proa
+ARCHFLAGS_SOS12U3_pentium_pro+mmx = -m32 -xarch=pentium_proa
    ARCHFLAGS_GCC3_pentium_pro+mmx = -m32 -march=pentium2
    ARCHFLAGS_GCC4_pentium_pro+mmx = -m32 -march=pentium2
       MEMORYMODEL_pentium_pro+mmx = 32
@@ -324,6 +336,7 @@
       ARCHFLAGS_SOS12_pentium_pro = -m32 -xarch=pentium_pro -xchip=pentium_pro
     ARCHFLAGS_SOS12U1_pentium_pro = -m32 -xarch=pentium_pro -xchip=pentium_pro
     ARCHFLAGS_SOS12U2_pentium_pro = -m32 -xarch=pentium_pro -xchip=pentium_pro
+    ARCHFLAGS_SOS12U3_pentium_pro = -m32 -xarch=pentium_pro -xchip=pentium_pro
        ARCHFLAGS_GCC3_pentium_pro = -m32 -march=pentiumpro
        ARCHFLAGS_GCC4_pentium_pro = -m32 -march=pentiumpro
           MEMORYMODEL_pentium_pro = 32
@@ -332,6 +345,7 @@
       ARCHFLAGS_SOS12_pentium+mmx = ERROR
     ARCHFLAGS_SOS12U1_pentium+mmx = ERROR
     ARCHFLAGS_SOS12U2_pentium+mmx = ERROR
+    ARCHFLAGS_SOS12U3_pentium+mmx = ERROR
        ARCHFLAGS_GCC3_pentium+mmx = -m32 -march=pentium-mmx
        ARCHFLAGS_GCC4_pentium+mmx = -m32 -march=pentium-mmx
           MEMORYMODEL_pentium+mmx = 32
@@ -340,6 +354,7 @@
           ARCHFLAGS_SOS12_pentium = -m32 -xchip=pentium
         ARCHFLAGS_SOS12U1_pentium = -m32 -xchip=pentium
         ARCHFLAGS_SOS12U2_pentium = -m32 -xchip=pentium
+        ARCHFLAGS_SOS12U3_pentium = -m32 -xchip=pentium
            ARCHFLAGS_GCC3_pentium = -m32 -march=pentium
            ARCHFLAGS_GCC4_pentium = -m32 -march=pentium
               MEMORYMODEL_pentium = 32
@@ -348,6 +363,7 @@
              ARCHFLAGS_SOS12_i486 = -m32 -xarch=386 -xchip=486
            ARCHFLAGS_SOS12U1_i486 = -m32 -xarch=386 -xchip=486
            ARCHFLAGS_SOS12U2_i486 = -m32 -xarch=386 -xchip=486
+           ARCHFLAGS_SOS12U3_i486 = -m32 -xarch=386 -xchip=486
               ARCHFLAGS_GCC3_i486 = -m32 -march=i486
               ARCHFLAGS_GCC4_i486 = -m32 -march=i486
                  MEMORYMODEL_i486 = 32
@@ -356,6 +372,7 @@
              ARCHFLAGS_SOS12_i386 = -m32 -xarch=386
            ARCHFLAGS_SOS12U1_i386 = -m32 -xarch=386
            ARCHFLAGS_SOS12U2_i386 = -m32 -xarch=386
+           ARCHFLAGS_SOS12U3_i386 = -m32 -xarch=386
               ARCHFLAGS_GCC3_i386 = -m32 -march=i386
               ARCHFLAGS_GCC4_i386 = -m32 -march=i386
                  MEMORYMODEL_i386 = 32
@@ -384,6 +401,7 @@
   OPT_FLAGS_SOS12 ?= $(OPT_FLAGS_SOS)
 OPT_FLAGS_SOS12U1 ?= $(OPT_FLAGS_SOS)
 OPT_FLAGS_SOS12U2 ?= $(OPT_FLAGS_SOS)
+OPT_FLAGS_SOS12U3 ?= $(OPT_FLAGS_SOS)
    OPT_FLAGS_GCC3 ?= $(OPT_FLAGS_GCC)
    OPT_FLAGS_GCC4 ?= $(OPT_FLAGS_GCC)
 
@@ -391,12 +409,14 @@
   OPT_FLAGS_SOS12_sparc ?= $(OPT_FLAGS_SOS12)
 OPT_FLAGS_SOS12U1_sparc ?= $(OPT_FLAGS_SOS12U1)
 OPT_FLAGS_SOS12U2_sparc ?= $(OPT_FLAGS_SOS12U2)
+OPT_FLAGS_SOS12U3_sparc ?= $(OPT_FLAGS_SOS12U3)
    OPT_FLAGS_GCC3_sparc ?= $(OPT_FLAGS_GCC3)
    OPT_FLAGS_GCC4_sparc ?= $(OPT_FLAGS_GCC4)
    OPT_FLAGS_SOS11_i386 ?= $(OPT_FLAGS_SOS11)
    OPT_FLAGS_SOS12_i386 ?= $(OPT_FLAGS_SOS12)
  OPT_FLAGS_SOS12U1_i386 ?= $(OPT_FLAGS_SOS12U1)
  OPT_FLAGS_SOS12U2_i386 ?= $(OPT_FLAGS_SOS12U2)
+ OPT_FLAGS_SOS12U3_i386 ?= $(OPT_FLAGS_SOS12U3)
     OPT_FLAGS_GCC3_i386 ?= $(OPT_FLAGS_GCC3)
     OPT_FLAGS_GCC4_i386 ?= $(OPT_FLAGS_GCC4)
 
@@ -419,12 +439,14 @@
   DBG_FLAGS_SOS12_sparc ?= -g
 DBG_FLAGS_SOS12U1_sparc ?= -g
 DBG_FLAGS_SOS12U2_sparc ?= -g
+DBG_FLAGS_SOS12U3_sparc ?= -g
    DBG_FLAGS_GCC3_sparc ?= -g
    DBG_FLAGS_GCC4_sparc ?= -g
    DBG_FLAGS_SOS11_i386 ?= -g
    DBG_FLAGS_SOS12_i386 ?= -g
  DBG_FLAGS_SOS12U1_i386 ?= -g
  DBG_FLAGS_SOS12U2_i386 ?= -g
+ DBG_FLAGS_SOS12U3_i386 ?= -g
     DBG_FLAGS_GCC3_i386 ?= -g
     DBG_FLAGS_GCC4_i386 ?= -g
 
@@ -509,6 +531,7 @@
   SOS12_CC_HOME ?= /opt/studio/SOS12/SUNWspro
 SOS12U1_CC_HOME ?= /opt/studio/sunstudio12.1
 SOS12U2_CC_HOME ?= /opt/solstudio12.2
+SOS12U3_CC_HOME ?= /opt/solarisstudio12.3
 
    GCC4_VERSION ?= 4.6
 
@@ -518,24 +541,28 @@
     SOS12_CC ?= $(SOS12_CC_HOME)/bin/cc
   SOS12U1_CC ?= $(SOS12U1_CC_HOME)/bin/cc
   SOS12U2_CC ?= $(SOS12U2_CC_HOME)/bin/cc
+  SOS12U3_CC ?= $(SOS12U3_CC_HOME)/bin/cc
     GCC3_CXX ?= $(GCC3_CC_HOME)/bin/g++
     GCC4_CXX ?= $(GCC4_CC_HOME)/bin/g++-$(GCC4_VERSION)
    SOS11_CXX ?= $(SOS11_CC_HOME)/bin/CC
    SOS12_CXX ?= $(SOS12_CC_HOME)/bin/CC
  SOS12U1_CXX ?= $(SOS12U1_CC_HOME)/bin/CC
  SOS12U2_CXX ?= $(SOS12U2_CC_HOME)/bin/CC
+ SOS12U3_CXX ?= $(SOS12U3_CC_HOME)/bin/CC
     GCC3_F77 ?= $(GCC3_CC_HOME)/bin/g77
     GCC4_F77 ?= $(GCC4_CC_HOME)/bin/gfortran-$(GCC4_VERSION)
    SOS11_F77 ?= $(SOS11_CC_HOME)/bin/f77
    SOS12_F77 ?= $(SOS12_CC_HOME)/bin/f77
  SOS12U1_F77 ?= $(SOS12U1_CC_HOME)/bin/f77
  SOS12U2_CXX ?= $(SOS12U2_CC_HOME)/bin/CC
+ SOS12U3_CXX ?= $(SOS12U3_CC_HOME)/bin/CC
      GCC3_FC ?= $(GCC3_CC_HOME)/bin/g77
      GCC4_FC ?= $(GCC4_CC_HOME)/bin/gfortran-$(GCC4_VERSION)
     SOS11_FC ?= $(SOS11_CC_HOME)/bin/f95
     SOS12_FC ?= $(SOS12_CC_HOME)/bin/f95
   SOS12U1_FC ?= $(SOS12U1_CC_HOME)/bin/f95
   SOS12U2_FC ?= $(SOS12U2_CC_HOME)/bin/f95
+  SOS12U3_FC ?= $(SOS12U3_CC_HOME)/bin/f95
 
     GCC3_CC_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_GCC3_CC_FLAGS) $(EXTRA_GCC_CC_FLAGS) $(EXTRA_CC_FLAGS)
     GCC4_CC_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_GCC4_CC_FLAGS) $(EXTRA_GCC_CC_FLAGS) $(EXTRA_CC_FLAGS)
@@ -543,36 +570,42 @@
    SOS12_CC_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12_CC_FLAGS) $(EXTRA_SOS_CC_FLAGS) $(EXTRA_CC_FLAGS)
  SOS12U1_CC_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12U1_CC_FLAGS) $(EXTRA_SOS_CC_FLAGS) $(EXTRA_CC_FLAGS)
  SOS12U2_CC_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12U2_CC_FLAGS) $(EXTRA_SOS_CC_FLAGS) $(EXTRA_CC_FLAGS)
+ SOS12U3_CC_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12U3_CC_FLAGS) $(EXTRA_SOS_CC_FLAGS) $(EXTRA_CC_FLAGS)
    GCC3_CXX_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_GCC3_CXX_FLAGS) $(EXTRA_GCC_CXX_FLAGS) $(EXTRA_CXX_FLAGS)
    GCC4_CXX_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_GCC4_CXX_FLAGS) $(EXTRA_GCC_CXX_FLAGS) $(EXTRA_CXX_FLAGS)
   SOS11_CXX_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS11_CXX_FLAGS) $(EXTRA_SOS_CXX_FLAGS) $(EXTRA_CXX_FLAGS)
   SOS12_CXX_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12_CXX_FLAGS) $(EXTRA_SOS_CXX_FLAGS) $(EXTRA_CXX_FLAGS)
 SOS12U1_CXX_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12U1_CXX_FLAGS) $(EXTRA_SOS_CXX_FLAGS) $(EXTRA_CXX_FLAGS)
 SOS12U2_CXX_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12U2_CXX_FLAGS) $(EXTRA_SOS_CXX_FLAGS) $(EXTRA_CXX_FLAGS)
+SOS12U3_CXX_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12U3_CXX_FLAGS) $(EXTRA_SOS_CXX_FLAGS) $(EXTRA_CXX_FLAGS)
     GCC3_AS_FLAGS ?= $(EXTRA_GCC3_AS_FLAGS) $(EXTRA_GCC_AS_FLAGS) $(EXTRA_AS_FLAGS)
     GCC4_AS_FLAGS ?= $(EXTRA_GCC4_AS_FLAGS) $(EXTRA_GCC_AS_FLAGS) $(EXTRA_AS_FLAGS)
    SOS11_AS_FLAGS ?= $(EXTRA_SOS11_AS_FLAGS) $(EXTRA_SOS_AS_FLAGS) $(EXTRA_AS_FLAGS)
    SOS12_AS_FLAGS ?= $(EXTRA_SOS12_AS_FLAGS) $(EXTRA_SOS_AS_FLAGS) $(EXTRA_AS_FLAGS)
  SOS12U1_AS_FLAGS ?= $(EXTRA_SOS12U1_AS_FLAGS) $(EXTRA_SOS_AS_FLAGS) $(EXTRA_AS_FLAGS)
  SOS12U2_AS_FLAGS ?= $(EXTRA_SOS12U2_AS_FLAGS) $(EXTRA_SOS_AS_FLAGS) $(EXTRA_AS_FLAGS)
+ SOS12U3_AS_FLAGS ?= $(EXTRA_SOS12U3_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)
    SOS12_LD_FLAGS ?= $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12_LD_FLAGS) $(EXTRA_SOS_LD_FLAGS) $(EXTRA_LD_FLAGS)
  SOS12U1_LD_FLAGS ?= $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12U1_LD_FLAGS) $(EXTRA_SOS_LD_FLAGS) $(EXTRA_LD_FLAGS)
  SOS12U2_LD_FLAGS ?= $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12U2_LD_FLAGS) $(EXTRA_SOS_LD_FLAGS) $(EXTRA_LD_FLAGS)
+ SOS12U3_LD_FLAGS ?= $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12U3_LD_FLAGS) $(EXTRA_SOS_LD_FLAGS) $(EXTRA_LD_FLAGS)
       GCC3_FFLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_GCC3_FFLAGS) $(EXTRA_GCC_FFLAGS) $(EXTRA_FFLAGS)
       GCC4_FFLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_GCC4_FFLAGS) $(EXTRA_GCC_FFLAGS) $(EXTRA_FFLAGS)
      SOS11_FFLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS11_FFLAGS) $(EXTRA_SOS_FFLAGS) $(EXTRA_FFLAGS)
      SOS12_FFLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12_FFLAGS) $(EXTRA_SOS_FFLAGS) $(EXTRA_FFLAGS)
    SOS12U1_FFLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12U1_FFLAGS) $(EXTRA_SOS_FFLAGS) $(EXTRA_FFLAGS)
    SOS12U2_FFLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12U2_FFLAGS) $(EXTRA_SOS_FFLAGS) $(EXTRA_FFLAGS)
+   SOS12U3_FFLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12U3_FFLAGS) $(EXTRA_SOS_FFLAGS) $(EXTRA_FFLAGS)
       GCC3_FCFLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_GCC3_FCFLAGS) $(EXTRA_GCC_FCFLAGS) $(EXTRA_FCFLAGS)
       GCC4_FCFLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_GCC4_FCFLAGS) $(EXTRA_GCC_FCFLAGS) $(EXTRA_FCFLAGS)
      SOS11_FCFLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS11_FCFLAGS) $(EXTRA_SOS_FCFLAGS) $(EXTRA_FCFLAGS)
      SOS12_FCFLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12_FCFLAGS) $(EXTRA_SOS_FCFLAGS) $(EXTRA_FCFLAGS)
    SOS12U1_FCFLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12U1_FCFLAGS) $(EXTRA_SOS_FCFLAGS) $(EXTRA_FCFLAGS)
    SOS12U2_FCFLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12U2_FCFLAGS) $(EXTRA_SOS_FCFLAGS) $(EXTRA_FCFLAGS)
+   SOS12U3_FCFLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12U3_FCFLAGS) $(EXTRA_SOS_FCFLAGS) $(EXTRA_FCFLAGS)
 
 # Compiler version
     GCC3_CC_VERSION = $(shell $(GCC3_CC) -v 2>&1| ggrep version)
@@ -599,6 +632,10 @@
 SOS12U2_CXX_VERSION = $(shell $(SOS12U2_CXX) -V 2>&1| ggrep CC: | gsed -e 's/CC: //')
 SOS12U2_F77_VERSION = $(shell $(SOS12U2_F77) -V 2>&1| ggrep -e 'f9[05]': | gsed -e 's/f9[05]: //')
  SOS12U2_FC_VERSION = $(shell $(SOS12U2_FC) -V 2>&1| ggrep -e 'f9[05]:' | gsed -e 's/f9[05]: //')
+ SOS12U3_CC_VERSION = $(shell $(SOS12U3_CC) -V 2>&1| ggrep cc: | gsed -e 's/cc: //')
+SOS12U3_CXX_VERSION = $(shell $(SOS12U3_CXX) -V 2>&1| ggrep CC: | gsed -e 's/CC: //')
+SOS12U3_F77_VERSION = $(shell $(SOS12U3_F77) -V 2>&1| ggrep -e 'f9[05]': | gsed -e 's/f9[05]: //')
+ SOS12U3_FC_VERSION = $(shell $(SOS12U3_FC) -V 2>&1| ggrep -e 'f9[05]:' | gsed -e 's/f9[05]: //')
 
  CC_VERSION = $($(GARCOMPILER)_CC_VERSION)
 CXX_VERSION = $($(GARCOMPILER)_CXX_VERSION)
@@ -668,6 +705,7 @@
 SOS12_LD_OPTIONS = $(EXTRA_SOS12_LD_OPTIONS) $(EXTRA_SOS_LD_OPTIONS)
 SOS12U1_LD_OPTIONS = $(EXTRA_SOS12U1_LD_OPTIONS) $(EXTRA_SOS_LD_OPTIONS)
 SOS12U2_LD_OPTIONS = $(EXTRA_SOS12U2_LD_OPTIONS) $(EXTRA_SOS_LD_OPTIONS)
+SOS12U3_LD_OPTIONS = $(EXTRA_SOS12U3_LD_OPTIONS) $(EXTRA_SOS_LD_OPTIONS)
 
 LD_OPTIONS ?= $(strip $($(GARCOMPILER)_LD_OPTIONS) $(RUNPATH_LINKER_FLAGS) $(EXTRA_LD_OPTIONS) $(_CATEGORY_LD_OPTIONS))
 

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


From cgrzemba at users.sourceforge.net  Thu Jan  5 15:13:42 2012
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Thu, 05 Jan 2012 14:13:42 +0000
Subject: [csw-devel] SF.net SVN: gar:[16696] csw/mgar/pkg/lang-java
Message-ID: <E1Rio4c-0007S3-2E@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 16696
          http://gar.svn.sourceforge.net/gar/?rev=16696&view=rev
Author:   cgrzemba
Date:     2012-01-05 14:13:41 +0000 (Thu, 05 Jan 2012)
Log Message:
-----------
lang-java/389-console/trunk: Initial release 389 console

Added Paths:
-----------
    csw/mgar/pkg/lang-java/389-console/
    csw/mgar/pkg/lang-java/389-console/Makefile
    csw/mgar/pkg/lang-java/389-console/branches/
    csw/mgar/pkg/lang-java/389-console/tags/
    csw/mgar/pkg/lang-java/389-console/trunk/
    csw/mgar/pkg/lang-java/389-console/trunk/Makefile
    csw/mgar/pkg/lang-java/389-console/trunk/checksums
    csw/mgar/pkg/lang-java/389-console/trunk/files/

Added: csw/mgar/pkg/lang-java/389-console/Makefile
===================================================================
--- csw/mgar/pkg/lang-java/389-console/Makefile	                        (rev 0)
+++ csw/mgar/pkg/lang-java/389-console/Makefile	2012-01-05 14:13:41 UTC (rev 16696)
@@ -0,0 +1,2 @@
+%:
+	$(MAKE) -C trunk $*


Property changes on: csw/mgar/pkg/lang-java/389-console/trunk
___________________________________________________________________
Added: svn:ignore
   + cookies
download
work


Added: svn:externals
   + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2


Added: csw/mgar/pkg/lang-java/389-console/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-java/389-console/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/lang-java/389-console/trunk/Makefile	2012-01-05 14:13:41 UTC (rev 16696)
@@ -0,0 +1,52 @@
+# $Id$
+# TODO (release-critical prefixed with !, non release-critical with *)
+#
+NAME = 389-console
+VERSION = 1.1.7
+MAJOR_VERSION = 1.1
+GARTYPE = v2
+CATEGORIES = java
+
+DESCRIPTION = 389 Directory Server - Management Console Client
+define BLURB
+This is the client component which have to installed on an administration client
+A Java based remote management console used for managing 389
+Administration Server and 389 Directory Server.
+endef
+
+MASTER_SITES = http://port389/source
+DISTFILES  = $(NAME)-$(VERSION).tar.bz2
+
+PACKAGES = CSW389console
+RUNTIME_DEP_PKGS = CSWidm-console-base CSWldapjdk CSWjss4
+
+ARCHALL = 1
+
+CATALOGNAME_CSW389console = 389-console
+
+LICENSE = LICENSE
+
+WORKSRC = $(WORKDIR)
+
+CONFIGURE_SCRIPTS =
+BUILD_SCRIPTS = custom
+TEST_SCRIPTS =
+INSTALL_SCRIPTS = custom
+
+include gar/category.mk
+
+install-custom: 
+	@ginstall -d $(DESTDIR)$(datadir)/java
+	@ginstall -d $(DESTDIR)$(bindir)
+	@gcp -fp $(WORKSRC)/$(DISTNAME)/built/$(NAME)-$(VERSION)_en.jar $(DESTDIR)$(datadir)/java
+	@gcp -fp $(WORKSRC)/$(DISTNAME)/389-console $(DESTDIR)$(bindir)
+	@( cd $(DESTDIR)$(datadir)/java ; \
+	   ln -s $(NAME)-$(VERSION)_en.jar $(NAME)-$(MAJOR_VERSION)_en.jar ; \
+	   ln -s $(NAME)-$(VERSION)_en.jar $(NAME)_en.jar )
+	@$(MAKECOOKIE)
+
+build-custom:
+	@( cd $(WORKSRC)/$(DISTNAME); \
+	  pwd; \
+	  ant -Dbuilt.dir=`pwd`/built -Dldapjdk.local.location=/opt/csw/share/java -Djss.local.location=/opt/csw/share/java -Dconsole.local.location=/opt/csw/share/java )
+	@$(MAKECOOKIE)


Property changes on: csw/mgar/pkg/lang-java/389-console/trunk/Makefile
___________________________________________________________________
Added: svn:keywords
   + Id

Added: csw/mgar/pkg/lang-java/389-console/trunk/checksums
===================================================================
--- csw/mgar/pkg/lang-java/389-console/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/lang-java/389-console/trunk/checksums	2012-01-05 14:13:41 UTC (rev 16696)
@@ -0,0 +1 @@
+e2c92a908c633fffe79de8add27906c6  389-console-1.1.7.tar.bz2

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


From cgrzemba at users.sourceforge.net  Thu Jan  5 15:16:05 2012
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Thu, 05 Jan 2012 14:16:05 +0000
Subject: [csw-devel] SF.net SVN: gar:[16697] csw/mgar/pkg/lang-java
Message-ID: <E1Rio6v-0007VO-Ms@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 16697
          http://gar.svn.sourceforge.net/gar/?rev=16697&view=rev
Author:   cgrzemba
Date:     2012-01-05 14:16:05 +0000 (Thu, 05 Jan 2012)
Log Message:
-----------
lang-java/389-admin-console/trunk: Initial release

Added Paths:
-----------
    csw/mgar/pkg/lang-java/389-admin-console/
    csw/mgar/pkg/lang-java/389-admin-console/Makefile
    csw/mgar/pkg/lang-java/389-admin-console/branches/
    csw/mgar/pkg/lang-java/389-admin-console/tags/
    csw/mgar/pkg/lang-java/389-admin-console/trunk/
    csw/mgar/pkg/lang-java/389-admin-console/trunk/Makefile
    csw/mgar/pkg/lang-java/389-admin-console/trunk/checksums
    csw/mgar/pkg/lang-java/389-admin-console/trunk/files/

Added: csw/mgar/pkg/lang-java/389-admin-console/Makefile
===================================================================
--- csw/mgar/pkg/lang-java/389-admin-console/Makefile	                        (rev 0)
+++ csw/mgar/pkg/lang-java/389-admin-console/Makefile	2012-01-05 14:16:05 UTC (rev 16697)
@@ -0,0 +1,2 @@
+%:
+	$(MAKE) -C trunk $*


Property changes on: csw/mgar/pkg/lang-java/389-admin-console/trunk
___________________________________________________________________
Added: svn:ignore
   + cookies
download
work


Added: svn:externals
   + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2


Added: csw/mgar/pkg/lang-java/389-admin-console/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-java/389-admin-console/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/lang-java/389-admin-console/trunk/Makefile	2012-01-05 14:16:05 UTC (rev 16697)
@@ -0,0 +1,55 @@
+# $Id$
+# TODO (release-critical prefixed with !, non release-critical with *)
+#
+NAME = 389-admin-console
+SHORTNAME = 389-admin
+VERSION = 1.1.8
+GARTYPE = v2
+CATEGORIES = java
+
+DESCRIPTION = 389 Directory Server - Management Console
+define BLURB
+A Java based remote management console used for managing 389
+Administration Server and 389 Directory Server.
+endef
+
+MASTER_SITES = http://port389/sources
+DISTFILES  = $(NAME)-$(VERSION).tar.bz2
+DISTFILES  += startconsole
+
+PACKAGES = CSW389-admin-console
+RUNTIME_DEP_PKGS = CSW389-admin
+
+ARCHALL = 1
+
+CATALOGNAME_CSW389-admin-console = 389-admin-console
+
+LICENSE = LICENSE
+
+WORKSRC = $(WORKDIR)
+
+CONFIGURE_SCRIPTS =
+BUILD_SCRIPTS = custom
+TEST_SCRIPTS =
+INSTALL_SCRIPTS = custom
+
+include gar/category.mk
+
+install-custom: 
+	@ginstall -d $(DESTDIR)$(datadir)/dirsrv/html/java
+	@ginstall -d $(DESTDIR)$(datadir)/dirsrv/manual/en/admin/help
+	@gcp -fp $(WORKSRC)/$(DISTNAME)/built/package/$(SHORTNAME)* $(DESTDIR)$(datadir)/dirsrv/html/java
+	@gcp -fp $(WORKSRC)/$(DISTNAME)/help/en/*.html $(DESTDIR)$(datadir)/dirsrv/manual/en/admin
+	@gcp -fp $(WORKSRC)/$(DISTNAME)/help/en/tokens.map $(DESTDIR)$(datadir)/dirsrv/manual/en/admin
+	@gcp -fp $(WORKSRC)/$(DISTNAME)/help/en/help/*.html $(DESTDIR)$(datadir)/dirsrv/manual/en/admin/help
+	@( cd $(DESTDIR)$(datadir)/dirsrv/html/java ; \
+	   ln -s $(SHORTNAME)-$(VERSION).jar $(SHORTNAME)-$(MAJOR_VERSION).jar ; \
+	   ln -s $(SHORTNAME)-$(VERSION).jar $(SHORTNAME).jar ; \
+	   ln -s $(SHORTNAME)-$(VERSION)_en.jar $(SHORTNAME)-$(MAJOR_VERSION)_en.jar ; \
+	   ln -s $(SHORTNAME)-$(VERSION)_en.jar $(SHORTNAME)_en.jar )
+	@$(MAKECOOKIE)
+
+build-custom:
+	@( cd $(WORKSRC)/$(DISTNAME); \
+	  ant -Dbuilt.dir=`pwd`/built -Dconsole.location=/opt/csw/share/java )
+	@$(MAKECOOKIE)


Property changes on: csw/mgar/pkg/lang-java/389-admin-console/trunk/Makefile
___________________________________________________________________
Added: svn:keywords
   + Id

Added: csw/mgar/pkg/lang-java/389-admin-console/trunk/checksums
===================================================================
--- csw/mgar/pkg/lang-java/389-admin-console/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/lang-java/389-admin-console/trunk/checksums	2012-01-05 14:16:05 UTC (rev 16697)
@@ -0,0 +1 @@
+7228ce57aa01fb8321a083f676de32f4  389-admin-console-1.1.8.tar.bz2

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


From cgrzemba at users.sourceforge.net  Thu Jan  5 15:18:03 2012
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Thu, 05 Jan 2012 14:18:03 +0000
Subject: [csw-devel] SF.net SVN: gar:[16698]
 csw/mgar/pkg/lang-java/389-ds-console/trunk/ Makefile
Message-ID: <E1Rio8p-0007Xv-9r@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 16698
          http://gar.svn.sourceforge.net/gar/?rev=16698&view=rev
Author:   cgrzemba
Date:     2012-01-05 14:18:03 +0000 (Thu, 05 Jan 2012)
Log Message:
-----------
lang-java/389-ds-console/trunk: correct runtime dependency

Modified Paths:
--------------
    csw/mgar/pkg/lang-java/389-ds-console/trunk/Makefile

Modified: csw/mgar/pkg/lang-java/389-ds-console/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-java/389-ds-console/trunk/Makefile	2012-01-05 14:16:05 UTC (rev 16697)
+++ csw/mgar/pkg/lang-java/389-ds-console/trunk/Makefile	2012-01-05 14:18:03 UTC (rev 16698)
@@ -7,7 +7,7 @@
 GARTYPE = v2
 CATEGORIES = java
 
-DESCRIPTION = 389 Directory Server - Management Console
+DESCRIPTION = 389 Directory Server - Management Console Plugin
 define BLURB
 A Java based remote management console used for managing 389
 Administration Server and 389 Directory Server.
@@ -17,7 +17,7 @@
 DISTFILES  = $(NAME)-$(VERSION).tar.bz2
 
 PACKAGES = CSW389-ds-console
-RUNTIME_DEP_PKGS = CSWidm-console-base CSWldapjdk CSWjss4
+RUNTIME_DEP_PKGS = CSW389-admin
 
 ARCHALL = 1
 

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


From cgrzemba at users.sourceforge.net  Thu Jan  5 16:05:04 2012
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Thu, 05 Jan 2012 15:05:04 +0000
Subject: [csw-devel] SF.net SVN: gar:[16699]
 csw/mgar/pkg/lang-java/idm-console-base/trunk/ Makefile
Message-ID: <E1RiosK-0006tg-6i@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 16699
          http://gar.svn.sourceforge.net/gar/?rev=16699&view=rev
Author:   cgrzemba
Date:     2012-01-05 15:05:03 +0000 (Thu, 05 Jan 2012)
Log Message:
-----------
lang-java/idm-console-base/trunk: fix build recipe

Modified Paths:
--------------
    csw/mgar/pkg/lang-java/idm-console-base/trunk/Makefile

Modified: csw/mgar/pkg/lang-java/idm-console-base/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-java/idm-console-base/trunk/Makefile	2012-01-05 14:18:03 UTC (rev 16698)
+++ csw/mgar/pkg/lang-java/idm-console-base/trunk/Makefile	2012-01-05 15:05:03 UTC (rev 16699)
@@ -16,17 +16,21 @@
 MASTER_SITES = http://port389.org/sources
 DISTFILES  = $(NAME)-$(VERSION).tar.bz2
 
-PACKAGES = CSWidmconsolebase
+PACKAGES = CSWidm-console-base
 # RUNTIME_DEP_PKGS = CSWldapjdk CSWjss4
 
 ARCHALL = 1
 
-CATALOGNAME_CSWidm-console-base = idm-console-base
+CATALOGNAME_CSWidm-console-base = idm_console_base
 
 LICENSE = LICENSE
 
 WORKSRC = $(WORKDIR)
+# EXTRAJARSPATH = /opt/csw/share/java
+EXTRAJARSPATH = /home/cgrzemba/java
 
+CHECKPKG_OVERRIDES_CSWidm-console-base += pkginfo-description-not-starting-with-uppercase|389|Directory|Server|-|Management|Console|Framework
+
 CONFIGURE_SCRIPTS =
 BUILD_SCRIPTS = custom
 TEST_SCRIPTS =
@@ -57,5 +61,5 @@
 build-custom:
 	@( cd $(WORKSRC)/$(DISTNAME); \
 	  pwd; \
-	  ant -Dbuilt.dir=`pwd`/built -Dldapjdk.local.location=/opt/csw/share/java -Djss.local.location=/opt/csw/share/java )
+	  ant -Dbuilt.dir=`pwd`/built -Dldapjdk.local.location=$(EXTRAJARSPATH) -Djss.local.location=$(EXTRAJARSPATH) )
 	@$(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 Jan  5 16:10:35 2012
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu, 05 Jan 2012 15:10:35 +0000
Subject: [csw-devel] SF.net SVN: gar:[16700] csw/mgar/pkg/freetype/trunk
Message-ID: <E1Rioxf-00069E-43@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 16700
          http://gar.svn.sourceforge.net/gar/?rev=16700&view=rev
Author:   dmichelsen
Date:     2012-01-05 15:10:34 +0000 (Thu, 05 Jan 2012)
Log Message:
-----------
freetype/trunk: Update to 2.4.8, split packages

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

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


Property changes on: csw/mgar/pkg/freetype/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2


Modified: csw/mgar/pkg/freetype/trunk/Makefile
===================================================================
--- csw/mgar/pkg/freetype/trunk/Makefile	2012-01-05 15:05:03 UTC (rev 16699)
+++ csw/mgar/pkg/freetype/trunk/Makefile	2012-01-05 15:10:34 UTC (rev 16700)
@@ -1,5 +1,5 @@
 NAME = freetype
-VERSION = 2.4.2
+VERSION = 2.4.8
 CATEGORIES = lib
 
 DESCRIPTION = A free and portable TrueType font rendering engine
@@ -15,27 +15,31 @@
 endef
 
 MASTER_SITES = $(SF_MIRRORS)
-DISTFILES  = $(NAME)-$(VERSION).tar.bz2
+DISTFILES += $(NAME)-$(VERSION).tar.bz2
 
-# We define upstream file regex so we can be notifed of new upstream software release
-UPSTREAM_USE_SF = 1
-UFILES_REGEX = (\d+(?:\.\d+)*)
-
 LICENSE = docs/LICENSE.TXT
 
-PACKAGES = CSWftype2
-CATALOGNAME_CSWftype2 = freetype2
-SPKG_SOURCEURL = http://www.freetype.org/
+VENDOR_URL = http://www.freetype.org/
 
-RUNTIME_DEP_PKGS_CSWftype2 = CSWzlib
+PACKAGES += CSWlibfreetype6
+SPKG_DESC_CSWlibfreetype6 = A free and portable TrueType font rendering engine, libfreetype.so.6
+PKGFILES_CSWlibfreetype6 += $(call pkgfiles_lib,libfreetype.so.6)
+RUNTIME_DEP_PKGS_CSWlibfreetype6 += CSWlibbz2-1-0
+RUNTIME_DEP_PKGS_CSWlibfreetype6 += CSWlibz1
+OBSOLETED_BY_CSWlibfreetype6 += CSWftype2
+CATALOGNAME_CSWftype2 = freetype2_stub
 
-CONFIGURE_ARGS = $(DIRPATHS)
+# This is inside a comment
+CHECKPKG_OVERRIDES_CSWlibfreetype-dev += file-with-bad-content|/usr/local|root/opt/csw/include/ft2build.h
+
+PACKAGES += CSWlibfreetype-dev
+SPKG_DESC_CSWlibfreetype-dev = Development files for libfreetype.so.6
+# PKGFILES is catchall
+RUNTIME_DEP_PKGS_CSWlibfreetype-dev += CSWlibfreetype6
+
 GNUMAKE = gmake
 EXTRA_CONFIGURE_EXPORTS = GNUMAKE
 
 BUILD64 = 1
-NOISAEXEC = 1
 
-TEST_TARGET = check
-
 include gar/category.mk

Modified: csw/mgar/pkg/freetype/trunk/checksums
===================================================================
--- csw/mgar/pkg/freetype/trunk/checksums	2012-01-05 15:05:03 UTC (rev 16699)
+++ csw/mgar/pkg/freetype/trunk/checksums	2012-01-05 15:10:34 UTC (rev 16700)
@@ -1 +1 @@
-647ee8ed266f9a4117c8d0a4855b3d3e  freetype-2.4.2.tar.bz2
+dbf2caca1d3afd410a29217a9809d397  freetype-2.4.8.tar.bz2

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


From cgrzemba at users.sourceforge.net  Thu Jan  5 16:24:16 2012
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Thu, 05 Jan 2012 15:24:16 +0000
Subject: [csw-devel] SF.net SVN: gar:[16701]
 csw/mgar/pkg/lang-java/idm-console-base/trunk/ Makefile
Message-ID: <E1RipAu-0006R3-7H@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 16701
          http://gar.svn.sourceforge.net/gar/?rev=16701&view=rev
Author:   cgrzemba
Date:     2012-01-05 15:24:15 +0000 (Thu, 05 Jan 2012)
Log Message:
-----------
lang-java/idm-console-base/trunk: fixing dependencies

Modified Paths:
--------------
    csw/mgar/pkg/lang-java/idm-console-base/trunk/Makefile

Modified: csw/mgar/pkg/lang-java/idm-console-base/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-java/idm-console-base/trunk/Makefile	2012-01-05 15:10:34 UTC (rev 16700)
+++ csw/mgar/pkg/lang-java/idm-console-base/trunk/Makefile	2012-01-05 15:24:15 UTC (rev 16701)
@@ -18,24 +18,28 @@
 
 PACKAGES = CSWidm-console-base
 # RUNTIME_DEP_PKGS = CSWldapjdk CSWjss4
+DEP_PKGS = CSWldapjdk CSWjss4
 
 ARCHALL = 1
+PACKAGING_PLATFORMS = solaris10-sparc
 
 CATALOGNAME_CSWidm-console-base = idm_console_base
 
 LICENSE = LICENSE
 
 WORKSRC = $(WORKDIR)
-# EXTRAJARSPATH = /opt/csw/share/java
-EXTRAJARSPATH = /home/cgrzemba/java
+EXTRAJARSPATH = /opt/csw/share/java
+# EXTRAJARSPATH = /home/cgrzemba/java
 
-CHECKPKG_OVERRIDES_CSWidm-console-base += pkginfo-description-not-starting-with-uppercase|389|Directory|Server|-|Management|Console|Framework
 
 CONFIGURE_SCRIPTS =
 BUILD_SCRIPTS = custom
 TEST_SCRIPTS =
 INSTALL_SCRIPTS = custom
 
+CHECKPKG_OVERRIDES_CSWidm-console-base += pkginfo-description-not-starting-with-uppercase|389|Directory|Server|-|Management|Console|Framework
+# CHECKPKG_OVERRIDES_CSWidm-console-base += pkginfo-opencsw-repository-uncommitted
+
 include gar/category.mk
 
 install-custom: 

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


From dmichelsen at users.sourceforge.net  Thu Jan  5 16:28:56 2012
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu, 05 Jan 2012 15:28:56 +0000
Subject: [csw-devel] SF.net SVN: gar:[16702]
	csw/mgar/pkg/samba/trunk/Makefile
Message-ID: <E1RipFQ-0006Xt-5m@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 16702
          http://gar.svn.sourceforge.net/gar/?rev=16702&view=rev
Author:   dmichelsen
Date:     2012-01-05 15:28:55 +0000 (Thu, 05 Jan 2012)
Log Message:
-----------
samba/trunk: Actually install cswwinbind m-(

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

Modified: csw/mgar/pkg/samba/trunk/Makefile
===================================================================
--- csw/mgar/pkg/samba/trunk/Makefile	2012-01-05 15:24:15 UTC (rev 16701)
+++ csw/mgar/pkg/samba/trunk/Makefile	2012-01-05 15:28:55 UTC (rev 16702)
@@ -339,5 +339,6 @@
 post-merge:
 	ginstall -d $(PKGROOT)/etc/opt/csw/init.d
 	ginstall $(WORKDIR)/cswsamba $(PKGROOT)/etc/opt/csw/init.d/cswsamba
+	ginstall $(WORKDIR)/cswwinbind $(PKGROOT)/etc/opt/csw/init.d/cswwinbind
 	ginstall -d $(PKGROOT)/etc/opt/csw/samba
 	ginstall $(WORKDIR)/smb.conf $(PKGROOT)/etc/opt/csw/samba/smb.conf

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


From cgrzemba at users.sourceforge.net  Thu Jan  5 16:47:18 2012
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Thu, 05 Jan 2012 15:47:18 +0000
Subject: [csw-devel] SF.net SVN: gar:[16703]
	csw/mgar/pkg/lang-java/389-console/trunk/Makefile
Message-ID: <E1RipXC-0008G0-RX@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 16703
          http://gar.svn.sourceforge.net/gar/?rev=16703&view=rev
Author:   cgrzemba
Date:     2012-01-05 15:47:18 +0000 (Thu, 05 Jan 2012)
Log Message:
-----------
lang-java/389-console/trunk: fixing buold recipe

Modified Paths:
--------------
    csw/mgar/pkg/lang-java/389-console/trunk/Makefile

Modified: csw/mgar/pkg/lang-java/389-console/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-java/389-console/trunk/Makefile	2012-01-05 15:28:55 UTC (rev 16702)
+++ csw/mgar/pkg/lang-java/389-console/trunk/Makefile	2012-01-05 15:47:18 UTC (rev 16703)
@@ -14,25 +14,37 @@
 Administration Server and 389 Directory Server.
 endef
 
-MASTER_SITES = http://port389/source
+MASTER_SITES = http://port389.org/source
 DISTFILES  = $(NAME)-$(VERSION).tar.bz2
 
-PACKAGES = CSW389console
-RUNTIME_DEP_PKGS = CSWidm-console-base CSWldapjdk CSWjss4
+PACKAGES = CSW389-console
+# RUNTIME_DEP_PKGS = CSWidm-console-base CSWldapjdk CSWjss4
+DEP_PKGS = CSWidm-console-base CSWldapjdk CSWjss4
 
 ARCHALL = 1
+PACKAGING_PLATFORMS = solaris10-sparc
 
-CATALOGNAME_CSW389console = 389-console
+CATALOGNAME_CSW389-console = 389_console
 
 LICENSE = LICENSE
 
 WORKSRC = $(WORKDIR)
+EXTRAJARSPATH = /opt/csw/share/java
+# EXTRAJARSPATH = /home/cgrzemba/java
 
 CONFIGURE_SCRIPTS =
 BUILD_SCRIPTS = custom
 TEST_SCRIPTS =
 INSTALL_SCRIPTS = custom
 
+CHECKPKG_OVERRIDES_CSW389-console += unidentified-dependency|CSWidm-console-base
+CHECKPKG_OVERRIDES_CSW389-console += surplus-dependency|CSWidm-console-base
+CHECKPKG_OVERRIDES_CSW389-console += surplus-dependency|CSWldapjdk
+CHECKPKG_OVERRIDES_CSW389-console += surplus-dependency|CSWjss4
+# CHECKPKG_OVERRIDES_CSW389-console += pkginfo-opencsw-repository-uncommitted
+CHECKPKG_OVERRIDES_CSW389-console += pkginfo-description-not-starting-with-uppercase|389|Directory|Server|-|Management|Console|Client
+
+
 include gar/category.mk
 
 install-custom: 
@@ -48,5 +60,5 @@
 build-custom:
 	@( cd $(WORKSRC)/$(DISTNAME); \
 	  pwd; \
-	  ant -Dbuilt.dir=`pwd`/built -Dldapjdk.local.location=/opt/csw/share/java -Djss.local.location=/opt/csw/share/java -Dconsole.local.location=/opt/csw/share/java )
+	  ant -Dbuilt.dir=`pwd`/built -Dldapjdk.local.location=$(EXTRAJARSPATH) -Djss.local.location=$(EXTRAJARSPATH) -Dconsole.local.location=$(EXTRAJARSPATH) )
 	@$(MAKECOOKIE)

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


From cgrzemba at users.sourceforge.net  Thu Jan  5 16:48:44 2012
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Thu, 05 Jan 2012 15:48:44 +0000
Subject: [csw-devel] SF.net SVN: gar:[16704]
 csw/mgar/pkg/lang-java/389-ds-console/trunk/ Makefile
Message-ID: <E1RipYa-0000sV-EC@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 16704
          http://gar.svn.sourceforge.net/gar/?rev=16704&view=rev
Author:   cgrzemba
Date:     2012-01-05 15:48:44 +0000 (Thu, 05 Jan 2012)
Log Message:
-----------
lang-java/389-ds-console/trunk: fixing build recipe

Modified Paths:
--------------
    csw/mgar/pkg/lang-java/389-ds-console/trunk/Makefile

Modified: csw/mgar/pkg/lang-java/389-ds-console/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-java/389-ds-console/trunk/Makefile	2012-01-05 15:47:18 UTC (rev 16703)
+++ csw/mgar/pkg/lang-java/389-ds-console/trunk/Makefile	2012-01-05 15:48:44 UTC (rev 16704)
@@ -13,7 +13,7 @@
 Administration Server and 389 Directory Server.
 endef
 
-MASTER_SITES = http://port389/sources
+MASTER_SITES = http://port389.org/sources
 DISTFILES  = $(NAME)-$(VERSION).tar.bz2
 
 PACKAGES = CSW389-ds-console
@@ -21,7 +21,7 @@
 
 ARCHALL = 1
 
-CATALOGNAME_CSW389-ds-console = 389-ds-console
+CATALOGNAME_CSW389-ds-console = 389_ds_console
 
 LICENSE = LICENSE
 
@@ -32,6 +32,12 @@
 TEST_SCRIPTS =
 INSTALL_SCRIPTS = custom
 
+
+CHECKPKG_OVERRIDES_CSW389-ds-console += pkginfo-description-not-starting-with-uppercase|389|Directory|Server|-|Management|Console|Plugin
+CHECKPKG_OVERRIDES_CSW389-ds-console += unidentified-dependency|CSW389-admin
+CHECKPKG_OVERRIDES_CSW389-ds-console += surplus-dependency|CSW389-admin
+# CHECKPKG_OVERRIDES_CSW389-ds-console += pkginfo-opencsw-repository-uncommitted
+
 include gar/category.mk
 
 install-custom: 

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


From dmichelsen at users.sourceforge.net  Thu Jan  5 22:29:20 2012
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu, 05 Jan 2012 21:29:20 +0000
Subject: [csw-devel] SF.net SVN: gar:[16705] csw/mgar/pkg
Message-ID: <E1RiusC-0000cx-EO@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 16705
          http://gar.svn.sourceforge.net/gar/?rev=16705&view=rev
Author:   dmichelsen
Date:     2012-01-05 21:29:19 +0000 (Thu, 05 Jan 2012)
Log Message:
-----------
sfpc: Initial commit

Added Paths:
-----------
    csw/mgar/pkg/sfpc/
    csw/mgar/pkg/sfpc/Makefile
    csw/mgar/pkg/sfpc/branches/
    csw/mgar/pkg/sfpc/tags/
    csw/mgar/pkg/sfpc/trunk/
    csw/mgar/pkg/sfpc/trunk/Makefile
    csw/mgar/pkg/sfpc/trunk/checksums
    csw/mgar/pkg/sfpc/trunk/files/
    csw/mgar/pkg/sfpc/trunk/files/0001-Force-CSW-Perl.patch
    csw/mgar/pkg/sfpc/trunk/files/COPYING

Added: csw/mgar/pkg/sfpc/Makefile
===================================================================
--- csw/mgar/pkg/sfpc/Makefile	                        (rev 0)
+++ csw/mgar/pkg/sfpc/Makefile	2012-01-05 21:29:19 UTC (rev 16705)
@@ -0,0 +1,2 @@
+%:
+	$(MAKE) -C trunk $*


Property changes on: csw/mgar/pkg/sfpc/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/sfpc/trunk/Makefile
===================================================================
--- csw/mgar/pkg/sfpc/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/sfpc/trunk/Makefile	2012-01-05 21:29:19 UTC (rev 16705)
@@ -0,0 +1,42 @@
+# $Id$
+# TODO (release-critical prefixed with !, non release-critical with *)
+#
+NAME = sfpC
+VERSION = 0.6
+GARTYPE = v2
+CATEGORIES = utils
+
+DESCRIPTION = Solaris fingerprint companion
+define BLURB
+endef
+
+MASTER_SITES = http://wesunsolve.net/downloads/
+DISTNAME = $(NAME)-v$(VERSION)
+DISTFILES += $(DISTNAME).tar.bz2
+DISTFILES += COPYING
+PATCHFILES += 0001-Force-CSW-Perl.patch
+
+PACKAGES += CSWwesunsolve-sfpc
+SPKG_DESC_CSWwesunsolve-sfpc = Solaris fingerprint companion sfpc
+RUNTIME_DEP_PKGS_CSWwesunsolve-sfpc += CSWperl
+RUNTIME_DEP_PKGS_CSWwesunsolve-sfpc += CSWpm-libwww-perl
+RUNTIME_DEP_PKGS_CSWwesunsolve-sfpc += CSWpm-html-parser
+ARCHALL_CSWwesunsolve-sfpc = 1
+# No Perl checks in checkpkg
+CHECKPKG_OVERRIDES_CSWwesunsolve-sfpc += surplus-dependency|CSWperl
+CHECKPKG_OVERRIDES_CSWwesunsolve-sfpc += surplus-dependency|CSWpm-libwww-perl
+CHECKPKG_OVERRIDES_CSWwesunsolve-sfpc += surplus-dependency|CSWpm-html-parser
+
+CONFIGURE_SCRIPTS =
+BUILD_SCRIPTS =
+TEST_SCRIPTS =
+INSTALL_SCRIPTS = custom
+
+include gar/category.mk
+
+install-custom:
+	ginstall -d $(DESTDIR)$(bindir)
+	ginstall -m 0755 $(WORKSRC)/sfpC.pl $(DESTDIR)$(bindir)/sfpc
+	ginstall -d $(DESTDIR)$(docdir)/wesunsolve_sfpc
+	ginstall -m 0644 $(WORKSRC)/README.* $(DESTDIR)$(docdir)/wesunsolve_sfpc/
+	@$(MAKECOOKIE)


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

Added: csw/mgar/pkg/sfpc/trunk/checksums
===================================================================
--- csw/mgar/pkg/sfpc/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/sfpc/trunk/checksums	2012-01-05 21:29:19 UTC (rev 16705)
@@ -0,0 +1 @@
+af328d687b981a0ffb73f4c9095e77a8  sfpC-v0.6.tar.bz2

Added: csw/mgar/pkg/sfpc/trunk/files/0001-Force-CSW-Perl.patch
===================================================================
--- csw/mgar/pkg/sfpc/trunk/files/0001-Force-CSW-Perl.patch	                        (rev 0)
+++ csw/mgar/pkg/sfpc/trunk/files/0001-Force-CSW-Perl.patch	2012-01-05 21:29:19 UTC (rev 16705)
@@ -0,0 +1,30 @@
+From b302d6f3120583bbcecc491c993a8ae471f74835 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Thu, 5 Jan 2012 22:06:02 +0100
+Subject: [PATCH] Force CSW Perl
+
+---
+ sfpC.pl |    7 ++++---
+ 1 files changed, 4 insertions(+), 3 deletions(-)
+ mode change 100755 => 100644 sfpC.pl
+
+diff --git a/sfpC.pl b/sfpC.pl
+old mode 100755
+new mode 100644
+index df6e600..b59f71c
+--- a/sfpC.pl
++++ b/sfpC.pl
+@@ -1,6 +1,7 @@
+-:
+-eval 'exec perl $0 ${1+"$@"}'
+-if 0; 
++#!/opt/csw/bin/perl
++
++use strict;
++use warnings;
+ 
+ #
+ # Version of sfpC.pl modified by Thomas Gouverneur <thomas at espix.org>
+-- 
+1.7.8.2
+

Added: csw/mgar/pkg/sfpc/trunk/files/COPYING
===================================================================
--- csw/mgar/pkg/sfpc/trunk/files/COPYING	                        (rev 0)
+++ csw/mgar/pkg/sfpc/trunk/files/COPYING	2012-01-05 21:29:19 UTC (rev 16705)
@@ -0,0 +1,27 @@
+# -----------------------------------------------------------------------------
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2007 Sun Microsystems Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#ident  "@(#)sfpC.pl 1.2     07/08/13     SMI"
+#
+

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


From cgrzemba at users.sourceforge.net  Fri Jan  6 08:53:55 2012
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Fri, 06 Jan 2012 07:53:55 +0000
Subject: [csw-devel] SF.net SVN: gar:[16706]
 csw/mgar/pkg/lang-java/389-ds-console/trunk/ Makefile
Message-ID: <E1Rj4cd-0007Dz-Qf@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 16706
          http://gar.svn.sourceforge.net/gar/?rev=16706&view=rev
Author:   cgrzemba
Date:     2012-01-06 07:53:55 +0000 (Fri, 06 Jan 2012)
Log Message:
-----------
lang-java/389-ds-console/trunk: fix html manual paths

Modified Paths:
--------------
    csw/mgar/pkg/lang-java/389-ds-console/trunk/Makefile

Modified: csw/mgar/pkg/lang-java/389-ds-console/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-java/389-ds-console/trunk/Makefile	2012-01-05 21:29:19 UTC (rev 16705)
+++ csw/mgar/pkg/lang-java/389-ds-console/trunk/Makefile	2012-01-06 07:53:55 UTC (rev 16706)
@@ -42,11 +42,11 @@
 
 install-custom: 
 	@ginstall -d $(DESTDIR)$(datadir)/dirsrv/html/java
-	@ginstall -d $(DESTDIR)$(datadir)/dirsrv/manual/en/admin/help
+	@ginstall -d $(DESTDIR)$(datadir)/dirsrv/manual/en/slapd/help
 	@gcp -fp $(WORKSRC)/$(DISTNAME)/built/package/$(SHORTNAME)* $(DESTDIR)$(datadir)/dirsrv/html/java
-	@gcp -fp $(WORKSRC)/$(DISTNAME)/help/en/*.html $(DESTDIR)$(datadir)/dirsrv/manual/en/admin
-	@gcp -fp $(WORKSRC)/$(DISTNAME)/help/en/tokens.map $(DESTDIR)$(datadir)/dirsrv/manual/en/admin
-	@gcp -fp $(WORKSRC)/$(DISTNAME)/help/en/help/*.html $(DESTDIR)$(datadir)/dirsrv/manual/en/admin/help
+	@gcp -fp $(WORKSRC)/$(DISTNAME)/help/en/*.html $(DESTDIR)$(datadir)/dirsrv/manual/en/slapd
+	@gcp -fp $(WORKSRC)/$(DISTNAME)/help/en/tokens.map $(DESTDIR)$(datadir)/dirsrv/manual/en/slapd
+	@gcp -fp $(WORKSRC)/$(DISTNAME)/help/en/help/*.html $(DESTDIR)$(datadir)/dirsrv/manual/en/slapd/help
 	@( cd $(DESTDIR)$(datadir)/dirsrv/html/java ; \
 	   ln -s $(SHORTNAME)-$(VERSION).jar $(SHORTNAME)-$(MAJOR_VERSION).jar ; \
 	   ln -s $(SHORTNAME)-$(VERSION).jar $(SHORTNAME).jar ; \

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


From cgrzemba at users.sourceforge.net  Fri Jan  6 09:02:33 2012
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Fri, 06 Jan 2012 08:02:33 +0000
Subject: [csw-devel] SF.net SVN: gar:[16707]
 csw/mgar/pkg/lang-java/389-ds-console/trunk/ Makefile
Message-ID: <E1Rj4kz-0007MK-6A@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 16707
          http://gar.svn.sourceforge.net/gar/?rev=16707&view=rev
Author:   cgrzemba
Date:     2012-01-06 08:02:32 +0000 (Fri, 06 Jan 2012)
Log Message:
-----------
lang-java/389-ds-console/trunk: add EXTRAJARSPATH

Modified Paths:
--------------
    csw/mgar/pkg/lang-java/389-ds-console/trunk/Makefile

Modified: csw/mgar/pkg/lang-java/389-ds-console/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-java/389-ds-console/trunk/Makefile	2012-01-06 07:53:55 UTC (rev 16706)
+++ csw/mgar/pkg/lang-java/389-ds-console/trunk/Makefile	2012-01-06 08:02:32 UTC (rev 16707)
@@ -26,13 +26,14 @@
 LICENSE = LICENSE
 
 WORKSRC = $(WORKDIR)
+# EXTRAJARSPATH = /opt/csw/share/java
+EXTRAJARSPATH = /home/cgrzemba/java
 
 CONFIGURE_SCRIPTS =
 BUILD_SCRIPTS = custom
 TEST_SCRIPTS =
 INSTALL_SCRIPTS = custom
 
-
 CHECKPKG_OVERRIDES_CSW389-ds-console += pkginfo-description-not-starting-with-uppercase|389|Directory|Server|-|Management|Console|Plugin
 CHECKPKG_OVERRIDES_CSW389-ds-console += unidentified-dependency|CSW389-admin
 CHECKPKG_OVERRIDES_CSW389-ds-console += surplus-dependency|CSW389-admin
@@ -56,5 +57,5 @@
 
 build-custom:
 	@( cd $(WORKSRC)/$(DISTNAME); \
-	  ant -Dbuilt.dir=`pwd`/built -Dconsole.location=/opt/csw/share/java )
+	  ant -Dbuilt.dir=`pwd`/built -Dconsole.location=$(EXTRAJARSPATH) -Dldapjdk.location=$(EXTRAJARSPATH) )
 	@$(MAKECOOKIE)

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


From cgrzemba at users.sourceforge.net  Fri Jan  6 09:11:56 2012
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Fri, 06 Jan 2012 08:11:56 +0000
Subject: [csw-devel] SF.net SVN: gar:[16708]
 csw/mgar/pkg/lang-java/389-admin-console/trunk/ Makefile
Message-ID: <E1Rj4u4-0007Vq-RW@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 16708
          http://gar.svn.sourceforge.net/gar/?rev=16708&view=rev
Author:   cgrzemba
Date:     2012-01-06 08:11:56 +0000 (Fri, 06 Jan 2012)
Log Message:
-----------
lang-java/389-admin-console/trunk: recommit changes in build recipe

Modified Paths:
--------------
    csw/mgar/pkg/lang-java/389-admin-console/trunk/Makefile

Modified: csw/mgar/pkg/lang-java/389-admin-console/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-java/389-admin-console/trunk/Makefile	2012-01-06 08:02:32 UTC (rev 16707)
+++ csw/mgar/pkg/lang-java/389-admin-console/trunk/Makefile	2012-01-06 08:11:56 UTC (rev 16708)
@@ -7,7 +7,7 @@
 GARTYPE = v2
 CATEGORIES = java
 
-DESCRIPTION = 389 Directory Server - Management Console
+DESCRIPTION = 389 Directory Server - Management Console Plugin AdminServer
 define BLURB
 A Java based remote management console used for managing 389
 Administration Server and 389 Directory Server.
@@ -15,18 +15,21 @@
 
 MASTER_SITES = http://port389/sources
 DISTFILES  = $(NAME)-$(VERSION).tar.bz2
-DISTFILES  += startconsole
 
 PACKAGES = CSW389-admin-console
 RUNTIME_DEP_PKGS = CSW389-admin
+# BUILD_DEP_PKGS = CSWidm-console-base
 
 ARCHALL = 1
+PACKAGING_PLATFORMS = solaris10-sparc
 
-CATALOGNAME_CSW389-admin-console = 389-admin-console
+CATALOGNAME_CSW389-admin-console = 389_admin_console
 
 LICENSE = LICENSE
 
 WORKSRC = $(WORKDIR)
+# EXTRAJARSPATH = /opt/csw/share/java
+EXTRAJARSPATH = /home/cgrzemba/java
 
 CONFIGURE_SCRIPTS =
 BUILD_SCRIPTS = custom
@@ -51,5 +54,5 @@
 
 build-custom:
 	@( cd $(WORKSRC)/$(DISTNAME); \
-	  ant -Dbuilt.dir=`pwd`/built -Dconsole.location=/opt/csw/share/java )
+	  ant -Dbuilt.dir=`pwd`/built -Dldapjdk.location=$(EXTRAJARSPATH) -Dconsole.location=$(EXTRAJARSPATH) )
 	@$(MAKECOOKIE)

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


From cgrzemba at users.sourceforge.net  Fri Jan  6 09:13:26 2012
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Fri, 06 Jan 2012 08:13:26 +0000
Subject: [csw-devel] SF.net SVN: gar:[16709]
 csw/mgar/pkg/lang-java/389-admin-console/trunk/ Makefile
Message-ID: <E1Rj4vW-0007Y8-0B@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 16709
          http://gar.svn.sourceforge.net/gar/?rev=16709&view=rev
Author:   cgrzemba
Date:     2012-01-06 08:13:25 +0000 (Fri, 06 Jan 2012)
Log Message:
-----------
lang-java/389-admin-console/trunk: recommit changes in build recipe second

Modified Paths:
--------------
    csw/mgar/pkg/lang-java/389-admin-console/trunk/Makefile

Modified: csw/mgar/pkg/lang-java/389-admin-console/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-java/389-admin-console/trunk/Makefile	2012-01-06 08:11:56 UTC (rev 16708)
+++ csw/mgar/pkg/lang-java/389-admin-console/trunk/Makefile	2012-01-06 08:13:25 UTC (rev 16709)
@@ -13,7 +13,7 @@
 Administration Server and 389 Directory Server.
 endef
 
-MASTER_SITES = http://port389/sources
+MASTER_SITES = http://port389.org/sources
 DISTFILES  = $(NAME)-$(VERSION).tar.bz2
 
 PACKAGES = CSW389-admin-console

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


From cgrzemba at users.sourceforge.net  Fri Jan  6 09:43:27 2012
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Fri, 06 Jan 2012 08:43:27 +0000
Subject: [csw-devel] SF.net SVN: gar:[16710]
	csw/mgar/pkg/mozldap/trunk/Makefile
Message-ID: <E1Rj5OZ-0000zY-PD@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 16710
          http://gar.svn.sourceforge.net/gar/?rev=16710&view=rev
Author:   cgrzemba
Date:     2012-01-06 08:43:27 +0000 (Fri, 06 Jan 2012)
Log Message:
-----------
mozldap/trunk: add build dependency

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

Modified: csw/mgar/pkg/mozldap/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mozldap/trunk/Makefile	2012-01-06 08:13:25 UTC (rev 16709)
+++ csw/mgar/pkg/mozldap/trunk/Makefile	2012-01-06 08:43:27 UTC (rev 16710)
@@ -21,8 +21,9 @@
 DISTFILES  = $(NAME)-$(VERSION).tar.gz
 DISTFILES += COPYING
 
+BUILD_DEP_PKGS = CSWlibsvrcore0-dev
 PACKAGING_PLATFORMS += solaris10-sparc
-# PACKAGING_PLATFORMS += solaris10-i386
+PACKAGING_PLATFORMS += solaris10-i386
 GARCOMPILER = SOS12U2
 
 PACKAGES += CSWlibldap60

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


From cgrzemba at users.sourceforge.net  Fri Jan  6 10:15:32 2012
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Fri, 06 Jan 2012 09:15:32 +0000
Subject: [csw-devel] SF.net SVN: gar:[16711]
	csw/mgar/pkg/mozldap/trunk/Makefile
Message-ID: <E1Rj5tc-0001hI-HE@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 16711
          http://gar.svn.sourceforge.net/gar/?rev=16711&view=rev
Author:   cgrzemba
Date:     2012-01-06 09:15:32 +0000 (Fri, 06 Jan 2012)
Log Message:
-----------
mozldap/trunk: add mozldap.pc

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

Modified: csw/mgar/pkg/mozldap/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mozldap/trunk/Makefile	2012-01-06 08:43:27 UTC (rev 16710)
+++ csw/mgar/pkg/mozldap/trunk/Makefile	2012-01-06 09:15:32 UTC (rev 16711)
@@ -1,13 +1,20 @@
 # $Id$
 #
 NAME = mozldap
-MAJOR_VERSION = 6
-MIN_VERSION = 0.7
-VERSION = $(MAJOR_VERSION).$(MIN_VERSION)
+MAJOR = 6
+MINOR = 0
+SUBMIN = 7
+VERSION = $(MAJOR).$(MINOR).$(SUBMIN)
 GARTYPE = v2
 CATEGORIES = lib
-# remove this before release !!
 
+NSPR_NAME = nspr
+NSPR_VERSION = 4.6
+NSS_NAME = nss
+NSS_VERSION = 3.11
+SVRCORE_NAME = svrcore
+SVR_CORE_VERSION = 4.0.3
+
 DESCRIPTION = Mozilla LDAP C-SDK
 define BLURB
 The Mozilla LDAP C SDK is a set of libraries that
@@ -93,7 +100,6 @@
 RUNTIME_DEP_PKGS_CSWmozldap-tools += CSWlibsvrcore0
 RUNTIME_DEP_PKGS_CSWmozldap-tools += CSWsasl
 RUNTIME_DEP_PKGS_CSWmozldap-tools += CSWlibplds4
-INCOMPATIBLE_PKGS_CSWmozldap-tools = CSWoldapclient
 
 PACKAGES += CSWmozldap-dev
 CATALOGNAME_CSWmozldap-dev = mozldap_dev
@@ -130,6 +136,7 @@
 CONFIGURE_ARGS_OPT += --with-svrcore-lib=$(libdir)
 CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARFLAVOR))
 CONFIGURE_ARGS_OPT += --includedir=$(prefix)/include/ldap
+CONFIGURE_ARGS_OPT += --bindir=$(prefix)/dirsrv/bin
 
 CPPFLAGS=
 
@@ -151,7 +158,7 @@
 
 install-c-sdk:
 	ginstall -m 755 -d $(DESTDIR)/$(bindir)
-	ginstall -m 755 -d $(DESTDIR)/$(libdir)
+	ginstall -m 755 -d $(DESTDIR)/$(libdir)/pkgconfig
 	ginstall -m 755 -d $(DESTDIR)/$(sysconfdir)
 	ginstall -m 755 -d $(DESTDIR)/$(includedir)
 	ginstall -m 755 $(WORKSRC)/../dist/lib/libldif60.so $(DESTDIR)$(libdir)
@@ -169,6 +176,21 @@
 	@for f in $(WORKSRC)/../dist/public/ldap/*h; do \
 		ginstall -m 644 $$f  $(DESTDIR)$(includedir); \
 	done
+	@cat $(WORKSRC)/mozilla/dirctory/c-sdk/mozldap.pc.in | \
+		| @gsed -e "s,%%libdir%%,$(libdir),g" \
+          -e "s,%%prefix%%,$(prefix),g" \
+          -e "s,%%major%%,$(MAJOR),g" \
+          -e "s,%%minor%%,$(MINOR),g" \
+          -e "s,%%submin%%,$(SUBMIN),g" \
+          -e "s,%%libsuffix%%,$(libdir),g" \
+          -e "s,%%bindir%%,$(bindir),g" \
+          -e "s,%%exec_prefix%%,$(bindir),g" \
+          -e "s,%%includedir%%,$(includedir),g" \
+          -e "s,%%NSPR_VERSION%%,$(NSPR_VERSION),g" \
+          -e "s,%%NSS_VERSION%%,$(NSS_VERSION),g" \
+          -e "s,%%SVRCORE_VERSION%%,$(SVRCORE_VERSION),g" \
+          -e "s,%%MOZLDAP_VERSION%%,$(VERSION),g" \
+    > $(DESTDIR)/$(libdir)/pkgconfig/$(NAME).pc
 	@$(MAKECOOKIE)
 
 include gar/category.mk

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


From cgrzemba at users.sourceforge.net  Fri Jan  6 12:54:20 2012
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Fri, 06 Jan 2012 11:54:20 +0000
Subject: [csw-devel] SF.net SVN: gar:[16712]
	csw/mgar/pkg/mozldap/trunk/Makefile
Message-ID: <E1Rj8NH-0002yk-Vz@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 16712
          http://gar.svn.sourceforge.net/gar/?rev=16712&view=rev
Author:   cgrzemba
Date:     2012-01-06 11:54:19 +0000 (Fri, 06 Jan 2012)
Log Message:
-----------
mozldap/trunk: adjust install paths to tolerate package oldapclient

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

Modified: csw/mgar/pkg/mozldap/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mozldap/trunk/Makefile	2012-01-06 09:15:32 UTC (rev 16711)
+++ csw/mgar/pkg/mozldap/trunk/Makefile	2012-01-06 11:54:19 UTC (rev 16712)
@@ -100,6 +100,7 @@
 RUNTIME_DEP_PKGS_CSWmozldap-tools += CSWlibsvrcore0
 RUNTIME_DEP_PKGS_CSWmozldap-tools += CSWsasl
 RUNTIME_DEP_PKGS_CSWmozldap-tools += CSWlibplds4
+RUNTIME_DEP_PKGS_CSWmozldap-tools += CSWlibiconv2
 
 PACKAGES += CSWmozldap-dev
 CATALOGNAME_CSWmozldap-dev = mozldap_dev
@@ -117,14 +118,19 @@
 # Move the include files to include/nspr to prevent polluting the main
 # header file namespace.
 
-CONFIGURE_ARGS  = $(DIRPATHS)
+# override the standard paths
+bindir=$(prefix)/bin/dirsrv
+includedir=$(prefix)/include/dirsrv
+
+CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS_isa-sparcv9 = --enable-64bit
 CONFIGURE_ARGS_isa-amd64 = --enable-64bit
 CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(MODULATION))
+CONFIGURE_ARGS_OPT += --with-svrcore=$(prefix)
 CONFIGURE_ARGS_OPT += --with-sasl
+CONFIGURE_ARGS_OPT += --with-sasl-inc=$(prefix)/include/sasl
 CONFIGURE_ARGS_OPT += --with-sasl-lib=$(libdir)
 CONFIGURE_ARGS_OPT += --enable-clu
-CONFIGURE_ARGS_OPT += --with-system-svrcore
 CONFIGURE_ARGS_OPT += --enable-optimize="-xO3"
 CONFIGURE_ARGS_OPT += --disable-debug
 CONFIGURE_ARGS_OPT += --enable-strip
@@ -132,11 +138,7 @@
 CONFIGURE_ARGS_OPT += --with-nss-lib=$(libdir)
 CONFIGURE_ARGS_OPT += --with-nspr-inc=$(prefix)/include/nspr
 CONFIGURE_ARGS_OPT += --with-nspr-lib=$(libdir)
-CONFIGURE_ARGS_OPT += --with-svrcore-inc=$(prefix)/include/nspr
-CONFIGURE_ARGS_OPT += --with-svrcore-lib=$(libdir)
 CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARFLAVOR))
-CONFIGURE_ARGS_OPT += --includedir=$(prefix)/include/ldap
-CONFIGURE_ARGS_OPT += --bindir=$(prefix)/dirsrv/bin
 
 CPPFLAGS=
 
@@ -145,8 +147,8 @@
 INSTALL_SCRIPTS = c-sdk
 TEST_TARGET = 
 TEST_SCRIPTS = 
-EXTRA_LDFLAGS = -L/opt/csw/lib
 BUILD64 = 1
+EXTRA_LINKER_FLAGS = -liconv
 
 configure-c-sdk:
 	(cd $(WORKSRC) && mkdir -p build inst)
@@ -166,33 +168,38 @@
 	ginstall -m 755 $(WORKSRC)/../dist/lib/libprldap60.so $(DESTDIR)$(libdir)
 	ginstall -m 755 $(WORKSRC)/../dist/lib/libssldap60.so $(DESTDIR)$(libdir)
 	ginstall -m 755 $(WORKSRC)/../dist/bin/ldapsearch $(DESTDIR)$(bindir)
+	ln -s $(DESTDIR)$(bindir)/ldapsearch $(DESTDIR)$(prefix)/bin/ldapsearch389
 	ginstall -m 755 $(WORKSRC)/../dist/bin/ldapmodify $(DESTDIR)$(bindir)
+	ln -s $(DESTDIR)$(bindir)/ldapmodify $(DESTDIR)$(prefix)/bin/ldapmodify389
 	ginstall -m 755 $(WORKSRC)/../dist/bin/ldapdelete $(DESTDIR)$(bindir)
+	ln -s $(DESTDIR)$(bindir)/ldapdelete $(DESTDIR)$(prefix)/bin/ldapdelete389
 	ginstall -m 755 $(WORKSRC)/../dist/bin/ldapcmp $(DESTDIR)$(bindir)
+	ln -s $(DESTDIR)$(bindir)/ldapcmp $(DESTDIR)$(prefix)/bin/ldapcmp389
 	ginstall -m 755 $(WORKSRC)/../dist/bin/ldappasswd $(DESTDIR)$(bindir)
+	ln -s $(DESTDIR)$(bindir)/ldappasswd $(DESTDIR)$(prefix)/bin/ldappasswd389
+	ginstall -m 755 $(WORKSRC)/c-sdk/mozldap.pc.in $(DESTDIR)$(libdir)/pkgconfig
 	@for f in $(WORKSRC)/../dist/etc/*; do \
 		ginstall -m 644 $$f  $(DESTDIR)$(sysconfdir); \
 	done
 	@for f in $(WORKSRC)/../dist/public/ldap/*h; do \
 		ginstall -m 644 $$f  $(DESTDIR)$(includedir); \
 	done
-	@cat $(WORKSRC)/mozilla/dirctory/c-sdk/mozldap.pc.in | \
-		| @gsed -e "s,%%libdir%%,$(libdir),g" \
-          -e "s,%%prefix%%,$(prefix),g" \
-          -e "s,%%major%%,$(MAJOR),g" \
-          -e "s,%%minor%%,$(MINOR),g" \
-          -e "s,%%submin%%,$(SUBMIN),g" \
-          -e "s,%%libsuffix%%,$(libdir),g" \
-          -e "s,%%bindir%%,$(bindir),g" \
-          -e "s,%%exec_prefix%%,$(bindir),g" \
-          -e "s,%%includedir%%,$(includedir),g" \
-          -e "s,%%NSPR_VERSION%%,$(NSPR_VERSION),g" \
-          -e "s,%%NSS_VERSION%%,$(NSS_VERSION),g" \
-          -e "s,%%SVRCORE_VERSION%%,$(SVRCORE_VERSION),g" \
-          -e "s,%%MOZLDAP_VERSION%%,$(VERSION),g" \
-    > $(DESTDIR)/$(libdir)/pkgconfig/$(NAME).pc
+	@gsed -i -e 's,%libdir%,$(libdir),g' \
+          -e 's,%prefix%,$(prefix),g' \
+          -e "s,%major%,$(MAJOR),g" \
+          -e "s,%minor%,$(MINOR),g" \
+          -e "s,%submin%,$(SUBMIN),g" \
+          -e "s,%libsuffix%,$(libdir),g" \
+          -e "s,%bindir%,$(bindir),g" \
+          -e "s,%exec_prefix%,$(bindir),g" \
+          -e "s,%includedir%,$(includedir),g" \
+          -e "s,%NSPR_VERSION%,$(NSPR_VERSION),g" \
+          -e "s,%NSS_VERSION%,$(NSS_VERSION),g" \
+          -e "s,%SVRCORE_VERSION%,$(SVRCORE_VERSION),g" \
+          -e "s,%MOZLDAP_VERSION%,$(VERSION),g" \
+     		$(DESTDIR)/$(libdir)/pkgconfig/$(NAME).pc.in
+	@mv $(DESTDIR)/$(libdir)/pkgconfig/$(NAME).pc.in $(DESTDIR)/$(libdir)/pkgconfig/$(NAME).pc
 	@$(MAKECOOKIE)
 
 include gar/category.mk
 
-

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


From cgrzemba at users.sourceforge.net  Fri Jan  6 13:17:55 2012
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Fri, 06 Jan 2012 12:17:55 +0000
Subject: [csw-devel] SF.net SVN: gar:[16713]
	csw/mgar/pkg/mozldap/trunk/Makefile
Message-ID: <E1Rj8k7-0005sk-Tb@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 16713
          http://gar.svn.sourceforge.net/gar/?rev=16713&view=rev
Author:   cgrzemba
Date:     2012-01-06 12:17:55 +0000 (Fri, 06 Jan 2012)
Log Message:
-----------
mozldap/trunk: fix build recipe

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

Modified: csw/mgar/pkg/mozldap/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mozldap/trunk/Makefile	2012-01-06 11:54:19 UTC (rev 16712)
+++ csw/mgar/pkg/mozldap/trunk/Makefile	2012-01-06 12:17:55 UTC (rev 16713)
@@ -41,6 +41,7 @@
 RUNTIME_DEP_PKGS_CSWlibldap60 += CSWsasl
 CHECKPKG_OVERRIDES_CSWlibldap60 += soname-equals-filename|file=/opt/csw/lib/libldap60.so
 CHECKPKG_OVERRIDES_CSWlibldap60 += soname-equals-filename|file=/opt/csw/lib/sparcv9/libldap60.so
+CHECKPKG_OVERRIDES_CSWlibldap60 += soname-equals-filename|file=/opt/csw/lib/amd64/libldap60.so
 
 PACKAGES += CSWlibldif60
 CATALOGNAME_CSWlibldif60 = libldif60
@@ -49,6 +50,7 @@
 SPKG_DESC_CSWlibldif60 += $(DESCRIPTION), libldif60.so
 CHECKPKG_OVERRIDES_CSWlibldif60 += soname-equals-filename|file=/opt/csw/lib/libldif60.so
 CHECKPKG_OVERRIDES_CSWlibldif60 += soname-equals-filename|file=/opt/csw/lib/sparcv9/libldif60.so
+CHECKPKG_OVERRIDES_CSWlibldif60 += soname-equals-filename|file=/opt/csw/lib/adm64/libldif60.so
 
 PACKAGES += CSWlibprldap60
 CATALOGNAME_CSWlibprldap60 = libprldap60
@@ -61,6 +63,7 @@
 RUNTIME_DEP_PKGS_CSWlibprldap60 += CSWlibldap60
 CHECKPKG_OVERRIDES_CSWlibprldap60 += soname-equals-filename|file=/opt/csw/lib/libprldap60.so
 CHECKPKG_OVERRIDES_CSWlibprldap60 += soname-equals-filename|file=/opt/csw/lib/sparcv9/libprldap60.so
+CHECKPKG_OVERRIDES_CSWlibprldap60 += soname-equals-filename|file=/opt/csw/lib/amd64/libprldap60.so
 
 PACKAGES += CSWlibssldap60
 CATALOGNAME_CSWlibssldap60 = libssldap60
@@ -75,6 +78,7 @@
 RUNTIME_DEP_PKGS_CSWlibssldap60 += CSWlibprldap60
 CHECKPKG_OVERRIDES_CSWlibssldap60 += soname-equals-filename|file=/opt/csw/lib/libssldap60.so
 CHECKPKG_OVERRIDES_CSWlibssldap60 += soname-equals-filename|file=/opt/csw/lib/sparcv9/libssldap60.so
+CHECKPKG_OVERRIDES_CSWlibssldap60 += soname-equals-filename|file=/opt/csw/lib/amd64/libssldap60.so
 
 PACKAGES += CSWmozldap-tools
 CATALOGNAME_CSWmozldap-tools= mozldap_tools
@@ -202,4 +206,3 @@
 	@$(MAKECOOKIE)
 
 include gar/category.mk
-

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


From cgrzemba at users.sourceforge.net  Fri Jan  6 13:41:28 2012
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Fri, 06 Jan 2012 12:41:28 +0000
Subject: [csw-devel] SF.net SVN: gar:[16714]
	csw/mgar/pkg/mozldap/trunk/Makefile
Message-ID: <E1Rj96u-0004fT-Gs@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 16714
          http://gar.svn.sourceforge.net/gar/?rev=16714&view=rev
Author:   cgrzemba
Date:     2012-01-06 12:41:28 +0000 (Fri, 06 Jan 2012)
Log Message:
-----------
mozldap/trunk: fix build recipe

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

Modified: csw/mgar/pkg/mozldap/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mozldap/trunk/Makefile	2012-01-06 12:17:55 UTC (rev 16713)
+++ csw/mgar/pkg/mozldap/trunk/Makefile	2012-01-06 12:41:28 UTC (rev 16714)
@@ -50,7 +50,7 @@
 SPKG_DESC_CSWlibldif60 += $(DESCRIPTION), libldif60.so
 CHECKPKG_OVERRIDES_CSWlibldif60 += soname-equals-filename|file=/opt/csw/lib/libldif60.so
 CHECKPKG_OVERRIDES_CSWlibldif60 += soname-equals-filename|file=/opt/csw/lib/sparcv9/libldif60.so
-CHECKPKG_OVERRIDES_CSWlibldif60 += soname-equals-filename|file=/opt/csw/lib/adm64/libldif60.so
+CHECKPKG_OVERRIDES_CSWlibldif60 += soname-equals-filename|file=/opt/csw/lib/amd64/libldif60.so
 
 PACKAGES += CSWlibprldap60
 CATALOGNAME_CSWlibprldap60 = libprldap60

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


From cgrzemba at users.sourceforge.net  Fri Jan  6 14:31:05 2012
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Fri, 06 Jan 2012 13:31:05 +0000
Subject: [csw-devel] SF.net SVN: gar:[16715] csw/mgar/pkg
Message-ID: <E1Rj9sv-00077G-Ke@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 16715
          http://gar.svn.sourceforge.net/gar/?rev=16715&view=rev
Author:   cgrzemba
Date:     2012-01-06 13:31:05 +0000 (Fri, 06 Jan 2012)
Log Message:
-----------
389-adminutil/trunk: Initial release

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

Added: csw/mgar/pkg/389-adminutil/Makefile
===================================================================
--- csw/mgar/pkg/389-adminutil/Makefile	                        (rev 0)
+++ csw/mgar/pkg/389-adminutil/Makefile	2012-01-06 13:31:05 UTC (rev 16715)
@@ -0,0 +1,2 @@
+%:
+	$(MAKE) -C trunk $*


Property changes on: csw/mgar/pkg/389-adminutil/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/389-adminutil/trunk/Makefile
===================================================================
--- csw/mgar/pkg/389-adminutil/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/389-adminutil/trunk/Makefile	2012-01-06 13:31:05 UTC (rev 16715)
@@ -0,0 +1,78 @@
+# $Id$
+#
+NAME = 389-adminutil
+VERSION = 1.1.14
+GARTYPE = v2
+CATEGORIES = lib
+
+DESCRIPTION = The enterprise-class Open Source LDAP server, libadminutil, libadmsslutil
+define BLURB
+The enterprise-class Open Source LDAP server for Linux|Unix. It is hardened by real-world use, is full-featured, supports multi-master replication, and already handles many of the largest LDAP deployments in the world. The 389 Directory Server can be downloaded for free and set up in less than an hour using the graphical console.
+endef
+
+LICENSE = LICENSE
+
+MASTER_SITES = http://port389.org/sources
+DISTFILES  = $(NAME)-$(VERSION).tar.bz2
+# BUILD64 = 1
+
+# GARCOMPILER = SOS12U2
+
+PACKAGES += CSWlibadminutil0
+CATALOGNAME_CSWlibadminutil0 = libadminutil0
+SPKG_DESC_CSWlibadminutil0 += $(DESCRIPTION), libadminutil
+PKGFILES_CSWlibadminutil0 +=  $(call baseisadirs,$(libdir),libadminutil\.so(\.\d+)+)
+RUNTIME_DEP_PKGS_CSWlibadminutil0 += CSWlibprldap60
+RUNTIME_DEP_PKGS_CSWlibadminutil0 += CSWlibldif60
+RUNTIME_DEP_PKGS_CSWlibadminutil0 += CSWlibnspr4
+RUNTIME_DEP_PKGS_CSWlibadminutil0 += CSWlibssldap60
+RUNTIME_DEP_PKGS_CSWlibadminutil0 += CSWlibicu46
+RUNTIME_DEP_PKGS_CSWlibadminutil0 += CSWsasl
+RUNTIME_DEP_PKGS_CSWlibadminutil0 += CSWlibnss3
+RUNTIME_DEP_PKGS_CSWlibadminutil0 += CSWlibplc4
+RUNTIME_DEP_PKGS_CSWlibadminutil0 += CSWlibldap60
+
+PACKAGES += CSWlibadmsslutil0
+CATALOGNAME_CSWlibadmsslutil0 = libadmsslutil0
+SPKG_DESC_CSWlibadmsslutil0 += $(DESCRIPTION), libadmsslutil
+PKGFILES_CSWlibadmsslutil0 +=  $(call baseisadirs,$(libdir),libadmsslutil\.so(\.\d+)+)
+RUNTIME_DEP_PKGS_CSWlibadmsslutil0 += CSWlibprldap60
+RUNTIME_DEP_PKGS_CSWlibadmsslutil0 += CSWlibldif60
+RUNTIME_DEP_PKGS_CSWlibadmsslutil0 += CSWlibnspr4
+RUNTIME_DEP_PKGS_CSWlibadmsslutil0 += CSWlibssldap60
+RUNTIME_DEP_PKGS_CSWlibadmsslutil0 += CSWlibicu46
+RUNTIME_DEP_PKGS_CSWlibadmsslutil0 += CSWsasl
+RUNTIME_DEP_PKGS_CSWlibadmsslutil0 += CSWlibnss3
+RUNTIME_DEP_PKGS_CSWlibadmsslutil0 += CSWlibplc4
+RUNTIME_DEP_PKGS_CSWlibadmsslutil0 += CSWlibldap60
+RUNTIME_DEP_PKGS_CSWlibadmsslutil0 += CSWlibadminutil0
+
+PACKAGES += CSW389-adminutil-dev
+CATALOGNAME_CSW389-adminutil-dev = 389_adminutil_dev
+SPKG_DESC_CSW389-adminutil-dev += $(DESCRIPTION), development files
+PKGFILES_CSW389-adminutil-dev += $(PKGFILES_DEV)
+PKGFILES_CSW389-adminutil-dev += $(call baseisadirs,$(libdir),libadminutil\.so)
+PKGFILES_CSW389-adminutil-dev += $(call baseisadirs,$(libdir),libadmsslutil\.so)
+RUNTIME_DEP_PKGS_CSW389-adminutil-dev += CSWlibadminutil0
+RUNTIME_DEP_PKGS_CSW389-adminutil-dev += CSWlibadmsslutil0
+
+
+TEST_SCRIPTS = 
+EXTRA_CFLAGS = -norunpath
+
+CONFIGURE_ARGS = $(DIRPATHS)
+CONFIGURE_ARGS_OPT += --with-ldapsdk-inc=/opt/csw/include/ldap 
+CONFIGURE_ARGS_OPT += --with-ldapsdk-lib=/opt/csw/lib 
+CONFIGURE_ARGS_OPT += --with-icu-inc=/opt/csw/include 
+CONFIGURE_ARGS_OPT += --with-icu-lib=/opt/csw/lib 
+CONFIGURE_ARGS_OPT += --with-icu-bin=/opt/csw/bin 
+CONFIGURE_ARGS_OPT += --with-sasl-inc=/opt/csw/include/sasl 
+CONFIGURE_ARGS_OPT += --with-sasl-lib=/opt/csw/lib 
+CONFIGURE_ARGS_OPT += --with-nss-lib=/opt/csw/lib/64
+CONFIGURE_ARGS_OPT += --with-nss-inc=/opt/csw/include/nss 
+CONFIGURE_ARGS_OPT += --with-nspr-lib=/opt/csw/lib
+CONFIGURE_ARGS_OPT += --with-nspr-inc=/opt/csw/include/nspr
+CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARFLAVOR))
+
+include gar/category.mk
+


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

Added: csw/mgar/pkg/389-adminutil/trunk/checksums
===================================================================
--- csw/mgar/pkg/389-adminutil/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/389-adminutil/trunk/checksums	2012-01-06 13:31:05 UTC (rev 16715)
@@ -0,0 +1 @@
+3854174fef3276686896825ea19ccf53  389-adminutil-1.1.14.tar.bz2

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


From cgrzemba at users.sourceforge.net  Fri Jan  6 15:41:13 2012
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Fri, 06 Jan 2012 14:41:13 +0000
Subject: [csw-devel] SF.net SVN: gar:[16716]
	csw/mgar/pkg/mozldap/trunk/Makefile
Message-ID: <E1RjAyn-0007q1-96@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 16716
          http://gar.svn.sourceforge.net/gar/?rev=16716&view=rev
Author:   cgrzemba
Date:     2012-01-06 14:41:12 +0000 (Fri, 06 Jan 2012)
Log Message:
-----------
mozldap/trunk: fix links

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

Modified: csw/mgar/pkg/mozldap/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mozldap/trunk/Makefile	2012-01-06 13:31:05 UTC (rev 16715)
+++ csw/mgar/pkg/mozldap/trunk/Makefile	2012-01-06 14:41:12 UTC (rev 16716)
@@ -172,15 +172,15 @@
 	ginstall -m 755 $(WORKSRC)/../dist/lib/libprldap60.so $(DESTDIR)$(libdir)
 	ginstall -m 755 $(WORKSRC)/../dist/lib/libssldap60.so $(DESTDIR)$(libdir)
 	ginstall -m 755 $(WORKSRC)/../dist/bin/ldapsearch $(DESTDIR)$(bindir)
-	ln -s $(DESTDIR)$(bindir)/ldapsearch $(DESTDIR)$(prefix)/bin/ldapsearch389
+	ln -s $(DESTDIR)$(bindir)/ldapsearch $(prefix)/bin/ldapsearch389
 	ginstall -m 755 $(WORKSRC)/../dist/bin/ldapmodify $(DESTDIR)$(bindir)
-	ln -s $(DESTDIR)$(bindir)/ldapmodify $(DESTDIR)$(prefix)/bin/ldapmodify389
+	ln -s $(DESTDIR)$(bindir)/ldapmodify $(prefix)/bin/ldapmodify389
 	ginstall -m 755 $(WORKSRC)/../dist/bin/ldapdelete $(DESTDIR)$(bindir)
-	ln -s $(DESTDIR)$(bindir)/ldapdelete $(DESTDIR)$(prefix)/bin/ldapdelete389
+	ln -s $(DESTDIR)$(bindir)/ldapdelete $(prefix)/bin/ldapdelete389
 	ginstall -m 755 $(WORKSRC)/../dist/bin/ldapcmp $(DESTDIR)$(bindir)
-	ln -s $(DESTDIR)$(bindir)/ldapcmp $(DESTDIR)$(prefix)/bin/ldapcmp389
+	ln -s $(DESTDIR)$(bindir)/ldapcmp $(prefix)/bin/ldapcmp389
 	ginstall -m 755 $(WORKSRC)/../dist/bin/ldappasswd $(DESTDIR)$(bindir)
-	ln -s $(DESTDIR)$(bindir)/ldappasswd $(DESTDIR)$(prefix)/bin/ldappasswd389
+	ln -s $(DESTDIR)$(bindir)/ldappasswd $(prefix)/bin/ldappasswd389
 	ginstall -m 755 $(WORKSRC)/c-sdk/mozldap.pc.in $(DESTDIR)$(libdir)/pkgconfig
 	@for f in $(WORKSRC)/../dist/etc/*; do \
 		ginstall -m 644 $$f  $(DESTDIR)$(sysconfdir); \

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


From cgrzemba at users.sourceforge.net  Fri Jan  6 16:05:21 2012
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Fri, 06 Jan 2012 15:05:21 +0000
Subject: [csw-devel] SF.net SVN: gar:[16717]
	csw/mgar/pkg/mozldap/trunk/Makefile
Message-ID: <E1RjBM9-00038k-EB@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 16717
          http://gar.svn.sourceforge.net/gar/?rev=16717&view=rev
Author:   cgrzemba
Date:     2012-01-06 15:05:21 +0000 (Fri, 06 Jan 2012)
Log Message:
-----------
mozldap/trunk: remove links

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

Modified: csw/mgar/pkg/mozldap/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mozldap/trunk/Makefile	2012-01-06 14:41:12 UTC (rev 16716)
+++ csw/mgar/pkg/mozldap/trunk/Makefile	2012-01-06 15:05:21 UTC (rev 16717)
@@ -172,15 +172,15 @@
 	ginstall -m 755 $(WORKSRC)/../dist/lib/libprldap60.so $(DESTDIR)$(libdir)
 	ginstall -m 755 $(WORKSRC)/../dist/lib/libssldap60.so $(DESTDIR)$(libdir)
 	ginstall -m 755 $(WORKSRC)/../dist/bin/ldapsearch $(DESTDIR)$(bindir)
-	ln -s $(DESTDIR)$(bindir)/ldapsearch $(prefix)/bin/ldapsearch389
+#	ln -s $(DESTDIR)$(bindir)/ldapsearch ../ldapsearch389
 	ginstall -m 755 $(WORKSRC)/../dist/bin/ldapmodify $(DESTDIR)$(bindir)
-	ln -s $(DESTDIR)$(bindir)/ldapmodify $(prefix)/bin/ldapmodify389
+#	ln -s $(DESTDIR)$(bindir)/ldapmodify ../ldapmodify389
 	ginstall -m 755 $(WORKSRC)/../dist/bin/ldapdelete $(DESTDIR)$(bindir)
-	ln -s $(DESTDIR)$(bindir)/ldapdelete $(prefix)/bin/ldapdelete389
+#	ln -s $(DESTDIR)$(bindir)/ldapdelete ../ldapdelete389
 	ginstall -m 755 $(WORKSRC)/../dist/bin/ldapcmp $(DESTDIR)$(bindir)
-	ln -s $(DESTDIR)$(bindir)/ldapcmp $(prefix)/bin/ldapcmp389
+#	ln -s $(DESTDIR)$(bindir)/ldapcmp ../ldapcmp389
 	ginstall -m 755 $(WORKSRC)/../dist/bin/ldappasswd $(DESTDIR)$(bindir)
-	ln -s $(DESTDIR)$(bindir)/ldappasswd $(prefix)/bin/ldappasswd389
+#	ln -s $(DESTDIR)$(bindir)/ldappasswd ../ldappasswd389
 	ginstall -m 755 $(WORKSRC)/c-sdk/mozldap.pc.in $(DESTDIR)$(libdir)/pkgconfig
 	@for f in $(WORKSRC)/../dist/etc/*; do \
 		ginstall -m 644 $$f  $(DESTDIR)$(sysconfdir); \

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


From guengel at users.sourceforge.net  Fri Jan  6 16:36:39 2012
From: guengel at users.sourceforge.net (guengel at users.sourceforge.net)
Date: Fri, 06 Jan 2012 15:36:39 +0000
Subject: [csw-devel] SF.net SVN: gar:[16718] csw/mgar/pkg/cfengine3/trunk
Message-ID: <E1RjBqR-0000Ea-Pn@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 16718
          http://gar.svn.sourceforge.net/gar/?rev=16718&view=rev
Author:   guengel
Date:     2012-01-06 15:36:39 +0000 (Fri, 06 Jan 2012)
Log Message:
-----------
cfengine3/trunk: Merged CSWlibpromises1 into CSWcfengine3rt.

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

Added Paths:
-----------
    csw/mgar/pkg/cfengine3/trunk/files/changelog.CSW

Modified: csw/mgar/pkg/cfengine3/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cfengine3/trunk/Makefile	2012-01-06 15:05:21 UTC (rev 16717)
+++ csw/mgar/pkg/cfengine3/trunk/Makefile	2012-01-06 15:36:39 UTC (rev 16718)
@@ -21,8 +21,11 @@
 DISTFILES += csw$(NAME)-cfmonitord
 DISTFILES += csw$(NAME)-cfserverd
 DISTFILES += README.CSW
+DISTFILES += changelog.CSW
 VENDOR_URL = http://www.cfengine.com/community
 
+UFILES_REGEX = cfengine-(\d+(?:\.\d+)*).tar.gz
+
 # File name regex to get notifications about upstream software releases
 # NOTE: Use this only if the automatic regex creation
 #       does not work for your package
@@ -40,22 +43,15 @@
 initddir		= $(sysconfdir)/init.d
 
 PACKAGES = CSW$(NAME)rt
+# Catch all
 CATALOGNAME_CSW$(NAME)rt = $(NAME)_rt
 SPKG_DESC_CSW$(NAME)rt = CFEngine 3 runtime and documentation
 RUNTIME_DEP_PKGS_CSW$(NAME)rt += CSWbdb48
 RUNTIME_DEP_PKGS_CSW$(NAME)rt += CSWosslrt
 RUNTIME_DEP_PKGS_CSW$(NAME)rt += CSWlibpcre0
-RUNTIME_DEP_PKGS_CSW$(NAME)rt += CSWlibpromises1
 CHECKPKG_OVERRIDES_CSW$(NAME)rt += catalogname-does-not-match-pkgname|pkgname=CSW$(NAME)rt|catalogname=$(NAME)_rt|expected-catalogname=$(NAME)rt
+OBSOLETED_BY_CSW$(name)rt = CSWlibpromises1
 
-PACKAGES += CSWlibpromises1
-SPKG_DESC_CSWlibpromises1 = CFEngine 3 promises library
-RUNTIME_DEP_PKGS_CSWlibpromises1 += CSWosslrt
-RUNTIME_DEP_PKGS_CSWlibpromises1 += CSWlibpcre0
-RUNTIME_DEP_PKGS_CSWlibpromises1 += CSWbdb48
-PKGFILES_CSWlibpromises1 = $(PKGFILES_RT)
-PKGFILES_CSWlibpromises1 += .*/libpromises1/README.CSW
-
 PACKAGES += CSW$(NAME)server
 CATALOGNAME_CSW$(NAME)server = $(NAME)_server
 SPKG_DESC_CSW$(NAME)server = CFEngine 3 server binary
@@ -63,7 +59,6 @@
 RUNTIME_DEP_PKGS_CSW$(NAME)server += CSWosslrt
 RUNTIME_DEP_PKGS_CSW$(NAME)server += CSWlibpcre0
 RUNTIME_DEP_PKGS_CSW$(NAME)server += CSW$(NAME)rt
-RUNTIME_DEP_PKGS_CSW$(NAME)server += CSWlibpromises1
 PKGFILES_CSW$(NAME)server += $(sbindir)/cf-serverd
 PKGFILES_CSW$(NAME)server += $(sbindir)/cf-runagent
 PKGFILES_CSW$(NAME)server += $(mandir)/.*/cf-serverd.*
@@ -80,7 +75,6 @@
 RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWosslrt
 RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibpcre0
 RUNTIME_DEP_PKGS_CSW$(NAME)client += CSW$(NAME)rt
-RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibpromises1
 PKGFILES_CSW$(NAME)client += $(sbindir)/cf-agent
 PKGFILES_CSW$(NAME)client += $(sbindir)/cf-execd
 PKGFILES_CSW$(NAME)client += $(sbindir)/cf-monitord

Added: csw/mgar/pkg/cfengine3/trunk/files/changelog.CSW
===================================================================
--- csw/mgar/pkg/cfengine3/trunk/files/changelog.CSW	                        (rev 0)
+++ csw/mgar/pkg/cfengine3/trunk/files/changelog.CSW	2012-01-06 15:36:39 UTC (rev 16718)
@@ -0,0 +1,5 @@
+cfengine3 (3.2.3,REV=2012.01.06)
+
+  * Obsoleted CSWlibpromises1.
+
+ -- Rafael Ostertag <raos at opencsw.org>  Fri, 06 Jan 2012 16:24:39 +0100

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


From guengel at users.sourceforge.net  Sat Jan  7 14:32:39 2012
From: guengel at users.sourceforge.net (guengel at users.sourceforge.net)
Date: Sat, 07 Jan 2012 13:32:39 +0000
Subject: [csw-devel] SF.net SVN: gar:[16719] csw/mgar/pkg/cfengine3/trunk
Message-ID: <E1RjWNz-0005Fh-NS@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 16719
          http://gar.svn.sourceforge.net/gar/?rev=16719&view=rev
Author:   guengel
Date:     2012-01-07 13:32:39 +0000 (Sat, 07 Jan 2012)
Log Message:
-----------
cfengine3/trunk: Properly obsoleting CSWlibpromises1 now. Added Solaris 10 to PACKAGING_PLATFORMS.

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

Modified: csw/mgar/pkg/cfengine3/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cfengine3/trunk/Makefile	2012-01-06 15:36:39 UTC (rev 16718)
+++ csw/mgar/pkg/cfengine3/trunk/Makefile	2012-01-07 13:32:39 UTC (rev 16719)
@@ -26,6 +26,8 @@
 
 UFILES_REGEX = cfengine-(\d+(?:\.\d+)*).tar.gz
 
+PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 solaris9-sparc solaris9-i386
+
 # File name regex to get notifications about upstream software releases
 # NOTE: Use this only if the automatic regex creation
 #       does not work for your package
@@ -50,8 +52,12 @@
 RUNTIME_DEP_PKGS_CSW$(NAME)rt += CSWosslrt
 RUNTIME_DEP_PKGS_CSW$(NAME)rt += CSWlibpcre0
 CHECKPKG_OVERRIDES_CSW$(NAME)rt += catalogname-does-not-match-pkgname|pkgname=CSW$(NAME)rt|catalogname=$(NAME)_rt|expected-catalogname=$(NAME)rt
-OBSOLETED_BY_CSW$(name)rt = CSWlibpromises1
+# Moved to runtime, since there are no header files for this library.
+CHECKPKG_OVERRIDES_CSW$(NAMES)rt += shared-lib-pkgname-mismatch
+OBSOLETED_BY_CSW$(NAME)rt = CSWlibpromises1
+CATALOGNAME_CSWlibpromises1 = libpromises1_stub
 
+
 PACKAGES += CSW$(NAME)server
 CATALOGNAME_CSW$(NAME)server = $(NAME)_server
 SPKG_DESC_CSW$(NAME)server = CFEngine 3 server binary
@@ -64,9 +70,8 @@
 PKGFILES_CSW$(NAME)server += $(mandir)/.*/cf-serverd.*
 PKGFILES_CSW$(NAME)server += $(mandir)/.*/cf-runagent.*
 PKGFILES_CSW$(NAME)server += $(initddir)/csw$(NAME)-cfserverd
-PKGFILES_CSW$(NAME)server += $(docdir)/$(NAME)_server/README.CSW
+PKGFILES_CSW$(NAME)server += $(docdir)/$(NAME)_server/.*\.CSW
 CHECKPKG_OVERRIDES_CSW$(NAME)server += catalogname-does-not-match-pkgname|pkgname=CSW$(NAME)server|catalogname=$(NAME)_server|expected-catalogname=$(NAME)server
-CHECKPKG_OVERRIDES_CSW$(NAME)server += surplus-dependency|CSW$(NAME)rt
 
 PACKAGES += CSW$(NAME)client
 CATALOGNAME_CSW$(NAME)client = $(NAME)_client
@@ -84,7 +89,7 @@
 PKGFILES_CSW$(NAME)client += $(cfengine_workdir_bin)/cf-agent
 PKGFILES_CSW$(NAME)client += $(initddir)/csw$(NAME)-cfexecd
 PKGFILES_CSW$(NAME)client += $(initddir)/csw$(NAME)-cfmonitord
-PKGFILES_CSW$(NAME)client += $(docdir)/$(NAME)_client/README.CSW
+PKGFILES_CSW$(NAME)client += $(docdir)/$(NAME)_client/.*\.CSW
 CHECKPKG_OVERRIDES_CSW$(NAME)client += catalogname-does-not-match-pkgname|pkgname=CSW$(NAME)client|catalogname=$(NAME)_client|expected-catalogname=$(NAME)client
 
 # CFEngine provides three daemons
@@ -126,6 +131,9 @@
 EXTRA_RUNPATH_ISALIST   = $(EXTRA_RUNPATH_DIRS)
 EXTRA_LDFLAGS = -L$(prefix)/bdb48/lib/$(MM_LIBDIR)
 
+# Those libs are used by configure to detect getaddrinfo()
+EXTRA_CONFIGURE_ENV = LIBS="-lsocket -lnsl"
+
 include gar/category.mk
 
 post-install-modulated: rename-cfengine-dir make-cfengine-workdir install-cfengine-links install-smf-manifests install-cfengine3rc install-cfengine3-csw-doc fix-paths-in-files
@@ -179,3 +187,8 @@
 			done ; \
 		fi ; \
 	done
+
+post-merge:
+# Get rid of the .so files. Since there are no header files provided,
+# .so files are pretty much useless
+	find $(PKGROOT)$(libdir) -name libpromises.so -exec rm \{\} \;
\ No newline at end of file

Modified: csw/mgar/pkg/cfengine3/trunk/files/changelog.CSW
===================================================================
--- csw/mgar/pkg/cfengine3/trunk/files/changelog.CSW	2012-01-06 15:36:39 UTC (rev 16718)
+++ csw/mgar/pkg/cfengine3/trunk/files/changelog.CSW	2012-01-07 13:32:39 UTC (rev 16719)
@@ -2,4 +2,9 @@
 
   * Obsoleted CSWlibpromises1.
 
+  * Built now explicitely with LIBS="-lsocket -lnsl" in order to make
+    configure detect getaddrinfo()
+
+  * Packages are now also built for Solaris 10.
+
  -- Rafael Ostertag <raos at opencsw.org>  Fri, 06 Jan 2012 16:24:39 +0100

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


From cgrzemba at users.sourceforge.net  Mon Jan  9 09:10:59 2012
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Mon, 09 Jan 2012 08:10:59 +0000
Subject: [csw-devel] SF.net SVN: gar:[16720]
	csw/mgar/pkg/mozldap/trunk/Makefile
Message-ID: <E1RkAJn-000597-7F@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 16720
          http://gar.svn.sourceforge.net/gar/?rev=16720&view=rev
Author:   cgrzemba
Date:     2012-01-09 08:10:58 +0000 (Mon, 09 Jan 2012)
Log Message:
-----------
mozldap/trunk: fix pkgconfig file

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

Modified: csw/mgar/pkg/mozldap/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mozldap/trunk/Makefile	2012-01-07 13:32:39 UTC (rev 16719)
+++ csw/mgar/pkg/mozldap/trunk/Makefile	2012-01-09 08:10:58 UTC (rev 16720)
@@ -193,7 +193,7 @@
           -e "s,%major%,$(MAJOR),g" \
           -e "s,%minor%,$(MINOR),g" \
           -e "s,%submin%,$(SUBMIN),g" \
-          -e "s,%libsuffix%,$(libdir),g" \
+          -e "s,%libsuffix%,$(MAJOR)$(MINOR),g" \
           -e "s,%bindir%,$(bindir),g" \
           -e "s,%exec_prefix%,$(bindir),g" \
           -e "s,%includedir%,$(includedir),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  Mon Jan  9 09:53:38 2012
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Mon, 09 Jan 2012 08:53:38 +0000
Subject: [csw-devel] SF.net SVN: gar:[16721] csw/mgar/pkg/msmtp/trunk
Message-ID: <E1RkAz4-0006WM-Ky@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 16721
          http://gar.svn.sourceforge.net/gar/?rev=16721&view=rev
Author:   dmichelsen
Date:     2012-01-09 08:53:38 +0000 (Mon, 09 Jan 2012)
Log Message:
-----------
msmtp/trunk: Update to 1.4.27

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

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


Property changes on: csw/mgar/pkg/msmtp/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2


Modified: csw/mgar/pkg/msmtp/trunk/Makefile
===================================================================
--- csw/mgar/pkg/msmtp/trunk/Makefile	2012-01-09 08:10:58 UTC (rev 16720)
+++ csw/mgar/pkg/msmtp/trunk/Makefile	2012-01-09 08:53:38 UTC (rev 16721)
@@ -1,5 +1,5 @@
 NAME = msmtp
-VERSION = 1.4.26
+VERSION = 1.4.27
 CATEGORIES = net
 
 DESCRIPTION = SMTP client
@@ -25,28 +25,26 @@
 MASTER_SITES = $(SF_MIRRORS)
 DISTFILES = $(NAME)-$(VERSION).tar.bz2
 
-PACKAGES += CSWmsmtp
-SPKG_DESC_CSWmsmtp = $(DESCRIPTION)
-RUNTIME_DEP_PKGS_CSWmsmtp += CSWlibgsasl7
-RUNTIME_DEP_PKGS_CSWmsmtp += CSWlibintl8
-RUNTIME_DEP_PKGS_CSWmsmtp += CSWlibidn11
-RUNTIME_DEP_PKGS_CSWmsmtp += CSWlibgnome-keyring0
-RUNTIME_DEP_PKGS_CSWmsmtp += CSWlibgnutls26
-RUNTIME_DEP_PKGS_CSWmsmtp += CSWglib2
+# New glib2 is only available for Solaris 10
+PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
 
-RUNTIME_DEP_PKGS_5.9 = CSWlibgnugetopt0
-RUNTIME_DEP_PKGS_CSWmsmtp += $(RUNTIME_DEP_PKGS_$(GAROSREL))
-
-EXTRA_LINKER_FLAGS_5.9 = -lgnugetopt
-EXTRA_LINKER_FLAGS = $(EXTRA_LINKER_FLAGS_$(GAROSREL))
-
 VENDOR_URL = http://msmtp.sourceforge.net/
 
 BUILD_DEP_PKGS += CSWlibgnutls-dev
 BUILD_DEP_PKGS += CSWlibgsasl-dev
 BUILD_DEP_PKGS += CSWggettext-dev
 BUILD_DEP_PKGS += CSWgnomekeyring-dev
+BUILD_DEP_PKGS += CSWlibglib2-dev
 
+PACKAGES += CSWmsmtp
+SPKG_DESC_CSWmsmtp = $(DESCRIPTION)
+RUNTIME_DEP_PKGS_CSWmsmtp += CSWlibgsasl7
+RUNTIME_DEP_PKGS_CSWmsmtp += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWmsmtp += CSWlibidn11
+RUNTIME_DEP_PKGS_CSWmsmtp += CSWlibgnome-keyring0
+RUNTIME_DEP_PKGS_CSWmsmtp += CSWlibgnutls26
+RUNTIME_DEP_PKGS_CSWmsmtp += CSWlibglib2-0-0
+
 PRESERVECONF = $(sysconfdir)/msmtprc
 
 include gar/category.mk

Modified: csw/mgar/pkg/msmtp/trunk/checksums
===================================================================
--- csw/mgar/pkg/msmtp/trunk/checksums	2012-01-09 08:10:58 UTC (rev 16720)
+++ csw/mgar/pkg/msmtp/trunk/checksums	2012-01-09 08:53:38 UTC (rev 16721)
@@ -1 +1 @@
-35734268c883aa06388742f902d95676  msmtp-1.4.26.tar.bz2
+2d6d10d9c59ed2b2635554ed35fb9226  msmtp-1.4.27.tar.bz2

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


From cgrzemba at users.sourceforge.net  Mon Jan  9 09:57:17 2012
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Mon, 09 Jan 2012 08:57:17 +0000
Subject: [csw-devel] SF.net SVN: gar:[16722]
	csw/mgar/pkg/mozldap/trunk/Makefile
Message-ID: <E1RkB2b-0001Pc-5g@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 16722
          http://gar.svn.sourceforge.net/gar/?rev=16722&view=rev
Author:   cgrzemba
Date:     2012-01-09 08:57:16 +0000 (Mon, 09 Jan 2012)
Log Message:
-----------
mozldap/trunk: fix bin links

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

Modified: csw/mgar/pkg/mozldap/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mozldap/trunk/Makefile	2012-01-09 08:53:38 UTC (rev 16721)
+++ csw/mgar/pkg/mozldap/trunk/Makefile	2012-01-09 08:57:16 UTC (rev 16722)
@@ -123,7 +123,7 @@
 # header file namespace.
 
 # override the standard paths
-bindir=$(prefix)/bin/dirsrv
+bindir=$(prefix)/dirsrv/bin
 includedir=$(prefix)/include/dirsrv
 
 CONFIGURE_ARGS = $(DIRPATHS)
@@ -164,6 +164,7 @@
 
 install-c-sdk:
 	ginstall -m 755 -d $(DESTDIR)/$(bindir)
+	ginstall -m 755 -d $(DESTDIR)/$(prefix)/bin
 	ginstall -m 755 -d $(DESTDIR)/$(libdir)/pkgconfig
 	ginstall -m 755 -d $(DESTDIR)/$(sysconfdir)
 	ginstall -m 755 -d $(DESTDIR)/$(includedir)
@@ -172,16 +173,17 @@
 	ginstall -m 755 $(WORKSRC)/../dist/lib/libprldap60.so $(DESTDIR)$(libdir)
 	ginstall -m 755 $(WORKSRC)/../dist/lib/libssldap60.so $(DESTDIR)$(libdir)
 	ginstall -m 755 $(WORKSRC)/../dist/bin/ldapsearch $(DESTDIR)$(bindir)
-#	ln -s $(DESTDIR)$(bindir)/ldapsearch ../ldapsearch389
 	ginstall -m 755 $(WORKSRC)/../dist/bin/ldapmodify $(DESTDIR)$(bindir)
-#	ln -s $(DESTDIR)$(bindir)/ldapmodify ../ldapmodify389
 	ginstall -m 755 $(WORKSRC)/../dist/bin/ldapdelete $(DESTDIR)$(bindir)
-#	ln -s $(DESTDIR)$(bindir)/ldapdelete ../ldapdelete389
 	ginstall -m 755 $(WORKSRC)/../dist/bin/ldapcmp $(DESTDIR)$(bindir)
-#	ln -s $(DESTDIR)$(bindir)/ldapcmp ../ldapcmp389
 	ginstall -m 755 $(WORKSRC)/../dist/bin/ldappasswd $(DESTDIR)$(bindir)
-#	ln -s $(DESTDIR)$(bindir)/ldappasswd ../ldappasswd389
 	ginstall -m 755 $(WORKSRC)/c-sdk/mozldap.pc.in $(DESTDIR)$(libdir)/pkgconfig
+	( cd $(DESTDIR)$(bindir); \
+	  gln -sf ldapsearch ../../bin/ldapsearch389 ; \
+ 	  gln -sf ldapmodify ../../bin/ldapmodify389 ; \
+	  gln -sf ldapdelete ../../bin/ldapdelete389 ; \
+	  gln -sf ldapcmp ../../bin/ldapcmp389 ; \
+	  gln -sf ldappasswd ../../bin/ldappasswd389 )
 	@for f in $(WORKSRC)/../dist/etc/*; do \
 		ginstall -m 644 $$f  $(DESTDIR)$(sysconfdir); \
 	done

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


From cgrzemba at users.sourceforge.net  Mon Jan  9 10:26:27 2012
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Mon, 09 Jan 2012 09:26:27 +0000
Subject: [csw-devel] SF.net SVN: gar:[16723]
	csw/mgar/pkg/mozldap/trunk/Makefile
Message-ID: <E1RkBUp-0000y4-5Y@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 16723
          http://gar.svn.sourceforge.net/gar/?rev=16723&view=rev
Author:   cgrzemba
Date:     2012-01-09 09:26:26 +0000 (Mon, 09 Jan 2012)
Log Message:
-----------
mozldap/trunk: fix package dependency

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

Modified: csw/mgar/pkg/mozldap/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mozldap/trunk/Makefile	2012-01-09 08:57:16 UTC (rev 16722)
+++ csw/mgar/pkg/mozldap/trunk/Makefile	2012-01-09 09:26:26 UTC (rev 16723)
@@ -105,6 +105,8 @@
 RUNTIME_DEP_PKGS_CSWmozldap-tools += CSWsasl
 RUNTIME_DEP_PKGS_CSWmozldap-tools += CSWlibplds4
 RUNTIME_DEP_PKGS_CSWmozldap-tools += CSWlibiconv2
+# it not depends on oldapclient!
+CHECKPKG_OVERRIDES_CSWmozldap-tools += missing-dependency|CSWoldapclient
 
 PACKAGES += CSWmozldap-dev
 CATALOGNAME_CSWmozldap-dev = mozldap_dev

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


From cgrzemba at users.sourceforge.net  Mon Jan  9 12:57:19 2012
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Mon, 09 Jan 2012 11:57:19 +0000
Subject: [csw-devel] SF.net SVN: gar:[16724]
 csw/mgar/pkg/lang-java/389-admin-console/trunk/ Makefile
Message-ID: <E1RkDqp-0005ez-IJ@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 16724
          http://gar.svn.sourceforge.net/gar/?rev=16724&view=rev
Author:   cgrzemba
Date:     2012-01-09 11:57:19 +0000 (Mon, 09 Jan 2012)
Log Message:
-----------
lang-java/389-admin-console/trunk: Initial release

Modified Paths:
--------------
    csw/mgar/pkg/lang-java/389-admin-console/trunk/Makefile

Modified: csw/mgar/pkg/lang-java/389-admin-console/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-java/389-admin-console/trunk/Makefile	2012-01-09 09:26:26 UTC (rev 16723)
+++ csw/mgar/pkg/lang-java/389-admin-console/trunk/Makefile	2012-01-09 11:57:19 UTC (rev 16724)
@@ -36,6 +36,11 @@
 TEST_SCRIPTS =
 INSTALL_SCRIPTS = custom
 
+CHECKPKG_OVERRIDES_CSW389-admin-console += file-with-bad-content|/usr/local|root/opt/csw/share/dirsrv/manual/en/admin/help/create_user_administrator_posix_user.html
+CHECKPKG_OVERRIDES_CSW389-admin-console += pkginfo-description-not-starting-with-uppercase|389|Directory|Server|-|Management|Console|Plugin|AdminServer
+CHECKPKG_OVERRIDES_CSW389-admin-console += unidentified-dependency|CSW389-admin
+CHECKPKG_OVERRIDES_CSW389-admin-console += surplus-dependency|CSW389-admin
+
 include gar/category.mk
 
 install-custom: 

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


From cgrzemba at users.sourceforge.net  Mon Jan  9 13:59:08 2012
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Mon, 09 Jan 2012 12:59:08 +0000
Subject: [csw-devel] SF.net SVN: gar:[16725]
 csw/mgar/pkg/lang-java/389-admin-console/trunk/ Makefile
Message-ID: <E1RkEoe-0004pa-Rb@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 16725
          http://gar.svn.sourceforge.net/gar/?rev=16725&view=rev
Author:   cgrzemba
Date:     2012-01-09 12:59:08 +0000 (Mon, 09 Jan 2012)
Log Message:
-----------
lang-java/389-admin-console/trunk: release

Modified Paths:
--------------
    csw/mgar/pkg/lang-java/389-admin-console/trunk/Makefile

Modified: csw/mgar/pkg/lang-java/389-admin-console/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-java/389-admin-console/trunk/Makefile	2012-01-09 11:57:19 UTC (rev 16724)
+++ csw/mgar/pkg/lang-java/389-admin-console/trunk/Makefile	2012-01-09 12:59:08 UTC (rev 16725)
@@ -18,7 +18,7 @@
 
 PACKAGES = CSW389-admin-console
 RUNTIME_DEP_PKGS = CSW389-admin
-# BUILD_DEP_PKGS = CSWidm-console-base
+BUILD_DEP_PKGS = CSWidm-console-base
 
 ARCHALL = 1
 PACKAGING_PLATFORMS = solaris10-sparc
@@ -28,8 +28,8 @@
 LICENSE = LICENSE
 
 WORKSRC = $(WORKDIR)
-# EXTRAJARSPATH = /opt/csw/share/java
-EXTRAJARSPATH = /home/cgrzemba/java
+EXTRAJARSPATH = /opt/csw/share/java
+# EXTRAJARSPATH = /home/cgrzemba/java
 
 CONFIGURE_SCRIPTS =
 BUILD_SCRIPTS = custom

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


From cgrzemba at users.sourceforge.net  Mon Jan  9 14:09:27 2012
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Mon, 09 Jan 2012 13:09:27 +0000
Subject: [csw-devel] SF.net SVN: gar:[16726]
 csw/mgar/pkg/lang-java/389-ds-console/trunk/ Makefile
Message-ID: <E1RkEyd-0007BJ-14@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 16726
          http://gar.svn.sourceforge.net/gar/?rev=16726&view=rev
Author:   cgrzemba
Date:     2012-01-09 13:09:26 +0000 (Mon, 09 Jan 2012)
Log Message:
-----------
lang-java/389-ds-console/trunk: release

Modified Paths:
--------------
    csw/mgar/pkg/lang-java/389-ds-console/trunk/Makefile

Modified: csw/mgar/pkg/lang-java/389-ds-console/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-java/389-ds-console/trunk/Makefile	2012-01-09 12:59:08 UTC (rev 16725)
+++ csw/mgar/pkg/lang-java/389-ds-console/trunk/Makefile	2012-01-09 13:09:26 UTC (rev 16726)
@@ -26,8 +26,8 @@
 LICENSE = LICENSE
 
 WORKSRC = $(WORKDIR)
-# EXTRAJARSPATH = /opt/csw/share/java
-EXTRAJARSPATH = /home/cgrzemba/java
+EXTRAJARSPATH = /opt/csw/share/java
+# EXTRAJARSPATH = /home/cgrzemba/java
 
 CONFIGURE_SCRIPTS =
 BUILD_SCRIPTS = custom

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


From cgrzemba at users.sourceforge.net  Mon Jan  9 14:28:37 2012
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Mon, 09 Jan 2012 13:28:37 +0000
Subject: [csw-devel] SF.net SVN: gar:[16727]
 csw/mgar/pkg/lang-java/389-ds-console/trunk/ Makefile
Message-ID: <E1RkFHB-0005Kb-G9@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 16727
          http://gar.svn.sourceforge.net/gar/?rev=16727&view=rev
Author:   cgrzemba
Date:     2012-01-09 13:28:37 +0000 (Mon, 09 Jan 2012)
Log Message:
-----------
lang-java/389-ds-console/trunk: build only on S10

Modified Paths:
--------------
    csw/mgar/pkg/lang-java/389-ds-console/trunk/Makefile

Modified: csw/mgar/pkg/lang-java/389-ds-console/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-java/389-ds-console/trunk/Makefile	2012-01-09 13:09:26 UTC (rev 16726)
+++ csw/mgar/pkg/lang-java/389-ds-console/trunk/Makefile	2012-01-09 13:28:37 UTC (rev 16727)
@@ -20,6 +20,7 @@
 RUNTIME_DEP_PKGS = CSW389-admin
 
 ARCHALL = 1
+PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
 
 CATALOGNAME_CSW389-ds-console = 389_ds_console
 

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


From bonivart at users.sourceforge.net  Mon Jan  9 18:22:42 2012
From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net)
Date: Mon, 09 Jan 2012 17:22:42 +0000
Subject: [csw-devel] SF.net SVN: gar:[16728] csw/mgar/pkg/pkgutil/trunk
Message-ID: <E1RkIvi-0003i3-S4@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 16728
          http://gar.svn.sourceforge.net/gar/?rev=16728&view=rev
Author:   bonivart
Date:     2012-01-09 17:22:42 +0000 (Mon, 09 Jan 2012)
Log Message:
-----------
pkgutil: 2.6.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	2012-01-09 13:28:37 UTC (rev 16727)
+++ csw/mgar/pkg/pkgutil/trunk/Makefile	2012-01-09 17:22:42 UTC (rev 16728)
@@ -1,5 +1,5 @@
 NAME = pkgutil
-VERSION = 2.6
+VERSION = 2.6.1b1
 CATEGORIES = utils
 
 DESCRIPTION = Installs Solaris packages easily

Modified: csw/mgar/pkg/pkgutil/trunk/checksums
===================================================================
--- csw/mgar/pkg/pkgutil/trunk/checksums	2012-01-09 13:28:37 UTC (rev 16727)
+++ csw/mgar/pkg/pkgutil/trunk/checksums	2012-01-09 17:22:42 UTC (rev 16728)
@@ -1 +1 @@
-2ed2712aa0bed253ebe6a0b76e34fed0  pkgutil-2.6.zip
+8dd59f7d63192d47b34ea63ffe26e47e  pkgutil-2.6.1b1.zip

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


From bonivart at users.sourceforge.net  Mon Jan  9 21:02:43 2012
From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net)
Date: Mon, 09 Jan 2012 20:02:43 +0000
Subject: [csw-devel] SF.net SVN: gar:[16729] csw/mgar/pkg
Message-ID: <E1RkLQZ-0002cC-DW@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 16729
          http://gar.svn.sourceforge.net/gar/?rev=16729&view=rev
Author:   bonivart
Date:     2012-01-09 20:02:43 +0000 (Mon, 09 Jan 2012)
Log Message:
-----------
md5deep/trunk: initial commit

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

Added: csw/mgar/pkg/md5deep/Makefile
===================================================================
--- csw/mgar/pkg/md5deep/Makefile	                        (rev 0)
+++ csw/mgar/pkg/md5deep/Makefile	2012-01-09 20:02:43 UTC (rev 16729)
@@ -0,0 +1,2 @@
+%:
+	$(MAKE) -C trunk $*


Property changes on: csw/mgar/pkg/md5deep/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/md5deep/trunk/Makefile
===================================================================
--- csw/mgar/pkg/md5deep/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/md5deep/trunk/Makefile	2012-01-09 20:02:43 UTC (rev 16729)
@@ -0,0 +1,22 @@
+# $Id$
+# TODO (release-critical prefixed with !, non release-critical with *)
+#
+NAME = md5deep
+VERSION = 4.0.0
+GARTYPE = v2
+CATEGORIES = utils
+
+DESCRIPTION = Compute MD5, SHA-1, SHA-256, Tiger, or Whirlpool message digests
+define BLURB
+  A set of programs to compute MD5, SHA-1, SHA-256, Tiger, or Whirlpool message digests on an arbitrary number of files
+endef
+
+MASTER_SITES = $(SF_MIRRORS)
+DISTFILES = $(DISTNAME).tar.gz
+
+GARCOMPILER = GNU
+
+CONFIGURE_ARGS = $(DIRPATHS)
+
+include gar/category.mk
+


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

Added: csw/mgar/pkg/md5deep/trunk/checksums
===================================================================
--- csw/mgar/pkg/md5deep/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/md5deep/trunk/checksums	2012-01-09 20:02:43 UTC (rev 16729)
@@ -0,0 +1 @@
+fc3c0afbcf72861a5a42c699e804d6d4  md5deep-4.0.0.tar.gz

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


From bdwalton at users.sourceforge.net  Tue Jan 10 03:05:24 2012
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Tue, 10 Jan 2012 02:05:24 +0000
Subject: [csw-devel] SF.net SVN: gar:[16730]
	csw/mgar/pkg/pkg-get/trunk/Makefile
Message-ID: <E1RkR5Y-0005jA-K9@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 16730
          http://gar.svn.sourceforge.net/gar/?rev=16730&view=rev
Author:   bdwalton
Date:     2012-01-10 02:05:24 +0000 (Tue, 10 Jan 2012)
Log Message:
-----------
pkg-get/trunk: drop the postinstall file

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

Modified: csw/mgar/pkg/pkg-get/trunk/Makefile
===================================================================
--- csw/mgar/pkg/pkg-get/trunk/Makefile	2012-01-09 20:02:43 UTC (rev 16729)
+++ csw/mgar/pkg/pkg-get/trunk/Makefile	2012-01-10 02:05:24 UTC (rev 16730)
@@ -12,7 +12,6 @@
 endef
 
 MASTER_SITES = http://opencsw.org
-DISTFILES = CSWpkgget.postinstall
 
 CONFIGURE_SCRIPTS =
 BUILD_SCRIPTS = 

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


From bdwalton at users.sourceforge.net  Tue Jan 10 03:17:16 2012
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Tue, 10 Jan 2012 02:17:16 +0000
Subject: [csw-devel] SF.net SVN: gar:[16731] csw/mgar/pkg/git/trunk/files/
 0007-Use-perl-instead-of-sed-for-t8006-blame-textconv-tes.patch
Message-ID: <E1RkRH2-0005wh-5p@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 16731
          http://gar.svn.sourceforge.net/gar/?rev=16731&view=rev
Author:   bdwalton
Date:     2012-01-10 02:17:15 +0000 (Tue, 10 Jan 2012)
Log Message:
-----------
git/trunk: tweak the wording in the sed to perl test fix patch

Modified Paths:
--------------
    csw/mgar/pkg/git/trunk/files/0007-Use-perl-instead-of-sed-for-t8006-blame-textconv-tes.patch

Modified: csw/mgar/pkg/git/trunk/files/0007-Use-perl-instead-of-sed-for-t8006-blame-textconv-tes.patch
===================================================================
--- csw/mgar/pkg/git/trunk/files/0007-Use-perl-instead-of-sed-for-t8006-blame-textconv-tes.patch	2012-01-10 02:05:24 UTC (rev 16730)
+++ csw/mgar/pkg/git/trunk/files/0007-Use-perl-instead-of-sed-for-t8006-blame-textconv-tes.patch	2012-01-10 02:17:15 UTC (rev 16731)
@@ -1,20 +1,24 @@
-From 146a5f084306992e70bc31d93d110fa2b9192160 Mon Sep 17 00:00:00 2001
+From df9fcdc3e9f415416b86ec572f0a248264483c06 Mon Sep 17 00:00:00 2001
 From: Ben Walton <bwalton at opencsw.org>
 Date: Sat, 31 Dec 2011 05:02:05 +0100
 Subject: [PATCH] Use perl instead of sed for t8006-blame-textconv test
 
 In test 'blame --textconv with local changes' of t8006-blame-textconv,
-using /usr/xpg4/bin/sed (as set by SANE_TOOL_PATH), an additional newline
-was added to the output from the 'helper' script.
+using /usr/xpg4/bin/sed (as set by SANE_TOOL_PATH), an additional
+newline was added to the output from the 'helper' script.
 
 This was noted by sed with a message such as:
 sed: Missing newline at end of file zero.bin.
 
+Sed then exits with status 2 causing the helper script to also exit
+with status 2.
+
 In turn, this was triggering a fatal error from git blame:
 fatal: unable to read files to diff
 
-To work around this difference in sed behaviour, use perl -p instead of
-sed -e as it will not insert the newline.
+To work around this difference in sed behaviour, use perl -p instead
+of sed -e as it exits cleanly and does not insert the additional
+newline.
 
 Signed-off-by: Ben Walton <bwalton at opencsw.org>
 ---
@@ -35,5 +39,5 @@
  chmod +x helper
  
 -- 
-1.7.6.1
+1.7.8.2
 

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


From bdwalton at users.sourceforge.net  Tue Jan 10 03:34:03 2012
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Tue, 10 Jan 2012 02:34:03 +0000
Subject: [csw-devel] SF.net SVN: gar:[16732] csw/mgar/pkg/git/trunk
Message-ID: <E1RkRXH-0002Ro-8x@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 16732
          http://gar.svn.sourceforge.net/gar/?rev=16732&view=rev
Author:   bdwalton
Date:     2012-01-10 02:34:03 +0000 (Tue, 10 Jan 2012)
Log Message:
-----------
git/trunk: version bump to 1.7.8.3

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

Modified: csw/mgar/pkg/git/trunk/Makefile
===================================================================
--- csw/mgar/pkg/git/trunk/Makefile	2012-01-10 02:17:15 UTC (rev 16731)
+++ csw/mgar/pkg/git/trunk/Makefile	2012-01-10 02:34:03 UTC (rev 16732)
@@ -1,5 +1,5 @@
 NAME = git
-VERSION = 1.7.8.2
+VERSION = 1.7.8.3
 #PATCHLEVEL = rc1
 CATEGORIES = devel
 

Modified: csw/mgar/pkg/git/trunk/checksums
===================================================================
--- csw/mgar/pkg/git/trunk/checksums	2012-01-10 02:17:15 UTC (rev 16731)
+++ csw/mgar/pkg/git/trunk/checksums	2012-01-10 02:34:03 UTC (rev 16732)
@@ -1 +1 @@
-f9def92c4afb708f69006da841502b80  git-1.7.8.2.tar.gz
+7a4bc5160166537d4da5eb48a7670dff  git-1.7.8.3.tar.gz

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


From cgrzemba at users.sourceforge.net  Tue Jan 10 08:12:46 2012
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Tue, 10 Jan 2012 07:12:46 +0000
Subject: [csw-devel] SF.net SVN: gar:[16733]
	csw/mgar/pkg/389-adminutil/trunk/Makefile
Message-ID: <E1RkVt0-0002ku-Gq@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 16733
          http://gar.svn.sourceforge.net/gar/?rev=16733&view=rev
Author:   cgrzemba
Date:     2012-01-10 07:12:46 +0000 (Tue, 10 Jan 2012)
Log Message:
-----------
389-adminutil/trunk: Initial release

Modified Paths:
--------------
    csw/mgar/pkg/389-adminutil/trunk/Makefile

Modified: csw/mgar/pkg/389-adminutil/trunk/Makefile
===================================================================
--- csw/mgar/pkg/389-adminutil/trunk/Makefile	2012-01-10 02:34:03 UTC (rev 16732)
+++ csw/mgar/pkg/389-adminutil/trunk/Makefile	2012-01-10 07:12:46 UTC (rev 16733)
@@ -14,8 +14,10 @@
 
 MASTER_SITES = http://port389.org/sources
 DISTFILES  = $(NAME)-$(VERSION).tar.bz2
+
 # BUILD64 = 1
-
+PACKAGING_PLATFORMS += solaris10-sparc
+# PACKAGING_PLATFORMS += solaris10-i386
 # GARCOMPILER = SOS12U2
 
 PACKAGES += CSWlibadminutil0
@@ -53,6 +55,7 @@
 PKGFILES_CSW389-adminutil-dev += $(PKGFILES_DEV)
 PKGFILES_CSW389-adminutil-dev += $(call baseisadirs,$(libdir),libadminutil\.so)
 PKGFILES_CSW389-adminutil-dev += $(call baseisadirs,$(libdir),libadmsslutil\.so)
+PKGFILES_CSW389-adminutil-dev += $(call baseisadirs,$(libdir)/pkgconfig,389adminutil\.pc)
 RUNTIME_DEP_PKGS_CSW389-adminutil-dev += CSWlibadminutil0
 RUNTIME_DEP_PKGS_CSW389-adminutil-dev += CSWlibadmsslutil0
 
@@ -61,7 +64,7 @@
 EXTRA_CFLAGS = -norunpath
 
 CONFIGURE_ARGS = $(DIRPATHS)
-CONFIGURE_ARGS_OPT += --with-ldapsdk-inc=/opt/csw/include/ldap 
+CONFIGURE_ARGS_OPT += --with-ldapsdk-inc=/opt/csw/include/dirsrv 
 CONFIGURE_ARGS_OPT += --with-ldapsdk-lib=/opt/csw/lib 
 CONFIGURE_ARGS_OPT += --with-icu-inc=/opt/csw/include 
 CONFIGURE_ARGS_OPT += --with-icu-lib=/opt/csw/lib 

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


From cgrzemba at users.sourceforge.net  Tue Jan 10 08:23:54 2012
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Tue, 10 Jan 2012 07:23:54 +0000
Subject: [csw-devel] SF.net SVN: gar:[16734]
	csw/mgar/pkg/389-adminutil/trunk/Makefile
Message-ID: <E1RkW3m-0004FP-3S@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 16734
          http://gar.svn.sourceforge.net/gar/?rev=16734&view=rev
Author:   cgrzemba
Date:     2012-01-10 07:23:53 +0000 (Tue, 10 Jan 2012)
Log Message:
-----------
389-adminutil/trunk: add packaging platform

Modified Paths:
--------------
    csw/mgar/pkg/389-adminutil/trunk/Makefile

Modified: csw/mgar/pkg/389-adminutil/trunk/Makefile
===================================================================
--- csw/mgar/pkg/389-adminutil/trunk/Makefile	2012-01-10 07:12:46 UTC (rev 16733)
+++ csw/mgar/pkg/389-adminutil/trunk/Makefile	2012-01-10 07:23:53 UTC (rev 16734)
@@ -17,7 +17,7 @@
 
 # BUILD64 = 1
 PACKAGING_PLATFORMS += solaris10-sparc
-# PACKAGING_PLATFORMS += solaris10-i386
+PACKAGING_PLATFORMS += solaris10-i386
 # GARCOMPILER = SOS12U2
 
 PACKAGES += CSWlibadminutil0

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


From cgrzemba at users.sourceforge.net  Tue Jan 10 11:51:54 2012
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Tue, 10 Jan 2012 10:51:54 +0000
Subject: [csw-devel] SF.net SVN: gar:[16735]
	csw/mgar/pkg/389-adminutil/trunk/Makefile
Message-ID: <E1RkZJ4-0004Dz-DT@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 16735
          http://gar.svn.sourceforge.net/gar/?rev=16735&view=rev
Author:   cgrzemba
Date:     2012-01-10 10:51:54 +0000 (Tue, 10 Jan 2012)
Log Message:
-----------
389-adminutil/trunk: add pre-configure-modulated target to regenerate ltmain.sh

Modified Paths:
--------------
    csw/mgar/pkg/389-adminutil/trunk/Makefile

Modified: csw/mgar/pkg/389-adminutil/trunk/Makefile
===================================================================
--- csw/mgar/pkg/389-adminutil/trunk/Makefile	2012-01-10 07:23:53 UTC (rev 16734)
+++ csw/mgar/pkg/389-adminutil/trunk/Makefile	2012-01-10 10:51:54 UTC (rev 16735)
@@ -18,7 +18,7 @@
 # BUILD64 = 1
 PACKAGING_PLATFORMS += solaris10-sparc
 PACKAGING_PLATFORMS += solaris10-i386
-# GARCOMPILER = SOS12U2
+GARCOMPILER = SOS12U2
 
 PACKAGES += CSWlibadminutil0
 CATALOGNAME_CSWlibadminutil0 = libadminutil0
@@ -28,7 +28,9 @@
 RUNTIME_DEP_PKGS_CSWlibadminutil0 += CSWlibldif60
 RUNTIME_DEP_PKGS_CSWlibadminutil0 += CSWlibnspr4
 RUNTIME_DEP_PKGS_CSWlibadminutil0 += CSWlibssldap60
-RUNTIME_DEP_PKGS_CSWlibadminutil0 += CSWlibicu46
+RUNTIME_DEP_PKGS_CSWlibadminutil0 += CSWlibicuuc48
+RUNTIME_DEP_PKGS_CSWlibadminutil0 += CSWlibicui18n48
+RUNTIME_DEP_PKGS_CSWlibadminutil0 += CSWlibicudata48
 RUNTIME_DEP_PKGS_CSWlibadminutil0 += CSWsasl
 RUNTIME_DEP_PKGS_CSWlibadminutil0 += CSWlibnss3
 RUNTIME_DEP_PKGS_CSWlibadminutil0 += CSWlibplc4
@@ -42,7 +44,9 @@
 RUNTIME_DEP_PKGS_CSWlibadmsslutil0 += CSWlibldif60
 RUNTIME_DEP_PKGS_CSWlibadmsslutil0 += CSWlibnspr4
 RUNTIME_DEP_PKGS_CSWlibadmsslutil0 += CSWlibssldap60
-RUNTIME_DEP_PKGS_CSWlibadmsslutil0 += CSWlibicu46
+RUNTIME_DEP_PKGS_CSWlibadmsslutil0 += CSWlibicuuc48
+RUNTIME_DEP_PKGS_CSWlibadmsslutil0 += CSWlibicui18n48
+RUNTIME_DEP_PKGS_CSWlibadmsslutil0 += CSWlibicudata48
 RUNTIME_DEP_PKGS_CSWlibadmsslutil0 += CSWsasl
 RUNTIME_DEP_PKGS_CSWlibadmsslutil0 += CSWlibnss3
 RUNTIME_DEP_PKGS_CSWlibadmsslutil0 += CSWlibplc4
@@ -61,7 +65,7 @@
 
 
 TEST_SCRIPTS = 
-EXTRA_CFLAGS = -norunpath
+EXTRA_LINKER_FLAGS = -xnorunpath -norunpath
 
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS_OPT += --with-ldapsdk-inc=/opt/csw/include/dirsrv 
@@ -77,5 +81,15 @@
 CONFIGURE_ARGS_OPT += --with-nspr-inc=/opt/csw/include/nspr
 CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARFLAVOR))
 
+# CHECKPKG_OVERRIDES_CSWlibadmsslutil0 += pkginfo-opencsw-repository-uncommitted
+# CHECKPKG_OVERRIDES_CSWlibadminutil0 += pkginfo-opencsw-repository-uncommitted
+# CHECKPKG_OVERRIDES_CSW389-adminutil-dev += pkginfo-opencsw-repository-uncommitted
 include gar/category.mk
 
+pre-configure-modulated:
+	cd $(WORKSRC) && rm ltmain.sh && libtoolize --copy --force
+	cd $(WORKSRC) && aclocal
+	cd $(WORKSRC) && autoconf --force
+	cd $(WORKSRC) && automake -a -c -f
+	@$(MAKECOOKIE)
+

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


From cgrzemba at users.sourceforge.net  Tue Jan 10 11:53:05 2012
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Tue, 10 Jan 2012 10:53:05 +0000
Subject: [csw-devel] SF.net SVN: gar:[16736]
	csw/mgar/pkg/mozldap/trunk/Makefile
Message-ID: <E1RkZKD-0000pV-PI@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 16736
          http://gar.svn.sourceforge.net/gar/?rev=16736&view=rev
Author:   cgrzemba
Date:     2012-01-10 10:53:05 +0000 (Tue, 10 Jan 2012)
Log Message:
-----------
mozldap/trunk: fix bin links creation

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

Modified: csw/mgar/pkg/mozldap/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mozldap/trunk/Makefile	2012-01-10 10:51:54 UTC (rev 16735)
+++ csw/mgar/pkg/mozldap/trunk/Makefile	2012-01-10 10:53:05 UTC (rev 16736)
@@ -180,12 +180,12 @@
 	ginstall -m 755 $(WORKSRC)/../dist/bin/ldapcmp $(DESTDIR)$(bindir)
 	ginstall -m 755 $(WORKSRC)/../dist/bin/ldappasswd $(DESTDIR)$(bindir)
 	ginstall -m 755 $(WORKSRC)/c-sdk/mozldap.pc.in $(DESTDIR)$(libdir)/pkgconfig
-	( cd $(DESTDIR)$(bindir); \
-	  gln -sf ldapsearch ../../bin/ldapsearch389 ; \
- 	  gln -sf ldapmodify ../../bin/ldapmodify389 ; \
-	  gln -sf ldapdelete ../../bin/ldapdelete389 ; \
-	  gln -sf ldapcmp ../../bin/ldapcmp389 ; \
-	  gln -sf ldappasswd ../../bin/ldappasswd389 )
+	( cd $(DESTDIR)$(prefix)/bin; \
+	  gln -sf ../dirsrv/bin/ldapsearch ldapsearch389 ; \
+	  gln -sf ../dirsrv/bin/ldapmodify ldapmodify389 ; \
+	  gln -sf ../dirsrv/bin/ldapdelete ldapdelete389 ; \
+	  gln -sf ../dirsrv/bin/ldapcmp ldapcmp389 ; \
+	  gln -sf ../dirsrv/bin/ldappasswd ldappasswd389 )
 	@for f in $(WORKSRC)/../dist/etc/*; do \
 		ginstall -m 644 $$f  $(DESTDIR)$(sysconfdir); \
 	done

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


From cgrzemba at users.sourceforge.net  Tue Jan 10 13:01:37 2012
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Tue, 10 Jan 2012 12:01:37 +0000
Subject: [csw-devel] SF.net SVN: gar:[16737]
	csw/mgar/pkg/389-adminutil/trunk/Makefile
Message-ID: <E1RkaOX-0003yu-JL@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 16737
          http://gar.svn.sourceforge.net/gar/?rev=16737&view=rev
Author:   cgrzemba
Date:     2012-01-10 12:01:37 +0000 (Tue, 10 Jan 2012)
Log Message:
-----------
389-adminutil/trunk: fix package content

Modified Paths:
--------------
    csw/mgar/pkg/389-adminutil/trunk/Makefile

Modified: csw/mgar/pkg/389-adminutil/trunk/Makefile
===================================================================
--- csw/mgar/pkg/389-adminutil/trunk/Makefile	2012-01-10 10:53:05 UTC (rev 16736)
+++ csw/mgar/pkg/389-adminutil/trunk/Makefile	2012-01-10 12:01:37 UTC (rev 16737)
@@ -24,6 +24,7 @@
 CATALOGNAME_CSWlibadminutil0 = libadminutil0
 SPKG_DESC_CSWlibadminutil0 += $(DESCRIPTION), libadminutil
 PKGFILES_CSWlibadminutil0 +=  $(call baseisadirs,$(libdir),libadminutil\.so(\.\d+)+)
+PKGFILES_CSWlibadminutil0 +=  $(call baseisadirs,$(sharedstatedir),.*\.res)
 RUNTIME_DEP_PKGS_CSWlibadminutil0 += CSWlibprldap60
 RUNTIME_DEP_PKGS_CSWlibadminutil0 += CSWlibldif60
 RUNTIME_DEP_PKGS_CSWlibadminutil0 += CSWlibnspr4
@@ -55,15 +56,15 @@
 
 PACKAGES += CSW389-adminutil-dev
 CATALOGNAME_CSW389-adminutil-dev = 389_adminutil_dev
+ARCHALL_CSW389-adminutil-dev = 1
 SPKG_DESC_CSW389-adminutil-dev += $(DESCRIPTION), development files
-PKGFILES_CSW389-adminutil-dev += $(PKGFILES_DEV)
-PKGFILES_CSW389-adminutil-dev += $(call baseisadirs,$(libdir),libadminutil\.so)
-PKGFILES_CSW389-adminutil-dev += $(call baseisadirs,$(libdir),libadmsslutil\.so)
-PKGFILES_CSW389-adminutil-dev += $(call baseisadirs,$(libdir)/pkgconfig,389adminutil\.pc)
+# PKGFILES_CSW389-adminutil-dev += $(PKGFILES_DEV)
+# PKGFILES_CSW389-adminutil-dev += $(call baseisadirs,$(libdir),libadminutil\.so)
+# PKGFILES_CSW389-adminutil-dev += $(call baseisadirs,$(libdir),libadmsslutil\.so)
+# PKGFILES_CSW389-adminutil-dev += $(call baseisadirs,$(libdir)/pkgconfig,389adminutil\.pc)
 RUNTIME_DEP_PKGS_CSW389-adminutil-dev += CSWlibadminutil0
 RUNTIME_DEP_PKGS_CSW389-adminutil-dev += CSWlibadmsslutil0
 
-
 TEST_SCRIPTS = 
 EXTRA_LINKER_FLAGS = -xnorunpath -norunpath
 

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


From cgrzemba at users.sourceforge.net  Tue Jan 10 13:52:54 2012
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Tue, 10 Jan 2012 12:52:54 +0000
Subject: [csw-devel] SF.net SVN: gar:[16738]
	csw/mgar/pkg/389-adminutil/trunk/Makefile
Message-ID: <E1RkbCA-0006Tu-CE@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 16738
          http://gar.svn.sourceforge.net/gar/?rev=16738&view=rev
Author:   cgrzemba
Date:     2012-01-10 12:52:54 +0000 (Tue, 10 Jan 2012)
Log Message:
-----------
389-adminutil/trunk: add CHECKPKG_OVERRIDES

Modified Paths:
--------------
    csw/mgar/pkg/389-adminutil/trunk/Makefile

Modified: csw/mgar/pkg/389-adminutil/trunk/Makefile
===================================================================
--- csw/mgar/pkg/389-adminutil/trunk/Makefile	2012-01-10 12:01:37 UTC (rev 16737)
+++ csw/mgar/pkg/389-adminutil/trunk/Makefile	2012-01-10 12:52:54 UTC (rev 16738)
@@ -64,7 +64,10 @@
 # PKGFILES_CSW389-adminutil-dev += $(call baseisadirs,$(libdir)/pkgconfig,389adminutil\.pc)
 RUNTIME_DEP_PKGS_CSW389-adminutil-dev += CSWlibadminutil0
 RUNTIME_DEP_PKGS_CSW389-adminutil-dev += CSWlibadmsslutil0
+CHECKPKG_OVERRIDES_CSW389-adminutil-dev += archall-devel-package
+CHECKPKG_OVERRIDES_CSW389-adminutil-dev += file-with-bad-content|/usr/share|root/opt/csw/include/libadminutil/resource.h
 
+
 TEST_SCRIPTS = 
 EXTRA_LINKER_FLAGS = -xnorunpath -norunpath
 

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


From cgrzemba at users.sourceforge.net  Tue Jan 10 15:22:37 2012
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Tue, 10 Jan 2012 14:22:37 +0000
Subject: [csw-devel] SF.net SVN: gar:[16739] csw/mgar/pkg
Message-ID: <E1Rkcaz-0002bw-Pv@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 16739
          http://gar.svn.sourceforge.net/gar/?rev=16739&view=rev
Author:   cgrzemba
Date:     2012-01-10 14:22:37 +0000 (Tue, 10 Jan 2012)
Log Message:
-----------
389-ds-base/trunk: First try

Added Paths:
-----------
    csw/mgar/pkg/389-ds-base/
    csw/mgar/pkg/389-ds-base/Makefile
    csw/mgar/pkg/389-ds-base/branches/
    csw/mgar/pkg/389-ds-base/tags/
    csw/mgar/pkg/389-ds-base/trunk/
    csw/mgar/pkg/389-ds-base/trunk/Makefile
    csw/mgar/pkg/389-ds-base/trunk/checksums
    csw/mgar/pkg/389-ds-base/trunk/files/
    csw/mgar/pkg/389-ds-base/trunk/files/0005-add-standard-path.patch
    csw/mgar/pkg/389-ds-base/trunk/files/0006-replace-SV-sh-with-Posix-sh.patch
    csw/mgar/pkg/389-ds-base/trunk/files/0007-create-var-run-dirsrv.patch

Added: csw/mgar/pkg/389-ds-base/Makefile
===================================================================
--- csw/mgar/pkg/389-ds-base/Makefile	                        (rev 0)
+++ csw/mgar/pkg/389-ds-base/Makefile	2012-01-10 14:22:37 UTC (rev 16739)
@@ -0,0 +1,2 @@
+%:
+	$(MAKE) -C trunk $*


Property changes on: csw/mgar/pkg/389-ds-base/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/389-ds-base/trunk/Makefile
===================================================================
--- csw/mgar/pkg/389-ds-base/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/389-ds-base/trunk/Makefile	2012-01-10 14:22:37 UTC (rev 16739)
@@ -0,0 +1,76 @@
+# $Id$
+# TODO (release-critical prefixed with !, non release-critical with *)
+#
+NAME = 389-ds-base
+VERSION = 1.2.9.9
+GARTYPE = v2
+CATEGORIES = server
+
+DESCRIPTION = The enterprise-class Open Source LDAP server
+define BLURB
+The enterprise-class Open Source LDAP server for Linux. It is hardened by real-world use, is full-featured, supports multi-master replication, and already handles many of the largest LDAP deployments in the world. The 389 Directory Server can be downloaded for free and set up in less than an hour using the graphical console.
+endef
+
+MASTER_SITES = http://port389.org/sources
+DISTFILES  = $(NAME)-$(VERSION).tar.bz2
+# BUILD64	= 1
+
+PATCHFILES += 0005-add-standard-path.patch
+PATCHFILES += 0006-replace-SV-sh-with-Posix-sh.patch
+PATCHFILES += 0007-create-var-run-dirsrv.patch
+
+RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibssldap60
+RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibprldap60
+RUNTIME_DEP_PKGS_CSW389-ds-base += CSWperl
+RUNTIME_DEP_PKGS_CSW389-ds-base += CSWpython
+RUNTIME_DEP_PKGS_CSW389-ds-base += CSWsasl
+RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibldif60
+RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibsvrcore0
+RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibnspr4
+RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibicu46
+RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibldap60
+RUNTIME_DEP_PKGS_CSW389-ds-base += CSWnetsnmp
+RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibplds4
+RUNTIME_DEP_PKGS_CSW389-ds-base += CSWkrb5lib
+RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibpcre0
+RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibnss3
+RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibplc4
+CHECKPKG_OVERRIDES_CSW389-ds-base += file-with-bad-content|/usr/share|root/opt/csw/lib/dirsrv/perl/DSUpdate.pm
+CHECKPKG_OVERRIDES_CSW389-ds-base += file-with-bad-content|/usr/share|root/opt/csw/share/dirsrv/updates/exampleupdate.ldif
+CHECKPKG_OVERRIDES_CSW389-ds-base += file-with-bad-content|/usr/share|root/opt/csw/share/man/man1/dbgen.pl.1
+CHECKPKG_OVERRIDES_CSW389-ds-base += license-missing|/opt/csw/share/doc/389_ds_base/license
+CHECKPKG_OVERRIDES_CSW389-ds-base += init-file-missing-cswinitsmf-class|/etc/opt/csw/init.d/dirsrv|class=none
+CHECKPKG_OVERRIDES_CSW389-ds-base += init-file-missing-cswinitsmf-class|/etc/opt/csw/init.d/dirsrv-snmp|class=none
+CHECKPKG_OVERRIDES_CSW389-ds-base += soname-not-found|libdb-4.8.so|is|needed|by|opt/csw/lib/dirsrv/plugins/libback-ldbm.so
+CHECKPKG_OVERRIDES_CSW389-ds-base += soname-not-found|libdb-4.8.so|is|needed|by|opt/csw/bin/dbscan-bin
+CHECKPKG_OVERRIDES_CSW389-ds-base += soname-not-found|libdb-4.8.so|is|needed|by|opt/csw/lib/dirsrv/plugins/libreplication-plugin.so
+
+# GARCOMPILER = SOS12U2
+
+CONFIGURE_ARGS = $(DIRPATHS)
+CONFIGURE_ARGS_OPT += --with-ldapsdk-inc=/opt/csw/include/dirsrv 
+CONFIGURE_ARGS_OPT += --with-ldapsdk-lib=/opt/csw/lib
+CONFIGURE_ARGS_OPT += --with-ldapsdk-bin=/opt/csw/dirsrv/bin 
+CONFIGURE_ARGS_OPT += --with-db-inc=/opt/csw/bdb48/include 
+CONFIGURE_ARGS_OPT += --with-db-lib=/opt/csw/bdb48/lib
+CONFIGURE_ARGS_OPT += --with-icu-inc=/opt/csw/include 
+CONFIGURE_ARGS_OPT += --with-icu-lib=/opt/csw/lib
+CONFIGURE_ARGS_OPT += --with-icu-bin=/opt/csw/bin 
+CONFIGURE_ARGS_OPT += --with-netsnmp-inc=/opt/csw/include 
+CONFIGURE_ARGS_OPT += --with-netsnmp-lib=/opt/csw/lib
+CONFIGURE_ARGS_OPT += --with-sasl-inc=/opt/csw/include/sasl 
+CONFIGURE_ARGS_OPT += --with-sasl-lib=/opt/csw/lib
+CONFIGURE_ARGS_OPT += --with-nss-lib=/opt/csw/lib
+CONFIGURE_ARGS_OPT += --with-nss-inc=/opt/csw/include/nss 
+CONFIGURE_ARGS_OPT += --with-nspr-lib=/opt/csw/lib
+CONFIGURE_ARGS_OPT += --with-nspr-inc=/opt/csw/include/nspr
+CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARFLAVOR))
+
+include gar/category.mk
+
+pre-configure-modulated:
+	cd $(WORKSRC) && rm ltmain.sh && libtoolize --copy --force
+	cd $(WORKSRC) && aclocal
+	cd $(WORKSRC) && autoconf --force
+	cd $(WORKSRC) && automake -a -c -f
+	@$(MAKECOOKIE)


Property changes on: csw/mgar/pkg/389-ds-base/trunk/Makefile
___________________________________________________________________
Added: svn:keywords
   + Id

Added: csw/mgar/pkg/389-ds-base/trunk/checksums
===================================================================
--- csw/mgar/pkg/389-ds-base/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/389-ds-base/trunk/checksums	2012-01-10 14:22:37 UTC (rev 16739)
@@ -0,0 +1 @@
+85ca908b219b6b7689bcf411b800e2e2  389-ds-base-1.2.9.9.tar.bz2

Added: csw/mgar/pkg/389-ds-base/trunk/files/0005-add-standard-path.patch
===================================================================
--- csw/mgar/pkg/389-ds-base/trunk/files/0005-add-standard-path.patch	                        (rev 0)
+++ csw/mgar/pkg/389-ds-base/trunk/files/0005-add-standard-path.patch	2012-01-10 14:22:37 UTC (rev 16739)
@@ -0,0 +1,25 @@
+From 9e7786a9b7d088a656f17c00ab6b293450a8fdb4 Mon Sep 17 00:00:00 2001
+From: Carsten Grzemba <cgrzemba at opencsw.org>
+Date: Tue, 10 Jan 2012 14:25:16 +0100
+Subject: [PATCH 5/7] add standard path
+
+---
+ wrappers/dsktune.in |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/wrappers/dsktune.in b/wrappers/dsktune.in
+index 7c4777c..c269582 100755
+--- a/wrappers/dsktune.in
++++ b/wrappers/dsktune.in
+@@ -30,7 +30,7 @@ export LD_LIBRARY_PATH
+ ##             path on this platform.                                        ##
+ ###############################################################################
+ 
+-PATH=${BIN_DIR}
++PATH=${BIN_DIR}:$PATH
+ export PATH
+ 
+ 
+-- 
+1.7.6.1
+

Added: csw/mgar/pkg/389-ds-base/trunk/files/0006-replace-SV-sh-with-Posix-sh.patch
===================================================================
--- csw/mgar/pkg/389-ds-base/trunk/files/0006-replace-SV-sh-with-Posix-sh.patch	                        (rev 0)
+++ csw/mgar/pkg/389-ds-base/trunk/files/0006-replace-SV-sh-with-Posix-sh.patch	2012-01-10 14:22:37 UTC (rev 16739)
@@ -0,0 +1,44 @@
+From d0ae6040f0b211a6ce51d090213bf7a6c8fbc26b Mon Sep 17 00:00:00 2001
+From: Carsten Grzemba <cgrzemba at opencsw.org>
+Date: Tue, 10 Jan 2012 14:29:50 +0100
+Subject: [PATCH 6/7] replace SV sh with Posix sh
+
+---
+ ldap/admin/src/scripts/restart-dirsrv.in |    2 +-
+ ldap/admin/src/scripts/start-dirsrv.in   |    2 +-
+ ldap/admin/src/scripts/stop-dirsrv.in    |    2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/ldap/admin/src/scripts/restart-dirsrv.in b/ldap/admin/src/scripts/restart-dirsrv.in
+index 76fb176..cd4a9b0 100644
+--- a/ldap/admin/src/scripts/restart-dirsrv.in
++++ b/ldap/admin/src/scripts/restart-dirsrv.in
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/usr/xpg4/bin/sh
+ 
+ # Script that restarts the ns-slapd server.
+ # Exit status can be:
+diff --git a/ldap/admin/src/scripts/start-dirsrv.in b/ldap/admin/src/scripts/start-dirsrv.in
+index 291c821..dfdce06 100755
+--- a/ldap/admin/src/scripts/start-dirsrv.in
++++ b/ldap/admin/src/scripts/start-dirsrv.in
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/usr/xpg4/bin/sh
+ 
+ # Script that starts the ns-slapd server.
+ # Exit status can be:
+diff --git a/ldap/admin/src/scripts/stop-dirsrv.in b/ldap/admin/src/scripts/stop-dirsrv.in
+index 4d88585..40b646d 100755
+--- a/ldap/admin/src/scripts/stop-dirsrv.in
++++ b/ldap/admin/src/scripts/stop-dirsrv.in
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/usr/xpg4/bin/sh
+ 
+ # Script that stops the ns-slapd server.
+ # Exit status can be:
+-- 
+1.7.6.1
+

Added: csw/mgar/pkg/389-ds-base/trunk/files/0007-create-var-run-dirsrv.patch
===================================================================
--- csw/mgar/pkg/389-ds-base/trunk/files/0007-create-var-run-dirsrv.patch	                        (rev 0)
+++ csw/mgar/pkg/389-ds-base/trunk/files/0007-create-var-run-dirsrv.patch	2012-01-10 14:22:37 UTC (rev 16739)
@@ -0,0 +1,42 @@
+From e2a18924e644ee93ef31bed2a18a83bfbe78cf62 Mon Sep 17 00:00:00 2001
+From: Carsten Grzemba <cgrzemba at opencsw.org>
+Date: Tue, 10 Jan 2012 15:05:25 +0100
+Subject: [PATCH 7/7] create var run dirsrv
+
+---
+ ldap/admin/src/dirsrv |   12 ++++++++++++
+ 1 files changed, 12 insertions(+), 0 deletions(-)
+
+diff --git a/ldap/admin/src/dirsrv b/ldap/admin/src/dirsrv
+index 31753b3..f024586 100644
+--- a/ldap/admin/src/dirsrv
++++ b/ldap/admin/src/dirsrv
+@@ -33,6 +33,8 @@ OS=`uname -s`
+ # use the new mt slab memory allocator on Solaris
+ # this requires Solaris 9 update 3 or later
+ if [ "$OS" = "SunOS" -a -f /usr/lib/libumem.so ] ; then
++#   UMEM_DEBUG=default
++#   UMEM_LOGGING=transaction
+     LD_PRELOAD=/usr/lib/libumem.so
+     export LD_PRELOAD
+ fi
+@@ -41,6 +43,16 @@ if [ "$OS" = "SunOS" -a -f /usr/lib/64/libumem.so ] ; then
+     export LD_PRELOAD_64
+ fi
+ 
++USER=`/usr/xpg4/bin/id -u -n`
++export USER
++[ -d /var/run/dirsrv ] && mkdir -p /var/run/dirsrv
++if [ -f /etc/opt/csw/dirsrv/admin-serv/adm.conf ]; then
++  slapd-user=`grep SuiteSpotUserID /etc/opt/csw/dirsrv/admin-serv/adm.conf | cut -d: -f2 | tr -d [:space:]`
++  slapd-group=`grep SuiteSpotGroup /etc/opt/csw/dirsrv/admin-serv/adm.conf | cut -d: -f2 | tr -d [:space:]`
++  chown $slapd-user:$slapd-group /var/run/dirsrv
++fi
++chmod g+w /var/run/dirsrv
++
+ # how many seconds to wait for the startpid file to show
+ # up before we assume there is a problem and fail to start
+ #STARTPID_TIME=10 ; export STARTPID_TIME
+-- 
+1.7.6.1
+

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


From cgrzemba at users.sourceforge.net  Wed Jan 11 10:41:46 2012
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Wed, 11 Jan 2012 09:41:46 +0000
Subject: [csw-devel] SF.net SVN: gar:[16740] csw/mgar/pkg/389-ds-base/trunk
Message-ID: <E1Rkugk-0005ec-18@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 16740
          http://gar.svn.sourceforge.net/gar/?rev=16740&view=rev
Author:   cgrzemba
Date:     2012-01-11 09:41:45 +0000 (Wed, 11 Jan 2012)
Log Message:
-----------
389-ds-base/trunk: add some patches

Modified Paths:
--------------
    csw/mgar/pkg/389-ds-base/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/389-ds-base/trunk/files/0003-add-user-and-var-run-dirsrv.patch
    csw/mgar/pkg/389-ds-base/trunk/files/0004-move-include-path.patch

Removed Paths:
-------------
    csw/mgar/pkg/389-ds-base/trunk/files/0007-create-var-run-dirsrv.patch

Modified: csw/mgar/pkg/389-ds-base/trunk/Makefile
===================================================================
--- csw/mgar/pkg/389-ds-base/trunk/Makefile	2012-01-10 14:22:37 UTC (rev 16739)
+++ csw/mgar/pkg/389-ds-base/trunk/Makefile	2012-01-11 09:41:45 UTC (rev 16740)
@@ -14,10 +14,15 @@
 MASTER_SITES = http://port389.org/sources
 DISTFILES  = $(NAME)-$(VERSION).tar.bz2
 # BUILD64	= 1
+PACKAGING_PLATFORMS += solaris10-sparc
+PACKAGING_PLATFORMS += solaris10-i386
 
+LICENSE = LICENSE LICENSE.GPLv2
+
 PATCHFILES += 0005-add-standard-path.patch
 PATCHFILES += 0006-replace-SV-sh-with-Posix-sh.patch
-PATCHFILES += 0007-create-var-run-dirsrv.patch
+PATCHFILES += 0003-add-user-and-var-run-dirsrv.patch
+PATHCFILES += 0004-move-include-path.patch
 
 RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibssldap60
 RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibprldap60
@@ -46,6 +51,9 @@
 CHECKPKG_OVERRIDES_CSW389-ds-base += soname-not-found|libdb-4.8.so|is|needed|by|opt/csw/lib/dirsrv/plugins/libreplication-plugin.so
 
 # GARCOMPILER = SOS12U2
+EXTRA_LIB = /opt/csw/bdb48/lib
+# remove -I/opt/csw/include
+CPPFLAGS = 
 
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS_OPT += --with-ldapsdk-inc=/opt/csw/include/dirsrv 

Added: csw/mgar/pkg/389-ds-base/trunk/files/0003-add-user-and-var-run-dirsrv.patch
===================================================================
--- csw/mgar/pkg/389-ds-base/trunk/files/0003-add-user-and-var-run-dirsrv.patch	                        (rev 0)
+++ csw/mgar/pkg/389-ds-base/trunk/files/0003-add-user-and-var-run-dirsrv.patch	2012-01-11 09:41:45 UTC (rev 16740)
@@ -0,0 +1,63 @@
+From 2a0b4df7c481f2f072d432e02389893516ed6007 Mon Sep 17 00:00:00 2001
+From: Carsten Grzemba <cgrzemba at unstable10s.bo.opencsw.org>
+Date: Tue, 10 Jan 2012 15:52:22 +0100
+Subject: [PATCH] add user and var run dirsrv
+
+---
+ ldap/admin/src/initconfig.in |   20 ++++++++++++++++----
+ 1 files changed, 16 insertions(+), 4 deletions(-)
+
+diff --git a/ldap/admin/src/initconfig.in b/ldap/admin/src/initconfig.in
+index 7f9dd8f..f024586 100644
+--- a/ldap/admin/src/initconfig.in
++++ b/ldap/admin/src/initconfig.in
+@@ -1,9 +1,9 @@
+-# This file is sourced by @package_name@ upon startup to set
++# This file is sourced by dirsrv upon startup to set
+ # the default environment for all directory server instances.
+ # To set instance specific defaults, use the file in the same
+-# directory called @package_name at -instance where "instance"
++# directory called dirsrv-instance where "instance"
+ # is the name of your directory server instance e.g.
+-# @package_name at -localhost for the slapd-localhost instance.
++# dirsrv-localhost for the slapd-localhost instance.
+ 
+ # In order to make more file descriptors available
+ # to the directory server, first make sure the system
+@@ -26,13 +26,15 @@
+ # server needs to know where to find its keytab
+ # file - uncomment the following line and set
+ # the path and filename appropriately
+-# KRB5_KTNAME=@instconfigdir@/myname.keytab ; export KRB5_KTNAME
++# KRB5_KTNAME=/etc/opt/csw/dirsrv/myname.keytab ; export KRB5_KTNAME
+ 
+ # other environment settings can be added here too
+ OS=`uname -s`
+ # use the new mt slab memory allocator on Solaris
+ # this requires Solaris 9 update 3 or later
+ if [ "$OS" = "SunOS" -a -f /usr/lib/libumem.so ] ; then
++#   UMEM_DEBUG=default
++#   UMEM_LOGGING=transaction
+     LD_PRELOAD=/usr/lib/libumem.so
+     export LD_PRELOAD
+ fi
+@@ -41,6 +43,16 @@ if [ "$OS" = "SunOS" -a -f /usr/lib/64/libumem.so ] ; then
+     export LD_PRELOAD_64
+ fi
+ 
++USER=`/usr/xpg4/bin/id -u -n`
++export USER
++[ -d /var/run/dirsrv ] && mkdir -p /var/run/dirsrv
++if [ -f /etc/opt/csw/dirsrv/admin-serv/adm.conf ]; then
++  slapd-user=`grep SuiteSpotUserID /etc/opt/csw/dirsrv/admin-serv/adm.conf | cut -d: -f2 | tr -d [:space:]`
++  slapd-group=`grep SuiteSpotGroup /etc/opt/csw/dirsrv/admin-serv/adm.conf | cut -d: -f2 | tr -d [:space:]`
++  chown $slapd-user:$slapd-group /var/run/dirsrv
++fi
++chmod g+w /var/run/dirsrv
++
+ # how many seconds to wait for the startpid file to show
+ # up before we assume there is a problem and fail to start
+ #STARTPID_TIME=10 ; export STARTPID_TIME
+-- 
+1.7.8.2
+

Added: csw/mgar/pkg/389-ds-base/trunk/files/0004-move-include-path.patch
===================================================================
--- csw/mgar/pkg/389-ds-base/trunk/files/0004-move-include-path.patch	                        (rev 0)
+++ csw/mgar/pkg/389-ds-base/trunk/files/0004-move-include-path.patch	2012-01-11 09:41:45 UTC (rev 16740)
@@ -0,0 +1,25 @@
+From 4087ee0524bc902f9bb3442c7ce8a35c112f1bbe Mon Sep 17 00:00:00 2001
+From: Carsten Grzemba <cgrzemba at opencsw.org>
+Date: Wed, 11 Jan 2012 10:15:19 +0100
+Subject: [PATCH] move include path
+
+---
+ Makefile.am |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 4bf1966..a4a9fa0 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -863,7 +863,7 @@ libcollation_plugin_la_SOURCES = ldap/servers/plugins/collation/collate.c \
+         ldap/servers/plugins/collation/config.c \
+         ldap/servers/plugins/collation/orfilter.c
+ 
+-libcollation_plugin_la_CPPFLAGS = @icu_inc@ $(PLUGIN_CPPFLAGS)
++libcollation_plugin_la_CPPFLAGS = $(PLUGIN_CPPFLAGS) @icu_inc@
+ libcollation_plugin_la_LIBADD = libslapd.la $(LDAPSDK_LINK) $(NSPR_LINK) $(ICU_LINK) $(LIBCSTD) $(LIBCRUN)
+ libcollation_plugin_la_LDFLAGS = -avoid-version
+ libcollation_plugin_la_LINK = $(CXXLINK) -avoid-version
+-- 
+1.7.8.2
+

Deleted: csw/mgar/pkg/389-ds-base/trunk/files/0007-create-var-run-dirsrv.patch
===================================================================
--- csw/mgar/pkg/389-ds-base/trunk/files/0007-create-var-run-dirsrv.patch	2012-01-10 14:22:37 UTC (rev 16739)
+++ csw/mgar/pkg/389-ds-base/trunk/files/0007-create-var-run-dirsrv.patch	2012-01-11 09:41:45 UTC (rev 16740)
@@ -1,42 +0,0 @@
-From e2a18924e644ee93ef31bed2a18a83bfbe78cf62 Mon Sep 17 00:00:00 2001
-From: Carsten Grzemba <cgrzemba at opencsw.org>
-Date: Tue, 10 Jan 2012 15:05:25 +0100
-Subject: [PATCH 7/7] create var run dirsrv
-
----
- ldap/admin/src/dirsrv |   12 ++++++++++++
- 1 files changed, 12 insertions(+), 0 deletions(-)
-
-diff --git a/ldap/admin/src/dirsrv b/ldap/admin/src/dirsrv
-index 31753b3..f024586 100644
---- a/ldap/admin/src/dirsrv
-+++ b/ldap/admin/src/dirsrv
-@@ -33,6 +33,8 @@ OS=`uname -s`
- # use the new mt slab memory allocator on Solaris
- # this requires Solaris 9 update 3 or later
- if [ "$OS" = "SunOS" -a -f /usr/lib/libumem.so ] ; then
-+#   UMEM_DEBUG=default
-+#   UMEM_LOGGING=transaction
-     LD_PRELOAD=/usr/lib/libumem.so
-     export LD_PRELOAD
- fi
-@@ -41,6 +43,16 @@ if [ "$OS" = "SunOS" -a -f /usr/lib/64/libumem.so ] ; then
-     export LD_PRELOAD_64
- fi
- 
-+USER=`/usr/xpg4/bin/id -u -n`
-+export USER
-+[ -d /var/run/dirsrv ] && mkdir -p /var/run/dirsrv
-+if [ -f /etc/opt/csw/dirsrv/admin-serv/adm.conf ]; then
-+  slapd-user=`grep SuiteSpotUserID /etc/opt/csw/dirsrv/admin-serv/adm.conf | cut -d: -f2 | tr -d [:space:]`
-+  slapd-group=`grep SuiteSpotGroup /etc/opt/csw/dirsrv/admin-serv/adm.conf | cut -d: -f2 | tr -d [:space:]`
-+  chown $slapd-user:$slapd-group /var/run/dirsrv
-+fi
-+chmod g+w /var/run/dirsrv
-+
- # how many seconds to wait for the startpid file to show
- # up before we assume there is a problem and fail to start
- #STARTPID_TIME=10 ; export STARTPID_TIME
--- 
-1.7.6.1
-

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


From cgrzemba at users.sourceforge.net  Wed Jan 11 11:11:06 2012
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Wed, 11 Jan 2012 10:11:06 +0000
Subject: [csw-devel] SF.net SVN: gar:[16741]
	csw/mgar/pkg/389-ds-base/trunk/Makefile
Message-ID: <E1Rkv98-0008NX-I4@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 16741
          http://gar.svn.sourceforge.net/gar/?rev=16741&view=rev
Author:   cgrzemba
Date:     2012-01-11 10:11:06 +0000 (Wed, 11 Jan 2012)
Log Message:
-----------
389-ds-base/trunk: fix build recipe

Modified Paths:
--------------
    csw/mgar/pkg/389-ds-base/trunk/Makefile

Modified: csw/mgar/pkg/389-ds-base/trunk/Makefile
===================================================================
--- csw/mgar/pkg/389-ds-base/trunk/Makefile	2012-01-11 09:41:45 UTC (rev 16740)
+++ csw/mgar/pkg/389-ds-base/trunk/Makefile	2012-01-11 10:11:06 UTC (rev 16741)
@@ -22,7 +22,7 @@
 PATCHFILES += 0005-add-standard-path.patch
 PATCHFILES += 0006-replace-SV-sh-with-Posix-sh.patch
 PATCHFILES += 0003-add-user-and-var-run-dirsrv.patch
-PATHCFILES += 0004-move-include-path.patch
+PATCHFILES += 0004-move-include-path.patch
 
 RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibssldap60
 RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibprldap60

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


From skayser at users.sourceforge.net  Wed Jan 11 23:04:42 2012
From: skayser at users.sourceforge.net (skayser at users.sourceforge.net)
Date: Wed, 11 Jan 2012 22:04:42 +0000
Subject: [csw-devel] SF.net SVN: opencsw:[591] twitter/sweets/sweets.py
Message-ID: <E1Rl6Hi-0005fQ-Pp@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 591
          http://opencsw.svn.sourceforge.net/opencsw/?rev=591&view=rev
Author:   skayser
Date:     2012-01-11 22:04:42 +0000 (Wed, 11 Jan 2012)
Log Message:
-----------
twitter/sweets: filter search result spam

Modified Paths:
--------------
    twitter/sweets/sweets.py

Modified: twitter/sweets/sweets.py
===================================================================
--- twitter/sweets/sweets.py	2011-11-26 23:42:25 UTC (rev 590)
+++ twitter/sweets/sweets.py	2012-01-11 22:04:42 UTC (rev 591)
@@ -119,7 +119,13 @@
             encoding = sys.stdout.encoding or 'utf-8'
             print msg.encode(encoding, 'replace')
 
+    def get_matchting_tweets(self, string):
+        """Get list of tweets where the tweet contains a given string."""
+        for tweet in self.get_tweets():
+            if tweet['text'].find(string) == -1: continue
+            else: yield tweet
 
+
 def twitter_search_mock(query="", state=""):
     """Search twitter (mockup), returns a single-line, JSON search result."""
     f = open("sample-search-results.txt", "r")
@@ -150,7 +156,11 @@
     response = TSResponse(file=outfile)
     while 1:
         try:
+            # Unfortunately, some search results are spam (text in tweet not
+            # related to query), thus we need to filter the search results
             new_response = twitter_search(query, state=response.get_state())
+            new_response.set_tweets(new_response.get_matching_tweets(query))
+
             if new_response.has_tweets():
                 new_response.print_tweets()
             response.update(new_response)

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


From skayser at users.sourceforge.net  Wed Jan 11 23:11:39 2012
From: skayser at users.sourceforge.net (skayser at users.sourceforge.net)
Date: Wed, 11 Jan 2012 22:11:39 +0000
Subject: [csw-devel] SF.net SVN: opencsw:[592] twitter/sweets/sweets.py
Message-ID: <E1Rl6OR-0002F1-Fz@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 592
          http://opencsw.svn.sourceforge.net/opencsw/?rev=592&view=rev
Author:   skayser
Date:     2012-01-11 22:11:39 +0000 (Wed, 11 Jan 2012)
Log Message:
-----------
twitter/sweets: fix typo, add $Id$ keyword

Modified Paths:
--------------
    twitter/sweets/sweets.py

Property Changed:
----------------
    twitter/sweets/sweets.py

Modified: twitter/sweets/sweets.py
===================================================================
--- twitter/sweets/sweets.py	2012-01-11 22:04:42 UTC (rev 591)
+++ twitter/sweets/sweets.py	2012-01-11 22:11:39 UTC (rev 592)
@@ -1,5 +1,7 @@
 #!/usr/bin/env python
 #
+# $Id$
+#
 # sweets.py:
 #   Search twitter with a search term and store results in a JSON file which
 #   can be used for further processing (e.g. to generate RSS)
@@ -119,7 +121,7 @@
             encoding = sys.stdout.encoding or 'utf-8'
             print msg.encode(encoding, 'replace')
 
-    def get_matchting_tweets(self, string):
+    def get_matching_tweets(self, string):
         """Get list of tweets where the tweet contains a given string."""
         for tweet in self.get_tweets():
             if tweet['text'].find(string) == -1: continue


Property changes on: twitter/sweets/sweets.py
___________________________________________________________________
Added: svn:keywords
   + Id

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


From skayser at users.sourceforge.net  Wed Jan 11 23:20:38 2012
From: skayser at users.sourceforge.net (skayser at users.sourceforge.net)
Date: Wed, 11 Jan 2012 22:20:38 +0000
Subject: [csw-devel] SF.net SVN: opencsw:[593] twitter/sweets/sweets.py
Message-ID: <E1Rl6X8-0005yc-Qq@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 593
          http://opencsw.svn.sourceforge.net/opencsw/?rev=593&view=rev
Author:   skayser
Date:     2012-01-11 22:20:38 +0000 (Wed, 11 Jan 2012)
Log Message:
-----------
twitter/sweets: python not happy with the generator, list comprehension FTW

Modified Paths:
--------------
    twitter/sweets/sweets.py

Modified: twitter/sweets/sweets.py
===================================================================
--- twitter/sweets/sweets.py	2012-01-11 22:11:39 UTC (rev 592)
+++ twitter/sweets/sweets.py	2012-01-11 22:20:38 UTC (rev 593)
@@ -123,9 +123,7 @@
 
     def get_matching_tweets(self, string):
         """Get list of tweets where the tweet contains a given string."""
-        for tweet in self.get_tweets():
-            if tweet['text'].find(string) == -1: continue
-            else: yield tweet
+        return [ t for t in self.get_tweets() if t['text'].find(string) != -1 ]
 
 
 def twitter_search_mock(query="", state=""):

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


From dmichelsen at users.sourceforge.net  Wed Jan 11 23:31:51 2012
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Wed, 11 Jan 2012 22:31:51 +0000
Subject: [csw-devel] SF.net SVN: gar:[16742] csw/mgar/pkg
Message-ID: <E1Rl6hz-0002cQ-Hz@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 16742
          http://gar.svn.sourceforge.net/gar/?rev=16742&view=rev
Author:   dmichelsen
Date:     2012-01-11 22:31:50 +0000 (Wed, 11 Jan 2012)
Log Message:
-----------
webalizer: Initial commit

Added Paths:
-----------
    csw/mgar/pkg/webalizer/
    csw/mgar/pkg/webalizer/Makefile
    csw/mgar/pkg/webalizer/branches/
    csw/mgar/pkg/webalizer/tags/
    csw/mgar/pkg/webalizer/trunk/
    csw/mgar/pkg/webalizer/trunk/Makefile
    csw/mgar/pkg/webalizer/trunk/checksums
    csw/mgar/pkg/webalizer/trunk/files/
    csw/mgar/pkg/webalizer/trunk/files/0001-Force-void-context.patch

Added: csw/mgar/pkg/webalizer/Makefile
===================================================================
--- csw/mgar/pkg/webalizer/Makefile	                        (rev 0)
+++ csw/mgar/pkg/webalizer/Makefile	2012-01-11 22:31:50 UTC (rev 16742)
@@ -0,0 +1,2 @@
+%:
+	$(MAKE) -C trunk $*


Property changes on: csw/mgar/pkg/webalizer/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/webalizer/trunk/Makefile
===================================================================
--- csw/mgar/pkg/webalizer/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/webalizer/trunk/Makefile	2012-01-11 22:31:50 UTC (rev 16742)
@@ -0,0 +1,41 @@
+# $Id$
+# TODO (release-critical prefixed with !, non release-critical with *)
+#
+NAME = webalizer
+VERSION = 2.23
+SUBREV = 05
+GARTYPE = v2
+CATEGORIES = utils
+
+DESCRIPTION = A flexible web server log file analysis program
+define BLURB
+endef
+
+MASTER_SITES = ftp://ftp.mrunix.net/pub/webalizer/
+DISTNAME = $(NAME)-$(VERSION)-$(SUBREV)
+DISTFILES += $(DISTNAME)-src.tgz
+
+PATCHFILES += 0001-Force-void-context.patch
+
+PACKAGES += CSWwebalizer
+SPKG_DESC_CSWwebalizer = A flexible web server log file analysis program
+# PKGFILES is catchall
+RUNTIME_DEP_PKGS_CSWwebalizer += CSWlibgd2
+RUNTIME_DEP_PKGS_CSWwebalizer += CSWlibpng12-0
+RUNTIME_DEP_PKGS_CSWwebalizer += CSWlibz1
+
+#EXTRA_INC = $(prefix)/bdb48/include
+#EXTRA_LIB = $(prefix)/bdb48/lib
+
+CONFIGURE_ARGS = $(DIRPATHS)
+
+# There is no testsuite
+TEST_SCRIPTS =
+
+MIGRATE_FILES += webalizer.conf
+PRESERVECONF += $(sysconfdir)/webalizer.conf
+
+EXTRA_PAX_ARGS += -s ',/webalizer\.conf\.sample$$,/webalizer.conf.CSW,'
+
+include gar/category.mk
+


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

Added: csw/mgar/pkg/webalizer/trunk/checksums
===================================================================
--- csw/mgar/pkg/webalizer/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/webalizer/trunk/checksums	2012-01-11 22:31:50 UTC (rev 16742)
@@ -0,0 +1 @@
+304338cf3b1e9389123380d5f7d88d58  webalizer-2.23-05-src.tgz

Added: csw/mgar/pkg/webalizer/trunk/files/0001-Force-void-context.patch
===================================================================
--- csw/mgar/pkg/webalizer/trunk/files/0001-Force-void-context.patch	                        (rev 0)
+++ csw/mgar/pkg/webalizer/trunk/files/0001-Force-void-context.patch	2012-01-11 22:31:50 UTC (rev 16742)
@@ -0,0 +1,25 @@
+From 185f509e80d9b2f53a7235b9572ad0c461959cd7 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Wed, 11 Jan 2012 23:17:40 +0100
+Subject: [PATCH] Force void context
+
+---
+ webalizer.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/webalizer.c b/webalizer.c
+index 702c532..612b94d 100644
+--- a/webalizer.c
++++ b/webalizer.c
+@@ -579,7 +579,7 @@ int main(int argc, char *argv[])
+ #ifdef USE_BZIP
+       (gz_log==COMP_BZIP)?bz2_rewind(&zlog_fp, log_fname, "rb"):
+ #endif
+-      (gz_log==COMP_GZIP)?gzrewind(zlog_fp):
++      (gz_log==COMP_GZIP)?(void)gzrewind(zlog_fp):
+       (log_fname)?rewind(log_fp):exit(0);
+    }
+ 
+-- 
+1.7.8.2
+

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


From dmichelsen at users.sourceforge.net  Wed Jan 11 23:33:46 2012
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Wed, 11 Jan 2012 22:33:46 +0000
Subject: [csw-devel] SF.net SVN: gar:[16743]
	csw/mgar/pkg/webalizer/trunk/Makefile
Message-ID: <E1Rl6jq-0001G6-Ei@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 16743
          http://gar.svn.sourceforge.net/gar/?rev=16743&view=rev
Author:   dmichelsen
Date:     2012-01-11 22:33:46 +0000 (Wed, 11 Jan 2012)
Log Message:
-----------
webalizer/trunk: Disable some stuff for now

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

Modified: csw/mgar/pkg/webalizer/trunk/Makefile
===================================================================
--- csw/mgar/pkg/webalizer/trunk/Makefile	2012-01-11 22:31:50 UTC (rev 16742)
+++ csw/mgar/pkg/webalizer/trunk/Makefile	2012-01-11 22:33:46 UTC (rev 16743)
@@ -24,6 +24,10 @@
 RUNTIME_DEP_PKGS_CSWwebalizer += CSWlibpng12-0
 RUNTIME_DEP_PKGS_CSWwebalizer += CSWlibz1
 
+# Fix config file later
+CHECKPKG_OVERRIDES_CSWwebalizer += file-with-bad-content|/usr/share|root/etc/opt/csw/webalizer.conf.CSW
+
+# No BDB support yet as detection bails out on long long
 #EXTRA_INC = $(prefix)/bdb48/include
 #EXTRA_LIB = $(prefix)/bdb48/lib
 

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 Jan 12 00:00:58 2012
From: skayser at users.sourceforge.net (skayser at users.sourceforge.net)
Date: Wed, 11 Jan 2012 23:00:58 +0000
Subject: [csw-devel] SF.net SVN: opencsw:[594] twitter/sweets/sweets.py
Message-ID: <E1Rl7AA-0002dS-7V@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 594
          http://opencsw.svn.sourceforge.net/opencsw/?rev=594&view=rev
Author:   skayser
Date:     2012-01-11 23:00:58 +0000 (Wed, 11 Jan 2012)
Log Message:
-----------
twitter/sweets: cleanup earlier ad-hoc mess, probably introduce some new

Modified Paths:
--------------
    twitter/sweets/sweets.py

Modified: twitter/sweets/sweets.py
===================================================================
--- twitter/sweets/sweets.py	2012-01-11 22:20:38 UTC (rev 593)
+++ twitter/sweets/sweets.py	2012-01-11 23:00:58 UTC (rev 594)
@@ -30,6 +30,7 @@
     """Holds twitter response data and offers operations on it."""
     def __init__(self, file="", json=""):
         self.data = {}
+        self._num_tweets_dropped = 0
         try:
             if file and os.path.exists(file):
                 self.data = self._import_file(file)
@@ -125,7 +126,18 @@
         """Get list of tweets where the tweet contains a given string."""
         return [ t for t in self.get_tweets() if t['text'].find(string) != -1 ]
 
+    def num_tweets(self):
+        return len(self.get_tweets())
 
+    def num_tweets_dropped(self):
+        return self._num_tweets_dropped
+
+    def drop_nonmatching_tweets(self, string):
+        n1 = self.num_tweets()
+        self.set_tweets(self.get_matching_tweets(string))
+        n2 = self.num_tweets()
+        self._num_tweets_dropped += n2 - n1
+
 def twitter_search_mock(query="", state=""):
     """Search twitter (mockup), returns a single-line, JSON search result."""
     f = open("sample-search-results.txt", "r")
@@ -156,19 +168,20 @@
     response = TSResponse(file=outfile)
     while 1:
         try:
-            # Unfortunately, some search results are spam (text in tweet not
-            # related to query), thus we need to filter the search results
             new_response = twitter_search(query, state=response.get_state())
-            new_response.set_tweets(new_response.get_matching_tweets(query))
 
             if new_response.has_tweets():
+                # Unfortunately, some search results are spam (tweet not related
+                # to query, URLs point to spam sites), drop irrelevant tweets
+                new_response.drop_nonmatching_tweets(query)
                 new_response.print_tweets()
             response.update(new_response)
             response.cap(keep)
             response.export(outfile)
-            print "%s new tweets, %s total in archive" % (
-                    len(new_response.get_tweets()),
-                    len(response.get_tweets()))
+            print "%s new tweets (%s dropped), %s total in archive" % (
+                    new_response.num_tweets(),
+                    new_response.num_tweets_dropped(),
+                    response.num_tweets())
 
         except urllib2.URLError, e:
             print "Couldn't retrieve URL:", e

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 Jan 12 00:13:05 2012
From: skayser at users.sourceforge.net (skayser at users.sourceforge.net)
Date: Wed, 11 Jan 2012 23:13:05 +0000
Subject: [csw-devel] SF.net SVN: opencsw:[595] twitter/sweets/sweets.py
Message-ID: <E1Rl7Lt-0005rQ-1S@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 595
          http://opencsw.svn.sourceforge.net/opencsw/?rev=595&view=rev
Author:   skayser
Date:     2012-01-11 23:13:04 +0000 (Wed, 11 Jan 2012)
Log Message:
-----------
twitter/sweets: fix result of adenosine-abundance

Modified Paths:
--------------
    twitter/sweets/sweets.py

Modified: twitter/sweets/sweets.py
===================================================================
--- twitter/sweets/sweets.py	2012-01-11 23:00:58 UTC (rev 594)
+++ twitter/sweets/sweets.py	2012-01-11 23:13:04 UTC (rev 595)
@@ -136,7 +136,7 @@
         n1 = self.num_tweets()
         self.set_tweets(self.get_matching_tweets(string))
         n2 = self.num_tweets()
-        self._num_tweets_dropped += n2 - n1
+        self._num_tweets_dropped += n1 - n2
 
 def twitter_search_mock(query="", state=""):
     """Search twitter (mockup), returns a single-line, JSON search result."""

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


From dmichelsen at users.sourceforge.net  Thu Jan 12 11:39:23 2012
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu, 12 Jan 2012 10:39:23 +0000
Subject: [csw-devel] SF.net SVN: gar:[16744] csw/mgar/pkg/webalizer/trunk
Message-ID: <E1RlI43-0006HD-Md@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 16744
          http://gar.svn.sourceforge.net/gar/?rev=16744&view=rev
Author:   dmichelsen
Date:     2012-01-12 10:39:23 +0000 (Thu, 12 Jan 2012)
Log Message:
-----------
webalizer/trunk: Enable GeoIP and bzip2

Modified Paths:
--------------
    csw/mgar/pkg/webalizer/trunk/Makefile
    csw/mgar/pkg/webalizer/trunk/files/0001-Force-void-context.patch

Added Paths:
-----------
    csw/mgar/pkg/webalizer/trunk/files/0002-Re-add-definition-on-u_int64_t.patch

Modified: csw/mgar/pkg/webalizer/trunk/Makefile
===================================================================
--- csw/mgar/pkg/webalizer/trunk/Makefile	2012-01-11 22:33:46 UTC (rev 16743)
+++ csw/mgar/pkg/webalizer/trunk/Makefile	2012-01-12 10:39:23 UTC (rev 16744)
@@ -17,22 +17,48 @@
 
 PATCHFILES += 0001-Force-void-context.patch
 
+# Having u_int64_t defined during autoconf-time disturbs detection of BerkeleyDB db.h
+# so we disable the test below and re-add the definition manually in webalizer.h
+PATCHFILES += 0002-Re-add-definition-on-u_int64_t.patch
+
+BUILD_DEP_PKGS += CSWlibgd-dev
+BUILD_DEP_PKGS += CSWlibpng-dev
+BUILD_DEP_PKGS += CSWlibz-dev
+BUILD_DEP_PKGS += CSWbdb48devel
+BUILD_DEP_PKGS += CSWgeoip-dev
+
 PACKAGES += CSWwebalizer
 SPKG_DESC_CSWwebalizer = A flexible web server log file analysis program
 # PKGFILES is catchall
 RUNTIME_DEP_PKGS_CSWwebalizer += CSWlibgd2
 RUNTIME_DEP_PKGS_CSWwebalizer += CSWlibpng12-0
 RUNTIME_DEP_PKGS_CSWwebalizer += CSWlibz1
+RUNTIME_DEP_PKGS_CSWwebalizer += CSWbdb48
+RUNTIME_DEP_PKGS_CSWwebalizer += CSWgeoip
+RUNTIME_DEP_PKGS_CSWwebalizer += CSWlibbz2-1-0
 
 # Fix config file later
 CHECKPKG_OVERRIDES_CSWwebalizer += file-with-bad-content|/usr/share|root/etc/opt/csw/webalizer.conf.CSW
 
-# No BDB support yet as detection bails out on long long
-#EXTRA_INC = $(prefix)/bdb48/include
-#EXTRA_LIB = $(prefix)/bdb48/lib
+EXTRA_INC = $(prefix)/bdb48/include
+EXTRA_LIB = $(prefix)/bdb48/lib
 
+REINPLACEMENTS += geodb
+REINPLACE_MATCH_geodb = GeoDB\.dat
+REINPLACE_WITH_geodb = GeoIP.dat
+REINPLACE_FILES_geodb += dns_resolv.c
+
 CONFIGURE_ARGS = $(DIRPATHS)
+CONFIGURE_ARGS += --enable-dns
+CONFIGURE_ARGS += --enable-bz2
+CONFIGURE_ARGS += --enable-geoip
+#CONFIGURE_ARGS += --with-geoip=DIR        Alternate location for libGeoIP header files
+#CONFIGURE_ARGS += --with-geoiplib=DIR     Alternate location for geoip library
+CONFIGURE_ARGS += --with-geodb=$(sharedstatedir)/GeoIP
 
+# This is also defined in db.h from BerkeleyDB and causes trouble when being defined twice (see patch above)
+CONFIGURE_ARGS += ac_cv_type_u_int64_t=yes
+
 # There is no testsuite
 TEST_SCRIPTS =
 

Modified: csw/mgar/pkg/webalizer/trunk/files/0001-Force-void-context.patch
===================================================================
--- csw/mgar/pkg/webalizer/trunk/files/0001-Force-void-context.patch	2012-01-11 22:33:46 UTC (rev 16743)
+++ csw/mgar/pkg/webalizer/trunk/files/0001-Force-void-context.patch	2012-01-12 10:39:23 UTC (rev 16744)
@@ -1,25 +1,37 @@
-From 185f509e80d9b2f53a7235b9572ad0c461959cd7 Mon Sep 17 00:00:00 2001
+From 974bb8cab5847f85b527d1f276eed4575d55096d Mon Sep 17 00:00:00 2001
 From: Dagobert Michelsen <dam at opencsw.org>
-Date: Wed, 11 Jan 2012 23:17:40 +0100
+Date: Thu, 12 Jan 2012 11:31:37 +0100
 Subject: [PATCH] Force void context
 
 ---
- webalizer.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ webalizer.c |    6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/webalizer.c b/webalizer.c
-index 702c532..612b94d 100644
+index 702c532..9d5777f 100644
 --- a/webalizer.c
 +++ b/webalizer.c
-@@ -579,7 +579,7 @@ int main(int argc, char *argv[])
+@@ -577,9 +577,9 @@ int main(int argc, char *argv[])
+       fflush(stdout);
+       (gz_log)?dns_resolver(zlog_fp):dns_resolver(log_fp);
  #ifdef USE_BZIP
-       (gz_log==COMP_BZIP)?bz2_rewind(&zlog_fp, log_fname, "rb"):
+-      (gz_log==COMP_BZIP)?bz2_rewind(&zlog_fp, log_fname, "rb"):
++      (gz_log==COMP_BZIP)?(void)bz2_rewind(&zlog_fp, log_fname, "rb"):
  #endif
 -      (gz_log==COMP_GZIP)?gzrewind(zlog_fp):
 +      (gz_log==COMP_GZIP)?(void)gzrewind(zlog_fp):
        (log_fname)?rewind(log_fp):exit(0);
     }
  
+@@ -1418,7 +1418,7 @@ int main(int argc, char *argv[])
+ 
+    /* close log file if needed */
+ #ifdef USE_BZIP
+-   if (gz_log) (gz_log==COMP_BZIP)?BZ2_bzclose(zlog_fp):gzclose(zlog_fp);
++   if (gz_log) (gz_log==COMP_BZIP)?BZ2_bzclose(zlog_fp):(void)gzclose(zlog_fp);
+ #else
+    if (gz_log) gzclose(zlog_fp);
+ #endif
 -- 
 1.7.8.2
 

Added: csw/mgar/pkg/webalizer/trunk/files/0002-Re-add-definition-on-u_int64_t.patch
===================================================================
--- csw/mgar/pkg/webalizer/trunk/files/0002-Re-add-definition-on-u_int64_t.patch	                        (rev 0)
+++ csw/mgar/pkg/webalizer/trunk/files/0002-Re-add-definition-on-u_int64_t.patch	2012-01-12 10:39:23 UTC (rev 16744)
@@ -0,0 +1,25 @@
+From 46c41630bb7db3f95df0ad81fe3161270ee9b360 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Thu, 12 Jan 2012 11:05:56 +0100
+Subject: [PATCH] Re-add definition on u_int64_t
+
+---
+ webalizer.h |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/webalizer.h b/webalizer.h
+index 7a3941c..158c4d1 100644
+--- a/webalizer.h
++++ b/webalizer.h
+@@ -1,6 +1,8 @@
+ #ifndef _WEBALIZER_H
+ #define _WEBALIZER_H
+ 
++typedef unsigned long long u_int64_t;
++
+ #define PCENT(val,max) ((val)?((double)val/(double)max)*100.0 : 0.0)
+ #define IDX_2C(c1,c2)       (((c1-'a'+1)<<7)+(c2-'a'+1) )
+ #define IDX_3C(c1,c2,c3)    (((c1-'a'+1)<<12)+((c2-'a'+1)<<7)+(c3-'a'+1) )
+-- 
+1.7.8.2
+

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


From cgrzemba at users.sourceforge.net  Thu Jan 12 13:37:29 2012
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Thu, 12 Jan 2012 12:37:29 +0000
Subject: [csw-devel] SF.net SVN: gar:[16745] csw/mgar/pkg/389-ds-base/trunk
Message-ID: <E1RlJuL-0006te-Vg@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 16745
          http://gar.svn.sourceforge.net/gar/?rev=16745&view=rev
Author:   cgrzemba
Date:     2012-01-12 12:37:29 +0000 (Thu, 12 Jan 2012)
Log Message:
-----------
389-ds-base/trunk: add patch for i386

Modified Paths:
--------------
    csw/mgar/pkg/389-ds-base/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/389-ds-base/trunk/files/0004-add-i386-platform-to-Makefile.am-and-configure.ac.patch

Removed Paths:
-------------
    csw/mgar/pkg/389-ds-base/trunk/files/0004-move-include-path.patch

Modified: csw/mgar/pkg/389-ds-base/trunk/Makefile
===================================================================
--- csw/mgar/pkg/389-ds-base/trunk/Makefile	2012-01-12 10:39:23 UTC (rev 16744)
+++ csw/mgar/pkg/389-ds-base/trunk/Makefile	2012-01-12 12:37:29 UTC (rev 16745)
@@ -17,13 +17,15 @@
 PACKAGING_PLATFORMS += solaris10-sparc
 PACKAGING_PLATFORMS += solaris10-i386
 
-LICENSE = LICENSE LICENSE.GPLv2
+LICENSE = LICENSE
 
 PATCHFILES += 0005-add-standard-path.patch
 PATCHFILES += 0006-replace-SV-sh-with-Posix-sh.patch
 PATCHFILES += 0003-add-user-and-var-run-dirsrv.patch
-PATCHFILES += 0004-move-include-path.patch
+# until Red Hat Bugzilla Bug 773617 is open do it yourself
+PATCHFILES += 0004-add-i386-platform-to-Makefile.am-and-configure.ac.patch
 
+INITSMF = /etc/opt/csw/init.d/dirsrv
 RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibssldap60
 RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibprldap60
 RUNTIME_DEP_PKGS_CSW389-ds-base += CSWperl
@@ -32,28 +34,31 @@
 RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibldif60
 RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibsvrcore0
 RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibnspr4
-RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibicu46
 RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibldap60
 RUNTIME_DEP_PKGS_CSW389-ds-base += CSWnetsnmp
 RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibplds4
-RUNTIME_DEP_PKGS_CSW389-ds-base += CSWkrb5lib
 RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibpcre0
 RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibnss3
 RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibplc4
+RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibicudata48
+RUNTIME_DEP_PKGS_CSW389-ds-base += CSWbdb48
+RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibcom-err3
+RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibkrb5-3
+RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibicuuc48
+RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibicui18n48
+RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibk5crypto3
+CHECKPKG_OVERRIDES_CSW389-ds-base += pkginfo-opencsw-repository-uncommitted
+
 CHECKPKG_OVERRIDES_CSW389-ds-base += file-with-bad-content|/usr/share|root/opt/csw/lib/dirsrv/perl/DSUpdate.pm
 CHECKPKG_OVERRIDES_CSW389-ds-base += file-with-bad-content|/usr/share|root/opt/csw/share/dirsrv/updates/exampleupdate.ldif
 CHECKPKG_OVERRIDES_CSW389-ds-base += file-with-bad-content|/usr/share|root/opt/csw/share/man/man1/dbgen.pl.1
-CHECKPKG_OVERRIDES_CSW389-ds-base += license-missing|/opt/csw/share/doc/389_ds_base/license
-CHECKPKG_OVERRIDES_CSW389-ds-base += init-file-missing-cswinitsmf-class|/etc/opt/csw/init.d/dirsrv|class=none
 CHECKPKG_OVERRIDES_CSW389-ds-base += init-file-missing-cswinitsmf-class|/etc/opt/csw/init.d/dirsrv-snmp|class=none
-CHECKPKG_OVERRIDES_CSW389-ds-base += soname-not-found|libdb-4.8.so|is|needed|by|opt/csw/lib/dirsrv/plugins/libback-ldbm.so
-CHECKPKG_OVERRIDES_CSW389-ds-base += soname-not-found|libdb-4.8.so|is|needed|by|opt/csw/bin/dbscan-bin
-CHECKPKG_OVERRIDES_CSW389-ds-base += soname-not-found|libdb-4.8.so|is|needed|by|opt/csw/lib/dirsrv/plugins/libreplication-plugin.so
 
-# GARCOMPILER = SOS12U2
+GARCOMPILER = SOS12U2
 EXTRA_LIB = /opt/csw/bdb48/lib
 # remove -I/opt/csw/include
 CPPFLAGS = 
+EXTRA_LINKER_FLAGS = -xnorunpath -norunpath
 
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS_OPT += --with-ldapsdk-inc=/opt/csw/include/dirsrv 
@@ -81,4 +86,5 @@
 	cd $(WORKSRC) && aclocal
 	cd $(WORKSRC) && autoconf --force
 	cd $(WORKSRC) && automake -a -c -f
+	cd $(WORKSRC) && autoheader
 	@$(MAKECOOKIE)

Added: csw/mgar/pkg/389-ds-base/trunk/files/0004-add-i386-platform-to-Makefile.am-and-configure.ac.patch
===================================================================
--- csw/mgar/pkg/389-ds-base/trunk/files/0004-add-i386-platform-to-Makefile.am-and-configure.ac.patch	                        (rev 0)
+++ csw/mgar/pkg/389-ds-base/trunk/files/0004-add-i386-platform-to-Makefile.am-and-configure.ac.patch	2012-01-12 12:37:29 UTC (rev 16745)
@@ -0,0 +1,90 @@
+From f4315b6b8516a8bfd9b09d2723b78c90e4581652 Mon Sep 17 00:00:00 2001
+From: Carsten Grzemba <cgrzemba at opencsw.org>
+Date: Thu, 12 Jan 2012 12:09:34 +0100
+Subject: [PATCH] add i386 platform to Makefile.am and configure.ac
+
+---
+ Makefile.am  |    4 ++--
+ configure.ac |   18 ++++++++++++++----
+ 2 files changed, 16 insertions(+), 6 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 4bf1966..6b01783 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -682,7 +682,7 @@ libslapd_la_SOURCES = ldap/servers/slapd/add.c \
+ 	$(libavl_a_SOURCES)
+ 
+ libslapd_la_CPPFLAGS = $(PLUGIN_CPPFLAGS) @sasl_inc@ @db_inc@ @svrcore_inc@ @kerberos_inc@ @pcre_inc@
+-if SOLARIS
++if SPARC
+ libslapd_la_SOURCES += ldap/servers/slapd/slapi_counter_sunos_sparcv9.S
+ endif
+ 
+@@ -863,7 +863,7 @@ libcollation_plugin_la_SOURCES = ldap/servers/plugins/collation/collate.c \
+         ldap/servers/plugins/collation/config.c \
+         ldap/servers/plugins/collation/orfilter.c
+ 
+-libcollation_plugin_la_CPPFLAGS = @icu_inc@ $(PLUGIN_CPPFLAGS)
++libcollation_plugin_la_CPPFLAGS = $(PLUGIN_CPPFLAGS) @icu_inc@
+ libcollation_plugin_la_LIBADD = libslapd.la $(LDAPSDK_LINK) $(NSPR_LINK) $(ICU_LINK) $(LIBCSTD) $(LIBCRUN)
+ libcollation_plugin_la_LDFLAGS = -avoid-version
+ libcollation_plugin_la_LINK = $(CXXLINK) -avoid-version
+diff --git a/configure.ac b/configure.ac
+index 6d8e277..ad94787 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -460,20 +460,18 @@ case $host in
+     # HPUX doesn't use /etc for this
+     initdir=/init.d
+     ;;
+-  sparc-sun-solaris*)
++  *-*-solaris*)
+     AC_DEFINE([XP_UNIX], [1], [UNIX])
+     AC_DEFINE([SVR4], [1], [SVR4])
+     AC_DEFINE([__svr4], [1], [SVR4])
+     AC_DEFINE([__svr4__], [1], [SVR4])
+     AC_DEFINE([_SVID_GETTOD], [1], [SVID_GETTOD])
+     AC_DEFINE([SOLARIS], [1], [SOLARIS])
+-    AC_DEFINE([CPU_sparc], [], [cpu type sparc])
+     AC_DEFINE([OS_solaris], [1], [OS SOLARIS])
+     AC_DEFINE([sunos5], [1], [SunOS5])
+     AC_DEFINE([OSVERSION], [509], [OS version])
+     AC_DEFINE([_REENTRANT], [1], [_REENTRANT])
+     AC_DEFINE([NO_DOMAINNAME], [1], [no getdomainname])
+-    AC_DEFINE([ATOMIC_64BIT_OPERATIONS], [1], [enabling atomic counter])
+ dnl socket nsl and dl are required to link several programs and libdb
+     LIBSOCKET=-lsocket
+     AC_SUBST([LIBSOCKET], [$LIBSOCKET])
+@@ -488,8 +486,19 @@ dnl Cstd and Crun are required to link any C++ related code
+     AC_SUBST([LIBCRUN], [$LIBCRUN])
+     platform="solaris"
+     # assume 64 bit
+-    perlexec='/usr/lib/sparcv9/dirsec/perl5x/bin/perl'
+     initdir='$(sysconfdir)/init.d'
++    case $host in
++      i?86-*-solaris2.1[[0-9]]*)
++dnl I dont know why i386 need this explicit
++        AC_DEFINE([HAVE_GETPEERUCRED], [1], [have getpeerucred])
++        ;;
++      sparc-*-solaris*)
++dnl includes some assembler stuff in counter.o
++        AC_DEFINE([ATOMIC_64BIT_OPERATIONS], [1], [enabling atomic counter])
++        AC_DEFINE([CPU_sparc], [], [cpu type sparc])
++	TARGET='SPARC'
++        ;;
++    esac
+     ;;
+   *)
+     platform=""
+@@ -519,6 +528,7 @@ AC_SUBST(initconfigdir)
+ 
+ AM_CONDITIONAL(HPUX,test "$platform" = "hpux")
+ AM_CONDITIONAL(SOLARIS,test "$platform" = "solaris")
++AM_CONDITIONAL(SPARC, test x$TARGET = xSPARC)
+ 
+ # Check for library dependencies
+ m4_include(m4/nspr.m4)
+-- 
+1.7.8.2
+

Deleted: csw/mgar/pkg/389-ds-base/trunk/files/0004-move-include-path.patch
===================================================================
--- csw/mgar/pkg/389-ds-base/trunk/files/0004-move-include-path.patch	2012-01-12 10:39:23 UTC (rev 16744)
+++ csw/mgar/pkg/389-ds-base/trunk/files/0004-move-include-path.patch	2012-01-12 12:37:29 UTC (rev 16745)
@@ -1,25 +0,0 @@
-From 4087ee0524bc902f9bb3442c7ce8a35c112f1bbe Mon Sep 17 00:00:00 2001
-From: Carsten Grzemba <cgrzemba at opencsw.org>
-Date: Wed, 11 Jan 2012 10:15:19 +0100
-Subject: [PATCH] move include path
-
----
- Makefile.am |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 4bf1966..a4a9fa0 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -863,7 +863,7 @@ libcollation_plugin_la_SOURCES = ldap/servers/plugins/collation/collate.c \
-         ldap/servers/plugins/collation/config.c \
-         ldap/servers/plugins/collation/orfilter.c
- 
--libcollation_plugin_la_CPPFLAGS = @icu_inc@ $(PLUGIN_CPPFLAGS)
-+libcollation_plugin_la_CPPFLAGS = $(PLUGIN_CPPFLAGS) @icu_inc@
- libcollation_plugin_la_LIBADD = libslapd.la $(LDAPSDK_LINK) $(NSPR_LINK) $(ICU_LINK) $(LIBCSTD) $(LIBCRUN)
- libcollation_plugin_la_LDFLAGS = -avoid-version
- libcollation_plugin_la_LINK = $(CXXLINK) -avoid-version
--- 
-1.7.8.2
-

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


From dmichelsen at users.sourceforge.net  Thu Jan 12 13:54:24 2012
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu, 12 Jan 2012 12:54:24 +0000
Subject: [csw-devel] SF.net SVN: gar:[16746]
	csw/mgar/pkg/webalizer/trunk/Makefile
Message-ID: <E1RlKAi-0007Gr-LW@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 16746
          http://gar.svn.sourceforge.net/gar/?rev=16746&view=rev
Author:   dmichelsen
Date:     2012-01-12 12:54:24 +0000 (Thu, 12 Jan 2012)
Log Message:
-----------
webalizer/trunk: GeoIP and GeoDB are different things

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

Modified: csw/mgar/pkg/webalizer/trunk/Makefile
===================================================================
--- csw/mgar/pkg/webalizer/trunk/Makefile	2012-01-12 12:37:29 UTC (rev 16745)
+++ csw/mgar/pkg/webalizer/trunk/Makefile	2012-01-12 12:54:24 UTC (rev 16746)
@@ -43,18 +43,13 @@
 EXTRA_INC = $(prefix)/bdb48/include
 EXTRA_LIB = $(prefix)/bdb48/lib
 
-REINPLACEMENTS += geodb
-REINPLACE_MATCH_geodb = GeoDB\.dat
-REINPLACE_WITH_geodb = GeoIP.dat
-REINPLACE_FILES_geodb += dns_resolv.c
-
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --enable-dns
 CONFIGURE_ARGS += --enable-bz2
 CONFIGURE_ARGS += --enable-geoip
 #CONFIGURE_ARGS += --with-geoip=DIR        Alternate location for libGeoIP header files
 #CONFIGURE_ARGS += --with-geoiplib=DIR     Alternate location for geoip library
-CONFIGURE_ARGS += --with-geodb=$(sharedstatedir)/GeoIP
+CONFIGURE_ARGS += --with-geodb=$(sharedstatedir)/GeoDB
 
 # This is also defined in db.h from BerkeleyDB and causes trouble when being defined twice (see patch above)
 CONFIGURE_ARGS += ac_cv_type_u_int64_t=yes

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


From cgrzemba at users.sourceforge.net  Thu Jan 12 16:42:06 2012
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Thu, 12 Jan 2012 15:42:06 +0000
Subject: [csw-devel] SF.net SVN: gar:[16747] csw/mgar/pkg
Message-ID: <E1RlMn0-000229-60@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 16747
          http://gar.svn.sourceforge.net/gar/?rev=16747&view=rev
Author:   cgrzemba
Date:     2012-01-12 15:42:05 +0000 (Thu, 12 Jan 2012)
Log Message:
-----------
mod_nss/trunk: Initial release

Added Paths:
-----------
    csw/mgar/pkg/mod_nss/
    csw/mgar/pkg/mod_nss/Makefile
    csw/mgar/pkg/mod_nss/branches/
    csw/mgar/pkg/mod_nss/tags/
    csw/mgar/pkg/mod_nss/trunk/
    csw/mgar/pkg/mod_nss/trunk/Makefile
    csw/mgar/pkg/mod_nss/trunk/checksums
    csw/mgar/pkg/mod_nss/trunk/files/
    csw/mgar/pkg/mod_nss/trunk/files/CSWap2modnss.postinstall
    csw/mgar/pkg/mod_nss/trunk/files/CSWap2modnss.preremove

Added: csw/mgar/pkg/mod_nss/Makefile
===================================================================
--- csw/mgar/pkg/mod_nss/Makefile	                        (rev 0)
+++ csw/mgar/pkg/mod_nss/Makefile	2012-01-12 15:42:05 UTC (rev 16747)
@@ -0,0 +1,2 @@
+%:
+	$(MAKE) -C trunk $*


Property changes on: csw/mgar/pkg/mod_nss/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/mod_nss/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mod_nss/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/mod_nss/trunk/Makefile	2012-01-12 15:42:05 UTC (rev 16747)
@@ -0,0 +1,73 @@
+# $Id$
+#
+NAME = mod_nss
+VERSION = 1.0.8
+GARTYPE = v2
+CATEGORIES = lib
+
+DESCRIPTION = Apache2 Crypto Modul using Mozilla NSS
+define BLURB
+An Apache 2.0 module for implementing crypto using the Mozilla NSS crypto libraries.  This supports SSLv3/TLSv1 including support for client certificate authentication.  NSS provides web applications with a FIPS 140 certified crypto provider and support for a full range of PKCS11 devices.
+endef
+
+LICENSE = LICENSE
+
+PACKAGES = CSWap2modnss
+
+MASTER_SITES = http://port389.org/sources
+# MASTER_SITES = http://directory.fedoraproject.org/sources
+DISTFILES  = $(NAME)-$(VERSION).tar.gz
+DISTFILES += CSWap2modnss.postinstall
+DISTFILES += CSWap2modnss.preremove
+
+# BUILD64 = 1
+PACKAGING_PLATFORMS += solaris10-sparc
+PACKAGING_PLATFORMS += solaris10-i386
+GARCOMPILER = SOS12U2
+
+TEST_SCRIPTS = 
+EXTRA_LINKER_FLAGS = -xnorunpath -norunpath
+
+CONFIGURE_ARGS = $(DIRPATHS)
+CONFIGURE_ARGS_OPT += --with-apr-config
+CONFIGURE_ARGS_OPT += --with-apxs=/opt/csw/apache2/sbin/apxs
+CONFIGURE_ARGS_OPT += --with-nss-lib=/opt/csw/lib/64
+CONFIGURE_ARGS_OPT += --with-nss-inc=/opt/csw/include/nss 
+CONFIGURE_ARGS_OPT += --with-nspr-lib=/opt/csw/lib
+CONFIGURE_ARGS_OPT += --with-nspr-inc=/opt/csw/include/nspr
+CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARFLAVOR))
+
+INSTALL_SCRIPTS = custom
+
+# No test suite
+TEST_SCRIPTS =
+
+STRIP_DIRS = $(DESTDIR)$(prefix)/apache2/libexec
+
+RUNTIME_DEP_PKGS_CSWap2modnss += CSWapache2
+RUNTIME_DEP_PKGS_CSWap2modnss += CSWlibnspr4
+RUNTIME_DEP_PKGS_CSWap2modnss += CSWlibnss3
+RUNTIME_DEP_PKGS_CSWap2modnss += CSWlibplds4
+RUNTIME_DEP_PKGS_CSWap2modnss += CSWlibplc4
+CHECKPKG_OVERRIDES_CSWap2modnss += pkginfo-opencsw-repository-uncommitted
+
+
+include gar/category.mk
+
+# Apache paths
+AP2_ROOT      = $(prefix)/apache2
+AP2_LIBEXEC   = $(DESTDIR)$(AP2_ROOT)/libexec
+AP2_CONF      = $(DESTDIR)$(AP2_ROOT)/etc
+AP2_SBIN      = $(DESTDIR)$(AP2_ROOT)/sbin
+
+install-custom:
+	@ginstall -m 755 -d $(AP2_LIBEXEC)
+	@ginstall -m 755 -d $(AP2_CONF)
+	@ginstall -m 755 -d $(AP2_SBIN)
+	@ginstall -c -m 755 $(WORKSRC)/.libs/libmodnss.so $(AP2_LIBEXEC)
+	@ginstall -c -m 644 $(WORKSRC)/nss.conf $(AP2_CONF)
+	@ginstall -c -m 755 $(WORKSRC)/nss_pcache $(AP2_SBIN)
+	@ginstall -c -m 755 $(WORKSRC)/gencert $(AP2_SBIN)
+	$(MAKECOOKIE)
+
+COPYFILES = CONFIGURE CHANGES README


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

Added: csw/mgar/pkg/mod_nss/trunk/checksums
===================================================================
--- csw/mgar/pkg/mod_nss/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/mod_nss/trunk/checksums	2012-01-12 15:42:05 UTC (rev 16747)
@@ -0,0 +1 @@
+32458d91ce909260a6081cce58004e2f  mod_nss-1.0.8.tar.gz

Added: csw/mgar/pkg/mod_nss/trunk/files/CSWap2modnss.postinstall
===================================================================
--- csw/mgar/pkg/mod_nss/trunk/files/CSWap2modnss.postinstall	                        (rev 0)
+++ csw/mgar/pkg/mod_nss/trunk/files/CSWap2modnss.postinstall	2012-01-12 15:42:05 UTC (rev 16747)
@@ -0,0 +1,28 @@
+#!/bin/sh
+
+CSW_PREFIX=${PKG_INSTALL_ROOT}/opt/csw
+AP2_PREFIX=$CSW_PREFIX/apache2
+AP2_BINDIR=$AP2_PREFIX/sbin
+AP2_LIBEXEC=$AP2_PREFIX/libexec
+AP2_CONFDIR=$AP2_PREFIX/etc
+
+AP2_CONFIG=$AP2_CONFDIR/httpd.conf
+
+PKG_INSTALL_ROOT=${PKG_INSTALL_ROOT:-'/'}
+
+# Enable the nss module
+chroot $PKG_INSTALL_ROOT \
+    $AP2_BINDIR/apxs -S LIBEXECDIR=$AP2_LIBEXEC -e -a -n nss libmodnss.so
+
+# Finito
+cat <<END
+
+NOTICE: mod_nss is enabled in $AP2_CONFIG but the server
+was not restarted.  Please configure mod_nss and restart apache.
+
+To create a certificate database with a self-signed
+certificate, use the 'gencert' program that comes with mod_nss
+
+
+END
+

Added: csw/mgar/pkg/mod_nss/trunk/files/CSWap2modnss.preremove
===================================================================
--- csw/mgar/pkg/mod_nss/trunk/files/CSWap2modnss.preremove	                        (rev 0)
+++ csw/mgar/pkg/mod_nss/trunk/files/CSWap2modnss.preremove	2012-01-12 15:42:05 UTC (rev 16747)
@@ -0,0 +1,24 @@
+#!/bin/sh
+
+CSW_PREFIX=${PKG_INSTALL_ROOT}/opt/csw
+AP2_PREFIX=$CSW_PREFIX/apache2
+AP2_BINDIR=$AP2_PREFIX/sbin
+AP2_LIBEXEC=$AP2_PREFIX/libexec
+AP2_CONFDIR=$AP2_PREFIX/etc
+
+AP2_CONFIG=$AP2_CONFDIR/httpd.conf
+
+PKG_INSTALL_ROOT=${PKG_INSTALL_ROOT:-'/'}
+
+# Enable the nss module
+chroot $PKG_INSTALL_ROOT \
+    $AP2_BINDIR/apxs -S LIBEXECDIR=$AP2_LIBEXEC -e -A -n nss libmodnss.so
+
+# Finito
+cat <<END
+
+NOTICE: mod_nss is disabled in $AP2_CONFIG but the server
+was not restarted.  Please restart apache.
+
+END
+

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


From cgrzemba at users.sourceforge.net  Thu Jan 12 16:56:50 2012
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Thu, 12 Jan 2012 15:56:50 +0000
Subject: [csw-devel] SF.net SVN: gar:[16748] csw/mgar/pkg
Message-ID: <E1RlN1G-0002IS-ME@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 16748
          http://gar.svn.sourceforge.net/gar/?rev=16748&view=rev
Author:   cgrzemba
Date:     2012-01-12 15:56:50 +0000 (Thu, 12 Jan 2012)
Log Message:
-----------
389-admin/trunk: create pkg

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

Added: csw/mgar/pkg/389-admin/Makefile
===================================================================
--- csw/mgar/pkg/389-admin/Makefile	                        (rev 0)
+++ csw/mgar/pkg/389-admin/Makefile	2012-01-12 15:56:50 UTC (rev 16748)
@@ -0,0 +1,2 @@
+%:
+	$(MAKE) -C trunk $*


Property changes on: csw/mgar/pkg/389-admin/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/389-admin/trunk/Makefile
===================================================================
--- csw/mgar/pkg/389-admin/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/389-admin/trunk/Makefile	2012-01-12 15:56:50 UTC (rev 16748)
@@ -0,0 +1,51 @@
+# $Id$
+# TODO (release-critical prefixed with !, non release-critical with *)
+#
+NAME = 389-admin
+VERSION = 1.1.23
+GARTYPE = v2
+CATEGORIES = lib
+
+DESCRIPTION = The enterprise-class Open Source LDAP server
+define BLURB
+The enterprise-class Open Source LDAP server for Linux. It is hardened by real-world use, is full-featured, supports multi-master replication, and already handles many of the largest LDAP deployments in the world. The 389 Directory Server can be downloaded for free and set up in less than an hour using the graphical console.
+endef
+
+MASTER_SITES = http://port389.org/sources
+DISTFILES  = $(NAME)-$(VERSION).tar.bz2
+# BUILD64	= 1
+PACKAGING_PLATFORMS += solaris10-sparc
+PACKAGING_PLATFORMS += solaris10-i386
+
+LICENSE = LICENSE LICENSE.GPLv2
+
+GARCOMPILER = SOS12U2
+# remove -I/opt/csw/include
+CPPFLAGS = 
+EXTRA_CFLAGS = --disable-threading
+EXTRA_LINKER_FLAGS = -xnorunpath -norunpath
+
+CONFIGURE_ARGS = $(DIRPATHS)
+CONFIGURE_ARGS_OPT += --with-ldapsdk-inc=/opt/csw/include/dirsrv 
+CONFIGURE_ARGS_OPT += --with-ldapsdk-lib=/opt/csw/lib
+CONFIGURE_ARGS_OPT += --with-icu-inc=/opt/csw/include 
+CONFIGURE_ARGS_OPT += --with-icu-lib=/opt/csw/lib
+CONFIGURE_ARGS_OPT += --with-icu-bin=/opt/csw/bin 
+CONFIGURE_ARGS_OPT += --with-sasl-inc=/opt/csw/include/sasl 
+CONFIGURE_ARGS_OPT += --with-sasl-lib=/opt/csw/lib
+CONFIGURE_ARGS_OPT += --with-nss-lib=/opt/csw/lib
+CONFIGURE_ARGS_OPT += --with-nss-inc=/opt/csw/include/nss 
+CONFIGURE_ARGS_OPT += --with-apxs=/opt/csw/apache2/sbin/apxs
+CONFIGURE_ARGS_OPT += --with-httpd=/opt/csw/apache2/sbin/httpd
+CONFIGURE_ARGS_OPT += --with-modnss-lib=/opt/csw/apache2/libexec
+CONFIGURE_ARGS_OPT += --with-modnss-bin=/opt/csw/apache2/sbin
+CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARFLAVOR))
+
+include gar/category.mk
+
+pre-configure-modulated:
+	cd $(WORKSRC) && rm ltmain.sh && libtoolize --copy --force
+	cd $(WORKSRC) && aclocal
+	cd $(WORKSRC) && autoconf --force
+	cd $(WORKSRC) && automake -a -c -f
+	@$(MAKECOOKIE)


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

Added: csw/mgar/pkg/389-admin/trunk/checksums
===================================================================
--- csw/mgar/pkg/389-admin/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/389-admin/trunk/checksums	2012-01-12 15:56:50 UTC (rev 16748)
@@ -0,0 +1 @@
+34d7608a1b4b7c1b56d649a3dc407682  389-admin-1.1.23.tar.bz2

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


From cgrzemba at users.sourceforge.net  Thu Jan 12 16:59:24 2012
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Thu, 12 Jan 2012 15:59:24 +0000
Subject: [csw-devel] SF.net SVN: gar:[16749]
	csw/mgar/pkg/389-admin/trunk/Makefile
Message-ID: <E1RlN3k-0005S0-9h@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 16749
          http://gar.svn.sourceforge.net/gar/?rev=16749&view=rev
Author:   cgrzemba
Date:     2012-01-12 15:59:24 +0000 (Thu, 12 Jan 2012)
Log Message:
-----------
389-admin/trunk: mod build recipe

Modified Paths:
--------------
    csw/mgar/pkg/389-admin/trunk/Makefile

Modified: csw/mgar/pkg/389-admin/trunk/Makefile
===================================================================
--- csw/mgar/pkg/389-admin/trunk/Makefile	2012-01-12 15:56:50 UTC (rev 16748)
+++ csw/mgar/pkg/389-admin/trunk/Makefile	2012-01-12 15:59:24 UTC (rev 16749)
@@ -19,6 +19,9 @@
 
 LICENSE = LICENSE LICENSE.GPLv2
 
+PACKAGES = CSW389admin
+RUNTIME_DEP_PKGS_CSW389admin = CSWap2modnss
+
 GARCOMPILER = SOS12U2
 # remove -I/opt/csw/include
 CPPFLAGS = 

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


From wahwah at users.sourceforge.net  Thu Jan 12 17:52:55 2012
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Thu, 12 Jan 2012 16:52:55 +0000
Subject: [csw-devel] SF.net SVN: gar:[16750]
	csw/mgar/pkg/gcc4/branches/private-lib/
Message-ID: <E1RlNtX-0003GK-Fj@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 16750
          http://gar.svn.sourceforge.net/gar/?rev=16750&view=rev
Author:   wahwah
Date:     2012-01-12 16:52:55 +0000 (Thu, 12 Jan 2012)
Log Message:
-----------
A branch to try out private gcc libraries.

Added Paths:
-----------
    csw/mgar/pkg/gcc4/branches/private-lib/


Property changes on: csw/mgar/pkg/gcc4/branches/private-lib
___________________________________________________________________
Added: svn:ignore
   + cookies
download
work

Added: svn:externals
   + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2

Added: svn:mergeinfo
   + /csw/mgar/pkg/gcc4/branches/ada-enable:16158-16379
/csw/mgar/pkg/gcc4/branches/bootstrap-4.6:15321-15435
/csw/mgar/pkg/gcc4/branches/opt-csw-prefix:15436-15623

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


From pfelecan at opencsw.org  Thu Jan 12 18:49:34 2012
From: pfelecan at opencsw.org (Peter FELECAN)
Date: Thu, 12 Jan 2012 18:49:34 +0100
Subject: [csw-devel] SF.net SVN: gar:[16750]
	csw/mgar/pkg/gcc4/branches/private-lib/
In-Reply-To: <E1RlNtX-0003GK-Fj@sfp-svn-5.v30.ch3.sourceforge.com>
	(wahwah@users.sourceforge.net's message of "Thu, 12 Jan 2012 16:52:55
	+0000")
References: <E1RlNtX-0003GK-Fj@sfp-svn-5.v30.ch3.sourceforge.com>
Message-ID: <x61ur4ak0h.fsf@opencsw.org>

wahwah at users.sourceforge.net writes:

> A branch to try out private gcc libraries.

What's the idea?
-- 
Peter

From wahwah at users.sourceforge.net  Thu Jan 12 20:15:50 2012
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Thu, 12 Jan 2012 19:15:50 +0000
Subject: [csw-devel] SF.net SVN: gar:[16751]
	csw/mgar/pkg/gcc4/branches/private-lib/Makefile
Message-ID: <E1RlQ7p-0006lC-Vr@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 16751
          http://gar.svn.sourceforge.net/gar/?rev=16751&view=rev
Author:   wahwah
Date:     2012-01-12 19:15:49 +0000 (Thu, 12 Jan 2012)
Log Message:
-----------
gcc4/branches/private-lib: A test run of GCC with private libs. Package names aren't adjusted yet.

Modified Paths:
--------------
    csw/mgar/pkg/gcc4/branches/private-lib/Makefile

Modified: csw/mgar/pkg/gcc4/branches/private-lib/Makefile
===================================================================
--- csw/mgar/pkg/gcc4/branches/private-lib/Makefile	2012-01-12 16:52:55 UTC (rev 16750)
+++ csw/mgar/pkg/gcc4/branches/private-lib/Makefile	2012-01-12 19:15:49 UTC (rev 16751)
@@ -43,6 +43,8 @@
 # Could be used to break out of the /opt/csw/$(PKG_VERSION_TOKEN) prefix
 PROGRAM_SUFFIX = -$(BASE_VERSION)
 
+libdir_install = $(prefix)/lib/gcc/$(BASE_VERSION)
+
 ## build options
 # http://gcc.gnu.org/install/configure.html
 
@@ -528,7 +530,7 @@
 PATH := /opt/csw/gnu:$(PATH)
 
 # This override sets the right RPATH on libstdc++ and other libraries.
-LD_OPTIONS := -R/opt/csw/lib -R/opt/csw/lib/\$$ISALIST
+LD_OPTIONS := -R$(libdir_install) -R$(libdir_install)/\$$ISALIST
 CONFIGURE_ENV := PATH=$(PATH) CC=$(CC) LD_OPTIONS="$(LD_OPTIONS)"
 BUILD_ENV := PATH=$(PATH) LD_OPTIONS="$(LD_OPTIONS)"
 INSTALL_ENV := PATH=$(PATH)

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


From bdwalton at users.sourceforge.net  Fri Jan 13 04:12:28 2012
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Fri, 13 Jan 2012 03:12:28 +0000
Subject: [csw-devel] SF.net SVN: gar:[16752] csw/mgar/pkg/coreutils/trunk
Message-ID: <E1RlXZ6-00069r-EQ@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 16752
          http://gar.svn.sourceforge.net/gar/?rev=16752&view=rev
Author:   bdwalton
Date:     2012-01-13 03:12:27 +0000 (Fri, 13 Jan 2012)
Log Message:
-----------
coreutils/trunk: version bump; grab .xz instead of .gz now

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

Modified: csw/mgar/pkg/coreutils/trunk/Makefile
===================================================================
--- csw/mgar/pkg/coreutils/trunk/Makefile	2012-01-12 19:15:49 UTC (rev 16751)
+++ csw/mgar/pkg/coreutils/trunk/Makefile	2012-01-13 03:12:27 UTC (rev 16752)
@@ -1,5 +1,5 @@
 NAME = coreutils
-VERSION = 8.13
+VERSION = 8.15
 CATEGORIES = utils
 
 # seq has issues related to the handling of long double's with -O2.
@@ -30,7 +30,7 @@
 endef
 
 MASTER_SITES = $(GNU_MIRROR)
-DISTFILES = $(NAME)-$(VERSION).tar.gz
+DISTFILES = $(NAME)-$(VERSION).tar.xz
 
 # We define upstream file regex so we can be notifed of new upstream
 # software release

Modified: csw/mgar/pkg/coreutils/trunk/checksums
===================================================================
--- csw/mgar/pkg/coreutils/trunk/checksums	2012-01-12 19:15:49 UTC (rev 16751)
+++ csw/mgar/pkg/coreutils/trunk/checksums	2012-01-13 03:12:27 UTC (rev 16752)
@@ -1 +1 @@
-f5e8bb4752ee2e876ddd99bda7471f35  coreutils-8.13.tar.gz
+094909fafa86110140b32e4948941545  coreutils-8.15.tar.xz

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 Jan 13 04:21:33 2012
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Fri, 13 Jan 2012 03:21:33 +0000
Subject: [csw-devel] SF.net SVN: gar:[16753]
	csw/mgar/pkg/apache2/trunk/Makefile
Message-ID: <E1RlXht-0003FX-O1@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 16753
          http://gar.svn.sourceforge.net/gar/?rev=16753&view=rev
Author:   bdwalton
Date:     2012-01-13 03:21:33 +0000 (Fri, 13 Jan 2012)
Log Message:
-----------
apache2/trunk: add dep on CSWlibaprutil1-dbm-db; mantis id 4882

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

Modified: csw/mgar/pkg/apache2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/apache2/trunk/Makefile	2012-01-13 03:12:27 UTC (rev 16752)
+++ csw/mgar/pkg/apache2/trunk/Makefile	2012-01-13 03:21:33 UTC (rev 16753)
@@ -94,6 +94,8 @@
 RUNTIME_DEP_PKGS_CSWapache2       += CSWapache2c CSWperl CSWapache2-utils
 # Note: This is required because apxs uses ap{r,u}-1-config
 RUNTIME_DEP_PKGS_CSWapache2	  += CSWlibapr-dev CSWlibaprutil-dev
+# Note: This is included as something in mod_dav uses dlopen to leverage it
+RUNTIME_DEP_PKGS_CSWapache2	  += CSWlibaprutil1-dbm-db
 RUNTIME_DEP_PKGS_CSWapache2-manual = CSWapache2
 RUNTIME_DEP_PKGS_CSWapache2-dev  = CSWapache2
 RUNTIME_DEP_PKGS_CSWapache2-utils += CSWlibaprutil1-0
@@ -117,6 +119,7 @@
 CHECKPKG_OVERRIDES_CSWapache2 += surplus-dependency|CSWapache2-utils
 CHECKPKG_OVERRIDES_CSWapache2 += surplus-dependency|CSWlibapr-dev
 CHECKPKG_OVERRIDES_CSWapache2 += surplus-dependency|CSWlibaprutil-dev
+CHECKPKG_OVERRIDES_CSWapache2 += surplus-dependency|CSWlibaprutil1-dbm-db
 CHECKPKG_OVERRIDES_CSWapache2-utils += surplus-dependency|CSWperl
 CHECKPKG_OVERRIDES_CSWapache2-utils += missing-dependency|CSWapache2
 CHECKPKG_OVERRIDES_CSWap2prefork += surplus-dependency|CSWapache2

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 Jan 13 04:49:32 2012
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Fri, 13 Jan 2012 03:49:32 +0000
Subject: [csw-devel] SF.net SVN: gar:[16754] csw/mgar/pkg/tig/trunk
Message-ID: <E1RlY8y-0006ng-Go@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 16754
          http://gar.svn.sourceforge.net/gar/?rev=16754&view=rev
Author:   bdwalton
Date:     2012-01-13 03:49:31 +0000 (Fri, 13 Jan 2012)
Log Message:
-----------
tig/trunk: version bump

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

Modified: csw/mgar/pkg/tig/trunk/Makefile
===================================================================
--- csw/mgar/pkg/tig/trunk/Makefile	2012-01-13 03:21:33 UTC (rev 16753)
+++ csw/mgar/pkg/tig/trunk/Makefile	2012-01-13 03:49:31 UTC (rev 16754)
@@ -1,5 +1,5 @@
 NAME = tig
-VERSION = 0.17
+VERSION = 0.18
 CATEGORIES = utils
 
 DESCRIPTION = A git repository browser

Modified: csw/mgar/pkg/tig/trunk/checksums
===================================================================
--- csw/mgar/pkg/tig/trunk/checksums	2012-01-13 03:21:33 UTC (rev 16753)
+++ csw/mgar/pkg/tig/trunk/checksums	2012-01-13 03:49:31 UTC (rev 16754)
@@ -1 +1 @@
-f373343199422c59518776db448dec0e  tig-0.17.tar.gz
+4fa9e33c5daa76b6fed11e068405356f  tig-0.18.tar.gz

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


From bdwalton at users.sourceforge.net  Fri Jan 13 05:02:08 2012
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Fri, 13 Jan 2012 04:02:08 +0000
Subject: [csw-devel] SF.net SVN: gar:[16755] csw/mgar/pkg/tig/trunk/Makefile
Message-ID: <E1RlYLA-0002Qu-HN@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 16755
          http://gar.svn.sourceforge.net/gar/?rev=16755&view=rev
Author:   bdwalton
Date:     2012-01-13 04:02:08 +0000 (Fri, 13 Jan 2012)
Log Message:
-----------
tig/trunk: update dependencies

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

Modified: csw/mgar/pkg/tig/trunk/Makefile
===================================================================
--- csw/mgar/pkg/tig/trunk/Makefile	2012-01-13 03:49:31 UTC (rev 16754)
+++ csw/mgar/pkg/tig/trunk/Makefile	2012-01-13 04:02:08 UTC (rev 16755)
@@ -24,8 +24,8 @@
 BUILD_DEP_PKGS += CSWxmlto
 BUILD_DEP_PKGS += CSWiconv
 
-RUNTIME_DEP_PKGS += CSWncurses
-RUNTIME_DEP_PKGS += CSWiconv
+RUNTIME_DEP_PKGS += CSWlibncursesw5
+RUNTIME_DEP_PKGS += CSWlibiconv2
 RUNTIME_DEP_PKGS += CSWgit
 # Yes, we do need git
 CHECKPKG_OVERRIDES_CSWtig += surplus-dependency|CSWgit

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


From cgrzemba at users.sourceforge.net  Fri Jan 13 12:53:53 2012
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Fri, 13 Jan 2012 11:53:53 +0000
Subject: [csw-devel] SF.net SVN: gar:[16756] csw/mgar/pkg/cpan
Message-ID: <E1Rlfhh-00021F-M5@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 16756
          http://gar.svn.sourceforge.net/gar/?rev=16756&view=rev
Author:   cgrzemba
Date:     2012-01-13 11:53:53 +0000 (Fri, 13 Jan 2012)
Log Message:
-----------
cpan/perl-mozldap/trunk: Initial release

Added Paths:
-----------
    csw/mgar/pkg/cpan/perl-mozldap/
    csw/mgar/pkg/cpan/perl-mozldap/Makefile
    csw/mgar/pkg/cpan/perl-mozldap/branches/
    csw/mgar/pkg/cpan/perl-mozldap/tags/
    csw/mgar/pkg/cpan/perl-mozldap/trunk/
    csw/mgar/pkg/cpan/perl-mozldap/trunk/Makefile
    csw/mgar/pkg/cpan/perl-mozldap/trunk/checksums
    csw/mgar/pkg/cpan/perl-mozldap/trunk/files/
    csw/mgar/pkg/cpan/perl-mozldap/trunk/files/LICENSE

Added: csw/mgar/pkg/cpan/perl-mozldap/Makefile
===================================================================
--- csw/mgar/pkg/cpan/perl-mozldap/Makefile	                        (rev 0)
+++ csw/mgar/pkg/cpan/perl-mozldap/Makefile	2012-01-13 11:53:53 UTC (rev 16756)
@@ -0,0 +1,2 @@
+%:
+	$(MAKE) -C trunk $*


Property changes on: csw/mgar/pkg/cpan/perl-mozldap/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/perl-mozldap/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/perl-mozldap/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/cpan/perl-mozldap/trunk/Makefile	2012-01-13 11:53:53 UTC (rev 16756)
@@ -0,0 +1,49 @@
+NAME = perl-mozldap
+VERSION = 1.5.2
+CATEGORIES = cpan
+
+DESCRIPTION = Mozilla SDK based Lightweight Directory Access Protocol
+define BLURB
+This package offers a direct interface to the LDAP C API calls from Perl. It is used internally by the other Mozilla::LDAP modules. It is highly suggested that you use the object oriented interface in Mozilla::LDAP::Conn and Mozilla::LDAP::Entry unless you need to use asynchronous calls or other functionality not available in the OO interface.
+endef
+
+MASTER_SITES = http://ftp.mozilla.org/pub/mozilla.org/directory/perldap/releases/$(VERSION)/src
+DISTFILES = $(NAME)-$(VERSION).tar.gz
+DISTFILES += LICENSE
+
+LICENSE = LICENSE 
+
+PACKAGES = CSWpm-mozldap
+CATALOGNAME = pm_mozldap
+SPKG_DESC_CSWpm-mozldap = $(DESCRIPTION)
+GARCOMPILER = SOS12U2
+PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
+
+LDAPSDKLIBDIR = /opt/csw/lib
+LDAPSDKINCDIR = /opt/csw/include/dirsrv
+LDAPSDKSSL = Y
+LDAPPR = Y
+NSPRINCDIR = /opt/csw/include/nspr
+NSPRLIBDIR = /opt/csw/lib
+NSSLIBDIR = /opt/csw/lib
+
+EXTRA_CONFIGURE_ENV = LDAPSDKDIR=$(prefix)
+EXTRA_CONFIGURE_ENV += LDAPSDKLIBDIR=$(LDAPSDKLIBDIR)
+EXTRA_CONFIGURE_ENV += LDAPSDKINCDIR=$(LDAPSDKINCDIR)
+EXTRA_CONFIGURE_ENV += LDAPSDKSSL=$(LDAPSDKSSL)
+EXTRA_CONFIGURE_ENV += LDAPPR=$(LDAPPR)
+EXTRA_CONFIGURE_ENV += NSPRINCDIR=$(NSPRINCDIR)
+EXTRA_CONFIGURE_ENV += NSPRLIBDIR=$(NSPRLIBDIR)
+EXTRA_CONFIGURE_ENV += NSSLIBDIR=$(NSSLIBDIR)
+
+CONFIGURE_ARGS =
+
+RUNTIME_DEP_PKGS_CSWpm-mozldap += CSWlibprldap60
+RUNTIME_DEP_PKGS_CSWpm-mozldap += CSWlibplc4
+RUNTIME_DEP_PKGS_CSWpm-mozldap += CSWlibldap60
+RUNTIME_DEP_PKGS_CSWpm-mozldap += CSWlibnss3
+RUNTIME_DEP_PKGS_CSWpm-mozldap += CSWlibnspr4
+RUNTIME_DEP_PKGS_CSWpm-mozldap += CSWlibssldap60
+CHECKPKG_OVERRIDES_CSWpm-mozldap += pkginfo-opencsw-repository-uncommitted
+
+include gar/category.mk


Property changes on: csw/mgar/pkg/cpan/perl-mozldap/trunk/Makefile
___________________________________________________________________
Added: svn:keywords
   + Id

Added: csw/mgar/pkg/cpan/perl-mozldap/trunk/checksums
===================================================================
--- csw/mgar/pkg/cpan/perl-mozldap/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/cpan/perl-mozldap/trunk/checksums	2012-01-13 11:53:53 UTC (rev 16756)
@@ -0,0 +1 @@
+1f7af40a8ca42f4a8b805942129915e0  perl-mozldap-1.5.2.tar.gz

Added: csw/mgar/pkg/cpan/perl-mozldap/trunk/files/LICENSE
===================================================================
--- csw/mgar/pkg/cpan/perl-mozldap/trunk/files/LICENSE	                        (rev 0)
+++ csw/mgar/pkg/cpan/perl-mozldap/trunk/files/LICENSE	2012-01-13 11:53:53 UTC (rev 16756)
@@ -0,0 +1,32 @@
+Version: MPL 1.1/GPL 2.0/LGPL 2.1
+
+ The contents of this file are subject to the Mozilla Public License Version
+ 1.1 (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+ http://www.mozilla.org/MPL/
+
+ Software distributed under the License is distributed on an "AS IS" basis,
+ WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ for the specific language governing rights and limitations under the
+ License.
+
+ The Original Code is PerLDAP.
+
+ The Initial Developer of the Original Code is
+ Netscape Communications Corporation.
+ Portions created by the Initial Developer are Copyright (C) 2001
+ the Initial Developer. All Rights Reserved.
+
+ Contributor(s):
+   Clayton Donley
+   Leif Hedstrom <leif at perldap.org>
+
+ Alternatively, the contents of this file may be used under the terms of
+ either the GNU General Public License Version 2 or later (the "GPL"), or
+ the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ in which case the provisions of the GPL or the LGPL are applicable instead
+ of those above. If you wish to allow use of your version of this file only
+ under the terms of either the GPL or the LGPL, and not to allow others to# use your version of this file under the terms of the MPL, indicate your
+ decision by deleting the provisions above and replace them with the notice
+ and other provisions required by the GPL or the LGPL. If you do not delete
+ the provisions above, a recipient may use your version of this file under# the terms of any one of the MPL, the GPL or the LGPL.

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


From cgrzemba at users.sourceforge.net  Fri Jan 13 13:19:34 2012
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Fri, 13 Jan 2012 12:19:34 +0000
Subject: [csw-devel] SF.net SVN: gar:[16757]
	csw/mgar/pkg/cpan/perl-mozldap/trunk/Makefile
Message-ID: <E1Rlg6Y-00069j-5Y@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 16757
          http://gar.svn.sourceforge.net/gar/?rev=16757&view=rev
Author:   cgrzemba
Date:     2012-01-13 12:19:33 +0000 (Fri, 13 Jan 2012)
Log Message:
-----------
cpan/perl-mozldap/trunk: remove check overide

Modified Paths:
--------------
    csw/mgar/pkg/cpan/perl-mozldap/trunk/Makefile

Modified: csw/mgar/pkg/cpan/perl-mozldap/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/perl-mozldap/trunk/Makefile	2012-01-13 11:53:53 UTC (rev 16756)
+++ csw/mgar/pkg/cpan/perl-mozldap/trunk/Makefile	2012-01-13 12:19:33 UTC (rev 16757)
@@ -44,6 +44,5 @@
 RUNTIME_DEP_PKGS_CSWpm-mozldap += CSWlibnss3
 RUNTIME_DEP_PKGS_CSWpm-mozldap += CSWlibnspr4
 RUNTIME_DEP_PKGS_CSWpm-mozldap += CSWlibssldap60
-CHECKPKG_OVERRIDES_CSWpm-mozldap += pkginfo-opencsw-repository-uncommitted
 
 include gar/category.mk

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


From bonivart at users.sourceforge.net  Fri Jan 13 13:38:00 2012
From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net)
Date: Fri, 13 Jan 2012 12:38:00 +0000
Subject: [csw-devel] SF.net SVN: gar:[16758] csw/mgar/pkg/dhcp/trunk
Message-ID: <E1RlgOO-0007LA-05@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 16758
          http://gar.svn.sourceforge.net/gar/?rev=16758&view=rev
Author:   bonivart
Date:     2012-01-13 12:37:59 +0000 (Fri, 13 Jan 2012)
Log Message:
-----------
dhcp/trunk: update to 4.2.3-P2

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

Modified: csw/mgar/pkg/dhcp/trunk/Makefile
===================================================================
--- csw/mgar/pkg/dhcp/trunk/Makefile	2012-01-13 12:19:33 UTC (rev 16757)
+++ csw/mgar/pkg/dhcp/trunk/Makefile	2012-01-13 12:37:59 UTC (rev 16758)
@@ -1,6 +1,6 @@
 NAME = dhcp
 VERSION = 4.2.3
-RELEASE = P1
+RELEASE = P2
 DISTVERSION = $(VERSION)-$(RELEASE)
 SPKG_VERSION = $(VERSION)$(RELEASE)
 DISTNAME = $(NAME)-$(VERSION)-$(RELEASE)

Modified: csw/mgar/pkg/dhcp/trunk/checksums
===================================================================
--- csw/mgar/pkg/dhcp/trunk/checksums	2012-01-13 12:19:33 UTC (rev 16757)
+++ csw/mgar/pkg/dhcp/trunk/checksums	2012-01-13 12:37:59 UTC (rev 16758)
@@ -1 +1 @@
-04599f1557a5cafd10d7745267a68c8b  dhcp-4.2.3-P1.tar.gz
+14f57fd580d01633d0fad4809007a801  dhcp-4.2.3-P2.tar.gz

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


From cgrzemba at users.sourceforge.net  Fri Jan 13 16:07:03 2012
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Fri, 13 Jan 2012 15:07:03 +0000
Subject: [csw-devel] SF.net SVN: gar:[16759] csw/mgar/pkg/389-admin/trunk
Message-ID: <E1Rliid-0001Us-Sm@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 16759
          http://gar.svn.sourceforge.net/gar/?rev=16759&view=rev
Author:   cgrzemba
Date:     2012-01-13 15:07:03 +0000 (Fri, 13 Jan 2012)
Log Message:
-----------
389-admin/trunk: add patch

Modified Paths:
--------------
    csw/mgar/pkg/389-admin/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/389-admin/trunk/files/0001-change-includedir-preference-in-Makefile.am.patch

Modified: csw/mgar/pkg/389-admin/trunk/Makefile
===================================================================
--- csw/mgar/pkg/389-admin/trunk/Makefile	2012-01-13 12:37:59 UTC (rev 16758)
+++ csw/mgar/pkg/389-admin/trunk/Makefile	2012-01-13 15:07:03 UTC (rev 16759)
@@ -19,14 +19,15 @@
 
 LICENSE = LICENSE LICENSE.GPLv2
 
+PATCHFILES += 0001-change-includedir-preference-in-Makefile.am.patch
+
 PACKAGES = CSW389admin
 RUNTIME_DEP_PKGS_CSW389admin = CSWap2modnss
 
 GARCOMPILER = SOS12U2
 # remove -I/opt/csw/include
 CPPFLAGS = 
-EXTRA_CFLAGS = --disable-threading
-EXTRA_LINKER_FLAGS = -xnorunpath -norunpath
+EXTRA_LINKER_FLAGS = -xnorunpath -norunpath -liconv
 
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS_OPT += --with-ldapsdk-inc=/opt/csw/include/dirsrv 

Added: csw/mgar/pkg/389-admin/trunk/files/0001-change-includedir-preference-in-Makefile.am.patch
===================================================================
--- csw/mgar/pkg/389-admin/trunk/files/0001-change-includedir-preference-in-Makefile.am.patch	                        (rev 0)
+++ csw/mgar/pkg/389-admin/trunk/files/0001-change-includedir-preference-in-Makefile.am.patch	2012-01-13 15:07:03 UTC (rev 16759)
@@ -0,0 +1,25 @@
+From 2cedc89069d4f66c9ce9e24addaa4c13ebd1bca4 Mon Sep 17 00:00:00 2001
+From: Carsten Grzemba <cgrzemba at opencsw.org>
+Date: Fri, 13 Jan 2012 13:04:22 +0100
+Subject: [PATCH] change includedir preference in Makefile.am
+
+---
+ Makefile.am |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 792f782..25ae853 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -99,7 +99,7 @@ libadmin_a_SOURCES = lib/libadmin/cluster.c \
+ 	lib/libadmin/error.c lib/libadmin/form_get.c lib/libadmin/httpcon.c lib/libadmin/install.c \
+ 	lib/libadmin/referer.c lib/libadmin/template.c lib/libadmin/util.c
+ 
+-AM_CPPFLAGS = $(DEBUG_DEFINES) $(PATH_DEFINES) $(OTHER_DEFINES) @adminutil_inc@ @icu_inc@ @openldap_inc@ @ldapsdk_inc@ @nss_inc@ @nspr_inc@ -DUSE_ADMSERV=1 \
++AM_CPPFLAGS = $(DEBUG_DEFINES) $(PATH_DEFINES) $(OTHER_DEFINES) @adminutil_inc@ @openldap_inc@ @ldapsdk_inc@ @nss_inc@ @nspr_inc@ @icu_inc@ -DUSE_ADMSERV=1 \
+ 	-I$(srcdir)/include -I$(srcdir)/include/base
+ if WINNT
+ AM_CPPFLAGS += -DXP_WINNT
+-- 
+1.7.8.2
+

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


From dmichelsen at users.sourceforge.net  Fri Jan 13 16:52:19 2012
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Fri, 13 Jan 2012 15:52:19 +0000
Subject: [csw-devel] SF.net SVN: gar:[16760] csw/mgar/pkg/recutils/trunk
Message-ID: <E1RljQR-0007OF-26@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 16760
          http://gar.svn.sourceforge.net/gar/?rev=16760&view=rev
Author:   dmichelsen
Date:     2012-01-13 15:52:18 +0000 (Fri, 13 Jan 2012)
Log Message:
-----------
recutils/trunk: Update to 1.5 and split library and devel package

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

Modified: csw/mgar/pkg/recutils/trunk/Makefile
===================================================================
--- csw/mgar/pkg/recutils/trunk/Makefile	2012-01-13 15:07:03 UTC (rev 16759)
+++ csw/mgar/pkg/recutils/trunk/Makefile	2012-01-13 15:52:18 UTC (rev 16760)
@@ -2,7 +2,7 @@
 # TODO (release-critical prefixed with !, non release-critical with *)
 #
 NAME = recutils
-VERSION = 1.4
+VERSION = 1.5
 GARTYPE = v2
 CATEGORIES = utils
 
@@ -16,17 +16,35 @@
 MASTER_SITES += ftp://alpha.gnu.org/gnu/$(GNU_PROJ)/
 DISTFILES  = $(DISTNAME).tar.gz
 
+PACKAGES += CSWrecutils
+SPKG_DESC_CSWrecutils = GNU recutils
+# PKGFILES is catchall
+RUNTIME_DEP_PKGS_CSWrecutils += CSWlibgcrypt11
 RUNTIME_DEP_PKGS_CSWrecutils += CSWlibintl8
-RUNTIME_DEP_PKGS_CSWrecutils += CSWemacscommon
 RUNTIME_DEP_PKGS_CSWrecutils += CSWlibgpg-error0
 RUNTIME_DEP_PKGS_CSWrecutils += CSWlibcurl4
-RUNTIME_DEP_PKGS_CSWrecutils += CSWlibgcrypt11
+RUNTIME_DEP_PKGS_CSWrecutils += CSWlibrec0
+RUNTIME_DEP_PKGS_CSWrecutils += CSWlibreadline6
+# This is just an emacs mode. It can be used when emacs is installed, no need to force dependency
+CHECKPKG_OVERRIDES_CSWrecutils += missing-dependency|CSWemacscommon
 
-# I am not sure if anyone is actually developing against te library
-# Looks like it is more like a private lib. Overwrite for now.
-CHECKPKG_OVERRIDES_CSWrecutils += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/librec.so
-CHECKPKG_OVERRIDES_CSWrecutils += shared-lib-pkgname-mismatch|file=opt/csw/lib/librec.so.0.0.0|soname=librec.so.0|pkgname=CSWrecutils|expected=CSWlibrec0
+PACKAGES += CSWlibrec0
+SPKG_DESC_CSWlibrec0 = GNU recutils library, librec.so.0
+PKGFILES_CSWlibrec0 += $(call pkgfiles_lib,librec.so.0)
+RUNTIME_DEP_PKGS_CSWlibrec0 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibrec0 += CSWlibgpg-error0
+RUNTIME_DEP_PKGS_CSWlibrec0 += CSWlibcurl4
+RUNTIME_DEP_PKGS_CSWlibrec0 += CSWlibgcrypt11
+RUNTIME_DEP_PKGS_CSWlibrec0 += CSWlibreadline6
 
+PACKAGES += CSWlibrec-dev
+SPKG_DESC_CSWlibrec-dev = Development files for librec.so.0
+PKGFILES_CSWlibrec-dev += $(PKGFILES_DEVEL)
+RUNTIME_DEP_PKGS_CSWlibrec-dev += CSWlibrec0
+
+CONFIGURE_ARGS += $(DIRPATHS)
+CONFIGURE_ARGS += --disable-static
+
 EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/charset\.alias
 
 include gar/category.mk

Modified: csw/mgar/pkg/recutils/trunk/checksums
===================================================================
--- csw/mgar/pkg/recutils/trunk/checksums	2012-01-13 15:07:03 UTC (rev 16759)
+++ csw/mgar/pkg/recutils/trunk/checksums	2012-01-13 15:52:18 UTC (rev 16760)
@@ -1 +1 @@
-4f62d66ce98f1dc50cd9cbb58d3dfe1d  recutils-1.4.tar.gz
+e8273e03c8b2030695089dedef4c99fe  recutils-1.5.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  Fri Jan 13 22:11:48 2012
From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net)
Date: Fri, 13 Jan 2012 21:11:48 +0000
Subject: [csw-devel] SF.net SVN: gar:[16761] csw/mgar/pkg/pkgutil/trunk
Message-ID: <E1RloPc-0003u0-Tr@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 16761
          http://gar.svn.sourceforge.net/gar/?rev=16761&view=rev
Author:   bonivart
Date:     2012-01-13 21:11:48 +0000 (Fri, 13 Jan 2012)
Log Message:
-----------
pkgutil/trunk: 2.6.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	2012-01-13 15:52:18 UTC (rev 16760)
+++ csw/mgar/pkg/pkgutil/trunk/Makefile	2012-01-13 21:11:48 UTC (rev 16761)
@@ -1,5 +1,5 @@
 NAME = pkgutil
-VERSION = 2.6.1b1
+VERSION = 2.6.1
 CATEGORIES = utils
 
 DESCRIPTION = Installs Solaris packages easily

Modified: csw/mgar/pkg/pkgutil/trunk/checksums
===================================================================
--- csw/mgar/pkg/pkgutil/trunk/checksums	2012-01-13 15:52:18 UTC (rev 16760)
+++ csw/mgar/pkg/pkgutil/trunk/checksums	2012-01-13 21:11:48 UTC (rev 16761)
@@ -1 +1 @@
-8dd59f7d63192d47b34ea63ffe26e47e  pkgutil-2.6.1b1.zip
+e570d6123d9ccff2b5c4d8f0dfe9ed99  pkgutil-2.6.1.zip

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


From bonivart at users.sourceforge.net  Fri Jan 13 22:38:29 2012
From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net)
Date: Fri, 13 Jan 2012 21:38:29 +0000
Subject: [csw-devel] SF.net SVN: gar:[16762]
	csw/mgar/pkg/pkgutil/trunk/checksums
Message-ID: <E1RlopR-0002aI-Du@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 16762
          http://gar.svn.sourceforge.net/gar/?rev=16762&view=rev
Author:   bonivart
Date:     2012-01-13 21:38:29 +0000 (Fri, 13 Jan 2012)
Log Message:
-----------
pkgutil/trunk: 2.6.1 2nd try

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

Modified: csw/mgar/pkg/pkgutil/trunk/checksums
===================================================================
--- csw/mgar/pkg/pkgutil/trunk/checksums	2012-01-13 21:11:48 UTC (rev 16761)
+++ csw/mgar/pkg/pkgutil/trunk/checksums	2012-01-13 21:38:29 UTC (rev 16762)
@@ -1 +1 @@
-e570d6123d9ccff2b5c4d8f0dfe9ed99  pkgutil-2.6.1.zip
+bbde8296d2b679664e887f8621527c4f  pkgutil-2.6.1.zip

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 Jan 14 03:08:47 2012
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Sat, 14 Jan 2012 02:08:47 +0000
Subject: [csw-devel] SF.net SVN: gar:[16763] csw/mgar/pkg/php5/trunk
Message-ID: <E1Rlt31-0000QV-MN@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 16763
          http://gar.svn.sourceforge.net/gar/?rev=16763&view=rev
Author:   bdwalton
Date:     2012-01-14 02:08:47 +0000 (Sat, 14 Jan 2012)
Log Message:
-----------
php5/trunk: version bump, add --enable-intl argument

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

Modified: csw/mgar/pkg/php5/trunk/Makefile
===================================================================
--- csw/mgar/pkg/php5/trunk/Makefile	2012-01-13 21:38:29 UTC (rev 16762)
+++ csw/mgar/pkg/php5/trunk/Makefile	2012-01-14 02:08:47 UTC (rev 16763)
@@ -1,5 +1,5 @@
 NAME     = php5
-VERSION  = 5.3.8
+VERSION  = 5.3.9
 CATEGORIES  = lang
 SF_PROJ     = $(shell echo $(NAME) | sed -e 's/[0-9]//g')
 DISTNAME    = $(SF_PROJ)-$(VERSION)
@@ -228,6 +228,7 @@
 CONFIGURE_ARGS += --enable-simplexml
 CONFIGURE_ARGS += --disable-static
 CONFIGURE_ARGS += --enable-xml
+CONFIGURE_ARGS += --enable-intl
 CONFIGURE_ARGS += --with-libxml-dir=$(prefix)
 CONFIGURE_ARGS += --with-config-file-path=$(sysconfdir)
 CONFIGURE_ARGS += --with-config-file-scan-dir=$(sysconfdir)/conf.d

Modified: csw/mgar/pkg/php5/trunk/checksums
===================================================================
--- csw/mgar/pkg/php5/trunk/checksums	2012-01-13 21:38:29 UTC (rev 16762)
+++ csw/mgar/pkg/php5/trunk/checksums	2012-01-14 02:08:47 UTC (rev 16763)
@@ -1 +1 @@
-704cd414a0565d905e1074ffdc1fadfb  php-5.3.8.tar.bz2
+dd3288ed5c08cd61ac5bf619cb357521  php-5.3.9.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  Sat Jan 14 03:43:23 2012
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Sat, 14 Jan 2012 02:43:23 +0000
Subject: [csw-devel] SF.net SVN: gar:[16764] csw/mgar/pkg/php5/trunk/files/
 0002-Force-the-PDO-pgsql-checks-to-use-32-bit-pg_config.patch
Message-ID: <E1RltaV-0001KK-Fz@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 16764
          http://gar.svn.sourceforge.net/gar/?rev=16764&view=rev
Author:   bdwalton
Date:     2012-01-14 02:43:23 +0000 (Sat, 14 Jan 2012)
Log Message:
-----------
update pg_config patch

Modified Paths:
--------------
    csw/mgar/pkg/php5/trunk/files/0002-Force-the-PDO-pgsql-checks-to-use-32-bit-pg_config.patch

Modified: csw/mgar/pkg/php5/trunk/files/0002-Force-the-PDO-pgsql-checks-to-use-32-bit-pg_config.patch
===================================================================
--- csw/mgar/pkg/php5/trunk/files/0002-Force-the-PDO-pgsql-checks-to-use-32-bit-pg_config.patch	2012-01-14 02:08:47 UTC (rev 16763)
+++ csw/mgar/pkg/php5/trunk/files/0002-Force-the-PDO-pgsql-checks-to-use-32-bit-pg_config.patch	2012-01-14 02:43:23 UTC (rev 16764)
@@ -1,6 +1,6 @@
-From 03f791ec352a08721208ff22aa1b70d4ccfd8b7a Mon Sep 17 00:00:00 2001
+From 3df3c4dc7a7f7aa77dbc45c7617fb5fe5522ff74 Mon Sep 17 00:00:00 2001
 From: Ben Walton <bwalton at opencsw.org>
-Date: Sat, 3 Sep 2011 04:22:44 +0200
+Date: Sat, 14 Jan 2012 03:39:10 +0100
 Subject: [PATCH] Force the PDO pgsql checks to use 32-bit pg_config
 
 On sparc, we have 32 and 64-bit pg_config binaries.  On i386, we only
@@ -16,12 +16,12 @@
  1 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/configure b/configure
-index f3772a5..5aa29c9 100755
+index a090a60..fef5052 100755
 --- a/configure
 +++ b/configure
-@@ -73177,8 +73177,8 @@ if test "$PHP_PDO_PGSQL" != "no"; then
+@@ -73482,8 +73482,8 @@ if test "$PHP_PDO_PGSQL" != "no"; then
    echo $ac_n "checking for pg_config""... $ac_c" 1>&6
- echo "configure:73216: checking for pg_config" >&5
+ echo "configure:73521: checking for pg_config" >&5
    for i in $PHP_PDO_PGSQL $PHP_PDO_PGSQL/bin /usr/local/pgsql/bin /usr/local/bin /usr/bin ""; do
 -    if test -x $i/pg_config; then
 -      PG_CONFIG="$i/pg_config"
@@ -31,5 +31,5 @@
      fi
    done
 -- 
-1.7.6
+1.7.8.2
 

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


From wahwah at users.sourceforge.net  Sat Jan 14 19:03:07 2012
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Sat, 14 Jan 2012 18:03:07 +0000
Subject: [csw-devel] SF.net SVN: gar:[16765]
	csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files
Message-ID: <E1Rm7wZ-0002L9-G6@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 16765
          http://gar.svn.sourceforge.net/gar/?rev=16765&view=rev
Author:   wahwah
Date:     2012-01-14 18:03:07 +0000 (Sat, 14 Jan 2012)
Log Message:
-----------
mysql5/branches/mysql-5.0.x: adjust paths to my-small.cnf

Modified Paths:
--------------
    csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/CSWmysql5.postinstall
    csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/quick_start-csw

Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/CSWmysql5.postinstall
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/CSWmysql5.postinstall	2012-01-14 02:43:23 UTC (rev 16764)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/CSWmysql5.postinstall	2012-01-14 18:03:07 UTC (rev 16765)
@@ -15,7 +15,7 @@
 MYSQL_HOME="/var${prefix}/mysql5"
 sysconfdir="/etc${prefix}"
 # https://www.opencsw.org/mantis/view.php?id=4646
-DEFAULTS_FILE="${sysconfdir}/my.cnf"
+DEFAULTS_FILE="${prefix}/share/mysql/5.0/mysql/my-small.cnf"
 MYSQLD_USER="mysql"
 # Provide the default data directory
 MYSQLD_DATADIR="${MYSQL_HOME}"

Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/quick_start-csw
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/quick_start-csw	2012-01-14 02:43:23 UTC (rev 16764)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/quick_start-csw	2012-01-14 18:03:07 UTC (rev 16765)
@@ -14,7 +14,7 @@
 MYSQL_HOME=${prefix}
 MYSQL_VAR=/var${prefix}
 sysconfdir=/etc${prefix}
-DEFAULTS_FILE=${sysconfdir}/my.cnf
+DEFAULTS_FILE=${prefix}/share/mysql/5.0/mysql/my-small.cnf
 MYSQLD_USER=mysql
 #
 # Provide a default data directory
@@ -54,7 +54,8 @@
     ` || exit $?
 if [ $usrin = "[default]" ]; then
     if [ ! -f "$DEFAULTS_FILE" ]; then
-        IN_DEFAULTS_FILE=$MYSQL_HOME/share/mysql/my-small.cnf
+        IN_DEFAULTS_FILE=$MYSQL_HOME/share/mysql/5.0/mysql/my-small.cnf
+        /share/mysql/my-small.cnf
         echo "Using $IN_DEFAULTS_FILE to create the options file."
     else
         IN_DEFAULTS_FILE=$DEFAULTS_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  Sun Jan 15 12:13:09 2012
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Sun, 15 Jan 2012 11:13:09 +0000
Subject: [csw-devel] SF.net SVN: gar:[16766] csw/mgar/pkg/xmlstarlet/trunk
Message-ID: <E1RmO1N-0003mB-TJ@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 16766
          http://gar.svn.sourceforge.net/gar/?rev=16766&view=rev
Author:   dmichelsen
Date:     2012-01-15 11:13:09 +0000 (Sun, 15 Jan 2012)
Log Message:
-----------
xmlstarlet/trunk: Update to 1.3.1

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

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


Property changes on: csw/mgar/pkg/xmlstarlet/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2


Modified: csw/mgar/pkg/xmlstarlet/trunk/Makefile
===================================================================
--- csw/mgar/pkg/xmlstarlet/trunk/Makefile	2012-01-14 18:03:07 UTC (rev 16765)
+++ csw/mgar/pkg/xmlstarlet/trunk/Makefile	2012-01-15 11:13:09 UTC (rev 16766)
@@ -1,5 +1,5 @@
 NAME = xmlstarlet
-VERSION = 1.3.0
+VERSION = 1.3.1
 CATEGORIES = utils
 
 DESCRIPTION = XML transformation utility
@@ -18,7 +18,7 @@
 VENDOR_URL = http://xmlstar.sourceforge.net/
 
 BUILD_DEP_PKGS += CSWlibxml2-dev
-BUILD_DEP_PKGS += CSWlibxsltdevel
+BUILD_DEP_PKGS += CSWlibxslt-dev
 
 RUNTIME_DEP_PKGS_CSWxmlstarlet += CSWlibxml2-2
 RUNTIME_DEP_PKGS_CSWxmlstarlet += CSWlibxslt1
@@ -27,8 +27,8 @@
 BUILD64 = 1
 ISAEXEC = 1
 
-CONFIGURE_ENV += LIBXML_CONFIG=$(bindir)/xml2-config
-CONFIGURE_ENV += LIBXSLT_CONFIG=$(bindir)/xslt-config
+EXTRA_CONFIGURE_ENV += LIBXML_CONFIG=$(bindir)/xml2-config
+EXTRA_CONFIGURE_ENV += LIBXSLT_CONFIG=$(bindir)/xslt-config
 
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --disable-static-libs

Modified: csw/mgar/pkg/xmlstarlet/trunk/checksums
===================================================================
--- csw/mgar/pkg/xmlstarlet/trunk/checksums	2012-01-14 18:03:07 UTC (rev 16765)
+++ csw/mgar/pkg/xmlstarlet/trunk/checksums	2012-01-15 11:13:09 UTC (rev 16766)
@@ -1 +1 @@
-4553fb51c38372e862987d0447e730ba  xmlstarlet-1.3.0.tar.gz
+5173ad3f01ec0ba0d54bd1fbfc057abf  xmlstarlet-1.3.1.tar.gz

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


From maciej at opencsw.org  Sun Jan 15 16:19:37 2012
From: maciej at opencsw.org (=?UTF-8?Q?Maciej_=28Matchek=29_Blizi=C5=84ski?=)
Date: Sun, 15 Jan 2012 15:19:37 +0000
Subject: [csw-devel] SF.net SVN: gar:[16750]
	csw/mgar/pkg/gcc4/branches/private-lib/
In-Reply-To: <x61ur4ak0h.fsf@opencsw.org>
References: <E1RlNtX-0003GK-Fj@sfp-svn-5.v30.ch3.sourceforge.com>
	<x61ur4ak0h.fsf@opencsw.org>
Message-ID: <CALtRa-5RbTptRaFfTVqxbmk7mfe7QVRTi8teiEs9uzb75O-5Wg@mail.gmail.com>

2012/1/12 Peter FELECAN <pfelecan at opencsw.org>:
> What's the idea?

The idea is this: if libstdc++.so.6 is in /opt/csw/lib and we
automatically add -R/opt/csw/lib/$ISALIST to all binaries, there's a
new failure mode: a binary might link against a SONAME traditionally
from /usr/lib. If / when we introduce the an incompatible library with
the same SONAME to /opt/csw/lib, we break that binary.

State 1:

/opt/csw/bin/foo NEEDED libbar.so.1, RPATH /opt/csw/lib
/usr/lib/libbar.so.1 is available

State 2:

/opt/csw/bin/foo NEEDED libbar.so.1, RPATH /opt/csw/lib
/usr/lib/libbar.so.1 is available
/opt/csw/lib/libbar.so.1 is available too, incompatible with /opt/csw/bin/foo

I'm not sure if this is a scenario we have to worry about, because the
solution is to keep GCC libraries in a subdirectory, which has its own
disadvantages - library space fragmentation, sometimes harder to debug
linking problems, etc.

Maciej

From bonivart at users.sourceforge.net  Sun Jan 15 16:21:57 2012
From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net)
Date: Sun, 15 Jan 2012 15:21:57 +0000
Subject: [csw-devel] SF.net SVN: gar:[16767] csw/mgar/pkg/dialog/trunk
Message-ID: <E1RmRu9-0007zv-KE@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 16767
          http://gar.svn.sourceforge.net/gar/?rev=16767&view=rev
Author:   bonivart
Date:     2012-01-15 15:21:57 +0000 (Sun, 15 Jan 2012)
Log Message:
-----------
dialog/trunk: update to 2011-10-20

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

Modified: csw/mgar/pkg/dialog/trunk/Makefile
===================================================================
--- csw/mgar/pkg/dialog/trunk/Makefile	2012-01-15 11:13:09 UTC (rev 16766)
+++ csw/mgar/pkg/dialog/trunk/Makefile	2012-01-15 15:21:57 UTC (rev 16767)
@@ -2,9 +2,9 @@
 #   gmake package-CSWdialog-minimal
 
 NAME = dialog
-VERSION = 1.1r20110118
+VERSION = 1.1r20111020
 VERSION2 = 1.1
-RELEASE = 20110118
+RELEASE = 20111020
 DISTNAME = $(NAME)-$(VERSION2)-$(RELEASE)
 WORKSRC = $(WORKDIR)/$(DISTNAME)
 CATEGORIES = utils
@@ -16,6 +16,7 @@
 
 MASTER_SITES = http://invisible-island.net/datafiles/release/
 DISTFILES = $(NAME).tar.gz
+VENDOR_URL = http://invisible-island.net/dialog
 
 EXTRA_MODULATORS = CURSES
 MODULATIONS_CURSES = ncurses minimal
@@ -28,7 +29,7 @@
 CATALOGNAME_CSWdialog = dialog
 CATALOGNAME_CSWdialog-minimal = dialog_minimal
 
-RUNTIME_DEP_PKGS_CSWdialog += CSWncurses
+RUNTIME_DEP_PKGS_CSWdialog += CSWlibncurses5
 
 CHECKPKG_OVERRIDES_CSWdialog += file-with-bad-content
 CHECKPKG_OVERRIDES_CSWdialog += missing-dependency|CSWpython

Modified: csw/mgar/pkg/dialog/trunk/checksums
===================================================================
--- csw/mgar/pkg/dialog/trunk/checksums	2012-01-15 11:13:09 UTC (rev 16766)
+++ csw/mgar/pkg/dialog/trunk/checksums	2012-01-15 15:21:57 UTC (rev 16767)
@@ -1 +1 @@
-07d6ab77bd8c12c3def07ed72a706194  dialog.tar.gz
+15dd2ce9f537c0400f600d1a383aa0a3  dialog.tar.gz

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


From guengel at users.sourceforge.net  Sun Jan 15 19:43:00 2012
From: guengel at users.sourceforge.net (guengel at users.sourceforge.net)
Date: Sun, 15 Jan 2012 18:43:00 +0000
Subject: [csw-devel] SF.net SVN: gar:[16768] csw/mgar/pkg/cfengine3/trunk
Message-ID: <E1RmV2i-0002Sx-HZ@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 16768
          http://gar.svn.sourceforge.net/gar/?rev=16768&view=rev
Author:   guengel
Date:     2012-01-15 18:43:00 +0000 (Sun, 15 Jan 2012)
Log Message:
-----------
cfengine3/trunk: Renamed CSWcfengine3rt to CSWcfengine3utils. libpromises now lives in a private directory $(libdir)/cfengine3.

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

Added Paths:
-----------
    csw/mgar/pkg/cfengine3/trunk/files/CSWcfengine3utils.postinstall

Removed Paths:
-------------
    csw/mgar/pkg/cfengine3/trunk/files/CSWcfengine3rt.postinstall

Modified: csw/mgar/pkg/cfengine3/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cfengine3/trunk/Makefile	2012-01-15 15:21:57 UTC (rev 16767)
+++ csw/mgar/pkg/cfengine3/trunk/Makefile	2012-01-15 18:43:00 UTC (rev 16768)
@@ -16,7 +16,7 @@
 MASTER_SITES = http://www.cfengine.com/source-code/download?file=
 DISTFILES  = $(DISTNAME).tar.gz
 DISTFILES += $(NAME)rc
-DISTFILES += CSW$(NAME)rt.postinstall
+DISTFILES += CSW$(NAME)utils.postinstall
 DISTFILES += csw$(NAME)-cfexecd
 DISTFILES += csw$(NAME)-cfmonitord
 DISTFILES += csw$(NAME)-cfserverd
@@ -26,6 +26,8 @@
 
 UFILES_REGEX = cfengine-(\d+(?:\.\d+)*).tar.gz
 
+# Cfengine probes for Solaris 10 specific functionality (i.e. zones),
+# so a we build it for Sol9 and Sol10
 PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 solaris9-sparc solaris9-i386
 
 # File name regex to get notifications about upstream software releases
@@ -44,27 +46,25 @@
 cfengine_workdir_bin	= $(cfengine_workdir)/bin
 initddir		= $(sysconfdir)/init.d
 
-PACKAGES = CSW$(NAME)rt
+PACKAGES = CSW$(NAME)utils
 # Catch all
-CATALOGNAME_CSW$(NAME)rt = $(NAME)_rt
-SPKG_DESC_CSW$(NAME)rt = CFEngine 3 runtime and documentation
-RUNTIME_DEP_PKGS_CSW$(NAME)rt += CSWbdb48
-RUNTIME_DEP_PKGS_CSW$(NAME)rt += CSWosslrt
-RUNTIME_DEP_PKGS_CSW$(NAME)rt += CSWlibpcre0
-CHECKPKG_OVERRIDES_CSW$(NAME)rt += catalogname-does-not-match-pkgname|pkgname=CSW$(NAME)rt|catalogname=$(NAME)_rt|expected-catalogname=$(NAME)rt
-# Moved to runtime, since there are no header files for this library.
-CHECKPKG_OVERRIDES_CSW$(NAMES)rt += shared-lib-pkgname-mismatch
-OBSOLETED_BY_CSW$(NAME)rt = CSWlibpromises1
+CATALOGNAME_CSW$(NAME)utils = $(NAME)_utils
+SPKG_DESC_CSW$(NAME)utils = CFEngine 3 utilities and documentation
+RUNTIME_DEP_PKGS_CSW$(NAME)utils += CSWbdb48
+RUNTIME_DEP_PKGS_CSW$(NAME)utils += CSWosslrt
+RUNTIME_DEP_PKGS_CSW$(NAME)utils += CSWlibpcre0
+CHECKPKG_OVERRIDES_CSW$(NAME)utils += catalogname-does-not-match-pkgname|pkgname=CSW$(NAME)utils|catalogname=$(NAME)_utils|expected-catalogname=$(NAME)utils
+OBSOLETED_BY_CSW$(NAME)utils = CSWlibpromises1 CSW$(NAME)rt
 CATALOGNAME_CSWlibpromises1 = libpromises1_stub
+CATALOGNAME_CSW$(NAME)rt = $(NAME)_rt_stub
 
-
 PACKAGES += CSW$(NAME)server
 CATALOGNAME_CSW$(NAME)server = $(NAME)_server
 SPKG_DESC_CSW$(NAME)server = CFEngine 3 server binary
 RUNTIME_DEP_PKGS_CSW$(NAME)server += CSWbdb48
 RUNTIME_DEP_PKGS_CSW$(NAME)server += CSWosslrt
 RUNTIME_DEP_PKGS_CSW$(NAME)server += CSWlibpcre0
-RUNTIME_DEP_PKGS_CSW$(NAME)server += CSW$(NAME)rt
+RUNTIME_DEP_PKGS_CSW$(NAME)server += CSW$(NAME)utils
 PKGFILES_CSW$(NAME)server += $(sbindir)/cf-serverd
 PKGFILES_CSW$(NAME)server += $(sbindir)/cf-runagent
 PKGFILES_CSW$(NAME)server += $(mandir)/.*/cf-serverd.*
@@ -79,7 +79,7 @@
 RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWbdb48
 RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWosslrt
 RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibpcre0
-RUNTIME_DEP_PKGS_CSW$(NAME)client += CSW$(NAME)rt
+RUNTIME_DEP_PKGS_CSW$(NAME)client += CSW$(NAME)utils
 PKGFILES_CSW$(NAME)client += $(sbindir)/cf-agent
 PKGFILES_CSW$(NAME)client += $(sbindir)/cf-execd
 PKGFILES_CSW$(NAME)client += $(sbindir)/cf-monitord
@@ -102,7 +102,7 @@
 
 LICENSE = LICENSE
 
-# This file gets installed by CSW$(NAME)rt since it is used by
+# This file gets installed by CSW$(NAME)util since it is used by
 # the server and client component
 PRESERVECONF = $(sysconfdir)/$(NAME)rc
 
@@ -130,13 +130,16 @@
 EXTRA_RUNPATH_DIRS = $(prefix)/bdb48/lib
 EXTRA_RUNPATH_ISALIST   = $(EXTRA_RUNPATH_DIRS)
 EXTRA_LDFLAGS = -L$(prefix)/bdb48/lib/$(MM_LIBDIR)
+# We use this because libpromises will be moved to this private
+# directory (see also move-libpromises:)
+EXTRA_LDFLAGS += -R$(libdir)/$(NAME)
 
 # Those libs are used by configure to detect getaddrinfo()
 EXTRA_CONFIGURE_ENV = LIBS="-lsocket -lnsl"
 
 include gar/category.mk
 
-post-install-modulated: rename-cfengine-dir make-cfengine-workdir install-cfengine-links install-smf-manifests install-cfengine3rc install-cfengine3-csw-doc fix-paths-in-files
+post-install-modulated: rename-cfengine-dir make-cfengine-workdir install-cfengine-links install-smf-manifests install-cfengine3rc install-cfengine3-csw-doc fix-paths-in-files move-libpromises
 	@$(MAKECOOKIE)
 
 rename-cfengine-dir:
@@ -188,7 +191,13 @@
 		fi ; \
 	done
 
+# We move libpromises to a prive directory, since there is no publicly
+# available API. Please note, the rpath has to be set appropriately
+move-libpromises:
+	ginstall -d $(DESTDIR)$(libdir)/$(NAME)
+	mv $(DESTDIR)$(libdir)/libpromises.* $(DESTDIR)$(libdir)/$(NAME)/
+
 post-merge:
 # Get rid of the .so files. Since there are no header files provided,
 # .so files are pretty much useless
-	find $(PKGROOT)$(libdir) -name libpromises.so -exec rm \{\} \;
\ No newline at end of file
+	find $(PKGROOT)$(libdir) -name libpromises.so -exec rm \{\} \;

Deleted: csw/mgar/pkg/cfengine3/trunk/files/CSWcfengine3rt.postinstall
===================================================================
--- csw/mgar/pkg/cfengine3/trunk/files/CSWcfengine3rt.postinstall	2012-01-15 15:21:57 UTC (rev 16767)
+++ csw/mgar/pkg/cfengine3/trunk/files/CSWcfengine3rt.postinstall	2012-01-15 18:43:00 UTC (rev 16768)
@@ -1,31 +0,0 @@
-# Takes care of creating the CFEngine 3 public/private keys
-
-CFEWORKDIR=${PKG_INSTALL_ROOT}/var/opt/csw/cfengine3
-CFEKEYDIR=${CFEWORKDIR}/ppkeys
-CF_KEYS=${PKG_INSTALL_ROOT}/opt/csw/sbin/cf-key
-
-if [ \! -d ${CFEWORKDIR} ]
-then
-    # Hmm, this is strange, since the prototype should have
-    # created this directory
-    echo "Creating ${CFEWORKDIR}"
-    mkdir -p ${CFEWORKDIR}
-fi
-
-if [ \! -d ${CFEKEYDIR} ]
-then
-    echo "Creating ${CFEKEYDIR}"
-    mkdir ${CFEKEYDIR}
-fi
-
-chmod 700 ${CFEKEYDIR}
-
-if [ -r ${CFEKEYDIR}/localhost.priv -a -r ${CFEKEYDIR}/localhost.pub ]
-then
-    echo "Keys for CFEngine exist."
-    exit 0
-else
-    ${CF_KEYS} -f ${CFEKEYDIR}/localhost
-fi
-
-exit 0

Copied: csw/mgar/pkg/cfengine3/trunk/files/CSWcfengine3utils.postinstall (from rev 16737, csw/mgar/pkg/cfengine3/trunk/files/CSWcfengine3rt.postinstall)
===================================================================
--- csw/mgar/pkg/cfengine3/trunk/files/CSWcfengine3utils.postinstall	                        (rev 0)
+++ csw/mgar/pkg/cfengine3/trunk/files/CSWcfengine3utils.postinstall	2012-01-15 18:43:00 UTC (rev 16768)
@@ -0,0 +1,31 @@
+# Takes care of creating the CFEngine 3 public/private keys
+
+CFEWORKDIR=${PKG_INSTALL_ROOT}/var/opt/csw/cfengine3
+CFEKEYDIR=${CFEWORKDIR}/ppkeys
+CF_KEYS=${PKG_INSTALL_ROOT}/opt/csw/sbin/cf-key
+
+if [ \! -d ${CFEWORKDIR} ]
+then
+    # Hmm, this is strange, since the prototype should have
+    # created this directory
+    echo "Creating ${CFEWORKDIR}"
+    mkdir -p ${CFEWORKDIR}
+fi
+
+if [ \! -d ${CFEKEYDIR} ]
+then
+    echo "Creating ${CFEKEYDIR}"
+    mkdir ${CFEKEYDIR}
+fi
+
+chmod 700 ${CFEKEYDIR}
+
+if [ -r ${CFEKEYDIR}/localhost.priv -a -r ${CFEKEYDIR}/localhost.pub ]
+then
+    echo "Keys for CFEngine exist."
+    exit 0
+else
+    ${CF_KEYS} -f ${CFEKEYDIR}/localhost
+fi
+
+exit 0

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


From pfelecan at opencsw.org  Sun Jan 15 20:43:01 2012
From: pfelecan at opencsw.org (Peter FELECAN)
Date: Sun, 15 Jan 2012 20:43:01 +0100
Subject: [csw-devel] SF.net SVN: gar:[16750]
	csw/mgar/pkg/gcc4/branches/private-lib/
In-Reply-To: <CALtRa-5RbTptRaFfTVqxbmk7mfe7QVRTi8teiEs9uzb75O-5Wg@mail.gmail.com>
	("Maciej (Matchek) =?utf-8?Q?Blizi=C5=84ski=22's?= message of "Sun,
	15 Jan 2012 15:19:37 +0000")
References: <E1RlNtX-0003GK-Fj@sfp-svn-5.v30.ch3.sourceforge.com>
	<x61ur4ak0h.fsf@opencsw.org>
	<CALtRa-5RbTptRaFfTVqxbmk7mfe7QVRTi8teiEs9uzb75O-5Wg@mail.gmail.com>
Message-ID: <x6vcoc7nwa.fsf@opencsw.org>

"Maciej (Matchek) Blizi?ski" <maciej at opencsw.org> writes:

> 2012/1/12 Peter FELECAN <pfelecan at opencsw.org>:
>> What's the idea?
>
> The idea is this: if libstdc++.so.6 is in /opt/csw/lib and we
> automatically add -R/opt/csw/lib/$ISALIST to all binaries, there's a
> new failure mode: a binary might link against a SONAME traditionally
> from /usr/lib. If / when we introduce the an incompatible library with
> the same SONAME to /opt/csw/lib, we break that binary.
>
> State 1:
>
> /opt/csw/bin/foo NEEDED libbar.so.1, RPATH /opt/csw/lib
> /usr/lib/libbar.so.1 is available
>
> State 2:
>
> /opt/csw/bin/foo NEEDED libbar.so.1, RPATH /opt/csw/lib
> /usr/lib/libbar.so.1 is available
> /opt/csw/lib/libbar.so.1 is available too, incompatible with /opt/csw/bin/foo

Is a question of order, isn't it? Consequently, if /opt/csw/lib is
before /usr/lib, everything is dandy.

> I'm not sure if this is a scenario we have to worry about, because the
> solution is to keep GCC libraries in a subdirectory, which has its own
> disadvantages - library space fragmentation, sometimes harder to debug
> linking problems, etc.

The 3rd branch as the 4th, in the beginning, when I was the maintainer,
had this strategy and, as far as I remember, we hadn't an issue with. Am
I wrong?
-- 
Peter

From dmichelsen at users.sourceforge.net  Sun Jan 15 21:34:20 2012
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Sun, 15 Jan 2012 20:34:20 +0000
Subject: [csw-devel] SF.net SVN: gar:[16769] csw/mgar/pkg/libgc/trunk
Message-ID: <E1RmWmS-0002Ot-Eb@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 16769
          http://gar.svn.sourceforge.net/gar/?rev=16769&view=rev
Author:   dmichelsen
Date:     2012-01-15 20:34:20 +0000 (Sun, 15 Jan 2012)
Log Message:
-----------
libgc/trunk: Update to 7.1, split package

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

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


Property changes on: csw/mgar/pkg/libgc/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2


Modified: csw/mgar/pkg/libgc/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libgc/trunk/Makefile	2012-01-15 18:43:00 UTC (rev 16768)
+++ csw/mgar/pkg/libgc/trunk/Makefile	2012-01-15 20:34:20 UTC (rev 16769)
@@ -1,5 +1,5 @@
 NAME = libgc
-VERSION = 7.0
+VERSION = 7.1
 CATEGORIES = lib
 
 DESCRIPTION = A garbage collector for C and C++
@@ -13,19 +13,33 @@
 endef
 
 MASTER_SITES = http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/
-DISTFILES  = gc-$(VERSION).tar.gz
-
 DISTNAME = gc-$(VERSION)
+DISTFILES  = $(DISTNAME).tar.gz
 
-# We define upstream file regex so we can be notifed of new upstream software release
-UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
+VENDOR_URL = http://www.hpl.hp.com/personal/Hans_Boehm/gc/
 
-# 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 = 
+LICENSE = README.QUICK
 
-CONFIGURE_ARGS = $(DIRPATHS)
+PACKAGES += CSWlibcord1
+SPKG_DESC_CSWlibcord1 = A garbage collector for C and C++, libcord.so.1
+PKGFILES_CSWlibcord1 += $(call pkgfiles_lib,libcord.so.1)
+RUNTIME_DEP_PKGS_CSWlibcord1 += CSWlibgc1
+OBSOLETED_BY_CSWlibcord1 += CSWlibgc
 
-TEST_TARGET = check
+PACKAGES += CSWlibgc1
+SPKG_DESC_CSWlibgc1 = A garbage collector for C and C++, libgc.so.1
+PKGFILES_CSWlibgc1 += $(call pkgfiles_lib,libgc.so.1)
+OBSOLETED_BY_CSWlibgc1 += CSWlibgc
 
+PACKAGES += CSWlibgc-dev
+SPKG_DESC_CSWlibgc-dev = Development files for libgc.so.1 and libcord.so.1
+# PKGFILES is catchall
+RUNTIME_DEP_PKGS_CSWlibgc-dev += CSWlibcord1
+RUNTIME_DEP_PKGS_CSWlibgc-dev += CSWlibgc1
+
+# This is just docs, ignore for now
+CHECKPKG_OVERRIDES_CSWlibgc-dev += file-with-bad-content|/usr/local|root/opt/csw/share/gc/README.autoconf
+
+BUILD64 = 1
+
 include gar/category.mk

Modified: csw/mgar/pkg/libgc/trunk/checksums
===================================================================
--- csw/mgar/pkg/libgc/trunk/checksums	2012-01-15 18:43:00 UTC (rev 16768)
+++ csw/mgar/pkg/libgc/trunk/checksums	2012-01-15 20:34:20 UTC (rev 16769)
@@ -1 +1 @@
-3645ccf5f32ebb27d99b27b0d29e9c38  download/gc-7.0.tar.gz
+2ff9924c7249ef7f736ecfe6f08f3f9b  gc-7.1.tar.gz

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


From dmichelsen at users.sourceforge.net  Sun Jan 15 21:58:30 2012
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Sun, 15 Jan 2012 20:58:30 +0000
Subject: [csw-devel] SF.net SVN: gar:[16770]
	csw/mgar/pkg/libgc/trunk/Makefile
Message-ID: <E1RmX9q-0005CP-Sz@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 16770
          http://gar.svn.sourceforge.net/gar/?rev=16770&view=rev
Author:   dmichelsen
Date:     2012-01-15 20:58:30 +0000 (Sun, 15 Jan 2012)
Log Message:
-----------
libgc/trunk: Disable 64 bit for now

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

Modified: csw/mgar/pkg/libgc/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libgc/trunk/Makefile	2012-01-15 20:34:20 UTC (rev 16769)
+++ csw/mgar/pkg/libgc/trunk/Makefile	2012-01-15 20:58:30 UTC (rev 16770)
@@ -40,6 +40,10 @@
 # This is just docs, ignore for now
 CHECKPKG_OVERRIDES_CSWlibgc-dev += file-with-bad-content|/usr/local|root/opt/csw/share/gc/README.autoconf
 
-BUILD64 = 1
+# One test is failing on amd64, disable for now:
+#   FAIL: gctest
+# The bugreport has been posted on
+#   http://www.hpl.hp.com/hosted/linux/mail-archives/gc/2012-January/thread.html
+# BUILD64 = 1
 
 include gar/category.mk

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


From dmichelsen at users.sourceforge.net  Sun Jan 15 22:13:09 2012
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Sun, 15 Jan 2012 21:13:09 +0000
Subject: [csw-devel] SF.net SVN: gar:[16771] csw/mgar/pkg
Message-ID: <E1RmXO1-0005UL-8n@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 16771
          http://gar.svn.sourceforge.net/gar/?rev=16771&view=rev
Author:   dmichelsen
Date:     2012-01-15 21:13:08 +0000 (Sun, 15 Jan 2012)
Log Message:
-----------
libunistring: Initial commit

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

Added: csw/mgar/pkg/libunistring/Makefile
===================================================================
--- csw/mgar/pkg/libunistring/Makefile	                        (rev 0)
+++ csw/mgar/pkg/libunistring/Makefile	2012-01-15 21:13:08 UTC (rev 16771)
@@ -0,0 +1,2 @@
+%:
+	$(MAKE) -C trunk $*


Property changes on: csw/mgar/pkg/libunistring/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/libunistring/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libunistring/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/libunistring/trunk/Makefile	2012-01-15 21:13:08 UTC (rev 16771)
@@ -0,0 +1,35 @@
+# $Id$
+# TODO (release-critical prefixed with !, non release-critical with *)
+#
+NAME = libunistring
+VERSION = 0.9.3
+GARTYPE = v2
+CATEGORIES = lib
+
+DESCRIPTION = Provides functions for manipulating Unicode strings
+define BLURB
+endef
+
+MASTER_SITES = $(GNU_MIRROR)
+DISTFILES  = $(DISTNAME).tar.gz
+
+PACKAGES += CSWlibunistring0
+SPKG_DESC_CSWlibunistring0 = Provides functions for manipulating Unicode strings, libunistring.so.0
+PKGFILES_CSWlibunistring0 += $(call pkgfiles_lib,libunistring.so.0)
+RUNTIME_DEP_PKGS_CSWlibunistring0 += CSWlibiconv2
+
+PACKAGES += CSWlibunistring-dev
+SPKG_DESC_CSWlibunistring-dev = Development files for libunistring.so.0
+# PKGFILES is catchall
+RUNTIME_DEP_PKGS_CSWlibunistring-dev += CSWlibunistring0
+
+# These are just docs, override for now
+CHECKPKG_OVERRIDES_CSWlibunistring-dev += file-with-bad-content|/usr/local|root/opt/csw/share/doc/libunistring/libunistring_15.html
+CHECKPKG_OVERRIDES_CSWlibunistring-dev += file-with-bad-content|/usr/local|root/opt/csw/share/info/libunistring.info
+
+BUILD64 = 1
+
+EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/charset\.alias
+
+include gar/category.mk
+


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

Added: csw/mgar/pkg/libunistring/trunk/checksums
===================================================================
--- csw/mgar/pkg/libunistring/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/libunistring/trunk/checksums	2012-01-15 21:13:08 UTC (rev 16771)
@@ -0,0 +1 @@
+db8eca3b64163abadf8c40e5cecc261f  libunistring-0.9.3.tar.gz

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


From dmichelsen at users.sourceforge.net  Mon Jan 16 10:10:42 2012
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Mon, 16 Jan 2012 09:10:42 +0000
Subject: [csw-devel] SF.net SVN: gar:[16772]
	csw/mgar/pkg/libgc/trunk/Makefile
Message-ID: <E1RmiaQ-0005RQ-Te@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 16772
          http://gar.svn.sourceforge.net/gar/?rev=16772&view=rev
Author:   dmichelsen
Date:     2012-01-16 09:10:42 +0000 (Mon, 16 Jan 2012)
Log Message:
-----------
libgc: Update link to bugreport

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

Modified: csw/mgar/pkg/libgc/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libgc/trunk/Makefile	2012-01-15 21:13:08 UTC (rev 16771)
+++ csw/mgar/pkg/libgc/trunk/Makefile	2012-01-16 09:10:42 UTC (rev 16772)
@@ -43,7 +43,7 @@
 # One test is failing on amd64, disable for now:
 #   FAIL: gctest
 # The bugreport has been posted on
-#   http://www.hpl.hp.com/hosted/linux/mail-archives/gc/2012-January/thread.html
+#   http://www.hpl.hp.com/hosted/linux/mail-archives/gc/2012-January/004904.html
 # BUILD64 = 1
 
 include gar/category.mk

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


From cgrzemba at users.sourceforge.net  Mon Jan 16 11:14:31 2012
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Mon, 16 Jan 2012 10:14:31 +0000
Subject: [csw-devel] SF.net SVN: gar:[16773] csw/mgar/pkg/nspr/trunk
Message-ID: <E1RmjaB-0004Wj-Hu@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 16773
          http://gar.svn.sourceforge.net/gar/?rev=16773&view=rev
Author:   cgrzemba
Date:     2012-01-16 10:14:31 +0000 (Mon, 16 Jan 2012)
Log Message:
-----------
nspr/trunk: update version 4.8.9

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

Modified: csw/mgar/pkg/nspr/trunk/Makefile
===================================================================
--- csw/mgar/pkg/nspr/trunk/Makefile	2012-01-16 09:10:42 UTC (rev 16772)
+++ csw/mgar/pkg/nspr/trunk/Makefile	2012-01-16 10:14:31 UTC (rev 16773)
@@ -8,7 +8,7 @@
 
 NAME = nspr
 MAJOR_VERSION = 4
-MIN_VERSION = 8.7
+MIN_VERSION = 8.9
 VERSION = $(MAJOR_VERSION).$(MIN_VERSION)
 CATEGORIES = lib
 
@@ -18,11 +18,13 @@
   many of Red Hat's, Sun's, and other software offerings.
 endef
 
-MASTER_SITES = https://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v$(VERSION)/src/
+MASTER_SITES = http://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v$(VERSION)/src/
 DISTFILES  = $(NAME)-$(VERSION).tar.gz
 DISTFILES += LICENSE
 PATCHFILES  = nspr-4.6.1-config.patch
 
+PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
+
 PACKAGES = CSWnspr-dev
 CATALOGNAME_CSWnspr-dev = nspr_dev
 SPKG_DESC_CSWnspr-dev = Netscape Portable Runtime, header files
@@ -104,6 +106,9 @@
 # # three libraries to be in one package.
 # CHECKPKG_OVERRIDES_CSWlibnspr4 += shared-lib-pkgname-mismatch
 
+CPPFLAGS = 
+PREFIX = $(prefix)
+
 include gar/category.mk
 
 configure-nspr:
@@ -135,8 +140,7 @@
 	ginstall -m 755 $(WORKSRC)/build/config/nspr-config \
 		$(DESTDIR)$(bindir)
 	ginstall -m 755 -d $(DESTDIR)$(libdir)/pkgconfig
-	ginstall -m 644 $(WORKSRC)/build/config/nspr.pc \
-		$(DESTDIR)$(libdir)/pkgconfig
+	ginstall -m 644 $(WORKSRC)/build/config/nspr.pc $(DESTDIR)$(libdir)/pkgconfig
 	if [ $(MEMORYMODEL) = 64 ]; then \
 		gsed -i -e 's+/lib$$+lib/64+' $(DESTDIR)$(libdir)/pkgconfig/nspr.pc ; \
 	fi

Modified: csw/mgar/pkg/nspr/trunk/checksums
===================================================================
--- csw/mgar/pkg/nspr/trunk/checksums	2012-01-16 09:10:42 UTC (rev 16772)
+++ csw/mgar/pkg/nspr/trunk/checksums	2012-01-16 10:14:31 UTC (rev 16773)
@@ -1 +1 @@
-97e30989a56ab813453b71261849c200  nspr-4.8.7.tar.gz
+60770d45dc08c0f181b22cdfce5be3e8  nspr-4.8.9.tar.gz

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


From cgrzemba at users.sourceforge.net  Mon Jan 16 11:26:21 2012
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Mon, 16 Jan 2012 10:26:21 +0000
Subject: [csw-devel] SF.net SVN: gar:[16774] csw/mgar/pkg/nspr/trunk/Makefile
Message-ID: <E1Rmjld-0004mw-BF@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 16774
          http://gar.svn.sourceforge.net/gar/?rev=16774&view=rev
Author:   cgrzemba
Date:     2012-01-16 10:26:21 +0000 (Mon, 16 Jan 2012)
Log Message:
-----------
nspr/trunk: remove unused variable in build recipe

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

Modified: csw/mgar/pkg/nspr/trunk/Makefile
===================================================================
--- csw/mgar/pkg/nspr/trunk/Makefile	2012-01-16 10:14:31 UTC (rev 16773)
+++ csw/mgar/pkg/nspr/trunk/Makefile	2012-01-16 10:26:21 UTC (rev 16774)
@@ -107,7 +107,6 @@
 # CHECKPKG_OVERRIDES_CSWlibnspr4 += shared-lib-pkgname-mismatch
 
 CPPFLAGS = 
-PREFIX = $(prefix)
 
 include gar/category.mk
 
@@ -140,7 +139,8 @@
 	ginstall -m 755 $(WORKSRC)/build/config/nspr-config \
 		$(DESTDIR)$(bindir)
 	ginstall -m 755 -d $(DESTDIR)$(libdir)/pkgconfig
-	ginstall -m 644 $(WORKSRC)/build/config/nspr.pc $(DESTDIR)$(libdir)/pkgconfig
+	ginstall -m 644 $(WORKSRC)/build/config/nspr.pc \ 
+		$(DESTDIR)$(libdir)/pkgconfig
 	if [ $(MEMORYMODEL) = 64 ]; then \
 		gsed -i -e 's+/lib$$+lib/64+' $(DESTDIR)$(libdir)/pkgconfig/nspr.pc ; \
 	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  Mon Jan 16 12:48:43 2012
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Mon, 16 Jan 2012 11:48:43 +0000
Subject: [csw-devel] SF.net SVN: gar:[16775]
	csw/mgar/gar/v2/lib/python/csw_upload_pkg.py
Message-ID: <E1Rml3L-0003VH-Oy@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 16775
          http://gar.svn.sourceforge.net/gar/?rev=16775&view=rev
Author:   wahwah
Date:     2012-01-16 11:48:43 +0000 (Mon, 16 Jan 2012)
Log Message:
-----------
csw-upload-pkg: --remove information

Add more information specific to the --remove option.

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

Modified: csw/mgar/gar/v2/lib/python/csw_upload_pkg.py
===================================================================
--- csw/mgar/gar/v2/lib/python/csw_upload_pkg.py	2012-01-16 10:26:21 UTC (rev 16774)
+++ csw/mgar/gar/v2/lib/python/csw_upload_pkg.py	2012-01-16 11:48:43 UTC (rev 16775)
@@ -27,23 +27,33 @@
 BASE_URL = "http://buildfarm.opencsw.org"
 RELEASES_APP = "/releases"
 DEFAULT_CATREL = "unstable"
-USAGE = """%prog [ options ] <pkg1> [ <pkg2> [ ... ] ]
+USAGE = """%prog [ options ] <file1.pkg.gz> [ <file2.pkg.gz> [ ... ] ]
 
 Uploads a set of packages to the unstable catalog in opencsw-future.
 
-- When an ARCH=all package is sent, it's added to both sparc and i386 catalogs
+- When an architecture-independent package is uploaded, it gets added to both
+	sparc and i386 catalogs
+
 - When a SunOS5.x package is sent, it's added to catalogs SunOS5.x,
   SunOS5.(x+1), up to SunOS5.11, but only if there are no packages specific to
   5.10 (and/or 5.11).
-- If a package update is sent, the tool uses catalogname to identify the
-  package it's supposed to replace
 
-The --remove option affects the same catalogs as the regular use, except that
-it removes assignments of a given package to catalogs, instead of adding them.
+- If a package update is sent, the tool uses both the catalogname and the
+	pkgname to identify the package it's updating. For example, you might upload
+	foo_stub/CSWfoo and mean to replace foo/CSWfoo with it.
 
 The --os-release flag makes %prog only insert the package to catalog with the
 given OS release.
 
+= Removing packages from the catalog =
+
+The --remove option works the same way as the regular use, except that it
+removes assignments of a given package to catalogs, instead of adding them.
+
+When removing packages from catalogs, files on disk are passed as arguments.
+On the buildfarm, all files are available under the /home/mirror/opencsw
+directory.
+
 For more information, see:
 http://wiki.opencsw.org/automated-release-process#toc0
 """

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


From maciej at opencsw.org  Mon Jan 16 13:55:05 2012
From: maciej at opencsw.org (=?UTF-8?Q?Maciej_=28Matchek=29_Blizi=C5=84ski?=)
Date: Mon, 16 Jan 2012 12:55:05 +0000
Subject: [csw-devel] SF.net SVN: gar:[16773] csw/mgar/pkg/nspr/trunk
In-Reply-To: <E1RmjaB-0004Wj-Hu@sfp-svn-6.v30.ch3.sourceforge.com>
References: <E1RmjaB-0004Wj-Hu@sfp-svn-6.v30.ch3.sourceforge.com>
Message-ID: <CALtRa-6jSyovmErSxgkenGLewOTDAxj1xCTr1G8GnCcAuOb4+Q@mail.gmail.com>

2012/1/16  <cgrzemba at users.sourceforge.net>:
> Revision: 16773
> ? ? ? ? ?http://gar.svn.sourceforge.net/gar/?rev=16773&view=rev
> Author: ? cgrzemba
> Date: ? ? 2012-01-16 10:14:31 +0000 (Mon, 16 Jan 2012)
> Log Message:
> -----------
> nspr/trunk: update version 4.8.9
>
> Modified Paths:
> --------------
> ? ?csw/mgar/pkg/nspr/trunk/Makefile
> ? ?csw/mgar/pkg/nspr/trunk/checksums
>
> Modified: csw/mgar/pkg/nspr/trunk/Makefile
> ===================================================================
> --- csw/mgar/pkg/nspr/trunk/Makefile ? ?2012-01-16 09:10:42 UTC (rev 16772)
> +++ csw/mgar/pkg/nspr/trunk/Makefile ? ?2012-01-16 10:14:31 UTC (rev 16773)
> @@ -8,7 +8,7 @@
>
> ?NAME = nspr
> ?MAJOR_VERSION = 4
> -MIN_VERSION = 8.7
> +MIN_VERSION = 8.9
> ?VERSION = $(MAJOR_VERSION).$(MIN_VERSION)
> ?CATEGORIES = lib
>
> @@ -18,11 +18,13 @@
> ? many of Red Hat's, Sun's, and other software offerings.
> ?endef
>
> -MASTER_SITES = https://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v$(VERSION)/src/
> +MASTER_SITES = http://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v$(VERSION)/src/

Why this change?

> ?DISTFILES ?= $(NAME)-$(VERSION).tar.gz
> ?DISTFILES += LICENSE
> ?PATCHFILES ?= nspr-4.6.1-config.patch
>
> +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
> +

This should compile on Solaris 9, is there any trouble with that?

> ?PACKAGES = CSWnspr-dev
> ?CATALOGNAME_CSWnspr-dev = nspr_dev
> ?SPKG_DESC_CSWnspr-dev = Netscape Portable Runtime, header files
> @@ -104,6 +106,9 @@
> ?# # three libraries to be in one package.
> ?# CHECKPKG_OVERRIDES_CSWlibnspr4 += shared-lib-pkgname-mismatch
>
> +CPPFLAGS =
> +PREFIX = $(prefix)
> +

Did you mean to export these variables?

> ?include gar/category.mk
>
> ?configure-nspr:
> @@ -135,8 +140,7 @@
> ? ? ? ?ginstall -m 755 $(WORKSRC)/build/config/nspr-config \
> ? ? ? ? ? ? ? ?$(DESTDIR)$(bindir)
> ? ? ? ?ginstall -m 755 -d $(DESTDIR)$(libdir)/pkgconfig
> - ? ? ? ginstall -m 644 $(WORKSRC)/build/config/nspr.pc \
> - ? ? ? ? ? ? ? $(DESTDIR)$(libdir)/pkgconfig
> + ? ? ? ginstall -m 644 $(WORKSRC)/build/config/nspr.pc $(DESTDIR)$(libdir)/pkgconfig

Please try to keep lines at up to 80 columns wide.

> ? ? ? ?if [ $(MEMORYMODEL) = 64 ]; then \
> ? ? ? ? ? ? ? ?gsed -i -e 's+/lib$$+lib/64+' $(DESTDIR)$(libdir)/pkgconfig/nspr.pc ; \
> ? ? ? ?fi
>
> Modified: csw/mgar/pkg/nspr/trunk/checksums
> ===================================================================
> --- csw/mgar/pkg/nspr/trunk/checksums ? 2012-01-16 09:10:42 UTC (rev 16772)
> +++ csw/mgar/pkg/nspr/trunk/checksums ? 2012-01-16 10:14:31 UTC (rev 16773)
> @@ -1 +1 @@
> -97e30989a56ab813453b71261849c200 ?nspr-4.8.7.tar.gz
> +60770d45dc08c0f181b22cdfce5be3e8 ?nspr-4.8.9.tar.gz
>
> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
>
> _______________________________________________
> devel mailing list
> devel at lists.opencsw.org
> https://lists.opencsw.org/mailman/listinfo/devel

From wahwah at users.sourceforge.net  Mon Jan 16 14:55:04 2012
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Mon, 16 Jan 2012 13:55:04 +0000
Subject: [csw-devel] SF.net SVN: gar:[16776]
	csw/mgar/gar/v2/lib/python/csw_upload_pkg.py
Message-ID: <E1Rmn1c-0005GZ-82@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 16776
          http://gar.svn.sourceforge.net/gar/?rev=16776&view=rev
Author:   wahwah
Date:     2012-01-16 13:55:04 +0000 (Mon, 16 Jan 2012)
Log Message:
-----------
csw-upload-pkg: Add general considerations section

Write in --help that the tool works with 24 package catalogs.

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

Modified: csw/mgar/gar/v2/lib/python/csw_upload_pkg.py
===================================================================
--- csw/mgar/gar/v2/lib/python/csw_upload_pkg.py	2012-01-16 11:48:43 UTC (rev 16775)
+++ csw/mgar/gar/v2/lib/python/csw_upload_pkg.py	2012-01-16 13:55:04 UTC (rev 16776)
@@ -45,6 +45,15 @@
 The --os-release flag makes %prog only insert the package to catalog with the
 given OS release.
 
+= General considerations =
+
+This tool operates on a database of packages and a package file store. It
+modifies a number of package catalogs, a cartesian product of:
+
+  {legacy,dublin,unstable}x{sparc,i386}x{5.8,5.9.5.10,5.11}
+
+This amounts to 3x2x4 = 24 package catalogs total.
+
 = Removing packages from the catalog =
 
 The --remove option works the same way as the regular use, except that it

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


From wahwah at users.sourceforge.net  Mon Jan 16 15:04:44 2012
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Mon, 16 Jan 2012 14:04:44 +0000
Subject: [csw-devel] SF.net SVN: gar:[16777]
 csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/ quick_start-csw
Message-ID: <E1RmnAy-0005XP-KX@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 16777
          http://gar.svn.sourceforge.net/gar/?rev=16777&view=rev
Author:   wahwah
Date:     2012-01-16 14:04:44 +0000 (Mon, 16 Jan 2012)
Log Message:
-----------
mysql5/branches/mysql-5.0.x: Remove a surplus line

Modified Paths:
--------------
    csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/quick_start-csw

Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/quick_start-csw
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/quick_start-csw	2012-01-16 13:55:04 UTC (rev 16776)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/quick_start-csw	2012-01-16 14:04:44 UTC (rev 16777)
@@ -55,7 +55,6 @@
 if [ $usrin = "[default]" ]; then
     if [ ! -f "$DEFAULTS_FILE" ]; then
         IN_DEFAULTS_FILE=$MYSQL_HOME/share/mysql/5.0/mysql/my-small.cnf
-        /share/mysql/my-small.cnf
         echo "Using $IN_DEFAULTS_FILE to create the options file."
     else
         IN_DEFAULTS_FILE=$DEFAULTS_FILE

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


From cgrzemba at users.sourceforge.net  Mon Jan 16 16:50:10 2012
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Mon, 16 Jan 2012 15:50:10 +0000
Subject: [csw-devel] SF.net SVN: gar:[16778] csw/mgar/pkg/nss/trunk
Message-ID: <E1Rmop0-0003Wd-0A@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 16778
          http://gar.svn.sourceforge.net/gar/?rev=16778&view=rev
Author:   cgrzemba
Date:     2012-01-16 15:50:09 +0000 (Mon, 16 Jan 2012)
Log Message:
-----------
nss/trunk: add patches for version 3.12.11

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

Added Paths:
-----------
    csw/mgar/pkg/nss/trunk/files/0004-fix-xarch-and-add-SQLITE_LIB_DIR-var.patch
    csw/mgar/pkg/nss/trunk/files/0005-platlibs.mk-linking-bltest.patch

Modified: csw/mgar/pkg/nss/trunk/Makefile
===================================================================
--- csw/mgar/pkg/nss/trunk/Makefile	2012-01-16 14:04:44 UTC (rev 16777)
+++ csw/mgar/pkg/nss/trunk/Makefile	2012-01-16 15:50:09 UTC (rev 16778)
@@ -17,7 +17,7 @@
 NAME = nss
 MAJOR_VERSION = 3
 MINOR_VERSION = 12
-PATCHLEVEL    = 4
+PATCHLEVEL    = 11
 VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(PATCHLEVEL)
 CATEGORIES = lib
 define BLURB
@@ -29,29 +29,31 @@
 endef
 SPKG_SOURCEURL = http://www.mozilla.org/projects/security/pki/nss/
 # TODO: Generate RTM_NAME from VERSION
-RTM_NAME = NSS_3_12_4_RTM
-MASTER_SITES = https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/$(RTM_NAME)/src/
+RTM_NAME = NSS_$(MAJOR_VERSION)_$(MINOR_VERSION)_$(PATCHLEVEL)_RTM
+MASTER_SITES = http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/$(RTM_NAME)/src/
 DISTFILES  = $(NAME)-$(VERSION).tar.gz
 DISTFILES += mpl-tri-license-txt
 UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
 
-PACKAGES = CSWlibnss3 CSWlibnss3-devel CSWlibnss3-tools
+PACKAGES = CSWlibnss3 CSWlibnss-dev CSWlibnss3-tools
 
 SPKG_DESC_CSWlibnss3 = Network Security Services library, implements crypto, PKI, SSL, and S/MIME support
-SPKG_DESC_CSWlibnss3-devel = libnss3 development files
+SPKG_DESC_CSWlibnss-dev = libnss development files
 SPKG_DESC_CSWlibnss3-tools = libnss3 command-line utilities
 
-PKGFILES_CSWlibnss3-devel = $(PKGFILES_DEVEL)
+PKGFILES_CSWlibnss-dev = $(PKGFILES_DEVEL)
 PKGFILES_CSWlibnss3-tools = $(bindir).*
 
-CATALOGNAME_CSWlibnss3-devel = libnss3_devel
+CATALOGNAME_CSWlibnss-dev = libnss_dev
 CATALOGNAME_CSWlibnss3-tools = libnss3_tools
+OBSOLETED_BY_CSWlibnss-dev = CSWlibnss3-devel
 
 RUNTIME_DEP_PKGS_CSWlibnss3 = CSWnspr CSWsqlite3rt
-RUNTIME_DEP_PKGS_CSWlibnss3-devel += CSWlibnss3
+RUNTIME_DEP_PKGS_CSWlibnss-dev += CSWlibnss3
 RUNTIME_DEP_PKGS_CSWlibnss3-tools += CSWlibnss3
 RUNTIME_DEP_PKGS_CSWlibnss3-tools += CSWnspr
-BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) CSWnspr-devel CSWsqlite3devel
+BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) CSWnspr-dev CSWlibsqlite3-dev
+
 CONFIGURE_SCRIPTS =
 BUILD_SCRIPTS = nss
 INSTALL_SCRIPTS = nss
@@ -72,7 +74,7 @@
 endif
 
 # NSPR is installed in /opt/csw/lib/nspr, nspr.pc is in /opt/csw/lib/pkgconfig
-NSPR_INCLUDE_DIR = $(shell PKG_CONFIG_PATH=/opt/csw/lib pkg-config --cflags-only-I nspr | gsed 's/-I//')
+NSPR_INCLUDE_DIR = $(shell PKG_CONFIG_PATH=/opt/csw/lib/pkgconfig pkg-config --cflags-only-I nspr | gsed 's/-I//')
 export NSPR_INCLUDE_DIR
 
 NSS_ENABLE_ECC = 1
@@ -81,23 +83,28 @@
 # To avoid creating /opt/csw/lib/libsqlite3.so (already exists)
 NSS_USE_SYSTEM_SQLITE = 1
 export NSS_USE_SYSTEM_SQLITE
+SQLITE_LIB_DIR = /opt/csw/lib
+export SQLITE_LIB_DIR
+SQLITE_INCLUDE_DIR = /opt/csw/include
+export SQLITE_INCLUDE_DIR
 
 # 64-bit suppport
 ifeq ($(MODULATION),isa-sparcv9)
 	USE_64 = 1
 	export USE_64
-	NSPR_LIB_DIR = $(shell PKG_CONFIG_PATH=/opt/csw/lib pkg-config --libs-only-L nspr | gsed 's/-L//' | tr -d ' ')/64
+	NSPR_LIB_DIR = $(shell PKG_CONFIG_PATH=/opt/csw/lib/pkgconfig pkg-config --libs-only-L nspr | gsed 's/-L//' | tr -d ' ')/64
 else
 ifeq ($(MODULATION),isa-amd64)
 	USE_64 = 1
 	export USE_64
-	NSPR_LIB_DIR = $(shell PKG_CONFIG_PATH=/opt/csw/lib pkg-config --libs-only-L nspr | gsed 's/-L//' | tr -d ' ')/64
+	NSPR_LIB_DIR = $(shell PKG_CONFIG_PATH=/opt/csw/lib/pkgconfig pkg-config --libs-only-L nspr | gsed 's/-L//' | tr -d ' ')/64
 else
-	NSPR_LIB_DIR = $(shell PKG_CONFIG_PATH=/opt/csw/lib pkg-config --libs-only-L nspr | gsed 's/-L//' | tr -d ' ')
+	NSPR_LIB_DIR = $(shell PKG_CONFIG_PATH=/opt/csw/lib/pkgconfig pkg-config --libs-only-L nspr | gsed 's/-L//' | tr -d ' ')
 endif
 endif
 export NSPR_LIB_DIR
 
+
 # Based on:
 # http://mxr.mozilla.org/security/source/security/nss/pkg/solaris/SUNWtlsu/prototype_com
 NSS_BINARIES  = addbuiltin
@@ -113,22 +120,26 @@
 LICENSE = mpl-tri-license-txt
 
 # For DBG builds
-PATCHFILES  = whoami.patch
+# PATCHFILES  = whoami.patch
 
 # Required patches.
 PATCHFILES += include.patch
 PATCHFILES += ld-options.patch
-PATCHFILES += platlibs-sqlite3.patch
+# PATCHFILES += platlibs-sqlite3.patch
 PATCHFILES_isa-sparcv8 = sqlite3-32.patch
 PATCHFILES_isa-i386 = sqlite3-32.patch
 PATCHFILES_isa-sparcv9  = sqlite3-64.patch
-PATCHFILES_isa-sparcv9 += platlibs-sqlite3-64.patch
+# PATCHFILES_isa-sparcv9 += platlibs-sqlite3-64.patch
 PATCHFILES_isa-amd64  = sqlite3-64.patch
-PATCHFILES_isa-amd64 += platlibs-sqlite3-64.patch
+# PATCHFILES_isa-amd64 += platlibs-sqlite3-64.patch
+PATCHFILES += 0004-fix-xarch-and-add-SQLITE_LIB_DIR-var.patch
+PATCHFILES += 0005-platlibs.mk-linking-bltest.patch
 
 # http://lists.opencsw.org/pipermail/pkgsubmissions/2010-February/000167.html
-NOISAEXEC = 1
+# NOISAEXEC = 1
 
+CPPFLAGS=
+
 include gar/category.mk
 
 build-nss: build-coreconf build-dbm build-nss-compile

Modified: csw/mgar/pkg/nss/trunk/checksums
===================================================================
--- csw/mgar/pkg/nss/trunk/checksums	2012-01-16 14:04:44 UTC (rev 16777)
+++ csw/mgar/pkg/nss/trunk/checksums	2012-01-16 15:50:09 UTC (rev 16778)
@@ -1,9 +1 @@
-4b2246d07092fe8b2f29a1a01e9bc821  include.patch
-79083e118f3d885957910fc845844c1c  ld-options.patch
-fd5baf22edc790b6fb5b84e4ba915cf0  mpl-tri-license-txt
-1ee3ed9c1900079319bd1de51388d856  nss-3.12.4.tar.gz
-bd8d96c42238c7cfd07ec1ba21191066  platlibs-sqlite3-64.patch
-f0f40bd021423ab1680b4d87cd19c1db  platlibs-sqlite3.patch
-cae46161d981e8aea822953b34339e60  sqlite3-32.patch
-b07d3de42785866c3c4385846fd8eb52  sqlite3-64.patch
-221646aa1954b4a255ac03e7d8b0225d  whoami.patch
+ca0ca058380be200cf247ea2496b5352  nss-3.12.11.tar.gz

Added: csw/mgar/pkg/nss/trunk/files/0004-fix-xarch-and-add-SQLITE_LIB_DIR-var.patch
===================================================================
--- csw/mgar/pkg/nss/trunk/files/0004-fix-xarch-and-add-SQLITE_LIB_DIR-var.patch	                        (rev 0)
+++ csw/mgar/pkg/nss/trunk/files/0004-fix-xarch-and-add-SQLITE_LIB_DIR-var.patch	2012-01-16 15:50:09 UTC (rev 16778)
@@ -0,0 +1,56 @@
+From 5ec3920b9ad8351ccbe372682ebc5a9843708b62 Mon Sep 17 00:00:00 2001
+From: Carsten Grzemba <cgrzemba at opencsw.org>
+Date: Mon, 16 Jan 2012 15:29:00 +0100
+Subject: [PATCH 4/5] fix xarch and add SQLITE_LIB_DIR var
+
+---
+ mozilla/security/coreconf/SunOS5.mk         |    6 +-----
+ mozilla/security/nss/lib/softoken/config.mk |    6 ++++--
+ 2 files changed, 5 insertions(+), 7 deletions(-)
+
+diff --git a/mozilla/security/coreconf/SunOS5.mk b/mozilla/security/coreconf/SunOS5.mk
+index c0f8e63..a836398 100644
+--- a/mozilla/security/coreconf/SunOS5.mk
++++ b/mozilla/security/coreconf/SunOS5.mk
+@@ -132,11 +132,7 @@ endif
+ 	DSO_LDOPTS += -shared -h $(notdir $@)
+ else
+ ifeq ($(USE_64), 1)
+-	ifeq ($(OS_TEST),i86pc)
+-	    DSO_LDOPTS +=-xarch=amd64
+-	else
+-	    DSO_LDOPTS +=-xarch=v9
+-	endif
++	DSO_LDOPTS += -m64
+ endif
+ 	DSO_LDOPTS += -G -h $(notdir $@)
+ endif
+diff --git a/mozilla/security/nss/lib/softoken/config.mk b/mozilla/security/nss/lib/softoken/config.mk
+index 3a35944..75826b8 100644
+--- a/mozilla/security/nss/lib/softoken/config.mk
++++ b/mozilla/security/nss/lib/softoken/config.mk
+@@ -52,9 +52,11 @@ IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION)
+ RES = $(OBJDIR)/$(LIBRARY_NAME).res
+ RESNAME = $(LIBRARY_NAME).rc
+ 
++SQLITE_LIB_DIR ?= $(DIST)/lib
++
+ ifdef NS_USE_GCC
+ EXTRA_SHARED_LIBS += \
+-	-L$(DIST)/lib \
++	-L$(SQLITE_LIB_DIR) \
+ 	-l$(SQLITE_LIB_NAME) \
+ 	-L$(NSSUTIL_LIB_DIR) \
+ 	-lnssutil3 \
+@@ -79,7 +81,7 @@ else
+ # $(PROGRAM) has NO explicit dependencies on $(EXTRA_SHARED_LIBS)
+ # $(EXTRA_SHARED_LIBS) come before $(OS_LIBS), except on AIX.
+ EXTRA_SHARED_LIBS += \
+-	-L$(DIST)/lib \
++	-L$(SQLITE_LIB_DIR) \
+ 	-l$(SQLITE_LIB_NAME) \
+ 	-L$(NSSUTIL_LIB_DIR) \
+ 	-lnssutil3 \
+-- 
+1.7.8.3
+

Added: csw/mgar/pkg/nss/trunk/files/0005-platlibs.mk-linking-bltest.patch
===================================================================
--- csw/mgar/pkg/nss/trunk/files/0005-platlibs.mk-linking-bltest.patch	                        (rev 0)
+++ csw/mgar/pkg/nss/trunk/files/0005-platlibs.mk-linking-bltest.patch	2012-01-16 15:50:09 UTC (rev 16778)
@@ -0,0 +1,38 @@
+From bddc0163686230f10e3c9d1f44fdce0529134ad7 Mon Sep 17 00:00:00 2001
+From: Carsten Grzemba <cgrzemba at opencsw.org>
+Date: Mon, 16 Jan 2012 16:42:31 +0100
+Subject: [PATCH 5/5] platlibs.mk linking bltest
+
+---
+ mozilla/security/nss/cmd/platlibs.mk |    5 ++++-
+ 1 files changed, 4 insertions(+), 1 deletions(-)
+
+diff --git a/mozilla/security/nss/cmd/platlibs.mk b/mozilla/security/nss/cmd/platlibs.mk
+index 5345dd2..88c053d 100644
+--- a/mozilla/security/nss/cmd/platlibs.mk
++++ b/mozilla/security/nss/cmd/platlibs.mk
+@@ -161,6 +161,7 @@ EXTRA_LIBS += \
+ 	$(DIST)/lib/$(LIB_PREFIX)nsspki.$(LIB_SUFFIX) \
+ 	$(DIST)/lib/$(LIB_PREFIX)nssdev.$(LIB_SUFFIX) \
+ 	$(DIST)/lib/$(LIB_PREFIX)nssb.$(LIB_SUFFIX) \
++	$(DIST)/lib/$(LIB_PREFIX)nssutil.$(LIB_SUFFIX) \
+ 	$(CRYPTOLIB) \
+ 	$(DBMLIB) \
+ 	$(PKIXLIB) \
+@@ -173,10 +174,12 @@ ifeq ($(OS_ARCH), AIX)
+ EXTRA_SHARED_LIBS += -brtl 
+ endif
+ 
++SQLITE_LIB_DIR ?= $(DIST)/lib
++
+ # $(PROGRAM) has NO explicit dependencies on $(EXTRA_SHARED_LIBS)
+ # $(EXTRA_SHARED_LIBS) come before $(OS_LIBS), except on AIX.
+ EXTRA_SHARED_LIBS += \
+-	-L$(DIST)/lib \
++	-L$(SQLITE_LIB_DIR) \
+ 	-l$(SQLITE_LIB_NAME) \
+ 	-L$(NSSUTIL_LIB_DIR) \
+ 	-lnssutil3 \
+-- 
+1.7.8.3
+

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


From cgrzemba at users.sourceforge.net  Mon Jan 16 17:28:48 2012
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Mon, 16 Jan 2012 16:28:48 +0000
Subject: [csw-devel] SF.net SVN: gar:[16779] csw/mgar/pkg/nss/trunk/Makefile
Message-ID: <E1RmpQO-0001Fe-87@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 16779
          http://gar.svn.sourceforge.net/gar/?rev=16779&view=rev
Author:   cgrzemba
Date:     2012-01-16 16:28:47 +0000 (Mon, 16 Jan 2012)
Log Message:
-----------
nss/trunk: fixing sqlite 64bit linking problem

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

Modified: csw/mgar/pkg/nss/trunk/Makefile
===================================================================
--- csw/mgar/pkg/nss/trunk/Makefile	2012-01-16 15:50:09 UTC (rev 16778)
+++ csw/mgar/pkg/nss/trunk/Makefile	2012-01-16 16:28:47 UTC (rev 16779)
@@ -83,10 +83,6 @@
 # To avoid creating /opt/csw/lib/libsqlite3.so (already exists)
 NSS_USE_SYSTEM_SQLITE = 1
 export NSS_USE_SYSTEM_SQLITE
-SQLITE_LIB_DIR = /opt/csw/lib
-export SQLITE_LIB_DIR
-SQLITE_INCLUDE_DIR = /opt/csw/include
-export SQLITE_INCLUDE_DIR
 
 # 64-bit suppport
 ifeq ($(MODULATION),isa-sparcv9)
@@ -104,6 +100,14 @@
 endif
 export NSPR_LIB_DIR
 
+ifeq ($(USE_64),1) 
+SQLITE_LIB_DIR = /opt/csw/lib/64
+else
+SQLITE_LIB_DIR = /opt/csw/lib
+endif
+export SQLITE_LIB_DIR
+SQLITE_INCLUDE_DIR = /opt/csw/include
+export SQLITE_INCLUDE_DIR
 
 # Based on:
 # http://mxr.mozilla.org/security/source/security/nss/pkg/solaris/SUNWtlsu/prototype_com

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


From dmichelsen at users.sourceforge.net  Mon Jan 16 18:01:58 2012
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Mon, 16 Jan 2012 17:01:58 +0000
Subject: [csw-devel] SF.net SVN: gar:[16780] csw/mgar/pkg/scummvm/trunk
Message-ID: <E1RmpwU-00006x-4P@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 16780
          http://gar.svn.sourceforge.net/gar/?rev=16780&view=rev
Author:   dmichelsen
Date:     2012-01-16 17:01:57 +0000 (Mon, 16 Jan 2012)
Log Message:
-----------
scummvm/trunk: Update to 1.4.0

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

Added Paths:
-----------
    csw/mgar/pkg/scummvm/trunk/checksums

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


Property changes on: csw/mgar/pkg/scummvm/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2

Added: svn:ignore
   + work


Modified: csw/mgar/pkg/scummvm/trunk/Makefile
===================================================================
--- csw/mgar/pkg/scummvm/trunk/Makefile	2012-01-16 16:28:47 UTC (rev 16779)
+++ csw/mgar/pkg/scummvm/trunk/Makefile	2012-01-16 17:01:57 UTC (rev 16780)
@@ -1,5 +1,5 @@
 NAME = scummvm
-VERSION = 1.0.0
+VERSION = 1.4.0
 CATEGORIES = apps
 
 DESCRIPTION = Virtual machine for several classic graphical point-and-click adventure games
@@ -9,9 +9,22 @@
 MASTER_SITES = $(SF_MIRRORS)
 DISTFILES  = $(NAME)-$(VERSION).tar.bz2
 
-# We define upstream file regex so we can be notifed of new upstream software release
-UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2
+RUNTIME_DEP_PKGS_CSWscummvm += CSWlibpng12-0
+RUNTIME_DEP_PKGS_CSWscummvm += CSWlibz1
+RUNTIME_DEP_PKGS_CSWscummvm += CSWlibogg0
+RUNTIME_DEP_PKGS_CSWscummvm += CSWlibvorbis0
+RUNTIME_DEP_PKGS_CSWscummvm += CSWlibstdc++6
+RUNTIME_DEP_PKGS_CSWscummvm += CSWlibsdl1-2-0
+RUNTIME_DEP_PKGS_CSWscummvm += CSWlibflac8
+RUNTIME_DEP_PKGS_CSWscummvm += CSWlibtheoradec1
+RUNTIME_DEP_PKGS_CSWscummvm += CSWlibmad0
+RUNTIME_DEP_PKGS_CSWscummvm += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWscummvm += CSWlibvorbisfile3
 
+# Don't know about these, investigate later
+CHECKPKG_OVERRIDES_CSWscummvm += file-with-bad-content|/usr/local|root/opt/csw/bin/scummvm
+CHECKPKG_OVERRIDES_CSWscummvm += file-with-bad-content|/usr/local|root/opt/csw/share/man/man6/scummvm.6
+
 GARCOMPILER = GCC4
 
 # Custom configure
@@ -22,5 +35,12 @@
 CONFIGURE_ARGS += --libdir=$(libdir)
 CONFIGURE_ARGS += --enable-all-engines
 
+TEST_TARGET = test
 
+# Testsuite relies on Python which throws lots of errors, disable for now
+SKIPTEST ?= 1
+
 include gar/category.mk
+
+# For "install" with GNU syntax
+PATH := /opt/csw/gnu:$(PATH)

Added: csw/mgar/pkg/scummvm/trunk/checksums
===================================================================
--- csw/mgar/pkg/scummvm/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/scummvm/trunk/checksums	2012-01-16 17:01:57 UTC (rev 16780)
@@ -0,0 +1 @@
+361000b78ebf0d0f449e98238d677be1  scummvm-1.4.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  Mon Jan 16 18:49:24 2012
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Mon, 16 Jan 2012 17:49:24 +0000
Subject: [csw-devel] SF.net SVN: gar:[16781]
	csw/mgar/pkg/cyrus_imapd/trunk/Makefile
Message-ID: <E1RmqgO-0000xL-Vf@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 16781
          http://gar.svn.sourceforge.net/gar/?rev=16781&view=rev
Author:   wahwah
Date:     2012-01-16 17:49:24 +0000 (Mon, 16 Jan 2012)
Log Message:
-----------
cyrus_imapd/trunk: Update dependencies, link against bdb47

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

Modified: csw/mgar/pkg/cyrus_imapd/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cyrus_imapd/trunk/Makefile	2012-01-16 17:01:57 UTC (rev 16780)
+++ csw/mgar/pkg/cyrus_imapd/trunk/Makefile	2012-01-16 17:49:24 UTC (rev 16781)
@@ -33,19 +33,6 @@
 
 SPKG_DESC_CSWcyrusimapd = Pop and Imap server from the Cyrus mail system
 CATALOGNAME_CSWcyrusimapd = cyrus_imapd
-RUNTIME_DEP_PKGS_CSWcyrusimapd = CSWosslrt CSWsasl CSWbdb42 CSWkrb5lib CSWnetsnmp CSWzlib CSWtcpwrap CSWlibpcreposix0 CSWlibpcre0
-#SPKG_CLASSES_CSWcyrusimapd = none services cswpreserveconf cswinitsmf
-
-SPKG_DESC_CSWcyrusimapdutils = Various admin utilities for Cyrus Imapd/Popd
-CATALOGNAME_CSWcyrusimapdutils = cyrus_imapd_utils
-RUNTIME_DEP_PKGS_CSWcyrusimapdutils = CSWpmcyrus CSWosslrt CSWsasl CSWbdb42 CSWkrb5lib CSWzlib CSWlibpcreposix0 CSWlibpcre0
-#SPKG_CLASSES_CSWcyrusimapdutils = none 
-
-SPKG_DESC_CSWpmcyrus = Perl interface to Cyrus Imap functions
-CATALOGNAME_CSWpmcyrus = pm_cyrus
-RUNTIME_DEP_PKGS_CSWpmcyrus = CSWperl CSWbdb42 CSWosslrt CSWsasl CSWzlib
-#SPKG_CLASSES_CSWpmcyrus = none
-
 PKGFILES_CSWcyrusimapd = $(sbindir)/.*
 PKGFILES_CSWcyrusimapd += $(sysconfdir)/cyrus
 PKGFILES_CSWcyrusimapd += $(docdir)/cyrus_imapd/.*
@@ -57,7 +44,53 @@
 PKGFILES_CSWcyrusimapd += /etc$(prefix)/init.d/cswcyrus
 PKGFILES_CSWcyrusimapd += /var$(prefix)/svc/manifest/network/cswcyrus\.xml
 PKGFILES_CSWcyrusimapd += $(localstatedir)/cyrus.*
+RUNTIME_DEP_PKGS_CSWcyrusimapd += CSWbdb47
+RUNTIME_DEP_PKGS_CSWcyrusimapd += CSWlibcom-err3
+RUNTIME_DEP_PKGS_CSWcyrusimapd += CSWlibgssapi-krb5-2
+RUNTIME_DEP_PKGS_CSWcyrusimapd += CSWlibk5crypto3
+RUNTIME_DEP_PKGS_CSWcyrusimapd += CSWlibkrb5-3
+RUNTIME_DEP_PKGS_CSWcyrusimapd += CSWlibkrb5support0
+RUNTIME_DEP_PKGS_CSWcyrusimapd += CSWlibpcre0
+RUNTIME_DEP_PKGS_CSWcyrusimapd += CSWlibpcreposix0
+RUNTIME_DEP_PKGS_CSWcyrusimapd += CSWlibwrap1
+RUNTIME_DEP_PKGS_CSWcyrusimapd += CSWlibz1
+RUNTIME_DEP_PKGS_CSWcyrusimapd += CSWnetsnmp
+RUNTIME_DEP_PKGS_CSWcyrusimapd += CSWosslrt
+RUNTIME_DEP_PKGS_CSWcyrusimapd += CSWsasl
 
+# Expected catalogname: cyrusimapd, not cyrus_imapd
+CHECKPKG_OVERRIDES_CSWcyrusimapd += catalogname-does-not-match-pkgname
+
+SPKG_DESC_CSWcyrusimapdutils = Various admin utilities for Cyrus Imapd/Popd
+CATALOGNAME_CSWcyrusimapdutils = cyrus_imapd_utils
+PKGFILES_CSWcyrusimapdutils = $(bindir)/.*
+PKGFILES_CSWcyrusimapdutils += $(mandir)/man1/.*
+PKGFILES_CSWcyrusimapdutils += $(docdir)/cyrus_imapd_utils/.*
+RUNTIME_DEP_PKGS_CSWcyrusimapdutils += CSWbdb47
+RUNTIME_DEP_PKGS_CSWcyrusimapdutils += CSWlibcom-err3
+RUNTIME_DEP_PKGS_CSWcyrusimapdutils += CSWlibgssapi-krb5-2
+RUNTIME_DEP_PKGS_CSWcyrusimapdutils += CSWlibk5crypto3
+RUNTIME_DEP_PKGS_CSWcyrusimapdutils += CSWlibkrb5-3
+RUNTIME_DEP_PKGS_CSWcyrusimapdutils += CSWlibkrb5support0
+RUNTIME_DEP_PKGS_CSWcyrusimapdutils += CSWlibpcre0
+RUNTIME_DEP_PKGS_CSWcyrusimapdutils += CSWlibpcreposix0
+RUNTIME_DEP_PKGS_CSWcyrusimapdutils += CSWlibz1
+RUNTIME_DEP_PKGS_CSWcyrusimapdutils += CSWosslrt
+RUNTIME_DEP_PKGS_CSWcyrusimapdutils += CSWsasl
+# Expected catalogname: cyrusimapdutils, not cyrus_imapd_utils
+CHECKPKG_OVERRIDES_CSWcyrusimapdutils += catalogname-does-not-match-pkgname
+
+SPKG_DESC_CSWpmcyrus = Perl interface to Cyrus Imap functions
+CATALOGNAME_CSWpmcyrus = pm_cyrus
+PKGFILES_CSWpmcyrus = $(perllib)/.*
+PKGFILES_CSWpmcyrus += $(mandir)/man3/Cyrus::.*
+PKGFILES_CSWpmcyrus += $(docdir)/pm_cyrus/.*
+RUNTIME_DEP_PKGS_CSWpmcyrus += CSWbdb47
+RUNTIME_DEP_PKGS_CSWpmcyrus += CSWlibz1
+RUNTIME_DEP_PKGS_CSWpmcyrus += CSWosslrt
+RUNTIME_DEP_PKGS_CSWpmcyrus += CSWperl
+RUNTIME_DEP_PKGS_CSWpmcyrus += CSWsasl
+
 PROTOTYPE_MODIFIERS = cyrusdir
 PROTOTYPE_FILES_cyrusdir = $(localstatedir)/cyrus.*
 PROTOTYPE_USER_cyrusdir = cyrus
@@ -70,15 +103,6 @@
 
 LICENSE = COPYRIGHT
 
-PKGFILES_CSWcyrusimapdutils = $(bindir)/.*
-PKGFILES_CSWcyrusimapdutils += $(mandir)/man1/.*
-PKGFILES_CSWcyrusimapdutils += $(docdir)/cyrus_imapd_utils/.*
-
-PKGFILES_CSWpmcyrus = $(perllib)/.*
-PKGFILES_CSWpmcyrus += $(mandir)/man3/Cyrus::.*
-PKGFILES_CSWpmcyrus += $(docdir)/pm_cyrus/.*
-
-
 CHECKPKG_OVERRIDES_CSWcyrusimapdutils += surplus-dependency|CSWpmcyrus
 
 # Don't how to properly solve this now
@@ -181,8 +205,8 @@
 CONFIGURE_ARGS += --with-service-path=$(libexecdir)/cyrus 
 CONFIGURE_ARGS += --sysconfdir=$(sysconfdir)/cyrus 
 CONFIGURE_ARGS += --with-bdb=db-4.2
-CONFIGURE_ARGS += --with-bdb-libdir=$(prefix)/bdb42/lib 
-CONFIGURE_ARGS += --with-bdb-incdir=$(prefix)/bdb42/include 
+CONFIGURE_ARGS += --with-bdb-libdir=$(prefix)/bdb47/lib 
+CONFIGURE_ARGS += --with-bdb-incdir=$(prefix)/bdb47/include 
 CONFIGURE_ARGS += --with-openssl=$(prefix)
 CONFIGURE_ARGS += --with-sasl=$(prefix)
 CONFIGURE_ARGS += --with-perl=$(prefix)/bin/perl 
@@ -193,6 +217,10 @@
 CONFIGURE_ARGS += --with-libwrap=$(prefix)
 CONFIGURE_ARGS += --disable-nntp
 
+# To link against BerkeleyDB 4.7 explicitly
+EXTRA_LINKER_FLAGS = -R$(prefix)/bdb47/lib/\$$ISALIST
+LD_OPTIONS += -R$(prefix)/bdb47/lib/\$$ISALIST
+
 # we add the args so perl libraries are installed
 # in the correct path
 INSTALL_ARGS = INSTALLDIRS=vendor

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


From wahwah at users.sourceforge.net  Mon Jan 16 20:04:52 2012
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Mon, 16 Jan 2012 19:04:52 +0000
Subject: [csw-devel] SF.net SVN: gar:[16782]
	csw/mgar/pkg/cyrus_imapd/trunk/Makefile
Message-ID: <E1RmrrQ-0000lI-Gv@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 16782
          http://gar.svn.sourceforge.net/gar/?rev=16782&view=rev
Author:   wahwah
Date:     2012-01-16 19:04:52 +0000 (Mon, 16 Jan 2012)
Log Message:
-----------
cyrus_imapd/trunk: declare 4.7 in configure args

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

Modified: csw/mgar/pkg/cyrus_imapd/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cyrus_imapd/trunk/Makefile	2012-01-16 17:49:24 UTC (rev 16781)
+++ csw/mgar/pkg/cyrus_imapd/trunk/Makefile	2012-01-16 19:04:52 UTC (rev 16782)
@@ -204,7 +204,7 @@
 CONFIGURE_ARGS += --with-cyrus-prefix=$(prefix)
 CONFIGURE_ARGS += --with-service-path=$(libexecdir)/cyrus 
 CONFIGURE_ARGS += --sysconfdir=$(sysconfdir)/cyrus 
-CONFIGURE_ARGS += --with-bdb=db-4.2
+CONFIGURE_ARGS += --with-bdb=db-4.7
 CONFIGURE_ARGS += --with-bdb-libdir=$(prefix)/bdb47/lib 
 CONFIGURE_ARGS += --with-bdb-incdir=$(prefix)/bdb47/include 
 CONFIGURE_ARGS += --with-openssl=$(prefix)

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


From dmichelsen at users.sourceforge.net  Mon Jan 16 23:00:23 2012
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Mon, 16 Jan 2012 22:00:23 +0000
Subject: [csw-devel] SF.net SVN: gar:[16783]
	csw/mgar/gar/v2/categories/python/category.mk
Message-ID: <E1RmubH-00039s-2j@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 16783
          http://gar.svn.sourceforge.net/gar/?rev=16783&view=rev
Author:   dmichelsen
Date:     2012-01-16 22:00:22 +0000 (Mon, 16 Jan 2012)
Log Message:
-----------
mGAR v2: Use target 'test' for Python as reported in #22 by abondarenko

Modified Paths:
--------------
    csw/mgar/gar/v2/categories/python/category.mk

Modified: csw/mgar/gar/v2/categories/python/category.mk
===================================================================
--- csw/mgar/gar/v2/categories/python/category.mk	2012-01-16 19:04:52 UTC (rev 16782)
+++ csw/mgar/gar/v2/categories/python/category.mk	2012-01-16 22:00:22 UTC (rev 16783)
@@ -24,6 +24,7 @@
 INSTALL_SCRIPTS ?= $(WORKSRC)/setup.py
 INSTALL_ARGS ?= --root=$(DESTDIR) --prefix=$(prefix)
 TEST_SCRIPTS ?= $(WORKSRC)/setup.py
+TEST_TARGET ?= test
 LICENSE ?= PKG-INFO
 SPKG_SOURCEURL ?= http://pypi.python.org/pypi/$(NAME)
 MASTER_SITES ?= $(PYPI_MIRROR)

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


From wahwah at users.sourceforge.net  Tue Jan 17 01:02:37 2012
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Tue, 17 Jan 2012 00:02:37 +0000
Subject: [csw-devel] SF.net SVN: gar:[16784]
	csw/mgar/pkg/opencsw-policy/trunk
Message-ID: <E1RmwVZ-0006z9-V6@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 16784
          http://gar.svn.sourceforge.net/gar/?rev=16784&view=rev
Author:   wahwah
Date:     2012-01-17 00:02:37 +0000 (Tue, 17 Jan 2012)
Log Message:
-----------
opencsw-policy/trunk: a sphinx version

Modified Paths:
--------------
    csw/mgar/pkg/opencsw-policy/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/opencsw-policy/trunk/files/Makefile
    csw/mgar/pkg/opencsw-policy/trunk/files/conf.py
    csw/mgar/pkg/opencsw-policy/trunk/files/filesystem-layout.rst
    csw/mgar/pkg/opencsw-policy/trunk/files/index.rst
    csw/mgar/pkg/opencsw-policy/trunk/files/shared-libraries.rst

Removed Paths:
-------------
    csw/mgar/pkg/opencsw-policy/trunk/files/index.txt

Modified: csw/mgar/pkg/opencsw-policy/trunk/Makefile
===================================================================
--- csw/mgar/pkg/opencsw-policy/trunk/Makefile	2012-01-16 22:00:22 UTC (rev 16783)
+++ csw/mgar/pkg/opencsw-policy/trunk/Makefile	2012-01-17 00:02:37 UTC (rev 16784)
@@ -19,28 +19,31 @@
 CATALOGNAME_CSWopencsw-policy = opencsw_policy
 LICENSE = fdl-1.3.txt
 
-BUILD_DEP_PKGS = CSWasciidoc
+BUILD_DEP_PKGS += CSWpy-sphinx
+BUILD_DEP_PKGS += CSWrsync
+BUILD_DEP_PKGS += CSWpysetuptools
 
 include gar/category.mk
 
-%.html: %.txt
-	asciidoc -o $@ $<
+post-extract-modulated:
+	rsync -r $(FILEDIR)/ $(WORKSRC)
+	@$(MAKECOOKIE)
 
-build-policy: \
-	copy-asciidoc \
-	$(WORKSRC)/index.html
+build-policy:
+	(cd $(WORKSRC); gmake html)
 
-copy-asciidoc:
-	gcp -v $(FILEDIR)/*.txt $(WORKSRC)
-
 install-policy:
 	ginstall -m 755 -d $(PKGROOT)$(docdir)/$(CATALOGNAME_CSWopencsw-policy)
-	for f in $(WORKSRC)/*.html $(WORKSRC)/*.txt; do \
-		ginstall $${f} $(PKGROOT)$(docdir)/$(CATALOGNAME_CSWopencsw-policy); \
-	done
+	rsync -rv $(WORKSRC)/_build/html/ $(PKGROOT)$(docdir)/$(CATALOGNAME_CSWopencsw-policy)
 	@$(MAKECOOKIE)
 
-post-merge:
+post-install-modulated: copy-to-web
+	@$(MAKECOOKIE)
+
+copy-to-web: $(PKGROOT)$(docdir)/$(CATALOGNAME_CSWopencsw-policy)/index.html
 	if [ -d $(HOME)/public_html/policy ]; then \
-	  cp $(PKGROOT)/opt/csw/share/doc/opencsw_policy/index.html $(HOME)/public_html/policy; \
+		rsync -r $(PKGROOT)$(docdir)/$(CATALOGNAME_CSWopencsw-policy)/ \
+		$(HOME)/public_html/policy; \
 	fi
+
+.PHONY: copy-to-web

Added: csw/mgar/pkg/opencsw-policy/trunk/files/Makefile
===================================================================
--- csw/mgar/pkg/opencsw-policy/trunk/files/Makefile	                        (rev 0)
+++ csw/mgar/pkg/opencsw-policy/trunk/files/Makefile	2012-01-17 00:02:37 UTC (rev 16784)
@@ -0,0 +1,130 @@
+# Makefile for Sphinx documentation
+#
+
+# You can set these variables from the command line.
+SPHINXOPTS    =
+SPHINXBUILD   = sphinx-build
+PAPER         =
+BUILDDIR      = _build
+
+# Internal variables.
+PAPEROPT_a4     = -D latex_paper_size=a4
+PAPEROPT_letter = -D latex_paper_size=letter
+ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
+
+.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest
+
+help:
+	@echo "Please use \`make <target>' where <target> is one of"
+	@echo "  html       to make standalone HTML files"
+	@echo "  dirhtml    to make HTML files named index.html in directories"
+	@echo "  singlehtml to make a single large HTML file"
+	@echo "  pickle     to make pickle files"
+	@echo "  json       to make JSON files"
+	@echo "  htmlhelp   to make HTML files and a HTML help project"
+	@echo "  qthelp     to make HTML files and a qthelp project"
+	@echo "  devhelp    to make HTML files and a Devhelp project"
+	@echo "  epub       to make an epub"
+	@echo "  latex      to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
+	@echo "  latexpdf   to make LaTeX files and run them through pdflatex"
+	@echo "  text       to make text files"
+	@echo "  man        to make manual pages"
+	@echo "  changes    to make an overview of all changed/added/deprecated items"
+	@echo "  linkcheck  to check all external links for integrity"
+	@echo "  doctest    to run all doctests embedded in the documentation (if enabled)"
+
+clean:
+	-rm -rf $(BUILDDIR)/*
+
+html:
+	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
+	@echo
+	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
+
+dirhtml:
+	$(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
+	@echo
+	@echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml."
+
+singlehtml:
+	$(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml
+	@echo
+	@echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml."
+
+pickle:
+	$(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle
+	@echo
+	@echo "Build finished; now you can process the pickle files."
+
+json:
+	$(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json
+	@echo
+	@echo "Build finished; now you can process the JSON files."
+
+htmlhelp:
+	$(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp
+	@echo
+	@echo "Build finished; now you can run HTML Help Workshop with the" \
+	      ".hhp project file in $(BUILDDIR)/htmlhelp."
+
+qthelp:
+	$(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp
+	@echo
+	@echo "Build finished; now you can run "qcollectiongenerator" with the" \
+	      ".qhcp project file in $(BUILDDIR)/qthelp, like this:"
+	@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/OpenCSW.qhcp"
+	@echo "To view the help file:"
+	@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/OpenCSW.qhc"
+
+devhelp:
+	$(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
+	@echo
+	@echo "Build finished."
+	@echo "To view the help file:"
+	@echo "# mkdir -p $$HOME/.local/share/devhelp/OpenCSW"
+	@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/OpenCSW"
+	@echo "# devhelp"
+
+epub:
+	$(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub
+	@echo
+	@echo "Build finished. The epub file is in $(BUILDDIR)/epub."
+
+latex:
+	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
+	@echo
+	@echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex."
+	@echo "Run \`make' in that directory to run these through (pdf)latex" \
+	      "(use \`make latexpdf' here to do that automatically)."
+
+latexpdf:
+	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
+	@echo "Running LaTeX files through pdflatex..."
+	make -C $(BUILDDIR)/latex all-pdf
+	@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
+
+text:
+	$(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text
+	@echo
+	@echo "Build finished. The text files are in $(BUILDDIR)/text."
+
+man:
+	$(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man
+	@echo
+	@echo "Build finished. The manual pages are in $(BUILDDIR)/man."
+
+changes:
+	$(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes
+	@echo
+	@echo "The overview file is in $(BUILDDIR)/changes."
+
+linkcheck:
+	$(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck
+	@echo
+	@echo "Link check complete; look for any errors in the above output " \
+	      "or in $(BUILDDIR)/linkcheck/output.txt."
+
+doctest:
+	$(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest
+	@echo "Testing of doctests in the sources finished, look at the " \
+	      "results in $(BUILDDIR)/doctest/output.txt."

Added: csw/mgar/pkg/opencsw-policy/trunk/files/conf.py
===================================================================
--- csw/mgar/pkg/opencsw-policy/trunk/files/conf.py	                        (rev 0)
+++ csw/mgar/pkg/opencsw-policy/trunk/files/conf.py	2012-01-17 00:02:37 UTC (rev 16784)
@@ -0,0 +1,263 @@
+# -*- coding: utf-8 -*-
+#
+# OpenCSW documentation build configuration file, created by
+# sphinx-quickstart on Mon Mar 21 23:48:09 2011.
+#
+# This file is execfile()d with the current directory set to its containing dir.
+#
+# Note that not all possible configuration values are present in this
+# autogenerated file.
+#
+# All configuration values have a default; values that are commented out
+# serve to show the default.
+
+import sys, os
+
+# If extensions (or modules to document with autodoc) are in another directory,
+# add these directories to sys.path here. If the directory is relative to the
+# documentation root, use os.path.abspath to make it absolute, like shown here.
+#sys.path.insert(0, os.path.abspath('.'))
+
+# -- General configuration -----------------------------------------------------
+
+# If your documentation needs a minimal Sphinx version, state it here.
+#needs_sphinx = '1.0'
+
+# Add any Sphinx extension module names here, as strings. They can be extensions
+# coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
+extensions = ['sphinx.ext.pngmath']
+
+# Add any paths that contain templates here, relative to this directory.
+templates_path = ['_templates']
+
+# The suffix of source filenames.
+source_suffix = '.rst'
+
+# The encoding of source files.
+#source_encoding = 'utf-8-sig'
+
+# The master toctree document.
+master_doc = 'index'
+
+# General information about the project.
+project = u'OpenCSW'
+copyright = u'2012, OpenCSW'
+
+# The version info for the project you're documenting, acts as replacement for
+# |version| and |release|, also used in various other places throughout the
+# built documents.
+#
+# The short X.Y version.
+version = '1.0'
+# The full version, including alpha/beta/rc tags.
+release = '1.0'
+
+# The language for content autogenerated by Sphinx. Refer to documentation
+# for a list of supported languages.
+#language = None
+
+# There are two options for replacing |today|: either, you set today to some
+# non-false value, then it is used:
+#today = ''
+# Else, today_fmt is used as the format for a strftime call.
+#today_fmt = '%B %d, %Y'
+
+# List of patterns, relative to source directory, that match files and
+# directories to ignore when looking for source files.
+exclude_patterns = ['_build']
+
+# The reST default role (used for this markup: `text`) to use for all documents.
+#default_role = None
+
+# If true, '()' will be appended to :func: etc. cross-reference text.
+#add_function_parentheses = True
+
+# If true, the current module name will be prepended to all description
+# unit titles (such as .. function::).
+#add_module_names = True
+
+# If true, sectionauthor and moduleauthor directives will be shown in the
+# output. They are ignored by default.
+#show_authors = False
+
+# The name of the Pygments (syntax highlighting) style to use.
+pygments_style = 'sphinx'
+
+# A list of ignored prefixes for module index sorting.
+#modindex_common_prefix = []
+
+
+# -- Options for HTML output ---------------------------------------------------
+
+# The theme to use for HTML and HTML Help pages.  See the documentation for
+# a list of builtin themes.
+html_theme = 'default'
+# html_theme = 'traditional'
+# html_theme = 'haiku'
+# html_theme = 'scrolls'
+# html_theme = 'agogo'
+
+# Theme options are theme-specific and customize the look and feel of a theme
+# further.  For a list of options available for each theme, see the
+# documentation.
+#html_theme_options = {}
+html_theme_options = {
+    # "rightsidebar": "true",
+}
+
+# Add any paths that contain custom themes here, relative to this directory.
+#html_theme_path = []
+
+# The name for this set of Sphinx documents.  If None, it defaults to
+# "<project> v<release> documentation".
+#html_title = None
+
+# A shorter title for the navigation bar.  Default is the same as html_title.
+#html_short_title = None
+
+# The name of an image file (relative to this directory) to place at the top
+# of the sidebar.
+#html_logo = None
+
+# The name of an image file (within the static path) to use as favicon of the
+# docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
+# pixels large.
+#html_favicon = None
+
+# Add any paths that contain custom static files (such as style sheets) here,
+# relative to this directory. They are copied after the builtin static files,
+# so a file named "default.css" will overwrite the builtin "default.css".
+html_static_path = ['_static']
+
+# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
+# using the given strftime format.
+#html_last_updated_fmt = '%b %d, %Y'
+
+# If true, SmartyPants will be used to convert quotes and dashes to
+# typographically correct entities.
+#html_use_smartypants = True
+
+# Custom sidebar templates, maps document names to template names.
+#html_sidebars = {}
+
+# Additional templates that should be rendered to pages, maps page names to
+# template names.
+#html_additional_pages = {}
+
+# If false, no module index is generated.
+#html_domain_indices = True
+
+# If false, no index is generated.
+#html_use_index = True
+
+# If true, the index is split into individual pages for each letter.
+#html_split_index = False
+
+# If true, links to the reST sources are added to the pages.
+#html_show_sourcelink = True
+
+# If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
+#html_show_sphinx = True
+
+# If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
+#html_show_copyright = True
+
+# If true, an OpenSearch description file will be output, and all pages will
+# contain a <link> tag referring to it.  The value of this option must be the
+# base URL from which the finished HTML is served.
+#html_use_opensearch = ''
+
+# This is the file name suffix for HTML files (e.g. ".xhtml").
+#html_file_suffix = None
+
+# Output file base name for HTML help builder.
+htmlhelp_basename = 'OpenCSWdoc'
+
+
+# -- Options for LaTeX output --------------------------------------------------
+
+# The paper size ('letter' or 'a4').
+#latex_paper_size = 'letter'
+
+# The font size ('10pt', '11pt' or '12pt').
+#latex_font_size = '10pt'
+
+# Grouping the document tree into LaTeX files. List of tuples
+# (source start file, target name, title, author, documentclass [howto/manual]).
+latex_documents = [
+  ('index', 'OpenCSW.tex', u'OpenCSW Documentation',
+   u'OpenCSW', 'manual'),
+]
+
+# The name of an image file (relative to this directory) to place at the top of
+# the title page.
+#latex_logo = None
+
+# For "manual" documents, if this is true, then toplevel headings are parts,
+# not chapters.
+#latex_use_parts = False
+
+# If true, show page references after internal links.
+#latex_show_pagerefs = False
+
+# If true, show URL addresses after external links.
+#latex_show_urls = False
+
+# Additional stuff for the LaTeX preamble.
+#latex_preamble = ''
+
+# Documents to append as an appendix to all manuals.
+#latex_appendices = []
+
+# If false, no module index is generated.
+#latex_domain_indices = True
+
+
+# -- Options for manual page output --------------------------------------------
+
+# One entry per manual page. List of tuples
+# (source start file, name, description, authors, manual section).
+man_pages = [
+    ('index', 'opencsw', u'OpenCSW Documentation',
+     [u'OpenCSW'], 1)
+]
+
+
+# -- Options for Epub output ---------------------------------------------------
+
+# Bibliographic Dublin Core info.
+epub_title = u'OpenCSW'
+epub_author = u'OpenCSW'
+epub_publisher = u'OpenCSW'
+epub_copyright = u'2012, OpenCSW'
+
+# The language of the text. It defaults to the language option
+# or en if the language is not set.
+#epub_language = ''
+
+# The scheme of the identifier. Typical schemes are ISBN or URL.
+#epub_scheme = ''
+
+# The unique identifier of the text. This can be a ISBN number
+# or the project homepage.
+#epub_identifier = ''
+
+# A unique identification for the text.
+#epub_uid = ''
+
+# HTML files that should be inserted before the pages created by sphinx.
+# The format is a list of tuples containing the path and title.
+#epub_pre_files = []
+
+# HTML files shat should be inserted after the pages created by sphinx.
+# The format is a list of tuples containing the path and title.
+#epub_post_files = []
+
+# A list of files that should not be packed into the epub file.
+#epub_exclude_files = []
+
+# The depth of the table of contents in toc.ncx.
+#epub_tocdepth = 3
+
+# Allow duplicate toc entries.
+#epub_tocdup = True

Added: csw/mgar/pkg/opencsw-policy/trunk/files/filesystem-layout.rst
===================================================================
--- csw/mgar/pkg/opencsw-policy/trunk/files/filesystem-layout.rst	                        (rev 0)
+++ csw/mgar/pkg/opencsw-policy/trunk/files/filesystem-layout.rst	2012-01-17 00:02:37 UTC (rev 16784)
@@ -0,0 +1,17 @@
+OpenCSW filesystem layout
+=========================
+
+.. contents::
+
+.. highlight:: text
+
+Introduction
+------------
+
+OpenCSW installs over an already installed Solaris system, and follows
+the general rule of not conflicting with existing Solaris files.
+
+* /opt/csw
+* /etc/opt/csw
+* /var/opt/csw
+

Added: csw/mgar/pkg/opencsw-policy/trunk/files/index.rst
===================================================================
--- csw/mgar/pkg/opencsw-policy/trunk/files/index.rst	                        (rev 0)
+++ csw/mgar/pkg/opencsw-policy/trunk/files/index.rst	2012-01-17 00:02:37 UTC (rev 16784)
@@ -0,0 +1,23 @@
+.. OpenCSW documentation master file, created by
+   sphinx-quickstart on Mon Mar 21 23:48:09 2011.
+   You can adapt this file completely to your liking, but it should at least
+   contain the root `toctree` directive.
+
+Welcome to OpenCSW's documentation!
+===================================
+
+Contents:
+
+.. toctree::
+   :maxdepth: 2
+
+   filesystem-layout.rst
+   shared-libraries.rst
+
+.. Indices and tables
+   ==================
+   * :ref:`genindex`
+   * :ref:`modindex`
+   * :ref:`search`
+
+

Deleted: csw/mgar/pkg/opencsw-policy/trunk/files/index.txt
===================================================================
--- csw/mgar/pkg/opencsw-policy/trunk/files/index.txt	2012-01-16 22:00:22 UTC (rev 16783)
+++ csw/mgar/pkg/opencsw-policy/trunk/files/index.txt	2012-01-17 00:02:37 UTC (rev 16784)
@@ -1,7 +0,0 @@
-OpenCSW packaging policy
-========================
-$Id: Makefile 11888 2010-12-12 12:43:48Z skayser $
-:toc:
-:website: http://www.opencsw.org
-
-:leveloffset: 1

Added: csw/mgar/pkg/opencsw-policy/trunk/files/shared-libraries.rst
===================================================================
--- csw/mgar/pkg/opencsw-policy/trunk/files/shared-libraries.rst	                        (rev 0)
+++ csw/mgar/pkg/opencsw-policy/trunk/files/shared-libraries.rst	2012-01-17 00:02:37 UTC (rev 16784)
@@ -0,0 +1,300 @@
+Shared libraries
+================
+
+Background
+----------
+
+Some packages are providing shared libraries.  When binaries start
+linking to them, the updates to packages with shared libraries must be
+done in a way that doesn't break existing binaries.
+
+Life cycle of a shared library can be summarized in the following way:
+
+1. A SONAME appears
+2. We decide to distribute it
+3. Binaries start linking to it
+4. Time passes, new version of the same library comes along
+5. Binaries stop linking to it
+6. SONAME goes away
+
+Historically, shared libraries were packaged either together with base
+packages, or split off to their own packages.  However, once updated
+shared libraries became available upstream, updated packages included
+both old and new versions of shared libraries.  This required package
+builds to download and compile multiple versions of the same project.
+Notable examples are curl and neon libraries, where CSWcurlrt contained
+all three libcurl.so.2, libcurl.so.3 and libcurl.so.4.
+
+Phasing out of shared libraries was difficult.  To phase out a shared
+library, it is required to verify that no binaries link to it.  All
+dependent packages need to be recompiled against the newest version of
+the library, and once this is done, old versions can be removed.
+However, even when all dependent packages are already recompiled against
+libcurl.so.4, there are no useful indicators that libcurl.so.2 is no
+longer linked to.  To verify this, all dependent packages have to be
+unpacked, and examined using /usr/ccs/bin/dump that the no longer list
+libcurl.so.2 in their NEEDED field.
+
+Once the detection problem is solved, removing the old version of
+a library is not as simple as it could be; The whole CSWcurlrt has to be
+rebuilt and re-released in a new version which no longer includes
+libcurl.so.2.
+
+Goals
+-----
+
+* Simplification of handling of shared library life cycles
+* Allowing to determine whether a specific shared library is no longer
+  linked to, by looking at package dependencies (This avoids potential
+  problem of our keeping "legacy binary libs" in a more modern package
+  for longer than is neccessary. It also avoids having to keep coping
+  the binary into future packages)
+
+Non-goals
+---------
+
+* Providing a reliable mechanism to determine whether a given pkgname
+  contains a shared library
+* Keeping package names short and pretty as a priority
+
+Overview
+--------
+
+As a general rule, each soname shall be packaged in a separate package.
+This way, it's easy to track dependencies on specific sonames, detect
+and phase out sonames that are no longer in use.  It also avoids the
+need to rebuild all the versions of software in question if one of the
+versions needs an update.
+
+This idea is based on the Debian shared libraries packaging policy
+[#debian-policy]_ and has been discussed [#discussion]_ on the mailing
+list.
+
+Advantages:
+
+* easy and complete lifecycle of shared libraries
+
+* phasing out of shared libraries can become part of standard catalog
+  update procedures
+* simpler packages, simpler builds (no need for version modulations and
+  complex merges, good for new maintainers)
+* isolation of old non-fixable files with issues (if there's an old
+  library mentioning /export/medusa, you don't have to worry about it
+  being stopped during release after you push it once)
+* no re-pushing of old files
+* more packages overall (good for stats!)
+* number of packages released per software upgrade remains the same.  If
+  there were, say, 4 packages to release with each Python update, the
+  number remains: 4 per release.  There will be one new CSWlibpython*
+  package, and the old CSWlibpython library won't be upgraded.
+
+
+Disadvantages:
+
+* maintainers need to make more decisions when packaging
+* there's some amount of work to be done to do the transition, such as
+  creation of new packages and dependencies
+* some package names become long and complex (however, they are only
+  dependencies; users don't need to type these in)
+
+Implementation details
+----------------------
+
+Package naming
+~~~~~~~~~~~~~~
+
+Names of packages shall be derived from sonames, and from sonames only.
+They shall not depend on project name, or project version.  If a project
+is named foo, and contains libbar.so.0, the package name shall be based
+on libbar, not foo.
+
+A table listing examples of sonames and corresponding package
+names. [#soname-pkgname-unit-test]_
+
+========================= ======================= =========================
+soname                    pkgname                 catalogname
+========================= ======================= =========================
+libfoo.so.0               CSWlibfoo0              libfoo0
+libfoo-0.so               CSWlibfoo0              libfoo0
+libfoo.so.0.1             CSWlibfoo0-1            libfoo0_1
+libapr-1.so.0             CSWlibapr1-0            libapr1_0
+libbabl-0.1.so.0          CSWlibbabl0-1-0         libbabl0_1_0
+libgettextlib-0.14.1.so   CSWlibgettextlib0-14-1  libgettextlib0_14_1
+libapr-1.so.10            CSWlibapr-1-10          libapr_1_10
+libstdc++.so.6            CSWlibstdc++6           libstdc++6
+libdnet.1                 CSWlibdnet1             libdnet1
+libUpperCase.so.1         CSWlibuppercase1        libuppercase1
+libpyglib-2.0-python.so.0 CSWlibpyglib2-0python0  libpyglib2_0python0
+libpython3.1.so.1.0       CSWlibpython3-1-1-0     libpython3_1_1_0
+libapr-1.so.10.0.0        CSWlibapr1-10-0-0       libapr1_10_0_0
+========================= ======================= =========================
+
+Separators
+^^^^^^^^^^
+
+Separators are added between two adjacent numbers, and removed if a number and a letter are next to each other.  For example, ``libfoo.so.0`` becomes ``CSWlibfoo0``, and ``libfoo-1.so.0`` becomes ``CSWlibfoo1-0``.
+
+Linkable shared objects
+~~~~~~~~~~~~~~~~~~~~~~~
+
+The policy or recommendation shall refer to libraries which are //linkable,// meaning other binaries can link against them.  Shared objects in private directories, such as /opt/csw/lib/someproject/foo.so (think Python modules) are not shared libraries which other projects can link to, and therefore there is no benefit in placing them in separate packages.
+
+Special cases
+^^^^^^^^^^^^^
+
+Some packages (e.g. Kerberos libraries) put private shared libraries into /opt/csw/lib.  They don't expose any public API, and only own Kerberos binaries link to them.  Private shared libraries can be bundled with the main package, without splitting them off.
+
+Examples
+^^^^^^^^
+
+============================================================================== ============
+file                                                                           linkable?
+============================================================================== ============
+/opt/csw/lib/libfoo.so.0.2                                                     Yes
+/opt/csw/lib/sparcv9/libfoo.so.0.2                                             Yes
+/opt/csw/lib/sparcv8plus+vis/libfoo.so.0.2                                     Yes
+/opt/csw/lib/amd64/libfoo.so.0.2                                               Yes
+/opt/csw/libexec/bar                                                           No
+/opt/csw/share/bar                                                             No
+/opt/csw/lib/gnucash/libgncmod-stylesheets.so.0.0.0                            No
+/opt/csw/lib/erlang/lib/megaco-3.6.0.1/priv/lib/megaco_flex_scanner_drv_mt.so  No
+/opt/csw/share/Adobe/Reader8/Reader/sparcsolaris/lib/libcrypto.so.0.9.6        No
+/opt/csw/customprefix/lib/libfoo.so.0.2                                        Yes
+/opt/csw/boost-gcc/lib/libboost_wserialization.so.1.44.0                       Yes
+============================================================================== ============
+
+Example implementation and its unit tests can be found in checkpkg
+sources [#is-library-linkable-implementation]_ and corresponding unit
+tests. [#is-library-linkable-unit-tests]_
+
+Private shared libraries
+^^^^^^^^^^^^^^^^^^^^^^^^
+
+Some software projects install private (non-linkable) shared libraries
+into libdir (e.g. ``/opt/csw/lib``) by default.  To ensure that they are
+private, they need to be moved to a subdirectory, e.g.
+``/opt/csw/lib/<project>``.
+
+To create a private library and install 32 and 64-bit libraries, they
+need to be laid out as follows:
+
+On sparc::
+
+  /opt/csw/lib/foo
+  /opt/csw/lib/foo/32 --> .
+  /opt/csw/lib/foo/64 --> sparcv9
+
+On i386::
+
+  /opt/csw/lib/foo
+  /opt/csw/lib/foo/32 --> .
+  /opt/csw/lib/foo/64 --> amd64
+
+In GAR, it can be simplified by symlinking:
+
+* 32 to ``$(ISA_DEFAULT)``
+* 64 to ``$(ISA_DEFAULT64)``
+
+The runpath needs to be set to ``/opt/csw/lib/foo/64``, e.g. ``-R/opt/csw/lib/foo/64``.
+
+Grouping shared libraries
+-------------------------
+
+There can be cases in which a set of shared libraries is likely to be
+upgraded together. Considering the following set of libraries:
+
+* libfoo.so.0
+* libfoo_bar.so.0
+* libfoo_baz.so.0
+
+It's possible that all the following libraries will be updated together.
+In such a case, all these shared objects can be put in a single package.
+The decision shall be made by the maintainer.
+
+If versions of shared libraries don't match, chances are that their API
+will not be changing together, and it's a good idea not to package them
+together.  For example, the following three libraries are best kept in
+separate packages.
+
+* libfoo.so.0
+* libfoo_bar.so.1
+* libfoo_baz.so.0
+
+When making the decision, the question a maintainer should ask, should
+be: "Are all these shared libraries going to be retired together?" If
+the answer is positive, shared libraries shall be in a single package.
+However, in the face of uncertainty (it's hard to predict the future),
+placing each file in a separate package is always a safe choice.
+
+Transitioning of the existing packages
+--------------------------------------
+
+Consists of moving the shared library to own package, and making the
+original package an empty, transitional one.  The phasing out of
+transitional packages follows the same rules as any other packages: when
+nothing depends on them, they can be removed.
+
+A simple example:
+
+* Before
+
+  - CSWlibfoo (libfoo.so.1)
+
+* After
+
+  - CSWlibfoo (empty) ? CSWlibfoo1 (libfoo.so.1)
+
+For an existing more complex package, with already existing two versions
+of a library:
+
+* Before
+
+  - CSWlibfoo (libfoo.so.1, libfoo.so.2)
+
+* After
+
+  - CSWlibfoo (empty) ? CSWlibfoo1 (libfoo.so.1)
+  - CSWlibfoo (empty) ? CSWlibfoo2 (libfoo.so.2)
+
+Potential problems
+==================
+
+Potential collisions in package naming would include libfoo.so.1 and
+libfoo-1.so both resolving to CSWlibfoo1.  If this case ever occurs, the
+naming conflict needs to be resolved manually.  However, to this time,
+such a case has been never observed.
+
+Certain sonames are long enough that the corresponding package names are
+over 29 characters long.  However, it affects a small percent of
+libraries, roughly about 98% SONAMEs generate package names within
+limits.
+
+Footnotes
+=========
+
+.. [#discussion] `An idea for a shared libraries policy`_ -
+   mailing list discussion
+.. [#debian-policy]
+   `Debian shared libraries packaging policy`_
+.. [#is-library-linkable-implementation]
+   `IsLibraryLinkable implementation`_
+.. [#is-library-linkable-unit-tests]
+   `IsLibraryLinkable unit tests`_
+.. [#soname-pkgname-unit-test]
+   checkpkg unit tests with
+   `examples of mappings between SONAMEs, pkgnames and catalognames`_
+.. _Debian shared libraries packaging policy:
+   http://www.debian.org/doc/debian-policy/
+   ch-sharedlibs.html#s-sharedlibs-runtime
+.. _An idea for a shared libraries policy:
+   http://lists.opencsw.org/pipermail/maintainers/2010-September/
+   012752.html
+.. _IsLibraryLinkable implementation:
+   http://sourceforge.net/apps/trac/gar/browser/csw/mgar/gar/v2/
+   lib/python/sharedlib_utils.py#L24
+.. _IsLibraryLinkable unit tests:
+   http://sourceforge.net/apps/trac/gar/browser/csw/mgar/gar/v2/
+   lib/python/sharedlib_utils_test.py#L13
+.. _examples of mappings between SONAMEs, pkgnames and catalognames:
+   http://sourceforge.net/apps/trac/gar/browser/csw/mgar/gar/v2/
+   lib/python/sharedlib_utils_test.py#L68

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


From maciej at opencsw.org  Tue Jan 17 01:21:45 2012
From: maciej at opencsw.org (=?UTF-8?Q?Maciej_=28Matchek=29_Blizi=C5=84ski?=)
Date: Tue, 17 Jan 2012 00:21:45 +0000
Subject: [csw-devel] SF.net SVN: gar:[16750]
	csw/mgar/pkg/gcc4/branches/private-lib/
In-Reply-To: <x6vcoc7nwa.fsf@opencsw.org>
References: <E1RlNtX-0003GK-Fj@sfp-svn-5.v30.ch3.sourceforge.com>
	<x61ur4ak0h.fsf@opencsw.org>
	<CALtRa-5RbTptRaFfTVqxbmk7mfe7QVRTi8teiEs9uzb75O-5Wg@mail.gmail.com>
	<x6vcoc7nwa.fsf@opencsw.org>
Message-ID: <CALtRa-4OE527JruQ+qnOJnzk9mZ6ht+V9MKw7rx7P=ctm+dw3w@mail.gmail.com>

2012/1/15 Peter FELECAN <pfelecan at opencsw.org>:
>> /opt/csw/bin/foo NEEDED libbar.so.1, RPATH /opt/csw/lib
>> /usr/lib/libbar.so.1 is available
>> /opt/csw/lib/libbar.so.1 is available too, incompatible with /opt/csw/bin/foo
>
> Is a question of order, isn't it? Consequently, if /opt/csw/lib is
> before /usr/lib, everything is dandy.

If /opt/csw/lib is first, then /opt/csw/lib/libbar.so.1 will be loaded
first, and /opt/csw/bin/foo will crash (it was linked against
/usr/lib/libbar.so.1).

>> I'm not sure if this is a scenario we have to worry about, because the
>> solution is to keep GCC libraries in a subdirectory, which has its own
>> disadvantages - library space fragmentation, sometimes harder to debug
>> linking problems, etc.
>
> The 3rd branch as the 4th, in the beginning, when I was the maintainer,
> had this strategy and, as far as I remember, we hadn't an issue with. Am
> I wrong?

My latest thoughts are that the above failure scenario is possible,
but is quite contrived and unlikely. It also assumes that we need to
support old binaries indefinitely. I understand that Solaris has the
backward binary compatibility policy, but this is not one our goals,
if I'm not mistaken. If we really run into a linking problem, we'll
rebuild the failing binaries. If we can't rebuild a package, then
library location is not the worst of our troubles.

So, I'm leaning towards keeping all libraries in /opt/csw/lib,
including libgcc_s and libstdc++.

Maciej

From wahwah at users.sourceforge.net  Tue Jan 17 01:24:42 2012
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Tue, 17 Jan 2012 00:24:42 +0000
Subject: [csw-devel] SF.net SVN: gar:[16785]
 csw/mgar/pkg/opencsw-policy/trunk/files/ shared-libraries.rst
Message-ID: <E1Rmwqw-0006Q1-JM@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 16785
          http://gar.svn.sourceforge.net/gar/?rev=16785&view=rev
Author:   wahwah
Date:     2012-01-17 00:24:42 +0000 (Tue, 17 Jan 2012)
Log Message:
-----------
opencsw-policy/trunk: typo

Modified Paths:
--------------
    csw/mgar/pkg/opencsw-policy/trunk/files/shared-libraries.rst

Modified: csw/mgar/pkg/opencsw-policy/trunk/files/shared-libraries.rst
===================================================================
--- csw/mgar/pkg/opencsw-policy/trunk/files/shared-libraries.rst	2012-01-17 00:02:37 UTC (rev 16784)
+++ csw/mgar/pkg/opencsw-policy/trunk/files/shared-libraries.rst	2012-01-17 00:24:42 UTC (rev 16785)
@@ -32,7 +32,7 @@
 However, even when all dependent packages are already recompiled against
 libcurl.so.4, there are no useful indicators that libcurl.so.2 is no
 longer linked to.  To verify this, all dependent packages have to be
-unpacked, and examined using /usr/ccs/bin/dump that the no longer list
+unpacked, and examined using /usr/ccs/bin/dump that they no longer list
 libcurl.so.2 in their NEEDED field.
 
 Once the detection problem is solved, removing the old version of

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


From pfelecan at opencsw.org  Tue Jan 17 09:55:05 2012
From: pfelecan at opencsw.org (Peter FELECAN)
Date: Tue, 17 Jan 2012 09:55:05 +0100
Subject: [csw-devel] SF.net SVN: gar:[16750]
	csw/mgar/pkg/gcc4/branches/private-lib/
In-Reply-To: <CALtRa-4OE527JruQ+qnOJnzk9mZ6ht+V9MKw7rx7P=ctm+dw3w@mail.gmail.com>
	("Maciej (Matchek) =?utf-8?Q?Blizi=C5=84ski=22's?= message of "Tue,
	17 Jan 2012 00:21:45 +0000")
References: <E1RlNtX-0003GK-Fj@sfp-svn-5.v30.ch3.sourceforge.com>
	<x61ur4ak0h.fsf@opencsw.org>
	<CALtRa-5RbTptRaFfTVqxbmk7mfe7QVRTi8teiEs9uzb75O-5Wg@mail.gmail.com>
	<x6vcoc7nwa.fsf@opencsw.org>
	<CALtRa-4OE527JruQ+qnOJnzk9mZ6ht+V9MKw7rx7P=ctm+dw3w@mail.gmail.com>
Message-ID: <x6obu27lp2.fsf@opencsw.org>

"Maciej (Matchek) Blizi?ski" <maciej at opencsw.org> writes:

> So, I'm leaning towards keeping all libraries in /opt/csw/lib,
> including libgcc_s and libstdc++.

This is the best least effort stance. Consequently, if I may, no need to
waste your time on this branch.
-- 
Peter

From guengel at users.sourceforge.net  Tue Jan 17 20:34:52 2012
From: guengel at users.sourceforge.net (guengel at users.sourceforge.net)
Date: Tue, 17 Jan 2012 19:34:52 +0000
Subject: [csw-devel] SF.net SVN: gar:[16786] csw/mgar/pkg/cyrus_imapd/trunk
Message-ID: <E1RnEo0-0006BM-VL@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 16786
          http://gar.svn.sourceforge.net/gar/?rev=16786&view=rev
Author:   guengel
Date:     2012-01-17 19:34:52 +0000 (Tue, 17 Jan 2012)
Log Message:
-----------
cyrus_imapd/trunk: Added patch to make mkimap (mkdirs) work out of the box.

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

Added Paths:
-----------
    csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus-imapd-fix-path-in-mkimap.patch

Modified: csw/mgar/pkg/cyrus_imapd/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cyrus_imapd/trunk/Makefile	2012-01-17 00:24:42 UTC (rev 16785)
+++ csw/mgar/pkg/cyrus_imapd/trunk/Makefile	2012-01-17 19:34:52 UTC (rev 16786)
@@ -186,6 +186,10 @@
 # "CC="/opt/SUNWspro/bin/cc -xrunpath"
 PATCHFILES += 0002-fix-config2header.patch
 
+# Changes location of imapd.conf from /etc/imapd.conf to
+# /etc/opt/csw/cyrus/imapd.conf in mkimap (mkdirs)
+PATCHFILES += cyrus-imapd-fix-path-in-mkimap.patch
+
 # cyradmrc.pl should be in /etc/opt/csw/etc/cyrus, not in /usr/local/etc/
 PATCHFILES += cyradmrc.pl-path-modification.patch
 
@@ -270,7 +274,7 @@
 install-additional-files:
 	# we provide our class action scripts to modify /etc/inet/services
 	ginstall -D $(WORKDIR_FIRSTMOD)/services $(PKGROOT)/etc/opt/csw/pkg/CSWcyrusimapd/services
-	
+		
 	# configuration and init file installation
 	ginstall -D "$(WORKDIR_FIRSTMOD)/cswcyrus" "$(PKGROOT)/etc/opt/csw/init.d/cswcyrus"
 	ginstall -D "$(WORKDIR_FIRSTMOD)/cswcyrus.xml" "$(PKGROOT)/var/opt/csw/svc/manifest/network/cswcyrus.xml"
@@ -324,6 +328,8 @@
 
 # we rename some tools with too generic names
 cyrus-rename:
+# I don't think renaming mkimap is clever, the online documentation
+# refers to mkimap. Renaming it may confuse users --raos
 	mv $(PKGROOT)/$(sbindir)/mkimap $(PKGROOT)/$(sbindir)/mkdirs
 	( for FILE in mkdirs mknewsgroups dohash undohash rehash; do \
 		mv $(PKGROOT)/$(sbindir)/$$FILE $(PKGROOT)/$(sbindir)/cyrus-$$FILE; \

Added: csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus-imapd-fix-path-in-mkimap.patch
===================================================================
--- csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus-imapd-fix-path-in-mkimap.patch	                        (rev 0)
+++ csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus-imapd-fix-path-in-mkimap.patch	2012-01-17 19:34:52 UTC (rev 16786)
@@ -0,0 +1,11 @@
+--- cyrus-imapd-2.4.10/tools/mkimap.orig	Tue Jan 17 20:14:11 2012
++++ cyrus-imapd-2.4.10/tools/mkimap	Tue Jan 17 20:13:14 2012
+@@ -90,7 +90,7 @@
+     close CONF;
+ }
+ 
+-$imapdconf = shift || "/etc/imapd.conf";
++$imapdconf = shift || "/etc/opt/csw/cyrus/imapd.conf";
+ 
+ push @configs, $imapdconf;
+ 

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


From dmichelsen at users.sourceforge.net  Tue Jan 17 22:07:37 2012
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Tue, 17 Jan 2012 21:07:37 +0000
Subject: [csw-devel] SF.net SVN: gar:[16787] csw/mgar/gar/v2/bin/mkpackage
Message-ID: <E1RnGFl-00038V-Qn@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 16787
          http://gar.svn.sourceforge.net/gar/?rev=16787&view=rev
Author:   dmichelsen
Date:     2012-01-17 21:07:37 +0000 (Tue, 17 Jan 2012)
Log Message:
-----------
mGAR v2: Make compression level adjustable as reported in #65

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

Modified: csw/mgar/gar/v2/bin/mkpackage
===================================================================
--- csw/mgar/gar/v2/bin/mkpackage	2012-01-17 19:34:52 UTC (rev 16786)
+++ csw/mgar/gar/v2/bin/mkpackage	2012-01-17 21:07:37 UTC (rev 16787)
@@ -65,6 +65,7 @@
     prog_exec_error     => 9,
     spec_error          => 10,
     dumped_env          => 11,
+    bad_ziplevel        => 12,
     unknown             => 42,
 );
 
@@ -317,6 +318,7 @@
         'transfer!'    => \$config{transfer},
         'overwrite!'   => \$config{overwrite},
         'compress!'    => \$config{compress},
+        'ziplevel|z=i' => \$config{ziplevel},
         'usebzip'      => \$config{usebzip},
         'usepigz'      => \$config{usepigz},
         'quiet|q'      => \$config{quiet},
@@ -399,6 +401,9 @@
     $config{overwrite} = 0 unless defined $config{overwrite};
     $config{usebzip}   = 0 unless defined $config{usebzip};
     $config{usepigz}   = 0 unless defined $config{usepigz};
+    $config{ziplevel}  = 9 unless defined $config{ziplevel};
+    Die( $exit{bad_ziplevel}, "Invalid --ziplevel '$config{ziplevel}'" )
+      if $config{ziplevel} < 1 or $config{ziplevel} > 9;
 
     # Export variables to the spec
     $ENV{$_} = $config{$_} foreach qw/
@@ -912,10 +917,10 @@
     if ( $config{compress} ) {
         my $compress =
           $config{usebzip}
-          ? 'bzip2 -9 -f %s'
-          : ($config{usepigz} ? 'pigz -9 -f %s' : 'gzip -9 -f %s');
+          ? 'bzip2 -%d -f %s'
+          : ($config{usepigz} ? 'pigz -%d -f %s' : 'gzip -%d -f %s');
 
-        vexec( sprintf( $compress, $tmppkg ), "Failed to compress $tmppkg" );
+        vexec( sprintf( $compress, $config{ziplevel}, $tmppkg ), "Failed to compress $tmppkg" );
         $tmppkg .= $config{usebzip} ? ".bz2" : ".gz";
     }
 
@@ -954,9 +959,10 @@
 
  mkpackage --spec <path> [--destdir <path>] [--workdir <path>]
         [--spooldir <path>] [--pkgroot <path>] [--tmpdir <path>]
-        [--[no]transfer] [--[no]overwrite] [--[no]compress]
-        [--usebzip] [--usepigz] [-v var=value...] [--dump <var>|-dumpall]
-        [--quiet] [--help] [--manual] [--version]
+        [--[no]transfer] [--[no]overwrite] [--[no]compress] 
+        [--ziplevel N] [--usebzip] [--usepigz] [-v var=value...] 
+        [--dump <var>|-dumpall] [--quiet] [--help] [--manual]
+        [--version]
 
 =head1 DESCRIPTION
 
@@ -1028,6 +1034,11 @@
 this option is ignored when --notransfer is specified, as in this case no
 bistream package will be created.
 
+=head2 --ziplevel,-z
+
+Set compression level. Option accepts a single integer from 1 to 9.
+The meaning is the same as for -# gzip option. (Default: 9)
+
 =head2 --usebzip
 
 Enable bzip2 compression.  Unless --nocompress and/or --notransfer options are

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


From dmichelsen at users.sourceforge.net  Tue Jan 17 22:21:07 2012
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Tue, 17 Jan 2012 21:21:07 +0000
Subject: [csw-devel] SF.net SVN: gar:[16788] csw/branches/dam/
Message-ID: <E1RnGSp-000285-OU@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 16788
          http://gar.svn.sourceforge.net/gar/?rev=16788&view=rev
Author:   dmichelsen
Date:     2012-01-17 21:21:07 +0000 (Tue, 17 Jan 2012)
Log Message:
-----------
GAR Tree: Remove old development branch of whole tree

Removed Paths:
-------------
    csw/branches/dam/

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


From dmichelsen at users.sourceforge.net  Tue Jan 17 22:45:59 2012
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Tue, 17 Jan 2012 21:45:59 +0000
Subject: [csw-devel] SF.net SVN: gar:[16789] csw/mgar/pkg/libidn/trunk
Message-ID: <E1RnGqt-0002gK-49@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 16789
          http://gar.svn.sourceforge.net/gar/?rev=16789&view=rev
Author:   dmichelsen
Date:     2012-01-17 21:45:58 +0000 (Tue, 17 Jan 2012)
Log Message:
-----------
libidn/trunk: Update to 1.24, slight reorg

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

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


Property changes on: csw/mgar/pkg/libidn/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2


Modified: csw/mgar/pkg/libidn/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libidn/trunk/Makefile	2012-01-17 21:21:07 UTC (rev 16788)
+++ csw/mgar/pkg/libidn/trunk/Makefile	2012-01-17 21:45:58 UTC (rev 16789)
@@ -1,5 +1,5 @@
 NAME = libidn
-VERSION = 1.23
+VERSION = 1.24
 CATEGORIES = lib
 
 DESCRIPTION = GNU IDN Library
@@ -12,13 +12,11 @@
 endef
 
 MASTER_SITES = $(GNU_MIRROR)
-MASTER_SITES += http://daily.josefsson.org/libidn/
+# MASTER_SITES += http://daily.josefsson.org/libidn/
 DISTFILES  = $(NAME)-$(VERSION).tar.gz
 
 VENDOR_URL = http://www.gnu.org/software/libidn/
 
-# PACKAGING_PLATFORMS = solaris10-sparc
-
 PACKAGES += CSWlibidn11
 SPKG_DESC_CSWlibidn11 = GNU IDN library, libidn.so.11
 PKGFILES_CSWlibidn11 += $(call pkgfiles_lib,libidn.so.11)
@@ -32,6 +30,8 @@
 PKGFILES_CSWlibidn-dev += $(sharedstatedir)/emacs/.*
 PKGFILES_CSWlibidn-dev += $(infodir)/.*
 RUNTIME_DEP_PKGS_CSWlibidn-dev += CSWlibidn11
+# This is just a file for the emacs mode
+CHECKPKG_OVERRIDES_CSWlibidn-dev += missing-dependency|CSWemacscommon
 
 PACKAGES += CSWlibidn-utils
 SPKG_DESC_CSWlibidn-utils = GNU IDN utilities
@@ -59,6 +59,4 @@
 # What's this? Windows DLLs? How do they end up in the Solaris build?
 EXTRA_MERGE_EXCLUDE_FILES = .*\.dll
 
-CHECKPKG_OVERRIDES_CSWlibidn-dev += missing-dependency|CSWemacscommon
-
 include gar/category.mk

Modified: csw/mgar/pkg/libidn/trunk/checksums
===================================================================
--- csw/mgar/pkg/libidn/trunk/checksums	2012-01-17 21:21:07 UTC (rev 16788)
+++ csw/mgar/pkg/libidn/trunk/checksums	2012-01-17 21:45:58 UTC (rev 16789)
@@ -1 +1 @@
-903550b16181f31f2a2557ee7368b269  libidn-1.23.tar.gz
+764d7258eeb273941680499fab2c7367  libidn-1.24.tar.gz

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


From dmichelsen at users.sourceforge.net  Wed Jan 18 09:54:19 2012
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Wed, 18 Jan 2012 08:54:19 +0000
Subject: [csw-devel] SF.net SVN: gar:[16790] csw/mgar/pkg/file/branches
Message-ID: <E1RnRHf-0008VO-RF@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 16790
          http://gar.svn.sourceforge.net/gar/?rev=16790&view=rev
Author:   dmichelsen
Date:     2012-01-18 08:54:19 +0000 (Wed, 18 Jan 2012)
Log Message:
-----------
file: Make branch for 5.10

Modified Paths:
--------------
    csw/mgar/pkg/file/branches/file-5.10-dam/Makefile
    csw/mgar/pkg/file/branches/file-5.10-dam/checksums

Added Paths:
-----------
    csw/mgar/pkg/file/branches/file-5.10-dam/

Removed Paths:
-------------
    csw/mgar/pkg/file/branches/file-5.10-dam/files/0001-Remove-surplus-flags-output-on-SPARC.patch
    csw/mgar/pkg/file/branches/file-5.10-dam/files/0001-libtool-dir-used-for-linking.patch
    csw/mgar/pkg/file/branches/file-5.10-dam/files/0002-CSW-runpath.patch


Property changes on: csw/mgar/pkg/file/branches/file-5.10-dam
___________________________________________________________________
Added: svn:ignore
   + cookies
download
work



Modified: csw/mgar/pkg/file/branches/file-5.10-dam/Makefile
===================================================================
--- csw/mgar/pkg/file/trunk/Makefile	2011-11-15 10:21:50 UTC (rev 16195)
+++ csw/mgar/pkg/file/branches/file-5.10-dam/Makefile	2012-01-18 08:54:19 UTC (rev 16790)
@@ -1,7 +1,7 @@
 # $Id$
 
 NAME = file
-VERSION = 5.07
+VERSION = 5.10
 CATEGORIES = utils
 
 define BLURB
@@ -13,61 +13,46 @@
 endef
 
 MASTER_SITES = ftp://ftp.astron.com/pub/file/
-DISTFILES  = $(NAME)-$(VERSION).tar.gz
-UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
-SPKG_SOURCEURL = http://www.darwinsys.com/file/
-CONFIGURE_ARGS = $(DIRPATHS)
-# These flags are not understood by Sun Studio
-CONFIGURE_ARGS += --disable-warnings
-TEST_TARGET = check
+DISTFILES  = $(DISTNAME).tar.gz
 
-# Patches specific to the 5.04 version:
-# PATCHFILES += 0001-libtool-dir-used-for-linking.patch 
-# PATCHFILES += 0002-CSW-runpath.patch
-
-# Patches specific to the 5.05 version:
-PATCHFILES += 0001-Remove-surplus-flags-output-on-SPARC.patch
 PATCHFILES += 0002-Do-not-use-find_library-at-runtime.patch
 
+VENDOR_URL = http://www.darwinsys.com/file/
+
 PACKAGES += CSWgfile
-PKGFILES_CSWgfile += $(bindir)/gfile
-PKGFILES_CSWgfile += $(bindir)/$(ISA_DEFAULT64)/gfile
+SPKG_DESC_CSWgfile = A file type guesser
+PKGFILES_CSWgfile += $(call baseisadirs,$(bindir),gfile)
 PKGFILES_CSWgfile += $(mandir)/man1/gfile\.1
 PKGFILES_CSWgfile += $(prefix)/gnu/file
-SPKG_DESC_CSWgfile = A file type guesser
-RUNTIME_DEP_PKGS_CSWgfile += CSWzlib
+RUNTIME_DEP_PKGS_CSWgfile += CSWlibz1
 RUNTIME_DEP_PKGS_CSWgfile += CSWlibmagic1
-EXTRA_MERGE_EXCLUDE_FILES = .*\.py[oc]
+# EXTRA_MERGE_EXCLUDE_FILES = .*\.py[oc]
 
 PACKAGES += CSWpy-libmagic
-PKGFILES_CSWpy-libmagic += /opt/csw/lib/python.*
 SPKG_DESC_CSWpy-libmagic = Python extension for libmagic
-CATALOGNAME_CSWpy-libmagic = py_libmagic
+PKGFILES_CSWpy-libmagic += /opt/csw/lib/python.*
 ARCHALL_CSWpy-libmagic = 1
 RUNTIME_DEP_PKGS_CSWpy-libmagic += CSWpython
 RUNTIME_DEP_PKGS_CSWpy-libmagic += CSWlibmagic1
 
 PACKAGES += CSWlibmagic-data
-CATALOGNAME_CSWlibmagic-data = libmagic_data
 SPKG_DESC_CSWlibmagic-data = Database for libmagic
+# PKGFILES is catchall
 ARCHALL_CSWlibmagic-data = 1
 # The magic file contains /usr/local as one of the magic constants to detect
 # file types.
 CHECKPKG_OVERRIDES_CSWlibmagic-data += file-with-bad-content
 
 PACKAGES += CSWlibmagic1
-CATALOGNAME_CSWlibmagic1 = libmagic1
-PKGFILES_CSWlibmagic1 += $(call baseisadirs,$(libdir),libmagic\.so\.1(\.\d+)*)
 SPKG_DESC_CSWlibmagic1 += The library behind file(1), libmagic.so.1
-RUNTIME_DEP_PKGS_CSWlibmagic1 += CSWzlib
-RUNTIME_DEP_PKGS_CSWlibmagic1 += CSWlibmagic-data
+PKGFILES_CSWlibmagic1 += $(call pkgfiles_lib,libmagic.so.1)
+RUNTIME_DEP_PKGS_CSWlibmagic1 += CSWlibz1
 CHECKPKG_OVERRIDES_CSWlibmagic1 += surplus-dependency|CSWlibmagic-data
+OBSOLETED_BY_CSWlibmagic1 += CSWlibmagic
 
 PACKAGES += CSWlibmagic-dev
-SPKG_DESC_CSWlibmagic-dev = Development files for libmagic
-CATALOGNAME_CSWlibmagic-dev = libmagic_dev
+SPKG_DESC_CSWlibmagic-dev = Development files for libmagic.so.1
 PKGFILES_CSWlibmagic-dev += $(PKGFILES_DEVEL)
-PKGFILES_CSWlibmagic-dev += /opt/csw/lib/libmagic.so
 RUNTIME_DEP_PKGS_CSWlibmagic-dev += CSWlibmagic1
 
 # The "file" util is used during stripbin. As the newly build binary
@@ -76,17 +61,23 @@
 IGNORE_DESTDIR = 1
 
 # Doesn't hurt to have this on.
-DISTUTILS_DEBUG = 1
-export DISTUTILS_DEBUG
+EXTRA_CONFIGURE_EXPORTS = DISTUTILS_DEBUG
+CONFIGURE_ENV_DISTUTILS_DEBUG = 1
 
+CONFIGURE_ARGS = $(DIRPATHS)
+# These flags are not understood by Sun Studio
+CONFIGURE_ARGS += --disable-warnings
+
 BUILD64 = 1
 
+PYCOMPILE = 1
+
 include gar/category.mk
 
 post-build-modulated:
 	# This fails for a mysterious reason.  Can't find libmagic (-lmagic).
-	# (cd $(WORKSRC)/python && python setup.py build --compiler=unix)
-	(cd $(WORKSRC)/python && python setup.py build)
+	(cd $(WORKSRC)/python && python setup.py build --compiler=unix)
+	###(cd $(WORKSRC)/python && python setup.py build)
 	@$(MAKECOOKIE)
 
 post-install-modulated:

Modified: csw/mgar/pkg/file/branches/file-5.10-dam/checksums
===================================================================
--- csw/mgar/pkg/file/trunk/checksums	2011-11-15 10:21:50 UTC (rev 16195)
+++ csw/mgar/pkg/file/branches/file-5.10-dam/checksums	2012-01-18 08:54:19 UTC (rev 16790)
@@ -1 +1 @@
-b8d1f9a8a644067bd0a703cebf3f4858  file-5.07.tar.gz
+4cea34b087b060772511e066e2038196  file-5.10.tar.gz

Deleted: csw/mgar/pkg/file/branches/file-5.10-dam/files/0001-Remove-surplus-flags-output-on-SPARC.patch
===================================================================
--- csw/mgar/pkg/file/trunk/files/0001-Remove-surplus-flags-output-on-SPARC.patch	2011-11-15 10:21:50 UTC (rev 16195)
+++ csw/mgar/pkg/file/branches/file-5.10-dam/files/0001-Remove-surplus-flags-output-on-SPARC.patch	2012-01-18 08:54:19 UTC (rev 16790)
@@ -1,27 +0,0 @@
-From 9be2ae854b16feecf9aed9cf908faf30e33b0edf Mon Sep 17 00:00:00 2001
-From: Maciej Blizinski <maciej at opencsw.org>
-Date: Fri, 4 Mar 2011 00:30:29 +0100
-Subject: [PATCH] Remove surplus "flags!" output on SPARC
-
----
- src/apprentice.c |    2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/src/apprentice.c b/src/apprentice.c
-index 49126ac..15d34de 100644
---- a/src/apprentice.c
-+++ b/src/apprentice.c
-@@ -2461,8 +2461,10 @@ bs1(struct magic *m)
- 	m->in_offset = swap4((uint32_t)m->in_offset);
- 	m->lineno = swap4((uint32_t)m->lineno);
- 	if (IS_STRING(m->type)) {
-+    /* This printf causes surplus output on sparc machines.
- 		if (m->type == FILE_PSTRING)
- 			printf("flags! %d\n", m->str_flags);
-+    */
- 		m->str_range = swap4(m->str_range);
- 		m->str_flags = swap4(m->str_flags);
- 	}
--- 
-1.7.3.2
-

Deleted: csw/mgar/pkg/file/branches/file-5.10-dam/files/0001-libtool-dir-used-for-linking.patch
===================================================================
--- csw/mgar/pkg/file/trunk/files/0001-libtool-dir-used-for-linking.patch	2011-11-15 10:21:50 UTC (rev 16195)
+++ csw/mgar/pkg/file/branches/file-5.10-dam/files/0001-libtool-dir-used-for-linking.patch	2012-01-18 08:54:19 UTC (rev 16790)
@@ -1,25 +0,0 @@
-From 071f0c1b11cf21628aa3ec8c092cfd050a11e9d9 Mon Sep 17 00:00:00 2001
-From: Maciej Blizinski <maciej at opencsw.org>
-Date: Sat, 8 May 2010 08:47:26 +0200
-Subject: [PATCH] libtool dir used for linking
-
----
- python/setup.py |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/python/setup.py b/python/setup.py
-index 7c86194..71074c3 100644
---- a/python/setup.py
-+++ b/python/setup.py
-@@ -3,7 +3,7 @@ from distutils.core import setup, Extension
- 
- magic_module = Extension('magic',
-     libraries = ['magic'],
--    library_dirs = ['./','../','../src','/usr/lib/'],
-+    library_dirs = ['./','../','../src','../src/.libs','/usr/lib/'],
-     include_dirs = ['./','../','../src','/usr/include/'],
-     sources = ['py_magic.c'])
- 
--- 
-1.7.0
-

Deleted: csw/mgar/pkg/file/branches/file-5.10-dam/files/0002-CSW-runpath.patch
===================================================================
--- csw/mgar/pkg/file/trunk/files/0002-CSW-runpath.patch	2011-11-15 10:21:50 UTC (rev 16195)
+++ csw/mgar/pkg/file/branches/file-5.10-dam/files/0002-CSW-runpath.patch	2012-01-18 08:54:19 UTC (rev 16790)
@@ -1,28 +0,0 @@
-From 19ff890df2c01f4c0fa2f606017ff2ab421240c9 Mon Sep 17 00:00:00 2001
-From: Maciej Blizinski <maciej at opencsw.org>
-Date: Mon, 7 Jun 2010 21:25:39 +0200
-Subject: [PATCH] CSW runpath
-
----
- python/setup.py |    5 +++--
- 1 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/python/setup.py b/python/setup.py
-index 71074c3..086211e 100644
---- a/python/setup.py
-+++ b/python/setup.py
-@@ -3,8 +3,9 @@ from distutils.core import setup, Extension
- 
- magic_module = Extension('magic',
-     libraries = ['magic'],
--    library_dirs = ['./','../','../src','../src/.libs','/usr/lib/'],
--    include_dirs = ['./','../','../src','/usr/include/'],
-+    library_dirs = ['./','../','../src','../src/.libs','/usr/lib/','/opt/csw/lib'],
-+    include_dirs = ['./','../','../src','/usr/include/','/opt/csw/include'],
-+    runtime_library_dirs = ['/opt/csw/lib'],
-     sources = ['py_magic.c'])
- 
- setup (name = 'Magic file extensions',
--- 
-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  Wed Jan 18 10:28:44 2012
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Wed, 18 Jan 2012 09:28:44 +0000
Subject: [csw-devel] SF.net SVN: gar:[16791] csw/mgar/pkg/file/trunk
Message-ID: <E1RnRoy-00035R-M0@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 16791
          http://gar.svn.sourceforge.net/gar/?rev=16791&view=rev
Author:   wahwah
Date:     2012-01-18 09:28:44 +0000 (Wed, 18 Jan 2012)
Log Message:
-----------
file/trunk: merging updates from Dago

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

Removed Paths:
-------------
    csw/mgar/pkg/file/trunk/files/0001-Remove-surplus-flags-output-on-SPARC.patch
    csw/mgar/pkg/file/trunk/files/0001-libtool-dir-used-for-linking.patch
    csw/mgar/pkg/file/trunk/files/0002-CSW-runpath.patch

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


Property changes on: csw/mgar/pkg/file/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2

Added: svn:mergeinfo
   + /csw/mgar/pkg/file/branches/file-5.10-dam:16790

Modified: csw/mgar/pkg/file/trunk/Makefile
===================================================================
--- csw/mgar/pkg/file/trunk/Makefile	2012-01-18 08:54:19 UTC (rev 16790)
+++ csw/mgar/pkg/file/trunk/Makefile	2012-01-18 09:28:44 UTC (rev 16791)
@@ -1,7 +1,7 @@
 # $Id$
 
 NAME = file
-VERSION = 5.07
+VERSION = 5.10
 CATEGORIES = utils
 
 define BLURB
@@ -13,61 +13,46 @@
 endef
 
 MASTER_SITES = ftp://ftp.astron.com/pub/file/
-DISTFILES  = $(NAME)-$(VERSION).tar.gz
-UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
-SPKG_SOURCEURL = http://www.darwinsys.com/file/
-CONFIGURE_ARGS = $(DIRPATHS)
-# These flags are not understood by Sun Studio
-CONFIGURE_ARGS += --disable-warnings
-TEST_TARGET = check
+DISTFILES  = $(DISTNAME).tar.gz
 
-# Patches specific to the 5.04 version:
-# PATCHFILES += 0001-libtool-dir-used-for-linking.patch 
-# PATCHFILES += 0002-CSW-runpath.patch
-
-# Patches specific to the 5.05 version:
-PATCHFILES += 0001-Remove-surplus-flags-output-on-SPARC.patch
 PATCHFILES += 0002-Do-not-use-find_library-at-runtime.patch
 
+VENDOR_URL = http://www.darwinsys.com/file/
+
 PACKAGES += CSWgfile
-PKGFILES_CSWgfile += $(bindir)/gfile
-PKGFILES_CSWgfile += $(bindir)/$(ISA_DEFAULT64)/gfile
+SPKG_DESC_CSWgfile = A file type guesser
+PKGFILES_CSWgfile += $(call baseisadirs,$(bindir),gfile)
 PKGFILES_CSWgfile += $(mandir)/man1/gfile\.1
 PKGFILES_CSWgfile += $(prefix)/gnu/file
-SPKG_DESC_CSWgfile = A file type guesser
-RUNTIME_DEP_PKGS_CSWgfile += CSWzlib
+RUNTIME_DEP_PKGS_CSWgfile += CSWlibz1
 RUNTIME_DEP_PKGS_CSWgfile += CSWlibmagic1
-EXTRA_MERGE_EXCLUDE_FILES = .*\.py[oc]
+# EXTRA_MERGE_EXCLUDE_FILES = .*\.py[oc]
 
 PACKAGES += CSWpy-libmagic
-PKGFILES_CSWpy-libmagic += /opt/csw/lib/python.*
 SPKG_DESC_CSWpy-libmagic = Python extension for libmagic
-CATALOGNAME_CSWpy-libmagic = py_libmagic
+PKGFILES_CSWpy-libmagic += /opt/csw/lib/python.*
 ARCHALL_CSWpy-libmagic = 1
 RUNTIME_DEP_PKGS_CSWpy-libmagic += CSWpython
 RUNTIME_DEP_PKGS_CSWpy-libmagic += CSWlibmagic1
 
 PACKAGES += CSWlibmagic-data
-CATALOGNAME_CSWlibmagic-data = libmagic_data
 SPKG_DESC_CSWlibmagic-data = Database for libmagic
+# PKGFILES is catchall
 ARCHALL_CSWlibmagic-data = 1
 # The magic file contains /usr/local as one of the magic constants to detect
 # file types.
 CHECKPKG_OVERRIDES_CSWlibmagic-data += file-with-bad-content
 
 PACKAGES += CSWlibmagic1
-CATALOGNAME_CSWlibmagic1 = libmagic1
-PKGFILES_CSWlibmagic1 += $(call baseisadirs,$(libdir),libmagic\.so\.1(\.\d+)*)
 SPKG_DESC_CSWlibmagic1 += The library behind file(1), libmagic.so.1
-RUNTIME_DEP_PKGS_CSWlibmagic1 += CSWzlib
-RUNTIME_DEP_PKGS_CSWlibmagic1 += CSWlibmagic-data
+PKGFILES_CSWlibmagic1 += $(call pkgfiles_lib,libmagic.so.1)
+RUNTIME_DEP_PKGS_CSWlibmagic1 += CSWlibz1
 CHECKPKG_OVERRIDES_CSWlibmagic1 += surplus-dependency|CSWlibmagic-data
+OBSOLETED_BY_CSWlibmagic1 += CSWlibmagic
 
 PACKAGES += CSWlibmagic-dev
-SPKG_DESC_CSWlibmagic-dev = Development files for libmagic
-CATALOGNAME_CSWlibmagic-dev = libmagic_dev
+SPKG_DESC_CSWlibmagic-dev = Development files for libmagic.so.1
 PKGFILES_CSWlibmagic-dev += $(PKGFILES_DEVEL)
-PKGFILES_CSWlibmagic-dev += /opt/csw/lib/libmagic.so
 RUNTIME_DEP_PKGS_CSWlibmagic-dev += CSWlibmagic1
 
 # The "file" util is used during stripbin. As the newly build binary
@@ -76,17 +61,23 @@
 IGNORE_DESTDIR = 1
 
 # Doesn't hurt to have this on.
-DISTUTILS_DEBUG = 1
-export DISTUTILS_DEBUG
+EXTRA_CONFIGURE_EXPORTS = DISTUTILS_DEBUG
+CONFIGURE_ENV_DISTUTILS_DEBUG = 1
 
+CONFIGURE_ARGS = $(DIRPATHS)
+# These flags are not understood by Sun Studio
+CONFIGURE_ARGS += --disable-warnings
+
 BUILD64 = 1
 
+PYCOMPILE = 1
+
 include gar/category.mk
 
 post-build-modulated:
 	# This fails for a mysterious reason.  Can't find libmagic (-lmagic).
-	# (cd $(WORKSRC)/python && python setup.py build --compiler=unix)
-	(cd $(WORKSRC)/python && python setup.py build)
+	(cd $(WORKSRC)/python && python setup.py build --compiler=unix)
+	###(cd $(WORKSRC)/python && python setup.py build)
 	@$(MAKECOOKIE)
 
 post-install-modulated:

Modified: csw/mgar/pkg/file/trunk/checksums
===================================================================
--- csw/mgar/pkg/file/trunk/checksums	2012-01-18 08:54:19 UTC (rev 16790)
+++ csw/mgar/pkg/file/trunk/checksums	2012-01-18 09:28:44 UTC (rev 16791)
@@ -1 +1 @@
-b8d1f9a8a644067bd0a703cebf3f4858  file-5.07.tar.gz
+4cea34b087b060772511e066e2038196  file-5.10.tar.gz

Deleted: csw/mgar/pkg/file/trunk/files/0001-Remove-surplus-flags-output-on-SPARC.patch
===================================================================
--- csw/mgar/pkg/file/trunk/files/0001-Remove-surplus-flags-output-on-SPARC.patch	2012-01-18 08:54:19 UTC (rev 16790)
+++ csw/mgar/pkg/file/trunk/files/0001-Remove-surplus-flags-output-on-SPARC.patch	2012-01-18 09:28:44 UTC (rev 16791)
@@ -1,27 +0,0 @@
-From 9be2ae854b16feecf9aed9cf908faf30e33b0edf Mon Sep 17 00:00:00 2001
-From: Maciej Blizinski <maciej at opencsw.org>
-Date: Fri, 4 Mar 2011 00:30:29 +0100
-Subject: [PATCH] Remove surplus "flags!" output on SPARC
-
----
- src/apprentice.c |    2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/src/apprentice.c b/src/apprentice.c
-index 49126ac..15d34de 100644
---- a/src/apprentice.c
-+++ b/src/apprentice.c
-@@ -2461,8 +2461,10 @@ bs1(struct magic *m)
- 	m->in_offset = swap4((uint32_t)m->in_offset);
- 	m->lineno = swap4((uint32_t)m->lineno);
- 	if (IS_STRING(m->type)) {
-+    /* This printf causes surplus output on sparc machines.
- 		if (m->type == FILE_PSTRING)
- 			printf("flags! %d\n", m->str_flags);
-+    */
- 		m->str_range = swap4(m->str_range);
- 		m->str_flags = swap4(m->str_flags);
- 	}
--- 
-1.7.3.2
-

Deleted: csw/mgar/pkg/file/trunk/files/0001-libtool-dir-used-for-linking.patch
===================================================================
--- csw/mgar/pkg/file/trunk/files/0001-libtool-dir-used-for-linking.patch	2012-01-18 08:54:19 UTC (rev 16790)
+++ csw/mgar/pkg/file/trunk/files/0001-libtool-dir-used-for-linking.patch	2012-01-18 09:28:44 UTC (rev 16791)
@@ -1,25 +0,0 @@
-From 071f0c1b11cf21628aa3ec8c092cfd050a11e9d9 Mon Sep 17 00:00:00 2001
-From: Maciej Blizinski <maciej at opencsw.org>
-Date: Sat, 8 May 2010 08:47:26 +0200
-Subject: [PATCH] libtool dir used for linking
-
----
- python/setup.py |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/python/setup.py b/python/setup.py
-index 7c86194..71074c3 100644
---- a/python/setup.py
-+++ b/python/setup.py
-@@ -3,7 +3,7 @@ from distutils.core import setup, Extension
- 
- magic_module = Extension('magic',
-     libraries = ['magic'],
--    library_dirs = ['./','../','../src','/usr/lib/'],
-+    library_dirs = ['./','../','../src','../src/.libs','/usr/lib/'],
-     include_dirs = ['./','../','../src','/usr/include/'],
-     sources = ['py_magic.c'])
- 
--- 
-1.7.0
-

Deleted: csw/mgar/pkg/file/trunk/files/0002-CSW-runpath.patch
===================================================================
--- csw/mgar/pkg/file/trunk/files/0002-CSW-runpath.patch	2012-01-18 08:54:19 UTC (rev 16790)
+++ csw/mgar/pkg/file/trunk/files/0002-CSW-runpath.patch	2012-01-18 09:28:44 UTC (rev 16791)
@@ -1,28 +0,0 @@
-From 19ff890df2c01f4c0fa2f606017ff2ab421240c9 Mon Sep 17 00:00:00 2001
-From: Maciej Blizinski <maciej at opencsw.org>
-Date: Mon, 7 Jun 2010 21:25:39 +0200
-Subject: [PATCH] CSW runpath
-
----
- python/setup.py |    5 +++--
- 1 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/python/setup.py b/python/setup.py
-index 71074c3..086211e 100644
---- a/python/setup.py
-+++ b/python/setup.py
-@@ -3,8 +3,9 @@ from distutils.core import setup, Extension
- 
- magic_module = Extension('magic',
-     libraries = ['magic'],
--    library_dirs = ['./','../','../src','../src/.libs','/usr/lib/'],
--    include_dirs = ['./','../','../src','/usr/include/'],
-+    library_dirs = ['./','../','../src','../src/.libs','/usr/lib/','/opt/csw/lib'],
-+    include_dirs = ['./','../','../src','/usr/include/','/opt/csw/include'],
-+    runtime_library_dirs = ['/opt/csw/lib'],
-     sources = ['py_magic.c'])
- 
- setup (name = 'Magic file extensions',
--- 
-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  Wed Jan 18 11:08:28 2012
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Wed, 18 Jan 2012 10:08:28 +0000
Subject: [csw-devel] SF.net SVN: gar:[16792]
	csw/mgar/pkg/cyrus_imapd/trunk/Makefile
Message-ID: <E1RnSRQ-0001Of-Sx@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 16792
          http://gar.svn.sourceforge.net/gar/?rev=16792&view=rev
Author:   wahwah
Date:     2012-01-18 10:08:28 +0000 (Wed, 18 Jan 2012)
Log Message:
-----------
cyrus_imapd/trunk: Update the dependency on SASL

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

Modified: csw/mgar/pkg/cyrus_imapd/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cyrus_imapd/trunk/Makefile	2012-01-18 09:28:44 UTC (rev 16791)
+++ csw/mgar/pkg/cyrus_imapd/trunk/Makefile	2012-01-18 10:08:28 UTC (rev 16792)
@@ -56,7 +56,7 @@
 RUNTIME_DEP_PKGS_CSWcyrusimapd += CSWlibz1
 RUNTIME_DEP_PKGS_CSWcyrusimapd += CSWnetsnmp
 RUNTIME_DEP_PKGS_CSWcyrusimapd += CSWosslrt
-RUNTIME_DEP_PKGS_CSWcyrusimapd += CSWsasl
+RUNTIME_DEP_PKGS_CSWcyrusimapd += CSWlibsasl2-2
 
 # Expected catalogname: cyrusimapd, not cyrus_imapd
 CHECKPKG_OVERRIDES_CSWcyrusimapd += catalogname-does-not-match-pkgname
@@ -76,7 +76,7 @@
 RUNTIME_DEP_PKGS_CSWcyrusimapdutils += CSWlibpcreposix0
 RUNTIME_DEP_PKGS_CSWcyrusimapdutils += CSWlibz1
 RUNTIME_DEP_PKGS_CSWcyrusimapdutils += CSWosslrt
-RUNTIME_DEP_PKGS_CSWcyrusimapdutils += CSWsasl
+RUNTIME_DEP_PKGS_CSWcyrusimapdutils += CSWlibsasl2-2
 # Expected catalogname: cyrusimapdutils, not cyrus_imapd_utils
 CHECKPKG_OVERRIDES_CSWcyrusimapdutils += catalogname-does-not-match-pkgname
 
@@ -89,7 +89,7 @@
 RUNTIME_DEP_PKGS_CSWpmcyrus += CSWlibz1
 RUNTIME_DEP_PKGS_CSWpmcyrus += CSWosslrt
 RUNTIME_DEP_PKGS_CSWpmcyrus += CSWperl
-RUNTIME_DEP_PKGS_CSWpmcyrus += CSWsasl
+RUNTIME_DEP_PKGS_CSWpmcyrus += CSWlibsasl2-2
 
 PROTOTYPE_MODIFIERS = cyrusdir
 PROTOTYPE_FILES_cyrusdir = $(localstatedir)/cyrus.*

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


From cgrzemba at users.sourceforge.net  Wed Jan 18 12:58:51 2012
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Wed, 18 Jan 2012 11:58:51 +0000
Subject: [csw-devel] SF.net SVN: gar:[16793] csw/mgar/pkg/nss/trunk
Message-ID: <E1RnUAF-0003UW-4Q@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 16793
          http://gar.svn.sourceforge.net/gar/?rev=16793&view=rev
Author:   cgrzemba
Date:     2012-01-18 11:58:50 +0000 (Wed, 18 Jan 2012)
Log Message:
-----------
nss/trunk: create lib packages, fix bad-rpath

Modified Paths:
--------------
    csw/mgar/pkg/nss/trunk/Makefile
    csw/mgar/pkg/nss/trunk/files/nss.pc

Modified: csw/mgar/pkg/nss/trunk/Makefile
===================================================================
--- csw/mgar/pkg/nss/trunk/Makefile	2012-01-18 10:08:28 UTC (rev 16792)
+++ csw/mgar/pkg/nss/trunk/Makefile	2012-01-18 11:58:50 UTC (rev 16793)
@@ -13,6 +13,14 @@
 #
 # TODO: nss-config
 # TODO: a better nss.pc
+#
+# there are a lot of other tools, which are not in the package at the moment,
+# some of them was part of the 'Netscape/iPlanet Certificate Management System', see:
+# http://docs.oracle.com/cd/E19850-01/816-6400-10/pkcsutil.html
+# http://docs.oracle.com/cd/E19397-01/816-5549-10/contents.htm
+# thats someone needs
+# other resources:  news group mozilla.dev.tech.crypto
+# http://www.mozilla.org/projects/security/pki/nss/tools/
 
 NAME = nss
 MAJOR_VERSION = 3
@@ -35,23 +43,123 @@
 DISTFILES += mpl-tri-license-txt
 UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
 
-PACKAGES = CSWlibnss3 CSWlibnss-dev CSWlibnss3-tools
+PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
 
+PACKAGES += CSWlibfreebl32fpu3
+CATALOGNAME_CSWlibfreebl32fpu3 = libfreebl32fpu3
+SPKG_DESC_CSWlibfreebl32fpu3 = Network Security Services library, libfreebl_32fpu_3
+PKGFILES_CSWlibfreebl32fpu3 += $(call baseisadirs,$(libdir),libfreebl_32fpu_3\.so)
+PKGFILES_CSWlibfreebl32fpu3 += $(call baseisadirs,$(libdir),libfreebl_32fpu_3\.so(\.\d+)*)
+SPKG_DESC_CSWlibfreebl32fpu3 += $(DESCRIPTION), libfreebl_32fpu_3.so
+RUNTIME_DEP_PKGS_CSWlibnss-dev += CSWlibfreebl32fpu3
+
+PACKAGES += CSWlibfreebl32int64-3
+CATALOGNAME_CSWlibfreebl32int64-3 = libfreebl32int64_3
+SPKG_DESC_CSWlibfreebl32int64-3 = Network Security Services library, libfreebl_32int64_3
+PKGFILES_CSWlibfreebl32int64-3 += $(call baseisadirs,$(libdir),libfreebl_32int64_3\.so)
+PKGFILES_CSWlibfreebl32int64-3 += $(call baseisadirs,$(libdir),libfreebl_32int64_3\.so(\.\d+)*)
+SPKG_DESC_CSWlibfreebl32int64-3 += $(DESCRIPTION), libfreebl_32int64_3.so
+RUNTIME_DEP_PKGS_CSWlibnss-dev += CSWlibfreebl32int64-3
+
+PACKAGES += CSWlibfreebl32int3
+CATALOGNAME_CSWlibfreebl32int3 = libfreebl32int3
+SPKG_DESC_CSWlibfreebl32int3 = Network Security Services library, libfreebl_32int_3
+PKGFILES_CSWlibfreebl32int3 += $(call baseisadirs,$(libdir),libfreebl_32int_3\.so)
+PKGFILES_CSWlibfreebl32int3 += $(call baseisadirs,$(libdir),libfreebl_32int_3\.so(\.\d+)*)
+SPKG_DESC_CSWlibfreebl32int3 += $(DESCRIPTION), libfreebl_32int_3.so
+RUNTIME_DEP_PKGS_CSWlibnss-dev += CSWlibfreebl32int3
+
+PACKAGES += CSWlibnss3
+CATALOGNAME_CSWlibnss3 = libnss3
 SPKG_DESC_CSWlibnss3 = Network Security Services library, implements crypto, PKI, SSL, and S/MIME support
-SPKG_DESC_CSWlibnss-dev = libnss development files
-SPKG_DESC_CSWlibnss3-tools = libnss3 command-line utilities
+PKGFILES_CSWlibnss3 += $(call baseisadirs,$(libdir),libnss3\.so)
+PKGFILES_CSWlibnss3 += $(call baseisadirs,$(libdir),libnss3\.so(\.\d+)*)
+SPKG_DESC_CSWlibnss3 += $(DESCRIPTION), libnss3.so
+RUNTIME_DEP_PKGS_CSWlibnss-dev += CSWlibnss3
 
-PKGFILES_CSWlibnss-dev = $(PKGFILES_DEVEL)
-PKGFILES_CSWlibnss3-tools = $(bindir).*
+PACKAGES += CSWlibnssckbi
+CATALOGNAME_CSWlibnssckbi = libnssckbi
+SPKG_DESC_CSWlibnssckbi = Network Security Services library, libnssckbi
+PKGFILES_CSWlibnssckbi += $(call baseisadirs,$(libdir),libnssckbi\.so)
+PKGFILES_CSWlibnssckbi += $(call baseisadirs,$(libdir),libnssckbi\.so(\.\d+)*)
+SPKG_DESC_CSWlibnssckbi += $(DESCRIPTION), libnssckbi.so
+RUNTIME_DEP_PKGS_CSWlibnss-dev += CSWlibnssckbi
 
+PACKAGES += CSWlibnssdbm3
+CATALOGNAME_CSWlibnssdbm3 = libnssdbm3
+SPKG_DESC_CSWlibnssdbm3 = Network Security Services library, libnssdbm3
+PKGFILES_CSWlibnssdbm3 += $(call baseisadirs,$(libdir),libnssdbm3\.so)
+PKGFILES_CSWlibnssdbm3 += $(call baseisadirs,$(libdir),libnssdbm3\.so(\.\d+)*)
+SPKG_DESC_CSWlibnssdbm3 += $(DESCRIPTION), libnssdbm3.so
+RUNTIME_DEP_PKGS_CSWlibnss-dev += CSWlibnssdbm3
+
+PACKAGES += CSWlibnssutil3
+CATALOGNAME_CSWlibnssutil3 = libnssutil3
+SPKG_DESC_CSWlibnssutil3 = Network Security Services library, libnssutil3
+PKGFILES_CSWlibnssutil3 += $(call baseisadirs,$(libdir),libnssutil3\.so)
+PKGFILES_CSWlibnssutil3 += $(call baseisadirs,$(libdir),libnssutil3\.so(\.\d+)*)SPKG_DESC_CSWlibnssutil3 += $(DESCRIPTION), libnssutil3.so
+RUNTIME_DEP_PKGS_CSWlibnss-dev += CSWlibnssutil3
+
+PACKAGES += CSWlibsmime3
+CATALOGNAME_CSWlibsmime3 = libsmime3
+SPKG_DESC_CSWlibsmime3 = Network Security Services library, libsmime3
+PKGFILES_CSWlibsmime3 += $(call baseisadirs,$(libdir),libsmime3\.so)
+PKGFILES_CSWlibsmime3 += $(call baseisadirs,$(libdir),libsmime3\.so(\.\d+)*)
+SPKG_DESC_CSWlibsmime3 += $(DESCRIPTION), libsmime3.so
+RUNTIME_DEP_PKGS_CSWlibnss-dev += CSWlibsmime3
+
+PACKAGES += CSWlibsoftokn3
+CATALOGNAME_CSWlibsoftokn3 = libsoftokn3
+SPKG_DESC_CSWlibsoftokn3 = Network Security Services library, libsoftokn3
+PKGFILES_CSWlibsoftokn3 += $(call baseisadirs,$(libdir),libsoftokn3\.so)
+PKGFILES_CSWlibsoftokn3 += $(call baseisadirs,$(libdir),libsoftokn3\.so(\.\d+)*)SPKG_DESC_CSWlibsoftokn3 += $(DESCRIPTION), libsoftokn3.so
+RUNTIME_DEP_PKGS_CSWlibnss-dev += CSWlibsoftokn3
+
+PACKAGES += CSWlibssl3
+CATALOGNAME_CSWlibssl3 = libssl3
+SPKG_DESC_CSWlibssl3 = Network Security Services library, libssl3
+PKGFILES_CSWlibssl3 += $(call baseisadirs,$(libdir),libssl3\.so)
+PKGFILES_CSWlibssl3 += $(call baseisadirs,$(libdir),libssl3\.so(\.\d+)*)
+SPKG_DESC_CSWlibssl3 += $(DESCRIPTION), libssl3.so
+RUNTIME_DEP_PKGS_CSWlibnss-dev += CSWlibssl3
+
+PACKAGES += CSWlibfreebl64fpu3
+CATALOGNAME_CSWlibfreebl64fpu3 = libfreebl64fpu3
+SPKG_DESC_CSWlibfreebl64fpu3 = Network Security Services library, libfreebl64fpu3
+PKGFILES_CSWlibfreebl64fpu3 += $(call baseisadirs,$(libdir),libfreebl_64fpu_3\.so)
+PKGFILES_CSWlibfreebl64fpu3 += $(call baseisadirs,$(libdir),libfreebl_64fpu_3\.so(\.\d+)*)
+SPKG_DESC_CSWlibfreebl64fpu3 += $(DESCRIPTION), libfreebl_64fpu_3.so
+RUNTIME_DEP_PKGS_CSWlibnss-dev += CSWlibfreebl64fpu3
+
+PACKAGES += CSWlibfreebl64int3
+CATALOGNAME_CSWlibfreebl64int3 = libfreebl64int3
+SPKG_DESC_CSWlibfreebl64int3 = Network Security Services library, libfreebl64int3
+PKGFILES_CSWlibfreebl64int3 += $(call baseisadirs,$(libdir),libfreebl_64int_3\.so)
+PKGFILES_CSWlibfreebl64int3 += $(call baseisadirs,$(libdir),libfreebl_64int_3\.so(\.\d+)*)
+SPKG_DESC_CSWlibfreebl64int3 += $(DESCRIPTION), libfreebl_64int_3.so
+RUNTIME_DEP_PKGS_CSWlibnss-dev += CSWlibfreebl64int3
+
+PACKAGES += CSWlibnss-dev
 CATALOGNAME_CSWlibnss-dev = libnss_dev
-CATALOGNAME_CSWlibnss3-tools = libnss3_tools
+SPKG_DESC_CSWlibnss-dev = Network Security Services library, development files
+PKGFILES_CSWlibnss-dev = $(PKGFILES_DEVEL)
+RUNTIME_DEP_PKGS_CSWlibnss-dev += CSWlibnss3
+RUNTIME_DEP_PKGS_CSWlibnss-dev += CSWlibsqlite3-0
+RUNTIME_DEP_PKGS_CSWlibnss-dev += CSWlibnspr4
+RUNTIME_DEP_PKGS_CSWlibnss-dev += CSWlibplds4
+RUNTIME_DEP_PKGS_CSWlibnss-dev += CSWlibplc4
 OBSOLETED_BY_CSWlibnss-dev = CSWlibnss3-devel
 
-RUNTIME_DEP_PKGS_CSWlibnss3 = CSWnspr CSWsqlite3rt
-RUNTIME_DEP_PKGS_CSWlibnss-dev += CSWlibnss3
+PACKAGES += CSWlibnss3-tools
+CATALOGNAME_CSWlibnss3-tools = libnss3_tools
+SPKG_DESC_CSWlibnss3-tools = Network Security Services library, command-line utilities
+PKGFILES_CSWlibnss3-tools = $(bindir).*
 RUNTIME_DEP_PKGS_CSWlibnss3-tools += CSWlibnss3
-RUNTIME_DEP_PKGS_CSWlibnss3-tools += CSWnspr
+RUNTIME_DEP_PKGS_CSWlibnss3-tools += CSWlibplc4
+RUNTIME_DEP_PKGS_CSWlibnss3-tools += CSWlibnspr4
+RUNTIME_DEP_PKGS_CSWlibnss3-tools += CSWlibplds4
+RUNTIME_DEP_PKGS_CSWlibnss3-tools += CSWlibnss-dev
+
 BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) CSWnspr-dev CSWlibsqlite3-dev
 
 CONFIGURE_SCRIPTS =
@@ -142,7 +250,9 @@
 # http://lists.opencsw.org/pipermail/pkgsubmissions/2010-February/000167.html
 # NOISAEXEC = 1
 
-CPPFLAGS=
+CPPFLAGS =
+LD_OPTIONS = 
+NSS_LD_OPTIONS = -R/opt/csw/lib/$$ISALIST
 
 include gar/category.mk
 
@@ -168,7 +278,7 @@
 build-nss-compile:
 	(cd $(WORKSRC)/mozilla/security/nss \
 		&& \
-	CPPFLAGS='$(CPPFLAGS)' LD_OPTIONS='$(LD_OPTIONS) -R/opt/csw/lib/$$$$ISALIST' \
+	CPPFLAGS='$(CPPFLAGS)' LD_OPTIONS='$(LD_OPTIONS) $(NSS_LD_OPTIONS)' \
 	gmake -j1)
 	@$(MAKECOOKIE)
 

Modified: csw/mgar/pkg/nss/trunk/files/nss.pc
===================================================================
--- csw/mgar/pkg/nss/trunk/files/nss.pc	2012-01-18 10:08:28 UTC (rev 16792)
+++ csw/mgar/pkg/nss/trunk/files/nss.pc	2012-01-18 11:58:50 UTC (rev 16793)
@@ -5,7 +5,7 @@
 
 Name: NSS
 Description: Network Security Services
-Version: 3.12.4
-Requires: nspr >= 4.8.0
+Version: 3.12.11
+Requires: nspr >= 4.8.9
 Libs: -L${libdir} -lssl3 -lsmime3 -lnss3 -lnssutil3 -R${libdir}
 Cflags: -I${includedir}

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


From cgrzemba at users.sourceforge.net  Wed Jan 18 14:09:28 2012
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Wed, 18 Jan 2012 13:09:28 +0000
Subject: [csw-devel] SF.net SVN: gar:[16794] csw/mgar/pkg/nss/trunk/Makefile
Message-ID: <E1RnVGa-0000zA-KR@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 16794
          http://gar.svn.sourceforge.net/gar/?rev=16794&view=rev
Author:   cgrzemba
Date:     2012-01-18 13:09:28 +0000 (Wed, 18 Jan 2012)
Log Message:
-----------
nss/trunk: use '' in rpath

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

Modified: csw/mgar/pkg/nss/trunk/Makefile
===================================================================
--- csw/mgar/pkg/nss/trunk/Makefile	2012-01-18 11:58:50 UTC (rev 16793)
+++ csw/mgar/pkg/nss/trunk/Makefile	2012-01-18 13:09:28 UTC (rev 16794)
@@ -252,7 +252,7 @@
 
 CPPFLAGS =
 LD_OPTIONS = 
-NSS_LD_OPTIONS = -R/opt/csw/lib/$$ISALIST
+# NSS_LD_OPTIONS = -R'$$ORIGIN'
 
 include gar/category.mk
 
@@ -278,8 +278,7 @@
 build-nss-compile:
 	(cd $(WORKSRC)/mozilla/security/nss \
 		&& \
-	CPPFLAGS='$(CPPFLAGS)' LD_OPTIONS='$(LD_OPTIONS) $(NSS_LD_OPTIONS)' \
-	gmake -j1)
+	gmake -j1 RPATH=-R\'\$$\$$ORIGIN\')
 	@$(MAKECOOKIE)
 
 install-nss:

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


From dmichelsen at users.sourceforge.net  Wed Jan 18 15:31:28 2012
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Wed, 18 Jan 2012 14:31:28 +0000
Subject: [csw-devel] SF.net SVN: gar:[16795] csw/mgar/pkg
Message-ID: <E1RnWXw-0007Js-UD@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 16795
          http://gar.svn.sourceforge.net/gar/?rev=16795&view=rev
Author:   dmichelsen
Date:     2012-01-18 14:30:49 +0000 (Wed, 18 Jan 2012)
Log Message:
-----------
WHOLE TREE: Remove svn:externals now that we have 'mgar'

Property Changed:
----------------
    csw/mgar/pkg/389-admin/trunk/
    csw/mgar/pkg/389-adminutil/trunk/
    csw/mgar/pkg/389-ds-base/trunk/
    csw/mgar/pkg/GeoIP/trunk/
    csw/mgar/pkg/ImageMagick/branches/64-bit/
    csw/mgar/pkg/ImageMagick/branches/package-split/
    csw/mgar/pkg/ImageMagick/trunk/
    csw/mgar/pkg/MailScanner/trunk/
    csw/mgar/pkg/Vispan/trunk/
    csw/mgar/pkg/ZSI/trunk/
    csw/mgar/pkg/a2ps/trunk/
    csw/mgar/pkg/achievo/trunk/
    csw/mgar/pkg/adns/trunk/
    csw/mgar/pkg/adobereader/trunk/
    csw/mgar/pkg/aide/trunk/
    csw/mgar/pkg/alarm-clock/trunk/
    csw/mgar/pkg/alpine/trunk/
    csw/mgar/pkg/alternatives/branches/alternatives-gar/
    csw/mgar/pkg/amanda/trunk/
    csw/mgar/pkg/amarok/trunk/
    csw/mgar/pkg/amavisd-new/trunk/
    csw/mgar/pkg/apache/trunk/
    csw/mgar/pkg/apache2/branches/open-bug-squash/
    csw/mgar/pkg/apache2/tags/apache-2.2.13-by-idogan/
    csw/mgar/pkg/apache2/trunk/
    csw/mgar/pkg/apache2-worker/
    csw/mgar/pkg/apache2-worker/trunk/
    csw/mgar/pkg/apcupsd/
    csw/mgar/pkg/apcupsd/trunk/
    csw/mgar/pkg/apg/trunk/
    csw/mgar/pkg/apr/trunk/
    csw/mgar/pkg/apr-iconv/trunk/
    csw/mgar/pkg/apr-util/trunk/
    csw/mgar/pkg/argtable/trunk/
    csw/mgar/pkg/aria2/trunk/
    csw/mgar/pkg/arpwatch/trunk/
    csw/mgar/pkg/arts/trunk/
    csw/mgar/pkg/ascii/trunk/
    csw/mgar/pkg/asciidoc/trunk/
    csw/mgar/pkg/audiofile/trunk/
    csw/mgar/pkg/augeas/trunk/
    csw/mgar/pkg/authz-tools/trunk/
    csw/mgar/pkg/autobench/trunk/
    csw/mgar/pkg/autoconf/tags/autoconf-2.64,REV=2009.07.29/
    csw/mgar/pkg/autoconf/tags/autoconf-2.66,REV=2010.07.26/
    csw/mgar/pkg/autoconf/trunk/
    csw/mgar/pkg/automake/trunk/
    csw/mgar/pkg/autoproject/trunk/
    csw/mgar/pkg/autossh/trunk/
    csw/mgar/pkg/autotrace/trunk/
    csw/mgar/pkg/avantfax/trunk/
    csw/mgar/pkg/avfs/trunk/
    csw/mgar/pkg/awesome/trunk/
    csw/mgar/pkg/awstats/trunk/
    csw/mgar/pkg/axel/trunk/
    csw/mgar/pkg/babl/trunk/
    csw/mgar/pkg/bacula/branches/5.2.0-beta/
    csw/mgar/pkg/bacula/trunk/
    csw/mgar/pkg/balance/trunk/
    csw/mgar/pkg/bash/trunk/
    csw/mgar/pkg/bash_completion/trunk/
    csw/mgar/pkg/bashdb/trunk/
    csw/mgar/pkg/bazaar/trunk/
    csw/mgar/pkg/bdb/trunk/
    csw/mgar/pkg/bdb3/tags/bdb-consolidation-4.4.20,REV=2009.07.28/
    csw/mgar/pkg/bdb3/trunk/
    csw/mgar/pkg/bdb4/trunk/
    csw/mgar/pkg/bdb42/tags/bdb-consolidation-4.4.20,REV=2009.07.28/
    csw/mgar/pkg/bdb42/trunk/
    csw/mgar/pkg/bdb43/tags/bdb-consolidation-4.3.29,REV=2009.06.26/
    csw/mgar/pkg/bdb43/trunk/
    csw/mgar/pkg/bdb44/tags/bdb-consolidation-4.4.20,REV=2009.07.28/
    csw/mgar/pkg/bdb44/trunk/
    csw/mgar/pkg/bdb45/tags/unreleased/
    csw/mgar/pkg/bdb45/trunk/
    csw/mgar/pkg/bdb46/tags/unreleased/
    csw/mgar/pkg/bdb46/trunk/
    csw/mgar/pkg/bdb47/trunk/
    csw/mgar/pkg/bdb48/trunk/
    csw/mgar/pkg/bdb51/trunk/
    csw/mgar/pkg/beautifulsoup/trunk/
    csw/mgar/pkg/bind/branches/stable/
    csw/mgar/pkg/bind/branches/stable-9.4.3p3/
    csw/mgar/pkg/bind/trunk/
    csw/mgar/pkg/bind2nsd/trunk/
    csw/mgar/pkg/binutils/trunk/
    csw/mgar/pkg/bison/trunk/
    csw/mgar/pkg/bitlbee/trunk/
    csw/mgar/pkg/bittwist/trunk/
    csw/mgar/pkg/blame/trunk/
    csw/mgar/pkg/bluefish/trunk/
    csw/mgar/pkg/boost/branches/boost-1.33.0/
    csw/mgar/pkg/boost/branches/boost-gcc/
    csw/mgar/pkg/boost/trunk/
    csw/mgar/pkg/boost-jam/trunk/
    csw/mgar/pkg/botnet/trunk/
    csw/mgar/pkg/bugzilla/trunk/
    csw/mgar/pkg/buildbot/trunk/
    csw/mgar/pkg/bvi/trunk/
    csw/mgar/pkg/bzflag/trunk/
    csw/mgar/pkg/bzip2/trunk/
    csw/mgar/pkg/c-ares/trunk/
    csw/mgar/pkg/ca_certificates/trunk/
    csw/mgar/pkg/cabextract/trunk/
    csw/mgar/pkg/cacti/trunk/
    csw/mgar/pkg/cadaver/trunk/
    csw/mgar/pkg/cairomm/trunk/
    csw/mgar/pkg/ccache/trunk/
    csw/mgar/pkg/cdecl/trunk/
    csw/mgar/pkg/cdrdao/trunk/
    csw/mgar/pkg/centerim/trunk/
    csw/mgar/pkg/cfengine/trunk/
    csw/mgar/pkg/cfengine3/tags/cfengine3-3.2.3,REV=2011.11.12/
    csw/mgar/pkg/cfengine3/trunk/
    csw/mgar/pkg/cfg2html/trunk/
    csw/mgar/pkg/cfitsio/trunk/
    csw/mgar/pkg/cgit/trunk/
    csw/mgar/pkg/cheetah/trunk/
    csw/mgar/pkg/cherokee/trunk/
    csw/mgar/pkg/chkconfig/trunk/
    csw/mgar/pkg/chmlib/trunk/
    csw/mgar/pkg/chromium/trunk/
    csw/mgar/pkg/chrpath/trunk/
    csw/mgar/pkg/clamav/trunk/
    csw/mgar/pkg/clamavsigs/trunk/
    csw/mgar/pkg/clearsilver/trunk/
    csw/mgar/pkg/climm/trunk/
    csw/mgar/pkg/cloog/trunk/
    csw/mgar/pkg/clpbar/trunk/
    csw/mgar/pkg/clusterit/trunk/
    csw/mgar/pkg/clusterssh/trunk/
    csw/mgar/pkg/clzip/trunk/
    csw/mgar/pkg/colordiff/trunk/
    csw/mgar/pkg/colormake/trunk/
    csw/mgar/pkg/colortail/trunk/
    csw/mgar/pkg/conserver/trunk/
    csw/mgar/pkg/convmv/trunk/
    csw/mgar/pkg/coreutils/branches/8.4-respin/
    csw/mgar/pkg/coreutils/tags/8.4-2010.12.18/
    csw/mgar/pkg/coreutils/tags/8.8-REV=2011.01.14/
    csw/mgar/pkg/coreutils/trunk/
    csw/mgar/pkg/cpan/Algorithm-Annotate/trunk/
    csw/mgar/pkg/cpan/Algorithm-CheckDigits/trunk/
    csw/mgar/pkg/cpan/Algorithm-Depedency/trunk/
    csw/mgar/pkg/cpan/Algorithm-Diff/trunk/
    csw/mgar/pkg/cpan/AnyData/trunk/
    csw/mgar/pkg/cpan/Apache-AuthPAM/trunk/
    csw/mgar/pkg/cpan/Apache-DBI/trunk/
    csw/mgar/pkg/cpan/Apache-PAR/trunk/
    csw/mgar/pkg/cpan/Apache-Session/trunk/
    csw/mgar/pkg/cpan/Apache-Template/trunk/
    csw/mgar/pkg/cpan/Apache-Test/trunk/
    csw/mgar/pkg/cpan/Apache2-AuthzNIS/trunk/
    csw/mgar/pkg/cpan/App-CLI/trunk/
    csw/mgar/pkg/cpan/AppConfig/trunk/
    csw/mgar/pkg/cpan/Archive-Extract/trunk/
    csw/mgar/pkg/cpan/Archive-SelfExtract/trunk/
    csw/mgar/pkg/cpan/Archive-Tar/tags/Archive-Tar-1.54,REV=2009.11.24/
    csw/mgar/pkg/cpan/Archive-Tar/trunk/
    csw/mgar/pkg/cpan/Archive-Zip/trunk/
    csw/mgar/pkg/cpan/Array-Compare/trunk/
    csw/mgar/pkg/cpan/Array-Window/trunk/
    csw/mgar/pkg/cpan/Astro-FITS-Header/trunk/
    csw/mgar/pkg/cpan/Attribute-Handlers/trunk/
    csw/mgar/pkg/cpan/Audio-TagLib/trunk/
    csw/mgar/pkg/cpan/Authen-PAM/trunk/
    csw/mgar/pkg/cpan/Authen-SASL/trunk/
    csw/mgar/pkg/cpan/AutoXS-Header/trunk/
    csw/mgar/pkg/cpan/B-C/trunk/
    csw/mgar/pkg/cpan/B-Flags/trunk/
    csw/mgar/pkg/cpan/B-Generate/trunk/
    csw/mgar/pkg/cpan/B-Keywords/trunk/
    csw/mgar/pkg/cpan/B-Utils/trunk/
    csw/mgar/pkg/cpan/BSD-Resource/trunk/
    csw/mgar/pkg/cpan/Barcode-Code128/trunk/
    csw/mgar/pkg/cpan/BerkeleyDB/tags/BerkeleyDB-0.42,REV=2010.03.15/
    csw/mgar/pkg/cpan/BerkeleyDB/trunk/
    csw/mgar/pkg/cpan/Biblio-EndnoteStyle/trunk/
    csw/mgar/pkg/cpan/Bit-Vector/trunk/
    csw/mgar/pkg/cpan/C-Scan/trunk/
    csw/mgar/pkg/cpan/CGI/trunk/
    csw/mgar/pkg/cpan/CGI-Application/trunk/
    csw/mgar/pkg/cpan/CGI-Application-Dispatch/trunk/
    csw/mgar/pkg/cpan/CGI-Application-Plugin-LogDispatch/trunk/
    csw/mgar/pkg/cpan/CGI-Builder/trunk/
    csw/mgar/pkg/cpan/CGI-Session/trunk/
    csw/mgar/pkg/cpan/CGI-SpeedyCGI/trunk/
    csw/mgar/pkg/cpan/CGP-CLI/trunk/
    csw/mgar/pkg/cpan/CPANPLUS/trunk/
    csw/mgar/pkg/cpan/CSS-DOM/trunk/
    csw/mgar/pkg/cpan/Cache/trunk/
    csw/mgar/pkg/cpan/Cache-Cache/trunk/
    csw/mgar/pkg/cpan/Cache-Memcached/trunk/
    csw/mgar/pkg/cpan/Cache-Simple-TimedExpiry/trunk/
    csw/mgar/pkg/cpan/Cairo/trunk/
    csw/mgar/pkg/cpan/Calendar-CSA/trunk/
    csw/mgar/pkg/cpan/Calendar-Simple/trunk/
    csw/mgar/pkg/cpan/Capitalization/trunk/
    csw/mgar/pkg/cpan/Carp-Assert/trunk/
    csw/mgar/pkg/cpan/Carp-Assert-More/trunk/
    csw/mgar/pkg/cpan/Carp-Clan/trunk/
    csw/mgar/pkg/cpan/Catalyst/trunk/
    csw/mgar/pkg/cpan/Chart/trunk/
    csw/mgar/pkg/cpan/Check-ISA/trunk/
    csw/mgar/pkg/cpan/Class-Accessor/trunk/
    csw/mgar/pkg/cpan/Class-Accessor-Chained/trunk/
    csw/mgar/pkg/cpan/Class-Adapter/trunk/
    csw/mgar/pkg/cpan/Class-Autouse/trunk/
    csw/mgar/pkg/cpan/Class-BlackHole/trunk/
    csw/mgar/pkg/cpan/Class-Container/trunk/
    csw/mgar/pkg/cpan/Class-DBI/trunk/
    csw/mgar/pkg/cpan/Class-DBI-Loader/trunk/
    csw/mgar/pkg/cpan/Class-DBI-Pg/trunk/
    csw/mgar/pkg/cpan/Class-DBI-SQLite/trunk/
    csw/mgar/pkg/cpan/Class-DBI-mysql/trunk/
    csw/mgar/pkg/cpan/Class-Data-Inheritable/trunk/
    csw/mgar/pkg/cpan/Class-Factory-Util/trunk/
    csw/mgar/pkg/cpan/Class-ISA/trunk/
    csw/mgar/pkg/cpan/Class-Inspector/trunk/
    csw/mgar/pkg/cpan/Class-Loader/trunk/
    csw/mgar/pkg/cpan/Class-ReturnValue/trunk/
    csw/mgar/pkg/cpan/Class-Singleton/trunk/
    csw/mgar/pkg/cpan/Class-Std/tags/Class-Std-0.011,REV=2010.06.22/
    csw/mgar/pkg/cpan/Class-Std/trunk/
    csw/mgar/pkg/cpan/Class-Trigger/trunk/
    csw/mgar/pkg/cpan/Class-WhiteHole/trunk/
    csw/mgar/pkg/cpan/Class-XSAccessor/trunk/
    csw/mgar/pkg/cpan/Clone/trunk/
    csw/mgar/pkg/cpan/Compress-Bzip2/trunk/
    csw/mgar/pkg/cpan/Compress-Raw-Bzip2/trunk/
    csw/mgar/pkg/cpan/Compress-Raw-Zlib/trunk/
    csw/mgar/pkg/cpan/Compress-Zlib/trunk/
    csw/mgar/pkg/cpan/Config-Augeas/trunk/
    csw/mgar/pkg/cpan/Config-General/trunk/
    csw/mgar/pkg/cpan/Config-IniFiles/trunk/
    csw/mgar/pkg/cpan/Config-Tiny/trunk/
    csw/mgar/pkg/cpan/Convert-ASCII-Armour/trunk/
    csw/mgar/pkg/cpan/Convert-ASN1/trunk/
    csw/mgar/pkg/cpan/Convert-BinHex/trunk/
    csw/mgar/pkg/cpan/Convert-EBCDIC/trunk/
    csw/mgar/pkg/cpan/Convert-PEM/trunk/
    csw/mgar/pkg/cpan/Convert-TNEF/trunk/
    csw/mgar/pkg/cpan/Convert-UUlib/trunk/
    csw/mgar/pkg/cpan/Crypt-Blowfish/trunk/
    csw/mgar/pkg/cpan/Crypt-CAST5/trunk/
    csw/mgar/pkg/cpan/Crypt-CBC/trunk/
    csw/mgar/pkg/cpan/Crypt-DES/trunk/
    csw/mgar/pkg/cpan/Crypt-DES_EDE3/trunk/
    csw/mgar/pkg/cpan/Crypt-DH/trunk/
    csw/mgar/pkg/cpan/Crypt-DSA/trunk/
    csw/mgar/pkg/cpan/Crypt-IDEA/trunk/
    csw/mgar/pkg/cpan/Crypt-OpenPGP/trunk/
    csw/mgar/pkg/cpan/Crypt-OpenSSL-Bignum/trunk/
    csw/mgar/pkg/cpan/Crypt-OpenSSL-DSA/trunk/
    csw/mgar/pkg/cpan/Crypt-OpenSSL-PKCS12/trunk/
    csw/mgar/pkg/cpan/Crypt-OpenSSL-RSA/trunk/
    csw/mgar/pkg/cpan/Crypt-OpenSSL-Random/trunk/
    csw/mgar/pkg/cpan/Crypt-OpenSSL-X509/trunk/
    csw/mgar/pkg/cpan/Crypt-PasswdMD5/trunk/
    csw/mgar/pkg/cpan/Crypt-Primes/trunk/
    csw/mgar/pkg/cpan/Crypt-RC4/trunk/
    csw/mgar/pkg/cpan/Crypt-RC5/trunk/
    csw/mgar/pkg/cpan/Crypt-RIPEMD160/trunk/
    csw/mgar/pkg/cpan/Crypt-RSA/trunk/
    csw/mgar/pkg/cpan/Crypt-Rijndael/trunk/
    csw/mgar/pkg/cpan/Crypt-SSLeay/trunk/
    csw/mgar/pkg/cpan/Crypt-Twofish/trunk/
    csw/mgar/pkg/cpan/Curses/trunk/
    csw/mgar/pkg/cpan/Curses-UI/trunk/
    csw/mgar/pkg/cpan/DBD-AnyData/trunk/
    csw/mgar/pkg/cpan/DBD-CSV/trunk/
    csw/mgar/pkg/cpan/DBD-DB2/trunk/
    csw/mgar/pkg/cpan/DBD-File/trunk/
    csw/mgar/pkg/cpan/DBD-Oracle/trunk/
    csw/mgar/pkg/cpan/DBD-Pg/trunk/
    csw/mgar/pkg/cpan/DBD-SQLite/trunk/
    csw/mgar/pkg/cpan/DBD-Sybase/trunk/
    csw/mgar/pkg/cpan/DBD-mysql/trunk/
    csw/mgar/pkg/cpan/DBD-mysql5/trunk/
    csw/mgar/pkg/cpan/DBI/trunk/
    csw/mgar/pkg/cpan/DBIx-ContextualFetch/trunk/
    csw/mgar/pkg/cpan/DBIx-Password/trunk/
    csw/mgar/pkg/cpan/DBIx-SearchBuilder/trunk/
    csw/mgar/pkg/cpan/DB_File/trunk/
    csw/mgar/pkg/cpan/Dancer/trunk/
    csw/mgar/pkg/cpan/Data-Buffer/trunk/
    csw/mgar/pkg/cpan/Data-Dump/trunk/
    csw/mgar/pkg/cpan/Data-Flow/trunk/
    csw/mgar/pkg/cpan/Data-Hierarchy/trunk/
    csw/mgar/pkg/cpan/Data-ICal/trunk/
    csw/mgar/pkg/cpan/Data-OptList/trunk/
    csw/mgar/pkg/cpan/Data-Serializer/trunk/
    csw/mgar/pkg/cpan/Data-ShowTable/trunk/
    csw/mgar/pkg/cpan/Data-TreeDumper/trunk/
    csw/mgar/pkg/cpan/Data-UUID/trunk/
    csw/mgar/pkg/cpan/Date-Calc/trunk/
    csw/mgar/pkg/cpan/Date-ICal/trunk/
    csw/mgar/pkg/cpan/Date-Leapyear/trunk/
    csw/mgar/pkg/cpan/Date-Manip/trunk/
    csw/mgar/pkg/cpan/Date-Simple/trunk/
    csw/mgar/pkg/cpan/DateTime/trunk/
    csw/mgar/pkg/cpan/DateTime-Format-Mail/trunk/
    csw/mgar/pkg/cpan/DateTime-Format-W3CDTF/trunk/
    csw/mgar/pkg/cpan/DateTime-Locale/trunk/
    csw/mgar/pkg/cpan/DateTime-TimeZone/trunk/
    csw/mgar/pkg/cpan/Devel-Caller/trunk/
    csw/mgar/pkg/cpan/Devel-Cover/trunk/
    csw/mgar/pkg/cpan/Devel-Cycle/trunk/
    csw/mgar/pkg/cpan/Devel-LeakTrace/trunk/
    csw/mgar/pkg/cpan/Devel-LexAlias/trunk/
    csw/mgar/pkg/cpan/Devel-NYTProf/trunk/
    csw/mgar/pkg/cpan/Devel-Size/trunk/
    csw/mgar/pkg/cpan/Devel-StackTrace/trunk/
    csw/mgar/pkg/cpan/Devel-StackTrace-AsHTML/trunk/
    csw/mgar/pkg/cpan/Devel-Symdump/trunk/
    csw/mgar/pkg/cpan/Devel-Trace/trunk/
    csw/mgar/pkg/cpan/Digest/tags/Digest-1.16,REV=2009.08.10/
    csw/mgar/pkg/cpan/Digest/trunk/
    csw/mgar/pkg/cpan/Digest-BubbleBabble/trunk/
    csw/mgar/pkg/cpan/Digest-HMAC/trunk/
    csw/mgar/pkg/cpan/Digest-MD2/trunk/
    csw/mgar/pkg/cpan/Digest-Nilsimsa/trunk/
    csw/mgar/pkg/cpan/Digest-SHA/trunk/
    csw/mgar/pkg/cpan/Digest-SHA1/tags/2.12,REV=2009.08.06/
    csw/mgar/pkg/cpan/Digest-SHA1/trunk/
    csw/mgar/pkg/cpan/DublinCore-Record/trunk/
    csw/mgar/pkg/cpan/Email-Address/trunk/
    csw/mgar/pkg/cpan/Email-Date-Format/trunk/
    csw/mgar/pkg/cpan/Email-Simple/trunk/
    csw/mgar/pkg/cpan/Email-Valid/trunk/
    csw/mgar/pkg/cpan/Env-Path/trunk/
    csw/mgar/pkg/cpan/Error/trunk/
    csw/mgar/pkg/cpan/Event/trunk/
    csw/mgar/pkg/cpan/Event-Lib/trunk/
    csw/mgar/pkg/cpan/Exception-Class/trunk/
    csw/mgar/pkg/cpan/Exception-Class-DBI/trunk/
    csw/mgar/pkg/cpan/ExtUtils-AutoInstall/trunk/
    csw/mgar/pkg/cpan/ExtUtils-CBuilder/trunk/
    csw/mgar/pkg/cpan/ExtUtils-Depends/trunk/
    csw/mgar/pkg/cpan/ExtUtils-F77/trunk/
    csw/mgar/pkg/cpan/ExtUtils-Manifest/trunk/
    csw/mgar/pkg/cpan/ExtUtils-ParseXS/trunk/
    csw/mgar/pkg/cpan/ExtUtils-PkgConfig/trunk/
    csw/mgar/pkg/cpan/ExtUtils-XSBuilder/trunk/
    csw/mgar/pkg/cpan/FCGI/trunk/
    csw/mgar/pkg/cpan/File-Cat/trunk/
    csw/mgar/pkg/cpan/File-Copy-Recursive/trunk/
    csw/mgar/pkg/cpan/File-Fetch/trunk/
    csw/mgar/pkg/cpan/File-Flat/trunk/
    csw/mgar/pkg/cpan/File-HomeDir/trunk/
    csw/mgar/pkg/cpan/File-LibMagic/trunk/
    csw/mgar/pkg/cpan/File-MMagic/trunk/
    csw/mgar/pkg/cpan/File-Modified/trunk/
    csw/mgar/pkg/cpan/File-NFSLock/trunk/
    csw/mgar/pkg/cpan/File-Next/trunk/
    csw/mgar/pkg/cpan/File-ReadBackwards/trunk/
    csw/mgar/pkg/cpan/File-Remove/trunk/
    csw/mgar/pkg/cpan/File-ShareDir/trunk/
    csw/mgar/pkg/cpan/File-Slurp/trunk/
    csw/mgar/pkg/cpan/File-Tail/trunk/
    csw/mgar/pkg/cpan/File-Type/trunk/
    csw/mgar/pkg/cpan/File-Which/trunk/
    csw/mgar/pkg/cpan/File-chdir/trunk/
    csw/mgar/pkg/cpan/File-chmod/trunk/
    csw/mgar/pkg/cpan/Filesys-Df/trunk/
    csw/mgar/pkg/cpan/Filesys-Notify-Simple/trunk/
    csw/mgar/pkg/cpan/Font-AFM/trunk/
    csw/mgar/pkg/cpan/Font-Freetype/trunk/
    csw/mgar/pkg/cpan/Font-TTF/trunk/
    csw/mgar/pkg/cpan/FreezeThaw/trunk/
    csw/mgar/pkg/cpan/Frontier-RPC/trunk/
    csw/mgar/pkg/cpan/GD/tags/GD-2.44,REV_2010.02.08/
    csw/mgar/pkg/cpan/GD/trunk/
    csw/mgar/pkg/cpan/GD-Barcode/trunk/
    csw/mgar/pkg/cpan/GDGraph/trunk/
    csw/mgar/pkg/cpan/GDTextUtil/trunk/
    csw/mgar/pkg/cpan/GSSAPI/trunk/
    csw/mgar/pkg/cpan/Geo-IP/trunk/
    csw/mgar/pkg/cpan/Geo-IP-PurePerl/trunk/
    csw/mgar/pkg/cpan/Geography-Countries/trunk/
    csw/mgar/pkg/cpan/Gimp/trunk/
    csw/mgar/pkg/cpan/Glib/trunk/
    csw/mgar/pkg/cpan/Gnome2/trunk/
    csw/mgar/pkg/cpan/Gnome2-Canvas/trunk/
    csw/mgar/pkg/cpan/Gnome2-GConf/trunk/
    csw/mgar/pkg/cpan/Gnome2-Print/trunk/
    csw/mgar/pkg/cpan/Gnome2-VFS/trunk/
    csw/mgar/pkg/cpan/Gnome2-Wnck/trunk/
    csw/mgar/pkg/cpan/Graph/trunk/
    csw/mgar/pkg/cpan/GraphViz/trunk/
    csw/mgar/pkg/cpan/Graphics-ColorNames/trunk/
    csw/mgar/pkg/cpan/Graphics-ColorNames-WWW/trunk/
    csw/mgar/pkg/cpan/Gtk2/trunk/
    csw/mgar/pkg/cpan/Gtk2-GladeXML/trunk/
    csw/mgar/pkg/cpan/Gtk2-PodViewer/trunk/
    csw/mgar/pkg/cpan/Gtk2-TrayIcon/trunk/
    csw/mgar/pkg/cpan/HTML-CalendarMonth/trunk/
    csw/mgar/pkg/cpan/HTML-Element-Extended/trunk/
    csw/mgar/pkg/cpan/HTML-Format/trunk/
    csw/mgar/pkg/cpan/HTML-Mason/trunk/
    csw/mgar/pkg/cpan/HTML-Parser/trunk/
    csw/mgar/pkg/cpan/HTML-Scrubber/trunk/
    csw/mgar/pkg/cpan/HTML-TableExtract/tags/HTML-TableExtract-2.10,REV=2011.01.21/
    csw/mgar/pkg/cpan/HTML-TableExtract/tags/HTML-TableExtract-2.10,REV=2011.01.22/
    csw/mgar/pkg/cpan/HTML-TableExtract/trunk/
    csw/mgar/pkg/cpan/HTML-Tagset/trunk/
    csw/mgar/pkg/cpan/HTML-Template/trunk/
    csw/mgar/pkg/cpan/HTML-Template-Pro/trunk/
    csw/mgar/pkg/cpan/HTML-TokeParser/trunk/
    csw/mgar/pkg/cpan/HTML-Tree/trunk/
    csw/mgar/pkg/cpan/HTTP-Body/trunk/
    csw/mgar/pkg/cpan/HTTP-DAV/trunk/
    csw/mgar/pkg/cpan/HTTP-Server-Simple/trunk/
    csw/mgar/pkg/cpan/HTTP-Server-Simple-PSGI/trunk/
    csw/mgar/pkg/cpan/Hash-MultiValue/trunk/
    csw/mgar/pkg/cpan/Heap/trunk/
    csw/mgar/pkg/cpan/Hook-LexWrap/trunk/
    csw/mgar/pkg/cpan/I18N-LangTags/trunk/
    csw/mgar/pkg/cpan/IDNA-Punycode/trunk/
    csw/mgar/pkg/cpan/IO-Compress/trunk/
    csw/mgar/pkg/cpan/IO-Compress-Base/trunk/
    csw/mgar/pkg/cpan/IO-Compress-Zlib/trunk/
    csw/mgar/pkg/cpan/IO-Digest/tags/IO-Digest-0.10,REV=2011.01.08/
    csw/mgar/pkg/cpan/IO-Digest/tags/IO-Digest-0.10,REV=2011.01.08/trunk/
    csw/mgar/pkg/cpan/IO-Digest/trunk/
    csw/mgar/pkg/cpan/IO-Multiplex/trunk/
    csw/mgar/pkg/cpan/IO-Pager/trunk/
    csw/mgar/pkg/cpan/IO-Socket-INET6/trunk/
    csw/mgar/pkg/cpan/IO-Socket-SSL/trunk/
    csw/mgar/pkg/cpan/IO-String/trunk/
    csw/mgar/pkg/cpan/IO-Tty/trunk/
    csw/mgar/pkg/cpan/IO-Util/trunk/
    csw/mgar/pkg/cpan/IO-Zlib/trunk/
    csw/mgar/pkg/cpan/IO-stringy/trunk/
    csw/mgar/pkg/cpan/IP-Country/trunk/
    csw/mgar/pkg/cpan/IPC-Cmd/trunk/
    csw/mgar/pkg/cpan/IPC-Run/trunk/
    csw/mgar/pkg/cpan/IPC-Run3/trunk/
    csw/mgar/pkg/cpan/IPC-ShareLite/trunk/
    csw/mgar/pkg/cpan/Ima-DBI/trunk/
    csw/mgar/pkg/cpan/Image-ExifTool/trunk/
    csw/mgar/pkg/cpan/Image-Info/trunk/
    csw/mgar/pkg/cpan/Image-Size/trunk/
    csw/mgar/pkg/cpan/Inline/trunk/
    csw/mgar/pkg/cpan/JIRA-Client/trunk/
    csw/mgar/pkg/cpan/JSON/trunk/
    csw/mgar/pkg/cpan/JSON-Any/trunk/
    csw/mgar/pkg/cpan/Jcode/trunk/
    csw/mgar/pkg/cpan/Lexical-Persistence/trunk/
    csw/mgar/pkg/cpan/Lingua-PT-Stemmer/trunk/
    csw/mgar/pkg/cpan/Lingua-Stem/trunk/
    csw/mgar/pkg/cpan/Lingua-Stem-Fr/trunk/
    csw/mgar/pkg/cpan/Lingua-Stem-It/trunk/
    csw/mgar/pkg/cpan/Lingua-Stem-Ru/trunk/
    csw/mgar/pkg/cpan/Lingua-Stem-Snowball-Da/trunk/
    csw/mgar/pkg/cpan/List-MoreUtils/trunk/
    csw/mgar/pkg/cpan/Locale-Gettext/trunk/
    csw/mgar/pkg/cpan/Locale-Maketext-Fuzzy/trunk/
    csw/mgar/pkg/cpan/Locale-Maketext-Lexicon/trunk/
    csw/mgar/pkg/cpan/Locale-Maketext-Simple/trunk/
    csw/mgar/pkg/cpan/Log-Any/trunk/
    csw/mgar/pkg/cpan/Log-Dispatch/trunk/
    csw/mgar/pkg/cpan/Log-Dispatch-Config/trunk/
    csw/mgar/pkg/cpan/Log-Dispatch-FileRotate/tags/Log-Dispatch-FileRotate-1.19,REV=2011.06.24/
    csw/mgar/pkg/cpan/Log-Dispatch-FileRotate/trunk/
    csw/mgar/pkg/cpan/Log-Log4perl/trunk/
    csw/mgar/pkg/cpan/Log-Message/trunk/
    csw/mgar/pkg/cpan/Log-Message-Simple/trunk/
    csw/mgar/pkg/cpan/MARC-Charset/trunk/
    csw/mgar/pkg/cpan/MARC-Crosswalk-DublinCore/trunk/
    csw/mgar/pkg/cpan/MARC-Record/trunk/
    csw/mgar/pkg/cpan/MARC-XML/trunk/
    csw/mgar/pkg/cpan/MIME-Base64/trunk/
    csw/mgar/pkg/cpan/MIME-Lite/trunk/
    csw/mgar/pkg/cpan/MIME-Types/trunk/
    csw/mgar/pkg/cpan/MIME-tools/trunk/
    csw/mgar/pkg/cpan/MLDBM/trunk/
    csw/mgar/pkg/cpan/MLDBM-Sync/trunk/
    csw/mgar/pkg/cpan/MP3-Tag/trunk/
    csw/mgar/pkg/cpan/Mail-Box/trunk/
    csw/mgar/pkg/cpan/Mail-Box-Parser-C/trunk/
    csw/mgar/pkg/cpan/Mail-DKIM/trunk/
    csw/mgar/pkg/cpan/Mail-IMAPClient/trunk/
    csw/mgar/pkg/cpan/Mail-SPF/trunk/
    csw/mgar/pkg/cpan/Mail-SPF-Query/trunk/
    csw/mgar/pkg/cpan/Mail-Sender/trunk/
    csw/mgar/pkg/cpan/Mail-Sendmail/trunk/
    csw/mgar/pkg/cpan/Mail-Tools/trunk/
    csw/mgar/pkg/cpan/Math-Bezier/trunk/
    csw/mgar/pkg/cpan/Math-GMP/trunk/
    csw/mgar/pkg/cpan/Math-Interpolate/trunk/
    csw/mgar/pkg/cpan/Math-Pari/trunk/
    csw/mgar/pkg/cpan/Module-Build/tags/Module-Build-0.33,REV=2009.06.08/
    csw/mgar/pkg/cpan/Module-Build/trunk/
    csw/mgar/pkg/cpan/Module-CoreList/trunk/
    csw/mgar/pkg/cpan/Module-Load/trunk/
    csw/mgar/pkg/cpan/Module-Load-Conditional/trunk/
    csw/mgar/pkg/cpan/Module-Loaded/trunk/
    csw/mgar/pkg/cpan/Module-Pluggable/trunk/
    csw/mgar/pkg/cpan/Module-Refresh/trunk/
    csw/mgar/pkg/cpan/Module-ScanDeps/trunk/
    csw/mgar/pkg/cpan/Module-Signature/trunk/
    csw/mgar/pkg/cpan/Module-Starter/trunk/
    csw/mgar/pkg/cpan/Module-Version/trunk/
    csw/mgar/pkg/cpan/Module-Versions-Report/trunk/
    csw/mgar/pkg/cpan/Net-Analysis/trunk/
    csw/mgar/pkg/cpan/Net-CIDR/trunk/
    csw/mgar/pkg/cpan/Net-CIDR-Lite/trunk/
    csw/mgar/pkg/cpan/Net-DNS/trunk/
    csw/mgar/pkg/cpan/Net-DNS-Resolver-Programmable/trunk/
    csw/mgar/pkg/cpan/Net-Daemon/trunk/
    csw/mgar/pkg/cpan/Net-IDN-Encode/trunk/
    csw/mgar/pkg/cpan/Net-IDN-Nameprep/trunk/
    csw/mgar/pkg/cpan/Net-IP/trunk/
    csw/mgar/pkg/cpan/Net-Jabber/trunk/
    csw/mgar/pkg/cpan/Net-NIS/trunk/
    csw/mgar/pkg/cpan/Net-Netmask/trunk/
    csw/mgar/pkg/cpan/Net-Patricia/trunk/
    csw/mgar/pkg/cpan/Net-Pcap/trunk/
    csw/mgar/pkg/cpan/Net-SMTP-SSL/trunk/
    csw/mgar/pkg/cpan/Net-SNMP/trunk/
    csw/mgar/pkg/cpan/Net-SSH/trunk/
    csw/mgar/pkg/cpan/Net-SSH-Perl/trunk/
    csw/mgar/pkg/cpan/Net-SSH2/trunk/
    csw/mgar/pkg/cpan/Net-SSLeay/trunk/
    csw/mgar/pkg/cpan/Net-Server/trunk/
    csw/mgar/pkg/cpan/Net-Syslog/tags/Net-Syslog-0.04,REV=2010.10.27/
    csw/mgar/pkg/cpan/Net-Syslog/trunk/
    csw/mgar/pkg/cpan/Net-Telnet/trunk/
    csw/mgar/pkg/cpan/Net-UCP/trunk/
    csw/mgar/pkg/cpan/Net-UCP-Common/trunk/
    csw/mgar/pkg/cpan/Net-UCP-IntTimeout/trunk/
    csw/mgar/pkg/cpan/Net-UCP-TransactionManager/trunk/
    csw/mgar/pkg/cpan/Net-XMPP/trunk/
    csw/mgar/pkg/cpan/Net-Z3950-ZOOM/trunk/
    csw/mgar/pkg/cpan/Net-ext/trunk/
    csw/mgar/pkg/cpan/NetAddr-IP/trunk/
    csw/mgar/pkg/cpan/NetPacket/trunk/
    csw/mgar/pkg/cpan/Number-Compare/trunk/
    csw/mgar/pkg/cpan/Number-Format/trunk/
    csw/mgar/pkg/cpan/OLE-Storage_Lite/trunk/
    csw/mgar/pkg/cpan/OOTools/trunk/
    csw/mgar/pkg/cpan/Object-Accessor/trunk/
    csw/mgar/pkg/cpan/Object-MultiType/trunk/
    csw/mgar/pkg/cpan/Object-Realize-Later/trunk/
    csw/mgar/pkg/cpan/Opcodes/trunk/
    csw/mgar/pkg/cpan/OpenGL/trunk/
    csw/mgar/pkg/cpan/PAR/trunk/
    csw/mgar/pkg/cpan/PAR-Dist/trunk/
    csw/mgar/pkg/cpan/PDF-API2/trunk/
    csw/mgar/pkg/cpan/PDF-Reuse/trunk/
    csw/mgar/pkg/cpan/PDF-Reuse-Barcode/trunk/
    csw/mgar/pkg/cpan/PDL/trunk/
    csw/mgar/pkg/cpan/POE/trunk/
    csw/mgar/pkg/cpan/POE-Test-Loops/trunk/
    csw/mgar/pkg/cpan/PPIx-Regexp/trunk/
    csw/mgar/pkg/cpan/PPIx-Utilities/trunk/
    csw/mgar/pkg/cpan/Package-Constants/trunk/
    csw/mgar/pkg/cpan/PadWalker/trunk/
    csw/mgar/pkg/cpan/Pango/trunk/
    csw/mgar/pkg/cpan/Parallel-ForkManager/trunk/
    csw/mgar/pkg/cpan/Params-Check/trunk/
    csw/mgar/pkg/cpan/Params-Util/trunk/
    csw/mgar/pkg/cpan/Params-Validate/trunk/
    csw/mgar/pkg/cpan/Parse-CPAN-Meta/trunk/
    csw/mgar/pkg/cpan/Parse-RecDescent/trunk/
    csw/mgar/pkg/cpan/Parse-Syslog/trunk/
    csw/mgar/pkg/cpan/Passwd-Unix/trunk/
    csw/mgar/pkg/cpan/PatchReader/trunk/
    csw/mgar/pkg/cpan/Path-Class/trunk/
    csw/mgar/pkg/cpan/Perl-Critic/trunk/
    csw/mgar/pkg/cpan/Perl-OSType/trunk/
    csw/mgar/pkg/cpan/Perl-Tidy/trunk/
    csw/mgar/pkg/cpan/Perl6-Export/tags/Perl6-Export-0.07,REV=2010.06.23/
    csw/mgar/pkg/cpan/Perl6-Export/trunk/
    csw/mgar/pkg/cpan/Perl6-Export-Attrs/tags/Perl6-Export-Attrs-0.0.3,REV=2010.06.23/
    csw/mgar/pkg/cpan/Perl6-Export-Attrs/trunk/
    csw/mgar/pkg/cpan/Perl6-Slurp/tags/Perl6-Slurp-0.03,REV=2010.06.24/
    csw/mgar/pkg/cpan/Perl6-Slurp/trunk/
    csw/mgar/pkg/cpan/PerlIO-eol/trunk/
    csw/mgar/pkg/cpan/PerlIO-gzip/trunk/
    csw/mgar/pkg/cpan/PerlIO-via-Bzip2/trunk/
    csw/mgar/pkg/cpan/PerlIO-via-dynamic/trunk/
    csw/mgar/pkg/cpan/PerlIO-via-symlink/trunk/
    csw/mgar/pkg/cpan/PlRPC/trunk/
    csw/mgar/pkg/cpan/Plack/trunk/
    csw/mgar/pkg/cpan/Pod-Coverage/trunk/
    csw/mgar/pkg/cpan/Pod-Escapes/trunk/
    csw/mgar/pkg/cpan/Pod-POM/trunk/
    csw/mgar/pkg/cpan/Pod-Readme/trunk/
    csw/mgar/pkg/cpan/Pod-Simple/trunk/
    csw/mgar/pkg/cpan/Pod-Spell/trunk/
    csw/mgar/pkg/cpan/Pod-Tests/trunk/
    csw/mgar/pkg/cpan/PodToHTML/trunk/
    csw/mgar/pkg/cpan/Probe-Perl/trunk/
    csw/mgar/pkg/cpan/Proc-ProcessTable/trunk/
    csw/mgar/pkg/cpan/RADIUS-UserFile/trunk/
    csw/mgar/pkg/cpan/RPC-XML/tags/RPC-XML-0.74,REV=2011.02.13/
    csw/mgar/pkg/cpan/RPC-XML/trunk/
    csw/mgar/pkg/cpan/Readonly/tags/Readonly-1.03,REV=2010.06.23/
    csw/mgar/pkg/cpan/Readonly/trunk/
    csw/mgar/pkg/cpan/Regexp-Common/trunk/
    csw/mgar/pkg/cpan/Regexp-Shellish/trunk/
    csw/mgar/pkg/cpan/SDF/trunk/
    csw/mgar/pkg/cpan/SMS-Send/trunk/
    csw/mgar/pkg/cpan/SOAP-Lite/trunk/
    csw/mgar/pkg/cpan/SOAP-WSDL/trunk/
    csw/mgar/pkg/cpan/SQL-Statement/trunk/
    csw/mgar/pkg/cpan/SVK/trunk/
    csw/mgar/pkg/cpan/SVN-Dump/trunk/
    csw/mgar/pkg/cpan/SVN-Mirror/trunk/
    csw/mgar/pkg/cpan/SVN-Notify/trunk/
    csw/mgar/pkg/cpan/SVN-Simple/trunk/
    csw/mgar/pkg/cpan/Scalar-List-Utils/trunk/
    csw/mgar/pkg/cpan/Schedule-At/trunk/
    csw/mgar/pkg/cpan/Schedule-Cron/trunk/
    csw/mgar/pkg/cpan/Scope-Guard/trunk/
    csw/mgar/pkg/cpan/Search-Xapian/trunk/
    csw/mgar/pkg/cpan/Shout/trunk/
    csw/mgar/pkg/cpan/Smart-Comments/tags/Smart-Comments-1.0.4,REV=2010.06.23/
    csw/mgar/pkg/cpan/Smart-Comments/trunk/
    csw/mgar/pkg/cpan/Snowball-Norwegian/trunk/
    csw/mgar/pkg/cpan/Snowball-Swedish/trunk/
    csw/mgar/pkg/cpan/Socket6/trunk/
    csw/mgar/pkg/cpan/Solaris-DeviceTree/trunk/
    csw/mgar/pkg/cpan/Solaris-Sysconf/trunk/
    csw/mgar/pkg/cpan/Sort-Naturally/trunk/
    csw/mgar/pkg/cpan/Sort-Versions/trunk/
    csw/mgar/pkg/cpan/Spiffy/trunk/
    csw/mgar/pkg/cpan/Statistics-Descriptive/trunk/
    csw/mgar/pkg/cpan/String-Approx/trunk/
    csw/mgar/pkg/cpan/String-CRC32/trunk/
    csw/mgar/pkg/cpan/String-Format/trunk/
    csw/mgar/pkg/cpan/String-ShellQuote/trunk/
    csw/mgar/pkg/cpan/Struct-Compare/trunk/
    csw/mgar/pkg/cpan/Sub-Delete/trunk/
    csw/mgar/pkg/cpan/Sub-Exporter/trunk/
    csw/mgar/pkg/cpan/Sub-Install/trunk/
    csw/mgar/pkg/cpan/Sub-Name/trunk/
    csw/mgar/pkg/cpan/Sub-Override/trunk/
    csw/mgar/pkg/cpan/Sub-Uplevel/trunk/
    csw/mgar/pkg/cpan/Sys-Hostname-Long/trunk/
    csw/mgar/pkg/cpan/Sys-SigAction/trunk/
    csw/mgar/pkg/cpan/Task-Weaken/trunk/
    csw/mgar/pkg/cpan/Template-Extract/trunk/
    csw/mgar/pkg/cpan/Template-TAL/trunk/
    csw/mgar/pkg/cpan/Template-Toolkit/trunk/
    csw/mgar/pkg/cpan/Term-Cap/trunk/
    csw/mgar/pkg/cpan/Term-Size/trunk/
    csw/mgar/pkg/cpan/Term-UI/trunk/
    csw/mgar/pkg/cpan/TermReadKey/trunk/
    csw/mgar/pkg/cpan/Test-Builder-Tester/trunk/
    csw/mgar/pkg/cpan/Test-Class/trunk/
    csw/mgar/pkg/cpan/Test-ClassAPI/trunk/
    csw/mgar/pkg/cpan/Test-Deep/trunk/
    csw/mgar/pkg/cpan/Test-Differences/trunk/
    csw/mgar/pkg/cpan/Test-Distribution/trunk/
    csw/mgar/pkg/cpan/Test-Exception/trunk/
    csw/mgar/pkg/cpan/Test-Inline/trunk/
    csw/mgar/pkg/cpan/Test-LongString/trunk/
    csw/mgar/pkg/cpan/Test-Manifest/trunk/
    csw/mgar/pkg/cpan/Test-Memory-Cycle/trunk/
    csw/mgar/pkg/cpan/Test-MockObject/trunk/
    csw/mgar/pkg/cpan/Test-NoWarnings/trunk/
    csw/mgar/pkg/cpan/Test-Pod/trunk/
    csw/mgar/pkg/cpan/Test-Pod-Coverage/trunk/
    csw/mgar/pkg/cpan/Test-Requires/trunk/
    csw/mgar/pkg/cpan/Test-Script/trunk/
    csw/mgar/pkg/cpan/Test-SharedFork/trunk/
    csw/mgar/pkg/cpan/Test-Simple/trunk/
    csw/mgar/pkg/cpan/Test-TCP/trunk/
    csw/mgar/pkg/cpan/Test-Tester/trunk/
    csw/mgar/pkg/cpan/Test-WWW-Mechanize/trunk/
    csw/mgar/pkg/cpan/Test-Warn/trunk/
    csw/mgar/pkg/cpan/Test-XML/trunk/
    csw/mgar/pkg/cpan/Test-use-ok/trunk/
    csw/mgar/pkg/cpan/Text-Autoformat/trunk/
    csw/mgar/pkg/cpan/Text-CSV/trunk/
    csw/mgar/pkg/cpan/Text-CSV_XS/trunk/
    csw/mgar/pkg/cpan/Text-Diff/trunk/
    csw/mgar/pkg/cpan/Text-DoubleMetaphone/trunk/
    csw/mgar/pkg/cpan/Text-Format/trunk/
    csw/mgar/pkg/cpan/Text-GenderFromName/trunk/
    csw/mgar/pkg/cpan/Text-German/trunk/
    csw/mgar/pkg/cpan/Text-Glob/trunk/
    csw/mgar/pkg/cpan/Text-Iconv/trunk/
    csw/mgar/pkg/cpan/Text-Quoted/trunk/
    csw/mgar/pkg/cpan/Text-Reform/trunk/
    csw/mgar/pkg/cpan/Text-Scraper/trunk/
    csw/mgar/pkg/cpan/Text-Tabs+Wrap/trunk/
    csw/mgar/pkg/cpan/Text-Template/trunk/
    csw/mgar/pkg/cpan/Text-WikiFormat/trunk/
    csw/mgar/pkg/cpan/Text-Wrapper/trunk/
    csw/mgar/pkg/cpan/Text-vFile-asData/trunk/
    csw/mgar/pkg/cpan/Tie-DBI/trunk/
    csw/mgar/pkg/cpan/Tie-EncryptedHash/trunk/
    csw/mgar/pkg/cpan/Tie-IxHash/trunk/
    csw/mgar/pkg/cpan/Tie-MLDBM/trunk/
    csw/mgar/pkg/cpan/Tie-Util/trunk/
    csw/mgar/pkg/cpan/Time-Format/trunk/
    csw/mgar/pkg/cpan/Time-HiRes/trunk/
    csw/mgar/pkg/cpan/Time-Period/trunk/
    csw/mgar/pkg/cpan/Time-Progress/trunk/
    csw/mgar/pkg/cpan/Time-modules/trunk/
    csw/mgar/pkg/cpan/TimeDate/trunk/
    csw/mgar/pkg/cpan/Tk/trunk/
    csw/mgar/pkg/cpan/Tree-DAG_Node/trunk/
    csw/mgar/pkg/cpan/Tree-Simple/trunk/
    csw/mgar/pkg/cpan/Try-Tiny/trunk/
    csw/mgar/pkg/cpan/UNIVERSAL-can/trunk/
    csw/mgar/pkg/cpan/UNIVERSAL-isa/trunk/
    csw/mgar/pkg/cpan/UNIVERSAL-moniker/trunk/
    csw/mgar/pkg/cpan/UNIVERSAL-require/trunk/
    csw/mgar/pkg/cpan/URI/trunk/
    csw/mgar/pkg/cpan/Unicode-Map/trunk/
    csw/mgar/pkg/cpan/Unicode-Map8/trunk/
    csw/mgar/pkg/cpan/Unicode-MapUTF8/trunk/
    csw/mgar/pkg/cpan/Unicode-String/trunk/
    csw/mgar/pkg/cpan/Unicode-Stringprep/trunk/
    csw/mgar/pkg/cpan/Unix-Statgrab/trunk/
    csw/mgar/pkg/cpan/Unix-Syslog/trunk/
    csw/mgar/pkg/cpan/User-Identity/trunk/
    csw/mgar/pkg/cpan/VCP/trunk/
    csw/mgar/pkg/cpan/VCP-Dest-svk/trunk/
    csw/mgar/pkg/cpan/WWW-Curl/trunk/
    csw/mgar/pkg/cpan/WWW-Mechanize/trunk/
    csw/mgar/pkg/cpan/Want/trunk/
    csw/mgar/pkg/cpan/X11-Protocol/trunk/
    csw/mgar/pkg/cpan/XML-Atom/trunk/
    csw/mgar/pkg/cpan/XML-Atom-SimpleFeed/trunk/
    csw/mgar/pkg/cpan/XML-AutoWriter/trunk/
    csw/mgar/pkg/cpan/XML-DOM/trunk/
    csw/mgar/pkg/cpan/XML-Dumper/trunk/
    csw/mgar/pkg/cpan/XML-Encoding/trunk/
    csw/mgar/pkg/cpan/XML-GDOME/trunk/
    csw/mgar/pkg/cpan/XML-GDOME-XSLT/trunk/
    csw/mgar/pkg/cpan/XML-LibXML/trunk/
    csw/mgar/pkg/cpan/XML-LibXSLT/trunk/
    csw/mgar/pkg/cpan/XML-NamespaceSupport/trunk/
    csw/mgar/pkg/cpan/XML-Parser/trunk/
    csw/mgar/pkg/cpan/XML-RSS/trunk/
    csw/mgar/pkg/cpan/XML-Records/trunk/
    csw/mgar/pkg/cpan/XML-RegExp/trunk/
    csw/mgar/pkg/cpan/XML-SAX/trunk/
    csw/mgar/pkg/cpan/XML-SemanticDiff/trunk/
    csw/mgar/pkg/cpan/XML-Simple/trunk/
    csw/mgar/pkg/cpan/XML-Smart/trunk/
    csw/mgar/pkg/cpan/XML-Stream/trunk/
    csw/mgar/pkg/cpan/XML-TokeParser/trunk/
    csw/mgar/pkg/cpan/XML-Twig/trunk/
    csw/mgar/pkg/cpan/XML-XPath/trunk/
    csw/mgar/pkg/cpan/XML-XSLT/trunk/
    csw/mgar/pkg/cpan/YAML/trunk/
    csw/mgar/pkg/cpan/YAML-Syck/trunk/
    csw/mgar/pkg/cpan/ack/trunk/
    csw/mgar/pkg/cpan/common-sense/trunk/
    csw/mgar/pkg/cpan/constant-lexical/trunk/
    csw/mgar/pkg/cpan/html2text/trunk/
    csw/mgar/pkg/cpan/libapreq/trunk/
    csw/mgar/pkg/cpan/libapreq2/trunk/
    csw/mgar/pkg/cpan/libwww-perl/trunk/
    csw/mgar/pkg/cpan/libxml-perl/trunk/
    csw/mgar/pkg/cpan/mod_perl/trunk/
    csw/mgar/pkg/cpan/mod_perl2/trunk/
    csw/mgar/pkg/cpan/perl-ldap/trunk/
    csw/mgar/pkg/cpan/perl-mozldap/trunk/
    csw/mgar/pkg/cpan/perlconsole/trunk/
    csw/mgar/pkg/cpan/pmtools/trunk/
    csw/mgar/pkg/cpan/prefork/trunk/
    csw/mgar/pkg/cpan/psh/trunk/
    csw/mgar/pkg/cpan/sol-inst/trunk/
    csw/mgar/pkg/cpan/version/trunk/
    csw/mgar/pkg/cpptest/trunk/
    csw/mgar/pkg/cronolog/trunk/
    csw/mgar/pkg/cscope/trunk/
    csw/mgar/pkg/csup/trunk/
    csw/mgar/pkg/cswclassutils/branches/cswclassutils-usergroup-idrange/
    csw/mgar/pkg/cswclassutils/trunk/
    csw/mgar/pkg/cswcommon/trunk/
    csw/mgar/pkg/cswgpgkey/trunk/
    csw/mgar/pkg/cswhookdebug/trunk/
    csw/mgar/pkg/cswpkgloghooks/tags/2.0-2010.12.18/
    csw/mgar/pkg/cswpkgloghooks/trunk/
    csw/mgar/pkg/cswutils/trunk/
    csw/mgar/pkg/csync2/trunk/
    csw/mgar/pkg/cups/branches/cups-1.3/
    csw/mgar/pkg/cups/branches/cups-1.4.0/
    csw/mgar/pkg/cups/tags/cups-1.3.9/
    csw/mgar/pkg/cups/trunk/
    csw/mgar/pkg/curl/tags/curl-7.20.0,REV=2010.02.15/
    csw/mgar/pkg/curl/tags/curl-7.21.2-last-unified-soname-build/
    csw/mgar/pkg/cvs/trunk/
    csw/mgar/pkg/cvs2svn/trunk/
    csw/mgar/pkg/cvsproxy/trunk/
    csw/mgar/pkg/cvsps/trunk/
    csw/mgar/pkg/cx-oracle/trunk/
    csw/mgar/pkg/cyrus_imapd/trunk/
    csw/mgar/pkg/daemontools/trunk/
    csw/mgar/pkg/daimonin/trunk/
    csw/mgar/pkg/dante/trunk/
    csw/mgar/pkg/dbus/tags/dbus-1.3.1,REV=2010.07.05/
    csw/mgar/pkg/dbus/trunk/
    csw/mgar/pkg/dbus-glib/trunk/
    csw/mgar/pkg/dcc/trunk/
    csw/mgar/pkg/dcraw/trunk/
    csw/mgar/pkg/dcraw/trunk/files/
    csw/mgar/pkg/ddd/trunk/
    csw/mgar/pkg/ddrescue/trunk/
    csw/mgar/pkg/debian-vote/trunk/
    csw/mgar/pkg/dejagnu/trunk/
    csw/mgar/pkg/denyhosts/trunk/
    csw/mgar/pkg/dhcp/trunk/
    csw/mgar/pkg/dhcping/trunk/
    csw/mgar/pkg/di/tags/di-4.24,REV=2010.06.02/
    csw/mgar/pkg/di/trunk/
    csw/mgar/pkg/dia/trunk/
    csw/mgar/pkg/dia-shapes/trunk/
    csw/mgar/pkg/dialog/trunk/
    csw/mgar/pkg/diffuse/trunk/
    csw/mgar/pkg/diffutils/trunk/
    csw/mgar/pkg/disktype/trunk/
    csw/mgar/pkg/distcc/trunk/
    csw/mgar/pkg/djbdns/trunk/
    csw/mgar/pkg/dnstop/trunk/
    csw/mgar/pkg/dnstracer/trunk/
    csw/mgar/pkg/dnswalk/trunk/
    csw/mgar/pkg/docbook/trunk/
    csw/mgar/pkg/docbook-dtds/trunk/
    csw/mgar/pkg/docbook-style-dsssl/trunk/
    csw/mgar/pkg/docbook-style-xsl/trunk/
    csw/mgar/pkg/dovecot/trunk/
    csw/mgar/pkg/doxygen/tags/doxygen-1.6.1,REV=2009.11.08/
    csw/mgar/pkg/doxygen/tags/doxygen-1.6.3,REV_2010.02.24/
    csw/mgar/pkg/doxygen/tags/doxygen-1.7.0,REV=2010.06.19/
    csw/mgar/pkg/doxygen/trunk/
    csw/mgar/pkg/dpkg/trunk/
    csw/mgar/pkg/drupal/trunk/
    csw/mgar/pkg/dsh/trunk/
    csw/mgar/pkg/dsniff/trunk/
    csw/mgar/pkg/dtracetoolkit/trunk/
    csw/mgar/pkg/duplicity/trunk/
    csw/mgar/pkg/easytag/trunk/
    csw/mgar/pkg/ectags/trunk/
    csw/mgar/pkg/eet/trunk/
    csw/mgar/pkg/eina/trunk/
    csw/mgar/pkg/elinks/trunk/
    csw/mgar/pkg/emacs/trunk/
    csw/mgar/pkg/emacs_sitestart/trunk/
    csw/mgar/pkg/enchant/trunk/
    csw/mgar/pkg/enscript/trunk/
    csw/mgar/pkg/erlang/trunk/
    csw/mgar/pkg/esound/trunk/
    csw/mgar/pkg/esvn/trunk/
    csw/mgar/pkg/eterm/trunk/
    csw/mgar/pkg/ethereal/trunk/
    csw/mgar/pkg/euler/trunk/
    csw/mgar/pkg/eventlog/trunk/
    csw/mgar/pkg/evince/trunk/
    csw/mgar/pkg/evolution/trunk/
    csw/mgar/pkg/evolution-ds/trunk/
    csw/mgar/pkg/evolution-exchange/trunk/
    csw/mgar/pkg/evolution-mapi/trunk/
    csw/mgar/pkg/evolution-webcal/trunk/
    csw/mgar/pkg/examples/64-bit/trunk/
    csw/mgar/pkg/examples/loose-files/trunk/
    csw/mgar/pkg/examples/minimalsmf/trunk/
    csw/mgar/pkg/examples/modulations/branches/minimal-version-modulation/
    csw/mgar/pkg/examples/modulations/trunk/
    csw/mgar/pkg/examples/multiple-versions/trunk/
    csw/mgar/pkg/examples/users-and-groups/trunk/
    csw/mgar/pkg/exempi/trunk/
    csw/mgar/pkg/exiftool/trunk/
    csw/mgar/pkg/exim/branches/dir-loc-fixes/
    csw/mgar/pkg/exim/tags/4.72-2010.12.18/
    csw/mgar/pkg/exim/trunk/
    csw/mgar/pkg/exiv2/trunk/
    csw/mgar/pkg/expect/trunk/
    csw/mgar/pkg/facter/tags/facter-1.5.8,REV=2011.03.06/
    csw/mgar/pkg/facter/trunk/
    csw/mgar/pkg/fakeroot/trunk/
    csw/mgar/pkg/fam/trunk/
    csw/mgar/pkg/fastcgi/trunk/
    csw/mgar/pkg/fax2png/trunk/
    csw/mgar/pkg/fbopenssl/trunk/
    csw/mgar/pkg/fetchmail/trunk/
    csw/mgar/pkg/ffcall/trunk/
    csw/mgar/pkg/ffmpeg/trunk/
    csw/mgar/pkg/fftw/trunk/
    csw/mgar/pkg/figlet/trunk/
    csw/mgar/pkg/fileutils/trunk/
    csw/mgar/pkg/filezilla/trunk/
    csw/mgar/pkg/findutils/trunk/
    csw/mgar/pkg/fio/trunk/
    csw/mgar/pkg/firefox/branches/firefox-8.0.1-raos/
    csw/mgar/pkg/firefox/branches/firefox2-maintenance/
    csw/mgar/pkg/firefox/branches/firefox3-packaging/
    csw/mgar/pkg/firefox/branches/firefox3.5-packaging/
    csw/mgar/pkg/firefox/branches/mwatters/
    csw/mgar/pkg/firefox/trunk/
    csw/mgar/pkg/firefox-l10n/trunk/
    csw/mgar/pkg/flac/trunk/
    csw/mgar/pkg/flex-2.5.4a/trunk/
    csw/mgar/pkg/flex_new/trunk/
    csw/mgar/pkg/flphoto/trunk/
    csw/mgar/pkg/fltk/trunk/
    csw/mgar/pkg/fontconfig/trunk/
    csw/mgar/pkg/fontforge/trunk/
    csw/mgar/pkg/formencode/trunk/
    csw/mgar/pkg/fortune4all/trunk/
    csw/mgar/pkg/fox/trunk/
    csw/mgar/pkg/fping/trunk/
    csw/mgar/pkg/fprobe/trunk/
    csw/mgar/pkg/freeciv/trunk/
    csw/mgar/pkg/freedesktop/libxcb/trunk/
    csw/mgar/pkg/freedesktop/xcb-util/trunk/
    csw/mgar/pkg/freedesktop/xcbproto/tags/xcbproto-1.4,REV=2009.02.25-testing-b1/
    csw/mgar/pkg/freedesktop/xcbproto/trunk/
    csw/mgar/pkg/freeglut/trunk/
    csw/mgar/pkg/freehdl/trunk/
    csw/mgar/pkg/freeradius/trunk/
    csw/mgar/pkg/freerdp/trunk/
    csw/mgar/pkg/freetds/trunk/
    csw/mgar/pkg/freetype/tags/freetype-2.3.9,REV=2009.09.11/
    csw/mgar/pkg/fribidi/trunk/
    csw/mgar/pkg/ftgl/trunk/
    csw/mgar/pkg/gaim/trunk/
    csw/mgar/pkg/ganglia/branches/ganglia-3.1.3-rc/
    csw/mgar/pkg/ganglia/branches/ganglia-3.1.4-rc/
    csw/mgar/pkg/ganglia/branches/ganglia-3.1.6-rc/
    csw/mgar/pkg/ganglia/branches/ganglia-3.1.7/
    csw/mgar/pkg/ganglia/tags/3.1.7-2011.11.27/
    csw/mgar/pkg/ganglia/trunk/
    csw/mgar/pkg/gar/trunk/
    csw/mgar/pkg/gardev/trunk/
    csw/mgar/pkg/gawk/trunk/
    csw/mgar/pkg/gbc/trunk/
    csw/mgar/pkg/gcal/trunk/
    csw/mgar/pkg/gcc4/branches/ada/
    csw/mgar/pkg/gcc4/branches/ada-enable/
    csw/mgar/pkg/gcc4/branches/bootstrap-3.4/
    csw/mgar/pkg/gcc4/branches/compat-test/
    csw/mgar/pkg/gcc4/branches/dublin-fix/
    csw/mgar/pkg/gcc4/branches/gcc3libs/
    csw/mgar/pkg/gcc4/branches/gccgo/
    csw/mgar/pkg/gcc4/branches/private-lib/
    csw/mgar/pkg/gcc4/tags/gcc-4.3.3/
    csw/mgar/pkg/gcc4/trunk/
    csw/mgar/pkg/gccgo/trunk/
    csw/mgar/pkg/gcpio/trunk/
    csw/mgar/pkg/gd/branches/gd-x11-reloaded/
    csw/mgar/pkg/gd/trunk/
    csw/mgar/pkg/gdal/trunk/
    csw/mgar/pkg/gdb/trunk/
    csw/mgar/pkg/gdbm/trunk/
    csw/mgar/pkg/gdk-pixbuf/trunk/
    csw/mgar/pkg/gdmap/trunk/
    csw/mgar/pkg/gdome2/trunk/
    csw/mgar/pkg/geda/trunk/
    csw/mgar/pkg/geeqie/trunk/
    csw/mgar/pkg/gem-rake/trunk/
    csw/mgar/pkg/gengetopt/trunk/
    csw/mgar/pkg/genshi/trunk/
    csw/mgar/pkg/geolitedb/trunk/
    csw/mgar/pkg/geos/trunk/
    csw/mgar/pkg/getopt/trunk/
    csw/mgar/pkg/gettext/trunk/
    csw/mgar/pkg/gforth/trunk/
    csw/mgar/pkg/gftp/trunk/
    csw/mgar/pkg/ghc/trunk/
    csw/mgar/pkg/ghex/trunk/
    csw/mgar/pkg/ghostscript/trunk/
    csw/mgar/pkg/gif2png/trunk/
    csw/mgar/pkg/giflib/tags/giflib-4.1.6,REV=2010.03.17-alternatives/
    csw/mgar/pkg/gifsicle/trunk/
    csw/mgar/pkg/gimp/trunk/
    csw/mgar/pkg/git/tags/1.6.2.1-2009.04.14/
    csw/mgar/pkg/git/trunk/
    csw/mgar/pkg/git-subtree/trunk/
    csw/mgar/pkg/gitg/trunk/
    csw/mgar/pkg/gitosis/trunk/
    csw/mgar/pkg/gkrellm/trunk/
    csw/mgar/pkg/glew/trunk/
    csw/mgar/pkg/glib/trunk/
    csw/mgar/pkg/glib2/branches/glib2-2.23.x/
    csw/mgar/pkg/glib2/trunk/
    csw/mgar/pkg/glibmm/trunk/
    csw/mgar/pkg/global/trunk/
    csw/mgar/pkg/glpk/trunk/
    csw/mgar/pkg/gluezilla/trunk/
    csw/mgar/pkg/gmake/trunk/
    csw/mgar/pkg/gmt/trunk/
    csw/mgar/pkg/gmtcoast/tags/gmt_gmtcoast-2.1.0,REV=2010.09.10/
    csw/mgar/pkg/gmtcoast/trunk/
    csw/mgar/pkg/gnome-base/gail/trunk/
    csw/mgar/pkg/gnome-base/gconf-editor/trunk/
    csw/mgar/pkg/gnome-base/gconf2/trunk/
    csw/mgar/pkg/gnome-base/gnome-icon-theme/trunk/
    csw/mgar/pkg/gnome-base/gnome-keyring/trunk/
    csw/mgar/pkg/gnome-base/gnome-mime-data/trunk/
    csw/mgar/pkg/gnome-base/gnome-terminal/trunk/
    csw/mgar/pkg/gnome-base/gnomedesktop/trunk/
    csw/mgar/pkg/gnome-base/gnomemedia/trunk/
    csw/mgar/pkg/gnome-base/gnomevfs2/trunk/
    csw/mgar/pkg/gnome-base/libbonobo2/trunk/
    csw/mgar/pkg/gnome-base/libgnomecanvas/trunk/
    csw/mgar/pkg/gnome-base/libgnomedb/trunk/
    csw/mgar/pkg/gnome-base/libgnomekbd/trunk/
    csw/mgar/pkg/gnome-base/libgnomeprint/trunk/
    csw/mgar/pkg/gnome-base/libgnomeprintui/trunk/
    csw/mgar/pkg/gnome-base/libgnomeui/trunk/
    csw/mgar/pkg/gnome-base/orbit2/trunk/
    csw/mgar/pkg/gnome-ssh-askpass/tags/gnome-ssh-askpass-5.9p1,REV=2011.11.13/
    csw/mgar/pkg/gnome-ssh-askpass/trunk/
    csw/mgar/pkg/gnulib/trunk/
    csw/mgar/pkg/gnulinks/trunk/
    csw/mgar/pkg/gnumeric/trunk/
    csw/mgar/pkg/gnupg/trunk/
    csw/mgar/pkg/gnupg2/trunk/
    csw/mgar/pkg/gnupg_minimal/trunk/
    csw/mgar/pkg/gnuplot/trunk/
    csw/mgar/pkg/gnutls/branches/libgnutls13/
    csw/mgar/pkg/gnutls/trunk/
    csw/mgar/pkg/gobject-introspection/trunk/
    csw/mgar/pkg/goocanvas/trunk/
    csw/mgar/pkg/google-gflags/trunk/
    csw/mgar/pkg/googlemock/trunk/
    csw/mgar/pkg/googletest/trunk/
    csw/mgar/pkg/gource/trunk/
    csw/mgar/pkg/gperf/trunk/
    csw/mgar/pkg/gpgme/trunk/
    csw/mgar/pkg/gphoto2/trunk/
    csw/mgar/pkg/gpicview/trunk/
    csw/mgar/pkg/graphviz/trunk/
    csw/mgar/pkg/grep/trunk/
    csw/mgar/pkg/groff/trunk/
    csw/mgar/pkg/gsasl/trunk/
    csw/mgar/pkg/gsm/trunk/
    csw/mgar/pkg/gstplugins/trunk/
    csw/mgar/pkg/gstplugins_bad/trunk/
    csw/mgar/pkg/gstplugins_good/trunk/
    csw/mgar/pkg/gstplugins_ugly/trunk/
    csw/mgar/pkg/gstreamer/trunk/
    csw/mgar/pkg/gtar/trunk/
    csw/mgar/pkg/gtk-doc/trunk/
    csw/mgar/pkg/gtk2/branches/2.24-raos/
    csw/mgar/pkg/gtk2/trunk/
    csw/mgar/pkg/gtkpod/trunk/
    csw/mgar/pkg/gtksourceview/trunk/
    csw/mgar/pkg/gtkwave/trunk/
    csw/mgar/pkg/gts/trunk/
    csw/mgar/pkg/guile/trunk/
    csw/mgar/pkg/guilt/trunk/
    csw/mgar/pkg/gvim/trunk/
    csw/mgar/pkg/gxmessage/trunk/
    csw/mgar/pkg/gzip/trunk/
    csw/mgar/pkg/hachoir-core/trunk/
    csw/mgar/pkg/hachoir-parser/trunk/
    csw/mgar/pkg/handbrake/trunk/
    csw/mgar/pkg/hatari/trunk/
    csw/mgar/pkg/hdf5-6/tags/hdf5-1.8.3,REV=2009.11.03/
    csw/mgar/pkg/hdf5-6/trunk/
    csw/mgar/pkg/hdf5-7/tags/hdf5-1.8.3,REV=2009.11.03/
    csw/mgar/pkg/hdf5-7/trunk/
    csw/mgar/pkg/help2man/tags/help2man-1.36.4,REV=2008.09.18/
    csw/mgar/pkg/help2man/trunk/
    csw/mgar/pkg/hexdump/trunk/
    csw/mgar/pkg/hicolor-icon-theme/trunk/
    csw/mgar/pkg/htmldoc/trunk/
    csw/mgar/pkg/htmltidy/trunk/
    csw/mgar/pkg/httperf/trunk/
    csw/mgar/pkg/httping/trunk/
    csw/mgar/pkg/hwloc/trunk/
    csw/mgar/pkg/hylafax/trunk/
    csw/mgar/pkg/hyperion/trunk/
    csw/mgar/pkg/hypermail/trunk/
    csw/mgar/pkg/icecast/trunk/
    csw/mgar/pkg/icinga/trunk/
    csw/mgar/pkg/icon-naming-utils/trunk/
    csw/mgar/pkg/id3lib/trunk/
    csw/mgar/pkg/idzebra/trunk/
    csw/mgar/pkg/iftop/trunk/
    csw/mgar/pkg/ilmbase2/trunk/
    csw/mgar/pkg/image-editor/trunk/
    csw/mgar/pkg/imap-c-client/trunk/
    csw/mgar/pkg/imapfilter/trunk/
    csw/mgar/pkg/imapproxy/trunk/
    csw/mgar/pkg/imapsync/trunk/
    csw/mgar/pkg/imlib/trunk/
    csw/mgar/pkg/imlib2/trunk/
    csw/mgar/pkg/imlib2_loaders/trunk/
    csw/mgar/pkg/indent/trunk/
    csw/mgar/pkg/inetutils/trunk/
    csw/mgar/pkg/intltool/trunk/
    csw/mgar/pkg/iotop/trunk/
    csw/mgar/pkg/iozone/trunk/
    csw/mgar/pkg/iperf/trunk/
    csw/mgar/pkg/ipv6calc/trunk/
    csw/mgar/pkg/irssi/trunk/
    csw/mgar/pkg/iso-codes/trunk/
    csw/mgar/pkg/jack/trunk/
    csw/mgar/pkg/java/ajcbeanutils/tags/commons_beanutils-1.8.0,REV=2009.02.24-testing-b1/
    csw/mgar/pkg/java/ajcbeanutils/tags/commons_beanutils-1.8.0,REV=2009.02.24-unstable-20090302/
    csw/mgar/pkg/java/ajcbeanutils/trunk/
    csw/mgar/pkg/java/ajcchain/tags/commons_chain-1.2,REV=2009.02.24-testing-b1/
    csw/mgar/pkg/java/ajcchain/tags/commons_chain-1.2,REV=2009.02.24-unstable-20090302/
    csw/mgar/pkg/java/ajcchain/trunk/
    csw/mgar/pkg/java/ajccli/tags/commons_cli-1.1,REV=2009.02.24-testing-b1/
    csw/mgar/pkg/java/ajccli/tags/commons_cli-1.1,REV=2009.02.24-unstable-20090302/
    csw/mgar/pkg/java/ajccli/trunk/
    csw/mgar/pkg/java/ajccodec/tags/commons_codec-1.3,REV=2009.02.24-testing-b1/
    csw/mgar/pkg/java/ajccodec/tags/commons_codec-1.3,REV=2009.02.24-unstable-20090302/
    csw/mgar/pkg/java/ajccodec/trunk/
    csw/mgar/pkg/java/ajccollections/tags/commons_collect-3.2.1,REV=2009.02.24-testing-b1/
    csw/mgar/pkg/java/ajccollections/tags/commons_collect-3.2.1,REV=2009.02.24-unstable-20090302/
    csw/mgar/pkg/java/ajccollections/trunk/
    csw/mgar/pkg/java/ajcconfig/trunk/
    csw/mgar/pkg/java/ajcdigester/trunk/
    csw/mgar/pkg/java/ajcdiscovery/trunk/
    csw/mgar/pkg/java/ajcemail/trunk/
    csw/mgar/pkg/java/ajchttpcl/trunk/
    csw/mgar/pkg/java/ajcio/trunk/
    csw/mgar/pkg/java/ajclang/trunk/
    csw/mgar/pkg/java/ajclogging/trunk/
    csw/mgar/pkg/java/ajcmath/trunk/
    csw/mgar/pkg/java/ajcnet/trunk/
    csw/mgar/pkg/java/ajcpool/trunk/
    csw/mgar/pkg/java/ajcprimitives/trunk/
    csw/mgar/pkg/java/ajcupload/trunk/
    csw/mgar/pkg/java/ajcvalidator/trunk/
    csw/mgar/pkg/java/junit/tags/junit-4.5,REV=2009.03.08-testing-b1/
    csw/mgar/pkg/java/junit/trunk/
    csw/mgar/pkg/java/log4j/tags/log4j-1.2.15,REV=2009.03.09-testing-b1/
    csw/mgar/pkg/java/log4j/trunk/
    csw/mgar/pkg/jboss4/trunk/
    csw/mgar/pkg/jdk5/trunk/
    csw/mgar/pkg/jdk6/trunk/
    csw/mgar/pkg/jed/trunk/
    csw/mgar/pkg/jetty6/trunk/
    csw/mgar/pkg/jhead/trunk/
    csw/mgar/pkg/jicmp/trunk/
    csw/mgar/pkg/joe/trunk/
    csw/mgar/pkg/jpeginfo/trunk/
    csw/mgar/pkg/jpegoptim/trunk/
    csw/mgar/pkg/jrrd/trunk/
    csw/mgar/pkg/json-glib/trunk/
    csw/mgar/pkg/jxplorer/trunk/
    csw/mgar/pkg/kawa/trunk/
    csw/mgar/pkg/kde/trunk/
    csw/mgar/pkg/kde4libs/trunk/
    csw/mgar/pkg/kdeaccessibility/trunk/
    csw/mgar/pkg/kdeaddons/trunk/
    csw/mgar/pkg/kdeadmin/trunk/
    csw/mgar/pkg/kdeartwork/trunk/
    csw/mgar/pkg/kdebase/trunk/
    csw/mgar/pkg/kdebindings/trunk/
    csw/mgar/pkg/kdeedu/trunk/
    csw/mgar/pkg/kdegames/trunk/
    csw/mgar/pkg/kdegraphics/trunk/
    csw/mgar/pkg/kdelibs/trunk/
    csw/mgar/pkg/kdemultimedia/trunk/
    csw/mgar/pkg/kdenetwork/trunk/
    csw/mgar/pkg/kdepim/trunk/
    csw/mgar/pkg/kdesdk/trunk/
    csw/mgar/pkg/kdesvn/trunk/
    csw/mgar/pkg/kdetoys/trunk/
    csw/mgar/pkg/kdeutils/trunk/
    csw/mgar/pkg/kdevelop/trunk/
    csw/mgar/pkg/keepassx/trunk/
    csw/mgar/pkg/keychain/trunk/
    csw/mgar/pkg/kile/trunk/
    csw/mgar/pkg/koffice/trunk/
    csw/mgar/pkg/koha/trunk/
    csw/mgar/pkg/krb5/trunk/
    csw/mgar/pkg/krb5-lib/branches/krb5-1.4.4/
    csw/mgar/pkg/krb5-lib/trunk/
    csw/mgar/pkg/ksh/trunk/
    csw/mgar/pkg/kshdbx/trunk/
    csw/mgar/pkg/lame/trunk/
    csw/mgar/pkg/lang-java/389-admin-console/trunk/
    csw/mgar/pkg/lang-java/389-console/trunk/
    csw/mgar/pkg/lang-java/389-ds-console/trunk/
    csw/mgar/pkg/lang-java/idm-console-base/trunk/
    csw/mgar/pkg/lang-java/jss/trunk/
    csw/mgar/pkg/lang-java/ldapjdk/trunk/
    csw/mgar/pkg/lang-python/M2Crypto/trunk/
    csw/mgar/pkg/lang-python/amara/trunk/
    csw/mgar/pkg/lang-python/atomixlib/trunk/
    csw/mgar/pkg/lang-python/bridge/trunk/
    csw/mgar/pkg/lang-python/cherrypy/trunk/
    csw/mgar/pkg/lang-python/dbus-python/trunk/
    csw/mgar/pkg/lang-python/dbutils/trunk/
    csw/mgar/pkg/lang-python/django/trunk/
    csw/mgar/pkg/lang-python/django-auth-ldap/trunk/
    csw/mgar/pkg/lang-python/django-filter/trunk/
    csw/mgar/pkg/lang-python/django-sorting/trunk/
    csw/mgar/pkg/lang-python/django-tagging/trunk/
    csw/mgar/pkg/lang-python/docutils/trunk/
    csw/mgar/pkg/lang-python/fabric/trunk/
    csw/mgar/pkg/lang-python/flup/trunk/
    csw/mgar/pkg/lang-python/gdata-python-client/trunk/
    csw/mgar/pkg/lang-python/guppy/trunk/
    csw/mgar/pkg/lang-python/ipython/trunk/
    csw/mgar/pkg/lang-python/jinja2/trunk/
    csw/mgar/pkg/lang-python/logilab-astng/trunk/
    csw/mgar/pkg/lang-python/logilab-common/trunk/
    csw/mgar/pkg/lang-python/mako/trunk/
    csw/mgar/pkg/lang-python/mechanize/trunk/
    csw/mgar/pkg/lang-python/mock/trunk/
    csw/mgar/pkg/lang-python/mod_python/trunk/
    csw/mgar/pkg/lang-python/mox/trunk/
    csw/mgar/pkg/lang-python/mysql-python/trunk/
    csw/mgar/pkg/lang-python/nose/tags/nose-0.11.2,REV=2010.10.14/
    csw/mgar/pkg/lang-python/nose/trunk/
    csw/mgar/pkg/lang-python/numpy/trunk/
    csw/mgar/pkg/lang-python/paramiko/trunk/
    csw/mgar/pkg/lang-python/ply/trunk/
    csw/mgar/pkg/lang-python/psycopg2/trunk/
    csw/mgar/pkg/lang-python/py_antlr/trunk/
    csw/mgar/pkg/lang-python/pyboto/trunk/
    csw/mgar/pkg/lang-python/pycairo/trunk/
    csw/mgar/pkg/lang-python/pychecker/trunk/
    csw/mgar/pkg/lang-python/pycrypto/trunk/
    csw/mgar/pkg/lang-python/pycurl/trunk/
    csw/mgar/pkg/lang-python/pydes/trunk/
    csw/mgar/pkg/lang-python/pyfpconst/trunk/
    csw/mgar/pkg/lang-python/pygments/trunk/
    csw/mgar/pkg/lang-python/pygobject/trunk/
    csw/mgar/pkg/lang-python/pygtk/trunk/
    csw/mgar/pkg/lang-python/pykstat/trunk/
    csw/mgar/pkg/lang-python/pylint/trunk/
    csw/mgar/pkg/lang-python/pylxml/trunk/
    csw/mgar/pkg/lang-python/pyopenssl/trunk/
    csw/mgar/pkg/lang-python/pyorbit/trunk/
    csw/mgar/pkg/lang-python/pyorbit/trunk/trunk/
    csw/mgar/pkg/lang-python/pysetuptools/trunk/
    csw/mgar/pkg/lang-python/pysoappy/trunk/
    csw/mgar/pkg/lang-python/pysqlite/trunk/
    csw/mgar/pkg/lang-python/pysqlite2/trunk/
    csw/mgar/pkg/lang-python/pysvn/trunk/
    csw/mgar/pkg/lang-python/python/branches/libpython2_5_1_0/
    csw/mgar/pkg/lang-python/python/branches/python-2.7/
    csw/mgar/pkg/lang-python/python/branches/python-3.1/
    csw/mgar/pkg/lang-python/python/branches/python-3.2/
    csw/mgar/pkg/lang-python/python/branches/soname-granularity/
    csw/mgar/pkg/lang-python/python/trunk/
    csw/mgar/pkg/lang-python/python-augeas/trunk/
    csw/mgar/pkg/lang-python/python-dateutil/trunk/
    csw/mgar/pkg/lang-python/python-gflags/trunk/
    csw/mgar/pkg/lang-python/python-graph/trunk/
    csw/mgar/pkg/lang-python/python-irclib/trunk/
    csw/mgar/pkg/lang-python/python-ldap/trunk/
    csw/mgar/pkg/lang-python/python-magic/trunk/
    csw/mgar/pkg/lang-python/python-pexpect/trunk/
    csw/mgar/pkg/lang-python/python-suds/trunk/
    csw/mgar/pkg/lang-python/python25/trunk/
    csw/mgar/pkg/lang-python/pytz/trunk/
    csw/mgar/pkg/lang-python/pyxdg/trunk/
    csw/mgar/pkg/lang-python/pyyaml/trunk/
    csw/mgar/pkg/lang-python/pyzor/trunk/
    csw/mgar/pkg/lang-python/quixote/trunk/
    csw/mgar/pkg/lang-python/reportlab/trunk/
    csw/mgar/pkg/lang-python/shapely/trunk/
    csw/mgar/pkg/lang-python/shout-python/trunk/
    csw/mgar/pkg/lang-python/simplejson/trunk/
    csw/mgar/pkg/lang-python/soappy/trunk/
    csw/mgar/pkg/lang-python/sphinx/trunk/
    csw/mgar/pkg/lang-python/sqlobject/trunk/
    csw/mgar/pkg/lang-python/supybot/trunk/
    csw/mgar/pkg/lang-python/terminator/trunk/
    csw/mgar/pkg/lang-python/textile/trunk/
    csw/mgar/pkg/lang-python/twill/trunk/
    csw/mgar/pkg/lang-python/twisted/trunk/
    csw/mgar/pkg/lang-python/unittest2/trunk/
    csw/mgar/pkg/lang-python/virtualenv/trunk/
    csw/mgar/pkg/lang-python/webpy/trunk/
    csw/mgar/pkg/lang-python/xlrd/trunk/
    csw/mgar/pkg/lang-python/xlwt/trunk/
    csw/mgar/pkg/lang-python/zope/trunk/
    csw/mgar/pkg/lang-python/zope-interface/trunk/
    csw/mgar/pkg/lastx/trunk/
    csw/mgar/pkg/lbzip2/trunk/
    csw/mgar/pkg/ldapjdk/trunk/
    csw/mgar/pkg/ldns_drill/trunk/
    csw/mgar/pkg/leafnode/trunk/
    csw/mgar/pkg/lensfun/trunk/
    csw/mgar/pkg/less/trunk/
    csw/mgar/pkg/lftp/trunk/
    csw/mgar/pkg/lha/trunk/
    csw/mgar/pkg/liba52/trunk/
    csw/mgar/pkg/libao/trunk/
    csw/mgar/pkg/libao2/trunk/
    csw/mgar/pkg/libarchive/trunk/
    csw/mgar/pkg/libart/trunk/
    csw/mgar/pkg/libassuan/trunk/
    csw/mgar/pkg/libast/trunk/
    csw/mgar/pkg/libatk/trunk/
    csw/mgar/pkg/libatomic_ops/trunk/
    csw/mgar/pkg/libcairo/branches/libcairo-x11-reloaded/
    csw/mgar/pkg/libcairo/trunk/
    csw/mgar/pkg/libcddb/trunk/
    csw/mgar/pkg/libcdio/trunk/
    csw/mgar/pkg/libconfuse/trunk/
    csw/mgar/pkg/libcroco/trunk/
    csw/mgar/pkg/libcurl2/branches/curl-7.21.2/
    csw/mgar/pkg/libcurl2/tags/curl-7.20.0,REV=2010.02.15/
    csw/mgar/pkg/libcurl2/trunk/
    csw/mgar/pkg/libcurl3/branches/curl-7.21.2/
    csw/mgar/pkg/libcurl3/tags/curl-7.20.0,REV=2010.02.15/
    csw/mgar/pkg/libcurl3/trunk/
    csw/mgar/pkg/libcurl4/branches/curl-7.21.2/
    csw/mgar/pkg/libcurl4/tags/curl-7.20.0,REV=2010.02.15/
    csw/mgar/pkg/libcurl4/trunk/
    csw/mgar/pkg/libdatrie/trunk/
    csw/mgar/pkg/libdbi/trunk/
    csw/mgar/pkg/libdbi-drivers/trunk/
    csw/mgar/pkg/libdnet/trunk/
    csw/mgar/pkg/libdshconfig/trunk/
    csw/mgar/pkg/libdvdcss/trunk/
    csw/mgar/pkg/libdvdread/trunk/
    csw/mgar/pkg/libebml/trunk/
    csw/mgar/pkg/libeggdbus/trunk/
    csw/mgar/pkg/libemf/trunk/
    csw/mgar/pkg/liberation-fonts/trunk/
    csw/mgar/pkg/libev/trunk/
    csw/mgar/pkg/libevent/tags/libevent-1.4.12,REV=2009.11.04/
    csw/mgar/pkg/libevent/tags/libevent-1.4.13,REV=2009.12.28/
    csw/mgar/pkg/libevent/trunk/
    csw/mgar/pkg/libevent2/
    csw/mgar/pkg/libevent2/trunk/
    csw/mgar/pkg/libexif/trunk/
    csw/mgar/pkg/libexpat0/trunk/
    csw/mgar/pkg/libexpat1/trunk/
    csw/mgar/pkg/libexplain/trunk/
    csw/mgar/pkg/libfaac/trunk/
    csw/mgar/pkg/libfaad2/trunk/
    csw/mgar/pkg/libfasttime/trunk/
    csw/mgar/pkg/libffi/trunk/
    csw/mgar/pkg/libfishsound/trunk/
    csw/mgar/pkg/libflac4/trunk/
    csw/mgar/pkg/libflac7/trunk/
    csw/mgar/pkg/libflac8/trunk/
    csw/mgar/pkg/libfpx/trunk/
    csw/mgar/pkg/libgadu/trunk/
    csw/mgar/pkg/libgcrypt/trunk/
    csw/mgar/pkg/libgda/trunk/
    csw/mgar/pkg/libgdbm3/trunk/
    csw/mgar/pkg/libgdiplus/trunk/
    csw/mgar/pkg/libgegl/trunk/
    csw/mgar/pkg/libglade/trunk/
    csw/mgar/pkg/libglade2/trunk/
    csw/mgar/pkg/libgmp/branches/on-current/
    csw/mgar/pkg/libgmp/trunk/
    csw/mgar/pkg/libgmp3/trunk/
    csw/mgar/pkg/libgnugetopt/trunk/
    csw/mgar/pkg/libgoffice/trunk/
    csw/mgar/pkg/libgpg_error/trunk/
    csw/mgar/pkg/libgphoto2/trunk/
    csw/mgar/pkg/libgpod/trunk/
    csw/mgar/pkg/libgsf/trunk/
    csw/mgar/pkg/libgsf1/trunk/
    csw/mgar/pkg/libgss/trunk/
    csw/mgar/pkg/libical/trunk/
    csw/mgar/pkg/libiconv/branches/sync-pkgname/
    csw/mgar/pkg/libiconv/tags/bootstrap-ggettext/
    csw/mgar/pkg/libiconv/trunk/
    csw/mgar/pkg/libicu42/
    csw/mgar/pkg/libicu46/trunk/
    csw/mgar/pkg/libicu48/branches/libicu42/
    csw/mgar/pkg/libicu48/trunk/
    csw/mgar/pkg/libid3tag/trunk/
    csw/mgar/pkg/libidl/trunk/
    csw/mgar/pkg/libidn/tags/libidn-1.15,REV=2009.06.10/
    csw/mgar/pkg/libiptcdata/trunk/
    csw/mgar/pkg/libjpeg62/trunk/
    csw/mgar/pkg/libjpeg7/trunk/
    csw/mgar/pkg/libjpeg8/trunk/
    csw/mgar/pkg/libkate/trunk/
    csw/mgar/pkg/libksba/trunk/
    csw/mgar/pkg/liblasi/tags/liblasi-1.1.0,REV=2009.05.28/
    csw/mgar/pkg/liblasi/trunk/
    csw/mgar/pkg/liblcms/trunk/
    csw/mgar/pkg/liblcms2/trunk/
    csw/mgar/pkg/libldns/trunk/
    csw/mgar/pkg/liblockfile/tags/liblockfile-1.08,REV=2010.06.23/
    csw/mgar/pkg/liblockfile/tags/liblockfile-1.08,REV=2010.06.25/
    csw/mgar/pkg/liblockfile/trunk/
    csw/mgar/pkg/liblqr/trunk/
    csw/mgar/pkg/libmad/trunk/
    csw/mgar/pkg/libmatio/trunk/
    csw/mgar/pkg/libmatroska/trunk/
    csw/mgar/pkg/libmcal/trunk/
    csw/mgar/pkg/libmcrypt/trunk/
    csw/mgar/pkg/libmhash/trunk/
    csw/mgar/pkg/libmikmod/trunk/
    csw/mgar/pkg/libmkv/trunk/
    csw/mgar/pkg/libmm/trunk/
    csw/mgar/pkg/libmp4v2/trunk/
    csw/mgar/pkg/libmpeg2/trunk/
    csw/mgar/pkg/libmpfr/branches/libmpfr1/
    csw/mgar/pkg/libmpfr/branches/rc/
    csw/mgar/pkg/libmpfr/trunk/
    csw/mgar/pkg/libneon26/trunk/
    csw/mgar/pkg/libneon27/trunk/
    csw/mgar/pkg/libnet/branches/1.1.x/
    csw/mgar/pkg/libnet/trunk/
    csw/mgar/pkg/libnids/trunk/
    csw/mgar/pkg/libnotify/trunk/
    csw/mgar/pkg/libntlm/trunk/
    csw/mgar/pkg/libogg/trunk/
    csw/mgar/pkg/liboggz/trunk/
    csw/mgar/pkg/liboil/trunk/
    csw/mgar/pkg/liborc/trunk/
    csw/mgar/pkg/libpaper/trunk/
    csw/mgar/pkg/libpcap/tags/libpcap-1.0.0,REV=2009.10.01/
    csw/mgar/pkg/libpcap/trunk/
    csw/mgar/pkg/libpng/branches/libpng3/
    csw/mgar/pkg/libpng/trunk/
    csw/mgar/pkg/libpopt/tags/popt-1.15,REV=2009.10.06/
    csw/mgar/pkg/libpopt/trunk/
    csw/mgar/pkg/libproxy/tags/libproxy-0.3.0REV=2010.01.18/
    csw/mgar/pkg/libproxy/trunk/
    csw/mgar/pkg/librsvg/trunk/
    csw/mgar/pkg/librsync/trunk/
    csw/mgar/pkg/libsamplerate/trunk/
    csw/mgar/pkg/libschroedinger/trunk/
    csw/mgar/pkg/libsdl/branches/libsdl-1.2.14,REV_2009.11.10/
    csw/mgar/pkg/libsdl/branches/x11-reloaded/
    csw/mgar/pkg/libsdl/trunk/
    csw/mgar/pkg/libserf/tags/libserf-0.3.1,REV=2010.02.28/
    csw/mgar/pkg/libserf/tags/libserf-0.3.1,REV=2010.04.19/
    csw/mgar/pkg/libserf/tags/libserf-0.6.1,REV=2010.05.18/
    csw/mgar/pkg/libsexy/trunk/
    csw/mgar/pkg/libshout/trunk/
    csw/mgar/pkg/libsigcpp/branches/2.2.10/
    csw/mgar/pkg/libsigcpp/trunk/
    csw/mgar/pkg/libsigsegv/trunk/
    csw/mgar/pkg/libsigsegv0/trunk/
    csw/mgar/pkg/libslang1/trunk/
    csw/mgar/pkg/libsmi/trunk/
    csw/mgar/pkg/libsndfile/tags/libsndfile-1.0.20,REV=2009.11.04/
    csw/mgar/pkg/libsndfile/trunk/
    csw/mgar/pkg/libsoup/trunk/
    csw/mgar/pkg/libsoup2/trunk/
    csw/mgar/pkg/libspectre/trunk/
    csw/mgar/pkg/libspf2/trunk/
    csw/mgar/pkg/libssh2/trunk/
    csw/mgar/pkg/libstatgrab/trunk/
    csw/mgar/pkg/libstlport/trunk/
    csw/mgar/pkg/libtasn1/tags/libtasn1-2.5,REV=2010.03.15/
    csw/mgar/pkg/libtasn1/trunk/
    csw/mgar/pkg/libthai/trunk/
    csw/mgar/pkg/libtheora/trunk/
    csw/mgar/pkg/libtool/branches/libldtl3/
    csw/mgar/pkg/libtool/tags/libtool-1.5.26-2.2.10-last-with-version-modulation/
    csw/mgar/pkg/libtool/tags/libtool-2.2.6,REV=2009.09.04_rev=a/
    csw/mgar/pkg/libtool/tags/libtool-2.2.6-legacy-gcctags/
    csw/mgar/pkg/libtool/tags/libtool-2.2.6b,REV=2010.01.05/
    csw/mgar/pkg/libtool/tags/libtool-2.2.6b_2010.01.05/
    csw/mgar/pkg/libtool/trunk/
    csw/mgar/pkg/libtorrent/trunk/
    csw/mgar/pkg/libunique/trunk/
    csw/mgar/pkg/libunistring/trunk/
    csw/mgar/pkg/liburiparser/trunk/
    csw/mgar/pkg/libvanessa-logger/trunk/
    csw/mgar/pkg/libvanessa-socket/trunk/
    csw/mgar/pkg/libvorbis/trunk/
    csw/mgar/pkg/libwebp/trunk/
    csw/mgar/pkg/libwnck/trunk/
    csw/mgar/pkg/libwww/trunk/
    csw/mgar/pkg/libxdg-basedir/trunk/
    csw/mgar/pkg/libxine/trunk/
    csw/mgar/pkg/libxml++/trunk/
    csw/mgar/pkg/libxml2/trunk/
    csw/mgar/pkg/libxpm/trunk/
    csw/mgar/pkg/libxslt/trunk/
    csw/mgar/pkg/libxspf/trunk/
    csw/mgar/pkg/libyaml/trunk/
    csw/mgar/pkg/libytnef/trunk/
    csw/mgar/pkg/liferea/trunk/
    csw/mgar/pkg/lighttpd/trunk/
    csw/mgar/pkg/listadmin/trunk/
    csw/mgar/pkg/llvm/branches/clang/
    csw/mgar/pkg/llvm/trunk/
    csw/mgar/pkg/lmbench/trunk/
    csw/mgar/pkg/log4sh/trunk/
    csw/mgar/pkg/logrotate/trunk/
    csw/mgar/pkg/logwatch/trunk/
    csw/mgar/pkg/loudmouth/trunk/
    csw/mgar/pkg/lpc10/trunk/
    csw/mgar/pkg/lsof/trunk/
    csw/mgar/pkg/lua/trunk/
    csw/mgar/pkg/lutefisk/trunk/
    csw/mgar/pkg/lynx/trunk/
    csw/mgar/pkg/lyx/trunk/
    csw/mgar/pkg/lzip/trunk/
    csw/mgar/pkg/lzlib/trunk/
    csw/mgar/pkg/lzo/trunk/
    csw/mgar/pkg/lzop/trunk/
    csw/mgar/pkg/m4/trunk/
    csw/mgar/pkg/magit/trunk/
    csw/mgar/pkg/maildrop/trunk/
    csw/mgar/pkg/mailutils/trunk/
    csw/mgar/pkg/mailx/trunk/
    csw/mgar/pkg/mairix/trunk/
    csw/mgar/pkg/man2html/trunk/
    csw/mgar/pkg/manifold/trunk/
    csw/mgar/pkg/mantis/tags/mantis-1.1.8,REV=2009.10.30/
    csw/mgar/pkg/mantis/trunk/
    csw/mgar/pkg/maven2/
    csw/mgar/pkg/maven2/trunk/
    csw/mgar/pkg/maven3/trunk/
    csw/mgar/pkg/mawk/trunk/
    csw/mgar/pkg/mbuffer/trunk/
    csw/mgar/pkg/mc/trunk/
    csw/mgar/pkg/mcabber/trunk/
    csw/mgar/pkg/mcrypt/branches/libmcrypt4/
    csw/mgar/pkg/mcrypt/trunk/
    csw/mgar/pkg/md5deep/trunk/
    csw/mgar/pkg/meanwhile/trunk/
    csw/mgar/pkg/mediawiki/
    csw/mgar/pkg/mediawiki/trunk/
    csw/mgar/pkg/memcached/tags/memcached-1.4.3,REV=2009.11.24/
    csw/mgar/pkg/memcached/tags/memcached-1.4.9,REV=2011.10.26/
    csw/mgar/pkg/memcached/trunk/
    csw/mgar/pkg/memconf/trunk/
    csw/mgar/pkg/meta/CSWmeta_example/trunk/
    csw/mgar/pkg/meta/SAMP/trunk/
    csw/mgar/pkg/meta/comand/trunk/
    csw/mgar/pkg/meta/toplevel/trunk/
    csw/mgar/pkg/mgar/trunk/
    csw/mgar/pkg/mharc/trunk/
    csw/mgar/pkg/mhonarc/trunk/
    csw/mgar/pkg/mibdump/trunk/
    csw/mgar/pkg/micq/trunk/
    csw/mgar/pkg/miltergreylist/trunk/
    csw/mgar/pkg/mimedefang/trunk/
    csw/mgar/pkg/minicom/trunk/
    csw/mgar/pkg/mixer/trunk/
    csw/mgar/pkg/mkpackage/trunk/
    csw/mgar/pkg/mkrdns/trunk/
    csw/mgar/pkg/mktemp/tags/mktemp-1.6,REV=2008.12.02/
    csw/mgar/pkg/mktemp/trunk/
    csw/mgar/pkg/mm/trunk/
    csw/mgar/pkg/moc/trunk/
    csw/mgar/pkg/mocha/trunk/
    csw/mgar/pkg/mod_auth_kerb/trunk/
    csw/mgar/pkg/mod_auth_mysql/trunk/
    csw/mgar/pkg/mod_auth_pam/trunk/
    csw/mgar/pkg/mod_auth_radius/trunk/
    csw/mgar/pkg/mod_evasive/trunk/
    csw/mgar/pkg/mod_fastcgi/trunk/
    csw/mgar/pkg/mod_fcgid/trunk/
    csw/mgar/pkg/mod_geoip/trunk/
    csw/mgar/pkg/mod_highlight/trunk/
    csw/mgar/pkg/mod_httpbl/trunk/
    csw/mgar/pkg/mod_jk/trunk/
    csw/mgar/pkg/mod_macro/trunk/
    csw/mgar/pkg/mod_nss/trunk/
    csw/mgar/pkg/mod_proxy_html/trunk/
    csw/mgar/pkg/mod_ruby/trunk/
    csw/mgar/pkg/mod_svn_view/trunk/
    csw/mgar/pkg/mod_transform/trunk/
    csw/mgar/pkg/mod_wsgi/trunk/
    csw/mgar/pkg/mongodb/trunk/
    csw/mgar/pkg/monit/trunk/
    csw/mgar/pkg/mono/trunk/
    csw/mgar/pkg/mono-basic/trunk/
    csw/mgar/pkg/mono-debugger/trunk/
    csw/mgar/pkg/mono-tools/trunk/
    csw/mgar/pkg/moonbuggy/trunk/
    csw/mgar/pkg/mozldap/trunk/
    csw/mgar/pkg/mpage/trunk/
    csw/mgar/pkg/mpc/trunk/
    csw/mgar/pkg/mpd/trunk/
    csw/mgar/pkg/mpeg4ip/trunk/
    csw/mgar/pkg/mpg123/trunk/
    csw/mgar/pkg/mpg321/trunk/
    csw/mgar/pkg/mplayer/tags/mplayer-1.0rc2-jwheeler/
    csw/mgar/pkg/mplayer/trunk/
    csw/mgar/pkg/mplex/trunk/
    csw/mgar/pkg/mrtg/trunk/
    csw/mgar/pkg/mscgen/trunk/
    csw/mgar/pkg/msttcorefonts/trunk/
    csw/mgar/pkg/mtools/trunk/
    csw/mgar/pkg/mtr/trunk/
    csw/mgar/pkg/mtwrite/trunk/
    csw/mgar/pkg/mtx/trunk/
    csw/mgar/pkg/multitail/trunk/
    csw/mgar/pkg/munin/trunk/
    csw/mgar/pkg/mutt/trunk/
    csw/mgar/pkg/myodbc/trunk/
    csw/mgar/pkg/mysql-ruby/trunk/
    csw/mgar/pkg/mysql4/trunk/
    csw/mgar/pkg/mysql5/branches/mysql-5.0.x/
    csw/mgar/pkg/mysql5/branches/mysql-5.0.x-old-layout/
    csw/mgar/pkg/mysql5/branches/mysql-5.1.x/
    csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/
    csw/mgar/pkg/mysql5/branches/mysql-5.5.x/
    csw/mgar/pkg/mysql5/trunk/
    csw/mgar/pkg/nagios/trunk/
    csw/mgar/pkg/nagios_plugins/trunk/
    csw/mgar/pkg/nagvis/trunk/
    csw/mgar/pkg/namazu/trunk/
    csw/mgar/pkg/namebench/trunk/
    csw/mgar/pkg/nano/trunk/
    csw/mgar/pkg/nasm/trunk/
    csw/mgar/pkg/nautilus/trunk/
    csw/mgar/pkg/ncal/trunk/
    csw/mgar/pkg/ncdu/trunk/
    csw/mgar/pkg/ncftp/trunk/
    csw/mgar/pkg/ncmpc/trunk/
    csw/mgar/pkg/ncsa-mosaic/trunk/
    csw/mgar/pkg/ncurses/trunk/
    csw/mgar/pkg/ndiff/trunk/
    csw/mgar/pkg/ndoutils/trunk/
    csw/mgar/pkg/neon/tags/neon-0.29.1,REV=2009.12.17/
    csw/mgar/pkg/neon/tags/neon-0.29.3,REV=2010.02.25/
    csw/mgar/pkg/neon/tags/neon-0.29.5-unfinished/
    csw/mgar/pkg/netcat/trunk/
    csw/mgar/pkg/netcdf/branches/gar-fortran/
    csw/mgar/pkg/netcdf/branches/netcdf-4/
    csw/mgar/pkg/netcdf/trunk/
    csw/mgar/pkg/netpbm/trunk/
    csw/mgar/pkg/netsnmp/branches/netsnmp-5.4.2.1-bug4408/
    csw/mgar/pkg/netsnmp/tags/netsnmp-5.4.2.1/
    csw/mgar/pkg/netsnmp/trunk/
    csw/mgar/pkg/nettle/trunk/
    csw/mgar/pkg/nfswatch/trunk/
    csw/mgar/pkg/nginx/trunk/
    csw/mgar/pkg/ngrep/trunk/
    csw/mgar/pkg/ngspice/trunk/
    csw/mgar/pkg/nicstat/trunk/
    csw/mgar/pkg/nmap/trunk/
    csw/mgar/pkg/nmh/trunk/
    csw/mgar/pkg/notification-daemon/trunk/
    csw/mgar/pkg/npadmin/trunk/
    csw/mgar/pkg/nrpe/trunk/
    csw/mgar/pkg/nsca/trunk/
    csw/mgar/pkg/nsd/trunk/
    csw/mgar/pkg/nspr/trunk/
    csw/mgar/pkg/nss/trunk/
    csw/mgar/pkg/ntop/tags/ntop-3.3.10/
    csw/mgar/pkg/ntop/tags/ntop-4.0.3,REV=2011.02.13/
    csw/mgar/pkg/ntop/trunk/
    csw/mgar/pkg/nxcl/trunk/
    csw/mgar/pkg/ocaml/trunk/
    csw/mgar/pkg/ocrad/trunk/
    csw/mgar/pkg/octave/trunk/
    csw/mgar/pkg/ogle/trunk/
    csw/mgar/pkg/ogle_gui/trunk/
    csw/mgar/pkg/oinkmaster/trunk/
    csw/mgar/pkg/oniguruma/trunk/
    csw/mgar/pkg/openal/trunk/
    csw/mgar/pkg/opencsw-policy/trunk/
    csw/mgar/pkg/opendbx/trunk/
    csw/mgar/pkg/opengrok/trunk/
    csw/mgar/pkg/openjade/trunk/
    csw/mgar/pkg/openjdk/trunk/
    csw/mgar/pkg/openjpeg/trunk/
    csw/mgar/pkg/openldap/tags/openldap-2.3.43-2.4.26/
    csw/mgar/pkg/openldap23/tags/openldap-2.3.43-2.4.26/
    csw/mgar/pkg/openldap23/trunk/
    csw/mgar/pkg/openldap24/trunk/
    csw/mgar/pkg/openmpi/trunk/
    csw/mgar/pkg/opennms/trunk/
    csw/mgar/pkg/openoffice/trunk/
    csw/mgar/pkg/openslp/trunk/
    csw/mgar/pkg/openssh/branches/openssh-5.4p1+lpk/
    csw/mgar/pkg/openssh/branches/openssh-5.6p1+lpk/
    csw/mgar/pkg/openssh/trunk/
    csw/mgar/pkg/openssl/branches/split/
    csw/mgar/pkg/openssl/trunk/
    csw/mgar/pkg/openssl1/trunk/
    csw/mgar/pkg/openvpn/trunk/
    csw/mgar/pkg/opera/trunk/
    csw/mgar/pkg/oracle/trunk/
    csw/mgar/pkg/oracle-instantclient/trunk/
    csw/mgar/pkg/orca/trunk/
    csw/mgar/pkg/otr/trunk/
    csw/mgar/pkg/p11-kit/trunk/
    csw/mgar/pkg/p4/trunk/
    csw/mgar/pkg/p7zip/trunk/
    csw/mgar/pkg/pacparser/trunk/
    csw/mgar/pkg/pakchois/trunk/
    csw/mgar/pkg/pango/branches/pango-x11-reloaded/
    csw/mgar/pkg/pango/trunk/
    csw/mgar/pkg/pango-libthai/trunk/
    csw/mgar/pkg/par/trunk/
    csw/mgar/pkg/parcellite/trunk/
    csw/mgar/pkg/pari/trunk/
    csw/mgar/pkg/password-gorilla/trunk/
    csw/mgar/pkg/patch/trunk/
    csw/mgar/pkg/patchutils/trunk/
    csw/mgar/pkg/pbzip2/trunk/
    csw/mgar/pkg/pca/tags/pca-20090224-01,REV=2009.03.12/
    csw/mgar/pkg/pca/trunk/
    csw/mgar/pkg/pcb/trunk/
    csw/mgar/pkg/pcp/trunk/
    csw/mgar/pkg/pcre/tags/pcre-8.00,REV=2009.11.17/
    csw/mgar/pkg/pcre/tags/pcre-8.01,REV=2010.01.20/
    csw/mgar/pkg/pcre/trunk/
    csw/mgar/pkg/pdfjam/trunk/
    csw/mgar/pkg/pdflib/trunk/
    csw/mgar/pkg/pdftk/trunk/
    csw/mgar/pkg/pdsh/trunk/
    csw/mgar/pkg/pen/trunk/
    csw/mgar/pkg/perdition/trunk/
    csw/mgar/pkg/perl/branches/perl-5.10.1-64bit/
    csw/mgar/pkg/perl/tags/perl-5.8.8,REV_2009.11.12/
    csw/mgar/pkg/perl/trunk/
    csw/mgar/pkg/pgadmin3/trunk/
    csw/mgar/pkg/pgpool/trunk/
    csw/mgar/pkg/php4/trunk/
    csw/mgar/pkg/php5/branches/re-enable-extensions/
    csw/mgar/pkg/php5/branches/re-enable-extensions/legacy/php5-apache/trunk/
    csw/mgar/pkg/php5/branches/re-enable-extensions/legacy/php5-apache2/trunk/
    csw/mgar/pkg/php5/trunk/
    csw/mgar/pkg/php5/trunk/legacy/php5-apache/trunk/
    csw/mgar/pkg/php5/trunk/legacy/php5-apache2/trunk/
    csw/mgar/pkg/php5_apc/
    csw/mgar/pkg/php5_apc/trunk/
    csw/mgar/pkg/php5_intl/trunk/
    csw/mgar/pkg/php5_xdebug/
    csw/mgar/pkg/php5_xdebug/trunk/
    csw/mgar/pkg/phpMyAdmin/trunk/
    csw/mgar/pkg/phpldapadmin/tags/phpldapadmin-1.2.0.4,REV=2009.09.23/
    csw/mgar/pkg/phpldapadmin/trunk/
    csw/mgar/pkg/phpmode/tags/release-1.5.0,REV=2009.07.28/
    csw/mgar/pkg/phpmode/tags/release-1.5.0-20090728/
    csw/mgar/pkg/phpmode/trunk/
    csw/mgar/pkg/phpsysinfo/trunk/
    csw/mgar/pkg/pidgin/trunk/
    csw/mgar/pkg/pidgin_sipe/trunk/
    csw/mgar/pkg/pidginotr/trunk/
    csw/mgar/pkg/pigz/trunk/
    csw/mgar/pkg/pil/trunk/
    csw/mgar/pkg/pinentry/trunk/
    csw/mgar/pkg/pius/trunk/
    csw/mgar/pkg/pixman/branches/latest-upstream/
    csw/mgar/pkg/pixman/trunk/
    csw/mgar/pkg/pkg-gate/trunk/
    csw/mgar/pkg/pkg-get/trunk/
    csw/mgar/pkg/pkg_update_watch/trunk/
    csw/mgar/pkg/pkgconfig/trunk/
    csw/mgar/pkg/pkgutil/trunk/
    csw/mgar/pkg/plib/trunk/
    csw/mgar/pkg/plzip/trunk/
    csw/mgar/pkg/pngwriter/trunk/
    csw/mgar/pkg/pnp/trunk/
    csw/mgar/pkg/policyd-weight/trunk/
    csw/mgar/pkg/polkit/trunk/
    csw/mgar/pkg/poppler/branches/0.10.6/
    csw/mgar/pkg/poppler/trunk/
    csw/mgar/pkg/poppler-data/trunk/
    csw/mgar/pkg/poster/trunk/
    csw/mgar/pkg/postfix/branches/postfix-2.4/
    csw/mgar/pkg/postfix/branches/postfix-2.6/
    csw/mgar/pkg/postfix/branches/postfix-2.7/
    csw/mgar/pkg/postfix/tags/postfix-2.8.6,REV=2011.10.26/
    csw/mgar/pkg/postfix/trunk/
    csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/
    csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/
    csw/mgar/pkg/postgresql/branches/postgresql-9.0-raos/
    csw/mgar/pkg/postgresql/branches/postgresql-9.1-raos/
    csw/mgar/pkg/postgresql/tags/legacy/optcsw/
    csw/mgar/pkg/postgresql/tags/legacy/postgresql-8.3/
    csw/mgar/pkg/postgresql/tags/legacy/postgresql-9.0/
    csw/mgar/pkg/postgresql/trunk/
    csw/mgar/pkg/postgrey/trunk/
    csw/mgar/pkg/pound/trunk/
    csw/mgar/pkg/pound2/trunk/
    csw/mgar/pkg/powerdns/branches/opendbx/
    csw/mgar/pkg/powerdns/branches/oracle/
    csw/mgar/pkg/powerdns/trunk/
    csw/mgar/pkg/ppkg_get/trunk/
    csw/mgar/pkg/ppl/trunk/
    csw/mgar/pkg/privoxy/trunk/
    csw/mgar/pkg/proftpd/trunk/
    csw/mgar/pkg/progressbar/trunk/
    csw/mgar/pkg/proj/trunk/
    csw/mgar/pkg/prosody/trunk/
    csw/mgar/pkg/protobuf/trunk/
    csw/mgar/pkg/proxytunnel/trunk/
    csw/mgar/pkg/pth/tags/pth-2.0.7,REV=2009.02.05/
    csw/mgar/pkg/pth/trunk/
    csw/mgar/pkg/pubcookie/trunk/
    csw/mgar/pkg/pulseaudio/trunk/
    csw/mgar/pkg/puppet/branches/puppet-0.24.x/
    csw/mgar/pkg/puppet/branches/puppet-0.25.x/
    csw/mgar/pkg/puppet/branches/puppet-2.6.x/
    csw/mgar/pkg/puppet/tags/puppet-2.6.4,REV=2011.03.07/
    csw/mgar/pkg/puppet/tags/puppet-2.6.8,REV=2011.05.17/
    csw/mgar/pkg/puppet/tags/puppet-2.6.9,REV=2011.06.23/
    csw/mgar/pkg/puppet/tags/puppet-2.7.1,REV=2011.06.26/
    csw/mgar/pkg/puppet/trunk/
    csw/mgar/pkg/puppet-dashboard/trunk/
    csw/mgar/pkg/pureftpd/trunk/
    csw/mgar/pkg/putty/trunk/
    csw/mgar/pkg/pv/trunk/
    csw/mgar/pkg/pwgen/trunk/
    csw/mgar/pkg/pwsafe/trunk/
    csw/mgar/pkg/pxlib/trunk/
    csw/mgar/pkg/pxz/trunk/
    csw/mgar/pkg/qhull/trunk/
    csw/mgar/pkg/qpopper/trunk/
    csw/mgar/pkg/qt-gcc/trunk/
    csw/mgar/pkg/qt4/trunk/
    csw/mgar/pkg/qt4-gcc/trunk/
    csw/mgar/pkg/quanta/trunk/
    csw/mgar/pkg/qucs/trunk/
    csw/mgar/pkg/quilt/trunk/
    csw/mgar/pkg/r/trunk/
    csw/mgar/pkg/rails/trunk/
    csw/mgar/pkg/rake/trunk/
    csw/mgar/pkg/rapidsvn/trunk/
    csw/mgar/pkg/razor/trunk/
    csw/mgar/pkg/rb-mysql/trunk/
    csw/mgar/pkg/rbgems/actionmailer/trunk/
    csw/mgar/pkg/rbgems/actionpack/trunk/
    csw/mgar/pkg/rbgems/activemodel-3.0.7/trunk/
    csw/mgar/pkg/rbgems/activerecord/trunk/
    csw/mgar/pkg/rbgems/activerecord-3.0.7/trunk/
    csw/mgar/pkg/rbgems/activeresource/trunk/
    csw/mgar/pkg/rbgems/activesupport/trunk/
    csw/mgar/pkg/rbgems/activesupport-3.0.7/trunk/
    csw/mgar/pkg/rbgems/ar-extensions/trunk/
    csw/mgar/pkg/rbgems/arel/trunk/
    csw/mgar/pkg/rbgems/bacon/trunk/
    csw/mgar/pkg/rbgems/builder-2.1.2/trunk/
    csw/mgar/pkg/rbgems/builder-3.0.0/trunk/
    csw/mgar/pkg/rbgems/bundler/trunk/
    csw/mgar/pkg/rbgems/cache-money/trunk/
    csw/mgar/pkg/rbgems/calendar_date_select/trunk/
    csw/mgar/pkg/rbgems/cgi_multipart_eof_fix/trunk/
    csw/mgar/pkg/rbgems/comma/trunk/
    csw/mgar/pkg/rbgems/cronedit/trunk/
    csw/mgar/pkg/rbgems/curb/trunk/
    csw/mgar/pkg/rbgems/daemons/trunk/
    csw/mgar/pkg/rbgems/diff-lcs/trunk/
    csw/mgar/pkg/rbgems/enumerated_attribute/trunk/
    csw/mgar/pkg/rbgems/fastercsv/trunk/
    csw/mgar/pkg/rbgems/fastthread/trunk/
    csw/mgar/pkg/rbgems/formtastic/trunk/
    csw/mgar/pkg/rbgems/gem_plugin/trunk/
    csw/mgar/pkg/rbgems/haml/trunk/
    csw/mgar/pkg/rbgems/hoe/trunk/
    csw/mgar/pkg/rbgems/hpricot/trunk/
    csw/mgar/pkg/rbgems/i18n-0.5.0/trunk/
    csw/mgar/pkg/rbgems/json/trunk/
    csw/mgar/pkg/rbgems/json_pure/trunk/
    csw/mgar/pkg/rbgems/libxml-ruby/trunk/
    csw/mgar/pkg/rbgems/memcache-client/trunk/
    csw/mgar/pkg/rbgems/meta_programming/trunk/
    csw/mgar/pkg/rbgems/mongrel/trunk/
    csw/mgar/pkg/rbgems/mongrel_cluster/trunk/
    csw/mgar/pkg/rbgems/mysql/trunk/
    csw/mgar/pkg/rbgems/parallel-forkmanager/trunk/
    csw/mgar/pkg/rbgems/passenger/branches/3.0.8/
    csw/mgar/pkg/rbgems/passenger/trunk/
    csw/mgar/pkg/rbgems/pg/trunk/
    csw/mgar/pkg/rbgems/prawn/trunk/
    csw/mgar/pkg/rbgems/prawn-core/trunk/
    csw/mgar/pkg/rbgems/prawn-layout/trunk/
    csw/mgar/pkg/rbgems/prawn-security/trunk/
    csw/mgar/pkg/rbgems/rack/trunk/
    csw/mgar/pkg/rbgems/rails/trunk/
    csw/mgar/pkg/rbgems/rake/branches/rb18/
    csw/mgar/pkg/rbgems/rake/trunk/
    csw/mgar/pkg/rbgems/rake-compiler/trunk/
    csw/mgar/pkg/rbgems/ratom/trunk/
    csw/mgar/pkg/rbgems/rdoc/trunk/
    csw/mgar/pkg/rbgems/rdoc-data/trunk/
    csw/mgar/pkg/rbgems/redcloth/trunk/
    csw/mgar/pkg/rbgems/rspec/trunk/
    csw/mgar/pkg/rbgems/rspec-core/trunk/
    csw/mgar/pkg/rbgems/rspec-expectations/trunk/
    csw/mgar/pkg/rbgems/rspec-mocks/trunk/
    csw/mgar/pkg/rbgems/ruby-ip/trunk/
    csw/mgar/pkg/rbgems/ruby-net-ldap/trunk/
    csw/mgar/pkg/rbgems/rubyforge/trunk/
    csw/mgar/pkg/rbgems/rubyrep-1.2.0/trunk/
    csw/mgar/pkg/rbgems/shoulda/trunk/
    csw/mgar/pkg/rbgems/sqlite3-ruby/trunk/
    csw/mgar/pkg/rbgems/tzinfo/trunk/
    csw/mgar/pkg/rbgems/will_paginate/trunk/
    csw/mgar/pkg/rbldnsd/trunk/
    csw/mgar/pkg/rc/trunk/
    csw/mgar/pkg/rcairo/trunk/
    csw/mgar/pkg/rcs/trunk/
    csw/mgar/pkg/rdesktop/trunk/
    csw/mgar/pkg/rdiff-backup/trunk/
    csw/mgar/pkg/re2c/trunk/
    csw/mgar/pkg/readline/tags/readline-6.0,REV=2009.03.31/
    csw/mgar/pkg/readline/trunk/
    csw/mgar/pkg/readline43/trunk/
    csw/mgar/pkg/readline52/trunk/
    csw/mgar/pkg/recode/trunk/
    csw/mgar/pkg/recutils/trunk/
    csw/mgar/pkg/remake/trunk/
    csw/mgar/pkg/resin/trunk/
    csw/mgar/pkg/rhythmbox/trunk/
    csw/mgar/pkg/rl/trunk/
    csw/mgar/pkg/rlwrap/trunk/
    csw/mgar/pkg/rox-filer/trunk/
    csw/mgar/pkg/rrdtool/branches/benny/
    csw/mgar/pkg/rrdtool/branches/ihsan/
    csw/mgar/pkg/rrdtool/trunk/
    csw/mgar/pkg/rspec/trunk/
    csw/mgar/pkg/rssh/trunk/
    csw/mgar/pkg/rsync/branches/3.1.0dev/
    csw/mgar/pkg/rsync/trunk/
    csw/mgar/pkg/rsyslog/trunk/
    csw/mgar/pkg/rtmpdump/trunk/
    csw/mgar/pkg/rtorrent/trunk/
    csw/mgar/pkg/ruby/trunk/
    csw/mgar/pkg/ruby-augeas/tags/ruby-augeas-0.3.0,REV=2011.03.18/
    csw/mgar/pkg/ruby-augeas/tags/ruby-augeas-0.3.0,REV=2011.04.18/
    csw/mgar/pkg/ruby-augeas/tags/ruby-augeas-0.4.1,REV=2011.07.26/
    csw/mgar/pkg/ruby-augeas/trunk/
    csw/mgar/pkg/ruby18/trunk/
    csw/mgar/pkg/ruby19/trunk/
    csw/mgar/pkg/rubygems/trunk/
    csw/mgar/pkg/samba/trunk/
    csw/mgar/pkg/sar2rrd/trunk/
    csw/mgar/pkg/sasl/branches/sasl-2.1.23-mGARv2/
    csw/mgar/pkg/sasl/tags/sasl-2.1.25,REV=2011.11.06/
    csw/mgar/pkg/sasl/trunk/
    csw/mgar/pkg/sauron/trunk/
    csw/mgar/pkg/sbcl/trunk/
    csw/mgar/pkg/sbt/trunk/
    csw/mgar/pkg/scala/trunk/
    csw/mgar/pkg/scfdot/trunk/
    csw/mgar/pkg/schily/trunk/
    csw/mgar/pkg/scintilla/trunk/
    csw/mgar/pkg/scite/trunk/
    csw/mgar/pkg/scons/trunk/
    csw/mgar/pkg/scponly/trunk/
    csw/mgar/pkg/screen/tags/screen-4.0.3,REV=2010.06.08/
    csw/mgar/pkg/screen/tags/screen-4.0.3,REV=2010.06.08/trunk/
    csw/mgar/pkg/screen/trunk/
    csw/mgar/pkg/scrollkeeper/trunk/
    csw/mgar/pkg/sdlimage/trunk/
    csw/mgar/pkg/sdlmixer/trunk/
    csw/mgar/pkg/sdlnet/trunk/
    csw/mgar/pkg/sdlsound/trunk/
    csw/mgar/pkg/sdlttf/trunk/
    csw/mgar/pkg/seamonkey/trunk/
    csw/mgar/pkg/sed/trunk/
    csw/mgar/pkg/sendmail/branches/benny/
    csw/mgar/pkg/sendmail/branches/mwatters/
    csw/mgar/pkg/sendmail/trunk/
    csw/mgar/pkg/setoolkit/trunk/
    csw/mgar/pkg/setxkbmap/trunk/
    csw/mgar/pkg/sfpc/trunk/
    csw/mgar/pkg/sgml-xml-common/trunk/
    csw/mgar/pkg/sh-utils/trunk/
    csw/mgar/pkg/shared-mime-info/trunk/
    csw/mgar/pkg/sharutils/trunk/
    csw/mgar/pkg/shflags/trunk/
    csw/mgar/pkg/shmux/trunk/
    csw/mgar/pkg/shunit2/trunk/
    csw/mgar/pkg/siege/trunk/
    csw/mgar/pkg/silctoolkit/trunk/
    csw/mgar/pkg/silvercity/trunk/
    csw/mgar/pkg/sipcalc/tags/sipcalc-1.1.5,REV=2011.06.26/
    csw/mgar/pkg/sipcalc/trunk/
    csw/mgar/pkg/slack/trunk/
    csw/mgar/pkg/slang/tags/last-version-modulation-1.4.9-2.2.4/
    csw/mgar/pkg/slang/trunk/
    csw/mgar/pkg/slocate/trunk/
    csw/mgar/pkg/sloccount/trunk/
    csw/mgar/pkg/slrn/trunk/
    csw/mgar/pkg/smbldap-tools/trunk/
    csw/mgar/pkg/snmptt/trunk/
    csw/mgar/pkg/snort/trunk/
    csw/mgar/pkg/snownews/trunk/
    csw/mgar/pkg/socat/trunk/
    csw/mgar/pkg/sox/trunk/
    csw/mgar/pkg/spamass-milter/trunk/
    csw/mgar/pkg/spamassassin/trunk/
    csw/mgar/pkg/speex/trunk/
    csw/mgar/pkg/spider/trunk/
    csw/mgar/pkg/spidermonkey/trunk/
    csw/mgar/pkg/spine/trunk/
    csw/mgar/pkg/sqlalchemy/trunk/
    csw/mgar/pkg/sqlite3/tags/sqlite3-3.6.19,REV=2009.10.29/
    csw/mgar/pkg/sqlite3/tags/sqlite3-3.6.21,REV=2010.01.04/
    csw/mgar/pkg/squid/branches/squid3/
    csw/mgar/pkg/squid/tags/squid-2.7,REV=2009.06.18_STABLE6/
    csw/mgar/pkg/squid/tags/squid-squid-2.7,REV=2009.06.18_STABLE6/
    csw/mgar/pkg/squid/trunk/
    csw/mgar/pkg/squidclamav/trunk/
    csw/mgar/pkg/squidguard/trunk/
    csw/mgar/pkg/squidpurge/trunk/
    csw/mgar/pkg/squirrelmail/trunk/
    csw/mgar/pkg/ss12u1f95rt/trunk/
    csw/mgar/pkg/ss5/trunk/
    csw/mgar/pkg/sshguard/trunk/
    csw/mgar/pkg/stalonetray/trunk/
    csw/mgar/pkg/startup-notification/trunk/
    csw/mgar/pkg/stellarium/trunk/
    csw/mgar/pkg/stmpclean/trunk/
    csw/mgar/pkg/stress/trunk/
    csw/mgar/pkg/stressapptest/trunk/
    csw/mgar/pkg/stunnel/trunk/
    csw/mgar/pkg/subversion/tags/subversion-1.6.9,REV=2010.02.27/
    csw/mgar/pkg/subversion-client/trunk/
    csw/mgar/pkg/sudo/branches/old-symlink-scheme/
    csw/mgar/pkg/sudo/branches/sudo-1.7.2x/
    csw/mgar/pkg/sudo/trunk/
    csw/mgar/pkg/sudo_ldap/trunk/
    csw/mgar/pkg/sudosh2/trunk/
    csw/mgar/pkg/sunx11_devel/trunk/
    csw/mgar/pkg/svclog/trunk/
    csw/mgar/pkg/svnmailer/trunk/
    csw/mgar/pkg/svnstat/trunk/
    csw/mgar/pkg/svrcore/trunk/
    csw/mgar/pkg/swaks/trunk/
    csw/mgar/pkg/swftools/trunk/
    csw/mgar/pkg/swig/trunk/
    csw/mgar/pkg/sword/trunk/
    csw/mgar/pkg/swtlibs/trunk/
    csw/mgar/pkg/synergy/trunk/
    csw/mgar/pkg/sysbench/trunk/
    csw/mgar/pkg/syslog_ng/trunk/
    csw/mgar/pkg/sysstat/tags/sysstat-20091024,REV=2009.10.25/
    csw/mgar/pkg/sysstat/trunk/
    csw/mgar/pkg/system-tray-applet/trunk/
    csw/mgar/pkg/taglib/trunk/
    csw/mgar/pkg/taglib_gcc/trunk/
    csw/mgar/pkg/talloc/trunk/
    csw/mgar/pkg/tardy/trunk/
    csw/mgar/pkg/tcl-bwidget/trunk/
    csw/mgar/pkg/tcl-itcl/trunk/
    csw/mgar/pkg/tcl-itk/trunk/
    csw/mgar/pkg/tcl-iwidgets/trunk/
    csw/mgar/pkg/tcl84/tags/tcl-8.5.8-with-8.4/
    csw/mgar/pkg/tcl84/trunk/
    csw/mgar/pkg/tcl85/tags/tcl-8.5.8-with-8.4/
    csw/mgar/pkg/tcl85/trunk/
    csw/mgar/pkg/tcllib/trunk/
    csw/mgar/pkg/tcpdrop/trunk/
    csw/mgar/pkg/tcpdump/trunk/
    csw/mgar/pkg/tcpflow/trunk/
    csw/mgar/pkg/tcpreplay/trunk/
    csw/mgar/pkg/tcpstat/trunk/
    csw/mgar/pkg/tcpwrappers/tags/tcpwrappers-7.6-alternatives-std-ext/
    csw/mgar/pkg/tcpwrappers/trunk/
    csw/mgar/pkg/tcsh/tags/tcsh-6.17.00,REV=2009.09.10/
    csw/mgar/pkg/tcsh/trunk/
    csw/mgar/pkg/template/trunk/
    csw/mgar/pkg/texinfo/trunk/
    csw/mgar/pkg/textutils/trunk/
    csw/mgar/pkg/thrift/trunk/
    csw/mgar/pkg/thunderbird/branches/thunderbird3-packaging/
    csw/mgar/pkg/thunderbird/trunk/
    csw/mgar/pkg/thunderbird-l10n/trunk/
    csw/mgar/pkg/tiff/trunk/
    csw/mgar/pkg/tig/trunk/
    csw/mgar/pkg/tightvnc/branches/tightvnc-1.5/
    csw/mgar/pkg/tightvnc/trunk/
    csw/mgar/pkg/tinyca/trunk/
    csw/mgar/pkg/tk/trunk/
    csw/mgar/pkg/tkcvs/trunk/
    csw/mgar/pkg/tme/trunk/
    csw/mgar/pkg/tmpreaper/trunk/
    csw/mgar/pkg/tmpwatch/trunk/
    csw/mgar/pkg/tmux/branches/tmux-broken-man-location/
    csw/mgar/pkg/tmux/tags/tmux-1.2,REV=2010.05.17/
    csw/mgar/pkg/tmux/trunk/
    csw/mgar/pkg/tnef/trunk/
    csw/mgar/pkg/tofrodos/trunk/
    csw/mgar/pkg/tokyocabinet/trunk/
    csw/mgar/pkg/tomcat4/trunk/
    csw/mgar/pkg/tomcat5/trunk/
    csw/mgar/pkg/tomcat6/trunk/
    csw/mgar/pkg/tomcat7/trunk/
    csw/mgar/pkg/top/trunk/
    csw/mgar/pkg/tor/trunk/
    csw/mgar/pkg/torque/trunk/
    csw/mgar/pkg/trac/trunk/
    csw/mgar/pkg/trafshow/trunk/
    csw/mgar/pkg/transmission/trunk/
    csw/mgar/pkg/tre/trunk/
    csw/mgar/pkg/tree/trunk/
    csw/mgar/pkg/tsclient/trunk/
    csw/mgar/pkg/ttcp/trunk/
    csw/mgar/pkg/tunctl/trunk/
    csw/mgar/pkg/tuntap/trunk/
    csw/mgar/pkg/twitter/trunk/
    csw/mgar/pkg/twolame/trunk/
    csw/mgar/pkg/ucarp/trunk/
    csw/mgar/pkg/ucspi-tcp/trunk/
    csw/mgar/pkg/ufraw/trunk/
    csw/mgar/pkg/umfpack/trunk/
    csw/mgar/pkg/unbound/branches/ihsan/
    csw/mgar/pkg/unbound/trunk/
    csw/mgar/pkg/unclutter/trunk/
    csw/mgar/pkg/unixodbc/trunk/
    csw/mgar/pkg/unixodbc-libodbc1/trunk/
    csw/mgar/pkg/unrar/tags/unrar-3.9.6,REV=2009.11.05/
    csw/mgar/pkg/unrar/trunk/
    csw/mgar/pkg/unrealircd/trunk/
    csw/mgar/pkg/unrtf/trunk/
    csw/mgar/pkg/unzip/trunk/
    csw/mgar/pkg/unzoo/trunk/
    csw/mgar/pkg/urt/trunk/
    csw/mgar/pkg/urxvt/trunk/
    csw/mgar/pkg/v8/trunk/
    csw/mgar/pkg/varnish/trunk/
    csw/mgar/pkg/vim/tags/vim-7.2.148,REV=2009.04.08/
    csw/mgar/pkg/vim/trunk/
    csw/mgar/pkg/vixiecron/trunk/
    csw/mgar/pkg/vlc/trunk/
    csw/mgar/pkg/vorbistools/trunk/
    csw/mgar/pkg/vsftpd/trunk/
    csw/mgar/pkg/vttest/trunk/
    csw/mgar/pkg/w3m/trunk/
    csw/mgar/pkg/waf/trunk/
    csw/mgar/pkg/watch/trunk/
    csw/mgar/pkg/wavpack/tags/wavpack-4.60.0,REV=2009.11.06/
    csw/mgar/pkg/wavpack/trunk/
    csw/mgar/pkg/wdiff/trunk/
    csw/mgar/pkg/webalizer/trunk/
    csw/mgar/pkg/webfs/trunk/
    csw/mgar/pkg/webkit/trunk/
    csw/mgar/pkg/webmin/trunk/
    csw/mgar/pkg/websvn/trunk/
    csw/mgar/pkg/wesnoth/trunk/
    csw/mgar/pkg/wget/trunk/
    csw/mgar/pkg/wgetpaste/trunk/
    csw/mgar/pkg/which/trunk/
    csw/mgar/pkg/wiggle/trunk/
    csw/mgar/pkg/wireshark/trunk/
    csw/mgar/pkg/wkhtmltopdf/trunk/
    csw/mgar/pkg/wmf/trunk/
    csw/mgar/pkg/wput/trunk/
    csw/mgar/pkg/wxwidgets/branches/wxwidgets-2.8.10-full-fix-ticket-10660/
    csw/mgar/pkg/wxwidgets/trunk/
    csw/mgar/pkg/x026/trunk/
    csw/mgar/pkg/x11/individual/x11_evieextproto/trunk/
    csw/mgar/pkg/x11/individual/x11_fontcacheproto/trunk/
    csw/mgar/pkg/x11/individual/x11_printproto/trunk/
    csw/mgar/pkg/x11/individual/x11_trapproto/trunk/
    csw/mgar/pkg/x11/individual/x11_xf86miscproto/trunk/
    csw/mgar/pkg/x11/individual/x11_xf86rushproto/trunk/
    csw/mgar/pkg/x11/lib/libdmx/trunk/
    csw/mgar/pkg/x11/lib/libfontenc/trunk/
    csw/mgar/pkg/x11/lib/libfs/trunk/
    csw/mgar/pkg/x11/lib/libice/trunk/
    csw/mgar/pkg/x11/lib/libpthread-stubs/trunk/
    csw/mgar/pkg/x11/lib/libsm/trunk/
    csw/mgar/pkg/x11/lib/libx11/trunk/
    csw/mgar/pkg/x11/lib/libxau/trunk/
    csw/mgar/pkg/x11/lib/libxaw/trunk/
    csw/mgar/pkg/x11/lib/libxcomposite/trunk/
    csw/mgar/pkg/x11/lib/libxcursor/trunk/
    csw/mgar/pkg/x11/lib/libxdamage/trunk/
    csw/mgar/pkg/x11/lib/libxdmcp/trunk/
    csw/mgar/pkg/x11/lib/libxext/trunk/
    csw/mgar/pkg/x11/lib/libxfixes/trunk/
    csw/mgar/pkg/x11/lib/libxfont/trunk/
    csw/mgar/pkg/x11/lib/libxft/trunk/
    csw/mgar/pkg/x11/lib/libxi/trunk/
    csw/mgar/pkg/x11/lib/libxinerama/trunk/
    csw/mgar/pkg/x11/lib/libxkbfile/trunk/
    csw/mgar/pkg/x11/lib/libxklavier/trunk/
    csw/mgar/pkg/x11/lib/libxmu/trunk/
    csw/mgar/pkg/x11/lib/libxpm/trunk/
    csw/mgar/pkg/x11/lib/libxrandr/trunk/
    csw/mgar/pkg/x11/lib/libxres/trunk/
    csw/mgar/pkg/x11/lib/libxscrnsaver/trunk/
    csw/mgar/pkg/x11/lib/libxt/trunk/
    csw/mgar/pkg/x11/lib/libxtst/trunk/
    csw/mgar/pkg/x11/lib/libxv/trunk/
    csw/mgar/pkg/x11/lib/libxvmc/trunk/
    csw/mgar/pkg/x11/lib/libxxf86dga/trunk/
    csw/mgar/pkg/x11/lib/libxxf86vm/trunk/
    csw/mgar/pkg/x11/lib/xrender/trunk/
    csw/mgar/pkg/x11/lib/xtrans/trunk/
    csw/mgar/pkg/x11/lib-old/libxfontcache/trunk/
    csw/mgar/pkg/x11/lib-old/libxxf86misc/trunk/
    csw/mgar/pkg/x11/liblbxutil/trunk/
    csw/mgar/pkg/x11/liboldx/trunk/
    csw/mgar/pkg/x11/libwindowswm/trunk/
    csw/mgar/pkg/x11/libxevie/trunk/
    csw/mgar/pkg/x11/libxkbui/trunk/
    csw/mgar/pkg/x11/libxp/trunk/
    csw/mgar/pkg/x11/libxprintapputil/trunk/
    csw/mgar/pkg/x11/libxprintutil/trunk/
    csw/mgar/pkg/x11/libxtrap/trunk/
    csw/mgar/pkg/x11/proto/x11_applewmproto/trunk/
    csw/mgar/pkg/x11/proto/x11_bigreqsproto/trunk/
    csw/mgar/pkg/x11/proto/x11_compositeproto/trunk/
    csw/mgar/pkg/x11/proto/x11_damageproto/trunk/
    csw/mgar/pkg/x11/proto/x11_dmxproto/trunk/
    csw/mgar/pkg/x11/proto/x11_dri2proto/trunk/
    csw/mgar/pkg/x11/proto/x11_fixesproto/trunk/
    csw/mgar/pkg/x11/proto/x11_fontsproto/trunk/
    csw/mgar/pkg/x11/proto/x11_glproto/trunk/
    csw/mgar/pkg/x11/proto/x11_inputproto/trunk/
    csw/mgar/pkg/x11/proto/x11_kbproto/trunk/
    csw/mgar/pkg/x11/proto/x11_randrproto/trunk/
    csw/mgar/pkg/x11/proto/x11_recordproto/trunk/
    csw/mgar/pkg/x11/proto/x11_renderproto/branches/renderproto-project-x11-reloaded/
    csw/mgar/pkg/x11/proto/x11_renderproto/trunk/
    csw/mgar/pkg/x11/proto/x11_resourceproto/trunk/
    csw/mgar/pkg/x11/proto/x11_scrnsaverproto/trunk/
    csw/mgar/pkg/x11/proto/x11_videoproto/trunk/
    csw/mgar/pkg/x11/proto/x11_windowswmproto/trunk/
    csw/mgar/pkg/x11/proto/x11_xcmiscproto/trunk/
    csw/mgar/pkg/x11/proto/x11_xextproto/trunk/
    csw/mgar/pkg/x11/proto/x11_xf86bigfontproto/trunk/
    csw/mgar/pkg/x11/proto/x11_xf86dgaproto/trunk/
    csw/mgar/pkg/x11/proto/x11_xf86driproto/trunk/
    csw/mgar/pkg/x11/proto/x11_xf86vidmodeproto/trunk/
    csw/mgar/pkg/x11/proto/x11_xineramaproto/trunk/
    csw/mgar/pkg/x11/proto/x11_xproto/trunk/
    csw/mgar/pkg/x11/x11common/trunk/
    csw/mgar/pkg/x11vnc/trunk/
    csw/mgar/pkg/x3270/trunk/
    csw/mgar/pkg/xapian-bindings/trunk/
    csw/mgar/pkg/xapian-core/trunk/
    csw/mgar/pkg/xbattle/trunk/
    csw/mgar/pkg/xbill/trunk/
    csw/mgar/pkg/xboard/trunk/
    csw/mgar/pkg/xcdroast/trunk/
    csw/mgar/pkg/xchat/trunk/
    csw/mgar/pkg/xchm/trunk/
    csw/mgar/pkg/xearth/trunk/
    csw/mgar/pkg/xerces-c/trunk/
    csw/mgar/pkg/xfce/appfinder/trunk/
    csw/mgar/pkg/xfce/dbh/trunk/
    csw/mgar/pkg/xfce/desktop/trunk/
    csw/mgar/pkg/xfce/devtools/trunk/
    csw/mgar/pkg/xfce/exo/trunk/
    csw/mgar/pkg/xfce/gtk-xfce-engine/trunk/
    csw/mgar/pkg/xfce/icon-theme/trunk/
    csw/mgar/pkg/xfce/libxfce4mcs/trunk/
    csw/mgar/pkg/xfce/libxfce4menu/trunk/
    csw/mgar/pkg/xfce/libxfce4util/trunk/
    csw/mgar/pkg/xfce/libxfcegui4/trunk/
    csw/mgar/pkg/xfce/mcs-manager/trunk/
    csw/mgar/pkg/xfce/mcs-plugins/trunk/
    csw/mgar/pkg/xfce/mixer/trunk/
    csw/mgar/pkg/xfce/mousepad/trunk/
    csw/mgar/pkg/xfce/orage/trunk/
    csw/mgar/pkg/xfce/panel/trunk/
    csw/mgar/pkg/xfce/print/trunk/
    csw/mgar/pkg/xfce/session/trunk/
    csw/mgar/pkg/xfce/terminal/trunk/
    csw/mgar/pkg/xfce/thunar/trunk/
    csw/mgar/pkg/xfce/utils/trunk/
    csw/mgar/pkg/xfce/xfconf/trunk/
    csw/mgar/pkg/xfce/xfwm4/trunk/
    csw/mgar/pkg/xfce/xfwm4-themes/trunk/
    csw/mgar/pkg/xfig/trunk/
    csw/mgar/pkg/xine-ui/trunk/
    csw/mgar/pkg/xinetd/trunk/
    csw/mgar/pkg/xjobs/trunk/
    csw/mgar/pkg/xmahjongg/trunk/
    csw/mgar/pkg/xmlstarlet/tags/xmlstarlet-1.0.1,REV=2009.04.09/
    csw/mgar/pkg/xmlto/trunk/
    csw/mgar/pkg/xmltoman/trunk/
    csw/mgar/pkg/xmms/trunk/
    csw/mgar/pkg/xorriso/trunk/
    csw/mgar/pkg/xosd/trunk/
    csw/mgar/pkg/xpdf/trunk/
    csw/mgar/pkg/xpilot/trunk/
    csw/mgar/pkg/xrestop/trunk/
    csw/mgar/pkg/xsel/trunk/
    csw/mgar/pkg/xsnow/trunk/
    csw/mgar/pkg/xterm/trunk/
    csw/mgar/pkg/xtide/trunk/
    csw/mgar/pkg/xtitle/trunk/
    csw/mgar/pkg/xymon/trunk/
    csw/mgar/pkg/xz/trunk/
    csw/mgar/pkg/yad/trunk/
    csw/mgar/pkg/yaml-mode/trunk/
    csw/mgar/pkg/yapet/trunk/
    csw/mgar/pkg/yasm/tags/yasm-0.8.0,REV=2010.01.02/
    csw/mgar/pkg/yasm/trunk/
    csw/mgar/pkg/yaz/trunk/
    csw/mgar/pkg/z/trunk/
    csw/mgar/pkg/zebra/trunk/
    csw/mgar/pkg/zlib/trunk/
    csw/mgar/pkg/zsh/trunk/
    csw/mgar/pkg/zshdb/trunk/
    csw/mgar/pkg/zutils/trunk/
    csw/mgar/pkg/zzuf/trunk/


Property changes on: csw/mgar/pkg/389-admin/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/389-adminutil/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/389-ds-base/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/GeoIP/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/ImageMagick/branches/64-bit
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/ImageMagick/branches/package-split
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/ImageMagick/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/MailScanner/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/Vispan/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/ZSI/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/a2ps/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/achievo/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/adns/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/adobereader/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/aide/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/alarm-clock/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/alpine/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/alternatives/branches/alternatives-gar
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/amanda/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/amarok/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1



Property changes on: csw/mgar/pkg/amavisd-new/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/apache/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1



Property changes on: csw/mgar/pkg/apache2/branches/open-bug-squash
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/apache2/tags/apache-2.2.13-by-idogan
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/apache2/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/apache2-worker
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/apache2-worker/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/apcupsd
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/apcupsd/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/apg/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1



Property changes on: csw/mgar/pkg/apr/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/apr-iconv/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/apr-util/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/argtable/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/aria2/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/arpwatch/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1



Property changes on: csw/mgar/pkg/arts/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1



Property changes on: csw/mgar/pkg/ascii/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/asciidoc/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/audiofile/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/augeas/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/authz-tools/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1



Property changes on: csw/mgar/pkg/autobench/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/autoconf/tags/autoconf-2.64,REV=2009.07.29
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/autoconf/tags/autoconf-2.66,REV=2010.07.26
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/autoconf/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/automake/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/autoproject/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/autossh/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/autotrace/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/avantfax/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1



Property changes on: csw/mgar/pkg/avfs/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/awesome/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/awstats/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/axel/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/babl/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/bacula/branches/5.2.0-beta
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/bacula/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/balance/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/bash/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/bash_completion/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/bashdb/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/bazaar/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/bdb/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/bdb3/tags/bdb-consolidation-4.4.20,REV=2009.07.28
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/bdb3/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/bdb4/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/bdb42/tags/bdb-consolidation-4.4.20,REV=2009.07.28
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/bdb42/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/bdb43/tags/bdb-consolidation-4.3.29,REV=2009.06.26
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/bdb43/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/bdb44/tags/bdb-consolidation-4.4.20,REV=2009.07.28
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/bdb44/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/bdb45/tags/unreleased
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1



Property changes on: csw/mgar/pkg/bdb45/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/bdb46/tags/unreleased
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1



Property changes on: csw/mgar/pkg/bdb46/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/bdb47/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/bdb48/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/bdb51/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/beautifulsoup/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/bind/branches/stable
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/bind/branches/stable-9.4.3p3
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/bind/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/bind2nsd/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/binutils/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/bison/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/bitlbee/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/bittwist/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/blame/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/bluefish/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/boost/branches/boost-1.33.0
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1



Property changes on: csw/mgar/pkg/boost/branches/boost-gcc
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1



Property changes on: csw/mgar/pkg/boost/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/boost-jam/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/botnet/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/bugzilla/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1



Property changes on: csw/mgar/pkg/buildbot/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/bvi/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/bzflag/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/bzip2/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/c-ares/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/ca_certificates/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cabextract/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1



Property changes on: csw/mgar/pkg/cacti/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cadaver/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cairomm/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/ccache/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cdecl/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cdrdao/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/centerim/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cfengine/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cfengine3/tags/cfengine3-3.2.3,REV=2011.11.12
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cfengine3/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cfg2html/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cfitsio/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cgit/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cheetah/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cherokee/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/chkconfig/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/chmlib/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/chromium/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/chrpath/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/clamav/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/clamavsigs/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/clearsilver/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/climm/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1



Property changes on: csw/mgar/pkg/cloog/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/clpbar/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/clusterit/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/clusterssh/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/clzip/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/colordiff/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/colormake/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/colortail/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/conserver/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/convmv/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/coreutils/branches/8.4-respin
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/coreutils/tags/8.4-2010.12.18
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/coreutils/tags/8.8-REV=2011.01.14
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/coreutils/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Algorithm-Annotate/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Algorithm-CheckDigits/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Algorithm-Depedency/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Algorithm-Diff/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/AnyData/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Apache-AuthPAM/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Apache-DBI/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Apache-PAR/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Apache-Session/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Apache-Template/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Apache-Test/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Apache2-AuthzNIS/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/App-CLI/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/AppConfig/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Archive-Extract/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Archive-SelfExtract/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Archive-Tar/tags/Archive-Tar-1.54,REV=2009.11.24
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Archive-Tar/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Archive-Zip/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Array-Compare/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Array-Window/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Astro-FITS-Header/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Attribute-Handlers/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Audio-TagLib/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Authen-PAM/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Authen-SASL/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/AutoXS-Header/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/B-C/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/B-Flags/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/B-Generate/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/B-Keywords/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/B-Utils/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/BSD-Resource/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Barcode-Code128/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/BerkeleyDB/tags/BerkeleyDB-0.42,REV=2010.03.15
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/BerkeleyDB/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Biblio-EndnoteStyle/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Bit-Vector/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/C-Scan/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/CGI/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/CGI-Application/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/CGI-Application-Dispatch/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/CGI-Application-Plugin-LogDispatch/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/CGI-Builder/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/CGI-Session/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/CGI-SpeedyCGI/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/CGP-CLI/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/CPANPLUS/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/CSS-DOM/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Cache/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Cache-Cache/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Cache-Memcached/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Cache-Simple-TimedExpiry/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Cairo/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Calendar-CSA/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Calendar-Simple/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Capitalization/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Carp-Assert/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Carp-Assert-More/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Carp-Clan/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Catalyst/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Chart/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Check-ISA/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Class-Accessor/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Class-Accessor-Chained/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Class-Adapter/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Class-Autouse/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Class-BlackHole/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Class-Container/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Class-DBI/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Class-DBI-Loader/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Class-DBI-Pg/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Class-DBI-SQLite/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Class-DBI-mysql/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Class-Data-Inheritable/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Class-Factory-Util/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Class-ISA/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Class-Inspector/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Class-Loader/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Class-ReturnValue/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Class-Singleton/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Class-Std/tags/Class-Std-0.011,REV=2010.06.22
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Class-Std/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Class-Trigger/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Class-WhiteHole/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Class-XSAccessor/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Clone/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Compress-Bzip2/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Compress-Raw-Bzip2/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Compress-Raw-Zlib/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Compress-Zlib/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Config-Augeas/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Config-General/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Config-IniFiles/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Config-Tiny/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Convert-ASCII-Armour/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Convert-ASN1/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Convert-BinHex/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Convert-EBCDIC/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Convert-PEM/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Convert-TNEF/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Convert-UUlib/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Crypt-Blowfish/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Crypt-CAST5/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Crypt-CBC/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Crypt-DES/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Crypt-DES_EDE3/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Crypt-DH/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Crypt-DSA/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Crypt-IDEA/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Crypt-OpenPGP/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Crypt-OpenSSL-Bignum/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Crypt-OpenSSL-DSA/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Crypt-OpenSSL-PKCS12/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Crypt-OpenSSL-RSA/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Crypt-OpenSSL-Random/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Crypt-OpenSSL-X509/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Crypt-PasswdMD5/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Crypt-Primes/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Crypt-RC4/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Crypt-RC5/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Crypt-RIPEMD160/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Crypt-RSA/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Crypt-Rijndael/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Crypt-SSLeay/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Crypt-Twofish/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Curses/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Curses-UI/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/DBD-AnyData/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/DBD-CSV/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/DBD-DB2/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/DBD-File/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/DBD-Oracle/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/DBD-Pg/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/DBD-SQLite/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/DBD-Sybase/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/DBD-mysql/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/DBD-mysql5/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/DBI/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/DBIx-ContextualFetch/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/DBIx-Password/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/DBIx-SearchBuilder/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/DB_File/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Dancer/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Data-Buffer/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Data-Dump/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Data-Flow/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Data-Hierarchy/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Data-ICal/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Data-OptList/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Data-Serializer/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Data-ShowTable/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Data-TreeDumper/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Data-UUID/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Date-Calc/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Date-ICal/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Date-Leapyear/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Date-Manip/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Date-Simple/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/DateTime/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/DateTime-Format-Mail/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/DateTime-Format-W3CDTF/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/DateTime-Locale/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/DateTime-TimeZone/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Devel-Caller/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Devel-Cover/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Devel-Cycle/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Devel-LeakTrace/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Devel-LexAlias/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Devel-NYTProf/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Devel-Size/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Devel-StackTrace/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Devel-StackTrace-AsHTML/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Devel-Symdump/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Devel-Trace/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Digest/tags/Digest-1.16,REV=2009.08.10
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Digest/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Digest-BubbleBabble/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Digest-HMAC/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Digest-MD2/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Digest-Nilsimsa/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Digest-SHA/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Digest-SHA1/tags/2.12,REV=2009.08.06
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Digest-SHA1/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/DublinCore-Record/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Email-Address/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Email-Date-Format/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Email-Simple/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Email-Valid/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Env-Path/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Error/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Event/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Event-Lib/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Exception-Class/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Exception-Class-DBI/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/ExtUtils-AutoInstall/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/ExtUtils-CBuilder/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/ExtUtils-Depends/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/ExtUtils-F77/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/ExtUtils-Manifest/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/ExtUtils-ParseXS/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/ExtUtils-PkgConfig/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/ExtUtils-XSBuilder/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/FCGI/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/File-Cat/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/File-Copy-Recursive/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/File-Fetch/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/File-Flat/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/File-HomeDir/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/File-LibMagic/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/File-MMagic/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/File-Modified/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/File-NFSLock/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/File-Next/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/File-ReadBackwards/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/File-Remove/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/File-ShareDir/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/File-Slurp/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/File-Tail/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/File-Type/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/File-Which/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/File-chdir/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/File-chmod/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Filesys-Df/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Filesys-Notify-Simple/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Font-AFM/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Font-Freetype/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Font-TTF/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/FreezeThaw/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Frontier-RPC/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/GD/tags/GD-2.44,REV_2010.02.08
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/GD/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/GD-Barcode/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/GDGraph/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/GDTextUtil/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/GSSAPI/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Geo-IP/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Geo-IP-PurePerl/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Geography-Countries/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Gimp/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Glib/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Gnome2/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Gnome2-Canvas/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Gnome2-GConf/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Gnome2-Print/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Gnome2-VFS/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Gnome2-Wnck/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Graph/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/GraphViz/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Graphics-ColorNames/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Graphics-ColorNames-WWW/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Gtk2/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Gtk2-GladeXML/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Gtk2-PodViewer/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Gtk2-TrayIcon/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/HTML-CalendarMonth/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/HTML-Element-Extended/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/HTML-Format/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/HTML-Mason/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/HTML-Parser/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/HTML-Scrubber/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/HTML-TableExtract/tags/HTML-TableExtract-2.10,REV=2011.01.21
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/HTML-TableExtract/tags/HTML-TableExtract-2.10,REV=2011.01.22
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/HTML-TableExtract/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/HTML-Tagset/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/HTML-Template/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/HTML-Template-Pro/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/HTML-TokeParser/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/HTML-Tree/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/HTTP-Body/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/HTTP-DAV/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/HTTP-Server-Simple/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/HTTP-Server-Simple-PSGI/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Hash-MultiValue/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Heap/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Hook-LexWrap/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/I18N-LangTags/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/IDNA-Punycode/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/IO-Compress/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/IO-Compress-Base/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/IO-Compress-Zlib/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/IO-Digest/tags/IO-Digest-0.10,REV=2011.01.08
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/IO-Digest/tags/IO-Digest-0.10,REV=2011.01.08/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/IO-Digest/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/IO-Multiplex/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/IO-Pager/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/IO-Socket-INET6/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/IO-Socket-SSL/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/IO-String/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/IO-Tty/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/IO-Util/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/IO-Zlib/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/IO-stringy/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/IP-Country/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/IPC-Cmd/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/IPC-Run/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/IPC-Run3/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/IPC-ShareLite/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Ima-DBI/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Image-ExifTool/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Image-Info/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Image-Size/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Inline/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/JIRA-Client/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/JSON/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/JSON-Any/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Jcode/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Lexical-Persistence/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Lingua-PT-Stemmer/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Lingua-Stem/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Lingua-Stem-Fr/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Lingua-Stem-It/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Lingua-Stem-Ru/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Lingua-Stem-Snowball-Da/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/List-MoreUtils/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Locale-Gettext/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Locale-Maketext-Fuzzy/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Locale-Maketext-Lexicon/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Locale-Maketext-Simple/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Log-Any/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Log-Dispatch/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Log-Dispatch-Config/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Log-Dispatch-FileRotate/tags/Log-Dispatch-FileRotate-1.19,REV=2011.06.24
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Log-Dispatch-FileRotate/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Log-Log4perl/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Log-Message/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/Log-Message-Simple/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/MARC-Charset/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2



Property changes on: csw/mgar/pkg/cpan/MARC-Crosswalk-DublinCore/trunk

@@ 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 wahwah at users.sourceforge.net  Wed Jan 18 15:43:54 2012
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Wed, 18 Jan 2012 14:43:54 +0000
Subject: [csw-devel] SF.net SVN: gar:[16796] csw/mgar/lib/
Message-ID: <E1RnWjy-0002gH-M3@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 16796
          http://gar.svn.sourceforge.net/gar/?rev=16796&view=rev
Author:   wahwah
Date:     2012-01-18 14:43:54 +0000 (Wed, 18 Jan 2012)
Log Message:
-----------
Removing a surplus directory

Removed Paths:
-------------
    csw/mgar/lib/

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


From cgrzemba at users.sourceforge.net  Wed Jan 18 16:08:49 2012
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Wed, 18 Jan 2012 15:08:49 +0000
Subject: [csw-devel] SF.net SVN: gar:[16797] csw/mgar/pkg/nss/trunk/Makefile
Message-ID: <E1RnX85-0004q1-Ni@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 16797
          http://gar.svn.sourceforge.net/gar/?rev=16797&view=rev
Author:   cgrzemba
Date:     2012-01-18 15:08:49 +0000 (Wed, 18 Jan 2012)
Log Message:
-----------
nss/trunk: fix dependencies in build recipe

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

Modified: csw/mgar/pkg/nss/trunk/Makefile
===================================================================
--- csw/mgar/pkg/nss/trunk/Makefile	2012-01-18 14:43:54 UTC (rev 16796)
+++ csw/mgar/pkg/nss/trunk/Makefile	2012-01-18 15:08:49 UTC (rev 16797)
@@ -28,6 +28,7 @@
 PATCHLEVEL    = 11
 VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(PATCHLEVEL)
 CATEGORIES = lib
+DESCRIPTION = Network Security Services library
 define BLURB
   Network Security Services (NSS) is a set of libraries designed to support
   cross-platform development of security-enabled client and server
@@ -45,109 +46,107 @@
 
 PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
 
-PACKAGES += CSWlibfreebl32fpu3
-CATALOGNAME_CSWlibfreebl32fpu3 = libfreebl32fpu3
-SPKG_DESC_CSWlibfreebl32fpu3 = Network Security Services library, libfreebl_32fpu_3
-PKGFILES_CSWlibfreebl32fpu3 += $(call baseisadirs,$(libdir),libfreebl_32fpu_3\.so)
-PKGFILES_CSWlibfreebl32fpu3 += $(call baseisadirs,$(libdir),libfreebl_32fpu_3\.so(\.\d+)*)
-SPKG_DESC_CSWlibfreebl32fpu3 += $(DESCRIPTION), libfreebl_32fpu_3.so
-RUNTIME_DEP_PKGS_CSWlibnss-dev += CSWlibfreebl32fpu3
-
-PACKAGES += CSWlibfreebl32int64-3
-CATALOGNAME_CSWlibfreebl32int64-3 = libfreebl32int64_3
-SPKG_DESC_CSWlibfreebl32int64-3 = Network Security Services library, libfreebl_32int64_3
-PKGFILES_CSWlibfreebl32int64-3 += $(call baseisadirs,$(libdir),libfreebl_32int64_3\.so)
-PKGFILES_CSWlibfreebl32int64-3 += $(call baseisadirs,$(libdir),libfreebl_32int64_3\.so(\.\d+)*)
-SPKG_DESC_CSWlibfreebl32int64-3 += $(DESCRIPTION), libfreebl_32int64_3.so
-RUNTIME_DEP_PKGS_CSWlibnss-dev += CSWlibfreebl32int64-3
-
-PACKAGES += CSWlibfreebl32int3
-CATALOGNAME_CSWlibfreebl32int3 = libfreebl32int3
-SPKG_DESC_CSWlibfreebl32int3 = Network Security Services library, libfreebl_32int_3
-PKGFILES_CSWlibfreebl32int3 += $(call baseisadirs,$(libdir),libfreebl_32int_3\.so)
-PKGFILES_CSWlibfreebl32int3 += $(call baseisadirs,$(libdir),libfreebl_32int_3\.so(\.\d+)*)
-SPKG_DESC_CSWlibfreebl32int3 += $(DESCRIPTION), libfreebl_32int_3.so
-RUNTIME_DEP_PKGS_CSWlibnss-dev += CSWlibfreebl32int3
-
 PACKAGES += CSWlibnss3
 CATALOGNAME_CSWlibnss3 = libnss3
-SPKG_DESC_CSWlibnss3 = Network Security Services library, implements crypto, PKI, SSL, and S/MIME support
+SPKG_DESC_CSWlibnss3 += $(DESCRIPTION), libnss3.so
 PKGFILES_CSWlibnss3 += $(call baseisadirs,$(libdir),libnss3\.so)
 PKGFILES_CSWlibnss3 += $(call baseisadirs,$(libdir),libnss3\.so(\.\d+)*)
-SPKG_DESC_CSWlibnss3 += $(DESCRIPTION), libnss3.so
-RUNTIME_DEP_PKGS_CSWlibnss-dev += CSWlibnss3
+RUNTIME_DEP_PKGS_CSWlibnss3 += CSWlibnssutil3
+RUNTIME_DEP_PKGS_CSWlibnss3 += CSWlibplds4
+RUNTIME_DEP_PKGS_CSWlibnss3 += CSWlibnspr4
+RUNTIME_DEP_PKGS_CSWlibnss3 += CSWlibplc4
 
 PACKAGES += CSWlibnssckbi
 CATALOGNAME_CSWlibnssckbi = libnssckbi
-SPKG_DESC_CSWlibnssckbi = Network Security Services library, libnssckbi
 PKGFILES_CSWlibnssckbi += $(call baseisadirs,$(libdir),libnssckbi\.so)
 PKGFILES_CSWlibnssckbi += $(call baseisadirs,$(libdir),libnssckbi\.so(\.\d+)*)
 SPKG_DESC_CSWlibnssckbi += $(DESCRIPTION), libnssckbi.so
-RUNTIME_DEP_PKGS_CSWlibnss-dev += CSWlibnssckbi
+RUNTIME_DEP_PKGS_CSWlibnssckbi += CSWlibplds4
+RUNTIME_DEP_PKGS_CSWlibnssckbi += CSWlibnspr4
+RUNTIME_DEP_PKGS_CSWlibnssckbi += CSWlibplc4
 
 PACKAGES += CSWlibnssdbm3
 CATALOGNAME_CSWlibnssdbm3 = libnssdbm3
-SPKG_DESC_CSWlibnssdbm3 = Network Security Services library, libnssdbm3
 PKGFILES_CSWlibnssdbm3 += $(call baseisadirs,$(libdir),libnssdbm3\.so)
 PKGFILES_CSWlibnssdbm3 += $(call baseisadirs,$(libdir),libnssdbm3\.so(\.\d+)*)
 SPKG_DESC_CSWlibnssdbm3 += $(DESCRIPTION), libnssdbm3.so
-RUNTIME_DEP_PKGS_CSWlibnss-dev += CSWlibnssdbm3
+RUNTIME_DEP_PKGS_CSWlibnssdbm3 += CSWlibnssutil3 
+RUNTIME_DEP_PKGS_CSWlibnssdbm3 += CSWlibplds4
+RUNTIME_DEP_PKGS_CSWlibnssdbm3 += CSWlibnspr4
+RUNTIME_DEP_PKGS_CSWlibnssdbm3 += CSWlibplc4
 
 PACKAGES += CSWlibnssutil3
 CATALOGNAME_CSWlibnssutil3 = libnssutil3
-SPKG_DESC_CSWlibnssutil3 = Network Security Services library, libnssutil3
 PKGFILES_CSWlibnssutil3 += $(call baseisadirs,$(libdir),libnssutil3\.so)
-PKGFILES_CSWlibnssutil3 += $(call baseisadirs,$(libdir),libnssutil3\.so(\.\d+)*)SPKG_DESC_CSWlibnssutil3 += $(DESCRIPTION), libnssutil3.so
-RUNTIME_DEP_PKGS_CSWlibnss-dev += CSWlibnssutil3
+PKGFILES_CSWlibnssutil3 += $(call baseisadirs,$(libdir),libnssutil3\.so(\.\d+)*)
+SPKG_DESC_CSWlibnssutil3 += $(DESCRIPTION), libnssutil3.so
+RUNTIME_DEP_PKGS_CSWlibnssutil3 += CSWlibplds4
+RUNTIME_DEP_PKGS_CSWlibnssutil3 += CSWlibnspr4
+RUNTIME_DEP_PKGS_CSWlibnssutil3 += CSWlibplc4
 
 PACKAGES += CSWlibsmime3
 CATALOGNAME_CSWlibsmime3 = libsmime3
-SPKG_DESC_CSWlibsmime3 = Network Security Services library, libsmime3
+SPKG_DESC_CSWlibsmime3 += $(DESCRIPTION), libsmime3.so
 PKGFILES_CSWlibsmime3 += $(call baseisadirs,$(libdir),libsmime3\.so)
 PKGFILES_CSWlibsmime3 += $(call baseisadirs,$(libdir),libsmime3\.so(\.\d+)*)
-SPKG_DESC_CSWlibsmime3 += $(DESCRIPTION), libsmime3.so
-RUNTIME_DEP_PKGS_CSWlibnss-dev += CSWlibsmime3
+RUNTIME_DEP_PKGS_CSWlibsmime3 += CSWlibnss3
+RUNTIME_DEP_PKGS_CSWlibsmime3 += CSWlibnssutil3 
+RUNTIME_DEP_PKGS_CSWlibsmime3 += CSWlibplds4
+RUNTIME_DEP_PKGS_CSWlibsmime3 += CSWlibnspr4
+RUNTIME_DEP_PKGS_CSWlibsmime3 += CSWlibplc4
 
 PACKAGES += CSWlibsoftokn3
 CATALOGNAME_CSWlibsoftokn3 = libsoftokn3
-SPKG_DESC_CSWlibsoftokn3 = Network Security Services library, libsoftokn3
 PKGFILES_CSWlibsoftokn3 += $(call baseisadirs,$(libdir),libsoftokn3\.so)
-PKGFILES_CSWlibsoftokn3 += $(call baseisadirs,$(libdir),libsoftokn3\.so(\.\d+)*)SPKG_DESC_CSWlibsoftokn3 += $(DESCRIPTION), libsoftokn3.so
-RUNTIME_DEP_PKGS_CSWlibnss-dev += CSWlibsoftokn3
+PKGFILES_CSWlibsoftokn3 += $(call baseisadirs,$(libdir),libsoftokn3\.so(\.\d+)*)
+SPKG_DESC_CSWlibsoftokn3 += $(DESCRIPTION), libsoftokn3.so
+RUNTIME_DEP_PKGS_CSWlibsoftokn3 += CSWlibnss3
+RUNTIME_DEP_PKGS_CSWlibsoftokn3 += CSWlibnspr4
+RUNTIME_DEP_PKGS_CSWlibsoftokn3 += CSWlibplc4
+RUNTIME_DEP_PKGS_CSWlibsoftokn3 += CSWlibsqlite3-0
+RUNTIME_DEP_PKGS_CSWlibsoftokn3 += CSWlibnssutil3 
+RUNTIME_DEP_PKGS_CSWlibsoftokn3 += CSWlibplds4
 
 PACKAGES += CSWlibssl3
 CATALOGNAME_CSWlibssl3 = libssl3
-SPKG_DESC_CSWlibssl3 = Network Security Services library, libssl3
+SPKG_DESC_CSWlibssl3 += $(DESCRIPTION), libssl3.so
 PKGFILES_CSWlibssl3 += $(call baseisadirs,$(libdir),libssl3\.so)
 PKGFILES_CSWlibssl3 += $(call baseisadirs,$(libdir),libssl3\.so(\.\d+)*)
-SPKG_DESC_CSWlibssl3 += $(DESCRIPTION), libssl3.so
-RUNTIME_DEP_PKGS_CSWlibnss-dev += CSWlibssl3
+RUNTIME_DEP_PKGS_CSWlibssl3 += CSWlibnss3
+RUNTIME_DEP_PKGS_CSWlibssl3 += CSWlibnspr4
+RUNTIME_DEP_PKGS_CSWlibssl3 += CSWlibplc4
 
-PACKAGES += CSWlibfreebl64fpu3
-CATALOGNAME_CSWlibfreebl64fpu3 = libfreebl64fpu3
-SPKG_DESC_CSWlibfreebl64fpu3 = Network Security Services library, libfreebl64fpu3
-PKGFILES_CSWlibfreebl64fpu3 += $(call baseisadirs,$(libdir),libfreebl_64fpu_3\.so)
-PKGFILES_CSWlibfreebl64fpu3 += $(call baseisadirs,$(libdir),libfreebl_64fpu_3\.so(\.\d+)*)
-SPKG_DESC_CSWlibfreebl64fpu3 += $(DESCRIPTION), libfreebl_64fpu_3.so
-RUNTIME_DEP_PKGS_CSWlibnss-dev += CSWlibfreebl64fpu3
-
-PACKAGES += CSWlibfreebl64int3
-CATALOGNAME_CSWlibfreebl64int3 = libfreebl64int3
-SPKG_DESC_CSWlibfreebl64int3 = Network Security Services library, libfreebl64int3
+PACKAGES += CSWlibfreebl
+CATALOGNAME_CSWlibfreebl = libfreebl
+SPKG_DESC_CSWlibfreebl+= $(DESCRIPTION), libfreebl
+PKGFILES_CSWlibfreebl+= $(call baseisadirs,$(libdir),libfreebl_64fpu_3\.so)
+PKGFILES_CSWlibfreebl+= $(call baseisadirs,$(libdir),libfreebl_64fpu_3\.so(\.\d+)*)
 PKGFILES_CSWlibfreebl64int3 += $(call baseisadirs,$(libdir),libfreebl_64int_3\.so)
 PKGFILES_CSWlibfreebl64int3 += $(call baseisadirs,$(libdir),libfreebl_64int_3\.so(\.\d+)*)
-SPKG_DESC_CSWlibfreebl64int3 += $(DESCRIPTION), libfreebl_64int_3.so
-RUNTIME_DEP_PKGS_CSWlibnss-dev += CSWlibfreebl64int3
+PKGFILES_CSWlibfreebl32fpu3 += $(call baseisadirs,$(libdir),libfreebl_32fpu_3\.so)
+PKGFILES_CSWlibfreebl32fpu3 += $(call baseisadirs,$(libdir),libfreebl_32fpu_3\.so(\.\d+)*)
+PKGFILES_CSWlibfreebl32int64-3 += $(call baseisadirs,$(libdir),libfreebl_32int64_3\.so)
+PKGFILES_CSWlibfreebl32int64-3 += $(call baseisadirs,$(libdir),libfreebl_32int64_3\.so(\.\d+)*)
+PKGFILES_CSWlibfreebl32int3 += $(call baseisadirs,$(libdir),libfreebl_32int_3\.so)
+PKGFILES_CSWlibfreebl32int3 += $(call baseisadirs,$(libdir),libfreebl_32int_3\.so(\.\d+)*)
+RUNTIME_DEP_PKGS_CSWlibfreebl += CSWlibnssutil3
 
 PACKAGES += CSWlibnss-dev
 CATALOGNAME_CSWlibnss-dev = libnss_dev
 SPKG_DESC_CSWlibnss-dev = Network Security Services library, development files
-PKGFILES_CSWlibnss-dev = $(PKGFILES_DEVEL)
+PKGFILES_CSWlibnss-dev = $(call baseisadirs,$(includedir),*\.h*)
 RUNTIME_DEP_PKGS_CSWlibnss-dev += CSWlibnss3
+RUNTIME_DEP_PKGS_CSWlibnss-dev += CSWlibssl3
 RUNTIME_DEP_PKGS_CSWlibnss-dev += CSWlibsqlite3-0
 RUNTIME_DEP_PKGS_CSWlibnss-dev += CSWlibnspr4
 RUNTIME_DEP_PKGS_CSWlibnss-dev += CSWlibplds4
 RUNTIME_DEP_PKGS_CSWlibnss-dev += CSWlibplc4
+RUNTIME_DEP_PKGS_CSWlibnss-dev += CSWlibsoftokn3
+RUNTIME_DEP_PKGS_CSWlibnss-dev += CSWlibsmime3
+RUNTIME_DEP_PKGS_CSWlibnss-dev += CSWlibnssutil3
+RUNTIME_DEP_PKGS_CSWlibnss-dev += CSWlibnssdbm3
+RUNTIME_DEP_PKGS_CSWlibnss-dev += CSWlibnssckbi
+RUNTIME_DEP_PKGS_CSWlibnss-dev += CSWlibfreebl
 OBSOLETED_BY_CSWlibnss-dev = CSWlibnss3-devel
 
 PACKAGES += CSWlibnss3-tools
@@ -158,7 +157,6 @@
 RUNTIME_DEP_PKGS_CSWlibnss3-tools += CSWlibplc4
 RUNTIME_DEP_PKGS_CSWlibnss3-tools += CSWlibnspr4
 RUNTIME_DEP_PKGS_CSWlibnss3-tools += CSWlibplds4
-RUNTIME_DEP_PKGS_CSWlibnss3-tools += CSWlibnss-dev
 
 BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) CSWnspr-dev CSWlibsqlite3-dev
 
@@ -254,6 +252,38 @@
 LD_OPTIONS = 
 # NSS_LD_OPTIONS = -R'$$ORIGIN'
 
+CHECKPKG_OVERRIDES_CSWlibfreebl += soname-equals-filename|file=/opt/csw/lib/sparcv9/libfreebl_64fpu_3.so
+CHECKPKG_OVERRIDES_CSWlibfreebl += soname-equals-filename|file=/opt/csw/lib/libfreebl_32int_3.so
+CHECKPKG_OVERRIDES_CSWlibfreebl += soname-equals-filename|file=/opt/csw/lib/libfreebl_32int64_3.so
+CHECKPKG_OVERRIDES_CSWlibfreebl += soname-equals-filename|file=/opt/csw/lib/sparcv9/libfreebl_64int_3.so
+CHECKPKG_OVERRIDES_CSWlibfreebl += soname-equals-filename|file=/opt/csw/lib/libfreebl_32fpu_3.so
+CHECKPKG_OVERRIDES_CSWlibfreebl += soname-equals-filename|file=/opt/csw/lib/sparcv9/libfreebl_64fpu_3.so
+CHECKPKG_OVERRIDES_CSWlibfreebl += non-uniform-lib-versions-in-package|sonames=libfreebl_32fpu_3.so,libfreebl_32int64_3.so,libfreebl_32int_3.so,libfreebl_64fpu_3.so,libfreebl_64int_3.so
+CHECKPKG_OVERRIDES_CSWlibnss3 += soname-equals-filename|file=/opt/csw/lib/libnss3.so
+CHECKPKG_OVERRIDES_CSWlibnss3 += soname-equals-filename|file=/opt/csw/lib/sparcv9/libnss3.so
+CHECKPKG_OVERRIDES_CSWlibnssutil3 += soname-equals-filename|file=/opt/csw/lib/libnssutil3.so
+CHECKPKG_OVERRIDES_CSWlibnssutil3 += soname-equals-filename|file=/opt/csw/lib/sparcv9/libnssutil3.so
+CHECKPKG_OVERRIDES_CSWlibsoftokn3 += soname-equals-filename|file=/opt/csw/lib/libsoftokn3.so
+CHECKPKG_OVERRIDES_CSWlibsoftokn3 += soname-equals-filename|file=/opt/csw/lib/sparcv9/libsoftokn3.so
+CHECKPKG_OVERRIDES_CSWlibssl3 += soname-equals-filename|file=/opt/csw/lib/libssl3.so
+CHECKPKG_OVERRIDES_CSWlibssl3 += soname-equals-filename|file=/opt/csw/lib/sparcv9/libssl3.so
+CHECKPKG_OVERRIDES_CSWlibsmime3 += soname-equals-filename|file=/opt/csw/lib/libsmime3.so
+CHECKPKG_OVERRIDES_CSWlibsmime3 += soname-equals-filename|file=/opt/csw/lib/sparcv9/libsmime3.so
+CHECKPKG_OVERRIDES_CSWlibnssckbi += soname-equals-filename|file=/opt/csw/lib/libnssckbi.so
+CHECKPKG_OVERRIDES_CSWlibnssckbi += soname-equals-filename|file=/opt/csw/lib/sparcv9/libnssckbi.so
+CHECKPKG_OVERRIDES_CSWlibnssdbm3 += soname-equals-filename|file=/opt/csw/lib/libnssdbm3.so
+CHECKPKG_OVERRIDES_CSWlibnssdbm3 += soname-equals-filename|file=/opt/csw/lib/sparcv9/libnssdbm3.so
+HECKPKG_OVERRIDES_CSWlibnss3-tools += bad-rpath-entry|$ORIGIN/../lib|opt/csw/bin/addbuiltin
+CHECKPKG_OVERRIDES_CSWlibnss3-tools += bad-rpath-entry|$ORIGIN/../lib|opt/csw/bin/certutil
+CHECKPKG_OVERRIDES_CSWlibnss3-tools += bad-rpath-entry|$ORIGIN/../lib|opt/csw/bin/cmsutil
+CHECKPKG_OVERRIDES_CSWlibnss3-tools += bad-rpath-entry|$ORIGIN/../lib|opt/csw/bin/crlutil
+CHECKPKG_OVERRIDES_CSWlibnss3-tools += bad-rpath-entry|$ORIGIN/../lib|opt/csw/bin/modutil
+CHECKPKG_OVERRIDES_CSWlibnss3-tools += bad-rpath-entry|$ORIGIN/../lib|opt/csw/bin/pk12util
+CHECKPKG_OVERRIDES_CSWlibnss3-tools += bad-rpath-entry|$ORIGIN/../lib|opt/csw/bin/signtool
+CHECKPKG_OVERRIDES_CSWlibnss3-tools += bad-rpath-entry|$ORIGIN/../lib|opt/csw/bin/signver
+CHECKPKG_OVERRIDES_CSWlibnss3-tools += bad-rpath-entry|$ORIGIN/../lib|opt/csw/bin/ssltap
+
+
 include gar/category.mk
 
 build-nss: build-coreconf build-dbm build-nss-compile

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


From cgrzemba at users.sourceforge.net  Wed Jan 18 16:28:02 2012
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Wed, 18 Jan 2012 15:28:02 +0000
Subject: [csw-devel] SF.net SVN: gar:[16798] csw/mgar/pkg/nss/trunk/Makefile
Message-ID: <E1RnXQg-0005Uy-76@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 16798
          http://gar.svn.sourceforge.net/gar/?rev=16798&view=rev
Author:   cgrzemba
Date:     2012-01-18 15:28:01 +0000 (Wed, 18 Jan 2012)
Log Message:
-----------
nss/trunk: change rpath to /opt/csw/lib/$ISALIST

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

Modified: csw/mgar/pkg/nss/trunk/Makefile
===================================================================
--- csw/mgar/pkg/nss/trunk/Makefile	2012-01-18 15:08:49 UTC (rev 16797)
+++ csw/mgar/pkg/nss/trunk/Makefile	2012-01-18 15:28:01 UTC (rev 16798)
@@ -308,7 +308,7 @@
 build-nss-compile:
 	(cd $(WORKSRC)/mozilla/security/nss \
 		&& \
-	gmake -j1 RPATH=-R\'\$$\$$ORIGIN\')
+	gmake -j1 RPATH=-R\'/opt/csw/lib/\$$\$$ISALIST\')
 	@$(MAKECOOKIE)
 
 install-nss:

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


From wahwah at users.sourceforge.net  Wed Jan 18 23:05:33 2012
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Wed, 18 Jan 2012 22:05:33 +0000
Subject: [csw-devel] SF.net SVN: gar:[16799]
	csw/mgar/pkg/lang-python/sphinx/trunk
Message-ID: <E1RnddN-0005CX-ET@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 16799
          http://gar.svn.sourceforge.net/gar/?rev=16799&view=rev
Author:   wahwah
Date:     2012-01-18 22:05:33 +0000 (Wed, 18 Jan 2012)
Log Message:
-----------
lang-python/sphinx/trunk: version bump to 1.1.2

Modified Paths:
--------------
    csw/mgar/pkg/lang-python/sphinx/trunk/Makefile
    csw/mgar/pkg/lang-python/sphinx/trunk/checksums

Modified: csw/mgar/pkg/lang-python/sphinx/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-python/sphinx/trunk/Makefile	2012-01-18 15:28:01 UTC (rev 16798)
+++ csw/mgar/pkg/lang-python/sphinx/trunk/Makefile	2012-01-18 22:05:33 UTC (rev 16799)
@@ -3,7 +3,7 @@
 # $Id$
 
 NAME = Sphinx
-VERSION = 1.0.7
+VERSION = 1.1.2
 PACKAGES = CSWpy-sphinx
 CATEGORIES = python
 DESCRIPTION = Helps create documentation consisting of reStructuredText sources
@@ -14,7 +14,9 @@
 DEP_PKGS += CSWpy-docutils
 DEP_PKGS += CSWpy-jinja2
 DEP_PKGS += CSWpy-pygments
+DEP_PKGS += CSWpysetuptools
 CHECKPKG_OVERRIDES_CSWpy-sphinx += surplus-dependency|CSWpy-docutils
 CHECKPKG_OVERRIDES_CSWpy-sphinx += surplus-dependency|CSWpy-jinja2
 CHECKPKG_OVERRIDES_CSWpy-sphinx += surplus-dependency|CSWpy-pygments
+CHECKPKG_OVERRIDES_CSWpy-sphinx += surplus-dependency|CSWpysetuptools
 include gar/category.mk

Modified: csw/mgar/pkg/lang-python/sphinx/trunk/checksums
===================================================================
--- csw/mgar/pkg/lang-python/sphinx/trunk/checksums	2012-01-18 15:28:01 UTC (rev 16798)
+++ csw/mgar/pkg/lang-python/sphinx/trunk/checksums	2012-01-18 22:05:33 UTC (rev 16799)
@@ -1 +1 @@
-42c722d48e52d4888193965dd473adb5  Sphinx-1.0.7.tar.gz
+b65a5d5d6172f3dcfefb4770ec63926e  Sphinx-1.1.2.tar.gz

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


From wahwah at users.sourceforge.net  Thu Jan 19 00:05:41 2012
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Wed, 18 Jan 2012 23:05:41 +0000
Subject: [csw-devel] SF.net SVN: gar:[16800]
	csw/mgar/pkg/opencsw-policy/trunk
Message-ID: <E1RneZZ-0001lw-FB@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 16800
          http://gar.svn.sourceforge.net/gar/?rev=16800&view=rev
Author:   wahwah
Date:     2012-01-18 23:05:41 +0000 (Wed, 18 Jan 2012)
Log Message:
-----------
opencsw-policy/trunk: Next iteration: 3 chapters

Modified Paths:
--------------
    csw/mgar/pkg/opencsw-policy/trunk/Makefile
    csw/mgar/pkg/opencsw-policy/trunk/files/filesystem-layout.rst
    csw/mgar/pkg/opencsw-policy/trunk/files/index.rst
    csw/mgar/pkg/opencsw-policy/trunk/files/shared-libraries.rst

Added Paths:
-----------
    csw/mgar/pkg/opencsw-policy/trunk/files/o2a-index.rst
    csw/mgar/pkg/opencsw-policy/trunk/files/o2d-index.rst
    csw/mgar/pkg/opencsw-policy/trunk/files/o2m-index.rst

Modified: csw/mgar/pkg/opencsw-policy/trunk/Makefile
===================================================================
--- csw/mgar/pkg/opencsw-policy/trunk/Makefile	2012-01-18 22:05:33 UTC (rev 16799)
+++ csw/mgar/pkg/opencsw-policy/trunk/Makefile	2012-01-18 23:05:41 UTC (rev 16800)
@@ -40,7 +40,7 @@
 post-install-modulated: copy-to-web
 	@$(MAKECOOKIE)
 
-copy-to-web: $(PKGROOT)$(docdir)/$(CATALOGNAME_CSWopencsw-policy)/index.html
+copy-to-web:
 	if [ -d $(HOME)/public_html/policy ]; then \
 		rsync -r $(PKGROOT)$(docdir)/$(CATALOGNAME_CSWopencsw-policy)/ \
 		$(HOME)/public_html/policy; \

Modified: csw/mgar/pkg/opencsw-policy/trunk/files/filesystem-layout.rst
===================================================================
--- csw/mgar/pkg/opencsw-policy/trunk/files/filesystem-layout.rst	2012-01-18 22:05:33 UTC (rev 16799)
+++ csw/mgar/pkg/opencsw-policy/trunk/files/filesystem-layout.rst	2012-01-18 23:05:41 UTC (rev 16800)
@@ -1,17 +1,17 @@
+-------------------------
 OpenCSW filesystem layout
-=========================
+-------------------------
 
-.. contents::
-
 .. highlight:: text
 
 Introduction
 ------------
 
-OpenCSW installs over an already installed Solaris system, and follows
-the general rule of not conflicting with existing Solaris files.
+OpenCSW installs over an already installed Solaris system, and follows the
+general rule of not conflicting with existing Solaris files.
 
-* /opt/csw
-* /etc/opt/csw
-* /var/opt/csw
+The outermost installation directories are:
 
+* /opt/csw (base of the hierarchy)
+* /etc/opt/csw (configuration files)
+* /var/opt/csw (data files)

Modified: csw/mgar/pkg/opencsw-policy/trunk/files/index.rst
===================================================================
--- csw/mgar/pkg/opencsw-policy/trunk/files/index.rst	2012-01-18 22:05:33 UTC (rev 16799)
+++ csw/mgar/pkg/opencsw-policy/trunk/files/index.rst	2012-01-18 23:05:41 UTC (rev 16800)
@@ -3,6 +3,7 @@
    You can adapt this file completely to your liking, but it should at least
    contain the root `toctree` directive.
 
+===================================
 Welcome to OpenCSW's documentation!
 ===================================
 
@@ -11,13 +12,12 @@
 .. toctree::
    :maxdepth: 2
 
-   filesystem-layout.rst
-   shared-libraries.rst
+   o2a-index
+   o2d-index
+   o2m-index
 
 .. Indices and tables
    ==================
    * :ref:`genindex`
    * :ref:`modindex`
    * :ref:`search`
-
-

Added: csw/mgar/pkg/opencsw-policy/trunk/files/o2a-index.rst
===================================================================
--- csw/mgar/pkg/opencsw-policy/trunk/files/o2a-index.rst	                        (rev 0)
+++ csw/mgar/pkg/opencsw-policy/trunk/files/o2a-index.rst	2012-01-18 23:05:41 UTC (rev 16800)
@@ -0,0 +1,22 @@
+==========================
+OpenCSW for Administrators
+==========================
+
+A usage manual for people who manage Solaris systems with OpenCSW packages.
+
+.. contents::
+
+Bootstrapping
+-------------
+
+On a Solaris 10 system, you can use the capacity of pkgadd to download
+packages via http::
+
+  pkgadd -d http://get.opencsw.org/now
+
+On Solaris 8 and 9 (best effort support only), you need to download the
+package using e.g. wget and install it with::
+
+  wget http://mirror.opencsw.org/opencsw/pkgutil.pkg
+  pkgadd -d pkgutil.pkg
+

Added: csw/mgar/pkg/opencsw-policy/trunk/files/o2d-index.rst
===================================================================
--- csw/mgar/pkg/opencsw-policy/trunk/files/o2d-index.rst	                        (rev 0)
+++ csw/mgar/pkg/opencsw-policy/trunk/files/o2d-index.rst	2012-01-18 23:05:41 UTC (rev 16800)
@@ -0,0 +1,8 @@
+======================
+OpenCSW for Developers
+======================
+
+.. contents::
+
+This is a manual for developers who want to build own software, using
+tools and libraries provided by OpenCSW.

Added: csw/mgar/pkg/opencsw-policy/trunk/files/o2m-index.rst
===================================================================
--- csw/mgar/pkg/opencsw-policy/trunk/files/o2m-index.rst	                        (rev 0)
+++ csw/mgar/pkg/opencsw-policy/trunk/files/o2m-index.rst	2012-01-18 23:05:41 UTC (rev 16800)
@@ -0,0 +1,11 @@
+===============================
+OpenCSW for Package Maintainers
+===============================
+
+This is a manual for people who want to build Solaris packages and Solaris
+package repositories, either at OpenCSW or at their own organization.
+
+.. contents::
+
+.. include:: filesystem-layout.rst
+.. include:: shared-libraries.rst

Modified: csw/mgar/pkg/opencsw-policy/trunk/files/shared-libraries.rst
===================================================================
--- csw/mgar/pkg/opencsw-policy/trunk/files/shared-libraries.rst	2012-01-18 22:05:33 UTC (rev 16799)
+++ csw/mgar/pkg/opencsw-policy/trunk/files/shared-libraries.rst	2012-01-18 23:05:41 UTC (rev 16800)
@@ -1,5 +1,6 @@
+----------------
 Shared libraries
-================
+----------------
 
 Background
 ----------

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


From wahwah at users.sourceforge.net  Thu Jan 19 00:08:23 2012
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Wed, 18 Jan 2012 23:08:23 +0000
Subject: [csw-devel] SF.net SVN: gar:[16801]
 csw/mgar/pkg/opencsw-policy/trunk/files/o2m-index. rst
Message-ID: <E1RnecB-0000yJ-H0@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 16801
          http://gar.svn.sourceforge.net/gar/?rev=16801&view=rev
Author:   wahwah
Date:     2012-01-18 23:08:23 +0000 (Wed, 18 Jan 2012)
Log Message:
-----------
opencsw-policy/trunk: You can use nested toctree directives

Modified Paths:
--------------
    csw/mgar/pkg/opencsw-policy/trunk/files/o2m-index.rst

Modified: csw/mgar/pkg/opencsw-policy/trunk/files/o2m-index.rst
===================================================================
--- csw/mgar/pkg/opencsw-policy/trunk/files/o2m-index.rst	2012-01-18 23:05:41 UTC (rev 16800)
+++ csw/mgar/pkg/opencsw-policy/trunk/files/o2m-index.rst	2012-01-18 23:08:23 UTC (rev 16801)
@@ -5,7 +5,8 @@
 This is a manual for people who want to build Solaris packages and Solaris
 package repositories, either at OpenCSW or at their own organization.
 
-.. contents::
+.. toctree::
+  :maxdepth: 2
 
-.. include:: filesystem-layout.rst
-.. include:: shared-libraries.rst
+  filesystem-layout
+  shared-libraries

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


From cgrzemba at users.sourceforge.net  Thu Jan 19 08:32:12 2012
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Thu, 19 Jan 2012 07:32:12 +0000
Subject: [csw-devel] SF.net SVN: gar:[16802] csw/mgar/pkg/nss/trunk/Makefile
Message-ID: <E1RnmTk-00022w-84@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 16802
          http://gar.svn.sourceforge.net/gar/?rev=16802&view=rev
Author:   cgrzemba
Date:     2012-01-19 07:32:11 +0000 (Thu, 19 Jan 2012)
Log Message:
-----------
nss/trunk: add checkpkg hints

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

Modified: csw/mgar/pkg/nss/trunk/Makefile
===================================================================
--- csw/mgar/pkg/nss/trunk/Makefile	2012-01-18 23:08:23 UTC (rev 16801)
+++ csw/mgar/pkg/nss/trunk/Makefile	2012-01-19 07:32:11 UTC (rev 16802)
@@ -115,21 +115,23 @@
 RUNTIME_DEP_PKGS_CSWlibssl3 += CSWlibnss3
 RUNTIME_DEP_PKGS_CSWlibssl3 += CSWlibnspr4
 RUNTIME_DEP_PKGS_CSWlibssl3 += CSWlibplc4
+RUNTIME_DEP_PKGS_CSWlibssl3 += CSWlibnssutil3
 
 PACKAGES += CSWlibfreebl
 CATALOGNAME_CSWlibfreebl = libfreebl
-SPKG_DESC_CSWlibfreebl+= $(DESCRIPTION), libfreebl
+SPKG_DESC_CSWlibfreebl+= $(DESCRIPTION), libfreebl libs
 PKGFILES_CSWlibfreebl+= $(call baseisadirs,$(libdir),libfreebl_64fpu_3\.so)
 PKGFILES_CSWlibfreebl+= $(call baseisadirs,$(libdir),libfreebl_64fpu_3\.so(\.\d+)*)
-PKGFILES_CSWlibfreebl64int3 += $(call baseisadirs,$(libdir),libfreebl_64int_3\.so)
-PKGFILES_CSWlibfreebl64int3 += $(call baseisadirs,$(libdir),libfreebl_64int_3\.so(\.\d+)*)
-PKGFILES_CSWlibfreebl32fpu3 += $(call baseisadirs,$(libdir),libfreebl_32fpu_3\.so)
-PKGFILES_CSWlibfreebl32fpu3 += $(call baseisadirs,$(libdir),libfreebl_32fpu_3\.so(\.\d+)*)
-PKGFILES_CSWlibfreebl32int64-3 += $(call baseisadirs,$(libdir),libfreebl_32int64_3\.so)
-PKGFILES_CSWlibfreebl32int64-3 += $(call baseisadirs,$(libdir),libfreebl_32int64_3\.so(\.\d+)*)
-PKGFILES_CSWlibfreebl32int3 += $(call baseisadirs,$(libdir),libfreebl_32int_3\.so)
-PKGFILES_CSWlibfreebl32int3 += $(call baseisadirs,$(libdir),libfreebl_32int_3\.so(\.\d+)*)
+PKGFILES_CSWlibfreebl += $(call baseisadirs,$(libdir),libfreebl_64int_3\.so)
+PKGFILES_CSWlibfreebl += $(call baseisadirs,$(libdir),libfreebl_64int_3\.so(\.\d+)*)
+PKGFILES_CSWlibfreebl += $(call baseisadirs,$(libdir),libfreebl_32fpu_3\.so)
+PKGFILES_CSWlibfreebl += $(call baseisadirs,$(libdir),libfreebl_32fpu_3\.so(\.\d+)*)
+PKGFILES_CSWlibfreebl += $(call baseisadirs,$(libdir),libfreebl_32int64_3\.so)
+PKGFILES_CSWlibfreebl += $(call baseisadirs,$(libdir),libfreebl_32int64_3\.so(\.\d+)*)
+PKGFILES_CSWlibfreebl += $(call baseisadirs,$(libdir),libfreebl_32int_3\.so)
+PKGFILES_CSWlibfreebl += $(call baseisadirs,$(libdir),libfreebl_32int_3\.so(\.\d+)*)
 RUNTIME_DEP_PKGS_CSWlibfreebl += CSWlibnssutil3
+RUNTIME_DEP_PKGS_CSWlibfreebl += CSWlibnspr4
 
 PACKAGES += CSWlibnss-dev
 CATALOGNAME_CSWlibnss-dev = libnss_dev

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


From cgrzemba at users.sourceforge.net  Thu Jan 19 10:08:58 2012
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Thu, 19 Jan 2012 09:08:58 +0000
Subject: [csw-devel] SF.net SVN: gar:[16803] csw/mgar/pkg/nss/trunk
Message-ID: <E1RnnzO-00041X-Sa@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 16803
          http://gar.svn.sourceforge.net/gar/?rev=16803&view=rev
Author:   cgrzemba
Date:     2012-01-19 09:08:58 +0000 (Thu, 19 Jan 2012)
Log Message:
-----------
nss/trunk: fix rpath for cmd's

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

Added Paths:
-----------
    csw/mgar/pkg/nss/trunk/files/0005-change-rpath-for-bins-in-platlibs.mk.patch

Modified: csw/mgar/pkg/nss/trunk/Makefile
===================================================================
--- csw/mgar/pkg/nss/trunk/Makefile	2012-01-19 07:32:11 UTC (rev 16802)
+++ csw/mgar/pkg/nss/trunk/Makefile	2012-01-19 09:08:58 UTC (rev 16803)
@@ -246,6 +246,7 @@
 # PATCHFILES_isa-amd64 += platlibs-sqlite3-64.patch
 PATCHFILES += 0004-fix-xarch-and-add-SQLITE_LIB_DIR-var.patch
 PATCHFILES += 0005-platlibs.mk-linking-bltest.patch
+PATCHFILES += 0005-change-rpath-for-bins-in-platlibs.mk.patch
 
 # http://lists.opencsw.org/pipermail/pkgsubmissions/2010-February/000167.html
 # NOISAEXEC = 1

Added: csw/mgar/pkg/nss/trunk/files/0005-change-rpath-for-bins-in-platlibs.mk.patch
===================================================================
--- csw/mgar/pkg/nss/trunk/files/0005-change-rpath-for-bins-in-platlibs.mk.patch	                        (rev 0)
+++ csw/mgar/pkg/nss/trunk/files/0005-change-rpath-for-bins-in-platlibs.mk.patch	2012-01-19 09:08:58 UTC (rev 16803)
@@ -0,0 +1,25 @@
+From 48bbd74f294a85ea1880906689ca4ba02faf5840 Mon Sep 17 00:00:00 2001
+From: Carsten Grzemba <cgrzemba at opencsw.org>
+Date: Thu, 19 Jan 2012 09:43:12 +0100
+Subject: [PATCH] change rpath for bins in platlibs.mk
+
+---
+ mozilla/security/nss/cmd/platlibs.mk |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/mozilla/security/nss/cmd/platlibs.mk b/mozilla/security/nss/cmd/platlibs.mk
+index 88c053d..3563c9a 100644
+--- a/mozilla/security/nss/cmd/platlibs.mk
++++ b/mozilla/security/nss/cmd/platlibs.mk
+@@ -46,7 +46,7 @@ else
+ EXTRA_SHARED_LIBS += -R '$$ORIGIN/../lib:/usr/lib/mps/secv1:/usr/lib/mps'
+ endif
+ else
+-EXTRA_SHARED_LIBS += -R '$$ORIGIN/../lib'
++EXTRA_SHARED_LIBS += $(RPATH)
+ endif
+ endif
+ 
+-- 
+1.7.8.3
+

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


From cgrzemba at users.sourceforge.net  Thu Jan 19 10:12:42 2012
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Thu, 19 Jan 2012 09:12:42 +0000
Subject: [csw-devel] SF.net SVN: gar:[16804] csw/mgar/pkg/nss/trunk/Makefile
Message-ID: <E1Rno30-00069s-SF@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 16804
          http://gar.svn.sourceforge.net/gar/?rev=16804&view=rev
Author:   cgrzemba
Date:     2012-01-19 09:12:42 +0000 (Thu, 19 Jan 2012)
Log Message:
-----------
nss/trunk: remove old sqlite3 patches

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

Modified: csw/mgar/pkg/nss/trunk/Makefile
===================================================================
--- csw/mgar/pkg/nss/trunk/Makefile	2012-01-19 09:08:58 UTC (rev 16803)
+++ csw/mgar/pkg/nss/trunk/Makefile	2012-01-19 09:12:42 UTC (rev 16804)
@@ -237,13 +237,6 @@
 # Required patches.
 PATCHFILES += include.patch
 PATCHFILES += ld-options.patch
-# PATCHFILES += platlibs-sqlite3.patch
-PATCHFILES_isa-sparcv8 = sqlite3-32.patch
-PATCHFILES_isa-i386 = sqlite3-32.patch
-PATCHFILES_isa-sparcv9  = sqlite3-64.patch
-# PATCHFILES_isa-sparcv9 += platlibs-sqlite3-64.patch
-PATCHFILES_isa-amd64  = sqlite3-64.patch
-# PATCHFILES_isa-amd64 += platlibs-sqlite3-64.patch
 PATCHFILES += 0004-fix-xarch-and-add-SQLITE_LIB_DIR-var.patch
 PATCHFILES += 0005-platlibs.mk-linking-bltest.patch
 PATCHFILES += 0005-change-rpath-for-bins-in-platlibs.mk.patch

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


From janholzh at users.sourceforge.net  Thu Jan 19 10:28:43 2012
From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net)
Date: Thu, 19 Jan 2012 09:28:43 +0000
Subject: [csw-devel] SF.net SVN: gar:[16805] csw/mgar/pkg
Message-ID: <E1RnoIV-0006Uk-Lh@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 16805
          http://gar.svn.sourceforge.net/gar/?rev=16805&view=rev
Author:   janholzh
Date:     2012-01-19 09:28:43 +0000 (Thu, 19 Jan 2012)
Log Message:
-----------
rootsh/trunk: Initial commit

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

Added: csw/mgar/pkg/rootsh/Makefile
===================================================================
--- csw/mgar/pkg/rootsh/Makefile	                        (rev 0)
+++ csw/mgar/pkg/rootsh/Makefile	2012-01-19 09:28:43 UTC (rev 16805)
@@ -0,0 +1,2 @@
+%:
+	$(MAKE) -C trunk $*


Property changes on: csw/mgar/pkg/rootsh/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/rootsh/trunk/Makefile
===================================================================
--- csw/mgar/pkg/rootsh/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/rootsh/trunk/Makefile	2012-01-19 09:28:43 UTC (rev 16805)
@@ -0,0 +1,30 @@
+# $Id$
+# TODO (release-critical prefixed with !, non release-critical with *)
+#
+NAME = rootsh
+VERSION = 1.5.3
+GARTYPE = v2
+CATEGORIES = apps
+
+DESCRIPTION = Rootsh is a wrapper for shells which logs all echoed keystrokes and terminal output to a file
+define BLURB
+Rootsh is a wrapper for shells which logs all echoed keystrokes and terminal output to a file and/or to syslog. It's main purpose is the auditing of users who need a shell with root privileges. They start rootsh through the sudo mechanism. 
+endef
+
+MASTER_SITES = $(SF_MIRRORS)
+DISTFILES  = $(DISTNAME).tar.gz
+PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
+
+# File name regex to get notifications about upstream software releases
+# NOTE: Use this only if the automatic regex creation
+#       does not work for your package
+# UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
+
+# If the url used to check for software update is different of MASTER_SITES, then 
+# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES
+# UPSTREAM_MASTER_SITES = 
+
+CONFIGURE_ARGS = $(DIRPATHS)
+
+include gar/category.mk
+


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

Added: csw/mgar/pkg/rootsh/trunk/checksums
===================================================================
--- csw/mgar/pkg/rootsh/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/rootsh/trunk/checksums	2012-01-19 09:28:43 UTC (rev 16805)
@@ -0,0 +1 @@
+af62e6140338c9b2e8e8f6e828fda1ac  rootsh-1.5.3.tar.gz

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


From bonivart at users.sourceforge.net  Thu Jan 19 10:38:13 2012
From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net)
Date: Thu, 19 Jan 2012 09:38:13 +0000
Subject: [csw-devel] SF.net SVN: gar:[16806] csw/mgar/pkg/memconf/trunk
Message-ID: <E1RnoRh-0006hT-Qu@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 16806
          http://gar.svn.sourceforge.net/gar/?rev=16806&view=rev
Author:   bonivart
Date:     2012-01-19 09:38:13 +0000 (Thu, 19 Jan 2012)
Log Message:
-----------
memconf/trunk: update to 2.21

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

Modified: csw/mgar/pkg/memconf/trunk/Makefile
===================================================================
--- csw/mgar/pkg/memconf/trunk/Makefile	2012-01-19 09:28:43 UTC (rev 16805)
+++ csw/mgar/pkg/memconf/trunk/Makefile	2012-01-19 09:38:13 UTC (rev 16806)
@@ -1,5 +1,5 @@
 NAME = memconf
-VERSION = 2.20
+VERSION = 2.21
 CATEGORIES = utils
 
 DESCRIPTION = Perl script that displays memory modules installed

Modified: csw/mgar/pkg/memconf/trunk/checksums
===================================================================
--- csw/mgar/pkg/memconf/trunk/checksums	2012-01-19 09:28:43 UTC (rev 16805)
+++ csw/mgar/pkg/memconf/trunk/checksums	2012-01-19 09:38:13 UTC (rev 16806)
@@ -1,2 +1,2 @@
-005841c8eb38a9180c2cb910455069f7  memconf.gz
-8a5ee6d0b6b13089d00607a88a0e166b  memconf.man
+2bd6ec7ae2e1c9f078e9f77035c9167f  memconf.gz
+b9ae140edae89a761eb5177767de258b  memconf.man

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


From cgrzemba at users.sourceforge.net  Thu Jan 19 10:55:38 2012
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Thu, 19 Jan 2012 09:55:38 +0000
Subject: [csw-devel] SF.net SVN: gar:[16807] csw/mgar/pkg/nss/trunk/Makefile
Message-ID: <E1RnoiY-00050j-9S@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 16807
          http://gar.svn.sourceforge.net/gar/?rev=16807&view=rev
Author:   cgrzemba
Date:     2012-01-19 09:55:38 +0000 (Thu, 19 Jan 2012)
Log Message:
-----------
nss/trunk: rename pkg CSWlibfreebl3

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

Modified: csw/mgar/pkg/nss/trunk/Makefile
===================================================================
--- csw/mgar/pkg/nss/trunk/Makefile	2012-01-19 09:38:13 UTC (rev 16806)
+++ csw/mgar/pkg/nss/trunk/Makefile	2012-01-19 09:55:38 UTC (rev 16807)
@@ -117,21 +117,21 @@
 RUNTIME_DEP_PKGS_CSWlibssl3 += CSWlibplc4
 RUNTIME_DEP_PKGS_CSWlibssl3 += CSWlibnssutil3
 
-PACKAGES += CSWlibfreebl
-CATALOGNAME_CSWlibfreebl = libfreebl
-SPKG_DESC_CSWlibfreebl+= $(DESCRIPTION), libfreebl libs
-PKGFILES_CSWlibfreebl+= $(call baseisadirs,$(libdir),libfreebl_64fpu_3\.so)
-PKGFILES_CSWlibfreebl+= $(call baseisadirs,$(libdir),libfreebl_64fpu_3\.so(\.\d+)*)
-PKGFILES_CSWlibfreebl += $(call baseisadirs,$(libdir),libfreebl_64int_3\.so)
-PKGFILES_CSWlibfreebl += $(call baseisadirs,$(libdir),libfreebl_64int_3\.so(\.\d+)*)
-PKGFILES_CSWlibfreebl += $(call baseisadirs,$(libdir),libfreebl_32fpu_3\.so)
-PKGFILES_CSWlibfreebl += $(call baseisadirs,$(libdir),libfreebl_32fpu_3\.so(\.\d+)*)
-PKGFILES_CSWlibfreebl += $(call baseisadirs,$(libdir),libfreebl_32int64_3\.so)
-PKGFILES_CSWlibfreebl += $(call baseisadirs,$(libdir),libfreebl_32int64_3\.so(\.\d+)*)
-PKGFILES_CSWlibfreebl += $(call baseisadirs,$(libdir),libfreebl_32int_3\.so)
-PKGFILES_CSWlibfreebl += $(call baseisadirs,$(libdir),libfreebl_32int_3\.so(\.\d+)*)
-RUNTIME_DEP_PKGS_CSWlibfreebl += CSWlibnssutil3
-RUNTIME_DEP_PKGS_CSWlibfreebl += CSWlibnspr4
+PACKAGES += CSWlibfreebl3
+CATALOGNAME_CSWlibfreebl3 = libfreebl3
+SPKG_DESC_CSWlibfreebl3 += $(DESCRIPTION), libfreebl libs
+PKGFILES_CSWlibfreebl3 += $(call baseisadirs,$(libdir),libfreebl_64fpu_3\.so)
+PKGFILES_CSWlibfreebl3 += $(call baseisadirs,$(libdir),libfreebl_64fpu_3\.so(\.\d+)*)
+PKGFILES_CSWlibfreebl3 += $(call baseisadirs,$(libdir),libfreebl_64int_3\.so)
+PKGFILES_CSWlibfreebl3 += $(call baseisadirs,$(libdir),libfreebl_64int_3\.so(\.\d+)*)
+PKGFILES_CSWlibfreebl3 += $(call baseisadirs,$(libdir),libfreebl_32fpu_3\.so)
+PKGFILES_CSWlibfreebl3 += $(call baseisadirs,$(libdir),libfreebl_32fpu_3\.so(\.\d+)*)
+PKGFILES_CSWlibfreebl3 += $(call baseisadirs,$(libdir),libfreebl_32int64_3\.so)
+PKGFILES_CSWlibfreebl3 += $(call baseisadirs,$(libdir),libfreebl_32int64_3\.so(\.\d+)*)
+PKGFILES_CSWlibfreebl3 += $(call baseisadirs,$(libdir),libfreebl_32int_3\.so)
+PKGFILES_CSWlibfreebl3 += $(call baseisadirs,$(libdir),libfreebl_32int_3\.so(\.\d+)*)
+RUNTIME_DEP_PKGS_CSWlibfreebl3 += CSWlibnssutil3
+RUNTIME_DEP_PKGS_CSWlibfreebl3 += CSWlibnspr4
 
 PACKAGES += CSWlibnss-dev
 CATALOGNAME_CSWlibnss-dev = libnss_dev

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


From cgrzemba at users.sourceforge.net  Thu Jan 19 11:20:27 2012
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Thu, 19 Jan 2012 10:20:27 +0000
Subject: [csw-devel] SF.net SVN: gar:[16808] csw/mgar/pkg/nss/trunk/Makefile
Message-ID: <E1Rnp6Z-0007do-2D@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 16808
          http://gar.svn.sourceforge.net/gar/?rev=16808&view=rev
Author:   cgrzemba
Date:     2012-01-19 10:20:26 +0000 (Thu, 19 Jan 2012)
Log Message:
-----------
nss/trunk: add checkpkg hints

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

Modified: csw/mgar/pkg/nss/trunk/Makefile
===================================================================
--- csw/mgar/pkg/nss/trunk/Makefile	2012-01-19 09:55:38 UTC (rev 16807)
+++ csw/mgar/pkg/nss/trunk/Makefile	2012-01-19 10:20:26 UTC (rev 16808)
@@ -100,7 +100,6 @@
 PKGFILES_CSWlibsoftokn3 += $(call baseisadirs,$(libdir),libsoftokn3\.so)
 PKGFILES_CSWlibsoftokn3 += $(call baseisadirs,$(libdir),libsoftokn3\.so(\.\d+)*)
 SPKG_DESC_CSWlibsoftokn3 += $(DESCRIPTION), libsoftokn3.so
-RUNTIME_DEP_PKGS_CSWlibsoftokn3 += CSWlibnss3
 RUNTIME_DEP_PKGS_CSWlibsoftokn3 += CSWlibnspr4
 RUNTIME_DEP_PKGS_CSWlibsoftokn3 += CSWlibplc4
 RUNTIME_DEP_PKGS_CSWlibsoftokn3 += CSWlibsqlite3-0
@@ -148,7 +147,7 @@
 RUNTIME_DEP_PKGS_CSWlibnss-dev += CSWlibnssutil3
 RUNTIME_DEP_PKGS_CSWlibnss-dev += CSWlibnssdbm3
 RUNTIME_DEP_PKGS_CSWlibnss-dev += CSWlibnssckbi
-RUNTIME_DEP_PKGS_CSWlibnss-dev += CSWlibfreebl
+RUNTIME_DEP_PKGS_CSWlibnss-dev += CSWlibfreebl3
 OBSOLETED_BY_CSWlibnss-dev = CSWlibnss3-devel
 
 PACKAGES += CSWlibnss3-tools
@@ -159,6 +158,9 @@
 RUNTIME_DEP_PKGS_CSWlibnss3-tools += CSWlibplc4
 RUNTIME_DEP_PKGS_CSWlibnss3-tools += CSWlibnspr4
 RUNTIME_DEP_PKGS_CSWlibnss3-tools += CSWlibplds4
+RUNTIME_DEP_PKGS_CSWlibnss3-tools += CSWlibsmime3
+RUNTIME_DEP_PKGS_CSWlibnss3-tools += CSWlibssl3
+RUNTIME_DEP_PKGS_CSWlibnss3-tools += CSWlibnssutil3
 
 BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) CSWnspr-dev CSWlibsqlite3-dev
 
@@ -248,13 +250,12 @@
 LD_OPTIONS = 
 # NSS_LD_OPTIONS = -R'$$ORIGIN'
 
-CHECKPKG_OVERRIDES_CSWlibfreebl += soname-equals-filename|file=/opt/csw/lib/sparcv9/libfreebl_64fpu_3.so
-CHECKPKG_OVERRIDES_CSWlibfreebl += soname-equals-filename|file=/opt/csw/lib/libfreebl_32int_3.so
-CHECKPKG_OVERRIDES_CSWlibfreebl += soname-equals-filename|file=/opt/csw/lib/libfreebl_32int64_3.so
-CHECKPKG_OVERRIDES_CSWlibfreebl += soname-equals-filename|file=/opt/csw/lib/sparcv9/libfreebl_64int_3.so
-CHECKPKG_OVERRIDES_CSWlibfreebl += soname-equals-filename|file=/opt/csw/lib/libfreebl_32fpu_3.so
-CHECKPKG_OVERRIDES_CSWlibfreebl += soname-equals-filename|file=/opt/csw/lib/sparcv9/libfreebl_64fpu_3.so
-CHECKPKG_OVERRIDES_CSWlibfreebl += non-uniform-lib-versions-in-package|sonames=libfreebl_32fpu_3.so,libfreebl_32int64_3.so,libfreebl_32int_3.so,libfreebl_64fpu_3.so,libfreebl_64int_3.so
+CHECKPKG_OVERRIDES_CSWlibfreebl3 += soname-equals-filename|file=/opt/csw/lib/sparcv9/libfreebl_64fpu_3.so
+CHECKPKG_OVERRIDES_CSWlibfreebl3 += soname-equals-filename|file=/opt/csw/lib/sparcv9/libfreebl_64int_3.so
+CHECKPKG_OVERRIDES_CSWlibfreebl3 += soname-equals-filename|file=/opt/csw/lib/libfreebl_32int_3.so
+CHECKPKG_OVERRIDES_CSWlibfreebl3 += soname-equals-filename|file=/opt/csw/lib/libfreebl_32int64_3.so
+CHECKPKG_OVERRIDES_CSWlibfreebl3 += soname-equals-filename|file=/opt/csw/lib/libfreebl_32fpu_3.so
+CHECKPKG_OVERRIDES_CSWlibfreebl3 += shared-lib-pkgname-mismatch|sonames=libfreebl_32fpu_3.so,libfreebl_32int64_3.so,libfreebl_32int_3.so,libfreebl_64fpu_3.so,libfreebl_64int_3.so|pkgname=CSWlibfreebl3|expected=CSWlibfreebl|
 CHECKPKG_OVERRIDES_CSWlibnss3 += soname-equals-filename|file=/opt/csw/lib/libnss3.so
 CHECKPKG_OVERRIDES_CSWlibnss3 += soname-equals-filename|file=/opt/csw/lib/sparcv9/libnss3.so
 CHECKPKG_OVERRIDES_CSWlibnssutil3 += soname-equals-filename|file=/opt/csw/lib/libnssutil3.so
@@ -269,17 +270,7 @@
 CHECKPKG_OVERRIDES_CSWlibnssckbi += soname-equals-filename|file=/opt/csw/lib/sparcv9/libnssckbi.so
 CHECKPKG_OVERRIDES_CSWlibnssdbm3 += soname-equals-filename|file=/opt/csw/lib/libnssdbm3.so
 CHECKPKG_OVERRIDES_CSWlibnssdbm3 += soname-equals-filename|file=/opt/csw/lib/sparcv9/libnssdbm3.so
-HECKPKG_OVERRIDES_CSWlibnss3-tools += bad-rpath-entry|$ORIGIN/../lib|opt/csw/bin/addbuiltin
-CHECKPKG_OVERRIDES_CSWlibnss3-tools += bad-rpath-entry|$ORIGIN/../lib|opt/csw/bin/certutil
-CHECKPKG_OVERRIDES_CSWlibnss3-tools += bad-rpath-entry|$ORIGIN/../lib|opt/csw/bin/cmsutil
-CHECKPKG_OVERRIDES_CSWlibnss3-tools += bad-rpath-entry|$ORIGIN/../lib|opt/csw/bin/crlutil
-CHECKPKG_OVERRIDES_CSWlibnss3-tools += bad-rpath-entry|$ORIGIN/../lib|opt/csw/bin/modutil
-CHECKPKG_OVERRIDES_CSWlibnss3-tools += bad-rpath-entry|$ORIGIN/../lib|opt/csw/bin/pk12util
-CHECKPKG_OVERRIDES_CSWlibnss3-tools += bad-rpath-entry|$ORIGIN/../lib|opt/csw/bin/signtool
-CHECKPKG_OVERRIDES_CSWlibnss3-tools += bad-rpath-entry|$ORIGIN/../lib|opt/csw/bin/signver
-CHECKPKG_OVERRIDES_CSWlibnss3-tools += bad-rpath-entry|$ORIGIN/../lib|opt/csw/bin/ssltap
 
-
 include gar/category.mk
 
 build-nss: build-coreconf build-dbm build-nss-compile

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


From janholzh at users.sourceforge.net  Thu Jan 19 12:06:59 2012
From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net)
Date: Thu, 19 Jan 2012 11:06:59 +0000
Subject: [csw-devel] SF.net SVN: gar:[16809]
	csw/mgar/pkg/rootsh/trunk/Makefile
Message-ID: <E1Rnppb-0006K0-J4@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 16809
          http://gar.svn.sourceforge.net/gar/?rev=16809&view=rev
Author:   janholzh
Date:     2012-01-19 11:06:59 +0000 (Thu, 19 Jan 2012)
Log Message:
-----------
rootsh/trunk: add logdir

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

Modified: csw/mgar/pkg/rootsh/trunk/Makefile
===================================================================
--- csw/mgar/pkg/rootsh/trunk/Makefile	2012-01-19 10:20:26 UTC (rev 16808)
+++ csw/mgar/pkg/rootsh/trunk/Makefile	2012-01-19 11:06:59 UTC (rev 16809)
@@ -24,7 +24,16 @@
 # uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES
 # UPSTREAM_MASTER_SITES = 
 
-CONFIGURE_ARGS = $(DIRPATHS)
+CONFIGURE_ARGS = $(DIRPATHS) --with-logdir=/var/opt/csw/rootsh
 
+PROTOTYPE_MODIFIERS = rootsshdir 
+PROTOTYPE_FILES_rootsshdir =  /var/opt/csw/rootsh  # a normal Perl regexp. Watch out for links!
+PROTOTYPE_PERMS_rootsshdir = 0733
+PROTOTYPE_USER_rootsshdir = root
+PROTOTYPE_GROUP_rootsshdir = root
+
 include gar/category.mk
 
+post-install-modulated:
+	ginstall --mode=733 -d $(DESTDIR)/var/opt/csw/rootsh
+	@$(MAKECOOKIE)

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


From cgrzemba at users.sourceforge.net  Thu Jan 19 12:21:53 2012
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Thu, 19 Jan 2012 11:21:53 +0000
Subject: [csw-devel] SF.net SVN: gar:[16810] csw/mgar/pkg/nss/trunk/Makefile
Message-ID: <E1Rnq41-00029H-Hu@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 16810
          http://gar.svn.sourceforge.net/gar/?rev=16810&view=rev
Author:   cgrzemba
Date:     2012-01-19 11:21:53 +0000 (Thu, 19 Jan 2012)
Log Message:
-----------
nss/trunk: fix checkpkg override

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

Modified: csw/mgar/pkg/nss/trunk/Makefile
===================================================================
--- csw/mgar/pkg/nss/trunk/Makefile	2012-01-19 11:06:59 UTC (rev 16809)
+++ csw/mgar/pkg/nss/trunk/Makefile	2012-01-19 11:21:53 UTC (rev 16810)
@@ -255,7 +255,6 @@
 CHECKPKG_OVERRIDES_CSWlibfreebl3 += soname-equals-filename|file=/opt/csw/lib/libfreebl_32int_3.so
 CHECKPKG_OVERRIDES_CSWlibfreebl3 += soname-equals-filename|file=/opt/csw/lib/libfreebl_32int64_3.so
 CHECKPKG_OVERRIDES_CSWlibfreebl3 += soname-equals-filename|file=/opt/csw/lib/libfreebl_32fpu_3.so
-CHECKPKG_OVERRIDES_CSWlibfreebl3 += shared-lib-pkgname-mismatch|sonames=libfreebl_32fpu_3.so,libfreebl_32int64_3.so,libfreebl_32int_3.so,libfreebl_64fpu_3.so,libfreebl_64int_3.so|pkgname=CSWlibfreebl3|expected=CSWlibfreebl|
 CHECKPKG_OVERRIDES_CSWlibnss3 += soname-equals-filename|file=/opt/csw/lib/libnss3.so
 CHECKPKG_OVERRIDES_CSWlibnss3 += soname-equals-filename|file=/opt/csw/lib/sparcv9/libnss3.so
 CHECKPKG_OVERRIDES_CSWlibnssutil3 += soname-equals-filename|file=/opt/csw/lib/libnssutil3.so

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


From cgrzemba at users.sourceforge.net  Thu Jan 19 12:27:38 2012
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Thu, 19 Jan 2012 11:27:38 +0000
Subject: [csw-devel] SF.net SVN: gar:[16811] csw/mgar/pkg
Message-ID: <E1Rnq9a-0006hS-9p@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 16811
          http://gar.svn.sourceforge.net/gar/?rev=16811&view=rev
Author:   cgrzemba
Date:     2012-01-19 11:27:38 +0000 (Thu, 19 Jan 2012)
Log Message:
-----------
389-dsgw/trunk: Inital commit

Added Paths:
-----------
    csw/mgar/pkg/389-dsgw/
    csw/mgar/pkg/389-dsgw/Makefile
    csw/mgar/pkg/389-dsgw/branches/
    csw/mgar/pkg/389-dsgw/tags/
    csw/mgar/pkg/389-dsgw/trunk/
    csw/mgar/pkg/389-dsgw/trunk/Makefile
    csw/mgar/pkg/389-dsgw/trunk/checksums
    csw/mgar/pkg/389-dsgw/trunk/files/
    csw/mgar/pkg/389-dsgw/trunk/files/0001-change-include-path-preference-in-Makefile.am.patch

Added: csw/mgar/pkg/389-dsgw/Makefile
===================================================================
--- csw/mgar/pkg/389-dsgw/Makefile	                        (rev 0)
+++ csw/mgar/pkg/389-dsgw/Makefile	2012-01-19 11:27:38 UTC (rev 16811)
@@ -0,0 +1,2 @@
+%:
+	$(MAKE) -C trunk $*


Property changes on: csw/mgar/pkg/389-dsgw/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/389-dsgw/trunk/Makefile
===================================================================
--- csw/mgar/pkg/389-dsgw/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/389-dsgw/trunk/Makefile	2012-01-19 11:27:38 UTC (rev 16811)
@@ -0,0 +1,67 @@
+# $Id$
+# TODO (release-critical prefixed with !, non release-critical with *)
+#
+NAME = 389-dsgw
+VERSION = 1.1.7
+GARTYPE = v2
+CATEGORIES = server
+
+DESCRIPTION = Directory Server Gateway web apps
+define BLURB
+The enterprise-class Open Source LDAP server for Linux. It is hardened by real-world use, is full-featured, supports multi-master replication, and already handles many of the largest LDAP deployments in the world. The 389 Directory Server can be downloaded for free and set up in less than an hour using the graphical console.
+endef
+
+MASTER_SITES = http://port389.org/sources
+DISTFILES  = $(NAME)-$(VERSION).tar.bz2
+# BUILD64	= 1
+PACKAGING_PLATFORMS += solaris10-sparc
+PACKAGING_PLATFORMS += solaris10-i386
+
+LICENSE = LICENSE
+
+GARCOMPILER = SOS12U2
+EXTRA_LIB = /opt/csw/bdb48/lib
+# remove -I/opt/csw/include
+CPPFLAGS = 
+EXTRA_LINKER_FLAGS = -xnorunpath -norunpath
+
+RUNTIME_DEP_PKGS_CSW389-dsgw += CSWlibprldap60
+RUNTIME_DEP_PKGS_CSW389-dsgw += CSWlibldif60
+RUNTIME_DEP_PKGS_CSW389-dsgw += CSWlibicudata48
+RUNTIME_DEP_PKGS_CSW389-dsgw += CSWlibadmsslutil0
+RUNTIME_DEP_PKGS_CSW389-dsgw += CSWlibsasl2-2
+RUNTIME_DEP_PKGS_CSW389-dsgw += CSWlibplc4
+RUNTIME_DEP_PKGS_CSW389-dsgw += CSWlibnspr4
+RUNTIME_DEP_PKGS_CSW389-dsgw += CSWlibldap60
+RUNTIME_DEP_PKGS_CSW389-dsgw += CSWlibicuuc48
+RUNTIME_DEP_PKGS_CSW389-dsgw += CSWlibicui18n48
+RUNTIME_DEP_PKGS_CSW389-dsgw += CSWlibadminutil0
+RUNTIME_DEP_PKGS_CSW389-dsgw += CSWlibnss3
+RUNTIME_DEP_PKGS_CSW389-dsgw += CSWlibplds4
+RUNTIME_DEP_PKGS_CSW389-dsgw += CSWlibssldap60
+CHECKPKG_OVERRIDES_CSW389-dsgw += file-with-bad-content|/usr/local|root/opt/csw/share/dirsrv/manual/en/dsgw/attribut.htm
+
+PATCHFILES += 0001-change-include-path-preference-in-Makefile.am.patch
+
+CONFIGURE_ARGS = $(DIRPATHS)
+CONFIGURE_ARGS_OPT += --with-ldapsdk-inc=/opt/csw/include/dirsrv 
+CONFIGURE_ARGS_OPT += --with-ldapsdk-lib=/opt/csw/lib
+CONFIGURE_ARGS_OPT += --with-ldapsdk-bin=/opt/csw/dirsrv/bin 
+CONFIGURE_ARGS_OPT += --with-icu-inc=/opt/csw/include 
+CONFIGURE_ARGS_OPT += --with-icu-lib=/opt/csw/lib
+CONFIGURE_ARGS_OPT += --with-icu-bin=/opt/csw/bin 
+CONFIGURE_ARGS_OPT += --with-sasl-inc=/opt/csw/include/sasl 
+CONFIGURE_ARGS_OPT += --with-sasl-lib=/opt/csw/lib
+CONFIGURE_ARGS_OPT += --with-nspr-lib=/opt/csw/lib
+CONFIGURE_ARGS_OPT += --with-nspr-inc=/opt/csw/include/nspr
+CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARFLAVOR))
+
+include gar/category.mk
+
+pre-configure-modulated:
+	cd $(WORKSRC) && rm ltmain.sh && libtoolize --copy --force
+	cd $(WORKSRC) && aclocal
+	cd $(WORKSRC) && autoconf --force
+	cd $(WORKSRC) && automake -a -c -f
+	cd $(WORKSRC) && autoheader
+	@$(MAKECOOKIE)


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

Added: csw/mgar/pkg/389-dsgw/trunk/checksums
===================================================================
--- csw/mgar/pkg/389-dsgw/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/389-dsgw/trunk/checksums	2012-01-19 11:27:38 UTC (rev 16811)
@@ -0,0 +1 @@
+367537e786006adf8f204974b62c282b  389-dsgw-1.1.7.tar.bz2

Added: csw/mgar/pkg/389-dsgw/trunk/files/0001-change-include-path-preference-in-Makefile.am.patch
===================================================================
--- csw/mgar/pkg/389-dsgw/trunk/files/0001-change-include-path-preference-in-Makefile.am.patch	                        (rev 0)
+++ csw/mgar/pkg/389-dsgw/trunk/files/0001-change-include-path-preference-in-Makefile.am.patch	2012-01-19 11:27:38 UTC (rev 16811)
@@ -0,0 +1,38795 @@
+From 61297c8e9549854b0b12707158ec5dce5e41785c Mon Sep 17 00:00:00 2001
+From: Carsten Grzemba <cgrzemba at opencsw.org>
+Date: Thu, 19 Jan 2012 11:59:37 +0100
+Subject: [PATCH] change include path preference in Makefile.am
+
+---
+ Makefile.am  |    2 +-
+ Makefile.in  |  102 +-
+ aclocal.m4   | 8501 ++++++++++++++++++++++++++++++++-
+ compile      |  173 +-
+ config.guess |  235 +-
+ config.h.in  |    3 +
+ config.sub   |  184 +-
+ configure    |15121 +++++++++++++++++++++++++---------------------------------
+ depcomp      |   74 +-
+ install-sh   |   29 +-
+ ltmain.sh    | 3977 ++++++++++------
+ 11 files changed, 18090 insertions(+), 10311 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 212e6c3..7951f18 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -52,7 +52,7 @@ endif
+ 
+ DSGW_VER_STR := "Directory-Server-Gateway/$(PACKAGE_VERSION)"
+ 
+-AM_CPPFLAGS = -DDSGW_VER_STR=\"$(DSGW_VER_STR)\" $(DEBUG_DEFINES) @adminutil_inc@ @icu_inc@ @openldap_inc@ @ldapsdk_inc@ @nss_inc@ @nspr_inc@ \
++AM_CPPFLAGS = -DDSGW_VER_STR=\"$(DSGW_VER_STR)\" $(DEBUG_DEFINES) @adminutil_inc@ @openldap_inc@ @ldapsdk_inc@ @nss_inc@ @nspr_inc@ @icu_inc@ \
+ 	-I$(srcdir)/include -I$(srcdir)/include/base
+ if WINNT
+ AM_CPPFLAGS += -DXP_WINNT
+diff --git a/Makefile.in b/Makefile.in
+index 08cd8cb..a648ca9 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.2 from Makefile.am.
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -76,10 +76,7 @@ DIST_COMMON = README $(am__configure_deps) $(dist_config_DATA) \
+ 	ChangeLog NEWS compile config.guess config.sub depcomp \
+ 	install-sh ltmain.sh missing
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
+-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+-	$(top_srcdir)/m4/fhs.m4 $(top_srcdir)/m4/nspr.m4 \
++am__aclocal_m4_deps = $(top_srcdir)/m4/fhs.m4 $(top_srcdir)/m4/nspr.m4 \
+ 	$(top_srcdir)/m4/nss.m4 $(top_srcdir)/m4/sasl.m4 \
+ 	$(top_srcdir)/m4/openldap.m4 $(top_srcdir)/m4/mozldap.m4 \
+ 	$(top_srcdir)/m4/icu.m4 $(top_srcdir)/m4/adminutil.m4 \
+@@ -240,6 +237,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
+ am__base_list = \
+   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__uninstall_files_from_dir = { \
++  test -z "$$files" \
++    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
++    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
++         $(am__cd) "$$dir" && rm -f $$files; }; \
++  }
+ SCRIPTS = $(cgibin_SCRIPTS) $(nodist_sbin_SCRIPTS)
+ DEFAULT_INCLUDES = -I. at am__isrc@
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+@@ -290,6 +293,8 @@ am__remove_distdir = \
+ DIST_ARCHIVES = $(distdir).tar.gz
+ GZIP_ENV = --best
+ distuninstallcheck_listfiles = find . -type f -print
++am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
++  | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
+ distcleancheck_listfiles = find . -type f -print
+ ACLOCAL = @ACLOCAL@
+ AMTAR = @AMTAR@
+@@ -310,6 +315,7 @@ CXXFLAGS = @CXXFLAGS@
+ CYGPATH_W = @CYGPATH_W@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
++DLLTOOL = @DLLTOOL@
+ DSYMUTIL = @DSYMUTIL@
+ DUMPBIN = @DUMPBIN@
+ ECHO_C = @ECHO_C@
+@@ -340,6 +346,7 @@ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
++MANIFEST_TOOL = @MANIFEST_TOOL@
+ MKDIR_P = @MKDIR_P@
+ NM = @NM@
+ NMEDIT = @NMEDIT@
+@@ -353,6 +360,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+ PACKAGE_NAME = @PACKAGE_NAME@
+ PACKAGE_STRING = @PACKAGE_STRING@
+ PACKAGE_TARNAME = @PACKAGE_TARNAME@
++PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+@@ -367,6 +375,7 @@ abs_builddir = @abs_builddir@
+ abs_srcdir = @abs_srcdir@
+ abs_top_builddir = @abs_top_builddir@
+ abs_top_srcdir = @abs_top_srcdir@
++ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+@@ -424,7 +433,6 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
+-lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ manualdir = $(datadir)@manualdir@
+ manualsubdir = @manualsubdir@
+@@ -708,7 +716,7 @@ all: config.h
+ 
+ .SUFFIXES:
+ .SUFFIXES: .c .cpp .lo .o .obj
+-am--refresh:
++am--refresh: Makefile
+ 	@:
+ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ 	@for dep in $?; do \
+@@ -744,10 +752,8 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ $(am__aclocal_m4_deps):
+ 
+ config.h: stamp-h1
+-	@if test ! -f $@; then \
+-	  rm -f stamp-h1; \
+-	  $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
+-	else :; fi
++	@if test ! -f $@; then rm -f stamp-h1; else :; fi
++	@if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi
+ 
+ stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
+ 	@rm -f stamp-h1
+@@ -884,9 +890,7 @@ uninstall-cgibinSCRIPTS:
+ 	@list='$(cgibin_SCRIPTS)'; test -n "$(cgibindir)" || exit 0; \
+ 	files=`for p in $$list; do echo "$$p"; done | \
+ 	       sed -e 's,.*/,,;$(transform)'`; \
+-	test -n "$$list" || exit 0; \
+-	echo " ( cd '$(DESTDIR)$(cgibindir)' && rm -f" $$files ")"; \
+-	cd "$(DESTDIR)$(cgibindir)" && rm -f $$files
++	dir='$(DESTDIR)$(cgibindir)'; $(am__uninstall_files_from_dir)
+ install-nodist_sbinSCRIPTS: $(nodist_sbin_SCRIPTS)
+ 	@$(NORMAL_INSTALL)
+ 	test -z "$(sbindir)" || $(MKDIR_P) "$(DESTDIR)$(sbindir)"
+@@ -918,9 +922,7 @@ uninstall-nodist_sbinSCRIPTS:
+ 	@list='$(nodist_sbin_SCRIPTS)'; test -n "$(sbindir)" || exit 0; \
+ 	files=`for p in $$list; do echo "$$p"; done | \
+ 	       sed -e 's,.*/,,;$(transform)'`; \
+-	test -n "$$list" || exit 0; \
+-	echo " ( cd '$(DESTDIR)$(sbindir)' && rm -f" $$files ")"; \
+-	cd "$(DESTDIR)$(sbindir)" && rm -f $$files
++	dir='$(DESTDIR)$(sbindir)'; $(am__uninstall_files_from_dir)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+@@ -1039,9 +1041,7 @@ uninstall-dist_configDATA:
+ 	@$(NORMAL_UNINSTALL)
+ 	@list='$(dist_config_DATA)'; test -n "$(configdir)" || list=; \
+ 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+-	test -n "$$files" || exit 0; \
+-	echo " ( cd '$(DESTDIR)$(configdir)' && rm -f" $$files ")"; \
+-	cd "$(DESTDIR)$(configdir)" && rm -f $$files
++	dir='$(DESTDIR)$(configdir)'; $(am__uninstall_files_from_dir)
+ install-dist_htmlDATA: $(dist_html_DATA)
+ 	@$(NORMAL_INSTALL)
+ 	test -z "$(htmldir)" || $(MKDIR_P) "$(DESTDIR)$(htmldir)"
+@@ -1059,9 +1059,7 @@ uninstall-dist_htmlDATA:
+ 	@$(NORMAL_UNINSTALL)
+ 	@list='$(dist_html_DATA)'; test -n "$(htmldir)" || list=; \
+ 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+-	test -n "$$files" || exit 0; \
+-	echo " ( cd '$(DESTDIR)$(htmldir)' && rm -f" $$files ")"; \
+-	cd "$(DESTDIR)$(htmldir)" && rm -f $$files
++	dir='$(DESTDIR)$(htmldir)'; $(am__uninstall_files_from_dir)
+ install-dist_maninstDATA: $(dist_maninst_DATA)
+ 	@$(NORMAL_INSTALL)
+ 	test -z "$(maninstdir)" || $(MKDIR_P) "$(DESTDIR)$(maninstdir)"
+@@ -1079,9 +1077,7 @@ uninstall-dist_maninstDATA:
+ 	@$(NORMAL_UNINSTALL)
+ 	@list='$(dist_maninst_DATA)'; test -n "$(maninstdir)" || list=; \
+ 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+-	test -n "$$files" || exit 0; \
+-	echo " ( cd '$(DESTDIR)$(maninstdir)' && rm -f" $$files ")"; \
+-	cd "$(DESTDIR)$(maninstdir)" && rm -f $$files
++	dir='$(DESTDIR)$(maninstdir)'; $(am__uninstall_files_from_dir)
+ install-dist_orghtmlDATA: $(dist_orghtml_DATA)
+ 	@$(NORMAL_INSTALL)
+ 	test -z "$(orghtmldir)" || $(MKDIR_P) "$(DESTDIR)$(orghtmldir)"
+@@ -1099,9 +1095,7 @@ uninstall-dist_orghtmlDATA:
+ 	@$(NORMAL_UNINSTALL)
+ 	@list='$(dist_orghtml_DATA)'; test -n "$(orghtmldir)" || list=; \
+ 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+-	test -n "$$files" || exit 0; \
+-	echo " ( cd '$(DESTDIR)$(orghtmldir)' && rm -f" $$files ")"; \
+-	cd "$(DESTDIR)$(orghtmldir)" && rm -f $$files
++	dir='$(DESTDIR)$(orghtmldir)'; $(am__uninstall_files_from_dir)
+ install-dist_pbconfigDATA: $(dist_pbconfig_DATA)
+ 	@$(NORMAL_INSTALL)
+ 	test -z "$(pbconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pbconfigdir)"
+@@ -1119,9 +1113,7 @@ uninstall-dist_pbconfigDATA:
+ 	@$(NORMAL_UNINSTALL)
+ 	@list='$(dist_pbconfig_DATA)'; test -n "$(pbconfigdir)" || list=; \
+ 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+-	test -n "$$files" || exit 0; \
+-	echo " ( cd '$(DESTDIR)$(pbconfigdir)' && rm -f" $$files ")"; \
+-	cd "$(DESTDIR)$(pbconfigdir)" && rm -f $$files
++	dir='$(DESTDIR)$(pbconfigdir)'; $(am__uninstall_files_from_dir)
+ install-dist_pbhtmlDATA: $(dist_pbhtml_DATA)
+ 	@$(NORMAL_INSTALL)
+ 	test -z "$(pbhtmldir)" || $(MKDIR_P) "$(DESTDIR)$(pbhtmldir)"
+@@ -1139,9 +1131,7 @@ uninstall-dist_pbhtmlDATA:
+ 	@$(NORMAL_UNINSTALL)
+ 	@list='$(dist_pbhtml_DATA)'; test -n "$(pbhtmldir)" || list=; \
+ 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+-	test -n "$$files" || exit 0; \
+-	echo " ( cd '$(DESTDIR)$(pbhtmldir)' && rm -f" $$files ")"; \
+-	cd "$(DESTDIR)$(pbhtmldir)" && rm -f $$files
++	dir='$(DESTDIR)$(pbhtmldir)'; $(am__uninstall_files_from_dir)
+ install-nodist_contextDATA: $(nodist_context_DATA)
+ 	@$(NORMAL_INSTALL)
+ 	test -z "$(contextdir)" || $(MKDIR_P) "$(DESTDIR)$(contextdir)"
+@@ -1159,9 +1149,7 @@ uninstall-nodist_contextDATA:
+ 	@$(NORMAL_UNINSTALL)
+ 	@list='$(nodist_context_DATA)'; test -n "$(contextdir)" || list=; \
+ 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+-	test -n "$$files" || exit 0; \
+-	echo " ( cd '$(DESTDIR)$(contextdir)' && rm -f" $$files ")"; \
+-	cd "$(DESTDIR)$(contextdir)" && rm -f $$files
++	dir='$(DESTDIR)$(contextdir)'; $(am__uninstall_files_from_dir)
+ install-nodist_propertyDATA: $(nodist_property_DATA)
+ 	@$(NORMAL_INSTALL)
+ 	test -z "$(propertydir)" || $(MKDIR_P) "$(DESTDIR)$(propertydir)"
+@@ -1179,9 +1167,7 @@ uninstall-nodist_propertyDATA:
+ 	@$(NORMAL_UNINSTALL)
+ 	@list='$(nodist_property_DATA)'; test -n "$(propertydir)" || list=; \
+ 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+-	test -n "$$files" || exit 0; \
+-	echo " ( cd '$(DESTDIR)$(propertydir)' && rm -f" $$files ")"; \
+-	cd "$(DESTDIR)$(propertydir)" && rm -f $$files
++	dir='$(DESTDIR)$(propertydir)'; $(am__uninstall_files_from_dir)
+ 
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+@@ -1279,7 +1265,7 @@ dist-gzip: distdir
+ 	$(am__remove_distdir)
+ 
+ dist-bzip2: distdir
+-	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
++	tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
+ 	$(am__remove_distdir)
+ 
+ dist-lzma: distdir
+@@ -1287,7 +1273,7 @@ dist-lzma: distdir
+ 	$(am__remove_distdir)
+ 
+ dist-xz: distdir
+-	tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
++	tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
+ 	$(am__remove_distdir)
+ 
+ dist-tarZ: distdir
+@@ -1337,6 +1323,7 @@ distcheck: dist
+ 	  && am__cwd=`pwd` \
+ 	  && $(am__cd) $(distdir)/_build \
+ 	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
++	    $(AM_DISTCHECK_CONFIGURE_FLAGS) \
+ 	    $(DISTCHECK_CONFIGURE_FLAGS) \
+ 	  && $(MAKE) $(AM_MAKEFLAGS) \
+ 	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
+@@ -1365,8 +1352,16 @@ distcheck: dist
+ 	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
+ 	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
+ distuninstallcheck:
+-	@$(am__cd) '$(distuninstallcheck_dir)' \
+-	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
++	@test -n '$(distuninstallcheck_dir)' || { \
++	  echo 'ERROR: trying to run $@ with an empty' \
++	       '$$(distuninstallcheck_dir)' >&2; \
++	  exit 1; \
++	}; \
++	$(am__cd) '$(distuninstallcheck_dir)' || { \
++	  echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \
++	  exit 1; \
++	}; \
++	test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \
+ 	   || { echo "ERROR: files left after uninstall:" ; \
+ 	        if test -n "$(DESTDIR)"; then \
+ 	          echo "  (check DESTDIR support)"; \
+@@ -1399,10 +1394,15 @@ install-am: all-am
+ 
+ installcheck: installcheck-am
+ install-strip:
+-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+-	  `test -z '$(STRIP)' || \
+-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++	if test -z '$(STRIP)'; then \
++	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++	      install; \
++	else \
++	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++	fi
+ mostlyclean-generic:
+ 	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
+ 
+diff --git a/aclocal.m4 b/aclocal.m4
+index ef89f4a..6623d7d 100644
+--- a/aclocal.m4
++++ b/aclocal.m4
+@@ -1,7 +1,8 @@
+-# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
++# generated automatically by aclocal 1.11.2 -*- Autoconf -*-
+ 
+ # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+-# 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
++# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
++# Inc.
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -13,18 +14,8448 @@
+ 
+ m4_ifndef([AC_AUTOCONF_VERSION],
+   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],,
+-[m4_warning([this file was generated for autoconf 2.63.
++m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],,
++[m4_warning([this file was generated for autoconf 2.68.
+ You have another version of autoconf.  It may work, but is not guaranteed to.
+ If you have problems, you may need to regenerate the build system entirely.
+ To do so, use the procedure documented by the package, typically `autoreconf'.])])
+ 
+-# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
++# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
++#
++#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
++#                 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
++#                 Inc.
++#   Written by Gordon Matzigkeit, 1996
++#
++# This file is free software; the Free Software Foundation gives
++# unlimited permission to copy and/or distribute it, with or without
++# modifications, as long as this notice is preserved.
++
++m4_define([_LT_COPYING], [dnl
++#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
++#                 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
++#                 Inc.
++#   Written by Gordon Matzigkeit, 1996
++#
++#   This file is part of GNU Libtool.
++#
++# GNU Libtool 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.
++#
++# As a special exception to the GNU General Public License,
++# if you distribute this file as part of a program or library that
++# is built using GNU Libtool, you may include this file under the
++# same distribution terms that you use for the rest of that program.
++#
++# GNU Libtool 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 GNU Libtool; see the file COPYING.  If not, a copy
++# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
++# obtained by writing to the Free Software Foundation, Inc.,
++# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
++])
++
++# serial 57 LT_INIT
++
++
++# LT_PREREQ(VERSION)
++# ------------------
++# Complain and exit if this libtool version is less that VERSION.
++m4_defun([LT_PREREQ],
++[m4_if(m4_version_compare(m4_defn([LT_PACKAGE_VERSION]), [$1]), -1,
++       [m4_default([$3],
++		   [m4_fatal([Libtool version $1 or higher is required],
++		             63)])],
++       [$2])])
++
++
++# _LT_CHECK_BUILDDIR
++# ------------------
++# Complain if the absolute build directory name contains unusual characters
++m4_defun([_LT_CHECK_BUILDDIR],
++[case `pwd` in
++  *\ * | *\	*)
++    AC_MSG_WARN([Libtool does not cope well with whitespace in `pwd`]) ;;
++esac
++])
++
++
++# LT_INIT([OPTIONS])
++# ------------------
++AC_DEFUN([LT_INIT],
++[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT
++AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
++AC_BEFORE([$0], [LT_LANG])dnl
++AC_BEFORE([$0], [LT_OUTPUT])dnl
++AC_BEFORE([$0], [LTDL_INIT])dnl
++m4_require([_LT_CHECK_BUILDDIR])dnl
++
++dnl Autoconf doesn't catch unexpanded LT_ macros by default:
++m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl
++m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])dnl
++dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4
++dnl unless we require an AC_DEFUNed macro:
++AC_REQUIRE([LTOPTIONS_VERSION])dnl
++AC_REQUIRE([LTSUGAR_VERSION])dnl
++AC_REQUIRE([LTVERSION_VERSION])dnl
++AC_REQUIRE([LTOBSOLETE_VERSION])dnl
++m4_require([_LT_PROG_LTMAIN])dnl
++
++_LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}])
++
++dnl Parse OPTIONS
++_LT_SET_OPTIONS([$0], [$1])
++
++# This can be used to rebuild libtool when needed
++LIBTOOL_DEPS="$ltmain"
++
++# Always use our own libtool.
++LIBTOOL='$(SHELL) $(top_builddir)/libtool'
++AC_SUBST(LIBTOOL)dnl
++
++_LT_SETUP
++
++# Only expand once:
++m4_define([LT_INIT])
++])# LT_INIT
++
++# Old names:
++AU_ALIAS([AC_PROG_LIBTOOL], [LT_INIT])
++AU_ALIAS([AM_PROG_LIBTOOL], [LT_INIT])
++dnl aclocal-1.4 backwards compatibility:
++dnl AC_DEFUN([AC_PROG_LIBTOOL], [])
++dnl AC_DEFUN([AM_PROG_LIBTOOL], [])
++
++
++# _LT_CC_BASENAME(CC)
++# -------------------
++# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
++m4_defun([_LT_CC_BASENAME],
++[for cc_temp in $1""; do
++  case $cc_temp in
++    compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
++    distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
++    \-*) ;;
++    *) break;;
++  esac
++done
++cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
++])
++
++
++# _LT_FILEUTILS_DEFAULTS
++# ----------------------
++# It is okay to use these file commands and assume they have been set
++# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'.
++m4_defun([_LT_FILEUTILS_DEFAULTS],
++[: ${CP="cp -f"}
++: ${MV="mv -f"}
++: ${RM="rm -f"}
++])# _LT_FILEUTILS_DEFAULTS
++
++
++# _LT_SETUP
++# ---------
++m4_defun([_LT_SETUP],
++[AC_REQUIRE([AC_CANONICAL_HOST])dnl
++AC_REQUIRE([AC_CANONICAL_BUILD])dnl
++AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl
++AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
++
++_LT_DECL([], [host_alias], [0], [The host system])dnl
++_LT_DECL([], [host], [0])dnl
++_LT_DECL([], [host_os], [0])dnl
++dnl
++_LT_DECL([], [build_alias], [0], [The build system])dnl
++_LT_DECL([], [build], [0])dnl
++_LT_DECL([], [build_os], [0])dnl
++dnl
++AC_REQUIRE([AC_PROG_CC])dnl
++AC_REQUIRE([LT_PATH_LD])dnl
++AC_REQUIRE([LT_PATH_NM])dnl
++dnl
++AC_REQUIRE([AC_PROG_LN_S])dnl
++test -z "$LN_S" && LN_S="ln -s"
++_LT_DECL([], [LN_S], [1], [Whether we need soft or hard links])dnl
++dnl
++AC_REQUIRE([LT_CMD_MAX_LEN])dnl
++_LT_DECL([objext], [ac_objext], [0], [Object file suffix (normally "o")])dnl
++_LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl
++dnl
++m4_require([_LT_FILEUTILS_DEFAULTS])dnl
++m4_require([_LT_CHECK_SHELL_FEATURES])dnl
++m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl
++m4_require([_LT_CMD_RELOAD])dnl
++m4_require([_LT_CHECK_MAGIC_METHOD])dnl
++m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl
++m4_require([_LT_CMD_OLD_ARCHIVE])dnl
++m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
++m4_require([_LT_WITH_SYSROOT])dnl
++
++_LT_CONFIG_LIBTOOL_INIT([
++# See if we are running on zsh, and set the options which allow our
++# commands through without removal of \ escapes INIT.
++if test -n "\${ZSH_VERSION+set}" ; then
++   setopt NO_GLOB_SUBST
++fi
++])
++if test -n "${ZSH_VERSION+set}" ; then
++   setopt NO_GLOB_SUBST
++fi
++
++_LT_CHECK_OBJDIR
++
++m4_require([_LT_TAG_COMPILER])dnl
++
++case $host_os in
++aix3*)
++  # AIX sometimes has problems with the GCC collect2 program.  For some
++  # reason, if we set the COLLECT_NAMES environment variable, the problems
++  # vanish in a puff of smoke.
++  if test "X${COLLECT_NAMES+set}" != Xset; then
++    COLLECT_NAMES=
++    export COLLECT_NAMES
++  fi
++  ;;
++esac
++
++# Global variables:
++ofile=libtool
++can_build_shared=yes
++
++# All known linkers require a `.a' archive for static linking (except MSVC,
++# which needs '.lib').
++libext=a
++
++with_gnu_ld="$lt_cv_prog_gnu_ld"
++
++old_CC="$CC"
++old_CFLAGS="$CFLAGS"
++
++# Set sane defaults for various variables
++test -z "$CC" && CC=cc
++test -z "$LTCC" && LTCC=$CC
++test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
++test -z "$LD" && LD=ld
++test -z "$ac_objext" && ac_objext=o
++
++_LT_CC_BASENAME([$compiler])
++
++# Only perform the check for file, if the check method requires it
++test -z "$MAGIC_CMD" && MAGIC_CMD=file
++case $deplibs_check_method in
++file_magic*)
++  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
++    _LT_PATH_MAGIC
++  fi
++  ;;
++esac
++
++# Use C for the default configuration in the libtool script
++LT_SUPPORTED_TAG([CC])
++_LT_LANG_C_CONFIG
++_LT_LANG_DEFAULT_CONFIG
++_LT_CONFIG_COMMANDS
++])# _LT_SETUP
++
++
++# _LT_PREPARE_SED_QUOTE_VARS
++# --------------------------
++# Define a few sed substitution that help us do robust quoting.
++m4_defun([_LT_PREPARE_SED_QUOTE_VARS],
++[# Backslashify metacharacters that are still active within
++# double-quoted strings.
++sed_quote_subst='s/\([["`$\\]]\)/\\\1/g'
++
++# Same as above, but do not quote variable references.
++double_quote_subst='s/\([["`\\]]\)/\\\1/g'
++
++# Sed substitution to delay expansion of an escaped shell variable in a
++# double_quote_subst'ed string.
++delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
++
++# Sed substitution to delay expansion of an escaped single quote.
++delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
++
++# Sed substitution to avoid accidental globbing in evaled expressions
++no_glob_subst='s/\*/\\\*/g'
++])
++
++# _LT_PROG_LTMAIN
++# ---------------
++# Note that this code is called both from `configure', and `config.status'
++# now that we use AC_CONFIG_COMMANDS to generate libtool.  Notably,
++# `config.status' has no value for ac_aux_dir unless we are using Automake,
++# so we pass a copy along to make sure it has a sensible value anyway.
++m4_defun([_LT_PROG_LTMAIN],
++[m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl
++_LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir'])
++ltmain="$ac_aux_dir/ltmain.sh"
++])# _LT_PROG_LTMAIN
++
++
++
++# So that we can recreate a full libtool script including additional
++# tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS
++# in macros and then make a single call at the end using the `libtool'
++# label.
++
++
++# _LT_CONFIG_LIBTOOL_INIT([INIT-COMMANDS])
++# ----------------------------------------
++# Register INIT-COMMANDS to be passed to AC_CONFIG_COMMANDS later.
++m4_define([_LT_CONFIG_LIBTOOL_INIT],
++[m4_ifval([$1],
++          [m4_append([_LT_OUTPUT_LIBTOOL_INIT],
++                     [$1
++])])])
++
++# Initialize.
++m4_define([_LT_OUTPUT_LIBTOOL_INIT])
++
++
++# _LT_CONFIG_LIBTOOL([COMMANDS])
++# ------------------------------
++# Register COMMANDS to be passed to AC_CONFIG_COMMANDS later.
++m4_define([_LT_CONFIG_LIBTOOL],
++[m4_ifval([$1],
++          [m4_append([_LT_OUTPUT_LIBTOOL_COMMANDS],
++                     [$1
++])])])
++
++# Initialize.
++m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS])
++
++
++# _LT_CONFIG_SAVE_COMMANDS([COMMANDS], [INIT_COMMANDS])
++# -----------------------------------------------------
++m4_defun([_LT_CONFIG_SAVE_COMMANDS],
++[_LT_CONFIG_LIBTOOL([$1])
++_LT_CONFIG_LIBTOOL_INIT([$2])
++])
++
++
++# _LT_FORMAT_COMMENT([COMMENT])
++# -----------------------------
++# Add leading comment marks to the start of each line, and a trailing
++# full-stop to the whole comment if one is not present already.
++m4_define([_LT_FORMAT_COMMENT],
++[m4_ifval([$1], [
++m4_bpatsubst([m4_bpatsubst([$1], [^ *], [# ])],
++              [['`$\]], [\\\&])]m4_bmatch([$1], [[!?.]$], [], [.])
++)])
++
++
++
++
++
++# _LT_DECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION], [IS-TAGGED?])
++# -------------------------------------------------------------------
++# CONFIGNAME is the name given to the value in the libtool script.
++# VARNAME is the (base) name used in the configure script.
++# VALUE may be 0, 1 or 2 for a computed quote escaped value based on
++# VARNAME.  Any other value will be used directly.
++m4_define([_LT_DECL],
++[lt_if_append_uniq([lt_decl_varnames], [$2], [, ],
++    [lt_dict_add_subkey([lt_decl_dict], [$2], [libtool_name],
++	[m4_ifval([$1], [$1], [$2])])
++    lt_dict_add_subkey([lt_decl_dict], [$2], [value], [$3])
++    m4_ifval([$4],
++	[lt_dict_add_subkey([lt_decl_dict], [$2], [description], [$4])])
++    lt_dict_add_subkey([lt_decl_dict], [$2],
++	[tagged?], [m4_ifval([$5], [yes], [no])])])
++])
++
++
++# _LT_TAGDECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION])
++# --------------------------------------------------------
++m4_define([_LT_TAGDECL], [_LT_DECL([$1], [$2], [$3], [$4], [yes])])
++
++
++# lt_decl_tag_varnames([SEPARATOR], [VARNAME1...])
++# ------------------------------------------------
++m4_define([lt_decl_tag_varnames],
++[_lt_decl_filter([tagged?], [yes], $@)])
++
++
++# _lt_decl_filter(SUBKEY, VALUE, [SEPARATOR], [VARNAME1..])
++# ---------------------------------------------------------
++m4_define([_lt_decl_filter],
++[m4_case([$#],
++  [0], [m4_fatal([$0: too few arguments: $#])],
++  [1], [m4_fatal([$0: too few arguments: $#: $1])],
++  [2], [lt_dict_filter([lt_decl_dict], [$1], [$2], [], lt_decl_varnames)],
++  [3], [lt_dict_filter([lt_decl_dict], [$1], [$2], [$3], lt_decl_varnames)],
++  [lt_dict_filter([lt_decl_dict], $@)])[]dnl
++])
++
++
++# lt_decl_quote_varnames([SEPARATOR], [VARNAME1...])
++# --------------------------------------------------
++m4_define([lt_decl_quote_varnames],
++[_lt_decl_filter([value], [1], $@)])
++
++
++# lt_decl_dquote_varnames([SEPARATOR], [VARNAME1...])
++# ---------------------------------------------------
++m4_define([lt_decl_dquote_varnames],
++[_lt_decl_filter([value], [2], $@)])
++
++
++# lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...])
++# ---------------------------------------------------
++m4_define([lt_decl_varnames_tagged],
++[m4_assert([$# <= 2])dnl
++_$0(m4_quote(m4_default([$1], [[, ]])),
++    m4_ifval([$2], [[$2]], [m4_dquote(lt_decl_tag_varnames)]),
++    m4_split(m4_normalize(m4_quote(_LT_TAGS)), [ ]))])
++m4_define([_lt_decl_varnames_tagged],
++[m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])])
++
++
++# lt_decl_all_varnames([SEPARATOR], [VARNAME1...])
++# ------------------------------------------------
++m4_define([lt_decl_all_varnames],
++[_$0(m4_quote(m4_default([$1], [[, ]])),
++     m4_if([$2], [],
++	   m4_quote(lt_decl_varnames),
++	m4_quote(m4_shift($@))))[]dnl
++])
++m4_define([_lt_decl_all_varnames],
++[lt_join($@, lt_decl_varnames_tagged([$1],
++			lt_decl_tag_varnames([[, ]], m4_shift($@))))dnl
++])
++
++
++# _LT_CONFIG_STATUS_DECLARE([VARNAME])
++# ------------------------------------
++# Quote a variable value, and forward it to `config.status' so that its
++# declaration there will have the same value as in `configure'.  VARNAME
++# must have a single quote delimited value for this to work.
++m4_define([_LT_CONFIG_STATUS_DECLARE],
++[$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`'])
++
++
++# _LT_CONFIG_STATUS_DECLARATIONS
++# ------------------------------
++# We delimit libtool config variables with single quotes, so when
++# we write them to config.status, we have to be sure to quote all
++# embedded single quotes properly.  In configure, this macro expands
++# each variable declared with _LT_DECL (and _LT_TAGDECL) into:
++#
++#    <var>='`$ECHO "$<var>" | $SED "$delay_single_quote_subst"`'
++m4_defun([_LT_CONFIG_STATUS_DECLARATIONS],
++[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames),
++    [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])])
++
++
++# _LT_LIBTOOL_TAGS
++# ----------------
++# Output comment and list of tags supported by the script
++m4_defun([_LT_LIBTOOL_TAGS],
++[_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl
++available_tags="_LT_TAGS"dnl
++])
++
++
++# _LT_LIBTOOL_DECLARE(VARNAME, [TAG])
++# -----------------------------------
++# Extract the dictionary values for VARNAME (optionally with TAG) and
++# expand to a commented shell variable setting:
++#
++#    # Some comment about what VAR is for.
++#    visible_name=$lt_internal_name
++m4_define([_LT_LIBTOOL_DECLARE],
++[_LT_FORMAT_COMMENT(m4_quote(lt_dict_fetch([lt_decl_dict], [$1],
++					   [description])))[]dnl
++m4_pushdef([_libtool_name],
++    m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [libtool_name])))[]dnl
++m4_case(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [value])),
++    [0], [_libtool_name=[$]$1],
++    [1], [_libtool_name=$lt_[]$1],
++    [2], [_libtool_name=$lt_[]$1],
++    [_libtool_name=lt_dict_fetch([lt_decl_dict], [$1], [value])])[]dnl
++m4_ifval([$2], [_$2])[]m4_popdef([_libtool_name])[]dnl
++])
++
++
++# _LT_LIBTOOL_CONFIG_VARS
++# -----------------------
++# Produce commented declarations of non-tagged libtool config variables
++# suitable for insertion in the LIBTOOL CONFIG section of the `libtool'
++# script.  Tagged libtool config variables (even for the LIBTOOL CONFIG
++# section) are produced by _LT_LIBTOOL_TAG_VARS.
++m4_defun([_LT_LIBTOOL_CONFIG_VARS],
++[m4_foreach([_lt_var],
++    m4_quote(_lt_decl_filter([tagged?], [no], [], lt_decl_varnames)),
++    [m4_n([_LT_LIBTOOL_DECLARE(_lt_var)])])])
++
++
++# _LT_LIBTOOL_TAG_VARS(TAG)
++# -------------------------
++m4_define([_LT_LIBTOOL_TAG_VARS],
++[m4_foreach([_lt_var], m4_quote(lt_decl_tag_varnames),
++    [m4_n([_LT_LIBTOOL_DECLARE(_lt_var, [$1])])])])
++
++
++# _LT_TAGVAR(VARNAME, [TAGNAME])
++# ------------------------------
++m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])])
++
++
++# _LT_CONFIG_COMMANDS
++# -------------------
++# Send accumulated output to $CONFIG_STATUS.  Thanks to the lists of
++# variables for single and double quote escaping we saved from calls
++# to _LT_DECL, we can put quote escaped variables declarations
++# into `config.status', and then the shell code to quote escape them in
++# for loops in `config.status'.  Finally, any additional code accumulated
++# from calls to _LT_CONFIG_LIBTOOL_INIT is expanded.
++m4_defun([_LT_CONFIG_COMMANDS],
++[AC_PROVIDE_IFELSE([LT_OUTPUT],
++	dnl If the libtool generation code has been placed in $CONFIG_LT,
++	dnl instead of duplicating it all over again into config.status,
++	dnl then we will have config.status run $CONFIG_LT later, so it
++	dnl needs to know what name is stored there:
++        [AC_CONFIG_COMMANDS([libtool],
++            [$SHELL $CONFIG_LT || AS_EXIT(1)], [CONFIG_LT='$CONFIG_LT'])],
++    dnl If the libtool generation code is destined for config.status,
++    dnl expand the accumulated commands and init code now:
++    [AC_CONFIG_COMMANDS([libtool],
++        [_LT_OUTPUT_LIBTOOL_COMMANDS], [_LT_OUTPUT_LIBTOOL_COMMANDS_INIT])])
++])#_LT_CONFIG_COMMANDS
++
++
++# Initialize.
++m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS_INIT],
++[
++
++# The HP-UX ksh and POSIX shell print the target directory to stdout
++# if CDPATH is set.
++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
++
++sed_quote_subst='$sed_quote_subst'
++double_quote_subst='$double_quote_subst'
++delay_variable_subst='$delay_variable_subst'
++_LT_CONFIG_STATUS_DECLARATIONS
++LTCC='$LTCC'
++LTCFLAGS='$LTCFLAGS'
++compiler='$compiler_DEFAULT'
++
++# A function that is used when there is no print builtin or printf.
++func_fallback_echo ()
++{
++  eval 'cat <<_LTECHO_EOF
++\$[]1
++_LTECHO_EOF'
++}
++
++# Quote evaled strings.
++for var in lt_decl_all_varnames([[ \
++]], lt_decl_quote_varnames); do
++    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
++    *[[\\\\\\\`\\"\\\$]]*)
++      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
++      ;;
++    *)
++      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
++      ;;
++    esac
++done
++
++# Double-quote double-evaled strings.
++for var in lt_decl_all_varnames([[ \
++]], lt_decl_dquote_varnames); do
++    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
++    *[[\\\\\\\`\\"\\\$]]*)
++      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
++      ;;
++    *)
++      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
++      ;;
++    esac
++done
++
++_LT_OUTPUT_LIBTOOL_INIT
++])
++
++# _LT_GENERATED_FILE_INIT(FILE, [COMMENT])
++# ------------------------------------
++# Generate a child script FILE with all initialization necessary to
++# reuse the environment learned by the parent script, and make the
++# file executable.  If COMMENT is supplied, it is inserted after the
++# `#!' sequence but before initialization text begins.  After this
++# macro, additional text can be appended to FILE to form the body of
++# the child script.  The macro ends with non-zero status if the
++# file could not be fully written (such as if the disk is full).
++m4_ifdef([AS_INIT_GENERATED],
++[m4_defun([_LT_GENERATED_FILE_INIT],[AS_INIT_GENERATED($@)])],
++[m4_defun([_LT_GENERATED_FILE_INIT],
++[m4_require([AS_PREPARE])]dnl
++[m4_pushdef([AS_MESSAGE_LOG_FD])]dnl
++[lt_write_fail=0
++cat >$1 <<_ASEOF || lt_write_fail=1
++#! $SHELL
++# Generated by $as_me.
++$2
++SHELL=\${CONFIG_SHELL-$SHELL}
++export SHELL
++_ASEOF
++cat >>$1 <<\_ASEOF || lt_write_fail=1
++AS_SHELL_SANITIZE
++_AS_PREPARE
++exec AS_MESSAGE_FD>&1
++_ASEOF
++test $lt_write_fail = 0 && chmod +x $1[]dnl
++m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT
++
++# LT_OUTPUT
++# ---------
++# This macro allows early generation of the libtool script (before
++# AC_OUTPUT is called), incase it is used in configure for compilation
++# tests.
++AC_DEFUN([LT_OUTPUT],
++[: ${CONFIG_LT=./config.lt}
++AC_MSG_NOTICE([creating $CONFIG_LT])
++_LT_GENERATED_FILE_INIT(["$CONFIG_LT"],
++[# Run this file to recreate a libtool stub with the current configuration.])
++
++cat >>"$CONFIG_LT" <<\_LTEOF
++lt_cl_silent=false
++exec AS_MESSAGE_LOG_FD>>config.log
++{
++  echo
++  AS_BOX([Running $as_me.])
++} >&AS_MESSAGE_LOG_FD
++
++lt_cl_help="\
++\`$as_me' creates a local libtool stub from the current configuration,
++for use in further configure time tests before the real libtool is
++generated.
++
++Usage: $[0] [[OPTIONS]]
++
++  -h, --help      print this help, then exit
++  -V, --version   print version number, then exit
++  -q, --quiet     do not print progress messages
++  -d, --debug     don't remove temporary files
++
++Report bugs to <bug-libtool at gnu.org>."
++
++lt_cl_version="\
++m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl
++m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
++configured by $[0], generated by m4_PACKAGE_STRING.
++
++Copyright (C) 2010 Free Software Foundation, Inc.
++This config.lt script is free software; the Free Software Foundation
++gives unlimited permision to copy, distribute and modify it."
++
++while test $[#] != 0
++do
++  case $[1] in
++    --version | --v* | -V )
++      echo "$lt_cl_version"; exit 0 ;;
++    --help | --h* | -h )
++      echo "$lt_cl_help"; exit 0 ;;
++    --debug | --d* | -d )
++      debug=: ;;
++    --quiet | --q* | --silent | --s* | -q )
++      lt_cl_silent=: ;;
++
++    -*) AC_MSG_ERROR([unrecognized option: $[1]
++Try \`$[0] --help' for more information.]) ;;
++
++    *) AC_MSG_ERROR([unrecognized argument: $[1]
++Try \`$[0] --help' for more information.]) ;;
++  esac
++  shift
++done
++
++if $lt_cl_silent; then
++  exec AS_MESSAGE_FD>/dev/null
++fi
++_LTEOF
++
++cat >>"$CONFIG_LT" <<_LTEOF
++_LT_OUTPUT_LIBTOOL_COMMANDS_INIT
++_LTEOF
++
++cat >>"$CONFIG_LT" <<\_LTEOF
++AC_MSG_NOTICE([creating $ofile])
++_LT_OUTPUT_LIBTOOL_COMMANDS
++AS_EXIT(0)
++_LTEOF
++chmod +x "$CONFIG_LT"
++
++# configure is writing to config.log, but config.lt does its own redirection,
++# appending to config.log, which fails on DOS, as config.log is still kept
++# open by configure.  Here we exec the FD to /dev/null, effectively closing
++# config.log, so it can be properly (re)opened and appended to by config.lt.
++lt_cl_success=:
++test "$silent" = yes &&
++  lt_config_lt_args="$lt_config_lt_args --quiet"
++exec AS_MESSAGE_LOG_FD>/dev/null
++$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
++exec AS_MESSAGE_LOG_FD>>config.log
++$lt_cl_success || AS_EXIT(1)
++])# LT_OUTPUT
++
++
++# _LT_CONFIG(TAG)
++# ---------------
++# If TAG is the built-in tag, create an initial libtool script with a
++# default configuration from the untagged config vars.  Otherwise add code
++# to config.status for appending the configuration named by TAG from the
++# matching tagged config vars.
++m4_defun([_LT_CONFIG],
++[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
++_LT_CONFIG_SAVE_COMMANDS([
++  m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl
++  m4_if(_LT_TAG, [C], [
++    # See if we are running on zsh, and set the options which allow our
++    # commands through without removal of \ escapes.
++    if test -n "${ZSH_VERSION+set}" ; then
++      setopt NO_GLOB_SUBST
++    fi
++
++    cfgfile="${ofile}T"
++    trap "$RM \"$cfgfile\"; exit 1" 1 2 15
++    $RM "$cfgfile"
++
++    cat <<_LT_EOF >> "$cfgfile"
++#! $SHELL
++
++# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
++# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
++# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
++# NOTE: Changes made to this file will be lost: look at ltmain.sh.
++#
++_LT_COPYING
++_LT_LIBTOOL_TAGS
++
++# ### BEGIN LIBTOOL CONFIG
++_LT_LIBTOOL_CONFIG_VARS
++_LT_LIBTOOL_TAG_VARS
++# ### END LIBTOOL CONFIG
++
++_LT_EOF
++
++  case $host_os in
++  aix3*)
++    cat <<\_LT_EOF >> "$cfgfile"
++# AIX sometimes has problems with the GCC collect2 program.  For some
++# reason, if we set the COLLECT_NAMES environment variable, the problems
++# vanish in a puff of smoke.
++if test "X${COLLECT_NAMES+set}" != Xset; then
++  COLLECT_NAMES=
++  export COLLECT_NAMES
++fi
++_LT_EOF
++    ;;
++  esac
++
++  _LT_PROG_LTMAIN
++
++  # We use sed instead of cat because bash on DJGPP gets confused if
++  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
++  # text mode, it properly converts lines to CR/LF.  This bash problem
++  # is reportedly fixed, but why not run on old versions too?
++  sed '$q' "$ltmain" >> "$cfgfile" \
++     || (rm -f "$cfgfile"; exit 1)
++
++  _LT_PROG_REPLACE_SHELLFNS
++
++   mv -f "$cfgfile" "$ofile" ||
++    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
++  chmod +x "$ofile"
++],
++[cat <<_LT_EOF >> "$ofile"
++
++dnl Unfortunately we have to use $1 here, since _LT_TAG is not expanded
++dnl in a comment (ie after a #).
++# ### BEGIN LIBTOOL TAG CONFIG: $1
++_LT_LIBTOOL_TAG_VARS(_LT_TAG)
++# ### END LIBTOOL TAG CONFIG: $1
++_LT_EOF
++])dnl /m4_if
++],
++[m4_if([$1], [], [
++    PACKAGE='$PACKAGE'
++    VERSION='$VERSION'
++    TIMESTAMP='$TIMESTAMP'
++    RM='$RM'
++    ofile='$ofile'], [])
++])dnl /_LT_CONFIG_SAVE_COMMANDS
++])# _LT_CONFIG
++
++
++# LT_SUPPORTED_TAG(TAG)
++# ---------------------
++# Trace this macro to discover what tags are supported by the libtool
++# --tag option, using:
++#    autoconf --trace 'LT_SUPPORTED_TAG:$1'
++AC_DEFUN([LT_SUPPORTED_TAG], [])
++
++
++# C support is built-in for now
++m4_define([_LT_LANG_C_enabled], [])
++m4_define([_LT_TAGS], [])
++
++
++# LT_LANG(LANG)
++# -------------
++# Enable libtool support for the given language if not already enabled.
++AC_DEFUN([LT_LANG],
++[AC_BEFORE([$0], [LT_OUTPUT])dnl
++m4_case([$1],
++  [C],			[_LT_LANG(C)],
++  [C++],		[_LT_LANG(CXX)],
++  [Java],		[_LT_LANG(GCJ)],
++  [Fortran 77],		[_LT_LANG(F77)],
++  [Fortran],		[_LT_LANG(FC)],
++  [Windows Resource],	[_LT_LANG(RC)],
++  [m4_ifdef([_LT_LANG_]$1[_CONFIG],
++    [_LT_LANG($1)],
++    [m4_fatal([$0: unsupported language: "$1"])])])dnl
++])# LT_LANG
++
++
++# _LT_LANG(LANGNAME)
++# ------------------
++m4_defun([_LT_LANG],
++[m4_ifdef([_LT_LANG_]$1[_enabled], [],
++  [LT_SUPPORTED_TAG([$1])dnl
++  m4_append([_LT_TAGS], [$1 ])dnl
++  m4_define([_LT_LANG_]$1[_enabled], [])dnl
++  _LT_LANG_$1_CONFIG($1)])dnl
++])# _LT_LANG
++
++
++# _LT_LANG_DEFAULT_CONFIG
++# -----------------------
++m4_defun([_LT_LANG_DEFAULT_CONFIG],
++[AC_PROVIDE_IFELSE([AC_PROG_CXX],
++  [LT_LANG(CXX)],
++  [m4_define([AC_PROG_CXX], defn([AC_PROG_CXX])[LT_LANG(CXX)])])
++
++AC_PROVIDE_IFELSE([AC_PROG_F77],
++  [LT_LANG(F77)],
++  [m4_define([AC_PROG_F77], defn([AC_PROG_F77])[LT_LANG(F77)])])
++
++AC_PROVIDE_IFELSE([AC_PROG_FC],
++  [LT_LANG(FC)],
++  [m4_define([AC_PROG_FC], defn([AC_PROG_FC])[LT_LANG(FC)])])
++
++dnl The call to [A][M_PROG_GCJ] is quoted like that to stop aclocal
++dnl pulling things in needlessly.
++AC_PROVIDE_IFELSE([AC_PROG_GCJ],
++  [LT_LANG(GCJ)],
++  [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
++    [LT_LANG(GCJ)],
++    [AC_PROVIDE_IFELSE([LT_PROG_GCJ],
++      [LT_LANG(GCJ)],
++      [m4_ifdef([AC_PROG_GCJ],
++	[m4_define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[LT_LANG(GCJ)])])
++       m4_ifdef([A][M_PROG_GCJ],
++	[m4_define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[LT_LANG(GCJ)])])
++       m4_ifdef([LT_PROG_GCJ],
++	[m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])])
++
++AC_PROVIDE_IFELSE([LT_PROG_RC],
++  [LT_LANG(RC)],
++  [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])])
++])# _LT_LANG_DEFAULT_CONFIG
++
++# Obsolete macros:
++AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)])
++AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)])
++AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)])
++AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)])
++AU_DEFUN([AC_LIBTOOL_RC], [LT_LANG(Windows Resource)])
++dnl aclocal-1.4 backwards compatibility:
++dnl AC_DEFUN([AC_LIBTOOL_CXX], [])
++dnl AC_DEFUN([AC_LIBTOOL_F77], [])
++dnl AC_DEFUN([AC_LIBTOOL_FC], [])
++dnl AC_DEFUN([AC_LIBTOOL_GCJ], [])
++dnl AC_DEFUN([AC_LIBTOOL_RC], [])
++
++
++# _LT_TAG_COMPILER
++# ----------------
++m4_defun([_LT_TAG_COMPILER],
++[AC_REQUIRE([AC_PROG_CC])dnl
++
++_LT_DECL([LTCC], [CC], [1], [A C compiler])dnl
++_LT_DECL([LTCFLAGS], [CFLAGS], [1], [LTCC compiler flags])dnl
++_LT_TAGDECL([CC], [compiler], [1], [A language specific compiler])dnl
++_LT_TAGDECL([with_gcc], [GCC], [0], [Is the compiler the GNU compiler?])dnl
++
++# If no C compiler was specified, use CC.
++LTCC=${LTCC-"$CC"}
++
++# If no C compiler flags were specified, use CFLAGS.
++LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
++
++# Allow CC to be a program name with arguments.
++compiler=$CC
++])# _LT_TAG_COMPILER
++
++
++# _LT_COMPILER_BOILERPLATE
++# ------------------------
++# Check for compiler boilerplate output or warnings with
++# the simple compiler test code.
++m4_defun([_LT_COMPILER_BOILERPLATE],
++[m4_require([_LT_DECL_SED])dnl
++ac_outfile=conftest.$ac_objext
++echo "$lt_simple_compile_test_code" >conftest.$ac_ext
++eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
++_lt_compiler_boilerplate=`cat conftest.err`
++$RM conftest*
++])# _LT_COMPILER_BOILERPLATE
++
++
++# _LT_LINKER_BOILERPLATE
++# ----------------------
++# Check for linker boilerplate output or warnings with
++# the simple link test code.
++m4_defun([_LT_LINKER_BOILERPLATE],
++[m4_require([_LT_DECL_SED])dnl
++ac_outfile=conftest.$ac_objext
++echo "$lt_simple_link_test_code" >conftest.$ac_ext
++eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
++_lt_linker_boilerplate=`cat conftest.err`
++$RM -r conftest*
++])# _LT_LINKER_BOILERPLATE
++
++# _LT_REQUIRED_DARWIN_CHECKS
++# -------------------------
++m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
++  case $host_os in
++    rhapsody* | darwin*)
++    AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])
++    AC_CHECK_TOOL([NMEDIT], [nmedit], [:])
++    AC_CHECK_TOOL([LIPO], [lipo], [:])
++    AC_CHECK_TOOL([OTOOL], [otool], [:])
++    AC_CHECK_TOOL([OTOOL64], [otool64], [:])
++    _LT_DECL([], [DSYMUTIL], [1],
++      [Tool to manipulate archived DWARF debug symbol files on Mac OS X])
++    _LT_DECL([], [NMEDIT], [1],
++      [Tool to change global to local symbols on Mac OS X])
++    _LT_DECL([], [LIPO], [1],
++      [Tool to manipulate fat objects and archives on Mac OS X])
++    _LT_DECL([], [OTOOL], [1],
++      [ldd/readelf like tool for Mach-O binaries on Mac OS X])
++    _LT_DECL([], [OTOOL64], [1],
++      [ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4])
++
++    AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
++      [lt_cv_apple_cc_single_mod=no
++      if test -z "${LT_MULTI_MODULE}"; then
++	# By default we will add the -single_module flag. You can override
++	# by either setting the environment variable LT_MULTI_MODULE
++	# non-empty at configure time, or by adding -multi_module to the
++	# link flags.
++	rm -rf libconftest.dylib*
++	echo "int foo(void){return 1;}" > conftest.c
++	echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
++-dynamiclib -Wl,-single_module conftest.c" >&AS_MESSAGE_LOG_FD
++	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
++	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
++        _lt_result=$?
++	if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
++	  lt_cv_apple_cc_single_mod=yes
++	else
++	  cat conftest.err >&AS_MESSAGE_LOG_FD
++	fi
++	rm -rf libconftest.dylib*
++	rm -f conftest.*
++      fi])
++    AC_CACHE_CHECK([for -exported_symbols_list linker flag],
++      [lt_cv_ld_exported_symbols_list],
++      [lt_cv_ld_exported_symbols_list=no
++      save_LDFLAGS=$LDFLAGS
++      echo "_main" > conftest.sym
++      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
++      AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
++	[lt_cv_ld_exported_symbols_list=yes],
++	[lt_cv_ld_exported_symbols_list=no])
++	LDFLAGS="$save_LDFLAGS"
++    ])
++    AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load],
++      [lt_cv_ld_force_load=no
++      cat > conftest.c << _LT_EOF
++int forced_loaded() { return 2;}
++_LT_EOF
++      echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD
++      $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD
++      echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
++      $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
++      echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD
++      $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD
++      cat > conftest.c << _LT_EOF
++int main() { return 0;}
++_LT_EOF
++      echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD
++      $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
++      _lt_result=$?
++      if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then
++	lt_cv_ld_force_load=yes
++      else
++	cat conftest.err >&AS_MESSAGE_LOG_FD
++      fi
++        rm -f conftest.err libconftest.a conftest conftest.c
++        rm -rf conftest.dSYM
++    ])
++    case $host_os in
++    rhapsody* | darwin1.[[012]])
++      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
++    darwin1.*)
++      _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
++    darwin*) # darwin 5.x on
++      # if running on 10.5 or later, the deployment target defaults
++      # to the OS version, if on x86, and 10.4, the deployment
++      # target defaults to 10.4. Don't you love it?
++      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
++	10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
++	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
++	10.[[012]]*)
++	  _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
++	10.*)
++	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
++      esac
++    ;;
++  esac
++    if test "$lt_cv_apple_cc_single_mod" = "yes"; then
++      _lt_dar_single_mod='$single_module'
++    fi
++    if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
++      _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
++    else
++      _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
++    fi
++    if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
++      _lt_dsymutil='~$DSYMUTIL $lib || :'
++    else
++      _lt_dsymutil=
++    fi
++    ;;
++  esac
++])
++
++
++# _LT_DARWIN_LINKER_FEATURES
++# --------------------------
++# Checks for linker and compiler features on darwin
++m4_defun([_LT_DARWIN_LINKER_FEATURES],
++[
++  m4_require([_LT_REQUIRED_DARWIN_CHECKS])
++  _LT_TAGVAR(archive_cmds_need_lc, $1)=no
++  _LT_TAGVAR(hardcode_direct, $1)=no
++  _LT_TAGVAR(hardcode_automatic, $1)=yes
++  _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
++  if test "$lt_cv_ld_force_load" = "yes"; then
++    _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
++  else
++    _LT_TAGVAR(whole_archive_flag_spec, $1)=''
++  fi
++  _LT_TAGVAR(link_all_deplibs, $1)=yes
++  _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
++  case $cc_basename in
++     ifort*) _lt_dar_can_shared=yes ;;
++     *) _lt_dar_can_shared=$GCC ;;
++  esac
++  if test "$_lt_dar_can_shared" = "yes"; then
++    output_verbose_link_cmd=func_echo_all
++    _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
++    _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
++    _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
++    _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
++    m4_if([$1], [CXX],
++[   if test "$lt_cv_apple_cc_single_mod" != "yes"; then
++      _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
++      _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
++    fi
++],[])
++  else
++  _LT_TAGVAR(ld_shlibs, $1)=no
++  fi
++])
++
++# _LT_SYS_MODULE_PATH_AIX([TAGNAME])
++# ----------------------------------
++# Links a minimal program and checks the executable
++# for the system default hardcoded library path. In most cases,
++# this is /usr/lib:/lib, but when the MPI compilers are used
++# the location of the communication and MPI libs are included too.
++# If we don't find anything, use the default library path according
++# to the aix ld manual.
++# Store the results from the different compilers for each TAGNAME.
++# Allow to override them for all tags through lt_cv_aix_libpath.
++m4_defun([_LT_SYS_MODULE_PATH_AIX],
++[m4_require([_LT_DECL_SED])dnl
++if test "${lt_cv_aix_libpath+set}" = set; then
++  aix_libpath=$lt_cv_aix_libpath
++else
++  AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])],
++  [AC_LINK_IFELSE([AC_LANG_PROGRAM],[
++  lt_aix_libpath_sed='[
++      /Import File Strings/,/^$/ {
++	  /^0/ {
++	      s/^0  *\([^ ]*\) *$/\1/
++	      p
++	  }
++      }]'
++  _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
++  # Check for a 64-bit object if we didn't find anything.
++  if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
++    _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
++  fi],[])
++  if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
++    _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib"
++  fi
++  ])
++  aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])
++fi
++])# _LT_SYS_MODULE_PATH_AIX
++
++
++# _LT_SHELL_INIT(ARG)
++# -------------------
++m4_define([_LT_SHELL_INIT],
++[m4_divert_text([M4SH-INIT], [$1
++])])# _LT_SHELL_INIT
++
++
++
++# _LT_PROG_ECHO_BACKSLASH
++# -----------------------
++# Find how we can fake an echo command that does not interpret backslash.
++# In particular, with Autoconf 2.60 or later we add some code to the start
++# of the generated configure script which will find a shell with a builtin
++# printf (which we can use as an echo command).
++m4_defun([_LT_PROG_ECHO_BACKSLASH],
++[ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
++ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
++ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
++
++AC_MSG_CHECKING([how to print strings])
++# Test print first, because it will be a builtin if present.
++if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
++   test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
++  ECHO='print -r --'
++elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
++  ECHO='printf %s\n'
++else
++  # Use this function as a fallback that always works.
++  func_fallback_echo ()
++  {
++    eval 'cat <<_LTECHO_EOF
++$[]1
++_LTECHO_EOF'
++  }
++  ECHO='func_fallback_echo'
++fi
++
++# func_echo_all arg...
++# Invoke $ECHO with all args, space-separated.
++func_echo_all ()
++{
++    $ECHO "$*" 
++}
++
++case "$ECHO" in
++  printf*) AC_MSG_RESULT([printf]) ;;
++  print*) AC_MSG_RESULT([print -r]) ;;
++  *) AC_MSG_RESULT([cat]) ;;
++esac
++
++m4_ifdef([_AS_DETECT_SUGGESTED],
++[_AS_DETECT_SUGGESTED([
++  test -n "${ZSH_VERSION+set}${BASH_VERSION+set}" || (
++    ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
++    ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
++    ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
++    PATH=/empty FPATH=/empty; export PATH FPATH
++    test "X`printf %s $ECHO`" = "X$ECHO" \
++      || test "X`print -r -- $ECHO`" = "X$ECHO" )])])
++
++_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts])
++_LT_DECL([], [ECHO], [1], [An echo program that protects backslashes])
++])# _LT_PROG_ECHO_BACKSLASH
++
++
++# _LT_WITH_SYSROOT
++# ----------------
++AC_DEFUN([_LT_WITH_SYSROOT],
++[AC_MSG_CHECKING([for sysroot])
++AC_ARG_WITH([sysroot],
++[  --with-sysroot[=DIR] Search for dependent libraries within DIR
++                        (or the compiler's sysroot if not specified).],
++[], [with_sysroot=no])
++
++dnl lt_sysroot will always be passed unquoted.  We quote it here
++dnl in case the user passed a directory name.
++lt_sysroot=
++case ${with_sysroot} in #(
++ yes)
++   if test "$GCC" = yes; then
++     lt_sysroot=`$CC --print-sysroot 2>/dev/null`
++   fi
++   ;; #(
++ /*)
++   lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
++   ;; #(
++ no|'')
++   ;; #(
++ *)
++   AC_MSG_RESULT([${with_sysroot}])
++   AC_MSG_ERROR([The sysroot must be an absolute path.])
++   ;;
++esac
++
++ AC_MSG_RESULT([${lt_sysroot:-no}])
++_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl
++[dependent libraries, and in which our libraries should be installed.])])
++
++# _LT_ENABLE_LOCK
++# ---------------
++m4_defun([_LT_ENABLE_LOCK],
++[AC_ARG_ENABLE([libtool-lock],
++  [AS_HELP_STRING([--disable-libtool-lock],
++    [avoid locking (might break parallel builds)])])
++test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
++
++# Some flags need to be propagated to the compiler or linker for good
++# libtool support.
++case $host in
++ia64-*-hpux*)
++  # Find out which ABI we are using.
++  echo 'int i;' > conftest.$ac_ext
++  if AC_TRY_EVAL(ac_compile); then
++    case `/usr/bin/file conftest.$ac_objext` in
++      *ELF-32*)
++	HPUX_IA64_MODE="32"
++	;;
++      *ELF-64*)
++	HPUX_IA64_MODE="64"
++	;;
++    esac
++  fi
++  rm -rf conftest*
++  ;;
++*-*-irix6*)
++  # Find out which ABI we are using.
++  echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext
++  if AC_TRY_EVAL(ac_compile); then
++    if test "$lt_cv_prog_gnu_ld" = yes; then
++      case `/usr/bin/file conftest.$ac_objext` in
++	*32-bit*)
++	  LD="${LD-ld} -melf32bsmip"
++	  ;;
++	*N32*)
++	  LD="${LD-ld} -melf32bmipn32"
++	  ;;
++	*64-bit*)
++	  LD="${LD-ld} -melf64bmip"
++	;;
++      esac
++    else
++      case `/usr/bin/file conftest.$ac_objext` in
++	*32-bit*)
++	  LD="${LD-ld} -32"
++	  ;;
++	*N32*)
++	  LD="${LD-ld} -n32"
++	  ;;
++	*64-bit*)
++	  LD="${LD-ld} -64"
++	  ;;
++      esac
++    fi
++  fi
++  rm -rf conftest*
++  ;;
++
++x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
++s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
++  # Find out which ABI we are using.
++  echo 'int i;' > conftest.$ac_ext
++  if AC_TRY_EVAL(ac_compile); then
++    case `/usr/bin/file conftest.o` in
++      *32-bit*)
++	case $host in
++	  x86_64-*kfreebsd*-gnu)
++	    LD="${LD-ld} -m elf_i386_fbsd"
++	    ;;
++	  x86_64-*linux*)
++	    LD="${LD-ld} -m elf_i386"
++	    ;;
++	  ppc64-*linux*|powerpc64-*linux*)
++	    LD="${LD-ld} -m elf32ppclinux"
++	    ;;
++	  s390x-*linux*)
++	    LD="${LD-ld} -m elf_s390"
++	    ;;
++	  sparc64-*linux*)
++	    LD="${LD-ld} -m elf32_sparc"
++	    ;;
++	esac
++	;;
++      *64-bit*)
++	case $host in
++	  x86_64-*kfreebsd*-gnu)
++	    LD="${LD-ld} -m elf_x86_64_fbsd"
++	    ;;
++	  x86_64-*linux*)
++	    LD="${LD-ld} -m elf_x86_64"
++	    ;;
++	  ppc*-*linux*|powerpc*-*linux*)
++	    LD="${LD-ld} -m elf64ppc"
++	    ;;
++	  s390*-*linux*|s390*-*tpf*)
++	    LD="${LD-ld} -m elf64_s390"
++	    ;;
++	  sparc*-*linux*)
++	    LD="${LD-ld} -m elf64_sparc"
++	    ;;
++	esac
++	;;
++    esac
++  fi
++  rm -rf conftest*
++  ;;
++
++*-*-sco3.2v5*)
++  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
++  SAVE_CFLAGS="$CFLAGS"
++  CFLAGS="$CFLAGS -belf"
++  AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
++    [AC_LANG_PUSH(C)
++     AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
++     AC_LANG_POP])
++  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
++    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
++    CFLAGS="$SAVE_CFLAGS"
++  fi
++  ;;
++sparc*-*solaris*)
++  # Find out which ABI we are using.
++  echo 'int i;' > conftest.$ac_ext
++  if AC_TRY_EVAL(ac_compile); then
++    case `/usr/bin/file conftest.o` in
++    *64-bit*)
++      case $lt_cv_prog_gnu_ld in
++      yes*) LD="${LD-ld} -m elf64_sparc" ;;
++      *)
++	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
++	  LD="${LD-ld} -64"
++	fi
++	;;
++      esac
++      ;;
++    esac
++  fi
++  rm -rf conftest*
++  ;;
++esac
++
++need_locks="$enable_libtool_lock"
++])# _LT_ENABLE_LOCK
++
++
++# _LT_PROG_AR
++# -----------
++m4_defun([_LT_PROG_AR],
++[AC_CHECK_TOOLS(AR, [ar], false)
++: ${AR=ar}
++: ${AR_FLAGS=cru}
++_LT_DECL([], [AR], [1], [The archiver])
++_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive])
++
++AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file],
++  [lt_cv_ar_at_file=no
++   AC_COMPILE_IFELSE([AC_LANG_PROGRAM],
++     [echo conftest.$ac_objext > conftest.lst
++      lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD'
++      AC_TRY_EVAL([lt_ar_try])
++      if test "$ac_status" -eq 0; then
++	# Ensure the archiver fails upon bogus file names.
++	rm -f conftest.$ac_objext libconftest.a
++	AC_TRY_EVAL([lt_ar_try])
++	if test "$ac_status" -ne 0; then
++          lt_cv_ar_at_file=@
++        fi
++      fi
++      rm -f conftest.* libconftest.a
++     ])
++  ])
++
++if test "x$lt_cv_ar_at_file" = xno; then
++  archiver_list_spec=
++else
++  archiver_list_spec=$lt_cv_ar_at_file
++fi
++_LT_DECL([], [archiver_list_spec], [1],
++  [How to feed a file listing to the archiver])
++])# _LT_PROG_AR
++
++
++# _LT_CMD_OLD_ARCHIVE
++# -------------------
++m4_defun([_LT_CMD_OLD_ARCHIVE],
++[_LT_PROG_AR
++
++AC_CHECK_TOOL(STRIP, strip, :)
++test -z "$STRIP" && STRIP=:
++_LT_DECL([], [STRIP], [1], [A symbol stripping program])
++
++AC_CHECK_TOOL(RANLIB, ranlib, :)
++test -z "$RANLIB" && RANLIB=:
++_LT_DECL([], [RANLIB], [1],
++    [Commands used to install an old-style archive])
++
++# Determine commands to create old-style static archives.
++old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
++old_postinstall_cmds='chmod 644 $oldlib'
++old_postuninstall_cmds=
++
++if test -n "$RANLIB"; then
++  case $host_os in
++  openbsd*)
++    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
++    ;;
++  *)
++    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
++    ;;
++  esac
++  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
++fi
++
++case $host_os in
++  darwin*)
++    lock_old_archive_extraction=yes ;;
++  *)
++    lock_old_archive_extraction=no ;;
++esac
++_LT_DECL([], [old_postinstall_cmds], [2])
++_LT_DECL([], [old_postuninstall_cmds], [2])
++_LT_TAGDECL([], [old_archive_cmds], [2],
++    [Commands used to build an old-style archive])
++_LT_DECL([], [lock_old_archive_extraction], [0],
++    [Whether to use a lock for old archive extraction])
++])# _LT_CMD_OLD_ARCHIVE
++
++
++# _LT_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
++#		[OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE])
++# ----------------------------------------------------------------
++# Check whether the given compiler option works
++AC_DEFUN([_LT_COMPILER_OPTION],
++[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
++m4_require([_LT_DECL_SED])dnl
++AC_CACHE_CHECK([$1], [$2],
++  [$2=no
++   m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
++   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
++   lt_compiler_flag="$3"
++   # Insert the option either (1) after the last *FLAGS variable, or
++   # (2) before a word containing "conftest.", or (3) at the end.
++   # Note that $ac_compile itself does not contain backslashes and begins
++   # with a dollar sign (not a hyphen), so the echo should work correctly.
++   # The option is referenced via a variable to avoid confusing sed.
++   lt_compile=`echo "$ac_compile" | $SED \
++   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
++   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
++   -e 's:$: $lt_compiler_flag:'`
++   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
++   (eval "$lt_compile" 2>conftest.err)
++   ac_status=$?
++   cat conftest.err >&AS_MESSAGE_LOG_FD
++   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
++   if (exit $ac_status) && test -s "$ac_outfile"; then
++     # The compiler can only warn and ignore the option if not recognized
++     # So say no if there are warnings other than the usual output.
++     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
++     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
++     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
++       $2=yes
++     fi
++   fi
++   $RM conftest*
++])
++
++if test x"[$]$2" = xyes; then
++    m4_if([$5], , :, [$5])
++else
++    m4_if([$6], , :, [$6])
++fi
++])# _LT_COMPILER_OPTION
++
++# Old name:
++AU_ALIAS([AC_LIBTOOL_COMPILER_OPTION], [_LT_COMPILER_OPTION])
++dnl aclocal-1.4 backwards compatibility:
++dnl AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], [])
++
++
++# _LT_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
++#                  [ACTION-SUCCESS], [ACTION-FAILURE])
++# ----------------------------------------------------
++# Check whether the given linker option works
++AC_DEFUN([_LT_LINKER_OPTION],
++[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
++m4_require([_LT_DECL_SED])dnl
++AC_CACHE_CHECK([$1], [$2],
++  [$2=no
++   save_LDFLAGS="$LDFLAGS"
++   LDFLAGS="$LDFLAGS $3"
++   echo "$lt_simple_link_test_code" > conftest.$ac_ext
++   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
++     # The linker can only warn and ignore the option if not recognized
++     # So say no if there are warnings
++     if test -s conftest.err; then
++       # Append any errors to the config.log.
++       cat conftest.err 1>&AS_MESSAGE_LOG_FD
++       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
++       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
++       if diff conftest.exp conftest.er2 >/dev/null; then
++         $2=yes
++       fi
++     else
++       $2=yes
++     fi
++   fi
++   $RM -r conftest*
++   LDFLAGS="$save_LDFLAGS"
++])
++
++if test x"[$]$2" = xyes; then
++    m4_if([$4], , :, [$4])
++else
++    m4_if([$5], , :, [$5])
++fi
++])# _LT_LINKER_OPTION
++
++# Old name:
++AU_ALIAS([AC_LIBTOOL_LINKER_OPTION], [_LT_LINKER_OPTION])
++dnl aclocal-1.4 backwards compatibility:
++dnl AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], [])
++
++
++# LT_CMD_MAX_LEN
++#---------------
++AC_DEFUN([LT_CMD_MAX_LEN],
++[AC_REQUIRE([AC_CANONICAL_HOST])dnl
++# find the maximum length of command line arguments
++AC_MSG_CHECKING([the maximum length of command line arguments])
++AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
++  i=0
++  teststring="ABCD"
++
++  case $build_os in
++  msdosdjgpp*)
++    # On DJGPP, this test can blow up pretty badly due to problems in libc
++    # (any single argument exceeding 2000 bytes causes a buffer overrun
++    # during glob expansion).  Even if it were fixed, the result of this
++    # check would be larger than it should be.
++    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
++    ;;
++
++  gnu*)
++    # Under GNU Hurd, this test is not required because there is
++    # no limit to the length of command line arguments.
++    # Libtool will interpret -1 as no limit whatsoever
++    lt_cv_sys_max_cmd_len=-1;
++    ;;
++
++  cygwin* | mingw* | cegcc*)
++    # On Win9x/ME, this test blows up -- it succeeds, but takes
++    # about 5 minutes as the teststring grows exponentially.
++    # Worse, since 9x/ME are not pre-emptively multitasking,
++    # you end up with a "frozen" computer, even though with patience
++    # the test eventually succeeds (with a max line length of 256k).
++    # Instead, let's just punt: use the minimum linelength reported by
++    # all of the supported platforms: 8192 (on NT/2K/XP).
++    lt_cv_sys_max_cmd_len=8192;
++    ;;
++
++  mint*)
++    # On MiNT this can take a long time and run out of memory.
++    lt_cv_sys_max_cmd_len=8192;
++    ;;
++
++  amigaos*)
++    # On AmigaOS with pdksh, this test takes hours, literally.
++    # So we just punt and use a minimum line length of 8192.
++    lt_cv_sys_max_cmd_len=8192;
++    ;;
++
++  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
++    # This has been around since 386BSD, at least.  Likely further.
++    if test -x /sbin/sysctl; then
++      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
++    elif test -x /usr/sbin/sysctl; then
++      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
++    else
++      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
++    fi
++    # And add a safety zone
++    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
++    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
++    ;;
++
++  interix*)
++    # We know the value 262144 and hardcode it with a safety zone (like BSD)
++    lt_cv_sys_max_cmd_len=196608
++    ;;
++
++  osf*)
++    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
++    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
++    # nice to cause kernel panics so lets avoid the loop below.
++    # First set a reasonable default.
++    lt_cv_sys_max_cmd_len=16384
++    #
++    if test -x /sbin/sysconfig; then
++      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
++        *1*) lt_cv_sys_max_cmd_len=-1 ;;
++      esac
++    fi
++    ;;
++  sco3.2v5*)
++    lt_cv_sys_max_cmd_len=102400
++    ;;
++  sysv5* | sco5v6* | sysv4.2uw2*)
++    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
++    if test -n "$kargmax"; then
++      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[	 ]]//'`
++    else
++      lt_cv_sys_max_cmd_len=32768
++    fi
++    ;;
++  *)
++    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
++    if test -n "$lt_cv_sys_max_cmd_len"; then
++      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
++      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
++    else
++      # Make teststring a little bigger before we do anything with it.
++      # a 1K string should be a reasonable start.
++      for i in 1 2 3 4 5 6 7 8 ; do
++        teststring=$teststring$teststring
++      done
++      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
++      # If test is not a shell built-in, we'll probably end up computing a
++      # maximum length that is only half of the actual maximum length, but
++      # we can't tell.
++      while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \
++	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
++	      test $i != 17 # 1/2 MB should be enough
++      do
++        i=`expr $i + 1`
++        teststring=$teststring$teststring
++      done
++      # Only check the string length outside the loop.
++      lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1`
++      teststring=
++      # Add a significant safety factor because C++ compilers can tack on
++      # massive amounts of additional arguments before passing them to the
++      # linker.  It appears as though 1/2 is a usable value.
++      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
++    fi
++    ;;
++  esac
++])
++if test -n $lt_cv_sys_max_cmd_len ; then
++  AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
++else
++  AC_MSG_RESULT(none)
++fi
++max_cmd_len=$lt_cv_sys_max_cmd_len
++_LT_DECL([], [max_cmd_len], [0],
++    [What is the maximum length of a command?])
++])# LT_CMD_MAX_LEN
++
++# Old name:
++AU_ALIAS([AC_LIBTOOL_SYS_MAX_CMD_LEN], [LT_CMD_MAX_LEN])
++dnl aclocal-1.4 backwards compatibility:
++dnl AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], [])
++
++
++# _LT_HEADER_DLFCN
++# ----------------
++m4_defun([_LT_HEADER_DLFCN],
++[AC_CHECK_HEADERS([dlfcn.h], [], [], [AC_INCLUDES_DEFAULT])dnl
++])# _LT_HEADER_DLFCN
++
++
++# _LT_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
++#                      ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
++# ----------------------------------------------------------------
++m4_defun([_LT_TRY_DLOPEN_SELF],
++[m4_require([_LT_HEADER_DLFCN])dnl
++if test "$cross_compiling" = yes; then :
++  [$4]
++else
++  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
++  lt_status=$lt_dlunknown
++  cat > conftest.$ac_ext <<_LT_EOF
++[#line $LINENO "configure"
++#include "confdefs.h"
++
++#if HAVE_DLFCN_H
++#include <dlfcn.h>
++#endif
++
++#include <stdio.h>
++
++#ifdef RTLD_GLOBAL
++#  define LT_DLGLOBAL		RTLD_GLOBAL
++#else
++#  ifdef DL_GLOBAL
++#    define LT_DLGLOBAL		DL_GLOBAL
++#  else
++#    define LT_DLGLOBAL		0
++#  endif
++#endif
++
++/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
++   find out it does not work in some platform. */
++#ifndef LT_DLLAZY_OR_NOW
++#  ifdef RTLD_LAZY
++#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
++#  else
++#    ifdef DL_LAZY
++#      define LT_DLLAZY_OR_NOW		DL_LAZY
++#    else
++#      ifdef RTLD_NOW
++#        define LT_DLLAZY_OR_NOW	RTLD_NOW
++#      else
++#        ifdef DL_NOW
++#          define LT_DLLAZY_OR_NOW	DL_NOW
++#        else
++#          define LT_DLLAZY_OR_NOW	0
++#        endif
++#      endif
++#    endif
++#  endif
++#endif
++
++/* When -fvisbility=hidden is used, assume the code has been annotated
++   correspondingly for the symbols needed.  */
++#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
++int fnord () __attribute__((visibility("default")));
++#endif
++
++int fnord () { return 42; }
++int main ()
++{
++  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
++  int status = $lt_dlunknown;
++
++  if (self)
++    {
++      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
++      else
++        {
++	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
++          else puts (dlerror ());
++	}
++      /* dlclose (self); */
++    }
++  else
++    puts (dlerror ());
++
++  return status;
++}]
++_LT_EOF
++  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
++    (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
++    lt_status=$?
++    case x$lt_status in
++      x$lt_dlno_uscore) $1 ;;
++      x$lt_dlneed_uscore) $2 ;;
++      x$lt_dlunknown|x*) $3 ;;
++    esac
++  else :
++    # compilation failed
++    $3
++  fi
++fi
++rm -fr conftest*
++])# _LT_TRY_DLOPEN_SELF
++
++
++# LT_SYS_DLOPEN_SELF
++# ------------------
++AC_DEFUN([LT_SYS_DLOPEN_SELF],
++[m4_require([_LT_HEADER_DLFCN])dnl
++if test "x$enable_dlopen" != xyes; then
++  enable_dlopen=unknown
++  enable_dlopen_self=unknown
++  enable_dlopen_self_static=unknown
++else
++  lt_cv_dlopen=no
++  lt_cv_dlopen_libs=
++
++  case $host_os in
++  beos*)
++    lt_cv_dlopen="load_add_on"
++    lt_cv_dlopen_libs=
++    lt_cv_dlopen_self=yes
++    ;;
++
++  mingw* | pw32* | cegcc*)
++    lt_cv_dlopen="LoadLibrary"
++    lt_cv_dlopen_libs=
++    ;;
++
++  cygwin*)
++    lt_cv_dlopen="dlopen"
++    lt_cv_dlopen_libs=
++    ;;
++
++  darwin*)
++  # if libdl is installed we need to link against it
++    AC_CHECK_LIB([dl], [dlopen],
++		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[
++    lt_cv_dlopen="dyld"
++    lt_cv_dlopen_libs=
++    lt_cv_dlopen_self=yes
++    ])
++    ;;
++
++  *)
++    AC_CHECK_FUNC([shl_load],
++	  [lt_cv_dlopen="shl_load"],
++      [AC_CHECK_LIB([dld], [shl_load],
++	    [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"],
++	[AC_CHECK_FUNC([dlopen],
++	      [lt_cv_dlopen="dlopen"],
++	  [AC_CHECK_LIB([dl], [dlopen],
++		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
++	    [AC_CHECK_LIB([svld], [dlopen],
++		  [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
++	      [AC_CHECK_LIB([dld], [dld_link],
++		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"])
++	      ])
++	    ])
++	  ])
++	])
++      ])
++    ;;
++  esac
++
++  if test "x$lt_cv_dlopen" != xno; then
++    enable_dlopen=yes
++  else
++    enable_dlopen=no
++  fi
++
++  case $lt_cv_dlopen in
++  dlopen)
++    save_CPPFLAGS="$CPPFLAGS"
++    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
++
++    save_LDFLAGS="$LDFLAGS"
++    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
++
++    save_LIBS="$LIBS"
++    LIBS="$lt_cv_dlopen_libs $LIBS"
++
++    AC_CACHE_CHECK([whether a program can dlopen itself],
++	  lt_cv_dlopen_self, [dnl
++	  _LT_TRY_DLOPEN_SELF(
++	    lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
++	    lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
++    ])
++
++    if test "x$lt_cv_dlopen_self" = xyes; then
++      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
++      AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
++	  lt_cv_dlopen_self_static, [dnl
++	  _LT_TRY_DLOPEN_SELF(
++	    lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
++	    lt_cv_dlopen_self_static=no,  lt_cv_dlopen_self_static=cross)
++      ])
++    fi
++
++    CPPFLAGS="$save_CPPFLAGS"
++    LDFLAGS="$save_LDFLAGS"
++    LIBS="$save_LIBS"
++    ;;
++  esac
++
++  case $lt_cv_dlopen_self in
++  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
++  *) enable_dlopen_self=unknown ;;
++  esac
++
++  case $lt_cv_dlopen_self_static in
++  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
++  *) enable_dlopen_self_static=unknown ;;
++  esac
++fi
++_LT_DECL([dlopen_support], [enable_dlopen], [0],
++	 [Whether dlopen is supported])
++_LT_DECL([dlopen_self], [enable_dlopen_self], [0],
++	 [Whether dlopen of programs is supported])
++_LT_DECL([dlopen_self_static], [enable_dlopen_self_static], [0],
++	 [Whether dlopen of statically linked programs is supported])
++])# LT_SYS_DLOPEN_SELF
++
++# Old name:
++AU_ALIAS([AC_LIBTOOL_DLOPEN_SELF], [LT_SYS_DLOPEN_SELF])
++dnl aclocal-1.4 backwards compatibility:
++dnl AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], [])
++
++
++# _LT_COMPILER_C_O([TAGNAME])
++# ---------------------------
++# Check to see if options -c and -o are simultaneously supported by compiler.
++# This macro does not hard code the compiler like AC_PROG_CC_C_O.
++m4_defun([_LT_COMPILER_C_O],
++[m4_require([_LT_DECL_SED])dnl
++m4_require([_LT_FILEUTILS_DEFAULTS])dnl
++m4_require([_LT_TAG_COMPILER])dnl
++AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
++  [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
++  [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
++   $RM -r conftest 2>/dev/null
++   mkdir conftest
++   cd conftest
++   mkdir out
++   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
++
++   lt_compiler_flag="-o out/conftest2.$ac_objext"
++   # Insert the option either (1) after the last *FLAGS variable, or
++   # (2) before a word containing "conftest.", or (3) at the end.
++   # Note that $ac_compile itself does not contain backslashes and begins
++   # with a dollar sign (not a hyphen), so the echo should work correctly.
++   lt_compile=`echo "$ac_compile" | $SED \
++   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
++   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
++   -e 's:$: $lt_compiler_flag:'`
++   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
++   (eval "$lt_compile" 2>out/conftest.err)
++   ac_status=$?
++   cat out/conftest.err >&AS_MESSAGE_LOG_FD
++   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
++   if (exit $ac_status) && test -s out/conftest2.$ac_objext
++   then
++     # The compiler can only warn and ignore the option if not recognized
++     # So say no if there are warnings
++     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
++     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
++     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
++       _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
++     fi
++   fi
++   chmod u+w . 2>&AS_MESSAGE_LOG_FD
++   $RM conftest*
++   # SGI C++ compiler will create directory out/ii_files/ for
++   # template instantiation
++   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
++   $RM out/* && rmdir out
++   cd ..
++   $RM -r conftest
++   $RM conftest*
++])
++_LT_TAGDECL([compiler_c_o], [lt_cv_prog_compiler_c_o], [1],
++	[Does compiler simultaneously support -c and -o options?])
++])# _LT_COMPILER_C_O
++
++
++# _LT_COMPILER_FILE_LOCKS([TAGNAME])
++# ----------------------------------
++# Check to see if we can do hard links to lock some files if needed
++m4_defun([_LT_COMPILER_FILE_LOCKS],
++[m4_require([_LT_ENABLE_LOCK])dnl
++m4_require([_LT_FILEUTILS_DEFAULTS])dnl
++_LT_COMPILER_C_O([$1])
++
++hard_links="nottested"
++if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then
++  # do not overwrite the value of need_locks provided by the user
++  AC_MSG_CHECKING([if we can lock with hard links])
++  hard_links=yes
++  $RM conftest*
++  ln conftest.a conftest.b 2>/dev/null && hard_links=no
++  touch conftest.a
++  ln conftest.a conftest.b 2>&5 || hard_links=no
++  ln conftest.a conftest.b 2>/dev/null && hard_links=no
++  AC_MSG_RESULT([$hard_links])
++  if test "$hard_links" = no; then
++    AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe])
++    need_locks=warn
++  fi
++else
++  need_locks=no
++fi
++_LT_DECL([], [need_locks], [1], [Must we lock files when doing compilation?])
++])# _LT_COMPILER_FILE_LOCKS
++
++
++# _LT_CHECK_OBJDIR
++# ----------------
++m4_defun([_LT_CHECK_OBJDIR],
++[AC_CACHE_CHECK([for objdir], [lt_cv_objdir],
++[rm -f .libs 2>/dev/null
++mkdir .libs 2>/dev/null
++if test -d .libs; then
++  lt_cv_objdir=.libs
++else
++  # MS-DOS does not allow filenames that begin with a dot.
++  lt_cv_objdir=_libs
++fi
++rmdir .libs 2>/dev/null])
++objdir=$lt_cv_objdir
++_LT_DECL([], [objdir], [0],
++         [The name of the directory that contains temporary libtool files])dnl
++m4_pattern_allow([LT_OBJDIR])dnl
++AC_DEFINE_UNQUOTED(LT_OBJDIR, "$lt_cv_objdir/",
++  [Define to the sub-directory in which libtool stores uninstalled libraries.])
++])# _LT_CHECK_OBJDIR
++
++
++# _LT_LINKER_HARDCODE_LIBPATH([TAGNAME])
++# --------------------------------------
++# Check hardcoding attributes.
++m4_defun([_LT_LINKER_HARDCODE_LIBPATH],
++[AC_MSG_CHECKING([how to hardcode library paths into programs])
++_LT_TAGVAR(hardcode_action, $1)=
++if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" ||
++   test -n "$_LT_TAGVAR(runpath_var, $1)" ||
++   test "X$_LT_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
++
++  # We can hardcode non-existent directories.
++  if test "$_LT_TAGVAR(hardcode_direct, $1)" != no &&
++     # If the only mechanism to avoid hardcoding is shlibpath_var, we
++     # have to relink, otherwise we might link with an installed library
++     # when we should be linking with a yet-to-be-installed one
++     ## test "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" != no &&
++     test "$_LT_TAGVAR(hardcode_minus_L, $1)" != no; then
++    # Linking always hardcodes the temporary library directory.
++    _LT_TAGVAR(hardcode_action, $1)=relink
++  else
++    # We can link without hardcoding, and we can hardcode nonexisting dirs.
++    _LT_TAGVAR(hardcode_action, $1)=immediate
++  fi
++else
++  # We cannot hardcode anything, or else we can only hardcode existing
++  # directories.
++  _LT_TAGVAR(hardcode_action, $1)=unsupported
++fi
++AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)])
++
++if test "$_LT_TAGVAR(hardcode_action, $1)" = relink ||
++   test "$_LT_TAGVAR(inherit_rpath, $1)" = yes; then
++  # Fast installation is not supported
++  enable_fast_install=no
++elif test "$shlibpath_overrides_runpath" = yes ||
++     test "$enable_shared" = no; then
++  # Fast installation is not necessary
++  enable_fast_install=needless
++fi
++_LT_TAGDECL([], [hardcode_action], [0],
++    [How to hardcode a shared library path into an executable])
++])# _LT_LINKER_HARDCODE_LIBPATH
++
++
++# _LT_CMD_STRIPLIB
++# ----------------
++m4_defun([_LT_CMD_STRIPLIB],
++[m4_require([_LT_DECL_EGREP])
++striplib=
++old_striplib=
++AC_MSG_CHECKING([whether stripping libraries is possible])
++if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
++  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
++  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
++  AC_MSG_RESULT([yes])
++else
++# FIXME - insert some real tests, host_os isn't really good enough
++  case $host_os in
++  darwin*)
++    if test -n "$STRIP" ; then
++      striplib="$STRIP -x"
++      old_striplib="$STRIP -S"
++      AC_MSG_RESULT([yes])
++    else
++      AC_MSG_RESULT([no])
++    fi
++    ;;
++  *)
++    AC_MSG_RESULT([no])
++    ;;
++  esac
++fi
++_LT_DECL([], [old_striplib], [1], [Commands to strip libraries])
++_LT_DECL([], [striplib], [1])
++])# _LT_CMD_STRIPLIB
++
++
++# _LT_SYS_DYNAMIC_LINKER([TAG])
++# -----------------------------
++# PORTME Fill in your ld.so characteristics
++m4_defun([_LT_SYS_DYNAMIC_LINKER],
++[AC_REQUIRE([AC_CANONICAL_HOST])dnl
++m4_require([_LT_DECL_EGREP])dnl
++m4_require([_LT_FILEUTILS_DEFAULTS])dnl
++m4_require([_LT_DECL_OBJDUMP])dnl
++m4_require([_LT_DECL_SED])dnl
++m4_require([_LT_CHECK_SHELL_FEATURES])dnl
++AC_MSG_CHECKING([dynamic linker characteristics])
++m4_if([$1],
++	[], [
++if test "$GCC" = yes; then
++  case $host_os in
++    darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
++    *) lt_awk_arg="/^libraries:/" ;;
++  esac
++  case $host_os in
++    mingw* | cegcc*) lt_sed_strip_eq="s,=\([[A-Za-z]]:\),\1,g" ;;
++    *) lt_sed_strip_eq="s,=/,/,g" ;;
++  esac
++  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
++  case $lt_search_path_spec in
++  *\;*)
++    # if the path contains ";" then we assume it to be the separator
++    # otherwise default to the standard path separator (i.e. ":") - it is
++    # assumed that no part of a normal pathname contains ";" but that should
++    # okay in the real world where ";" in dirpaths is itself problematic.
++    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`
++    ;;
++  *)
++    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
++    ;;
++  esac
++  # Ok, now we have the path, separated by spaces, we can step through it
++  # and add multilib dir if necessary.
++  lt_tmp_lt_search_path_spec=
++  lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
++  for lt_sys_path in $lt_search_path_spec; do
++    if test -d "$lt_sys_path/$lt_multi_os_dir"; then
++      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
++    else
++      test -d "$lt_sys_path" && \
++	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
++    fi
++  done
++  lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
++BEGIN {RS=" "; FS="/|\n";} {
++  lt_foo="";
++  lt_count=0;
++  for (lt_i = NF; lt_i > 0; lt_i--) {
++    if ($lt_i != "" && $lt_i != ".") {
++      if ($lt_i == "..") {
++        lt_count++;
++      } else {
++        if (lt_count == 0) {
++          lt_foo="/" $lt_i lt_foo;
++        } else {
++          lt_count--;
++        }
++      }
++    }
++  }
++  if (lt_foo != "") { lt_freq[[lt_foo]]++; }
++  if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
++}'`
++  # AWK program above erroneously prepends '/' to C:/dos/paths
++  # for these hosts.
++  case $host_os in
++    mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
++      $SED 's,/\([[A-Za-z]]:\),\1,g'` ;;
++  esac
++  sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
++else
++  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
++fi])
++library_names_spec=
++libname_spec='lib$name'
++soname_spec=
++shrext_cmds=".so"
++postinstall_cmds=
++postuninstall_cmds=
++finish_cmds=
++finish_eval=
++shlibpath_var=
++shlibpath_overrides_runpath=unknown
++version_type=none
++dynamic_linker="$host_os ld.so"
++sys_lib_dlsearch_path_spec="/lib /usr/lib"
++need_lib_prefix=unknown
++hardcode_into_libs=no
++
++# when you set need_version to no, make sure it does not cause -set_version
++# flags to be left without arguments
++need_version=unknown
++
++case $host_os in
++aix3*)
++  version_type=linux
++  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
++  shlibpath_var=LIBPATH
++
++  # AIX 3 has no versioning support, so we append a major version to the name.
++  soname_spec='${libname}${release}${shared_ext}$major'
++  ;;
++
++aix[[4-9]]*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  hardcode_into_libs=yes
++  if test "$host_cpu" = ia64; then
++    # AIX 5 supports IA64
++    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
++    shlibpath_var=LD_LIBRARY_PATH
++  else
++    # With GCC up to 2.95.x, collect2 would create an import file
++    # for dependence libraries.  The import file would start with
++    # the line `#! .'.  This would cause the generated library to
++    # depend on `.', always an invalid library.  This was fixed in
++    # development snapshots of GCC prior to 3.0.
++    case $host_os in
++      aix4 | aix4.[[01]] | aix4.[[01]].*)
++      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
++	   echo ' yes '
++	   echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
++	:
++      else
++	can_build_shared=no
++      fi
++      ;;
++    esac
++    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
++    # soname into executable. Probably we can add versioning support to
++    # collect2, so additional links can be useful in future.
++    if test "$aix_use_runtimelinking" = yes; then
++      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
++      # instead of lib<name>.a to let people know that these are not
++      # typical AIX shared libraries.
++      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++    else
++      # We preserve .a as extension for shared libraries through AIX4.2
++      # and later when we are not doing run time linking.
++      library_names_spec='${libname}${release}.a $libname.a'
++      soname_spec='${libname}${release}${shared_ext}$major'
++    fi
++    shlibpath_var=LIBPATH
++  fi
++  ;;
++
++amigaos*)
++  case $host_cpu in
++  powerpc)
++    # Since July 2007 AmigaOS4 officially supports .so libraries.
++    # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++    ;;
++  m68k)
++    library_names_spec='$libname.ixlibrary $libname.a'
++    # Create ${libname}_ixlibrary.a entries in /sys/libs.
++    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
++    ;;
++  esac
++  ;;
++
++beos*)
++  library_names_spec='${libname}${shared_ext}'
++  dynamic_linker="$host_os ld.so"
++  shlibpath_var=LIBRARY_PATH
++  ;;
++
++bsdi[[45]]*)
++  version_type=linux
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
++  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
++  # the default ld.so.conf also contains /usr/contrib/lib and
++  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
++  # libtool to hard-code these into programs
++  ;;
++
++cygwin* | mingw* | pw32* | cegcc*)
++  version_type=windows
++  shrext_cmds=".dll"
++  need_version=no
++  need_lib_prefix=no
++
++  case $GCC,$cc_basename in
++  yes,*)
++    # gcc
++    library_names_spec='$libname.dll.a'
++    # DLL is installed to $(libdir)/../bin by postinstall_cmds
++    postinstall_cmds='base_file=`basename \${file}`~
++      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
++      dldir=$destdir/`dirname \$dlpath`~
++      test -d \$dldir || mkdir -p \$dldir~
++      $install_prog $dir/$dlname \$dldir/$dlname~
++      chmod a+x \$dldir/$dlname~
++      if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
++        eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
++      fi'
++    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
++      dlpath=$dir/\$dldll~
++       $RM \$dlpath'
++    shlibpath_overrides_runpath=yes
++
++    case $host_os in
++    cygwin*)
++      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
++      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
++m4_if([$1], [],[
++      sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"])
++      ;;
++    mingw* | cegcc*)
++      # MinGW DLLs use traditional 'lib' prefix
++      soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
++      ;;
++    pw32*)
++      # pw32 DLLs use 'pw' prefix rather than 'lib'
++      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
++      ;;
++    esac
++    dynamic_linker='Win32 ld.exe'
++    ;;
++
++  *,cl*)
++    # Native MSVC
++    libname_spec='$name'
++    soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
++    library_names_spec='${libname}.dll.lib'
++
++    case $build_os in
++    mingw*)
++      sys_lib_search_path_spec=
++      lt_save_ifs=$IFS
++      IFS=';'
++      for lt_path in $LIB
++      do
++        IFS=$lt_save_ifs
++        # Let DOS variable expansion print the short 8.3 style file name.
++        lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
++        sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
++      done
++      IFS=$lt_save_ifs
++      # Convert to MSYS style.
++      sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'`
++      ;;
++    cygwin*)
++      # Convert to unix form, then to dos form, then back to unix form
++      # but this time dos style (no spaces!) so that the unix form looks
++      # like /cygdrive/c/PROGRA~1:/cygdr...
++      sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
++      sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
++      sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
++      ;;
++    *)
++      sys_lib_search_path_spec="$LIB"
++      if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
++        # It is most probably a Windows format PATH.
++        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
++      else
++        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
++      fi
++      # FIXME: find the short name or the path components, as spaces are
++      # common. (e.g. "Program Files" -> "PROGRA~1")
++      ;;
++    esac
++
++    # DLL is installed to $(libdir)/../bin by postinstall_cmds
++    postinstall_cmds='base_file=`basename \${file}`~
++      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
++      dldir=$destdir/`dirname \$dlpath`~
++      test -d \$dldir || mkdir -p \$dldir~
++      $install_prog $dir/$dlname \$dldir/$dlname'
++    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
++      dlpath=$dir/\$dldll~
++       $RM \$dlpath'
++    shlibpath_overrides_runpath=yes
++    dynamic_linker='Win32 link.exe'
++    ;;
++
++  *)
++    # Assume MSVC wrapper
++    library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
++    dynamic_linker='Win32 ld.exe'
++    ;;
++  esac
++  # FIXME: first we should search . and the directory the executable is in
++  shlibpath_var=PATH
++  ;;
++
++darwin* | rhapsody*)
++  dynamic_linker="$host_os dyld"
++  version_type=darwin
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
++  soname_spec='${libname}${release}${major}$shared_ext'
++  shlibpath_overrides_runpath=yes
++  shlibpath_var=DYLD_LIBRARY_PATH
++  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
++m4_if([$1], [],[
++  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"])
++  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
++  ;;
++
++dgux*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  ;;
++
++freebsd1*)
++  dynamic_linker=no
++  ;;
++
++freebsd* | dragonfly*)
++  # DragonFly does not have aout.  When/if they implement a new
++  # versioning mechanism, adjust this.
++  if test -x /usr/bin/objformat; then
++    objformat=`/usr/bin/objformat`
++  else
++    case $host_os in
++    freebsd[[123]]*) objformat=aout ;;
++    *) objformat=elf ;;
++    esac
++  fi
++  version_type=freebsd-$objformat
++  case $version_type in
++    freebsd-elf*)

@@ 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 janholzh at users.sourceforge.net  Thu Jan 19 12:35:18 2012
From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net)
Date: Thu, 19 Jan 2012 11:35:18 +0000
Subject: [csw-devel] SF.net SVN: gar:[16812]
	csw/mgar/pkg/rootsh/trunk/Makefile
Message-ID: <E1RnqH0-0006qZ-QQ@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 16812
          http://gar.svn.sourceforge.net/gar/?rev=16812&view=rev
Author:   janholzh
Date:     2012-01-19 11:35:18 +0000 (Thu, 19 Jan 2012)
Log Message:
-----------
rootsh/trunk: use localstatedir

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

Modified: csw/mgar/pkg/rootsh/trunk/Makefile
===================================================================
--- csw/mgar/pkg/rootsh/trunk/Makefile	2012-01-19 11:27:38 UTC (rev 16811)
+++ csw/mgar/pkg/rootsh/trunk/Makefile	2012-01-19 11:35:18 UTC (rev 16812)
@@ -27,7 +27,7 @@
 CONFIGURE_ARGS = $(DIRPATHS) --with-logdir=/var/opt/csw/rootsh
 
 PROTOTYPE_MODIFIERS = rootsshdir 
-PROTOTYPE_FILES_rootsshdir =  /var/opt/csw/rootsh  # a normal Perl regexp. Watch out for links!
+PROTOTYPE_FILES_rootsshdir =  $(localstatedir)/rootsh  # a normal Perl regexp. Watch out for links!
 PROTOTYPE_PERMS_rootsshdir = 0733
 PROTOTYPE_USER_rootsshdir = root
 PROTOTYPE_GROUP_rootsshdir = root
@@ -35,5 +35,5 @@
 include gar/category.mk
 
 post-install-modulated:
-	ginstall --mode=733 -d $(DESTDIR)/var/opt/csw/rootsh
+	@ginstall -d $(DESTDIR)$(localstatedir)/rootsh
 	@$(MAKECOOKIE)

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


From wahwah at users.sourceforge.net  Thu Jan 19 13:22:05 2012
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Thu, 19 Jan 2012 12:22:05 +0000
Subject: [csw-devel] SF.net SVN: gar:[16813]
	csw/mgar/pkg/opencsw-policy/trunk
Message-ID: <E1Rnr0H-0007Zw-LF@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 16813
          http://gar.svn.sourceforge.net/gar/?rev=16813&view=rev
Author:   wahwah
Date:     2012-01-19 12:22:05 +0000 (Thu, 19 Jan 2012)
Log Message:
-----------
opencsw-policy/trunk: Use subdirectories for sub-books

Modified Paths:
--------------
    csw/mgar/pkg/opencsw-policy/trunk/Makefile
    csw/mgar/pkg/opencsw-policy/trunk/files/index.rst

Added Paths:
-----------
    csw/mgar/pkg/opencsw-policy/trunk/files/for-administrators/
    csw/mgar/pkg/opencsw-policy/trunk/files/for-administrators/index.rst
    csw/mgar/pkg/opencsw-policy/trunk/files/for-developers/
    csw/mgar/pkg/opencsw-policy/trunk/files/for-developers/index.rst
    csw/mgar/pkg/opencsw-policy/trunk/files/for-maintainers/
    csw/mgar/pkg/opencsw-policy/trunk/files/for-maintainers/filesystem-layout.rst
    csw/mgar/pkg/opencsw-policy/trunk/files/for-maintainers/index.rst
    csw/mgar/pkg/opencsw-policy/trunk/files/for-maintainers/shared-libraries.rst

Removed Paths:
-------------
    csw/mgar/pkg/opencsw-policy/trunk/files/filesystem-layout.rst
    csw/mgar/pkg/opencsw-policy/trunk/files/o2a-index.rst
    csw/mgar/pkg/opencsw-policy/trunk/files/o2d-index.rst
    csw/mgar/pkg/opencsw-policy/trunk/files/o2m-index.rst
    csw/mgar/pkg/opencsw-policy/trunk/files/shared-libraries.rst

Modified: csw/mgar/pkg/opencsw-policy/trunk/Makefile
===================================================================
--- csw/mgar/pkg/opencsw-policy/trunk/Makefile	2012-01-19 11:35:18 UTC (rev 16812)
+++ csw/mgar/pkg/opencsw-policy/trunk/Makefile	2012-01-19 12:22:05 UTC (rev 16813)
@@ -1,11 +1,19 @@
 # Copyright 2009 OpenCSW
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
+#
+# Testing
+# =======
+#
+# mkdir -p ~/public_html/opencsw-manual
+# mgar install copy-to-web
+# point your browser at:
+# http://buildfarm.opencsw.org/~${LOGNAME}/opencsw-manual/
 
-NAME = opencsw-policy
+NAME = opencsw-manual
 VERSION = 0.1
 CATEGORIES = lib
-DESCRIPTION = OpenCSW packaging policy
+DESCRIPTION = OpenCSW manual
 define BLURB
 endef
 SPKG_SOURCEURL = http://www.opencsw.org
@@ -15,8 +23,8 @@
 BUILD_SCRIPTS = policy
 INSTALL_SCRIPTS = policy
 TEST_SCRIPTS =
-ARCHALL_CSWopencsw-policy = 1
-CATALOGNAME_CSWopencsw-policy = opencsw_policy
+ARCHALL_CSWopencsw-manual = 1
+CATALOGNAME_CSWopencsw-manual = opencsw_policy
 LICENSE = fdl-1.3.txt
 
 BUILD_DEP_PKGS += CSWpy-sphinx
@@ -33,17 +41,17 @@
 	(cd $(WORKSRC); gmake html)
 
 install-policy:
-	ginstall -m 755 -d $(PKGROOT)$(docdir)/$(CATALOGNAME_CSWopencsw-policy)
-	rsync -rv $(WORKSRC)/_build/html/ $(PKGROOT)$(docdir)/$(CATALOGNAME_CSWopencsw-policy)
+	ginstall -m 755 -d $(PKGROOT)$(docdir)/$(CATALOGNAME_CSWopencsw-manual)
+	rsync -rv $(WORKSRC)/_build/html/ $(PKGROOT)$(docdir)/$(CATALOGNAME_CSWopencsw-manual)
 	@$(MAKECOOKIE)
 
 post-install-modulated: copy-to-web
 	@$(MAKECOOKIE)
 
 copy-to-web:
-	if [ -d $(HOME)/public_html/policy ]; then \
-		rsync -r $(PKGROOT)$(docdir)/$(CATALOGNAME_CSWopencsw-policy)/ \
-		$(HOME)/public_html/policy; \
+	if [ -d $(HOME)/public_html/opencsw-manual ]; then \
+		rsync -r $(PKGROOT)$(docdir)/$(CATALOGNAME_CSWopencsw-manual)/ \
+		$(HOME)/public_html/opencsw-manual; \
 	fi
 
 .PHONY: copy-to-web

Deleted: csw/mgar/pkg/opencsw-policy/trunk/files/filesystem-layout.rst
===================================================================
--- csw/mgar/pkg/opencsw-policy/trunk/files/filesystem-layout.rst	2012-01-19 11:35:18 UTC (rev 16812)
+++ csw/mgar/pkg/opencsw-policy/trunk/files/filesystem-layout.rst	2012-01-19 12:22:05 UTC (rev 16813)
@@ -1,17 +0,0 @@
--------------------------
-OpenCSW filesystem layout
--------------------------
-
-.. highlight:: text
-
-Introduction
-------------
-
-OpenCSW installs over an already installed Solaris system, and follows the
-general rule of not conflicting with existing Solaris files.
-
-The outermost installation directories are:
-
-* /opt/csw (base of the hierarchy)
-* /etc/opt/csw (configuration files)
-* /var/opt/csw (data files)

Copied: csw/mgar/pkg/opencsw-policy/trunk/files/for-administrators/index.rst (from rev 16800, csw/mgar/pkg/opencsw-policy/trunk/files/o2a-index.rst)
===================================================================
--- csw/mgar/pkg/opencsw-policy/trunk/files/for-administrators/index.rst	                        (rev 0)
+++ csw/mgar/pkg/opencsw-policy/trunk/files/for-administrators/index.rst	2012-01-19 12:22:05 UTC (rev 16813)
@@ -0,0 +1,22 @@
+==========================
+OpenCSW for Administrators
+==========================
+
+A usage manual for people who manage Solaris systems with OpenCSW packages.
+
+.. contents::
+
+Bootstrapping
+-------------
+
+On a Solaris 10 system, you can use the capacity of pkgadd to download
+packages via http::
+
+  pkgadd -d http://get.opencsw.org/now
+
+On Solaris 8 and 9 (best effort support only), you need to download the
+package using e.g. wget and install it with::
+
+  wget http://mirror.opencsw.org/opencsw/pkgutil.pkg
+  pkgadd -d pkgutil.pkg
+

Copied: csw/mgar/pkg/opencsw-policy/trunk/files/for-developers/index.rst (from rev 16800, csw/mgar/pkg/opencsw-policy/trunk/files/o2d-index.rst)
===================================================================
--- csw/mgar/pkg/opencsw-policy/trunk/files/for-developers/index.rst	                        (rev 0)
+++ csw/mgar/pkg/opencsw-policy/trunk/files/for-developers/index.rst	2012-01-19 12:22:05 UTC (rev 16813)
@@ -0,0 +1,8 @@
+======================
+OpenCSW for Developers
+======================
+
+.. contents::
+
+This is a manual for developers who want to build own software, using
+tools and libraries provided by OpenCSW.

Copied: csw/mgar/pkg/opencsw-policy/trunk/files/for-maintainers/filesystem-layout.rst (from rev 16800, csw/mgar/pkg/opencsw-policy/trunk/files/filesystem-layout.rst)
===================================================================
--- csw/mgar/pkg/opencsw-policy/trunk/files/for-maintainers/filesystem-layout.rst	                        (rev 0)
+++ csw/mgar/pkg/opencsw-policy/trunk/files/for-maintainers/filesystem-layout.rst	2012-01-19 12:22:05 UTC (rev 16813)
@@ -0,0 +1,17 @@
+-------------------------
+OpenCSW filesystem layout
+-------------------------
+
+.. highlight:: text
+
+Introduction
+------------
+
+OpenCSW installs over an already installed Solaris system, and follows the
+general rule of not conflicting with existing Solaris files.
+
+The outermost installation directories are:
+
+* /opt/csw (base of the hierarchy)
+* /etc/opt/csw (configuration files)
+* /var/opt/csw (data files)

Copied: csw/mgar/pkg/opencsw-policy/trunk/files/for-maintainers/index.rst (from rev 16801, csw/mgar/pkg/opencsw-policy/trunk/files/o2m-index.rst)
===================================================================
--- csw/mgar/pkg/opencsw-policy/trunk/files/for-maintainers/index.rst	                        (rev 0)
+++ csw/mgar/pkg/opencsw-policy/trunk/files/for-maintainers/index.rst	2012-01-19 12:22:05 UTC (rev 16813)
@@ -0,0 +1,12 @@
+===============================
+OpenCSW for Package Maintainers
+===============================
+
+This is a manual for people who want to build Solaris packages and Solaris
+package repositories, either at OpenCSW or at their own organization.
+
+.. toctree::
+  :maxdepth: 2
+
+  filesystem-layout
+  shared-libraries

Copied: csw/mgar/pkg/opencsw-policy/trunk/files/for-maintainers/shared-libraries.rst (from rev 16800, csw/mgar/pkg/opencsw-policy/trunk/files/shared-libraries.rst)
===================================================================
--- csw/mgar/pkg/opencsw-policy/trunk/files/for-maintainers/shared-libraries.rst	                        (rev 0)
+++ csw/mgar/pkg/opencsw-policy/trunk/files/for-maintainers/shared-libraries.rst	2012-01-19 12:22:05 UTC (rev 16813)
@@ -0,0 +1,301 @@
+----------------
+Shared libraries
+----------------
+
+Background
+----------
+
+Some packages are providing shared libraries.  When binaries start
+linking to them, the updates to packages with shared libraries must be
+done in a way that doesn't break existing binaries.
+
+Life cycle of a shared library can be summarized in the following way:
+
+1. A SONAME appears
+2. We decide to distribute it
+3. Binaries start linking to it
+4. Time passes, new version of the same library comes along
+5. Binaries stop linking to it
+6. SONAME goes away
+
+Historically, shared libraries were packaged either together with base
+packages, or split off to their own packages.  However, once updated
+shared libraries became available upstream, updated packages included
+both old and new versions of shared libraries.  This required package
+builds to download and compile multiple versions of the same project.
+Notable examples are curl and neon libraries, where CSWcurlrt contained
+all three libcurl.so.2, libcurl.so.3 and libcurl.so.4.
+
+Phasing out of shared libraries was difficult.  To phase out a shared
+library, it is required to verify that no binaries link to it.  All
+dependent packages need to be recompiled against the newest version of
+the library, and once this is done, old versions can be removed.
+However, even when all dependent packages are already recompiled against
+libcurl.so.4, there are no useful indicators that libcurl.so.2 is no
+longer linked to.  To verify this, all dependent packages have to be
+unpacked, and examined using /usr/ccs/bin/dump that they no longer list
+libcurl.so.2 in their NEEDED field.
+
+Once the detection problem is solved, removing the old version of
+a library is not as simple as it could be; The whole CSWcurlrt has to be
+rebuilt and re-released in a new version which no longer includes
+libcurl.so.2.
+
+Goals
+-----
+
+* Simplification of handling of shared library life cycles
+* Allowing to determine whether a specific shared library is no longer
+  linked to, by looking at package dependencies (This avoids potential
+  problem of our keeping "legacy binary libs" in a more modern package
+  for longer than is neccessary. It also avoids having to keep coping
+  the binary into future packages)
+
+Non-goals
+---------
+
+* Providing a reliable mechanism to determine whether a given pkgname
+  contains a shared library
+* Keeping package names short and pretty as a priority
+
+Overview
+--------
+
+As a general rule, each soname shall be packaged in a separate package.
+This way, it's easy to track dependencies on specific sonames, detect
+and phase out sonames that are no longer in use.  It also avoids the
+need to rebuild all the versions of software in question if one of the
+versions needs an update.
+
+This idea is based on the Debian shared libraries packaging policy
+[#debian-policy]_ and has been discussed [#discussion]_ on the mailing
+list.
+
+Advantages:
+
+* easy and complete lifecycle of shared libraries
+
+* phasing out of shared libraries can become part of standard catalog
+  update procedures
+* simpler packages, simpler builds (no need for version modulations and
+  complex merges, good for new maintainers)
+* isolation of old non-fixable files with issues (if there's an old
+  library mentioning /export/medusa, you don't have to worry about it
+  being stopped during release after you push it once)
+* no re-pushing of old files
+* more packages overall (good for stats!)
+* number of packages released per software upgrade remains the same.  If
+  there were, say, 4 packages to release with each Python update, the
+  number remains: 4 per release.  There will be one new CSWlibpython*
+  package, and the old CSWlibpython library won't be upgraded.
+
+
+Disadvantages:
+
+* maintainers need to make more decisions when packaging
+* there's some amount of work to be done to do the transition, such as
+  creation of new packages and dependencies
+* some package names become long and complex (however, they are only
+  dependencies; users don't need to type these in)
+
+Implementation details
+----------------------
+
+Package naming
+~~~~~~~~~~~~~~
+
+Names of packages shall be derived from sonames, and from sonames only.
+They shall not depend on project name, or project version.  If a project
+is named foo, and contains libbar.so.0, the package name shall be based
+on libbar, not foo.
+
+A table listing examples of sonames and corresponding package
+names. [#soname-pkgname-unit-test]_
+
+========================= ======================= =========================
+soname                    pkgname                 catalogname
+========================= ======================= =========================
+libfoo.so.0               CSWlibfoo0              libfoo0
+libfoo-0.so               CSWlibfoo0              libfoo0
+libfoo.so.0.1             CSWlibfoo0-1            libfoo0_1
+libapr-1.so.0             CSWlibapr1-0            libapr1_0
+libbabl-0.1.so.0          CSWlibbabl0-1-0         libbabl0_1_0
+libgettextlib-0.14.1.so   CSWlibgettextlib0-14-1  libgettextlib0_14_1
+libapr-1.so.10            CSWlibapr-1-10          libapr_1_10
+libstdc++.so.6            CSWlibstdc++6           libstdc++6
+libdnet.1                 CSWlibdnet1             libdnet1
+libUpperCase.so.1         CSWlibuppercase1        libuppercase1
+libpyglib-2.0-python.so.0 CSWlibpyglib2-0python0  libpyglib2_0python0
+libpython3.1.so.1.0       CSWlibpython3-1-1-0     libpython3_1_1_0
+libapr-1.so.10.0.0        CSWlibapr1-10-0-0       libapr1_10_0_0
+========================= ======================= =========================
+
+Separators
+^^^^^^^^^^
+
+Separators are added between two adjacent numbers, and removed if a number and a letter are next to each other.  For example, ``libfoo.so.0`` becomes ``CSWlibfoo0``, and ``libfoo-1.so.0`` becomes ``CSWlibfoo1-0``.
+
+Linkable shared objects
+~~~~~~~~~~~~~~~~~~~~~~~
+
+The policy or recommendation shall refer to libraries which are //linkable,// meaning other binaries can link against them.  Shared objects in private directories, such as /opt/csw/lib/someproject/foo.so (think Python modules) are not shared libraries which other projects can link to, and therefore there is no benefit in placing them in separate packages.
+
+Special cases
+^^^^^^^^^^^^^
+
+Some packages (e.g. Kerberos libraries) put private shared libraries into /opt/csw/lib.  They don't expose any public API, and only own Kerberos binaries link to them.  Private shared libraries can be bundled with the main package, without splitting them off.
+
+Examples
+^^^^^^^^
+
+============================================================================== ============
+file                                                                           linkable?
+============================================================================== ============
+/opt/csw/lib/libfoo.so.0.2                                                     Yes
+/opt/csw/lib/sparcv9/libfoo.so.0.2                                             Yes
+/opt/csw/lib/sparcv8plus+vis/libfoo.so.0.2                                     Yes
+/opt/csw/lib/amd64/libfoo.so.0.2                                               Yes
+/opt/csw/libexec/bar                                                           No
+/opt/csw/share/bar                                                             No
+/opt/csw/lib/gnucash/libgncmod-stylesheets.so.0.0.0                            No
+/opt/csw/lib/erlang/lib/megaco-3.6.0.1/priv/lib/megaco_flex_scanner_drv_mt.so  No
+/opt/csw/share/Adobe/Reader8/Reader/sparcsolaris/lib/libcrypto.so.0.9.6        No
+/opt/csw/customprefix/lib/libfoo.so.0.2                                        Yes
+/opt/csw/boost-gcc/lib/libboost_wserialization.so.1.44.0                       Yes
+============================================================================== ============
+
+Example implementation and its unit tests can be found in checkpkg
+sources [#is-library-linkable-implementation]_ and corresponding unit
+tests. [#is-library-linkable-unit-tests]_
+
+Private shared libraries
+^^^^^^^^^^^^^^^^^^^^^^^^
+
+Some software projects install private (non-linkable) shared libraries
+into libdir (e.g. ``/opt/csw/lib``) by default.  To ensure that they are
+private, they need to be moved to a subdirectory, e.g.
+``/opt/csw/lib/<project>``.
+
+To create a private library and install 32 and 64-bit libraries, they
+need to be laid out as follows:
+
+On sparc::
+
+  /opt/csw/lib/foo
+  /opt/csw/lib/foo/32 --> .
+  /opt/csw/lib/foo/64 --> sparcv9
+
+On i386::
+
+  /opt/csw/lib/foo
+  /opt/csw/lib/foo/32 --> .
+  /opt/csw/lib/foo/64 --> amd64
+
+In GAR, it can be simplified by symlinking:
+
+* 32 to ``$(ISA_DEFAULT)``
+* 64 to ``$(ISA_DEFAULT64)``
+
+The runpath needs to be set to ``/opt/csw/lib/foo/64``, e.g. ``-R/opt/csw/lib/foo/64``.
+
+Grouping shared libraries
+-------------------------
+
+There can be cases in which a set of shared libraries is likely to be
+upgraded together. Considering the following set of libraries:
+
+* libfoo.so.0
+* libfoo_bar.so.0
+* libfoo_baz.so.0
+
+It's possible that all the following libraries will be updated together.
+In such a case, all these shared objects can be put in a single package.
+The decision shall be made by the maintainer.
+
+If versions of shared libraries don't match, chances are that their API
+will not be changing together, and it's a good idea not to package them
+together.  For example, the following three libraries are best kept in
+separate packages.
+
+* libfoo.so.0
+* libfoo_bar.so.1
+* libfoo_baz.so.0
+
+When making the decision, the question a maintainer should ask, should
+be: "Are all these shared libraries going to be retired together?" If
+the answer is positive, shared libraries shall be in a single package.
+However, in the face of uncertainty (it's hard to predict the future),
+placing each file in a separate package is always a safe choice.
+
+Transitioning of the existing packages
+--------------------------------------
+
+Consists of moving the shared library to own package, and making the
+original package an empty, transitional one.  The phasing out of
+transitional packages follows the same rules as any other packages: when
+nothing depends on them, they can be removed.
+
+A simple example:
+
+* Before
+
+  - CSWlibfoo (libfoo.so.1)
+
+* After
+
+  - CSWlibfoo (empty) ? CSWlibfoo1 (libfoo.so.1)
+
+For an existing more complex package, with already existing two versions
+of a library:
+
+* Before
+
+  - CSWlibfoo (libfoo.so.1, libfoo.so.2)
+
+* After
+
+  - CSWlibfoo (empty) ? CSWlibfoo1 (libfoo.so.1)
+  - CSWlibfoo (empty) ? CSWlibfoo2 (libfoo.so.2)
+
+Potential problems
+==================
+
+Potential collisions in package naming would include libfoo.so.1 and
+libfoo-1.so both resolving to CSWlibfoo1.  If this case ever occurs, the
+naming conflict needs to be resolved manually.  However, to this time,
+such a case has been never observed.
+
+Certain sonames are long enough that the corresponding package names are
+over 29 characters long.  However, it affects a small percent of
+libraries, roughly about 98% SONAMEs generate package names within
+limits.
+
+Footnotes
+=========
+
+.. [#discussion] `An idea for a shared libraries policy`_ -
+   mailing list discussion
+.. [#debian-policy]
+   `Debian shared libraries packaging policy`_
+.. [#is-library-linkable-implementation]
+   `IsLibraryLinkable implementation`_
+.. [#is-library-linkable-unit-tests]
+   `IsLibraryLinkable unit tests`_
+.. [#soname-pkgname-unit-test]
+   checkpkg unit tests with
+   `examples of mappings between SONAMEs, pkgnames and catalognames`_
+.. _Debian shared libraries packaging policy:
+   http://www.debian.org/doc/debian-policy/
+   ch-sharedlibs.html#s-sharedlibs-runtime
+.. _An idea for a shared libraries policy:
+   http://lists.opencsw.org/pipermail/maintainers/2010-September/
+   012752.html
+.. _IsLibraryLinkable implementation:
+   http://sourceforge.net/apps/trac/gar/browser/csw/mgar/gar/v2/
+   lib/python/sharedlib_utils.py#L24
+.. _IsLibraryLinkable unit tests:
+   http://sourceforge.net/apps/trac/gar/browser/csw/mgar/gar/v2/
+   lib/python/sharedlib_utils_test.py#L13
+.. _examples of mappings between SONAMEs, pkgnames and catalognames:
+   http://sourceforge.net/apps/trac/gar/browser/csw/mgar/gar/v2/
+   lib/python/sharedlib_utils_test.py#L68

Modified: csw/mgar/pkg/opencsw-policy/trunk/files/index.rst
===================================================================
--- csw/mgar/pkg/opencsw-policy/trunk/files/index.rst	2012-01-19 11:35:18 UTC (rev 16812)
+++ csw/mgar/pkg/opencsw-policy/trunk/files/index.rst	2012-01-19 12:22:05 UTC (rev 16813)
@@ -3,18 +3,18 @@
    You can adapt this file completely to your liking, but it should at least
    contain the root `toctree` directive.
 
-===================================
-Welcome to OpenCSW's documentation!
-===================================
+==============================
+Welcome to the OpenCSW manual!
+==============================
 
 Contents:
 
 .. toctree::
-   :maxdepth: 2
+   :maxdepth: 1
 
-   o2a-index
-   o2d-index
-   o2m-index
+   for-administrators/index
+   for-developers/index
+   for-maintainers/index
 
 .. Indices and tables
    ==================

Deleted: csw/mgar/pkg/opencsw-policy/trunk/files/o2a-index.rst
===================================================================
--- csw/mgar/pkg/opencsw-policy/trunk/files/o2a-index.rst	2012-01-19 11:35:18 UTC (rev 16812)
+++ csw/mgar/pkg/opencsw-policy/trunk/files/o2a-index.rst	2012-01-19 12:22:05 UTC (rev 16813)
@@ -1,22 +0,0 @@
-==========================
-OpenCSW for Administrators
-==========================
-
-A usage manual for people who manage Solaris systems with OpenCSW packages.
-
-.. contents::
-
-Bootstrapping
--------------
-
-On a Solaris 10 system, you can use the capacity of pkgadd to download
-packages via http::
-
-  pkgadd -d http://get.opencsw.org/now
-
-On Solaris 8 and 9 (best effort support only), you need to download the
-package using e.g. wget and install it with::
-
-  wget http://mirror.opencsw.org/opencsw/pkgutil.pkg
-  pkgadd -d pkgutil.pkg
-

Deleted: csw/mgar/pkg/opencsw-policy/trunk/files/o2d-index.rst
===================================================================
--- csw/mgar/pkg/opencsw-policy/trunk/files/o2d-index.rst	2012-01-19 11:35:18 UTC (rev 16812)
+++ csw/mgar/pkg/opencsw-policy/trunk/files/o2d-index.rst	2012-01-19 12:22:05 UTC (rev 16813)
@@ -1,8 +0,0 @@
-======================
-OpenCSW for Developers
-======================
-
-.. contents::
-
-This is a manual for developers who want to build own software, using
-tools and libraries provided by OpenCSW.

Deleted: csw/mgar/pkg/opencsw-policy/trunk/files/o2m-index.rst
===================================================================
--- csw/mgar/pkg/opencsw-policy/trunk/files/o2m-index.rst	2012-01-19 11:35:18 UTC (rev 16812)
+++ csw/mgar/pkg/opencsw-policy/trunk/files/o2m-index.rst	2012-01-19 12:22:05 UTC (rev 16813)
@@ -1,12 +0,0 @@
-===============================
-OpenCSW for Package Maintainers
-===============================
-
-This is a manual for people who want to build Solaris packages and Solaris
-package repositories, either at OpenCSW or at their own organization.
-
-.. toctree::
-  :maxdepth: 2
-
-  filesystem-layout
-  shared-libraries

Deleted: csw/mgar/pkg/opencsw-policy/trunk/files/shared-libraries.rst
===================================================================
--- csw/mgar/pkg/opencsw-policy/trunk/files/shared-libraries.rst	2012-01-19 11:35:18 UTC (rev 16812)
+++ csw/mgar/pkg/opencsw-policy/trunk/files/shared-libraries.rst	2012-01-19 12:22:05 UTC (rev 16813)
@@ -1,301 +0,0 @@
-----------------
-Shared libraries
-----------------
-
-Background
-----------
-
-Some packages are providing shared libraries.  When binaries start
-linking to them, the updates to packages with shared libraries must be
-done in a way that doesn't break existing binaries.
-
-Life cycle of a shared library can be summarized in the following way:
-
-1. A SONAME appears
-2. We decide to distribute it
-3. Binaries start linking to it
-4. Time passes, new version of the same library comes along
-5. Binaries stop linking to it
-6. SONAME goes away
-
-Historically, shared libraries were packaged either together with base
-packages, or split off to their own packages.  However, once updated
-shared libraries became available upstream, updated packages included
-both old and new versions of shared libraries.  This required package
-builds to download and compile multiple versions of the same project.
-Notable examples are curl and neon libraries, where CSWcurlrt contained
-all three libcurl.so.2, libcurl.so.3 and libcurl.so.4.
-
-Phasing out of shared libraries was difficult.  To phase out a shared
-library, it is required to verify that no binaries link to it.  All
-dependent packages need to be recompiled against the newest version of
-the library, and once this is done, old versions can be removed.
-However, even when all dependent packages are already recompiled against
-libcurl.so.4, there are no useful indicators that libcurl.so.2 is no
-longer linked to.  To verify this, all dependent packages have to be
-unpacked, and examined using /usr/ccs/bin/dump that they no longer list
-libcurl.so.2 in their NEEDED field.
-
-Once the detection problem is solved, removing the old version of
-a library is not as simple as it could be; The whole CSWcurlrt has to be
-rebuilt and re-released in a new version which no longer includes
-libcurl.so.2.
-
-Goals
------
-
-* Simplification of handling of shared library life cycles
-* Allowing to determine whether a specific shared library is no longer
-  linked to, by looking at package dependencies (This avoids potential
-  problem of our keeping "legacy binary libs" in a more modern package
-  for longer than is neccessary. It also avoids having to keep coping
-  the binary into future packages)
-
-Non-goals
----------
-
-* Providing a reliable mechanism to determine whether a given pkgname
-  contains a shared library
-* Keeping package names short and pretty as a priority
-
-Overview
---------
-
-As a general rule, each soname shall be packaged in a separate package.
-This way, it's easy to track dependencies on specific sonames, detect
-and phase out sonames that are no longer in use.  It also avoids the
-need to rebuild all the versions of software in question if one of the
-versions needs an update.
-
-This idea is based on the Debian shared libraries packaging policy
-[#debian-policy]_ and has been discussed [#discussion]_ on the mailing
-list.
-
-Advantages:
-
-* easy and complete lifecycle of shared libraries
-
-* phasing out of shared libraries can become part of standard catalog
-  update procedures
-* simpler packages, simpler builds (no need for version modulations and
-  complex merges, good for new maintainers)
-* isolation of old non-fixable files with issues (if there's an old
-  library mentioning /export/medusa, you don't have to worry about it
-  being stopped during release after you push it once)
-* no re-pushing of old files
-* more packages overall (good for stats!)
-* number of packages released per software upgrade remains the same.  If
-  there were, say, 4 packages to release with each Python update, the
-  number remains: 4 per release.  There will be one new CSWlibpython*
-  package, and the old CSWlibpython library won't be upgraded.
-
-
-Disadvantages:
-
-* maintainers need to make more decisions when packaging
-* there's some amount of work to be done to do the transition, such as
-  creation of new packages and dependencies
-* some package names become long and complex (however, they are only
-  dependencies; users don't need to type these in)
-
-Implementation details
-----------------------
-
-Package naming
-~~~~~~~~~~~~~~
-
-Names of packages shall be derived from sonames, and from sonames only.
-They shall not depend on project name, or project version.  If a project
-is named foo, and contains libbar.so.0, the package name shall be based
-on libbar, not foo.
-
-A table listing examples of sonames and corresponding package
-names. [#soname-pkgname-unit-test]_
-
-========================= ======================= =========================
-soname                    pkgname                 catalogname
-========================= ======================= =========================
-libfoo.so.0               CSWlibfoo0              libfoo0
-libfoo-0.so               CSWlibfoo0              libfoo0
-libfoo.so.0.1             CSWlibfoo0-1            libfoo0_1
-libapr-1.so.0             CSWlibapr1-0            libapr1_0
-libbabl-0.1.so.0          CSWlibbabl0-1-0         libbabl0_1_0
-libgettextlib-0.14.1.so   CSWlibgettextlib0-14-1  libgettextlib0_14_1
-libapr-1.so.10            CSWlibapr-1-10          libapr_1_10
-libstdc++.so.6            CSWlibstdc++6           libstdc++6
-libdnet.1                 CSWlibdnet1             libdnet1
-libUpperCase.so.1         CSWlibuppercase1        libuppercase1
-libpyglib-2.0-python.so.0 CSWlibpyglib2-0python0  libpyglib2_0python0
-libpython3.1.so.1.0       CSWlibpython3-1-1-0     libpython3_1_1_0
-libapr-1.so.10.0.0        CSWlibapr1-10-0-0       libapr1_10_0_0
-========================= ======================= =========================
-
-Separators
-^^^^^^^^^^
-
-Separators are added between two adjacent numbers, and removed if a number and a letter are next to each other.  For example, ``libfoo.so.0`` becomes ``CSWlibfoo0``, and ``libfoo-1.so.0`` becomes ``CSWlibfoo1-0``.
-
-Linkable shared objects
-~~~~~~~~~~~~~~~~~~~~~~~
-
-The policy or recommendation shall refer to libraries which are //linkable,// meaning other binaries can link against them.  Shared objects in private directories, such as /opt/csw/lib/someproject/foo.so (think Python modules) are not shared libraries which other projects can link to, and therefore there is no benefit in placing them in separate packages.
-
-Special cases
-^^^^^^^^^^^^^
-
-Some packages (e.g. Kerberos libraries) put private shared libraries into /opt/csw/lib.  They don't expose any public API, and only own Kerberos binaries link to them.  Private shared libraries can be bundled with the main package, without splitting them off.
-
-Examples
-^^^^^^^^
-
-============================================================================== ============
-file                                                                           linkable?
-============================================================================== ============
-/opt/csw/lib/libfoo.so.0.2                                                     Yes
-/opt/csw/lib/sparcv9/libfoo.so.0.2                                             Yes
-/opt/csw/lib/sparcv8plus+vis/libfoo.so.0.2                                     Yes
-/opt/csw/lib/amd64/libfoo.so.0.2                                               Yes
-/opt/csw/libexec/bar                                                           No
-/opt/csw/share/bar                                                             No
-/opt/csw/lib/gnucash/libgncmod-stylesheets.so.0.0.0                            No
-/opt/csw/lib/erlang/lib/megaco-3.6.0.1/priv/lib/megaco_flex_scanner_drv_mt.so  No
-/opt/csw/share/Adobe/Reader8/Reader/sparcsolaris/lib/libcrypto.so.0.9.6        No
-/opt/csw/customprefix/lib/libfoo.so.0.2                                        Yes
-/opt/csw/boost-gcc/lib/libboost_wserialization.so.1.44.0                       Yes
-============================================================================== ============
-
-Example implementation and its unit tests can be found in checkpkg
-sources [#is-library-linkable-implementation]_ and corresponding unit
-tests. [#is-library-linkable-unit-tests]_
-
-Private shared libraries
-^^^^^^^^^^^^^^^^^^^^^^^^
-
-Some software projects install private (non-linkable) shared libraries
-into libdir (e.g. ``/opt/csw/lib``) by default.  To ensure that they are
-private, they need to be moved to a subdirectory, e.g.
-``/opt/csw/lib/<project>``.
-
-To create a private library and install 32 and 64-bit libraries, they
-need to be laid out as follows:
-
-On sparc::
-
-  /opt/csw/lib/foo
-  /opt/csw/lib/foo/32 --> .
-  /opt/csw/lib/foo/64 --> sparcv9
-
-On i386::
-
-  /opt/csw/lib/foo
-  /opt/csw/lib/foo/32 --> .
-  /opt/csw/lib/foo/64 --> amd64
-
-In GAR, it can be simplified by symlinking:
-
-* 32 to ``$(ISA_DEFAULT)``
-* 64 to ``$(ISA_DEFAULT64)``
-
-The runpath needs to be set to ``/opt/csw/lib/foo/64``, e.g. ``-R/opt/csw/lib/foo/64``.
-
-Grouping shared libraries
--------------------------
-
-There can be cases in which a set of shared libraries is likely to be
-upgraded together. Considering the following set of libraries:
-
-* libfoo.so.0
-* libfoo_bar.so.0
-* libfoo_baz.so.0
-
-It's possible that all the following libraries will be updated together.
-In such a case, all these shared objects can be put in a single package.
-The decision shall be made by the maintainer.
-
-If versions of shared libraries don't match, chances are that their API
-will not be changing together, and it's a good idea not to package them
-together.  For example, the following three libraries are best kept in
-separate packages.
-
-* libfoo.so.0
-* libfoo_bar.so.1
-* libfoo_baz.so.0
-
-When making the decision, the question a maintainer should ask, should
-be: "Are all these shared libraries going to be retired together?" If
-the answer is positive, shared libraries shall be in a single package.
-However, in the face of uncertainty (it's hard to predict the future),
-placing each file in a separate package is always a safe choice.
-
-Transitioning of the existing packages
---------------------------------------
-
-Consists of moving the shared library to own package, and making the
-original package an empty, transitional one.  The phasing out of
-transitional packages follows the same rules as any other packages: when
-nothing depends on them, they can be removed.
-
-A simple example:
-
-* Before
-
-  - CSWlibfoo (libfoo.so.1)
-
-* After
-
-  - CSWlibfoo (empty) ? CSWlibfoo1 (libfoo.so.1)
-
-For an existing more complex package, with already existing two versions
-of a library:
-
-* Before
-
-  - CSWlibfoo (libfoo.so.1, libfoo.so.2)
-
-* After
-
-  - CSWlibfoo (empty) ? CSWlibfoo1 (libfoo.so.1)
-  - CSWlibfoo (empty) ? CSWlibfoo2 (libfoo.so.2)
-
-Potential problems
-==================
-
-Potential collisions in package naming would include libfoo.so.1 and
-libfoo-1.so both resolving to CSWlibfoo1.  If this case ever occurs, the
-naming conflict needs to be resolved manually.  However, to this time,
-such a case has been never observed.
-
-Certain sonames are long enough that the corresponding package names are
-over 29 characters long.  However, it affects a small percent of
-libraries, roughly about 98% SONAMEs generate package names within
-limits.
-
-Footnotes
-=========
-
-.. [#discussion] `An idea for a shared libraries policy`_ -
-   mailing list discussion
-.. [#debian-policy]
-   `Debian shared libraries packaging policy`_
-.. [#is-library-linkable-implementation]
-   `IsLibraryLinkable implementation`_
-.. [#is-library-linkable-unit-tests]
-   `IsLibraryLinkable unit tests`_
-.. [#soname-pkgname-unit-test]
-   checkpkg unit tests with
-   `examples of mappings between SONAMEs, pkgnames and catalognames`_
-.. _Debian shared libraries packaging policy:
-   http://www.debian.org/doc/debian-policy/
-   ch-sharedlibs.html#s-sharedlibs-runtime
-.. _An idea for a shared libraries policy:
-   http://lists.opencsw.org/pipermail/maintainers/2010-September/
-   012752.html
-.. _IsLibraryLinkable implementation:
-   http://sourceforge.net/apps/trac/gar/browser/csw/mgar/gar/v2/
-   lib/python/sharedlib_utils.py#L24
-.. _IsLibraryLinkable unit tests:
-   http://sourceforge.net/apps/trac/gar/browser/csw/mgar/gar/v2/
-   lib/python/sharedlib_utils_test.py#L13
-.. _examples of mappings between SONAMEs, pkgnames and catalognames:
-   http://sourceforge.net/apps/trac/gar/browser/csw/mgar/gar/v2/
-   lib/python/sharedlib_utils_test.py#L68

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


From wahwah at users.sourceforge.net  Thu Jan 19 13:59:02 2012
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Thu, 19 Jan 2012 12:59:02 +0000
Subject: [csw-devel] SF.net SVN: gar:[16814]
	csw/mgar/pkg/opencsw-policy/trunk/files
Message-ID: <E1Rnra2-0003qH-8T@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 16814
          http://gar.svn.sourceforge.net/gar/?rev=16814&view=rev
Author:   wahwah
Date:     2012-01-19 12:59:01 +0000 (Thu, 19 Jan 2012)
Log Message:
-----------
opencsw-policy/trunk: add some empty sections and a reference to the scrapbook

Modified Paths:
--------------
    csw/mgar/pkg/opencsw-policy/trunk/files/for-administrators/index.rst
    csw/mgar/pkg/opencsw-policy/trunk/files/for-developers/index.rst
    csw/mgar/pkg/opencsw-policy/trunk/files/for-maintainers/filesystem-layout.rst

Added Paths:
-----------
    csw/mgar/pkg/opencsw-policy/trunk/files/for-administrators/bootstrapping.rst
    csw/mgar/pkg/opencsw-policy/trunk/files/for-administrators/configuring-services.rst

Added: csw/mgar/pkg/opencsw-policy/trunk/files/for-administrators/bootstrapping.rst
===================================================================
--- csw/mgar/pkg/opencsw-policy/trunk/files/for-administrators/bootstrapping.rst	                        (rev 0)
+++ csw/mgar/pkg/opencsw-policy/trunk/files/for-administrators/bootstrapping.rst	2012-01-19 12:59:01 UTC (rev 16814)
@@ -0,0 +1,15 @@
+-------------
+Bootstrapping
+-------------
+
+On a Solaris 10 system, you can use the capacity of pkgadd to download
+packages via http::
+
+  pkgadd -d http://get.opencsw.org/now
+
+On Solaris 8 and 9 (best effort support only), you need to download the
+package using e.g. wget and install it with::
+
+  wget http://mirror.opencsw.org/opencsw/pkgutil.pkg
+  pkgadd -d pkgutil.pkg
+

Added: csw/mgar/pkg/opencsw-policy/trunk/files/for-administrators/configuring-services.rst
===================================================================
--- csw/mgar/pkg/opencsw-policy/trunk/files/for-administrators/configuring-services.rst	                        (rev 0)
+++ csw/mgar/pkg/opencsw-policy/trunk/files/for-administrators/configuring-services.rst	2012-01-19 12:59:01 UTC (rev 16814)
@@ -0,0 +1,23 @@
+====================
+Configuring services
+====================
+
+/etc/opt/csw vs. /opt/csw/etc
+=============================
+
+...
+
+preserveconf
+============
+
+...
+
+RC/SMF
+======
+
+...
+
+csw.conf
+========
+
+...

Modified: csw/mgar/pkg/opencsw-policy/trunk/files/for-administrators/index.rst
===================================================================
--- csw/mgar/pkg/opencsw-policy/trunk/files/for-administrators/index.rst	2012-01-19 12:22:05 UTC (rev 16813)
+++ csw/mgar/pkg/opencsw-policy/trunk/files/for-administrators/index.rst	2012-01-19 12:59:01 UTC (rev 16814)
@@ -2,21 +2,15 @@
 OpenCSW for Administrators
 ==========================
 
-A usage manual for people who manage Solaris systems with OpenCSW packages.
+A user's manual for people who manage Solaris systems with OpenCSW packages.
 
-.. contents::
+.. toctree::
+  :maxdepth: 2
 
-Bootstrapping
--------------
+  bootstrapping
+  configuring-services
 
-On a Solaris 10 system, you can use the capacity of pkgadd to download
-packages via http::
-
-  pkgadd -d http://get.opencsw.org/now
-
-On Solaris 8 and 9 (best effort support only), you need to download the
-package using e.g. wget and install it with::
-
-  wget http://mirror.opencsw.org/opencsw/pkgutil.pkg
-  pkgadd -d pkgutil.pkg
-
+.. [#dagosscrapebook]
+   `Dago's Scrapebook`_
+.. _Dago's Scrapebook:
+   http://sourceforge.net/apps/trac/gar/wiki/DagosScrapbook

Modified: csw/mgar/pkg/opencsw-policy/trunk/files/for-developers/index.rst
===================================================================
--- csw/mgar/pkg/opencsw-policy/trunk/files/for-developers/index.rst	2012-01-19 12:22:05 UTC (rev 16813)
+++ csw/mgar/pkg/opencsw-policy/trunk/files/for-developers/index.rst	2012-01-19 12:59:01 UTC (rev 16814)
@@ -1,8 +1,24 @@
-======================
+----------------------
 OpenCSW for Developers
-======================
+----------------------
 
-.. contents::
-
 This is a manual for developers who want to build own software, using
 tools and libraries provided by OpenCSW.
+
+Linking against OpenCSW libraries
+=================================
+
+To build own software against libraries distributed by OpenCSW, install the
+relevant ``*_dev`` packages. They contain the header files, and ``*.so``
+symlinks necessary during linking.
+
+When building againt OpenCSW software, these flags will typically make it
+work::
+
+  CPPFLAGS="-I/opt/csw/include"
+  LDFLAGS="-L/opt/csw/lib -R/opt/csw/lib"
+
+If you're building a 64-bit binary, use these::
+
+  CPPFLAGS="-I/opt/csw/include"
+  LDFLAGS="-L/opt/csw/lib/64 -R/opt/csw/lib/64"

Modified: csw/mgar/pkg/opencsw-policy/trunk/files/for-maintainers/filesystem-layout.rst
===================================================================
--- csw/mgar/pkg/opencsw-policy/trunk/files/for-maintainers/filesystem-layout.rst	2012-01-19 12:22:05 UTC (rev 16813)
+++ csw/mgar/pkg/opencsw-policy/trunk/files/for-maintainers/filesystem-layout.rst	2012-01-19 12:59:01 UTC (rev 16814)
@@ -15,3 +15,8 @@
 * /opt/csw (base of the hierarchy)
 * /etc/opt/csw (configuration files)
 * /var/opt/csw (data files)
+
+The /opt/csw directory and everything below is considered read-only. It's
+a common practice to set up non-global sparse zones with shared /opt/csw. In
+this setup, non-global zones see /opt/csw as mounted read-only. Any local
+state needs to be kept under /var/opt/csw.

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


From wahwah at users.sourceforge.net  Thu Jan 19 14:01:39 2012
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Thu, 19 Jan 2012 13:01:39 +0000
Subject: [csw-devel] SF.net SVN: gar:[16815] csw/mgar/pkg
Message-ID: <E1RnrcZ-0000JN-JZ@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 16815
          http://gar.svn.sourceforge.net/gar/?rev=16815&view=rev
Author:   wahwah
Date:     2012-01-19 13:01:39 +0000 (Thu, 19 Jan 2012)
Log Message:
-----------
Renaming opencsw-policy to opencsw-manual

Added Paths:
-----------
    csw/mgar/pkg/opencsw-manual/

Removed Paths:
-------------
    csw/mgar/pkg/opencsw-policy/

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


From cgrzemba at users.sourceforge.net  Thu Jan 19 14:12:44 2012
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Thu, 19 Jan 2012 13:12:44 +0000
Subject: [csw-devel] SF.net SVN: gar:[16816] csw/mgar/pkg/nss/trunk/Makefile
Message-ID: <E1RnrnI-00046v-VY@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 16816
          http://gar.svn.sourceforge.net/gar/?rev=16816&view=rev
Author:   cgrzemba
Date:     2012-01-19 13:12:44 +0000 (Thu, 19 Jan 2012)
Log Message:
-----------
nss/trunk: knows checkpkg what it wants?

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

Modified: csw/mgar/pkg/nss/trunk/Makefile
===================================================================
--- csw/mgar/pkg/nss/trunk/Makefile	2012-01-19 13:01:39 UTC (rev 16815)
+++ csw/mgar/pkg/nss/trunk/Makefile	2012-01-19 13:12:44 UTC (rev 16816)
@@ -250,6 +250,7 @@
 LD_OPTIONS = 
 # NSS_LD_OPTIONS = -R'$$ORIGIN'
 
+# CHECKPKG_OVERRIDES_CSWlibfreebl3 += shared-lib-pkgname-mismatch|sonames=libfreebl_32fpu_3.so,libfreebl_32int64_3.so,libfreebl_32int_3.so,libfreebl_64fpu_3.so,libfreebl_64int_3.so|pkgname=CSWlibfreebl3|expected=CSWlibfreebl|
 CHECKPKG_OVERRIDES_CSWlibfreebl3 += soname-equals-filename|file=/opt/csw/lib/sparcv9/libfreebl_64fpu_3.so
 CHECKPKG_OVERRIDES_CSWlibfreebl3 += soname-equals-filename|file=/opt/csw/lib/sparcv9/libfreebl_64int_3.so
 CHECKPKG_OVERRIDES_CSWlibfreebl3 += soname-equals-filename|file=/opt/csw/lib/libfreebl_32int_3.so

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


From wahwah at users.sourceforge.net  Thu Jan 19 14:23:39 2012
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Thu, 19 Jan 2012 13:23:39 +0000
Subject: [csw-devel] SF.net SVN: gar:[16817]
 csw/mgar/pkg/opencsw-manual/trunk/files/ for-administrators/index.rst
Message-ID: <E1Rnrxr-0004JF-GH@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 16817
          http://gar.svn.sourceforge.net/gar/?rev=16817&view=rev
Author:   wahwah
Date:     2012-01-19 13:23:39 +0000 (Thu, 19 Jan 2012)
Log Message:
-----------
opencsw-manual/trunk: fix a typo

Modified Paths:
--------------
    csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/index.rst

Modified: csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/index.rst
===================================================================
--- csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/index.rst	2012-01-19 13:12:44 UTC (rev 16816)
+++ csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/index.rst	2012-01-19 13:23:39 UTC (rev 16817)
@@ -10,7 +10,7 @@
   bootstrapping
   configuring-services
 
-.. [#dagosscrapebook]
-   `Dago's Scrapebook`_
-.. _Dago's Scrapebook:
+.. [#dagosscrapbook]
+   `Dago's Scrapbook`_
+.. _Dago's Scrapbook:
    http://sourceforge.net/apps/trac/gar/wiki/DagosScrapbook

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


From maciej at opencsw.org  Thu Jan 19 14:30:45 2012
From: maciej at opencsw.org (=?UTF-8?Q?Maciej_=28Matchek=29_Blizi=C5=84ski?=)
Date: Thu, 19 Jan 2012 13:30:45 +0000
Subject: [csw-devel] SF.net SVN: gar:[16816]
	csw/mgar/pkg/nss/trunk/Makefile
In-Reply-To: <E1RnrnI-00046v-VY@sfp-svn-4.v30.ch3.sourceforge.com>
References: <E1RnrnI-00046v-VY@sfp-svn-4.v30.ch3.sourceforge.com>
Message-ID: <CALtRa-6HkFhNaQG9MADv_N_Amyb8EuTfs8k+QRN_SUbAKS91Qg@mail.gmail.com>

2012/1/19  <cgrzemba at users.sourceforge.net>:
> Revision: 16816
> ? ? ? ? ?http://gar.svn.sourceforge.net/gar/?rev=16816&view=rev
> Author: ? cgrzemba
> Date: ? ? 2012-01-19 13:12:44 +0000 (Thu, 19 Jan 2012)
> Log Message:
> -----------
> nss/trunk: knows checkpkg what it wants?
>
> Modified Paths:
> --------------
> ? ?csw/mgar/pkg/nss/trunk/Makefile
>
> Modified: csw/mgar/pkg/nss/trunk/Makefile
> ===================================================================
> --- csw/mgar/pkg/nss/trunk/Makefile ? ? 2012-01-19 13:01:39 UTC (rev 16815)
> +++ csw/mgar/pkg/nss/trunk/Makefile ? ? 2012-01-19 13:12:44 UTC (rev 16816)
> @@ -250,6 +250,7 @@
> ?LD_OPTIONS =
> ?# NSS_LD_OPTIONS = -R'$$ORIGIN'
>
> +# CHECKPKG_OVERRIDES_CSWlibfreebl3 += shared-lib-pkgname-mismatch|sonames=libfreebl_32fpu_3.so,libfreebl_32int64_3.so,libfreebl_32int_3.so,libfreebl_64fpu_3.so,libfreebl_64int_3.so|pkgname=CSWlibfreebl3|expected=CSWlibfreebl|

Make sure to run "gmake remerge" after you modify overrides. Otherwise
override changes will not be taken into account.

Maciej

From cgrzemba at users.sourceforge.net  Thu Jan 19 15:12:56 2012
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Thu, 19 Jan 2012 14:12:56 +0000
Subject: [csw-devel] SF.net SVN: gar:[16818] csw/mgar/pkg/nss/trunk/Makefile
Message-ID: <E1RnsjY-00032L-5A@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 16818
          http://gar.svn.sourceforge.net/gar/?rev=16818&view=rev
Author:   cgrzemba
Date:     2012-01-19 14:12:55 +0000 (Thu, 19 Jan 2012)
Log Message:
-----------
nss/trunk: add checkpkg hints

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

Modified: csw/mgar/pkg/nss/trunk/Makefile
===================================================================
--- csw/mgar/pkg/nss/trunk/Makefile	2012-01-19 13:23:39 UTC (rev 16817)
+++ csw/mgar/pkg/nss/trunk/Makefile	2012-01-19 14:12:55 UTC (rev 16818)
@@ -119,22 +119,15 @@
 PACKAGES += CSWlibfreebl3
 CATALOGNAME_CSWlibfreebl3 = libfreebl3
 SPKG_DESC_CSWlibfreebl3 += $(DESCRIPTION), libfreebl libs
-PKGFILES_CSWlibfreebl3 += $(call baseisadirs,$(libdir),libfreebl_64fpu_3\.so)
-PKGFILES_CSWlibfreebl3 += $(call baseisadirs,$(libdir),libfreebl_64fpu_3\.so(\.\d+)*)
-PKGFILES_CSWlibfreebl3 += $(call baseisadirs,$(libdir),libfreebl_64int_3\.so)
-PKGFILES_CSWlibfreebl3 += $(call baseisadirs,$(libdir),libfreebl_64int_3\.so(\.\d+)*)
-PKGFILES_CSWlibfreebl3 += $(call baseisadirs,$(libdir),libfreebl_32fpu_3\.so)
-PKGFILES_CSWlibfreebl3 += $(call baseisadirs,$(libdir),libfreebl_32fpu_3\.so(\.\d+)*)
-PKGFILES_CSWlibfreebl3 += $(call baseisadirs,$(libdir),libfreebl_32int64_3\.so)
-PKGFILES_CSWlibfreebl3 += $(call baseisadirs,$(libdir),libfreebl_32int64_3\.so(\.\d+)*)
-PKGFILES_CSWlibfreebl3 += $(call baseisadirs,$(libdir),libfreebl_32int_3\.so)
-PKGFILES_CSWlibfreebl3 += $(call baseisadirs,$(libdir),libfreebl_32int_3\.so(\.\d+)*)
+PKGFILES_CSWlibfreebl3 += $(call baseisadirs,$(libdir),libfreebl.*3\.so)
+PKGFILES_CSWlibfreebl3 += $(call baseisadirs,$(libdir),libfreebl.*3\.so(\.\d+)*)
 RUNTIME_DEP_PKGS_CSWlibfreebl3 += CSWlibnssutil3
 RUNTIME_DEP_PKGS_CSWlibfreebl3 += CSWlibnspr4
 
 PACKAGES += CSWlibnss-dev
 CATALOGNAME_CSWlibnss-dev = libnss_dev
 SPKG_DESC_CSWlibnss-dev = Network Security Services library, development files
+ARCHALL_CSWlibnss-dev = 1
 PKGFILES_CSWlibnss-dev = $(call baseisadirs,$(includedir),*\.h*)
 RUNTIME_DEP_PKGS_CSWlibnss-dev += CSWlibnss3
 RUNTIME_DEP_PKGS_CSWlibnss-dev += CSWlibssl3
@@ -256,20 +249,30 @@
 CHECKPKG_OVERRIDES_CSWlibfreebl3 += soname-equals-filename|file=/opt/csw/lib/libfreebl_32int_3.so
 CHECKPKG_OVERRIDES_CSWlibfreebl3 += soname-equals-filename|file=/opt/csw/lib/libfreebl_32int64_3.so
 CHECKPKG_OVERRIDES_CSWlibfreebl3 += soname-equals-filename|file=/opt/csw/lib/libfreebl_32fpu_3.so
+CHECKPKG_OVERRIDES_CSWlibfreebl3 += soname-equals-filename|file=/opt/csw/lib/sparcv9/libfreebl3.so
+CHECKPKG_OVERRIDES_CSWlibfreebl3 += soname-equals-filename|file=/opt/csw/lib/amd64/libfreebl3.so
+CHECKPKG_OVERRIDES_CSWlibfreebl3 += soname-equals-filename|file=/opt/csw/lib/libfreebl3.so
 CHECKPKG_OVERRIDES_CSWlibnss3 += soname-equals-filename|file=/opt/csw/lib/libnss3.so
 CHECKPKG_OVERRIDES_CSWlibnss3 += soname-equals-filename|file=/opt/csw/lib/sparcv9/libnss3.so
+CHECKPKG_OVERRIDES_CSWlibnss3 += soname-equals-filename|file=/opt/csw/lib/amd64/libnss3.so
 CHECKPKG_OVERRIDES_CSWlibnssutil3 += soname-equals-filename|file=/opt/csw/lib/libnssutil3.so
 CHECKPKG_OVERRIDES_CSWlibnssutil3 += soname-equals-filename|file=/opt/csw/lib/sparcv9/libnssutil3.so
+CHECKPKG_OVERRIDES_CSWlibnssutil3 += soname-equals-filename|file=/opt/csw/lib/amd64/libnssutil3.so
 CHECKPKG_OVERRIDES_CSWlibsoftokn3 += soname-equals-filename|file=/opt/csw/lib/libsoftokn3.so
 CHECKPKG_OVERRIDES_CSWlibsoftokn3 += soname-equals-filename|file=/opt/csw/lib/sparcv9/libsoftokn3.so
+CHECKPKG_OVERRIDES_CSWlibsoftokn3 += soname-equals-filename|file=/opt/csw/lib/amd64/libsoftokn3.so
 CHECKPKG_OVERRIDES_CSWlibssl3 += soname-equals-filename|file=/opt/csw/lib/libssl3.so
 CHECKPKG_OVERRIDES_CSWlibssl3 += soname-equals-filename|file=/opt/csw/lib/sparcv9/libssl3.so
+CHECKPKG_OVERRIDES_CSWlibssl3 += soname-equals-filename|file=/opt/csw/lib/amd64/libssl3.so
 CHECKPKG_OVERRIDES_CSWlibsmime3 += soname-equals-filename|file=/opt/csw/lib/libsmime3.so
 CHECKPKG_OVERRIDES_CSWlibsmime3 += soname-equals-filename|file=/opt/csw/lib/sparcv9/libsmime3.so
+CHECKPKG_OVERRIDES_CSWlibsmime3 += soname-equals-filename|file=/opt/csw/lib/amd64/libsmime3.so
 CHECKPKG_OVERRIDES_CSWlibnssckbi += soname-equals-filename|file=/opt/csw/lib/libnssckbi.so
 CHECKPKG_OVERRIDES_CSWlibnssckbi += soname-equals-filename|file=/opt/csw/lib/sparcv9/libnssckbi.so
+CHECKPKG_OVERRIDES_CSWlibnssckbi += soname-equals-filename|file=/opt/csw/lib/amd64/libnssckbi.so
 CHECKPKG_OVERRIDES_CSWlibnssdbm3 += soname-equals-filename|file=/opt/csw/lib/libnssdbm3.so
 CHECKPKG_OVERRIDES_CSWlibnssdbm3 += soname-equals-filename|file=/opt/csw/lib/sparcv9/libnssdbm3.so
+CHECKPKG_OVERRIDES_CSWlibnssdbm3 += soname-equals-filename|file=/opt/csw/lib/amd64/libnssdbm3.so
 
 include gar/category.mk
 

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


From cgrzemba at users.sourceforge.net  Thu Jan 19 15:19:31 2012
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Thu, 19 Jan 2012 14:19:31 +0000
Subject: [csw-devel] SF.net SVN: gar:[16819] csw/mgar/pkg/nss/trunk/Makefile
Message-ID: <E1Rnspv-0003A1-4Y@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 16819
          http://gar.svn.sourceforge.net/gar/?rev=16819&view=rev
Author:   cgrzemba
Date:     2012-01-19 14:19:30 +0000 (Thu, 19 Jan 2012)
Log Message:
-----------
nss/trunk: add checkpkg hints

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

Modified: csw/mgar/pkg/nss/trunk/Makefile
===================================================================
--- csw/mgar/pkg/nss/trunk/Makefile	2012-01-19 14:12:55 UTC (rev 16818)
+++ csw/mgar/pkg/nss/trunk/Makefile	2012-01-19 14:19:30 UTC (rev 16819)
@@ -244,6 +244,7 @@
 # NSS_LD_OPTIONS = -R'$$ORIGIN'
 
 # CHECKPKG_OVERRIDES_CSWlibfreebl3 += shared-lib-pkgname-mismatch|sonames=libfreebl_32fpu_3.so,libfreebl_32int64_3.so,libfreebl_32int_3.so,libfreebl_64fpu_3.so,libfreebl_64int_3.so|pkgname=CSWlibfreebl3|expected=CSWlibfreebl|
+CHECKPKG_OVERRIDES_CSWlibnss-dev += archall-devel-package
 CHECKPKG_OVERRIDES_CSWlibfreebl3 += soname-equals-filename|file=/opt/csw/lib/sparcv9/libfreebl_64fpu_3.so
 CHECKPKG_OVERRIDES_CSWlibfreebl3 += soname-equals-filename|file=/opt/csw/lib/sparcv9/libfreebl_64int_3.so
 CHECKPKG_OVERRIDES_CSWlibfreebl3 += soname-equals-filename|file=/opt/csw/lib/libfreebl_32int_3.so

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


From dmichelsen at users.sourceforge.net  Thu Jan 19 15:37:20 2012
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu, 19 Jan 2012 14:37:20 +0000
Subject: [csw-devel] SF.net SVN: gar:[16820]
	csw/mgar/pkg/libdbi/trunk/Makefile
Message-ID: <E1Rnt7A-0003So-9g@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 16820
          http://gar.svn.sourceforge.net/gar/?rev=16820&view=rev
Author:   dmichelsen
Date:     2012-01-19 14:37:20 +0000 (Thu, 19 Jan 2012)
Log Message:
-----------
libdbi/trunk: General cleanup, use reinplace

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

Modified: csw/mgar/pkg/libdbi/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libdbi/trunk/Makefile	2012-01-19 14:19:30 UTC (rev 16819)
+++ csw/mgar/pkg/libdbi/trunk/Makefile	2012-01-19 14:37:20 UTC (rev 16820)
@@ -13,20 +13,21 @@
 MASTER_SITES = $(SF_MIRROR)
 DISTFILES  = $(DISTNAME).tar.gz
 
-# File name regex to get notifications about upstream software releases
-UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
+VENDOR_URL = http://libdbi.sourceforge.net/
 
 PACKAGES += CSWlibdbi1
-CATALOGNAME_CSWlibdbi1 = libdbi1
 SPKG_DESC_CSWlibdbi1 = A database-independent abstraction layer, libdbi.so.1
 PKGFILES_CSWlibdbi1 = $(call pkgfiles_lib,libdbi.so.1)
 
 PACKAGES += CSWlibdbi-dev
-CATALOGNAME_CSWlibdbi-dev = libdbi_dev
 SPKG_DESC_CSWlibdbi-dev = Development files for libdbi.so.1
+# PKGFILES is catchall
 RUNTIME_DEP_PKGS_CSWlibdbi-dev = CSWlibdbi1
 OBSOLETED_BY_CSWlibdbi-dev = CSWlibdbi-devel
 
+REINPLACE_USRLOCAL += doc/programmers-guide/x276.html
+REINPLACE_USRLOCAL += doc/programmers-guide/quickstart-code.html
+
 BUILD64 = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --docdir=$(docdir)/libdbi
@@ -39,15 +40,7 @@
 BUILD_OVERRIDE_VARS = CFLAGS
 BUILD_OVERRIDE_VAR_CFLAGS = $(CFLAGS)
 
-TEST_TARGET = check
-
 INSTALL_OVERRIDE_VARS = docdir
 INSTALL_OVERRIDE_VAR_docdir = $(docdir)/libdbi_dev
 
 include gar/category.mk
-
-post-install-modulated:
-	perl -pi -e 's,/usr/local,$(prefix),g' \
-		$(DESTDIR)$(docdir)/libdbi_dev/programmers-guide/x276.html \
-		$(DESTDIR)$(docdir)/libdbi_dev/programmers-guide/quickstart-code.html
-	@$(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 Jan 19 15:56:15 2012
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu, 19 Jan 2012 14:56:15 +0000
Subject: [csw-devel] SF.net SVN: gar:[16821]
	csw/mgar/pkg/libevent/trunk/Makefile
Message-ID: <E1RntPT-0003kw-DN@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 16821
          http://gar.svn.sourceforge.net/gar/?rev=16821&view=rev
Author:   dmichelsen
Date:     2012-01-19 14:56:14 +0000 (Thu, 19 Jan 2012)
Log Message:
-----------
libevent/trunk: Use real obsoletion

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

Modified: csw/mgar/pkg/libevent/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libevent/trunk/Makefile	2012-01-19 14:37:20 UTC (rev 16820)
+++ csw/mgar/pkg/libevent/trunk/Makefile	2012-01-19 14:56:14 UTC (rev 16821)
@@ -19,34 +19,16 @@
 LICENSE = LICENSE
 
 PACKAGES += CSWlibevent1-4-2
-CATALOGNAME_CSWlibevent1-4-2 = libevent1_4_2
 SPKG_DESC_CSWlibevent1-4-2 = Event notification library, libevent-1.4.so.2
-PKGFILES_CSWlibevent1-4-2 = $(PKGFILES_RT)
+PKGFILES_CSWlibevent1-4-2 = $(call pkgfiles_lib,libevent-1.4.so.2)
+OBSOLETED_BY_CSWlibevent1-4-2 += CSWlibevent
 
-PACKAGES += CSWlibevent
-CATALOGNAME_CSWlibevent = libevent
-SPKG_DESC_CSWlibevent = Legacy package as contents moved to soname-specific packages
-RUNTIME_DEP_PKGS_CSWlibevent = CSWlibevent1-4-2
-ARCHALL_CSWlibevent = 1
-PKGFILES_CSWlibevent = NOFILES
+VENDOR_URL = http://www.monkey.org/~provos/libevent/
 
-# We define upstream file regex so we can be notifed of new upstream software release
-UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*)-stable.tar.gz
-
-SPKG_SOURCEURL = http://www.monkey.org/~provos/libevent/
-
 BUILD64 = 1
-NOISAEXEC = 1
-CONFIGURE_ARGS  = $(DIRPATHS) 
 
 TEST_TARGET = verify
 
-# This is a legacy dependancy
-CHECKPKG_OVERRIDES_CSWlibevent += surplus-dependency|CSWlibevent1-4-2
-
-# This is a bug in checkpkg, remove after fixing
-CHECKPKG_OVERRIDES_CSWlibevent1-4-2 += shared-lib-pkgname-mismatch
-
 include gar/category.mk
 
 post-extract-modulated:

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


From cgrzemba at users.sourceforge.net  Thu Jan 19 16:00:18 2012
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Thu, 19 Jan 2012 15:00:18 +0000
Subject: [csw-devel] SF.net SVN: gar:[16822] csw/mgar/pkg/nss/trunk/Makefile
Message-ID: <E1RntTO-0003pV-Jc@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 16822
          http://gar.svn.sourceforge.net/gar/?rev=16822&view=rev
Author:   cgrzemba
Date:     2012-01-19 15:00:18 +0000 (Thu, 19 Jan 2012)
Log Message:
-----------
nss/trunk: add checkpkg hints

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

Modified: csw/mgar/pkg/nss/trunk/Makefile
===================================================================
--- csw/mgar/pkg/nss/trunk/Makefile	2012-01-19 14:56:14 UTC (rev 16821)
+++ csw/mgar/pkg/nss/trunk/Makefile	2012-01-19 15:00:18 UTC (rev 16822)
@@ -69,6 +69,7 @@
 CATALOGNAME_CSWlibnssdbm3 = libnssdbm3
 PKGFILES_CSWlibnssdbm3 += $(call baseisadirs,$(libdir),libnssdbm3\.so)
 PKGFILES_CSWlibnssdbm3 += $(call baseisadirs,$(libdir),libnssdbm3\.so(\.\d+)*)
+PKGFILES_CSWlibnssdbm3 += $(call baseisadirs,$(libdir),libnssdbm3\.chk)
 SPKG_DESC_CSWlibnssdbm3 += $(DESCRIPTION), libnssdbm3.so
 RUNTIME_DEP_PKGS_CSWlibnssdbm3 += CSWlibnssutil3 
 RUNTIME_DEP_PKGS_CSWlibnssdbm3 += CSWlibplds4
@@ -99,6 +100,7 @@
 CATALOGNAME_CSWlibsoftokn3 = libsoftokn3
 PKGFILES_CSWlibsoftokn3 += $(call baseisadirs,$(libdir),libsoftokn3\.so)
 PKGFILES_CSWlibsoftokn3 += $(call baseisadirs,$(libdir),libsoftokn3\.so(\.\d+)*)
+PKGFILES_CSWlibsoftokn3 += $(call baseisadirs,$(libdir),libsoftokn3\.chk)
 SPKG_DESC_CSWlibsoftokn3 += $(DESCRIPTION), libsoftokn3.so
 RUNTIME_DEP_PKGS_CSWlibsoftokn3 += CSWlibnspr4
 RUNTIME_DEP_PKGS_CSWlibsoftokn3 += CSWlibplc4
@@ -121,6 +123,7 @@
 SPKG_DESC_CSWlibfreebl3 += $(DESCRIPTION), libfreebl libs
 PKGFILES_CSWlibfreebl3 += $(call baseisadirs,$(libdir),libfreebl.*3\.so)
 PKGFILES_CSWlibfreebl3 += $(call baseisadirs,$(libdir),libfreebl.*3\.so(\.\d+)*)
+PKGFILES_CSWlibfreebl3 += $(call baseisadirs,$(libdir),libfreebl.*3\.chk)
 RUNTIME_DEP_PKGS_CSWlibfreebl3 += CSWlibnssutil3
 RUNTIME_DEP_PKGS_CSWlibfreebl3 += CSWlibnspr4
 
@@ -128,7 +131,7 @@
 CATALOGNAME_CSWlibnss-dev = libnss_dev
 SPKG_DESC_CSWlibnss-dev = Network Security Services library, development files
 ARCHALL_CSWlibnss-dev = 1
-PKGFILES_CSWlibnss-dev = $(call baseisadirs,$(includedir),*\.h*)
+# PKGFILES_CSWlibnss-dev = $(call baseisadirs,$(includedir),*\.h*)
 RUNTIME_DEP_PKGS_CSWlibnss-dev += CSWlibnss3
 RUNTIME_DEP_PKGS_CSWlibnss-dev += CSWlibssl3
 RUNTIME_DEP_PKGS_CSWlibnss-dev += CSWlibsqlite3-0
@@ -274,7 +277,10 @@
 CHECKPKG_OVERRIDES_CSWlibnssdbm3 += soname-equals-filename|file=/opt/csw/lib/libnssdbm3.so
 CHECKPKG_OVERRIDES_CSWlibnssdbm3 += soname-equals-filename|file=/opt/csw/lib/sparcv9/libnssdbm3.so
 CHECKPKG_OVERRIDES_CSWlibnssdbm3 += soname-equals-filename|file=/opt/csw/lib/amd64/libnssdbm3.so
+CHECKPKG_OVERRIDES_CSWlibnss-dev += archall-with-arch-paths|/opt/csw/lib/amd64/pkgconfig
+CHECKPKG_OVERRIDES_CSWlibnss-dev += archall-with-arch-paths|/opt/csw/lib/amd64/pkgconfig/nss.pc
 
+
 include gar/category.mk
 
 build-nss: build-coreconf build-dbm build-nss-compile
@@ -334,10 +340,9 @@
 			false \
 		)
 	ginstall -d -m 755 $(DESTDIR)$(libdir)/pkgconfig
-	ginstall -m 644 \
-		$(FILEDIR)/nss.pc \
+	ginstall -m 644 $(FILEDIR)/nss.pc \
 		$(DESTDIR)$(libdir)/pkgconfig
 	if [ $(MEMORYMODEL) = 64 ]; then \
-		gsed -i -e 's+/lib$$+lib/64+' $(DESTDIR)$(libdir)/pkgconfig/nss.pc ; \
+	    gsed -i -e 's+/lib$$+lib/64+' $(DESTDIR)$(libdir)/pkgconfig/nss.pc ; \
 	fi
 	@$(MAKECOOKIE)

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


From cgrzemba at users.sourceforge.net  Thu Jan 19 16:01:53 2012
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Thu, 19 Jan 2012 15:01:53 +0000
Subject: [csw-devel] SF.net SVN: gar:[16823]
	csw/mgar/pkg/389-admin/trunk/Makefile
Message-ID: <E1RntUv-0002qi-UB@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 16823
          http://gar.svn.sourceforge.net/gar/?rev=16823&view=rev
Author:   cgrzemba
Date:     2012-01-19 15:01:53 +0000 (Thu, 19 Jan 2012)
Log Message:
-----------
389-admin/trunk: add checkpkg hints

Modified Paths:
--------------
    csw/mgar/pkg/389-admin/trunk/Makefile

Modified: csw/mgar/pkg/389-admin/trunk/Makefile
===================================================================
--- csw/mgar/pkg/389-admin/trunk/Makefile	2012-01-19 15:00:18 UTC (rev 16822)
+++ csw/mgar/pkg/389-admin/trunk/Makefile	2012-01-19 15:01:53 UTC (rev 16823)
@@ -17,17 +17,39 @@
 PACKAGING_PLATFORMS += solaris10-sparc
 PACKAGING_PLATFORMS += solaris10-i386
 
+# GARCOMPILER = SOS12U2
+
 LICENSE = LICENSE LICENSE.GPLv2
 
 PATCHFILES += 0001-change-includedir-preference-in-Makefile.am.patch
 
 PACKAGES = CSW389admin
+INITSMF = /etc/opt/csw/init.d/dirsrv-admin
 RUNTIME_DEP_PKGS_CSW389admin = CSWap2modnss
+RUNTIME_DEP_PKGS_CSW389admin += CSWlibprldap60
+RUNTIME_DEP_PKGS_CSW389admin += CSWlibldif60
+RUNTIME_DEP_PKGS_CSW389admin += CSWlibicudata48
+RUNTIME_DEP_PKGS_CSW389admin += CSWperl
+RUNTIME_DEP_PKGS_CSW389admin += CSWlibadmsslutil0
+RUNTIME_DEP_PKGS_CSW389admin += CSWlibsasl2-2
+RUNTIME_DEP_PKGS_CSW389admin += CSWlibplc4
+RUNTIME_DEP_PKGS_CSW389admin += CSWlibssldap60
+RUNTIME_DEP_PKGS_CSW389admin += CSWlibnspr4
+RUNTIME_DEP_PKGS_CSW389admin += CSWlibnss-dev
+RUNTIME_DEP_PKGS_CSW389admin += CSWlibicuuc48
+RUNTIME_DEP_PKGS_CSW389admin += CSWlibicui18n48
+RUNTIME_DEP_PKGS_CSW389admin += CSWlibadminutil0
+RUNTIME_DEP_PKGS_CSW389admin += CSWlibplds4
+RUNTIME_DEP_PKGS_CSW389admin += CSWlibldap60
+CHECKPKG_OVERRIDES_CSW389admin += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libds-admin-serv.so
+CHECKPKG_OVERRIDES_CSW389admin += pkginfo-opencsw-repository-uncommitted
+CHECKPKG_OVERRIDES_CSW389admin += shared-lib-pkgname-mismatch|file=opt/csw/lib/libds-admin-serv.so.0.0.0|soname=libds-admin-serv.so.0|pkgname=CSW389admin|expected=CSWlibds-admin-serv0
+CHECKPKG_OVERRIDES_CSW389admin += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libds-admin-serv.so
 
-GARCOMPILER = SOS12U2
 # remove -I/opt/csw/include
 CPPFLAGS = 
-EXTRA_LINKER_FLAGS = -xnorunpath -norunpath -liconv
+# EXTRA_LINKER_FLAGS = -xnorunpath -norunpath -liconv
+EXTRA_LINKER_FLAGS = -xnorunpath -norunpath
 
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS_OPT += --with-ldapsdk-inc=/opt/csw/include/dirsrv 

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


From dmichelsen at users.sourceforge.net  Thu Jan 19 16:15:47 2012
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu, 19 Jan 2012 15:15:47 +0000
Subject: [csw-devel] SF.net SVN: gar:[16824] csw/mgar/pkg/pca/trunk
Message-ID: <E1RntiN-00045K-9J@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 16824
          http://gar.svn.sourceforge.net/gar/?rev=16824&view=rev
Author:   dmichelsen
Date:     2012-01-19 15:15:46 +0000 (Thu, 19 Jan 2012)
Log Message:
-----------
pca/trunk: Update to 20120119-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	2012-01-19 15:01:53 UTC (rev 16823)
+++ csw/mgar/pkg/pca/trunk/Makefile	2012-01-19 15:15:46 UTC (rev 16824)
@@ -1,5 +1,5 @@
 NAME = pca
-VERSION = 20111018-01
+VERSION = 20120119-01
 CATEGORIES = utils
 
 DESCRIPTION = Patch Check Advanced

Modified: csw/mgar/pkg/pca/trunk/checksums
===================================================================
--- csw/mgar/pkg/pca/trunk/checksums	2012-01-19 15:01:53 UTC (rev 16823)
+++ csw/mgar/pkg/pca/trunk/checksums	2012-01-19 15:15:46 UTC (rev 16824)
@@ -2,4 +2,4 @@
 def9838b9f704ec17a32dd2aeec8bf02  clean
 3027cc2e36a52704e4443cb5c7a91427  cleanup_sadm
 9032b788b8a494082368ea0881146078  mkxref
-3f095c2d03da4fb68f9b16f336d591bb  pca-20111018-01
+889f960f31531cb79d04aa3c25d2bb46  pca-20120119-01

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


From dmichelsen at users.sourceforge.net  Thu Jan 19 16:16:30 2012
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu, 19 Jan 2012 15:16:30 +0000
Subject: [csw-devel] SF.net SVN: gar:[16825]
	csw/mgar/pkg/libevent/trunk/Makefile
Message-ID: <E1Rntj4-000462-Kl@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 16825
          http://gar.svn.sourceforge.net/gar/?rev=16825&view=rev
Author:   dmichelsen
Date:     2012-01-19 15:16:30 +0000 (Thu, 19 Jan 2012)
Log Message:
-----------
libevent/trunk: Some cleanup

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

Modified: csw/mgar/pkg/libevent/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libevent/trunk/Makefile	2012-01-19 15:15:46 UTC (rev 16824)
+++ csw/mgar/pkg/libevent/trunk/Makefile	2012-01-19 15:16:30 UTC (rev 16825)
@@ -20,9 +20,12 @@
 
 PACKAGES += CSWlibevent1-4-2
 SPKG_DESC_CSWlibevent1-4-2 = Event notification library, libevent-1.4.so.2
-PKGFILES_CSWlibevent1-4-2 = $(call pkgfiles_lib,libevent-1.4.so.2)
+PKGFILES_CSWlibevent1-4-2 = $(PKGFILES_RT)
 OBSOLETED_BY_CSWlibevent1-4-2 += CSWlibevent
 
+# This is a unified lib package
+CHECKPKG_OVERRIDES_CSWlibevent1-4-2 += shared-lib-pkgname-mismatch
+
 VENDOR_URL = http://www.monkey.org/~provos/libevent/
 
 BUILD64 = 1
@@ -31,6 +34,9 @@
 
 include gar/category.mk
 
+# For "make" to be GNU make
+PATH := /opt/csw/gnu:$(PATH)
+
 post-extract-modulated:
 	-test -f $(WORKSRC)/test/test.sh && perl -pi -e 's,#!/bin/sh,#!/bin/bash,' $(WORKSRC)/test/test.sh
 	@$(MAKECOOKIE)

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


From cgrzemba at users.sourceforge.net  Thu Jan 19 16:42:32 2012
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Thu, 19 Jan 2012 15:42:32 +0000
Subject: [csw-devel] SF.net SVN: gar:[16826] csw/mgar/pkg/nss/trunk/Makefile
Message-ID: <E1Rnu8G-0002TQ-Fu@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 16826
          http://gar.svn.sourceforge.net/gar/?rev=16826&view=rev
Author:   cgrzemba
Date:     2012-01-19 15:42:32 +0000 (Thu, 19 Jan 2012)
Log Message:
-----------
nss/trunk: make dev pkg arch-dependent

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

Modified: csw/mgar/pkg/nss/trunk/Makefile
===================================================================
--- csw/mgar/pkg/nss/trunk/Makefile	2012-01-19 15:16:30 UTC (rev 16825)
+++ csw/mgar/pkg/nss/trunk/Makefile	2012-01-19 15:42:32 UTC (rev 16826)
@@ -130,8 +130,6 @@
 PACKAGES += CSWlibnss-dev
 CATALOGNAME_CSWlibnss-dev = libnss_dev
 SPKG_DESC_CSWlibnss-dev = Network Security Services library, development files
-ARCHALL_CSWlibnss-dev = 1
-# PKGFILES_CSWlibnss-dev = $(call baseisadirs,$(includedir),*\.h*)
 RUNTIME_DEP_PKGS_CSWlibnss-dev += CSWlibnss3
 RUNTIME_DEP_PKGS_CSWlibnss-dev += CSWlibssl3
 RUNTIME_DEP_PKGS_CSWlibnss-dev += CSWlibsqlite3-0
@@ -247,7 +245,6 @@
 # NSS_LD_OPTIONS = -R'$$ORIGIN'
 
 # CHECKPKG_OVERRIDES_CSWlibfreebl3 += shared-lib-pkgname-mismatch|sonames=libfreebl_32fpu_3.so,libfreebl_32int64_3.so,libfreebl_32int_3.so,libfreebl_64fpu_3.so,libfreebl_64int_3.so|pkgname=CSWlibfreebl3|expected=CSWlibfreebl|
-CHECKPKG_OVERRIDES_CSWlibnss-dev += archall-devel-package
 CHECKPKG_OVERRIDES_CSWlibfreebl3 += soname-equals-filename|file=/opt/csw/lib/sparcv9/libfreebl_64fpu_3.so
 CHECKPKG_OVERRIDES_CSWlibfreebl3 += soname-equals-filename|file=/opt/csw/lib/sparcv9/libfreebl_64int_3.so
 CHECKPKG_OVERRIDES_CSWlibfreebl3 += soname-equals-filename|file=/opt/csw/lib/libfreebl_32int_3.so
@@ -277,8 +274,6 @@
 CHECKPKG_OVERRIDES_CSWlibnssdbm3 += soname-equals-filename|file=/opt/csw/lib/libnssdbm3.so
 CHECKPKG_OVERRIDES_CSWlibnssdbm3 += soname-equals-filename|file=/opt/csw/lib/sparcv9/libnssdbm3.so
 CHECKPKG_OVERRIDES_CSWlibnssdbm3 += soname-equals-filename|file=/opt/csw/lib/amd64/libnssdbm3.so
-CHECKPKG_OVERRIDES_CSWlibnss-dev += archall-with-arch-paths|/opt/csw/lib/amd64/pkgconfig
-CHECKPKG_OVERRIDES_CSWlibnss-dev += archall-with-arch-paths|/opt/csw/lib/amd64/pkgconfig/nss.pc
 
 
 include gar/category.mk

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


From dmichelsen at users.sourceforge.net  Thu Jan 19 16:58:27 2012
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu, 19 Jan 2012 15:58:27 +0000
Subject: [csw-devel] SF.net SVN: gar:[16827] csw/mgar/pkg/libevent2/trunk
Message-ID: <E1RnuNe-0002j4-W1@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 16827
          http://gar.svn.sourceforge.net/gar/?rev=16827&view=rev
Author:   dmichelsen
Date:     2012-01-19 15:58:26 +0000 (Thu, 19 Jan 2012)
Log Message:
-----------
libevent2/trunk: Update to 2.0.16, split package

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

Added Paths:
-----------
    csw/mgar/pkg/libevent2/trunk/files/0001-Do-not-return-value-in-void-function.patch

Modified: csw/mgar/pkg/libevent2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libevent2/trunk/Makefile	2012-01-19 15:42:32 UTC (rev 16826)
+++ csw/mgar/pkg/libevent2/trunk/Makefile	2012-01-19 15:58:26 UTC (rev 16827)
@@ -1,5 +1,5 @@
 NAME = libevent
-VERSION = 2.0.12
+VERSION = 2.0.16
 CATEGORIES = lib
 
 DESCRIPTION = Event notification library
@@ -10,23 +10,47 @@
   regular timeouts.
 endef
 
-MASTER_SITES = http://www.monkey.org/~provos/
+MASTER_SITES = http://github.com/downloads/libevent/libevent/
 DISTNAME = $(NAME)-$(VERSION)-stable
 DISTFILES += $(DISTNAME).tar.gz
 
+# This is the same fix as reported in
+#   http://sourceforge.net/tracker/?func=detail&aid=3452589&group_id=50884&atid=461322
+PATCHFILES += 0001-Do-not-return-value-in-void-function.patch
+
 VENDOR_URL = http://www.monkey.org/~provos/libevent/
 LICENSE = LICENSE
 
 BUILD_DEP_PKGS += CSWossldevel
 
 PACKAGES += CSWlibevent2-0-5
-SPKG_DESC_CSWlibevent2-0-5 = Event notification library 2.0, libevent*-2.0.so.5
-PKGFILES_CSWlibevent2-0-5 = $(PKGFILES_RT)
-RUNTIME_DEP_PKGS_CSWlibevent2-0-5 += CSWosslrt
+SPKG_DESC_CSWlibevent2-0-5 = Event notification library 2.0, libevent-2.0.so.5
+PKGFILES_CSWlibevent2-0-5 = $(call pkgfiles_lib,libevent-2.0.so.5)
 
+PACKAGES += CSWlibevent-core2-0-5
+SPKG_DESC_CSWlibevent-core2-0-5 = Event notification library 2.0, libevent_core-2.0.so.5
+PKGFILES_CSWlibevent-core2-0-5 = $(call pkgfiles_lib,libevent_core-2.0.so.5)
+
+PACKAGES += CSWlibevent-extra2-0-5
+SPKG_DESC_CSWlibevent-extra2-0-5 = Event notification library 2.0, libevent_extra-2.0.so.5
+PKGFILES_CSWlibevent-extra2-0-5 = $(call pkgfiles_lib,libevent_extra-2.0.so.5)
+
+PACKAGES += CSWlibevent-openssl2-0-5
+SPKG_DESC_CSWlibevent-openssl2-0-5 = Event notification library 2.0, libevent_openssl-2.0.so.5
+PKGFILES_CSWlibevent-openssl2-0-5 = $(call pkgfiles_lib,libevent_openssl-2.0.so.5)
+RUNTIME_DEP_PKGS_CSWlibevent-openssl2-0-5 += CSWosslrt
+
+PACKAGES += CSWlibevent-pthreads2-0-5
+SPKG_DESC_CSWlibevent-pthreads2-0-5 = Event notification library 2.0, libevent_pthreads-2.0.so.5
+PKGFILES_CSWlibevent-pthreads2-0-5 = $(call pkgfiles_lib,libevent_pthreads-2.0.so.5)
+
 PACKAGES += CSWlibevent-dev
 SPKG_DESC_CSWlibevent-dev = Development files for libevent*-2.0.so.5
 RUNTIME_DEP_PKGS_CSWlibevent-dev += CSWlibevent2-0-5
+RUNTIME_DEP_PKGS_CSWlibevent-dev += CSWlibevent-core2-0-5
+RUNTIME_DEP_PKGS_CSWlibevent-dev += CSWlibevent-extra2-0-5
+RUNTIME_DEP_PKGS_CSWlibevent-dev += CSWlibevent-openssl2-0-5
+RUNTIME_DEP_PKGS_CSWlibevent-dev += CSWlibevent-pthreads2-0-5
 RUNTIME_DEP_PKGS_CSWlibevent-dev += CSWpython
 OBSOLETED_BY_CSWlibevent-dev += CSWlibevent-devel
 

Modified: csw/mgar/pkg/libevent2/trunk/checksums
===================================================================
--- csw/mgar/pkg/libevent2/trunk/checksums	2012-01-19 15:42:32 UTC (rev 16826)
+++ csw/mgar/pkg/libevent2/trunk/checksums	2012-01-19 15:58:26 UTC (rev 16827)
@@ -1 +1 @@
-42986228baf95e325778ed328a93e070  libevent-2.0.12-stable.tar.gz
+899efcffccdb3d5111419df76e7dc8df  libevent-2.0.16-stable.tar.gz

Added: csw/mgar/pkg/libevent2/trunk/files/0001-Do-not-return-value-in-void-function.patch
===================================================================
--- csw/mgar/pkg/libevent2/trunk/files/0001-Do-not-return-value-in-void-function.patch	                        (rev 0)
+++ csw/mgar/pkg/libevent2/trunk/files/0001-Do-not-return-value-in-void-function.patch	2012-01-19 15:58:26 UTC (rev 16827)
@@ -0,0 +1,26 @@
+From 5cb574becae82337673dbd093176ed87b0de4be1 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Thu, 19 Jan 2012 16:18:24 +0100
+Subject: [PATCH] Do not return value in void function
+
+---
+ test/regress_dns.c |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/test/regress_dns.c b/test/regress_dns.c
+index b2ca47c..24eb6b7 100644
+--- a/test/regress_dns.c
++++ b/test/regress_dns.c
+@@ -1665,7 +1665,8 @@ static void
+ cnt_free(void *ptr)
+ {
+ 	allocated_chunks -= 1;
+-	return free(ptr);
++	free(ptr);
++        return;
+ }
+ 
+ struct testleak_env_t {
+-- 
+1.7.8.3
+

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


From janholzh at users.sourceforge.net  Thu Jan 19 17:10:44 2012
From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net)
Date: Thu, 19 Jan 2012 16:10:44 +0000
Subject: [csw-devel] SF.net SVN: gar:[16828] csw/mgar/pkg/sudo/trunk
Message-ID: <E1RnuZY-0004JN-63@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 16828
          http://gar.svn.sourceforge.net/gar/?rev=16828&view=rev
Author:   janholzh
Date:     2012-01-19 16:10:43 +0000 (Thu, 19 Jan 2012)
Log Message:
-----------
sudo/trunk: first steps to update to 1.8.3p1 sudo_ldap needs to be updated to

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

Modified: csw/mgar/pkg/sudo/trunk/Makefile
===================================================================
--- csw/mgar/pkg/sudo/trunk/Makefile	2012-01-19 15:58:26 UTC (rev 16827)
+++ csw/mgar/pkg/sudo/trunk/Makefile	2012-01-19 16:10:43 UTC (rev 16828)
@@ -1,7 +1,7 @@
 # $Id$
 
 NAME = sudo
-VERSION = 1.7.4p2
+VERSION = 1.8.3p1
 CATEGORIES = utils
 
 DESCRIPTION = Provides limited super user privileges
@@ -14,27 +14,26 @@
 
 MASTER_SITES = ftp://ftp.sudo.ws/pub/sudo/
 DISTFILES  = $(NAME)-$(VERSION).tar.gz 
-PATCHFILES = install.diff
+#PATCHFILES = install.diff
 
 # We define upstream file regex so we can be notifed of new 
 # upstream software release
 UFILES_REGEX = $(NAME)-((\d+(?:\.\d+)*)(p\d+)?).tar.gz
 
+
 PACKAGES += CSWsudo
 PACKAGES += CSWsudo-common
 
 CATALOGNAME_CSWsudo = sudo
 SPKG_DESC_CSWsudo = $(DESCRIPTION)
 SPKG_SOURCEURL_CSWsudo = http://www.sudo.ws/sudo/
-RUNTIME_DEP_PKGS_CSWsudo += CSWsudo-common
-RUNTIME_DEP_PKGS_CSWsudo += CSWggettextrt
+RUNTIME_DEP_PKGS_CSWsudo += CSWlibintl8
 
 CATALOGNAME_CSWsudo-common = sudo_common
 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
+RUNTIME_DEP_PKGS_CSWsudo-common += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWsudo-common += CSWlibz1
 
 DISTFILES += CSWsudo-common.postinstall 
 
@@ -46,13 +45,17 @@
 CONFIGURE_ARGS += --with-ignore-dot
 CONFIGURE_ARGS += --with-env-editor
 CONFIGURE_ARGS += --disable-path-info
+
+# Not sure if this is good for timedir and iologdir
+CONFIGURE_ARGS += --with-timedir=/var/opt/csw/sudo   
+CONFIGURE_ARGS +=  --with-iologdir=$(LOGPATH)/sudolog  
 CONFIGURE_ARGS += --with-logpath=$(LOGPATH)/sudolog
 ifneq ($(shell uname -r),5.8)
     CONFIGURE_ARGS += --with-project
 endif
 
-# sysconfdir to be enabled later
-# sysconfdir = /etc/opt/csw
+# sysconfdir to be enabled later needs migrate conf stuff
+#sysconfdir = /etc/opt/csw
 localstatedir = /var/opt/csw
 
 TEST_TARGET = check
@@ -65,7 +68,7 @@
 PROTOTYPE_FILES_sudo = $(bindir)/sudo(edit)?.minimal
 PROTOTYPE_PERMS_sudo = 4755
 
-LICENSE = LICENSE
+LICENSE = doc/LICENSE
 ALTERNATIVES_CSWsudo = minimal
 ALTERNATIVE_minimal  = $(bindir)/sudo     sudo     $(bindir)/sudo.minimal     50
 ALTERNATIVE_minimal += $(bindir)/sudoedit sudoedit $(bindir)/sudoedit.minimal

Modified: csw/mgar/pkg/sudo/trunk/checksums
===================================================================
--- csw/mgar/pkg/sudo/trunk/checksums	2012-01-19 15:58:26 UTC (rev 16827)
+++ csw/mgar/pkg/sudo/trunk/checksums	2012-01-19 16:10:43 UTC (rev 16828)
@@ -1,3 +1 @@
-955d99eda1432c7b7e00d98b91e35a79  CSWsudo-common.postinstall
-157b2e5e38ca54eb36e0364706bd0292  install.diff
-80f3a2506f0ec3e2d75e7d17d95f5341  sudo-1.7.4p2.tar.gz
+7becc572fa97f94cf721a2ee8299c45b  sudo-1.8.3p1.tar.gz

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


From janholzh at users.sourceforge.net  Thu Jan 19 17:40:38 2012
From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net)
Date: Thu, 19 Jan 2012 16:40:38 +0000
Subject: [csw-devel] SF.net SVN: gar:[16829] csw/mgar/pkg/sudo/trunk/Makefile
Message-ID: <E1Rnv2U-0007D2-KM@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 16829
          http://gar.svn.sourceforge.net/gar/?rev=16829&view=rev
Author:   janholzh
Date:     2012-01-19 16:40:38 +0000 (Thu, 19 Jan 2012)
Log Message:
-----------
sudo/trunk: add CSWsudo-common back to RUNTIME_DEP for CSWsudo

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

Modified: csw/mgar/pkg/sudo/trunk/Makefile
===================================================================
--- csw/mgar/pkg/sudo/trunk/Makefile	2012-01-19 16:10:43 UTC (rev 16828)
+++ csw/mgar/pkg/sudo/trunk/Makefile	2012-01-19 16:40:38 UTC (rev 16829)
@@ -28,6 +28,7 @@
 SPKG_DESC_CSWsudo = $(DESCRIPTION)
 SPKG_SOURCEURL_CSWsudo = http://www.sudo.ws/sudo/
 RUNTIME_DEP_PKGS_CSWsudo += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWsudo += CSWsudo-common
 
 CATALOGNAME_CSWsudo-common = sudo_common
 SPKG_DESC_CSWsudo-common = Common files for sudo

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


From dmichelsen at users.sourceforge.net  Thu Jan 19 21:56:09 2012
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu, 19 Jan 2012 20:56:09 +0000
Subject: [csw-devel] SF.net SVN: gar:[16830] csw/mgar/pkg/lua/trunk
Message-ID: <E1Rnz1l-0007eh-Cf@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 16830
          http://gar.svn.sourceforge.net/gar/?rev=16830&view=rev
Author:   dmichelsen
Date:     2012-01-19 20:56:09 +0000 (Thu, 19 Jan 2012)
Log Message:
-----------
lua/trunk: Update to 5.2.0, update patch, split package

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

Added Paths:
-----------
    csw/mgar/pkg/lua/trunk/files/0001-Make-shared-lib.patch

Removed Paths:
-------------
    csw/mgar/pkg/lua/trunk/files/dynamic.patch

Modified: csw/mgar/pkg/lua/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lua/trunk/Makefile	2012-01-19 16:40:38 UTC (rev 16829)
+++ csw/mgar/pkg/lua/trunk/Makefile	2012-01-19 20:56:09 UTC (rev 16830)
@@ -1,7 +1,12 @@
 # $Id$
 
+# Open issues:
+# - no .pc file
+# - provide different C/C++ libs for liblua as discussed here:
+#     http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=560139
+
 NAME = lua
-VERSION = 5.1.4
+VERSION = 5.2.0
 CATEGORIES = lang
 
 DESCRIPTION = Light-weight language designed for extending applications
@@ -11,25 +16,48 @@
   language.
 endef
 
-SPKG_SOURCEURL = http://www.lua.org/
 MASTER_SITES = http://www.lua.org/ftp/
-DISTFILES  = $(NAME)-$(VERSION).tar.gz
-PATCHFILES = dynamic.patch
+DISTFILES += $(DISTNAME).tar.gz
 
-UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
+PATCHFILES += 0001-Make-shared-lib.patch
 
+VENDOR_URL = http://www.lua.org
+
+LICENSE = doc/readme.html
+
+PACKAGES += CSWlua
+SPKG_DESC_CSWlua = Light-weight language designed for extending applications
+# PKGFILES is catchall
+
+PACKAGES += CSWliblua5-2
+SPKG_DESC_CSWliblua5-2 = Library for the LUA langauge, liblua.so.5.2
+PKGFILES_CSWliblua5-2 += $(call pkgfiles_lib,liblua.so.5.2)
+
+PACKAGES += CSWlua-dev
+SPKG_DESC_CSWlua-dev = Development files for liblua.so.5.2
+PKGFILES_CSWlua-dev += $(PKGFILES_DEVEL)
+RUNTIME_DEP_PKGS_CSWlua-dev += CSWliblua5-2
+
+REINPLACEMENTS += luaroot
+REINPLACE_MATCH_luaroot = (\#define\s+LUA_ROOT\s+).*
+REINPLACE_WITH_luaroot = $$1"$(prefix)"
+REINPLACE_FILES_luaroot += src/luaconf.h
+
+# No configure
 CONFIGURE_SCRIPTS =
 
-BUILD_ARGS += solaris CC=$(CC)
-BUILD_ARGS += CFLAGS="${CFLAGS}
-BUILD_ARGS += -DLUA_USE_POSIX
-BUILD_ARGS += -DLUA_USE_DLOPEN
-BUILD_ARGS += -KPIC" MYLIBS="-ldl"
+EXTRA_CFLAGS += -KPIC
 
+BUILD_ARGS += solaris
+BUILD_ARGS += CC=$(CC)
+BUILD_ARGS += CFLAGS="$(CFLAGS)"
+BUILD_ARGS += MYLIBS="-ldl"
+BUILD_ARGS += LDFLAGS="$(LDFLAGS)"
+
+TEST_TARGET = test
+
 INSTALL_ARGS += INSTALL=ginstall
 INSTALL_ARGS += INSTALL_TOP=$(DESTDIR)$(prefix)
 INSTALL_ARGS += INSTALL_MAN=$(DESTDIR)$(mandir)/man1
 
-LICENSE = COPYRIGHT
-
 include gar/category.mk

Modified: csw/mgar/pkg/lua/trunk/checksums
===================================================================
--- csw/mgar/pkg/lua/trunk/checksums	2012-01-19 16:40:38 UTC (rev 16829)
+++ csw/mgar/pkg/lua/trunk/checksums	2012-01-19 20:56:09 UTC (rev 16830)
@@ -1,3 +1 @@
-31f0a21e4b8937af46d8e55a7b9cac51  download/CSWlua.gspec
-84b47da3b41da0bf44205291a4c81ea5  download/dynamic.patch
-d0870f2de55d59c1c8419f36e8fac150  download/lua-5.1.4.tar.gz
+f1ea831f397214bae8a265995ab1a93e  lua-5.2.0.tar.gz

Added: csw/mgar/pkg/lua/trunk/files/0001-Make-shared-lib.patch
===================================================================
--- csw/mgar/pkg/lua/trunk/files/0001-Make-shared-lib.patch	                        (rev 0)
+++ csw/mgar/pkg/lua/trunk/files/0001-Make-shared-lib.patch	2012-01-19 20:56:09 UTC (rev 16830)
@@ -0,0 +1,95 @@
+From 65faf5dfa74ed9349a3b73156e271620ff227d12 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Thu, 19 Jan 2012 20:34:38 +0100
+Subject: [PATCH] Make shared lib
+
+---
+ Makefile     |    9 ++++++++-
+ src/Makefile |   11 ++++++++++-
+ 2 files changed, 18 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index ec53e1a..e553643 100644
+--- a/Makefile
++++ b/Makefile
+@@ -42,6 +42,9 @@ PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris
+ TO_BIN= lua luac
+ TO_INC= lua.h luaconf.h lualib.h lauxlib.h lua.hpp
+ TO_LIB= liblua.a
++TO_SOLIB= liblua.so
++TO_SOLIBR= liblua.so.$(R)
++TO_SOLIBV= liblua.so.$(V)
+ TO_MAN= lua.1 luac.1
+ 
+ # Lua version and release.
+@@ -52,7 +55,7 @@ R= $V.0
+ all:	$(PLAT)
+ 
+ $(PLATS) clean:
+-	cd src && $(MAKE) $@
++	cd src && $(MAKE) V=$(V) R=$(R) $@
+ 
+ test:	dummy
+ 	src/lua -v
+@@ -62,6 +65,9 @@ install: dummy
+ 	cd src && $(INSTALL_EXEC) $(TO_BIN) $(INSTALL_BIN)
+ 	cd src && $(INSTALL_DATA) $(TO_INC) $(INSTALL_INC)
+ 	cd src && $(INSTALL_DATA) $(TO_LIB) $(INSTALL_LIB)
++	cd src && $(INSTALL_EXEC) $(TO_SOLIBR) $(INSTALL_LIB)
++	cd src && ln -s           $(TO_SOLIBR) $(INSTALL_LIB)/$(TO_SOLIB)
++	cd src && ln -s           $(TO_SOLIBR) $(INSTALL_LIB)/$(TO_SOLIBV)
+ 	cd doc && $(INSTALL_DATA) $(TO_MAN) $(INSTALL_MAN)
+ 
+ uninstall:
+@@ -90,6 +96,7 @@ echo:
+ 	@echo "TO_BIN= $(TO_BIN)"
+ 	@echo "TO_INC= $(TO_INC)"
+ 	@echo "TO_LIB= $(TO_LIB)"
++	@echo "TO_SOLIB= $(TO_SOLIB)"
+ 	@echo "TO_MAN= $(TO_MAN)"
+ 	@echo "INSTALL_TOP= $(INSTALL_TOP)"
+ 	@echo "INSTALL_BIN= $(INSTALL_BIN)"
+diff --git a/src/Makefile b/src/Makefile
+index bba1693..fdd68b1 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -29,6 +29,7 @@ MYOBJS=
+ PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris
+ 
+ LUA_A=	liblua.a
++LUA_SO= liblua.so
+ CORE_O=	lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o \
+ 	lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o \
+ 	ltm.o lundump.o lvm.o lzio.o
+@@ -43,8 +44,9 @@ LUAC_T=	luac
+ LUAC_O=	luac.o
+ 
+ ALL_O= $(BASE_O) $(LUA_O) $(LUAC_O)
+-ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T)
++ALL_T= $(LUA_A) $(LUA_SO) $(LUA_T) $(LUAC_T)
+ ALL_A= $(LUA_A)
++ALL_SO= $(LUA_SO)
+ 
+ # Targets start here.
+ default: $(PLAT)
+@@ -55,10 +57,17 @@ o:	$(ALL_O)
+ 
+ a:	$(ALL_A)
+ 
++so:	$(ALL_SO)
++
+ $(LUA_A): $(BASE_O)
+ 	$(AR) $@ $?
+ 	$(RANLIB) $@
+ 
++$(LUA_SO): $(LUA_A)
++	-rm -f $(LUA_SO)
++	$(CC) -h $(LUA_SO).$(V) -G -o $(LUA_SO).$(R) $(CORE_O) $(LIB_O)
++	ln -s $(LUA_SO).$(R) $(LUA_SO)
++
+ $(LUA_T): $(LUA_O) $(LUA_A)
+ 	$(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
+ 
+-- 
+1.7.8.3
+

Deleted: csw/mgar/pkg/lua/trunk/files/dynamic.patch
===================================================================
--- csw/mgar/pkg/lua/trunk/files/dynamic.patch	2012-01-19 16:40:38 UTC (rev 16829)
+++ csw/mgar/pkg/lua/trunk/files/dynamic.patch	2012-01-19 20:56:09 UTC (rev 16830)
@@ -1,78 +0,0 @@
---- lua-5.1.3/src/Makefile.orig	2008-04-13 19:21:29.000000000 +0200
-+++ lua-5.1.3/src/Makefile	2008-04-13 20:06:30.000000000 +0200
-@@ -23,6 +23,7 @@
- PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris
- 
- LUA_A=	liblua.a
-+LUA_SO=	liblua.so
- CORE_O=	lapi.o lcode.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o lmem.o \
- 	lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o ltm.o  \
- 	lundump.o lvm.o lzio.o
-@@ -33,8 +34,9 @@
- LUAC_O=	luac.o print.o
- 
- ALL_O= $(CORE_O) $(LIB_O) $(LUA_O) $(LUAC_O)
--ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T)
-+ALL_T= $(LUA_A) $(LUA_SO) $(LUA_T) $(LUAC_T)
- ALL_A= $(LUA_A)
-+ALL_SO= $(LUA_SO)
- 
- default: $(PLAT)
- 
-@@ -47,10 +49,17 @@
- 
- a:	$(ALL_A)
- 
-+so:	$(ALL_SO)
-+
- $(LUA_A): $(CORE_O) $(LIB_O)
- 	$(AR) $@ $?
- 	$(RANLIB) $@
- 
-+$(LUA_SO): $(LUA_A)
-+	-rm -f $(LUA_SO)
-+	$(CC) -h $(LUA_SO).$(V) -G -o $(LUA_SO).$(R) $(CORE_O) $(LIB_O)
-+	ln -s $(LUA_SO).$(R) $(LUA_SO)
-+
- $(LUA_T): $(LUA_O) $(LUA_A)
- 	$(CC) -o $@ $(MYLDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
- 
---- lua-5.1.3/Makefile.orig	2008-04-13 19:29:27.000000000 +0200
-+++ lua-5.1.3/Makefile	2008-04-13 19:52:12.000000000 +0200
-@@ -39,6 +39,9 @@
- TO_BIN= lua luac
- TO_INC= lua.h luaconf.h lualib.h lauxlib.h ../etc/lua.hpp
- TO_LIB= liblua.a
-+TO_SOLIB= liblua.so
-+TO_SOLIBR= liblua.so.$(R)
-+TO_SOLIBV= liblua.so.$(V)
- TO_MAN= lua.1 luac.1
- 
- # Lua version and release.
-@@ -48,7 +49,7 @@
- all:	$(PLAT)
- 
- $(PLATS) clean:
--	cd src && $(MAKE) $@
-+	cd src && $(MAKE) V=$(V) R=$(R) $@
- 
- test:	dummy
- 	src/lua test/hello.lua
-@@ -58,6 +59,9 @@
- 	cd src && $(INSTALL_EXEC) $(TO_BIN) $(INSTALL_BIN)
- 	cd src && $(INSTALL_DATA) $(TO_INC) $(INSTALL_INC)
- 	cd src && $(INSTALL_DATA) $(TO_LIB) $(INSTALL_LIB)
-+	cd src && $(INSTALL_EXEC) $(TO_SOLIBR) $(INSTALL_LIB)
-+	cd src && ln -s           $(TO_SOLIBR) $(INSTALL_LIB)/$(TO_SOLIB)
-+	cd src && ln -s           $(TO_SOLIBR) $(INSTALL_LIB)/$(TO_SOLIBV)
- 	cd doc && $(INSTALL_DATA) $(TO_MAN) $(INSTALL_MAN)
- 
- local:
-@@ -103,6 +105,7 @@
- 	@echo "TO_BIN = $(TO_BIN)"
- 	@echo "TO_INC = $(TO_INC)"
- 	@echo "TO_LIB = $(TO_LIB)"
-+	@echo "TO_SOLIB = $(TO_SOLIB)"
- 	@echo "TO_MAN = $(TO_MAN)"
- 
- # echo config parameters as Lua code

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


From guengel at users.sourceforge.net  Thu Jan 19 22:07:24 2012
From: guengel at users.sourceforge.net (guengel at users.sourceforge.net)
Date: Thu, 19 Jan 2012 21:07:24 +0000
Subject: [csw-devel] SF.net SVN: gar:[16831] csw/mgar/pkg/cyrus_imapd/trunk
Message-ID: <E1RnzCe-0001PN-Qy@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 16831
          http://gar.svn.sourceforge.net/gar/?rev=16831&view=rev
Author:   guengel
Date:     2012-01-19 21:07:24 +0000 (Thu, 19 Jan 2012)
Log Message:
-----------
cyrus_imapd/trunk: Move manpages in 8 to 1m.

Modified Paths:
--------------
    csw/mgar/pkg/cyrus_imapd/trunk/Makefile
    csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd.changelog.CSW
    csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd_utils.changelog.CSW

Modified: csw/mgar/pkg/cyrus_imapd/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cyrus_imapd/trunk/Makefile	2012-01-19 20:56:09 UTC (rev 16830)
+++ csw/mgar/pkg/cyrus_imapd/trunk/Makefile	2012-01-19 21:07:24 UTC (rev 16831)
@@ -18,14 +18,14 @@
 
 DESCRIPTION = Pop and Imap server from the Cyrus mail system
 define BLURB
-  The Cyrus IMAP server is generally intended to be run on sealed systems, 
-  where normal users are not permitted to log in. The mailbox database is 
-  stored in parts of the filesystem that are private to Cyrus. All user 
-  access to mail is through the IMAP, POP3, or KPOP protocols. The private 
-  mailbox database design gives the server large advantages in efficiency, 
-  scalability, and administratability. Multiple concurrent read/write 
-  connections to the same mailbox are permitted. The server supports access 
-  control lists on mailboxes and storage quotas on mailbox hierarchies, 
+  The Cyrus IMAP server is generally intended to be run on sealed systems,
+  where normal users are not permitted to log in. The mailbox database is
+  stored in parts of the filesystem that are private to Cyrus. All user
+  access to mail is through the IMAP, POP3, or KPOP protocols. The private
+  mailbox database design gives the server large advantages in efficiency,
+  scalability, and administratability. Multiple concurrent read/write
+  connections to the same mailbox are permitted. The server supports access
+  control lists on mailboxes and storage quotas on mailbox hierarchies,
   multiple SASL mechanisms, and the Sieve mail filtering language.
 endef
 
@@ -105,9 +105,6 @@
 
 CHECKPKG_OVERRIDES_CSWcyrusimapdutils += surplus-dependency|CSWpmcyrus
 
-# Don't how to properly solve this now
-CHECKPKG_OVERRIDES_CSWcyrusimapd += file-collision|/opt/csw/share/man/man8/imapd.8|CSWcourierimap|CSWcyrusimapd
-
 # it's just the path to the dtd file
 CHECKPKG_OVERRIDES_CSWcyrusimapd += file-with-bad-content|/usr/share|root/var/opt/csw/svc/manifest/network/cswcyrus.xml
 
@@ -160,17 +157,17 @@
 
 # University of Athens patchs to allow autocreation of mailboxes
 # and autocreation of sub-lolders for filter rules
-#PATCHFILES = cyrus-imapd-$(VERSION)-autocreate-0.10-0.diff cyrus-imapd-$(VERSION)-autosieve-0.6.0.diff 
-PATCHFILES = cyrus-imapd-2.4.4-autocreate-0.10-0.patch cyrus-imapd-2.4.4-autosieve-0.6.0.patch 
- 
+#PATCHFILES = cyrus-imapd-$(VERSION)-autocreate-0.10-0.diff cyrus-imapd-$(VERSION)-autosieve-0.6.0.diff
+PATCHFILES = cyrus-imapd-2.4.4-autocreate-0.10-0.patch cyrus-imapd-2.4.4-autosieve-0.6.0.patch
+
 # This patch makes cyrus more tolerant with mails containing
-# invalid From headers 
+# invalid From headers
 # This avoids "Invalid Message header" error messages
 #PATCHFILES += cyrus-imapd-acceptinvalidfrom.patch
 
 # This patch makes cyrus more tolerant with mails containing
 # contains bare newlines
-PATCHFILES += cyrus-imapd-2.3.7-nobarenewlinescheck.patch 
+PATCHFILES += cyrus-imapd-2.3.7-nobarenewlinescheck.patch
 
 # the default value for allowplaintext changed since 2.3.9
 # we restore the previous default value to avoid upgrade problem
@@ -206,16 +203,16 @@
 
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --with-cyrus-prefix=$(prefix)
-CONFIGURE_ARGS += --with-service-path=$(libexecdir)/cyrus 
-CONFIGURE_ARGS += --sysconfdir=$(sysconfdir)/cyrus 
+CONFIGURE_ARGS += --with-service-path=$(libexecdir)/cyrus
+CONFIGURE_ARGS += --sysconfdir=$(sysconfdir)/cyrus
 CONFIGURE_ARGS += --with-bdb=db-4.7
-CONFIGURE_ARGS += --with-bdb-libdir=$(prefix)/bdb47/lib 
-CONFIGURE_ARGS += --with-bdb-incdir=$(prefix)/bdb47/include 
+CONFIGURE_ARGS += --with-bdb-libdir=$(prefix)/bdb47/lib
+CONFIGURE_ARGS += --with-bdb-incdir=$(prefix)/bdb47/include
 CONFIGURE_ARGS += --with-openssl=$(prefix)
 CONFIGURE_ARGS += --with-sasl=$(prefix)
-CONFIGURE_ARGS += --with-perl=$(prefix)/bin/perl 
-CONFIGURE_ARGS += --enable-idled 
-CONFIGURE_ARGS += --enable-murder 
+CONFIGURE_ARGS += --with-perl=$(prefix)/bin/perl
+CONFIGURE_ARGS += --enable-idled
+CONFIGURE_ARGS += --enable-murder
 CONFIGURE_ARGS += --enable-replication
 CONFIGURE_ARGS += --with-snmp=$(prefix)
 CONFIGURE_ARGS += --with-libwrap=$(prefix)
@@ -229,7 +226,7 @@
 # in the correct path
 INSTALL_ARGS = INSTALLDIRS=vendor
 
-TEST_SCRIPTS = 
+TEST_SCRIPTS =
 
 CYRUS_DAEMONS = fud idled imapd lmtpd lmtpproxyd mupdate notifyd pop3d pop3proxyd proxyd sieved smmapd timsieved
 
@@ -245,13 +242,11 @@
 	find $(WORKSRC)/doc/ -type f -exec perl -pi -e 's/(cyrus-)?master/cyrus-master/g' '{}' ';'
 	find $(WORKSRC)/man/ -type f -exec perl -pi -e 's/(cyrus-)?master/cyrus-master/g' '{}' ';'
 	perl -pi -e 's/(cyrus-)?master/cyrus-master/' $(WORKSRC)/master/Makefile.in
-
 	#  we delete autogenerated error files to force regeneration
 	# find $(WORKSRC) \( -name "*_err.c" -o -name "*_err.h" \) ! -name "com_err.*" -exec rm {} \;
-
 	@$(MAKECOOKIE)
 
-post-build:
+post-build-modulated:
 	# we change /etc reference to /opt/csw/etc in doc and scripts,
 	# except the sasldb2 path
 	( cd $(WORKSRC); \
@@ -267,20 +262,18 @@
 	mkdir -p $(PKGROOT)/$(prefix)/share/doc/cyrus_imapd
 	@$(MAKECOOKIE)
 
-post-merge: install-tools cyrus-rename install-docs libexec-in-sbin install-cyrus-directory install-additional-files fix2build
+post-merge: install-tools cyrus-rename install-docs libexec-in-sbin install-cyrus-directory install-additional-files fix2build move-man8
 
 
-# Let's install the files 
+# Let's install the files
 install-additional-files:
 	# we provide our class action scripts to modify /etc/inet/services
 	ginstall -D $(WORKDIR_FIRSTMOD)/services $(PKGROOT)/etc/opt/csw/pkg/CSWcyrusimapd/services
-		
 	# configuration and init file installation
 	ginstall -D "$(WORKDIR_FIRSTMOD)/cswcyrus" "$(PKGROOT)/etc/opt/csw/init.d/cswcyrus"
 	ginstall -D "$(WORKDIR_FIRSTMOD)/cswcyrus.xml" "$(PKGROOT)/var/opt/csw/svc/manifest/network/cswcyrus.xml"
 	ginstall -D "$(WORKDIR_FIRSTMOD)/imapd.conf" "$(PKGROOT)/$(sysconfdir)/cyrus/imapd.conf.CSW"
 	ginstall -D "$(WORKDIR_FIRSTMOD)/cyrus.conf" "$(PKGROOT)/$(sysconfdir)/cyrus/cyrus.conf.CSW"
-
 	@$(MAKECOOKIE)
 
 
@@ -293,9 +286,8 @@
 			[ -L $$E ] || ( mv -f $$E ../../sbin/$$E && ln -sf ../../sbin/$$E ); \
 		done )
 	@$(MAKECOOKIE)
-	
 
-# let's create the directory structure where mails 
+# let's create the directory structure where mails
 # and other cyrus stuffs will be stored
 install-cyrus-directory:
 	for D in sieve config/proc config/db config/socket config/log \
@@ -303,29 +295,24 @@
 		mkdir -p "$(PKGROOT)/$(localstatedir)/cyrus/$$D"; \
 	done
 	@$(MAKECOOKIE)
-	
 
-
 # Some fixes and cleaning to correctly build the package
 fix2build:
 	# we fix some permission problems
 	chmod -R u+w "$(PKGROOT)/"
-
 	# let's remove pod files
 	gfind $(PKGROOT) -name "perllocal.pod" -delete
 	# and CVS directories
 	gfind $(PKGROOT) -depth -type d -name "CVS" -exec rm -rf '{}' ';'
 	# and orig files
-	gfind $(PKGROOT) -name "*.orig" -delete 
-
+	gfind $(PKGROOT) -name "*.orig" -delete
 	# We remove fetchnews man and doc page as we did not build nntp support
 	# and as it clashes with leafnode
 	rm -f $(PKGROOT)$(mandir)/man8/fetchnews.8
 	rm -f $(PKGROOT)$(docdir)/cyrus_imapd/man/fetchnews.8.html
+	#gfind /home/yann/mgar/cyrus_imapd/trunk -name "*.orig" -delete
 
-	gfind /home/yann/mgar/cyrus_imapd/trunk -name "*.orig" -delete 
 
-
 # we rename some tools with too generic names
 cyrus-rename:
 # I don't think renaming mkimap is clever, the online documentation
@@ -356,7 +343,6 @@
 	for F in config2header config2man not-mkdep migrate-metadata mupdate-loadgen.pl upgradesieve convert-sieve.pl; do \
 		rm -f $(PKGROOT)$(sbindir)/$$F; \
 	done
-	
 	# we want perl scripts to use opencsw perl and paths
 	perl -pi -e 's/exec\s+perl/exec \/opt\/csw\/bin\/perl/g' $(PKGROOT)$(sbindir)/* $(PKGROOT)$(bindir)/*
 	( for FILE in translatesieve undohash arbitronsort; do \
@@ -364,3 +350,20 @@
 	    done )
 	gsed -i -e 's,/usr/local/etc/,/etc/opt/csw/,' $(PKGROOT)$(libdir)/perl/csw/Cyrus/IMAP/Shell.pm
 	@$(MAKECOOKIE)
+
+# The manpages in 8 are moved to 1m, since cyrus' imapd(8) clashes
+# with courier's. In the future, this might be solved using
+# alternatives. See also
+# http://lists.opencsw.org/pipermail/maintainers/2012-January/015940.html
+move-man8:
+	[ -d $(PKGROOT)$(mandir)/man8 ] && mv $(PKGROOT)$(mandir)/man8 $(PKGROOT)$(mandir)/man1m
+	if [ -d $(PKGROOT)$(mandir)/man1m ] ; then \
+		for f in $(PKGROOT)$(mandir)/man1m/*.8 ; do \
+			f_no_ext="`echo $$f | sed 's/\.8//'`" ; \
+			gsed 's/^\(\.TH.*\)8\(.*\)/\11M\2/' $${f} > $${f_no_ext}.1m ; \
+			rm $${f} ; \
+		done ; \
+	fi
+# fix references in man pages
+	find $(PKGROOT)$(mandir) -type f -exec gsed -i 's/(8)/(1m)/g' \{\} \;
+#	@$(MAKECOOKIE)
\ No newline at end of file

Modified: csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd.changelog.CSW
===================================================================
--- csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd.changelog.CSW	2012-01-19 20:56:09 UTC (rev 16830)
+++ csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd.changelog.CSW	2012-01-19 21:07:24 UTC (rev 16831)
@@ -1,3 +1,11 @@
+cyrus_imapd (2.4.10,REV=2012.01.19)
+
+  * Manpages in section 8 have been moved to 1m due to collision with
+    courier's manpages. See also
+    http://lists.opencsw.org/pipermail/maintainers/2012-January/015940.html
+
+ -- Rafael Ostertag <raos at opencsw.org>  Thu, 19 Jan 2012 21:31:22 +0100
+
 cyrus_imapd (2.4.10,rev=2011.07.20) unstable
 
   * New upstream version.

Modified: csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd_utils.changelog.CSW
===================================================================
--- csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd_utils.changelog.CSW	2012-01-19 20:56:09 UTC (rev 16830)
+++ csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd_utils.changelog.CSW	2012-01-19 21:07:24 UTC (rev 16831)
@@ -1,3 +1,11 @@
+cyrus_imapd (2.4.10,REV=2012.01.19)
+
+  * Manpages in section 8 have been moved to 1m due to collision with
+    courier's manpages. See also
+    http://lists.opencsw.org/pipermail/maintainers/2012-January/015940.html
+
+ -- Rafael Ostertag <raos at opencsw.org>  Thu, 19 Jan 2012 21:31:22 +0100
+
 cyrus_imapd_utils (2.4.10,rev=2011.07.20) unstable
 
   * New upstream version.

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


From dmichelsen at users.sourceforge.net  Thu Jan 19 22:19:22 2012
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu, 19 Jan 2012 21:19:22 +0000
Subject: [csw-devel] SF.net SVN: gar:[16832] csw/mgar/pkg/rrdtool/trunk
Message-ID: <E1RnzOE-0002SB-6K@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 16832
          http://gar.svn.sourceforge.net/gar/?rev=16832&view=rev
Author:   dmichelsen
Date:     2012-01-19 21:19:21 +0000 (Thu, 19 Jan 2012)
Log Message:
-----------
rrdtool/trunk: Update to 1.4.6, use reinplace, complete rework

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

Added Paths:
-----------
    csw/mgar/pkg/rrdtool/trunk/files/0001-Do-not-reference-tm.tm_gmtoff-on-Solaris.patch
    csw/mgar/pkg/rrdtool/trunk/files/0002-Always-link-local-libs-first-during-Perl-module.patch
    csw/mgar/pkg/rrdtool/trunk/files/0003-Always-link-against-libperl.so.patch
    csw/mgar/pkg/rrdtool/trunk/files/0004-Do-not-pass-LDFLAGS-to-pysetup-or-the-system-lib-is-.patch

Removed Paths:
-------------
    csw/mgar/pkg/rrdtool/trunk/files/patch-bindings-perl-piped-Makefile.PL
    csw/mgar/pkg/rrdtool/trunk/files/patch-bindings-perl-shared-Makefile.PL
    csw/mgar/pkg/rrdtool/trunk/files/patch-bindings-ruby-extconf.rb
    csw/mgar/pkg/rrdtool/trunk/gar

Modified: csw/mgar/pkg/rrdtool/trunk/Makefile
===================================================================
--- csw/mgar/pkg/rrdtool/trunk/Makefile	2012-01-19 21:07:24 UTC (rev 16831)
+++ csw/mgar/pkg/rrdtool/trunk/Makefile	2012-01-19 21:19:21 UTC (rev 16832)
@@ -1,5 +1,5 @@
 NAME = rrdtool
-VERSION = 1.4.5
+VERSION = 1.4.6
 CATEGORIES = utils
 
 DESCRIPTION = Time-series data logging and graphing
@@ -10,155 +10,180 @@
 endef
 
 MASTER_SITES = http://oss.oetiker.ch/$(NAME)/pub/
-DISTFILES = $(NAME)-$(VERSION).tar.gz
+DISTFILES = $(DISTNAME).tar.gz
 
+# Use patch until this is fixed:
+#   http://oss.oetiker.ch/rrdtool-trac/ticket/330
+PATCHFILES += 0001-Do-not-reference-tm.tm_gmtoff-on-Solaris.patch
+
+PATCHFILES += 0002-Always-link-local-libs-first-during-Perl-module.patch
+
 # Make sure to link against libperl.so to make shared libraries self-contained.
-PATCHFILES += patch-bindings-perl-piped-Makefile.PL
-PATCHFILES += patch-bindings-perl-shared-Makefile.PL
+PATCHFILES += 0003-Always-link-against-libperl.so.patch
 
-# This is the stub
-CATALOGNAME_CSWrrd = rrd_stub
+# Do not pass LDFLAGS during pysetup or -L/opt/csw/lib will appear too early during
+# linking which results in the system installed librrd.so is linked against instead
+# of the newly build one
+PATCHFILES += 0004-Do-not-pass-LDFLAGS-to-pysetup-or-the-system-lib-is-.patch
 
+# New glib2 is only available for Solaris 10
+PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
+
+VENDOR_URL = http://oss.oetiker.ch/rrdtool/
+
+BUILD_DEP_PKGS += $(RUNTIME_DEP_PKGS_CSWlibrrd4)
+BUILD_DEP_PKGS += CSWpangodevel
+BUILD_DEP_PKGS += CSWlibcairo-dev
+BUILD_DEP_PKGS += CSWlibglib2-dev
+BUILD_DEP_PKGS += CSWperl
+BUILD_DEP_PKGS += CSWpython-dev
+BUILD_DEP_PKGS += CSWruby18-dev
+BUILD_DEP_PKGS += CSWlibdbi-devel
+
 PACKAGES += CSWrrdtool
-CATALOGNAME_CSWrrdtool = rrdtool
 SPKG_DESC_CSWrrdtool = Time-series data logging and graphing
-RUNTIME_DEP_PKGS_CSWrrdtool += CSWglib2
+RUNTIME_DEP_PKGS_CSWrrdtool += CSWlibglib2-0-0
 RUNTIME_DEP_PKGS_CSWrrdtool += CSWpango
-RUNTIME_DEP_PKGS_CSWrrdtool += CSWlibxml2
-RUNTIME_DEP_PKGS_CSWrrdtool += CSWlibcairo
+RUNTIME_DEP_PKGS_CSWrrdtool += CSWlibxml2-2
+RUNTIME_DEP_PKGS_CSWrrdtool += CSWlibcairo2
 RUNTIME_DEP_PKGS_CSWrrdtool += CSWlibintl8
-RUNTIME_DEP_PKGS_CSWrrdtool += CSWtcpwrap
+RUNTIME_DEP_PKGS_CSWrrdtool += CSWlibwrap1
 RUNTIME_DEP_PKGS_CSWrrdtool += CSWlibdbi1
-RUNTIME_DEP_PKGS_CSWrrdtool += CSWlibrrd4
-RUNTIME_DEP_PKGS_CSWrrdtool += CSWlibrrd-th4
+RUNTIME_DEP_PKGS_CSWrrdtool += CSWlibrrd3
+RUNTIME_DEP_PKGS_CSWrrdtool += CSWlibrrd-th3
 OBSOLETED_BY_CSWrrdtool = CSWrrd
+CATALOGNAME_CSWrrd = rrd_stub
 
 PACKAGES += CSWrrdtool-dev
-CATALOGNAME_CSWrrdtool-dev = rrdtool_dev
-SPKG_DESC_CSWrrdtool-dev = Development files for librrd.so.4
+SPKG_DESC_CSWrrdtool-dev = Development files for librrd.so.3
+# Explicitly do not include *.3perl
+PKGFILES_DEVEL_MAN3_MANPAGE = $(mandir)/man3/.*\.3
 PKGFILES_CSWrrdtool-dev = $(PKGFILES_DEVEL)
-RUNTIME_DEP_PKGS_CSWrrdtool-dev += CSWlibrrd4
-RUNTIME_DEP_PKGS_CSWrrdtool-dev += CSWlibrrd-th4
+RUNTIME_DEP_PKGS_CSWrrdtool-dev += CSWlibrrd3
+RUNTIME_DEP_PKGS_CSWrrdtool-dev += CSWlibrrd-th3
 
-PACKAGES += CSWlibrrd4
-CATALOGNAME_CSWlibrrd4 = librrd4
-SPKG_DESC_CSWlibrrd4 = Runtime library for RRDtool, librrd.so.4
-PKGFILES_CSWlibrrd4 += $(call pkgfiles_lib,librrd.so.4)
-RUNTIME_DEP_PKGS_CSWlibrrd4 += CSWglib2
-RUNTIME_DEP_PKGS_CSWlibrrd4 += CSWlibcairo
-RUNTIME_DEP_PKGS_CSWlibrrd4 += CSWpango
-RUNTIME_DEP_PKGS_CSWlibrrd4 += CSWlibxml2
-RUNTIME_DEP_PKGS_CSWlibrrd4 += CSWlibintl8
-RUNTIME_DEP_PKGS_CSWlibrrd4 += CSWtcpwrap
-RUNTIME_DEP_PKGS_CSWlibrrd4 += CSWlibdbi1
+PACKAGES += CSWlibrrd3
+SPKG_DESC_CSWlibrrd3 = Runtime library for RRDtool, librrd.so.3
+PKGFILES_CSWlibrrd3 += $(call pkgfiles_lib,librrd.so.3)
+RUNTIME_DEP_PKGS_CSWlibrrd3 += CSWlibglib2-0-0
+RUNTIME_DEP_PKGS_CSWlibrrd3 += CSWlibcairo2
+RUNTIME_DEP_PKGS_CSWlibrrd3 += CSWpango
+RUNTIME_DEP_PKGS_CSWlibrrd3 += CSWlibxml2-2
+RUNTIME_DEP_PKGS_CSWlibrrd3 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibrrd3 += CSWlibwrap1
+RUNTIME_DEP_PKGS_CSWlibrrd3 += CSWlibdbi1
 
-PACKAGES += CSWlibrrd-th4
-CATALOGNAME_CSWlibrrd-th4 = librrd_th4
-SPKG_DESC_CSWlibrrd-th4 = Runtime library for RRDtool, librrd_th.so.4
-PKGFILES_CSWlibrrd-th4 += $(call pkgfiles_lib,librrd_th.so.4)
-RUNTIME_DEP_PKGS_CSWlibrrd-th4 += CSWtcpwrap
-RUNTIME_DEP_PKGS_CSWlibrrd-th4 += CSWlibintl8
-RUNTIME_DEP_PKGS_CSWlibrrd-th4 += CSWlibcairo
-RUNTIME_DEP_PKGS_CSWlibrrd-th4 += CSWlibxml2
-RUNTIME_DEP_PKGS_CSWlibrrd-th4 += CSWpango
-RUNTIME_DEP_PKGS_CSWlibrrd-th4 += CSWglib2
-RUNTIME_DEP_PKGS_CSWlibrrd-th4 += CSWlibdbi1
+PACKAGES += CSWlibrrd-th3
+SPKG_DESC_CSWlibrrd-th3 = Runtime library for RRDtool, librrd_th.so.3
+PKGFILES_CSWlibrrd-th3 += $(call pkgfiles_lib,librrd_th.so.3)
+RUNTIME_DEP_PKGS_CSWlibrrd-th3 += CSWlibwrap1
+RUNTIME_DEP_PKGS_CSWlibrrd-th3 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibrrd-th3 += CSWlibcairo2
+RUNTIME_DEP_PKGS_CSWlibrrd-th3 += CSWlibxml2-2
+RUNTIME_DEP_PKGS_CSWlibrrd-th3 += CSWpango
+RUNTIME_DEP_PKGS_CSWlibrrd-th3 += CSWlibglib2-0-0
+RUNTIME_DEP_PKGS_CSWlibrrd-th3 += CSWlibdbi1
 
 PACKAGES += CSWpm-rrdtool
-CATALOGNAME_CSWpm-rrdtool = pm_rrdtool
 SPKG_DESC_CSWpm-rrdtool = RRDs: Access RRDtool as a shared module (part of RRDtool)
 PKGFILES_CSWpm-rrdtool += $(libdir)/perl/.*
 PKGFILES_CSWpm-rrdtool += $(sharedstatedir)/perl/.*
 PKGFILES_CSWpm-rrdtool += $(sharedstatedir)/rrdtool/examples/.*
 PKGFILES_CSWpm-rrdtool += .*\.3perl
+
 RUNTIME_DEP_PKGS_CSWpm-rrdtool += CSWperl
-RUNTIME_DEP_PKGS_CSWpm-rrdtool += CSWlibrrd4
+RUNTIME_DEP_PKGS_CSWpm-rrdtool += CSWlibrrd3
 OBSOLETED_BY_CSWpm-rrdtool = CSWrrd
 
 PACKAGES += CSWpy-rrdtool
-CATALOGNAME_CSWpy-rrdtool = py_rrdtool
 SPKG_DESC_CSWrb-rrdtool = Ruby binding for RRD access (part of RRDtool)
 PKGFILES_CSWpy-rrdtool = $(libdir)/python/.*
 RUNTIME_DEP_PKGS_CSWpy-rrdtool += CSWlibpython2-6-1-0
-RUNTIME_DEP_PKGS_CSWpy-rrdtool += CSWlibrrd4
-RUNTIME_DEP_PKGS_CSWpy-rrdtool += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWpy-rrdtool += CSWlibrrd3
 OBSOLETED_BY_CSWpy-rrdtool = CSWrrd
 
 PACKAGES += CSWrb-rrdtool
-CATALOGNAME_CSWrb-rrdtool = rb_rrdtool
 SPKG_DESC_CSWpy-rrdtool = Python egg for RRD access (part of RRDtool)
 PKGFILES_CSWrb-rrdtool = $(libdir)/ruby/.*
-RUNTIME_DEP_PKGS_CSWrb-rrdtool += CSWlibruby1
-RUNTIME_DEP_PKGS_CSWrb-rrdtool += CSWlibrrd4
+RUNTIME_DEP_PKGS_CSWrb-rrdtool += CSWlibruby18-1
+RUNTIME_DEP_PKGS_CSWrb-rrdtool += CSWlibrrd3
 OBSOLETED_BY_CSWrb-rrdtool = CSWrrd
 # This is crappy and needs fixing, unfortunately inside extconf.rb which is hard.
 CHECKPKG_OVERRIDES_CSWrb-rrdtool += bad-rpath-entry
 
-BUILD_DEP_PKGS += $(RUNTIME_DEP_PKGS_CSWlibrrd4)
-BUILD_DEP_PKGS += CSWpangodevel
-BUILD_DEP_PKGS += CSWlibcairodevel
-BUILD_DEP_PKGS += CSWglib2devel
-BUILD_DEP_PKGS += CSWperl
-BUILD_DEP_PKGS += CSWpython-devel
-BUILD_DEP_PKGS += CSWrubydev
+#CHECKPKG_OVERRIDES_CSWpm-rrdtool += file-with-bad-content|/usr/local|root/opt/csw/share/man/man3/RRDp.3perl
+#CHECKPKG_OVERRIDES_CSWpm-rrdtool += file-with-bad-content|/usr/local|root/opt/csw/share/perl/csw/RRDp.pm
+#CHECKPKG_OVERRIDES_CSWpm-rrdtool += pkginfo-opencsw-repository-uncommitted
+#CHECKPKG_OVERRIDES_CSWrrdtool += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/rrd-beginners.1
+#CHECKPKG_OVERRIDES_CSWrrdtool += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/rrdcgi.1
+#CHECKPKG_OVERRIDES_CSWrrdtool += file-with-bad-content|/usr/local|root/opt/csw/share/doc/rrdtool/html/rrdcgi.html
+#CHECKPKG_OVERRIDES_CSWrrdtool += file-with-bad-content|/usr/local|root/opt/csw/share/doc/rrdtool/html/rrd-beginners.html
+#CHECKPKG_OVERRIDES_CSWrrdtool += file-with-bad-content|/usr/local|root/opt/csw/share/doc/rrdtool/html/RRDp.html
+#CHECKPKG_OVERRIDES_CSWrrdtool += file-with-bad-content|/usr/local|root/opt/csw/share/doc/rrdtool/txt/rrdcgi.txt
+#CHECKPKG_OVERRIDES_CSWrrdtool += file-with-bad-content|/usr/local|root/opt/csw/share/doc/rrdtool/txt/rrd-beginners.pod
+#CHECKPKG_OVERRIDES_CSWrrdtool += file-with-bad-content|/usr/local|root/opt/csw/share/doc/rrdtool/txt/rrd-beginners.txt
+#CHECKPKG_OVERRIDES_CSWrrdtool += file-with-bad-content|/usr/local|root/opt/csw/share/doc/rrdtool/txt/rrdcgi.pod
+#CHECKPKG_OVERRIDES_CSWrrdtool += file-with-bad-content|/usr/share|root/opt/csw/share/man/man1/rrdbuild.1
+#CHECKPKG_OVERRIDES_CSWrrdtool += file-with-bad-content|/usr/share|root/opt/csw/share/doc/rrdtool/html/rrdbuild.html
+#CHECKPKG_OVERRIDES_CSWrrdtool += file-with-bad-content|/usr/share|root/opt/csw/share/doc/rrdtool/txt/rrdbuild.pod
+#CHECKPKG_OVERRIDES_CSWrrdtool += file-with-bad-content|/usr/share|root/opt/csw/share/doc/rrdtool/txt/rrdbuild.txt
 
-EXTRA_INC = $(prefix)/include/cairo
-EXTRA_INC += $(prefix)/include/libxml2
+REINPLACE_USRLOCAL += /opt/csw/share/perl/csw/RRDp.pm
+REINPLACE_USRLOCAL += /opt/csw/share/man/man3/RRDp.3perl
+REINPLACE_USRLOCAL += /opt/csw/share/man/man1/rrd-beginners.1
+REINPLACE_USRLOCAL += /opt/csw/share/man/man1/rrdcgi.1
+REINPLACE_USRLOCAL += /opt/csw/share/doc/rrdtool-$(VERSION)/txt/rrd-beginners.pod
+REINPLACE_USRLOCAL += /opt/csw/share/doc/rrdtool-$(VERSION)/txt/rrdcgi.pod
+REINPLACE_USRLOCAL += /opt/csw/share/doc/rrdtool-$(VERSION)/txt/rrd-beginners.txt
+REINPLACE_USRLOCAL += /opt/csw/share/doc/rrdtool-$(VERSION)/txt/rrdcgi.txt
+REINPLACE_USRLOCAL += /opt/csw/share/doc/rrdtool-$(VERSION)/html/rrd-beginners.html
+REINPLACE_USRLOCAL += /opt/csw/share/doc/rrdtool-$(VERSION)/html/RRDp.html
+REINPLACE_USRLOCAL += /opt/csw/share/doc/rrdtool-$(VERSION)/html/rrdcgi.html
+REINPLACE_WHEN_USRLOCAL = postinstall
 
+REINPLACE_USRSHARE += /opt/csw/share/man/man1/rrdbuild.1
+REINPLACE_USRSHARE += /opt/csw/share/doc/rrdtool-$(VERSION)/txt/rrdbuild.txt
+REINPLACE_USRSHARE += /opt/csw/share/doc/rrdtool-$(VERSION)/txt/rrdbuild.pod
+REINPLACE_USRSHARE += /opt/csw/share/doc/rrdtool-$(VERSION)/html/rrdbuild.html
+REINPLACE_WHEN_USRSHARE = postinstall
+
+EXTRA_INC += $(includedir)/pango-1.0
+EXTRA_INC += $(includedir)/cairo
+EXTRA_INC += $(includedir)/libxml2
+EXTRA_INC += $(includedir)/glib-2.0
+EXTRA_INC += $(libdir)/glib-2.0/include
+
 EXTRA_LINKER_FLAGS = -lintl
 
 BUILD64 = 1
-NOISAEXEC = 1
-STRIP_LIBTOOL = 1
 
+# Verbose build output
+# BUILD_ARGS += V=1
+
 CONFIGURE_ARGS_32 += --enable-python
 CONFIGURE_ARGS_32 += --enable-ruby
 CONFIGURE_ARGS_32 += --with-ruby-options=RUBY_MAKE_OPTIONS=DESTDIR=$(DESTDIR)
 CONFIGURE_ARGS_32 += --enable-perl
+# Reenable when new lua package with pkgconfig is there
+CONFIGURE_ARGS_32 += --disable-lua
 CONFIGURE_ARGS_32 += --with-perl-options=INSTALLDIRS=vendor
 # We don't have any of these in 64 bit (yet!)
 CONFIGURE_ARGS_64 += --disable-python
 CONFIGURE_ARGS_64 += --disable-ruby
 CONFIGURE_ARGS_64 += --disable-perl
+CONFIGURE_ARGS_64 += --disable-lua
 
 CONFIGURE_ARGS  = $(DIRPATHS)
 CONFIGURE_ARGS += --docdir=$(sharedstatedir)/doc/$(NAME)
-CONFIGURE_ARGS += --disable-lua
 CONFIGURE_ARGS += --disable-tcl
 CONFIGURE_ARGS += --with-libintl-prefix=$(libdir)
 CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(MEMORYMODEL))
 
-TEST_TARGET = check
+# TEST_TARGET = check
 
 MERGE_DIRS_isa-extra = $(libdir)
-MERGE_SCRIPTS_isa-extra = copy-relocated-only copy-config-only
+# MERGE_SCRIPTS_isa-extra = copy-relocated-only copy-config-only
 EXTRA_MERGE_EXCLUDE_FILES = .*~ .*perllocal\.pod .*/\.packlist
 EXTRA_PAX_ARGS += -s ',^\.$(docdir)/$(NAME)-$(VERSION),.$(BUILD_PREFIX)/share/doc/rrdtool,'
 
 include gar/category.mk
-
-post-install-modulated:
-	perl -pi -e 's,/usr/local,$(prefix),g' \
-		$(addprefix $(DESTDIR), \
-		/opt/csw/share/perl/csw/RRDp.pm \
-		/opt/csw/share/man/man3/RRDp.3perl \
-		/opt/csw/share/man/man1/rrd-beginners.1 \
-		/opt/csw/share/man/man1/rrdcgi.1 \
-		/opt/csw/share/doc/rrdtool-1.4.5/txt/rrd-beginners.pod \
-		/opt/csw/share/doc/rrdtool-1.4.5/txt/rrdcgi.pod \
-		/opt/csw/share/doc/rrdtool-1.4.5/txt/rrd-beginners.txt \
-		/opt/csw/share/doc/rrdtool-1.4.5/txt/rrdcgi.txt \
-		/opt/csw/share/doc/rrdtool-1.4.5/html/rrd-beginners.html \
-		/opt/csw/share/doc/rrdtool-1.4.5/html/RRDp.html \
-		/opt/csw/share/doc/rrdtool-1.4.5/html/rrdcgi.html \
-		)
-
-	perl -pi -e 's,/usr/share,$(sharedstatedir),g' \
-		$(addprefix $(DESTDIR), \
-		/opt/csw/share/man/man1/rrdbuild.1 \
-		/opt/csw/share/doc/rrdtool-1.4.5/txt/rrdbuild.txt \
-		/opt/csw/share/doc/rrdtool-1.4.5/txt/rrdbuild.pod \
-		/opt/csw/share/doc/rrdtool-1.4.5/html/rrdbuild.html \
-		)
-
-	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/rrdtool/trunk/checksums
===================================================================
--- csw/mgar/pkg/rrdtool/trunk/checksums	2012-01-19 21:07:24 UTC (rev 16831)
+++ csw/mgar/pkg/rrdtool/trunk/checksums	2012-01-19 21:19:21 UTC (rev 16832)
@@ -1 +1 @@
-4d116dba9a0888d8aaac179e35d3980a  rrdtool-1.4.5.tar.gz
+f62316beba89b5f31880850d2c2a5267  rrdtool-1.4.6.tar.gz

Added: csw/mgar/pkg/rrdtool/trunk/files/0001-Do-not-reference-tm.tm_gmtoff-on-Solaris.patch
===================================================================
--- csw/mgar/pkg/rrdtool/trunk/files/0001-Do-not-reference-tm.tm_gmtoff-on-Solaris.patch	                        (rev 0)
+++ csw/mgar/pkg/rrdtool/trunk/files/0001-Do-not-reference-tm.tm_gmtoff-on-Solaris.patch	2012-01-19 21:19:21 UTC (rev 16832)
@@ -0,0 +1,26 @@
+From 62585d67b81bd3b47872a061f8c369504bce986f Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Thu, 19 Jan 2012 15:51:37 +0100
+Subject: [PATCH] Do not reference tm.tm_gmtoff on Solaris
+
+---
+ src/rrd_fetch_libdbi.c |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/src/rrd_fetch_libdbi.c b/src/rrd_fetch_libdbi.c
+index 21fbc08..9d437aa 100644
+--- a/src/rrd_fetch_libdbi.c
++++ b/src/rrd_fetch_libdbi.c
+@@ -464,7 +464,9 @@ rrd_fetch_fn_libdbi(
+     struct tm tm;
+     time_t t=time(NULL);
+     localtime_r(&t,&tm);
++#if !defined(__sun) && !defined(__sun__)
+     gmt_offset=tm.tm_gmtoff;
++#endif
+     isunixtime=0; table_help.timestamp++;
+   }
+   /* hex-unescape the value */
+-- 
+1.7.8.3
+

Added: csw/mgar/pkg/rrdtool/trunk/files/0002-Always-link-local-libs-first-during-Perl-module.patch
===================================================================
--- csw/mgar/pkg/rrdtool/trunk/files/0002-Always-link-local-libs-first-during-Perl-module.patch	                        (rev 0)
+++ csw/mgar/pkg/rrdtool/trunk/files/0002-Always-link-local-libs-first-during-Perl-module.patch	2012-01-19 21:19:21 UTC (rev 16832)
@@ -0,0 +1,25 @@
+From 29ea3c2cccc14da8b3cbcd02a0965563dfbe680a Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Thu, 19 Jan 2012 16:39:18 +0100
+Subject: [PATCH] Always link local libs first during Perl module
+
+---
+ bindings/perl-shared/Makefile.PL |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/bindings/perl-shared/Makefile.PL b/bindings/perl-shared/Makefile.PL
+index 781682c..85e2629 100644
+--- a/bindings/perl-shared/Makefile.PL
++++ b/bindings/perl-shared/Makefile.PL
+@@ -57,7 +57,7 @@ if (($Config{'osname'} eq 'MSWin32' && $ENV{'OSTYPE'} eq '')) {
+ 		'depend'       => {'RRDs.c' => "../../src/librrd.la"},
+ 		'LDFROM'       => '$(OBJECT) '.$librrd, 
+ 		'realclean'    => {FILES => 't/demo?.rrd t/demo?.png' },
+-		($^O eq 'darwin') ? ( 'LDDLFLAGS'    => "-L../../src/.libs/ $Config{lddlflags}" ) : ()
++		'LDDLFLAGS'    => "-L../../src/.libs/ $Config{lddlflags}"
+ 	);
+ }
+ 
+-- 
+1.7.8.3
+

Added: csw/mgar/pkg/rrdtool/trunk/files/0003-Always-link-against-libperl.so.patch
===================================================================
--- csw/mgar/pkg/rrdtool/trunk/files/0003-Always-link-against-libperl.so.patch	                        (rev 0)
+++ csw/mgar/pkg/rrdtool/trunk/files/0003-Always-link-against-libperl.so.patch	2012-01-19 21:19:21 UTC (rev 16832)
@@ -0,0 +1,37 @@
+From d9cd315cb85caf2e4c5237d4a055367b776feda0 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Thu, 19 Jan 2012 16:42:41 +0100
+Subject: [PATCH] Always link against libperl.so
+
+---
+ bindings/perl-piped/Makefile.PL  |    1 +
+ bindings/perl-shared/Makefile.PL |    1 +
+ 2 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/bindings/perl-piped/Makefile.PL b/bindings/perl-piped/Makefile.PL
+index 5c1a98f..2aa47db 100644
+--- a/bindings/perl-piped/Makefile.PL
++++ b/bindings/perl-piped/Makefile.PL
+@@ -5,6 +5,7 @@ use ExtUtils::MakeMaker;
+ WriteMakefile(
+     'NAME'         => 'RRDp',
+     'VERSION'      => '0.99.0', # finds $VERSION
++    'LIBS'         => '-lperl',
+     'linkext'   => {LINKTYPE => ''},
+     'dist'    =>    {COMPRESS=>'gzip', SUFFIX=>'gz'},
+ );
+diff --git a/bindings/perl-shared/Makefile.PL b/bindings/perl-shared/Makefile.PL
+index 85e2629..094b48f 100644
+--- a/bindings/perl-shared/Makefile.PL
++++ b/bindings/perl-shared/Makefile.PL
+@@ -52,6 +52,7 @@ if (($Config{'osname'} eq 'MSWin32' && $ENV{'OSTYPE'} eq '')) {
+ 		'VERSION_FROM' => 'RRDs.pm', # finds $VERSION
+ 		'DEFINE'	   => "-DPERLPATCHLEVEL=$Config{PATCHLEVEL}",
+ 		'INC'          => '-I../../src',
++		'LIBS'         => '-lperl',
+ 		# Perl will figure out which one is valid
+ 		#'dynamic_lib'  => {'OTHERLDFLAGS' => "$librrd -lm"},
+ 		'depend'       => {'RRDs.c' => "../../src/librrd.la"},
+-- 
+1.7.8.3
+

Added: csw/mgar/pkg/rrdtool/trunk/files/0004-Do-not-pass-LDFLAGS-to-pysetup-or-the-system-lib-is-.patch
===================================================================
--- csw/mgar/pkg/rrdtool/trunk/files/0004-Do-not-pass-LDFLAGS-to-pysetup-or-the-system-lib-is-.patch	                        (rev 0)
+++ csw/mgar/pkg/rrdtool/trunk/files/0004-Do-not-pass-LDFLAGS-to-pysetup-or-the-system-lib-is-.patch	2012-01-19 21:19:21 UTC (rev 16832)
@@ -0,0 +1,26 @@
+From 0e9bcfe4f39134290074fb44b664590ee855f17b Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Thu, 19 Jan 2012 21:40:56 +0100
+Subject: [PATCH] Do not pass LDFLAGS to pysetup or the system lib is pulled
+ in before the newly build one
+
+---
+ bindings/Makefile.in |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/bindings/Makefile.in b/bindings/Makefile.in
+index 1c8548e..5200f60 100644
+--- a/bindings/Makefile.in
++++ b/bindings/Makefile.in
+@@ -670,7 +670,7 @@ ruby:   Makefile
+ 
+ # rules for building the pyton module
+ python: Makefile
+-	cd python && env BUILDLIBDIR=../../src/.libs $(PYTHON) setup.py build_ext --rpath=$(libdir) && env LIBDIR=../../src/.libs $(PYTHON) setup.py build
++	cd python && env BUILDLIBDIR=../../src/.libs LDFLAGS= $(PYTHON) setup.py build_ext --rpath=$(libdir) && env LIBDIR=../../src/.libs $(PYTHON) setup.py build
+ 
+ # rules for building the perl module
+ perl_piped: perl-piped/Makefile
+-- 
+1.7.8.3
+

Deleted: csw/mgar/pkg/rrdtool/trunk/files/patch-bindings-perl-piped-Makefile.PL
===================================================================
--- csw/mgar/pkg/rrdtool/trunk/files/patch-bindings-perl-piped-Makefile.PL	2012-01-19 21:07:24 UTC (rev 16831)
+++ csw/mgar/pkg/rrdtool/trunk/files/patch-bindings-perl-piped-Makefile.PL	2012-01-19 21:19:21 UTC (rev 16832)
@@ -1,10 +0,0 @@
---- rrdtool-1.4.2.orig/bindings/perl-piped/Makefile.PL	2008-03-15 11:39:48.000000000 +0100
-+++ rrdtool-1.4.2/bindings/perl-piped/Makefile.PL	2010-03-04 16:15:51.013159708 +0100
-@@ -5,6 +5,7 @@
- WriteMakefile(
-     'NAME'         => 'RRDp',
-     'VERSION'      => '0.99.0', # finds $VERSION
-+    'LIBS'         => '-lperl',
-     'linkext'   => {LINKTYPE => ''},
-     'dist'    =>    {COMPRESS=>'gzip', SUFFIX=>'gz'},
- );

Deleted: csw/mgar/pkg/rrdtool/trunk/files/patch-bindings-perl-shared-Makefile.PL
===================================================================
--- csw/mgar/pkg/rrdtool/trunk/files/patch-bindings-perl-shared-Makefile.PL	2012-01-19 21:07:24 UTC (rev 16831)
+++ csw/mgar/pkg/rrdtool/trunk/files/patch-bindings-perl-shared-Makefile.PL	2012-01-19 21:19:21 UTC (rev 16832)
@@ -1,10 +0,0 @@
---- rrdtool-1.4.2.orig/bindings/perl-shared/Makefile.PL	2008-12-05 16:39:55.000000000 +0100
-+++ rrdtool-1.4.2/bindings/perl-shared/Makefile.PL	2010-03-04 16:15:30.877275566 +0100
-@@ -37,6 +37,7 @@
-     'VERSION_FROM' => 'RRDs.pm', # finds $VERSION
-     'DEFINE'	   => "-DPERLPATCHLEVEL=$Config{PATCHLEVEL}",
-     'INC'          => '-I../../src',
-+    'LIBS'         => '-lperl',
-     # Perl will figure out which one is valid
-     #'dynamic_lib'  => {'OTHERLDFLAGS' => "$librrd -lm"},
-     'depend'       => {'RRDs.c' => "../../src/librrd.la"},

Deleted: csw/mgar/pkg/rrdtool/trunk/files/patch-bindings-ruby-extconf.rb
===================================================================
--- csw/mgar/pkg/rrdtool/trunk/files/patch-bindings-ruby-extconf.rb	2012-01-19 21:07:24 UTC (rev 16831)
+++ csw/mgar/pkg/rrdtool/trunk/files/patch-bindings-ruby-extconf.rb	2012-01-19 21:19:21 UTC (rev 16832)
@@ -1,11 +0,0 @@
---- rrdtool-1.4.2.orig/bindings/ruby/extconf.rb	2010-03-02 16:12:18.622716000 +0100
-+++ rrdtool-1.4.2/bindings/ruby/extconf.rb	2010-03-02 17:27:47.399923107 +0100
-@@ -6,7 +6,7 @@
- if /linux/ =~ RUBY_PLATFORM
-    $LDFLAGS += '-Wl,--rpath -Wl,$(EPREFIX)/lib'
- elsif /solaris/ =~ RUBY_PLATFORM
--   $LDFLAGS += '-R$(EPREFIX)/lib'
-+   $LDFLAGS += ' -R$(EPREFIX)/lib'
- elsif /hpux/ =~ RUBY_PLATFORM
-    $LDFLAGS += '+b$(EPREFIX)/lib'
- elsif /aix/ =~ RUBY_PLATFORM

Deleted: csw/mgar/pkg/rrdtool/trunk/gar
===================================================================
--- csw/mgar/pkg/rrdtool/trunk/gar	2012-01-19 21:07:24 UTC (rev 16831)
+++ csw/mgar/pkg/rrdtool/trunk/gar	2012-01-19 21:19:21 UTC (rev 16832)
@@ -1 +0,0 @@
-link ../../../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 wahwah at users.sourceforge.net  Fri Jan 20 01:13:22 2012
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Fri, 20 Jan 2012 00:13:22 +0000
Subject: [csw-devel] SF.net SVN: gar:[16833]
	csw/mgar/pkg/opencsw-manual/trunk/files/conf.py
Message-ID: <E1Ro26c-0003oW-Cl@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 16833
          http://gar.svn.sourceforge.net/gar/?rev=16833&view=rev
Author:   wahwah
Date:     2012-01-20 00:13:22 +0000 (Fri, 20 Jan 2012)
Log Message:
-----------
opencsw-manual/trunk: Set the doc version to 0.1

Modified Paths:
--------------
    csw/mgar/pkg/opencsw-manual/trunk/files/conf.py

Modified: csw/mgar/pkg/opencsw-manual/trunk/files/conf.py
===================================================================
--- csw/mgar/pkg/opencsw-manual/trunk/files/conf.py	2012-01-19 21:19:21 UTC (rev 16832)
+++ csw/mgar/pkg/opencsw-manual/trunk/files/conf.py	2012-01-20 00:13:22 UTC (rev 16833)
@@ -48,9 +48,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '1.0'
+version = '0.1'
 # The full version, including alpha/beta/rc tags.
-release = '1.0'
+release = '0.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

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


From cgrzemba at users.sourceforge.net  Fri Jan 20 08:23:56 2012
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Fri, 20 Jan 2012 07:23:56 +0000
Subject: [csw-devel] SF.net SVN: gar:[16834]
	csw/mgar/pkg/389-admin/trunk/Makefile
Message-ID: <E1Ro8pI-000602-1d@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 16834
          http://gar.svn.sourceforge.net/gar/?rev=16834&view=rev
Author:   cgrzemba
Date:     2012-01-20 07:23:55 +0000 (Fri, 20 Jan 2012)
Log Message:
-----------
389-admin/trunk: add lib package

Modified Paths:
--------------
    csw/mgar/pkg/389-admin/trunk/Makefile

Modified: csw/mgar/pkg/389-admin/trunk/Makefile
===================================================================
--- csw/mgar/pkg/389-admin/trunk/Makefile	2012-01-20 00:13:22 UTC (rev 16833)
+++ csw/mgar/pkg/389-admin/trunk/Makefile	2012-01-20 07:23:55 UTC (rev 16834)
@@ -6,7 +6,7 @@
 GARTYPE = v2
 CATEGORIES = lib
 
-DESCRIPTION = The enterprise-class Open Source LDAP server
+DESCRIPTION = The 389 LDAP server Admin Tools
 define BLURB
 The enterprise-class Open Source LDAP server for Linux. It is hardened by real-world use, is full-featured, supports multi-master replication, and already handles many of the largest LDAP deployments in the world. The 389 Directory Server can be downloaded for free and set up in less than an hour using the graphical console.
 endef
@@ -23,7 +23,24 @@
 
 PATCHFILES += 0001-change-includedir-preference-in-Makefile.am.patch
 
-PACKAGES = CSW389admin
+PACKAGES += CSWlibds-admin-serv0
+CATALOGNAME_CSWlibds-admin-serv0 = libds_admin_serv0
+PKGFILES_CSWlibds-admin-serv0 += $(call baseisadirs,$(libdir),libds-admin-serv\.so\.0(\.\d+)*)
+SPKG_DESC_CSWlibds-admin-serv0 += $(DESCRIPTION), libds-admin-serv.so.0
+RUNTIME_DEP_PKGS_CSWlibds-admin-serv0 += CSWlibadmsslutil0
+RUNTIME_DEP_PKGS_CSWlibds-admin-serv0 += CSWlibadminutil0
+RUNTIME_DEP_PKGS_CSWlibds-admin-serv0 += CSWlibplds4
+RUNTIME_DEP_PKGS_CSWlibds-admin-serv0 += CSWlibnspr4
+RUNTIME_DEP_PKGS_CSWlibds-admin-serv0 += CSWlibplc4
+
+PACKAGES += CSW389admin-dev
+CATALOGNAME_CSW389admin-dev = 389admin_dev
+SPKG_DESC_CSW389admin-dev += $(DESCRIPTION), development files
+PKGFILES_CSW389admin-dev += /opt/csw/lib/libds-admin-serv.so
+CHECKPKG_OVERRIDES_CSW389admin-dev += missing-dependency|CSWlibds-admin-serv0
+
+PACKAGES += CSW389admin
+SPKG_DESC_CSW389admin += $(DESCRIPTION)
 INITSMF = /etc/opt/csw/init.d/dirsrv-admin
 RUNTIME_DEP_PKGS_CSW389admin = CSWap2modnss
 RUNTIME_DEP_PKGS_CSW389admin += CSWlibprldap60
@@ -38,13 +55,11 @@
 RUNTIME_DEP_PKGS_CSW389admin += CSWlibnss-dev
 RUNTIME_DEP_PKGS_CSW389admin += CSWlibicuuc48
 RUNTIME_DEP_PKGS_CSW389admin += CSWlibicui18n48
+RUNTIME_DEP_PKGS_CSW389admin += CSWlibds-admin-serv0
 RUNTIME_DEP_PKGS_CSW389admin += CSWlibadminutil0
 RUNTIME_DEP_PKGS_CSW389admin += CSWlibplds4
 RUNTIME_DEP_PKGS_CSW389admin += CSWlibldap60
-CHECKPKG_OVERRIDES_CSW389admin += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libds-admin-serv.so
-CHECKPKG_OVERRIDES_CSW389admin += pkginfo-opencsw-repository-uncommitted
-CHECKPKG_OVERRIDES_CSW389admin += shared-lib-pkgname-mismatch|file=opt/csw/lib/libds-admin-serv.so.0.0.0|soname=libds-admin-serv.so.0|pkgname=CSW389admin|expected=CSWlibds-admin-serv0
-CHECKPKG_OVERRIDES_CSW389admin += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libds-admin-serv.so
+CHECKPKG_OVERRIDES_CSW389admin += surplus-dependency|CSWap2modnss
 
 # remove -I/opt/csw/include
 CPPFLAGS = 

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


From cgrzemba at users.sourceforge.net  Fri Jan 20 08:26:55 2012
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Fri, 20 Jan 2012 07:26:55 +0000
Subject: [csw-devel] SF.net SVN: gar:[16835]
	csw/mgar/pkg/389-admin/trunk/Makefile
Message-ID: <E1Ro8sB-000656-GJ@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 16835
          http://gar.svn.sourceforge.net/gar/?rev=16835&view=rev
Author:   cgrzemba
Date:     2012-01-20 07:26:55 +0000 (Fri, 20 Jan 2012)
Log Message:
-----------
389-admin/trunk: add lib package dependency

Modified Paths:
--------------
    csw/mgar/pkg/389-admin/trunk/Makefile

Modified: csw/mgar/pkg/389-admin/trunk/Makefile
===================================================================
--- csw/mgar/pkg/389-admin/trunk/Makefile	2012-01-20 07:23:55 UTC (rev 16834)
+++ csw/mgar/pkg/389-admin/trunk/Makefile	2012-01-20 07:26:55 UTC (rev 16835)
@@ -37,6 +37,7 @@
 CATALOGNAME_CSW389admin-dev = 389admin_dev
 SPKG_DESC_CSW389admin-dev += $(DESCRIPTION), development files
 PKGFILES_CSW389admin-dev += /opt/csw/lib/libds-admin-serv.so
+RUNTIME_DEP_PKGS_CSW389admin-dev += CSWlibds-admin-serv0
 CHECKPKG_OVERRIDES_CSW389admin-dev += missing-dependency|CSWlibds-admin-serv0
 
 PACKAGES += CSW389admin

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


From cgrzemba at users.sourceforge.net  Fri Jan 20 09:01:44 2012
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Fri, 20 Jan 2012 08:01:44 +0000
Subject: [csw-devel] SF.net SVN: gar:[16836]
	csw/mgar/pkg/389-admin/trunk/Makefile
Message-ID: <E1Ro9Ps-0002pd-LM@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 16836
          http://gar.svn.sourceforge.net/gar/?rev=16836&view=rev
Author:   cgrzemba
Date:     2012-01-20 08:01:44 +0000 (Fri, 20 Jan 2012)
Log Message:
-----------
389-admin/trunk: add link option -liconv

Modified Paths:
--------------
    csw/mgar/pkg/389-admin/trunk/Makefile

Modified: csw/mgar/pkg/389-admin/trunk/Makefile
===================================================================
--- csw/mgar/pkg/389-admin/trunk/Makefile	2012-01-20 07:26:55 UTC (rev 16835)
+++ csw/mgar/pkg/389-admin/trunk/Makefile	2012-01-20 08:01:44 UTC (rev 16836)
@@ -64,8 +64,7 @@
 
 # remove -I/opt/csw/include
 CPPFLAGS = 
-# EXTRA_LINKER_FLAGS = -xnorunpath -norunpath -liconv
-EXTRA_LINKER_FLAGS = -xnorunpath -norunpath
+EXTRA_LINKER_FLAGS = -xnorunpath -norunpath -liconv
 
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS_OPT += --with-ldapsdk-inc=/opt/csw/include/dirsrv 

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


From cgrzemba at users.sourceforge.net  Fri Jan 20 09:12:04 2012
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Fri, 20 Jan 2012 08:12:04 +0000
Subject: [csw-devel] SF.net SVN: gar:[16837] csw/mgar/pkg/nss/trunk/Makefile
Message-ID: <E1Ro9Zs-00081p-MI@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 16837
          http://gar.svn.sourceforge.net/gar/?rev=16837&view=rev
Author:   cgrzemba
Date:     2012-01-20 08:12:04 +0000 (Fri, 20 Jan 2012)
Log Message:
-----------
nss/trunk: change checkpkg hints

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

Modified: csw/mgar/pkg/nss/trunk/Makefile
===================================================================
--- csw/mgar/pkg/nss/trunk/Makefile	2012-01-20 08:01:44 UTC (rev 16836)
+++ csw/mgar/pkg/nss/trunk/Makefile	2012-01-20 08:12:04 UTC (rev 16837)
@@ -245,6 +245,7 @@
 # NSS_LD_OPTIONS = -R'$$ORIGIN'
 
 # CHECKPKG_OVERRIDES_CSWlibfreebl3 += shared-lib-pkgname-mismatch|sonames=libfreebl_32fpu_3.so,libfreebl_32int64_3.so,libfreebl_32int_3.so,libfreebl_64fpu_3.so,libfreebl_64int_3.so|pkgname=CSWlibfreebl3|expected=CSWlibfreebl|
+CHECKPKG_OVERRIDES_CSWlibfreebl3 += shared-lib-pkgname-mismatch
 CHECKPKG_OVERRIDES_CSWlibfreebl3 += soname-equals-filename|file=/opt/csw/lib/sparcv9/libfreebl_64fpu_3.so
 CHECKPKG_OVERRIDES_CSWlibfreebl3 += soname-equals-filename|file=/opt/csw/lib/sparcv9/libfreebl_64int_3.so
 CHECKPKG_OVERRIDES_CSWlibfreebl3 += soname-equals-filename|file=/opt/csw/lib/libfreebl_32int_3.so

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


From cgrzemba at users.sourceforge.net  Fri Jan 20 09:24:17 2012
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Fri, 20 Jan 2012 08:24:17 +0000
Subject: [csw-devel] SF.net SVN: gar:[16838]
	csw/mgar/pkg/389-ds-base/trunk/Makefile
Message-ID: <E1Ro9lh-0003Ao-Dm@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 16838
          http://gar.svn.sourceforge.net/gar/?rev=16838&view=rev
Author:   cgrzemba
Date:     2012-01-20 08:24:16 +0000 (Fri, 20 Jan 2012)
Log Message:
-----------
389-ds-base/trunk: remove checkpkg override

Modified Paths:
--------------
    csw/mgar/pkg/389-ds-base/trunk/Makefile

Modified: csw/mgar/pkg/389-ds-base/trunk/Makefile
===================================================================
--- csw/mgar/pkg/389-ds-base/trunk/Makefile	2012-01-20 08:12:04 UTC (rev 16837)
+++ csw/mgar/pkg/389-ds-base/trunk/Makefile	2012-01-20 08:24:16 UTC (rev 16838)
@@ -47,7 +47,6 @@
 RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibicuuc48
 RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibicui18n48
 RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibk5crypto3
-CHECKPKG_OVERRIDES_CSW389-ds-base += pkginfo-opencsw-repository-uncommitted
 
 CHECKPKG_OVERRIDES_CSW389-ds-base += file-with-bad-content|/usr/share|root/opt/csw/lib/dirsrv/perl/DSUpdate.pm
 CHECKPKG_OVERRIDES_CSW389-ds-base += file-with-bad-content|/usr/share|root/opt/csw/share/dirsrv/updates/exampleupdate.ldif

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


From cgrzemba at users.sourceforge.net  Fri Jan 20 09:58:04 2012
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Fri, 20 Jan 2012 08:58:04 +0000
Subject: [csw-devel] SF.net SVN: gar:[16839]
	csw/mgar/pkg/389-ds-base/trunk/Makefile
Message-ID: <E1RoAIO-00065j-2a@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 16839
          http://gar.svn.sourceforge.net/gar/?rev=16839&view=rev
Author:   cgrzemba
Date:     2012-01-20 08:58:03 +0000 (Fri, 20 Jan 2012)
Log Message:
-----------
389-ds-base/trunk: add pm-mozldap dependency

Modified Paths:
--------------
    csw/mgar/pkg/389-ds-base/trunk/Makefile

Modified: csw/mgar/pkg/389-ds-base/trunk/Makefile
===================================================================
--- csw/mgar/pkg/389-ds-base/trunk/Makefile	2012-01-20 08:24:16 UTC (rev 16838)
+++ csw/mgar/pkg/389-ds-base/trunk/Makefile	2012-01-20 08:58:03 UTC (rev 16839)
@@ -47,13 +47,15 @@
 RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibicuuc48
 RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibicui18n48
 RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibk5crypto3
+RUNTIME_DEP_PKGS_CSW389-ds-base += CSWpm-mozldap
 
 CHECKPKG_OVERRIDES_CSW389-ds-base += file-with-bad-content|/usr/share|root/opt/csw/lib/dirsrv/perl/DSUpdate.pm
 CHECKPKG_OVERRIDES_CSW389-ds-base += file-with-bad-content|/usr/share|root/opt/csw/share/dirsrv/updates/exampleupdate.ldif
 CHECKPKG_OVERRIDES_CSW389-ds-base += file-with-bad-content|/usr/share|root/opt/csw/share/man/man1/dbgen.pl.1
 CHECKPKG_OVERRIDES_CSW389-ds-base += init-file-missing-cswinitsmf-class|/etc/opt/csw/init.d/dirsrv-snmp|class=none
+CHECKPKG_OVERRIDES_CSW389-ds-base += surplus-dependency|CSWpm-mozldap
 
-GARCOMPILER = SOS12U2
+# GARCOMPILER = SOS12U2
 EXTRA_LIB = /opt/csw/bdb48/lib
 # remove -I/opt/csw/include
 CPPFLAGS = 

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


From wahwah at users.sourceforge.net  Fri Jan 20 10:43:06 2012
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Fri, 20 Jan 2012 09:43:06 +0000
Subject: [csw-devel] SF.net SVN: gar:[16840] csw/mgar/gar/v2/gar.mk
Message-ID: <E1RoAzy-0006o5-26@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 16840
          http://gar.svn.sourceforge.net/gar/?rev=16840&view=rev
Author:   wahwah
Date:     2012-01-20 09:43:05 +0000 (Fri, 20 Jan 2012)
Log Message:
-----------
mGAR v2: Rename CONFIG_FILES to DEVEL_EXECUTABLES

It better describes what the variable refers to.

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

Modified: csw/mgar/gar/v2/gar.mk
===================================================================
--- csw/mgar/gar/v2/gar.mk	2012-01-20 08:58:03 UTC (rev 16839)
+++ csw/mgar/gar/v2/gar.mk	2012-01-20 09:43:05 UTC (rev 16840)
@@ -943,12 +943,12 @@
 	)
 	@$(MAKECOOKIE)
 
-CONFIG_FILES ?= $(bindir)/.*_config $(bindir)/.*-config
+DEVEL_EXECUTABLES ?= $(bindir)/.*_config $(bindir)/.*-config
 
 # Copy 
 merge-copy-config-only:
 	$(_DBG_MERGE)(cd $(INSTALLISADIR)$(if $(ALLOW_RELOCATE),$(RELOCATE_PREFIX)); umask 022 && pcopy \
-		-m $(foreach C,$(CONFIG_FILES),-s ",^\(\.$C\)\$$,\1,p" ) \
+		-m $(foreach C,$(DEVEL_EXECUTABLES),-s ",^\(\.$C\)\$$,\1,p" ) \
 		. $(PKGROOT) \
 	)
 	@$(MAKECOOKIE)

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


From wahwah at users.sourceforge.net  Fri Jan 20 10:43:41 2012
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Fri, 20 Jan 2012 09:43:41 +0000
Subject: [csw-devel] SF.net SVN: gar:[16841]
	csw/mgar/gar/v2/lib/python/pkgdb.py
Message-ID: <E1RoB0X-0001cq-Ce@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 16841
          http://gar.svn.sourceforge.net/gar/?rev=16841&view=rev
Author:   wahwah
Date:     2012-01-20 09:43:41 +0000 (Fri, 20 Jan 2012)
Log Message:
-----------
pkgdb: A better error message for a common problem

There are some scenarios when package metadata aren't imported properly, and
a run of pkgdb results in a permission denied error. Try to display a better
error message when that happens.

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

Modified: csw/mgar/gar/v2/lib/python/pkgdb.py
===================================================================
--- csw/mgar/gar/v2/lib/python/pkgdb.py	2012-01-20 09:43:05 UTC (rev 16840)
+++ csw/mgar/gar/v2/lib/python/pkgdb.py	2012-01-20 09:43:41 UTC (rev 16841)
@@ -438,8 +438,20 @@
         logger=logging,
         debug=options.debug)
     file_list = args
-    stats_list = collector.CollectStatsFromFiles(file_list, None,
-        force_unpack=options.force_unpack)
+    try:
+      stats_list = collector.CollectStatsFromFiles(file_list, None,
+          force_unpack=options.force_unpack)
+    except sqlobject.dberrors.OperationalError, e:
+      exception_msg = ("DELETE command denied to user "
+                       "'pkg_maintainer'@'192.168.1.2' for table 'csw_file'")
+      if exception_msg in str(e):
+        logging.fatal(
+            "You don't have sufficient privileges to overwrite previously "
+            "imported package. Did you run checkpkg before running "
+            "csw-upload-pkg?")
+        sys.exit(1)
+      else:
+        raise e
     for stats in stats_list:
       logging.debug(
           "Importing %s, %s",

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


From wahwah at users.sourceforge.net  Fri Jan 20 10:44:12 2012
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Fri, 20 Jan 2012 09:44:12 +0000
Subject: [csw-devel] SF.net SVN: gar:[16842]
	csw/mgar/gar/v2/lib/web/pkgdb_web.py
Message-ID: <E1RoB12-0006ov-4Y@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 16842
          http://gar.svn.sourceforge.net/gar/?rev=16842&view=rev
Author:   wahwah
Date:     2012-01-20 09:44:11 +0000 (Fri, 20 Jan 2012)
Log Message:
-----------
pkgdb-web: A silly daylight savings related change.

Modified Paths:
--------------
    csw/mgar/gar/v2/lib/web/pkgdb_web.py

Modified: csw/mgar/gar/v2/lib/web/pkgdb_web.py
===================================================================
--- csw/mgar/gar/v2/lib/web/pkgdb_web.py	2012-01-20 09:43:41 UTC (rev 16841)
+++ csw/mgar/gar/v2/lib/web/pkgdb_web.py	2012-01-20 09:44:11 UTC (rev 16842)
@@ -63,7 +63,7 @@
     def Ago(timedelta):
       # Not sure why there is a time difference between mysql and the datetime
       # module.
-      timezone_diff = 2.0
+      timezone_diff = 1.0
       return "%.1fh" % (timedelta.seconds / 60.0 / 60.0 - timezone_diff)
     pkgs_ago = [(x, Ago(now - x.mtime)) for x in pkgs]
     return render.Srv4List(pkgs_ago)

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


From wahwah at users.sourceforge.net  Fri Jan 20 10:44:41 2012
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Fri, 20 Jan 2012 09:44:41 +0000
Subject: [csw-devel] SF.net SVN: gar:[16843]
	csw/mgar/gar/v2/lib/python/csw_upload_pkg_test.py
Message-ID: <E1RoB1V-0001eL-Op@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 16843
          http://gar.svn.sourceforge.net/gar/?rev=16843&view=rev
Author:   wahwah
Date:     2012-01-20 09:44:41 +0000 (Fri, 20 Jan 2012)
Log Message:
-----------
csw-upload-pkg: Add a unit test with a 5.8 pkg

Added during debugging of another issue, saving here for completeness.

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

Modified: csw/mgar/gar/v2/lib/python/csw_upload_pkg_test.py
===================================================================
--- csw/mgar/gar/v2/lib/python/csw_upload_pkg_test.py	2012-01-20 09:44:11 UTC (rev 16842)
+++ csw/mgar/gar/v2/lib/python/csw_upload_pkg_test.py	2012-01-20 09:44:41 UTC (rev 16843)
@@ -11,6 +11,21 @@
 import rest
 import copy
 
+GDB_STRUCT_8 = {
+    "arch": "sparc",
+    "basename": "gdb-7.2,REV=2011.01.21-SunOS5.8-sparc-CSW.pkg.gz",
+    "catalogname": "gdb",
+    "filename_arch": "sparc",
+    "maintainer_email": "pfele... at opencsw.org",
+    "maintainer_full_name": None,
+    "md5_sum": "7971e31461b53638d7813407fab4765b",
+    "mtime": "2011-01-24 03:09:54",
+    "osrel": "SunOS5.8",
+    "pkgname": "CSWgdb",
+    "rev": "2011.01.21",
+    "size": 7616184,
+    "version_string": "7.2,REV=2011.01.21",
+}
 GDB_STRUCT_9 = {
     "arch": "sparc",
     "basename": "gdb-7.2,REV=2011.01.21-SunOS5.9-sparc-CSW.pkg.gz",
@@ -253,7 +268,30 @@
     )
     self.assertEquals(expected, result)
 
+  def test_MatchSrv4ToCatalogsSolaris8(self):
+    rest_client_mock = self.mox.CreateMock(rest.RestClient)
+    self.mox.StubOutWithMock(rest, "RestClient")
+    rest.RestClient(None).AndReturn(rest_client_mock)
+    rest_client_mock.Srv4ByCatalogAndCatalogname(
+        'unstable', 'sparc', u'SunOS5.9', 'gdb').AndReturn(GDB_STRUCT_8)
+    rest_client_mock.Srv4ByCatalogAndCatalogname(
+        'unstable', 'sparc', u'SunOS5.10', 'gdb').AndReturn(GDB_STRUCT_8)
+    rest_client_mock.Srv4ByCatalogAndCatalogname(
+        'unstable', 'sparc', u'SunOS5.11', 'gdb').AndReturn(GDB_STRUCT_8)
+    self.mox.ReplayAll()
+    su = csw_upload_pkg.Srv4Uploader(None, None)
+    result = su._MatchSrv4ToCatalogs(
+        "gdb-7.2,REV=2011.01.21-SunOS5.9-sparc-CSW.pkg.gz",
+        "unstable", "sparc", "SunOS5.9",
+        "deadbeef61b53638d7813407fab4765b")
+    expected = (
+        ("unstable", "sparc", "SunOS5.9"),
+        ("unstable", "sparc", "SunOS5.10"),
+        ("unstable", "sparc", "SunOS5.11"),
+    )
+    self.assertEquals(expected, result)
 
+
 class Srv4UploaderDataDrivenUnitTest(mox.MoxTestBase):
   """A unit test doing an search over multiple combinations.
 
@@ -268,6 +306,7 @@
       ((None, None, None),  9, None, (9, 10, 11)),
       ((None, None,    9),  9, None, (9, 10, 11)),
       ((None,    9,    9),  9, None, (9, 10, 11)),
+      ((   8,    8,    8),  9, None, (9, 10, 11)), # No insertion to 5.8
       ((   9,    9,    9),  9, None, (9, 10, 11)),
       ((None,    9,   10),  9, None, (9, 10)),
       ((   9,    9,   10),  9, None, (9, 10)),
@@ -294,6 +333,7 @@
   def DataPointTest(self, in_catalog, pkg_osrel, osrel_spec, expected_rels):
     pkg_struct_map = {
         None: None,
+        8: GDB_STRUCT_8,
         9: GDB_STRUCT_9,
         10: GDB_STRUCT_10,
         11: GDB_STRUCT_11,

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


From wahwah at users.sourceforge.net  Fri Jan 20 10:45:15 2012
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Fri, 20 Jan 2012 09:45:15 +0000
Subject: [csw-devel] SF.net SVN: gar:[16844] csw/mgar/gar/v2/lib
Message-ID: <E1RoB23-0001fA-Pm@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 16844
          http://gar.svn.sourceforge.net/gar/?rev=16844&view=rev
Author:   wahwah
Date:     2012-01-20 09:45:15 +0000 (Fri, 20 Jan 2012)
Log Message:
-----------
pkgdb-web: RESTful maintainer data (read-only)

There isn't much of that data, we don't have the maintainer status, for
example. The only two fields are email and the full name.

Modified Paths:
--------------
    csw/mgar/gar/v2/lib/python/models.py
    csw/mgar/gar/v2/lib/web/pkgdb_web.py

Modified: csw/mgar/gar/v2/lib/python/models.py
===================================================================
--- csw/mgar/gar/v2/lib/python/models.py	2012-01-20 09:44:41 UTC (rev 16843)
+++ csw/mgar/gar/v2/lib/python/models.py	2012-01-20 09:45:15 UTC (rev 16844)
@@ -63,6 +63,13 @@
         self.full_name or "Maintainer full name unknown",
         self.ObfuscatedEmail())
 
+  def GetRestRepr(self):
+    return {
+        'maintainer_email': self.email,
+        'maintainer_full_name': self.full_name,
+        'maintainer_id': self.id,
+    }
+
 class Host(sqlobject.SQLObject):
   "Hostname, as returned by socket.getfqdn()"
   fqdn = sqlobject.UnicodeCol(length=255, unique=True, notNone=True)
@@ -262,6 +269,7 @@
         'filename_arch': self.filename_arch.name,
         'maintainer_email': self.maintainer.email,
         'maintainer_full_name': self.maintainer.full_name,
+        'maintainer_id': self.maintainer.id,
         'md5_sum': self.md5_sum,
         'mtime': unicode(self.mtime),
         'osrel': self.os_rel.short_name,

Modified: csw/mgar/gar/v2/lib/web/pkgdb_web.py
===================================================================
--- csw/mgar/gar/v2/lib/web/pkgdb_web.py	2012-01-20 09:44:41 UTC (rev 16843)
+++ csw/mgar/gar/v2/lib/web/pkgdb_web.py	2012-01-20 09:45:15 UTC (rev 16844)
@@ -35,6 +35,7 @@
   # Query by catalog release, arch, OS release and catalogname
   r'/rest/catalogs/([^/]+)/(sparc|i386)/(SunOS[^/]+)/catalognames/([^/]+)/', 'Srv4ByCatAndCatalogname',
   r'/rest/catalogs/([^/]+)/(sparc|i386)/(SunOS[^/]+)/pkgnames/([^/]+)/', 'Srv4ByCatAndPkgname',
+  r'/rest/maintainers/([0-9]+)/', 'RestMaintainerDetail',
   r'/rest/srv4/([0-9a-f]{32})/', 'RestSrv4Detail',
   r'/rest/srv4/([0-9a-f]{32})/files/', 'RestSrv4DetailFiles',
   r'/rest/srv4/([0-9a-f]{32})/pkg-stats/', 'RestSrv4FullStats',
@@ -187,6 +188,13 @@
     return render.MaintainerDetail(maintainer, pkgs)
 
 
+class RestMaintainerDetail(object):
+  def GET(self, id):
+    ConnectToDatabase()
+    maintainer = models.Maintainer.selectBy(id=id).getOne()
+    return json.dumps(maintainer.GetRestRepr())
+
+
 class MaintainerCheckpkgReport(object):
   def GET(self, id):
     ConnectToDatabase()

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


From wahwah at users.sourceforge.net  Fri Jan 20 10:45:45 2012
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Fri, 20 Jan 2012 09:45:45 +0000
Subject: [csw-devel] SF.net SVN: gar:[16845]
	csw/mgar/gar/v2/lib/web/pkgdb_web.py
Message-ID: <E1RoB2X-0006rh-M1@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 16845
          http://gar.svn.sourceforge.net/gar/?rev=16845&view=rev
Author:   wahwah
Date:     2012-01-20 09:45:45 +0000 (Fri, 20 Jan 2012)
Log Message:
-----------
pkgdb-web: Remove commented lines

Leftovers from my struggles of how to run the app under Apache.

Modified Paths:
--------------
    csw/mgar/gar/v2/lib/web/pkgdb_web.py

Modified: csw/mgar/gar/v2/lib/web/pkgdb_web.py
===================================================================
--- csw/mgar/gar/v2/lib/web/pkgdb_web.py	2012-01-20 09:45:15 UTC (rev 16844)
+++ csw/mgar/gar/v2/lib/web/pkgdb_web.py	2012-01-20 09:45:45 UTC (rev 16845)
@@ -419,9 +419,6 @@
 
 web.webapi.internalerror = web.debugerror
 
-# app = web.application(urls, globals())
-# web.wsgi.runwsgi = lambda func, addr=None: web.wsgi.runfcgi(func, addr)
-# app = web.application(urls, globals(), autoreload=False)
 app = web.application(urls, globals())
 main = app.wsgifunc()
 

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


From wahwah at users.sourceforge.net  Fri Jan 20 10:46:15 2012
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Fri, 20 Jan 2012 09:46:15 +0000
Subject: [csw-devel] SF.net SVN: gar:[16846]
	csw/mgar/gar/v2/lib/python/package_checks.py
Message-ID: <E1RoB31-0001h2-Sz@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 16846
          http://gar.svn.sourceforge.net/gar/?rev=16846&view=rev
Author:   wahwah
Date:     2012-01-20 09:46:15 +0000 (Fri, 20 Jan 2012)
Log Message:
-----------
checkpkg: Add a missing string interpolation

An error message was missing the library name and was displaying a bare "%s".

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	2012-01-20 09:45:45 UTC (rev 16845)
+++ csw/mgar/gar/v2/lib/python/package_checks.py	2012-01-20 09:46:15 UTC (rev 16846)
@@ -1330,7 +1330,8 @@
              "that shared library.  This problem has occurred with relation "
              "to libnet. "
              "For information how to update such library, please see: "
-             "http://wiki.opencsw.org/project-libnet")
+             "http://wiki.opencsw.org/project-libnet" %
+             binary_info["path"])
       messenger.Message(msg)
       error_mgr.ReportError(
           "soname-equals-filename",

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


From cgrzemba at users.sourceforge.net  Fri Jan 20 14:11:12 2012
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Fri, 20 Jan 2012 13:11:12 +0000
Subject: [csw-devel] SF.net SVN: gar:[16847]
	csw/mgar/pkg/lang-java/389-console/trunk/Makefile
Message-ID: <E1RoEFM-0007bM-9Q@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 16847
          http://gar.svn.sourceforge.net/gar/?rev=16847&view=rev
Author:   cgrzemba
Date:     2012-01-20 13:11:11 +0000 (Fri, 20 Jan 2012)
Log Message:
-----------
lang-java/389-console/trunk:  fix wrapper script

Modified Paths:
--------------
    csw/mgar/pkg/lang-java/389-console/trunk/Makefile

Modified: csw/mgar/pkg/lang-java/389-console/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-java/389-console/trunk/Makefile	2012-01-20 09:46:15 UTC (rev 16846)
+++ csw/mgar/pkg/lang-java/389-console/trunk/Makefile	2012-01-20 13:11:11 UTC (rev 16847)
@@ -14,51 +14,51 @@
 Administration Server and 389 Directory Server.
 endef
 
-MASTER_SITES = http://port389.org/source
+MASTER_SITES = http://port389/source
 DISTFILES  = $(NAME)-$(VERSION).tar.bz2
 
-PACKAGES = CSW389-console
-# RUNTIME_DEP_PKGS = CSWidm-console-base CSWldapjdk CSWjss4
-DEP_PKGS = CSWidm-console-base CSWldapjdk CSWjss4
+PACKAGES = CSW389console
+RUNTIME_DEP_PKGS = CSWidm-console-base CSWldapjdk CSWjss4
 
 ARCHALL = 1
-PACKAGING_PLATFORMS = solaris10-sparc
 
-CATALOGNAME_CSW389-console = 389_console
+CATALOGNAME_CSW389console = 389-console
 
 LICENSE = LICENSE
 
 WORKSRC = $(WORKDIR)
-EXTRAJARSPATH = /opt/csw/share/java
-# EXTRAJARSPATH = /home/cgrzemba/java
 
 CONFIGURE_SCRIPTS =
 BUILD_SCRIPTS = custom
 TEST_SCRIPTS =
 INSTALL_SCRIPTS = custom
 
-CHECKPKG_OVERRIDES_CSW389-console += unidentified-dependency|CSWidm-console-base
-CHECKPKG_OVERRIDES_CSW389-console += surplus-dependency|CSWidm-console-base
-CHECKPKG_OVERRIDES_CSW389-console += surplus-dependency|CSWldapjdk
-CHECKPKG_OVERRIDES_CSW389-console += surplus-dependency|CSWjss4
-# CHECKPKG_OVERRIDES_CSW389-console += pkginfo-opencsw-repository-uncommitted
-CHECKPKG_OVERRIDES_CSW389-console += pkginfo-description-not-starting-with-uppercase|389|Directory|Server|-|Management|Console|Client
-
-
 include gar/category.mk
 
 install-custom: 
 	@ginstall -d $(DESTDIR)$(datadir)/java
 	@ginstall -d $(DESTDIR)$(bindir)
 	@gcp -fp $(WORKSRC)/$(DISTNAME)/built/$(NAME)-$(VERSION)_en.jar $(DESTDIR)$(datadir)/java
-	@gcp -fp $(WORKSRC)/$(DISTNAME)/389-console $(DESTDIR)$(bindir)
+	@ginstall -m 755 $(WORKSRC)/$(DISTNAME)/389-console $(DESTDIR)$(bindir)
 	@( cd $(DESTDIR)$(datadir)/java ; \
 	   ln -s $(NAME)-$(VERSION)_en.jar $(NAME)-$(MAJOR_VERSION)_en.jar ; \
 	   ln -s $(NAME)-$(VERSION)_en.jar $(NAME)_en.jar )
+	@gsed -i -e 's+ at jssjar@+$(datadir)/java/jss4.jar+' \
+		-e 's+ at ldapjdkjar@+$(datadir)/java/ldapjdk.jar+' \
+		-e 's+ at basejar@+idm-console-base.jar+' \
+		-e 's+ at mccjar@+idm-console-mcc.jar+' \
+		-e 's+ at mcclangjar@+idm-console-mcc_en.jar+' \
+		-e 's+ at nmclfjar@+idm-console-nmclf.jar+' \
+		-e 's+ at nmclflangjar@+idm-console-nmclf_en.jar+' \
+		-e 's+ at themejar@+$(NAME).jar+' \
+		-e 's+ at classdest@+$(datadir)/java+' \
+		-e 's+ at prefsdir@+389-console+' \
+		-e 's+ at libdir@+$(libdir)+' \
+	   $(DESTDIR)$(bindir)/389-console
 	@$(MAKECOOKIE)
 
 build-custom:
 	@( cd $(WORKSRC)/$(DISTNAME); \
 	  pwd; \
-	  ant -Dbuilt.dir=`pwd`/built -Dldapjdk.local.location=$(EXTRAJARSPATH) -Djss.local.location=$(EXTRAJARSPATH) -Dconsole.local.location=$(EXTRAJARSPATH) )
+	  ant -Dbuilt.dir=`pwd`/built -Dldapjdk.local.location=/opt/csw/share/java -Djss.local.location=/opt/csw/share/java -Dconsole.local.location=/opt/csw/share/java )
 	@$(MAKECOOKIE)

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


From cgrzemba at users.sourceforge.net  Fri Jan 20 14:20:45 2012
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Fri, 20 Jan 2012 13:20:45 +0000
Subject: [csw-devel] SF.net SVN: gar:[16848]
	csw/mgar/pkg/lang-java/389-console/trunk/Makefile
Message-ID: <E1RoEOb-0006HT-0u@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 16848
          http://gar.svn.sourceforge.net/gar/?rev=16848&view=rev
Author:   cgrzemba
Date:     2012-01-20 13:20:44 +0000 (Fri, 20 Jan 2012)
Log Message:
-----------
lang-java/389-console/trunk: add checkpkg hints

Modified Paths:
--------------
    csw/mgar/pkg/lang-java/389-console/trunk/Makefile

Modified: csw/mgar/pkg/lang-java/389-console/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-java/389-console/trunk/Makefile	2012-01-20 13:11:11 UTC (rev 16847)
+++ csw/mgar/pkg/lang-java/389-console/trunk/Makefile	2012-01-20 13:20:44 UTC (rev 16848)
@@ -14,16 +14,17 @@
 Administration Server and 389 Directory Server.
 endef
 
-MASTER_SITES = http://port389/source
+MASTER_SITES = http://port389.org/sources
 DISTFILES  = $(NAME)-$(VERSION).tar.bz2
 
-PACKAGES = CSW389console
+PACKAGING_PLATFORMS = solaris10x
+
+PACKAGES = CSW389-console
 RUNTIME_DEP_PKGS = CSWidm-console-base CSWldapjdk CSWjss4
-
 ARCHALL = 1
+CATALOGNAME_CSW389-console = 389_console
+CHECKPKG_OVERRIDES_CSW389console += pkginfo-description-not-starting-with-uppercase|389|Directory|Server|-|Management|Console|Client
 
-CATALOGNAME_CSW389console = 389-console
-
 LICENSE = LICENSE
 
 WORKSRC = $(WORKDIR)

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


From cgrzemba at users.sourceforge.net  Fri Jan 20 14:22:39 2012
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Fri, 20 Jan 2012 13:22:39 +0000
Subject: [csw-devel] SF.net SVN: gar:[16849]
	csw/mgar/pkg/lang-java/389-console/trunk/Makefile
Message-ID: <E1RoEQR-0007mN-Re@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 16849
          http://gar.svn.sourceforge.net/gar/?rev=16849&view=rev
Author:   cgrzemba
Date:     2012-01-20 13:22:39 +0000 (Fri, 20 Jan 2012)
Log Message:
-----------
lang-java/389-console/trunk: add checkpkg hints, second

Modified Paths:
--------------
    csw/mgar/pkg/lang-java/389-console/trunk/Makefile

Modified: csw/mgar/pkg/lang-java/389-console/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-java/389-console/trunk/Makefile	2012-01-20 13:20:44 UTC (rev 16848)
+++ csw/mgar/pkg/lang-java/389-console/trunk/Makefile	2012-01-20 13:22:39 UTC (rev 16849)
@@ -23,7 +23,7 @@
 RUNTIME_DEP_PKGS = CSWidm-console-base CSWldapjdk CSWjss4
 ARCHALL = 1
 CATALOGNAME_CSW389-console = 389_console
-CHECKPKG_OVERRIDES_CSW389console += pkginfo-description-not-starting-with-uppercase|389|Directory|Server|-|Management|Console|Client
+CHECKPKG_OVERRIDES_CSW389-console += pkginfo-description-not-starting-with-uppercase|389|Directory|Server|-|Management|Console|Client
 
 LICENSE = LICENSE
 

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


From cgrzemba at users.sourceforge.net  Fri Jan 20 15:26:32 2012
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Fri, 20 Jan 2012 14:26:32 +0000
Subject: [csw-devel] SF.net SVN: gar:[16850] csw/mgar/pkg/389-admin/trunk
Message-ID: <E1RoFQG-00015z-4W@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 16850
          http://gar.svn.sourceforge.net/gar/?rev=16850&view=rev
Author:   cgrzemba
Date:     2012-01-20 14:26:31 +0000 (Fri, 20 Jan 2012)
Log Message:
-----------
389-admin/trunk: add i386 platform

Modified Paths:
--------------
    csw/mgar/pkg/389-admin/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/389-admin/trunk/files/0002-add-i386-platform-to-configure.ac.patch

Modified: csw/mgar/pkg/389-admin/trunk/Makefile
===================================================================
--- csw/mgar/pkg/389-admin/trunk/Makefile	2012-01-20 13:22:39 UTC (rev 16849)
+++ csw/mgar/pkg/389-admin/trunk/Makefile	2012-01-20 14:26:31 UTC (rev 16850)
@@ -22,6 +22,7 @@
 LICENSE = LICENSE LICENSE.GPLv2
 
 PATCHFILES += 0001-change-includedir-preference-in-Makefile.am.patch
+PATCHFILES += 0002-add-i386-platform-to-configure.ac.patch
 
 PACKAGES += CSWlibds-admin-serv0
 CATALOGNAME_CSWlibds-admin-serv0 = libds_admin_serv0

Added: csw/mgar/pkg/389-admin/trunk/files/0002-add-i386-platform-to-configure.ac.patch
===================================================================
--- csw/mgar/pkg/389-admin/trunk/files/0002-add-i386-platform-to-configure.ac.patch	                        (rev 0)
+++ csw/mgar/pkg/389-admin/trunk/files/0002-add-i386-platform-to-configure.ac.patch	2012-01-20 14:26:31 UTC (rev 16850)
@@ -0,0 +1,40 @@
+From e1dbbdb2e7b8a79d47e28f600bfd4d3cd9921a5a Mon Sep 17 00:00:00 2001
+From: Carsten Grzemba <cgrzemba at opencsw.org>
+Date: Fri, 20 Jan 2012 15:15:30 +0100
+Subject: [PATCH] add i386 platform to configure.ac
+
+---
+ configure.ac |    5 +----
+ 1 files changed, 1 insertions(+), 4 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 1a438e3..d9850f2 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -192,13 +192,12 @@ case $host in
+     # HPUX doesn't use /etc for this
+     initdir=/init.d
+ 	;;
+-  sparc-sun-solaris*)
++  *-*-solaris*)
+     AC_DEFINE([XP_UNIX], [1], [UNIX])
+     AC_DEFINE([SVR4], [1], [SVR4])
+     AC_DEFINE([__svr4], [1], [SVR4])
+     AC_DEFINE([__svr4__], [1], [SVR4])
+     AC_DEFINE([_SVID_GETTOD], [1], [SVID_GETTOD])
+-    AC_DEFINE([CPU_sparc], [], [cpu type sparc])
+     AC_DEFINE([OS_solaris], [1], [OS SOLARIS])
+     AC_DEFINE([sunos5], [1], [SunOS5])
+     AC_DEFINE([OSVERSION], [509], [OS version])
+@@ -215,8 +214,6 @@ dnl Cstd and Crun are required to link any C++ related code (ICU)
+     AC_SUBST([LIBCRUN], [$LIBCRUN])
+     CXXLINK_REQUIRED=1
+     platform="solaris"
+-    # assume 64 bit
+-    perlexec='/usr/lib/sparcv9/dirsec/perl5x/bin/perl'
+     initdir='$(sysconfdir)/init.d'
+ 	;;
+   *)
+-- 
+1.7.8.3
+

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


From cgrzemba at users.sourceforge.net  Fri Jan 20 15:36:50 2012
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Fri, 20 Jan 2012 14:36:50 +0000
Subject: [csw-devel] SF.net SVN: gar:[16851]
	csw/mgar/pkg/389-admin/trunk/Makefile
Message-ID: <E1RoFaE-0003Yr-Kq@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 16851
          http://gar.svn.sourceforge.net/gar/?rev=16851&view=rev
Author:   cgrzemba
Date:     2012-01-20 14:36:50 +0000 (Fri, 20 Jan 2012)
Log Message:
-----------
389-admin/trunk: add runtime dependencies

Modified Paths:
--------------
    csw/mgar/pkg/389-admin/trunk/Makefile

Modified: csw/mgar/pkg/389-admin/trunk/Makefile
===================================================================
--- csw/mgar/pkg/389-admin/trunk/Makefile	2012-01-20 14:26:31 UTC (rev 16850)
+++ csw/mgar/pkg/389-admin/trunk/Makefile	2012-01-20 14:36:50 UTC (rev 16851)
@@ -33,6 +33,7 @@
 RUNTIME_DEP_PKGS_CSWlibds-admin-serv0 += CSWlibplds4
 RUNTIME_DEP_PKGS_CSWlibds-admin-serv0 += CSWlibnspr4
 RUNTIME_DEP_PKGS_CSWlibds-admin-serv0 += CSWlibplc4
+RUNTIME_DEP_PKGS_CSWlibds-admin-serv0 += CSWlibiconv2
 
 PACKAGES += CSW389admin-dev
 CATALOGNAME_CSW389admin-dev = 389admin_dev
@@ -61,6 +62,11 @@
 RUNTIME_DEP_PKGS_CSW389admin += CSWlibadminutil0
 RUNTIME_DEP_PKGS_CSW389admin += CSWlibplds4
 RUNTIME_DEP_PKGS_CSW389admin += CSWlibldap60
+RUNTIME_DEP_PKGS_CSW389admin += CSWlibsoftokn3
+RUNTIME_DEP_PKGS_CSW389admin += CSWlibsmime3
+RUNTIME_DEP_PKGS_CSW389admin += CSWlibiconv2
+RUNTIME_DEP_PKGS_CSW389admin += CSWlibssl3
+RUNTIME_DEP_PKGS_CSW389admin += CSWlibnss3
 CHECKPKG_OVERRIDES_CSW389admin += surplus-dependency|CSWap2modnss
 
 # remove -I/opt/csw/include

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


From guengel at users.sourceforge.net  Fri Jan 20 15:47:52 2012
From: guengel at users.sourceforge.net (guengel at users.sourceforge.net)
Date: Fri, 20 Jan 2012 14:47:52 +0000
Subject: [csw-devel] SF.net SVN: gar:[16852] csw/mgar/pkg/postgresql/branches
Message-ID: <E1RoFku-0003jM-96@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 16852
          http://gar.svn.sourceforge.net/gar/?rev=16852&view=rev
Author:   guengel
Date:     2012-01-20 14:47:51 +0000 (Fri, 20 Jan 2012)
Log Message:
-----------
postgresql/branches/postgresql-8.3-raos: renamed to postgresql-8.3.

Added Paths:
-----------
    csw/mgar/pkg/postgresql/branches/postgresql-8.3/

Removed Paths:
-------------
    csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos/

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


From guengel at users.sourceforge.net  Fri Jan 20 15:48:43 2012
From: guengel at users.sourceforge.net (guengel at users.sourceforge.net)
Date: Fri, 20 Jan 2012 14:48:43 +0000
Subject: [csw-devel] SF.net SVN: gar:[16853] csw/mgar/pkg/postgresql/branches
Message-ID: <E1RoFlj-0003kI-Eb@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 16853
          http://gar.svn.sourceforge.net/gar/?rev=16853&view=rev
Author:   guengel
Date:     2012-01-20 14:48:42 +0000 (Fri, 20 Jan 2012)
Log Message:
-----------
postgresql/branches/postgresql-8.4-raos: renamed to postgresql-8.4.

Added Paths:
-----------
    csw/mgar/pkg/postgresql/branches/postgresql-8.4/

Removed Paths:
-------------
    csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos/

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


From guengel at users.sourceforge.net  Fri Jan 20 15:49:57 2012
From: guengel at users.sourceforge.net (guengel at users.sourceforge.net)
Date: Fri, 20 Jan 2012 14:49:57 +0000
Subject: [csw-devel] SF.net SVN: gar:[16854] csw/mgar/pkg/postgresql/branches
Message-ID: <E1RoFmv-0003m9-VY@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 16854
          http://gar.svn.sourceforge.net/gar/?rev=16854&view=rev
Author:   guengel
Date:     2012-01-20 14:49:57 +0000 (Fri, 20 Jan 2012)
Log Message:
-----------
postgresql/branches/postgresql-9.0-raos: renamed to postgresql-9.0.

Added Paths:
-----------
    csw/mgar/pkg/postgresql/branches/postgresql-9.0/

Removed Paths:
-------------
    csw/mgar/pkg/postgresql/branches/postgresql-9.0-raos/

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


From cgrzemba at users.sourceforge.net  Fri Jan 20 15:55:31 2012
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Fri, 20 Jan 2012 14:55:31 +0000
Subject: [csw-devel] SF.net SVN: gar:[16855]
	csw/mgar/pkg/389-admin/trunk/Makefile
Message-ID: <E1RoFsJ-0003rq-NG@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 16855
          http://gar.svn.sourceforge.net/gar/?rev=16855&view=rev
Author:   cgrzemba
Date:     2012-01-20 14:55:31 +0000 (Fri, 20 Jan 2012)
Log Message:
-----------
389-admin/trunk: add dependency CSWapache2

Modified Paths:
--------------
    csw/mgar/pkg/389-admin/trunk/Makefile

Modified: csw/mgar/pkg/389-admin/trunk/Makefile
===================================================================
--- csw/mgar/pkg/389-admin/trunk/Makefile	2012-01-20 14:49:57 UTC (rev 16854)
+++ csw/mgar/pkg/389-admin/trunk/Makefile	2012-01-20 14:55:31 UTC (rev 16855)
@@ -40,12 +40,12 @@
 SPKG_DESC_CSW389admin-dev += $(DESCRIPTION), development files
 PKGFILES_CSW389admin-dev += /opt/csw/lib/libds-admin-serv.so
 RUNTIME_DEP_PKGS_CSW389admin-dev += CSWlibds-admin-serv0
-CHECKPKG_OVERRIDES_CSW389admin-dev += missing-dependency|CSWlibds-admin-serv0
 
 PACKAGES += CSW389admin
 SPKG_DESC_CSW389admin += $(DESCRIPTION)
 INITSMF = /etc/opt/csw/init.d/dirsrv-admin
-RUNTIME_DEP_PKGS_CSW389admin = CSWap2modnss
+RUNTIME_DEP_PKGS_CSW389admin += CSWapche2
+RUNTIME_DEP_PKGS_CSW389admin += CSWap2modnss
 RUNTIME_DEP_PKGS_CSW389admin += CSWlibprldap60
 RUNTIME_DEP_PKGS_CSW389admin += CSWlibldif60
 RUNTIME_DEP_PKGS_CSW389admin += CSWlibicudata48
@@ -55,7 +55,6 @@
 RUNTIME_DEP_PKGS_CSW389admin += CSWlibplc4
 RUNTIME_DEP_PKGS_CSW389admin += CSWlibssldap60
 RUNTIME_DEP_PKGS_CSW389admin += CSWlibnspr4
-RUNTIME_DEP_PKGS_CSW389admin += CSWlibnss-dev
 RUNTIME_DEP_PKGS_CSW389admin += CSWlibicuuc48
 RUNTIME_DEP_PKGS_CSW389admin += CSWlibicui18n48
 RUNTIME_DEP_PKGS_CSW389admin += CSWlibds-admin-serv0
@@ -68,6 +67,7 @@
 RUNTIME_DEP_PKGS_CSW389admin += CSWlibssl3
 RUNTIME_DEP_PKGS_CSW389admin += CSWlibnss3
 CHECKPKG_OVERRIDES_CSW389admin += surplus-dependency|CSWap2modnss
+CHECKPKG_OVERRIDES_CSW389admin += surplus-dependency|CSWapche2
 
 # remove -I/opt/csw/include
 CPPFLAGS = 

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


From guengel at users.sourceforge.net  Fri Jan 20 15:56:12 2012
From: guengel at users.sourceforge.net (guengel at users.sourceforge.net)
Date: Fri, 20 Jan 2012 14:56:12 +0000
Subject: [csw-devel] SF.net SVN: gar:[16856]
 csw/mgar/pkg/postgresql/tags/legacy/ trunk-2012-01-20/
Message-ID: <E1RoFsy-0003t4-Re@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 16856
          http://gar.svn.sourceforge.net/gar/?rev=16856&view=rev
Author:   guengel
Date:     2012-01-20 14:56:12 +0000 (Fri, 20 Jan 2012)
Log Message:
-----------
postgresql/trunk: tagging current version of trunk.

Added Paths:
-----------
    csw/mgar/pkg/postgresql/tags/legacy/trunk-2012-01-20/

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


From cgrzemba at users.sourceforge.net  Fri Jan 20 16:00:35 2012
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Fri, 20 Jan 2012 15:00:35 +0000
Subject: [csw-devel] SF.net SVN: gar:[16857]
	csw/mgar/pkg/389-admin/trunk/Makefile
Message-ID: <E1RoFxD-0001t2-Jx@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 16857
          http://gar.svn.sourceforge.net/gar/?rev=16857&view=rev
Author:   cgrzemba
Date:     2012-01-20 15:00:35 +0000 (Fri, 20 Jan 2012)
Log Message:
-----------
389-admin/trunk: add dependency CSWapache2, fix

Modified Paths:
--------------
    csw/mgar/pkg/389-admin/trunk/Makefile

Modified: csw/mgar/pkg/389-admin/trunk/Makefile
===================================================================
--- csw/mgar/pkg/389-admin/trunk/Makefile	2012-01-20 14:56:12 UTC (rev 16856)
+++ csw/mgar/pkg/389-admin/trunk/Makefile	2012-01-20 15:00:35 UTC (rev 16857)
@@ -44,7 +44,7 @@
 PACKAGES += CSW389admin
 SPKG_DESC_CSW389admin += $(DESCRIPTION)
 INITSMF = /etc/opt/csw/init.d/dirsrv-admin
-RUNTIME_DEP_PKGS_CSW389admin += CSWapche2
+RUNTIME_DEP_PKGS_CSW389admin += CSWapache2
 RUNTIME_DEP_PKGS_CSW389admin += CSWap2modnss
 RUNTIME_DEP_PKGS_CSW389admin += CSWlibprldap60
 RUNTIME_DEP_PKGS_CSW389admin += CSWlibldif60
@@ -67,7 +67,7 @@
 RUNTIME_DEP_PKGS_CSW389admin += CSWlibssl3
 RUNTIME_DEP_PKGS_CSW389admin += CSWlibnss3
 CHECKPKG_OVERRIDES_CSW389admin += surplus-dependency|CSWap2modnss
-CHECKPKG_OVERRIDES_CSW389admin += surplus-dependency|CSWapche2
+CHECKPKG_OVERRIDES_CSW389admin += surplus-dependency|CSWapache2
 
 # remove -I/opt/csw/include
 CPPFLAGS = 

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


From guengel at users.sourceforge.net  Fri Jan 20 16:02:39 2012
From: guengel at users.sourceforge.net (guengel at users.sourceforge.net)
Date: Fri, 20 Jan 2012 15:02:39 +0000
Subject: [csw-devel] SF.net SVN: gar:[16858] csw/mgar/pkg/postgresql/trunk
Message-ID: <E1RoFzD-000165-LW@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 16858
          http://gar.svn.sourceforge.net/gar/?rev=16858&view=rev
Author:   guengel
Date:     2012-01-20 15:02:39 +0000 (Fri, 20 Jan 2012)
Log Message:
-----------
postgresql/trunk: Merged with branches/postgresql-9.1-raos.

Modified Paths:
--------------
    csw/mgar/pkg/postgresql/trunk/Makefile
    csw/mgar/pkg/postgresql/trunk/checksums
    csw/mgar/pkg/postgresql/trunk/files/cswusergroup.tmpl
    csw/mgar/pkg/postgresql/trunk/files/postgresql.conf.tmpl

Added Paths:
-----------
    csw/mgar/pkg/postgresql/trunk/files/0000-Run-tests-in-var-tmp-pgsql-tmp_check.patch
    csw/mgar/pkg/postgresql/trunk/files/0000-Use-plain-rpath.patch
    csw/mgar/pkg/postgresql/trunk/files/0000-ecpg-usr-local-include-replacement.patch
    csw/mgar/pkg/postgresql/trunk/files/CSWpostgresql-server.postinstall.tmpl
    csw/mgar/pkg/postgresql/trunk/files/README.CSW
    csw/mgar/pkg/postgresql/trunk/files/cswpostgresql.tmpl

Removed Paths:
-------------
    csw/mgar/pkg/postgresql/trunk/files/CSWpostgresql-84.postinstall
    csw/mgar/pkg/postgresql/trunk/files/README-CSW.txt
    csw/mgar/pkg/postgresql/trunk/files/cswpostgres.tmpl

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


Property changes on: csw/mgar/pkg/postgresql/trunk
___________________________________________________________________
Added: svn:mergeinfo
   + /csw/mgar/pkg/postgresql/branches/postgresql-8.3:12252-16277
/csw/mgar/pkg/postgresql/branches/postgresql-8.3-raos:16278-16563
/csw/mgar/pkg/postgresql/branches/postgresql-8.4-raos:16564-16625
/csw/mgar/pkg/postgresql/branches/postgresql-9.0:11032-12251
/csw/mgar/pkg/postgresql/branches/postgresql-9.0-raos:16626
/csw/mgar/pkg/postgresql/branches/postgresql-9.1-raos:16629-16856

Modified: csw/mgar/pkg/postgresql/trunk/Makefile
===================================================================
--- csw/mgar/pkg/postgresql/trunk/Makefile	2012-01-20 15:00:35 UTC (rev 16857)
+++ csw/mgar/pkg/postgresql/trunk/Makefile	2012-01-20 15:02:39 UTC (rev 16858)
@@ -1,264 +1,699 @@
-# Copyright 2009 OpenCSW
-# Distributed under the terms of the GNU General Public License v2
 # $Id$
-
-# This BUILD is NOT READY!  It needs work before it's usable.
-
-# TODO: Initialize the database cluster during installation if not already
-# there.
 #
-# TODO: Migration plan from 8.3: Installing 8.3 and 8.4 at the same time, and
-# migrating
+# Note 1
+# ------
 #
-# TODO: The isaexec part in GAR doesn't work very well.  Let's write a minimal
-# example of it.   (gmake repackage may produce the right output)
+# A word of caution: PostgreSQL does use autoconf, but it does *not* use
+# automake. That said, it `misses' many features found in pure
+# autoconf/automake builds, e.g. --program-suffix is not available. This also
+# explains some quirks of this recipe.
+#
+#
+# Note 2
+# ------
+#
+# The idea is to make it possible to install different major/minor versions of
+# PostgreSQL at the same time but without installing them to distinct --prefix
+# directories, which in turn makes linking against PostgreSQL easier. This has
+# been achieved as follows:
+#
+#  * libraries go into $(libdir)
+#
+#  * binaries go into $(libexec)/postgres/XY/ and alternatives are used to
+#    bring the binaries into $(prefix)/bin
+#
+# Generally, putting libraries in $(libdir) should not pose a problem, but in
+# the case of PostgresSQL, there is also a directory $(libdir)/postgres which
+# is unversioned and cannot be changed by passing arguments to configure. This
+# shortcoming can be lifted by adjusting $(pkglibdir) in
+# $(WORKSRC)/src/Makefile.global.in which is what we do.
+#
+#
+# Note 3: Alternatives
+# ------
+#
+# I was unable to get the alternatives system to work with using, for
+# instance,
+#
+#  ALTERNATIVES_CSWpostgresql83-server = server_amd64 server_pentium_pro
+#
+# and then defining those alternatives. /opt/csw/sbin/alternatives choked on
+# the one file generated for server containing two distinct alternatives. So I
+# cooked my own soup:
+#
+#  1. Create for server, client, contrib, devel separate files containing the
+#     alternatives for the ISAs
+#
+#  2. Adjust the prototype to add include the class 'cswalternatives' for the
+#     files in question.
+#
+# The problem appeared to be having two lines in the same file. So my approach
+# is to generate one file per line of alternatives.
+#
+#
+# Note 4:  New upstream releases
+# ------
+#
+# 1. Adjust BASE_VERSION and/or PATCHLEVEL.
+#
+# 2. Comment out 'post-install-modulated:'. So we can identify changes in the
+#    server/client environment.
+#
+# 3. `mgar package`
+#
+# 4. If step 3 succeeded, check the prototype of
+#    CSW$(NAME)$(BASE_VERSION_NODOT) for files that have slipped by and put
+#    them in the proper place.
+#
+# 5. Uncomment 'post-install-modulated:'. This will shed light on changes in
+#    the contrib environment.
+#
+# 6. `mgar spotless package`
+#
+# 7. If step 6 succeeded, check the prototype of
+#    CSW$(NAME)$(BASE_VERSION_NODOT) for files that have slipped by and put
+#    them in the proper place.
+#
+#
+# Note 5: Development package
+# ------
+#
+# The development package is not versioned, i.e. named CSW$(NAME)-dev,
+# since we can only support one set of header files with a reasonable
+# amount of effort.
+#
+# Further, it does not use alternatives and puts binaries in $(bindir)
+# (see 'post-merge-modulated:'). This will make it easier for
+# maintainers to use `pg_config'.
 
 NAME = postgresql
-BASE_VERSION = 8.4
-# How to make one automatically?
-VERSION_NODOT = 8_4
-BASE_VERSION_G = 84
-PATCHLEVEL = 4
+BASE_VERSION = 9.1
+VERSION_NODOT = $(subst .,_,$(BASE_VERSION))
+BASE_VERSION_NODOT = $(subst .,,$(BASE_VERSION))
+PATCHLEVEL = 2
 VERSION = $(BASE_VERSION).$(PATCHLEVEL)
 CATEGORIES = apps
 
 # Useful when making a series of builds on the same day
 # GARFLAVOR ?= DBG
 
-DESCRIPTION = An advanced open source database
-SPKG_SOURCEURL = http://www.postgresql.org/
+VENDOR_URL = http://www.postgresql.org/
 
 define BLURB
+	PostgreSQL is a powerful, open source object-relational database system.
+	It has more than 15 years of active development and a proven architecture
+	that has earned it a strong reputation for reliability, data integrity,
+	and correctness.
 endef
 
-pgsubdir = $(NAME)$(BASE_VERSION_G)
-bindir_install = $(exec_prefix)/bin/$(pgsubdir)
-sbindir_install = $(exec_prefix)/sbin/$(pgsubdir)
-libdir_install = $(exec_prefix)/lib/$(pgsubdir)
-# libdir = $(prefix)$(version_dependent)/lib
-# Otherwise initdb can't find the right libraries, see:
-# http://archives.postgresql.org/pgsql-general/2010-01/msg00422.php
-localstatedir = /var$(prefix)/$(pgsubdir)
-sysconfdir = /etc$(prefix)/$(pgsubdir)
-datadir = $(prefix)/share/$(pgsubdir)
-docdir = $(prefix)/share/doc/$(NAME)-$(BASE_VERSION)
-includedir = $(prefix)/include/$(pgsubdir)
-infodir = $(datadir)/info
-libexecdir_install = $(exec_prefix)/libexec/$(pgsubdir)
-lispdir = $(datadir)/emacs/site-lisp
-mandir = $(datadir)/man
-sharedstatedir = $(prefix)/share/$(pgsubdir)
-sourcedir = $(prefix)/src/$(pgsubdir)
+#
+# These variables control many aspects of the build
+#
+sysconfdir-suffix-64	= /64
+sysconfdir		= /etc/opt/csw$(sysconfdir-suffix-$(MEMORYMODEL))
+PGSYSCONFDIR		= $(sysconfdir)/$(NAME)/$(BASE_VERSION_NODOT)
+PGBINDIR		= $(libexecdir)/$(NAME)/$(BASE_VERSION_NODOT)
+PGSBINDIR		= $(libexecdir)/$(NAME)/$(BASE_VERSION_NODOT)
+PGDATADIR		= $(datadir)/$(NAME)/$(BASE_VERSION_NODOT)
+PGDOCDIR		= $(datadir)/doc/$(NAME)/$(BASE_VERSION_NODOT)
+PGLOCALSTATEDIR_BASE	= $(localstatedir)/$(NAME)
+PGDATA			= $(PGLOCALSTATEDIR_BASE)/$(BASE_VERSION_NODOT)
+# This variable has been introduced for using in EXPANDVARS files
+PGNAMEVERSIONED		= $(NAME)$(BASE_VERSION_NODOT)
+# This variable has been introduced for using in EXPANDVARS files
+PGNAME_VERSIONED	= $(NAME)-$(BASE_VERSION_NODOT)
+# Those BIN_NAMES_* are used both, for package creation and alternatives.
+# 8.4 has removed ipcclean
+BIN_NAMES_SERVER	= initdb pg_controldata pg_ctl pg_resetxlog postmaster postgres
+BIN_NAMES_DEVEL		= ecpg pg_config
+BIN_NAMES_CLIENT	= clusterdb createdb createlang createuser dropdb droplang dropuser pg_dump pg_dumpall pg_restore psql reindexdb vacuumdb pg_basebackup clusterdb
+BIN_NAMES_CONTRIB	= oid2name pgbench pg_standby vacuumlo pg_upgrade pg_archivecleanup pg_test_fsync
+# These are shared objects used by the server. Please note, contrib installs
+# also shared object in the same place, so make sure you don't mix up things
+SO_NAMES_SERVER		 = ascii_and_mic.so cyrillic_and_mic.so dict_snowball.so euc_cn_and_mic.so
+SO_NAMES_SERVER 	+= euc_jp_and_sjis.so euc_kr_and_mic.so utf8_and_euc2004.so utf8_and_sjis2004.so
+SO_NAMES_SERVER		+= euc_tw_and_big5.so latin2_and_win1250.so latin_and_mic.so plpgsql.so
+SO_NAMES_SERVER		+= utf8_and_ascii.so utf8_and_big5.so utf8_and_cyrillic.so utf8_and_euc_cn.so
+SO_NAMES_SERVER		+= utf8_and_euc_jp.so utf8_and_euc_kr.so utf8_and_euc_tw.so euc2004_sjis2004.so
+SO_NAMES_SERVER		+= utf8_and_gb18030.so utf8_and_gbk.so utf8_and_iso8859.so utf8_and_iso8859_1.so
+SO_NAMES_SERVER		+= utf8_and_johab.so utf8_and_sjis.so utf8_and_uhc.so utf8_and_win.so
+# This has been introduced with 9.0
+SO_NAMES_SERVER		+= libpqwalreceiver.so
+# Those are the extension provided by the server.
+#
+# This has been introduced with 9.1
+EXT_NAMES_SERVER	 = plpgsql--1.0.sql plpgsql--unpackaged--1.0.sql plpgsql.control
+# These are shared object used by contrib. Please note, the server installs
+# also shared object in the same place, so make sure you don't mix up things
+SO_NAMES_CONTRIB 	 = _int.so adminpack.so autoinc.so btree_gist.so chkpass.so passwordcheck.so
+SO_NAMES_CONTRIB	+= cube.so dblink.so dict_int.so dict_xsyn.so earthdistance.so
+SO_NAMES_CONTRIB	+= fuzzystrmatch.so hstore.so insert_username.so pg_upgrade_support.so
+SO_NAMES_CONTRIB	+= isn.so lo.so ltree.so moddatetime.so pageinspect.so pg_buffercache.so
+SO_NAMES_CONTRIB	+= pg_freespacemap.so pg_trgm.so pgcrypto.so pgrowlocks.so pgstattuple.so
+SO_NAMES_CONTRIB	+= pgxml.so refint.so seg.so sslinfo.so tablefunc.so test_parser.so timetravel.so tsearch2.so
+SO_NAMES_CONTRIB	+= auto_explain.so btree_gin.so citext.so pg_stat_statements.so unaccent.so dummy_seclabel.so
+SO_NAMES_CONTRIB	+= auth_delay.so file_fdw.so
+# Those are the extension provided by contrib.
+#
+# This has been introduced with 9.1
+EXT_NAMES_CONTRIB	 = adminpack--1.0.sql adminpack.control
+EXT_NAMES_CONTRIB	+= autoinc--1.0.sql autoinc.control autoinc--unpackaged--1.0.sql
+EXT_NAMES_CONTRIB	+= btree_gin--1.0.sql btree_gin.control btree_gin--unpackaged--1.0.sql
+EXT_NAMES_CONTRIB	+= btree_gist--1.0.sql btree_gist.control btree_gist--unpackaged--1.0.sql
+EXT_NAMES_CONTRIB	+= chkpass--1.0.sql chkpass.control chkpass--unpackaged--1.0.sql
+EXT_NAMES_CONTRIB	+= citext--1.0.sql citext.control citext--unpackaged--1.0.sql
+EXT_NAMES_CONTRIB	+= cube--1.0.sql cube.control cube--unpackaged--1.0.sql
+EXT_NAMES_CONTRIB	+= dblink--1.0.sql dblink.control dblink--unpackaged--1.0.sql
+EXT_NAMES_CONTRIB	+= dict_int--1.0.sql dict_int.control dict_int--unpackaged--1.0.sql
+EXT_NAMES_CONTRIB	+= dict_xsyn--1.0.sql dict_xsyn.control dict_xsyn--unpackaged--1.0.sql
+EXT_NAMES_CONTRIB	+= earthdistance--1.0.sql earthdistance.control earthdistance--unpackaged--1.0.sql
+EXT_NAMES_CONTRIB	+= file_fdw--1.0.sql file_fdw.control 
+EXT_NAMES_CONTRIB	+= fuzzystrmatch--1.0.sql fuzzystrmatch.control fuzzystrmatch--unpackaged--1.0.sql
+EXT_NAMES_CONTRIB	+= hstore--1.0.sql hstore.control hstore--unpackaged--1.0.sql 
+EXT_NAMES_CONTRIB	+= insert_username--1.0.sql insert_username.control insert_username--unpackaged--1.0.sql
+EXT_NAMES_CONTRIB	+= intagg--1.0.sql intagg.control intagg--unpackaged--1.0.sql
+EXT_NAMES_CONTRIB	+= intarray--1.0.sql intarray.control intarray--unpackaged--1.0.sql
+EXT_NAMES_CONTRIB	+= isn--1.0.sql isn.control isn--unpackaged--1.0.sql
+EXT_NAMES_CONTRIB	+= lo--1.0.sql lo.control lo--unpackaged--1.0.sql
+EXT_NAMES_CONTRIB	+= ltree--1.0.sql ltree.control ltree--unpackaged--1.0.sql
+EXT_NAMES_CONTRIB	+= moddatetime--1.0.sql moddatetime.control moddatetime--unpackaged--1.0.sql
+EXT_NAMES_CONTRIB	+= pageinspect--1.0.sql pageinspect.control pageinspect--unpackaged--1.0.sql
+EXT_NAMES_CONTRIB	+= pg_buffercache--1.0.sql pg_buffercache.control pg_buffercache--unpackaged--1.0.sql
+EXT_NAMES_CONTRIB	+= pgcrypto--1.0.sql pgcrypto.control pgcrypto--unpackaged--1.0.sql
+EXT_NAMES_CONTRIB	+= pg_freespacemap--1.0.sql pg_freespacemap.control pg_freespacemap--unpackaged--1.0.sql
+EXT_NAMES_CONTRIB	+= pgrowlocks--1.0.sql pgrowlocks.control pgrowlocks--unpackaged--1.0.sql
+EXT_NAMES_CONTRIB	+= pg_stat_statements--1.0.sql pg_stat_statements.control pg_stat_statements--unpackaged--1.0.sql
+EXT_NAMES_CONTRIB	+= pgstattuple--1.0.sql pgstattuple.control pgstattuple--unpackaged--1.0.sql
+EXT_NAMES_CONTRIB	+= pg_trgm--1.0.sql pg_trgm.control pg_trgm--unpackaged--1.0.sql
+EXT_NAMES_CONTRIB	+= refint--1.0.sql refint.control refint--unpackaged--1.0.sql
+EXT_NAMES_CONTRIB	+= seg--1.0.sql seg.control seg--unpackaged--1.0.sql
+EXT_NAMES_CONTRIB	+= sslinfo--1.0.sql sslinfo.control sslinfo--unpackaged--1.0.sql
+EXT_NAMES_CONTRIB	+= tablefunc--1.0.sql tablefunc.control tablefunc--unpackaged--1.0.sql
+EXT_NAMES_CONTRIB	+= test_parser--1.0.sql test_parser.control test_parser--unpackaged--1.0.sql
+EXT_NAMES_CONTRIB	+= timetravel--1.0.sql timetravel.control timetravel--unpackaged--1.0.sql
+EXT_NAMES_CONTRIB	+= tsearch2--1.0.sql tsearch2.control tsearch2--unpackaged--1.0.sql
+EXT_NAMES_CONTRIB	+= unaccent--1.0.sql unaccent.control unaccent--unpackaged--1.0.sql
+EXT_NAMES_CONTRIB	+= xml2--1.0.sql xml2.control xml2--unpackaged--1.0.sql
+# Miscellaneous files
+MISC_NAMES_SERVER	+= .*/share/$(NAME)/$(BASE_VERSION_NODOT)/conversion_create.sql
+MISC_NAMES_SERVER	+= .*/share/$(NAME)/$(BASE_VERSION_NODOT)/information_schema.sql
+MISC_NAMES_SERVER	+= .*/share/$(NAME)/$(BASE_VERSION_NODOT)/pg_hba.conf.sample
+MISC_NAMES_SERVER	+= .*/share/$(NAME)/$(BASE_VERSION_NODOT)/pg_ident.conf.sample
+MISC_NAMES_SERVER	+= .*/share/$(NAME)/$(BASE_VERSION_NODOT)/pg_service.conf.sample
+MISC_NAMES_SERVER	+= .*/share/$(NAME)/$(BASE_VERSION_NODOT)/postgres.bki
+MISC_NAMES_SERVER	+= .*/share/$(NAME)/$(BASE_VERSION_NODOT)/postgres.description
+MISC_NAMES_SERVER	+= .*/share/$(NAME)/$(BASE_VERSION_NODOT)/postgres.shdescription
+MISC_NAMES_SERVER	+= .*/share/$(NAME)/$(BASE_VERSION_NODOT)/postgresql.conf.sample
+MISC_NAMES_SERVER	+= .*/share/$(NAME)/$(BASE_VERSION_NODOT)/recovery.conf.sample
+MISC_NAMES_SERVER	+= .*/share/$(NAME)/$(BASE_VERSION_NODOT)/snowball_create.sql
+MISC_NAMES_SERVER	+= .*/share/$(NAME)/$(BASE_VERSION_NODOT)/sql_features.txt
+MISC_NAMES_SERVER	+= .*/share/$(NAME)/$(BASE_VERSION_NODOT)/system_views.sql
+MISC_NAMES_CLIENT	+= .*/share/$(NAME)/$(BASE_VERSION_NODOT)/psqlrc.sample
 
-MIGRATE_FILES_CSWpostgresql-$(BASE_VERSION_G)    = postgresql.conf
-MIGRATE_DEST_DIR_CSWpostgresql-$(BASE_VERSION_G) = $(sysconfdir)
+# Used for the PostgreSQL user. Please note, although the file does not feature
+# a version number here, it will be installed with $(BASE_VERSION_NODOT)
+# appended.
+USERGROUPDIR		= $(sysconfdir)/pkg/$(NAME)
+USERGROUPFILE		= cswusergroup
+USERGROUPFILETMPL	= $(USERGROUPFILE).tmpl
+USERGROUPFILE_VERSIONED = $(USERGROUPFILE)-$(BASE_VERSION_NODOT)
 
-MASTER_SITES = http://wwwmaster.postgresql.org/redir/53/h/source/v$(VERSION)/
-DISTFILES  = $(NAME)-$(VERSION).tar.bz2
-DISTFILES += cswpostgres.tmpl
-DISTFILES += cswusergroup.tmpl
-DISTFILES += postgresql.conf.tmpl
-DISTFILES += README-CSW.txt
-# DISTFILES += CSWpostgresql-$(BASE_VERSION_G).postinstall
-include files/CSWpostgresql-$(BASE_VERSION_G).postinstall
+# The configuration file for the init.d script. Please note, although the file
+# does not feature a version number here, it will be installed with
+# $(BASE_VERSION_NODOT) inserted.
+CSWPGSQLCONFFILE	= postgresql.conf
+CSWPGSQLCONFFILETMPL    = $(CSWPGSQLCONFFILE).tmpl
+CSWPGSQLCONFFILE_VERSIONED = $(subst $(suffix $(CSWPGSQLCONFFILE)),,$(CSWPGSQLCONFFILE))-$(BASE_VERSION_NODOT).conf
 
-PACKAGES += CSWpostgresql
-PACKAGES += CSWlibpq-$(BASE_VERSION_G)
-PACKAGES += CSWpostgresql-$(BASE_VERSION_G)
-PACKAGES += CSWpostgresql-$(BASE_VERSION_G)-dev
-PACKAGES += CSWpostgresql-$(BASE_VERSION_G)-doc
+# The initscript. Please note, although the file does not feature a version
+# number here, it will be installed with $(BASE_VERSION_NODOT) appended
+INITSCRIPTFILE		= cswpostgresql
+INITSCRIPTFILETMPL	= $(INITSCRIPTFILE).tmpl
+INITSCRIPTFILE_VERSIONED = $(INITSCRIPTFILE)-$(BASE_VERSION_NODOT)
 
-CATALOGNAME_CSWpostgresql-$(BASE_VERSION_G)      = postgresql_$(BASE_VERSION_G)
-CATALOGNAME_CSWpostgresql-$(BASE_VERSION_G)-doc  = postgresql_$(BASE_VERSION_G)_doc
-CATALOGNAME_CSWpostgresql-$(BASE_VERSION_G)-dev  = postgresql_$(BASE_VERSION_G)_devel
-CATALOGNAME_CSWlibpq-$(BASE_VERSION_G)           = libpq$(BASE_VERSION_G)
-CATALOGNAME_CSWpostgresql                        = postgresql
+# The postinstall script for the postgreSQL server
+SERVERPOSTINSTTMPL  = CSWpostgresql-server.postinstall.tmpl
+SERVERPOSTINST_VERSIONED = CSW$(NAME)$(BASE_VERSION_NODOT)-server.postinstall
 
-SPKG_DEST_CSWpostgresql                       = An advanced open source database, a metapackage
-SPKG_DESC_CSWpostgresql-$(BASE_VERSION_G)     = An advanced open source database, version $(BASE_VERSION).x
-SPKG_DESC_CSWpostgresql-$(BASE_VERSION_G)-doc = PostgreSQL $(BASE_VERSION).x Documentation
-SPKG_DESC_CSWpostgresql-$(BASE_VERSION_G)-dev = PostgreSQL $(BASE_VERSION).x Developer Files
-SPKG_DESC_CSWlibpq-$(BASE_VERSION_G)          = PostgreSQL $(BASE_VERSION).x Libraries
 
-RUNTIME_DEP_PKGS_CSWpostgresql                        = CSWpostgresql-$(BASE_VERSION_G)
-RUNTIME_DEP_PKGS_CSWpostgresql-$(BASE_VERSION_G)     += CSWkrb5lib
-RUNTIME_DEP_PKGS_CSWpostgresql-$(BASE_VERSION_G)     += CSWlibgnugetopt
-RUNTIME_DEP_PKGS_CSWpostgresql-$(BASE_VERSION_G)     += CSWlibpq-$(BASE_VERSION_G)
-RUNTIME_DEP_PKGS_CSWpostgresql-$(BASE_VERSION_G)     += CSWlibxml2
-RUNTIME_DEP_PKGS_CSWpostgresql-$(BASE_VERSION_G)     += CSWlibxslt
-RUNTIME_DEP_PKGS_CSWpostgresql-$(BASE_VERSION_G)     += CSWosslrt
-RUNTIME_DEP_PKGS_CSWpostgresql-$(BASE_VERSION_G)     += CSWreadline
-RUNTIME_DEP_PKGS_CSWpostgresql-$(BASE_VERSION_G)     += CSWzlib
-RUNTIME_DEP_PKGS_CSWlibpq-$(BASE_VERSION_G)          += CSWkrb5lib
-RUNTIME_DEP_PKGS_CSWlibpq-$(BASE_VERSION_G)          += CSWosslrt
-RUNTIME_DEP_PKGS_CSWpostgresql-$(BASE_VERSION_G)-dev  = CSWpostgresql-$(BASE_VERSION_G)
+# These are the alternatives provided for the packages.  I use them in the
+# recipe to iterate over all possible alternatives (see 'post-merge:')
+#
+# Please note that these should correspond to the package suffixes.
+myALTERNATIVES = server client contrib
 
-CHECKPKG_OVERRIDES_CSWpostgresql += surplus-dependency|CSWpostgresql-84
-CHECKPKG_OVERRIDES_CSWpostgresql-84-dev += surplus-dependency|CSWpostgresql-84
+POSTMSG = $(foreach n,$(myALTERNATIVES),\
+	$(docdir)/$(NAME)$(BASE_VERSION_NODOT)_$(n)/CSW$(NAME)$(BASE_VERSION_NODOT)-$(n).postmsg\
+)
 
-ARCHALL_CSWpostgresql                       = 1
-ARCHALL_CSWpostgresql-$(BASE_VERSION_G)-doc = 1
-ARCHALL_CSWpostgresql-$(BASE_VERSION_G)-doc = 1
+MASTER_SITES = http://ftp.postgresql.org/pub/source/v$(VERSION)/
+DISTFILES  = $(NAME)-$(VERSION).tar.bz2
+DISTFILES += README.CSW
+DISTFILES += $(SERVERPOSTINSTTMPL)
+DISTFILES += $(INITSCRIPTFILETMPL)
+DISTFILES += $(USERGROUPFILETMPL)
+DISTFILES += $(CSWPGSQLCONFFILETMPL)
+DISTFILES += $(notdir $(POSTMSG))
+NOCHECKSUM = $(notdir $(POSTMSG))
 
+EXPANDVARS  = $(CSWPGSQLCONFFILETMPL)
+EXPANDVARS += $(INITSCRIPTFILETMPL)
+EXPANDVARS += $(CSWPGSQLCONFFILETMPL)
+EXPANDVARS += $(SERVERPOSTINSTTMPL)
+EXPANDVARS += $(USERGROUPFILETMPL)
+EXPANDVARS += README.CSW
+
+# This patch will replace /usr/local/include by /opt/csw/include in
+# ecpg.c and thus silence a checkpkg error.
+PATCHFILES += 0000-ecpg-usr-local-include-replacement.patch
+# Test running on a NFS may fail. Thus we let the test run in
+# /var/tmp/pgsql/tmp_check
+PATCHFILES += 0000-Run-tests-in-var-tmp-pgsql-tmp_check.patch
+# By default, src/makefiles/Makefile.solaris uses -Wl,-R'$(rpathdir)'
+# which isn't properly digested by Sun's ld
+PATCHFILES += 0000-Use-plain-rpath.patch
+
+INITSMF = $(sysconfdir)/init\.d/$(INITSCRIPTFILE_VERSIONED)
+USERGROUP = $(USERGROUPDIR)/$(USERGROUPFILE_VERSIONED)
+PRESERVECONF = $(sysconfdir)/$(CSWPGSQLCONFFILE_VERSIONED)
+
 LICENSE = COPYRIGHT
 
-EXTRA_INC = $(BUILD_PREFIX)/include
-EXTRA_LIB = $(BUILD_PREFIX)/lib
+# The alternatives modifier should stay in place, until I figured out
+# how to properly employ the ALTERNATIVES system in this build.
+PROTOTYPE_MODIFIERS = pgdata alternatives
+PROTOTYPE_FILES_pgdata = $(PGLOCALSTATEDIR_BASE).*
+PROTOTYPE_USER_pgdata = postgres
+PROTOTYPE_GROUP_pgdata = sys
+PROTOTYPE_PERMS_pgdata = 0700
+PROTOTYPE_CLASS_pgdata = ugfiles
+PROTOTYPE_FILES_alternatives = .*/alternatives/$(NAME)$(BASE_VERSION_NODOT).*
+PROTOTYPE_CLASS_alternatives = cswalternatives
 
-EXTRA_LD_OPTIONS  = -R$(prefix)/lib/\$$ISALIST
+# This is the catchall package. It should not contain any files from
+# $(PKGROOT). After building all the packages, I check the prototype of this
+# package to make sure there are no files slipped by.
+PACKAGES = CSW$(NAME)$(BASE_VERSION_NODOT)
+SPKG_DESC_CSW$(NAME)$(BASE_VERSION_NODOT) = PostgreSQL $(VERSION), Meta Package
+ARCHALL_CSW$(NAME)$(BASE_VERSION_NODOT) = 1
+RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)  = CSW$(NAME)$(BASE_VERSION_NODOT)-server
+RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT) += CSW$(NAME)$(BASE_VERSION_NODOT)-client
+RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT) += CSW$(NAME)$(BASE_VERSION_NODOT)-contrib
+CHECKPKG_OVERRIDES_CSW$(NAME)$(BASE_VERSION_NODOT) += surplus-dependency|CSW$(NAME)$(BASE_VERSION_NODOT)-client
+CHECKPKG_OVERRIDES_CSW$(NAME)$(BASE_VERSION_NODOT) += surplus-dependency|CSW$(NAME)$(BASE_VERSION_NODOT)-server
+CHECKPKG_OVERRIDES_CSW$(NAME)$(BASE_VERSION_NODOT) += surplus-dependency|CSW$(NAME)$(BASE_VERSION_NODOT)-contrib
 
-BUILD64 = 1
+PACKAGES += CSW$(NAME)$(BASE_VERSION_NODOT)-server
+SPKG_DESC_CSW$(NAME)$(BASE_VERSION_NODOT)-server = PostgreSQL $(VERSION), Server
+PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-server  = $(foreach n,$(BIN_NAMES_SERVER),.*$(n)$$)
+PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-server += $(foreach n,$(BIN_NAMES_SERVER),.*/man1/$(n)-$(BASE_VERSION_NODOT)\.1$$)
+PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-server += $(foreach n,$(SO_NAMES_SERVER),.*/$(NAME)/$(BASE_VERSION_NODOT)/*$(n)$$)
+PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-server += $(foreach n,$(EXT_NAMES_SERVER),.*/$(NAME)/$(BASE_VERSION_NODOT)/extension/$(n)$$)
+PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-server += $(MISC_NAMES_SERVER)
+PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-server += .*/$(NAME)/$(BASE_VERSION_NODOT)/timezone(sets|)/.*
+PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-server += .*/$(NAME)/$(BASE_VERSION_NODOT)/tsearch_.*/.*
+PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-server += $(PGLOCALSTATEDIR_BASE).*
+PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-server += .*$(USERGROUP)
+PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-server += .*$(sysconfdir)/init\.d/.*
+PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-server += .*$(sysconfdir)/$(CSWPGSQLCONFFILE_VERSIONED).CSW
+PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-server += .*/alternatives/$(NAME)$(BASE_VERSION_NODOT)_server.*
+PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-server += .*/CSW$(NAME)$(BASE_VERSION_NODOT)-server.postmsg
+PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-server += .*$(docdir)/$(NAME)$(BASE_VERSION_NODOT)_server/README.CSW
+RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWlibreadline6
+RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWosslrt
+RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWlibz1
+RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWlibpq5
+RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWlibgnugetopt0
+RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWlibxslt1
+RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWlibxml2-2
+RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWlibgssapi-krb5-2
+#ALTERNATIVES_CSW$(NAME)$(BASE_VERSION_NODOT)-server = $(foreach i,$(NEEDED_ISAS), server_$(i))
 
-# There was a discussion about whether to use ISAEXEC by default.  The argument
-# is that enabling 64-bit by default where possible (using isaexec) is a waste.
-# I'm not completely convinced.  Leaving this line commented out for future
-# consideration.
-#
-# References:
-# - http://lists.opencsw.org/pipermail/maintainers/2009-November/004903.html
-#
-# I'd like to get some hard data though.  What is the difference in the memory
-# footprint, and what is the difference in execution speed between 32 and
-# 64-bit versions?
-#
-# NOISAEXEC = 1
+PACKAGES += CSW$(NAME)$(BASE_VERSION_NODOT)-client
+SPKG_DESC_CSW$(NAME)$(BASE_VERSION_NODOT)-client = PostgreSQL $(VERSION), Client
+PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-client = $(foreach n,$(BIN_NAMES_CLIENT),.*$(n)$$)
+PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-client += $(foreach n,$(BIN_NAMES_CLIENT),.*/man1/$(n)-$(BASE_VERSION_NODOT)\.1$$)
+PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-client += $(MISC_NAMES_CLIENT)
+PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-client += .*/alternatives/$(NAME)$(BASE_VERSION_NODOT)_client.*
+PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-client += .*/CSW$(NAME)$(BASE_VERSION_NODOT)-client.postmsg
+PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-client += .*$(docdir)/$(NAME)$(BASE_VERSION_NODOT)_client/README.CSW
+RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWlibreadline6
+RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWosslrt
+RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWlibz1
+RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWlibpq5
+RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWlibgnugetopt0
+RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWlibxslt1
+RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWlibxml2-2
+RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWlibgssapi-krb5-2
+#ALTERNATIVES_CSW$(NAME)$(BASE_VERSION_NODOT)-client = $(foreach i,$(NEEDED_ISAS), client_$(i))
 
-CONFIGURE_ARGS  = $(DIRPATHS)
-CONFIGURE_ARGS += --with-includes=/opt/csw/include
+PACKAGES += CSW$(NAME)$(BASE_VERSION_NODOT)-contrib
+SPKG_DESC_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib = PostgreSQL $(VERSION), Contrib
+PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib = $(foreach n,$(BIN_NAMES_CONTRIB),.*$(n)$$)
+PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += $(foreach n,$(BIN_NAMES_CONTRIB),.*/man1/$(n)-$(BASE_VERSION_NODOT)\.1$$)
+PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += $(foreach n,$(SO_NAMES_CONTRIB),.*/$(NAME)/$(BASE_VERSION_NODOT)/*$(n)$$)
+PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += $(foreach n,$(EXT_NAMES_CONTRIB),.*/$(NAME)/$(BASE_VERSION_NODOT)/extension/$(n)$$)
+PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += .*$(docdir)/$(NAME)/$(BASE_VERSION_NODOT)/extension/.*
+# This has been removed as of 9.1
+#PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += .*/$(NAME)/$(BASE_VERSION_NODOT)/contrib.*
+PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += .*/alternatives/$(NAME)$(BASE_VERSION_NODOT)_contrib.*
+PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += .*/CSW$(NAME)$(BASE_VERSION_NODOT)-contrib.postmsg
+PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += .*$(docdir)/$(NAME)$(BASE_VERSION_NODOT)_contrib/README.CSW
+RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += CSWosslrt
+RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += CSWlibz1
+RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += CSWlibpq5
+RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += CSWlibgnugetopt0
+RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += CSWlibxslt1
+RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += CSWlibxml2-2
+RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += CSWlibgssapi-krb5-2
+RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += CSWlibreadline6
+#ALTERNATIVES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib = $(foreach i,$(NEEDED_ISAS), contrib_$(i))
 
-# # Perl support only in the 32-bit version
-# CONFIGURE_ARGS_isa-sparcv8 += --with-perl
-# CONFIGURE_ARGS_isa-i386 += --with-perl
+PACKAGES += CSW$(NAME)-dev
+SPKG_DESC_CSW$(NAME)-dev = PostgreSQL $(VERSION), Development Files
+PKGFILES_CSW$(NAME)-dev  = .*/pgxs/.*
+PKGFILES_CSW$(NAME)-dev += $(PKGFILES_DEVEL)
+PKGFILES_CSW$(NAME)-dev += $(foreach n,$(BIN_NAMES_DEVEL),.*$(n)$$)
+PKGFILES_CSW$(NAME)-dev += $(foreach n,$(BIN_NAMES_DEVEL),.*/man1/$(n)\.1$$)
+PKGFILES_CSW$(NAME)-dev += .*/CSW$(NAME)-dev.postmsg
+PKGFILES_CSW$(NAME)-dev += .*$(docdir)/$(NAME)_dev/README.CSW
+# See `post-merge-modulated:'
+PKGFILES_CSW$(NAME)-dev += .*/libpgport\.a$
+RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWlibecpg-compat3
+RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWlibecpg6
+RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWlibpq5
+RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWlibpgtypes3
+RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWlibz1
+RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWlibgssapi-krb5-2
+RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWlibgnugetopt0
+RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWlibxslt1
+RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWlibxml2-2
+RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWlibreadline6
+RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWosslrt
+# Those '/usr/local' are ok, they are in a HPUX section of the file
+CHECKPKG_OVERRIDES_CSW$(NAME)-dev += $(foreach i,$(NEEDED_ISAS), $(subst $(ISA_DEFAULT)/,,file-with-bad-content|/usr/local|root$(libdir)/$(i)/$(NAME)/$(BASE_VERSION_NODOT)/pgxs/src/Makefile.shlib) )
+# That's ok too, it's docbook stuff which we don't use in this build
+CHECKPKG_OVERRIDES_CSW$(NAME)-dev += $(foreach i,$(NEEDED_ISAS), $(subst $(ISA_DEFAULT)/,,file-with-bad-content|/usr/share|root$(libdir)/$(i)/$(NAME)/$(BASE_VERSION_NODOT)/pgxs/src/Makefile.global) )
+# See `post-merge-modulated:' for those overrides
+CHECKPKG_OVERRIDES_CSWpostgresql-dev += discouraged-path-in-pkgmap|/opt/csw/lib/libpgport.a
+CHECKPKG_OVERRIDES_CSWpostgresql-dev += discouraged-path-in-pkgmap|/opt/csw/lib/$(ISA_DEFAULT64)/libpgport.a
 
-# # Python support in 32-bit only
-# CONFIGURE_ARGS_isa-sparcv8 += --with-python
-# CONFIGURE_ARGS_isa-i386 += --with-python
+PACKAGES += CSW$(NAME)$(BASE_VERSION_NODOT)-doc
+ARCHALL_CSW$(NAME)$(BASE_VERSION_NODOT)-doc = 1
+SPKG_DESC_CSW$(NAME)$(BASE_VERSION_NODOT)-doc = PostgreSQL $(VERSION), Documentation Files
+PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-doc  = .*/doc/$(NAME)/$(BASE_VERSION_NODOT)/.*\.(html|css)
+PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-doc += .*/man5/.*
 
-CONFIGURE_ARGS += --with-gssapi
-# CONFIGURE_ARGS += --with-krb5
-CONFIGURE_ARGS += --with-pam
-# CONFIGURE_ARGS += --with-bonjour
-CONFIGURE_ARGS += --with-openssl
-CONFIGURE_ARGS += --with-libxml
-CONFIGURE_ARGS += --with-libxslt
-CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(MODULATION))
+PACKAGES += CSWlibecpg-compat3
+SPKG_DESC_CSWlibecpg-compat3 = PostgreSQL $(VERSION), libecpg_compat
+PKGFILES_CSWlibecpg-compat3  = $(call pkgfiles_lib,libecpg_compat.so.3)
+RUNTIME_DEP_PKGS_CSWlibecpg-compat3  = CSWlibecpg6
+RUNTIME_DEP_PKGS_CSWlibecpg-compat3 += CSWlibpgtypes3
+RUNTIME_DEP_PKGS_CSWlibecpg-compat3 += CSWlibpq5
 
-# Skipping tests to save time during packaging, and to enable x86 builds.
-SKIPTEST ?= 1
-TEST_TARGET = check
+PACKAGES += CSWlibecpg6
+SPKG_DESC_CSWlibecpg6 = PostgreSQL $(VERSION), libecpg
+PKGFILES_CSWlibecpg6  = $(call pkgfiles_lib,libecpg.so.6)
+RUNTIME_DEP_PKGS_CSWlibecpg6 += CSWlibpgtypes3
+RUNTIME_DEP_PKGS_CSWlibecpg6 += CSWlibpq5
 
-# CSWpostgresql is a generic wrapper always pointing to the latest release
-PKGFILES_CSWpostgresql                        = NOFILES
-PKGFILES_CSWpostgresql-$(BASE_VERSION_G)-doc  = $(PKGFILES_DOC)
-PKGFILES_CSWpostgresql-$(BASE_VERSION_G)-dev  = $(PKGFILES_DEVEL)
+PACKAGES += CSWlibpgtypes3
+SPKG_DESC_CSWlibpgtypes3 = PostgreSQL $(VERSION), libpgtypes
+PKGFILES_CSWlibpgtypes3  = $(call pkgfiles_lib,libpgtypes.so.3)
 
-PKGFILES_CSWlibpq-$(BASE_VERSION_G)           = $(call baseisadirs,$(libdir),libpq\.so(\.\d+)*)
-PKGFILES_CSWlibpq-$(BASE_VERSION_G)          += $(call baseisadirs,$(libpath_install),libpq\.so(\.\d+)*)
-PKGFILES_CSWlibpq-$(BASE_VERSION_G)          += $(libdir)/64
+PACKAGES += CSWlibpq5
+SPKG_DESC_CSWlibpq5 = PostgreSQL $(VERSION), libpq
+PKGFILES_CSWlibpq5  = $(call pkgfiles_lib,libpq.so.5)
+RUNTIME_DEP_PKGS_CSWlibpq5  = CSWosslrt
+RUNTIME_DEP_PKGS_CSWlibpq5 += CSWlibgssapi-krb5-2
 
-# initscript_base_name = cswpostgres_$(subst .,_,$(BASE_VERSION))
-initscript_base_name = cswpostgres_$(VERSION_NODOT)
-INITSMF = /etc$(prefix)/init\.d/$(initscript_base_name)
-USERGROUP = /etc/opt/csw/pkg/postgresql/cswusergroup_$(VERSION_NODOT)
-PRESERVECONF = $(sysconfdir)/postgresql\.conf
+BUILD_DEP_PKGS  = CSWlibxml2-dev
+BUILD_DEP_PKGS += CSWlibxslt-dev
+BUILD_DEP_PKGS += CSWperl
+BUILD_DEP_PKGS += CSWpython-dev
+BUILD_DEP_PKGS += CSWossldevel
+BUILD_DEP_PKGS += CSWlibreadline-dev
+BUILD_DEP_PKGS += CSWgsed # gsed is used in this recipe
+BUILD_DEP_PKGS += CSWlibz-dev
+BUILD_DEP_PKGS += CSWlibgnugetopt-dev
 
-BIN_NAMES  = clusterdb
-BIN_NAMES += createdb
-BIN_NAMES += createlang
-BIN_NAMES += createuser
-BIN_NAMES += dropdb
-BIN_NAMES += droplang
-BIN_NAMES += dropuser
-BIN_NAMES += ecpg
-BIN_NAMES += initdb
-BIN_NAMES += oid2name
-BIN_NAMES += pg_config
-BIN_NAMES += pg_controldata
-BIN_NAMES += pg_ctl
-BIN_NAMES += pg_dump
-BIN_NAMES += pg_dumpall
-BIN_NAMES += pg_resetxlog
-BIN_NAMES += pg_restore
-BIN_NAMES += pg_standby
-BIN_NAMES += pgbench
-BIN_NAMES += postgres
-BIN_NAMES += postmaster
-BIN_NAMES += psql
-BIN_NAMES += reindexdb
-BIN_NAMES += vacuumdb
-BIN_NAMES += vacuumlo
+# See comment on the test-custom target.
+TEST_SCRIPTS = custom
 
-PGDATA = $(localstatedir)/pgdata
+EXTRA_LD_OPTIONS  = -R$(prefix)/lib/\$$ISALIST
+# Needed for thread safety check by configure
+LIBS		= -lrt
+EXTRA_CONFIGURE_ENV = LIBS=$(LIBS)
 
-PROTOTYPE_MODIFIERS = pgdata
-PROTOTYPE_FILES_pgdata = $(PGDATA)
-PROTOTYPE_USER_pgdata = postgres
-PROTOTYPE_GROUP_pgdata = sys
-PROTOTYPE_PERMS_pgdata = 0700
-PROTOTYPE_CLASS_pgdata = ugfiles
+BUILD64 = 1
+#ISAEXEC = 0
+MERGE_DIRS_isa-extra = $(bindir) $(libdir) $(libexecdir)
 
-# This is one of the rare cases where a protoype filter is needed.
-# Do not copy this for other Makefiles unless you understand exactly what it does!!
-# (explanation: It adds -isaexec to the isaexec-name of the binaries to be isaexec'ed)
-PROTOTYPE_FILTER = perl -npe 's,=/opt/csw/bin/isaexec,-isaexec=/opt/csw/bin/isaexec,'
+CONFIGURE_ARGS  = $(DIRPATHS)
+# This is one of the quirks mentioned at the beginning: --program-suffix is not
+# supported, so IMHO, binaries should go to --libexecdir
+CONFIGURE_ARGS += --bindir=$(PGBINDIR)
+CONFIGURE_ARGS += --sbindir=$(PGSBINDIR)
+CONFIGURE_ARGS += --sysconfdir=$(PGSYSCONFDIR)
+CONFIGURE_ARGS += --datadir=$(PGDATADIR)
+CONFIGURE_ARGS += --localstatedir=$(PGDATA)
+CONFIGURE_ARGS += --with-includes=$(includedir)
+CONFIGURE_ARGS += --with-libraries=$(libdir)
+CONFIGURE_ARGS += --docdir=$(PGDOCDIR)
 
-# ISAEXEC_FILES = $(addsuffix -isaexec,$(foreach B,$(BIN_NAMES),$(bindir_install)/$B))
-ALTERNATIVES_CSWpostgresql-$(BASE_VERSION_G) = $(NAME)$(BASE_VERSION_G)-32 $(NAME)$(BASE_VERSION_G)-64 $(NAME)$(BASE_VERSION_G)-auto
-ALTERNATIVE_$(NAME)$(BASE_VERSION_G)-32 = $(bindir_install)/$(firstword $(BIN_NAMES)) $(firstword $(BIN_NAMES)) $(bindir_install)/$(ISA_DEFAULT)/$(firstword $(BIN_NAMES)) 100
-ALTERNATIVE_$(NAME)$(BASE_VERSION_G)-32 += $(foreach B,$(wordlist 2,$(words $(BIN_NAMES)),$(BIN_NAMES)),$(bindir_install)/$B $B $(bindir_install)/$(ISA_DEFAULT)/$B)
-ALTERNATIVE_$(NAME)$(BASE_VERSION_G)-64 = $(bindir_install)/$(firstword $(BIN_NAMES)) $(firstword $(BIN_NAMES)) $(bindir_install)/$(ISA_DEFAULT64)/$(firstword $(BIN_NAMES)) 200
-ALTERNATIVE_$(NAME)$(BASE_VERSION_G)-64 += $(foreach B,$(wordlist 2,$(words $(BIN_NAMES)),$(BIN_NAMES)),$(bindir_install)/$B $B $(bindir_install)/$(ISA_DEFAULT64)/$B)
-ALTERNATIVE_$(NAME)$(BASE_VERSION_G)-auto = $(bindir_install)/$(firstword $(BIN_NAMES)) $(firstword $(BIN_NAMES)) $(bindir_install)/$(firstword $(BIN_NAMES))-isaexec 300
-ALTERNATIVE_$(NAME)$(BASE_VERSION_G)-auto += $(foreach B,$(wordlist 2,$(words $(BIN_NAMES)),$(BIN_NAMES)),$(bindir_install)/$B $B $(bindir_install)/$B-isaexec)
+CONFIGURE_ARGS += --with-gssapi
+CONFIGURE_ARGS += --with-pam
+CONFIGURE_ARGS += --with-openssl
+CONFIGURE_ARGS += --with-libxml
+CONFIGURE_ARGS += --with-libxslt
+CONFIGURE_ARGS += --without-krb5
+CONFIGURE_ARGS += --without-bonjour
 
-# checkpkg does not detect this dependency automatically
-CHECKPKG_OVERRIDES_CSWpostgresql-84 += surplus-dependency|CSWalternatives
+#SKIPTEST ?= 1
 
 include gar/category.mk
 
-CFLAGS := $(filter-out -I%,$(CFLAGS))
+# If the check is not called from within the $(WORKSRC) dir, it
+# fails. This behavior appeared with version 9.1.
+test-custom:
+	cd $(WORKSRC) ; $(BUILD_ENV) gmake check
+	@$(MAKECOOKIE)
 
+# This will generate the ALTERNATIVEs for the binaries in
+# $(libexecdir)/postgresql/XY.
+#
+# The uppercase_* variables are used to translate the lowercase
+# $(myALTERNATIVES) to uppercase.
+#
+# How it does create the alternatives:
+#
+# for pkg in $(myALTERNATIVES)
+#   -- set alternative priority to 20
+#   for alt in $(NEEDED_ISAS)
+#     -- increment alternative priority by 10
+#     -- create master alternative for pkg, remove default isa from path,
+#	 store alternative in $(ALTERNATIVE_$(pkg)_$(alt)
+#     -- create slave alternatives for pkg, remove default isa from path,
+#	 append slave alternative to $(ALTERNATIVE_$(pkg)_$(alt)
+#   end alt
+# end pkg
+#
+# In the post-merge target, the alternatives are written to their
+# respective files
+
+uppercase_server = SERVER
+uppercase_client = CLIENT
+uppercase_contrib = CONTRIB
+$(foreach pkg,$(myALTERNATIVES),\
+	$(eval alt_priority = 20) \
+	$(foreach alt,$(NEEDED_ISAS), \
+		$(eval alt_priority=$(shell expr $(alt_priority) + 10)) \
+		$(eval ALTERNATIVE_$(pkg)_$(alt) = $(subst /$(ISA_DEFAULT)/,/,$(foreach n,$(firstword $(BIN_NAMES_$(uppercase_$(pkg)))),$(bindir)/$(n)-$(BASE_VERSION_NODOT) $(NAME)$(BASE_VERSION_NODOT)-$(pkg) $(libexecdir)/$(alt)/$(NAME)/$(BASE_VERSION_NODOT)/$(n))) $(alt_priority)) \
+		$(eval ALTERNATIVE_$(pkg)_$(alt) += $(subst /$(ISA_DEFAULT)/,/,$(foreach n,$(wordlist 2,$(words $(BIN_NAMES_$(uppercase_$(pkg)))),$(BIN_NAMES_$(uppercase_$(pkg)))),$(bindir)/$(n)-$(BASE_VERSION_NODOT) $(NAME)$(BASE_VERSION_NODOT)-$(pkg) $(libexecdir)/$(alt)/$(NAME)/$(BASE_VERSION_NODOT)/$(n)))) \
+	)\
+)
+
+# We adjust the $(pkglibdir) found in $(WORKSRC)/src/Makefile.global.in, so
+# that it should be possible to install 8.x and 8.y concurrently
+pre-configure-modulated:
+	@echo " ===> Adjusting pkglibdir in $(WORKSRC)/src/Makefile.global.in"
+	@if [ -r $(WORKSRC)/src/Makefile.global.in ] ; then \
+		gsed -i -r -e 's|^(pkglibdir[[:space:]]*=[[:space:]]*)\$$\(libdir\).*$$|\1$$(libdir)/postgresql/$(BASE_VERSION_NODOT)|' $(WORKSRC)/src/Makefile.global.in ; \
+	fi
+	@$(MAKECOOKIE)
+
 post-build-modulated:
+	@echo " ===> Building contrib stuff"
 	$(BUILD_ENV) gmake -C $(WORKSRC)/contrib all
 	@$(MAKECOOKIE)
 
 post-install-modulated:
+	@echo " ===> Installing contrib stuff"
 	$(INSTALL_ENV) gmake -C $(WORKSRC)/contrib DESTDIR=$(DESTDIR) install
+	$(INSTALL_ENV) gmake -C $(WORKSRC) DESTDIR=$(DESTDIR) install-docs
 	@$(MAKECOOKIE)
 
-post-merge:
-	ginstall -d $(PKGROOT)/etc$(prefix)/init.d
-	gsed \
-		-e 's+ at PGDATA@+$(PGDATA)+g' \
-		-e 's+ at sysconfdir@+$(sysconfdir)+g' \
-		-e 's+ at bindir@+$(bindir)+g' \
-		< $(FILEDIR)/cswpostgres.tmpl \
-		> $(WORKDIR)/$(initscript_base_name)
-	ginstall \
-		$(WORKDIR)/$(initscript_base_name) \
-		$(PKGROOT)/etc$(prefix)/init.d/$(initscript_base_name)
-	ginstall -d $(PKGROOT)/etc$(prefix)/pkg/$(NAME)
-	gsed -e 's+ at PGDATA@+$(PGDATA)+g' \
-		< $(FILEDIR)/cswusergroup.tmpl \
-		> $(WORKDIR)/cswusergroup
-	ginstall $(WORKDIR)/cswusergroup \
-		$(PKGROOT)/etc$(prefix)/pkg/$(NAME)/cswusergroup_$(VERSION_NODOT)
-	ginstall -d $(PKGROOT)$(sysconfdir)
-	gsed -e 's+ at PGDATA@+$(PGDATA)+g' \
-		< $(FILEDIR)/postgresql.conf.tmpl \
-		> $(WORKDIR)/postgresql.conf
-	ginstall $(WORKDIR)/postgresql.conf \
-		$(PKGROOT)$(sysconfdir)
-	ginstall -d $(PKGROOT)$(docdir)
-	# ginstall $(WORKDIR)/README-CSW.txt $(PKGROOT)$(docdir)
-	ginstall -m 755 -d $(PKGROOT)$(prefix)/bin
-	ginstall -d $(PKGROOT)$(PGDATA)
-	gln -s $(ISA_DEFAULT64) $(PKGROOT)$(libdir)/64
-	for L in $(notdir $(wildcard $(PKGROOT)$(libdir)/libpq.*)); do \
-		gln -s $(pgsubdir)/$$L $(PKGROOT)$(libpath_install)/$$L; \
+# We suck in the libpgport.a since pg_config is emitting
+# -lpgport. Unfortunately, there is no shared lib version, and I'm too
+# lazzy to adjust the build system to generate one...
+post-merge-modulated:
+ifeq ($(ISA),$(ISA_DEFAULT64))
+	ginstall $(WORKSRC)/src/port/libpgport.a $(PKGROOT)$(libpath_install)/$(ISA_DEFAULT64)/
+else
+	ginstall $(WORKSRC)/src/port/libpgport.a $(PKGROOT)$(libdir)/
+endif
+# Move the development binaries to the standard location
+	ginstall -d $(PKGROOT)$(bindir)/
+	for f in $(BIN_NAMES_DEVEL) ; do \
+		gmv -v $(PKGROOT)$(libexecdir)/$(NAME)/$(BASE_VERSION_NODOT)/$$f $(PKGROOT)$(bindir)/ ; \
 	done
-	mkdir -p $(PKGROOT)$(libpath_install)/$(ISA_DEFAULT64)
-	for L in $(notdir $(wildcard $(PKGROOT)$(libdir)/$(ISA_DEFAULT64)/libpq.*)); do \
-		gln -s ../$(pgsubdir)/$(ISA_DEFAULT64)/$$L $(PKGROOT)$(libpath_install)/$(ISA_DEFAULT64)/$$L; \
+
+post-merge:  $(foreach n,$(POSTMSG),$(PKGROOT)/$(n)) test-installation
+# Create my alternatives files.
+	$(foreach a,$(myALTERNATIVES), $(foreach i,$(NEEDED_ISAS), $(info ===> Create alternative $(i) $(a)) $(shell ginstall -d $(PKGROOT)$(sharedstatedir)/alternatives ; echo "$(ALTERNATIVE_$(a)_$(i))" > $(PKGROOT)$(sharedstatedir)/alternatives/$(NAME)$(BASE_VERSION_NODOT)_$(a)_$(i) ) ) )
+# Create the PGDATA directory
+	@echo " ===> Create pgdata directory"
+	@ginstall -d $(PKGROOT)$(PGDATA)
+# Adjust the man page names.
+	@echo " ===> Adjusting man page file names"
+	@for i in 1 5 ; do \
+		test -d $(PKGROOT)$(datadir)/man/man$$i || continue ; \
+		for f in $(PKGROOT)$(datadir)/man/man$$i/* ; do \
+			suffix="`echo $$f | awk 'BEGIN { FS="." } { print $$NF }'`" ; \
+			f_no_suffix="`echo $$f | sed -e "s/\.$${suffix}$$//"`" ; \
+			dont_move=0 ; \
+			for d in $(BIN_NAMES_DEVEL) ; do \
+				bname="`basename $${f_no_suffix}`" ; \
+				if test "$${bname}" = "$$d" ; then \
+					dont_move=1 ; \
+					break ; \
+				fi ; \
+			done ; \
+			test $${dont_move} -eq 0 && mv $$f $${f_no_suffix}-$(BASE_VERSION_NODOT).$${suffix} ; \
+		done ;\
 	done
+# Change path names in documentation
+	@echo " ===> Adjust path names in documentation"
+	@for f in $(PKGROOT)$(docdir)/$(NAME)/$(BASE_VERSION_NODOT)/html/*.html $(PKGROOT)$(mandir)/man1/*.1 $(PKGROOT)$(datadir)/$(NAME)/$(BASE_VERSION_NODOT)/*.sample ; do \
+		gsed -i -e 's|/usr/local/pgsql/data|$(localstatedir)/$(NAME)/$(BASE_VERSION_NODOT)|g' \
+			-e 's|/usr/local/pgsql/|$(prefix)/|g' \
+			-e 's|/usr/local|$(prefix)|g' \
+			-e 's|/usr/share|$(datadir)|g' $$f ; \
+	done
+	@echo " ===> Install postmsg"
+	$(foreach n,$(POSTMSG), $(shell ginstall -d $(PKGROOT)$(dir $(n))) $(shell ginstall $(WORKDIR)/$(notdir $(n)) $(PKGROOT)$(n)))
 	@$(MAKECOOKIE)
+
+pre-package:
+# The postinstall for the server package
+	@echo " ===> Install postinstall script"
+	@ginstall $(WORKDIR)/$(SERVERPOSTINSTTMPL) $(WORKDIR)/$(SERVERPOSTINST_VERSIONED)
+# The usergroup file
+	@echo " ===> Install usergroup file"
+	@ginstall -d $(PKGROOT)$(USERGROUPDIR)
+	@ginstall $(WORKDIR)/$(USERGROUPFILETMPL) $(PKGROOT)$(USERGROUPDIR)/$(USERGROUPFILE_VERSIONED)
+# The init script
+	@echo " ===> Install init script"
+	@ginstall -d $(PKGROOT)$(sysconfdir)/init.d
+	@ginstall $(WORKDIR)/$(INITSCRIPTFILETMPL) $(PKGROOT)$(sysconfdir)/init.d/$(INITSCRIPTFILE_VERSIONED)
+	@chmod 0755 $(PKGROOT)$(sysconfdir)/init.d/$(INITSCRIPTFILE_VERSIONED)
+# The init script config
+	@echo " ===> Install init script config"
+	@ginstall $(WORKDIR)/$(CSWPGSQLCONFFILETMPL) $(PKGROOT)$(sysconfdir)/$(CSWPGSQLCONFFILE_VERSIONED).CSW
+# Remove all the README.CSW, since they have not expanded the
+# variables, and copy only the one's we're interested in
+	@echo " ===> Remove all README.CSW"
+	@for f in $(PKGROOT)$(docdir)/*/README.CSW ; do \
+		rm $$f ; \
+	done
+	@echo " ==> Install variable expanded README.CSW"
+	@for d in $(foreach n,$(myALTERNATIVES),$(NAME)$(BASE_VERSION_NODOT)_$(n)) $(NAME)$(BASE_VERSION_NODOT) ; do \
+		ginstall $(WORKDIR)/README.CSW $(PKGROOT)$(docdir)/$$d/ ; \
+	done
+	@$(MAKECOOKIE)
+
+$(foreach n,$(POSTMSG),$(PKGROOT)/$(n)):
+	@echo " ===> Linking Post Messages"
+	@ginstall -d $(dir $@)
+	@ln $(DOWNLOADDIR)/$(notdir $@) $@
+
+$(foreach n,$(POSTMSG),$(DOWNLOADDIR)/$(notdir $(n))):
+	@echo " ===> Generating $(notdir $@)"
+	@echo "" > $@
+	@echo "---" >> $@
+	@echo "" >> $@
+	@echo "There are 32bit and 64bit versions of $(NAME) $(VERSION) binaries on the system installed:" >> $@
+	@echo "" >> $@
+	@echo "You can easily select between the versions with the alternatives(8)" >> $@
+	@echo "system by executing" >> $@
+	@echo "" >> $@
+	@echo "  /opt/csw/sbin/alternatives --config $(subst .postmsg,,$(subst CSW,,$(notdir $@)))" >> $@
+	@echo "" >> $@
+	@echo "See http://www.opencsw.org/packages/alternatives for details." >> $@
+	@echo "" >> $@
+	@echo "---" >> $@
+	@echo "" >> $@
+	@$(MAKECOOKIE)
+
+test-installation:
+# Check if all binaries and libraries defined in the variables
+# BIN_NAMES_* and SO_NAMES_* are there
+	@echo " ===> Checking for extra binaries in BIN_NAMES_*"
+	@for n in $(BIN_NAMES_SERVER) $(BIN_NAMES_CLIENT) $(BIN_NAMES_CONTRIB) ; do \
+		if [ -f $(PKGROOT)$(PGBINDIR)/$$n ] ; then\
+			: ; \
+		else \
+			echo "Extra binary defined $$n" ; \
+			exit 1 ; \
+		fi ; \
+	done
+	@echo " ===> Checking for extra libraries in SO_NAMES_*"
+	@for n in $(SO_NAMES_SERVER) $(SO_NAMES_CONTRIB) ; do \
+		if [ -f $(PKGROOT)$(libdir)/$(NAME)/$(BASE_VERSION_NODOT)/$$n ] ; then\
+			: ; \
+		else \
+			echo "Extra library defined $$n" ; \
+			exit 1 ; \
+		fi ; \
+	done
+	@echo " ===> Checking for extra extensions in EXT_NAMES_*"
+	@for n in $(EXT_NAMES_SERVER) $(EXT_NAMES_CONTRIB) ; do \
+		if [ -f $(PKGROOT)$(sharedstatedir)/$(NAME)/$(BASE_VERSION_NODOT)/extension/$$n ] ; then\
+			: ; \
+		else \
+			echo "Extra extension defined $$n" ; \
+			exit 1 ; \
+		fi ; \
+	done
+# Check if all binaries and libraries in the pkgroot are contained in
+# the respective recipe variables.
+	@echo " ===> Checking for missing binaries in BIN_NAMES_*"
+	@for n in `gfind $(PKGROOT)$(PGBINDIR) -maxdepth 1 -type f` ; do \
+		echo "$(BIN_NAMES_SERVER) $(BIN_NAMES_CLIENT) $(BIN_NAMES_CONTRIB)" | grep `basename $$n` >/dev/null 2>&1 ; \
+		if [ $$? -eq 0 ] ; then \
+			: ; \
+		else \
+			echo "Binary `basename $$n` not defined" ; \
+			exit 1 ; \
+		fi ; \
+	done
+	@echo " ===> Checking for missing binaries in SO_NAMES_*"
+	@for n in `gfind $(PKGROOT)$(libdir)/$(NAME)/$(BASE_VERSION_NODOT) -maxdepth 1 -type f` ; do \
+		echo "$(SO_NAMES_SERVER) $(SO_NAMES_CONTRIB)" | grep `basename $$n` >/dev/null 2>&1 ; \
+		if [ $$? -eq 0 ] ; then \
+			: ; \
+		else \
+			echo "Library `basename $$n` not defined" ; \
+			exit 1 ; \
+		fi ; \
+	done
+	@echo " ===> Checking for missing extensions in EXT_NAMES_*"
+	@for n in `gfind $(PKGROOT)$(sharedstatedir)/$(NAME)/$(BASE_VERSION_NODOT)/extension -maxdepth 1 -type f` ; do \
+		echo "$(EXT_NAMES_SERVER) $(EXT_NAMES_CONTRIB)" | grep `basename $$n` >/dev/null 2>&1 ; \
+		if [ $$? -eq 0 ] ; then \
+			: ; \
+		else \
+			echo "Extension `basename $$n` not defined" ; \
+			exit 1 ; \
+		fi ; \
+	done

Modified: csw/mgar/pkg/postgresql/trunk/checksums
===================================================================
--- csw/mgar/pkg/postgresql/trunk/checksums	2012-01-20 15:00:35 UTC (rev 16857)
+++ csw/mgar/pkg/postgresql/trunk/checksums	2012-01-20 15:02:39 UTC (rev 16858)
@@ -1 +1 @@
-4bf2448ad965bca3940df648c02194df  postgresql-8.4.4.tar.bz2
+7dbff52221954c46595313eb7f92c3e0  postgresql-9.1.2.tar.bz2

Copied: csw/mgar/pkg/postgresql/trunk/files/0000-Run-tests-in-var-tmp-pgsql-tmp_check.patch (from rev 16856, csw/mgar/pkg/postgresql/branches/postgresql-9.1-raos/files/0000-Run-tests-in-var-tmp-pgsql-tmp_check.patch)
===================================================================
--- csw/mgar/pkg/postgresql/trunk/files/0000-Run-tests-in-var-tmp-pgsql-tmp_check.patch	                        (rev 0)
+++ csw/mgar/pkg/postgresql/trunk/files/0000-Run-tests-in-var-tmp-pgsql-tmp_check.patch	2012-01-20 15:02:39 UTC (rev 16858)
@@ -0,0 +1,62 @@
+From 051eb505448cba2f98aa5926ef3bfe0eed50d74c Mon Sep 17 00:00:00 2001
+From: Rafael Ostertag <rafisol at opencsw.org>
+Date: Fri, 30 Dec 2011 20:32:11 +0100
+Subject: [PATCH] Run tests in /var/tmp/pgsql/tmp_check
+
+---
+ src/Makefile.global.in       |    4 ++--
+ src/test/regress/GNUmakefile |    4 ++++
+ 2 files changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/src/Makefile.global.in b/src/Makefile.global.in
+index 3bf658d..69523de 100644
+--- a/src/Makefile.global.in
++++ b/src/Makefile.global.in
+@@ -438,10 +438,10 @@ endif
+ 
+ pg_regress_locale_flags = $(if $(ENCODING),--encoding=$(ENCODING)) $(NOLOCALE)
+ 
+-pg_regress_check = $(top_builddir)/src/test/regress/pg_regress --inputdir=$(srcdir) --temp-install=./tmp_check --top-builddir=$(top_builddir) $(pg_regress_locale_flags)
++pg_regress_check = $(top_builddir)/src/test/regress/pg_regress --inputdir=$(srcdir) --temp-install=/var/tmp/pgsql/tmp_check --top-builddir=$(top_builddir) $(pg_regress_locale_flags)
+ pg_regress_installcheck = $(top_builddir)/src/test/regress/pg_regress --inputdir=$(srcdir) --psqldir='$(PSQLDIR)' $(pg_regress_locale_flags)
+ 
+-pg_regress_clean_files = results/ regression.diffs regression.out tmp_check/ log/
++pg_regress_clean_files = results/ regression.diffs regression.out /var/tmp/pgsql/tmp_check log/
+ 
+ 
+ ##########################################################################
+diff --git a/src/test/regress/GNUmakefile b/src/test/regress/GNUmakefile
+index 90aea6c..99c3905 100644
+--- a/src/test/regress/GNUmakefile
++++ b/src/test/regress/GNUmakefile
+@@ -135,6 +135,7 @@ tablespace-setup:
+ REGRESS_OPTS = --dlpath=.
+ 
+ check: all tablespace-setup
++	install -d /var/tmp/pgsql/tmp_check
+ 	$(pg_regress_check) $(REGRESS_OPTS) --schedule=$(srcdir)/parallel_schedule $(MAXCONNOPT) $(TEMP_CONF) $(EXTRA_TESTS)
+ 
+ installcheck: all tablespace-setup
+@@ -144,6 +145,7 @@ installcheck-parallel: all tablespace-setup
+ 	$(pg_regress_installcheck) $(REGRESS_OPTS) --schedule=$(srcdir)/parallel_schedule $(MAXCONNOPT) $(EXTRA_TESTS)
+ 
+ standbycheck: all
++	install -d /var/tmp/pgsql/tmp_check
+ 	$(pg_regress_installcheck) $(REGRESS_OPTS) --schedule=$(srcdir)/standby_schedule --use-existing
+ 
+ # old interfaces follow...
+@@ -153,9 +155,11 @@ runtest: installcheck
+ runtest-parallel: installcheck-parallel
+ 
+ bigtest: all tablespace-setup
++	install -d /var/tmp/pgsql/tmp_check
+ 	$(pg_regress_installcheck) $(REGRESS_OPTS) --schedule=$(srcdir)/serial_schedule numeric_big
+ 
+ bigcheck: all tablespace-setup
++	install -d /var/tmp/pgsql/tmp_check
+ 	$(pg_regress_check) $(REGRESS_OPTS) --schedule=$(srcdir)/parallel_schedule $(MAXCONNOPT) numeric_big
+ 
+ 
+-- 
+1.7.6.1
+

Copied: csw/mgar/pkg/postgresql/trunk/files/0000-Use-plain-rpath.patch (from rev 16856, csw/mgar/pkg/postgresql/branches/postgresql-9.1-raos/files/0000-Use-plain-rpath.patch)
===================================================================
--- csw/mgar/pkg/postgresql/trunk/files/0000-Use-plain-rpath.patch	                        (rev 0)
+++ csw/mgar/pkg/postgresql/trunk/files/0000-Use-plain-rpath.patch	2012-01-20 15:02:39 UTC (rev 16858)
@@ -0,0 +1,25 @@
+From 3e5748b6bc287f4036c2f619c143b9e467b84c29 Mon Sep 17 00:00:00 2001
+From: Rafael Ostertag <rafisol at opencsw.org>
+Date: Sun, 1 Jan 2012 17:35:00 +0100
+Subject: [PATCH] Use plain rpath
+
+---
+ src/makefiles/Makefile.solaris |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/makefiles/Makefile.solaris b/src/makefiles/Makefile.solaris
+index bb56830..89d83df 100644
+--- a/src/makefiles/Makefile.solaris
++++ b/src/makefiles/Makefile.solaris
+@@ -6,7 +6,7 @@ ifeq ($(with_gnu_ld), yes)
+ export_dynamic = -Wl,-E
+ rpath = -Wl,-rpath,'$(rpathdir)'
+ else
+-rpath = -Wl,-R'$(rpathdir)'
++rpath = -R$(rpathdir)
+ endif
+ 
+ DLSUFFIX = .so
+-- 
+1.7.6.1
+

Copied: csw/mgar/pkg/postgresql/trunk/files/0000-ecpg-usr-local-include-replacement.patch (from rev 16856, csw/mgar/pkg/postgresql/branches/postgresql-9.1-raos/files/0000-ecpg-usr-local-include-replacement.patch)
===================================================================
--- csw/mgar/pkg/postgresql/trunk/files/0000-ecpg-usr-local-include-replacement.patch	                        (rev 0)
+++ csw/mgar/pkg/postgresql/trunk/files/0000-ecpg-usr-local-include-replacement.patch	2012-01-20 15:02:39 UTC (rev 16858)
@@ -0,0 +1,25 @@
+From dec1e5ffd2ec2e58d185f6e4753e38ff5a0af1cd Mon Sep 17 00:00:00 2001
+From: Rafael Ostertag <rafisol at opencsw.org>
+Date: Fri, 30 Dec 2011 16:27:27 +0100
+Subject: [PATCH] ecpg /usr/local/include replacement
+
+---
+ src/interfaces/ecpg/preproc/ecpg.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/interfaces/ecpg/preproc/ecpg.c b/src/interfaces/ecpg/preproc/ecpg.c
+index db52bf5..05cad72 100644
+--- a/src/interfaces/ecpg/preproc/ecpg.c
++++ b/src/interfaces/ecpg/preproc/ecpg.c
+@@ -253,7 +253,7 @@ main(int argc, char *const argv[])
+ 	}
+ 
+ 	add_include_path(".");
+-	add_include_path("/usr/local/include");
++	add_include_path("/opt/csw/include");
+ 	get_include_path(my_exec_path, include_path);
+ 	add_include_path(include_path);
+ 	add_include_path("/usr/include");
+-- 
+1.7.6.1
+

Deleted: csw/mgar/pkg/postgresql/trunk/files/CSWpostgresql-84.postinstall
===================================================================
--- csw/mgar/pkg/postgresql/trunk/files/CSWpostgresql-84.postinstall	2012-01-20 15:00:35 UTC (rev 16857)
+++ csw/mgar/pkg/postgresql/trunk/files/CSWpostgresql-84.postinstall	2012-01-20 15:02:39 UTC (rev 16858)
@@ -1,41 +0,0 @@
-define CSWpostgresql-84_postinstall
-#!/bin/sh
-# vim:set ft=sh:
-#
-# $$Id$$
-#
-# Initialize the database cluster if it hasn't been initialized before.
-
-# Read in the user configuration file
-[ -s /opt/csw/etc/postgresql.conf ] && . /opt/csw/etc/postgresql.conf
-[ -s $(sysconfdir)/postgresql.conf ] && . $(sysconfdir)/postgresql.conf
-
-PGDATA=$(PGDATA)
-PGINIT=$(bindir)/initdb
-
-initialize_cluster() {
-	chown postgres "$${PGDATA}"
-	chmod 0700 "$${PGDATA}"
-	echo "Initializing PostgreSQL database..."
-	su postgres -c "\"$${PGINIT}\" -D \"$${PGDATA}\" -E utf-8"
-}
-
-if [ `ls -l $${PGDATA} 2>/dev/null | wc -l` -eq 1 ]; then
-	initialize_cluster
-else
-	echo "The database cluster seems to be initialized already."
-fi
-
-if [ -x /usr/sbin/svcadm ]; then
-	fmri="cswpostgres_$(VERSION_NODOT)"
-	echo "Enabling the $${fmri} service in SMF"
-	svcadm clear "$${fmri}"
-	svcadm enable "$${fmri}"
-else
-	initscript="/etc/opt/csw/init.d/cswpostgres_$(VERSION_NODOT)"
-	echo "Issuing $${initscript} start"
-	$${initscript} start
-fi
-
-exit 0
-endef

Copied: csw/mgar/pkg/postgresql/trunk/files/CSWpostgresql-server.postinstall.tmpl (from rev 16856, csw/mgar/pkg/postgresql/branches/postgresql-9.1-raos/files/CSWpostgresql-server.postinstall.tmpl)
===================================================================
--- csw/mgar/pkg/postgresql/trunk/files/CSWpostgresql-server.postinstall.tmpl	                        (rev 0)
+++ csw/mgar/pkg/postgresql/trunk/files/CSWpostgresql-server.postinstall.tmpl	2012-01-20 15:02:39 UTC (rev 16858)
@@ -0,0 +1,64 @@
+#!/bin/sh
+# vim:set ft=sh:
+#
+# $Id$
+#
+# Initialize the database cluster if it hasn't been initialized before.
+
+USERCONF=@CSWPGSQLCONFFILE_VERSIONED@
+PGCTL=@bindir@/pg_ctl- at BASE_VERSION_NODOT@
+PGINIT=@bindir@/initdb- at BASE_VERSION_NODOT@
+
+# Read in the user configuration file
+[ -s /opt/csw/etc/${USERCONF} ] && . /opt/csw/etc/${USERCONF}
+[ -s @sysconfdir@/${USERCONF} ] && . @sysconfdir@/${USERCONF}
+
+if [ ! -d "${PGDATA}" -o `ls -l ${PGDATA} 2>/dev/null | wc -l` -eq 1 ]; then
+    @sysconfdir@/init.d/cswpostgresql- at BASE_VERSION_NODOT@ init
+    cat <<EOF
+---
+
+The database cluster has been initialized in ${PGDATA}.
+
+Some customizations to the initialization can be made by editing the file
+
+ @sysconfdir@/${USERCONF}
+
+In order to re-initialize the database cluster, remove the directory
+
+ ${PGDATA}
+
+and call cswpostgresql- at BASE_VERSION_NODOT@ as such
+
+ @sysconfdir@/init.d/cswpostgresql- at BASE_VERSION_NODOT@ init
+
+PLEASE NOTE: by doing so, all data will be LOST. Thus this procedure
+             is only recommended for pristine installations.
+
+
+In order to start the PostgreSQL server you can either use
+
+ svcadm enable cswpostgresql- at BASE_VERSION_NODOT@    # Solaris 10+ only
+
+or
+
+ @sysconfdir@/init.d/cswpostgresql- at BASE_VERSION_NODOT@ start
+
+---
+EOF
+else
+    cat <<EOF
+---
+
+The database cluster seems to be initialized already.
+
+---
+EOF
+fi
+
+# The database server will not be started, in case the user wants to
+# do some customization to the database cluster. However, the database
+# cluster is initialized and the user simply have to start the server
+# if the defaults suits him.
+
+exit 0

Deleted: csw/mgar/pkg/postgresql/trunk/files/README-CSW.txt
===================================================================
--- csw/mgar/pkg/postgresql/trunk/files/README-CSW.txt	2012-01-20 15:00:35 UTC (rev 16857)
+++ csw/mgar/pkg/postgresql/trunk/files/README-CSW.txt	2012-01-20 15:02:39 UTC (rev 16858)
@@ -1,103 +0,0 @@
-*** Important information - please make sure you read this ! ***
-
-*** Migrating from older versions ***
-
-If you have upgraded from a previous 8.0, 8.1 or 8.2 version of PostgreSQL, 
-your databases will NOT work on this 8.3.x version. Before upgrading, you 
-should dump your databases using the old utilities. You can then create a
-new data directory using this 8.3.x package, and import your dumps. 
-See the "64-bit support" section below for pointers to documentation on t
-his.
-
-Another point to note is that the location of the PostgreSQL install has 
-changed. Previous 7.3.x packages used /opt/csw as the base - this package 
-uses /opt/csw/postgresql. You will need to add /opt/csw/postgresql/bin to your
-$PATH, and any scripts you have written using the old locations will have to
-be changed.
-
-
-*** User configuration of server options ***
-
-Configuration of the server start-up options is now done through a user-
-configuration file, /opt/csw/etc/postgresql.conf. A sample template has been
-provided for you at /opt/csw/etc/postgresql.conf.csw. If you want to change
-any of the server options discussed below, make a copy of this file to 
-/opt/csw/etc/postgresql.conf and edit it accordingly.
-
-If you cannot modify this file (for instance, you are mounting /opt/csw
-from a read-only NFS server), you can use /etc/opt/csw/postgresql.conf 
-instead, and it will take precedence over /opt/csw/etc/postgresql.conf.
-
-*** Networking ***
-
-By default, the cswpostgres init script will start the server up listening on
-localhost only. If you want to allow other hosts on your network to connect, you
-will need to add "-o -i" to the value of SERVEROPTS in the user configuration
-file and restart your server. The included template has the line already
-entered, you just need to uncomment it (remove the leading #).
-
-Once this is done, PostgreSQL will now bind to all network interfaces and
-listen for connections. You will still need to configure which hosts are allowed
-access by modifying the pg_hba.conf file in your data directory - read the manual
-for more information on this.
-
-*** 64-bit support ***
-
-The SPARC packages have been built with 64-bit support, but by default, the
-32-bit version of the server will be run. If you need the 64-bit version,
-edit the user configuration file and change the values of PGINIT and PGCTL
-accordingly.
-
-It is important to note that the 64-bit server WILL NOT WORK with databases
-created with the 32-bit version, and vice versa. You will get an error
-message if you attempt this.
-
-In order to migrate your system to the 64-bit server, you will need to dump
-your databases while running the 32-bit client, stop and upgrade the server,
-initialise a new database directory, and import your dumps. For more information
-on this procedure, see the PostgreSQL manual (included with this package),
-chapter 9 - Backup and restore. This is located at :
-
-/opt/csw/postgresql/share/doc/html/backup.html
-
-All other PostgreSQL binaries in /opt/csw/postgresql/bin/ are copies of the 
-'isaexec' wrapper, which will run the appropriate binary for your
-architecture and/or kernel.
-
-*** Starting the server ***
-
-The PostgreSQL database runs under the user 'postgres' - this has been created 
-for you by the installation script.
-
-The default PostgreSQL data directory is /opt/csw/var/pgdata. As this does not 
-exist, you will need to create it yourself before the database will start.
-You can change the location of the data directory by altering the user
-configuration file, and modifying the value of PGDATA.
-
-A startup script has been provided for you that handles database initialisation,
-startup and shutdown functions - it is located at /etc/init.d/cswpostgres. You
-should always use this script to start or stop the server, otherwise you may 
-find that you are running the wrong binaries (64-bit instead of 32-bit).
- 
-It is set to start the database the next time the system enters runlevel 3 - 
-usually, this will be at the next boot. 
-
-To create the data directory, the startup script accepts the "init" argument :
-
-/etc/init.d/cswpostgres init
-
-This will create and initialise the data directory. After this step has been
-completed succesfully, the database can be started with :
-
-/etc/init.d/cswpostgres start
-
-If you get errors relating to shared memory on startup, make sure you have read 
-the section entitled "Manging Kernel Resources" - this is in Chapter 3 of the 
-PostgreSQL HTML Administrator's Guide, located at 
-
-/opt/csw/postgresql/share/doc/html/index.html 
-
-
-Mark Round,
-mark at blastwave.org
-

Copied: csw/mgar/pkg/postgresql/trunk/files/README.CSW (from rev 16856, csw/mgar/pkg/postgresql/branches/postgresql-9.1-raos/files/README.CSW)
===================================================================
--- csw/mgar/pkg/postgresql/trunk/files/README.CSW	                        (rev 0)
+++ csw/mgar/pkg/postgresql/trunk/files/README.CSW	2012-01-20 15:02:39 UTC (rev 16858)
@@ -0,0 +1,145 @@
+OpenCSW PostgreSQL
+==================
+
+
+Parallel Installations
+----------------------
+
+OpenCSW's PostgreSQL allows for parallel installation of different
+PostgreSQL versions. Therefore, the binaries have appended the
+PostgreSQL version number, e.g. PostgreSQL's @VERSION@ `psql' is named
+`psql- at BASE_VERSION_NODOT@'. The same holds for manpages.
+
+The notable exception to this are development files. Development files
+are only available for the latest PostgreSQL version provided by
+OpenCSW and have no version number appended.
+
+Please see also `Starting the PostgreSQL Server' below for caveat on
+running multiple PostgreSQL servers in parallel.
+
+
+Migrating from CSWpostgresql
+----------------------------
+
+CSWpostgresql has been superseeded by CSW at NAME@@BASE_VERSION_NODOT at .
+It is possible to have CSWpostgresql and CSW at NAME@@BASE_VERSION_NODOT@
+installed on the same system, though. Please refer to `Starting the
+PostgreSQL Server' below for more information on how to run multiple
+PostgreSQL instances on the same system.
+
+In order to migrate from CSWpostgresql to CSW at NAME@@BASE_VERSION_NODOT@,
+create a full dump of the CSWpostgresql database cluster as
+described in
+
+ http://www.postgresql.org/docs/@BASE_VERSION@/static/upgrading.html
+
+and transfer it to the CSW at NAME@@BASE_VERSION_NODOT@ database cluster.
+
+
+32/64-bit Binaries
+------------------
+
+It can be chosen between 32-bit or 64-bit binaries using the
+alternatives mechanism (see the alternative's README.user). By
+default, PostgreSQL will use 64-bit binaries.
+
+Alternatives are provided for server, client, contrib, and dev
+binaries separately. This makes it possible to select different memory
+models for those binaries independently.
+
+In order to list the alternatives provided, issue
+
+ /opt/csw/sbin/alternatives --list
+
+on the command line.
+
+Please note, that a database cluster initialized by the 32-bit server
+binaries cannot be used by the 64-bit versions and vice versa. If you
+want to switch the memory model of the server, you have to
+
+ 1. dump the entire database cluster
+ 2. switch the memory model of the server binaries
+ 3. remove the database cluster
+ 4. re-initialize the database cluster using `initdb- at BASE_VERSION_NODOT@'
+    (see also `Initializing the Database Cluster' below)
+ 5. start the server and restore the database cluster from the dump
+    created in step 1.
+
+
+Starting the PostgreSQL Server
+------------------------------
+
+When installing the PostgreSQL server for the first time, only the
+database cluster will be initialized using default values provided by
+
+ @sysconfdir@/postgresql- at BASE_VERSION_NODOT@.conf
+
+and the database server will not be started, thus allowing for
+post-installation customization.
+
+In order to start the PostgreSQL server you can either use
+
+ svcadm enable cswpostgresql- at BASE_VERSION_NODOT@    # Solaris 10+ only
+
+or
+
+ @sysconfdir@/init.d/cswpostgresql- at BASE_VERSION_NODOT@ start
+
+Please note, that when installing multiple PostgreSQL server versions
+in parallel, the above method will work for the first database server
+started only. Subsequent servers starts will fail unless the listening
+port is set to distinct values using the `SERVEROPTS' in
+
+ @sysconfdir@/postgresql-XY.conf
+
+like
+
+ SERVEROPTS="-p <portnum>"
+
+where `<portnum>' is the port number the server has to listen on,
+which is by default 5432. So, one could configure the servers, for
+instance, to make the first server listen on 5432, the second on 5433,
+and so on.
+
+Alternatively, one can use the `postgresql.conf' file in the database
+cluster directory to provide a different listening port.
+
+
+User Configuration of Server Options
+------------------------------------
+
+Configuration of the server start-up options is done through a
+user-configuration file, `@sysconfdir@/postgresql- at BASE_VERSION_NODOT@.conf', regardless of
+whether Solaris SMF or System V-style initialization is used.
+
+This file also defines the location of the PostgreSQL database cluster
+in `PGDATA', which is by default
+
+ /var/opt/csw/postgresql/@BASE_VERSION_NODOT@
+
+
+Initializing the Database Cluster
+---------------------------------
+
+The startup script `/etc/opt/csw/init.d/cswpostgresql- at BASE_VERSION_NODOT@' allows to
+initialize the database cluster by providing the argument `init' as such
+
+ /etc/opt/csw/init.d/cswpostgresql- at BASE_VERSION_NODOT@ init
+
+This will initialize the database cluster at the location specified in
+the `PGDATA' variable defined in `/etc/opt/csw/postgresql- at BASE_VERSION_NODOT@.conf'.
+
+When installing PostgreSQL for the first time, the database cluster
+will be initialized using default values.
+
+Please note, that when changing the memory model of the server
+binaries, i.e. from 32-bit to 64-bit or vice versa, you have to
+re-initialize the database cluster (see also `32/64-bit Binaries'
+above).
+
+
+--
+That's all folks.
+
+Rafael Ostertag
+raos at opencsw.org

Deleted: csw/mgar/pkg/postgresql/trunk/files/cswpostgres.tmpl
===================================================================
--- csw/mgar/pkg/postgresql/trunk/files/cswpostgres.tmpl	2012-01-20 15:00:35 UTC (rev 16857)
+++ csw/mgar/pkg/postgresql/trunk/files/cswpostgres.tmpl	2012-01-20 15:02:39 UTC (rev 16858)
@@ -1,123 +0,0 @@
-#!/bin/sh
-# $Id$
-#
-# PostgreSQL startup script - part of the CSWpostgresql package
-# mark at blastwave.org
-# 
-# 2009-11-29  Maciej Blizinski (maciej at opencsw.org)
-#   - Parametrized file locations
-#   - Style changes
-#              
-#
-# This files is a template.  The following variables need to be substituted
-# before it can be run:
-#
-# - PGDATA
-# - bindir
-# - sysconfdir
-
-
-# Read in the user configuration file
-[ -s /opt/csw/etc/postgresql.conf ] && . /opt/csw/etc/postgresql.conf
-[ -s @sysconfdir@/postgresql.conf ] && . @sysconfdir@/postgresql.conf
-
-# Defaults
-[ -z "${PGDATA}" ] && PGDATA=@PGDATA@
-[ -z "${PGCTL}" ] && PGCTL=@bindir@/sparcv8/pg_ctl
-[ -z "${PGINIT}" ] && PGINIT=@bindir@/sparcv8/initdb
-
-
-# The following attempts to catch any mistakes in the server
-# version - it checks if the 64-bit server was last run. If so,
-# it forces the 64-bit server, otherwise it won't start up!
-# And vice-versa for the 32-bit server...
-#
-# This version doesn't check the i386/amd64 architectures.
-if [ -f "${PGDATA}/postmaster.opts" ]; then
-  if grep 'sparcv9' ${PGDATA}/postmaster.opts > /dev/null; then
-    echo ${PGCTL} | grep "sparcv8" > /dev/null
-    if [ $? -eq 0 ]; then
-      echo "Warning: 32-bit server was specified in /etc/init.d/cswpostgres,"
-      echo "         but 64-bit version was last run. Using 64-bit server..."
-    fi
-    PGCTL=@bindir@/sparcv9/pg_ctl
-    PGINIT=@bindir@/sparcv9/initdb
-  elif grep 'sparcv8' ${PGDATA}/postmaster.opts > /dev/null; then
-    # Detected 32-bit server last used
-    echo "${PGCTL}" | grep "sparcv8" > /dev/null
-    if [ $? -ne 0 ]; then
-      echo "Warning: 64-bit server was specified in /etc/init.d/cswpostgres,"
-      echo "         but 32-bit version was last run. Using 32-bit server..."
-    fi
-    PGCTL=@bindir@/sparcv8/pg_ctl
-    PGINIT=@bindir@/sparcv8/initdb
-  else
-  	echo "Couldn't detect whether the previously run version was 32 or 64-bit."
-  	echo "Running the default."
-  	PGCTL=@bindir@/pg_ctl
-  	PGINIT=@bindir@/initdb
-  fi
-fi
-
-# Exit if postgres user hasn't been created.
-# FIXME: This bit of code is old. It might be obsolete.
-if grep '^postgres:' /etc/passwd >/dev/null; then
-	echo > /dev/null
-else
-  getent passwd postgres >/dev/null
-  if [ $? -ne 0 ] ; then
-         exit 0
-  fi
-fi
-
-# Change to /var/tmp, as pgctl etc. need to be started from
-# a directory that they can read
-cd /var/tmp
-
-case "$1" in
-start)
-      if [ -d ${PGDATA} -a `ls -l ${PGDATA} 2> /dev/null | wc -l` -gt 1 ]; then
-         # PostgreSQL data directory exists and is populated
-         echo "Starting PostgreSQL..."
-         su postgres -c "${PGCTL} -D ${PGDATA} -l ${PGDATA}/postgresql.log start ${SERVEROPTS}"
-      fi
-      ;;
-
-stop)
-     echo "Stopping PostgreSQL database..."
-     su postgres -c "${PGCTL} -D ${PGDATA} -l ${PGDATA}/postgresql.log stop"
-     true  # The previous command fails when there's no .pid file
-     ;;
-
-restart)
-     echo "Restarting PostgreSQL database..."
-     su postgres -c "${PGCTL} -D ${PGDATA} -l ${PGDATA}/postgresql.log restart ${SERVEROPTS}"
-     ;;
-
-reload)
-     echo "Reloading PostgreSQL database..."
-     su postgres -c "${PGCTL} -D ${PGDATA} -l ${PGDATA}/postgresql.log reload ${SERVEROPTS}"
-     ;;
-
-status)
-     su postgres -c "${PGCTL} -D ${PGDATA} status"
-     ;;
-
-init)
-     # create and initialise data directory
-     echo "Creating PostgreSQL data directory at ${PGDATA}..."
-     # Create it, unless it's already there and empty
-     [ -d ${PGDATA} -a `ls -l ${PGDATA} 2> /dev/null | wc -l` -eq 1 ] || mkdir -p "${PGDATA}"
-     chown postgres "${PGDATA}"
-     chmod 0700 "${PGDATA}"
-     echo "Initialising PostgreSQL database..."
-     su postgres -c "${PGINIT} -D ${PGDATA} -E utf-8"
-     ;;
-
-*)
-     echo "Usage: ${0} (init|start|stop|restart|reload|status)"
-     ;;
-
-esac
-
-# vim:set ft=sh sw=2 ts=2 sts=2 expandtab si ci:

Copied: csw/mgar/pkg/postgresql/trunk/files/cswpostgresql.tmpl (from rev 16856, csw/mgar/pkg/postgresql/branches/postgresql-9.1-raos/files/cswpostgresql.tmpl)
===================================================================
--- csw/mgar/pkg/postgresql/trunk/files/cswpostgresql.tmpl	                        (rev 0)
+++ csw/mgar/pkg/postgresql/trunk/files/cswpostgresql.tmpl	2012-01-20 15:02:39 UTC (rev 16858)
@@ -0,0 +1,117 @@
+#!/bin/sh
+# $Id$
+#
+# PostgreSQL startup script - part of the CSWpostgresql package
+#
+# 2009-11-29  Maciej Blizinski (maciej at opencsw.org)
+#   - Parametrized file locations
+#   - Style changes
+#
+#
+#RC_KNUM 20         # Number used for kill script symlink, e.g. K20cswfoo
+#RC_SNUM 80         # Number used for start script symlink, e.g. S80cswfoo
+#RC_KLEV 0,1,2,S    # Run levels that should have a kill script symlink
+#RC_SLEV 3          # Run levels that should have a start script symlink
+#AUTOENABLE no      # If set to no will not enable service regardless of
+#                     local csw.conf, use when a package needs setup before
+#                     being useful, would otherwise leave service in
+#                     maintenance mode
+
+VERSION=@BASE_VERSION_NODOT@
+
+USERCONF=@CSWPGSQLCONFFILE_VERSIONED@
+PGCTL=@bindir@/pg_ctl-${VERSION}
+PGINIT=@bindir@/initdb-${VERSION}
+
+# Read in the user configuration file
+[ -s /opt/csw/etc/${USERCONF} ] && . /opt/csw/etc/${USERCONF}
+[ -s @sysconfdir@/${USERCONF} ] && . @sysconfdir@/${USERCONF}
+
+# Defaults
+[ -z "${PGDATA}" ] && PGDATA=@PGDATA@
+[ -z "${SHUTDOWNMODE}" ] && SHUTDOWNMODE=fast
+[ -z "${PGENCODING}" ] && PGENCODING=UTF8
+[ -z "${PGSUPERUSER}" ] && PGSUPERUSER=postgres
+[ -z "${PGLOGOUTPUT}" ] && PGLOGOUTPUT=${PGDATA}/postgresql.log
+
+if [ -n "${SERVEROPTS}" ]
+then
+    # Remove the -o option, we provide it later on
+    SERVEROPTS=`echo "${SERVEROPTS}" | sed 's/^-o[ ]*//'`
+fi
+if [ -n "${PGLOCALE}" ]
+then
+    PGLOCALE="--locale=${PGLOCALE}"
+fi
+
+
+# Exit if postgres user hasn't been created.
+# FIXME: This bit of code is old. It might be obsolete.
+if grep '^postgres:' /etc/passwd >/dev/null; then
+	echo > /dev/null
+else
+  getent passwd postgres >/dev/null
+  if [ $? -ne 0 ] ; then
+	 exit 0
+  fi
+fi
+
+cd /
+
+case "$1" in
+start)
+      if [ -d ${PGDATA} -a `ls -l ${PGDATA} 2> /dev/null | wc -l` -gt 1 ]; then
+	 # PostgreSQL data directory exists and is populated
+	 echo "Starting PostgreSQL..."
+	 if [ -n "${SERVEROPTS}" ]
+	 then
+	     su postgres -c "${PGCTL} start -D ${PGDATA} -l ${PGLOGOUTPUT} -o '${SERVEROPTS}'"
+	 else
+	     su postgres -c "${PGCTL} start -D ${PGDATA} -l ${PGLOGOUTPUT}"
+	 fi
+      fi
+      ;;
+
+stop)
+     echo "Stopping PostgreSQL database..."
+     su postgres -c "${PGCTL} stop -D ${PGDATA} -l ${PGLOGOUTPUT} -m ${SHUTDOWNMODE}"
+     true  # The previous command fails when there's no .pid file
+     ;;
+
+restart)
+     echo "Restarting PostgreSQL database..."
+     if [ -n "${SERVEROPTS}" ]
+     then
+	 su postgres -c "${PGCTL} restart -D ${PGDATA} -l ${PGLOGOUTPUT} -m ${SHUTDOWNMODE} -o '${SERVEROPTS}'"
+     else
+	 su postgres -c "${PGCTL} restart -D ${PGDATA} -l ${PGLOGOUTPUT} -m ${SHUTDOWNMODE}"
+     fi
+     ;;
+
+reload)
+     echo "Reloading PostgreSQL database..."
+     su postgres -c "${PGCTL} reload -D ${PGDATA} -l ${PGLOGOUTPUT}"
+     ;;
+
+status)
+     su postgres -c "${PGCTL} status -D ${PGDATA}"
+     ;;
+
+init)
+     # create and initialise data directory
+     echo "Creating PostgreSQL data directory at ${PGDATA}..."
+     # Create it, unless it's already there and empty
+     [ -d "${PGDATA}" -a `ls -l ${PGDATA} 2> /dev/null | wc -l` -eq 1 ] || mkdir -p "${PGDATA}"
+     chown postgres "${PGDATA}"
+     chmod 0700 "${PGDATA}"
+     echo "Initialising PostgreSQL database..."
+     su postgres -c "\"${PGINIT}\" -D \"${PGDATA}\" -E ${PGENCODING} -U ${PGSUPERUSER} ${PGLOCALE}"
+     ;;
+
+*)
+     echo "Usage: ${0} (init|start|stop|restart|reload|status)"
+     ;;
+
+esac
+
+# vim:set ft=sh sw=2 ts=2 sts=2 expandtab si ci:

Modified: csw/mgar/pkg/postgresql/trunk/files/cswusergroup.tmpl
===================================================================
--- csw/mgar/pkg/postgresql/trunk/files/cswusergroup.tmpl	2012-01-20 15:00:35 UTC (rev 16857)
+++ csw/mgar/pkg/postgresql/trunk/files/cswusergroup.tmpl	2012-01-20 15:02:39 UTC (rev 16858)
@@ -1 +1 @@
-postgres::CSW Postgres:@PGDATA@:/bin/sh::
+postgres::CSW Postgres:@PGLOCALSTATEDIR_BASE@:/bin/sh::

Modified: csw/mgar/pkg/postgresql/trunk/files/postgresql.conf.tmpl
===================================================================
--- csw/mgar/pkg/postgresql/trunk/files/postgresql.conf.tmpl	2012-01-20 15:00:35 UTC (rev 16857)
+++ csw/mgar/pkg/postgresql/trunk/files/postgresql.conf.tmpl	2012-01-20 15:02:39 UTC (rev 16858)
@@ -1,37 +1,63 @@
-# Example PostgreSQL server configuration file.
+# This is a shell script fragment.
 # 
-# Provided by the OpenCSW package of PostgreSQL.  This file is read by the
-# /etc/opt/csw/init.d/cswpostgres startup script, and can be used to override
-# the defaults.
+# This file is sourced by the /etc/opt/csw/init.d/csw at PGNAME_VERSIONED@
+# startup script, and can be used to override the defaults.
+#
+# Please use alternatives to choose between 32/64bit version of the
+# server (See also @docdir@/@PGNAMEVERSIONED at _server/README.CSW)
 
 # The location of the data directory.
-# Default : /opt/csw/var/pgdata
+#
+# Default: @PGDATA@
 PGDATA=@PGDATA@
 
-# Which binaries to use, 32- or 64-bit.  Only use the 64-bit server if you're
-# sure you need it.  Make sure you have read
-# /opt/csw/postgresql/share/doc/README-CSW.txt before changing these, as your
-# databases may not work without a 'dump and restore' cycle!
+# Specifies the shutdown mode. mode can be smart, fast, or immediate,
+# or the first letter of one of these three.
+#
+# Default: fast
+#SHUTDOWNMODE=fast
 
-# 32-bit server - default, and fine for most uses
-# 
-# PGCTL=/opt/csw/postgresql/bin/sparcv8/pg_ctl
-# PGINIT=/opt/csw/postgresql/bin/sparcv8/initdb
+# Append the server log output to filename. If the file does not
+# exist, it is created. The umask is set to 077, so access to the log
+# file from other users is disallowed by default
+#
+# Default: ${PGDATA}/postgresql.log
+#PGLOGOUTPUT=${PGDATA}/postgresql.log
 
-# 64-bit server - uncomment these lines only if you really need them.
-# 
-# PGCTL=/opt/csw/postgresql/bin/sparcv9/pg_ctl
-# PGINIT=/opt/csw/postgresql/bin/sparcv9/initdb
+# Additional options to pass to postmaster.
+#
+# Please note: it is no longer necessary to pass the '-o' option.
+#
+# SERVEROPTS="-i"
 
+##
+## The following variables are used by initdb when initializing the
+## database cluster
+##
 
-# Additional options to pass to postmaster.
-# 
-# These options will be passed to the postmaster program. The most common use
-# of these is to allow network access to PostgreSQL from other hosts over
-# TCP/IP.  This is done by using the flags "-o -i", as in the example below.
-# Uncomment this line to enable network access to PostgreSQL.  Note that you
-# will still need to configure authentication in the pg_hba.conf in your data
-# directory.
-# 
-# SERVEROPTS="-o -i"
+# The PostgreSQL encoding of the database cluster. This is used when
+# initializing the database cluster using the init script.
+#
+# For a complete list of character sets supported, go to
+#
+#  http://www.postgresql.org/docs/@BASE_VERSION@/static/multibyte.html#MULTIBYTE-CHARSET-SUPPORTED
+#
+# Default: UTF8
+#PGENCODING=UTF8
 
+# The locale used to initialize the database cluster.
+#
+# If none is specified, the locale is inherited from the environment
+# that initdb runs in.
+#
+# Default: <empty>
+#PGLOCALE=en_US.UTF-8
+
+# Selects the user name of the database superuser. This defaults to
+# the name of the effective user running initdb. It is really not
+# important what the superuser's name is, but one might choose to keep
+# the customary name postgres, even if the operating system user's
+# name is different.
+#
+# Default: postgres
+#PGSUPERUSER=postgres

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


From guengel at users.sourceforge.net  Fri Jan 20 16:05:01 2012
From: guengel at users.sourceforge.net (guengel at users.sourceforge.net)
Date: Fri, 20 Jan 2012 15:05:01 +0000
Subject: [csw-devel] SF.net SVN: gar:[16859]
 csw/mgar/pkg/postgresql/branches/postgresql-9. 1-raos/
Message-ID: <E1RoG1V-00018j-Dp@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 16859
          http://gar.svn.sourceforge.net/gar/?rev=16859&view=rev
Author:   guengel
Date:     2012-01-20 15:05:01 +0000 (Fri, 20 Jan 2012)
Log Message:
-----------
postgresql/branches/postgresql-9.1-raos: has been merged with trunk. Currently no need for this branch.

Removed Paths:
-------------
    csw/mgar/pkg/postgresql/branches/postgresql-9.1-raos/

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


From dmichelsen at users.sourceforge.net  Fri Jan 20 16:19:33 2012
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Fri, 20 Jan 2012 15:19:33 +0000
Subject: [csw-devel] SF.net SVN: gar:[16860] csw/mgar/pkg
Message-ID: <E1RoGFZ-0002I9-Mv@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 16860
          http://gar.svn.sourceforge.net/gar/?rev=16860&view=rev
Author:   dmichelsen
Date:     2012-01-20 15:19:33 +0000 (Fri, 20 Jan 2012)
Log Message:
-----------
WHOLE TREE: Do not set svn:externals in boilerplates any more

Modified Paths:
--------------
    csw/mgar/pkg/Makefile
    csw/mgar/pkg/cpan/Makefile
    csw/mgar/pkg/freedesktop/Makefile
    csw/mgar/pkg/java/Makefile
    csw/mgar/pkg/rbgems/Makefile
    csw/mgar/pkg/x11/Makefile
    csw/mgar/pkg/xfce/Makefile

Modified: csw/mgar/pkg/Makefile
===================================================================
--- csw/mgar/pkg/Makefile	2012-01-20 15:05:01 UTC (rev 16859)
+++ csw/mgar/pkg/Makefile	2012-01-20 15:19:33 UTC (rev 16860)
@@ -77,12 +77,6 @@
 	@svn add $*/trunk/Makefile $*/trunk/checksums
 	@svn ps svn:keywords Id $*/trunk/Makefile
 	@echo "cookies\ndownload\nwork\n" | svn propset svn:ignore -F /dev/fd/0 $*/trunk
-	@echo "gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2" | svn propset svn:externals -F /dev/fd/0 $*/trunk
-	@if [ -d ../gar/v2 ]; then \
-	  ln -s ../../../gar/v2 $*/trunk/gar; \
-	else \
-	  svn co https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 $*/trunk/gar; \
-	fi
 	@echo
 	@echo "Your package is set up for editing at $*/trunk"
 

Modified: csw/mgar/pkg/cpan/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Makefile	2012-01-20 15:05:01 UTC (rev 16859)
+++ csw/mgar/pkg/cpan/Makefile	2012-01-20 15:19:33 UTC (rev 16860)
@@ -40,11 +40,5 @@
 	@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"

Modified: csw/mgar/pkg/freedesktop/Makefile
===================================================================
--- csw/mgar/pkg/freedesktop/Makefile	2012-01-20 15:05:01 UTC (rev 16859)
+++ csw/mgar/pkg/freedesktop/Makefile	2012-01-20 15:19:33 UTC (rev 16860)
@@ -54,12 +54,6 @@
 	@touch $*/trunk/checksums
 	@svn add $*/trunk/Makefile $*/trunk/checksums
 	@echo "cookies\ndownload\nwork\n" | svn propset svn:ignore -F /dev/fd/0 $*/trunk
-	@echo "gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2" | svn propset svn:externals -F /dev/fd/0 $*/trunk
-	@if [ -d ../../gar/v2 ]; then \
-	  ln -s ../../../../gar/v2 $*/trunk/gar; \
-	else \
-	  svn co https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 $*/trunk/gar; \
-	fi
 	@echo
 	@echo "Your package is set up for editing at $*/trunk"
 

Modified: csw/mgar/pkg/java/Makefile
===================================================================
--- csw/mgar/pkg/java/Makefile	2012-01-20 15:05:01 UTC (rev 16859)
+++ csw/mgar/pkg/java/Makefile	2012-01-20 15:19:33 UTC (rev 16860)
@@ -55,8 +55,6 @@
 	echo "%copyright      url file://%{WORKSRC}/LICENSE";           \
 	) > $*/trunk/files/CSWpackage.gspec
 	@echo "cookies\ndownload\nwork\n" | svn propset svn:ignore -F /dev/fd/0 $*/trunk
-	@echo "gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2" | svn propset svn:externals -F /dev/fd/0 $*/trunk
-	@svn co https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 $*/trunk/gar
 	@echo
 	@echo "Your package is set up for editing at $*/trunk"
 	@echo "Please don't forget to add the gspec-file!"

Modified: csw/mgar/pkg/rbgems/Makefile
===================================================================
--- csw/mgar/pkg/rbgems/Makefile	2012-01-20 15:05:01 UTC (rev 16859)
+++ csw/mgar/pkg/rbgems/Makefile	2012-01-20 15:19:33 UTC (rev 16860)
@@ -33,13 +33,6 @@
 newpkg-%:
 	@svn mkdir $(dir) $(dir)/tags $(dir)/branches $(dir)/trunk $(dir)/trunk/files
 	@svn cp ../template/Makefile $(dir)/Makefile
-	@if [ -d ../../gar/v2 ]; then \
-	  ln -s ../../../../gar/v2 $(dir)/trunk/gar; \
-	  cd $(dir)/trunk/gar; svn update; \
-	else \
-	  svn co https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 $(dir)/trunk/gar; \
-	fi
-	@echo "gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2" | svn propset svn:externals -F /dev/fd/0 $(dir)/trunk
 	@echo "work\n" | svn propset svn:ignore -F /dev/fd/0 $(dir)/trunk
 	@(cd $(dir)/trunk/; gem fetch $*; gar/bin/gem2pkg *gem > Makefile; rm *gem)
 	@( cd $(dir)/trunk; gmake fetch; gmake makesums; gmake garchive );

Modified: csw/mgar/pkg/x11/Makefile
===================================================================
--- csw/mgar/pkg/x11/Makefile	2012-01-20 15:05:01 UTC (rev 16859)
+++ csw/mgar/pkg/x11/Makefile	2012-01-20 15:19:33 UTC (rev 16860)
@@ -55,12 +55,6 @@
 	@touch $*/trunk/checksums
 	@svn add $*/trunk/Makefile $*/trunk/checksums
 	@echo "cookies\ndownload\nwork\n" | svn propset svn:ignore -F /dev/fd/0 $*/trunk
-	@echo "gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2" | svn propset svn:externals -F /dev/fd/0 $*/trunk
-	@if [ -d ../../gar/v2 ]; then \
-	  ln -s ../../../../gar/v2 $*/trunk/gar; \
-	else \
-	  svn co https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 $*/trunk/gar; \
-	fi
 	@echo
 	@echo "Your package is set up for editing at $*/trunk"
 

Modified: csw/mgar/pkg/xfce/Makefile
===================================================================
--- csw/mgar/pkg/xfce/Makefile	2012-01-20 15:05:01 UTC (rev 16859)
+++ csw/mgar/pkg/xfce/Makefile	2012-01-20 15:19:33 UTC (rev 16860)
@@ -33,11 +33,5 @@
         print t.render(**v)' > $*/trunk/Makefile   
 	@svn add $*/trunk/Makefile
 	@echo "cookies\ndownload\nwork\n" | svn propset svn:ignore -F /dev/fd/0 $*/trunk
-	@echo "gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2" | svn propset svn:externals -F /dev/fd/0 $*/trunk
-	@if [ -d ../../gar/v2 ]; then \
-      ln -s ../../../../gar/v2 $*/trunk/gar; \
-    else \
-      svn co https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 $*/trunk/gar; \
-    fi
 	@echo
 	@echo "Your package is set up for editing at $*/trunk"

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


From dmichelsen at users.sourceforge.net  Fri Jan 20 16:20:24 2012
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Fri, 20 Jan 2012 15:20:24 +0000
Subject: [csw-devel] SF.net SVN: gar:[16861] csw/mgar/pkg/389-dsgw/trunk/
Message-ID: <E1RoGGO-0002K7-GT@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 16861
          http://gar.svn.sourceforge.net/gar/?rev=16861&view=rev
Author:   dmichelsen
Date:     2012-01-20 15:20:24 +0000 (Fri, 20 Jan 2012)
Log Message:
-----------
389-dsgw: Delete leftover svn:external

Property Changed:
----------------
    csw/mgar/pkg/389-dsgw/trunk/


Property changes on: csw/mgar/pkg/389-dsgw/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2


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


From dmichelsen at users.sourceforge.net  Fri Jan 20 16:20:49 2012
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Fri, 20 Jan 2012 15:20:49 +0000
Subject: [csw-devel] SF.net SVN: gar:[16862] csw/mgar/pkg/rootsh/trunk/
Message-ID: <E1RoGGn-0002Kt-ON@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 16862
          http://gar.svn.sourceforge.net/gar/?rev=16862&view=rev
Author:   dmichelsen
Date:     2012-01-20 15:20:49 +0000 (Fri, 20 Jan 2012)
Log Message:
-----------
rootsh: Delete leftover svn:external

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


Property changes on: csw/mgar/pkg/rootsh/trunk
___________________________________________________________________
Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2


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


From cgrzemba at users.sourceforge.net  Fri Jan 20 16:30:06 2012
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Fri, 20 Jan 2012 15:30:06 +0000
Subject: [csw-devel] SF.net SVN: gar:[16863] csw/mgar/pkg/389-ds-base/trunk
Message-ID: <E1RoGPm-0000MX-GD@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 16863
          http://gar.svn.sourceforge.net/gar/?rev=16863&view=rev
Author:   cgrzemba
Date:     2012-01-20 15:30:06 +0000 (Fri, 20 Jan 2012)
Log Message:
-----------
389-ds-base/trunk: add smf patch

Modified Paths:
--------------
    csw/mgar/pkg/389-ds-base/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/389-ds-base/trunk/files/0005-smf-autoenable-no.patch
    csw/mgar/pkg/389-ds-base/trunk/files/CSW389-ds-base.postinstall
    csw/mgar/pkg/389-ds-base/trunk/files/CSW389-ds-base.postremove

Modified: csw/mgar/pkg/389-ds-base/trunk/Makefile
===================================================================
--- csw/mgar/pkg/389-ds-base/trunk/Makefile	2012-01-20 15:20:49 UTC (rev 16862)
+++ csw/mgar/pkg/389-ds-base/trunk/Makefile	2012-01-20 15:30:06 UTC (rev 16863)
@@ -13,6 +13,8 @@
 
 MASTER_SITES = http://port389.org/sources
 DISTFILES  = $(NAME)-$(VERSION).tar.bz2
+DISTFILES += CSW389-ds-base.postinstall
+DISTFILES += CSW389-ds-base.postremove
 # BUILD64	= 1
 PACKAGING_PLATFORMS += solaris10-sparc
 PACKAGING_PLATFORMS += solaris10-i386
@@ -24,6 +26,7 @@
 PATCHFILES += 0003-add-user-and-var-run-dirsrv.patch
 # until Red Hat Bugzilla Bug 773617 is open do it yourself
 PATCHFILES += 0004-add-i386-platform-to-Makefile.am-and-configure.ac.patch
+PATCHFILES += 0005-smf-autoenable-no.patch
 
 INITSMF = /etc/opt/csw/init.d/dirsrv
 RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibssldap60

Added: csw/mgar/pkg/389-ds-base/trunk/files/0005-smf-autoenable-no.patch
===================================================================
--- csw/mgar/pkg/389-ds-base/trunk/files/0005-smf-autoenable-no.patch	                        (rev 0)
+++ csw/mgar/pkg/389-ds-base/trunk/files/0005-smf-autoenable-no.patch	2012-01-20 15:30:06 UTC (rev 16863)
@@ -0,0 +1,25 @@
+From a600e648d88ce1967d7d1d68efc5b23e2403a60a Mon Sep 17 00:00:00 2001
+From: Carsten Grzemba <cgrzemba at opencsw.org>
+Date: Fri, 20 Jan 2012 16:27:00 +0100
+Subject: [PATCH] smf autoenable no
+
+---
+ wrappers/initscript.in |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/wrappers/initscript.in b/wrappers/initscript.in
+index 7632749..84392cb 100644
+--- a/wrappers/initscript.in
++++ b/wrappers/initscript.in
+@@ -9,6 +9,8 @@
+ # piddir:      @localstatedir@/run/@package_name@
+ # datadir:     @localstatedir@/lib/@package_name@/slapd-<instance name>
+ #
++#AUTOENABLE no
++#
+ 
+ # Source function library.
+ if [ -f /etc/rc.d/init.d/functions ] ; then
+-- 
+1.7.8.3
+

Added: csw/mgar/pkg/389-ds-base/trunk/files/CSW389-ds-base.postinstall
===================================================================
--- csw/mgar/pkg/389-ds-base/trunk/files/CSW389-ds-base.postinstall	                        (rev 0)
+++ csw/mgar/pkg/389-ds-base/trunk/files/CSW389-ds-base.postinstall	2012-01-20 15:30:06 UTC (rev 16863)
@@ -0,0 +1,18 @@
+# define exit func
+my_exit () 
+{
+	echo "postinstall failed on cmd: $1"
+	exit 1
+}
+
+# add group ldap
+getent group ldap > /dev/null || groupadd -g 389 ldap || my_exit groupadd
+# add user ldap
+getent passwd ldap > /dev/null || useradd -g 389 -u 389 -d /var/opt/csw/lib/dirsrv ldap || my_exit useradd
+# add /var/opt/csw/lib/dirserv
+[ -d /var/opt/csw/lib/dirsrv ] || mkdir -p /var/opt/csw/lib/dirsrv || my_exit mkdir
+# add /var/opt/csw/log/dirserv
+[ -d /var/opt/csw/log/dirsrv ] || mkdir -p /var/opt/csw/log/dirsrv || my_exit mkdir
+# change owner
+chown ldap:ldap /var/opt/csw/lib/dirsrv || my_exit chown
+chown ldap:ldap /var/opt/csw/log/dirsrv || my_exit chown

Added: csw/mgar/pkg/389-ds-base/trunk/files/CSW389-ds-base.postremove
===================================================================
--- csw/mgar/pkg/389-ds-base/trunk/files/CSW389-ds-base.postremove	                        (rev 0)
+++ csw/mgar/pkg/389-ds-base/trunk/files/CSW389-ds-base.postremove	2012-01-20 15:30:06 UTC (rev 16863)
@@ -0,0 +1 @@
+echo "Directories /var/opt/csw/lib/dirsrv and /var/opt/csw/log/dirsrv not removed! remove them manually, if you do not want use them any longer"

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


From dmichelsen at users.sourceforge.net  Fri Jan 20 16:38:57 2012
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Fri, 20 Jan 2012 15:38:57 +0000
Subject: [csw-devel] SF.net SVN: gar:[16864] csw/mgar/gar/v2/gar.conf.mk
Message-ID: <E1RoGYL-0002lg-4o@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 16864
          http://gar.svn.sourceforge.net/gar/?rev=16864&view=rev
Author:   dmichelsen
Date:     2012-01-20 15:38:56 +0000 (Fri, 20 Jan 2012)
Log Message:
-----------
mGAR v2: Export HOME by default

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

Modified: csw/mgar/gar/v2/gar.conf.mk
===================================================================
--- csw/mgar/gar/v2/gar.conf.mk	2012-01-20 15:30:06 UTC (rev 16863)
+++ csw/mgar/gar/v2/gar.conf.mk	2012-01-20 15:38:56 UTC (rev 16864)
@@ -773,7 +773,7 @@
 # Package dir
 GARPACKAGE = $(shell basename $(CURDIR))
 
-STANDARD_EXPORTS ?= PATH
+STANDARD_EXPORTS ?= HOME PATH
 LANG_EXPORTS ?= LC_ALL
 
 CONFIGURE_ENV_LC_ALL ?= C

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


From guengel at users.sourceforge.net  Fri Jan 20 18:07:48 2012
From: guengel at users.sourceforge.net (guengel at users.sourceforge.net)
Date: Fri, 20 Jan 2012 17:07:48 +0000
Subject: [csw-devel] SF.net SVN: gar:[16865] csw/mgar/pkg/cyrus_imapd/trunk
Message-ID: <E1RoHwK-0002Oh-IX@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 16865
          http://gar.svn.sourceforge.net/gar/?rev=16865&view=rev
Author:   guengel
Date:     2012-01-20 17:07:48 +0000 (Fri, 20 Jan 2012)
Log Message:
-----------
cyrus_imapd/trunk: link against berkeley db 4.8.

Modified Paths:
--------------
    csw/mgar/pkg/cyrus_imapd/trunk/Makefile
    csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd.changelog.CSW
    csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd_utils.changelog.CSW

Modified: csw/mgar/pkg/cyrus_imapd/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cyrus_imapd/trunk/Makefile	2012-01-20 15:38:56 UTC (rev 16864)
+++ csw/mgar/pkg/cyrus_imapd/trunk/Makefile	2012-01-20 17:07:48 UTC (rev 16865)
@@ -44,7 +44,7 @@
 PKGFILES_CSWcyrusimapd += /etc$(prefix)/init.d/cswcyrus
 PKGFILES_CSWcyrusimapd += /var$(prefix)/svc/manifest/network/cswcyrus\.xml
 PKGFILES_CSWcyrusimapd += $(localstatedir)/cyrus.*
-RUNTIME_DEP_PKGS_CSWcyrusimapd += CSWbdb47
+RUNTIME_DEP_PKGS_CSWcyrusimapd += CSWbdb48
 RUNTIME_DEP_PKGS_CSWcyrusimapd += CSWlibcom-err3
 RUNTIME_DEP_PKGS_CSWcyrusimapd += CSWlibgssapi-krb5-2
 RUNTIME_DEP_PKGS_CSWcyrusimapd += CSWlibk5crypto3
@@ -66,7 +66,7 @@
 PKGFILES_CSWcyrusimapdutils = $(bindir)/.*
 PKGFILES_CSWcyrusimapdutils += $(mandir)/man1/.*
 PKGFILES_CSWcyrusimapdutils += $(docdir)/cyrus_imapd_utils/.*
-RUNTIME_DEP_PKGS_CSWcyrusimapdutils += CSWbdb47
+RUNTIME_DEP_PKGS_CSWcyrusimapdutils += CSWbdb48
 RUNTIME_DEP_PKGS_CSWcyrusimapdutils += CSWlibcom-err3
 RUNTIME_DEP_PKGS_CSWcyrusimapdutils += CSWlibgssapi-krb5-2
 RUNTIME_DEP_PKGS_CSWcyrusimapdutils += CSWlibk5crypto3
@@ -85,7 +85,7 @@
 PKGFILES_CSWpmcyrus = $(perllib)/.*
 PKGFILES_CSWpmcyrus += $(mandir)/man3/Cyrus::.*
 PKGFILES_CSWpmcyrus += $(docdir)/pm_cyrus/.*
-RUNTIME_DEP_PKGS_CSWpmcyrus += CSWbdb47
+RUNTIME_DEP_PKGS_CSWpmcyrus += CSWbdb48
 RUNTIME_DEP_PKGS_CSWpmcyrus += CSWlibz1
 RUNTIME_DEP_PKGS_CSWpmcyrus += CSWosslrt
 RUNTIME_DEP_PKGS_CSWpmcyrus += CSWperl
@@ -205,9 +205,9 @@
 CONFIGURE_ARGS += --with-cyrus-prefix=$(prefix)
 CONFIGURE_ARGS += --with-service-path=$(libexecdir)/cyrus
 CONFIGURE_ARGS += --sysconfdir=$(sysconfdir)/cyrus
-CONFIGURE_ARGS += --with-bdb=db-4.7
-CONFIGURE_ARGS += --with-bdb-libdir=$(prefix)/bdb47/lib
-CONFIGURE_ARGS += --with-bdb-incdir=$(prefix)/bdb47/include
+CONFIGURE_ARGS += --with-bdb=db-4.8
+CONFIGURE_ARGS += --with-bdb-libdir=$(prefix)/bdb48/lib
+CONFIGURE_ARGS += --with-bdb-incdir=$(prefix)/bdb48/include
 CONFIGURE_ARGS += --with-openssl=$(prefix)
 CONFIGURE_ARGS += --with-sasl=$(prefix)
 CONFIGURE_ARGS += --with-perl=$(prefix)/bin/perl
@@ -218,9 +218,9 @@
 CONFIGURE_ARGS += --with-libwrap=$(prefix)
 CONFIGURE_ARGS += --disable-nntp
 
-# To link against BerkeleyDB 4.7 explicitly
-EXTRA_LINKER_FLAGS = -R$(prefix)/bdb47/lib/\$$ISALIST
-LD_OPTIONS += -R$(prefix)/bdb47/lib/\$$ISALIST
+# To link against BerkeleyDB 4.8 explicitly
+EXTRA_LINKER_FLAGS = -R$(prefix)/bdb48/lib/\$$ISALIST
+LD_OPTIONS += -R$(prefix)/bdb48/lib/\$$ISALIST
 
 # we add the args so perl libraries are installed
 # in the correct path
@@ -366,4 +366,4 @@
 	fi
 # fix references in man pages
 	find $(PKGROOT)$(mandir) -type f -exec gsed -i 's/(8)/(1m)/g' \{\} \;
-#	@$(MAKECOOKIE)
\ No newline at end of file
+#	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd.changelog.CSW
===================================================================
--- csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd.changelog.CSW	2012-01-20 15:38:56 UTC (rev 16864)
+++ csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd.changelog.CSW	2012-01-20 17:07:48 UTC (rev 16865)
@@ -1,3 +1,9 @@
+cyrus_imapd (2.4.10,REV=2012.01.20)
+
+  * Linked against Berkeley DB 4.8.
+
+ -- Rafael Ostertag <raos at opencsw.org>  Fri, 20 Jan 2012 18:01:09 +0100
+
 cyrus_imapd (2.4.10,REV=2012.01.19)
 
   * Manpages in section 8 have been moved to 1m due to collision with

Modified: csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd_utils.changelog.CSW
===================================================================
--- csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd_utils.changelog.CSW	2012-01-20 15:38:56 UTC (rev 16864)
+++ csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd_utils.changelog.CSW	2012-01-20 17:07:48 UTC (rev 16865)
@@ -1,5 +1,11 @@
-cyrus_imapd (2.4.10,REV=2012.01.19)
+cyrus_imapd_utils (2.4.10,REV=2012.01.20)
 
+  * Linked against Berkeley DB 4.8.
+
+ -- Rafael Ostertag <raos at opencsw.org>  Fri, 20 Jan 2012 18:01:09 +0100
+
+cyrus_imapd_utils (2.4.10,REV=2012.01.19)
+
   * Manpages in section 8 have been moved to 1m due to collision with
     courier's manpages. See also
     http://lists.opencsw.org/pipermail/maintainers/2012-January/015940.html

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


From guengel at users.sourceforge.net  Fri Jan 20 19:23:20 2012
From: guengel at users.sourceforge.net (guengel at users.sourceforge.net)
Date: Fri, 20 Jan 2012 18:23:20 +0000
Subject: [csw-devel] SF.net SVN: gar:[16866] csw/mgar/pkg/sasl/trunk
Message-ID: <E1RoJ7Q-0001Us-NH@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 16866
          http://gar.svn.sourceforge.net/gar/?rev=16866&view=rev
Author:   guengel
Date:     2012-01-20 18:23:20 +0000 (Fri, 20 Jan 2012)
Log Message:
-----------
sasl/trunk: link against berkeley db 4.8.

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

Modified: csw/mgar/pkg/sasl/trunk/Makefile
===================================================================
--- csw/mgar/pkg/sasl/trunk/Makefile	2012-01-20 17:07:48 UTC (rev 16865)
+++ csw/mgar/pkg/sasl/trunk/Makefile	2012-01-20 18:23:20 UTC (rev 16866)
@@ -41,7 +41,7 @@
 PACKAGES += CSWsasl
 SPKG_DESC_CSWsasl = Cyrus Simple Authentication and Security Layer
 RUNTIME_DEP_PKGS_CSWsasl = CSWosslrt
-RUNTIME_DEP_PKGS_CSWsasl += CSWbdb47
+RUNTIME_DEP_PKGS_CSWsasl += CSWbdb48
 RUNTIME_DEP_PKGS_CSWsasl += CSWlibsasl2-2
 
 PACKAGES += CSWsaslauthd
@@ -126,7 +126,7 @@
 BUILD_DEP_PKGS += CSWoldapdevel 
 BUILD_DEP_PKGS += CSWlibsqlite3-dev
 BUILD_DEP_PKGS += CSWossldevel
-BUILD_DEP_PKGS += CSWbdb47devel
+BUILD_DEP_PKGS += CSWbdb48devel
 
 EXTRA_CFLAGS = -D__EXTENSIONS__
 
@@ -134,16 +134,15 @@
 
 EXTRA_INC  = $(includedir)/gssapi
 EXTRA_INC += $(includedir)/mysql
+EXTRA_INC += $(prefix)/bdb48/include
 EXTRA_INC += /opt/csw/postgresql/include
 
+EXTRA_LIB  = $(prefix)/bdb48/lib
+EXTRA_LIB += $(prefix)/postgresql/lib
+
 # Do not use LD_OPTIONS as it breaks tests by using the installed libraries
 # before the newly built ones.
 EXTRA_RUNPATH_ISALIST	= $(EXTRA_RUNPATH_DIRS)
-# We use EXTRA_RUNPATH for bdb to make sure it is linked against $(prefix)/bdb47/lib/$(MM_LIBDIR))
-# which silences the check deprecated-library message.
-EXTRA_RUNPATH_DIRS = $(prefix)/bdb47/lib/$(MM_LIBDIR)
-EXTRA_LDFLAGS	 = -L$(abspath $(prefix)/bdb47/lib/$(MM_LIBDIR)) -R$(abspath $(prefix)/bdb47/lib/$(MM_LIBDIR))
-EXTRA_LDFLAGS	+= -L$(abspath $(prefix)/postgresql/lib/$(MM_LIBDIR)) -R$(abspath $(prefix)/postgresql/lib/$(MM_LIBDIR))
 
 BUILD64 = 1
 NOISALIST = 1
@@ -162,8 +161,9 @@
 CONFIGURE_ARGS += --enable-scram
 CONFIGURE_ARGS += --enable-otp
 CONFIGURE_ARGS += --enable-gssapi
-CONFIGURE_ARGS += --with-bdb-libdir=$(abspath /opt/csw/bdb47/lib/$(MM_LIBDIR))
-CONFIGURE_ARGS += --with-bdb-incdir=/opt/csw/bdb47/include/ 
+CONFIGURE_ARGS += --with-bdb-libdir=$(abspath /opt/csw/bdb48/lib/$(MM_LIBDIR))
+CONFIGURE_ARGS += --with-bdb-incdir=/opt/csw/bdb48/include/ 
+CONFIGURE_ARGS += --with-bdb=db-4.8
 CONFIGURE_ARGS += --with-saslauthd=$(localstatedir)/saslauthd 
 CONFIGURE_ARGS += --with-ipctype=unix 
 CONFIGURE_ARGS += --with-ldap=$(libdir)

Modified: csw/mgar/pkg/sasl/trunk/files/changelog.CSW
===================================================================
--- csw/mgar/pkg/sasl/trunk/files/changelog.CSW	2012-01-20 17:07:48 UTC (rev 16865)
+++ csw/mgar/pkg/sasl/trunk/files/changelog.CSW	2012-01-20 18:23:20 UTC (rev 16866)
@@ -1,3 +1,9 @@
+sasl (2.1.25,REV=2012.01.20)
+
+  * Link against Berkeley DB 4.8.
+
+ -- Rafael Ostertag <raos at opencsw.org>  Fri, 20 Jan 2012 19:20:16 +0100
+
 sasl (2.1.25,REV=2012.01.04)
 
   * README.sasl, README.saslauthd: moved changelog entries to

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


From jake_goerzen at users.sourceforge.net  Fri Jan 20 19:45:29 2012
From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net)
Date: Fri, 20 Jan 2012 18:45:29 +0000
Subject: [csw-devel] SF.net SVN: gar:[16867] csw/mgar/pkg/dovecot/trunk
Message-ID: <E1RoJSr-0006wJ-Nv@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 16867
          http://gar.svn.sourceforge.net/gar/?rev=16867&view=rev
Author:   jake_goerzen
Date:     2012-01-20 18:45:29 +0000 (Fri, 20 Jan 2012)
Log Message:
-----------
dovecot: Update to version 2.0.17

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

Modified: csw/mgar/pkg/dovecot/trunk/Makefile
===================================================================
--- csw/mgar/pkg/dovecot/trunk/Makefile	2012-01-20 18:23:20 UTC (rev 16866)
+++ csw/mgar/pkg/dovecot/trunk/Makefile	2012-01-20 18:45:29 UTC (rev 16867)
@@ -2,7 +2,7 @@
 # - SSL certs to /etc/opt/csw/ssl?
 # - /var/run/dovecot instead of /var/opt/csw/run?
 NAME = dovecot
-VERSION = 2.0.16
+VERSION = 2.0.17
 CATEGORIES = server
 
 DESCRIPTION = Secure IMAP server

Modified: csw/mgar/pkg/dovecot/trunk/checksums
===================================================================
--- csw/mgar/pkg/dovecot/trunk/checksums	2012-01-20 18:23:20 UTC (rev 16866)
+++ csw/mgar/pkg/dovecot/trunk/checksums	2012-01-20 18:45:29 UTC (rev 16867)
@@ -1 +1 @@
-e01a29a355afefcb9fb5f8b7a54e1a14  dovecot-2.0.16.tar.gz
+41c10dffa56e228b9176833db2efaac5  dovecot-2.0.17.tar.gz

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


From wahwah at users.sourceforge.net  Fri Jan 20 21:04:36 2012
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Fri, 20 Jan 2012 20:04:36 +0000
Subject: [csw-devel] SF.net SVN: gar:[16868]
 csw/mgar/pkg/opencsw-manual/trunk/files/ for-maintainers
Message-ID: <E1RoKhQ-0006Z2-2t@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 16868
          http://gar.svn.sourceforge.net/gar/?rev=16868&view=rev
Author:   wahwah
Date:     2012-01-20 20:04:35 +0000 (Fri, 20 Jan 2012)
Log Message:
-----------
opencsw-manual/trunk: Formatting changes

Modified Paths:
--------------
    csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/filesystem-layout.rst
    csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/shared-libraries.rst

Modified: csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/filesystem-layout.rst
===================================================================
--- csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/filesystem-layout.rst	2012-01-20 18:45:29 UTC (rev 16867)
+++ csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/filesystem-layout.rst	2012-01-20 20:04:35 UTC (rev 16868)
@@ -20,3 +20,8 @@
 a common practice to set up non-global sparse zones with shared /opt/csw. In
 this setup, non-global zones see /opt/csw as mounted read-only. Any local
 state needs to be kept under /var/opt/csw.
+
+.. [#shared-opt-csw]
+   `Shared /opt/csw configuration files`_
+.. Shared /opt/csw configuration files:
+   http://wiki.opencsw.org/shared-opt-csw-setup

Modified: csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/shared-libraries.rst
===================================================================
--- csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/shared-libraries.rst	2012-01-20 18:45:29 UTC (rev 16867)
+++ csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/shared-libraries.rst	2012-01-20 20:04:35 UTC (rev 16868)
@@ -74,7 +74,6 @@
 Advantages:
 
 * easy and complete lifecycle of shared libraries
-
 * phasing out of shared libraries can become part of standard catalog
   update procedures
 * simpler packages, simpler builds (no need for version modulations and
@@ -89,7 +88,6 @@
   number remains: 4 per release.  There will be one new CSWlibpython*
   package, and the old CSWlibpython library won't be upgraded.
 
-
 Disadvantages:
 
 * maintainers need to make more decisions when packaging
@@ -130,24 +128,24 @@
 libapr-1.so.10.0.0        CSWlibapr1-10-0-0       libapr1_10_0_0
 ========================= ======================= =========================
 
-Separators
-^^^^^^^^^^
+Separators are added between two adjacent numbers, and removed if a number and
+a letter are next to each other.  For example, ``libfoo.so.0`` becomes
+``CSWlibfoo0``, and ``libfoo-1.so.0`` becomes ``CSWlibfoo1-0``.
 
-Separators are added between two adjacent numbers, and removed if a number and a letter are next to each other.  For example, ``libfoo.so.0`` becomes ``CSWlibfoo0``, and ``libfoo-1.so.0`` becomes ``CSWlibfoo1-0``.
-
 Linkable shared objects
 ~~~~~~~~~~~~~~~~~~~~~~~
 
-The policy or recommendation shall refer to libraries which are //linkable,// meaning other binaries can link against them.  Shared objects in private directories, such as /opt/csw/lib/someproject/foo.so (think Python modules) are not shared libraries which other projects can link to, and therefore there is no benefit in placing them in separate packages.
+The policy or recommendation shall refer to libraries which are //linkable,//
+meaning other binaries can link against them.  Shared objects in private
+directories, such as /opt/csw/lib/someproject/foo.so (think Python modules)
+are not shared libraries which other projects can link to, and therefore there
+is no benefit in placing them in separate packages.
 
-Special cases
-^^^^^^^^^^^^^
+Some packages (e.g. Kerberos libraries) put private shared libraries into
+/opt/csw/lib.  They don't expose any public API, and only own Kerberos
+binaries link to them.  Private shared libraries can be bundled with the main
+package, without splitting them off.
 
-Some packages (e.g. Kerberos libraries) put private shared libraries into /opt/csw/lib.  They don't expose any public API, and only own Kerberos binaries link to them.  Private shared libraries can be bundled with the main package, without splitting them off.
-
-Examples
-^^^^^^^^
-
 ============================================================================== ============
 file                                                                           linkable?
 ============================================================================== ============
@@ -169,7 +167,7 @@
 tests. [#is-library-linkable-unit-tests]_
 
 Private shared libraries
-^^^^^^^^^^^^^^^^^^^^^^^^
+~~~~~~~~~~~~~~~~~~~~~~~~
 
 Some software projects install private (non-linkable) shared libraries
 into libdir (e.g. ``/opt/csw/lib``) by default.  To ensure that they are

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


From dmichelsen at users.sourceforge.net  Fri Jan 20 22:42:19 2012
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Fri, 20 Jan 2012 21:42:19 +0000
Subject: [csw-devel] SF.net SVN: gar:[16869]
 csw/mgar/pkg/opencsw-manual/trunk/files/ for-administrators
Message-ID: <E1RoMDz-00088Z-LK@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 16869
          http://gar.svn.sourceforge.net/gar/?rev=16869&view=rev
Author:   dmichelsen
Date:     2012-01-20 21:42:19 +0000 (Fri, 20 Jan 2012)
Log Message:
-----------
opencsw-manual: Add contents

Modified Paths:
--------------
    csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/bootstrapping.rst
    csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/index.rst

Added Paths:
-----------
    csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/introduction.rst

Modified: csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/bootstrapping.rst
===================================================================
--- csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/bootstrapping.rst	2012-01-20 20:04:35 UTC (rev 16868)
+++ csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/bootstrapping.rst	2012-01-20 21:42:19 UTC (rev 16869)
@@ -2,14 +2,62 @@
 Bootstrapping
 -------------
 
+OpenCSW uses a tool named pkgutil on top of the Solaris packaging utilities
+to automatically download, install and update packages. This has to be installed
+manually once, after that all maintenance is done via pkgutil.
+
 On a Solaris 10 system, you can use the capacity of pkgadd to download
-packages via http::
+and install it via http in one step::
 
   pkgadd -d http://get.opencsw.org/now
 
-On Solaris 8 and 9 (best effort support only), you need to download the
-package using e.g. wget and install it with::
+On Solaris 8 and 9 you need to download the package manually e.g. using wget
+and then install it::
 
   wget http://mirror.opencsw.org/opencsw/pkgutil.pkg
   pkgadd -d pkgutil.pkg
 
+Now is a good time to modify your profile to honour the OpenCSW programs.
+For a bourne shell add the following lines to your ``.profile``::
+
+  PATH=$PATH:/opt/csw/bin
+  MANPATH=$MANPATH:/opt/csw/share/man
+
+Please source it or logout and login again to make sure the environment is adjusted.
+
+You can now start installing packages. For a list of available packages use
+::
+  pkgutil -l
+
+As the list is quite long and you probably have an idea what you are looking for the
+list can be fuzzy-matched with
+::
+  root# pkgutil -a vim
+  common               package              catalog                        size
+  gvim                 CSWgvim              7.3.055,REV=2010.11.25       1.1 MB
+  vim                  CSWvim               7.3.055,REV=2010.11.25    1002.2 KB
+  vimrt                CSWvimrt             7.3.055,REV=2010.11.25       7.3 MB
+
+Lets just go ahead and try one::
+
+  root# pkgutil -i vim
+  ...
+  root# vim
+
+Voila! You have installed your first package!
+
+
+------------------
+Selecting a mirror
+------------------
+
+Now that you are about to install lots of stuff it may be a good time to select
+one of the mirrors from ``mirror.opencsw.org`` close to you. The official mirrors
+are listed at
+  http://www.opencsw.org/get-it/mirrors/
+
+
+-------------------------------------
+Setting up cryptographic verification
+-------------------------------------
+

Modified: csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/index.rst
===================================================================
--- csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/index.rst	2012-01-20 20:04:35 UTC (rev 16868)
+++ csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/index.rst	2012-01-20 21:42:19 UTC (rev 16869)
@@ -7,8 +7,10 @@
 .. toctree::
   :maxdepth: 2
 
+  introduction
   bootstrapping
   configuring-services
+  pkgutil-reference
 
 .. [#dagosscrapbook]
    `Dago's Scrapbook`_

Added: csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/introduction.rst
===================================================================
--- csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/introduction.rst	                        (rev 0)
+++ csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/introduction.rst	2012-01-20 21:42:19 UTC (rev 16869)
@@ -0,0 +1,6 @@
+------------
+Introduction
+------------
+
+Solaris 10 is fully supported whereas Solaris 8 and 9 are best effort
+and only get sporadic updates.

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


From chninkel at users.sourceforge.net  Sat Jan 21 12:04:04 2012
From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net)
Date: Sat, 21 Jan 2012 11:04:04 +0000
Subject: [csw-devel] SF.net SVN: gar:[16870] csw/mgar/pkg/openssl/trunk
Message-ID: <E1RoYjs-0005c9-3V@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 16870
          http://gar.svn.sourceforge.net/gar/?rev=16870&view=rev
Author:   chninkel
Date:     2012-01-21 11:04:03 +0000 (Sat, 21 Jan 2012)
Log Message:
-----------
openssl: updated to 0.9.8t

Modified Paths:
--------------
    csw/mgar/pkg/openssl/trunk/Makefile
    csw/mgar/pkg/openssl/trunk/checksums
    csw/mgar/pkg/openssl/trunk/files/changelog.CSW

Modified: csw/mgar/pkg/openssl/trunk/Makefile
===================================================================
--- csw/mgar/pkg/openssl/trunk/Makefile	2012-01-20 21:42:19 UTC (rev 16869)
+++ csw/mgar/pkg/openssl/trunk/Makefile	2012-01-21 11:04:03 UTC (rev 16870)
@@ -16,7 +16,7 @@
 ###### Package information #######
 
 NAME = openssl
-VERSION = 0.9.8s
+VERSION = 0.9.8t
 CATEGORIES = lib
 
 DESCRIPTION = The Open Source toolkit for SSL and TLS

Modified: csw/mgar/pkg/openssl/trunk/checksums
===================================================================
--- csw/mgar/pkg/openssl/trunk/checksums	2012-01-20 21:42:19 UTC (rev 16869)
+++ csw/mgar/pkg/openssl/trunk/checksums	2012-01-21 11:04:03 UTC (rev 16870)
@@ -1 +1 @@
-fbf71e8e050bc1ec290b7468bab1a76e  openssl-0.9.8s.tar.gz
+f5dabb7ffb068eecf245f1b2151df100  openssl-0.9.8t.tar.gz

Modified: csw/mgar/pkg/openssl/trunk/files/changelog.CSW
===================================================================
--- csw/mgar/pkg/openssl/trunk/files/changelog.CSW	2012-01-20 21:42:19 UTC (rev 16869)
+++ csw/mgar/pkg/openssl/trunk/files/changelog.CSW	2012-01-21 11:04:03 UTC (rev 16870)
@@ -1,7 +1,13 @@
-openssl (0.9.8s,REV=2012.02.04) unstable
+openssl (0.9.8t,REV=2012.01.21) unstable
 
   * New upstream release.
   
+   -- Yann Rouillard <yann at opencsw.org>  Sat, 21 Jan 2012 12:03:07 +0100
+
+openssl (0.9.8s,REV=2012.01.04) unstable
+
+  * New upstream release.
+  
    -- Yann Rouillard <yann at opencsw.org>  Wed, 04 Jan 2012 22:06:46 +0100
 
 openssl (0.9.8r,REV=2011.09.19) unstable

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


From chninkel at users.sourceforge.net  Sat Jan 21 16:36:28 2012
From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net)
Date: Sat, 21 Jan 2012 15:36:28 +0000
Subject: [csw-devel] SF.net SVN: gar:[16871] csw/mgar/pkg/lftp/trunk
Message-ID: <E1RoczU-00006w-0e@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 16871
          http://gar.svn.sourceforge.net/gar/?rev=16871&view=rev
Author:   chninkel
Date:     2012-01-21 15:36:27 +0000 (Sat, 21 Jan 2012)
Log Message:
-----------
lftp: updated to 4.3.4

Modified Paths:
--------------
    csw/mgar/pkg/lftp/trunk/Makefile
    csw/mgar/pkg/lftp/trunk/checksums
    csw/mgar/pkg/lftp/trunk/files/changelog.CSW

Modified: csw/mgar/pkg/lftp/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lftp/trunk/Makefile	2012-01-21 11:04:03 UTC (rev 16870)
+++ csw/mgar/pkg/lftp/trunk/Makefile	2012-01-21 15:36:27 UTC (rev 16871)
@@ -13,7 +13,7 @@
 ###### Package information #######
 
 NAME = lftp
-VERSION = 4.3.3
+VERSION = 4.3.4
 CATEGORIES = net
 
 DESCRIPTION = A sophisticated command-line ftp/http client

Modified: csw/mgar/pkg/lftp/trunk/checksums
===================================================================
--- csw/mgar/pkg/lftp/trunk/checksums	2012-01-21 11:04:03 UTC (rev 16870)
+++ csw/mgar/pkg/lftp/trunk/checksums	2012-01-21 15:36:27 UTC (rev 16871)
@@ -1 +1 @@
-14bd2e4a583d07593d76da3690aef02a  lftp-4.3.3.tar.gz
+2f9fc66597e869f3375b28d7ab42692e  lftp-4.3.4.tar.gz

Modified: csw/mgar/pkg/lftp/trunk/files/changelog.CSW
===================================================================
--- csw/mgar/pkg/lftp/trunk/files/changelog.CSW	2012-01-21 11:04:03 UTC (rev 16870)
+++ csw/mgar/pkg/lftp/trunk/files/changelog.CSW	2012-01-21 15:36:27 UTC (rev 16871)
@@ -1,3 +1,9 @@
+lftp (4.3.4,REV=2012.01.21) unstable
+
+  * New upstream release.
+
+ -- Yann Rouillard <yann at opencsw.org>  Sat, 21 Jan 2012 16:34:31 +0100
+
 lftp (4.3.3,REV=2011.11.06) unstable
 
   * New upstream release.

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


From guengel at users.sourceforge.net  Sat Jan 21 20:41:26 2012
From: guengel at users.sourceforge.net (guengel at users.sourceforge.net)
Date: Sat, 21 Jan 2012 19:41:26 +0000
Subject: [csw-devel] SF.net SVN: gar:[16872] csw/mgar/pkg/cyrus_imapd/trunk
Message-ID: <E1RogoY-0006T3-Cx@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 16872
          http://gar.svn.sourceforge.net/gar/?rev=16872&view=rev
Author:   guengel
Date:     2012-01-21 19:41:26 +0000 (Sat, 21 Jan 2012)
Log Message:
-----------
cyrus_imapd/trunk: Included manpages that went missing in the 2012.01.19 release package.

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

Modified: csw/mgar/pkg/cyrus_imapd/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cyrus_imapd/trunk/Makefile	2012-01-21 15:36:27 UTC (rev 16871)
+++ csw/mgar/pkg/cyrus_imapd/trunk/Makefile	2012-01-21 19:41:26 UTC (rev 16872)
@@ -37,7 +37,7 @@
 PKGFILES_CSWcyrusimapd += $(sysconfdir)/cyrus
 PKGFILES_CSWcyrusimapd += $(docdir)/cyrus_imapd/.*
 PKGFILES_CSWcyrusimapd += $(mandir)/man5/.*
-PKGFILES_CSWcyrusimapd += $(mandir)/man8/.*
+PKGFILES_CSWcyrusimapd += $(mandir)/man1m/.*
 PKGFILES_CSWcyrusimapd += $(libexecdir)/cyrus.*
 PKGFILES_CSWcyrusimapd += $(sysconfdir)/cyrus/imapd.conf.CSW
 PKGFILES_CSWcyrusimapd += $(sysconfdir)/cyrus/cyrus.conf.CSW

Modified: csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd.changelog.CSW
===================================================================
--- csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd.changelog.CSW	2012-01-21 15:36:27 UTC (rev 16871)
+++ csw/mgar/pkg/cyrus_imapd/trunk/files/cyrus_imapd.changelog.CSW	2012-01-21 19:41:26 UTC (rev 16872)
@@ -1,3 +1,9 @@
+cyrus_imapd (2.4.10,REV=2012.01.21)
+
+  * Included manpages that went missing in the 2012.01.19 release.
+
+ -- Rafael Ostertag <raos at opencsw.org>  Sat, 21 Jan 2012 20:16:59 +0100
+
 cyrus_imapd (2.4.10,REV=2012.01.20)
 
   * Linked against Berkeley DB 4.8.

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


From dmichelsen at users.sourceforge.net  Sat Jan 21 23:58:05 2012
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Sat, 21 Jan 2012 22:58:05 +0000
Subject: [csw-devel] SF.net SVN: gar:[16873]
 csw/mgar/pkg/opencsw-manual/trunk/files/
 for-administrators/bootstrapping.rst
Message-ID: <E1Rojsr-0007l4-Tg@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 16873
          http://gar.svn.sourceforge.net/gar/?rev=16873&view=rev
Author:   dmichelsen
Date:     2012-01-21 22:58:05 +0000 (Sat, 21 Jan 2012)
Log Message:
-----------
opencsw-manual/trunk: Add mirror selection and set up catalog gpg checks

Modified Paths:
--------------
    csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/bootstrapping.rst

Modified: csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/bootstrapping.rst
===================================================================
--- csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/bootstrapping.rst	2012-01-21 19:41:26 UTC (rev 16872)
+++ csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/bootstrapping.rst	2012-01-21 22:58:05 UTC (rev 16873)
@@ -27,11 +27,13 @@
 
 You can now start installing packages. For a list of available packages use
 ::
+
   pkgutil -l
 
 As the list is quite long and you probably have an idea what you are looking for the
 list can be fuzzy-matched with
 ::
+
   root# pkgutil -a vim
   common               package              catalog                        size
   gvim                 CSWgvim              7.3.055,REV=2010.11.25       1.1 MB
@@ -40,7 +42,7 @@
 
 Lets just go ahead and try one::
 
-  root# pkgutil -i vim
+  root# pkgutil -y -i vim
   ...
   root# vim
 
@@ -54,10 +56,85 @@
 Now that you are about to install lots of stuff it may be a good time to select
 one of the mirrors from ``mirror.opencsw.org`` close to you. The official mirrors
 are listed at
+::
+
   http://www.opencsw.org/get-it/mirrors/
 
+It is important to note that ``pkgutil`` has **two** configuration files:
 
+- ``/etc/opt/csw/pkgutil.conf``
+- ``/opt/csw/etc/pkgutil.conf``
+
+This may seem confusing, the reason why there are two is that it is possible to run
+OpenCSW in a `sparse root environment`_ where ``/opt`` is not writable. In this scenario
+you use configurations in ``/opt/csw/etc`` for global settings and ``/etc/opt/csw``
+for zone-specific setting. Both ``pkgutil.conf`` are identical on installation with all
+configuration options commented out, so you can just pick one for now. As a rule of thumb it is
+recommended to prefer the more prominent ``/etc/opt/csw``. Please uncomment the line
+with ``mirror`` so it looks similar to this with the URL replaced by the mirror you picked::
+
+  mirror=http://mirror.opencsw.org/opencsw/unstable
+
+You can verify the setting with ``pkgutil -V``::
+
+  ...
+  maxpkglist              10000 (default: 10000)
+  mirror                  http://mirror.opencsw.org/opencsw/unstable
+                          (default: http://mirror.opencsw.org/opencsw/unstable)
+  noncsw                  false (default: false)
+  ...
+
+On the next catalog update with ``pkgutil -U`` the catalogs are pulled from the new mirror.
+
+
 -------------------------------------
 Setting up cryptographic verification
 -------------------------------------
 
+The catalog is signed with PGP and it is a good idea to set up your system to verify
+the integrity of the catalog. As the catalog itself contains hashes for all packages
+in the catalog this ensures you actually install the packages which were officially
+released. First you need to install ``pgp`` (of course with pkgutil!)::
+
+  pkgutil -y -i gpg
+
+Then you need to import the public key::
+
+  root# wget -O - http://www.opencsw.org/get-it/mirrors/  | gpg --import -
+  
+The current fingerprint looks like this::
+
+  root# gpg --fingerprint board at opencsw.org
+  pub   1024D/9306CC77 2011-08-31
+        Key fingerprint = 4DCE 3C80 AAB2 CAB1 E60C  9A3C 05F4 2D66 9306 CC77
+  uid                  OpenCSW catalog signing <board at opencsw.org>
+  sub   2048g/971EDE93 2011-08-31
+
+Now everything is in place for enabling security in ``pkgutil``. Edit the ``/etc/opt/csw/pkgutil.conf``
+and uncomment the two lines with ``use_gpg`` and ``use_md5`` so they look like this::
+
+  use_gpg=true
+  use_md5=true
+
+You can verify that it worked with ``pkgutil -V``::
+
+  root at login [login]:/etc/opt/csw > pkgutil -V             
+  ...
+  show_current            true (default: true)
+  stop_on_hook_soft_error not set (default: false)
+  use_gpg                 true (default: false)
+  use_md5                 true (default: false)
+  wgetopts                not set (default: none)
+
+On the next ``pkgutil -U`` you should see a catalog integrity verification wit ``gpg``::
+
+  ...
+  Checking integrity of /var/opt/csw/pkgutil/catalog.mirror_opencsw_current_sparc_5.10 with gpg.
+  gpg: Signature made Sat Jan 21 18:34:45 2012 CET using DSA key ID 9306CC77
+  gpg: Good signature from "OpenCSW catalog signing <board at opencsw.org>"
+  gpg: WARNING: This key is not certified with a trusted signature!
+  gpg:          There is no indication that the signature belongs to the owner.
+  Primary key fingerprint: 4DCE 3C80 AAB2 CAB1 E60C  9A3C 05F4 2D66 9306 CC77
+  ==> 3173 packages loaded from /var/opt/csw/pkgutil/catalog.mirror_opencsw_current_sparc_5.10
+  ...
+

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


From bdwalton at users.sourceforge.net  Sun Jan 22 15:05:24 2012
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Sun, 22 Jan 2012 14:05:24 +0000
Subject: [csw-devel] SF.net SVN: gar:[16874] csw/mgar/pkg/php5/trunk/Makefile
Message-ID: <E1Roy2u-0002SL-24@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 16874
          http://gar.svn.sourceforge.net/gar/?rev=16874&view=rev
Author:   bdwalton
Date:     2012-01-22 14:05:23 +0000 (Sun, 22 Jan 2012)
Log Message:
-----------
php5/trunk: tweak a few build options

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

Modified: csw/mgar/pkg/php5/trunk/Makefile
===================================================================
--- csw/mgar/pkg/php5/trunk/Makefile	2012-01-21 22:58:05 UTC (rev 16873)
+++ csw/mgar/pkg/php5/trunk/Makefile	2012-01-22 14:05:23 UTC (rev 16874)
@@ -33,7 +33,7 @@
 
 VENDOR_URL     = http://www.php.net/
 MASTER_SITES   = http://us.php.net/distributions/
-INSTALL_ENV   += INSTALL_ROOT=$(DESTDIR)
+EXTRA_INSTALL_ENV   = INSTALL_ROOT=$(DESTDIR)
 
 LICENSE = LICENSE
 
@@ -215,9 +215,14 @@
 EXTRA_CFLAGS = -I$(prefix)/include/ncursesw
 EXTRA_LIB = /opt/csw/postgresql/lib
 
+# We link with /usr/ccs/bin/ld which requires setting the path to libCstd.so,
+# using CC as linker would have made this automatic.
+SUBDIR64-sparc = v9
+SUBDIR64-i386 = amd64
+EXTRA_LINKER_FLAGS = -L$($(GARCOMPILER)_CC_HOME)/lib/$(SUBDIR$(MEMORYMODEL)-$(GARCH)) -lCstd -lz
+
 NOISALIST = 1
 STRIP_LIBTOOL = 1
-# PACKAGING_PLATFORMS = solaris10-i386
 
 sysconfdir = /etc$(prefix)/php5
 
@@ -321,6 +326,7 @@
 CONFIGURE_ARGS += --with-zlib=$(prefix)
 endif
 
+
 # Disable Tests (report submitted to PHP QA)
 SKIPTEST = 1
 #ENABLE_CHECK = 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  Sun Jan 22 20:16:53 2012
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Sun, 22 Jan 2012 19:16:53 +0000
Subject: [csw-devel] SF.net SVN: gar:[16875] csw/mgar/pkg/php5/trunk/Makefile
Message-ID: <E1Rp2uL-0006kI-7K@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 16875
          http://gar.svn.sourceforge.net/gar/?rev=16875&view=rev
Author:   bdwalton
Date:     2012-01-22 19:16:52 +0000 (Sun, 22 Jan 2012)
Log Message:
-----------
php5/trunk: depend on freetype_dev at build time

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

Modified: csw/mgar/pkg/php5/trunk/Makefile
===================================================================
--- csw/mgar/pkg/php5/trunk/Makefile	2012-01-22 14:05:23 UTC (rev 16874)
+++ csw/mgar/pkg/php5/trunk/Makefile	2012-01-22 19:16:52 UTC (rev 16875)
@@ -61,6 +61,7 @@
 BUILD_DEP_PKGS += CSWlibmcrypt CSWfreetds CSWmysql-dev CSWunixodbc
 BUILD_DEP_PKGS += CSWlibpq CSWlibreadline-dev CSWlibncurses-dev CSWnetsnmp
 BUILD_DEP_PKGS += CSWlibsqlite3-dev CSWaspell CSWhtmltidy CSWpostgresql
+BUILD_DEP_PKGS += CSWlibfreetype-dev
 # NOTE: I think this is a leftover bug.  we shouldn't depend on two versions
 # of sqlite...
 BUILD_DEP_PKGS += CSWlibsqlite3-0

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


From chninkel at users.sourceforge.net  Sun Jan 22 20:50:33 2012
From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net)
Date: Sun, 22 Jan 2012 19:50:33 +0000
Subject: [csw-devel] SF.net SVN: gar:[16876]
	csw/mgar/pkg/openssh/branches/openssh-hpn/
Message-ID: <E1Rp3Qv-0001ho-A5@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 16876
          http://gar.svn.sourceforge.net/gar/?rev=16876&view=rev
Author:   chninkel
Date:     2012-01-22 19:50:33 +0000 (Sun, 22 Jan 2012)
Log Message:
-----------
openssh: add branch openssh-hpn to build openssh with High Performance Enabled patch

Added Paths:
-----------
    csw/mgar/pkg/openssh/branches/openssh-hpn/

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


From chninkel at users.sourceforge.net  Sun Jan 22 23:01:01 2012
From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net)
Date: Sun, 22 Jan 2012 22:01:01 +0000
Subject: [csw-devel] SF.net SVN: gar:[16877]
	csw/mgar/pkg/openssh/branches/openssh-hpn/Makefile
Message-ID: <E1Rp5TB-00043i-U0@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 16877
          http://gar.svn.sourceforge.net/gar/?rev=16877&view=rev
Author:   chninkel
Date:     2012-01-22 22:01:01 +0000 (Sun, 22 Jan 2012)
Log Message:
-----------
openssh/hpn branch: added hpn patches

Modified Paths:
--------------
    csw/mgar/pkg/openssh/branches/openssh-hpn/Makefile

Modified: csw/mgar/pkg/openssh/branches/openssh-hpn/Makefile
===================================================================
--- csw/mgar/pkg/openssh/branches/openssh-hpn/Makefile	2012-01-22 19:50:33 UTC (rev 16876)
+++ csw/mgar/pkg/openssh/branches/openssh-hpn/Makefile	2012-01-22 22:01:01 UTC (rev 16877)
@@ -10,6 +10,8 @@
 # software causes damage.
 #####################################################################
 
+HPN = 1
+
 ###### Package information #######
 
 NAME = openssh
@@ -138,6 +140,14 @@
 # see https://www.opencsw.org/mantis/view.php?id=4398
 PATCHFILES += 0005-rename-pidfile.patch
 
+ifdef HPN
+MASTER_SITES += http://www.psc.edu/networking/projects/hpn-ssh/
+PATCHFILES += openssh5.9-dynwindow_noneswitch.diff.gz
+PATCHFILES += openssh5.9-CTR-threading.diff
+PATCHFILES += openssh5.9-peaktput.diff
+#PATCHFILES += openssh5.9-server-logging.diff
+endif
+
 # documentation files to install (not a gar variable)
 DOCFILES = CREDITS ChangeLog ChangeLog.gssapi INSTALL LICENCE OVERVIEW README README.dns 
 DOCFILES += README.platform README.privsep README.tun TODO WARNING.RNG    

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


From chninkel at users.sourceforge.net  Sun Jan 22 23:23:21 2012
From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net)
Date: Sun, 22 Jan 2012 22:23:21 +0000
Subject: [csw-devel] SF.net SVN: gar:[16878]
	csw/mgar/pkg/openssh/branches/openssh-hpn/checksums
Message-ID: <E1Rp5on-0004SJ-JF@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 16878
          http://gar.svn.sourceforge.net/gar/?rev=16878&view=rev
Author:   chninkel
Date:     2012-01-22 22:23:21 +0000 (Sun, 22 Jan 2012)
Log Message:
-----------
openssh/branches/openssh-hpn: openssh/hpn branch: updated checksum

Modified Paths:
--------------
    csw/mgar/pkg/openssh/branches/openssh-hpn/checksums

Modified: csw/mgar/pkg/openssh/branches/openssh-hpn/checksums
===================================================================
--- csw/mgar/pkg/openssh/branches/openssh-hpn/checksums	2012-01-22 22:01:01 UTC (rev 16877)
+++ csw/mgar/pkg/openssh/branches/openssh-hpn/checksums	2012-01-22 22:23:21 UTC (rev 16878)
@@ -1 +1,4 @@
 afe17eee7e98d3b8550cc349834a85d0  openssh-5.9p1.tar.gz
+0735e4d4e1bcb158b02cfaa93aa67f58  openssh5.9-CTR-threading.diff
+c2813a4f5226cad77ec2cd78a503fe9c  openssh5.9-dynwindow_noneswitch.diff.gz
+de968b6c2ae998e9b6ac4a41648dc1a8  openssh5.9-peaktput.diff

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


From dmichelsen at users.sourceforge.net  Mon Jan 23 10:31:04 2012
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Mon, 23 Jan 2012 09:31:04 +0000
Subject: [csw-devel] SF.net SVN: gar:[16879] csw/mgar/pkg
Message-ID: <E1RpGEy-0004qi-Nj@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 16879
          http://gar.svn.sourceforge.net/gar/?rev=16879&view=rev
Author:   dmichelsen
Date:     2012-01-23 09:31:04 +0000 (Mon, 23 Jan 2012)
Log Message:
-----------
WHOLE TREE: Followup for r11888 (GARVERSION -> VERSION) to adjust modulations and var settings

Revision Links:
--------------
    http://gar.svn.sourceforge.net/gar/?rev=11888&view=rev

Modified Paths:
--------------
    csw/mgar/pkg/automake/trunk/Makefile
    csw/mgar/pkg/examples/modulations/trunk/Makefile
    csw/mgar/pkg/flac/trunk/Makefile
    csw/mgar/pkg/glib/trunk/Makefile
    csw/mgar/pkg/libmm/trunk/Makefile
    csw/mgar/pkg/wxwidgets/trunk/Makefile

Modified: csw/mgar/pkg/automake/trunk/Makefile
===================================================================
--- csw/mgar/pkg/automake/trunk/Makefile	2012-01-22 22:23:21 UTC (rev 16878)
+++ csw/mgar/pkg/automake/trunk/Makefile	2012-01-23 09:31:04 UTC (rev 16879)
@@ -58,12 +58,12 @@
 $(foreach VERSION,$(MODULATIONS_VERSION),$(eval MERGE_SCRIPTS_isa-$(ISA)-version-$(VERSION) = copy-all))
 
 # These are hardlinks to the versioned versions and will confuse the merging
-EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv8-garversion-1.6.3 = $(bindir)/automake $(bindir)/aclocal $(infodir)/.*
-EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv8-garversion-1.7.9 = $(bindir)/automake $(bindir)/aclocal $(infodir)/.*
-EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv8-garversion-1.8.5 = $(bindir)/automake $(bindir)/aclocal $(infodir)/.*
-EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv8-garversion-1.9.6 = $(bindir)/automake $(bindir)/aclocal $(infodir)/.*
-EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv8-garversion-1.10.3 = $(bindir)/automake $(bindir)/aclocal $(infodir)/.*
-EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv8-garversion-1.11.2 = $(bindir)/automake $(bindir)/aclocal $(infodir)/.*
+EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv8-version-1.6.3 = $(bindir)/automake $(bindir)/aclocal $(infodir)/.*
+EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv8-version-1.7.9 = $(bindir)/automake $(bindir)/aclocal $(infodir)/.*
+EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv8-version-1.8.5 = $(bindir)/automake $(bindir)/aclocal $(infodir)/.*
+EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv8-version-1.9.6 = $(bindir)/automake $(bindir)/aclocal $(infodir)/.*
+EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv8-version-1.10.3 = $(bindir)/automake $(bindir)/aclocal $(infodir)/.*
+EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv8-version-1.11.2 = $(bindir)/automake $(bindir)/aclocal $(infodir)/.*
 
 #     alternatives [options] --install link name path priority  [-
 #     -slave link name path]...  [--initscript service]

Modified: csw/mgar/pkg/examples/modulations/trunk/Makefile
===================================================================
--- csw/mgar/pkg/examples/modulations/trunk/Makefile	2012-01-22 22:23:21 UTC (rev 16878)
+++ csw/mgar/pkg/examples/modulations/trunk/Makefile	2012-01-23 09:31:04 UTC (rev 16879)
@@ -23,9 +23,9 @@
 
 EXTRA_MODULATORS = VERSION
 MODULATIONS_VERSION = 1.0 1.1 2.0
-MERGE_SCRIPTS_isa-sparcv8-garversion-1.0 = copy-all
-MERGE_SCRIPTS_isa-sparcv8-garversion-1.1 = copy-all
-MERGE_SCRIPTS_isa-sparcv8-garversion-2.0 = copy-all
+MERGE_SCRIPTS_isa-sparcv8-version-1.0 = copy-all
+MERGE_SCRIPTS_isa-sparcv8-version-1.1 = copy-all
+MERGE_SCRIPTS_isa-sparcv8-version-2.0 = copy-all
 
 # A really simple installator, creating different files for each VERSION.
 install-example:

Modified: csw/mgar/pkg/flac/trunk/Makefile
===================================================================
--- csw/mgar/pkg/flac/trunk/Makefile	2012-01-22 22:23:21 UTC (rev 16878)
+++ csw/mgar/pkg/flac/trunk/Makefile	2012-01-23 09:31:04 UTC (rev 16879)
@@ -8,10 +8,10 @@
 
 # There was no 64 bit legacy version. Do not provide it as new binaries should
 # link against the new version.
-SKIP_MODULATIONS = isa-sparcv9-garversion-1.0.4
-SKIP_MODULATIONS += isa-amd64-garversion-1.0.4
-SKIP_MODULATIONS += isa-sparcv9-garversion-1.1.2
-SKIP_MODULATIONS += isa-amd64-garversion-1.1.2
+SKIP_MODULATIONS = isa-sparcv9-version-1.0.4
+SKIP_MODULATIONS += isa-amd64-version-1.0.4
+SKIP_MODULATIONS += isa-sparcv9-version-1.1.2
+SKIP_MODULATIONS += isa-amd64-version-1.1.2
 
 DESCRIPTION = Free lossless audio codec
 define BLURB
@@ -32,16 +32,16 @@
 
 NOEXTRACT = $(filter-out $(SF_PROJ)-$(VERSION).tar.gz,$(SOURCEFILES))
 
-PATCHFILES_isa-sparcv8-garversion-1.1.2 = libtool-64bit.patch
-PATCHFILES_isa-sparcv9-garversion-1.1.2 = libtool-64bit.patch
-PATCHFILES_isa-sparcv8-garversion-1.2.1 = libtool-64bit.patch no-stdint.patch
-PATCHFILES_isa-sparcv9-garversion-1.2.1 = libtool-64bit.patch no-stdint.patch
+PATCHFILES_isa-sparcv8-version-1.1.2 = libtool-64bit.patch
+PATCHFILES_isa-sparcv9-version-1.1.2 = libtool-64bit.patch
+PATCHFILES_isa-sparcv8-version-1.2.1 = libtool-64bit.patch no-stdint.patch
+PATCHFILES_isa-sparcv9-version-1.2.1 = libtool-64bit.patch no-stdint.patch
 
-PATCHFILES_isa-i386-garversion-1.0.4 = strip-nasm-1.0.4.patch
-PATCHFILES_isa-i386-garversion-1.1.2 = strip-nasm-1.1.2.patch libtool-64bit.patch
-PATCHFILES_isa-amd64-garversion-1.1.2 = libtool-64bit.patch
-PATCHFILES_isa-i386-garversion-1.2.1 = strip-nasm-1.2.1.patch libtool-64bit.patch no-stdint.patch
-PATCHFILES_isa-amd64-garversion-1.2.1 = strip-nasm-1.2.1.patch libtool-64bit.patch no-stdint.patch
+PATCHFILES_isa-i386-version-1.0.4 = strip-nasm-1.0.4.patch
+PATCHFILES_isa-i386-version-1.1.2 = strip-nasm-1.1.2.patch libtool-64bit.patch
+PATCHFILES_isa-amd64-version-1.1.2 = libtool-64bit.patch
+PATCHFILES_isa-i386-version-1.2.1 = strip-nasm-1.2.1.patch libtool-64bit.patch no-stdint.patch
+PATCHFILES_isa-amd64-version-1.2.1 = strip-nasm-1.2.1.patch libtool-64bit.patch no-stdint.patch
 
 PACKAGES = CSWflac CSWxmmsflac
 CATALOGNAME_CSWflac = libflac
@@ -85,33 +85,33 @@
 
 TEST_TARGET = check
 
-MERGE_SCRIPTS_isa-i386-garversion-1.0.4 = copy-only
-MERGE_DIRS_isa-i386-garversion-1.0.4 = $(libdir)
-MERGE_SCRIPTS_isa-amd64-garversion-1.0.4 = copy-relocated-only
-MERGE_DIRS_isa-amd64-garversion-1.0.4 = $(libdir)
+MERGE_SCRIPTS_isa-i386-version-1.0.4 = copy-only
+MERGE_DIRS_isa-i386-version-1.0.4 = $(libdir)
+MERGE_SCRIPTS_isa-amd64-version-1.0.4 = copy-relocated-only
+MERGE_DIRS_isa-amd64-version-1.0.4 = $(libdir)
 
-MERGE_SCRIPTS_isa-i386-garversion-1.1.2 = copy-only
-MERGE_DIRS_isa-i386-garversion-1.1.2 = $(libdir)
-MERGE_SCRIPTS_isa-amd64-garversion-1.1.2 = copy-relocated-only
-MERGE_DIRS_isa-amd64-garversion-1.1.2 = $(libdir)
+MERGE_SCRIPTS_isa-i386-version-1.1.2 = copy-only
+MERGE_DIRS_isa-i386-version-1.1.2 = $(libdir)
+MERGE_SCRIPTS_isa-amd64-version-1.1.2 = copy-relocated-only
+MERGE_DIRS_isa-amd64-version-1.1.2 = $(libdir)
 
-MERGE_SCRIPTS_isa-i386-garversion-1.2.1 = copy-all
-MERGE_SCRIPTS_isa-amd64-garversion-1.2.1 = copy-relocated-only
-MERGE_DIRS_isa-amd64-garversion-1.2.1 = $(bindir) $(sbindir) $(libexecdir) $(libdir)
+MERGE_SCRIPTS_isa-i386-version-1.2.1 = copy-all
+MERGE_SCRIPTS_isa-amd64-version-1.2.1 = copy-relocated-only
+MERGE_DIRS_isa-amd64-version-1.2.1 = $(bindir) $(sbindir) $(libexecdir) $(libdir)
 
-MERGE_SCRIPTS_isa-sparcv8-garversion-1.0.4 = copy-only
-MERGE_DIRS_isa-sparcv8-garversion-1.0.4 = $(libdir)
-MERGE_SCRIPTS_isa-sparcv9-garversion-1.0.4 = copy-relocated-only
-MERGE_DIRS_isa-sparcv9-garversion-1.0.4 = $(libdir)
+MERGE_SCRIPTS_isa-sparcv8-version-1.0.4 = copy-only
+MERGE_DIRS_isa-sparcv8-version-1.0.4 = $(libdir)
+MERGE_SCRIPTS_isa-sparcv9-version-1.0.4 = copy-relocated-only
+MERGE_DIRS_isa-sparcv9-version-1.0.4 = $(libdir)
 
-MERGE_SCRIPTS_isa-sparcv8-garversion-1.1.2 = copy-only
-MERGE_DIRS_isa-sparcv8-garversion-1.1.2 = $(libdir)
-MERGE_SCRIPTS_isa-sparcv9-garversion-1.1.2 = copy-relocated-only
-MERGE_DIRS_isa-sparcv9-garversion-1.1.2 = $(libdir)
+MERGE_SCRIPTS_isa-sparcv8-version-1.1.2 = copy-only
+MERGE_DIRS_isa-sparcv8-version-1.1.2 = $(libdir)
+MERGE_SCRIPTS_isa-sparcv9-version-1.1.2 = copy-relocated-only
+MERGE_DIRS_isa-sparcv9-version-1.1.2 = $(libdir)
 
-MERGE_SCRIPTS_isa-sparcv8-garversion-1.2.1 = copy-all
-MERGE_SCRIPTS_isa-sparcv9-garversion-1.2.1 = copy-relocated-only
-MERGE_DIRS_isa-sparcv9-garversion-1.2.1 = $(bindir) $(sbindir) $(libexecdir) $(libdir)
+MERGE_SCRIPTS_isa-sparcv8-version-1.2.1 = copy-all
+MERGE_SCRIPTS_isa-sparcv9-version-1.2.1 = copy-relocated-only
+MERGE_DIRS_isa-sparcv9-version-1.2.1 = $(bindir) $(sbindir) $(libexecdir) $(libdir)
 
 PKGFILES_CSWxmmsflac = $(libdir)/xmms/.*
 
@@ -121,18 +121,18 @@
 CXX := $(abspath ./bin/CC)
 PATH := ./bin:$(PATH):/usr/ccs/bin
 
-post-patch-isa-i386-garversion-1.0.4:
+post-patch-isa-i386-version-1.0.4:
 	perl -pi -e "s/-O3 //g" $(WORKSRC)/configure
 	$(MAKECOOKIE)
 
-post-patch-isa-i386-garversion-1.1.2:
+post-patch-isa-i386-version-1.1.2:
 	perl -pi -e "s/-O2 //g" $(WORKSRC)/configure
 	$(MAKECOOKIE)
 
-post-patch-isa-sparcv8-garversion-1.0.4:
+post-patch-isa-sparcv8-version-1.0.4:
 	perl -pi -e "s/-O3 //g" $(WORKSRC)/configure
 	$(MAKECOOKIE)
 
-post-patch-isa-sparcv8-garversion-1.1.2:
+post-patch-isa-sparcv8-version-1.1.2:
 	perl -pi -e "s/-O2 //g" $(WORKSRC)/configure
 	$(MAKECOOKIE)

Modified: csw/mgar/pkg/glib/trunk/Makefile
===================================================================
--- csw/mgar/pkg/glib/trunk/Makefile	2012-01-22 22:23:21 UTC (rev 16878)
+++ csw/mgar/pkg/glib/trunk/Makefile	2012-01-23 09:31:04 UTC (rev 16879)
@@ -5,7 +5,7 @@
 EXTRA_MODULATORS = VERSION
 MODULATIONS_VERSION = 1.2.10 1.3.15
 
-SKIP_MODULATIONS = isa-sparcv9-garversion-1.2.10 isa-amd64-garversion-1.2.10
+SKIP_MODULATIONS = isa-sparcv9-version-1.2.10 isa-amd64-version-1.2.10
 
 DESCRIPTION = Utility library commonly associated with GNOME programs
 define BLURB
@@ -20,9 +20,9 @@
 NOEXTRACT = $(filter-out $(NAME)-$(VERSION).tar.gz,$(SOURCEFILES))
 PATCHFILES-1.3.15  = 0001-gtkdoc-mkhtml-returns-1-even-on-warnings.patch
 PATCHFILES-1.3.15 += 0002-Don-t-break-when-index.sgml-is-not-there.patch
-PATCHFILES_isa-i386-garversion-1.3.15 = $(PATCHFILES-1.3.15)
-PATCHFILES_isa-sparcv8-garversion-1.3.15 = $(PATCHFILES-1.3.15)
-PATCHFILES_isa-sparcv9-garversion-1.3.15 = $(PATCHFILES-1.3.15)
+PATCHFILES_isa-i386-version-1.3.15 = $(PATCHFILES-1.3.15)
+PATCHFILES_isa-sparcv8-version-1.3.15 = $(PATCHFILES-1.3.15)
+PATCHFILES_isa-sparcv9-version-1.3.15 = $(PATCHFILES-1.3.15)
 
 PACKAGES = CSWglib CSWglibdevel
 
@@ -51,8 +51,8 @@
 UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2
 
 # There are three possible harmless tests failing for 1.3.15 64 bit, so skip for now
-TEST_SCRIPTS_isa-default-garversion-1.2.10 = $(WORKSRC)/Makefile
-TEST_SCRIPTS_isa-default-garversion-1.3.15 = $(WORKSRC)/Makefile
+TEST_SCRIPTS_isa-default-version-1.2.10 = $(WORKSRC)/Makefile
+TEST_SCRIPTS_isa-default-version-1.3.15 = $(WORKSRC)/Makefile
 TEST_SCRIPTS = $(call modulationvalue,TEST_SCRIPTS)
 
 TEST_TARGET = check
@@ -60,11 +60,11 @@
 #provided by iconv
 MERGE_EXCLUDE_FILES = .*/charset.alias
 
-MERGE_SCRIPTS_isa-default-garversion-1.2.10 = copy-only
-MERGE_DIRS_isa-default-garversion-1.2.10 = $(libdir)
-MERGE_SCRIPTS_isa-default-garversion-1.3.15 = copy-all
-MERGE_DIRS_isa-extra-garversion-1.3.15 = $(libdir)
-MERGE_SCRIPTS_isa-extra-garversion-1.3.15 = copy-relocated-only
+MERGE_SCRIPTS_isa-default-version-1.2.10 = copy-only
+MERGE_DIRS_isa-default-version-1.2.10 = $(libdir)
+MERGE_SCRIPTS_isa-default-version-1.3.15 = copy-all
+MERGE_DIRS_isa-extra-version-1.3.15 = $(libdir)
+MERGE_SCRIPTS_isa-extra-version-1.3.15 = copy-relocated-only
 
 PKGFILES_CSWglibdevel  = $(PKGFILES_DEVEL)
 PKGFILES_CSWglibdevel += $(sharedstatedir)/gtk-doc/.*

Modified: csw/mgar/pkg/libmm/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libmm/trunk/Makefile	2012-01-22 22:23:21 UTC (rev 16878)
+++ csw/mgar/pkg/libmm/trunk/Makefile	2012-01-23 09:31:04 UTC (rev 16879)
@@ -6,8 +6,8 @@
 MODULATIONS_VERSION = 1.3.1 1.4.2
 
 # No 64 bit for old version as it wasn't provided in the legacy version also
-SKIP_MODULATIONS = isa-amd64-garversion-1.3.1
-SKIP_MODULATIONS += isa-sparcv9-garversion-1.3.1
+SKIP_MODULATIONS = isa-amd64-version-1.3.1
+SKIP_MODULATIONS += isa-sparcv9-version-1.3.1
 
 DESCRIPTION = Shared Memory Allocation abstraction library
 define BLURB
@@ -42,23 +42,23 @@
 BUILD64 = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 
-MERGE_SCRIPTS_isa-i386-garversion-1.3.1 = copy-only
-MERGE_DIRS_isa-i386-garversion-1.3.1 = $(libdir)
-MERGE_SCRIPTS_isa-amd64-garversion-1.3.1 = copy-relocated-only
-MERGE_DIRS_isa-amd64-garversion-1.3.1 = $(libdir)
+MERGE_SCRIPTS_isa-i386-version-1.3.1 = copy-only
+MERGE_DIRS_isa-i386-version-1.3.1 = $(libdir)
+MERGE_SCRIPTS_isa-amd64-version-1.3.1 = copy-relocated-only
+MERGE_DIRS_isa-amd64-version-1.3.1 = $(libdir)
 
-MERGE_SCRIPTS_isa-i386-garversion-1.4.2 = copy-all
-MERGE_SCRIPTS_isa-amd64-garversion-1.4.2 = copy-relocated-only
-MERGE_DIRS_isa-amd64-garversion-1.4.2 = $(bindir) $(sbindir) $(libexecdir) $(libdir)
+MERGE_SCRIPTS_isa-i386-version-1.4.2 = copy-all
+MERGE_SCRIPTS_isa-amd64-version-1.4.2 = copy-relocated-only
+MERGE_DIRS_isa-amd64-version-1.4.2 = $(bindir) $(sbindir) $(libexecdir) $(libdir)
 
-MERGE_SCRIPTS_isa-sparcv8-garversion-1.3.1 = copy-only
-MERGE_DIRS_isa-sparcv8-garversion-1.3.1 = $(libdir)
-MERGE_SCRIPTS_isa-sparcv9-garversion-1.3.1 = copy-relocated-only
-MERGE_DIRS_isa-sparcv9-garversion-1.3.1 = $(libdir)
+MERGE_SCRIPTS_isa-sparcv8-version-1.3.1 = copy-only
+MERGE_DIRS_isa-sparcv8-version-1.3.1 = $(libdir)
+MERGE_SCRIPTS_isa-sparcv9-version-1.3.1 = copy-relocated-only
+MERGE_DIRS_isa-sparcv9-version-1.3.1 = $(libdir)
 
-MERGE_SCRIPTS_isa-sparcv8-garversion-1.4.2 = copy-all
-MERGE_SCRIPTS_isa-sparcv9-garversion-1.4.2 = copy-relocated-only
-MERGE_DIRS_isa-sparcv9-garversion-1.4.2 = $(bindir) $(sbindir) $(libexecdir) $(libdir)
+MERGE_SCRIPTS_isa-sparcv8-version-1.4.2 = copy-all
+MERGE_SCRIPTS_isa-sparcv9-version-1.4.2 = copy-relocated-only
+MERGE_DIRS_isa-sparcv9-version-1.4.2 = $(bindir) $(sbindir) $(libexecdir) $(libdir)
 
 
 include gar/category.mk

Modified: csw/mgar/pkg/wxwidgets/trunk/Makefile
===================================================================
--- csw/mgar/pkg/wxwidgets/trunk/Makefile	2012-01-22 22:23:21 UTC (rev 16878)
+++ csw/mgar/pkg/wxwidgets/trunk/Makefile	2012-01-23 09:31:04 UTC (rev 16879)
@@ -25,12 +25,12 @@
 # files copied from the old package have been provided.
 MODULATIONS_VERSION = 2.8.10
 
-MERGE_SCRIPTS_isa-i386-garversion-2.8.5 = copy-only
-MERGE_DIRS_isa-i386-garversion-2.8.5 = $(libdir)
-MERGE_SCRIPTS_isa-sparcv8-garversion-2.8.5 = copy-only
-MERGE_DIRS_isa-sparcv8-garversion-2.8.5 = $(libdir)
-MERGE_SCRIPTS_isa-i386-garversion-2.8.10 = copy-all
-MERGE_SCRIPTS_isa-sparcv8-garversion-2.8.10 = copy-all
+MERGE_SCRIPTS_isa-i386-version-2.8.5 = copy-only
+MERGE_DIRS_isa-i386-version-2.8.5 = $(libdir)
+MERGE_SCRIPTS_isa-sparcv8-version-2.8.5 = copy-only
+MERGE_DIRS_isa-sparcv8-version-2.8.5 = $(libdir)
+MERGE_SCRIPTS_isa-i386-version-2.8.10 = copy-all
+MERGE_SCRIPTS_isa-sparcv8-version-2.8.10 = copy-all
 
 SOURCEFILES = $(foreach VERSION,$(MODULATIONS_VERSION),$(NAME)-$(VERSION).tar.gz)
 NOEXTRACT = $(filter-out $(NAME)-$(VERSION).tar.gz,$(SOURCEFILES))
@@ -44,26 +44,26 @@
 SF_PROJ = wxwindows
 
 
-PATCHFILES_isa-i386-garversion-2.8.5  = 0500-wxT-macro-first-iteration.patch
-PATCHFILES_isa-i386-garversion-2.8.5 += 0501-a-possible-fix-to-wxchar.h.patch
-PATCHFILES_isa-i386-garversion-2.8.5 += 0002-Fixing-retarded-checks-for-libGL.patch
-PATCHFILES_isa-i386-garversion-2.8.5 += 0003-vsscanf-support-via-ncursesw.patch
-PATCHFILES_isa-i386-garversion-2.8.5 += 0004-add-monodll_appbase.so-to-wxrc.patch
-PATCHFILES_isa-i386-garversion-2.8.5 += 0005-stupid-vwscanf-workaround.patch
-PATCHFILES_isa-sparcv8-garversion-2.8.5  = 0500-wxT-macro-first-iteration.patch
-PATCHFILES_isa-sparcv8-garversion-2.8.5 += 0501-a-possible-fix-to-wxchar.h.patch
-PATCHFILES_isa-sparcv8-garversion-2.8.5 += 0002-Fixing-retarded-checks-for-libGL.patch
-PATCHFILES_isa-sparcv8-garversion-2.8.5 += 0003-vsscanf-support-via-ncursesw.patch
-PATCHFILES_isa-sparcv8-garversion-2.8.5 += 0004-add-monodll_appbase.so-to-wxrc.patch
-PATCHFILES_isa-sparcv8-garversion-2.8.5 += 0005-stupid-vwscanf-workaround.patch
-PATCHFILES_isa-i386-garversion-2.8.10  = 0001-Patches-from-http-trac.wxwidgets.org-ticket-10660.patch
-PATCHFILES_isa-i386-garversion-2.8.10 += 0002-Fixing-retarded-checks-for-libGL.patch
-PATCHFILES_isa-i386-garversion-2.8.10 += 0003-vsscanf-support-via-ncursesw.patch
-PATCHFILES_isa-i386-garversion-2.8.10 += 0005-stupid-vwscanf-workaround.patch
-PATCHFILES_isa-sparcv8-garversion-2.8.10  = 0001-Patches-from-http-trac.wxwidgets.org-ticket-10660.patch
-PATCHFILES_isa-sparcv8-garversion-2.8.10 += 0002-Fixing-retarded-checks-for-libGL.patch
-PATCHFILES_isa-sparcv8-garversion-2.8.10 += 0003-vsscanf-support-via-ncursesw.patch
-PATCHFILES_isa-sparcv8-garversion-2.8.10 += 0005-stupid-vwscanf-workaround.patch
+PATCHFILES_isa-i386-version-2.8.5  = 0500-wxT-macro-first-iteration.patch
+PATCHFILES_isa-i386-version-2.8.5 += 0501-a-possible-fix-to-wxchar.h.patch
+PATCHFILES_isa-i386-version-2.8.5 += 0002-Fixing-retarded-checks-for-libGL.patch
+PATCHFILES_isa-i386-version-2.8.5 += 0003-vsscanf-support-via-ncursesw.patch
+PATCHFILES_isa-i386-version-2.8.5 += 0004-add-monodll_appbase.so-to-wxrc.patch
+PATCHFILES_isa-i386-version-2.8.5 += 0005-stupid-vwscanf-workaround.patch
+PATCHFILES_isa-sparcv8-version-2.8.5  = 0500-wxT-macro-first-iteration.patch
+PATCHFILES_isa-sparcv8-version-2.8.5 += 0501-a-possible-fix-to-wxchar.h.patch
+PATCHFILES_isa-sparcv8-version-2.8.5 += 0002-Fixing-retarded-checks-for-libGL.patch
+PATCHFILES_isa-sparcv8-version-2.8.5 += 0003-vsscanf-support-via-ncursesw.patch
+PATCHFILES_isa-sparcv8-version-2.8.5 += 0004-add-monodll_appbase.so-to-wxrc.patch
+PATCHFILES_isa-sparcv8-version-2.8.5 += 0005-stupid-vwscanf-workaround.patch
+PATCHFILES_isa-i386-version-2.8.10  = 0001-Patches-from-http-trac.wxwidgets.org-ticket-10660.patch
+PATCHFILES_isa-i386-version-2.8.10 += 0002-Fixing-retarded-checks-for-libGL.patch
+PATCHFILES_isa-i386-version-2.8.10 += 0003-vsscanf-support-via-ncursesw.patch
+PATCHFILES_isa-i386-version-2.8.10 += 0005-stupid-vwscanf-workaround.patch
+PATCHFILES_isa-sparcv8-version-2.8.10  = 0001-Patches-from-http-trac.wxwidgets.org-ticket-10660.patch
+PATCHFILES_isa-sparcv8-version-2.8.10 += 0002-Fixing-retarded-checks-for-libGL.patch
+PATCHFILES_isa-sparcv8-version-2.8.10 += 0003-vsscanf-support-via-ncursesw.patch
+PATCHFILES_isa-sparcv8-version-2.8.10 += 0005-stupid-vwscanf-workaround.patch
 PACKAGES  = CSWwxwidgetscommon
 PACKAGES += CSWwxwidgetsdevel
 PACKAGES += CSWwxwidgetsgtk2
@@ -160,8 +160,8 @@
 
 # The 2.8.5 version has been compiled as a monolithic library.  Building it the
 # same way for backwards compatibility.
-CONFIGURE_ARGS_garversion-2.8.5 = --enable-monolithic
-CONFIGURE_ARGS += $(CONFIGURE_ARGS_garversion-$(VERSION))
+CONFIGURE_ARGS_version-2.8.5 = --enable-monolithic
+CONFIGURE_ARGS += $(CONFIGURE_ARGS_version-$(VERSION))
 
 INSTALL_SCRIPTS = wxwidgets
 

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


From dmichelsen at users.sourceforge.net  Mon Jan 23 10:58:24 2012
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Mon, 23 Jan 2012 09:58:24 +0000
Subject: [csw-devel] SF.net SVN: gar:[16880] csw/mgar/pkg
Message-ID: <E1RpGfQ-0005Nv-Vb@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 16880
          http://gar.svn.sourceforge.net/gar/?rev=16880&view=rev
Author:   dmichelsen
Date:     2012-01-23 09:58:23 +0000 (Mon, 23 Jan 2012)
Log Message:
-----------
WHOLE TREE: Followup for r14023 (make NOISAEXEC the default), take out NOISAEXEC = 1

Revision Links:
--------------
    http://gar.svn.sourceforge.net/gar/?rev=14023&view=rev

Modified Paths:
--------------
    csw/mgar/pkg/audiofile/trunk/Makefile
    csw/mgar/pkg/bdb42/trunk/Makefile
    csw/mgar/pkg/bdb43/trunk/Makefile
    csw/mgar/pkg/bdb44/trunk/Makefile
    csw/mgar/pkg/bdb45/trunk/Makefile
    csw/mgar/pkg/bdb46/trunk/Makefile
    csw/mgar/pkg/bdb47/trunk/Makefile
    csw/mgar/pkg/bdb48/trunk/Makefile
    csw/mgar/pkg/chmlib/trunk/Makefile
    csw/mgar/pkg/enchant/trunk/Makefile
    csw/mgar/pkg/esound/trunk/Makefile
    csw/mgar/pkg/fltk/trunk/Makefile
    csw/mgar/pkg/ftgl/trunk/Makefile
    csw/mgar/pkg/gdb/trunk/Makefile
    csw/mgar/pkg/glib/trunk/Makefile
    csw/mgar/pkg/glibmm/trunk/Makefile
    csw/mgar/pkg/gnome-base/gconf-editor/trunk/Makefile
    csw/mgar/pkg/gnome-base/libgnomecanvas/trunk/Makefile
    csw/mgar/pkg/gnutls/trunk/Makefile
    csw/mgar/pkg/google-gflags/trunk/Makefile
    csw/mgar/pkg/gpgme/trunk/Makefile
    csw/mgar/pkg/imlib/trunk/Makefile
    csw/mgar/pkg/imlib2/trunk/Makefile
    csw/mgar/pkg/krb5/trunk/Makefile
    csw/mgar/pkg/liba52/trunk/Makefile
    csw/mgar/pkg/libast/trunk/Makefile
    csw/mgar/pkg/libcdio/trunk/Makefile
    csw/mgar/pkg/libev/trunk/Makefile
    csw/mgar/pkg/libfaac/trunk/Makefile
    csw/mgar/pkg/libfishsound/trunk/Makefile
    csw/mgar/pkg/libglade2/trunk/Makefile
    csw/mgar/pkg/libkate/trunk/Makefile
    csw/mgar/pkg/libmcal/trunk/Makefile
    csw/mgar/pkg/libmpeg2/trunk/Makefile
    csw/mgar/pkg/libnotify/trunk/Makefile
    csw/mgar/pkg/liborc/trunk/Makefile
    csw/mgar/pkg/libproxy/trunk/Makefile
    csw/mgar/pkg/libschroedinger/trunk/Makefile
    csw/mgar/pkg/libxpm/trunk/Makefile
    csw/mgar/pkg/libxspf/trunk/Makefile
    csw/mgar/pkg/mibdump/trunk/Makefile
    csw/mgar/pkg/oracle-instantclient/trunk/Makefile
    csw/mgar/pkg/otr/trunk/Makefile
    csw/mgar/pkg/pdflib/trunk/Makefile
    csw/mgar/pkg/sox/trunk/Makefile
    csw/mgar/pkg/tk/trunk/Makefile
    csw/mgar/pkg/tre/trunk/Makefile
    csw/mgar/pkg/tuntap/trunk/Makefile
    csw/mgar/pkg/yaz/trunk/Makefile

Modified: csw/mgar/pkg/audiofile/trunk/Makefile
===================================================================
--- csw/mgar/pkg/audiofile/trunk/Makefile	2012-01-23 09:31:04 UTC (rev 16879)
+++ csw/mgar/pkg/audiofile/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
@@ -38,7 +38,6 @@
 RUNTIME_DEP_PKGS_CSWlibaudiofile-dev = CSWlibaudiofile0
 
 BUILD64 = 1
-NOISAEXEC = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 
 TEST_TARGET = check

Modified: csw/mgar/pkg/bdb42/trunk/Makefile
===================================================================
--- csw/mgar/pkg/bdb42/trunk/Makefile	2012-01-23 09:31:04 UTC (rev 16879)
+++ csw/mgar/pkg/bdb42/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
@@ -27,7 +27,6 @@
 RELEASE = p$(words $(filter patch.$(VERSION).%,$(PATCHFILES)))
 
 BUILD64 = 1
-NOISAEXEC = 1
 
 CONFIGURE_SCRIPTS = dist
 

Modified: csw/mgar/pkg/bdb43/trunk/Makefile
===================================================================
--- csw/mgar/pkg/bdb43/trunk/Makefile	2012-01-23 09:31:04 UTC (rev 16879)
+++ csw/mgar/pkg/bdb43/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
@@ -27,7 +27,6 @@
 WORKSRC = $(WORKDIR)/$(NAME)-$(VERSION)/build_unix
 
 BUILD64 = 1
-NOISAEXEC = 1
 
 CONFIGURE_SCRIPTS = dist
 

Modified: csw/mgar/pkg/bdb44/trunk/Makefile
===================================================================
--- csw/mgar/pkg/bdb44/trunk/Makefile	2012-01-23 09:31:04 UTC (rev 16879)
+++ csw/mgar/pkg/bdb44/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
@@ -27,7 +27,6 @@
 RELEASE = p$(words $(filter patch.$(VERSION).%,$(PATCHFILES)))
 
 BUILD64 = 1
-NOISAEXEC = 1
 
 CONFIGURE_SCRIPTS = dist
 

Modified: csw/mgar/pkg/bdb45/trunk/Makefile
===================================================================
--- csw/mgar/pkg/bdb45/trunk/Makefile	2012-01-23 09:31:04 UTC (rev 16879)
+++ csw/mgar/pkg/bdb45/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
@@ -27,7 +27,6 @@
 RELEASE = p$(words $(filter patch.$(VERSION).%,$(PATCHFILES)))
 
 BUILD64 = 1
-NOISAEXEC = 1
 
 CONFIGURE_SCRIPTS = dist
 

Modified: csw/mgar/pkg/bdb46/trunk/Makefile
===================================================================
--- csw/mgar/pkg/bdb46/trunk/Makefile	2012-01-23 09:31:04 UTC (rev 16879)
+++ csw/mgar/pkg/bdb46/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
@@ -27,7 +27,6 @@
 RELEASE = p$(words $(filter patch.$(VERSION).%,$(PATCHFILES)))
 
 BUILD64 = 1
-NOISAEXEC = 1
 
 CONFIGURE_SCRIPTS = dist
 

Modified: csw/mgar/pkg/bdb47/trunk/Makefile
===================================================================
--- csw/mgar/pkg/bdb47/trunk/Makefile	2012-01-23 09:31:04 UTC (rev 16879)
+++ csw/mgar/pkg/bdb47/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
@@ -27,7 +27,6 @@
 RELEASE = p$(words $(filter patch.$(VERSION).%,$(PATCHFILES)))
 
 BUILD64 = 1
-NOISAEXEC = 1
 
 CONFIGURE_SCRIPTS = dist
 

Modified: csw/mgar/pkg/bdb48/trunk/Makefile
===================================================================
--- csw/mgar/pkg/bdb48/trunk/Makefile	2012-01-23 09:31:04 UTC (rev 16879)
+++ csw/mgar/pkg/bdb48/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
@@ -27,7 +27,6 @@
 RELEASE = p$(words $(filter patch.$(VERSION).%,$(PATCHFILES)))
 
 BUILD64 = 1
-NOISAEXEC = 1
 
 CONFIGURE_SCRIPTS = dist
 

Modified: csw/mgar/pkg/chmlib/trunk/Makefile
===================================================================
--- csw/mgar/pkg/chmlib/trunk/Makefile	2012-01-23 09:31:04 UTC (rev 16879)
+++ csw/mgar/pkg/chmlib/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
@@ -23,7 +23,6 @@
 UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2
 
 BUILD64 = 1
-NOISAEXEC = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --enable-examples
 

Modified: csw/mgar/pkg/enchant/trunk/Makefile
===================================================================
--- csw/mgar/pkg/enchant/trunk/Makefile	2012-01-23 09:31:04 UTC (rev 16879)
+++ csw/mgar/pkg/enchant/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
@@ -66,7 +66,6 @@
 #CHECKPKG_OVERRIDES_CSWenchantrt += symbol-not-found|libenchant_myspell.so
 
 
-NOISAEXEC = 1
 #NOISALIST = 1
 # libdbus not 64-bit yet
 #BUILD64 = 1

Modified: csw/mgar/pkg/esound/trunk/Makefile
===================================================================
--- csw/mgar/pkg/esound/trunk/Makefile	2012-01-23 09:31:04 UTC (rev 16879)
+++ csw/mgar/pkg/esound/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
@@ -53,7 +53,6 @@
 MIGRATE_FILES_CSWesound = esd.conf
 
 BUILD64 = 1
-NOISAEXEC = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 
 TEST_TARGET = check

Modified: csw/mgar/pkg/fltk/trunk/Makefile
===================================================================
--- csw/mgar/pkg/fltk/trunk/Makefile	2012-01-23 09:31:04 UTC (rev 16879)
+++ csw/mgar/pkg/fltk/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
@@ -19,7 +19,6 @@
 DEP_PKGS = CSWzlib CSWjpeg CSWpng
 
 BUILD64 = 1
-NOISAEXEC = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --mandir=/opt/csw/share/man
 CONFIGURE_ARGS += --disable-localpng

Modified: csw/mgar/pkg/ftgl/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ftgl/trunk/Makefile	2012-01-23 09:31:04 UTC (rev 16879)
+++ csw/mgar/pkg/ftgl/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
@@ -37,7 +37,6 @@
 
 PKGFILES_CSWftgl = $(PKGFILES_RT)
 
-NOISAEXEC = 1
 NOISALIST = 1
 # Unless the Solaris 10 compilation problem with both SUNW mesa and CSW mesa
 # installed exists disable 64 bit for now.

Modified: csw/mgar/pkg/gdb/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gdb/trunk/Makefile	2012-01-23 09:31:04 UTC (rev 16879)
+++ csw/mgar/pkg/gdb/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
@@ -25,7 +25,6 @@
 RUNTIME_DEP_PKGS = CSWexpat CSWggettextrt CSWiconv CSWncurses
 
 BUILD64 = 1
-NOISAEXEC = 1
 NOISALIST = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 

Modified: csw/mgar/pkg/glib/trunk/Makefile
===================================================================
--- csw/mgar/pkg/glib/trunk/Makefile	2012-01-23 09:31:04 UTC (rev 16879)
+++ csw/mgar/pkg/glib/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
@@ -38,7 +38,6 @@
 
 # glib 1.x doesn't seem to be 64 bit clean
 BUILD64 = 1
-NOISAEXEC = 1
 
 # Only needed for 1.3.x
 SGML_CATALOG_FILES = /etc/opt/csw/sgml/catalog

Modified: csw/mgar/pkg/glibmm/trunk/Makefile
===================================================================
--- csw/mgar/pkg/glibmm/trunk/Makefile	2012-01-23 09:31:04 UTC (rev 16879)
+++ csw/mgar/pkg/glibmm/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
@@ -15,7 +15,6 @@
 DISTFILES = $(NAME)-$(VERSION).tar.gz
 
 BUILD64 = 1
-NOISAEXEC = 1
 
 CONFIGURE_ARGS  = $(DIRPATHS)
 MAKE = gmake

Modified: csw/mgar/pkg/gnome-base/gconf-editor/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gnome-base/gconf-editor/trunk/Makefile	2012-01-23 09:31:04 UTC (rev 16879)
+++ csw/mgar/pkg/gnome-base/gconf-editor/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
@@ -16,7 +16,6 @@
 #SPKG_SOURCEURL = http://projects.gnome.org/gconf/
 
 BUILD64 = 1
-NOISAEXEC = 1
 
 TEST_TARGET = check
 

Modified: csw/mgar/pkg/gnome-base/libgnomecanvas/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gnome-base/libgnomecanvas/trunk/Makefile	2012-01-23 09:31:04 UTC (rev 16879)
+++ csw/mgar/pkg/gnome-base/libgnomecanvas/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
@@ -16,7 +16,6 @@
 CONFIGURE_ARGS  = $(DIRPATHS)
 
 BUILD64 = 1
-NOISAEXEC = 1
 
 TEST_TARGET = check
 

Modified: csw/mgar/pkg/gnutls/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gnutls/trunk/Makefile	2012-01-23 09:31:04 UTC (rev 16879)
+++ csw/mgar/pkg/gnutls/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
@@ -67,7 +67,6 @@
 LD_OPTIONS =
 
 BUILD64 = 1
-NOISAEXEC = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 
 TEST_TARGET = check

Modified: csw/mgar/pkg/google-gflags/trunk/Makefile
===================================================================
--- csw/mgar/pkg/google-gflags/trunk/Makefile	2012-01-23 09:31:04 UTC (rev 16879)
+++ csw/mgar/pkg/google-gflags/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
@@ -22,5 +22,4 @@
 BUILD64 = 1
 MERGE_DIRS_isa-sparcv9 = $(libdir)
 MERGE_DIRS_isa-amd64   = $(libdir)
-NOISAEXEC = 1
 include gar/category.mk

Modified: csw/mgar/pkg/gpgme/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gpgme/trunk/Makefile	2012-01-23 09:31:04 UTC (rev 16879)
+++ csw/mgar/pkg/gpgme/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
@@ -23,7 +23,6 @@
 RUNTIME_DEP_PKGS = CSWgpgerr CSWpth
 
 BUILD64 = 1
-NOISAEXEC = 1
 
 CONFIGURE_ARGS = $(DIRPATHS)
 

Modified: csw/mgar/pkg/imlib/trunk/Makefile
===================================================================
--- csw/mgar/pkg/imlib/trunk/Makefile	2012-01-23 09:31:04 UTC (rev 16879)
+++ csw/mgar/pkg/imlib/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
@@ -16,7 +16,6 @@
 
 # Make glib and gtk 64 bit first
 # BUILD64 = 1
-NOISAEXEC = 1
 sysconfdir = /etc/opt/csw
 CONFIGURE_ARGS = $(DIRPATHS)
 

Modified: csw/mgar/pkg/imlib2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/imlib2/trunk/Makefile	2012-01-23 09:31:04 UTC (rev 16879)
+++ csw/mgar/pkg/imlib2/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
@@ -21,7 +21,6 @@
 RUNTIME_DEP_PKGS += CSWpng CSWtiff CSWzlib
 
 BUILD64 = 1
-NOISAEXEC = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 
 TEST_TARGET = check

Modified: csw/mgar/pkg/krb5/trunk/Makefile
===================================================================
--- csw/mgar/pkg/krb5/trunk/Makefile	2012-01-23 09:31:04 UTC (rev 16879)
+++ csw/mgar/pkg/krb5/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
@@ -74,7 +74,6 @@
 CONFIGURE_ARGS += --with-ldap
 
 BUILD64 = 1
-NOISAEXEC = 1
 
 BUILD_SCRIPTS  = $(WORKSRC)/src/Makefile
 BUILD_SCRIPTS += $(WORKSRC)/doc/Makefile

Modified: csw/mgar/pkg/liba52/trunk/Makefile
===================================================================
--- csw/mgar/pkg/liba52/trunk/Makefile	2012-01-23 09:31:04 UTC (rev 16879)
+++ csw/mgar/pkg/liba52/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
@@ -31,7 +31,6 @@
 EXTRA_LINKER_FLAGS = -lsunmath
 
 BUILD64 = 1
-NOISAEXEC = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --enable-shared --disable-static
 

Modified: csw/mgar/pkg/libast/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libast/trunk/Makefile	2012-01-23 09:31:04 UTC (rev 16879)
+++ csw/mgar/pkg/libast/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
@@ -22,7 +22,6 @@
 STRIP_LIBTOOL = 1
 
 BUILD64 = 1
-NOISAEXEC = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 
 MERGE_DIRS_isa-extra = $(libdir)

Modified: csw/mgar/pkg/libcdio/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libcdio/trunk/Makefile	2012-01-23 09:31:04 UTC (rev 16879)
+++ csw/mgar/pkg/libcdio/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
@@ -20,7 +20,6 @@
 RUNTIME_DEP_PKGS = CSWgcc4corert CSWgcc4g++rt CSWiconv
 
 BUILD64 = 1
-NOISAEXEC = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 
 MERGE_DIRS_isa-extra = $(libdir)

Modified: csw/mgar/pkg/libev/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libev/trunk/Makefile	2012-01-23 09:31:04 UTC (rev 16879)
+++ csw/mgar/pkg/libev/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
@@ -18,7 +18,6 @@
 UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
 CONFIGURE_ARGS  = $(DIRPATHS)
 BUILD64 = 1
-NOISAEXEC = 1
 TEST_TARGET = check
 LICENSE = LICENSE
 CHECKPKG_OVERRIDES_CSWlibev += soname-not-found|libm.so.2|is|needed|by|opt/csw/lib/amd64/libev.so.3.0.0

Modified: csw/mgar/pkg/libfaac/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libfaac/trunk/Makefile	2012-01-23 09:31:04 UTC (rev 16879)
+++ csw/mgar/pkg/libfaac/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
@@ -29,7 +29,6 @@
 PATCHFILES += mpeg4ip.h.diff psych.h.diff
 
 BUILD64 = 1
-NOISAEXEC = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 
 TEST_TARGET = check

Modified: csw/mgar/pkg/libfishsound/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libfishsound/trunk/Makefile	2012-01-23 09:31:04 UTC (rev 16879)
+++ csw/mgar/pkg/libfishsound/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
@@ -22,7 +22,6 @@
 OPT_FLAGS_SOS =
 
 BUILD64 = 1
-NOISAEXEC = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 
 BUILD_ARGS = AM_CFLAGS= SHLIB_VERSION_ARG= libfishsound_la_LDFLAGS=

Modified: csw/mgar/pkg/libglade2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libglade2/trunk/Makefile	2012-01-23 09:31:04 UTC (rev 16879)
+++ csw/mgar/pkg/libglade2/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
@@ -32,7 +32,6 @@
 EXTRA_LDFLAGS = -lm /usr/openwin/lib/$(SUNX11SUB_$(ISA))libXext.so
 
 BUILD64 = 1
-NOISAEXEC = 1
 CONFIGURE_ARGS  = $(DIRPATHS)
 
 TEST_TARGET = check

Modified: csw/mgar/pkg/libkate/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libkate/trunk/Makefile	2012-01-23 09:31:04 UTC (rev 16879)
+++ csw/mgar/pkg/libkate/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
@@ -58,7 +58,6 @@
 PYCOMPILE = 1
 
 BUILD64 = 1
-NOISAEXEC = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 
 TEST_TARGET = check

Modified: csw/mgar/pkg/libmcal/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libmcal/trunk/Makefile	2012-01-23 09:31:04 UTC (rev 16879)
+++ csw/mgar/pkg/libmcal/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
@@ -15,7 +15,6 @@
 MASTER_SITES = $(SF_MIRRORS)
 
 BUILD64 = 1
-NOISAEXEC = 1
 
 DISTFILES  = $(NAME)-$(VERSION).tar.gz
 DISTFILES += $(DRIVERNAME)-$(DRIVERVERSION).tar.gz

Modified: csw/mgar/pkg/libmpeg2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libmpeg2/trunk/Makefile	2012-01-23 09:31:04 UTC (rev 16879)
+++ csw/mgar/pkg/libmpeg2/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
@@ -37,7 +37,6 @@
 BUILD64_platform-solaris10-i386 = 1
 BUILD64 = $(BUILD64_platform-$(PLATFORM))
 
-NOISAEXEC = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 
 CONFIGURE_ARGS_garosrel-5.8  = --x-includes=/usr/openwin/include

Modified: csw/mgar/pkg/libnotify/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libnotify/trunk/Makefile	2012-01-23 09:31:04 UTC (rev 16879)
+++ csw/mgar/pkg/libnotify/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
@@ -33,7 +33,6 @@
 
 # Enable when CSWdbusglib is done in 64 bit
 BUILD64 = 1
-NOISAEXEC = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 
 TEST_TARGET = check

Modified: csw/mgar/pkg/liborc/trunk/Makefile
===================================================================
--- csw/mgar/pkg/liborc/trunk/Makefile	2012-01-23 09:31:04 UTC (rev 16879)
+++ csw/mgar/pkg/liborc/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
@@ -20,7 +20,6 @@
 VENDOR_URL = http://code.entropywave.com/projects/orc/
 
 BUILD64 = 1
-NOISAEXEC = 1
 NOISALIST = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 

Modified: csw/mgar/pkg/libproxy/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libproxy/trunk/Makefile	2012-01-23 09:31:04 UTC (rev 16879)
+++ csw/mgar/pkg/libproxy/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
@@ -105,7 +105,6 @@
 EXTRA_LINKER_FLAGS = -lnsl
 
 BUILD64 = 1
-NOISAEXEC = 1
 
 # Skip 64 bit binaries - they are just big and gain nothing
 MERGE_DIRS_isa-extra = $(libdir)

Modified: csw/mgar/pkg/libschroedinger/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libschroedinger/trunk/Makefile	2012-01-23 09:31:04 UTC (rev 16879)
+++ csw/mgar/pkg/libschroedinger/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
@@ -30,7 +30,6 @@
 RUNTIME_DEP_PKGS_CSWlibschrodevel = CSWlibschro
 
 BUILD64 = 1
-NOISAEXEC = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 
 TEST_TARGET = check

Modified: csw/mgar/pkg/libxpm/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libxpm/trunk/Makefile	2012-01-23 09:31:04 UTC (rev 16879)
+++ csw/mgar/pkg/libxpm/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
@@ -40,7 +40,6 @@
 PKGFILES_CSWlibxpm      += $(PKGFILES_RT)
 
 BUILD64 = 1
-NOISAEXEC = 1
 EXTRA_BUILD_ISAS = sparcv8plus+vis
 CONFIGURE_ARGS += $(DIRPATHS)
 CONFIGURE_ARGS += --disable-silent-rules

Modified: csw/mgar/pkg/libxspf/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libxspf/trunk/Makefile	2012-01-23 09:31:04 UTC (rev 16879)
+++ csw/mgar/pkg/libxspf/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
@@ -29,7 +29,6 @@
 RUNTIME_DEP_PKGS_CSWlibxspfdevel += CSWexpat
 
 BUILD64 = 1
-NOISAEXEC = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 
 MERGE_DIRS_isa-extra = $(libdir)

Modified: csw/mgar/pkg/mibdump/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mibdump/trunk/Makefile	2012-01-23 09:31:04 UTC (rev 16879)
+++ csw/mgar/pkg/mibdump/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
@@ -22,7 +22,6 @@
 RUNTIME_DEP_PKGS = CSWlibsmi
 
 BUILD64 = 1
-NOISAEXEC = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 
 MERGE_DIRS_isa-extra = $(libdir)

Modified: csw/mgar/pkg/oracle-instantclient/trunk/Makefile
===================================================================
--- csw/mgar/pkg/oracle-instantclient/trunk/Makefile	2012-01-23 09:31:04 UTC (rev 16879)
+++ csw/mgar/pkg/oracle-instantclient/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
@@ -40,7 +40,6 @@
 
 # LICENSE = LICENSE
 
-NOISAEXEC = 1
 
 BUILD64 = 1
 CONFIGURE_SCRIPTS =

Modified: csw/mgar/pkg/otr/trunk/Makefile
===================================================================
--- csw/mgar/pkg/otr/trunk/Makefile	2012-01-23 09:31:04 UTC (rev 16879)
+++ csw/mgar/pkg/otr/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
@@ -19,7 +19,6 @@
 CONFIGURE_ARGS = $(DIRPATHS)
 
 BUILD64 = 1
-NOISAEXEC = 1
 
 MERGE_EXCLUDE_FILES = /opt/csw/bin/$(ISA)/.*
 

Modified: csw/mgar/pkg/pdflib/trunk/Makefile
===================================================================
--- csw/mgar/pkg/pdflib/trunk/Makefile	2012-01-23 09:31:04 UTC (rev 16879)
+++ csw/mgar/pkg/pdflib/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
@@ -47,7 +47,6 @@
 CPPFLAGS =
 EXTRA_CFLAGS = -I/opt/csw/include
 
-NOISAEXEC = 1
 BUILD64 = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --enable-icu

Modified: csw/mgar/pkg/sox/trunk/Makefile
===================================================================
--- csw/mgar/pkg/sox/trunk/Makefile	2012-01-23 09:31:04 UTC (rev 16879)
+++ csw/mgar/pkg/sox/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
@@ -72,7 +72,6 @@
 CONFIGURE_ARGS +=  --without-libltdl
 
 BUILD64 = 1
-NOISAEXEC = 1
 
 TEST_TARGET = check
 

Modified: csw/mgar/pkg/tk/trunk/Makefile
===================================================================
--- csw/mgar/pkg/tk/trunk/Makefile	2012-01-23 09:31:04 UTC (rev 16879)
+++ csw/mgar/pkg/tk/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
@@ -36,7 +36,6 @@
 UFILES_REGEX = $(NAME)(\d+(?:\.\d+)*)-src.tar.gz
 
 BUILD64 = 1
-NOISAEXEC = 1
 
 EXTRA_INC = $(prefix)/X11/include
 EXTRA_LIB = $(prefix)/X11/lib

Modified: csw/mgar/pkg/tre/trunk/Makefile
===================================================================
--- csw/mgar/pkg/tre/trunk/Makefile	2012-01-23 09:31:04 UTC (rev 16879)
+++ csw/mgar/pkg/tre/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
@@ -12,7 +12,6 @@
 MASTER_SITES = http://laurikari.net/tre/
 DISTFILES  = $(NAME)-$(VERSION).tar.bz2
 BUILD64 = 1
-NOISAEXEC = 1
 # agrep needs getopt_long
 # TODO: Solve the getopt_long problem and build agrep.
 # PATCHFILES += 0001-gnulib-import-getopt-gnu.patch

Modified: csw/mgar/pkg/tuntap/trunk/Makefile
===================================================================
--- csw/mgar/pkg/tuntap/trunk/Makefile	2012-01-23 09:31:04 UTC (rev 16879)
+++ csw/mgar/pkg/tuntap/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
@@ -44,7 +44,6 @@
 
 # build 64bit modules
 BUILD64 = 1
-NOISAEXEC = 1
 
 # no build tests
 SKIPTEST = 1

Modified: csw/mgar/pkg/yaz/trunk/Makefile
===================================================================
--- csw/mgar/pkg/yaz/trunk/Makefile	2012-01-23 09:31:04 UTC (rev 16879)
+++ csw/mgar/pkg/yaz/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
@@ -79,7 +79,6 @@
 BUILD64 = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 
-NOISAEXEC = 1
 MERGE_SCRIPTS_isa-extra = copy-relocated-only copy-config-only
 MERGE_DIRS_isa-extra = $(libdir)
 

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


From dmichelsen at users.sourceforge.net  Mon Jan 23 11:35:24 2012
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Mon, 23 Jan 2012 10:35:24 +0000
Subject: [csw-devel] SF.net SVN: gar:[16881] csw/mgar/pkg
Message-ID: <E1RpHFE-0006By-O5@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 16881
          http://gar.svn.sourceforge.net/gar/?rev=16881&view=rev
Author:   dmichelsen
Date:     2012-01-23 10:35:20 +0000 (Mon, 23 Jan 2012)
Log Message:
-----------
WHOLE TREE: Followup for r14023 (make TEST_TARGET = check the default), take out for clarity

Revision Links:
--------------
    http://gar.svn.sourceforge.net/gar/?rev=14023&view=rev

Modified Paths:
--------------
    csw/mgar/pkg/alarm-clock/trunk/Makefile
    csw/mgar/pkg/alpine/trunk/Makefile
    csw/mgar/pkg/amanda/trunk/Makefile
    csw/mgar/pkg/audiofile/trunk/Makefile
    csw/mgar/pkg/augeas/trunk/Makefile
    csw/mgar/pkg/autoconf/trunk/Makefile
    csw/mgar/pkg/autotrace/trunk/Makefile
    csw/mgar/pkg/bashdb/trunk/Makefile
    csw/mgar/pkg/binutils/trunk/Makefile
    csw/mgar/pkg/bitlbee/trunk/Makefile
    csw/mgar/pkg/blame/trunk/Makefile
    csw/mgar/pkg/bzflag/trunk/Makefile
    csw/mgar/pkg/cfengine/trunk/Makefile
    csw/mgar/pkg/chkconfig/trunk/Makefile
    csw/mgar/pkg/chmlib/trunk/Makefile
    csw/mgar/pkg/clamav/trunk/Makefile
    csw/mgar/pkg/clzip/trunk/Makefile
    csw/mgar/pkg/coreutils/trunk/Makefile
    csw/mgar/pkg/cscope/trunk/Makefile
    csw/mgar/pkg/cvs/trunk/Makefile
    csw/mgar/pkg/cvs2svn/trunk/Makefile
    csw/mgar/pkg/cvsproxy/trunk/Makefile
    csw/mgar/pkg/ddrescue/trunk/Makefile
    csw/mgar/pkg/dejagnu/trunk/Makefile
    csw/mgar/pkg/dhcp/trunk/Makefile
    csw/mgar/pkg/dnstracer/trunk/Makefile
    csw/mgar/pkg/enchant/trunk/Makefile
    csw/mgar/pkg/esound/trunk/Makefile
    csw/mgar/pkg/ethereal/trunk/Makefile
    csw/mgar/pkg/evolution/trunk/Makefile
    csw/mgar/pkg/evolution-ds/trunk/Makefile
    csw/mgar/pkg/evolution-exchange/trunk/Makefile
    csw/mgar/pkg/evolution-mapi/trunk/Makefile
    csw/mgar/pkg/evolution-webcal/trunk/Makefile
    csw/mgar/pkg/exempi/trunk/Makefile
    csw/mgar/pkg/fastcgi/trunk/Makefile
    csw/mgar/pkg/ffcall/trunk/Makefile
    csw/mgar/pkg/fileutils/trunk/Makefile
    csw/mgar/pkg/flac/trunk/Makefile
    csw/mgar/pkg/flex_new/trunk/Makefile
    csw/mgar/pkg/fping/trunk/Makefile
    csw/mgar/pkg/freedesktop/xcbproto/trunk/Makefile
    csw/mgar/pkg/freeglut/trunk/Makefile
    csw/mgar/pkg/gbc/trunk/Makefile
    csw/mgar/pkg/gdb/trunk/Makefile
    csw/mgar/pkg/gdmap/trunk/Makefile
    csw/mgar/pkg/geeqie/trunk/Makefile
    csw/mgar/pkg/gettext/trunk/Makefile
    csw/mgar/pkg/gftp/trunk/Makefile
    csw/mgar/pkg/ghex/trunk/Makefile
    csw/mgar/pkg/gif2png/trunk/Makefile
    csw/mgar/pkg/gimp/trunk/Makefile
    csw/mgar/pkg/glib/trunk/Makefile
    csw/mgar/pkg/glibmm/trunk/Makefile
    csw/mgar/pkg/gluezilla/trunk/Makefile
    csw/mgar/pkg/gnome-base/gconf-editor/trunk/Makefile
    csw/mgar/pkg/gnome-base/gnome-icon-theme/trunk/Makefile
    csw/mgar/pkg/gnome-base/gnome-keyring/trunk/Makefile
    csw/mgar/pkg/gnome-base/gnome-mime-data/trunk/Makefile
    csw/mgar/pkg/gnome-base/gnomedesktop/trunk/Makefile
    csw/mgar/pkg/gnome-base/libgnomecanvas/trunk/Makefile
    csw/mgar/pkg/gnome-base/libgnomeprint/trunk/Makefile
    csw/mgar/pkg/gnome-base/libgnomeprintui/trunk/Makefile
    csw/mgar/pkg/gnome-base/libgnomeui/trunk/Makefile
    csw/mgar/pkg/gnupg_minimal/trunk/Makefile
    csw/mgar/pkg/gnutls/trunk/Makefile
    csw/mgar/pkg/goocanvas/trunk/Makefile
    csw/mgar/pkg/google-gflags/trunk/Makefile
    csw/mgar/pkg/googletest/trunk/Makefile
    csw/mgar/pkg/gource/trunk/Makefile
    csw/mgar/pkg/gperf/trunk/Makefile
    csw/mgar/pkg/gpgme/trunk/Makefile
    csw/mgar/pkg/groff/trunk/Makefile
    csw/mgar/pkg/gtkpod/trunk/Makefile
    csw/mgar/pkg/gzip/trunk/Makefile
    csw/mgar/pkg/htmltidy/trunk/Makefile
    csw/mgar/pkg/icecast/trunk/Makefile
    csw/mgar/pkg/icon-naming-utils/trunk/Makefile
    csw/mgar/pkg/imlib/trunk/Makefile
    csw/mgar/pkg/imlib2/trunk/Makefile
    csw/mgar/pkg/imlib2_loaders/trunk/Makefile
    csw/mgar/pkg/intltool/trunk/Makefile
    csw/mgar/pkg/irssi/trunk/Makefile
    csw/mgar/pkg/joe/trunk/Makefile
    csw/mgar/pkg/krb5/trunk/Makefile
    csw/mgar/pkg/lang-python/pycairo/trunk/Makefile
    csw/mgar/pkg/lang-python/pygobject/trunk/Makefile
    csw/mgar/pkg/lang-python/pygtk/trunk/Makefile
    csw/mgar/pkg/lang-python/python-gflags/trunk/Makefile
    csw/mgar/pkg/leafnode/trunk/Makefile
    csw/mgar/pkg/lha/trunk/Makefile
    csw/mgar/pkg/libart/trunk/Makefile
    csw/mgar/pkg/libcddb/trunk/Makefile
    csw/mgar/pkg/libcroco/trunk/Makefile
    csw/mgar/pkg/libeggdbus/trunk/Makefile
    csw/mgar/pkg/libemf/trunk/Makefile
    csw/mgar/pkg/libev/trunk/Makefile
    csw/mgar/pkg/libfaac/trunk/Makefile
    csw/mgar/pkg/libfishsound/trunk/Makefile
    csw/mgar/pkg/libflac7/trunk/Makefile
    csw/mgar/pkg/libgdiplus/trunk/Makefile
    csw/mgar/pkg/libglade2/trunk/Makefile
    csw/mgar/pkg/libgmp3/trunk/Makefile
    csw/mgar/pkg/libical/trunk/Makefile
    csw/mgar/pkg/libid3tag/trunk/Makefile
    csw/mgar/pkg/libiptcdata/trunk/Makefile
    csw/mgar/pkg/libkate/trunk/Makefile
    csw/mgar/pkg/libmhash/trunk/Makefile
    csw/mgar/pkg/libnotify/trunk/Makefile
    csw/mgar/pkg/liborc/trunk/Makefile
    csw/mgar/pkg/libpaper/trunk/Makefile
    csw/mgar/pkg/libproxy/trunk/Makefile
    csw/mgar/pkg/librsync/trunk/Makefile
    csw/mgar/pkg/libschroedinger/trunk/Makefile
    csw/mgar/pkg/libsexy/trunk/Makefile
    csw/mgar/pkg/libstatgrab/trunk/Makefile
    csw/mgar/pkg/libthai/trunk/Makefile
    csw/mgar/pkg/libtorrent/trunk/Makefile
    csw/mgar/pkg/libvorbis/trunk/Makefile
    csw/mgar/pkg/libxdg-basedir/trunk/Makefile
    csw/mgar/pkg/libxslt/trunk/Makefile
    csw/mgar/pkg/lzip/trunk/Makefile
    csw/mgar/pkg/lzop/trunk/Makefile
    csw/mgar/pkg/m4/trunk/Makefile
    csw/mgar/pkg/maildrop/trunk/Makefile
    csw/mgar/pkg/mktemp/trunk/Makefile
    csw/mgar/pkg/mm/trunk/Makefile
    csw/mgar/pkg/mod_transform/trunk/Makefile
    csw/mgar/pkg/mono-basic/trunk/Makefile
    csw/mgar/pkg/mono-debugger/trunk/Makefile
    csw/mgar/pkg/mono-tools/trunk/Makefile
    csw/mgar/pkg/mpd/trunk/Makefile
    csw/mgar/pkg/namazu/trunk/Makefile
    csw/mgar/pkg/ndiff/trunk/Makefile
    csw/mgar/pkg/ntop/trunk/Makefile
    csw/mgar/pkg/octave/trunk/Makefile
    csw/mgar/pkg/otr/trunk/Makefile
    csw/mgar/pkg/patch/trunk/Makefile
    csw/mgar/pkg/patchutils/trunk/Makefile
    csw/mgar/pkg/pidgin/trunk/Makefile
    csw/mgar/pkg/pidginotr/trunk/Makefile
    csw/mgar/pkg/pkgconfig/trunk/Makefile
    csw/mgar/pkg/plib/trunk/Makefile
    csw/mgar/pkg/polkit/trunk/Makefile
    csw/mgar/pkg/protobuf/trunk/Makefile
    csw/mgar/pkg/pwsafe/trunk/Makefile
    csw/mgar/pkg/qhull/trunk/Makefile
    csw/mgar/pkg/rapidsvn/trunk/Makefile
    csw/mgar/pkg/rc/trunk/Makefile
    csw/mgar/pkg/recode/trunk/Makefile
    csw/mgar/pkg/rssh/trunk/Makefile
    csw/mgar/pkg/rtorrent/trunk/Makefile
    csw/mgar/pkg/ruby19/trunk/Makefile
    csw/mgar/pkg/sauron/trunk/Makefile
    csw/mgar/pkg/screen/trunk/Makefile
    csw/mgar/pkg/sed/trunk/Makefile
    csw/mgar/pkg/sh-utils/trunk/Makefile
    csw/mgar/pkg/shared-mime-info/trunk/Makefile
    csw/mgar/pkg/snort/trunk/Makefile
    csw/mgar/pkg/sox/trunk/Makefile
    csw/mgar/pkg/squid/trunk/Makefile
    csw/mgar/pkg/squidclamav/trunk/Makefile
    csw/mgar/pkg/sudo/trunk/Makefile
    csw/mgar/pkg/sudo_ldap/trunk/Makefile
    csw/mgar/pkg/swig/trunk/Makefile
    csw/mgar/pkg/taglib/trunk/Makefile
    csw/mgar/pkg/taglib_gcc/trunk/Makefile
    csw/mgar/pkg/tcpstat/trunk/Makefile
    csw/mgar/pkg/texinfo/trunk/Makefile
    csw/mgar/pkg/textutils/trunk/Makefile
    csw/mgar/pkg/tnef/trunk/Makefile
    csw/mgar/pkg/transmission/trunk/Makefile
    csw/mgar/pkg/tre/trunk/Makefile
    csw/mgar/pkg/umfpack/trunk/Makefile
    csw/mgar/pkg/unrtf/trunk/Makefile
    csw/mgar/pkg/urxvt/trunk/Makefile
    csw/mgar/pkg/varnish/trunk/Makefile
    csw/mgar/pkg/webkit/trunk/Makefile
    csw/mgar/pkg/which/trunk/Makefile
    csw/mgar/pkg/x11vnc/trunk/Makefile
    csw/mgar/pkg/xchat/trunk/Makefile
    csw/mgar/pkg/xerces-c/trunk/Makefile
    csw/mgar/pkg/xmlto/trunk/Makefile
    csw/mgar/pkg/zebra/trunk/Makefile
    csw/mgar/pkg/zshdb/trunk/Makefile
    csw/mgar/pkg/zutils/trunk/Makefile

Modified: csw/mgar/pkg/alarm-clock/trunk/Makefile
===================================================================
--- csw/mgar/pkg/alarm-clock/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/alarm-clock/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -32,8 +32,6 @@
 
 STRIP_LIBTOOL = 1
 
-TEST_TARGET = check
-
 INSTALL_OVERRIDE_VARS = alarmclockdocdir
 INSTALL_OVERRIDE_VAR_alarmclockdocdir = $(docdir)/$(CATALOGNAME)
 

Modified: csw/mgar/pkg/alpine/trunk/Makefile
===================================================================
--- csw/mgar/pkg/alpine/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/alpine/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -56,8 +56,6 @@
 LIBS += -lm -lgssapi_krb5 -lkrb5 -lintl -liconv
 export LIBS
 
-TEST_TARGET = check
-
 RUNTIME_DEP_PKGS  = CSWggettextrt CSWiconv CSWtcl CSWsasl CSWosslrt
 RUNTIME_DEP_PKGS += CSWkrb5lib CSWlibnet CSWncurses CSWoldaprt
 

Modified: csw/mgar/pkg/amanda/trunk/Makefile
===================================================================
--- csw/mgar/pkg/amanda/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/amanda/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -61,6 +61,4 @@
 CONFIGURE_ARGS += --disable-installperms
 CONFIGURE_ARGS += --with-amperldir=/opt/csw/lib/perl/csw
 
-TEST_TARGET = check
-
 include gar/category.mk

Modified: csw/mgar/pkg/audiofile/trunk/Makefile
===================================================================
--- csw/mgar/pkg/audiofile/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/audiofile/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -40,8 +40,6 @@
 BUILD64 = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 
-TEST_TARGET = check
-
 MERGE_SCRIPTS_isa-extra += copy-config-only
 MERGE_SCRIPTS_isa-extra += copy-relocated-only
 MERGE_DIRS_isa-extra = $(libdir)

Modified: csw/mgar/pkg/augeas/trunk/Makefile
===================================================================
--- csw/mgar/pkg/augeas/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/augeas/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -31,8 +31,6 @@
 # NOISAEXEC = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 
-TEST_TARGET = check
-
 CHECKPKG_OVERRIDES_CSWaugeas += file-with-bad-content
 CHECKPKG_OVERRIDES_CSWaugeas += non-uniform-lib-versions-in-package|sonames=libaugeas.so.0,libfa.so.1
 CHECKPKG_OVERRIDES_CSWaugeas += shared-lib-package-contains-so-symlink

Modified: csw/mgar/pkg/autoconf/trunk/Makefile
===================================================================
--- csw/mgar/pkg/autoconf/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/autoconf/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -28,8 +28,6 @@
 
 CONFIGURE_ARGS = $(DIRPATHS)
 
-TEST_TARGET = check
-
 # Tests take a loooooonnng time.
 # TEST_SCRIPTS =
 

Modified: csw/mgar/pkg/autotrace/trunk/Makefile
===================================================================
--- csw/mgar/pkg/autotrace/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/autotrace/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -59,6 +59,4 @@
 CONFIGURE_ARGS += --with-magick
 CONFIGURE_ARGS += --with-pstoedit
 
-TEST_TARGET = check
-
 include gar/category.mk

Modified: csw/mgar/pkg/bashdb/trunk/Makefile
===================================================================
--- csw/mgar/pkg/bashdb/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/bashdb/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -30,8 +30,6 @@
 
 CONFIGURE_ARGS = $(DIRPATHS)
 
-TEST_TARGET = check
-
 ARCHALL = 1
 
 include gar/category.mk

Modified: csw/mgar/pkg/binutils/trunk/Makefile
===================================================================
--- csw/mgar/pkg/binutils/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/binutils/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -26,8 +26,6 @@
 CONFIGURE_ARGS += --enable-targets=all
 CONFIGURE_ARGS += --enable-64-bit-bfd
 
-TEST_TARGET = check
-
 # Do not run tests until this is fixed:
 #   <http://sourceware.org/bugzilla/show_bug.cgi?id=11128>
 SKIPTEST ?= 1

Modified: csw/mgar/pkg/bitlbee/trunk/Makefile
===================================================================
--- csw/mgar/pkg/bitlbee/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/bitlbee/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -46,8 +46,6 @@
 
 # Critical check.h is missing on Solaris
 SKIPTEST ?= 1
-TEST_TARGET = check
-
 PRESERVECONF = $(sysconfdir)/bitlbee.conf
 
 include gar/category.mk

Modified: csw/mgar/pkg/blame/trunk/Makefile
===================================================================
--- csw/mgar/pkg/blame/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/blame/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -16,6 +16,4 @@
 
 CONFIGURE_ARGS = $(DIRPATHS)
 
-TEST_TARGET = check
-
 include gar/category.mk

Modified: csw/mgar/pkg/bzflag/trunk/Makefile
===================================================================
--- csw/mgar/pkg/bzflag/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/bzflag/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -21,8 +21,6 @@
 
 CONFIGURE_ARGS = $(DIRPATHS)
 
-TEST_TARGET = check
-
 RUNTIME_DEP_PKGS_CSWbzflag += CSWglew
 RUNTIME_DEP_PKGS_CSWbzflag += CSWlibsdl
 RUNTIME_DEP_PKGS_CSWbzflag += CSWcurlrt

Modified: csw/mgar/pkg/cfengine/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cfengine/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/cfengine/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -38,6 +38,4 @@
 
 GARCOMPILER = GCC3
 
-TEST_TARGET = check
-
 include gar/category.mk

Modified: csw/mgar/pkg/chkconfig/trunk/Makefile
===================================================================
--- csw/mgar/pkg/chkconfig/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/chkconfig/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -37,8 +37,6 @@
 CONFIGURE_ARGS += --with-alt-links-dir=/etc/opt/csw/alternatives
 CONFIGURE_ARGS += --with-alt-admin-dir=/var/opt/csw/alternatives
 
-TEST_TARGET = check
-
 include gar/category.mk
 
 post-merge:

Modified: csw/mgar/pkg/chmlib/trunk/Makefile
===================================================================
--- csw/mgar/pkg/chmlib/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/chmlib/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -26,8 +26,6 @@
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --enable-examples
 
-TEST_TARGET = check
-
 MERGE_DIRS_isa-extra = $(libdir)
 
 DOCS  = NEWS README

Modified: csw/mgar/pkg/clamav/trunk/Makefile
===================================================================
--- csw/mgar/pkg/clamav/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/clamav/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -107,8 +107,6 @@
 SPKG_SOURCEURL = http://www.clamav.net
 
 #SKIPTEST = 1
-TEST_TARGET = check
-
 # These are harmless examples
 CHECKPKG_OVERRIDES_CSWclamav += file-with-bad-content|/usr/local|root/etc/opt/csw/clamd.conf.CSW
 CHECKPKG_OVERRIDES_CSWclamav += file-with-bad-content|/usr/local|root/opt/csw/share/doc/clamav/README

Modified: csw/mgar/pkg/clzip/trunk/Makefile
===================================================================
--- csw/mgar/pkg/clzip/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/clzip/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -22,8 +22,6 @@
 CONFIGURE_ARGS += CXXFLAGS="$(CXXFLAGS)"
 CONFIGURE_ARGS += LDFLAGS="$(LDFLAGS)"
 
-TEST_TARGET = check
-
 INSTALL_OVERRIDE_VARS = INSTALL
 INSTALL_OVERRIDE_VAR_INSTALL = /opt/csw/bin/ginstall
 

Modified: csw/mgar/pkg/coreutils/trunk/Makefile
===================================================================
--- csw/mgar/pkg/coreutils/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/coreutils/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -54,7 +54,6 @@
 
 # move the pegs forward
 ifneq ($(VERSION), 8.13)
-TEST_TARGET = check
 else
 TEST_SCRIPTS =
 endif

Modified: csw/mgar/pkg/cscope/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cscope/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/cscope/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -24,8 +24,6 @@
 
 CONFIGURE_ARGS = $(DIRPATHS)
 
-TEST_TARGET = check
-
 # Test suite won't run as root!
 TEST_SCRIPTS =
 

Modified: csw/mgar/pkg/cvs/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cvs/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/cvs/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -50,8 +50,6 @@
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = (\d+(?:\.\d+)*)
 
-TEST_TARGET = check
-
 # The testsuite runs for more than one hour!
 # SKIPTEST ?= 1
 

Modified: csw/mgar/pkg/cvs2svn/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cvs2svn/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/cvs2svn/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -26,7 +26,5 @@
 
 BUILD_ARGS = man
 
-TEST_TARGET = check
-
 include gar/category.mk
 

Modified: csw/mgar/pkg/cvsproxy/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cvsproxy/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/cvsproxy/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -18,8 +18,6 @@
 
 CONFIGURE_ARGS = $(DIRPATHS)
 
-TEST_TARGET = check
-
 ETCSERVICES = /opt/csw/etc/pkg/$(NAME)/services
 INETDCONF = /opt/csw/etc/pkg/$(NAME)/inetd.conf
 

Modified: csw/mgar/pkg/ddrescue/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ddrescue/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/ddrescue/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -20,8 +20,6 @@
 CONFIGURE_ARGS = --prefix=$(prefix)
 CONFIGURE_ARGS += CXX="$(CXX)" CPPFLAGS="$(CPPFLAGS)" CXXFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)"
 
-TEST_TARGET = check
-
 INSTALL_OVERRIDE_VARS = INSTALL
 INSTALL_OVERRIDE_VAR_INSTALL = /opt/csw/bin/ginstall
 

Modified: csw/mgar/pkg/dejagnu/trunk/Makefile
===================================================================
--- csw/mgar/pkg/dejagnu/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/dejagnu/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -17,6 +17,4 @@
 
 CONFIGURE_ARGS = $(DIRPATHS)
 
-TEST_TARGET = check
-
 include gar/category.mk

Modified: csw/mgar/pkg/dhcp/trunk/Makefile
===================================================================
--- csw/mgar/pkg/dhcp/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/dhcp/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -31,8 +31,6 @@
 CATALOGNAME_CSWdhcp-dev = dhcp_dev
 
 GARCOMPILER = GNU
-TEST_TARGET = check
-
 CONFIGURE_ARGS  = $(DIRPATHS)
 CONFIGURE_ARGS += --sysconfdir=/etc/opt/csw
 CONFIGURE_ARGS += --localstatedir=/var/opt/csw/dhcp

Modified: csw/mgar/pkg/dnstracer/trunk/Makefile
===================================================================
--- csw/mgar/pkg/dnstracer/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/dnstracer/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -24,6 +24,4 @@
 
 EXTRA_LDFLAGS = -lresolv
 
-TEST_TARGET = check
-
 include gar/category.mk

Modified: csw/mgar/pkg/enchant/trunk/Makefile
===================================================================
--- csw/mgar/pkg/enchant/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/enchant/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -75,8 +75,6 @@
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --enable-static=no
 
-TEST_TARGET = check
-
 include gar/category.mk
 
 PATH := /opt/csw/gnu:$(PATH)

Modified: csw/mgar/pkg/esound/trunk/Makefile
===================================================================
--- csw/mgar/pkg/esound/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/esound/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -55,8 +55,6 @@
 BUILD64 = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 
-TEST_TARGET = check
-
 MERGE_SCRIPTS_isa-extra += copy-relocated-only
 MERGE_SCRIPTS_isa-extra += copy-config-only
 MERGE_DIRS_isa-extra = $(libdir)

Modified: csw/mgar/pkg/ethereal/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ethereal/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/ethereal/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -28,8 +28,6 @@
 CONFIGURE_ARGS += --enable-gtk2
 CONFIGURE_ARGS += --with-ssl=$(tool_prefix)
 
-TEST_TARGET = check
-
 include gar/category.mk
 
 LDFLAGS += -lnsl -lsocket

Modified: csw/mgar/pkg/evolution/trunk/Makefile
===================================================================
--- csw/mgar/pkg/evolution/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/evolution/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -26,8 +26,6 @@
 
 CONFIGURE_ARGS = $(DIRPATHS)
 
-TEST_TARGET = check
-
 include gar/category.mk
 
 PATH := /opt/csw/gnu:$(PATH)

Modified: csw/mgar/pkg/evolution-ds/trunk/Makefile
===================================================================
--- csw/mgar/pkg/evolution-ds/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/evolution-ds/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -46,8 +46,6 @@
 
 CONFIGURE_ARGS = $(DIRPATHS)
 
-TEST_TARGET = check
-
 include gar/category.mk
 
 PATH := /opt/csw/gnu:$(PATH)

Modified: csw/mgar/pkg/evolution-exchange/trunk/Makefile
===================================================================
--- csw/mgar/pkg/evolution-exchange/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/evolution-exchange/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -46,8 +46,6 @@
 
 CONFIGURE_ARGS = $(DIRPATHS)
 
-TEST_TARGET = check
-
 include gar/category.mk
 
 PATH := /opt/csw/gnu:$(PATH)

Modified: csw/mgar/pkg/evolution-mapi/trunk/Makefile
===================================================================
--- csw/mgar/pkg/evolution-mapi/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/evolution-mapi/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -46,8 +46,6 @@
 
 CONFIGURE_ARGS = $(DIRPATHS)
 
-TEST_TARGET = check
-
 include gar/category.mk
 
 PATH := /opt/csw/gnu:$(PATH)

Modified: csw/mgar/pkg/evolution-webcal/trunk/Makefile
===================================================================
--- csw/mgar/pkg/evolution-webcal/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/evolution-webcal/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -44,8 +44,6 @@
 
 CONFIGURE_ARGS = $(DIRPATHS)
 
-TEST_TARGET = check
-
 include gar/category.mk
 
 PATH := /opt/csw/gnu:$(PATH)

Modified: csw/mgar/pkg/exempi/trunk/Makefile
===================================================================
--- csw/mgar/pkg/exempi/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/exempi/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -53,8 +53,6 @@
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --with-boost=/opt/csw
 
-TEST_TARGET = check
-
 include gar/category.mk
 
 pre-configure-modulated:

Modified: csw/mgar/pkg/fastcgi/trunk/Makefile
===================================================================
--- csw/mgar/pkg/fastcgi/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/fastcgi/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -26,8 +26,6 @@
 
 CONFIGURE_ARGS = $(DIRPATHS)
 
-TEST_TARGET = check
-
 WORKSRC ?= $(WORKDIR)/$(DLNAME)
 
 datadir = $(docdir)/$(NAME)

Modified: csw/mgar/pkg/ffcall/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ffcall/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/ffcall/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -18,8 +18,6 @@
 
 CONFIGURE_ARGS = $(DIRPATHS)
 
-TEST_TARGET = check
-
 include gar/category.mk
 
 pre-install-modulated:

Modified: csw/mgar/pkg/fileutils/trunk/Makefile
===================================================================
--- csw/mgar/pkg/fileutils/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/fileutils/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -16,6 +16,4 @@
 
 CONFIGURE_ARGS = $(DIRPATHS)
 
-TEST_TARGET = check
-
 include gar/category.mk

Modified: csw/mgar/pkg/flac/trunk/Makefile
===================================================================
--- csw/mgar/pkg/flac/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/flac/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -83,8 +83,6 @@
 # XXX: Assembler optimization just doesn't work. Disable for now.
 CONFIGURE_ARGS += --disable-asm-optimizations
 
-TEST_TARGET = check
-
 MERGE_SCRIPTS_isa-i386-version-1.0.4 = copy-only
 MERGE_DIRS_isa-i386-version-1.0.4 = $(libdir)
 MERGE_SCRIPTS_isa-amd64-version-1.0.4 = copy-relocated-only

Modified: csw/mgar/pkg/flex_new/trunk/Makefile
===================================================================
--- csw/mgar/pkg/flex_new/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/flex_new/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -28,8 +28,6 @@
 NOISALIST = 1
 CONFIGURE_ARGS = --prefix=$(libexecdir)/$(NAME)-$(VERSION)
 
-TEST_TARGET = check
-
 EXTRA_MERGE_EXCLUDE_FILES = $(prefix)/.*\.a
 
 include gar/category.mk

Modified: csw/mgar/pkg/fping/trunk/Makefile
===================================================================
--- csw/mgar/pkg/fping/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/fping/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -36,8 +36,6 @@
 
 CONFIGURE_ARGS = $(DIRPATHS)
 
-TEST_TARGET = check
-
 include gar/category.mk
 
 SPKG_VERSION := $(SPKG_VERSION)_rev=$(REV)

Modified: csw/mgar/pkg/freedesktop/xcbproto/trunk/Makefile
===================================================================
--- csw/mgar/pkg/freedesktop/xcbproto/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/freedesktop/xcbproto/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -59,7 +59,6 @@
 CHECKPKG_OVERRIDES_CSWxcbproto += surplus-dependency|CSWx11common
 CHECKPKG_OVERRIDES_CSWpyxcbproto += pkgname-does-not-start-with-CSWpy-
 
-TEST_TARGET = check
 EXTRA_MERGE_EXCLUDE_FILES = .*.py[co]
 
 include gar/category.mk

Modified: csw/mgar/pkg/freeglut/trunk/Makefile
===================================================================
--- csw/mgar/pkg/freeglut/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/freeglut/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -29,8 +29,6 @@
 BUILD64 = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 
-TEST_TARGET = check
-
 # No 64 bit libs on Solaris 9 x86
 CHECKPKG_OVERRIDES_CSWfreeglut += soname-not-found|libXxf86vm.so.1|is|needed|by|opt/csw/lib/amd64/libglut.so.3.9.0
 

Modified: csw/mgar/pkg/gbc/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gbc/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/gbc/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -20,6 +20,4 @@
 
 CONFIGURE_ARGS = $(DIRPATHS)
 
-TEST_TARGET = check
-
 include gar/category.mk

Modified: csw/mgar/pkg/gdb/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gdb/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/gdb/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -28,8 +28,6 @@
 NOISALIST = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 
-TEST_TARGET = check
-
 include gar/category.mk
 
 # Needed for testing

Modified: csw/mgar/pkg/gdmap/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gdmap/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/gdmap/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -30,8 +30,6 @@
 
 CONFIGURE_ARGS = $(DIRPATHS)
 
-TEST_TARGET = check
-
 include gar/category.mk
 
 # For GNU gettext

Modified: csw/mgar/pkg/geeqie/trunk/Makefile
===================================================================
--- csw/mgar/pkg/geeqie/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/geeqie/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -12,7 +12,6 @@
 MASTER_SITES = $(SF_MIRRORS)
 DISTFILES  = $(NAME)-$(VERSION).tar.gz
 UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
-TEST_TARGET = check
 CONFIGURE_ARGS = $(DIRPATHS)
 EXTRA_LDFLAGS = -lsocket
 

Modified: csw/mgar/pkg/gettext/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gettext/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/gettext/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -219,8 +219,6 @@
 #NOTE: gettext tests are sensitive to bash environment variables, make sure
 #      custom paths are prefixed by $PATH, may be better to set aside
 #      ~/.bashrc, etc. during build.
-TEST_TARGET = check
-
 #provided by iconv
 MERGE_EXCLUDE_FILES  = .*/charset.alias
 MERGE_EXCLUDE_FILES += .*/locale.alias

Modified: csw/mgar/pkg/gftp/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gftp/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/gftp/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -18,6 +18,4 @@
 CONFIGURE_ARGS += LDFLAGS=-lrt
 CONFIGURE_ARGS += LD_OPTIONS=-L/opt/csw/lib
 
-TEST_TARGET = check
-
 include gar/category.mk

Modified: csw/mgar/pkg/ghex/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ghex/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/ghex/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -45,8 +45,6 @@
 
 CONFIGURE_ARGS = $(DIRPATHS)
 
-TEST_TARGET = check
-
 include gar/category.mk
 
 # GNU gettext required

Modified: csw/mgar/pkg/gif2png/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gif2png/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/gif2png/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -15,8 +15,6 @@
 
 CONFIGURE_ARGS = $(DIRPATHS)
 
-TEST_TARGET = check
-
 RUNTIME_DEP_PKGS_CSWgif2png += CSWzlib
 RUNTIME_DEP_PKGS_CSWgif2png += CSWpng
 

Modified: csw/mgar/pkg/gimp/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gimp/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/gimp/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -43,6 +43,4 @@
 
 # Tests don't quite work properly
 TEST_SCRIPTS =
-TEST_TARGET = check
-
 include gar/category.mk

Modified: csw/mgar/pkg/glib/trunk/Makefile
===================================================================
--- csw/mgar/pkg/glib/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/glib/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -54,8 +54,6 @@
 TEST_SCRIPTS_isa-default-version-1.3.15 = $(WORKSRC)/Makefile
 TEST_SCRIPTS = $(call modulationvalue,TEST_SCRIPTS)
 
-TEST_TARGET = check
-
 #provided by iconv
 MERGE_EXCLUDE_FILES = .*/charset.alias
 

Modified: csw/mgar/pkg/glibmm/trunk/Makefile
===================================================================
--- csw/mgar/pkg/glibmm/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/glibmm/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -22,6 +22,4 @@
 
 UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2
 
-TEST_TARGET = check
-
 include gar/category.mk

Modified: csw/mgar/pkg/gluezilla/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gluezilla/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/gluezilla/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -17,7 +17,6 @@
 
 CONFIGURE_ARGS = $(DIRPATHS)
 
-TEST_TARGET = check
 TEST_SCRIPTS =
 
 include gar/category.mk

Modified: csw/mgar/pkg/gnome-base/gconf-editor/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gnome-base/gconf-editor/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/gnome-base/gconf-editor/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -17,8 +17,6 @@
 
 BUILD64 = 1
 
-TEST_TARGET = check
-
 EXTRA_INC = $(prefix)/X11/include
 EXTRA_LIB = $(prefix)/X11/lib
 EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib

Modified: csw/mgar/pkg/gnome-base/gnome-icon-theme/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gnome-base/gnome-icon-theme/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/gnome-base/gnome-icon-theme/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -17,7 +17,6 @@
 CATALOGNAME_CSWgnomeicontheme = gnome_icon_theme
 RUNTIME_DEP_PKGS_CSWgnomeicontheme = CSWicon-naming-utils
 BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS_CSWgnomeicontheme)
-TEST_TARGET = check
 CONFIGURE_ARGS = $(DIRPATHS)
 ARCHALL_CSWgnomeicontheme = 1
 include gar/category.mk

Modified: csw/mgar/pkg/gnome-base/gnome-keyring/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gnome-base/gnome-keyring/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/gnome-base/gnome-keyring/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -15,7 +15,6 @@
 CATALOGNAME_CSWgnomekeyring = gnomekeyring
 PACKAGES = CSWgnomekeyring
 CONFIGURE_ARGS = $(DIRPATHS)
-TEST_TARGET = check
 PATCHFILES += inttypes.patch
 PATCHFILES += inttypes-gck-rpc-module.c.patch
 STRIP_LIBTOOL = 1

Modified: csw/mgar/pkg/gnome-base/gnome-mime-data/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gnome-base/gnome-mime-data/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/gnome-base/gnome-mime-data/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -30,8 +30,6 @@
 
 CONFIGURE_ARGS = $(DIRPATHS)
 
-TEST_TARGET = check
-
 include gar/category.mk
 
 PATH := /opt/csw/gnu:$(PATH)

Modified: csw/mgar/pkg/gnome-base/gnomedesktop/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gnome-base/gnomedesktop/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/gnome-base/gnomedesktop/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -49,8 +49,6 @@
 
 CONFIGURE_ARGS = $(DIRPATHS)
 
-TEST_TARGET = check
-
 include gar/category.mk
 
 PATH := /opt/csw/gnu:$(PATH)

Modified: csw/mgar/pkg/gnome-base/libgnomecanvas/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gnome-base/libgnomecanvas/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/gnome-base/libgnomecanvas/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -17,8 +17,6 @@
 
 BUILD64 = 1
 
-TEST_TARGET = check
-
 include gar/category.mk
 
 PATH := /opt/csw/gnu:$(PATH)

Modified: csw/mgar/pkg/gnome-base/libgnomeprint/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gnome-base/libgnomeprint/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/gnome-base/libgnomeprint/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -54,8 +54,6 @@
 CONFIGURE_ARGS += --x-includes=$(prefix)/X11/include
 CONFIGURE_ARGS += --x-libraries=$(abspath $(prefix)/X11/lib/$(MM_LIBDIR))
 
-TEST_TARGET = check
-
 include gar/category.mk
 
 PATH := /opt/csw/gnu:$(PATH)

Modified: csw/mgar/pkg/gnome-base/libgnomeprintui/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gnome-base/libgnomeprintui/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/gnome-base/libgnomeprintui/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -54,8 +54,6 @@
 CONFIGURE_ARGS += --x-includes=$(prefix)/X11/include
 CONFIGURE_ARGS += --x-libraries=$(abspath $(prefix)/X11/lib/$(MM_LIBDIR))
 
-TEST_TARGET = check
-
 include gar/category.mk
 
 PATH := /opt/csw/gnu:$(PATH)

Modified: csw/mgar/pkg/gnome-base/libgnomeui/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gnome-base/libgnomeui/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/gnome-base/libgnomeui/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -73,8 +73,6 @@
 CONFIGURE_ARGS += --enable-static=no
 CONFIGURE_ARGS += --enable-gtk-doc
 
-TEST_TARGET = check
-
 ARCHALL_CSWlibgnomeui = 1
 ARCHALL_CSWlibgnomeui-doc = 1
 

Modified: csw/mgar/pkg/gnupg_minimal/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gnupg_minimal/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/gnupg_minimal/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -58,7 +58,5 @@
 CONFIGURE_ARGS += --disable-dns-cert
 
 RUNPATHQUOTE = 1
-TEST_TARGET = check
-
 include gar/category.mk
 

Modified: csw/mgar/pkg/gnutls/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gnutls/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/gnutls/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -69,8 +69,6 @@
 BUILD64 = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 
-TEST_TARGET = check
-
 # We put all libs in one package as they are .so.26 and are all bumped together
 CHECKPKG_OVERRIDES_CSWlibgnutls26 += shared-lib-pkgname-mismatch
 

Modified: csw/mgar/pkg/goocanvas/trunk/Makefile
===================================================================
--- csw/mgar/pkg/goocanvas/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/goocanvas/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -53,8 +53,6 @@
 CONFIGURE_ARGS += --x-include=$(prefix)/X11/include
 CONFIGURE_ARGS += --x-libraries=$(abspath $(prefix)/X11/lib/$(MM_LIBDIR))
 
-TEST_TARGET = check
-
 include gar/category.mk
 
 PATH := /opt/csw/gnu:$(PATH)

Modified: csw/mgar/pkg/google-gflags/trunk/Makefile
===================================================================
--- csw/mgar/pkg/google-gflags/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/google-gflags/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -17,7 +17,6 @@
 GOOGLE_PROJECT = google-gflags
 DISTFILES  = $(NAME)-$(VERSION).tar.gz
 UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
-TEST_TARGET = check
 CONFIGURE_ARGS = $(DIRPATHS)
 BUILD64 = 1
 MERGE_DIRS_isa-sparcv9 = $(libdir)

Modified: csw/mgar/pkg/googletest/trunk/Makefile
===================================================================
--- csw/mgar/pkg/googletest/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/googletest/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -23,6 +23,4 @@
 # EXTRA_LDFLAGS = -lCrun -lm
 BUILD64 = 1
 CONFIGURE_ARGS = $(DIRPATHS)
-TEST_TARGET = check
-
 include gar/category.mk

Modified: csw/mgar/pkg/gource/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gource/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/gource/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -28,6 +28,4 @@
 EXTRA_CXXFLAGS = -library=stlport4
 CONFIGURE_ARGS = $(DIRPATHS)
 
-TEST_TARGET = check
-
 include gar/category.mk

Modified: csw/mgar/pkg/gperf/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gperf/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/gperf/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -19,7 +19,5 @@
 
 CONFIGURE_ARGS = $(DIRPATHS)
 
-TEST_TARGET = check
-
 include gar/category.mk
 

Modified: csw/mgar/pkg/gpgme/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gpgme/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/gpgme/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -26,6 +26,4 @@
 
 CONFIGURE_ARGS = $(DIRPATHS)
 
-TEST_TARGET = check
-
 include gar/category.mk

Modified: csw/mgar/pkg/groff/trunk/Makefile
===================================================================
--- csw/mgar/pkg/groff/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/groff/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -24,6 +24,4 @@
 
 INSTALL_OVERRIDE_DIRS = bindir datadir
 
-TEST_TARGET = check
-
 include gar/category.mk

Modified: csw/mgar/pkg/gtkpod/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gtkpod/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/gtkpod/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -55,8 +55,6 @@
 
 CONFIGURE_ARGS = $(DIRPATHS)
 
-TEST_TARGET = check
-
 MSGFMT= /opt/csw/bin/gmsgfmt
 MSGMERGE= /opt/csw/bin/gmsgmerge
 XGETTEXT = /opt/csw/bin/gxgettext

Modified: csw/mgar/pkg/gzip/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gzip/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/gzip/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -42,8 +42,6 @@
 
 CONFIGURE_ARGS = $(DIRPATHS)
 
-TEST_TARGET = check
-
 EXTRA_MERGE_EXCLUDE_FILES = $(libdir)/charset.alias
 
 PKGFILES_CSWgzip  = $(bindir)/gzip

Modified: csw/mgar/pkg/htmltidy/trunk/Makefile
===================================================================
--- csw/mgar/pkg/htmltidy/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/htmltidy/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -24,8 +24,6 @@
 CONFIGURE_ARGS = $(DIRPATHS)
 
 # It's useless, but it's there...
-TEST_TARGET = check
-
 include gar/category.mk
 
 pre-configure:

Modified: csw/mgar/pkg/icecast/trunk/Makefile
===================================================================
--- csw/mgar/pkg/icecast/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/icecast/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -26,8 +26,6 @@
 
 CONFIGURE_ARGS = $(DIRPATHS)
 
-TEST_TARGET = check
-
 include gar/category.mk
 
 post-install-modulated:

Modified: csw/mgar/pkg/icon-naming-utils/trunk/Makefile
===================================================================
--- csw/mgar/pkg/icon-naming-utils/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/icon-naming-utils/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -15,6 +15,5 @@
 CATALOGNAME_CSWicon-naming-utils = icon_naming_utils
 ARCHALL_CSWicon-naming-utils = 1
 RUNTIME_DEP_PKGS_CSWicon-naming-utils = CSWpmxmlsimple
-TEST_TARGET = check
 CONFIGURE_ARGS = $(DIRPATHS)
 include gar/category.mk

Modified: csw/mgar/pkg/imlib/trunk/Makefile
===================================================================
--- csw/mgar/pkg/imlib/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/imlib/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -35,8 +35,6 @@
 # Building the test cases misses -lX11, disable for now
 SKIPTEST ?= 1
 
-TEST_TARGET = check
-
 # No package refactoring for now
 CHECKPKG_OVERRIDES_CSWimlib += shared-lib-package-contains-so-symlink
 CHECKPKG_OVERRIDES_CSWimlib += non-uniform-lib-versions-in-package

Modified: csw/mgar/pkg/imlib2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/imlib2/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/imlib2/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -23,8 +23,6 @@
 BUILD64 = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 
-TEST_TARGET = check
-
 MERGE_SCRIPTS_isa-extra = copy-relocated-only copy-config-only
 MERGE_DIRS_isa-extra = $(libdir)
 

Modified: csw/mgar/pkg/imlib2_loaders/trunk/Makefile
===================================================================
--- csw/mgar/pkg/imlib2_loaders/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/imlib2_loaders/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -37,6 +37,4 @@
 CONFIGURE_ARGS += --x-include=$(prefix)/X11/include
 CONFIGURE_ARGS += --x-libraries=$(abspath $(prefix)/X11/lib/$(MM_LIBDIR))
 
-TEST_TARGET = check
-
 include gar/category.mk

Modified: csw/mgar/pkg/intltool/trunk/Makefile
===================================================================
--- csw/mgar/pkg/intltool/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/intltool/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -17,8 +17,6 @@
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
 
-TEST_TARGET = check
-
 RUNTIME_DEP_PKGS_CSWintltool = CSWperl CSWpmxmlparser
 
 CONFIGURE_ARGS = $(DIRPATHS)

Modified: csw/mgar/pkg/irssi/trunk/Makefile
===================================================================
--- csw/mgar/pkg/irssi/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/irssi/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -39,6 +39,4 @@
 RUNTIME_DEP_PKGS += CSWggettextrt
 RUNTIME_DEP_PKGS += CSWbdb47
 
-TEST_TARGET = check
-
 include gar/category.mk

Modified: csw/mgar/pkg/joe/trunk/Makefile
===================================================================
--- csw/mgar/pkg/joe/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/joe/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -28,8 +28,6 @@
 CONFIGURE_ARGS  = $(DIRPATHS)
 CONFIGURE_ARGS += --disable-curses
 
-TEST_TARGET = check
-
 PRESERVECONF = /etc/opt/csw/joe/.*
 MIGRATE_FILES = jmacsrc joerc jpicorc jstarrc rjoerc
 

Modified: csw/mgar/pkg/krb5/trunk/Makefile
===================================================================
--- csw/mgar/pkg/krb5/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/krb5/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -79,8 +79,6 @@
 BUILD_SCRIPTS += $(WORKSRC)/doc/Makefile
 
 TEST_SCRIPTS = $(WORKSRC)/src/Makefile
-TEST_TARGET = check
-
 INSTALL_SCRIPTS = $(WORKSRC)/src/Makefile custom
 
 ARCHALL_CSWkrb5doc = 1

Modified: csw/mgar/pkg/lang-python/pycairo/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-python/pycairo/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/lang-python/pycairo/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -29,8 +29,6 @@
 EXTRA_CONFIGURE_EXPORTS += CAIRO_LIBS CAIRO_CFLAGS
 CONFIGURE_ARGS = $(DIRPATHS)
 
-TEST_TARGET = check
-
 include gar/category.mk
 
 

Modified: csw/mgar/pkg/lang-python/pygobject/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-python/pygobject/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/lang-python/pygobject/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -48,7 +48,6 @@
 CONFIGURE_ARGS += --without-ffi
 
 ## Tests require gtk, but gtk requries gobject
-TEST_TARGET = check
 TEST_SCRIPTS =
 
 EXTRA_MERGE_EXCLUDE_FILES += .*\.pyo .*\.pyc

Modified: csw/mgar/pkg/lang-python/pygtk/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-python/pygtk/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/lang-python/pygtk/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -31,7 +31,6 @@
 
 CONFIGURE_ARGS  = $(DIRPATHS)
 
-TEST_TARGET = check
 #TEST_SCRIPTS = 
 
 include gar/category.mk

Modified: csw/mgar/pkg/lang-python/python-gflags/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-python/python-gflags/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/lang-python/python-gflags/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -20,6 +20,5 @@
 UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
 PACKAGES = CSWpy-gflags
 CATALOGNAME = py_gflags
-TEST_TARGET = check
 ARCHALL_CSWpy-gflags = 1
 include gar/category.mk

Modified: csw/mgar/pkg/leafnode/trunk/Makefile
===================================================================
--- csw/mgar/pkg/leafnode/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/leafnode/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -17,6 +17,4 @@
 
 CONFIGURE_ARGS = $(DIRPATHS)
 
-TEST_TARGET = check
-
 include gar/category.mk

Modified: csw/mgar/pkg/lha/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lha/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/lha/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -21,8 +21,6 @@
 EXTRA_LINKER_FLAGS = -liconv
 CONFIGURE_ARGS = $(DIRPATHS)
 
-TEST_TARGET = check
-
 # License is really unknown
 CHECKPKG_OVERRIDES_CSWlha += license-missing|/opt/csw/share/doc/lha/license
 

Modified: csw/mgar/pkg/libart/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libart/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/libart/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -27,6 +27,4 @@
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --disable-static
 
-TEST_TARGET = check
-
 include gar/category.mk

Modified: csw/mgar/pkg/libcddb/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libcddb/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/libcddb/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -30,8 +30,6 @@
 EXTRA_TEST_EXPORTS = http_proxy
 
 export http_proxy
-TEST_TARGET = check
-
 PKGFILES_CSWlibcddbutil = $(bindir)/.*
 
 include gar/category.mk

Modified: csw/mgar/pkg/libcroco/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libcroco/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/libcroco/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -21,6 +21,4 @@
 NOISALIST = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 
-TEST_TARGET = check
-
 include gar/category.mk

Modified: csw/mgar/pkg/libeggdbus/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libeggdbus/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/libeggdbus/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -38,8 +38,6 @@
 
 CONFIGURE_ARGS = $(DIRPATHS)
 
-TEST_TARGET = check
-
 include gar/category.mk
 
 pre-configure-modulated:

Modified: csw/mgar/pkg/libemf/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libemf/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/libemf/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -39,8 +39,6 @@
 # BUILD64 = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 
-TEST_TARGET = check
-
 PKGFILES_CSWlibemf1 = $(PKGFILES_RT)
 PKGFILES_CSWlibemf-devel = $(PKGFILES_DEVEL)
 

Modified: csw/mgar/pkg/libev/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libev/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/libev/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -18,7 +18,6 @@
 UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
 CONFIGURE_ARGS  = $(DIRPATHS)
 BUILD64 = 1
-TEST_TARGET = check
 LICENSE = LICENSE
 CHECKPKG_OVERRIDES_CSWlibev += soname-not-found|libm.so.2|is|needed|by|opt/csw/lib/amd64/libev.so.3.0.0
 include gar/category.mk

Modified: csw/mgar/pkg/libfaac/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libfaac/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/libfaac/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -31,8 +31,6 @@
 BUILD64 = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 
-TEST_TARGET = check
-
 MERGE_DIRS_isa-extra = $(libdir)
 
 include gar/category.mk

Modified: csw/mgar/pkg/libfishsound/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libfishsound/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/libfishsound/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -26,8 +26,6 @@
 
 BUILD_ARGS = AM_CFLAGS= SHLIB_VERSION_ARG= libfishsound_la_LDFLAGS=
 
-TEST_TARGET = check
-
 # We have one failing test, so disable tests for now:
 # encdec-comments.c:68: Recently inserted ARTIST1 not retrieved
 # FAIL: encdec-comments

Modified: csw/mgar/pkg/libflac7/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libflac7/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/libflac7/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -50,8 +50,6 @@
 # This is a legacy library, built XMMS plugin against newest one
 CONFIGURE_ARGS += --with-xmms-prefix=/notthere
 
-TEST_TARGET = check
-
 # There is one test failing, but as this is really a long-outdated legacy library
 # I don't care much for now.
 SKIPTEST ?= 1

Modified: csw/mgar/pkg/libgdiplus/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libgdiplus/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/libgdiplus/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -41,7 +41,5 @@
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --with-pango
 
-TEST_TARGET = check
-
 GARCOMPILER = GCC4
 include gar/category.mk

Modified: csw/mgar/pkg/libglade2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libglade2/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/libglade2/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -34,6 +34,4 @@
 BUILD64 = 1
 CONFIGURE_ARGS  = $(DIRPATHS)
 
-TEST_TARGET = check
-
 include gar/category.mk

Modified: csw/mgar/pkg/libgmp3/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libgmp3/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/libgmp3/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -30,8 +30,6 @@
 
 BUILD_DEP_PKGS = CSWgm4
 
-TEST_TARGET = check
-
 # Solaris m4 seems to fail on Solaris 10 amd64 only, use gm4 for all builds
 M4 = /opt/csw/bin/gm4
 EXTRA_CONFIGURE_EXPORTS = M4

Modified: csw/mgar/pkg/libical/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libical/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/libical/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -38,8 +38,6 @@
 BUILD64 = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 
-TEST_TARGET = check
-
 PKGFILES_CSWlibicaldevel = $(PKGFILES_DEVEL)
 
 CHECKPKG_OVERRIDES_CSWlibicaldevel += surplus-dependency|CSWlibical

Modified: csw/mgar/pkg/libid3tag/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libid3tag/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/libid3tag/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -24,8 +24,6 @@
 
 CONFIGURE_ARGS = $(DIRPATHS)
 
-TEST_TARGET = check
-
 include gar/category.mk
 
 SPKG_VERSION := $(SPKG_VERSION)_rev=$(REV)

Modified: csw/mgar/pkg/libiptcdata/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libiptcdata/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/libiptcdata/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -50,6 +50,4 @@
 #CONFIGURE_ARGS += --enable-python
 CONFIGURE_ARGS += --enable-gtk-doc
 
-TEST_TARGET = check
-
 include gar/category.mk

Modified: csw/mgar/pkg/libkate/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libkate/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/libkate/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -60,8 +60,6 @@
 BUILD64 = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 
-TEST_TARGET = check
-
 # Disable testsuite until this is fixed:
 #   http://code.google.com/p/libkate/issues/detail?id=20
 SKIPTEST ?= 1

Modified: csw/mgar/pkg/libmhash/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libmhash/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/libmhash/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -31,8 +31,6 @@
 CONFIGURE_ARGS = $(DIRPATHS)
 
 # Always run testsuite as the code is prone to optimization errors
-TEST_TARGET = check
-
 PACKAGES = CSWlibmhash
 
 include gar/category.mk

Modified: csw/mgar/pkg/libnotify/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libnotify/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/libnotify/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -35,8 +35,6 @@
 BUILD64 = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 
-TEST_TARGET = check
-
 PKGFILES_CSWlibnotifydevel  = $(PKGFILES_DEVEL)
 PKGFILES_CSWlibnotifydevel += $(sharedstatedir)/gtk-doc/.*
 

Modified: csw/mgar/pkg/liborc/trunk/Makefile
===================================================================
--- csw/mgar/pkg/liborc/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/liborc/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -23,6 +23,4 @@
 NOISALIST = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 
-TEST_TARGET = check
-
 include gar/category.mk

Modified: csw/mgar/pkg/libpaper/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libpaper/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/libpaper/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -36,6 +36,4 @@
 
 CONFIGURE_ARGS = $(DIRPATHS)
 
-TEST_TARGET = check
-
 include gar/category.mk

Modified: csw/mgar/pkg/libproxy/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libproxy/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/libproxy/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -123,8 +123,6 @@
 CONFIGURE_ARGS += --with-python
 CONFIGURE_ARGS += --disable-silent-rules
 
-TEST_TARGET = check
-
 include gar/category.mk
 
 #pre-configure-modulated:

Modified: csw/mgar/pkg/librsync/trunk/Makefile
===================================================================
--- csw/mgar/pkg/librsync/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/librsync/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -22,8 +22,6 @@
 CONFIGURE_ARGS += --enable-shared=yes
 CONFIGURE_ARGS += --enable-static=no
 
-TEST_TARGET = check
-
 # delta.c contains inlined functions without storage qualifiers, treat them
 # as static as the only references are within delta.c itself. Otherwise the
 # linking will fail to resolve those references. See "inline functions"

Modified: csw/mgar/pkg/libschroedinger/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libschroedinger/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/libschroedinger/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -32,8 +32,6 @@
 BUILD64 = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 
-TEST_TARGET = check
-
 PKGFILES_CSWlibschrodevel = $(PKGFILES_DEVEL)
 PKGFILES_CSWlibschrodevel += $(sharedstatedir)/gtk-doc/.*
 

Modified: csw/mgar/pkg/libsexy/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libsexy/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/libsexy/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -33,8 +33,6 @@
 BUILD64 = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 
-TEST_TARGET = check
-
 PKGFILES_CSWlibsexydevel  = $(PKGFILES_DEVEL)
 PKGFILES_CSWlibsexydevel += $(sharedstatedir)/gtk-doc/.*
 

Modified: csw/mgar/pkg/libstatgrab/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libstatgrab/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/libstatgrab/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -28,6 +28,4 @@
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --with-curses-prefix=/usr
 
-TEST_TARGET = check
-
 include gar/category.mk

Modified: csw/mgar/pkg/libthai/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libthai/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/libthai/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -37,8 +37,6 @@
 BUILD64 = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 
-TEST_TARGET = check
-
 PKGFILES_CSWlibthaidevel = $(PKGFILES_DEVEL)
 PKGFILES_CSWlibthaidevel += $(docdir)/.*
 

Modified: csw/mgar/pkg/libtorrent/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libtorrent/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/libtorrent/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -38,8 +38,6 @@
 BUILD64 = 1
 CONFIGURE_ARGS = $(DIRPATHS) --enable-shared --disable-static --disable-libtool-lock --disable-debug
 
-TEST_TARGET = check
-
 PKGFILES_CSWlibtorrentdevel = $(PKGFILES_DEVEL)
 PKGFILES_CSWlibtorrentdevel += $(docdir)/.*
 PKGFILES_CSWlibtorrentdevel += .*\.h

Modified: csw/mgar/pkg/libvorbis/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libvorbis/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/libvorbis/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -58,6 +58,4 @@
 
 CONFIGURE_ARGS = $(DIRPATHS)
 
-TEST_TARGET = check
-
 include gar/category.mk

Modified: csw/mgar/pkg/libxdg-basedir/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libxdg-basedir/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/libxdg-basedir/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -22,7 +22,6 @@
 UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
 PACKAGES = CSWlibxdgbasedir
 CATALOGNAME = libxdg_basedir
-TEST_TARGET = check
 # These settings do not do anything.  xdg-basedir has the paths hardcoded in
 # basedir.c, there's a separate patch for it.
 # sysconfdir = /etc$(prefix)

Modified: csw/mgar/pkg/libxslt/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libxslt/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/libxslt/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -71,8 +71,6 @@
 RUNTIME_DEP_PKGS_CSWlibxslt1 += CSWzlib
 
 SPKG_SOURCEURL = http://xmlsoft.org/XSLT/
-TEST_TARGET = check
-
 CONFIGURE_ARGS_32 =
 CONFIGURE_ARGS_64 = --without-python
 CONFIGURE_ARGS = $(DIRPATHS) $(CONFIGURE_ARGS_$(MEMORYMODEL))

Modified: csw/mgar/pkg/lzip/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lzip/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/lzip/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -28,8 +28,6 @@
 CONFIGURE_ARGS += CXXFLAGS="$(CXXFLAGS)"
 CONFIGURE_ARGS += LDFLAGS="$(LDFLAGS)"
 
-TEST_TARGET = check
-
 INSTALL_OVERRIDE_VARS = INSTALL
 INSTALL_OVERRIDE_VAR_INSTALL = /opt/csw/bin/ginstall
 

Modified: csw/mgar/pkg/lzop/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lzop/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/lzop/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -26,8 +26,6 @@
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
 
-TEST_TARGET = check
-
 CONFIGURE_ARGS = $(DIRPATHS)
 
 NOISALIST = 1

Modified: csw/mgar/pkg/m4/trunk/Makefile
===================================================================
--- csw/mgar/pkg/m4/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/m4/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -23,8 +23,6 @@
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --program-prefix=g
 
-TEST_TARGET = check
-
 # This must only be shipped by libiconv
 EXTRA_MERGE_EXCLUDE_FILES = $(libdir)/charset.alias
 

Modified: csw/mgar/pkg/maildrop/trunk/Makefile
===================================================================
--- csw/mgar/pkg/maildrop/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/maildrop/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -18,8 +18,6 @@
 
 CONFIGURE_ARGS = $(DIRPATHS)
 
-TEST_TARGET = check
-
 include gar/category.mk
 
 # We need whoami

Modified: csw/mgar/pkg/mktemp/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mktemp/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/mktemp/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -22,6 +22,4 @@
 
 CONFIGURE_ARGS = $(DIRPATHS)
 
-TEST_TARGET = check
-
 include gar/category.mk

Modified: csw/mgar/pkg/mm/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mm/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/mm/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -25,6 +25,4 @@
 CONFIGURE_ARGS  = $(DIRPATHS)
 CONFIGURE_ARGS += --disable-static
 
-TEST_TARGET = check
-
 include gar/category.mk

Modified: csw/mgar/pkg/mod_transform/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mod_transform/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/mod_transform/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -31,6 +31,4 @@
 CONFIGURE_ARGS += --with-xslt-prefix=$(prefix)
 CONFIGURE_ARGS += --with-xml-prefix=$(prefix)
 
-TEST_TARGET = check
-
 include gar/category.mk

Modified: csw/mgar/pkg/mono-basic/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mono-basic/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/mono-basic/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -17,7 +17,6 @@
 
 CONFIGURE_ARGS = $(DIRPATHS)
 
-TEST_TARGET = check
 TEST_SCRIPTS =
 
 include gar/category.mk

Modified: csw/mgar/pkg/mono-debugger/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mono-debugger/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/mono-debugger/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -17,7 +17,6 @@
 
 CONFIGURE_ARGS = $(DIRPATHS)
 
-TEST_TARGET = check
 TEST_SCRIPTS =
 
 include gar/category.mk

Modified: csw/mgar/pkg/mono-tools/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mono-tools/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/mono-tools/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -17,7 +17,6 @@
 
 CONFIGURE_ARGS = $(DIRPATHS)
 
-TEST_TARGET = check
 TEST_SCRIPTS =
 
 include gar/category.mk

Modified: csw/mgar/pkg/mpd/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mpd/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/mpd/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -30,8 +30,6 @@
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2
 
-TEST_TARGET = check
-
 SPKG_CLASSES = none cswcpsampleconf cswusergroup ugfiles cswinitsmf
 PROTOTYPE_FILTER  = awk ' \
     $$$$3 ~ /\/init.d\/cswmpd$$$$/ { $$$$2 = "cswinitsmf" } \

Modified: csw/mgar/pkg/namazu/trunk/Makefile
===================================================================
--- csw/mgar/pkg/namazu/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/namazu/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -19,6 +19,4 @@
 
 CONFIGURE_ARGS += $(DIRPATHS)
 
-TEST_TARGET = check
-
 include gar/category.mk

Modified: csw/mgar/pkg/ndiff/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ndiff/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/ndiff/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -28,4 +28,3 @@
 
 include gar/category.mk
 
-TEST_TARGET = check

Modified: csw/mgar/pkg/ntop/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ntop/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/ntop/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -74,8 +74,6 @@
 # CONFIGURE_ARGS += --enable-fc
 # CONFIGURE_ARGS += --enable-mysql
 
-TEST_TARGET = check
-
 # We don't have a separate devel-package, so this is ok
 CHECKPKG_OVERRIDES_CSWntop += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libcpacketPlugin.so
 CHECKPKG_OVERRIDES_CSWntop += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libicmpPlugin.so

Modified: csw/mgar/pkg/octave/trunk/Makefile
===================================================================
--- csw/mgar/pkg/octave/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/octave/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -14,7 +14,5 @@
 
 CONFIGURE_ARGS = $(DIRPATHS)
 
-TEST_TARGET = check
-
 include gar/category.mk
 

Modified: csw/mgar/pkg/otr/trunk/Makefile
===================================================================
--- csw/mgar/pkg/otr/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/otr/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -25,8 +25,6 @@
 RUNTIME_DEP_PKGS_CSWotr = CSWgcrypt CSWgpgerr
 RUNTIME_DEP_PKGS_CSWotrdevel = CSWotr
 
-TEST_TARGET = check
-
 PKGFILES_CSWotrdevel = $(PKGFILES_DEVEL)
 
 include gar/category.mk

Modified: csw/mgar/pkg/patch/trunk/Makefile
===================================================================
--- csw/mgar/pkg/patch/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/patch/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -28,8 +28,6 @@
 EXTRA_LINKER_FLAGS = -lgnugetopt
 BUILD_ARGS = SHELL=bash
 
-TEST_TARGET = check
-
 include gar/category.mk
 
 post-extract-modulated:

Modified: csw/mgar/pkg/patchutils/trunk/Makefile
===================================================================
--- csw/mgar/pkg/patchutils/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/patchutils/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -26,8 +26,6 @@
 
 CONFIGURE_ARGS = $(DIRPATHS)
 
-TEST_TARGET = check
-
 # gendiff is still not found, but the results look otherwise pretty good.
 # Ignore for now.
 SKIPTEST ?= 1

Modified: csw/mgar/pkg/pidgin/trunk/Makefile
===================================================================
--- csw/mgar/pkg/pidgin/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/pidgin/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -41,7 +41,6 @@
 EXTRA_CONFIGURE_EXPORTS  = DOT XGETTEXT MSGFMT MSGMERGE SED PKG_CONFIG_PATH
 EXTRA_CONFIGURE_EXPORTS += X11_CFLAGS X11_LIBS LIBS
 EXTRA_INC = /opt/csw/include/ncurses
-TEST_TARGET = check
 TEST_SCRIPTS =
 # We define upstream file regex so we can be notifed of new upstream software release
 UPSTREAM_USE_SF = 1

Modified: csw/mgar/pkg/pidginotr/trunk/Makefile
===================================================================
--- csw/mgar/pkg/pidginotr/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/pidginotr/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -12,8 +12,6 @@
 DISTFILES += $(call admfiles,CSWpidginotr,)
 PATCHFILES = otr_priority.patch
 
-TEST_TARGET = check
-
 # 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/pkgconfig/trunk/Makefile
===================================================================
--- csw/mgar/pkg/pkgconfig/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/pkgconfig/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -32,6 +32,4 @@
 CONFIGURE_ARGS += --docdir=$(docdir)/$(CATALOGNAME)
 CONFIGURE_ARGS += --with-installed-glib
 
-TEST_TARGET = check
-
 include gar/category.mk

Modified: csw/mgar/pkg/plib/trunk/Makefile
===================================================================
--- csw/mgar/pkg/plib/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/plib/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -17,8 +17,6 @@
 BUILD64 = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 
-TEST_TARGET = check
-
 # This library contains only static libs, so it is more like a developer library
 MERGE_EXCLUDE_STATICLIBS =
 

Modified: csw/mgar/pkg/polkit/trunk/Makefile
===================================================================
--- csw/mgar/pkg/polkit/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/polkit/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -40,8 +40,6 @@
 
 CONFIGURE_ARGS = $(DIRPATHS)
 
-TEST_TARGET = check
-
 include gar/category.mk
 
 #pre-configure-modulated:

Modified: csw/mgar/pkg/protobuf/trunk/Makefile
===================================================================
--- csw/mgar/pkg/protobuf/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/protobuf/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -30,7 +30,6 @@
 EXTRA_LDFLAGS = -lCrun -lm
 BUILD64 = 1
 CONFIGURE_ARGS = $(DIRPATHS)
-TEST_TARGET = check
 PYCOMPILE = 1
 
 PACKAGES  = CSWprotobuf

Modified: csw/mgar/pkg/pwsafe/trunk/Makefile
===================================================================
--- csw/mgar/pkg/pwsafe/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/pwsafe/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -21,6 +21,4 @@
 CONFIGURE_ARGS += --with-openssl-dir=$(prefix)/ssl
 CONFIGURE_ARGS += --with-x
 
-TEST_TARGET = check
-
 include gar/category.mk

Modified: csw/mgar/pkg/qhull/trunk/Makefile
===================================================================
--- csw/mgar/pkg/qhull/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/qhull/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -47,6 +47,4 @@
 # This is for amd64 checked on i386
 CHECKPKG_OVERRIDES = soname-not-found|libm.so.2
 
-TEST_TARGET = check
-
 include gar/category.mk

Modified: csw/mgar/pkg/rapidsvn/trunk/Makefile
===================================================================
--- csw/mgar/pkg/rapidsvn/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/rapidsvn/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -65,8 +65,6 @@
 # libdb.so is found at the correct place.
 EXTRA_LIB = $(SVNLIBDIR) $(prefix)/bdb48/lib
 
-TEST_TARGET = check
-
 PKGFILES_CSWlibsvncpp3 = $(PKGFILES_RT)
 PKGFILES_CSWlibsvncpp3 += $(PKGFILES_DEVEL)
 

Modified: csw/mgar/pkg/rc/trunk/Makefile
===================================================================
--- csw/mgar/pkg/rc/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/rc/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -20,6 +20,4 @@
 CONFIGURE_ARGS  = $(DIRPATHS)
 CONFIGURE_ARGS += --with-readline
 
-TEST_TARGET = check
-
 include gar/category.mk

Modified: csw/mgar/pkg/recode/trunk/Makefile
===================================================================
--- csw/mgar/pkg/recode/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/recode/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -45,8 +45,6 @@
 CONFIGURE_ARGS = $(DIRPATHS) \
 	--enable-static=no
 
-TEST_TARGET = check
-
 EXTRA_MERGE_EXCLUDE_FILES = $(libdir)/charset.alias
 
 include gar/category.mk

Modified: csw/mgar/pkg/rssh/trunk/Makefile
===================================================================
--- csw/mgar/pkg/rssh/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/rssh/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -40,8 +40,6 @@
 CONFIGURE_ARGS += --with-rdist=$(bindir)/rdist
 CONFIGURE_ARGS += --with-rsync=$(bindir)/rsync
 
-TEST_TARGET = check
-
 PROTOTYPE_MODIFIERS = makesuid
 PROTOTYPE_FILES_makesuid = $(libexecdir)/rssh_chroot_helper
 PROTOTYPE_PERMS_makesuid = 4755

Modified: csw/mgar/pkg/rtorrent/trunk/Makefile
===================================================================
--- csw/mgar/pkg/rtorrent/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/rtorrent/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -21,8 +21,6 @@
 EXTRA_LDFLAGS  = -Wl,-zignore -Wl,-zcombreloc -Wl,-Bdirect
 
 CONFIGURE_ARGS = $(DIRPATHS) --disable-debug
-TEST_TARGET = check
-
 include gar/category.mk
 
 pre-configure-modulated:

Modified: csw/mgar/pkg/ruby19/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ruby19/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/ruby19/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -11,7 +11,6 @@
 # [1] http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=543805
 # [2] http://redmine.ruby-lang.org/issues/show/2609
 ifneq ($(VERSION)$(PATCHLEVEL), 1.9.1p376)
-TEST_TARGET = check
 else
 TEST_SCRIPTS = 
 endif

Modified: csw/mgar/pkg/sauron/trunk/Makefile
===================================================================
--- csw/mgar/pkg/sauron/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/sauron/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -17,7 +17,6 @@
 
 CONFIGURE_ARGS = $(DIRPATHS)
 
-TEST_TARGET = check
 INSTALL_SCRIPTS = custom
 
 include gar/category.mk

Modified: csw/mgar/pkg/screen/trunk/Makefile
===================================================================
--- csw/mgar/pkg/screen/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/screen/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -74,8 +74,6 @@
 CONFIGURE_ARGS += --with-sys-screenrc=/etc$(prefix)/screenrc
 CONFIGURE_ARGS += --with-socket-dir=/var$(prefix)/run/screen
 
-TEST_TARGET = check
-
 include gar/category.mk
 
 # we must recreate configure as we modified configure.in

Modified: csw/mgar/pkg/sed/trunk/Makefile
===================================================================
--- csw/mgar/pkg/sed/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/sed/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -36,8 +36,6 @@
 CONFIGURE_ARGS += --program-prefix=g  
 CONFIGURE_ARGS += --with-included-gettext
 
-TEST_TARGET = check
-
 SHELL = /bin/bash
 
 EXTRA_MERGE_EXCLUDE_FILES = $(sharedstatedir)/.*locale.alias

Modified: csw/mgar/pkg/sh-utils/trunk/Makefile
===================================================================
--- csw/mgar/pkg/sh-utils/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/sh-utils/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -20,8 +20,6 @@
 INSTALL_SCRIPTS = $(WORKSRC)/Makefile $(WORKSRC)/Makefile-root
 CONFIGURE_ARGS  = $(DIRPATHS)
 
-TEST_TARGET = check
-
 # Some tests require a controlling terminal
 TEST_SCRIPTS =
 

Modified: csw/mgar/pkg/shared-mime-info/trunk/Makefile
===================================================================
--- csw/mgar/pkg/shared-mime-info/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/shared-mime-info/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -43,8 +43,6 @@
 
 CONFIGURE_ARGS = $(DIRPATHS)
 
-TEST_TARGET = check
-
 include gar/category.mk
 
 PATH := /opt/csw/gnu:$(PATH)

Modified: csw/mgar/pkg/snort/trunk/Makefile
===================================================================
--- csw/mgar/pkg/snort/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/snort/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -26,8 +26,6 @@
 CONFIGURE_ARGS  = $(DIRPATHS) --libdir=/opt/csw/lib
 CONFIGURE_ARGS += --enable-dynamicplugin
 
-TEST_TARGET = check
-
 SAMPLECONF = /etc/opt/csw/snort/snort.conf
 
 include gar/category.mk

Modified: csw/mgar/pkg/sox/trunk/Makefile
===================================================================
--- csw/mgar/pkg/sox/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/sox/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -73,8 +73,6 @@
 
 BUILD64 = 1
 
-TEST_TARGET = check
-
 MERGE_DIRS_isa-extra = $(libdir)
 
 include gar/category.mk

Modified: csw/mgar/pkg/squid/trunk/Makefile
===================================================================
--- csw/mgar/pkg/squid/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/squid/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -57,8 +57,6 @@
 CONFIGURE_ARGS += --with-large-files
 CONFIGURE_ARGS += --with-openssl=$(prefix)
 
-TEST_TARGET = check
-
 PROTOTYPE_MODIFIERS      = varuser
 PROTOTYPE_FILES_varuser  = /var/opt/csw/squid/cache
 PROTOTYPE_FILES_varuser += /var/opt/csw/squid/logs

Modified: csw/mgar/pkg/squidclamav/trunk/Makefile
===================================================================
--- csw/mgar/pkg/squidclamav/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/squidclamav/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -29,8 +29,6 @@
 
 EXTRA_LINKER_FLAGS += -lrt -lnsl -lsocket
 
-TEST_TARGET = check
-
 EXTRA_DOCFILES = AUTHORS ChangeLog INSTALL NEWS README
 
 post-install-modulated:

Modified: csw/mgar/pkg/sudo/trunk/Makefile
===================================================================
--- csw/mgar/pkg/sudo/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/sudo/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -59,7 +59,6 @@
 #sysconfdir = /etc/opt/csw
 localstatedir = /var/opt/csw
 
-TEST_TARGET = check
 FIXCONFIG_DIRS = $(DESTDIR)$(libexecdir)
 
 PKGFILES_CSWsudo  = $(bindir)/sudo\.minimal

Modified: csw/mgar/pkg/sudo_ldap/trunk/Makefile
===================================================================
--- csw/mgar/pkg/sudo_ldap/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/sudo_ldap/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -47,7 +47,6 @@
 # sysconfdir = /etc/opt/csw
 localstatedir = /var/opt/csw
 
-TEST_TARGET = check
 FIXCONFIG_DIRS = $(DESTDIR)$(libexecdir)
 
 PKGFILES_CSWsudoldap  = $(bindir)/sudo\.ldap

Modified: csw/mgar/pkg/swig/trunk/Makefile
===================================================================
--- csw/mgar/pkg/swig/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/swig/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -54,7 +54,6 @@
 MAKE_ARGS += docs
 
 # Not sure if this was meant to run by non-developers
-TEST_TARGET = check
 TEST_SCRIPTS =
 
 #SWIG doesn't DEPEND on the languages it supports being installed

Modified: csw/mgar/pkg/taglib/trunk/Makefile
===================================================================
--- csw/mgar/pkg/taglib/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/taglib/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -53,8 +53,6 @@
 BUILD64 = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 
-TEST_TARGET = check
-
 # There are collisions with the existing taglib_gcc at the moment. These will go away
 # as soon as the updated taglib_gcc has been released.
 CHECKPKG_OVERRIDES_CSWlibtag-c0 += file-collision

Modified: csw/mgar/pkg/taglib_gcc/trunk/Makefile
===================================================================
--- csw/mgar/pkg/taglib_gcc/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/taglib_gcc/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -38,8 +38,6 @@
 prefix = $(BUILD_PREFIX)/kde-gcc
 CONFIGURE_ARGS = $(DIRPATHS)
 
-TEST_TARGET = check
-
 # This is a legacy lib, don't care too much about the naming for now.
 CHECKPKG_OVERRIDES_CSWtaglibgcc += shared-lib-package-contains-so-symlink|file=/opt/csw/kde-gcc/lib/libtag.so
 CHECKPKG_OVERRIDES_CSWtaglibgcc += shared-lib-package-contains-so-symlink|file=/opt/csw/kde-gcc/lib/libtag_c.so

Modified: csw/mgar/pkg/tcpstat/trunk/Makefile
===================================================================
--- csw/mgar/pkg/tcpstat/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/tcpstat/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -29,8 +29,6 @@
 
 CONFIGURE_ARGS = $(DIRPATHS)
 
-TEST_TARGET = check
-
 EXTRA_MERGE_EXCLUDE_FILES = .*/tcpprof\.1
 
 include gar/category.mk

Modified: csw/mgar/pkg/texinfo/trunk/Makefile
===================================================================
--- csw/mgar/pkg/texinfo/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/texinfo/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -30,8 +30,6 @@
 # required libraries don't offer optimized versions, hence no $ISALIST.
 NORUNPATH = 1
 
-TEST_TARGET = check
-
 EXTRA_MERGE_EXCLUDE_FILES = $(libdir)/charset.alias
 
 # Are these really needed? May investigate deeply later.

Modified: csw/mgar/pkg/textutils/trunk/Makefile
===================================================================
--- csw/mgar/pkg/textutils/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/textutils/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -16,8 +16,6 @@
 
 CONFIGURE_ARGS = $(DIRPATHS)
 
-TEST_TARGET = check
-
 include gar/category.mk
 
 # Solaris already has a 'sum'

Modified: csw/mgar/pkg/tnef/trunk/Makefile
===================================================================
--- csw/mgar/pkg/tnef/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/tnef/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -18,7 +18,6 @@
 
 NOISALIST = 1
 
-TEST_TARGET = check
 INSTALL_SCRIPTS = custom
 
 include gar/category.mk

Modified: csw/mgar/pkg/transmission/trunk/Makefile
===================================================================
--- csw/mgar/pkg/transmission/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/transmission/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -75,7 +75,6 @@
 CONFIGURE_ARGS = $(DIRPATHS) --enable-gtk --disable-silent-rules
 STRIP_LIBTOOL = 1
 
-TEST_TARGET = check
 CHECKPKG_OVERRIDES_CSWtransmissiongtk2 += surplus-dependency|CSWtransmission
 CHECKPKG_OVERRIDES_CSWtransmissiongtk2 += surplus-dependency|CSWdbus
 

Modified: csw/mgar/pkg/tre/trunk/Makefile
===================================================================
--- csw/mgar/pkg/tre/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/tre/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -18,8 +18,6 @@
 # PATCHFILES += 0002-manual-gnulib-integration-steps.patch
 # EXTRA_LD_OPTIONS = -lgnugetopt
 CONFIGURE_ARGS = $(DIRPATHS) --disable-agrep
-TEST_TARGET = check
-
 PACKAGES += CSWlibtre5
 SPKG_DESC_CSWlibtre5 = Approximate regex matching library (libtre.so.5)
 PKGFILES_CSWlibtre5 = /opt/csw/lib/.*libtre\.so\.5.*

Modified: csw/mgar/pkg/umfpack/trunk/Makefile
===================================================================
--- csw/mgar/pkg/umfpack/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/umfpack/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -35,6 +35,4 @@
 
 BUILD_OVERRIDE_DIRS = CFLAGS FFLAGS BLAS LAPACK
 
-TEST_TARGET = check
-
 include gar/category.mk

Modified: csw/mgar/pkg/unrtf/trunk/Makefile
===================================================================
--- csw/mgar/pkg/unrtf/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/unrtf/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -18,6 +18,4 @@
 
 CONFIGURE_ARGS = $(DIRPATHS)
 
-TEST_TARGET = check
-
 include gar/category.mk

Modified: csw/mgar/pkg/urxvt/trunk/Makefile
===================================================================
--- csw/mgar/pkg/urxvt/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/urxvt/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -37,7 +37,6 @@
 RUNTIME_DEP_PKGS_CSWurxvt += CSWlibxft2
 RUNTIME_DEP_PKGS_CSWurxvt += CSWlibxrender
 GARCOMPILER = GNU
-TEST_TARGET = check
 EXTRA_INC = /opt/csw/X11/include
 EXTRA_LIB = /opt/csw/X11/lib
 EXTRA_PKG_CONFIG_DIRS = /opt/csw/X11/lib

Modified: csw/mgar/pkg/varnish/trunk/Makefile
===================================================================
--- csw/mgar/pkg/varnish/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/varnish/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -28,8 +28,6 @@
 BUILD64 = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 
-TEST_TARGET = check
-
 include gar/category.mk
 
 pre-configure-modulated:

Modified: csw/mgar/pkg/webkit/trunk/Makefile
===================================================================
--- csw/mgar/pkg/webkit/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/webkit/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -55,8 +55,6 @@
 CONFIGURE_ARGS += --x-includes=$(prefix)/X11/include
 CONFIGURE_ARGS += --x-libraries=$(abspath $(prefix)/X11/lib/$(MM_LIBDIR))
 
-TEST_TARGET = check
-
 include gar/category.mk
 
 PATH := /opt/csw/gnu:$(PATH)

Modified: csw/mgar/pkg/which/trunk/Makefile
===================================================================
--- csw/mgar/pkg/which/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/which/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -18,8 +18,6 @@
 CONFIGURE_ARGS += --program-prefix=g
 CONFIGURE_ARGS += --disable-dependency-tracking
 
-TEST_TARGET = check
-
 BUILD64 = 1
 
 include gar/category.mk

Modified: csw/mgar/pkg/x11vnc/trunk/Makefile
===================================================================
--- csw/mgar/pkg/x11vnc/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/x11vnc/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -20,6 +20,4 @@
 
 CONFIGURE_ARGS = $(DIRPATHS)
 
-TEST_TARGET = check
-
 include gar/category.mk

Modified: csw/mgar/pkg/xchat/trunk/Makefile
===================================================================
--- csw/mgar/pkg/xchat/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/xchat/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -54,8 +54,6 @@
 
 ## run checkpkg manually
 ENABLE_CHECK = 0
-TEST_TARGET = check
-
 EXTRA_INC = $(prefix)/bdb44/include
 EXTRA_LIB = $(prefix)/bdb44/lib
 

Modified: csw/mgar/pkg/xerces-c/trunk/Makefile
===================================================================
--- csw/mgar/pkg/xerces-c/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/xerces-c/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -68,6 +68,4 @@
 # CONFIGURE_ARGS += --with-icu=$(prefix)
 # CONFIGURE_ARGS += --with-curl=$(prefix)
 
-TEST_TARGET = check
-
 include gar/category.mk

Modified: csw/mgar/pkg/xmlto/trunk/Makefile
===================================================================
--- csw/mgar/pkg/xmlto/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/xmlto/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -24,8 +24,6 @@
 # the long forms of -P (--no-dereference) and -p (--preserve).
 PATCHFILES = gcp-explicit-args.patch
 
-TEST_TARGET = check
-
 CHECKPKG_OVERRIDES_CSWxmlto += unidentified-dependency|CSWcoreutils
 CHECKPKG_OVERRIDES_CSWxmlto += surplus-dependency|CSWcoreutils
 CHECKPKG_OVERRIDES_CSWxmlto += surplus-dependency|CSWdocbookdtds

Modified: csw/mgar/pkg/zebra/trunk/Makefile
===================================================================
--- csw/mgar/pkg/zebra/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/zebra/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -25,8 +25,6 @@
 
 CONFIGURE_ARGS = $(DIRPATHS)
 
-TEST_TARGET = check
-
 EXTRA_PAX_ARGS = -s ",\.conf.sample\(.*\),.conf\1.CSW,p"
 
 SAMPLECONF = /etc/opt/csw/bgpd.conf

Modified: csw/mgar/pkg/zshdb/trunk/Makefile
===================================================================
--- csw/mgar/pkg/zshdb/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/zshdb/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -22,8 +22,6 @@
 
 CONFIGURE_ARGS = $(DIRPATHS)
 
-TEST_TARGET = check
-
 ARCHALL = 1
 
 include gar/category.mk

Modified: csw/mgar/pkg/zutils/trunk/Makefile
===================================================================
--- csw/mgar/pkg/zutils/trunk/Makefile	2012-01-23 09:58:23 UTC (rev 16880)
+++ csw/mgar/pkg/zutils/trunk/Makefile	2012-01-23 10:35:20 UTC (rev 16881)
@@ -37,8 +37,6 @@
 CONFIGURE_ARGS += CXXFLAGS="$(CXXFLAGS)"
 CONFIGURE_ARGS += LDFLAGS="$(LDFLAGS)"
 
-TEST_TARGET = check
-
 INSTALL_OVERRIDE_VARS = INSTALL
 INSTALL_OVERRIDE_VAR_INSTALL = /opt/csw/bin/ginstall
 

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


From dmichelsen at users.sourceforge.net  Mon Jan 23 13:12:17 2012
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Mon, 23 Jan 2012 12:12:17 +0000
Subject: [csw-devel] SF.net SVN: gar:[16882] csw/mgar/gar/v2/gar.mk
Message-ID: <E1RpIkz-00025o-EX@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 16882
          http://gar.svn.sourceforge.net/gar/?rev=16882&view=rev
Author:   dmichelsen
Date:     2012-01-23 12:12:17 +0000 (Mon, 23 Jan 2012)
Log Message:
-----------
mGAR v2: Enable ISA wildcards in EXTRA_PAX_ARGS

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

Modified: csw/mgar/gar/v2/gar.mk
===================================================================
--- csw/mgar/gar/v2/gar.mk	2012-01-23 10:35:20 UTC (rev 16881)
+++ csw/mgar/gar/v2/gar.mk	2012-01-23 12:12:17 UTC (rev 16882)
@@ -844,7 +844,7 @@
 # has not, so we use this one for appending.
 
 
-_PAX_ARGS = $(_INC_EXT_RULE) $(_EXTRA_PAX_ARGS) $(EXTRA_PAX_ARGS_$(MODULATION)) $(EXTRA_PAX_ARGS)
+_PAX_ARGS = $(_INC_EXT_RULE) $(_EXTRA_PAX_ARGS) $(call modulationvalue,EXTRA_PAX_ARGS) $(EXTRA_PAX_ARGS)
 
 define killprocandparent
 cpids() { \

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


From dmichelsen at users.sourceforge.net  Mon Jan 23 13:29:09 2012
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Mon, 23 Jan 2012 12:29:09 +0000
Subject: [csw-devel] SF.net SVN: gar:[16883]
	csw/mgar/pkg/ncurses/trunk/Makefile
Message-ID: <E1RpJ1J-0005OS-Hq@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 16883
          http://gar.svn.sourceforge.net/gar/?rev=16883&view=rev
Author:   dmichelsen
Date:     2012-01-23 12:29:09 +0000 (Mon, 23 Jan 2012)
Log Message:
-----------
/home/dam/csw/mgar/pkg/ncurses/trunk: Use wildcard in MERGE_SCRIPTS and MERGE_DIRS

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

Modified: csw/mgar/pkg/ncurses/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ncurses/trunk/Makefile	2012-01-23 12:12:17 UTC (rev 16882)
+++ csw/mgar/pkg/ncurses/trunk/Makefile	2012-01-23 12:29:09 UTC (rev 16883)
@@ -138,24 +138,15 @@
 
 TEST_TARGET = test
 
-MERGE_SCRIPTS_isa-sparcv8-widec-disable = copy-only copy-config-only
-   MERGE_DIRS_isa-sparcv8-widec-disable = $(libdir) $(includedir)
-MERGE_SCRIPTS_isa-sparcv9-widec-disable = copy-relocated-only copy-config-only
-   MERGE_DIRS_isa-sparcv9-widec-disable = $(libdir)
+MERGE_SCRIPTS_isa-default-widec-disable = copy-only copy-config-only
+   MERGE_DIRS_isa-default-widec-disable = $(libdir) $(includedir)
+MERGE_SCRIPTS_isa-extra-widec-disable = copy-relocated-only copy-config-only
+   MERGE_DIRS_isa-extra-widec-disable = $(libdir)
 
- MERGE_SCRIPTS_isa-sparcv8-widec-enable = copy-all
- MERGE_SCRIPTS_isa-sparcv9-widec-enable = copy-relocated-only copy-config-only
-    MERGE_DIRS_isa-sparcv9-widec-enable = $(libdir)
+ MERGE_SCRIPTS_isa-default-widec-enable = copy-all
+ MERGE_SCRIPTS_isa-extra-widec-enable = copy-relocated-only copy-config-only
+    MERGE_DIRS_isa-extra-widec-enable = $(libdir)
 
-   MERGE_SCRIPTS_isa-i386-widec-disable = copy-only copy-config-only
-      MERGE_DIRS_isa-i386-widec-disable = $(libdir) $(includedir)
-  MERGE_SCRIPTS_isa-amd64-widec-disable = copy-relocated-only copy-config-only
-     MERGE_DIRS_isa-amd64-widec-disable = $(libdir)
-
-    MERGE_SCRIPTS_isa-i386-widec-enable = copy-all
-   MERGE_SCRIPTS_isa-amd64-widec-enable = copy-relocated-only copy-config-only
-      MERGE_DIRS_isa-amd64-widec-enable = $(libdir)
-
 # This is termcap location which defaults to 
 #   /etc/termcap, /usr/share/misc/termcap and $HOME/.termcap
 # which I think is ok

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


From dmichelsen at users.sourceforge.net  Mon Jan 23 13:29:33 2012
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Mon, 23 Jan 2012 12:29:33 +0000
Subject: [csw-devel] SF.net SVN: gar:[16884]
	csw/mgar/pkg/libcurl4/trunk/Makefile
Message-ID: <E1RpJ1h-0002Mn-EX@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 16884
          http://gar.svn.sourceforge.net/gar/?rev=16884&view=rev
Author:   dmichelsen
Date:     2012-01-23 12:29:33 +0000 (Mon, 23 Jan 2012)
Log Message:
-----------
/home/dam/csw/mgar/pkg/libcurl4/trunk: Use wildcard in MERGE_SCRIPTS and MERGE_DIRS

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

Modified: csw/mgar/pkg/libcurl4/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libcurl4/trunk/Makefile	2012-01-23 12:29:09 UTC (rev 16883)
+++ csw/mgar/pkg/libcurl4/trunk/Makefile	2012-01-23 12:29:33 UTC (rev 16884)
@@ -117,10 +117,8 @@
 # We do special 32/64 merging for this one, see post-merge
 EXTRA_MERGE_EXCLUDE_FILES += $(includedir)/curl/curlbuild.h
 
-EXTRA_PAX_ARGS_isa-sparcv8-features-full += -s ",.*/libcurl\.so(\.\d+)?$$,," -s ",\(\.$(libdir)/libcurl\)\(\.so\.\d+\..*\),\1-feature\2,p"
-EXTRA_PAX_ARGS_isa-i386-features-full    += -s ",.*/libcurl\.so(\.\d+)?$$,," -s ",\(\.$(libdir)/libcurl\)\(\.so\.\d+\..*\),\1-feature\2,p"
-EXTRA_PAX_ARGS_isa-sparcv9-features-full += -s ",.*/libcurl\.so(\.\d+)?$$,," -s ",\.$(libdir)/libcurl\(\.so\.\d+\..*\),.$(libdir_install)/$(ISA)/libcurl-feature\1,p"
-EXTRA_PAX_ARGS_isa-amd64-features-full   += -s ",.*/libcurl\.so(\.\d+)?$$,," -s ",\.$(libdir)/libcurl\(\.so\.\d+\..*\),.$(libdir_install)/$(ISA)/libcurl-feature\1,p"
+EXTRA_PAX_ARGS_isa-default-features-full += -s ",.*/libcurl\.so(\.\d+)?$$,," -s ",\(\.$(libdir)/libcurl\)\(\.so\.\d+\..*\),\1-feature\2,p"
+EXTRA_PAX_ARGS_isa-extra-features-full += -s ",.*/libcurl\.so(\.\d+)?$$,," -s ",\.$(libdir)/libcurl\(\.so\.\d+\..*\),.$(libdir_install)/$(ISA)/libcurl-feature\1,p"
 
 # We select pkgconfig for minimal library bindings. As libneon is self-contained (links
 # to all necessary libs directly) the full version can simly be linked in.

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


From dmichelsen at users.sourceforge.net  Mon Jan 23 13:29:56 2012
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Mon, 23 Jan 2012 12:29:56 +0000
Subject: [csw-devel] SF.net SVN: gar:[16885]
	csw/mgar/pkg/libmm/trunk/Makefile
Message-ID: <E1RpJ24-0005P5-9k@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 16885
          http://gar.svn.sourceforge.net/gar/?rev=16885&view=rev
Author:   dmichelsen
Date:     2012-01-23 12:29:56 +0000 (Mon, 23 Jan 2012)
Log Message:
-----------
/home/dam/csw/mgar/pkg/libmm/trunk: Use wildcard in MERGE_SCRIPTS and MERGE_DIRS

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

Modified: csw/mgar/pkg/libmm/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libmm/trunk/Makefile	2012-01-23 12:29:33 UTC (rev 16884)
+++ csw/mgar/pkg/libmm/trunk/Makefile	2012-01-23 12:29:56 UTC (rev 16885)
@@ -42,23 +42,13 @@
 BUILD64 = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 
-MERGE_SCRIPTS_isa-i386-version-1.3.1 = copy-only
-MERGE_DIRS_isa-i386-version-1.3.1 = $(libdir)
-MERGE_SCRIPTS_isa-amd64-version-1.3.1 = copy-relocated-only
-MERGE_DIRS_isa-amd64-version-1.3.1 = $(libdir)
+MERGE_SCRIPTS_isa-default-version-1.3.1 = copy-only
+MERGE_DIRS_isa-default-version-1.3.1 = $(libdir)
+MERGE_SCRIPTS_isa-extra-version-1.3.1 = copy-relocated-only
+MERGE_DIRS_isa-extra-version-1.3.1 = $(libdir)
 
-MERGE_SCRIPTS_isa-i386-version-1.4.2 = copy-all
-MERGE_SCRIPTS_isa-amd64-version-1.4.2 = copy-relocated-only
-MERGE_DIRS_isa-amd64-version-1.4.2 = $(bindir) $(sbindir) $(libexecdir) $(libdir)
+MERGE_SCRIPTS_isa-default-version-1.4.2 = copy-all
+MERGE_SCRIPTS_isa-extra-version-1.4.2 = copy-relocated-only
+MERGE_DIRS_isa-extra-version-1.4.2 = $(bindir) $(sbindir) $(libexecdir) $(libdir)
 
-MERGE_SCRIPTS_isa-sparcv8-version-1.3.1 = copy-only
-MERGE_DIRS_isa-sparcv8-version-1.3.1 = $(libdir)
-MERGE_SCRIPTS_isa-sparcv9-version-1.3.1 = copy-relocated-only
-MERGE_DIRS_isa-sparcv9-version-1.3.1 = $(libdir)
-
-MERGE_SCRIPTS_isa-sparcv8-version-1.4.2 = copy-all
-MERGE_SCRIPTS_isa-sparcv9-version-1.4.2 = copy-relocated-only
-MERGE_DIRS_isa-sparcv9-version-1.4.2 = $(bindir) $(sbindir) $(libexecdir) $(libdir)
-
-
 include gar/category.mk

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


From dmichelsen at users.sourceforge.net  Mon Jan 23 13:30:18 2012
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Mon, 23 Jan 2012 12:30:18 +0000
Subject: [csw-devel] SF.net SVN: gar:[16886]
	csw/mgar/pkg/libneon27/trunk/Makefile
Message-ID: <E1RpJ2Q-0002OW-So@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 16886
          http://gar.svn.sourceforge.net/gar/?rev=16886&view=rev
Author:   dmichelsen
Date:     2012-01-23 12:30:18 +0000 (Mon, 23 Jan 2012)
Log Message:
-----------
/home/dam/csw/mgar/pkg/libneon27/trunk: Use wildcard in MERGE_SCRIPTS and MERGE_DIRS

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

Modified: csw/mgar/pkg/libneon27/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libneon27/trunk/Makefile	2012-01-23 12:29:56 UTC (rev 16885)
+++ csw/mgar/pkg/libneon27/trunk/Makefile	2012-01-23 12:30:18 UTC (rev 16886)
@@ -100,10 +100,8 @@
 EXTRA_PAX_ARGS_features-full = -s ",.*/pkgconfig.*,,"
 EXTRA_PAX_ARGS += $(EXTRA_PAX_ARGS_features-$(FEATURES))
 
-EXTRA_PAX_ARGS_isa-sparcv8-features-full += -s ",.*/libneon\.so(\.\d+)?$$,," -s ",\(\.$(libdir)/libneon\)\(\.so\.\d+\..*\),\1-feature\2,p"
-EXTRA_PAX_ARGS_isa-i386-features-full    += -s ",.*/libneon\.so(\.\d+)?$$,," -s ",\(\.$(libdir)/libneon\)\(\.so\.\d+\..*\),\1-feature\2,p"
-EXTRA_PAX_ARGS_isa-sparcv9-features-full += -s ",.*/libneon\.so(\.\d+)?$$,," -s ",\.$(libdir)/libneon\(\.so\.\d+\..*\),.$(libdir_install)/$(ISA)/libneon-feature\1,p"
-EXTRA_PAX_ARGS_isa-amd64-features-full   += -s ",.*/libneon\.so(\.\d+)?$$,," -s ",\.$(libdir)/libneon\(\.so\.\d+\..*\),.$(libdir_install)/$(ISA)/libneon-feature\1,p"
+EXTRA_PAX_ARGS_isa-default-features-full += -s ",.*/libneon\.so(\.\d+)?$$,," -s ",\(\.$(libdir)/libneon\)\(\.so\.\d+\..*\),\1-feature\2,p"
+EXTRA_PAX_ARGS_isa-extra-features-full += -s ",.*/libneon\.so(\.\d+)?$$,," -s ",\.$(libdir)/libneon\(\.so\.\d+\..*\),.$(libdir_install)/$(ISA)/libneon-feature\1,p"
 
 MERGE_SCRIPTS_isa-default-features-minimal = copy-all
 MERGE_SCRIPTS_isa-default64-features-minimal = copy-relocated-only
@@ -117,8 +115,8 @@
 
 include gar/category.mk
 
-post-build-isa-sparcv8-features-minimal post-build-isa-sparcv9-features-minimal post-build-isa-i386-features-minimal post-build-isa-amd64-features-minimal: EXTRA_LD_OPTIONS = -f libneon-feature.so.27
-post-build-isa-sparcv8-features-minimal post-build-isa-sparcv9-features-minimal post-build-isa-i386-features-minimal post-build-isa-amd64-features-minimal: 
+post-build-isa-$(ISA_DEFAULT)-features-minimal post-build-isa-$(ISA_DEFAULT64)-features-minimal: EXTRA_LD_OPTIONS = -f libneon-feature.so.27
+post-build-isa-$(ISA_DEFAULT)-features-minimal post-build-isa-$(ISA_DEFAULT64)-features-minimal:
 	rm -f $(WORKSRC)/src/libneon.la
 	$(BUILD_ENV) $(MAKE) $(PARALLELMFLAGS) $(foreach TTT,$(BUILD_OVERRIDE_VARS),$(TTT)="$(BUILD_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(BUILD_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $(WORKSRC) $(BUILD_ARGS)
 	@$(MAKECOOKIE)

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


From dmichelsen at users.sourceforge.net  Mon Jan 23 13:30:41 2012
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Mon, 23 Jan 2012 12:30:41 +0000
Subject: [csw-devel] SF.net SVN: gar:[16887] csw/mgar/pkg/flac/trunk/Makefile
Message-ID: <E1RpJ2n-0005Ql-4v@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 16887
          http://gar.svn.sourceforge.net/gar/?rev=16887&view=rev
Author:   dmichelsen
Date:     2012-01-23 12:30:40 +0000 (Mon, 23 Jan 2012)
Log Message:
-----------
/home/dam/csw/mgar/pkg/flac/trunk: Use wildcard in MERGE_SCRIPTS and MERGE_DIRS

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

Modified: csw/mgar/pkg/flac/trunk/Makefile
===================================================================
--- csw/mgar/pkg/flac/trunk/Makefile	2012-01-23 12:30:18 UTC (rev 16886)
+++ csw/mgar/pkg/flac/trunk/Makefile	2012-01-23 12:30:40 UTC (rev 16887)
@@ -83,34 +83,20 @@
 # XXX: Assembler optimization just doesn't work. Disable for now.
 CONFIGURE_ARGS += --disable-asm-optimizations
 
-MERGE_SCRIPTS_isa-i386-version-1.0.4 = copy-only
-MERGE_DIRS_isa-i386-version-1.0.4 = $(libdir)
-MERGE_SCRIPTS_isa-amd64-version-1.0.4 = copy-relocated-only
-MERGE_DIRS_isa-amd64-version-1.0.4 = $(libdir)
+MERGE_SCRIPTS_isa-default-version-1.0.4 = copy-only
+MERGE_DIRS_isa-default-version-1.0.4 = $(libdir)
+MERGE_SCRIPTS_isa-extra-version-1.0.4 = copy-relocated-only
+MERGE_DIRS_isa-extra-version-1.0.4 = $(libdir)
 
-MERGE_SCRIPTS_isa-i386-version-1.1.2 = copy-only
-MERGE_DIRS_isa-i386-version-1.1.2 = $(libdir)
-MERGE_SCRIPTS_isa-amd64-version-1.1.2 = copy-relocated-only
-MERGE_DIRS_isa-amd64-version-1.1.2 = $(libdir)
+MERGE_SCRIPTS_isa-default-version-1.1.2 = copy-only
+MERGE_DIRS_isa-default-version-1.1.2 = $(libdir)
+MERGE_SCRIPTS_isa-extra-version-1.1.2 = copy-relocated-only
+MERGE_DIRS_isa-extra-version-1.1.2 = $(libdir)
 
-MERGE_SCRIPTS_isa-i386-version-1.2.1 = copy-all
-MERGE_SCRIPTS_isa-amd64-version-1.2.1 = copy-relocated-only
-MERGE_DIRS_isa-amd64-version-1.2.1 = $(bindir) $(sbindir) $(libexecdir) $(libdir)
+MERGE_SCRIPTS_isa-default-version-1.2.1 = copy-all
+MERGE_SCRIPTS_isa-extra-version-1.2.1 = copy-relocated-only
+MERGE_DIRS_isa-extra-version-1.2.1 = $(bindir) $(sbindir) $(libexecdir) $(libdir)
 
-MERGE_SCRIPTS_isa-sparcv8-version-1.0.4 = copy-only
-MERGE_DIRS_isa-sparcv8-version-1.0.4 = $(libdir)
-MERGE_SCRIPTS_isa-sparcv9-version-1.0.4 = copy-relocated-only
-MERGE_DIRS_isa-sparcv9-version-1.0.4 = $(libdir)
-
-MERGE_SCRIPTS_isa-sparcv8-version-1.1.2 = copy-only
-MERGE_DIRS_isa-sparcv8-version-1.1.2 = $(libdir)
-MERGE_SCRIPTS_isa-sparcv9-version-1.1.2 = copy-relocated-only
-MERGE_DIRS_isa-sparcv9-version-1.1.2 = $(libdir)
-
-MERGE_SCRIPTS_isa-sparcv8-version-1.2.1 = copy-all
-MERGE_SCRIPTS_isa-sparcv9-version-1.2.1 = copy-relocated-only
-MERGE_DIRS_isa-sparcv9-version-1.2.1 = $(bindir) $(sbindir) $(libexecdir) $(libdir)
-
 PKGFILES_CSWxmmsflac = $(libdir)/xmms/.*
 
 include gar/category.mk

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


From cgrzemba at users.sourceforge.net  Mon Jan 23 13:57:07 2012
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Mon, 23 Jan 2012 12:57:07 +0000
Subject: [csw-devel] SF.net SVN: gar:[16888]
 csw/mgar/pkg/lang-java/389-admin-console/trunk/ Makefile
Message-ID: <E1RpJSN-0000eG-7t@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 16888
          http://gar.svn.sourceforge.net/gar/?rev=16888&view=rev
Author:   cgrzemba
Date:     2012-01-23 12:57:06 +0000 (Mon, 23 Jan 2012)
Log Message:
-----------
lang-java/389-admin-console/trunk: correct dependency

Modified Paths:
--------------
    csw/mgar/pkg/lang-java/389-admin-console/trunk/Makefile

Modified: csw/mgar/pkg/lang-java/389-admin-console/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-java/389-admin-console/trunk/Makefile	2012-01-23 12:30:40 UTC (rev 16887)
+++ csw/mgar/pkg/lang-java/389-admin-console/trunk/Makefile	2012-01-23 12:57:06 UTC (rev 16888)
@@ -17,7 +17,6 @@
 DISTFILES  = $(NAME)-$(VERSION).tar.bz2
 
 PACKAGES = CSW389-admin-console
-RUNTIME_DEP_PKGS = CSW389-admin
 BUILD_DEP_PKGS = CSWidm-console-base
 
 ARCHALL = 1

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


From cgrzemba at users.sourceforge.net  Mon Jan 23 14:00:28 2012
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Mon, 23 Jan 2012 13:00:28 +0000
Subject: [csw-devel] SF.net SVN: gar:[16889]
 csw/mgar/pkg/lang-java/389-ds-console/trunk/ Makefile
Message-ID: <E1RpJVc-0008CV-S2@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 16889
          http://gar.svn.sourceforge.net/gar/?rev=16889&view=rev
Author:   cgrzemba
Date:     2012-01-23 13:00:28 +0000 (Mon, 23 Jan 2012)
Log Message:
-----------
lang-java/389-ds-console/trunk: correct dependency

Modified Paths:
--------------
    csw/mgar/pkg/lang-java/389-ds-console/trunk/Makefile

Modified: csw/mgar/pkg/lang-java/389-ds-console/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-java/389-ds-console/trunk/Makefile	2012-01-23 12:57:06 UTC (rev 16888)
+++ csw/mgar/pkg/lang-java/389-ds-console/trunk/Makefile	2012-01-23 13:00:28 UTC (rev 16889)
@@ -17,7 +17,7 @@
 DISTFILES  = $(NAME)-$(VERSION).tar.bz2
 
 PACKAGES = CSW389-ds-console
-RUNTIME_DEP_PKGS = CSW389-admin
+BUILD_DEP_PKGS = CSWidm-console-base
 
 ARCHALL = 1
 PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
@@ -36,9 +36,6 @@
 INSTALL_SCRIPTS = custom
 
 CHECKPKG_OVERRIDES_CSW389-ds-console += pkginfo-description-not-starting-with-uppercase|389|Directory|Server|-|Management|Console|Plugin
-CHECKPKG_OVERRIDES_CSW389-ds-console += unidentified-dependency|CSW389-admin
-CHECKPKG_OVERRIDES_CSW389-ds-console += surplus-dependency|CSW389-admin
-# CHECKPKG_OVERRIDES_CSW389-ds-console += pkginfo-opencsw-repository-uncommitted
 
 include gar/category.mk
 

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


From cgrzemba at users.sourceforge.net  Mon Jan 23 14:01:13 2012
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Mon, 23 Jan 2012 13:01:13 +0000
Subject: [csw-devel] SF.net SVN: gar:[16890]
 csw/mgar/pkg/lang-java/389-admin-console/trunk/ Makefile
Message-ID: <E1RpJWL-0000jw-92@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 16890
          http://gar.svn.sourceforge.net/gar/?rev=16890&view=rev
Author:   cgrzemba
Date:     2012-01-23 13:01:13 +0000 (Mon, 23 Jan 2012)
Log Message:
-----------
lang-java/389-admin-console/trunk: correct dependency

Modified Paths:
--------------
    csw/mgar/pkg/lang-java/389-admin-console/trunk/Makefile

Modified: csw/mgar/pkg/lang-java/389-admin-console/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-java/389-admin-console/trunk/Makefile	2012-01-23 13:00:28 UTC (rev 16889)
+++ csw/mgar/pkg/lang-java/389-admin-console/trunk/Makefile	2012-01-23 13:01:13 UTC (rev 16890)
@@ -37,8 +37,6 @@
 
 CHECKPKG_OVERRIDES_CSW389-admin-console += file-with-bad-content|/usr/local|root/opt/csw/share/dirsrv/manual/en/admin/help/create_user_administrator_posix_user.html
 CHECKPKG_OVERRIDES_CSW389-admin-console += pkginfo-description-not-starting-with-uppercase|389|Directory|Server|-|Management|Console|Plugin|AdminServer
-CHECKPKG_OVERRIDES_CSW389-admin-console += unidentified-dependency|CSW389-admin
-CHECKPKG_OVERRIDES_CSW389-admin-console += surplus-dependency|CSW389-admin
 
 include gar/category.mk
 

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


From cgrzemba at users.sourceforge.net  Mon Jan 23 14:15:58 2012
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Mon, 23 Jan 2012 13:15:58 +0000
Subject: [csw-devel] SF.net SVN: gar:[16891]
 csw/mgar/pkg/389-ds-base/trunk/files/
 0003-add-user-and-var-run-dirsrv.patch
Message-ID: <E1RpJkc-0008Sa-B3@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 16891
          http://gar.svn.sourceforge.net/gar/?rev=16891&view=rev
Author:   cgrzemba
Date:     2012-01-23 13:15:58 +0000 (Mon, 23 Jan 2012)
Log Message:
-----------
389-ds-base/trunk: fix piddir problems

Modified Paths:
--------------
    csw/mgar/pkg/389-ds-base/trunk/files/0003-add-user-and-var-run-dirsrv.patch

Modified: csw/mgar/pkg/389-ds-base/trunk/files/0003-add-user-and-var-run-dirsrv.patch
===================================================================
--- csw/mgar/pkg/389-ds-base/trunk/files/0003-add-user-and-var-run-dirsrv.patch	2012-01-23 13:01:13 UTC (rev 16890)
+++ csw/mgar/pkg/389-ds-base/trunk/files/0003-add-user-and-var-run-dirsrv.patch	2012-01-23 13:15:58 UTC (rev 16891)
@@ -47,13 +47,14 @@
  
 +USER=`/usr/xpg4/bin/id -u -n`
 +export USER
-+[ -d /var/run/dirsrv ] && mkdir -p /var/run/dirsrv
++[ ! -d /var/opt/csw/run/dirsrv ] && mkdir -p /var/opt/csw/run/dirsrv
 +if [ -f /etc/opt/csw/dirsrv/admin-serv/adm.conf ]; then
 +  slapd-user=`grep SuiteSpotUserID /etc/opt/csw/dirsrv/admin-serv/adm.conf | cut -d: -f2 | tr -d [:space:]`
 +  slapd-group=`grep SuiteSpotGroup /etc/opt/csw/dirsrv/admin-serv/adm.conf | cut -d: -f2 | tr -d [:space:]`
-+  chown $slapd-user:$slapd-group /var/run/dirsrv
++  chown $slapd-user:$slapd-group /var/opt/csw/run/dirsrv
 +fi
-+chmod g+w /var/run/dirsrv
++chmod g+w /var/opt/csw/run/dirsrv
++chmod +rx /var/opt/csw/run
 +
  # how many seconds to wait for the startpid file to show
  # up before we assume there is a problem and fail to start

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


From dmichelsen at users.sourceforge.net  Mon Jan 23 14:43:55 2012
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Mon, 23 Jan 2012 13:43:55 +0000
Subject: [csw-devel] SF.net SVN: gar:[16892]
	csw/mgar/pkg/libmatroska/trunk/Makefile
Message-ID: <E1RpKBf-0001bp-Rm@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 16892
          http://gar.svn.sourceforge.net/gar/?rev=16892&view=rev
Author:   dmichelsen
Date:     2012-01-23 13:43:55 +0000 (Mon, 23 Jan 2012)
Log Message:
-----------
/home/dam/csw/mgar/pkg/libmatroska/trunk: Remove duplicate clauses

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

Modified: csw/mgar/pkg/libmatroska/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libmatroska/trunk/Makefile	2012-01-23 13:15:58 UTC (rev 16891)
+++ csw/mgar/pkg/libmatroska/trunk/Makefile	2012-01-23 13:43:55 UTC (rev 16892)
@@ -44,18 +44,8 @@
 
 LICENSE = LICENSE.LGPL
 
-BUILD64 = 1
-NOISALIST = 1
-
-CONFIGURE_SCRIPTS = 
-
-# Needed for shared library
-EXTRA_CFLAGS = -xcode=pic32
-EXTRA_CXXFLAGS = -xcode=pic32
-
 EXTRA_LINKER_FLAGS = -norunpath
 
-
 RUNTIME_DEP_PKGS = CSWlibebml3
 BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS)
 

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


From cgrzemba at users.sourceforge.net  Mon Jan 23 15:09:44 2012
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Mon, 23 Jan 2012 14:09:44 +0000
Subject: [csw-devel] SF.net SVN: gar:[16893] csw/mgar/pkg/389-admin/trunk
Message-ID: <E1RpKae-0004GD-Qi@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 16893
          http://gar.svn.sourceforge.net/gar/?rev=16893&view=rev
Author:   cgrzemba
Date:     2012-01-23 14:09:44 +0000 (Mon, 23 Jan 2012)
Log Message:
-----------
389-admin/trunk: disable SMF and optimization

Modified Paths:
--------------
    csw/mgar/pkg/389-admin/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/389-admin/trunk/files/0004-disable-SMF-service-at-install.patch
    csw/mgar/pkg/389-admin/trunk/files/0005-comment-out-httpd-thread-options-in-httpd.conf.patch

Modified: csw/mgar/pkg/389-admin/trunk/Makefile
===================================================================
--- csw/mgar/pkg/389-admin/trunk/Makefile	2012-01-23 13:43:55 UTC (rev 16892)
+++ csw/mgar/pkg/389-admin/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
@@ -23,6 +23,8 @@
 
 PATCHFILES += 0001-change-includedir-preference-in-Makefile.am.patch
 PATCHFILES += 0002-add-i386-platform-to-configure.ac.patch
+PATCHFILES += 0004-disable-SMF-service-at-install.patch
+PATCHFILES += 0005-comment-out-httpd-thread-options-in-httpd.conf.patch
 
 PACKAGES += CSWlibds-admin-serv0
 CATALOGNAME_CSWlibds-admin-serv0 = libds_admin_serv0
@@ -66,11 +68,17 @@
 RUNTIME_DEP_PKGS_CSW389admin += CSWlibiconv2
 RUNTIME_DEP_PKGS_CSW389admin += CSWlibssl3
 RUNTIME_DEP_PKGS_CSW389admin += CSWlibnss3
+RUNTIME_DEP_PKGS_CSW389admin += CSW389-admin-console
+RUNTIME_DEP_PKGS_CSW389admin += CSW389-ds-console
 CHECKPKG_OVERRIDES_CSW389admin += surplus-dependency|CSWap2modnss
 CHECKPKG_OVERRIDES_CSW389admin += surplus-dependency|CSWapache2
+CHECKPKG_OVERRIDES_CSW389admin += surplus-dependency|CSW389-admin-console
+CHECKPKG_OVERRIDES_CSW389admin += surplus-dependency|CSW389-ds-console
 
 # remove -I/opt/csw/include
 CPPFLAGS = 
+# no optimization
+CFLAGS = 
 EXTRA_LINKER_FLAGS = -xnorunpath -norunpath -liconv
 
 CONFIGURE_ARGS = $(DIRPATHS)

Added: csw/mgar/pkg/389-admin/trunk/files/0004-disable-SMF-service-at-install.patch
===================================================================
--- csw/mgar/pkg/389-admin/trunk/files/0004-disable-SMF-service-at-install.patch	                        (rev 0)
+++ csw/mgar/pkg/389-admin/trunk/files/0004-disable-SMF-service-at-install.patch	2012-01-23 14:09:44 UTC (rev 16893)
@@ -0,0 +1,25 @@
+From fc16535d4003f8fc7df6f451b6c785e975ce9bc0 Mon Sep 17 00:00:00 2001
+From: Carsten Grzemba <cgrzemba at opencsw.org>
+Date: Mon, 23 Jan 2012 14:27:18 +0100
+Subject: [PATCH 4/5] disable SMF service at install
+
+---
+ wrappers/initscript.in |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/wrappers/initscript.in b/wrappers/initscript.in
+index 82dd20e..2971c35 100644
+--- a/wrappers/initscript.in
++++ b/wrappers/initscript.in
+@@ -7,6 +7,8 @@
+ # processname: @sbindir@/httpd
+ # piddir:      @localstatedir@/run/@PACKAGE_BASE_NAME@
+ #
++#AUTOENABLE no # no CSW SMF enable at install!
++#
+ 
+ # Source function library.
+ if [ -f /etc/rc.d/init.d/functions ] ; then
+-- 
+1.7.8.3
+

Added: csw/mgar/pkg/389-admin/trunk/files/0005-comment-out-httpd-thread-options-in-httpd.conf.patch
===================================================================
--- csw/mgar/pkg/389-admin/trunk/files/0005-comment-out-httpd-thread-options-in-httpd.conf.patch	                        (rev 0)
+++ csw/mgar/pkg/389-admin/trunk/files/0005-comment-out-httpd-thread-options-in-httpd.conf.patch	2012-01-23 14:09:44 UTC (rev 16893)
@@ -0,0 +1,29 @@
+From 0fde3ae66c2bbca4d211ad8a232b488ab3b389cc Mon Sep 17 00:00:00 2001
+From: Carsten Grzemba <cgrzemba at opencsw.org>
+Date: Mon, 23 Jan 2012 14:29:10 +0100
+Subject: [PATCH 5/5] comment out httpd thread options in httpd.conf
+
+---
+ admserv/cfgstuff/httpd.conf.in |    6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/admserv/cfgstuff/httpd.conf.in b/admserv/cfgstuff/httpd.conf.in
+index a66eb21..ea12a56 100644
+--- a/admserv/cfgstuff/httpd.conf.in
++++ b/admserv/cfgstuff/httpd.conf.in
+@@ -102,9 +102,9 @@ StartServers 1
+ ServerLimit 1
+ 
+ MaxClients 64
+-MinSpareThreads 32
+-MaxSpareThreads 64
+-ThreadsPerChild 64
++# MinSpareThreads 32
++# MaxSpareThreads 64
++# ThreadsPerChild 64
+ 
+ #
+ # Dynamic Shared Object (DSO) Support
+-- 
+1.7.8.3
+

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


From dmichelsen at users.sourceforge.net  Mon Jan 23 15:12:33 2012
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Mon, 23 Jan 2012 14:12:33 +0000
Subject: [csw-devel] SF.net SVN: gar:[16894] csw/mgar
Message-ID: <E1RpKdN-0004Kg-Pi@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 16894
          http://gar.svn.sourceforge.net/gar/?rev=16894&view=rev
Author:   dmichelsen
Date:     2012-01-23 14:12:28 +0000 (Mon, 23 Jan 2012)
Log Message:
-----------
WHOLE TREE: Change semantics of BUILD64, add BUILD64_LIBS_ONLY

Modified Paths:
--------------
    csw/mgar/gar/v2/gar.conf.mk
    csw/mgar/gar/v2/gar.mk
    csw/mgar/pkg/GeoIP/trunk/Makefile
    csw/mgar/pkg/adns/trunk/Makefile
    csw/mgar/pkg/apr-iconv/trunk/Makefile
    csw/mgar/pkg/apr-util/trunk/Makefile
    csw/mgar/pkg/argtable/trunk/Makefile
    csw/mgar/pkg/audiofile/trunk/Makefile
    csw/mgar/pkg/autotrace/trunk/Makefile
    csw/mgar/pkg/babl/trunk/Makefile
    csw/mgar/pkg/bdb3/trunk/Makefile
    csw/mgar/pkg/boost/trunk/Makefile
    csw/mgar/pkg/bzip2/trunk/Makefile
    csw/mgar/pkg/c-ares/trunk/Makefile
    csw/mgar/pkg/cfengine3/trunk/Makefile
    csw/mgar/pkg/cfitsio/trunk/Makefile
    csw/mgar/pkg/chmlib/trunk/Makefile
    csw/mgar/pkg/chrpath/trunk/Makefile
    csw/mgar/pkg/cloog/trunk/Makefile
    csw/mgar/pkg/cpptest/trunk/Makefile
    csw/mgar/pkg/cups/trunk/Makefile
    csw/mgar/pkg/dbus/trunk/Makefile
    csw/mgar/pkg/dbus-glib/trunk/Makefile
    csw/mgar/pkg/eet/trunk/Makefile
    csw/mgar/pkg/eina/trunk/Makefile
    csw/mgar/pkg/enchant/trunk/Makefile
    csw/mgar/pkg/esound/trunk/Makefile
    csw/mgar/pkg/evolution/trunk/Makefile
    csw/mgar/pkg/evolution-ds/trunk/Makefile
    csw/mgar/pkg/evolution-exchange/trunk/Makefile
    csw/mgar/pkg/evolution-mapi/trunk/Makefile
    csw/mgar/pkg/evolution-webcal/trunk/Makefile
    csw/mgar/pkg/examples/64-bit/trunk/Makefile
    csw/mgar/pkg/examples/multiple-versions/trunk/Makefile
    csw/mgar/pkg/exiv2/trunk/Makefile
    csw/mgar/pkg/expect/trunk/Makefile
    csw/mgar/pkg/fbopenssl/trunk/Makefile
    csw/mgar/pkg/ffmpeg/trunk/Makefile
    csw/mgar/pkg/file/trunk/Makefile
    csw/mgar/pkg/fltk/trunk/Makefile
    csw/mgar/pkg/fontconfig/trunk/Makefile
    csw/mgar/pkg/freedesktop/libxcb/trunk/Makefile
    csw/mgar/pkg/freedesktop/xcb-util/trunk/Makefile
    csw/mgar/pkg/freedesktop/xcbproto/trunk/Makefile
    csw/mgar/pkg/freeglut/trunk/Makefile
    csw/mgar/pkg/freetds/trunk/Makefile
    csw/mgar/pkg/freetype/trunk/Makefile
    csw/mgar/pkg/fribidi/trunk/Makefile
    csw/mgar/pkg/ftgl/trunk/Makefile
    csw/mgar/pkg/gamin/trunk/Makefile
    csw/mgar/pkg/ganglia/trunk/Makefile
    csw/mgar/pkg/ganglia-modules-solaris/trunk/Makefile
    csw/mgar/pkg/gd/trunk/Makefile
    csw/mgar/pkg/gdbm/trunk/Makefile
    csw/mgar/pkg/gdk-pixbuf/trunk/Makefile
    csw/mgar/pkg/gdome2/trunk/Makefile
    csw/mgar/pkg/gengetopt/trunk/Makefile
    csw/mgar/pkg/gettext/trunk/Makefile
    csw/mgar/pkg/giflib/trunk/Makefile
    csw/mgar/pkg/gkrellm/trunk/Makefile
    csw/mgar/pkg/glew/trunk/Makefile
    csw/mgar/pkg/glib2/trunk/Makefile
    csw/mgar/pkg/glibmm/trunk/Makefile
    csw/mgar/pkg/gnome-base/gconf-editor/trunk/Makefile
    csw/mgar/pkg/gnome-base/gconf2/trunk/Makefile
    csw/mgar/pkg/gnome-base/gnomedesktop/trunk/Makefile
    csw/mgar/pkg/gnome-base/gnomevfs2/trunk/Makefile
    csw/mgar/pkg/gnome-base/libbonobo2/trunk/Makefile
    csw/mgar/pkg/gnome-base/libgnomecanvas/trunk/Makefile
    csw/mgar/pkg/gnome-base/orbit2/trunk/Makefile
    csw/mgar/pkg/gnulib/trunk/Makefile
    csw/mgar/pkg/gnupg2/trunk/Makefile
    csw/mgar/pkg/gnupg_minimal/trunk/Makefile
    csw/mgar/pkg/gnutls/trunk/Makefile
    csw/mgar/pkg/googletest/trunk/Makefile
    csw/mgar/pkg/gpgme/trunk/Makefile
    csw/mgar/pkg/gsasl/trunk/Makefile
    csw/mgar/pkg/gsm/trunk/Makefile
    csw/mgar/pkg/gtk2/trunk/Makefile
    csw/mgar/pkg/gts/trunk/Makefile
    csw/mgar/pkg/guile/trunk/Makefile
    csw/mgar/pkg/host-sflow/trunk/Makefile
    csw/mgar/pkg/hwloc/trunk/Makefile
    csw/mgar/pkg/id3lib/trunk/Makefile
    csw/mgar/pkg/idzebra/trunk/Makefile
    csw/mgar/pkg/ilmbase/trunk/Makefile
    csw/mgar/pkg/ilmbase2/trunk/Makefile
    csw/mgar/pkg/imlib/trunk/Makefile
    csw/mgar/pkg/imlib2/trunk/Makefile
    csw/mgar/pkg/imlib2_loaders/trunk/Makefile
    csw/mgar/pkg/jack/trunk/Makefile
    csw/mgar/pkg/krb5/trunk/Makefile
    csw/mgar/pkg/krb5-lib/trunk/Makefile
    csw/mgar/pkg/lame/trunk/Makefile
    csw/mgar/pkg/lensfun/trunk/Makefile
    csw/mgar/pkg/liba52/trunk/Makefile
    csw/mgar/pkg/libao/trunk/Makefile
    csw/mgar/pkg/libao2/trunk/Makefile
    csw/mgar/pkg/libarchive/trunk/Makefile
    csw/mgar/pkg/libart/trunk/Makefile
    csw/mgar/pkg/libassuan/trunk/Makefile
    csw/mgar/pkg/libast/trunk/Makefile
    csw/mgar/pkg/libatk/trunk/Makefile
    csw/mgar/pkg/libcairo/trunk/Makefile
    csw/mgar/pkg/libcddb/trunk/Makefile
    csw/mgar/pkg/libcdio/trunk/Makefile
    csw/mgar/pkg/libconfuse/trunk/Makefile
    csw/mgar/pkg/libcroco/trunk/Makefile
    csw/mgar/pkg/libdatrie/trunk/Makefile
    csw/mgar/pkg/libdbi/trunk/Makefile
    csw/mgar/pkg/libdbi-drivers/trunk/Makefile
    csw/mgar/pkg/libdnet/trunk/Makefile
    csw/mgar/pkg/libebml/trunk/Makefile
    csw/mgar/pkg/libeggdbus/trunk/Makefile
    csw/mgar/pkg/libemf/trunk/Makefile
    csw/mgar/pkg/libev/trunk/Makefile
    csw/mgar/pkg/libevent/trunk/Makefile
    csw/mgar/pkg/libevent2/trunk/Makefile
    csw/mgar/pkg/libexif/trunk/Makefile
    csw/mgar/pkg/libexpat0/trunk/Makefile
    csw/mgar/pkg/libexplain/trunk/Makefile
    csw/mgar/pkg/libfaac/trunk/Makefile
    csw/mgar/pkg/libfaad2/trunk/Makefile
    csw/mgar/pkg/libffi/trunk/Makefile
    csw/mgar/pkg/libfishsound/trunk/Makefile
    csw/mgar/pkg/libflac8/trunk/Makefile
    csw/mgar/pkg/libfpx/trunk/Makefile
    csw/mgar/pkg/libgadu/trunk/Makefile
    csw/mgar/pkg/libgc/trunk/Makefile
    csw/mgar/pkg/libgcrypt/trunk/Makefile
    csw/mgar/pkg/libgdbm3/trunk/Makefile
    csw/mgar/pkg/libglade2/trunk/Makefile
    csw/mgar/pkg/libgmp/trunk/Makefile
    csw/mgar/pkg/libgmp3/trunk/Makefile
    csw/mgar/pkg/libgnugetopt/trunk/Makefile
    csw/mgar/pkg/libgpg_error/trunk/Makefile
    csw/mgar/pkg/libgsf/trunk/Makefile
    csw/mgar/pkg/libgss/trunk/Makefile
    csw/mgar/pkg/libical/trunk/Makefile
    csw/mgar/pkg/libiconv/trunk/Makefile
    csw/mgar/pkg/libicu46/trunk/Makefile
    csw/mgar/pkg/libicu48/trunk/Makefile
    csw/mgar/pkg/libid3tag/trunk/Makefile
    csw/mgar/pkg/libidl/trunk/Makefile
    csw/mgar/pkg/libidn/trunk/Makefile
    csw/mgar/pkg/libiptcdata/trunk/Makefile
    csw/mgar/pkg/libjpeg62/trunk/Makefile
    csw/mgar/pkg/libkate/trunk/Makefile
    csw/mgar/pkg/libksba/trunk/Makefile
    csw/mgar/pkg/liblasi/trunk/Makefile
    csw/mgar/pkg/liblqr/trunk/Makefile
    csw/mgar/pkg/libmad/trunk/Makefile
    csw/mgar/pkg/libmatio/trunk/Makefile
    csw/mgar/pkg/libmatroska/trunk/Makefile
    csw/mgar/pkg/libmcal/trunk/Makefile
    csw/mgar/pkg/libmcrypt/trunk/Makefile
    csw/mgar/pkg/libmhash/trunk/Makefile
    csw/mgar/pkg/libmikmod/trunk/Makefile
    csw/mgar/pkg/libmpeg2/trunk/Makefile
    csw/mgar/pkg/libmpfr/trunk/Makefile
    csw/mgar/pkg/libnet/trunk/Makefile
    csw/mgar/pkg/libnotify/trunk/Makefile
    csw/mgar/pkg/libntlm/trunk/Makefile
    csw/mgar/pkg/libogg/trunk/Makefile
    csw/mgar/pkg/liboggz/trunk/Makefile
    csw/mgar/pkg/liboil/trunk/Makefile
    csw/mgar/pkg/liborc/trunk/Makefile
    csw/mgar/pkg/libpaper/trunk/Makefile
    csw/mgar/pkg/libpng/trunk/Makefile
    csw/mgar/pkg/libpopt/trunk/Makefile
    csw/mgar/pkg/libproxy/trunk/Makefile
    csw/mgar/pkg/libsamplerate/trunk/Makefile
    csw/mgar/pkg/libschroedinger/trunk/Makefile
    csw/mgar/pkg/libsdl/trunk/Makefile
    csw/mgar/pkg/libsexy/trunk/Makefile
    csw/mgar/pkg/libshout/trunk/Makefile
    csw/mgar/pkg/libsigcpp/trunk/Makefile
    csw/mgar/pkg/libsigsegv/trunk/Makefile
    csw/mgar/pkg/libsigsegv0/trunk/Makefile
    csw/mgar/pkg/libsmi/trunk/Makefile
    csw/mgar/pkg/libsndfile/trunk/Makefile
    csw/mgar/pkg/libsoup/trunk/Makefile
    csw/mgar/pkg/libspectre/trunk/Makefile
    csw/mgar/pkg/libspf2/trunk/Makefile
    csw/mgar/pkg/libssh2/trunk/Makefile
    csw/mgar/pkg/libstatgrab/trunk/Makefile
    csw/mgar/pkg/libstlport/trunk/Makefile
    csw/mgar/pkg/libtasn1/trunk/Makefile
    csw/mgar/pkg/libthai/trunk/Makefile
    csw/mgar/pkg/libtheora/trunk/Makefile
    csw/mgar/pkg/libtorrent/trunk/Makefile
    csw/mgar/pkg/libunique/trunk/Makefile
    csw/mgar/pkg/libunistring/trunk/Makefile
    csw/mgar/pkg/liburiparser/trunk/Makefile
    csw/mgar/pkg/libvorbis/trunk/Makefile
    csw/mgar/pkg/libwebp/trunk/Makefile
    csw/mgar/pkg/libwnck/trunk/Makefile
    csw/mgar/pkg/libxdg-basedir/trunk/Makefile
    csw/mgar/pkg/libxml++/trunk/Makefile
    csw/mgar/pkg/libxslt/trunk/Makefile
    csw/mgar/pkg/libxspf/trunk/Makefile
    csw/mgar/pkg/libyaml/trunk/Makefile
    csw/mgar/pkg/loudmouth/trunk/Makefile
    csw/mgar/pkg/lpc10/trunk/Makefile
    csw/mgar/pkg/lzlib/trunk/Makefile
    csw/mgar/pkg/lzo/trunk/Makefile
    csw/mgar/pkg/mbuffer/trunk/Makefile
    csw/mgar/pkg/mcrypt/trunk/Makefile
    csw/mgar/pkg/memcached/trunk/Makefile
    csw/mgar/pkg/mibdump/trunk/Makefile
    csw/mgar/pkg/mod_nss/trunk/Makefile
    csw/mgar/pkg/mozldap/trunk/Makefile
    csw/mgar/pkg/mpc/trunk/Makefile
    csw/mgar/pkg/mpeg4ip/trunk/Makefile
    csw/mgar/pkg/mpg123/trunk/Makefile
    csw/mgar/pkg/netcdf/trunk/Makefile
    csw/mgar/pkg/netsnmp/trunk/Makefile
    csw/mgar/pkg/nettle/trunk/Makefile
    csw/mgar/pkg/nspr/trunk/Makefile
    csw/mgar/pkg/oniguruma/trunk/Makefile
    csw/mgar/pkg/opendbx/trunk/Makefile
    csw/mgar/pkg/openexr/trunk/Makefile
    csw/mgar/pkg/openjpeg/trunk/Makefile
    csw/mgar/pkg/openldap23/trunk/Makefile
    csw/mgar/pkg/oracle-instantclient/trunk/Makefile
    csw/mgar/pkg/otr/trunk/Makefile
    csw/mgar/pkg/p11-kit/trunk/Makefile
    csw/mgar/pkg/p4/trunk/Makefile
    csw/mgar/pkg/pakchois/trunk/Makefile
    csw/mgar/pkg/pango/trunk/Makefile
    csw/mgar/pkg/pango-libthai/trunk/Makefile
    csw/mgar/pkg/pcre/trunk/Makefile
    csw/mgar/pkg/perl/trunk/Makefile
    csw/mgar/pkg/pixman/trunk/Makefile
    csw/mgar/pkg/plib/trunk/Makefile
    csw/mgar/pkg/pngwriter/trunk/Makefile
    csw/mgar/pkg/poppler/trunk/Makefile
    csw/mgar/pkg/postgresql/trunk/Makefile
    csw/mgar/pkg/ppl/trunk/Makefile
    csw/mgar/pkg/proj/trunk/Makefile
    csw/mgar/pkg/protobuf/trunk/Makefile
    csw/mgar/pkg/pth/trunk/Makefile
    csw/mgar/pkg/pulseaudio/trunk/Makefile
    csw/mgar/pkg/qhull/trunk/Makefile
    csw/mgar/pkg/readline/trunk/Makefile
    csw/mgar/pkg/readline43/trunk/Makefile
    csw/mgar/pkg/readline52/trunk/Makefile
    csw/mgar/pkg/rrdtool/trunk/Makefile
    csw/mgar/pkg/rtmpdump/trunk/Makefile
    csw/mgar/pkg/sasl/trunk/Makefile
    csw/mgar/pkg/scintilla/trunk/Makefile
    csw/mgar/pkg/sharutils/trunk/Makefile
    csw/mgar/pkg/slang/trunk/Makefile
    csw/mgar/pkg/sox/trunk/Makefile
    csw/mgar/pkg/speex/trunk/Makefile
    csw/mgar/pkg/startup-notification/trunk/Makefile
    csw/mgar/pkg/svrcore/trunk/Makefile
    csw/mgar/pkg/taglib/trunk/Makefile
    csw/mgar/pkg/talloc/trunk/Makefile
    csw/mgar/pkg/tcpwrappers/trunk/Makefile
    csw/mgar/pkg/tre/trunk/Makefile
    csw/mgar/pkg/twolame/trunk/Makefile
    csw/mgar/pkg/umfpack/trunk/Makefile
    csw/mgar/pkg/unixodbc/trunk/Makefile
    csw/mgar/pkg/unixodbc-libodbc1/trunk/Makefile
    csw/mgar/pkg/urt/trunk/Makefile
    csw/mgar/pkg/varnish/trunk/Makefile
    csw/mgar/pkg/wavpack/trunk/Makefile
    csw/mgar/pkg/which/trunk/Makefile
    csw/mgar/pkg/wmf/trunk/Makefile
    csw/mgar/pkg/x11/liblbxutil/trunk/Makefile
    csw/mgar/pkg/x11/liboldx/trunk/Makefile
    csw/mgar/pkg/x11/libwindowswm/trunk/Makefile
    csw/mgar/pkg/x11/libxevie/trunk/Makefile
    csw/mgar/pkg/x11/libxkbui/trunk/Makefile
    csw/mgar/pkg/x11/libxp/trunk/Makefile
    csw/mgar/pkg/x11/libxprintapputil/trunk/Makefile
    csw/mgar/pkg/x11/libxprintutil/trunk/Makefile
    csw/mgar/pkg/x11/libxtrap/trunk/Makefile
    csw/mgar/pkg/xerces-c/trunk/Makefile
    csw/mgar/pkg/xfce/libxfce4menu/trunk/Makefile
    csw/mgar/pkg/xfce/libxfce4util/trunk/Makefile
    csw/mgar/pkg/xfce/libxfcegui4/trunk/Makefile
    csw/mgar/pkg/xfce/xfconf/trunk/Makefile
    csw/mgar/pkg/xmlrpc_c/trunk/Makefile
    csw/mgar/pkg/xz/trunk/Makefile
    csw/mgar/pkg/yaz/trunk/Makefile
    csw/mgar/pkg/zlib/trunk/Makefile

Modified: csw/mgar/gar/v2/gar.conf.mk
===================================================================
--- csw/mgar/gar/v2/gar.conf.mk	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/gar/v2/gar.conf.mk	2012-01-23 14:12:28 UTC (rev 16894)
@@ -503,7 +503,7 @@
 # Just keeps the first appearance of each word
 remove-duplicates = $(if $1,$(firstword $1) $(call remove-duplicates,$(filter-out $(firstword $1),$1)))
 
-REQUESTED_ISAS ?= $(strip $(call remove-duplicates,$(foreach A,$(GARCHLIST),$(ISA_DEFAULT_$A) $(if $(BUILD64),$(ISA_DEFAULT64_$A)) $(EXTRA_BUILD_ISAS_$A)) $(EXTRA_BUILD_ISAS)))
+REQUESTED_ISAS ?= $(strip $(call remove-duplicates,$(foreach A,$(GARCHLIST),$(ISA_DEFAULT_$A) $(if $(or $(BUILD64),$(BUILD64_LIBS_ONLY)),$(ISA_DEFAULT64_$A)) $(EXTRA_BUILD_ISAS_$A)) $(EXTRA_BUILD_ISAS)))
 NEEDED_ISAS ?= $(strip $(filter     $(ISALIST_$(KERNELISA)),$(filter $(ISALIST_$(ISA_DEFAULT64_$(GARCH))),$(REQUESTED_ISAS))) \
                        $(filter-out $(ISALIST_$(KERNELISA)),$(filter $(ISALIST_$(ISA_DEFAULT64_$(GARCH))),$(REQUESTED_ISAS))))
 BUILD_ISAS ?= $(filter $(ISALIST_$(KERNELISA)),$(NEEDED_ISAS))

Modified: csw/mgar/gar/v2/gar.mk
===================================================================
--- csw/mgar/gar/v2/gar.mk	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/gar/v2/gar.mk	2012-01-23 14:12:28 UTC (rev 16894)
@@ -767,7 +767,7 @@
 else
 ISAEXEC_DIRS ?= $(if $(ISAEXEC),$(bindir) $(sbindir) $(libexecdir))
 MERGE_DIRS_isa-default ?= $(EXTRA_MERGE_DIRS) $(EXTRA_MERGE_DIRS_isa-$(ISA_DEFAULT))
-MERGE_DIRS_isa-extra ?= $(if $(ISAEXEC),$(bindir) $(sbindir) $(libexecdir)) $(libdir) $(EXTRA_MERGE_DIRS) $(EXTRA_MERGE_DIRS_isa-extra) $(EXTRA_MERGE_DIRS_isa-$(ISA))
+MERGE_DIRS_isa-extra ?= $(if $(or $(BUILD64),$(ISAEXEC)),$(bindir) $(sbindir) $(libexecdir)) $(libdir) $(EXTRA_MERGE_DIRS) $(EXTRA_MERGE_DIRS_isa-extra) $(EXTRA_MERGE_DIRS_isa-$(ISA))
 MERGE_DIRS_$(MODULATION_ISACOLLAPSED64) ?= $(MERGE_DIRS_$(MODULATION_ISACOLLAPSEDEXTRA))
 MERGE_DIRS_$(MODULATION) ?= $(MERGE_DIRS_$(MODULATION_ISACOLLAPSED))
 

Modified: csw/mgar/pkg/GeoIP/trunk/Makefile
===================================================================
--- csw/mgar/pkg/GeoIP/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/GeoIP/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -30,7 +30,7 @@
 
 EXTRA_MERGE_EXCLUDE_FILES = .*GeoIP.dat$
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 STRIP_LIBTOOL = 1
 
 CONFIGURE_ARGS  = $(DIRPATHS)

Modified: csw/mgar/pkg/adns/trunk/Makefile
===================================================================
--- csw/mgar/pkg/adns/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/adns/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -29,7 +29,7 @@
 SPKG_DESC_CSWlibadns1 = Advanced, easy to use, asynchronous-capable DNS client library, libadns.so.1
 PKGFILES_CSWlibadns1 += $(call pkgfiles_lib,libadns.so.1)
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 BUILD_OVERRIDE_VARS = MKSHLIB_1 MKSHLIB_3
 BUILD_OVERRIDE_VAR_MKSHLIB_1 = $(CC) $(LDFLAGS) -G -h $$(SHLIBSONAME) -o

Modified: csw/mgar/pkg/apr-iconv/trunk/Makefile
===================================================================
--- csw/mgar/pkg/apr-iconv/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/apr-iconv/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -19,7 +19,7 @@
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --with-apr=$(prefix)/bin/apr-1-config
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 STRIP_LIBTOOL = 1
 
 include gar/category.mk

Modified: csw/mgar/pkg/apr-util/trunk/Makefile
===================================================================
--- csw/mgar/pkg/apr-util/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/apr-util/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -78,7 +78,7 @@
 # EXTRA_INC += $(prefix)/instantclient_10_2/$(MM_LIBDIR)/sdk/include
 # EXTRA_LIB += $(prefix)/instantclient_10_2
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 NOISALIST = 1
 
 CONFIGURE_ARGS = $(DIRPATHS)

Modified: csw/mgar/pkg/argtable/trunk/Makefile
===================================================================
--- csw/mgar/pkg/argtable/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/argtable/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -36,6 +36,6 @@
 
 EXTRA_LDFLAGS = -lintl
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 include gar/category.mk

Modified: csw/mgar/pkg/audiofile/trunk/Makefile
===================================================================
--- csw/mgar/pkg/audiofile/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/audiofile/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -37,11 +37,7 @@
 # PKGFILES is catchall
 RUNTIME_DEP_PKGS_CSWlibaudiofile-dev = CSWlibaudiofile0
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 
-MERGE_SCRIPTS_isa-extra += copy-config-only
-MERGE_SCRIPTS_isa-extra += copy-relocated-only
-MERGE_DIRS_isa-extra = $(libdir)
-
 include gar/category.mk

Modified: csw/mgar/pkg/autotrace/trunk/Makefile
===================================================================
--- csw/mgar/pkg/autotrace/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/autotrace/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -53,7 +53,7 @@
 UFILES_REGEX = (\d+(?:\.\d+)*)
 
 # Not until we have a 64-bit imagemagick
-#BUILD64 = 1
+#BUILD64_LIBS_ONLY = 1
 
 CONFIGURE_ARGS  = $(DIRPATHS)
 CONFIGURE_ARGS += --with-magick

Modified: csw/mgar/pkg/babl/trunk/Makefile
===================================================================
--- csw/mgar/pkg/babl/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/babl/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -28,7 +28,7 @@
 # PKGFILES is catchall
 RUNTIME_DEP_PKGS_CSWlibbabl-dev += CSWlibbabl0-1-0
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 # Replace manually until this is fixed:
 #   https://bugzilla.gnome.org/show_bug.cgi?id=664800

Modified: csw/mgar/pkg/bdb3/trunk/Makefile
===================================================================
--- csw/mgar/pkg/bdb3/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/bdb3/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -90,9 +90,6 @@
 EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 = .*/docs.*
 EXTRA_MERGE_EXCLUDE_FILES_isa-amd64 = .*/docs.*
 
-# We need the binaries
-EXTRA_MERGE_DIRS_isa-extra = $(bindir)
-
 include gar/category.mk
 
 LIBS += -lnsl

Modified: csw/mgar/pkg/boost/trunk/Makefile
===================================================================
--- csw/mgar/pkg/boost/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/boost/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -80,7 +80,7 @@
 JAMDIR_i386 = solarisx86
 JAMDIR = $(JAMDIR_$(GARCH))
 
-# BUILD64 = 1
+# BUILD64_LIBS_ONLY = 1
 
 # These can't be just passed from Make's PARALLELMFLAGS because of the -l flag.
 BJAM_PARALLELMFLAGS_current9s = -j 32

Modified: csw/mgar/pkg/bzip2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/bzip2/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/bzip2/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -37,7 +37,7 @@
 
 LICENSE = LICENSE
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 EXTRA_CFLAGS += -KPIC
 EXTRA_CFLAGS += -D_FILE_OFFSET_BITS=64

Modified: csw/mgar/pkg/c-ares/trunk/Makefile
===================================================================
--- csw/mgar/pkg/c-ares/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/c-ares/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -29,7 +29,7 @@
 
 RUNTIME_DEP_PKGS_CSWlibcaresdevel = CSWlibcares
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 
 EXTRA_PAX_ARGS_32 = -s ",^\.$(includedir)/ares_build.h$$,.$(includedir)/ares_build-32.h,p"

Modified: csw/mgar/pkg/cfengine3/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cfengine3/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/cfengine3/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -106,7 +106,7 @@
 # the server and client component
 PRESERVECONF = $(sysconfdir)/$(NAME)rc
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 BUILD_DEP_PKGS = CSWbdb48devel
 BUILD_DEP_PKGS += CSWlibpcre-dev

Modified: csw/mgar/pkg/cfitsio/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cfitsio/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/cfitsio/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -22,7 +22,7 @@
 
 LICENSE = License.txt
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 
 BUILD_ARGS = all testprog

Modified: csw/mgar/pkg/chmlib/trunk/Makefile
===================================================================
--- csw/mgar/pkg/chmlib/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/chmlib/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -22,12 +22,10 @@
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --enable-examples
 
-MERGE_DIRS_isa-extra = $(libdir)
-
 DOCS  = NEWS README
 DOCS += ChmLib-ds6.zip ChmLib-ce.zip
 

Modified: csw/mgar/pkg/chrpath/trunk/Makefile
===================================================================
--- csw/mgar/pkg/chrpath/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/chrpath/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -22,7 +22,7 @@
 # new upstream software release
 UFILES_REGEX = (\d+(?:\.\d+)*).tar.gz
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 NOISALIST = 1
 
 CONFIGURE_ARGS  = $(DIRPATHS)

Modified: csw/mgar/pkg/cloog/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cloog/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/cloog/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -12,7 +12,7 @@
 MASTER_SITES = http://www.bastoul.net/cloog/pages/download/
 DISTFILES  = $(NAME)-$(VERSION).tar.gz
 CONFIGURE_ARGS = $(DIRPATHS)
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 GARCOMPILER = GNU
 
 LICENSE = $(FILEDIR)/COPYING

Modified: csw/mgar/pkg/cpptest/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpptest/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/cpptest/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -22,7 +22,7 @@
 OBSOLETED_BY_CSWlibcpptest-dev += CSWlibcpptestdevel
 CATALOGNAME_CSWlibcpptestdevel = libcpptest_devel_stub
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 EXTRA_CXXFLAGS = -norunpath
 

Modified: csw/mgar/pkg/cups/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cups/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/cups/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -302,7 +302,7 @@
 # For some reason -norunpath is not used here, investigate later
 CHECKPKG_OVERRIDES_CSWlibcupsppdc1 += bad-rpath-entry
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 EXTRA_LINKER_FLAGS += -liconv
 EXTRA_LINKER_FLAGS += -norunpath

Modified: csw/mgar/pkg/dbus/trunk/Makefile
===================================================================
--- csw/mgar/pkg/dbus/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/dbus/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -104,7 +104,7 @@
 # Needed for sockaddr_in6
 EXTRA_CFLAGS += -D__EXTENSIONS__
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 include gar/category.mk
 

Modified: csw/mgar/pkg/dbus-glib/trunk/Makefile
===================================================================
--- csw/mgar/pkg/dbus-glib/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/dbus-glib/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -55,7 +55,7 @@
 CHECKPKG_OVERRIDES_CSWlibdbus-glib-dev += file-with-bad-content|/usr/share|root/opt/csw/share/gtk-doc/html/dbus-glib/dbus-glib-DBus-GObject-related-functions.html
 CHECKPKG_OVERRIDES_CSWlibdbus-glib-dev += file-with-bad-content|/usr/share|root/opt/csw/share/gtk-doc/html/dbus-glib/dbus-glib-DBusGProxy.html
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 include gar/category.mk
 

Modified: csw/mgar/pkg/eet/trunk/Makefile
===================================================================
--- csw/mgar/pkg/eet/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/eet/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -20,7 +20,7 @@
 
 CPPFLAGS = abc
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 
 include gar/category.mk

Modified: csw/mgar/pkg/eina/trunk/Makefile
===================================================================
--- csw/mgar/pkg/eina/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/eina/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -19,7 +19,7 @@
 
 EXTRA_CPPFLAGS = -D__FUNCTION__=
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 
 include gar/category.mk

Modified: csw/mgar/pkg/enchant/trunk/Makefile
===================================================================
--- csw/mgar/pkg/enchant/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/enchant/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -68,7 +68,7 @@
 
 #NOISALIST = 1
 # libdbus not 64-bit yet
-#BUILD64 = 1
+#BUILD64_LIBS_ONLY = 1
 
 STRIP_LIBTOOL = 1
 

Modified: csw/mgar/pkg/esound/trunk/Makefile
===================================================================
--- csw/mgar/pkg/esound/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/esound/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -52,11 +52,7 @@
 PRESERVECONF = $(sysconfdir)/esd.conf
 MIGRATE_FILES_CSWesound = esd.conf
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 
-MERGE_SCRIPTS_isa-extra += copy-relocated-only
-MERGE_SCRIPTS_isa-extra += copy-config-only
-MERGE_DIRS_isa-extra = $(libdir)
-
 include gar/category.mk

Modified: csw/mgar/pkg/evolution/trunk/Makefile
===================================================================
--- csw/mgar/pkg/evolution/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/evolution/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -20,7 +20,7 @@
 EXTRA_LIB = $(prefix)/X11/lib
 EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 STRIP_LIBTOOL = 1
 

Modified: csw/mgar/pkg/evolution-ds/trunk/Makefile
===================================================================
--- csw/mgar/pkg/evolution-ds/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/evolution-ds/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -40,7 +40,7 @@
 EXTRA_LIB = $(prefix)/X11/lib
 EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 STRIP_LIBTOOL = 1
 

Modified: csw/mgar/pkg/evolution-exchange/trunk/Makefile
===================================================================
--- csw/mgar/pkg/evolution-exchange/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/evolution-exchange/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -40,7 +40,7 @@
 EXTRA_LIB = $(prefix)/X11/lib
 EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 STRIP_LIBTOOL = 1
 

Modified: csw/mgar/pkg/evolution-mapi/trunk/Makefile
===================================================================
--- csw/mgar/pkg/evolution-mapi/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/evolution-mapi/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -40,7 +40,7 @@
 EXTRA_LIB = $(prefix)/X11/lib
 EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 STRIP_LIBTOOL = 1
 

Modified: csw/mgar/pkg/evolution-webcal/trunk/Makefile
===================================================================
--- csw/mgar/pkg/evolution-webcal/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/evolution-webcal/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -38,7 +38,7 @@
 EXTRA_LIB = $(prefix)/X11/lib
 EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 STRIP_LIBTOOL = 1
 

Modified: csw/mgar/pkg/examples/64-bit/trunk/Makefile
===================================================================
--- csw/mgar/pkg/examples/64-bit/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/examples/64-bit/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -21,7 +21,7 @@
 
 prefix = $(BUILD_PREFIX)/foo
 libdir = $(BUILD_PREFIX)/lib
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 include gar/category.mk
 

Modified: csw/mgar/pkg/examples/multiple-versions/trunk/Makefile
===================================================================
--- csw/mgar/pkg/examples/multiple-versions/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/examples/multiple-versions/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -40,7 +40,7 @@
 TEST_SCRIPTS =
 WORKSRC = $(WORKDIR)/hello-$(VERSION)
 CONFIGURE_ARGS = $(DIRPATHS)
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 include gar/category.mk
 

Modified: csw/mgar/pkg/exiv2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/exiv2/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/exiv2/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -17,7 +17,7 @@
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 
 # Sun Studio doesn't unerstand g++ features

Modified: csw/mgar/pkg/expect/trunk/Makefile
===================================================================
--- csw/mgar/pkg/expect/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/expect/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -72,7 +72,7 @@
 
 TEST_TARGET = 
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 include gar/category.mk
 

Modified: csw/mgar/pkg/fbopenssl/trunk/Makefile
===================================================================
--- csw/mgar/pkg/fbopenssl/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/fbopenssl/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -31,7 +31,7 @@
 # These are no header files in there, is this correct?
 RUNTIME_DEP_PKGS_CSWlibfbopenssl-dev += CSWlibfbopenssl0
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 CONFIGURE_SCRIPTS = 
 BUILD_SCRIPTS = custom

Modified: csw/mgar/pkg/ffmpeg/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ffmpeg/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/ffmpeg/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -190,7 +190,7 @@
 #EXTRA_MODULATORS = SHARED
 #MODULATIONS_SHARED = yes no
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 GARCOMPILER = GNU
 

Modified: csw/mgar/pkg/file/trunk/Makefile
===================================================================
--- csw/mgar/pkg/file/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/file/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -68,7 +68,7 @@
 # These flags are not understood by Sun Studio
 CONFIGURE_ARGS += --disable-warnings
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 PYCOMPILE = 1
 

Modified: csw/mgar/pkg/fltk/trunk/Makefile
===================================================================
--- csw/mgar/pkg/fltk/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/fltk/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -18,7 +18,7 @@
 
 DEP_PKGS = CSWzlib CSWjpeg CSWpng
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --mandir=/opt/csw/share/man
 CONFIGURE_ARGS += --disable-localpng
@@ -31,9 +31,6 @@
 
 EXTRA_BUILD_EXPORTS = libdir
 
-MERGE_SCRIPTS_isa-extra = copy-relocated-only copy-config-only
-MERGE_DIRS_isa-extra = $(libdir)
-
 CHECKPKG_OVERRIDES_CSWfltk += soname-not-found|libm.so.2|is|needed|by|opt/csw/lib/amd64/libfltk.so.1.1
 CHECKPKG_OVERRIDES_CSWfltk += soname-not-found|libm.so.2|is|needed|by|opt/csw/lib/amd64/libfltk_forms.so.1.1
 CHECKPKG_OVERRIDES_CSWfltk += soname-not-found|libm.so.2|is|needed|by|opt/csw/lib/amd64/libfltk_images.so.1.1

Modified: csw/mgar/pkg/fontconfig/trunk/Makefile
===================================================================
--- csw/mgar/pkg/fontconfig/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/fontconfig/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -21,7 +21,7 @@
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 PACKAGES = CSWfconfig
 CATALOGNAME = fontconfig
 

Modified: csw/mgar/pkg/freedesktop/libxcb/trunk/Makefile
===================================================================
--- csw/mgar/pkg/freedesktop/libxcb/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/freedesktop/libxcb/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -36,7 +36,7 @@
 
 ARCHALL_CSWlibxcbdoc = 1
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 NOISALIST = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 

Modified: csw/mgar/pkg/freedesktop/xcb-util/trunk/Makefile
===================================================================
--- csw/mgar/pkg/freedesktop/xcb-util/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/freedesktop/xcb-util/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -21,7 +21,7 @@
 
 CATALOGNAME = xcbutil
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 NOISALIST = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 

Modified: csw/mgar/pkg/freedesktop/xcbproto/trunk/Makefile
===================================================================
--- csw/mgar/pkg/freedesktop/xcbproto/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/freedesktop/xcbproto/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -44,7 +44,7 @@
 
 UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 CONFIGURE_ARGS = $(DIRPATHS)
 

Modified: csw/mgar/pkg/freeglut/trunk/Makefile
===================================================================
--- csw/mgar/pkg/freeglut/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/freeglut/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -26,7 +26,7 @@
 CPPFLAGS =
 EXTRA_CFLAGS = -I/opt/csw/include -DSUN_OGL_NO_VERTEX_MACROS
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 
 # No 64 bit libs on Solaris 9 x86

Modified: csw/mgar/pkg/freetds/trunk/Makefile
===================================================================
--- csw/mgar/pkg/freetds/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/freetds/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -60,7 +60,7 @@
 # Make sure library is self-sufficient
 EXTRA_LINKER_FLAGS = -liconv
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 # Testsuite needs a running Sybase/SQLServer database
 SKIPTEST ?= 1

Modified: csw/mgar/pkg/freetype/trunk/Makefile
===================================================================
--- csw/mgar/pkg/freetype/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/freetype/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -40,6 +40,6 @@
 GNUMAKE = gmake
 EXTRA_CONFIGURE_EXPORTS = GNUMAKE
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 include gar/category.mk

Modified: csw/mgar/pkg/fribidi/trunk/Makefile
===================================================================
--- csw/mgar/pkg/fribidi/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/fribidi/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -14,7 +14,7 @@
 
 SPKG_SOURCEURL = http://www.fribidi.org/
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 NOISALIST = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 

Modified: csw/mgar/pkg/ftgl/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ftgl/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/ftgl/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -40,7 +40,7 @@
 NOISALIST = 1
 # Unless the Solaris 10 compilation problem with both SUNW mesa and CSW mesa
 # installed exists disable 64 bit for now.
-# BUILD64 = 1
+# BUILD64_LIBS_ONLY = 1
 
 LD_OPTIONS =
 EXTRA_LINKER_FLAGS = $(RUNPATH_LINKER_FLAGS)

Modified: csw/mgar/pkg/gamin/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gamin/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/gamin/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -68,8 +68,7 @@
 # Overwrite existing -L/opt/csw/lib or installed libs will be picked up first
 LINKER_FLAGS = -lsocket -lnsl
 
-BUILD64 = 1
-MERGE_DIRS_isa-extra = $(bindir) $(libdir) $(libexecdir)
+BUILD64_LIBS_ONLY = 1
 
 # This is not passed to configure, although it is defined (but wrong) in configure.in
 EXTRA_CONFIGURE_EXPORTS += ENV_CFLAGS

Modified: csw/mgar/pkg/ganglia/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ganglia/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/ganglia/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -79,7 +79,7 @@
 
 # Uncomment this if we want to build both 32 bit and 64 bit binaries
 # By default, only 32 bit binaries are built
-#BUILD64 = 1
+#BUILD64_LIBS_ONLY = 1
 
 CONFIGURE_ARGS = $(DIRPATHS)
 

Modified: csw/mgar/pkg/ganglia-modules-solaris/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ganglia-modules-solaris/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/ganglia-modules-solaris/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -34,7 +34,7 @@
 # uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES
 # UPSTREAM_MASTER_SITES = 
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 BUILD_DEP_PKGS = CSWlibapr1-0 CSWganglia-dev
 

Modified: csw/mgar/pkg/gd/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gd/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/gd/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -60,7 +60,7 @@
 # This is evaluated twice, quote properly
 EXTRA_CPPFLAGS = -DDEFAULT_FONTPATH=\\\"$(CSW_DEFAULT_FONTPATH)\\\"
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 STRIP_LIBTOOL = 1
 
 CONFIGURE_ARGS  = $(DIRPATHS)
@@ -75,8 +75,6 @@
 # GD does not have a testsuite
 TEST_SCRIPTS =
 
-MERGE_DIRS_isa-extra = $(libdir)
-
 # This is ok as there are a number of search pathes for fonts in there.
 # We made sure that the $CSW_DEFAULT_FONTPATH is the first one in the list.
 CHECKPKG_OVERRIDES_CSWlibgd-dev += file-with-bad-content|/usr/share|root/opt/csw/include/gd.h

Modified: csw/mgar/pkg/gdbm/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gdbm/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/gdbm/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -26,7 +26,7 @@
 # This is catchall
 RUNTIME_DEP_PKGS_CSWlibgdbm-dev = CSWlibgdbm4
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 # gdbm package has no test suite
 TEST_SCRIPTS =

Modified: csw/mgar/pkg/gdk-pixbuf/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gdk-pixbuf/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/gdk-pixbuf/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -89,9 +89,6 @@
 
 BUILD64 = 1
 
-# We need the binaries to query 64 bit modules
-MERGE_DIRS_isa-extra = $(bindir) $(libdir)
-
 CONFIGURE_ARGS  = $(DIRPATHS)
 CONFIGURE_ARGS += --with-libiconv-prefix
 CONFIGURE_ARGS += --with-libintl-prefix

Modified: csw/mgar/pkg/gdome2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gdome2/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/gdome2/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -20,7 +20,7 @@
 
 SPKG_SOURCEURL = http://gdome2.cs.unibo.it/
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 
 include gar/category.mk

Modified: csw/mgar/pkg/gengetopt/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gengetopt/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/gengetopt/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -19,7 +19,7 @@
 
 SPKG_SOURCEURL = http://www.gnu.org/software/gengetopt/
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 CONFIGURE_ARGS = $(DIRPATHS) 
 

Modified: csw/mgar/pkg/gettext/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gettext/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/gettext/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -212,7 +212,7 @@
 
 UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 STRIP_LIBTOOL = 1
 EXTRA_LINKER_FLAGS = -xnorunpath
 

Modified: csw/mgar/pkg/giflib/trunk/Makefile
===================================================================
--- csw/mgar/pkg/giflib/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/giflib/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -44,7 +44,7 @@
 RUNTIME_DEP_PKGS_CSWlibgif-dev += CSWlibgif4
 RUNTIME_DEP_PKGS_CSWlibgif-dev += CSWlibungif4
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --x-includes=/usr/openwin/include

Modified: csw/mgar/pkg/gkrellm/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gkrellm/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/gkrellm/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -38,7 +38,7 @@
 
 #Disable build64 until fix linking:
 #ld: fatal: file main.o: wrong ELF class: ELFCLASS64
-#BUILD64 = 1
+#BUILD64_LIBS_ONLY = 1
 
 BUILD_ARGS    = INSTALLROOT=$(prefix)
 BUILD_ARGS   += LOCALEDIR=$(sharedstatedir)/locale

Modified: csw/mgar/pkg/glew/trunk/Makefile
===================================================================
--- csw/mgar/pkg/glew/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/glew/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -42,7 +42,7 @@
 OBSOLETED_BY_CSWlibglew-dev = CSWglew
 
 NOISALIST = 1
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 LDOPT-64 = -64
 EXTRA_CFLAGS-sparc = -xcode=pic32

Modified: csw/mgar/pkg/glib2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/glib2/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/glib2/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -160,7 +160,7 @@
 
 EXTRA_LDFLAGS = -lsocket
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 CONFIGURE_ARGS  = $(DIRPATHS)
 CONFIGURE_ARGS += --with-libiconv=gnu

Modified: csw/mgar/pkg/glibmm/trunk/Makefile
===================================================================
--- csw/mgar/pkg/glibmm/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/glibmm/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -14,7 +14,7 @@
 MASTER_SITES = $(GNOME_MIRROR)
 DISTFILES = $(NAME)-$(VERSION).tar.gz
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 CONFIGURE_ARGS  = $(DIRPATHS)
 MAKE = gmake

Modified: csw/mgar/pkg/gnome-base/gconf-editor/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gnome-base/gconf-editor/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/gnome-base/gconf-editor/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -15,7 +15,7 @@
 
 #SPKG_SOURCEURL = http://projects.gnome.org/gconf/
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 EXTRA_INC = $(prefix)/X11/include
 EXTRA_LIB = $(prefix)/X11/lib

Modified: csw/mgar/pkg/gnome-base/gconf2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gnome-base/gconf2/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/gnome-base/gconf2/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -57,7 +57,7 @@
 # man-page only, override for now
 CHECKPKG_OVERRIDES_CSWlibgconf-dev += file-with-bad-content|/usr/share|root/opt/csw/share/man/man1/gsettings-data-convert.1
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 STRIP_LIBTOOL = 1
 

Modified: csw/mgar/pkg/gnome-base/gnomedesktop/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gnome-base/gnomedesktop/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/gnome-base/gnomedesktop/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -43,7 +43,7 @@
 EXTRA_LIB = $(prefix)/X11/lib
 EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib
 
-# BUILD64 = 1
+# BUILD64_LIBS_ONLY = 1
 
 STRIP_LIBTOOL = 1
 

Modified: csw/mgar/pkg/gnome-base/gnomevfs2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gnome-base/gnomevfs2/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/gnome-base/gnomevfs2/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -65,7 +65,7 @@
 REINPLACE_FILES_xdg = libgnomevfs/xdgmime.c
 
 NOISALIST = 1
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 # STRIP_LIBTOOL = 1
 

Modified: csw/mgar/pkg/gnome-base/libbonobo2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gnome-base/libbonobo2/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/gnome-base/libbonobo2/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -37,7 +37,7 @@
 CHECKPKG_OVERRIDES_CSWlibbonobo2 += shared-lib-package-contains-so-symlink
 CHECKPKG_OVERRIDES_CSWlibbonobo2 += non-uniform-lib-versions-in-package
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 CPP = /usr/lib/cpp
 EXTRA_COMMON_EXPORTS += CPP

Modified: csw/mgar/pkg/gnome-base/libgnomecanvas/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gnome-base/libgnomecanvas/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/gnome-base/libgnomecanvas/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -15,7 +15,7 @@
 
 CONFIGURE_ARGS  = $(DIRPATHS)
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 include gar/category.mk
 

Modified: csw/mgar/pkg/gnome-base/orbit2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gnome-base/orbit2/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/gnome-base/orbit2/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -40,6 +40,5 @@
 BUILD64 = 1
 
 EXTRA_MERGE_INCLUDE_FILES  = $(libdir)/libname-server-2.a
-EXTRA_MERGE_DIRS_isa-extra = $(bindir)
 
 include gar/category.mk

Modified: csw/mgar/pkg/gnulib/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gnulib/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/gnulib/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -21,7 +21,7 @@
 
 WORKSRC = $(WORKDIR)/posixlib
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 INSTALL_SCRIPTS = custom
 

Modified: csw/mgar/pkg/gnupg2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gnupg2/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/gnupg2/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -78,7 +78,7 @@
 
 # Unfortunately GNU PTH does not handle 64 bit sanely:
 #   "/opt/csw/include/pth.h", line 93: #error: "FD_SETSIZE is larger than what GNU Pth can handle."
-#BUILD64 = 1
+#BUILD64_LIBS_ONLY = 1
 
 CONFIGURE_ARGS  = $(DIRPATHS)
 CONFIGURE_ARGS += --with-libcurl=$(prefix)

Modified: csw/mgar/pkg/gnupg_minimal/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gnupg_minimal/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/gnupg_minimal/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -18,7 +18,7 @@
 RUNTIME_DEP_PKGS_CSWgnupgminimal = CSWbzip2 CSWcurlrt CSWggettextrt CSWiconv
 RUNTIME_DEP_PKGS_CSWgnupgminimal += CSWoldaprt CSWreadline CSWzlib
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 CONFIGURE_ARGS  = $(DIRPATHS)
 CONFIGURE_ARGS += --program-suffix=-minimal

Modified: csw/mgar/pkg/gnutls/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gnutls/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/gnutls/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -66,7 +66,7 @@
 # We don't need it and if defined the test breaks
 LD_OPTIONS =
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 
 # We put all libs in one package as they are .so.26 and are all bumped together

Modified: csw/mgar/pkg/googletest/trunk/Makefile
===================================================================
--- csw/mgar/pkg/googletest/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/googletest/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -21,6 +21,6 @@
 UFILES_REGEX = gtest-(\d+(?:\.\d+)*).tar.gz
 EXTRA_CXXFLAGS = -library=stlport4 -library=no%Cstd
 # EXTRA_LDFLAGS = -lCrun -lm
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 include gar/category.mk

Modified: csw/mgar/pkg/gpgme/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gpgme/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/gpgme/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -22,7 +22,7 @@
 
 RUNTIME_DEP_PKGS = CSWgpgerr CSWpth
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 CONFIGURE_ARGS = $(DIRPATHS)
 

Modified: csw/mgar/pkg/gsasl/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gsasl/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/gsasl/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -65,7 +65,7 @@
 EXTRA_LINKER_FLAGS = $(RUNPATH_LINKER_FLAGS)
 
 # Disable 64 bit until krb5 is available in 64 bit
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 EXTRA_MERGE_EXCLUDE_FILES = $(libdir)/charset.alias
 

Modified: csw/mgar/pkg/gsm/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gsm/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/gsm/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -25,7 +25,7 @@
 #       BUGS="$(BUGS) -DSOLARIS_24_GETHOSTBYNAME_BUG" IPV6="$(IPV6)" \
 #       EXTRA_CFLAGS="-DUSE_STRERROR -Kpic" all
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 CONFIGURE_SCRIPTS =
 

Modified: csw/mgar/pkg/gtk2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gtk2/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/gtk2/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -284,9 +284,6 @@
 sysconfdir-suffix-64 = /64
 sysconfdir = /etc/opt/csw$(sysconfdir-suffix-$(MEMORYMODEL))
 
-# We need the binaries to query 64 bit modules
-MERGE_DIRS_isa-extra = $(bindir) $(libdir)
-
 CONFIGURE_ARGS  = $(DIRPATHS)
 CONFIGURE_ARGS += --enable-shm
 CONFIGURE_ARGS += --enable-xkb

Modified: csw/mgar/pkg/gts/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gts/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/gts/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -33,6 +33,6 @@
 
 PATCHFILES = gts-fabsf.diff
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 include gar/category.mk

Modified: csw/mgar/pkg/guile/trunk/Makefile
===================================================================
--- csw/mgar/pkg/guile/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/guile/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -30,7 +30,7 @@
 
 GARCOMPILER = GNU
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 CONFIGURE_ARGS  = $(DIRPATHS) 
 CONFIGURE_ARGS += --enable-error-on-warning=no
 

Modified: csw/mgar/pkg/host-sflow/trunk/Makefile
===================================================================
--- csw/mgar/pkg/host-sflow/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/host-sflow/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -16,7 +16,7 @@
 MASTER_SITES = $(SF_MIRRORS)
 DISTFILES  = $(NAME)-$(VERSION).tar.gz
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 include gar/category.mk
 

Modified: csw/mgar/pkg/hwloc/trunk/Makefile
===================================================================
--- csw/mgar/pkg/hwloc/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/hwloc/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -41,7 +41,7 @@
 CONFIGURE_ARGS  = $(DIRPATHS)
 #CONFIGURE_ARGS += --disable-visibility
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 GARFLAVOR = DBG
 

Modified: csw/mgar/pkg/id3lib/trunk/Makefile
===================================================================
--- csw/mgar/pkg/id3lib/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/id3lib/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -46,6 +46,6 @@
 SUBDIR64-i386 = amd64
 EXTRA_LINKER_FLAGS = -L$($(GARCOMPILER)_CC_HOME)/lib/$(SUBDIR$(MEMORYMODEL)-$(GARCH)) -lCstd -lz
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 include gar/category.mk

Modified: csw/mgar/pkg/idzebra/trunk/Makefile
===================================================================
--- csw/mgar/pkg/idzebra/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/idzebra/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -19,7 +19,7 @@
 VENDOR_URL = http://www.indexdata.com/zebra
 
 # Just wait a _little_ longer until yaz is ready in 64 bit, which itself needs libicu in 64 bit
-# BUILD64 = 1
+# BUILD64_LIBS_ONLY = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 
 include gar/category.mk

Modified: csw/mgar/pkg/ilmbase/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ilmbase/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/ilmbase/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -68,6 +68,6 @@
 REINPLACE_WITH = |-norunpath$$1
 REINPLACE_FILES += ltmain.sh
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 include gar/category.mk

Modified: csw/mgar/pkg/ilmbase2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ilmbase2/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/ilmbase2/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -67,7 +67,7 @@
 EXTRA_CXX_FLAGS_isa-sparcv9 = -KPIC
 EXTRA_CXX_FLAGS += $(EXTRA_LD_FLAGS_$(MODULATION))
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 # Check fails if library isn't installed /opt/csw/lib and until a 64-bit
 # lib is installed test has to be disabled

Modified: csw/mgar/pkg/imlib/trunk/Makefile
===================================================================
--- csw/mgar/pkg/imlib/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/imlib/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -15,7 +15,7 @@
 STRIP_LIBTOOL = 1
 
 # Make glib and gtk 64 bit first
-# BUILD64 = 1
+# BUILD64_LIBS_ONLY = 1
 sysconfdir = /etc/opt/csw
 CONFIGURE_ARGS = $(DIRPATHS)
 

Modified: csw/mgar/pkg/imlib2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/imlib2/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/imlib2/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -20,12 +20,9 @@
 RUNTIME_DEP_PKGS = CSWbzip2 CSWftype2 CSWgiflibrt CSWjpeg CSWlibid3tag
 RUNTIME_DEP_PKGS += CSWpng CSWtiff CSWzlib
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 
-MERGE_SCRIPTS_isa-extra = copy-relocated-only copy-config-only
-MERGE_DIRS_isa-extra = $(libdir)
-
 CHECKPKG_OVERRIDES_CSWimlib2 += soname-not-found|libm.so.2|is|needed|by|opt/csw/lib/amd64/imlib2/loaders/bmp.so
 CHECKPKG_OVERRIDES_CSWimlib2 += soname-not-found|libm.so.2|is|needed|by|opt/csw/lib/amd64/imlib2/loaders/tiff.so
 CHECKPKG_OVERRIDES_CSWimlib2 += soname-not-found|libm.so.2|is|needed|by|opt/csw/lib/amd64/imlib2/loaders/bz2.so

Modified: csw/mgar/pkg/imlib2_loaders/trunk/Makefile
===================================================================
--- csw/mgar/pkg/imlib2_loaders/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/imlib2_loaders/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -32,7 +32,7 @@
 EXTRA_LIB = $(prefix)/X11/lib
 EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --x-include=$(prefix)/X11/include
 CONFIGURE_ARGS += --x-libraries=$(abspath $(prefix)/X11/lib/$(MM_LIBDIR))

Modified: csw/mgar/pkg/jack/trunk/Makefile
===================================================================
--- csw/mgar/pkg/jack/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/jack/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -20,7 +20,7 @@
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 CONFIGURE_SCRIPTS = $(WORKSRC)/waf
 CONFIGURE_ARGS = configure --prefix=$(prefix)

Modified: csw/mgar/pkg/krb5/trunk/Makefile
===================================================================
--- csw/mgar/pkg/krb5/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/krb5/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -73,7 +73,7 @@
 CONFIGURE_ARGS += --disable-static --disable-profiled
 CONFIGURE_ARGS += --with-ldap
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 BUILD_SCRIPTS  = $(WORKSRC)/src/Makefile
 BUILD_SCRIPTS += $(WORKSRC)/doc/Makefile

Modified: csw/mgar/pkg/krb5-lib/trunk/Makefile
===================================================================
--- csw/mgar/pkg/krb5-lib/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/krb5-lib/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -126,7 +126,7 @@
 
 CONFIGURE_SCRIPTS = $(WORKSRC)/src/configure
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 # We turn off almost everything as we are just interested in the library.
 NODIRPATHS = --docdir

Modified: csw/mgar/pkg/lame/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lame/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/lame/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -38,7 +38,7 @@
 SPKG_DESC_CSWlibmp3lame0 = Library for LAME, libmp3lame.so.0
 PKGFILES_CSWlibmp3lame0 = $(call pkgfiles_lib,libmp3lame.so.0)
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 EXTRA_BUILD_ISAS = sparcv8plus+vis pentium_pro
 
 # Disable intrinsics until this has been resolved:

Modified: csw/mgar/pkg/lensfun/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lensfun/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/lensfun/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -26,7 +26,7 @@
 LD=$(CC)
 EXTRA_COMMON_EXPORTS = LD
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 # This is not autoconf, but some hand-hacked Python thingie.
 CONFIGURE_ARGS  = --prefix=$(prefix)
 CONFIGURE_ARGS += --bindir=$(bindir)

Modified: csw/mgar/pkg/liba52/trunk/Makefile
===================================================================
--- csw/mgar/pkg/liba52/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/liba52/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -30,7 +30,7 @@
 
 EXTRA_LINKER_FLAGS = -lsunmath
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --enable-shared --disable-static
 
@@ -38,8 +38,6 @@
 # especially activating 64 bit.
 BUILD_ARGS = CFLAGS="$(CFLAGS)"
 
-MERGE_DIRS_isa-extra = $(libdir)
-
 PKGFILES_CSWa52dec = $(bindir)/.*
 PKGFILES_CSWa52dec += $(mandir)/man1/.*
 

Modified: csw/mgar/pkg/libao/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libao/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libao/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -41,7 +41,7 @@
 
 PRESERVECONF = $(LIBAO_CONF)
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 include gar/category.mk
 

Modified: csw/mgar/pkg/libao2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libao2/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libao2/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -28,6 +28,6 @@
 
 # The file libao.conf is delivered with the newer libao4
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 include gar/category.mk

Modified: csw/mgar/pkg/libarchive/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libarchive/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libarchive/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -47,7 +47,7 @@
 
 EXTRA_INC = $(includedir)/cryptopp
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 # There is currently one test failing. Skip until this is fixed:
 #   http://code.google.com/p/libarchive/issues/detail?id=171

Modified: csw/mgar/pkg/libart/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libart/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libart/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -22,7 +22,7 @@
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --disable-static

Modified: csw/mgar/pkg/libassuan/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libassuan/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libassuan/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -24,7 +24,7 @@
 # PKGFILES is catchall
 RUNTIME_DEP_PKGS_CSWlibassuan-dev += CSWlibassuan0
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 # Disable tests until this is fixed:
 #   https://bugs.g10code.com/gnupg/msg4081

Modified: csw/mgar/pkg/libast/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libast/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libast/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -21,9 +21,7 @@
 
 STRIP_LIBTOOL = 1
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 
-MERGE_DIRS_isa-extra = $(libdir)
-
 include gar/category.mk

Modified: csw/mgar/pkg/libatk/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libatk/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libatk/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -32,7 +32,7 @@
 OBSOLETED_BY_CSWlibatk-dev = CSWlibatkdevel
 CATALOGNAME_CSWlibatkdevel = libatk_devel_stub
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 CONFIGURE_ARGS  = $(DIRPATHS)
 CONFIGURE_ARGS += --enable-debug=yes

Modified: csw/mgar/pkg/libcairo/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libcairo/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libcairo/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -75,7 +75,7 @@
 # We do NOT want -L/opt/csw/lib in there as the pathes are detected properly and this disturbs libtool later on
 LINKER_FLAGS =
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 CONFIGURE_ARGS += $(DIRPATHS)
 CONFIGURE_ARGS += --disable-full-testing

Modified: csw/mgar/pkg/libcddb/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libcddb/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libcddb/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -23,7 +23,7 @@
 
 RUNTIME_DEP_PKGS_CSWlibcddbutil = CSWlibcddb CSWlibcdio
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 
 http_proxy='$(http_proxy)'

Modified: csw/mgar/pkg/libcdio/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libcdio/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libcdio/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -19,11 +19,9 @@
 
 RUNTIME_DEP_PKGS = CSWgcc4corert CSWgcc4g++rt CSWiconv
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 
-MERGE_DIRS_isa-extra = $(libdir)
-
 # There is a minor test regarding timezones failing.
 # Disable tests for now until this is fixed:
 #   https://savannah.gnu.org/support/index.php?107175

Modified: csw/mgar/pkg/libconfuse/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libconfuse/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libconfuse/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -31,7 +31,7 @@
 # PKGFILES is catchall
 RUNTIME_DEP_PKGS_CSWlibconfuse-dev += CSWlibconfuse0
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --enable-shared --disable-nls

Modified: csw/mgar/pkg/libcroco/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libcroco/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libcroco/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -17,7 +17,7 @@
 
 RUNTIME_DEP_PKGS = CSWggettextrt CSWglib2 CSWlibxml2
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 NOISALIST = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 

Modified: csw/mgar/pkg/libdatrie/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libdatrie/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libdatrie/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -29,7 +29,7 @@
 RUNTIME_DEP_PKGS_CSWlibdatrie-utils += CSWlibdatrie1
 RUNTIME_DEP_PKGS_CSWlibdatrie-utils += CSWiconv
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 CONFIGURE_ARGS += $(DIRPATHS)
 CONFIGURE_ARGS += --with-html-docdir=$(docdir)/libdatrie-dev/html

Modified: csw/mgar/pkg/libdbi/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libdbi/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libdbi/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -28,7 +28,7 @@
 REINPLACE_USRLOCAL += doc/programmers-guide/x276.html
 REINPLACE_USRLOCAL += doc/programmers-guide/quickstart-code.html
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --docdir=$(docdir)/libdbi
 

Modified: csw/mgar/pkg/libdbi-drivers/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libdbi-drivers/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libdbi-drivers/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -13,7 +13,7 @@
 # File name regex to get notifications about upstream software releases
 UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 
 include gar/category.mk

Modified: csw/mgar/pkg/libdnet/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libdnet/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libdnet/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -14,14 +14,12 @@
 
 LICENSE = LICENSE
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 
 PATCHFILES  = 0001-Using-the-m4-subdirectory-for-macros.patch
 PATCHFILES += 0002-Moved-acinclude.m4-to-the-m4-directory.patch
 
-MERGE_DIRS_isa-extra = $(libdir)
-
 PACKAGES = CSWlibdnet1
 CATALOGNAME_CSWlibdnet1 = libdnet1
 PKGFILES_CSWlibdnet1 += $(call baseisadirs,$(libdir),libdnet\.so\.1\.0\.1)

Modified: csw/mgar/pkg/libebml/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libebml/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libebml/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -36,7 +36,7 @@
 
 LICENSE = LICENSE.LGPL
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 NOISALIST = 1
 
 CONFIGURE_SCRIPTS = 

Modified: csw/mgar/pkg/libeggdbus/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libeggdbus/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libeggdbus/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -34,7 +34,7 @@
 PKGFILES_CSWlibeggdbusdevel = $(PKGFILES_DEVEL)
 
 # libdbus isn't 64-bit yet
-#BUILD64 = 1
+#BUILD64_LIBS_ONLY = 1
 
 CONFIGURE_ARGS = $(DIRPATHS)
 

Modified: csw/mgar/pkg/libemf/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libemf/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libemf/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -36,7 +36,7 @@
 
 # *We* can do 64 bit, but the tests dump core in CSWglib2 2.23.5,REV=2010.03.09
 # Re-enable when glib2 gets refreshed.
-# BUILD64 = 1
+# BUILD64_LIBS_ONLY = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 
 PKGFILES_CSWlibemf1 = $(PKGFILES_RT)

Modified: csw/mgar/pkg/libev/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libev/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libev/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -17,7 +17,7 @@
 DISTFILES  = $(NAME)-$(VERSION).tar.gz
 UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
 CONFIGURE_ARGS  = $(DIRPATHS)
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 LICENSE = LICENSE
 CHECKPKG_OVERRIDES_CSWlibev += soname-not-found|libm.so.2|is|needed|by|opt/csw/lib/amd64/libev.so.3.0.0
 include gar/category.mk

Modified: csw/mgar/pkg/libevent/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libevent/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libevent/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -28,7 +28,7 @@
 
 VENDOR_URL = http://www.monkey.org/~provos/libevent/
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 TEST_TARGET = verify
 

Modified: csw/mgar/pkg/libevent2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libevent2/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libevent2/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -64,7 +64,7 @@
 CPPFLAGS =
 EXTRA_CFLAGS += $(INCLUDE_FLAGS)
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 TEST_TARGET = verify
 

Modified: csw/mgar/pkg/libexif/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libexif/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libexif/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -30,7 +30,7 @@
 # PKGFILES is catchall
 RUNTIME_DEP_PKGS_CSWlibexif-dev += CSWlibexif12
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 CONFIGURE_ARGS  = $(DIRPATHS)
 CONFIGURE_ARGS += --enable-docs

Modified: csw/mgar/pkg/libexpat0/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libexpat0/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libexpat0/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -16,7 +16,7 @@
 SPKG_DESC_CSWlibexpat0 = XML parser toolkit, libexpat.so.0
 PKGFILES_CSWlibexpat0 += $(call pkgfiles_lib,libexpat.so.0)
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 INSTALL_OVERRIDE_DIRS = prefix exec_prefix bindir libdir includedir man1dir
 

Modified: csw/mgar/pkg/libexplain/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libexplain/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libexplain/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -36,6 +36,6 @@
 # PKGFILES is catchall
 RUNTIME_DEP_PKGS_CSWlibexplain-dev += CSWlibexplain30
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 include gar/category.mk

Modified: csw/mgar/pkg/libfaac/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libfaac/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libfaac/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -28,9 +28,7 @@
 PATCHFILES += input.c.diff ltp.c.diff mp4property.h.diff mp4util.h.diff
 PATCHFILES += mpeg4ip.h.diff psych.h.diff
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 
-MERGE_DIRS_isa-extra = $(libdir)
-
 include gar/category.mk

Modified: csw/mgar/pkg/libfaad2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libfaad2/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libfaad2/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -46,7 +46,7 @@
 
 STRIP_LIBTOOL = 1
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --with-drm

Modified: csw/mgar/pkg/libffi/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libffi/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libffi/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -49,7 +49,7 @@
 
 LICENSE = LICENSE
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 CONFIGURE_ARGS  = $(DIRPATHS)
 

Modified: csw/mgar/pkg/libfishsound/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libfishsound/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libfishsound/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -21,7 +21,7 @@
 
 OPT_FLAGS_SOS =
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 
 BUILD_ARGS = AM_CFLAGS= SHLIB_VERSION_ARG= libfishsound_la_LDFLAGS=

Modified: csw/mgar/pkg/libflac8/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libflac8/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libflac8/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -83,7 +83,7 @@
 
 STRIP_LIBTOOL = 1
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 CONFIGURE_ARGS = $(DIRPATHS)
 

Modified: csw/mgar/pkg/libfpx/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libfpx/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libfpx/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -51,7 +51,7 @@
 # For sqrt, atan2, pow
 EXTRA_LINKER_FLAGS += -lm
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 include gar/category.mk
 

Modified: csw/mgar/pkg/libgadu/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libgadu/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libgadu/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -44,6 +44,6 @@
 # There are zero-sized structs
 EXTRA_CFLAGS += -features=extensions
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 include gar/category.mk

Modified: csw/mgar/pkg/libgc/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libgc/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libgc/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -44,6 +44,6 @@
 #   FAIL: gctest
 # The bugreport has been posted on
 #   http://www.hpl.hp.com/hosted/linux/mail-archives/gc/2012-January/004904.html
-# BUILD64 = 1
+# BUILD64_LIBS_ONLY = 1
 
 include gar/category.mk

Modified: csw/mgar/pkg/libgcrypt/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libgcrypt/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libgcrypt/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -31,7 +31,7 @@
 OBSOLETED_BY_CSWlibgcrypt-utils = CSWgcrypt
 CATALOGNAME_CSWgcrypt = libgcrypt_stub
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 CONFIGURE_ARGS  = $(DIRPATHS)
 CONFIGURE_ARGS += --disable-asm

Modified: csw/mgar/pkg/libgdbm3/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libgdbm3/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libgdbm3/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -36,7 +36,7 @@
 # This is catchall
 RUNTIME_DEP_PKGS_CSWlibgdbm-dev = CSWlibgdbm3
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 
 # gdbm package has no test suite

Modified: csw/mgar/pkg/libglade2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libglade2/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libglade2/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -31,7 +31,7 @@
 SUNX11SUB_amd64 = amd64/
 EXTRA_LDFLAGS = -lm /usr/openwin/lib/$(SUNX11SUB_$(ISA))libXext.so
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 CONFIGURE_ARGS  = $(DIRPATHS)
 
 include gar/category.mk

Modified: csw/mgar/pkg/libgmp/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libgmp/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libgmp/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -24,7 +24,7 @@
 
 SPKG_SOURCEURL = http://gmplib.org/
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 # Disabling sparcv8plus with GCC
 # /var/tmp//ccPKyHnL.s: Assembler messages:

Modified: csw/mgar/pkg/libgmp3/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libgmp3/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libgmp3/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -23,7 +23,7 @@
 SPKG_SOURCEURL = http://gmplib.org/
 
 GARCOMPILER = GCC4
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 EXTRA_BUILD_ISAS_sparc = sparcv8plus sparcv8plus+vis 
 EXTRA_BUILD_ISAS_i386  = pentium

Modified: csw/mgar/pkg/libgnugetopt/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libgnugetopt/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libgnugetopt/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -26,6 +26,6 @@
 
 EXTRA_CFLAGS += -Xc
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 include gar/category.mk

Modified: csw/mgar/pkg/libgpg_error/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libgpg_error/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libgpg_error/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -38,6 +38,6 @@
 
 RUNTIME_DEP_PKGS = CSWggettextrt
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 include gar/category.mk

Modified: csw/mgar/pkg/libgsf/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libgsf/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libgsf/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -77,7 +77,7 @@
 
 # Missing 64-bit libs:
 # libgnomevfs-2.so libgconf-2.so libbonobo-2.so libbonobo-activation.so
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 STRIP_LIBTOOL = 1
 

Modified: csw/mgar/pkg/libgss/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libgss/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libgss/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -27,7 +27,7 @@
 RUNTIME_DEP_PKGS_CSWgss += CSWlibgss3
 RUNTIME_DEP_PKGS_CSWgss += CSWlibintl8
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 include gar/category.mk
 

Modified: csw/mgar/pkg/libical/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libical/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libical/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -35,7 +35,7 @@
 
 RUNTIME_DEP_PKGS_CSWlibicaldevel = CSWlibical
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 
 PKGFILES_CSWlibicaldevel = $(PKGFILES_DEVEL)

Modified: csw/mgar/pkg/libiconv/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libiconv/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libiconv/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -69,7 +69,7 @@
 #
 # OBSOLETED_BY_CSWlibiconv-utils += CSWiconv
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 # 'gmake test' shows three errors of coredumping printf's
 #

Modified: csw/mgar/pkg/libicu46/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libicu46/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libicu46/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -69,7 +69,7 @@
 
 EXTRA_CXXFLAGS = -norunpath
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 NOISALIST = 1
 
 include gar/category.mk

Modified: csw/mgar/pkg/libicu48/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libicu48/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libicu48/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -90,7 +90,7 @@
 # packages using the libs will bail out as they assume the libs are self-contained.
 LINKER_FLAGS = -lCrun -lCstd -norunpath
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 NOISALIST = 1
 
 include gar/category.mk

Modified: csw/mgar/pkg/libid3tag/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libid3tag/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libid3tag/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -19,7 +19,7 @@
 
 RUNTIME_DEP_PKGS = CSWzlib
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 NOISALIST = 1
 
 CONFIGURE_ARGS = $(DIRPATHS)

Modified: csw/mgar/pkg/libidl/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libidl/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libidl/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -23,7 +23,7 @@
 # pkgfiles is catchall
 RUNTIME_DEP_PKGS_CSWlibidl-dev += CSWlibidl2-0
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 CPP = /usr/lib/cpp
 EXTRA_COMMON_EXPORTS += CPP

Modified: csw/mgar/pkg/libidn/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libidn/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libidn/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -50,7 +50,7 @@
 INSTALL_OVERRIDE_VARS = SHELL
 INSTALL_OVERRIDE_VAR_SHELL = /opt/csw/bin/bash
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 # We don't need it and if defined the test breaks
 LD_OPTIONS =

Modified: csw/mgar/pkg/libiptcdata/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libiptcdata/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libiptcdata/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -43,7 +43,7 @@
 UPSTREAM_USE_SF = 1
 UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 CONFIGURE_ARGS  = $(DIRPATHS)
 # Python isn't 64-bit yet

Modified: csw/mgar/pkg/libjpeg62/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libjpeg62/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libjpeg62/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -17,7 +17,7 @@
 SPKG_DESC_CSWlibjpeg62 += JPEG library and tools by the Independent JPEG Group, libjpeg.so.62
 PKGFILES_CSWlibjpeg62 = $(call pkgfiles_lib,libjpeg.so.62)
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 # Ok, here comes a good one: a dynamic library is only generated when warnings are suppressed.
 # This is because in ltconfig the test to look if -KPIC actually works detects if there are

Modified: csw/mgar/pkg/libkate/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libkate/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libkate/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -57,15 +57,13 @@
 RUNTIME_DEP_PKGS_CSWpy-libkate += CSWpython
 PYCOMPILE = 1
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 
 # Disable testsuite until this is fixed:
 #   http://code.google.com/p/libkate/issues/detail?id=20
 SKIPTEST ?= 1
 
-MERGE_DIRS_isa-extra = $(libdir)
-
 include gar/category.mk
 
 post-configure-modulated:

Modified: csw/mgar/pkg/libksba/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libksba/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libksba/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -26,6 +26,6 @@
 # PKGFILES is catchall
 RUNTIME_DEP_PKGS_CSWlibksba-dev += CSWlibksba8
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 include gar/category.mk

Modified: csw/mgar/pkg/liblasi/trunk/Makefile
===================================================================
--- csw/mgar/pkg/liblasi/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/liblasi/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -48,7 +48,7 @@
 # That is ok
 CHECKPKG_OVERRIDES_CSWliblasi-dev += file-with-bad-content|/usr/local|root/opt/csw/share/doc/liblasi/examples/README
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 EXTRA_CXX_FLAGS = -lCstd -norunpath
 

Modified: csw/mgar/pkg/liblqr/trunk/Makefile
===================================================================
--- csw/mgar/pkg/liblqr/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/liblqr/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -36,6 +36,6 @@
 OBSOLETED_BY_CSWliblqr-dev += CSWliblqrdevel
 CATALOGNAME_CSWliblqrdevel = liblqr_devel_stub
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 include gar/category.mk

Modified: csw/mgar/pkg/libmad/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libmad/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libmad/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -27,7 +27,7 @@
 # PKGFILES is catchall
 RUNTIME_DEP_PKGS_CSWlibmad-dev = CSWlibmad0
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 include gar/category.mk
 

Modified: csw/mgar/pkg/libmatio/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libmatio/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libmatio/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -14,7 +14,7 @@
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 NOISALIST = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --enable-shared

Modified: csw/mgar/pkg/libmatroska/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libmatroska/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libmatroska/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -49,7 +49,7 @@
 RUNTIME_DEP_PKGS = CSWlibebml3
 BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS)
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 NOISALIST = 1
 
 CONFIGURE_SCRIPTS = 

Modified: csw/mgar/pkg/libmcal/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libmcal/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libmcal/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -14,7 +14,7 @@
 
 MASTER_SITES = $(SF_MIRRORS)
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 DISTFILES  = $(NAME)-$(VERSION).tar.gz
 DISTFILES += $(DRIVERNAME)-$(DRIVERVERSION).tar.gz

Modified: csw/mgar/pkg/libmcrypt/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libmcrypt/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libmcrypt/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -16,7 +16,7 @@
 MASTER_SITES = $(SF_MIRRORS)
 DISTFILES  = $(DISTNAME).tar.gz
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 STRIP_LIBTOOL = 1
 
 EXTRA_BUILD_ISAS_i386 = pentium_pro

Modified: csw/mgar/pkg/libmhash/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libmhash/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libmhash/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -18,7 +18,7 @@
 
 EXTRA_CPPFLAGS = -D__const=const
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 NOISALIST = 1
 
 # sparcv9 compile fails with optimization beyond -xO1 at HAVAL256: FAIL: frag_test

Modified: csw/mgar/pkg/libmikmod/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libmikmod/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libmikmod/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -19,7 +19,7 @@
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = -(\d+(?:\.\d+)*).tar.gz
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 TEST_SCRIPTS =
 

Modified: csw/mgar/pkg/libmpeg2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libmpeg2/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libmpeg2/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -32,10 +32,10 @@
 # This stupid configure script adds '-fast' overwriting -xarch ande especially activating 64 bit.
 BUILD_ARGS = MPEG2DEC_CFLAGS= OPT_CFLAGS=
 
-BUILD64_platform-solaris8-sparc = 1
-BUILD64_platform-solaris10-sparc = 1
-BUILD64_platform-solaris10-i386 = 1
-BUILD64 = $(BUILD64_platform-$(PLATFORM))
+BUILD64_LIBS_ONLY_platform-solaris8-sparc = 1
+BUILD64_LIBS_ONLY_platform-solaris10-sparc = 1
+BUILD64_LIBS_ONLY_platform-solaris10-i386 = 1
+BUILD64_LIBS_ONLY = $(BUILD64_platform-$(PLATFORM))
 
 CONFIGURE_ARGS = $(DIRPATHS)
 
@@ -46,8 +46,6 @@
 
 CONFIGURE_ARGS += $(CONFIGURE_ARGS_garosrel-$(GAROSREL))
 
-MERGE_DIRS_isa-extra = $(libdir)
-
 PKGFILES_CSWmpeg2dec = $(bindir)/.*
 PKGFILES_CSWmpeg2dec += $(mandir)/man1/.*
 

Modified: csw/mgar/pkg/libmpfr/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libmpfr/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libmpfr/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -18,7 +18,7 @@
 
 BUILD_DEP_PKGS = CSWlibgmp-dev
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 STRIP_LIBTOOL = 1
 
 CONFIGURE_ARGS  = $(DIRPATHS)

Modified: csw/mgar/pkg/libnet/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libnet/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libnet/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -24,7 +24,7 @@
 
 SPKG_SOURCEURL = http://www.packetfactory.net/libnet/
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 DISTNAME = Libnet-$(VERSION)
 

Modified: csw/mgar/pkg/libnotify/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libnotify/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libnotify/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -32,7 +32,7 @@
 EXTRA_INC = $(libdir_install)/dbus-1.0/include
 
 # Enable when CSWdbusglib is done in 64 bit
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 
 PKGFILES_CSWlibnotifydevel  = $(PKGFILES_DEVEL)

Modified: csw/mgar/pkg/libntlm/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libntlm/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libntlm/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -29,6 +29,6 @@
 # We don't need it and if defined the test breaks
 LD_OPTIONS =
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 include gar/category.mk

Modified: csw/mgar/pkg/libogg/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libogg/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libogg/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -24,6 +24,6 @@
 
 VENDOR_URL = http://www.vorbis.com/
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 include gar/category.mk

Modified: csw/mgar/pkg/liboggz/trunk/Makefile
===================================================================
--- csw/mgar/pkg/liboggz/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/liboggz/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -40,7 +40,7 @@
 OBSOLETED_BY_CSWoggz = CSWliboggz
 CATALOGNAME_CSWliboggz = liboggz_stub
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 # This is just docs
 CHECKPKG_OVERRIDES_CSWliboggz-dev += file-with-bad-content|/usr/local|root/opt/csw/share/doc/liboggz/html/group__install.html

Modified: csw/mgar/pkg/liboil/trunk/Makefile
===================================================================
--- csw/mgar/pkg/liboil/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/liboil/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -31,6 +31,6 @@
 OBSOLETED_BY_CSWliboil-dev += CSWliboildevel
 CATALOGNAME_CSWliboildevel = liboil_devel_stub
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 include gar/category.mk

Modified: csw/mgar/pkg/liborc/trunk/Makefile
===================================================================
--- csw/mgar/pkg/liborc/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/liborc/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -19,7 +19,7 @@
 
 VENDOR_URL = http://code.entropywave.com/projects/orc/
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 NOISALIST = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 

Modified: csw/mgar/pkg/libpaper/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libpaper/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libpaper/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -32,7 +32,7 @@
 
 EXTRA_CFLAGS = -Xc
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 CONFIGURE_ARGS = $(DIRPATHS)
 

Modified: csw/mgar/pkg/libpng/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libpng/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libpng/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -41,6 +41,6 @@
 # The CSWpng package must also pull in libpng.so.3 and libpng12.so.0
 OBSOLETED_BY_CSWlibpng15-15 = CSWpng
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 include gar/category.mk

Modified: csw/mgar/pkg/libpopt/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libpopt/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libpopt/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -38,7 +38,7 @@
 PKGFILES_CSWlibpopt-dev += $(PKGFILES_DEVEL)
 OBSOLETES_CSWlibpopt-dev += CSWlibpopt
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 NORUNPATH = 1
 
 include gar/category.mk

Modified: csw/mgar/pkg/libproxy/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libproxy/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libproxy/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -104,11 +104,8 @@
 
 EXTRA_LINKER_FLAGS = -lnsl
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
-# Skip 64 bit binaries - they are just big and gain nothing
-MERGE_DIRS_isa-extra = $(libdir)
-
 EXTRA_INC = $(prefix)/X11/include
 EXTRA_LIB = $(prefix)/X11/lib
 EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib

Modified: csw/mgar/pkg/libsamplerate/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libsamplerate/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libsamplerate/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -45,7 +45,7 @@
 
 BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS)
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --disable-static
 

Modified: csw/mgar/pkg/libschroedinger/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libschroedinger/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libschroedinger/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -29,7 +29,7 @@
 RUNTIME_DEP_PKGS_CSWlibschro = CSWliboil
 RUNTIME_DEP_PKGS_CSWlibschrodevel = CSWlibschro
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 
 PKGFILES_CSWlibschrodevel = $(PKGFILES_DEVEL)

Modified: csw/mgar/pkg/libsdl/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libsdl/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libsdl/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -28,7 +28,7 @@
 OBSOLETED_BY_CSWlibsdl-dev += CSWlibsdldevel
 CATALOGNAME_CSWlibsdldevel = libsdl_devel
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 CONFIGURE_ARGS = $(DIRPATHS) --disable-static
 
 TEST_TARGET = test

Modified: csw/mgar/pkg/libsexy/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libsexy/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libsexy/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -30,7 +30,7 @@
 
 VENDOR_URL = http://www.chipx86.com/blog/tag/libsexy/
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 
 PKGFILES_CSWlibsexydevel  = $(PKGFILES_DEVEL)

Modified: csw/mgar/pkg/libshout/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libshout/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libshout/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -28,7 +28,7 @@
 # PKGFILES is catchall
 RUNTIME_DEP_PKGS_CSWlibshout-dev = CSWlibshout3
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 #         GAR default: -xO3 -xarch=v8 -I/opt/csw/include
 # Configure hardwired: -xO4 -fast -w -fsimple -native -xcg92

Modified: csw/mgar/pkg/libsigcpp/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libsigcpp/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libsigcpp/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -25,7 +25,7 @@
 OBSOLETED_BY_CSWlibsigc-dev = CSWlibsigc++devel
 CATALOGNAME_CSWlibsigc++devel = libsigc++_devel_stub
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 EXTRA_CXXFLAGS += -norunpath
 EXTRA_CONFIGURE_ENV = MAKE=gmake
 CONFIGURE_ARGS = $(DIRPATHS) --disable-static

Modified: csw/mgar/pkg/libsigsegv/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libsigsegv/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libsigsegv/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -29,7 +29,7 @@
 
 VENDOR_URL = http://www.gnu.org/software/libsigsegv/
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --enable-shared --disable-static
 

Modified: csw/mgar/pkg/libsigsegv0/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libsigsegv0/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libsigsegv0/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -18,7 +18,7 @@
 
 VENDOR_URL = http://www.gnu.org/software/libsigsegv/
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --enable-shared --disable-static
 

Modified: csw/mgar/pkg/libsmi/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libsmi/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libsmi/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -42,7 +42,7 @@
 OBSOLETED_BY_CSWlibsmi-mibs = CSWlibsmimibs
 CATALOGNAME_CSWlibsmimibs = libsmi_mibs_stub
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 EXTRA_CPPFLAGS_isa-sparcv8 = -Dfabsf=fabs
 EXTRA_CPPFLAGS_isa-sparcv9 = -Dfabsf=fabs

Modified: csw/mgar/pkg/libsndfile/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libsndfile/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libsndfile/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -72,7 +72,7 @@
 PKGFILES_CSWlibsndfile-dev += $(docdir)/.*
 RUNTIME_DEP_PKGS_CSWlibsndfile-dev += CSWlibsndfile1
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 # Relocate docs to standard location
 EXTRA_PAX_ARGS += -s ',^\.$(prefix)/share/doc/libsndfile1-dev,.$(prefix)/share/doc/$(NAME),'

Modified: csw/mgar/pkg/libsoup/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libsoup/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libsoup/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -65,7 +65,7 @@
 STRIP_LIBTOOL = 1
 
 # Not working until gconf2 is 64-bit
-#BUILD64 = 1
+#BUILD64_LIBS_ONLY = 1
 
 # One test fails for some unknown reason
 #TEST_TARGET = check

Modified: csw/mgar/pkg/libspectre/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libspectre/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libspectre/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -26,6 +26,6 @@
 RUNTIME_DEP_PKGS_CSWlibspectre-dev = CSWlibspectre1
 
 # Disable for now as libgs is missing 64 bit
-#BUILD64 = 1
+#BUILD64_LIBS_ONLY = 1
 
 include gar/category.mk

Modified: csw/mgar/pkg/libspf2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libspf2/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libspf2/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -36,7 +36,7 @@
 # PKGFILES is catchall
 RUNTIME_DEP_PKGS_CSWlibspf2-dev = CSWlibspf2-2
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 EXTRA_LINKER_FLAGS = -lresolv  -lsocket  -lnsl 
 

Modified: csw/mgar/pkg/libssh2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libssh2/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libssh2/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -32,7 +32,7 @@
 OBSOLETED_BY_CSWlibssh2-dev += CSWlibssh2devel
 CATALOGNAME_CSWlibssh2devel = libssh2_devel_stub
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 CONFIGURE_ARGS  = $(DIRPATHS)
 CONFIGURE_ARGS += --with-libz

Modified: csw/mgar/pkg/libstatgrab/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libstatgrab/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libstatgrab/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -23,7 +23,7 @@
 # Don't pull in ncurses from CSW, but add needed libraries to be self-sufficient
 LINKER_FLAGS = -lkstat -ldevinfo -lsocket -lnsl
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 NORUNPATH = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --with-curses-prefix=/usr

Modified: csw/mgar/pkg/libstlport/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libstlport/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libstlport/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -15,7 +15,7 @@
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 
 include gar/category.mk

Modified: csw/mgar/pkg/libtasn1/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libtasn1/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libtasn1/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -40,7 +40,7 @@
 # we don't really need it anyway, so disable for now.
 NOISALIST = 1
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 include gar/category.mk
 

Modified: csw/mgar/pkg/libthai/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libthai/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libthai/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -34,7 +34,7 @@
 RUNTIME_DEP_PKGS_CSWlibthaidevel = CSWlibthai
 PREREQUISUITE_PKGS = $(RUNTIME_DEP_PKGS_CSWlibthai)
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 
 PKGFILES_CSWlibthaidevel = $(PKGFILES_DEVEL)

Modified: csw/mgar/pkg/libtheora/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libtheora/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libtheora/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -42,7 +42,7 @@
 RUNTIME_DEP_PKGS_CSWlibtheora-dev += CSWlibtheoradec1
 RUNTIME_DEP_PKGS_CSWlibtheora-dev += CSWlibtheoraenc1
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --disable-examples

Modified: csw/mgar/pkg/libtorrent/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libtorrent/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libtorrent/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -35,7 +35,7 @@
 RUNTIME_DEP_PKGS_CSWlibtorrent      = CSWosslrt CSWlibsigc++
 RUNTIME_DEP_PKGS_CSWlibtorrentdevel = CSWlibtorrent
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 CONFIGURE_ARGS = $(DIRPATHS) --enable-shared --disable-static --disable-libtool-lock --disable-debug
 
 PKGFILES_CSWlibtorrentdevel = $(PKGFILES_DEVEL)

Modified: csw/mgar/pkg/libunique/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libunique/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libunique/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -51,7 +51,7 @@
 RUNTIME_DEP_PKGS_CSWlibunique-dev += CSWlibcairo-dev
 RUNTIME_DEP_PKGS_CSWlibunique-dev += CSWpangodevel
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 NOISALIST = 1
 
 EXTRA_LINKER_FLAGS = -lsocket -lnsl

Modified: csw/mgar/pkg/libunistring/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libunistring/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libunistring/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -27,7 +27,7 @@
 CHECKPKG_OVERRIDES_CSWlibunistring-dev += file-with-bad-content|/usr/local|root/opt/csw/share/doc/libunistring/libunistring_15.html
 CHECKPKG_OVERRIDES_CSWlibunistring-dev += file-with-bad-content|/usr/local|root/opt/csw/share/info/libunistring.info
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/charset\.alias
 

Modified: csw/mgar/pkg/liburiparser/trunk/Makefile
===================================================================
--- csw/mgar/pkg/liburiparser/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/liburiparser/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -30,7 +30,7 @@
 RUNTIME_DEP_PKGS_CSWliburiparserdevel = CSWliburiparser1
 CHECKPKG_OVERRIDES_CSWliburiparserdevel += surplus-dependency|CSWliburiparser1
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 CONFIGURE_SCRIPTS  = $(WORKSRC)/configure
 CONFIGURE_SCRIPTS += $(WORKSRC)/doc/configure
 

Modified: csw/mgar/pkg/libvorbis/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libvorbis/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libvorbis/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -52,7 +52,7 @@
 
 VENDOR_URL = http://www.vorbis.com/
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 EXTRA_LD_FLAGS = -L$(libdir) -lsunmath -lm
 

Modified: csw/mgar/pkg/libwebp/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libwebp/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libwebp/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -30,7 +30,7 @@
 RUNTIME_DEP_PKGS_CSWwebp += CSWpng
 RUNTIME_DEP_PKGS_CSWwebp += CSWjpeg
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 # On amd64 -xO3 results in an assembler error
 OPT_FLAGS_SOS-amd64 = -xO2

Modified: csw/mgar/pkg/libwnck/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libwnck/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libwnck/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -51,7 +51,7 @@
 # For cos(3m)
 EXTRA_LINKER_FLAGS = -lm 
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 include gar/category.mk
 

Modified: csw/mgar/pkg/libxdg-basedir/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libxdg-basedir/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libxdg-basedir/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -28,6 +28,6 @@
 # localstatedir = /var$(prefix)
 #
 CONFIGURE_ARGS = $(DIRPATHS)
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 PATCHFILES += opencsw-paths.patch
 include gar/category.mk

Modified: csw/mgar/pkg/libxml++/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libxml++/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libxml++/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -16,7 +16,7 @@
 EXTRA_CONFIGURE_EXPORTS = MAKE
 MAKE = gmake
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 
 include gar/category.mk

Modified: csw/mgar/pkg/libxslt/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libxslt/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libxslt/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -75,7 +75,7 @@
 CONFIGURE_ARGS_64 = --without-python
 CONFIGURE_ARGS = $(DIRPATHS) $(CONFIGURE_ARGS_$(MEMORYMODEL))
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 STRIP_LIBTOOL = 1
 PYCOMPILE = 1
 

Modified: csw/mgar/pkg/libxspf/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libxspf/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libxspf/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -28,11 +28,9 @@
 RUNTIME_DEP_PKGS_CSWlibxspfdevel += CSWliburiparser1
 RUNTIME_DEP_PKGS_CSWlibxspfdevel += CSWexpat
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 
-MERGE_DIRS_isa-extra = $(libdir)
-
 PKGFILES_CSWlibxspf4 = $(PKGFILES_RT)
 
 include gar/category.mk

Modified: csw/mgar/pkg/libyaml/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libyaml/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/libyaml/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -14,6 +14,6 @@
 UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
 TEST_SCRIPTS =
 CONFIGURE_ARGS = $(DIRPATHS)
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 WORKSRC = $(WORKDIR)/yaml-$(VERSION)
 include gar/category.mk

Modified: csw/mgar/pkg/loudmouth/trunk/Makefile
===================================================================
--- csw/mgar/pkg/loudmouth/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/loudmouth/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -35,7 +35,7 @@
 
 VENDOR_URL = http://groups.google.com/group/loudmouth-dev
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --enable-glibtest
 

Modified: csw/mgar/pkg/lpc10/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lpc10/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/lpc10/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -14,7 +14,7 @@
 
 SPKG_SOURCEURL = http://www.arl.wustl.edu/~jaf/lpc/
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 # Some way to go for the manual build
 

Modified: csw/mgar/pkg/lzlib/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lzlib/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/lzlib/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -29,7 +29,7 @@
 EXTRA_CXXFLAGS = -xcode=pic32
 EXTRA_LINKER_FLAGS = -lCrun -norunpath
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 NOISALIST = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --enable-shared

Modified: csw/mgar/pkg/lzo/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lzo/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/lzo/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -25,7 +25,7 @@
 
 VENDOR_URL = http://www.oberhumer.com/opensource/lzo/
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --enable-shared --disable-static
 

Modified: csw/mgar/pkg/mbuffer/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mbuffer/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/mbuffer/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -26,7 +26,7 @@
 RUNTIME_DEP_PKGS = CSWlibmhash
 
 # 64-bit build enables buffers >= 2GB (see README).
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 
 # Required for updated libmhash (mbuffer builds against it) which allows for
 # flexible const/non-const definitions.  There should be a more intelligent 

Modified: csw/mgar/pkg/mcrypt/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mcrypt/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/mcrypt/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -19,7 +19,7 @@
 # PATCHFILES  = 0001-Do-not-use-Wall-on-Sun-Compiler.patch
 
 # There's a problem with the 64-bit build.
-# BUILD64 = 1
+# BUILD64_LIBS_ONLY = 1
 NOISALIST = 1
 STRIP_LIBTOOL = 1
 

Modified: csw/mgar/pkg/memcached/trunk/Makefile
===================================================================
--- csw/mgar/pkg/memcached/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/memcached/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -43,7 +43,7 @@
 # Make special version for Solaris 10 with enabled DTrace
 PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 # SASL is not 64 bit yet!
 #CONFIGURE_ARGS += --enable-sasl

Modified: csw/mgar/pkg/mibdump/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mibdump/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/mibdump/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -21,9 +21,7 @@
 
 RUNTIME_DEP_PKGS = CSWlibsmi
 
-BUILD64 = 1
+BUILD64_LIBS_ONLY = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 
-MERGE_DIRS_isa-extra = $(libdir)
-
 include gar/category.mk

Modified: csw/mgar/pkg/mod_nss/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mod_nss/trunk/Makefile	2012-01-23 14:09:44 UTC (rev 16893)
+++ csw/mgar/pkg/mod_nss/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
@@ -20,7 +20,7 @@
 DISTFILES += CSWap2modnss.postinstall
 DISTFILES += CSWap2modnss.preremove
 
-# BUILD64 = 1
+# BUILD64_LIBS_ONLY = 1
 PACKAGING_PLATFORMS += solaris10-sparc
 PACKAGING_PLATFORMS += solaris10-i386
 GARCOMPILER = SOS12U2

Modified: csw/mgar/pkg/mozldap/trunk/Makefile

@@ 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 cgrzemba at users.sourceforge.net  Mon Jan 23 15:23:48 2012
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Mon, 23 Jan 2012 14:23:48 +0000
Subject: [csw-devel] SF.net SVN: gar:[16895]
	csw/mgar/pkg/389-admin/trunk/Makefile
Message-ID: <E1RpKoG-0007CT-Nq@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 16895
          http://gar.svn.sourceforge.net/gar/?rev=16895&view=rev
Author:   cgrzemba
Date:     2012-01-23 14:23:48 +0000 (Mon, 23 Jan 2012)
Log Message:
-----------
389-admin/trunk: add checkpkg hints

Modified Paths:
--------------
    csw/mgar/pkg/389-admin/trunk/Makefile

Modified: csw/mgar/pkg/389-admin/trunk/Makefile
===================================================================
--- csw/mgar/pkg/389-admin/trunk/Makefile	2012-01-23 14:12:28 UTC (rev 16894)
+++ csw/mgar/pkg/389-admin/trunk/Makefile	2012-01-23 14:23:48 UTC (rev 16895)
@@ -74,6 +74,8 @@
 CHECKPKG_OVERRIDES_CSW389admin += surplus-dependency|CSWapache2
 CHECKPKG_OVERRIDES_CSW389admin += surplus-dependency|CSW389-admin-console
 CHECKPKG_OVERRIDES_CSW389admin += surplus-dependency|CSW389-ds-console
+CHECKPKG_OVERRIDES_CSW389admin += unidentified-dependency|CSW389-admin-console
+CHECKPKG_OVERRIDES_CSW389admin += unidentified-dependency|CSW389-ds-console
 
 # remove -I/opt/csw/include
 CPPFLAGS = 

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


From cgrzemba at users.sourceforge.net  Mon Jan 23 16:03:03 2012
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Mon, 23 Jan 2012 15:03:03 +0000
Subject: [csw-devel] SF.net SVN: gar:[16896] csw/mgar/pkg/389-ds-base/trunk
Message-ID: <E1RpLQF-0002jH-6w@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 16896
          http://gar.svn.sourceforge.net/gar/?rev=16896&view=rev
Author:   cgrzemba
Date:     2012-01-23 15:03:02 +0000 (Mon, 23 Jan 2012)
Log Message:
-----------
389-ds-base/trunk: fix default/dirsrv file

Modified Paths:
--------------
    csw/mgar/pkg/389-ds-base/trunk/Makefile
    csw/mgar/pkg/389-ds-base/trunk/files/0003-add-user-and-var-run-dirsrv.patch

Modified: csw/mgar/pkg/389-ds-base/trunk/Makefile
===================================================================
--- csw/mgar/pkg/389-ds-base/trunk/Makefile	2012-01-23 14:23:48 UTC (rev 16895)
+++ csw/mgar/pkg/389-ds-base/trunk/Makefile	2012-01-23 15:03:02 UTC (rev 16896)
@@ -33,7 +33,6 @@
 RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibprldap60
 RUNTIME_DEP_PKGS_CSW389-ds-base += CSWperl
 RUNTIME_DEP_PKGS_CSW389-ds-base += CSWpython
-RUNTIME_DEP_PKGS_CSW389-ds-base += CSWsasl
 RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibldif60
 RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibsvrcore0
 RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibnspr4
@@ -51,7 +50,10 @@
 RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibicui18n48
 RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibk5crypto3
 RUNTIME_DEP_PKGS_CSW389-ds-base += CSWpm-mozldap
+RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibssl3
+RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibsasl2-2
 
+
 CHECKPKG_OVERRIDES_CSW389-ds-base += file-with-bad-content|/usr/share|root/opt/csw/lib/dirsrv/perl/DSUpdate.pm
 CHECKPKG_OVERRIDES_CSW389-ds-base += file-with-bad-content|/usr/share|root/opt/csw/share/dirsrv/updates/exampleupdate.ldif
 CHECKPKG_OVERRIDES_CSW389-ds-base += file-with-bad-content|/usr/share|root/opt/csw/share/man/man1/dbgen.pl.1

Modified: csw/mgar/pkg/389-ds-base/trunk/files/0003-add-user-and-var-run-dirsrv.patch
===================================================================
--- csw/mgar/pkg/389-ds-base/trunk/files/0003-add-user-and-var-run-dirsrv.patch	2012-01-23 14:23:48 UTC (rev 16895)
+++ csw/mgar/pkg/389-ds-base/trunk/files/0003-add-user-and-var-run-dirsrv.patch	2012-01-23 15:03:02 UTC (rev 16896)
@@ -41,7 +41,7 @@
      LD_PRELOAD=/usr/lib/libumem.so
      export LD_PRELOAD
  fi
-@@ -41,6 +43,16 @@ if [ "$OS" = "SunOS" -a -f /usr/lib/64/libumem.so ] ; then
+@@ -41,6 +43,17 @@ if [ "$OS" = "SunOS" -a -f /usr/lib/64/libumem.so ] ; then
      export LD_PRELOAD_64
  fi
  

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


From cgrzemba at users.sourceforge.net  Mon Jan 23 16:05:59 2012
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Mon, 23 Jan 2012 15:05:59 +0000
Subject: [csw-devel] SF.net SVN: gar:[16897] csw/mgar/pkg/389-admin/trunk
Message-ID: <E1RpLT4-0001y4-WA@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 16897
          http://gar.svn.sourceforge.net/gar/?rev=16897&view=rev
Author:   cgrzemba
Date:     2012-01-23 15:05:58 +0000 (Mon, 23 Jan 2012)
Log Message:
-----------
389-admin/trunk: fix httpd.conf and initscript

Modified Paths:
--------------
    csw/mgar/pkg/389-admin/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/389-admin/trunk/files/0003-correct-initscript-and-http.conf.in.patch

Modified: csw/mgar/pkg/389-admin/trunk/Makefile
===================================================================
--- csw/mgar/pkg/389-admin/trunk/Makefile	2012-01-23 15:03:02 UTC (rev 16896)
+++ csw/mgar/pkg/389-admin/trunk/Makefile	2012-01-23 15:05:58 UTC (rev 16897)
@@ -23,8 +23,7 @@
 
 PATCHFILES += 0001-change-includedir-preference-in-Makefile.am.patch
 PATCHFILES += 0002-add-i386-platform-to-configure.ac.patch
-PATCHFILES += 0004-disable-SMF-service-at-install.patch
-PATCHFILES += 0005-comment-out-httpd-thread-options-in-httpd.conf.patch
+PATCHFILES += 0003-correct-initscript-and-http.conf.in.patch
 
 PACKAGES += CSWlibds-admin-serv0
 CATALOGNAME_CSWlibds-admin-serv0 = libds_admin_serv0

Added: csw/mgar/pkg/389-admin/trunk/files/0003-correct-initscript-and-http.conf.in.patch
===================================================================
--- csw/mgar/pkg/389-admin/trunk/files/0003-correct-initscript-and-http.conf.in.patch	                        (rev 0)
+++ csw/mgar/pkg/389-admin/trunk/files/0003-correct-initscript-and-http.conf.in.patch	2012-01-23 15:05:58 UTC (rev 16897)
@@ -0,0 +1,66 @@
+From 285470791f9eb6dbb196075e0f1945a09c4ad9ea Mon Sep 17 00:00:00 2001
+From: Carsten Grzemba <cgrzemba at opencsw.org>
+Date: Mon, 23 Jan 2012 15:51:51 +0100
+Subject: [PATCH] correct initscript and http.conf.in
+
+---
+ admserv/cfgstuff/httpd.conf.in |   10 +++++-----
+ wrappers/initscript.in         |    6 ++++--
+ 2 files changed, 9 insertions(+), 7 deletions(-)
+
+diff --git a/admserv/cfgstuff/httpd.conf.in b/admserv/cfgstuff/httpd.conf.in
+index a66eb21..b4098d9 100644
+--- a/admserv/cfgstuff/httpd.conf.in
++++ b/admserv/cfgstuff/httpd.conf.in
+@@ -99,12 +99,12 @@ ServerTokens Minor
+ # start one server in multi threaded mode
+ StartServers 1
+ # mtm
+-ServerLimit 1
++ServerLimit 4
+ 
+-MaxClients 64
+-MinSpareThreads 32
+-MaxSpareThreads 64
+-ThreadsPerChild 64
++MaxClients 4
++# MinSpareThreads 32
++# MaxSpareThreads 64
++# ThreadsPerChild 64
+ 
+ #
+ # Dynamic Shared Object (DSO) Support
+diff --git a/wrappers/initscript.in b/wrappers/initscript.in
+index 82dd20e..8fd03da 100644
+--- a/wrappers/initscript.in
++++ b/wrappers/initscript.in
+@@ -7,6 +7,8 @@
+ # processname: @sbindir@/httpd
+ # piddir:      @localstatedir@/run/@PACKAGE_BASE_NAME@
+ #
++#AUTOENABLE no # no SMF enable at install!
++#
+ 
+ # Source function library.
+ if [ -f /etc/rc.d/init.d/functions ] ; then
+@@ -94,7 +96,7 @@ prog="@package_name@"
+ piddir="@localstatedir@/run/@PACKAGE_BASE_NAME@"
+ # PID file
+ pidfile=$piddir/admin-serv.pid
+-lockfile=/var/lock/subsys/@package_name@
++lockfile=@localstatedir@/lock/subsys/@package_name@
+ 
+ [ -f $exec ] || exit 0
+ 
+@@ -163,7 +165,7 @@ start() {
+             RETVAL=1
+         fi
+     fi
+-    [ $RETVAL -eq 0 -a -d /var/lock/subsys ] && touch $lockfile
++    [ $RETVAL -eq 0 -a -d @localstatedir@/lock/subsys ] && touch $lockfile
+ }
+ 
+ stop() {
+-- 
+1.7.8.3
+

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


From dmichelsen at users.sourceforge.net  Mon Jan 23 21:50:26 2012
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Mon, 23 Jan 2012 20:50:26 +0000
Subject: [csw-devel] SF.net SVN: gar:[16898]
	csw/mgar/pkg/mgar/branches/no-svn-externals/
Message-ID: <E1RpQqQ-000505-V6@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 16898
          http://gar.svn.sourceforge.net/gar/?rev=16898&view=rev
Author:   dmichelsen
Date:     2012-01-23 20:50:26 +0000 (Mon, 23 Jan 2012)
Log Message:
-----------
mgar: Make branch to get rid of svn:externals

Added Paths:
-----------
    csw/mgar/pkg/mgar/branches/no-svn-externals/

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


From dmichelsen at users.sourceforge.net  Mon Jan 23 21:52:46 2012
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Mon, 23 Jan 2012 20:52:46 +0000
Subject: [csw-devel] SF.net SVN: opencsw:[596] gar-wrapper/mgar
Message-ID: <E1RpQsg-0007Op-1G@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 596
          http://opencsw.svn.sourceforge.net/opencsw/?rev=596&view=rev
Author:   dmichelsen
Date:     2012-01-23 20:52:45 +0000 (Mon, 23 Jan 2012)
Log Message:
-----------
mgar: Do not use svn:externals at all

Modified Paths:
--------------
    gar-wrapper/mgar

Modified: gar-wrapper/mgar
===================================================================
--- gar-wrapper/mgar	2012-01-11 23:13:04 UTC (rev 595)
+++ gar-wrapper/mgar	2012-01-23 20:52:45 UTC (rev 596)
@@ -39,7 +39,6 @@
 #   (~/opencsw/.buildsys/vX at YYYY, ~/opencsw/foo/trunk at YYYY)
 # * When packaging mgar, shield mgar up --self so that it won't override
 #   the package binary, but place it somewhere else.
-# * Recipes: Move from svn:externals to GARTYPE
 # * In commit mode: verify that checksums is up to date (DISTFILES listed?)
 # * Tune locate a:<foo> so that you can also search substrings (e.g. sed
 #   will also find recipes with gsed)
@@ -431,9 +430,6 @@
 function get_pkg_buildsysdir() {
   # fallback to svn:externals until builds are adjusted to carry GARYTPE
   local __gartype=`read_makefile_value GARTYPE`;
-  if [ -z "$__gartype" ]; then
-    __gartype=`svn pg svn:externals . | awk -F/ '/^gar/ { print $NF }'`
-  fi
   [ -z "$__gartype" ] && __gartype=$DEF_GARTYPE
   echo $BUILDTREE/.buildsys/$__gartype
 }
@@ -509,8 +505,7 @@
 
   svn ps svn:keywords Id ${__pkgname}/trunk/Makefile
   svn ps svn:ignore \
-    -F <( echo -e "cookies\ndownload\nwork\n" ) ${__pkgname}/trunk
-  svn ps svn:externals "gar ${GAR_REPO}v2" ${__pkgname}/trunk
+    -F <( echo -e "work" ) ${__pkgname}/trunk
 
   echo ""
   echo "Created successfully at $PWD/${__pkgname}/trunk" >&2

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


From cgrzemba at users.sourceforge.net  Tue Jan 24 11:43:34 2012
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Tue, 24 Jan 2012 10:43:34 +0000
Subject: [csw-devel] SF.net SVN: gar:[16899]
 csw/mgar/pkg/lang-java/389-admin-console/trunk/ Makefile
Message-ID: <E1Rpdqg-0002RO-G8@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 16899
          http://gar.svn.sourceforge.net/gar/?rev=16899&view=rev
Author:   cgrzemba
Date:     2012-01-24 10:43:34 +0000 (Tue, 24 Jan 2012)
Log Message:
-----------
lang-java/389-admin-console/trunk: fix brocken links

Modified Paths:
--------------
    csw/mgar/pkg/lang-java/389-admin-console/trunk/Makefile

Modified: csw/mgar/pkg/lang-java/389-admin-console/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-java/389-admin-console/trunk/Makefile	2012-01-23 20:50:26 UTC (rev 16898)
+++ csw/mgar/pkg/lang-java/389-admin-console/trunk/Makefile	2012-01-24 10:43:34 UTC (rev 16899)
@@ -4,6 +4,7 @@
 NAME = 389-admin-console
 SHORTNAME = 389-admin
 VERSION = 1.1.8
+MAJOR_VERSION = 1.1
 GARTYPE = v2
 CATEGORIES = java
 

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


From cgrzemba at users.sourceforge.net  Tue Jan 24 12:46:56 2012
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Tue, 24 Jan 2012 11:46:56 +0000
Subject: [csw-devel] SF.net SVN: gar:[16900]
 csw/mgar/pkg/lang-java/389-ds-console/trunk/ Makefile
Message-ID: <E1Rpeq0-00053Z-1o@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 16900
          http://gar.svn.sourceforge.net/gar/?rev=16900&view=rev
Author:   cgrzemba
Date:     2012-01-24 11:46:55 +0000 (Tue, 24 Jan 2012)
Log Message:
-----------
lang-java/389-ds-console/trunk: fix broken links

Modified Paths:
--------------
    csw/mgar/pkg/lang-java/389-ds-console/trunk/Makefile

Modified: csw/mgar/pkg/lang-java/389-ds-console/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-java/389-ds-console/trunk/Makefile	2012-01-24 10:43:34 UTC (rev 16899)
+++ csw/mgar/pkg/lang-java/389-ds-console/trunk/Makefile	2012-01-24 11:46:55 UTC (rev 16900)
@@ -4,6 +4,7 @@
 NAME = 389-ds-console
 SHORTNAME = 389-ds
 VERSION = 1.2.6
+MAJOR_VERSION = 1.2
 GARTYPE = v2
 CATEGORIES = java
 

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


From cgrzemba at users.sourceforge.net  Tue Jan 24 13:48:29 2012
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Tue, 24 Jan 2012 12:48:29 +0000
Subject: [csw-devel] SF.net SVN: gar:[16901] csw/mgar/pkg/389-admin/trunk
Message-ID: <E1RpfnZ-0002gU-Pj@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 16901
          http://gar.svn.sourceforge.net/gar/?rev=16901&view=rev
Author:   cgrzemba
Date:     2012-01-24 12:48:29 +0000 (Tue, 24 Jan 2012)
Log Message:
-----------
389-admin/trunk: fix configuration

Modified Paths:
--------------
    csw/mgar/pkg/389-admin/trunk/Makefile
    csw/mgar/pkg/389-admin/trunk/files/0003-correct-initscript-and-http.conf.in.patch

Added Paths:
-----------
    csw/mgar/pkg/389-admin/trunk/files/CSW389admin.preremove

Removed Paths:
-------------
    csw/mgar/pkg/389-admin/trunk/files/0004-disable-SMF-service-at-install.patch
    csw/mgar/pkg/389-admin/trunk/files/0005-comment-out-httpd-thread-options-in-httpd.conf.patch

Modified: csw/mgar/pkg/389-admin/trunk/Makefile
===================================================================
--- csw/mgar/pkg/389-admin/trunk/Makefile	2012-01-24 11:46:55 UTC (rev 16900)
+++ csw/mgar/pkg/389-admin/trunk/Makefile	2012-01-24 12:48:29 UTC (rev 16901)
@@ -79,7 +79,12 @@
 # remove -I/opt/csw/include
 CPPFLAGS = 
 # no optimization
-CFLAGS = 
+CFLAGS = -g
+FFLAGS=
+FCFLAGS=
+OPTFLAGS=
+CXXFLAGS=
+
 EXTRA_LINKER_FLAGS = -xnorunpath -norunpath -liconv
 
 CONFIGURE_ARGS = $(DIRPATHS)
@@ -96,6 +101,7 @@
 CONFIGURE_ARGS_OPT += --with-httpd=/opt/csw/apache2/sbin/httpd
 CONFIGURE_ARGS_OPT += --with-modnss-lib=/opt/csw/apache2/libexec
 CONFIGURE_ARGS_OPT += --with-modnss-bin=/opt/csw/apache2/sbin
+CONFIGURE_ARGS_OPT += --disable-threading
 CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARFLAVOR))
 
 include gar/category.mk

Modified: csw/mgar/pkg/389-admin/trunk/files/0003-correct-initscript-and-http.conf.in.patch
===================================================================
--- csw/mgar/pkg/389-admin/trunk/files/0003-correct-initscript-and-http.conf.in.patch	2012-01-24 11:46:55 UTC (rev 16900)
+++ csw/mgar/pkg/389-admin/trunk/files/0003-correct-initscript-and-http.conf.in.patch	2012-01-24 12:48:29 UTC (rev 16901)
@@ -4,14 +4,14 @@
 Subject: [PATCH] correct initscript and http.conf.in
 
 ---
- admserv/cfgstuff/httpd.conf.in |   10 +++++-----
+ admserv/cfgstuff/httpd-2.2.conf.in |   10 +++++-----
  wrappers/initscript.in         |    6 ++++--
  2 files changed, 9 insertions(+), 7 deletions(-)
 
-diff --git a/admserv/cfgstuff/httpd.conf.in b/admserv/cfgstuff/httpd.conf.in
+diff --git a/admserv/cfgstuff/httpd-2.2.conf.in b/admserv/cfgstuff/httpd-2.2.conf.in
 index a66eb21..b4098d9 100644
---- a/admserv/cfgstuff/httpd.conf.in
-+++ b/admserv/cfgstuff/httpd.conf.in
+--- a/admserv/cfgstuff/httpd-2.2.conf.in
++++ b/admserv/cfgstuff/httpd-2.2.conf.in
 @@ -99,12 +99,12 @@ ServerTokens Minor
  # start one server in multi threaded mode
  StartServers 1
@@ -43,24 +43,27 @@
  
  # Source function library.
  if [ -f /etc/rc.d/init.d/functions ] ; then
-@@ -94,7 +96,7 @@ prog="@package_name@"
+@@ -94,7 +96,8 @@ prog="@package_name@"
  piddir="@localstatedir@/run/@PACKAGE_BASE_NAME@"
  # PID file
  pidfile=$piddir/admin-serv.pid
 -lockfile=/var/lock/subsys/@package_name@
 +lockfile=@localstatedir@/lock/subsys/@package_name@
++lockdir=`dirname $lockfile`
  
  [ -f $exec ] || exit 0
  
-@@ -163,7 +165,7 @@ start() {
+@@ -163,7 +166,8 @@ start() {
              RETVAL=1
          fi
      fi
 -    [ $RETVAL -eq 0 -a -d /var/lock/subsys ] && touch $lockfile
-+    [ $RETVAL -eq 0 -a -d @localstatedir@/lock/subsys ] && touch $lockfile
++    [ ! -d $lockdir ] && mkdir -p $lockdir
++    [ $RETVAL -eq 0 -a -d $lockdir ] && touch $lockfile
  }
  
  stop() {
+
 -- 
 1.7.8.3
 

Deleted: csw/mgar/pkg/389-admin/trunk/files/0004-disable-SMF-service-at-install.patch
===================================================================
--- csw/mgar/pkg/389-admin/trunk/files/0004-disable-SMF-service-at-install.patch	2012-01-24 11:46:55 UTC (rev 16900)
+++ csw/mgar/pkg/389-admin/trunk/files/0004-disable-SMF-service-at-install.patch	2012-01-24 12:48:29 UTC (rev 16901)
@@ -1,25 +0,0 @@
-From fc16535d4003f8fc7df6f451b6c785e975ce9bc0 Mon Sep 17 00:00:00 2001
-From: Carsten Grzemba <cgrzemba at opencsw.org>
-Date: Mon, 23 Jan 2012 14:27:18 +0100
-Subject: [PATCH 4/5] disable SMF service at install
-
----
- wrappers/initscript.in |    2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/wrappers/initscript.in b/wrappers/initscript.in
-index 82dd20e..2971c35 100644
---- a/wrappers/initscript.in
-+++ b/wrappers/initscript.in
-@@ -7,6 +7,8 @@
- # processname: @sbindir@/httpd
- # piddir:      @localstatedir@/run/@PACKAGE_BASE_NAME@
- #
-+#AUTOENABLE no # no CSW SMF enable at install!
-+#
- 
- # Source function library.
- if [ -f /etc/rc.d/init.d/functions ] ; then
--- 
-1.7.8.3
-

Deleted: csw/mgar/pkg/389-admin/trunk/files/0005-comment-out-httpd-thread-options-in-httpd.conf.patch
===================================================================
--- csw/mgar/pkg/389-admin/trunk/files/0005-comment-out-httpd-thread-options-in-httpd.conf.patch	2012-01-24 11:46:55 UTC (rev 16900)
+++ csw/mgar/pkg/389-admin/trunk/files/0005-comment-out-httpd-thread-options-in-httpd.conf.patch	2012-01-24 12:48:29 UTC (rev 16901)
@@ -1,29 +0,0 @@
-From 0fde3ae66c2bbca4d211ad8a232b488ab3b389cc Mon Sep 17 00:00:00 2001
-From: Carsten Grzemba <cgrzemba at opencsw.org>
-Date: Mon, 23 Jan 2012 14:29:10 +0100
-Subject: [PATCH 5/5] comment out httpd thread options in httpd.conf
-
----
- admserv/cfgstuff/httpd.conf.in |    6 +++---
- 1 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/admserv/cfgstuff/httpd.conf.in b/admserv/cfgstuff/httpd.conf.in
-index a66eb21..ea12a56 100644
---- a/admserv/cfgstuff/httpd.conf.in
-+++ b/admserv/cfgstuff/httpd.conf.in
-@@ -102,9 +102,9 @@ StartServers 1
- ServerLimit 1
- 
- MaxClients 64
--MinSpareThreads 32
--MaxSpareThreads 64
--ThreadsPerChild 64
-+# MinSpareThreads 32
-+# MaxSpareThreads 64
-+# ThreadsPerChild 64
- 
- #
- # Dynamic Shared Object (DSO) Support
--- 
-1.7.8.3
-

Added: csw/mgar/pkg/389-admin/trunk/files/CSW389admin.preremove
===================================================================
--- csw/mgar/pkg/389-admin/trunk/files/CSW389admin.preremove	                        (rev 0)
+++ csw/mgar/pkg/389-admin/trunk/files/CSW389admin.preremove	2012-01-24 12:48:29 UTC (rev 16901)
@@ -0,0 +1,5 @@
+( cd /etc/opt/csw/dirsrv/adm-serv
+  cp -p console.conf console.conf.configured
+  cp -p httpd.conf httpd.conf.configured
+  cp -p admserv.conf admserv.conf.configured
+)

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


From dmichelsen at users.sourceforge.net  Tue Jan 24 14:19:56 2012
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Tue, 24 Jan 2012 13:19:56 +0000
Subject: [csw-devel] SF.net SVN: gar:[16902] csw/mgar/pkg/rrdtool/trunk
Message-ID: <E1RpgI0-00033G-3t@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 16902
          http://gar.svn.sourceforge.net/gar/?rev=16902&view=rev
Author:   dmichelsen
Date:     2012-01-24 13:19:55 +0000 (Tue, 24 Jan 2012)
Log Message:
-----------
rrdtool/trunk: Update to 1.4.7

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

Removed Paths:
-------------
    csw/mgar/pkg/rrdtool/trunk/files/0001-Do-not-reference-tm.tm_gmtoff-on-Solaris.patch

Modified: csw/mgar/pkg/rrdtool/trunk/Makefile
===================================================================
--- csw/mgar/pkg/rrdtool/trunk/Makefile	2012-01-24 12:48:29 UTC (rev 16901)
+++ csw/mgar/pkg/rrdtool/trunk/Makefile	2012-01-24 13:19:55 UTC (rev 16902)
@@ -1,5 +1,5 @@
 NAME = rrdtool
-VERSION = 1.4.6
+VERSION = 1.4.7
 CATEGORIES = utils
 
 DESCRIPTION = Time-series data logging and graphing
@@ -12,10 +12,6 @@
 MASTER_SITES = http://oss.oetiker.ch/$(NAME)/pub/
 DISTFILES = $(DISTNAME).tar.gz
 
-# Use patch until this is fixed:
-#   http://oss.oetiker.ch/rrdtool-trac/ticket/330
-PATCHFILES += 0001-Do-not-reference-tm.tm_gmtoff-on-Solaris.patch
-
 PATCHFILES += 0002-Always-link-local-libs-first-during-Perl-module.patch
 
 # Make sure to link against libperl.so to make shared libraries self-contained.
@@ -49,40 +45,40 @@
 RUNTIME_DEP_PKGS_CSWrrdtool += CSWlibintl8
 RUNTIME_DEP_PKGS_CSWrrdtool += CSWlibwrap1
 RUNTIME_DEP_PKGS_CSWrrdtool += CSWlibdbi1
-RUNTIME_DEP_PKGS_CSWrrdtool += CSWlibrrd3
-RUNTIME_DEP_PKGS_CSWrrdtool += CSWlibrrd-th3
+RUNTIME_DEP_PKGS_CSWrrdtool += CSWlibrrd4
+RUNTIME_DEP_PKGS_CSWrrdtool += CSWlibrrd-th4
 OBSOLETED_BY_CSWrrdtool = CSWrrd
 CATALOGNAME_CSWrrd = rrd_stub
 
 PACKAGES += CSWrrdtool-dev
-SPKG_DESC_CSWrrdtool-dev = Development files for librrd.so.3
+SPKG_DESC_CSWrrdtool-dev = Development files for librrd.so.4
 # Explicitly do not include *.3perl
 PKGFILES_DEVEL_MAN3_MANPAGE = $(mandir)/man3/.*\.3
 PKGFILES_CSWrrdtool-dev = $(PKGFILES_DEVEL)
-RUNTIME_DEP_PKGS_CSWrrdtool-dev += CSWlibrrd3
-RUNTIME_DEP_PKGS_CSWrrdtool-dev += CSWlibrrd-th3
+RUNTIME_DEP_PKGS_CSWrrdtool-dev += CSWlibrrd4
+RUNTIME_DEP_PKGS_CSWrrdtool-dev += CSWlibrrd-th4
 
-PACKAGES += CSWlibrrd3
-SPKG_DESC_CSWlibrrd3 = Runtime library for RRDtool, librrd.so.3
-PKGFILES_CSWlibrrd3 += $(call pkgfiles_lib,librrd.so.3)
-RUNTIME_DEP_PKGS_CSWlibrrd3 += CSWlibglib2-0-0
-RUNTIME_DEP_PKGS_CSWlibrrd3 += CSWlibcairo2
-RUNTIME_DEP_PKGS_CSWlibrrd3 += CSWpango
-RUNTIME_DEP_PKGS_CSWlibrrd3 += CSWlibxml2-2
-RUNTIME_DEP_PKGS_CSWlibrrd3 += CSWlibintl8
-RUNTIME_DEP_PKGS_CSWlibrrd3 += CSWlibwrap1
-RUNTIME_DEP_PKGS_CSWlibrrd3 += CSWlibdbi1
+PACKAGES += CSWlibrrd4
+SPKG_DESC_CSWlibrrd4 = Runtime library for RRDtool, librrd.so.4
+PKGFILES_CSWlibrrd4 += $(call pkgfiles_lib,librrd.so.4)
+RUNTIME_DEP_PKGS_CSWlibrrd4 += CSWlibglib2-0-0
+RUNTIME_DEP_PKGS_CSWlibrrd4 += CSWlibcairo2
+RUNTIME_DEP_PKGS_CSWlibrrd4 += CSWpango
+RUNTIME_DEP_PKGS_CSWlibrrd4 += CSWlibxml2-2
+RUNTIME_DEP_PKGS_CSWlibrrd4 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibrrd4 += CSWlibwrap1
+RUNTIME_DEP_PKGS_CSWlibrrd4 += CSWlibdbi1
 
-PACKAGES += CSWlibrrd-th3
-SPKG_DESC_CSWlibrrd-th3 = Runtime library for RRDtool, librrd_th.so.3
-PKGFILES_CSWlibrrd-th3 += $(call pkgfiles_lib,librrd_th.so.3)
-RUNTIME_DEP_PKGS_CSWlibrrd-th3 += CSWlibwrap1
-RUNTIME_DEP_PKGS_CSWlibrrd-th3 += CSWlibintl8
-RUNTIME_DEP_PKGS_CSWlibrrd-th3 += CSWlibcairo2
-RUNTIME_DEP_PKGS_CSWlibrrd-th3 += CSWlibxml2-2
-RUNTIME_DEP_PKGS_CSWlibrrd-th3 += CSWpango
-RUNTIME_DEP_PKGS_CSWlibrrd-th3 += CSWlibglib2-0-0
-RUNTIME_DEP_PKGS_CSWlibrrd-th3 += CSWlibdbi1
+PACKAGES += CSWlibrrd-th4
+SPKG_DESC_CSWlibrrd-th4 = Runtime library for RRDtool, librrd_th.so.4
+PKGFILES_CSWlibrrd-th4 += $(call pkgfiles_lib,librrd_th.so.4)
+RUNTIME_DEP_PKGS_CSWlibrrd-th4 += CSWlibwrap1
+RUNTIME_DEP_PKGS_CSWlibrrd-th4 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibrrd-th4 += CSWlibcairo2
+RUNTIME_DEP_PKGS_CSWlibrrd-th4 += CSWlibxml2-2
+RUNTIME_DEP_PKGS_CSWlibrrd-th4 += CSWpango
+RUNTIME_DEP_PKGS_CSWlibrrd-th4 += CSWlibglib2-0-0
+RUNTIME_DEP_PKGS_CSWlibrrd-th4 += CSWlibdbi1
 
 PACKAGES += CSWpm-rrdtool
 SPKG_DESC_CSWpm-rrdtool = RRDs: Access RRDtool as a shared module (part of RRDtool)
@@ -92,21 +88,21 @@
 PKGFILES_CSWpm-rrdtool += .*\.3perl
 
 RUNTIME_DEP_PKGS_CSWpm-rrdtool += CSWperl
-RUNTIME_DEP_PKGS_CSWpm-rrdtool += CSWlibrrd3
+RUNTIME_DEP_PKGS_CSWpm-rrdtool += CSWlibrrd4
 OBSOLETED_BY_CSWpm-rrdtool = CSWrrd
 
 PACKAGES += CSWpy-rrdtool
 SPKG_DESC_CSWrb-rrdtool = Ruby binding for RRD access (part of RRDtool)
 PKGFILES_CSWpy-rrdtool = $(libdir)/python/.*
 RUNTIME_DEP_PKGS_CSWpy-rrdtool += CSWlibpython2-6-1-0
-RUNTIME_DEP_PKGS_CSWpy-rrdtool += CSWlibrrd3
+RUNTIME_DEP_PKGS_CSWpy-rrdtool += CSWlibrrd4
 OBSOLETED_BY_CSWpy-rrdtool = CSWrrd
 
 PACKAGES += CSWrb-rrdtool
 SPKG_DESC_CSWpy-rrdtool = Python egg for RRD access (part of RRDtool)
 PKGFILES_CSWrb-rrdtool = $(libdir)/ruby/.*
 RUNTIME_DEP_PKGS_CSWrb-rrdtool += CSWlibruby18-1
-RUNTIME_DEP_PKGS_CSWrb-rrdtool += CSWlibrrd3
+RUNTIME_DEP_PKGS_CSWrb-rrdtool += CSWlibrrd4
 OBSOLETED_BY_CSWrb-rrdtool = CSWrrd
 # This is crappy and needs fixing, unfortunately inside extconf.rb which is hard.
 CHECKPKG_OVERRIDES_CSWrb-rrdtool += bad-rpath-entry

Modified: csw/mgar/pkg/rrdtool/trunk/checksums
===================================================================
--- csw/mgar/pkg/rrdtool/trunk/checksums	2012-01-24 12:48:29 UTC (rev 16901)
+++ csw/mgar/pkg/rrdtool/trunk/checksums	2012-01-24 13:19:55 UTC (rev 16902)
@@ -1 +1 @@
-f62316beba89b5f31880850d2c2a5267  rrdtool-1.4.6.tar.gz
+ffe369d8921b4dfdeaaf43812100c38f  rrdtool-1.4.7.tar.gz

Deleted: csw/mgar/pkg/rrdtool/trunk/files/0001-Do-not-reference-tm.tm_gmtoff-on-Solaris.patch
===================================================================
--- csw/mgar/pkg/rrdtool/trunk/files/0001-Do-not-reference-tm.tm_gmtoff-on-Solaris.patch	2012-01-24 12:48:29 UTC (rev 16901)
+++ csw/mgar/pkg/rrdtool/trunk/files/0001-Do-not-reference-tm.tm_gmtoff-on-Solaris.patch	2012-01-24 13:19:55 UTC (rev 16902)
@@ -1,26 +0,0 @@
-From 62585d67b81bd3b47872a061f8c369504bce986f Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen <dam at opencsw.org>
-Date: Thu, 19 Jan 2012 15:51:37 +0100
-Subject: [PATCH] Do not reference tm.tm_gmtoff on Solaris
-
----
- src/rrd_fetch_libdbi.c |    2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/src/rrd_fetch_libdbi.c b/src/rrd_fetch_libdbi.c
-index 21fbc08..9d437aa 100644
---- a/src/rrd_fetch_libdbi.c
-+++ b/src/rrd_fetch_libdbi.c
-@@ -464,7 +464,9 @@ rrd_fetch_fn_libdbi(
-     struct tm tm;
-     time_t t=time(NULL);
-     localtime_r(&t,&tm);
-+#if !defined(__sun) && !defined(__sun__)
-     gmt_offset=tm.tm_gmtoff;
-+#endif
-     isunixtime=0; table_help.timestamp++;
-   }
-   /* hex-unescape the value */
--- 
-1.7.8.3
-

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


From cgrzemba at users.sourceforge.net  Tue Jan 24 17:04:10 2012
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Tue, 24 Jan 2012 16:04:10 +0000
Subject: [csw-devel] SF.net SVN: gar:[16903]
	csw/mgar/pkg/389-admin/trunk/Makefile
Message-ID: <E1Rpiqw-0005uS-AR@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 16903
          http://gar.svn.sourceforge.net/gar/?rev=16903&view=rev
Author:   cgrzemba
Date:     2012-01-24 16:04:09 +0000 (Tue, 24 Jan 2012)
Log Message:
-----------
389-admin/trunk: add preremove script

Modified Paths:
--------------
    csw/mgar/pkg/389-admin/trunk/Makefile

Modified: csw/mgar/pkg/389-admin/trunk/Makefile
===================================================================
--- csw/mgar/pkg/389-admin/trunk/Makefile	2012-01-24 13:19:55 UTC (rev 16902)
+++ csw/mgar/pkg/389-admin/trunk/Makefile	2012-01-24 16:04:09 UTC (rev 16903)
@@ -13,6 +13,8 @@
 
 MASTER_SITES = http://port389.org/sources
 DISTFILES  = $(NAME)-$(VERSION).tar.bz2
+DISTFILES += CSW389admin.preremove
+
 # BUILD64	= 1
 PACKAGING_PLATFORMS += solaris10-sparc
 PACKAGING_PLATFORMS += solaris10-i386

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


From skayser at users.sourceforge.net  Tue Jan 24 17:28:06 2012
From: skayser at users.sourceforge.net (skayser at users.sourceforge.net)
Date: Tue, 24 Jan 2012 16:28:06 +0000
Subject: [csw-devel] SF.net SVN: opencsw:[597] gar-wrapper
Message-ID: <E1RpjE6-0001mh-Tf@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 597
          http://opencsw.svn.sourceforge.net/opencsw/?rev=597&view=rev
Author:   skayser
Date:     2012-01-24 16:28:06 +0000 (Tue, 24 Jan 2012)
Log Message:
-----------
mgar: mark as 0.95

Modified Paths:
--------------
    gar-wrapper/CHANGES
    gar-wrapper/mgar

Modified: gar-wrapper/CHANGES
===================================================================
--- gar-wrapper/CHANGES	2012-01-23 20:52:45 UTC (rev 596)
+++ gar-wrapper/CHANGES	2012-01-24 16:28:06 UTC (rev 597)
@@ -1,5 +1,7 @@
-Changes with 0.95 (r???):
+Changes with 0.95 (r597):
 * CHANGE "list-categories" will now show category.mk locations
+* DROP "newpkg" will not create svn:externals any more (Dagobert Michelsen)
+* DROP no more fallback to svn:externals when looking for GAR (Dagobert M.)
 
 Changes with 0.94 (r564):
 * NEW command "status" to query VCS status (^= svn status)

Modified: gar-wrapper/mgar
===================================================================
--- gar-wrapper/mgar	2012-01-23 20:52:45 UTC (rev 596)
+++ gar-wrapper/mgar	2012-01-24 16:28:06 UTC (rev 597)
@@ -33,6 +33,7 @@
 #
 # Todos:
 # * Add template for ~/.garrc (think new users)
+# * Verify that required config variables are set in ~/.garrc
 # * Add "diag" command to display CC versions, ~/.garrc settings, and such
 # * Improve error messages when buildsys can't be found
 # * Enable checkout of a specific revision for build recipe + GAR
@@ -54,7 +55,7 @@
 set -u
 set -e
 
-VERSION=0.95-dev
+VERSION=0.95
 EDITOR=${EDITOR:-vi}
 PATH=$PATH:/opt/csw/bin
 DEF_BUILDTREE=~/opencsw

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


From skayser at users.sourceforge.net  Tue Jan 24 17:55:20 2012
From: skayser at users.sourceforge.net (skayser at users.sourceforge.net)
Date: Tue, 24 Jan 2012 16:55:20 +0000
Subject: [csw-devel] SF.net SVN: gar:[16904] csw/mgar/pkg/mgar/trunk
Message-ID: <E1RpjeS-0002LN-3s@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 16904
          http://gar.svn.sourceforge.net/gar/?rev=16904&view=rev
Author:   skayser
Date:     2012-01-24 16:55:19 +0000 (Tue, 24 Jan 2012)
Log Message:
-----------
mgar/trunk: bump to 0.95

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

Modified: csw/mgar/pkg/mgar/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mgar/trunk/Makefile	2012-01-24 16:04:09 UTC (rev 16903)
+++ csw/mgar/pkg/mgar/trunk/Makefile	2012-01-24 16:55:19 UTC (rev 16904)
@@ -2,7 +2,7 @@
 # TODO (release-critical prefixed with !, non release-critical with *)
 #
 NAME = mgar
-VERSION = 0.94
+VERSION = 0.95
 CATEGORIES = apps
 
 DESCRIPTION = Command line interface to the OpenCSW build system
@@ -12,7 +12,7 @@
 
 VENDOR_URL = http://gar.opencsw.org
 SVNROOT    = https://opencsw.svn.sourceforge.net/svnroot/opencsw/gar-wrapper
-SVNREV     = 564
+SVNREV     = 597
 
 ARCHALL = 1
 

Modified: csw/mgar/pkg/mgar/trunk/files/changelog.CSW
===================================================================
--- csw/mgar/pkg/mgar/trunk/files/changelog.CSW	2012-01-24 16:04:09 UTC (rev 16903)
+++ csw/mgar/pkg/mgar/trunk/files/changelog.CSW	2012-01-24 16:55:19 UTC (rev 16904)
@@ -1,3 +1,8 @@
+mgar (0.95,REV=2012.01.24)
+
+  * Bump to version 0.95.
+
+ -- Sebastian Kayser <skayser at opencsw.org>  Tue, 24 Jan 2012 17:27:54 +0100
 mgar (0.94,REV=2011.09.28)
 
   * Depend on CSWgar-dev instead of obsolete CSWgardevel

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


From bdwalton at users.sourceforge.net  Wed Jan 25 02:38:32 2012
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Wed, 25 Jan 2012 01:38:32 +0000
Subject: [csw-devel] SF.net SVN: gar:[16905] csw/mgar/pkg/php5/trunk/Makefile
Message-ID: <E1Rprom-0000Lp-QX@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 16905
          http://gar.svn.sourceforge.net/gar/?rev=16905&view=rev
Author:   bdwalton
Date:     2012-01-25 01:38:32 +0000 (Wed, 25 Jan 2012)
Log Message:
-----------
php5/trunk: update dependencies (most modules link to libz1 now!)

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

Modified: csw/mgar/pkg/php5/trunk/Makefile
===================================================================
--- csw/mgar/pkg/php5/trunk/Makefile	2012-01-24 16:55:19 UTC (rev 16904)
+++ csw/mgar/pkg/php5/trunk/Makefile	2012-01-25 01:38:32 UTC (rev 16905)
@@ -86,6 +86,8 @@
 CATALOGNAME_CSWphp5        = php5
 SPKG_DESC_CSWphp5          = A High-Level Scripting Language
 RUNTIME_DEP_PKGS_CSWphp5 += CSWlibxml2-2 CSWlibiconv2 CSWlibexpat1 CSWlibz1
+RUNTIME_DEP_PKGS_CSWphp5 += CSWlibicuio48 CSWlibicuuc48 CSWlibicui18n48
+RUNTIME_DEP_PKGS_CSWphp5 += CSWlibicudata48
 INCOMPATIBLE_PKGS_CSWphp5 = CSWphp5mimemagic CSWphp5mhash CSWphp5dbase
 INCOMPATIBLE_PKGS_CSWphp5 += CSWphp5ncurses CSWmodphp5
 # embeded 'magic' information to detect file types...odd, but...
@@ -132,83 +134,85 @@
 SPKG_DESC_CSWap2-modphp5 = The apache 2.2.x php5 module
 RUNTIME_DEP_PKGS_CSWap2-modphp5  = CSWphp5 CSWapache2 CSWlibxml2-2 CSWlibiconv2
 RUNTIME_DEP_PKGS_CSWap2-modphp5 += CSWlibexpat1 CSWlibz1
+RUNTIME_DEP_PKGS_CSWap2-modphp5 += CSWlibicuio48 CSWlibicuuc48
+RUNTIME_DEP_PKGS_CSWap2-modphp5 += CSWlibicui18n48 CSWlibicudata48 
 OBSOLETED_BY_CSWap2-modphp5 = CSWap2modphp5
 PKGFILES_CSWap2-modphp5 += $(prefix)/apache2.*
 CHECKPKG_OVERRIDES_CSWap2-modphp5 += surplus-dependency|CSWphp5
 CHECKPKG_OVERRIDES_CSWap2-modphp5 += file-with-bad-content|/usr/local|root/opt/csw/apache2/libexec/libphp5.so
 
-$(eval $(call php5_subpackage,bcmath))
-$(eval $(call php5_subpackage,bz2,CSWlibbz2-1-0))
-$(eval $(call php5_subpackage,calendar))
-$(eval $(call php5_subpackage,ctype))
+$(eval $(call php5_subpackage,bcmath,CSWlibz1))
+$(eval $(call php5_subpackage,bz2,CSWlibbz2-1-0 CSWlibz1))
+$(eval $(call php5_subpackage,calendar,CSWlibz1))
+$(eval $(call php5_subpackage,ctype,CSWlibz1))
 $(eval $(call php5_subpackage,curl,CSWlibcurl4 CSWlibidn11 CSWosslrt CSWlibz1))
-$(eval $(call php5_subpackage,dba,CSWlibgdbm3 CSWbdb42))
+$(eval $(call php5_subpackage,dba,CSWlibgdbm4 CSWbdb42, CSWlibz1))
 $(eval $(call php5_subpackage,dom,CSWlibiconv2 CSWlibxml2-2 CSWlibz1))
 PKGFILES_CSWphp5-dom += .*include/php/ext/dom.*
-$(eval $(call php5_subpackage,exif))
-$(eval $(call php5_subpackage,ftp,CSWosslrt))
-$(eval $(call php5_subpackage,gd,CSWftype2 CSWlibgd2 CSWjpeg CSWlibpng12-0 CSWt1lib CSWxpm CSWlibz1))
+$(eval $(call php5_subpackage,exif,CSWlibz1))
+$(eval $(call php5_subpackage,ftp,CSWosslrt CSWlibz1))
+$(eval $(call php5_subpackage,gd,CSWlibfreetype6 CSWlibgd2 CSWlibjpeg7 CSWlibpng12-0 CSWt1lib CSWxpm CSWlibz1))
 PKGFILES_CSWphp5-gd += .*/include/php/ext/gd.*
-$(eval $(call php5_subpackage,gettext,CSWlibintl8))
-$(eval $(call php5_subpackage,gmp,CSWlibgmp10))
-$(eval $(call php5_subpackage,hash))
+$(eval $(call php5_subpackage,gettext,CSWlibintl8 CSWlibz1))
+$(eval $(call php5_subpackage,gmp,CSWlibgmp10 CSWlibz1))
+$(eval $(call php5_subpackage,hash,CSWlibz1))
 PKGFILES_CSWphp5-hash += .*/include/php/ext/hash.*
-$(eval $(call php5_subpackage,iconv,CSWlibiconv2))
+$(eval $(call php5_subpackage,iconv,CSWlibiconv2 CSWlibz))
 PKGFILES_CSWphp5-iconv += .*/include/php/ext/iconv.*
-$(eval $(call php5_subpackage,imap,CSWimaprt CSWlibk5crypto3 CSWlibgssapi-krb5-2 CSWlibcom-err3 CSWlibkrb5-3 CSWosslrt))
-$(eval $(call php5_subpackage,json))
-$(eval $(call php5_subpackage,ldap,CSWoldaprt CSWsasl))
-$(eval $(call php5_subpackage,mbstring))
+$(eval $(call php5_subpackage,imap,CSWimaprt CSWlibk5crypto3 CSWlibgssapi-krb5-2 CSWlibcom-err3 CSWlibkrb5-3 CSWosslrt CSWlibz1))
+$(eval $(call php5_subpackage,json,CSWlibz1))
+$(eval $(call php5_subpackage,ldap,CSWoldaprt CSWlibsasl2-2 CSWlibz1))
+$(eval $(call php5_subpackage,mbstring,CSWlibz1))
 PKGFILES_CSWphp5-mbstring += .*/include/php/ext/mbstring.*
-$(eval $(call php5_subpackage,mcrypt,CSWlibmcrypt CSWlibltdl7))
-$(eval $(call php5_subpackage,mssql,CSWfreetds))
-$(eval $(call php5_subpackage,mysql,CSWlibmysqlclient15))
+$(eval $(call php5_subpackage,mcrypt,CSWlibmcrypt4 CSWlibltdl7 CSWlibz1))
+$(eval $(call php5_subpackage,mssql,CSWlibsybdb5 CSWlibz1))
+$(eval $(call php5_subpackage,mysql,CSWlibmysqlclient15 CSWlibz1))
 $(eval $(call php5_subpackage,mysqli,CSWlibmysqlclient15 CSWlibz1))
-$(eval $(call php5_subpackage,odbc,CSWunixodbc))
-$(eval $(call php5_subpackage,openssl,CSWosslrt CSWlibgssapi-krb5-2 CSWlibkrb5-3 CSWlibk5crypto3 CSWlibcom-err3))
-$(eval $(call php5_subpackage,pcntl))
-$(eval $(call php5_subpackage,pdo))
+$(eval $(call php5_subpackage,odbc,CSWlibodbc2 CSWlibz1))
+$(eval $(call php5_subpackage,openssl,CSWosslrt CSWlibgssapi-krb5-2 CSWlibkrb5-3 CSWlibk5crypto3 CSWlibcom-err3 CSWlibz1))
+$(eval $(call php5_subpackage,pcntl,CSWlibz1))
+$(eval $(call php5_subpackage,pdo,CSWlibz1))
 PKGFILES_CSWphp5-pdo += .*/include/php/ext/pdo.*
 $(eval $(call php5_subpackage,pdomysql,CSWlibmysqlclient15 CSWlibz1 CSWphp5-pdo))
 PKGFILES_CSWphp5-pdomysql += .*/lib/php/extensions/.*/pdo_mysql.so
 PKGFILES_CSWphp5-pdomysql += .*extensions/pdo_mysql
 CHECKPKG_OVERRIDES_CSWphp5-pdomysql += surplus-dependency|CSWphp5-pdo
 CHECKPKG_OVERRIDES_CSWphp5-pdomysql += surplus-dependency|CSWphp5
-$(eval $(call php5_subpackage,pdoodbc,CSWunixodbc CSWphp5-pdo))
+$(eval $(call php5_subpackage,pdoodbc,CSWlibodbc2 CSWphp5-pdo CSWlibz1))
 PKGFILES_CSWphp5-pdoodbc += .*/lib/php/extensions/.*/pdo_odbc.so
 PKGFILES_CSWphp5-pdoodbc += .*extensions/pdo_odbc
 CHECKPKG_OVERRIDES_CSWphp5-pdoodbc += surplus-dependency|CSWphp5-pdo
 CHECKPKG_OVERRIDES_CSWphp5-pdoodbc += surplus-dependency|CSWphp5
-$(eval $(call php5_subpackage,pdopgsql,CSWlibpq CSWphp5-pdo))
+$(eval $(call php5_subpackage,pdopgsql,CSWlibpq CSWphp5-pdo CSWlibz1))
 PKGFILES_CSWphp5-pdopgsql += .*/lib/php/extensions/.*/pdo_pgsql.so
 PKGFILES_CSWphp5-pdopgsql += .*extensions/pdo_pgsql
 CHECKPKG_OVERRIDES_CSWphp5-pdopgsql += surplus-dependency|CSWphp5-pdo
 CHECKPKG_OVERRIDES_CSWphp5-pdopgsql += surplus-dependency|CSWphp5
-$(eval $(call php5_subpackage,pdosqlite,CSWlibsqlite3-0 CSWphp5-pdo))
+$(eval $(call php5_subpackage,pdosqlite,CSWlibsqlite3-0 CSWphp5-pdo CSWlibz1))
 PKGFILES_CSWphp5-pdosqlite += .*/lib/php/extensions/.*/pdo_sqlite.so
 PKGFILES_CSWphp5-pdosqlite += .*extensions/pdo_sqlite
 CHECKPKG_OVERRIDES_CSWphp5-pdosqlite += surplus-dependency|CSWphp5-pdo
 CHECKPKG_OVERRIDES_CSWphp5-pdosqlite += surplus-dependency|CSWphp5
-$(eval $(call php5_subpackage,pgsql,CSWlibpq))
-$(eval $(call php5_subpackage,posix))
-$(eval $(call php5_subpackage,pspell,CSWaspell))
-$(eval $(call php5_subpackage,readline,CSWlibreadline6 CSWlibncurses5))
-$(eval $(call php5_subpackage,session,CSWlibmm))
+$(eval $(call php5_subpackage,pgsql,CSWlibpq CSWlibz1))
+$(eval $(call php5_subpackage,posix,CSWlibz1))
+$(eval $(call php5_subpackage,pspell,CSWaspell CSWlibz1))
+$(eval $(call php5_subpackage,readline,CSWlibreadline6 CSWlibncurses5 CSWlibz1))
+$(eval $(call php5_subpackage,session,CSWlibmm CSWlibz1))
 PKGFILES_CSWphp5-session += .*/include/php/ext/session.*
-$(eval $(call php5_subpackage,shmop))
-$(eval $(call php5_subpackage,snmp,CSWnetsnmp))
+$(eval $(call php5_subpackage,shmop,CSWlibz1))
+$(eval $(call php5_subpackage,snmp,CSWnetsnmp CSWlibz1))
 $(eval $(call php5_subpackage,soap,CSWlibiconv2 CSWlibxml2-2 CSWlibz1))
-$(eval $(call php5_subpackage,sockets))
-$(eval $(call php5_subpackage,sqlite,CSWsqlite))
+$(eval $(call php5_subpackage,sockets,CSWlibz1))
+$(eval $(call php5_subpackage,sqlite,CSWsqlite CSWlibz1))
 PKGFILES_CSWphp5-sqlite += .*/include/php/ext/sqlite.*
-$(eval $(call php5_subpackage,sysvmsg))
-$(eval $(call php5_subpackage,sysvsem))
-$(eval $(call php5_subpackage,sysvshm))
-$(eval $(call php5_subpackage,tidy,CSWhtmltidy))
-$(eval $(call php5_subpackage,tokenizer))
-$(eval $(call php5_subpackage,wddx))
+$(eval $(call php5_subpackage,sysvmsg,CSWlibz1))
+$(eval $(call php5_subpackage,sysvsem,CSWlibz1))
+$(eval $(call php5_subpackage,sysvshm,CSWlibz1))
+$(eval $(call php5_subpackage,tidy,CSWhtmltidy CSWlibz1))
+$(eval $(call php5_subpackage,tokenizer,CSWlibz1))
+$(eval $(call php5_subpackage,wddx,CSWlibz1))
 $(eval $(call php5_subpackage,xmlreader,CSWlibiconv2 CSWlibxml2-2 CSWlibz1))
-$(eval $(call php5_subpackage,xmlrpc,CSWlibiconv2 CSWlibexpat1))
+$(eval $(call php5_subpackage,xmlrpc,CSWlibiconv2 CSWlibexpat1 CSWlibz1))
 $(eval $(call php5_subpackage,xmlwriter,CSWlibiconv2 CSWlibxml2-2 CSWlibz1))
 $(eval $(call php5_subpackage,xsl,CSWlibiconv2 CSWlibxml2-2 CSWlibxslt1 CSWlibexslt0 CSWlibz1))
 $(eval $(call php5_subpackage,zip,CSWlibz1))

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


From bdwalton at users.sourceforge.net  Wed Jan 25 03:41:08 2012
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Wed, 25 Jan 2012 02:41:08 +0000
Subject: [csw-devel] SF.net SVN: gar:[16906] csw/mgar/pkg/php5/trunk/Makefile
Message-ID: <E1RpsnM-0006Qy-NR@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 16906
          http://gar.svn.sourceforge.net/gar/?rev=16906&view=rev
Author:   bdwalton
Date:     2012-01-25 02:41:08 +0000 (Wed, 25 Jan 2012)
Log Message:
-----------
php5/trunk: more dependency fixes

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

Modified: csw/mgar/pkg/php5/trunk/Makefile
===================================================================
--- csw/mgar/pkg/php5/trunk/Makefile	2012-01-25 01:38:32 UTC (rev 16905)
+++ csw/mgar/pkg/php5/trunk/Makefile	2012-01-25 02:41:08 UTC (rev 16906)
@@ -145,21 +145,21 @@
 $(eval $(call php5_subpackage,bz2,CSWlibbz2-1-0 CSWlibz1))
 $(eval $(call php5_subpackage,calendar,CSWlibz1))
 $(eval $(call php5_subpackage,ctype,CSWlibz1))
-$(eval $(call php5_subpackage,curl,CSWlibcurl4 CSWlibidn11 CSWosslrt CSWlibz1))
-$(eval $(call php5_subpackage,dba,CSWlibgdbm4 CSWbdb42, CSWlibz1))
+$(eval $(call php5_subpackage,curl,CSWlibcurl4 CSWlibidn11 CSWlibssl0-9-8 CSWlibz1))
+$(eval $(call php5_subpackage,dba,CSWlibgdbm4 CSWbdb42 CSWlibz1))
 $(eval $(call php5_subpackage,dom,CSWlibiconv2 CSWlibxml2-2 CSWlibz1))
 PKGFILES_CSWphp5-dom += .*include/php/ext/dom.*
 $(eval $(call php5_subpackage,exif,CSWlibz1))
-$(eval $(call php5_subpackage,ftp,CSWosslrt CSWlibz1))
+$(eval $(call php5_subpackage,ftp,CSWlibssl0-9-8 CSWlibz1))
 $(eval $(call php5_subpackage,gd,CSWlibfreetype6 CSWlibgd2 CSWlibjpeg7 CSWlibpng12-0 CSWt1lib CSWxpm CSWlibz1))
 PKGFILES_CSWphp5-gd += .*/include/php/ext/gd.*
 $(eval $(call php5_subpackage,gettext,CSWlibintl8 CSWlibz1))
 $(eval $(call php5_subpackage,gmp,CSWlibgmp10 CSWlibz1))
 $(eval $(call php5_subpackage,hash,CSWlibz1))
 PKGFILES_CSWphp5-hash += .*/include/php/ext/hash.*
-$(eval $(call php5_subpackage,iconv,CSWlibiconv2 CSWlibz))
+$(eval $(call php5_subpackage,iconv,CSWlibiconv2 CSWlibz1))
 PKGFILES_CSWphp5-iconv += .*/include/php/ext/iconv.*
-$(eval $(call php5_subpackage,imap,CSWimaprt CSWlibk5crypto3 CSWlibgssapi-krb5-2 CSWlibcom-err3 CSWlibkrb5-3 CSWosslrt CSWlibz1))
+$(eval $(call php5_subpackage,imap,CSWimaprt CSWlibk5crypto3 CSWlibgssapi-krb5-2 CSWlibcom-err3 CSWlibkrb5-3 CSWlibssl0-9-8 CSWlibz1))
 $(eval $(call php5_subpackage,json,CSWlibz1))
 $(eval $(call php5_subpackage,ldap,CSWoldaprt CSWlibsasl2-2 CSWlibz1))
 $(eval $(call php5_subpackage,mbstring,CSWlibz1))
@@ -169,7 +169,7 @@
 $(eval $(call php5_subpackage,mysql,CSWlibmysqlclient15 CSWlibz1))
 $(eval $(call php5_subpackage,mysqli,CSWlibmysqlclient15 CSWlibz1))
 $(eval $(call php5_subpackage,odbc,CSWlibodbc2 CSWlibz1))
-$(eval $(call php5_subpackage,openssl,CSWosslrt CSWlibgssapi-krb5-2 CSWlibkrb5-3 CSWlibk5crypto3 CSWlibcom-err3 CSWlibz1))
+$(eval $(call php5_subpackage,openssl,CSWlibssl0-9-8 CSWlibgssapi-krb5-2 CSWlibkrb5-3 CSWlibk5crypto3 CSWlibcom-err3 CSWlibz1))
 $(eval $(call php5_subpackage,pcntl,CSWlibz1))
 $(eval $(call php5_subpackage,pdo,CSWlibz1))
 PKGFILES_CSWphp5-pdo += .*/include/php/ext/pdo.*

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


From skayser at opencsw.org  Wed Jan 25 17:11:26 2012
From: skayser at opencsw.org (Sebastian Kayser)
Date: Wed, 25 Jan 2012 17:11:26 +0100
Subject: [csw-devel] SF.net SVN: gar:[16901] csw/mgar/pkg/389-admin/trunk
In-Reply-To: <E1RpfnZ-0002gU-Pj@sfp-svn-2.v30.ch3.sourceforge.com>
References: <E1RpfnZ-0002gU-Pj@sfp-svn-2.v30.ch3.sourceforge.com>
Message-ID: <20120125161125.GJ19520@sebastiankayser.de>

Hi Carsten,

* cgrzemba at users.sourceforge.net <cgrzemba at users.sourceforge.net> wrote:
> Revision: 16901
>           http://gar.svn.sourceforge.net/gar/?rev=16901&view=rev
> Author:   cgrzemba
> Date:     2012-01-24 12:48:29 +0000 (Tue, 24 Jan 2012)
> Log Message:
> -----------
> 389-admin/trunk: fix configuration
> 
>  # no optimization
> -CFLAGS = 
> +CFLAGS = -g
> +FFLAGS=
> +FCFLAGS=
> +OPTFLAGS=
> +CXXFLAGS=

not sure if you tried this, but you should be able to achieve the same
with behavior with GARFLAVOR=DBG too. Give it a try and compare mgar
modenv afterwards.

http://sourceforge.net/apps/trac/gar/wiki/GAR%20Variable%20Reference#CompilationSettings

Sebastian

From wahwah at users.sourceforge.net  Thu Jan 26 09:56:09 2012
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Thu, 26 Jan 2012 08:56:09 +0000
Subject: [csw-devel] SF.net SVN: gar:[16907]
	csw/mgar/gar/v2/lib/web/pkgdb_web.py
Message-ID: <E1RqL7p-0003Zh-3U@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 16907
          http://gar.svn.sourceforge.net/gar/?rev=16907&view=rev
Author:   wahwah
Date:     2012-01-26 08:56:08 +0000 (Thu, 26 Jan 2012)
Log Message:
-----------
pkgdb-web: Add a function for unicode rescue

Modified Paths:
--------------
    csw/mgar/gar/v2/lib/web/pkgdb_web.py

Modified: csw/mgar/gar/v2/lib/web/pkgdb_web.py
===================================================================
--- csw/mgar/gar/v2/lib/web/pkgdb_web.py	2012-01-25 02:41:08 UTC (rev 16906)
+++ csw/mgar/gar/v2/lib/web/pkgdb_web.py	2012-01-26 08:56:08 UTC (rev 16907)
@@ -318,6 +318,18 @@
 
 class RestSrv4FullStats(object):
 
+  def GetUnicodeOrNone(self, s):
+    """Tries to decode UTF-8"""
+    if s is None:
+      return None
+    if type(s) != unicode:
+      try:
+        s = unicode(s, 'utf-8')
+      except UnicodeDecodeError, e:
+        s = s.decode("utf-8", "ignore")
+        s = s + u" (bad unicode detected)"
+    return s
+
   def GET(self, md5_sum):
     ConnectToDatabase()
     class PkgStatsEncoder(json.JSONEncoder):
@@ -336,14 +348,8 @@
       # There was a problem with bad utf-8 in the VENDOR field.
       # This is a workaround.
       if "VENDOR" in data_structure["pkginfo"]:
-        vendor = data_structure["pkginfo"]["VENDOR"]
-        if type(vendor) != unicode:
-          try:
-            vendor = unicode(vendor, 'utf-8')
-          except UnicodeDecodeError, e:
-            vendor = vendor.decode("utf-8", "ignore")
-          data_structure["pkginfo"]["VENDOR"] = (
-              vendor + " (bad unicode detected)")
+        data_structure["pkginfo"]["VENDOR"] = self.GetUnicodeOrNone(
+            data_structure["pkginfo"]["VENDOR"])
       # The end of the hack.
       return json.dumps(data_structure, cls=PkgStatsEncoder)
     except sqlobject.main.SQLObjectNotFound, e:

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


From wahwah at users.sourceforge.net  Thu Jan 26 10:00:14 2012
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Thu, 26 Jan 2012 09:00:14 +0000
Subject: [csw-devel] SF.net SVN: gar:[16908]
	csw/mgar/gar/v2/lib/web/pkgdb_web.py
Message-ID: <E1RqLBm-0003ez-Hd@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 16908
          http://gar.svn.sourceforge.net/gar/?rev=16908&view=rev
Author:   wahwah
Date:     2012-01-26 09:00:14 +0000 (Thu, 26 Jan 2012)
Log Message:
-----------
pkgdb-web: Rescue bad unicode in pkgmap

Modified Paths:
--------------
    csw/mgar/gar/v2/lib/web/pkgdb_web.py

Modified: csw/mgar/gar/v2/lib/web/pkgdb_web.py
===================================================================
--- csw/mgar/gar/v2/lib/web/pkgdb_web.py	2012-01-26 08:56:08 UTC (rev 16907)
+++ csw/mgar/gar/v2/lib/web/pkgdb_web.py	2012-01-26 09:00:14 UTC (rev 16908)
@@ -351,6 +351,13 @@
         data_structure["pkginfo"]["VENDOR"] = self.GetUnicodeOrNone(
             data_structure["pkginfo"]["VENDOR"])
       # The end of the hack.
+      #
+      # One more workaround
+      for d in data_structure["pkgmap"]:
+        if "path" in d:
+          d["path"] = self.GetUnicodeOrNone(d["path"])
+          d["line"] = self.GetUnicodeOrNone(d["line"])
+      # End of the workaround
       return json.dumps(data_structure, cls=PkgStatsEncoder)
     except sqlobject.main.SQLObjectNotFound, e:
       raise web.notfound()

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


From cgrzemba at users.sourceforge.net  Thu Jan 26 10:04:44 2012
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Thu, 26 Jan 2012 09:04:44 +0000
Subject: [csw-devel] SF.net SVN: gar:[16909]
	csw/mgar/pkg/cpan/perl-mozldap/trunk/Makefile
Message-ID: <E1RqLG8-0003lC-Qz@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 16909
          http://gar.svn.sourceforge.net/gar/?rev=16909&view=rev
Author:   cgrzemba
Date:     2012-01-26 09:04:44 +0000 (Thu, 26 Jan 2012)
Log Message:
-----------
cpan/perl-mozldap/trunk: add dependency

Modified Paths:
--------------
    csw/mgar/pkg/cpan/perl-mozldap/trunk/Makefile

Modified: csw/mgar/pkg/cpan/perl-mozldap/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/perl-mozldap/trunk/Makefile	2012-01-26 09:00:14 UTC (rev 16908)
+++ csw/mgar/pkg/cpan/perl-mozldap/trunk/Makefile	2012-01-26 09:04:44 UTC (rev 16909)
@@ -44,5 +44,7 @@
 RUNTIME_DEP_PKGS_CSWpm-mozldap += CSWlibnss3
 RUNTIME_DEP_PKGS_CSWpm-mozldap += CSWlibnspr4
 RUNTIME_DEP_PKGS_CSWpm-mozldap += CSWlibssldap60
+RUNTIME_DEP_PKGS_CSWpm-mozldap += CSWlibssl3
+RUNTIME_DEP_PKGS_CSWpm-mozldap += CSWlibsoftokn3
 
 include gar/category.mk

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


From cgrzemba at users.sourceforge.net  Thu Jan 26 10:18:33 2012
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Thu, 26 Jan 2012 09:18:33 +0000
Subject: [csw-devel] SF.net SVN: gar:[16910]
	csw/mgar/pkg/mod_nss/trunk/Makefile
Message-ID: <E1RqLTV-00047G-51@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 16910
          http://gar.svn.sourceforge.net/gar/?rev=16910&view=rev
Author:   cgrzemba
Date:     2012-01-26 09:18:32 +0000 (Thu, 26 Jan 2012)
Log Message:
-----------
mod_nss/trunk: add dependency for splitted NSS Lib packages

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

Modified: csw/mgar/pkg/mod_nss/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mod_nss/trunk/Makefile	2012-01-26 09:04:44 UTC (rev 16909)
+++ csw/mgar/pkg/mod_nss/trunk/Makefile	2012-01-26 09:18:32 UTC (rev 16910)
@@ -49,7 +49,8 @@
 RUNTIME_DEP_PKGS_CSWap2modnss += CSWlibnss3
 RUNTIME_DEP_PKGS_CSWap2modnss += CSWlibplds4
 RUNTIME_DEP_PKGS_CSWap2modnss += CSWlibplc4
-CHECKPKG_OVERRIDES_CSWap2modnss += pkginfo-opencsw-repository-uncommitted
+RUNTIME_DEP_PKGS_CSWap2modnss += CSWlibsmime3
+RUNTIME_DEP_PKGS_CSWap2modnss += CSWlibssl3
 
 
 include gar/category.mk

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


From cgrzemba at users.sourceforge.net  Thu Jan 26 11:08:03 2012
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Thu, 26 Jan 2012 10:08:03 +0000
Subject: [csw-devel] SF.net SVN: gar:[16911]
	csw/mgar/pkg/389-ds-base/trunk/Makefile
Message-ID: <E1RqMFP-0005G1-I9@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 16911
          http://gar.svn.sourceforge.net/gar/?rev=16911&view=rev
Author:   cgrzemba
Date:     2012-01-26 10:08:03 +0000 (Thu, 26 Jan 2012)
Log Message:
-----------
389-ds-base/trunk: add dependeny libfreebl3 for pwdhash

Modified Paths:
--------------
    csw/mgar/pkg/389-ds-base/trunk/Makefile

Modified: csw/mgar/pkg/389-ds-base/trunk/Makefile
===================================================================
--- csw/mgar/pkg/389-ds-base/trunk/Makefile	2012-01-26 09:18:32 UTC (rev 16910)
+++ csw/mgar/pkg/389-ds-base/trunk/Makefile	2012-01-26 10:08:03 UTC (rev 16911)
@@ -52,6 +52,7 @@
 RUNTIME_DEP_PKGS_CSW389-ds-base += CSWpm-mozldap
 RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibssl3
 RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibsasl2-2
+RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibfreebl3
 
 
 CHECKPKG_OVERRIDES_CSW389-ds-base += file-with-bad-content|/usr/share|root/opt/csw/lib/dirsrv/perl/DSUpdate.pm

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


From cgrzemba at users.sourceforge.net  Thu Jan 26 11:45:20 2012
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Thu, 26 Jan 2012 10:45:20 +0000
Subject: [csw-devel] SF.net SVN: gar:[16912]
	csw/mgar/pkg/389-ds-base/trunk/Makefile
Message-ID: <E1RqMpU-00066y-7p@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 16912
          http://gar.svn.sourceforge.net/gar/?rev=16912&view=rev
Author:   cgrzemba
Date:     2012-01-26 10:45:19 +0000 (Thu, 26 Jan 2012)
Log Message:
-----------
389-ds-base/trunk: add dependency libnssdbm3

Modified Paths:
--------------
    csw/mgar/pkg/389-ds-base/trunk/Makefile

Modified: csw/mgar/pkg/389-ds-base/trunk/Makefile
===================================================================
--- csw/mgar/pkg/389-ds-base/trunk/Makefile	2012-01-26 10:08:03 UTC (rev 16911)
+++ csw/mgar/pkg/389-ds-base/trunk/Makefile	2012-01-26 10:45:19 UTC (rev 16912)
@@ -53,6 +53,7 @@
 RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibssl3
 RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibsasl2-2
 RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibfreebl3
+RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibnssdbm3
 
 
 CHECKPKG_OVERRIDES_CSW389-ds-base += file-with-bad-content|/usr/share|root/opt/csw/lib/dirsrv/perl/DSUpdate.pm

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


From cgrzemba at users.sourceforge.net  Thu Jan 26 11:57:57 2012
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Thu, 26 Jan 2012 10:57:57 +0000
Subject: [csw-devel] SF.net SVN: gar:[16913]
	csw/mgar/pkg/389-ds-base/trunk/Makefile
Message-ID: <E1RqN1h-0006PK-VE@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 16913
          http://gar.svn.sourceforge.net/gar/?rev=16913&view=rev
Author:   cgrzemba
Date:     2012-01-26 10:57:57 +0000 (Thu, 26 Jan 2012)
Log Message:
-----------
389-ds-base/trunk: add dependency checkpkgoverrides

Modified Paths:
--------------
    csw/mgar/pkg/389-ds-base/trunk/Makefile

Modified: csw/mgar/pkg/389-ds-base/trunk/Makefile
===================================================================
--- csw/mgar/pkg/389-ds-base/trunk/Makefile	2012-01-26 10:45:19 UTC (rev 16912)
+++ csw/mgar/pkg/389-ds-base/trunk/Makefile	2012-01-26 10:57:57 UTC (rev 16913)
@@ -61,7 +61,10 @@
 CHECKPKG_OVERRIDES_CSW389-ds-base += file-with-bad-content|/usr/share|root/opt/csw/share/man/man1/dbgen.pl.1
 CHECKPKG_OVERRIDES_CSW389-ds-base += init-file-missing-cswinitsmf-class|/etc/opt/csw/init.d/dirsrv-snmp|class=none
 CHECKPKG_OVERRIDES_CSW389-ds-base += surplus-dependency|CSWpm-mozldap
+CHECKPKG_OVERRIDES_CSW389-ds-base += surplus-dependency|CSWlibfreebl3
+CHECKPKG_OVERRIDES_CSW389-ds-base += surplus-dependency|CSWlibnssdbm3
 
+
 # GARCOMPILER = SOS12U2
 EXTRA_LIB = /opt/csw/bdb48/lib
 # remove -I/opt/csw/include

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


From cgrzemba at users.sourceforge.net  Thu Jan 26 12:34:47 2012
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Thu, 26 Jan 2012 11:34:47 +0000
Subject: [csw-devel] SF.net SVN: gar:[16914]
 csw/mgar/pkg/389-admin/trunk/files/CSW389admin. preremove
Message-ID: <E1RqNbL-0007En-89@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 16914
          http://gar.svn.sourceforge.net/gar/?rev=16914&view=rev
Author:   cgrzemba
Date:     2012-01-26 11:34:47 +0000 (Thu, 26 Jan 2012)
Log Message:
-----------
389-admin/trunk: add nss.conf to preserverd files on remove

Modified Paths:
--------------
    csw/mgar/pkg/389-admin/trunk/files/CSW389admin.preremove

Modified: csw/mgar/pkg/389-admin/trunk/files/CSW389admin.preremove
===================================================================
--- csw/mgar/pkg/389-admin/trunk/files/CSW389admin.preremove	2012-01-26 10:57:57 UTC (rev 16913)
+++ csw/mgar/pkg/389-admin/trunk/files/CSW389admin.preremove	2012-01-26 11:34:47 UTC (rev 16914)
@@ -2,4 +2,5 @@
   cp -p console.conf console.conf.configured
   cp -p httpd.conf httpd.conf.configured
   cp -p admserv.conf admserv.conf.configured
+  cp -p nss.conf nss.conf.configured
 )

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


From cgrzemba at users.sourceforge.net  Thu Jan 26 12:47:39 2012
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Thu, 26 Jan 2012 11:47:39 +0000
Subject: [csw-devel] SF.net SVN: gar:[16915] csw/mgar/pkg/389-admin/trunk
Message-ID: <E1RqNnn-0004CG-UW@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 16915
          http://gar.svn.sourceforge.net/gar/?rev=16915&view=rev
Author:   cgrzemba
Date:     2012-01-26 11:47:39 +0000 (Thu, 26 Jan 2012)
Log Message:
-----------
389-admin/trunk: recommit

Modified Paths:
--------------
    csw/mgar/pkg/389-admin/trunk/Makefile
    csw/mgar/pkg/389-admin/trunk/files/0003-correct-initscript-and-http.conf.in.patch

Modified: csw/mgar/pkg/389-admin/trunk/Makefile
===================================================================
--- csw/mgar/pkg/389-admin/trunk/Makefile	2012-01-26 11:34:47 UTC (rev 16914)
+++ csw/mgar/pkg/389-admin/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
@@ -23,6 +23,8 @@
 
 LICENSE = LICENSE LICENSE.GPLv2
 
+# GARFLAVOR=DBG
+
 PATCHFILES += 0001-change-includedir-preference-in-Makefile.am.patch
 PATCHFILES += 0002-add-i386-platform-to-configure.ac.patch
 PATCHFILES += 0003-correct-initscript-and-http.conf.in.patch
@@ -47,7 +49,7 @@
 PACKAGES += CSW389admin
 SPKG_DESC_CSW389admin += $(DESCRIPTION)
 INITSMF = /etc/opt/csw/init.d/dirsrv-admin
-RUNTIME_DEP_PKGS_CSW389admin += CSWapache2
+RUNTIME_DEP_PKGS_CSW389admin += CSWap2worker
 RUNTIME_DEP_PKGS_CSW389admin += CSWap2modnss
 RUNTIME_DEP_PKGS_CSW389admin += CSWlibprldap60
 RUNTIME_DEP_PKGS_CSW389admin += CSWlibldif60
@@ -72,7 +74,7 @@
 RUNTIME_DEP_PKGS_CSW389admin += CSW389-admin-console
 RUNTIME_DEP_PKGS_CSW389admin += CSW389-ds-console
 CHECKPKG_OVERRIDES_CSW389admin += surplus-dependency|CSWap2modnss
-CHECKPKG_OVERRIDES_CSW389admin += surplus-dependency|CSWapache2
+CHECKPKG_OVERRIDES_CSW389admin += surplus-dependency|CSWap2worker
 CHECKPKG_OVERRIDES_CSW389admin += surplus-dependency|CSW389-admin-console
 CHECKPKG_OVERRIDES_CSW389admin += surplus-dependency|CSW389-ds-console
 CHECKPKG_OVERRIDES_CSW389admin += unidentified-dependency|CSW389-admin-console
@@ -80,12 +82,6 @@
 
 # remove -I/opt/csw/include
 CPPFLAGS = 
-# no optimization
-CFLAGS = -g
-FFLAGS=
-FCFLAGS=
-OPTFLAGS=
-CXXFLAGS=
 
 EXTRA_LINKER_FLAGS = -xnorunpath -norunpath -liconv
 

Modified: csw/mgar/pkg/389-admin/trunk/files/0003-correct-initscript-and-http.conf.in.patch
===================================================================
--- csw/mgar/pkg/389-admin/trunk/files/0003-correct-initscript-and-http.conf.in.patch	2012-01-26 11:34:47 UTC (rev 16914)
+++ csw/mgar/pkg/389-admin/trunk/files/0003-correct-initscript-and-http.conf.in.patch	2012-01-26 11:47:39 UTC (rev 16915)
@@ -8,28 +8,6 @@
  wrappers/initscript.in         |    6 ++++--
  2 files changed, 9 insertions(+), 7 deletions(-)
 
-diff --git a/admserv/cfgstuff/httpd-2.2.conf.in b/admserv/cfgstuff/httpd-2.2.conf.in
-index a66eb21..b4098d9 100644
---- a/admserv/cfgstuff/httpd-2.2.conf.in
-+++ b/admserv/cfgstuff/httpd-2.2.conf.in
-@@ -99,12 +99,12 @@ ServerTokens Minor
- # start one server in multi threaded mode
- StartServers 1
- # mtm
--ServerLimit 1
-+ServerLimit 4
- 
--MaxClients 64
--MinSpareThreads 32
--MaxSpareThreads 64
--ThreadsPerChild 64
-+MaxClients 4
-+# MinSpareThreads 32
-+# MaxSpareThreads 64
-+# ThreadsPerChild 64
- 
- #
- # Dynamic Shared Object (DSO) Support
 diff --git a/wrappers/initscript.in b/wrappers/initscript.in
 index 82dd20e..8fd03da 100644
 --- a/wrappers/initscript.in

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


From dmichelsen at users.sourceforge.net  Thu Jan 26 14:25:48 2012
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu, 26 Jan 2012 13:25:48 +0000
Subject: [csw-devel] SF.net SVN: gar:[16916] csw/mgar/pkg
Message-ID: <E1RqPKm-0006jF-Hv@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 16916
          http://gar.svn.sourceforge.net/gar/?rev=16916&view=rev
Author:   dmichelsen
Date:     2012-01-26 13:25:13 +0000 (Thu, 26 Jan 2012)
Log Message:
-----------
WHOLE TREE: Explicitly set GARTYPE to current default 'v2'

Modified Paths:
--------------
    csw/mgar/pkg/GeoIP/trunk/Makefile
    csw/mgar/pkg/ImageMagick/trunk/Makefile
    csw/mgar/pkg/MailScanner/trunk/Makefile
    csw/mgar/pkg/Vispan/trunk/Makefile
    csw/mgar/pkg/ZSI/trunk/Makefile
    csw/mgar/pkg/a2ps/trunk/Makefile
    csw/mgar/pkg/achievo/trunk/Makefile
    csw/mgar/pkg/adobereader/trunk/Makefile
    csw/mgar/pkg/aide/trunk/Makefile
    csw/mgar/pkg/alarm-clock/trunk/Makefile
    csw/mgar/pkg/alpine/trunk/Makefile
    csw/mgar/pkg/amanda/trunk/Makefile
    csw/mgar/pkg/amavisd-new/trunk/Makefile
    csw/mgar/pkg/apache2/trunk/Makefile
    csw/mgar/pkg/apache2-worker/trunk/Makefile
    csw/mgar/pkg/apcupsd/trunk/Makefile
    csw/mgar/pkg/apr/trunk/Makefile
    csw/mgar/pkg/apr-iconv/trunk/Makefile
    csw/mgar/pkg/apr-util/trunk/Makefile
    csw/mgar/pkg/argtable/trunk/Makefile
    csw/mgar/pkg/aria2/trunk/Makefile
    csw/mgar/pkg/ascii/trunk/Makefile
    csw/mgar/pkg/asciidoc/trunk/Makefile
    csw/mgar/pkg/audiofile/trunk/Makefile
    csw/mgar/pkg/augeas/trunk/Makefile
    csw/mgar/pkg/autobench/trunk/Makefile
    csw/mgar/pkg/autoconf/trunk/Makefile
    csw/mgar/pkg/automake/trunk/Makefile
    csw/mgar/pkg/autoproject/trunk/Makefile
    csw/mgar/pkg/autossh/trunk/Makefile
    csw/mgar/pkg/autotrace/trunk/Makefile
    csw/mgar/pkg/avfs/trunk/Makefile
    csw/mgar/pkg/awesome/trunk/Makefile
    csw/mgar/pkg/awstats/trunk/Makefile
    csw/mgar/pkg/axel/trunk/Makefile
    csw/mgar/pkg/babl/trunk/Makefile
    csw/mgar/pkg/bacula/trunk/Makefile
    csw/mgar/pkg/balance/trunk/Makefile
    csw/mgar/pkg/bash/trunk/Makefile
    csw/mgar/pkg/bash_completion/trunk/Makefile
    csw/mgar/pkg/bashdb/trunk/Makefile
    csw/mgar/pkg/bazaar/trunk/Makefile
    csw/mgar/pkg/bdb/trunk/Makefile
    csw/mgar/pkg/bdb3/trunk/Makefile
    csw/mgar/pkg/bdb4/trunk/Makefile
    csw/mgar/pkg/bdb42/trunk/Makefile
    csw/mgar/pkg/bdb43/trunk/Makefile
    csw/mgar/pkg/bdb44/trunk/Makefile
    csw/mgar/pkg/bdb45/trunk/Makefile
    csw/mgar/pkg/bdb46/trunk/Makefile
    csw/mgar/pkg/bdb47/trunk/Makefile
    csw/mgar/pkg/bdb48/trunk/Makefile
    csw/mgar/pkg/bdb51/trunk/Makefile
    csw/mgar/pkg/bdb52/trunk/Makefile
    csw/mgar/pkg/beautifulsoup/trunk/Makefile
    csw/mgar/pkg/bind/trunk/Makefile
    csw/mgar/pkg/bind2nsd/trunk/Makefile
    csw/mgar/pkg/binutils/trunk/Makefile
    csw/mgar/pkg/bison/trunk/Makefile
    csw/mgar/pkg/bitlbee/trunk/Makefile
    csw/mgar/pkg/bittwist/trunk/Makefile
    csw/mgar/pkg/blame/trunk/Makefile
    csw/mgar/pkg/bluefish/trunk/Makefile
    csw/mgar/pkg/boost/trunk/Makefile
    csw/mgar/pkg/boost-jam/trunk/Makefile
    csw/mgar/pkg/botnet/trunk/Makefile
    csw/mgar/pkg/buildbot/trunk/Makefile
    csw/mgar/pkg/bvi/trunk/Makefile
    csw/mgar/pkg/bzflag/trunk/Makefile
    csw/mgar/pkg/bzip2/trunk/Makefile
    csw/mgar/pkg/c-ares/trunk/Makefile
    csw/mgar/pkg/ca_certificates/trunk/Makefile
    csw/mgar/pkg/cacti/trunk/Makefile
    csw/mgar/pkg/cadaver/trunk/Makefile
    csw/mgar/pkg/cairomm/trunk/Makefile
    csw/mgar/pkg/ccache/trunk/Makefile
    csw/mgar/pkg/cdecl/trunk/Makefile
    csw/mgar/pkg/cdrdao/trunk/Makefile
    csw/mgar/pkg/centerim/trunk/Makefile
    csw/mgar/pkg/cfengine/trunk/Makefile
    csw/mgar/pkg/cfengine3/trunk/Makefile
    csw/mgar/pkg/cfg2html/trunk/Makefile
    csw/mgar/pkg/cfitsio/trunk/Makefile
    csw/mgar/pkg/cgit/trunk/Makefile
    csw/mgar/pkg/cheetah/trunk/Makefile
    csw/mgar/pkg/cherokee/trunk/Makefile
    csw/mgar/pkg/chkconfig/trunk/Makefile
    csw/mgar/pkg/chmlib/trunk/Makefile
    csw/mgar/pkg/chromium/trunk/Makefile
    csw/mgar/pkg/chrpath/trunk/Makefile
    csw/mgar/pkg/clamav/trunk/Makefile
    csw/mgar/pkg/clamavsigs/trunk/Makefile
    csw/mgar/pkg/clearsilver/trunk/Makefile
    csw/mgar/pkg/cloog/trunk/Makefile
    csw/mgar/pkg/clpbar/trunk/Makefile
    csw/mgar/pkg/clusterit/trunk/Makefile
    csw/mgar/pkg/clusterssh/trunk/Makefile
    csw/mgar/pkg/clzip/trunk/Makefile
    csw/mgar/pkg/cmake/trunk/Makefile
    csw/mgar/pkg/colordiff/trunk/Makefile
    csw/mgar/pkg/colormake/trunk/Makefile
    csw/mgar/pkg/colortail/trunk/Makefile
    csw/mgar/pkg/conserver/trunk/Makefile
    csw/mgar/pkg/convmv/trunk/Makefile
    csw/mgar/pkg/coreutils/trunk/Makefile
    csw/mgar/pkg/cpan/Algorithm-Annotate/trunk/Makefile
    csw/mgar/pkg/cpan/Algorithm-CheckDigits/trunk/Makefile
    csw/mgar/pkg/cpan/Algorithm-Depedency/trunk/Makefile
    csw/mgar/pkg/cpan/Algorithm-Diff/trunk/Makefile
    csw/mgar/pkg/cpan/AnyData/trunk/Makefile
    csw/mgar/pkg/cpan/Apache-AuthPAM/trunk/Makefile
    csw/mgar/pkg/cpan/Apache-DBI/trunk/Makefile
    csw/mgar/pkg/cpan/Apache-PAR/trunk/Makefile
    csw/mgar/pkg/cpan/Apache-Session/trunk/Makefile
    csw/mgar/pkg/cpan/Apache-Template/trunk/Makefile
    csw/mgar/pkg/cpan/Apache-Test/trunk/Makefile
    csw/mgar/pkg/cpan/Apache2-AuthzNIS/trunk/Makefile
    csw/mgar/pkg/cpan/App-CLI/trunk/Makefile
    csw/mgar/pkg/cpan/AppConfig/trunk/Makefile
    csw/mgar/pkg/cpan/Archive-Extract/trunk/Makefile
    csw/mgar/pkg/cpan/Archive-SelfExtract/trunk/Makefile
    csw/mgar/pkg/cpan/Archive-Tar/trunk/Makefile
    csw/mgar/pkg/cpan/Archive-Zip/trunk/Makefile
    csw/mgar/pkg/cpan/Array-Compare/trunk/Makefile
    csw/mgar/pkg/cpan/Array-Window/trunk/Makefile
    csw/mgar/pkg/cpan/Astro-FITS-Header/trunk/Makefile
    csw/mgar/pkg/cpan/Attribute-Handlers/trunk/Makefile
    csw/mgar/pkg/cpan/Audio-TagLib/trunk/Makefile
    csw/mgar/pkg/cpan/Authen-PAM/trunk/Makefile
    csw/mgar/pkg/cpan/Authen-SASL/trunk/Makefile
    csw/mgar/pkg/cpan/AutoXS-Header/trunk/Makefile
    csw/mgar/pkg/cpan/B-C/trunk/Makefile
    csw/mgar/pkg/cpan/B-Flags/trunk/Makefile
    csw/mgar/pkg/cpan/B-Generate/trunk/Makefile
    csw/mgar/pkg/cpan/B-Keywords/trunk/Makefile
    csw/mgar/pkg/cpan/B-Utils/trunk/Makefile
    csw/mgar/pkg/cpan/BSD-Resource/trunk/Makefile
    csw/mgar/pkg/cpan/Barcode-Code128/trunk/Makefile
    csw/mgar/pkg/cpan/BerkeleyDB/trunk/Makefile
    csw/mgar/pkg/cpan/Biblio-EndnoteStyle/trunk/Makefile
    csw/mgar/pkg/cpan/Bit-Vector/trunk/Makefile
    csw/mgar/pkg/cpan/C-Scan/trunk/Makefile
    csw/mgar/pkg/cpan/CGI/trunk/Makefile
    csw/mgar/pkg/cpan/CGI-Application/trunk/Makefile
    csw/mgar/pkg/cpan/CGI-Application-Dispatch/trunk/Makefile
    csw/mgar/pkg/cpan/CGI-Application-Plugin-LogDispatch/trunk/Makefile
    csw/mgar/pkg/cpan/CGI-Builder/trunk/Makefile
    csw/mgar/pkg/cpan/CGI-Session/trunk/Makefile
    csw/mgar/pkg/cpan/CGI-SpeedyCGI/trunk/Makefile
    csw/mgar/pkg/cpan/CGP-CLI/trunk/Makefile
    csw/mgar/pkg/cpan/CPANPLUS/trunk/Makefile
    csw/mgar/pkg/cpan/CSS-DOM/trunk/Makefile
    csw/mgar/pkg/cpan/Cache/trunk/Makefile
    csw/mgar/pkg/cpan/Cache-Cache/trunk/Makefile
    csw/mgar/pkg/cpan/Cache-Memcached/trunk/Makefile
    csw/mgar/pkg/cpan/Cache-Simple-TimedExpiry/trunk/Makefile
    csw/mgar/pkg/cpan/Cairo/trunk/Makefile
    csw/mgar/pkg/cpan/Calendar-CSA/trunk/Makefile
    csw/mgar/pkg/cpan/Calendar-Simple/trunk/Makefile
    csw/mgar/pkg/cpan/Capitalization/trunk/Makefile
    csw/mgar/pkg/cpan/Carp-Assert/trunk/Makefile
    csw/mgar/pkg/cpan/Carp-Assert-More/trunk/Makefile
    csw/mgar/pkg/cpan/Carp-Clan/trunk/Makefile
    csw/mgar/pkg/cpan/Catalyst/trunk/Makefile
    csw/mgar/pkg/cpan/Chart/trunk/Makefile
    csw/mgar/pkg/cpan/Check-ISA/trunk/Makefile
    csw/mgar/pkg/cpan/Class-Accessor/trunk/Makefile
    csw/mgar/pkg/cpan/Class-Accessor-Chained/trunk/Makefile
    csw/mgar/pkg/cpan/Class-Adapter/trunk/Makefile
    csw/mgar/pkg/cpan/Class-Autouse/trunk/Makefile
    csw/mgar/pkg/cpan/Class-BlackHole/trunk/Makefile
    csw/mgar/pkg/cpan/Class-Container/trunk/Makefile
    csw/mgar/pkg/cpan/Class-DBI/trunk/Makefile
    csw/mgar/pkg/cpan/Class-DBI-Loader/trunk/Makefile
    csw/mgar/pkg/cpan/Class-DBI-Pg/trunk/Makefile
    csw/mgar/pkg/cpan/Class-DBI-SQLite/trunk/Makefile
    csw/mgar/pkg/cpan/Class-DBI-mysql/trunk/Makefile
    csw/mgar/pkg/cpan/Class-Data-Inheritable/trunk/Makefile
    csw/mgar/pkg/cpan/Class-Factory-Util/trunk/Makefile
    csw/mgar/pkg/cpan/Class-ISA/trunk/Makefile
    csw/mgar/pkg/cpan/Class-Inspector/trunk/Makefile
    csw/mgar/pkg/cpan/Class-Loader/trunk/Makefile
    csw/mgar/pkg/cpan/Class-ReturnValue/trunk/Makefile
    csw/mgar/pkg/cpan/Class-Singleton/trunk/Makefile
    csw/mgar/pkg/cpan/Class-Std/trunk/Makefile
    csw/mgar/pkg/cpan/Class-Trigger/trunk/Makefile
    csw/mgar/pkg/cpan/Class-WhiteHole/trunk/Makefile
    csw/mgar/pkg/cpan/Class-XSAccessor/trunk/Makefile
    csw/mgar/pkg/cpan/Clone/trunk/Makefile
    csw/mgar/pkg/cpan/Compress-Bzip2/trunk/Makefile
    csw/mgar/pkg/cpan/Compress-Raw-Bzip2/trunk/Makefile
    csw/mgar/pkg/cpan/Compress-Raw-Zlib/trunk/Makefile
    csw/mgar/pkg/cpan/Compress-Zlib/trunk/Makefile
    csw/mgar/pkg/cpan/Config-Augeas/trunk/Makefile
    csw/mgar/pkg/cpan/Config-General/trunk/Makefile
    csw/mgar/pkg/cpan/Config-IniFiles/trunk/Makefile
    csw/mgar/pkg/cpan/Config-Tiny/trunk/Makefile
    csw/mgar/pkg/cpan/Convert-ASCII-Armour/trunk/Makefile
    csw/mgar/pkg/cpan/Convert-ASN1/trunk/Makefile
    csw/mgar/pkg/cpan/Convert-BinHex/trunk/Makefile
    csw/mgar/pkg/cpan/Convert-EBCDIC/trunk/Makefile
    csw/mgar/pkg/cpan/Convert-PEM/trunk/Makefile
    csw/mgar/pkg/cpan/Convert-TNEF/trunk/Makefile
    csw/mgar/pkg/cpan/Convert-UUlib/trunk/Makefile
    csw/mgar/pkg/cpan/Crypt-Blowfish/trunk/Makefile
    csw/mgar/pkg/cpan/Crypt-CAST5/trunk/Makefile
    csw/mgar/pkg/cpan/Crypt-CBC/trunk/Makefile
    csw/mgar/pkg/cpan/Crypt-DES/trunk/Makefile
    csw/mgar/pkg/cpan/Crypt-DES_EDE3/trunk/Makefile
    csw/mgar/pkg/cpan/Crypt-DH/trunk/Makefile
    csw/mgar/pkg/cpan/Crypt-DSA/trunk/Makefile
    csw/mgar/pkg/cpan/Crypt-IDEA/trunk/Makefile
    csw/mgar/pkg/cpan/Crypt-OpenPGP/trunk/Makefile
    csw/mgar/pkg/cpan/Crypt-OpenSSL-Bignum/trunk/Makefile
    csw/mgar/pkg/cpan/Crypt-OpenSSL-DSA/trunk/Makefile
    csw/mgar/pkg/cpan/Crypt-OpenSSL-PKCS12/trunk/Makefile
    csw/mgar/pkg/cpan/Crypt-OpenSSL-RSA/trunk/Makefile
    csw/mgar/pkg/cpan/Crypt-OpenSSL-Random/trunk/Makefile
    csw/mgar/pkg/cpan/Crypt-OpenSSL-X509/trunk/Makefile
    csw/mgar/pkg/cpan/Crypt-PasswdMD5/trunk/Makefile
    csw/mgar/pkg/cpan/Crypt-Primes/trunk/Makefile
    csw/mgar/pkg/cpan/Crypt-RC4/trunk/Makefile
    csw/mgar/pkg/cpan/Crypt-RC5/trunk/Makefile
    csw/mgar/pkg/cpan/Crypt-RIPEMD160/trunk/Makefile
    csw/mgar/pkg/cpan/Crypt-RSA/trunk/Makefile
    csw/mgar/pkg/cpan/Crypt-Rijndael/trunk/Makefile
    csw/mgar/pkg/cpan/Crypt-SSLeay/trunk/Makefile
    csw/mgar/pkg/cpan/Crypt-Twofish/trunk/Makefile
    csw/mgar/pkg/cpan/Curses/trunk/Makefile
    csw/mgar/pkg/cpan/Curses-UI/trunk/Makefile
    csw/mgar/pkg/cpan/DBD-AnyData/trunk/Makefile
    csw/mgar/pkg/cpan/DBD-CSV/trunk/Makefile
    csw/mgar/pkg/cpan/DBD-DB2/trunk/Makefile
    csw/mgar/pkg/cpan/DBD-File/trunk/Makefile
    csw/mgar/pkg/cpan/DBD-Oracle/trunk/Makefile
    csw/mgar/pkg/cpan/DBD-Pg/trunk/Makefile
    csw/mgar/pkg/cpan/DBD-SQLite/trunk/Makefile
    csw/mgar/pkg/cpan/DBD-Sybase/trunk/Makefile
    csw/mgar/pkg/cpan/DBD-mysql/trunk/Makefile
    csw/mgar/pkg/cpan/DBD-mysql5/trunk/Makefile
    csw/mgar/pkg/cpan/DBI/trunk/Makefile
    csw/mgar/pkg/cpan/DBIx-ContextualFetch/trunk/Makefile
    csw/mgar/pkg/cpan/DBIx-Password/trunk/Makefile
    csw/mgar/pkg/cpan/DBIx-SearchBuilder/trunk/Makefile
    csw/mgar/pkg/cpan/DB_File/trunk/Makefile
    csw/mgar/pkg/cpan/Dancer/trunk/Makefile
    csw/mgar/pkg/cpan/Data-Buffer/trunk/Makefile
    csw/mgar/pkg/cpan/Data-Dump/trunk/Makefile
    csw/mgar/pkg/cpan/Data-Flow/trunk/Makefile
    csw/mgar/pkg/cpan/Data-Hierarchy/trunk/Makefile
    csw/mgar/pkg/cpan/Data-ICal/trunk/Makefile
    csw/mgar/pkg/cpan/Data-OptList/trunk/Makefile
    csw/mgar/pkg/cpan/Data-Serializer/trunk/Makefile
    csw/mgar/pkg/cpan/Data-ShowTable/trunk/Makefile
    csw/mgar/pkg/cpan/Data-TreeDumper/trunk/Makefile
    csw/mgar/pkg/cpan/Data-UUID/trunk/Makefile
    csw/mgar/pkg/cpan/Date-Calc/trunk/Makefile
    csw/mgar/pkg/cpan/Date-ICal/trunk/Makefile
    csw/mgar/pkg/cpan/Date-Leapyear/trunk/Makefile
    csw/mgar/pkg/cpan/Date-Manip/trunk/Makefile
    csw/mgar/pkg/cpan/Date-Simple/trunk/Makefile
    csw/mgar/pkg/cpan/DateTime/trunk/Makefile
    csw/mgar/pkg/cpan/DateTime-Format-Mail/trunk/Makefile
    csw/mgar/pkg/cpan/DateTime-Format-W3CDTF/trunk/Makefile
    csw/mgar/pkg/cpan/DateTime-Locale/trunk/Makefile
    csw/mgar/pkg/cpan/DateTime-TimeZone/trunk/Makefile
    csw/mgar/pkg/cpan/Devel-Caller/trunk/Makefile
    csw/mgar/pkg/cpan/Devel-Cover/trunk/Makefile
    csw/mgar/pkg/cpan/Devel-Cycle/trunk/Makefile
    csw/mgar/pkg/cpan/Devel-LeakTrace/trunk/Makefile
    csw/mgar/pkg/cpan/Devel-LexAlias/trunk/Makefile
    csw/mgar/pkg/cpan/Devel-NYTProf/trunk/Makefile
    csw/mgar/pkg/cpan/Devel-Size/trunk/Makefile
    csw/mgar/pkg/cpan/Devel-StackTrace/trunk/Makefile
    csw/mgar/pkg/cpan/Devel-StackTrace-AsHTML/trunk/Makefile
    csw/mgar/pkg/cpan/Devel-Symdump/trunk/Makefile
    csw/mgar/pkg/cpan/Devel-Trace/trunk/Makefile
    csw/mgar/pkg/cpan/Digest/trunk/Makefile
    csw/mgar/pkg/cpan/Digest-BubbleBabble/trunk/Makefile
    csw/mgar/pkg/cpan/Digest-HMAC/trunk/Makefile
    csw/mgar/pkg/cpan/Digest-MD2/trunk/Makefile
    csw/mgar/pkg/cpan/Digest-Nilsimsa/trunk/Makefile
    csw/mgar/pkg/cpan/Digest-SHA/trunk/Makefile
    csw/mgar/pkg/cpan/Digest-SHA1/trunk/Makefile
    csw/mgar/pkg/cpan/DublinCore-Record/trunk/Makefile
    csw/mgar/pkg/cpan/Email-Date-Format/trunk/Makefile
    csw/mgar/pkg/cpan/Email-Simple/trunk/Makefile
    csw/mgar/pkg/cpan/Email-Valid/trunk/Makefile
    csw/mgar/pkg/cpan/Env-Path/trunk/Makefile
    csw/mgar/pkg/cpan/Error/trunk/Makefile
    csw/mgar/pkg/cpan/Event/trunk/Makefile
    csw/mgar/pkg/cpan/Event-Lib/trunk/Makefile
    csw/mgar/pkg/cpan/Exception-Class/trunk/Makefile
    csw/mgar/pkg/cpan/Exception-Class-DBI/trunk/Makefile
    csw/mgar/pkg/cpan/ExtUtils-AutoInstall/trunk/Makefile
    csw/mgar/pkg/cpan/ExtUtils-CBuilder/trunk/Makefile
    csw/mgar/pkg/cpan/ExtUtils-Depends/trunk/Makefile
    csw/mgar/pkg/cpan/ExtUtils-F77/trunk/Makefile
    csw/mgar/pkg/cpan/ExtUtils-Manifest/trunk/Makefile
    csw/mgar/pkg/cpan/ExtUtils-ParseXS/trunk/Makefile
    csw/mgar/pkg/cpan/ExtUtils-PkgConfig/trunk/Makefile
    csw/mgar/pkg/cpan/ExtUtils-XSBuilder/trunk/Makefile
    csw/mgar/pkg/cpan/FCGI/trunk/Makefile
    csw/mgar/pkg/cpan/File-Cat/trunk/Makefile
    csw/mgar/pkg/cpan/File-Copy-Recursive/trunk/Makefile
    csw/mgar/pkg/cpan/File-Fetch/trunk/Makefile
    csw/mgar/pkg/cpan/File-Flat/trunk/Makefile
    csw/mgar/pkg/cpan/File-HomeDir/trunk/Makefile
    csw/mgar/pkg/cpan/File-LibMagic/trunk/Makefile
    csw/mgar/pkg/cpan/File-MMagic/trunk/Makefile
    csw/mgar/pkg/cpan/File-Modified/trunk/Makefile
    csw/mgar/pkg/cpan/File-NFSLock/trunk/Makefile
    csw/mgar/pkg/cpan/File-Next/trunk/Makefile
    csw/mgar/pkg/cpan/File-ReadBackwards/trunk/Makefile
    csw/mgar/pkg/cpan/File-Remove/trunk/Makefile
    csw/mgar/pkg/cpan/File-ShareDir/trunk/Makefile
    csw/mgar/pkg/cpan/File-Slurp/trunk/Makefile
    csw/mgar/pkg/cpan/File-Tail/trunk/Makefile
    csw/mgar/pkg/cpan/File-Type/trunk/Makefile
    csw/mgar/pkg/cpan/File-Which/trunk/Makefile
    csw/mgar/pkg/cpan/File-chdir/trunk/Makefile
    csw/mgar/pkg/cpan/File-chmod/trunk/Makefile
    csw/mgar/pkg/cpan/Filesys-Df/trunk/Makefile
    csw/mgar/pkg/cpan/Filesys-Notify-Simple/trunk/Makefile
    csw/mgar/pkg/cpan/Font-AFM/trunk/Makefile
    csw/mgar/pkg/cpan/Font-Freetype/trunk/Makefile
    csw/mgar/pkg/cpan/Font-TTF/trunk/Makefile
    csw/mgar/pkg/cpan/FreezeThaw/trunk/Makefile
    csw/mgar/pkg/cpan/Frontier-RPC/trunk/Makefile
    csw/mgar/pkg/cpan/GD/trunk/Makefile
    csw/mgar/pkg/cpan/GD-Barcode/trunk/Makefile
    csw/mgar/pkg/cpan/GDGraph/trunk/Makefile
    csw/mgar/pkg/cpan/GDTextUtil/trunk/Makefile
    csw/mgar/pkg/cpan/GSSAPI/trunk/Makefile
    csw/mgar/pkg/cpan/Geo-IP/trunk/Makefile
    csw/mgar/pkg/cpan/Geo-IP-PurePerl/trunk/Makefile
    csw/mgar/pkg/cpan/Geography-Countries/trunk/Makefile
    csw/mgar/pkg/cpan/Gimp/trunk/Makefile
    csw/mgar/pkg/cpan/Glib/trunk/Makefile
    csw/mgar/pkg/cpan/Gnome2/trunk/Makefile
    csw/mgar/pkg/cpan/Gnome2-Canvas/trunk/Makefile
    csw/mgar/pkg/cpan/Gnome2-GConf/trunk/Makefile
    csw/mgar/pkg/cpan/Gnome2-Print/trunk/Makefile
    csw/mgar/pkg/cpan/Gnome2-VFS/trunk/Makefile
    csw/mgar/pkg/cpan/Gnome2-Wnck/trunk/Makefile
    csw/mgar/pkg/cpan/Graph/trunk/Makefile
    csw/mgar/pkg/cpan/GraphViz/trunk/Makefile
    csw/mgar/pkg/cpan/Graphics-ColorNames/trunk/Makefile
    csw/mgar/pkg/cpan/Graphics-ColorNames-WWW/trunk/Makefile
    csw/mgar/pkg/cpan/Gtk2/trunk/Makefile
    csw/mgar/pkg/cpan/Gtk2-GladeXML/trunk/Makefile
    csw/mgar/pkg/cpan/Gtk2-PodViewer/trunk/Makefile
    csw/mgar/pkg/cpan/Gtk2-TrayIcon/trunk/Makefile
    csw/mgar/pkg/cpan/HTML-CalendarMonth/trunk/Makefile
    csw/mgar/pkg/cpan/HTML-Element-Extended/trunk/Makefile
    csw/mgar/pkg/cpan/HTML-Format/trunk/Makefile
    csw/mgar/pkg/cpan/HTML-Mason/trunk/Makefile
    csw/mgar/pkg/cpan/HTML-Parser/trunk/Makefile
    csw/mgar/pkg/cpan/HTML-Scrubber/trunk/Makefile
    csw/mgar/pkg/cpan/HTML-TableExtract/trunk/Makefile
    csw/mgar/pkg/cpan/HTML-Tagset/trunk/Makefile
    csw/mgar/pkg/cpan/HTML-Template/trunk/Makefile
    csw/mgar/pkg/cpan/HTML-Template-Pro/trunk/Makefile
    csw/mgar/pkg/cpan/HTML-TokeParser/trunk/Makefile
    csw/mgar/pkg/cpan/HTML-Tree/trunk/Makefile
    csw/mgar/pkg/cpan/HTTP-Body/trunk/Makefile
    csw/mgar/pkg/cpan/HTTP-DAV/trunk/Makefile
    csw/mgar/pkg/cpan/HTTP-Server-Simple/trunk/Makefile
    csw/mgar/pkg/cpan/HTTP-Server-Simple-PSGI/trunk/Makefile
    csw/mgar/pkg/cpan/Hash-MultiValue/trunk/Makefile
    csw/mgar/pkg/cpan/Heap/trunk/Makefile
    csw/mgar/pkg/cpan/Hook-LexWrap/trunk/Makefile
    csw/mgar/pkg/cpan/I18N-LangTags/trunk/Makefile
    csw/mgar/pkg/cpan/IDNA-Punycode/trunk/Makefile
    csw/mgar/pkg/cpan/IO-Compress/trunk/Makefile
    csw/mgar/pkg/cpan/IO-Compress-Base/trunk/Makefile
    csw/mgar/pkg/cpan/IO-Compress-Zlib/trunk/Makefile
    csw/mgar/pkg/cpan/IO-Digest/trunk/Makefile
    csw/mgar/pkg/cpan/IO-Multiplex/trunk/Makefile
    csw/mgar/pkg/cpan/IO-Pager/trunk/Makefile
    csw/mgar/pkg/cpan/IO-Socket-INET6/trunk/Makefile
    csw/mgar/pkg/cpan/IO-Socket-SSL/trunk/Makefile
    csw/mgar/pkg/cpan/IO-String/trunk/Makefile
    csw/mgar/pkg/cpan/IO-Tty/trunk/Makefile
    csw/mgar/pkg/cpan/IO-Util/trunk/Makefile
    csw/mgar/pkg/cpan/IO-Zlib/trunk/Makefile
    csw/mgar/pkg/cpan/IO-stringy/trunk/Makefile
    csw/mgar/pkg/cpan/IP-Country/trunk/Makefile
    csw/mgar/pkg/cpan/IPC-Cmd/trunk/Makefile
    csw/mgar/pkg/cpan/IPC-Run/trunk/Makefile
    csw/mgar/pkg/cpan/IPC-Run3/trunk/Makefile
    csw/mgar/pkg/cpan/IPC-ShareLite/trunk/Makefile
    csw/mgar/pkg/cpan/Ima-DBI/trunk/Makefile
    csw/mgar/pkg/cpan/Image-ExifTool/trunk/Makefile
    csw/mgar/pkg/cpan/Image-Info/trunk/Makefile
    csw/mgar/pkg/cpan/Image-Size/trunk/Makefile
    csw/mgar/pkg/cpan/Inline/trunk/Makefile
    csw/mgar/pkg/cpan/JIRA-Client/trunk/Makefile
    csw/mgar/pkg/cpan/JSON/trunk/Makefile
    csw/mgar/pkg/cpan/JSON-Any/trunk/Makefile
    csw/mgar/pkg/cpan/Jcode/trunk/Makefile
    csw/mgar/pkg/cpan/Lexical-Persistence/trunk/Makefile
    csw/mgar/pkg/cpan/Lingua-PT-Stemmer/trunk/Makefile
    csw/mgar/pkg/cpan/Lingua-Stem/trunk/Makefile
    csw/mgar/pkg/cpan/Lingua-Stem-Fr/trunk/Makefile
    csw/mgar/pkg/cpan/Lingua-Stem-It/trunk/Makefile
    csw/mgar/pkg/cpan/Lingua-Stem-Ru/trunk/Makefile
    csw/mgar/pkg/cpan/Lingua-Stem-Snowball-Da/trunk/Makefile
    csw/mgar/pkg/cpan/List-MoreUtils/trunk/Makefile
    csw/mgar/pkg/cpan/Locale-Gettext/trunk/Makefile
    csw/mgar/pkg/cpan/Locale-Maketext-Fuzzy/trunk/Makefile
    csw/mgar/pkg/cpan/Locale-Maketext-Lexicon/trunk/Makefile
    csw/mgar/pkg/cpan/Locale-Maketext-Simple/trunk/Makefile
    csw/mgar/pkg/cpan/Log-Any/trunk/Makefile
    csw/mgar/pkg/cpan/Log-Dispatch/trunk/Makefile
    csw/mgar/pkg/cpan/Log-Dispatch-Config/trunk/Makefile
    csw/mgar/pkg/cpan/Log-Dispatch-FileRotate/trunk/Makefile
    csw/mgar/pkg/cpan/Log-Log4perl/trunk/Makefile
    csw/mgar/pkg/cpan/Log-Message/trunk/Makefile
    csw/mgar/pkg/cpan/Log-Message-Simple/trunk/Makefile
    csw/mgar/pkg/cpan/MARC-Charset/trunk/Makefile
    csw/mgar/pkg/cpan/MARC-Crosswalk-DublinCore/trunk/Makefile
    csw/mgar/pkg/cpan/MARC-Record/trunk/Makefile
    csw/mgar/pkg/cpan/MARC-XML/trunk/Makefile
    csw/mgar/pkg/cpan/MIME-Base64/trunk/Makefile
    csw/mgar/pkg/cpan/MIME-Lite/trunk/Makefile
    csw/mgar/pkg/cpan/MIME-Types/trunk/Makefile
    csw/mgar/pkg/cpan/MIME-tools/trunk/Makefile
    csw/mgar/pkg/cpan/MLDBM/trunk/Makefile
    csw/mgar/pkg/cpan/MLDBM-Sync/trunk/Makefile
    csw/mgar/pkg/cpan/MP3-Tag/trunk/Makefile
    csw/mgar/pkg/cpan/Mail-Box/trunk/Makefile
    csw/mgar/pkg/cpan/Mail-Box-Parser-C/trunk/Makefile
    csw/mgar/pkg/cpan/Mail-DKIM/trunk/Makefile
    csw/mgar/pkg/cpan/Mail-IMAPClient/trunk/Makefile
    csw/mgar/pkg/cpan/Mail-SPF/trunk/Makefile
    csw/mgar/pkg/cpan/Mail-SPF-Query/trunk/Makefile
    csw/mgar/pkg/cpan/Mail-Sender/trunk/Makefile
    csw/mgar/pkg/cpan/Mail-Sendmail/trunk/Makefile
    csw/mgar/pkg/cpan/Mail-Tools/trunk/Makefile
    csw/mgar/pkg/cpan/Math-Bezier/trunk/Makefile
    csw/mgar/pkg/cpan/Math-GMP/trunk/Makefile
    csw/mgar/pkg/cpan/Math-Interpolate/trunk/Makefile
    csw/mgar/pkg/cpan/Math-Pari/trunk/Makefile
    csw/mgar/pkg/cpan/Module-Build/trunk/Makefile
    csw/mgar/pkg/cpan/Module-CoreList/trunk/Makefile
    csw/mgar/pkg/cpan/Module-Load/trunk/Makefile
    csw/mgar/pkg/cpan/Module-Load-Conditional/trunk/Makefile
    csw/mgar/pkg/cpan/Module-Loaded/trunk/Makefile
    csw/mgar/pkg/cpan/Module-Pluggable/trunk/Makefile
    csw/mgar/pkg/cpan/Module-Refresh/trunk/Makefile
    csw/mgar/pkg/cpan/Module-ScanDeps/trunk/Makefile
    csw/mgar/pkg/cpan/Module-Signature/trunk/Makefile
    csw/mgar/pkg/cpan/Module-Starter/trunk/Makefile
    csw/mgar/pkg/cpan/Module-Version/trunk/Makefile
    csw/mgar/pkg/cpan/Module-Versions-Report/trunk/Makefile
    csw/mgar/pkg/cpan/Net-Analysis/trunk/Makefile
    csw/mgar/pkg/cpan/Net-CIDR/trunk/Makefile
    csw/mgar/pkg/cpan/Net-CIDR-Lite/trunk/Makefile
    csw/mgar/pkg/cpan/Net-DNS/trunk/Makefile
    csw/mgar/pkg/cpan/Net-DNS-Resolver-Programmable/trunk/Makefile
    csw/mgar/pkg/cpan/Net-Daemon/trunk/Makefile
    csw/mgar/pkg/cpan/Net-IDN-Encode/trunk/Makefile
    csw/mgar/pkg/cpan/Net-IDN-Nameprep/trunk/Makefile
    csw/mgar/pkg/cpan/Net-IP/trunk/Makefile
    csw/mgar/pkg/cpan/Net-Jabber/trunk/Makefile
    csw/mgar/pkg/cpan/Net-NIS/trunk/Makefile
    csw/mgar/pkg/cpan/Net-Netmask/trunk/Makefile
    csw/mgar/pkg/cpan/Net-Patricia/trunk/Makefile
    csw/mgar/pkg/cpan/Net-Pcap/trunk/Makefile
    csw/mgar/pkg/cpan/Net-SMTP-SSL/trunk/Makefile
    csw/mgar/pkg/cpan/Net-SNMP/trunk/Makefile
    csw/mgar/pkg/cpan/Net-SSH/trunk/Makefile
    csw/mgar/pkg/cpan/Net-SSH-Perl/trunk/Makefile
    csw/mgar/pkg/cpan/Net-SSH2/trunk/Makefile
    csw/mgar/pkg/cpan/Net-SSLeay/trunk/Makefile
    csw/mgar/pkg/cpan/Net-Server/trunk/Makefile
    csw/mgar/pkg/cpan/Net-Syslog/trunk/Makefile
    csw/mgar/pkg/cpan/Net-Telnet/trunk/Makefile
    csw/mgar/pkg/cpan/Net-UCP/trunk/Makefile
    csw/mgar/pkg/cpan/Net-UCP-Common/trunk/Makefile
    csw/mgar/pkg/cpan/Net-UCP-IntTimeout/trunk/Makefile
    csw/mgar/pkg/cpan/Net-UCP-TransactionManager/trunk/Makefile
    csw/mgar/pkg/cpan/Net-XMPP/trunk/Makefile
    csw/mgar/pkg/cpan/Net-Z3950-ZOOM/trunk/Makefile
    csw/mgar/pkg/cpan/Net-ext/trunk/Makefile
    csw/mgar/pkg/cpan/NetAddr-IP/trunk/Makefile
    csw/mgar/pkg/cpan/NetPacket/trunk/Makefile
    csw/mgar/pkg/cpan/Number-Compare/trunk/Makefile
    csw/mgar/pkg/cpan/Number-Format/trunk/Makefile
    csw/mgar/pkg/cpan/OLE-Storage_Lite/trunk/Makefile
    csw/mgar/pkg/cpan/OOTools/trunk/Makefile
    csw/mgar/pkg/cpan/Object-Accessor/trunk/Makefile
    csw/mgar/pkg/cpan/Object-MultiType/trunk/Makefile
    csw/mgar/pkg/cpan/Object-Realize-Later/trunk/Makefile
    csw/mgar/pkg/cpan/Opcodes/trunk/Makefile
    csw/mgar/pkg/cpan/OpenGL/trunk/Makefile
    csw/mgar/pkg/cpan/PAR/trunk/Makefile
    csw/mgar/pkg/cpan/PAR-Dist/trunk/Makefile
    csw/mgar/pkg/cpan/PDF-API2/trunk/Makefile
    csw/mgar/pkg/cpan/PDF-Reuse/trunk/Makefile
    csw/mgar/pkg/cpan/PDF-Reuse-Barcode/trunk/Makefile
    csw/mgar/pkg/cpan/PDL/trunk/Makefile
    csw/mgar/pkg/cpan/POE/trunk/Makefile
    csw/mgar/pkg/cpan/POE-Test-Loops/trunk/Makefile
    csw/mgar/pkg/cpan/Package-Constants/trunk/Makefile
    csw/mgar/pkg/cpan/PadWalker/trunk/Makefile
    csw/mgar/pkg/cpan/Pango/trunk/Makefile
    csw/mgar/pkg/cpan/Parallel-ForkManager/trunk/Makefile
    csw/mgar/pkg/cpan/Params-Check/trunk/Makefile
    csw/mgar/pkg/cpan/Params-Util/trunk/Makefile
    csw/mgar/pkg/cpan/Params-Validate/trunk/Makefile
    csw/mgar/pkg/cpan/Parse-CPAN-Meta/trunk/Makefile
    csw/mgar/pkg/cpan/Parse-RecDescent/trunk/Makefile
    csw/mgar/pkg/cpan/Parse-Syslog/trunk/Makefile
    csw/mgar/pkg/cpan/Passwd-Unix/trunk/Makefile
    csw/mgar/pkg/cpan/PatchReader/trunk/Makefile
    csw/mgar/pkg/cpan/Path-Class/trunk/Makefile
    csw/mgar/pkg/cpan/Perl-OSType/trunk/Makefile
    csw/mgar/pkg/cpan/Perl-Tidy/trunk/Makefile
    csw/mgar/pkg/cpan/Perl6-Export/trunk/Makefile
    csw/mgar/pkg/cpan/Perl6-Export-Attrs/trunk/Makefile
    csw/mgar/pkg/cpan/Perl6-Slurp/trunk/Makefile
    csw/mgar/pkg/cpan/PerlIO-eol/trunk/Makefile
    csw/mgar/pkg/cpan/PerlIO-gzip/trunk/Makefile
    csw/mgar/pkg/cpan/PerlIO-via-Bzip2/trunk/Makefile
    csw/mgar/pkg/cpan/PerlIO-via-dynamic/trunk/Makefile
    csw/mgar/pkg/cpan/PerlIO-via-symlink/trunk/Makefile
    csw/mgar/pkg/cpan/PlRPC/trunk/Makefile
    csw/mgar/pkg/cpan/Plack/trunk/Makefile
    csw/mgar/pkg/cpan/Pod-Coverage/trunk/Makefile
    csw/mgar/pkg/cpan/Pod-Escapes/trunk/Makefile
    csw/mgar/pkg/cpan/Pod-POM/trunk/Makefile
    csw/mgar/pkg/cpan/Pod-Readme/trunk/Makefile
    csw/mgar/pkg/cpan/Pod-Simple/trunk/Makefile
    csw/mgar/pkg/cpan/Pod-Tests/trunk/Makefile
    csw/mgar/pkg/cpan/PodToHTML/trunk/Makefile
    csw/mgar/pkg/cpan/Probe-Perl/trunk/Makefile
    csw/mgar/pkg/cpan/Proc-ProcessTable/trunk/Makefile
    csw/mgar/pkg/cpan/RADIUS-UserFile/trunk/Makefile
    csw/mgar/pkg/cpan/RPC-XML/trunk/Makefile
    csw/mgar/pkg/cpan/Readonly/trunk/Makefile
    csw/mgar/pkg/cpan/Regexp-Common/trunk/Makefile
    csw/mgar/pkg/cpan/Regexp-Shellish/trunk/Makefile
    csw/mgar/pkg/cpan/SDF/trunk/Makefile
    csw/mgar/pkg/cpan/SMS-Send/trunk/Makefile
    csw/mgar/pkg/cpan/SOAP-Lite/trunk/Makefile
    csw/mgar/pkg/cpan/SOAP-WSDL/trunk/Makefile
    csw/mgar/pkg/cpan/SQL-Statement/trunk/Makefile
    csw/mgar/pkg/cpan/SVK/trunk/Makefile
    csw/mgar/pkg/cpan/SVN-Dump/trunk/Makefile
    csw/mgar/pkg/cpan/SVN-Mirror/trunk/Makefile
    csw/mgar/pkg/cpan/SVN-Notify/trunk/Makefile
    csw/mgar/pkg/cpan/SVN-Simple/trunk/Makefile
    csw/mgar/pkg/cpan/Scalar-List-Utils/trunk/Makefile
    csw/mgar/pkg/cpan/Schedule-At/trunk/Makefile
    csw/mgar/pkg/cpan/Schedule-Cron/trunk/Makefile
    csw/mgar/pkg/cpan/Scope-Guard/trunk/Makefile
    csw/mgar/pkg/cpan/Search-Xapian/trunk/Makefile
    csw/mgar/pkg/cpan/Shout/trunk/Makefile
    csw/mgar/pkg/cpan/Smart-Comments/trunk/Makefile
    csw/mgar/pkg/cpan/Snowball-Norwegian/trunk/Makefile
    csw/mgar/pkg/cpan/Snowball-Swedish/trunk/Makefile
    csw/mgar/pkg/cpan/Socket6/trunk/Makefile
    csw/mgar/pkg/cpan/Solaris-DeviceTree/trunk/Makefile
    csw/mgar/pkg/cpan/Solaris-Sysconf/trunk/Makefile
    csw/mgar/pkg/cpan/Sort-Naturally/trunk/Makefile
    csw/mgar/pkg/cpan/Sort-Versions/trunk/Makefile
    csw/mgar/pkg/cpan/Spiffy/trunk/Makefile
    csw/mgar/pkg/cpan/Statistics-Descriptive/trunk/Makefile
    csw/mgar/pkg/cpan/String-Approx/trunk/Makefile
    csw/mgar/pkg/cpan/String-CRC32/trunk/Makefile
    csw/mgar/pkg/cpan/String-ShellQuote/trunk/Makefile
    csw/mgar/pkg/cpan/Struct-Compare/trunk/Makefile
    csw/mgar/pkg/cpan/Sub-Delete/trunk/Makefile
    csw/mgar/pkg/cpan/Sub-Exporter/trunk/Makefile
    csw/mgar/pkg/cpan/Sub-Install/trunk/Makefile
    csw/mgar/pkg/cpan/Sub-Name/trunk/Makefile
    csw/mgar/pkg/cpan/Sub-Override/trunk/Makefile
    csw/mgar/pkg/cpan/Sub-Uplevel/trunk/Makefile
    csw/mgar/pkg/cpan/Sys-Hostname-Long/trunk/Makefile
    csw/mgar/pkg/cpan/Sys-SigAction/trunk/Makefile
    csw/mgar/pkg/cpan/Task-Weaken/trunk/Makefile
    csw/mgar/pkg/cpan/Template-Extract/trunk/Makefile
    csw/mgar/pkg/cpan/Template-TAL/trunk/Makefile
    csw/mgar/pkg/cpan/Template-Toolkit/trunk/Makefile
    csw/mgar/pkg/cpan/Term-Cap/trunk/Makefile
    csw/mgar/pkg/cpan/Term-ReadLine-Gnu/trunk/Makefile
    csw/mgar/pkg/cpan/Term-Size/trunk/Makefile
    csw/mgar/pkg/cpan/Term-UI/trunk/Makefile
    csw/mgar/pkg/cpan/TermReadKey/trunk/Makefile
    csw/mgar/pkg/cpan/Test-Builder-Tester/trunk/Makefile
    csw/mgar/pkg/cpan/Test-Class/trunk/Makefile
    csw/mgar/pkg/cpan/Test-ClassAPI/trunk/Makefile
    csw/mgar/pkg/cpan/Test-Deep/trunk/Makefile
    csw/mgar/pkg/cpan/Test-Differences/trunk/Makefile
    csw/mgar/pkg/cpan/Test-Distribution/trunk/Makefile
    csw/mgar/pkg/cpan/Test-Exception/trunk/Makefile
    csw/mgar/pkg/cpan/Test-Inline/trunk/Makefile
    csw/mgar/pkg/cpan/Test-LongString/trunk/Makefile
    csw/mgar/pkg/cpan/Test-Manifest/trunk/Makefile
    csw/mgar/pkg/cpan/Test-Memory-Cycle/trunk/Makefile
    csw/mgar/pkg/cpan/Test-MockObject/trunk/Makefile
    csw/mgar/pkg/cpan/Test-NoWarnings/trunk/Makefile
    csw/mgar/pkg/cpan/Test-Pod/trunk/Makefile
    csw/mgar/pkg/cpan/Test-Pod-Coverage/trunk/Makefile
    csw/mgar/pkg/cpan/Test-Requires/trunk/Makefile
    csw/mgar/pkg/cpan/Test-Script/trunk/Makefile
    csw/mgar/pkg/cpan/Test-SharedFork/trunk/Makefile
    csw/mgar/pkg/cpan/Test-Simple/trunk/Makefile
    csw/mgar/pkg/cpan/Test-TCP/trunk/Makefile
    csw/mgar/pkg/cpan/Test-Tester/trunk/Makefile
    csw/mgar/pkg/cpan/Test-WWW-Mechanize/trunk/Makefile
    csw/mgar/pkg/cpan/Test-Warn/trunk/Makefile
    csw/mgar/pkg/cpan/Test-XML/trunk/Makefile
    csw/mgar/pkg/cpan/Test-use-ok/trunk/Makefile
    csw/mgar/pkg/cpan/Text-Autoformat/trunk/Makefile
    csw/mgar/pkg/cpan/Text-CSV/trunk/Makefile
    csw/mgar/pkg/cpan/Text-CSV_XS/trunk/Makefile
    csw/mgar/pkg/cpan/Text-Diff/trunk/Makefile
    csw/mgar/pkg/cpan/Text-DoubleMetaphone/trunk/Makefile
    csw/mgar/pkg/cpan/Text-Format/trunk/Makefile
    csw/mgar/pkg/cpan/Text-GenderFromName/trunk/Makefile
    csw/mgar/pkg/cpan/Text-German/trunk/Makefile
    csw/mgar/pkg/cpan/Text-Glob/trunk/Makefile
    csw/mgar/pkg/cpan/Text-Iconv/trunk/Makefile
    csw/mgar/pkg/cpan/Text-Quoted/trunk/Makefile
    csw/mgar/pkg/cpan/Text-Reform/trunk/Makefile
    csw/mgar/pkg/cpan/Text-Scraper/trunk/Makefile
    csw/mgar/pkg/cpan/Text-Tabs+Wrap/trunk/Makefile
    csw/mgar/pkg/cpan/Text-Template/trunk/Makefile
    csw/mgar/pkg/cpan/Text-WikiFormat/trunk/Makefile
    csw/mgar/pkg/cpan/Text-Wrapper/trunk/Makefile
    csw/mgar/pkg/cpan/Text-vFile-asData/trunk/Makefile
    csw/mgar/pkg/cpan/Tie-DBI/trunk/Makefile
    csw/mgar/pkg/cpan/Tie-EncryptedHash/trunk/Makefile
    csw/mgar/pkg/cpan/Tie-IxHash/trunk/Makefile
    csw/mgar/pkg/cpan/Tie-MLDBM/trunk/Makefile
    csw/mgar/pkg/cpan/Tie-Util/trunk/Makefile
    csw/mgar/pkg/cpan/Time-Format/trunk/Makefile
    csw/mgar/pkg/cpan/Time-HiRes/trunk/Makefile
    csw/mgar/pkg/cpan/Time-Period/trunk/Makefile
    csw/mgar/pkg/cpan/Time-Progress/trunk/Makefile
    csw/mgar/pkg/cpan/Time-modules/trunk/Makefile
    csw/mgar/pkg/cpan/TimeDate/trunk/Makefile
    csw/mgar/pkg/cpan/Tk/trunk/Makefile
    csw/mgar/pkg/cpan/Tree-DAG_Node/trunk/Makefile
    csw/mgar/pkg/cpan/Tree-Simple/trunk/Makefile
    csw/mgar/pkg/cpan/Try-Tiny/trunk/Makefile
    csw/mgar/pkg/cpan/UNIVERSAL-can/trunk/Makefile
    csw/mgar/pkg/cpan/UNIVERSAL-isa/trunk/Makefile
    csw/mgar/pkg/cpan/UNIVERSAL-moniker/trunk/Makefile
    csw/mgar/pkg/cpan/UNIVERSAL-require/trunk/Makefile
    csw/mgar/pkg/cpan/URI/trunk/Makefile
    csw/mgar/pkg/cpan/Unicode-Map/trunk/Makefile
    csw/mgar/pkg/cpan/Unicode-Map8/trunk/Makefile
    csw/mgar/pkg/cpan/Unicode-MapUTF8/trunk/Makefile
    csw/mgar/pkg/cpan/Unicode-String/trunk/Makefile
    csw/mgar/pkg/cpan/Unicode-Stringprep/trunk/Makefile
    csw/mgar/pkg/cpan/Unix-Statgrab/trunk/Makefile
    csw/mgar/pkg/cpan/Unix-Syslog/trunk/Makefile
    csw/mgar/pkg/cpan/User-Identity/trunk/Makefile
    csw/mgar/pkg/cpan/VCP/trunk/Makefile
    csw/mgar/pkg/cpan/VCP-Dest-svk/trunk/Makefile
    csw/mgar/pkg/cpan/WWW-Curl/trunk/Makefile
    csw/mgar/pkg/cpan/WWW-Mechanize/trunk/Makefile
    csw/mgar/pkg/cpan/Want/trunk/Makefile
    csw/mgar/pkg/cpan/X11-Protocol/trunk/Makefile
    csw/mgar/pkg/cpan/XML-Atom/trunk/Makefile
    csw/mgar/pkg/cpan/XML-Atom-SimpleFeed/trunk/Makefile
    csw/mgar/pkg/cpan/XML-AutoWriter/trunk/Makefile
    csw/mgar/pkg/cpan/XML-DOM/trunk/Makefile
    csw/mgar/pkg/cpan/XML-Dumper/trunk/Makefile
    csw/mgar/pkg/cpan/XML-Encoding/trunk/Makefile
    csw/mgar/pkg/cpan/XML-GDOME/trunk/Makefile
    csw/mgar/pkg/cpan/XML-GDOME-XSLT/trunk/Makefile
    csw/mgar/pkg/cpan/XML-LibXML/trunk/Makefile
    csw/mgar/pkg/cpan/XML-LibXSLT/trunk/Makefile
    csw/mgar/pkg/cpan/XML-NamespaceSupport/trunk/Makefile
    csw/mgar/pkg/cpan/XML-Parser/trunk/Makefile
    csw/mgar/pkg/cpan/XML-RSS/trunk/Makefile
    csw/mgar/pkg/cpan/XML-Records/trunk/Makefile
    csw/mgar/pkg/cpan/XML-RegExp/trunk/Makefile
    csw/mgar/pkg/cpan/XML-SAX/trunk/Makefile
    csw/mgar/pkg/cpan/XML-SemanticDiff/trunk/Makefile
    csw/mgar/pkg/cpan/XML-Simple/trunk/Makefile
    csw/mgar/pkg/cpan/XML-Smart/trunk/Makefile
    csw/mgar/pkg/cpan/XML-Stream/trunk/Makefile
    csw/mgar/pkg/cpan/XML-TokeParser/trunk/Makefile
    csw/mgar/pkg/cpan/XML-Twig/trunk/Makefile
    csw/mgar/pkg/cpan/XML-XPath/trunk/Makefile
    csw/mgar/pkg/cpan/XML-XSLT/trunk/Makefile
    csw/mgar/pkg/cpan/YAML/trunk/Makefile
    csw/mgar/pkg/cpan/YAML-Syck/trunk/Makefile
    csw/mgar/pkg/cpan/ack/trunk/Makefile
    csw/mgar/pkg/cpan/common-sense/trunk/Makefile
    csw/mgar/pkg/cpan/constant-lexical/trunk/Makefile
    csw/mgar/pkg/cpan/html2text/trunk/Makefile
    csw/mgar/pkg/cpan/libapreq/trunk/Makefile
    csw/mgar/pkg/cpan/libapreq2/trunk/Makefile
    csw/mgar/pkg/cpan/libwww-perl/trunk/Makefile
    csw/mgar/pkg/cpan/libxml-perl/trunk/Makefile
    csw/mgar/pkg/cpan/mod_perl/trunk/Makefile
    csw/mgar/pkg/cpan/mod_perl2/trunk/Makefile
    csw/mgar/pkg/cpan/perl-ldap/trunk/Makefile
    csw/mgar/pkg/cpan/perl-mozldap/trunk/Makefile
    csw/mgar/pkg/cpan/perlconsole/trunk/Makefile
    csw/mgar/pkg/cpan/pmtools/trunk/Makefile
    csw/mgar/pkg/cpan/prefork/trunk/Makefile
    csw/mgar/pkg/cpan/psh/trunk/Makefile
    csw/mgar/pkg/cpan/sol-inst/trunk/Makefile
    csw/mgar/pkg/cpan/version/trunk/Makefile
    csw/mgar/pkg/cpptest/trunk/Makefile
    csw/mgar/pkg/cscope/trunk/Makefile
    csw/mgar/pkg/csup/trunk/Makefile
    csw/mgar/pkg/cswclassutils/trunk/Makefile
    csw/mgar/pkg/cswcommon/trunk/Makefile
    csw/mgar/pkg/cswgpgkey/trunk/Makefile
    csw/mgar/pkg/cswhookdebug/trunk/Makefile
    csw/mgar/pkg/cswpkgloghooks/trunk/Makefile
    csw/mgar/pkg/cswutils/trunk/Makefile
    csw/mgar/pkg/csync2/trunk/Makefile
    csw/mgar/pkg/cups/trunk/Makefile
    csw/mgar/pkg/cvs/trunk/Makefile
    csw/mgar/pkg/cvs2svn/trunk/Makefile
    csw/mgar/pkg/cvsproxy/trunk/Makefile
    csw/mgar/pkg/cvsps/trunk/Makefile
    csw/mgar/pkg/cx-oracle/trunk/Makefile
    csw/mgar/pkg/cyrus_imapd/trunk/Makefile
    csw/mgar/pkg/daemontools/trunk/Makefile
    csw/mgar/pkg/dante/trunk/Makefile
    csw/mgar/pkg/dbus/trunk/Makefile
    csw/mgar/pkg/dbus-glib/trunk/Makefile
    csw/mgar/pkg/dcc/trunk/Makefile
    csw/mgar/pkg/ddrescue/trunk/Makefile
    csw/mgar/pkg/debian-vote/trunk/Makefile
    csw/mgar/pkg/dejagnu/trunk/Makefile
    csw/mgar/pkg/denyhosts/trunk/Makefile
    csw/mgar/pkg/dhcp/trunk/Makefile
    csw/mgar/pkg/dhcping/trunk/Makefile
    csw/mgar/pkg/di/trunk/Makefile
    csw/mgar/pkg/dia/trunk/Makefile
    csw/mgar/pkg/dia-shapes/trunk/Makefile
    csw/mgar/pkg/dialog/trunk/Makefile
    csw/mgar/pkg/diffstat/trunk/Makefile
    csw/mgar/pkg/diffuse/trunk/Makefile
    csw/mgar/pkg/diffutils/trunk/Makefile
    csw/mgar/pkg/disktype/trunk/Makefile
    csw/mgar/pkg/distcc/trunk/Makefile
    csw/mgar/pkg/djbdns/trunk/Makefile
    csw/mgar/pkg/djvulibre/trunk/Makefile
    csw/mgar/pkg/djvulibre15/trunk/Makefile
    csw/mgar/pkg/dnstop/trunk/Makefile
    csw/mgar/pkg/dnstracer/trunk/Makefile
    csw/mgar/pkg/dnswalk/trunk/Makefile
    csw/mgar/pkg/docbook-dtds/trunk/Makefile
    csw/mgar/pkg/docbook-style-dsssl/trunk/Makefile
    csw/mgar/pkg/docbook-style-xsl/trunk/Makefile
    csw/mgar/pkg/dovecot/trunk/Makefile
    csw/mgar/pkg/doxygen/trunk/Makefile
    csw/mgar/pkg/dpkg/trunk/Makefile
    csw/mgar/pkg/drupal/trunk/Makefile
    csw/mgar/pkg/dsniff/trunk/Makefile
    csw/mgar/pkg/dtracetoolkit/trunk/Makefile
    csw/mgar/pkg/duplicity/trunk/Makefile
    csw/mgar/pkg/easytag/trunk/Makefile
    csw/mgar/pkg/ectags/trunk/Makefile
    csw/mgar/pkg/eet/trunk/Makefile
    csw/mgar/pkg/eina/trunk/Makefile
    csw/mgar/pkg/elinks/trunk/Makefile
    csw/mgar/pkg/emacs_sitestart/trunk/Makefile
    csw/mgar/pkg/enchant/trunk/Makefile
    csw/mgar/pkg/enscript/trunk/Makefile
    csw/mgar/pkg/erlang/trunk/Makefile
    csw/mgar/pkg/esound/trunk/Makefile
    csw/mgar/pkg/eterm/trunk/Makefile
    csw/mgar/pkg/euler/trunk/Makefile
    csw/mgar/pkg/eventlog/trunk/Makefile
    csw/mgar/pkg/evince/trunk/Makefile
    csw/mgar/pkg/evolution/trunk/Makefile
    csw/mgar/pkg/evolution-ds/trunk/Makefile
    csw/mgar/pkg/evolution-exchange/trunk/Makefile
    csw/mgar/pkg/evolution-mapi/trunk/Makefile
    csw/mgar/pkg/evolution-webcal/trunk/Makefile
    csw/mgar/pkg/examples/64-bit/trunk/Makefile
    csw/mgar/pkg/examples/loose-files/trunk/Makefile
    csw/mgar/pkg/examples/minimalsmf/trunk/Makefile
    csw/mgar/pkg/examples/modulations/trunk/Makefile
    csw/mgar/pkg/examples/multiple-versions/trunk/Makefile
    csw/mgar/pkg/examples/users-and-groups/trunk/Makefile
    csw/mgar/pkg/exempi/trunk/Makefile
    csw/mgar/pkg/exiftool/trunk/Makefile
    csw/mgar/pkg/exim/trunk/Makefile
    csw/mgar/pkg/exiv2/trunk/Makefile
    csw/mgar/pkg/expect/trunk/Makefile
    csw/mgar/pkg/facter/trunk/Makefile
    csw/mgar/pkg/fakeroot/trunk/Makefile
    csw/mgar/pkg/fam/trunk/Makefile
    csw/mgar/pkg/fbopenssl/trunk/Makefile
    csw/mgar/pkg/ffcall/trunk/Makefile
    csw/mgar/pkg/ffmpeg/trunk/Makefile
    csw/mgar/pkg/fftw/trunk/Makefile
    csw/mgar/pkg/figlet/trunk/Makefile
    csw/mgar/pkg/file/trunk/Makefile
    csw/mgar/pkg/filezilla/trunk/Makefile
    csw/mgar/pkg/findutils/trunk/Makefile
    csw/mgar/pkg/fio/trunk/Makefile
    csw/mgar/pkg/firefox/trunk/Makefile
    csw/mgar/pkg/firefox-l10n/trunk/Makefile
    csw/mgar/pkg/flac/trunk/Makefile
    csw/mgar/pkg/flex_new/trunk/Makefile
    csw/mgar/pkg/fltk/trunk/Makefile
    csw/mgar/pkg/fontconfig/trunk/Makefile
    csw/mgar/pkg/fontforge/trunk/Makefile
    csw/mgar/pkg/formencode/trunk/Makefile
    csw/mgar/pkg/fortune4all/trunk/Makefile
    csw/mgar/pkg/fping/trunk/Makefile
    csw/mgar/pkg/fprobe/trunk/Makefile
    csw/mgar/pkg/freeciv/trunk/Makefile
    csw/mgar/pkg/freedesktop/libxcb/trunk/Makefile
    csw/mgar/pkg/freedesktop/xcb-util/trunk/Makefile
    csw/mgar/pkg/freedesktop/xcbproto/trunk/Makefile
    csw/mgar/pkg/freeglut/trunk/Makefile
    csw/mgar/pkg/freehdl/trunk/Makefile
    csw/mgar/pkg/freeradius/trunk/Makefile
    csw/mgar/pkg/freerdp/trunk/Makefile
    csw/mgar/pkg/freetds/trunk/Makefile
    csw/mgar/pkg/freetype/trunk/Makefile
    csw/mgar/pkg/fribidi/trunk/Makefile
    csw/mgar/pkg/ftgl/trunk/Makefile
    csw/mgar/pkg/gamin/trunk/Makefile
    csw/mgar/pkg/ganglia/trunk/Makefile
    csw/mgar/pkg/ganglia-modules-solaris/trunk/Makefile
    csw/mgar/pkg/gar/trunk/Makefile
    csw/mgar/pkg/gardev/trunk/Makefile
    csw/mgar/pkg/gawk/trunk/Makefile
    csw/mgar/pkg/gbc/trunk/Makefile
    csw/mgar/pkg/gcal/trunk/Makefile
    csw/mgar/pkg/gccgo/trunk/Makefile
    csw/mgar/pkg/gcpio/trunk/Makefile
    csw/mgar/pkg/gd/trunk/Makefile
    csw/mgar/pkg/gdal/trunk/Makefile
    csw/mgar/pkg/gdb/trunk/Makefile
    csw/mgar/pkg/gdbm/trunk/Makefile
    csw/mgar/pkg/gdmap/trunk/Makefile
    csw/mgar/pkg/gdome2/trunk/Makefile
    csw/mgar/pkg/geda/trunk/Makefile
    csw/mgar/pkg/geeqie/trunk/Makefile
    csw/mgar/pkg/gem-rake/trunk/Makefile
    csw/mgar/pkg/gengetopt/trunk/Makefile
    csw/mgar/pkg/genshi/trunk/Makefile
    csw/mgar/pkg/geolitedb/trunk/Makefile
    csw/mgar/pkg/geos/trunk/Makefile
    csw/mgar/pkg/getopt/trunk/Makefile
    csw/mgar/pkg/gettext/trunk/Makefile
    csw/mgar/pkg/ghc/trunk/Makefile
    csw/mgar/pkg/ghex/trunk/Makefile
    csw/mgar/pkg/ghostscript/trunk/Makefile
    csw/mgar/pkg/gif2png/trunk/Makefile
    csw/mgar/pkg/giflib/trunk/Makefile
    csw/mgar/pkg/gifsicle/trunk/Makefile
    csw/mgar/pkg/git/trunk/Makefile
    csw/mgar/pkg/git-subtree/trunk/Makefile
    csw/mgar/pkg/gitosis/trunk/Makefile
    csw/mgar/pkg/gkrellm/trunk/Makefile
    csw/mgar/pkg/glew/trunk/Makefile
    csw/mgar/pkg/glib/trunk/Makefile
    csw/mgar/pkg/glib2/trunk/Makefile
    csw/mgar/pkg/glibmm/trunk/Makefile
    csw/mgar/pkg/glpk/trunk/Makefile
    csw/mgar/pkg/gluezilla/trunk/Makefile
    csw/mgar/pkg/gmake/trunk/Makefile
    csw/mgar/pkg/gmt/trunk/Makefile
    csw/mgar/pkg/gmtcoast/trunk/Makefile
    csw/mgar/pkg/gnome-base/gail/trunk/Makefile
    csw/mgar/pkg/gnome-base/gconf-editor/trunk/Makefile
    csw/mgar/pkg/gnome-base/gconf2/trunk/Makefile
    csw/mgar/pkg/gnome-base/gnome-icon-theme/trunk/Makefile
    csw/mgar/pkg/gnome-base/gnome-keyring/trunk/Makefile
    csw/mgar/pkg/gnome-base/gnome-mime-data/trunk/Makefile
    csw/mgar/pkg/gnome-base/gnome-terminal/trunk/Makefile
    csw/mgar/pkg/gnome-base/gnomedesktop/trunk/Makefile
    csw/mgar/pkg/gnome-base/gnomemedia/trunk/Makefile
    csw/mgar/pkg/gnome-base/gnomevfs2/trunk/Makefile
    csw/mgar/pkg/gnome-base/libbonobo2/trunk/Makefile
    csw/mgar/pkg/gnome-base/libgnomecanvas/trunk/Makefile
    csw/mgar/pkg/gnome-base/libgnomedb/trunk/Makefile
    csw/mgar/pkg/gnome-base/libgnomekbd/trunk/Makefile
    csw/mgar/pkg/gnome-base/libgnomeprint/trunk/Makefile
    csw/mgar/pkg/gnome-base/libgnomeprintui/trunk/Makefile
    csw/mgar/pkg/gnome-base/libgnomeui/trunk/Makefile
    csw/mgar/pkg/gnome-base/orbit2/trunk/Makefile
    csw/mgar/pkg/gnulinks/trunk/Makefile
    csw/mgar/pkg/gnumeric/trunk/Makefile
    csw/mgar/pkg/gnupg/trunk/Makefile
    csw/mgar/pkg/gnupg2/trunk/Makefile
    csw/mgar/pkg/gnupg_minimal/trunk/Makefile
    csw/mgar/pkg/gnuplot/trunk/Makefile
    csw/mgar/pkg/gnutls/trunk/Makefile
    csw/mgar/pkg/gobject-introspection/trunk/Makefile
    csw/mgar/pkg/goocanvas/trunk/Makefile
    csw/mgar/pkg/google-gflags/trunk/Makefile
    csw/mgar/pkg/googlemock/trunk/Makefile
    csw/mgar/pkg/googletest/trunk/Makefile
    csw/mgar/pkg/gource/trunk/Makefile
    csw/mgar/pkg/gperf/trunk/Makefile
    csw/mgar/pkg/gpgme/trunk/Makefile
    csw/mgar/pkg/gpicview/trunk/Makefile
    csw/mgar/pkg/graphviz/trunk/Makefile
    csw/mgar/pkg/grep/trunk/Makefile
    csw/mgar/pkg/gsasl/trunk/Makefile
    csw/mgar/pkg/gsm/trunk/Makefile
    csw/mgar/pkg/gstplugins/trunk/Makefile
    csw/mgar/pkg/gstplugins_bad/trunk/Makefile
    csw/mgar/pkg/gstplugins_good/trunk/Makefile
    csw/mgar/pkg/gstplugins_ugly/trunk/Makefile
    csw/mgar/pkg/gstreamer/trunk/Makefile
    csw/mgar/pkg/gtar/trunk/Makefile
    csw/mgar/pkg/gtk-doc/trunk/Makefile
    csw/mgar/pkg/gtkpod/trunk/Makefile
    csw/mgar/pkg/gtksourceview/trunk/Makefile
    csw/mgar/pkg/gtkwave/trunk/Makefile
    csw/mgar/pkg/gts/trunk/Makefile
    csw/mgar/pkg/guile/trunk/Makefile
    csw/mgar/pkg/guilt/trunk/Makefile
    csw/mgar/pkg/gvim/trunk/Makefile
    csw/mgar/pkg/gxmessage/trunk/Makefile
    csw/mgar/pkg/gzip/trunk/Makefile
    csw/mgar/pkg/hachoir-core/trunk/Makefile
    csw/mgar/pkg/hachoir-parser/trunk/Makefile
    csw/mgar/pkg/handbrake/trunk/Makefile
    csw/mgar/pkg/haproxy/trunk/Makefile
    csw/mgar/pkg/hatari/trunk/Makefile
    csw/mgar/pkg/hdf5-6/trunk/Makefile
    csw/mgar/pkg/hdf5-7/trunk/Makefile
    csw/mgar/pkg/help2man/trunk/Makefile
    csw/mgar/pkg/hexdump/trunk/Makefile
    csw/mgar/pkg/host-sflow/trunk/Makefile
    csw/mgar/pkg/htmldoc/trunk/Makefile
    csw/mgar/pkg/httperf/trunk/Makefile
    csw/mgar/pkg/httping/trunk/Makefile
    csw/mgar/pkg/icecast/trunk/Makefile
    csw/mgar/pkg/icinga/trunk/Makefile
    csw/mgar/pkg/icon-naming-utils/trunk/Makefile
    csw/mgar/pkg/id3lib/trunk/Makefile
    csw/mgar/pkg/idzebra/trunk/Makefile
    csw/mgar/pkg/iftop/trunk/Makefile
    csw/mgar/pkg/ilmbase/trunk/Makefile
    csw/mgar/pkg/ilmbase2/trunk/Makefile
    csw/mgar/pkg/image-editor/trunk/Makefile
    csw/mgar/pkg/imapproxy/trunk/Makefile
    csw/mgar/pkg/imapsync/trunk/Makefile
    csw/mgar/pkg/imlib/trunk/Makefile
    csw/mgar/pkg/imlib2/trunk/Makefile
    csw/mgar/pkg/imlib2_loaders/trunk/Makefile
    csw/mgar/pkg/indent/trunk/Makefile
    csw/mgar/pkg/intltool/trunk/Makefile
    csw/mgar/pkg/iotop/trunk/Makefile
    csw/mgar/pkg/iperf/trunk/Makefile
    csw/mgar/pkg/irssi/trunk/Makefile
    csw/mgar/pkg/iso-codes/trunk/Makefile
    csw/mgar/pkg/jack/trunk/Makefile
    csw/mgar/pkg/java/ajcbeanutils/trunk/Makefile
    csw/mgar/pkg/java/ajcchain/trunk/Makefile
    csw/mgar/pkg/java/ajccli/trunk/Makefile
    csw/mgar/pkg/java/ajccodec/trunk/Makefile
    csw/mgar/pkg/java/ajccollections/trunk/Makefile
    csw/mgar/pkg/java/ajcconfig/trunk/Makefile
    csw/mgar/pkg/java/ajcdigester/trunk/Makefile
    csw/mgar/pkg/java/ajcdiscovery/trunk/Makefile
    csw/mgar/pkg/java/ajcemail/trunk/Makefile
    csw/mgar/pkg/java/ajchttpcl/trunk/Makefile
    csw/mgar/pkg/java/ajcio/trunk/Makefile
    csw/mgar/pkg/java/ajclang/trunk/Makefile
    csw/mgar/pkg/java/ajclogging/trunk/Makefile
    csw/mgar/pkg/java/ajcmath/trunk/Makefile
    csw/mgar/pkg/java/ajcnet/trunk/Makefile
    csw/mgar/pkg/java/ajcpool/trunk/Makefile
    csw/mgar/pkg/java/ajcprimitives/trunk/Makefile
    csw/mgar/pkg/java/ajcupload/trunk/Makefile
    csw/mgar/pkg/java/ajcvalidator/trunk/Makefile
    csw/mgar/pkg/java/junit/trunk/Makefile
    csw/mgar/pkg/java/log4j/trunk/Makefile
    csw/mgar/pkg/jdk5/trunk/Makefile
    csw/mgar/pkg/jdk6/trunk/Makefile
    csw/mgar/pkg/jetty6/trunk/Makefile
    csw/mgar/pkg/joe/trunk/Makefile
    csw/mgar/pkg/jpeginfo/trunk/Makefile
    csw/mgar/pkg/jpegoptim/trunk/Makefile
    csw/mgar/pkg/json-glib/trunk/Makefile
    csw/mgar/pkg/jxplorer/trunk/Makefile
    csw/mgar/pkg/kawa/trunk/Makefile
    csw/mgar/pkg/kde4libs/trunk/Makefile
    csw/mgar/pkg/kdebindings/trunk/Makefile
    csw/mgar/pkg/kdesdk/trunk/Makefile
    csw/mgar/pkg/kdevelop/trunk/Makefile
    csw/mgar/pkg/keepassx/trunk/Makefile
    csw/mgar/pkg/keychain/trunk/Makefile
    csw/mgar/pkg/koffice/trunk/Makefile
    csw/mgar/pkg/koha/trunk/Makefile
    csw/mgar/pkg/krb5/trunk/Makefile
    csw/mgar/pkg/krb5-lib/trunk/Makefile
    csw/mgar/pkg/ksh/trunk/Makefile
    csw/mgar/pkg/kshdbx/trunk/Makefile
    csw/mgar/pkg/lame/trunk/Makefile
    csw/mgar/pkg/lang-python/M2Crypto/trunk/Makefile
    csw/mgar/pkg/lang-python/amara/trunk/Makefile
    csw/mgar/pkg/lang-python/atomixlib/trunk/Makefile
    csw/mgar/pkg/lang-python/bridge/trunk/Makefile
    csw/mgar/pkg/lang-python/cherrypy/trunk/Makefile
    csw/mgar/pkg/lang-python/dbus-python/trunk/Makefile
    csw/mgar/pkg/lang-python/dbutils/trunk/Makefile
    csw/mgar/pkg/lang-python/django/trunk/Makefile
    csw/mgar/pkg/lang-python/django-auth-ldap/trunk/Makefile
    csw/mgar/pkg/lang-python/django-filter/trunk/Makefile
    csw/mgar/pkg/lang-python/django-sorting/trunk/Makefile
    csw/mgar/pkg/lang-python/django-tagging/trunk/Makefile
    csw/mgar/pkg/lang-python/docutils/trunk/Makefile
    csw/mgar/pkg/lang-python/flup/trunk/Makefile
    csw/mgar/pkg/lang-python/gdata-python-client/trunk/Makefile
    csw/mgar/pkg/lang-python/guppy/trunk/Makefile
    csw/mgar/pkg/lang-python/ipython/trunk/Makefile
    csw/mgar/pkg/lang-python/jinja2/trunk/Makefile
    csw/mgar/pkg/lang-python/logilab-astng/trunk/Makefile
    csw/mgar/pkg/lang-python/logilab-common/trunk/Makefile
    csw/mgar/pkg/lang-python/mako/trunk/Makefile
    csw/mgar/pkg/lang-python/mechanize/trunk/Makefile
    csw/mgar/pkg/lang-python/mock/trunk/Makefile
    csw/mgar/pkg/lang-python/mod_python/trunk/Makefile
    csw/mgar/pkg/lang-python/mox/trunk/Makefile
    csw/mgar/pkg/lang-python/mysql-python/trunk/Makefile
    csw/mgar/pkg/lang-python/nose/trunk/Makefile
    csw/mgar/pkg/lang-python/numpy/trunk/Makefile
    csw/mgar/pkg/lang-python/ply/trunk/Makefile
    csw/mgar/pkg/lang-python/psycopg2/trunk/Makefile
    csw/mgar/pkg/lang-python/py_antlr/trunk/Makefile
    csw/mgar/pkg/lang-python/pyboto/trunk/Makefile
    csw/mgar/pkg/lang-python/pycairo/trunk/Makefile
    csw/mgar/pkg/lang-python/pychecker/trunk/Makefile
    csw/mgar/pkg/lang-python/pycurl/trunk/Makefile
    csw/mgar/pkg/lang-python/pydes/trunk/Makefile
    csw/mgar/pkg/lang-python/pyfpconst/trunk/Makefile
    csw/mgar/pkg/lang-python/pygments/trunk/Makefile
    csw/mgar/pkg/lang-python/pygobject/trunk/Makefile
    csw/mgar/pkg/lang-python/pygtk/trunk/Makefile
    csw/mgar/pkg/lang-python/pykstat/trunk/Makefile
    csw/mgar/pkg/lang-python/pylint/trunk/Makefile
    csw/mgar/pkg/lang-python/pylxml/trunk/Makefile
    csw/mgar/pkg/lang-python/pyorbit/trunk/Makefile
    csw/mgar/pkg/lang-python/pysetuptools/trunk/Makefile
    csw/mgar/pkg/lang-python/pysoappy/trunk/Makefile
    csw/mgar/pkg/lang-python/pysqlite/trunk/Makefile
    csw/mgar/pkg/lang-python/pysqlite2/trunk/Makefile
    csw/mgar/pkg/lang-python/pysvn/trunk/Makefile
    csw/mgar/pkg/lang-python/python/trunk/Makefile
    csw/mgar/pkg/lang-python/python-augeas/trunk/Makefile
    csw/mgar/pkg/lang-python/python-dateutil/trunk/Makefile
    csw/mgar/pkg/lang-python/python-gflags/trunk/Makefile
    csw/mgar/pkg/lang-python/python-graph/trunk/Makefile
    csw/mgar/pkg/lang-python/python-ldap/trunk/Makefile
    csw/mgar/pkg/lang-python/python-magic/trunk/Makefile
    csw/mgar/pkg/lang-python/python-pexpect/trunk/Makefile
    csw/mgar/pkg/lang-python/python-suds/trunk/Makefile
    csw/mgar/pkg/lang-python/python25/trunk/Makefile
    csw/mgar/pkg/lang-python/pytz/trunk/Makefile
    csw/mgar/pkg/lang-python/pyxdg/trunk/Makefile
    csw/mgar/pkg/lang-python/pyyaml/trunk/Makefile
    csw/mgar/pkg/lang-python/pyzor/trunk/Makefile
    csw/mgar/pkg/lang-python/quixote/trunk/Makefile
    csw/mgar/pkg/lang-python/reportlab/trunk/Makefile
    csw/mgar/pkg/lang-python/shapely/trunk/Makefile
    csw/mgar/pkg/lang-python/shout-python/trunk/Makefile
    csw/mgar/pkg/lang-python/simplejson/trunk/Makefile
    csw/mgar/pkg/lang-python/soappy/trunk/Makefile
    csw/mgar/pkg/lang-python/sphinx/trunk/Makefile
    csw/mgar/pkg/lang-python/sqlobject/trunk/Makefile
    csw/mgar/pkg/lang-python/supybot/trunk/Makefile
    csw/mgar/pkg/lang-python/terminator/trunk/Makefile
    csw/mgar/pkg/lang-python/textile/trunk/Makefile
    csw/mgar/pkg/lang-python/twill/trunk/Makefile
    csw/mgar/pkg/lang-python/twisted/trunk/Makefile
    csw/mgar/pkg/lang-python/unittest2/trunk/Makefile
    csw/mgar/pkg/lang-python/virtualenv/trunk/Makefile
    csw/mgar/pkg/lang-python/webpy/trunk/Makefile
    csw/mgar/pkg/lang-python/xlrd/trunk/Makefile
    csw/mgar/pkg/lang-python/xlwt/trunk/Makefile
    csw/mgar/pkg/lang-python/zope/trunk/Makefile
    csw/mgar/pkg/lang-python/zope-interface/trunk/Makefile
    csw/mgar/pkg/lastx/trunk/Makefile
    csw/mgar/pkg/lbzip2/trunk/Makefile
    csw/mgar/pkg/ldapvi/trunk/Makefile
    csw/mgar/pkg/ldns_drill/trunk/Makefile
    csw/mgar/pkg/leafnode/trunk/Makefile
    csw/mgar/pkg/lensfun/trunk/Makefile
    csw/mgar/pkg/less/trunk/Makefile
    csw/mgar/pkg/lftp/trunk/Makefile
    csw/mgar/pkg/lha/trunk/Makefile
    csw/mgar/pkg/liba52/trunk/Makefile
    csw/mgar/pkg/libao/trunk/Makefile
    csw/mgar/pkg/libao2/trunk/Makefile
    csw/mgar/pkg/libarchive/trunk/Makefile
    csw/mgar/pkg/libart/trunk/Makefile
    csw/mgar/pkg/libassuan/trunk/Makefile
    csw/mgar/pkg/libast/trunk/Makefile
    csw/mgar/pkg/libatk/trunk/Makefile
    csw/mgar/pkg/libatomic_ops/trunk/Makefile
    csw/mgar/pkg/libcairo/trunk/Makefile
    csw/mgar/pkg/libcddb/trunk/Makefile
    csw/mgar/pkg/libcdio/trunk/Makefile
    csw/mgar/pkg/libconfuse/trunk/Makefile
    csw/mgar/pkg/libcroco/trunk/Makefile
    csw/mgar/pkg/libcurl2/trunk/Makefile
    csw/mgar/pkg/libcurl3/trunk/Makefile
    csw/mgar/pkg/libcurl4/trunk/Makefile
    csw/mgar/pkg/libdatrie/trunk/Makefile
    csw/mgar/pkg/libdbi/trunk/Makefile
    csw/mgar/pkg/libdbi-drivers/trunk/Makefile
    csw/mgar/pkg/libebml/trunk/Makefile
    csw/mgar/pkg/libeggdbus/trunk/Makefile
    csw/mgar/pkg/libemf/trunk/Makefile
    csw/mgar/pkg/liberation-fonts/trunk/Makefile
    csw/mgar/pkg/libev/trunk/Makefile
    csw/mgar/pkg/libevent/trunk/Makefile
    csw/mgar/pkg/libevent2/trunk/Makefile
    csw/mgar/pkg/libexif/trunk/Makefile
    csw/mgar/pkg/libexpat0/trunk/Makefile
    csw/mgar/pkg/libexpat1/trunk/Makefile
    csw/mgar/pkg/libfaac/trunk/Makefile
    csw/mgar/pkg/libfaad2/trunk/Makefile
    csw/mgar/pkg/libfasttime/trunk/Makefile
    csw/mgar/pkg/libffi/trunk/Makefile
    csw/mgar/pkg/libfishsound/trunk/Makefile
    csw/mgar/pkg/libflac4/trunk/Makefile
    csw/mgar/pkg/libflac7/trunk/Makefile
    csw/mgar/pkg/libflac8/trunk/Makefile
    csw/mgar/pkg/libfpx/trunk/Makefile
    csw/mgar/pkg/libgc/trunk/Makefile
    csw/mgar/pkg/libgcrypt/trunk/Makefile
    csw/mgar/pkg/libgda/trunk/Makefile
    csw/mgar/pkg/libgdbm3/trunk/Makefile
    csw/mgar/pkg/libgdiplus/trunk/Makefile
    csw/mgar/pkg/libgegl/trunk/Makefile
    csw/mgar/pkg/libglade2/trunk/Makefile
    csw/mgar/pkg/libgmp/trunk/Makefile
    csw/mgar/pkg/libgmp3/trunk/Makefile
    csw/mgar/pkg/libgnugetopt/trunk/Makefile
    csw/mgar/pkg/libgoffice/trunk/Makefile
    csw/mgar/pkg/libgpg_error/trunk/Makefile
    csw/mgar/pkg/libgpod/trunk/Makefile
    csw/mgar/pkg/libgsf/trunk/Makefile
    csw/mgar/pkg/libgsf1/trunk/Makefile
    csw/mgar/pkg/libgss/trunk/Makefile
    csw/mgar/pkg/libical/trunk/Makefile
    csw/mgar/pkg/libiconv/trunk/Makefile
    csw/mgar/pkg/libicu46/trunk/Makefile
    csw/mgar/pkg/libicu48/trunk/Makefile
    csw/mgar/pkg/libid3tag/trunk/Makefile
    csw/mgar/pkg/libidl/trunk/Makefile
    csw/mgar/pkg/libidn/trunk/Makefile
    csw/mgar/pkg/libiptcdata/trunk/Makefile
    csw/mgar/pkg/libjpeg62/trunk/Makefile
    csw/mgar/pkg/libjpeg7/trunk/Makefile
    csw/mgar/pkg/libjpeg8/trunk/Makefile
    csw/mgar/pkg/libkate/trunk/Makefile
    csw/mgar/pkg/libksba/trunk/Makefile
    csw/mgar/pkg/liblasi/trunk/Makefile
    csw/mgar/pkg/liblcms/trunk/Makefile
    csw/mgar/pkg/liblcms2/trunk/Makefile
    csw/mgar/pkg/libldns/trunk/Makefile
    csw/mgar/pkg/liblockfile/trunk/Makefile
    csw/mgar/pkg/liblqr/trunk/Makefile
    csw/mgar/pkg/libmad/trunk/Makefile
    csw/mgar/pkg/libmatio/trunk/Makefile
    csw/mgar/pkg/libmatroska/trunk/Makefile
    csw/mgar/pkg/libmcal/trunk/Makefile
    csw/mgar/pkg/libmcrypt/trunk/Makefile
    csw/mgar/pkg/libmhash/trunk/Makefile
    csw/mgar/pkg/libmikmod/trunk/Makefile
    csw/mgar/pkg/libmkv/trunk/Makefile
    csw/mgar/pkg/libmm/trunk/Makefile
    csw/mgar/pkg/libmp4v2/trunk/Makefile
    csw/mgar/pkg/libmpeg2/trunk/Makefile
    csw/mgar/pkg/libneon26/trunk/Makefile
    csw/mgar/pkg/libneon27/trunk/Makefile
    csw/mgar/pkg/libnet/trunk/Makefile
    csw/mgar/pkg/libnids/trunk/Makefile
    csw/mgar/pkg/libnotify/trunk/Makefile
    csw/mgar/pkg/libntlm/trunk/Makefile
    csw/mgar/pkg/libogg/trunk/Makefile
    csw/mgar/pkg/liboggz/trunk/Makefile
    csw/mgar/pkg/liboil/trunk/Makefile
    csw/mgar/pkg/liborc/trunk/Makefile
    csw/mgar/pkg/libpaper/trunk/Makefile
    csw/mgar/pkg/libpcap/trunk/Makefile
    csw/mgar/pkg/libpng/trunk/Makefile
    csw/mgar/pkg/libpopt/trunk/Makefile
    csw/mgar/pkg/libproxy/trunk/Makefile
    csw/mgar/pkg/librsvg/trunk/Makefile
    csw/mgar/pkg/librsync/trunk/Makefile
    csw/mgar/pkg/libsamplerate/trunk/Makefile
    csw/mgar/pkg/libschroedinger/trunk/Makefile
    csw/mgar/pkg/libsdl/trunk/Makefile
    csw/mgar/pkg/libserf/trunk/Makefile
    csw/mgar/pkg/libsexy/trunk/Makefile
    csw/mgar/pkg/libshout/trunk/Makefile
    csw/mgar/pkg/libsigcpp/trunk/Makefile
    csw/mgar/pkg/libsigsegv/trunk/Makefile
    csw/mgar/pkg/libsigsegv0/trunk/Makefile
    csw/mgar/pkg/libslang1/trunk/Makefile
    csw/mgar/pkg/libsmi/trunk/Makefile
    csw/mgar/pkg/libsndfile/trunk/Makefile
    csw/mgar/pkg/libsoup/trunk/Makefile
    csw/mgar/pkg/libsoup2/trunk/Makefile
    csw/mgar/pkg/libspectre/trunk/Makefile
    csw/mgar/pkg/libspf2/trunk/Makefile
    csw/mgar/pkg/libssh2/trunk/Makefile
    csw/mgar/pkg/libstatgrab/trunk/Makefile
    csw/mgar/pkg/libstlport/trunk/Makefile
    csw/mgar/pkg/libtasn1/trunk/Makefile
    csw/mgar/pkg/libthai/trunk/Makefile
    csw/mgar/pkg/libtheora/trunk/Makefile
    csw/mgar/pkg/libtool/trunk/Makefile
    csw/mgar/pkg/libtorrent/trunk/Makefile
    csw/mgar/pkg/libunique/trunk/Makefile
    csw/mgar/pkg/liburiparser/trunk/Makefile
    csw/mgar/pkg/libvanessa-logger/trunk/Makefile
    csw/mgar/pkg/libvanessa-socket/trunk/Makefile
    csw/mgar/pkg/libvorbis/trunk/Makefile
    csw/mgar/pkg/libwnck/trunk/Makefile
    csw/mgar/pkg/libwww/trunk/Makefile
    csw/mgar/pkg/libxdg-basedir/trunk/Makefile
    csw/mgar/pkg/libxml++/trunk/Makefile
    csw/mgar/pkg/libxml2/trunk/Makefile
    csw/mgar/pkg/libxpm/trunk/Makefile
    csw/mgar/pkg/libxslt/trunk/Makefile
    csw/mgar/pkg/libxspf/trunk/Makefile
    csw/mgar/pkg/libyaml/trunk/Makefile
    csw/mgar/pkg/liferea/trunk/Makefile
    csw/mgar/pkg/lighttpd/trunk/Makefile
    csw/mgar/pkg/log4sh/trunk/Makefile
    csw/mgar/pkg/logrotate/trunk/Makefile
    csw/mgar/pkg/logwatch/trunk/Makefile
    csw/mgar/pkg/loudmouth/trunk/Makefile
    csw/mgar/pkg/lpc10/trunk/Makefile
    csw/mgar/pkg/lsof/trunk/Makefile
    csw/mgar/pkg/lua/trunk/Makefile
    csw/mgar/pkg/lutefisk/trunk/Makefile
    csw/mgar/pkg/lynx/trunk/Makefile
    csw/mgar/pkg/lzip/trunk/Makefile
    csw/mgar/pkg/lzlib/trunk/Makefile
    csw/mgar/pkg/lzo/trunk/Makefile
    csw/mgar/pkg/lzop/trunk/Makefile
    csw/mgar/pkg/m4/trunk/Makefile
    csw/mgar/pkg/magit/trunk/Makefile
    csw/mgar/pkg/maildrop/trunk/Makefile
    csw/mgar/pkg/mailutils/trunk/Makefile
    csw/mgar/pkg/mailx/trunk/Makefile
    csw/mgar/pkg/mairix/trunk/Makefile
    csw/mgar/pkg/man2html/trunk/Makefile
    csw/mgar/pkg/mantis/trunk/Makefile
    csw/mgar/pkg/maven3/trunk/Makefile
    csw/mgar/pkg/mawk/trunk/Makefile
    csw/mgar/pkg/mbuffer/trunk/Makefile
    csw/mgar/pkg/mc/trunk/Makefile
    csw/mgar/pkg/mcabber/trunk/Makefile
    csw/mgar/pkg/mcrypt/trunk/Makefile
    csw/mgar/pkg/mediawiki/trunk/Makefile
    csw/mgar/pkg/memcached/trunk/Makefile
    csw/mgar/pkg/memconf/trunk/Makefile
    csw/mgar/pkg/mercurial/trunk/Makefile
    csw/mgar/pkg/meta/CSWmeta_example/trunk/Makefile
    csw/mgar/pkg/mgar/trunk/Makefile
    csw/mgar/pkg/mibdump/trunk/Makefile
    csw/mgar/pkg/miltergreylist/trunk/Makefile
    csw/mgar/pkg/mimedefang/trunk/Makefile
    csw/mgar/pkg/minicom/trunk/Makefile
    csw/mgar/pkg/mixer/trunk/Makefile
    csw/mgar/pkg/mkrdns/trunk/Makefile
    csw/mgar/pkg/mktemp/trunk/Makefile
    csw/mgar/pkg/moc/trunk/Makefile
    csw/mgar/pkg/mocha/trunk/Makefile
    csw/mgar/pkg/mod_auth_kerb/trunk/Makefile
    csw/mgar/pkg/mod_auth_radius/trunk/Makefile
    csw/mgar/pkg/mod_fcgid/trunk/Makefile
    csw/mgar/pkg/mod_httpbl/trunk/Makefile
    csw/mgar/pkg/mod_jk/trunk/Makefile
    csw/mgar/pkg/mod_macro/trunk/Makefile
    csw/mgar/pkg/mod_wsgi/trunk/Makefile
    csw/mgar/pkg/mongodb/trunk/Makefile
    csw/mgar/pkg/mono-basic/trunk/Makefile
    csw/mgar/pkg/mono-debugger/trunk/Makefile
    csw/mgar/pkg/mono-tools/trunk/Makefile
    csw/mgar/pkg/moonbuggy/trunk/Makefile
    csw/mgar/pkg/mpage/trunk/Makefile
    csw/mgar/pkg/mpd/trunk/Makefile
    csw/mgar/pkg/mpeg4ip/trunk/Makefile
    csw/mgar/pkg/mpg123/trunk/Makefile
    csw/mgar/pkg/mpg321/trunk/Makefile
    csw/mgar/pkg/mplayer/trunk/Makefile
    csw/mgar/pkg/mplex/trunk/Makefile
    csw/mgar/pkg/mrtg/trunk/Makefile
    csw/mgar/pkg/msmtp/trunk/Makefile
    csw/mgar/pkg/msttcorefonts/trunk/Makefile
    csw/mgar/pkg/mtools/trunk/Makefile
    csw/mgar/pkg/mtr/trunk/Makefile
    csw/mgar/pkg/mtwrite/trunk/Makefile
    csw/mgar/pkg/mtx/trunk/Makefile
    csw/mgar/pkg/multitail/trunk/Makefile
    csw/mgar/pkg/munin/trunk/Makefile
    csw/mgar/pkg/mutt/trunk/Makefile
    csw/mgar/pkg/myodbc/trunk/Makefile
    csw/mgar/pkg/mysql5/trunk/Makefile
    csw/mgar/pkg/nagios/trunk/Makefile
    csw/mgar/pkg/nagios_plugins/trunk/Makefile
    csw/mgar/pkg/nagvis/trunk/Makefile
    csw/mgar/pkg/namebench/trunk/Makefile
    csw/mgar/pkg/nano/trunk/Makefile
    csw/mgar/pkg/nasm/trunk/Makefile
    csw/mgar/pkg/nautilus/trunk/Makefile
    csw/mgar/pkg/ncal/trunk/Makefile
    csw/mgar/pkg/ncdu/trunk/Makefile
    csw/mgar/pkg/ncftp/trunk/Makefile
    csw/mgar/pkg/ncmpc/trunk/Makefile
    csw/mgar/pkg/ncsa-mosaic/trunk/Makefile
    csw/mgar/pkg/ncurses/trunk/Makefile
    csw/mgar/pkg/ndiff/trunk/Makefile
    csw/mgar/pkg/ndoutils/trunk/Makefile
    csw/mgar/pkg/netcdf/trunk/Makefile
    csw/mgar/pkg/netpbm/trunk/Makefile
    csw/mgar/pkg/netsnmp/trunk/Makefile
    csw/mgar/pkg/nfswatch/trunk/Makefile
    csw/mgar/pkg/nginx/trunk/Makefile
    csw/mgar/pkg/ngspice/trunk/Makefile
    csw/mgar/pkg/nicstat/trunk/Makefile
    csw/mgar/pkg/nmap/trunk/Makefile
    csw/mgar/pkg/nmh/trunk/Makefile
    csw/mgar/pkg/notification-daemon/trunk/Makefile
    csw/mgar/pkg/npadmin/trunk/Makefile
    csw/mgar/pkg/nrpe/trunk/Makefile
    csw/mgar/pkg/nsca/trunk/Makefile
    csw/mgar/pkg/nsd/trunk/Makefile
    csw/mgar/pkg/nspr/trunk/Makefile
    csw/mgar/pkg/nss/trunk/Makefile
    csw/mgar/pkg/ntop/trunk/Makefile
    csw/mgar/pkg/nxcl/trunk/Makefile
    csw/mgar/pkg/ocaml/trunk/Makefile
    csw/mgar/pkg/ocrad/trunk/Makefile
    csw/mgar/pkg/octave/trunk/Makefile
    csw/mgar/pkg/oinkmaster/trunk/Makefile
    csw/mgar/pkg/oniguruma/trunk/Makefile
    csw/mgar/pkg/opencsw-manual/trunk/Makefile
    csw/mgar/pkg/opendbx/trunk/Makefile
    csw/mgar/pkg/openexr/trunk/Makefile
    csw/mgar/pkg/openjade/trunk/Makefile
    csw/mgar/pkg/openjdk/trunk/Makefile
    csw/mgar/pkg/openjpeg/trunk/Makefile
    csw/mgar/pkg/openldap24/trunk/Makefile
    csw/mgar/pkg/openmpi/trunk/Makefile
    csw/mgar/pkg/opennms/trunk/Makefile
    csw/mgar/pkg/openslp/trunk/Makefile
    csw/mgar/pkg/openssh/trunk/Makefile
    csw/mgar/pkg/openssl/trunk/Makefile
    csw/mgar/pkg/openssl1/trunk/Makefile
    csw/mgar/pkg/opera/trunk/Makefile
    csw/mgar/pkg/oracle/trunk/Makefile
    csw/mgar/pkg/oracle-instantclient/trunk/Makefile
    csw/mgar/pkg/orca/trunk/Makefile
    csw/mgar/pkg/otr/trunk/Makefile
    csw/mgar/pkg/p4/trunk/Makefile
    csw/mgar/pkg/p7zip/trunk/Makefile
    csw/mgar/pkg/pacparser/trunk/Makefile
    csw/mgar/pkg/pakchois/trunk/Makefile
    csw/mgar/pkg/pango/trunk/Makefile
    csw/mgar/pkg/pango-libthai/trunk/Makefile
    csw/mgar/pkg/par/trunk/Makefile
    csw/mgar/pkg/parallel/trunk/Makefile
    csw/mgar/pkg/parcellite/trunk/Makefile
    csw/mgar/pkg/pari/trunk/Makefile
    csw/mgar/pkg/password-gorilla/trunk/Makefile
    csw/mgar/pkg/patch/trunk/Makefile
    csw/mgar/pkg/patchutils/trunk/Makefile
    csw/mgar/pkg/pbzip2/trunk/Makefile
    csw/mgar/pkg/pca/trunk/Makefile
    csw/mgar/pkg/pcb/trunk/Makefile
    csw/mgar/pkg/pcp/trunk/Makefile
    csw/mgar/pkg/pcre/trunk/Makefile
    csw/mgar/pkg/pdfjam/trunk/Makefile
    csw/mgar/pkg/pdflib/trunk/Makefile
    csw/mgar/pkg/pdftk/trunk/Makefile
    csw/mgar/pkg/pen/trunk/Makefile
    csw/mgar/pkg/perdition/trunk/Makefile
    csw/mgar/pkg/perl/trunk/Makefile
    csw/mgar/pkg/pgadmin3/trunk/Makefile
    csw/mgar/pkg/pgpool/trunk/Makefile
    csw/mgar/pkg/php4/trunk/Makefile
    csw/mgar/pkg/php5/trunk/Makefile
    csw/mgar/pkg/php5_apc/trunk/Makefile
    csw/mgar/pkg/php5_xdebug/trunk/Makefile
    csw/mgar/pkg/phpMyAdmin/trunk/Makefile
    csw/mgar/pkg/phpldapadmin/trunk/Makefile
    csw/mgar/pkg/phpmode/trunk/Makefile
    csw/mgar/pkg/phpsysinfo/trunk/Makefile
    csw/mgar/pkg/pidgin/trunk/Makefile
    csw/mgar/pkg/pidgin_sipe/trunk/Makefile
    csw/mgar/pkg/pidginotr/trunk/Makefile
    csw/mgar/pkg/pigz/trunk/Makefile
    csw/mgar/pkg/pil/trunk/Makefile
    csw/mgar/pkg/pinentry/trunk/Makefile
    csw/mgar/pkg/pius/trunk/Makefile
    csw/mgar/pkg/pixman/trunk/Makefile
    csw/mgar/pkg/pkgconfig/trunk/Makefile
    csw/mgar/pkg/pkgutil/trunk/Makefile
    csw/mgar/pkg/plib/trunk/Makefile
    csw/mgar/pkg/plzip/trunk/Makefile
    csw/mgar/pkg/pngwriter/trunk/Makefile
    csw/mgar/pkg/pnp/trunk/Makefile
    csw/mgar/pkg/policyd-weight/trunk/Makefile
    csw/mgar/pkg/polkit/trunk/Makefile
    csw/mgar/pkg/poppler/trunk/Makefile
    csw/mgar/pkg/poppler-data/trunk/Makefile
    csw/mgar/pkg/poster/trunk/Makefile
    csw/mgar/pkg/postfix/trunk/Makefile
    csw/mgar/pkg/postgresql/trunk/Makefile
    csw/mgar/pkg/postgrey/trunk/Makefile
    csw/mgar/pkg/pound2/trunk/Makefile
    csw/mgar/pkg/powerdns/trunk/Makefile
    csw/mgar/pkg/privoxy/trunk/Makefile
    csw/mgar/pkg/proftpd/trunk/Makefile
    csw/mgar/pkg/progressbar/trunk/Makefile
    csw/mgar/pkg/protobuf/trunk/Makefile
    csw/mgar/pkg/proxytunnel/trunk/Makefile
    csw/mgar/pkg/pth/trunk/Makefile
    csw/mgar/pkg/pulseaudio/trunk/Makefile
    csw/mgar/pkg/puppet/trunk/Makefile
    csw/mgar/pkg/puppet-dashboard/trunk/Makefile
    csw/mgar/pkg/pureftpd/trunk/Makefile
    csw/mgar/pkg/pv/trunk/Makefile
    csw/mgar/pkg/pwgen/trunk/Makefile
    csw/mgar/pkg/pxlib/trunk/Makefile
    csw/mgar/pkg/pxz/trunk/Makefile
    csw/mgar/pkg/qhull/trunk/Makefile
    csw/mgar/pkg/qpopper/trunk/Makefile
    csw/mgar/pkg/qucs/trunk/Makefile
    csw/mgar/pkg/quilt/trunk/Makefile
    csw/mgar/pkg/r/trunk/Makefile
    csw/mgar/pkg/rake/trunk/Makefile
    csw/mgar/pkg/rapidsvn/trunk/Makefile
    csw/mgar/pkg/razor/trunk/Makefile
    csw/mgar/pkg/rb-mysql/trunk/Makefile
    csw/mgar/pkg/rbgems/actionmailer/trunk/Makefile
    csw/mgar/pkg/rbgems/actionpack/trunk/Makefile
    csw/mgar/pkg/rbgems/activemodel-3.0.7/trunk/Makefile
    csw/mgar/pkg/rbgems/activerecord/trunk/Makefile
    csw/mgar/pkg/rbgems/activerecord-3.0.7/trunk/Makefile
    csw/mgar/pkg/rbgems/activeresource/trunk/Makefile
    csw/mgar/pkg/rbgems/activesupport/trunk/Makefile
    csw/mgar/pkg/rbgems/activesupport-3.0.7/trunk/Makefile
    csw/mgar/pkg/rbgems/ar-extensions/trunk/Makefile
    csw/mgar/pkg/rbgems/arel/trunk/Makefile
    csw/mgar/pkg/rbgems/bacon/trunk/Makefile
    csw/mgar/pkg/rbgems/builder-2.1.2/trunk/Makefile
    csw/mgar/pkg/rbgems/builder-3.0.0/trunk/Makefile
    csw/mgar/pkg/rbgems/bundler/trunk/Makefile
    csw/mgar/pkg/rbgems/cache-money/trunk/Makefile
    csw/mgar/pkg/rbgems/calendar_date_select/trunk/Makefile
    csw/mgar/pkg/rbgems/cgi_multipart_eof_fix/trunk/Makefile
    csw/mgar/pkg/rbgems/comma/trunk/Makefile
    csw/mgar/pkg/rbgems/cronedit/trunk/Makefile
    csw/mgar/pkg/rbgems/curb/trunk/Makefile
    csw/mgar/pkg/rbgems/daemons/trunk/Makefile
    csw/mgar/pkg/rbgems/diff-lcs/trunk/Makefile
    csw/mgar/pkg/rbgems/enumerated_attribute/trunk/Makefile
    csw/mgar/pkg/rbgems/fastercsv/trunk/Makefile
    csw/mgar/pkg/rbgems/fastthread/trunk/Makefile
    csw/mgar/pkg/rbgems/formtastic/trunk/Makefile
    csw/mgar/pkg/rbgems/gem_plugin/trunk/Makefile
    csw/mgar/pkg/rbgems/haml/trunk/Makefile
    csw/mgar/pkg/rbgems/hoe/trunk/Makefile
    csw/mgar/pkg/rbgems/hpricot/trunk/Makefile
    csw/mgar/pkg/rbgems/i18n-0.5.0/trunk/Makefile
    csw/mgar/pkg/rbgems/json/trunk/Makefile
    csw/mgar/pkg/rbgems/json_pure/trunk/Makefile
    csw/mgar/pkg/rbgems/libxml-ruby/trunk/Makefile
    csw/mgar/pkg/rbgems/memcache-client/trunk/Makefile
    csw/mgar/pkg/rbgems/meta_programming/trunk/Makefile
    csw/mgar/pkg/rbgems/mongrel/trunk/Makefile
    csw/mgar/pkg/rbgems/mongrel_cluster/trunk/Makefile
    csw/mgar/pkg/rbgems/mysql/trunk/Makefile
    csw/mgar/pkg/rbgems/parallel-forkmanager/trunk/Makefile
    csw/mgar/pkg/rbgems/passenger/trunk/Makefile
    csw/mgar/pkg/rbgems/pg/trunk/Makefile
    csw/mgar/pkg/rbgems/prawn/trunk/Makefile
    csw/mgar/pkg/rbgems/prawn-core/trunk/Makefile
    csw/mgar/pkg/rbgems/prawn-layout/trunk/Makefile
    csw/mgar/pkg/rbgems/prawn-security/trunk/Makefile
    csw/mgar/pkg/rbgems/rack/trunk/Makefile
    csw/mgar/pkg/rbgems/rails/trunk/Makefile
    csw/mgar/pkg/rbgems/rake/trunk/Makefile
    csw/mgar/pkg/rbgems/rake-compiler/trunk/Makefile
    csw/mgar/pkg/rbgems/ratom/trunk/Makefile
    csw/mgar/pkg/rbgems/rdoc/trunk/Makefile
    csw/mgar/pkg/rbgems/rdoc-data/trunk/Makefile
    csw/mgar/pkg/rbgems/redcloth/trunk/Makefile
    csw/mgar/pkg/rbgems/rspec/trunk/Makefile
    csw/mgar/pkg/rbgems/rspec-core/trunk/Makefile
    csw/mgar/pkg/rbgems/rspec-expectations/trunk/Makefile
    csw/mgar/pkg/rbgems/rspec-mocks/trunk/Makefile
    csw/mgar/pkg/rbgems/ruby-ip/trunk/Makefile
    csw/mgar/pkg/rbgems/ruby-net-ldap/trunk/Makefile
    csw/mgar/pkg/rbgems/rubyforge/trunk/Makefile
    csw/mgar/pkg/rbgems/rubyrep-1.2.0/trunk/Makefile
    csw/mgar/pkg/rbgems/shoulda/trunk/Makefile
    csw/mgar/pkg/rbgems/sqlite3-ruby/trunk/Makefile
    csw/mgar/pkg/rbgems/tzinfo/trunk/Makefile
    csw/mgar/pkg/rbgems/will_paginate/trunk/Makefile
    csw/mgar/pkg/rbldnsd/trunk/Makefile
    csw/mgar/pkg/rc/trunk/Makefile
    csw/mgar/pkg/rcairo/trunk/Makefile
    csw/mgar/pkg/rcs/trunk/Makefile
    csw/mgar/pkg/rdesktop/trunk/Makefile
    csw/mgar/pkg/rdiff-backup/trunk/Makefile
    csw/mgar/pkg/re2c/trunk/Makefile
    csw/mgar/pkg/readline/trunk/Makefile
    csw/mgar/pkg/readline43/trunk/Makefile
    csw/mgar/pkg/readline52/trunk/Makefile
    csw/mgar/pkg/recode/trunk/Makefile
    csw/mgar/pkg/remake/trunk/Makefile
    csw/mgar/pkg/rhythmbox/trunk/Makefile
    csw/mgar/pkg/rl/trunk/Makefile
    csw/mgar/pkg/rlwrap/trunk/Makefile
    csw/mgar/pkg/rox-filer/trunk/Makefile
    csw/mgar/pkg/rrdtool/trunk/Makefile
    csw/mgar/pkg/rspec/trunk/Makefile
    csw/mgar/pkg/rssh/trunk/Makefile
    csw/mgar/pkg/rsync/trunk/Makefile
    csw/mgar/pkg/rsyslog/trunk/Makefile
    csw/mgar/pkg/rtorrent/trunk/Makefile
    csw/mgar/pkg/ruby/trunk/Makefile
    csw/mgar/pkg/ruby-augeas/trunk/Makefile
    csw/mgar/pkg/ruby18/trunk/Makefile
    csw/mgar/pkg/ruby19/trunk/Makefile
    csw/mgar/pkg/rubygems/trunk/Makefile
    csw/mgar/pkg/samba/trunk/Makefile
    csw/mgar/pkg/sar2rrd/trunk/Makefile
    csw/mgar/pkg/sasl/trunk/Makefile
    csw/mgar/pkg/sauron/trunk/Makefile
    csw/mgar/pkg/sbcl/trunk/Makefile
    csw/mgar/pkg/sbt/trunk/Makefile
    csw/mgar/pkg/scala/trunk/Makefile
    csw/mgar/pkg/scfdot/trunk/Makefile
    csw/mgar/pkg/schily/trunk/Makefile
    csw/mgar/pkg/scons/trunk/Makefile
    csw/mgar/pkg/scponly/trunk/Makefile
    csw/mgar/pkg/screen/trunk/Makefile
    csw/mgar/pkg/scrollkeeper/trunk/Makefile
    csw/mgar/pkg/scummvm/trunk/Makefile
    csw/mgar/pkg/sdlimage/trunk/Makefile
    csw/mgar/pkg/sdlmixer/trunk/Makefile
    csw/mgar/pkg/seamonkey/trunk/Makefile
    csw/mgar/pkg/sed/trunk/Makefile
    csw/mgar/pkg/sendmail/trunk/Makefile
    csw/mgar/pkg/setoolkit/trunk/Makefile
    csw/mgar/pkg/setxkbmap/trunk/Makefile
    csw/mgar/pkg/sgml-xml-common/trunk/Makefile
    csw/mgar/pkg/shared-mime-info/trunk/Makefile
    csw/mgar/pkg/sharutils/trunk/Makefile
    csw/mgar/pkg/shflags/trunk/Makefile
    csw/mgar/pkg/shmux/trunk/Makefile
    csw/mgar/pkg/shunit2/trunk/Makefile
    csw/mgar/pkg/siege/trunk/Makefile
    csw/mgar/pkg/silvercity/trunk/Makefile
    csw/mgar/pkg/sipcalc/trunk/Makefile
    csw/mgar/pkg/slack/trunk/Makefile
    csw/mgar/pkg/slang/trunk/Makefile
    csw/mgar/pkg/slocate/trunk/Makefile
    csw/mgar/pkg/snmptt/trunk/Makefile
    csw/mgar/pkg/snort/trunk/Makefile
    csw/mgar/pkg/snownews/trunk/Makefile
    csw/mgar/pkg/socat/trunk/Makefile
    csw/mgar/pkg/sox/trunk/Makefile
    csw/mgar/pkg/spamass-milter/trunk/Makefile
    csw/mgar/pkg/spamassassin/trunk/Makefile
    csw/mgar/pkg/speex/trunk/Makefile
    csw/mgar/pkg/spider/trunk/Makefile
    csw/mgar/pkg/spidermonkey/trunk/Makefile
    csw/mgar/pkg/spine/trunk/Makefile
    csw/mgar/pkg/sqlalchemy/trunk/Makefile
    csw/mgar/pkg/sqlite3/trunk/Makefile
    csw/mgar/pkg/sqsh/trunk/Makefile
    csw/mgar/pkg/squid/trunk/Makefile
    csw/mgar/pkg/squidclamav/trunk/Makefile
    csw/mgar/pkg/squidguard/trunk/Makefile
    csw/mgar/pkg/squirrelmail/trunk/Makefile
    csw/mgar/pkg/ss12u1f95rt/trunk/Makefile
    csw/mgar/pkg/ss5/trunk/Makefile
    csw/mgar/pkg/sshguard/trunk/Makefile
    csw/mgar/pkg/stalonetray/trunk/Makefile
    csw/mgar/pkg/startup-notification/trunk/Makefile
    csw/mgar/pkg/stellarium/trunk/Makefile
    csw/mgar/pkg/stmpclean/trunk/Makefile
    csw/mgar/pkg/stress/trunk/Makefile
    csw/mgar/pkg/stressapptest/trunk/Makefile
    csw/mgar/pkg/stunnel/trunk/Makefile
    csw/mgar/pkg/subversion/trunk/Makefile
    csw/mgar/pkg/subversion-client/trunk/Makefile
    csw/mgar/pkg/sudo/trunk/Makefile
    csw/mgar/pkg/sudo_ldap/trunk/Makefile
    csw/mgar/pkg/sudosh2/trunk/Makefile
    csw/mgar/pkg/svclog/trunk/Makefile
    csw/mgar/pkg/svnstat/trunk/Makefile
    csw/mgar/pkg/swftools/trunk/Makefile
    csw/mgar/pkg/swig/trunk/Makefile
    csw/mgar/pkg/synergy/trunk/Makefile
    csw/mgar/pkg/syslog_ng/trunk/Makefile
    csw/mgar/pkg/sysstat/trunk/Makefile
    csw/mgar/pkg/taglib/trunk/Makefile
    csw/mgar/pkg/taglib_gcc/trunk/Makefile
    csw/mgar/pkg/talloc/trunk/Makefile
    csw/mgar/pkg/tardy/trunk/Makefile
    csw/mgar/pkg/tcl84/trunk/Makefile
    csw/mgar/pkg/tcl85/trunk/Makefile
    csw/mgar/pkg/tcpdrop/trunk/Makefile
    csw/mgar/pkg/tcpdump/trunk/Makefile
    csw/mgar/pkg/tcpflow/trunk/Makefile
    csw/mgar/pkg/tcpreplay/trunk/Makefile
    csw/mgar/pkg/tcpstat/trunk/Makefile
    csw/mgar/pkg/tcpwrappers/trunk/Makefile
    csw/mgar/pkg/tcsh/trunk/Makefile
    csw/mgar/pkg/template/trunk/Makefile
    csw/mgar/pkg/texinfo/trunk/Makefile
    csw/mgar/pkg/thrift/trunk/Makefile
    csw/mgar/pkg/thunderbird/trunk/Makefile
    csw/mgar/pkg/thunderbird-l10n/trunk/Makefile
    csw/mgar/pkg/tiff/trunk/Makefile
    csw/mgar/pkg/tig/trunk/Makefile
    csw/mgar/pkg/tightvnc/trunk/Makefile
    csw/mgar/pkg/tin/trunk/Makefile
    csw/mgar/pkg/tinyca/trunk/Makefile
    csw/mgar/pkg/tk/trunk/Makefile
    csw/mgar/pkg/tkcvs/trunk/Makefile
    csw/mgar/pkg/tkdiff/trunk/Makefile
    csw/mgar/pkg/tmpreaper/trunk/Makefile
    csw/mgar/pkg/tmpwatch/trunk/Makefile
    csw/mgar/pkg/tmux/trunk/Makefile
    csw/mgar/pkg/tnef/trunk/Makefile
    csw/mgar/pkg/tofrodos/trunk/Makefile
    csw/mgar/pkg/tomcat6/trunk/Makefile
    csw/mgar/pkg/tomcat7/trunk/Makefile
    csw/mgar/pkg/top/trunk/Makefile
    csw/mgar/pkg/tor/trunk/Makefile
    csw/mgar/pkg/torque/trunk/Makefile
    csw/mgar/pkg/trac/trunk/Makefile
    csw/mgar/pkg/trafshow/trunk/Makefile
    csw/mgar/pkg/transmission/trunk/Makefile
    csw/mgar/pkg/tre/trunk/Makefile
    csw/mgar/pkg/tree/trunk/Makefile
    csw/mgar/pkg/tunctl/trunk/Makefile
    csw/mgar/pkg/tuntap/trunk/Makefile
    csw/mgar/pkg/twolame/trunk/Makefile
    csw/mgar/pkg/ucarp/trunk/Makefile
    csw/mgar/pkg/ucspi-tcp/trunk/Makefile
    csw/mgar/pkg/ufraw/trunk/Makefile
    csw/mgar/pkg/umfpack/trunk/Makefile
    csw/mgar/pkg/unbound/trunk/Makefile
    csw/mgar/pkg/unclutter/trunk/Makefile
    csw/mgar/pkg/unixodbc/trunk/Makefile
    csw/mgar/pkg/unixodbc-libodbc1/trunk/Makefile
    csw/mgar/pkg/unrar/trunk/Makefile
    csw/mgar/pkg/unrealircd/trunk/Makefile
    csw/mgar/pkg/unrtf/trunk/Makefile
    csw/mgar/pkg/unzip/trunk/Makefile
    csw/mgar/pkg/urt/trunk/Makefile
    csw/mgar/pkg/urxvt/trunk/Makefile
    csw/mgar/pkg/v8/trunk/Makefile
    csw/mgar/pkg/varnish/trunk/Makefile
    csw/mgar/pkg/vim/trunk/Makefile
    csw/mgar/pkg/vixiecron/trunk/Makefile
    csw/mgar/pkg/vorbistools/trunk/Makefile
    csw/mgar/pkg/vsftpd/trunk/Makefile
    csw/mgar/pkg/vttest/trunk/Makefile
    csw/mgar/pkg/w3m/trunk/Makefile
    csw/mgar/pkg/waf/trunk/Makefile
    csw/mgar/pkg/watch/trunk/Makefile
    csw/mgar/pkg/wavpack/trunk/Makefile
    csw/mgar/pkg/wdiff/trunk/Makefile
    csw/mgar/pkg/webfs/trunk/Makefile
    csw/mgar/pkg/webkit/trunk/Makefile
    csw/mgar/pkg/webmin/trunk/Makefile
    csw/mgar/pkg/websvn/trunk/Makefile
    csw/mgar/pkg/wesnoth/trunk/Makefile
    csw/mgar/pkg/wget/trunk/Makefile
    csw/mgar/pkg/wgetpaste/trunk/Makefile
    csw/mgar/pkg/which/trunk/Makefile
    csw/mgar/pkg/wireshark/trunk/Makefile
    csw/mgar/pkg/wkhtmltopdf/trunk/Makefile
    csw/mgar/pkg/wmf/trunk/Makefile
    csw/mgar/pkg/wput/trunk/Makefile
    csw/mgar/pkg/wxwidgets/trunk/Makefile
    csw/mgar/pkg/x026/trunk/Makefile
    csw/mgar/pkg/x11/liblbxutil/trunk/Makefile
    csw/mgar/pkg/x11/liboldx/trunk/Makefile
    csw/mgar/pkg/x11/libwindowswm/trunk/Makefile
    csw/mgar/pkg/x11/libxevie/trunk/Makefile
    csw/mgar/pkg/x11/libxkbui/trunk/Makefile
    csw/mgar/pkg/x11/libxp/trunk/Makefile
    csw/mgar/pkg/x11/libxprintapputil/trunk/Makefile
    csw/mgar/pkg/x11/libxprintutil/trunk/Makefile
    csw/mgar/pkg/x11/libxtrap/trunk/Makefile
    csw/mgar/pkg/x11/x11common/trunk/Makefile
    csw/mgar/pkg/x11vnc/trunk/Makefile
    csw/mgar/pkg/x3270/trunk/Makefile
    csw/mgar/pkg/xapian-bindings/trunk/Makefile
    csw/mgar/pkg/xapian-core/trunk/Makefile
    csw/mgar/pkg/xbattle/trunk/Makefile
    csw/mgar/pkg/xbill/trunk/Makefile
    csw/mgar/pkg/xboard/trunk/Makefile
    csw/mgar/pkg/xchat/trunk/Makefile
    csw/mgar/pkg/xchm/trunk/Makefile
    csw/mgar/pkg/xearth/trunk/Makefile
    csw/mgar/pkg/xerces-c/trunk/Makefile
    csw/mgar/pkg/xfce/dbh/trunk/Makefile
    csw/mgar/pkg/xfce/libxfce4menu/trunk/Makefile
    csw/mgar/pkg/xfce/libxfce4util/trunk/Makefile
    csw/mgar/pkg/xfce/xfconf/trunk/Makefile
    csw/mgar/pkg/xfig/trunk/Makefile
    csw/mgar/pkg/xjobs/trunk/Makefile
    csw/mgar/pkg/xmahjongg/trunk/Makefile
    csw/mgar/pkg/xmlrpc_c/trunk/Makefile
    csw/mgar/pkg/xmlstarlet/trunk/Makefile
    csw/mgar/pkg/xmlto/trunk/Makefile
    csw/mgar/pkg/xmltoman/trunk/Makefile
    csw/mgar/pkg/xmms/trunk/Makefile
    csw/mgar/pkg/xorriso/trunk/Makefile
    csw/mgar/pkg/xpdf/trunk/Makefile
    csw/mgar/pkg/xpilot/trunk/Makefile
    csw/mgar/pkg/xsel/trunk/Makefile
    csw/mgar/pkg/xsnow/trunk/Makefile
    csw/mgar/pkg/xterm/trunk/Makefile
    csw/mgar/pkg/xtide/trunk/Makefile
    csw/mgar/pkg/xtitle/trunk/Makefile
    csw/mgar/pkg/xymon/trunk/Makefile
    csw/mgar/pkg/xz/trunk/Makefile
    csw/mgar/pkg/yad/trunk/Makefile
    csw/mgar/pkg/yaml-mode/trunk/Makefile
    csw/mgar/pkg/yapet/trunk/Makefile
    csw/mgar/pkg/yasm/trunk/Makefile
    csw/mgar/pkg/yaz/trunk/Makefile
    csw/mgar/pkg/z/trunk/Makefile
    csw/mgar/pkg/zebra/trunk/Makefile
    csw/mgar/pkg/zlib/trunk/Makefile
    csw/mgar/pkg/zsh/trunk/Makefile
    csw/mgar/pkg/zshdb/trunk/Makefile
    csw/mgar/pkg/zutils/trunk/Makefile

Modified: csw/mgar/pkg/GeoIP/trunk/Makefile
===================================================================
--- csw/mgar/pkg/GeoIP/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/GeoIP/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,8 @@
 NAME = GeoIP
 VERSION = 1.4.7
 CATEGORIES = net
+GARTYPE = v2
+GARTYPE = v2
 
 DESCRIPTION = GeoIP C API
 define BLURB

Modified: csw/mgar/pkg/ImageMagick/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ImageMagick/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/ImageMagick/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -2,6 +2,7 @@
 VERSION = 6.7.3
 GARSUBREV = 10
 CATEGORIES = lib
+GARTYPE = v2
 
 DESCRIPTION = A comprehensive package supporting automated and interative manipulation of images
 define BLURB

Modified: csw/mgar/pkg/MailScanner/trunk/Makefile
===================================================================
--- csw/mgar/pkg/MailScanner/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/MailScanner/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -5,6 +5,7 @@
 #DISTNAME = $(NAME)-$(DISTVERSION)
 #WORKSRC = $(WORKDIR)/$(DISTNAME)
 CATEGORIES = net
+GARTYPE = v2
 
 DESCRIPTION = A Free Anti-Virus and Anti-Spam Filter
 define BLURB

Modified: csw/mgar/pkg/Vispan/trunk/Makefile
===================================================================
--- csw/mgar/pkg/Vispan/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/Vispan/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = Vispan
 VERSION = 3.1.1
 CATEGORIES = cpan
+GARTYPE = v2
 
 DESCRIPTION = VIrus and SPam ANalyser
 define BLURB

Modified: csw/mgar/pkg/ZSI/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ZSI/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/ZSI/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -4,6 +4,7 @@
 NAME = ZSI
 VERSION = 2.0
 CATEGORIES = python
+GARTYPE = v2
 
 DESCRIPTION = Web services for Python programmers, both client and servers.
 define BLURB

Modified: csw/mgar/pkg/a2ps/trunk/Makefile
===================================================================
--- csw/mgar/pkg/a2ps/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/a2ps/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -3,6 +3,7 @@
 VERSION = 4.13
 SPKG_VERSION = 4.13b
 CATEGORIES = apps
+GARTYPE = v2
 
 DESCRIPTION = Any to PostScript filter
 define BLURB

Modified: csw/mgar/pkg/achievo/trunk/Makefile
===================================================================
--- csw/mgar/pkg/achievo/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/achievo/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = achievo
 VERSION = 1.4.3
 CATEGORIES = apps
+GARTYPE = v2
 
 DESCRIPTION = A flexible web-based resource management tool for business environments
 define BLURB

Modified: csw/mgar/pkg/adobereader/trunk/Makefile
===================================================================
--- csw/mgar/pkg/adobereader/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/adobereader/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -6,6 +6,7 @@
 FILEVERSION_i386 = 9.4.1
 VERSION = $(VERSION_$(GARCH))
 CATEGORIES = apps
+GARTYPE = v2
 
 DESCRIPTION = Adobe Acrobat Reader
 define BLURB

Modified: csw/mgar/pkg/aide/trunk/Makefile
===================================================================
--- csw/mgar/pkg/aide/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/aide/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = aide
 VERSION = 0.13.1
 CATEGORIES = utils
+GARTYPE = v2
 
 DESCRIPTION = Advanced Intrusion Detection Environment
 define BLURB

Modified: csw/mgar/pkg/alarm-clock/trunk/Makefile
===================================================================
--- csw/mgar/pkg/alarm-clock/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/alarm-clock/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = alarm-clock
 VERSION = 1.4.1
 CATEGORIES = gnome
+GARTYPE = v2
 
 DESCRIPTION = A simple interface for reminding about birthdays, appointments and important dates
 define BLURB

Modified: csw/mgar/pkg/alpine/trunk/Makefile
===================================================================
--- csw/mgar/pkg/alpine/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/alpine/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = alpine
 VERSION = 2.00
 CATEGORIES = apps
+GARTYPE = v2
 
 DESCRIPTION = Alpine Messaging System
 define BLURB

Modified: csw/mgar/pkg/amanda/trunk/Makefile
===================================================================
--- csw/mgar/pkg/amanda/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/amanda/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -2,6 +2,7 @@
 NAME = amanda
 VERSION = 3.2.0
 CATEGORIES = apps
+GARTYPE = v2
 
 DESCRIPTION = The Advanced Maryland Automatic Network Disk Archiver
 define BLURB

Modified: csw/mgar/pkg/amavisd-new/trunk/Makefile
===================================================================
--- csw/mgar/pkg/amavisd-new/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/amavisd-new/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = amavisd-new
 VERSION = 2.6.4
 CATEGORIES = server
+GARTYPE = v2
 
 DESCRIPTION = Interface between MTA and content checkers
 define BLURB

Modified: csw/mgar/pkg/apache2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/apache2/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/apache2/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -3,6 +3,7 @@
 NAME = httpd
 VERSION = 2.2.21
 CATEGORIES = server
+GARTYPE = v2
 
 DESCRIPTION = A high performance HTTP server.
 define BLURB

Modified: csw/mgar/pkg/apache2-worker/trunk/Makefile
===================================================================
--- csw/mgar/pkg/apache2-worker/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/apache2-worker/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = httpd
 VERSION = 2.2.13
 CATEGORIES = server
+GARTYPE = v2
 
 DESCRIPTION = A high performance Unix-based HTTP server.
 define BLURB

Modified: csw/mgar/pkg/apcupsd/trunk/Makefile
===================================================================
--- csw/mgar/pkg/apcupsd/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/apcupsd/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = apcupsd
 VERSION = 3.14.8
 CATEGORIES = utils
+GARTYPE = v2
 
 GARCOMPILER = GCC3
 

Modified: csw/mgar/pkg/apr/trunk/Makefile
===================================================================
--- csw/mgar/pkg/apr/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/apr/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = apr
 VERSION = 1.4.5
 CATEGORIES = lib
+GARTYPE = v2
 
 DESCRIPTION = Apache Portable Runtime
 define BLURB

Modified: csw/mgar/pkg/apr-iconv/trunk/Makefile
===================================================================
--- csw/mgar/pkg/apr-iconv/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/apr-iconv/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = apr-iconv
 VERSION = 1.2.1
 CATEGORIES = lib
+GARTYPE = v2
 
 DESCRIPTION = Apache Portable Runtime Utilities
 define BLURB

Modified: csw/mgar/pkg/apr-util/trunk/Makefile
===================================================================
--- csw/mgar/pkg/apr-util/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/apr-util/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = apr-util
 VERSION = 1.3.12
 CATEGORIES = lib
+GARTYPE = v2
 
 DESCRIPTION = Apache Portable Runtime Utilities
 define BLURB

Modified: csw/mgar/pkg/argtable/trunk/Makefile
===================================================================
--- csw/mgar/pkg/argtable/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/argtable/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = argtable
 VERSION = 2.13
 CATEGORIES = utils
+GARTYPE = v2
 
 DESCRIPTION = Parsing GNU style command line options with a minimum of fuss
 define BLURB

Modified: csw/mgar/pkg/aria2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/aria2/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/aria2/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -2,6 +2,7 @@
 NAME = aria2
 VERSION = 1.12.1
 CATEGORIES = utils
+GARTYPE = v2
 
 DESCRIPTION = The Next Generation Download Utility
 define BLURB

Modified: csw/mgar/pkg/ascii/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ascii/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/ascii/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -2,6 +2,7 @@
 NAME = ascii
 VERSION = 3.11
 CATEGORIES = utils
+GARTYPE = v2
 
 DESCRIPTION = Interactive ASCII name and synonym chart
 define BLURB

Modified: csw/mgar/pkg/asciidoc/trunk/Makefile
===================================================================
--- csw/mgar/pkg/asciidoc/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/asciidoc/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = asciidoc
 VERSION = 8.6.6
 CATEGORIES = utils
+GARTYPE = v2
 
 DESCRIPTION = A Documentation Generator
 define BLURB

Modified: csw/mgar/pkg/audiofile/trunk/Makefile
===================================================================
--- csw/mgar/pkg/audiofile/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/audiofile/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = audiofile
 VERSION = 0.2.7
 CATEGORIES = lib
+GARTYPE = v2
 
 DESCRIPTION = Silicon Graphics Audio File Library
 define BLURB

Modified: csw/mgar/pkg/augeas/trunk/Makefile
===================================================================
--- csw/mgar/pkg/augeas/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/augeas/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = augeas
 VERSION = 0.10.0
 CATEGORIES = lib
+GARTYPE = v2
 
 DESCRIPTION = A configuration editing tool
 define BLURB

Modified: csw/mgar/pkg/autobench/trunk/Makefile
===================================================================
--- csw/mgar/pkg/autobench/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/autobench/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = autobench
 VERSION = 2.1.2
 CATEGORIES = apps
+GARTYPE = v2
 
 DESCRIPTION = Wrapper around httperf which automates the benchmarking process
 define BLURB

Modified: csw/mgar/pkg/autoconf/trunk/Makefile
===================================================================
--- csw/mgar/pkg/autoconf/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/autoconf/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = autoconf
 VERSION = 2.68
 CATEGORIES = devel
+GARTYPE = v2
 
 DESCRIPTION = GNU auto-configuration tool
 define BLURB

Modified: csw/mgar/pkg/automake/trunk/Makefile
===================================================================
--- csw/mgar/pkg/automake/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/automake/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = automake
 VERSION = 1.11.2
 CATEGORIES = devel
+GARTYPE = v2
 
 EXTRA_MODULATORS = VERSION
 MODULATIONS_VERSION = 1.6.3 1.7.9 1.8.5 1.9.6 1.10.3 1.11.2

Modified: csw/mgar/pkg/autoproject/trunk/Makefile
===================================================================
--- csw/mgar/pkg/autoproject/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/autoproject/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -6,6 +6,7 @@
 VERSION = 0.20
 
 CATEGORIES = apps
+GARTYPE = v2
 DESCRIPTION = A utility for automated configuration of GNU autotools
 define BLURB
 

Modified: csw/mgar/pkg/autossh/trunk/Makefile
===================================================================
--- csw/mgar/pkg/autossh/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/autossh/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -10,6 +10,7 @@
 NAME = autossh
 VERSION = 1.4b
 CATEGORIES = net
+GARTYPE = v2
 
 DESCRIPTION = Automatically restart SSH sessions and tunnels
 define BLURB

Modified: csw/mgar/pkg/autotrace/trunk/Makefile
===================================================================
--- csw/mgar/pkg/autotrace/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/autotrace/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = autotrace
 VERSION = 0.31.1
 CATEGORIES = apps
+GARTYPE = v2
 
 DESCRIPTION = A program for converting bitmap to vector graphics
 define BLURB

Modified: csw/mgar/pkg/avfs/trunk/Makefile
===================================================================
--- csw/mgar/pkg/avfs/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/avfs/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -5,6 +5,7 @@
 NAME = avfs
 VERSION = 0.9.8
 CATEGORIES = apps
+GARTYPE = v2
 
 DESCRIPTION = Virtual file system to access archives, disk images, remote locations
 define BLURB

Modified: csw/mgar/pkg/awesome/trunk/Makefile
===================================================================
--- csw/mgar/pkg/awesome/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/awesome/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -7,6 +7,7 @@
 NAME = awesome
 VERSION = 3.4.4
 CATEGORIES = apps
+GARTYPE = v2
 DESCRIPTION = A tiling window manager for X
 define BLURB
 endef

Modified: csw/mgar/pkg/awstats/trunk/Makefile
===================================================================
--- csw/mgar/pkg/awstats/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/awstats/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = awstats
 VERSION = 7.0
 CATEGORIES = apps
+GARTYPE = v2
 
 DESCRIPTION = Featureful tool for web, ftp and mail server statistics
 define BLURB

Modified: csw/mgar/pkg/axel/trunk/Makefile
===================================================================
--- csw/mgar/pkg/axel/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/axel/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = axel
 VERSION = 2.4
 CATEGORIES = utils
+GARTYPE = v2
 
 DESCRIPTION = Lightweight command-line download accelerator
 define BLURB

Modified: csw/mgar/pkg/babl/trunk/Makefile
===================================================================
--- csw/mgar/pkg/babl/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/babl/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = babl
 VERSION = 0.1.6
 CATEGORIES = gnome
+GARTYPE = v2
 
 DESCRIPTION = A dynamic, any to any, pixel format translation library
 define BLURB

Modified: csw/mgar/pkg/bacula/trunk/Makefile
===================================================================
--- csw/mgar/pkg/bacula/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/bacula/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -2,6 +2,7 @@
 NAME = bacula
 VERSION = 5.0.3
 CATEGORIES = apps
+GARTYPE = v2
 
 DESCRIPTION = The Open Source Network Backup Solution
 define BLURB

Modified: csw/mgar/pkg/balance/trunk/Makefile
===================================================================
--- csw/mgar/pkg/balance/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/balance/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = balance
 VERSION = 3.54
 CATEGORIES = net
+GARTYPE = v2
 
 DESCRIPTION = A TCP proxy and load balancer
 define BLURB

Modified: csw/mgar/pkg/bash/trunk/Makefile
===================================================================
--- csw/mgar/pkg/bash/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/bash/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -15,6 +15,7 @@
 NAME = bash
 VERSION = 4.2.10
 CATEGORIES = devel
+GARTYPE = v2
 
 DESCRIPTION = A sh-compatible command language interpreter
 define BLURB

Modified: csw/mgar/pkg/bash_completion/trunk/Makefile
===================================================================
--- csw/mgar/pkg/bash_completion/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/bash_completion/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -15,6 +15,7 @@
 NAME = bash_completion
 VERSION = 1.1
 CATEGORIES = xtra
+GARTYPE = v2
 
 DESCRIPTION = Programmable completion for bash
 define BLURB

Modified: csw/mgar/pkg/bashdb/trunk/Makefile
===================================================================
--- csw/mgar/pkg/bashdb/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/bashdb/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -2,6 +2,7 @@
 VERSION = 4.0-0.4
 # PATCHLEVEL = 75eadce
 CATEGORIES = utils
+GARTYPE = v2
 
 DESCRIPTION = Bash Debugger
 define BLURB

Modified: csw/mgar/pkg/bazaar/trunk/Makefile
===================================================================
--- csw/mgar/pkg/bazaar/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/bazaar/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -2,6 +2,7 @@
 VERSION = 1.17
 #PATCHREV = .1
 CATEGORIES = devel
+GARTYPE = v2
 
 DESCRIPTION = Bazaar is a distributed version control system.
 define BLURB

Modified: csw/mgar/pkg/bdb/trunk/Makefile
===================================================================
--- csw/mgar/pkg/bdb/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/bdb/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = db
 VERSION = 4.7.25
 CATEGORIES = lib
+GARTYPE = v2
 
 DESCRIPTION = Stub package as contents moved to CSWbdb47
 define BLURB

Modified: csw/mgar/pkg/bdb3/trunk/Makefile
===================================================================
--- csw/mgar/pkg/bdb3/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/bdb3/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = db
 VERSION = 3.3.11
 CATEGORIES = lib
+GARTYPE = v2
 
 DESCRIPTION = embedded database libraries and utilities
 define BLURB

Modified: csw/mgar/pkg/bdb4/trunk/Makefile
===================================================================
--- csw/mgar/pkg/bdb4/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/bdb4/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = db
 VERSION = 4.2.52
 CATEGORIES = lib
+GARTYPE = v2
 
 DESCRIPTION = Stub package as contents moved to CSWbdb42
 define BLURB

Modified: csw/mgar/pkg/bdb42/trunk/Makefile
===================================================================
--- csw/mgar/pkg/bdb42/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/bdb42/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = db
 VERSION = 4.2.52
 CATEGORIES = lib
+GARTYPE = v2
 
 DESCRIPTION = embedded database libraries and utilities
 define BLURB

Modified: csw/mgar/pkg/bdb43/trunk/Makefile
===================================================================
--- csw/mgar/pkg/bdb43/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/bdb43/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = db
 VERSION = 4.3.29
 CATEGORIES = lib
+GARTYPE = v2
 
 DESCRIPTION = BerkeleyDB 4.3 libraries and utilities
 define BLURB

Modified: csw/mgar/pkg/bdb44/trunk/Makefile
===================================================================
--- csw/mgar/pkg/bdb44/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/bdb44/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = db
 VERSION = 4.4.20
 CATEGORIES = lib
+GARTYPE = v2
 
 DESCRIPTION = embedded database libraries and utilities
 define BLURB

Modified: csw/mgar/pkg/bdb45/trunk/Makefile
===================================================================
--- csw/mgar/pkg/bdb45/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/bdb45/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = db
 VERSION = 4.5.20
 CATEGORIES = lib
+GARTYPE = v2
 
 DESCRIPTION = Berkeley DB 4.5
 define BLURB

Modified: csw/mgar/pkg/bdb46/trunk/Makefile
===================================================================
--- csw/mgar/pkg/bdb46/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/bdb46/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = db
 VERSION = 4.6.21
 CATEGORIES = lib
+GARTYPE = v2
 
 DESCRIPTION = Berkeley DB 4.6
 define BLURB

Modified: csw/mgar/pkg/bdb47/trunk/Makefile
===================================================================
--- csw/mgar/pkg/bdb47/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/bdb47/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = db
 VERSION = 4.7.25
 CATEGORIES = lib
+GARTYPE = v2
 
 DESCRIPTION = Berkeley DB 4.7
 define BLURB

Modified: csw/mgar/pkg/bdb48/trunk/Makefile
===================================================================
--- csw/mgar/pkg/bdb48/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/bdb48/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = db
 VERSION = 4.8.30
 CATEGORIES = lib
+GARTYPE = v2
 
 DESCRIPTION = Berkeley DB 4.8
 define BLURB

Modified: csw/mgar/pkg/bdb51/trunk/Makefile
===================================================================
--- csw/mgar/pkg/bdb51/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/bdb51/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = db
 VERSION = 5.1.29
 CATEGORIES = lib
+GARTYPE = v2
 
 DESCRIPTION = Berkeley DB 5.1
 define BLURB

Modified: csw/mgar/pkg/bdb52/trunk/Makefile
===================================================================
--- csw/mgar/pkg/bdb52/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/bdb52/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = db
 VERSION = 5.2.36
 CATEGORIES = lib
+GARTYPE = v2
 
 DESCRIPTION = Berkeley DB 5.2
 define BLURB

Modified: csw/mgar/pkg/beautifulsoup/trunk/Makefile
===================================================================
--- csw/mgar/pkg/beautifulsoup/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/beautifulsoup/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = beautifulsoup
 VERSION = 3.1.0.1
 CATEGORIES = lib
+GARTYPE = v2
 
 EXT_NAME = BeautifulSoup
 

Modified: csw/mgar/pkg/bind/trunk/Makefile
===================================================================
--- csw/mgar/pkg/bind/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/bind/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -4,6 +4,7 @@
 NAME = bind
 VERSION = 9.8.1
 CATEGORIES = net
+GARTYPE = v2
 
 # Enable these for Px-releases
 RELEASE = P1

Modified: csw/mgar/pkg/bind2nsd/trunk/Makefile
===================================================================
--- csw/mgar/pkg/bind2nsd/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/bind2nsd/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = bind2nsd
 VERSION = 0.7.2
 CATEGORIES = utils
+GARTYPE = v2
 
 DESCRIPTION = scripts to translate DNS information in BIND format to NSD format
 define BLURB

Modified: csw/mgar/pkg/binutils/trunk/Makefile
===================================================================
--- csw/mgar/pkg/binutils/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/binutils/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = binutils
 VERSION = 2.21.1
 CATEGORIES = utils
+GARTYPE = v2
 
 DESCRIPTION = GNU binary utilities: gas, gld, gprof, and others
 define BLURB

Modified: csw/mgar/pkg/bison/trunk/Makefile
===================================================================
--- csw/mgar/pkg/bison/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/bison/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = bison
 VERSION = 2.5
 CATEGORIES = devel
+GARTYPE = v2
 
 DESCRIPTION = GNU Project parser generator (yacc replacement)
 define BLURB

Modified: csw/mgar/pkg/bitlbee/trunk/Makefile
===================================================================
--- csw/mgar/pkg/bitlbee/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/bitlbee/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -2,6 +2,7 @@
 NAME = bitlbee
 VERSION = 1.2.8
 CATEGORIES = apps
+GARTYPE = v2
 
 DESCRIPTION = An IRC to other chat networks gateway
 define BLURB

Modified: csw/mgar/pkg/bittwist/trunk/Makefile
===================================================================
--- csw/mgar/pkg/bittwist/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/bittwist/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -4,6 +4,7 @@
 NAME = bittwist
 VERSION = 1.1
 CATEGORIES = apps
+GARTYPE = v2
 
 DESCRIPTION = Libpcap-based ethernet packet generator
 define BLURB

Modified: csw/mgar/pkg/blame/trunk/Makefile
===================================================================
--- csw/mgar/pkg/blame/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/blame/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -2,6 +2,7 @@
 NAME = blame
 VERSION = 1.3.1
 CATEGORIES = utils
+GARTYPE = v2
 
 DESCRIPTION = Displays the last modification for each line in an RCS file
 define BLURB

Modified: csw/mgar/pkg/bluefish/trunk/Makefile
===================================================================
--- csw/mgar/pkg/bluefish/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/bluefish/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = bluefish
 VERSION = 2.2.0
 CATEGORIES = apps
+GARTYPE = v2
 
 DESCRIPTION = Advanced Gtk+ HTML editor
 define BLURB

Modified: csw/mgar/pkg/boost/trunk/Makefile
===================================================================
--- csw/mgar/pkg/boost/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/boost/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -3,6 +3,7 @@
 NAME = boost
 VERSION = 1.45.0
 CATEGORIES = lib
+GARTYPE = v2
 
 define BLURB
   Boost was begun by members of the C++ standards committee Library Working

Modified: csw/mgar/pkg/boost-jam/trunk/Makefile
===================================================================
--- csw/mgar/pkg/boost-jam/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/boost-jam/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -5,6 +5,7 @@
 NAME = boost-jam
 VERSION = 3.1.18
 CATEGORIES = utils
+GARTYPE = v2
 DESCRIPTION = Build tool from the Boost C++ libraries
 define BLURB
 endef

Modified: csw/mgar/pkg/botnet/trunk/Makefile
===================================================================
--- csw/mgar/pkg/botnet/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/botnet/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = botnet
 VERSION = 0.8
 CATEGORIES = net
+GARTYPE = v2
 
 DESCRIPTION = Botnet detector plugin for SpamAssassin
 define BLURB

Modified: csw/mgar/pkg/buildbot/trunk/Makefile
===================================================================
--- csw/mgar/pkg/buildbot/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/buildbot/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -6,6 +6,7 @@
 VERSION = 0.7.12
 PATCHLEVEL =
 CATEGORIES = python
+GARTYPE = v2
 
 DESCRIPTION = A system to automate the compile/test cycle
 define BLURB

Modified: csw/mgar/pkg/bvi/trunk/Makefile
===================================================================
--- csw/mgar/pkg/bvi/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/bvi/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = bvi
 VERSION = 1.3.2
 CATEGORIES = utils
+GARTYPE = v2
 
 DESCRIPTION = A vi-like binary file (hex) editor
 define BLURB

Modified: csw/mgar/pkg/bzflag/trunk/Makefile
===================================================================
--- csw/mgar/pkg/bzflag/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/bzflag/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -2,6 +2,7 @@
 NAME = bzflag
 VERSION = 2.0.16
 CATEGORIES = apps
+GARTYPE = v2
 
 DESCRIPTION = A free multiplayer multiplatform 3D tank battle game
 define BLURB

Modified: csw/mgar/pkg/bzip2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/bzip2/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/bzip2/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -3,6 +3,7 @@
 NAME = bzip2
 VERSION = 1.0.6
 CATEGORIES = utils
+GARTYPE = v2
 
 DESCRIPTION = Compression Utility
 define BLURB

Modified: csw/mgar/pkg/c-ares/trunk/Makefile
===================================================================
--- csw/mgar/pkg/c-ares/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/c-ares/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = c-ares
 VERSION = 1.7.5
 CATEGORIES = lib
+GARTYPE = v2
 
 DESCRIPTION = C-ares library to perform DNS requests and name resolves asynchronously
 define BLURB

Modified: csw/mgar/pkg/ca_certificates/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ca_certificates/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/ca_certificates/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -15,6 +15,7 @@
 NAME = cacertificates
 VERSION = $(shell date '+%Y%m%d')
 CATEGORIES = xtra
+GARTYPE = v2
 
 DESCRIPTION = CA certificates
 define BLURB

Modified: csw/mgar/pkg/cacti/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cacti/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cacti/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = cacti
 VERSION = 0.8.7e
 CATEGORIES = apps
+GARTYPE = v2
 
 DESCRIPTION = a network graphing solution based on RRDtool
 define BLURB

Modified: csw/mgar/pkg/cadaver/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cadaver/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cadaver/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -15,6 +15,7 @@
 NAME = cadaver
 VERSION = 0.23.3
 CATEGORIES = net
+GARTYPE = v2
 
 DESCRIPTION = WebDAV commandline tool
 define BLURB

Modified: csw/mgar/pkg/cairomm/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cairomm/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cairomm/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME      = cairomm
 VERSION   = 1.8.0
 CATEGORIES   = lib
+GARTYPE = v2
 
 DESCRIPTION  = C++ bindings for Cairo
 define BLURB

Modified: csw/mgar/pkg/ccache/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ccache/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/ccache/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -2,6 +2,7 @@
 NAME = ccache
 VERSION = 3.0pre1
 CATEGORIES = utils
+GARTYPE = v2
 
 DESCRIPTION = Brief description
 define BLURB

Modified: csw/mgar/pkg/cdecl/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cdecl/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cdecl/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = cdecl
 VERSION = 2.5
 CATEGORIES = utils
+GARTYPE = v2
 
 DESCRIPTION = C declaration guide/tool
 define BLURB

Modified: csw/mgar/pkg/cdrdao/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cdrdao/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cdrdao/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -2,6 +2,7 @@
 NAME = cdrdao
 VERSION = 1.2.3
 CATEGORIES = apps
+GARTYPE = v2
 
 DESCRIPTION = CD recording in DAO mode
 define BLURB

Modified: csw/mgar/pkg/centerim/trunk/Makefile
===================================================================
--- csw/mgar/pkg/centerim/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/centerim/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = centerim
 VERSION = 4.22.7
 CATEGORIES = utils
+GARTYPE = v2
 
 DESCRIPTION = Text mode menu- and window-driven IM interface
 define BLURB

Modified: csw/mgar/pkg/cfengine/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cfengine/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cfengine/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = cfengine
 VERSION = 2.2.10
 CATEGORIES = utils
+GARTYPE = v2
 
 DESCRIPTION = A tool for administering Networks of Diverse Machines
 define BLURB

Modified: csw/mgar/pkg/cfengine3/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cfengine3/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cfengine3/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -3,6 +3,7 @@
 NAME = cfengine3
 VERSION = 3.2.3
 CATEGORIES = utils
+GARTYPE = v2
 
 DESCRIPTION = Open source configuration management system
 define BLURB

Modified: csw/mgar/pkg/cfg2html/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cfg2html/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cfg2html/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -6,6 +6,7 @@
 VERSION = 1.14
 PATCHLEVEL = r1.8
 CATEGORIES = utils
+GARTYPE = v2
 DESCRIPTION = Configuration documentation generator
 define BLURB
 endef

Modified: csw/mgar/pkg/cfitsio/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cfitsio/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cfitsio/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = cfitsio
 VERSION = 3.24
 CATEGORIES = lib
+GARTYPE = v2
 
 DESCRIPTION = A library of C and Fortran subroutines for reading and writing data files in FITS
 define BLURB

Modified: csw/mgar/pkg/cgit/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cgit/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cgit/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = cgit
 VERSION = 0.8.3_opencsw_1
 CATEGORIES = devel
+GARTYPE = v2
 
 DESCRIPTION = Web front-end for Git
 define BLURB

Modified: csw/mgar/pkg/cheetah/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cheetah/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cheetah/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -5,6 +5,7 @@
 NAME = cheetah
 VERSION = 2.4.0
 CATEGORIES = python
+GARTYPE = v2
 DESCRIPTION = A template engine and code generation tool
 define BLURB
   Cheetah is an open source template engine and code generation tool, written

Modified: csw/mgar/pkg/cherokee/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cherokee/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cherokee/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -2,6 +2,7 @@
 NAME = cherokee
 VERSION = 1.2.2
 CATEGORIES = server
+GARTYPE = v2
 
 DESCRIPTION = Extremely fast and flexible web server
 define BLURB

Modified: csw/mgar/pkg/chkconfig/trunk/Makefile
===================================================================
--- csw/mgar/pkg/chkconfig/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/chkconfig/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -5,6 +5,7 @@
 NAME = chkconfig
 VERSION = 1.3.30c
 CATEGORIES = utils
+GARTYPE = v2
 
 DESCRIPTION = RedHat alternatives engine with CSW customizations
 define BLURB

Modified: csw/mgar/pkg/chmlib/trunk/Makefile
===================================================================
--- csw/mgar/pkg/chmlib/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/chmlib/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = chmlib
 VERSION = 0.40
 CATEGORIES = lib
+GARTYPE = v2
 
 DESCRIPTION = Library designed for accessing MS ITSS files (chm)
 define BLURB

Modified: csw/mgar/pkg/chromium/trunk/Makefile
===================================================================
--- csw/mgar/pkg/chromium/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/chromium/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -6,6 +6,7 @@
 CHROMIUM_REVISION = 32797
 VERSION = 0.$(CHROMIUM_REVISION)
 CATEGORIES = lib
+GARTYPE = v2
 DESCRIPTION = An open-source web browser
 define BLURB
 endef

Modified: csw/mgar/pkg/chrpath/trunk/Makefile
===================================================================
--- csw/mgar/pkg/chrpath/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/chrpath/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = chrpath
 VERSION = 0.13
 CATEGORIES = utils
+GARTYPE = v2
 
 DESCRIPTION = A program to fix/change runpaths
 define BLURB

Modified: csw/mgar/pkg/clamav/trunk/Makefile
===================================================================
--- csw/mgar/pkg/clamav/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/clamav/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -3,6 +3,7 @@
 #VERSION    = 0.97rc
 #DISTNAME   = $(NAME)-devel-latest
 CATEGORIES = apps
+GARTYPE = v2
 
 DESCRIPTION = Clam AntiVirus
 define BLURB

Modified: csw/mgar/pkg/clamavsigs/trunk/Makefile
===================================================================
--- csw/mgar/pkg/clamavsigs/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/clamavsigs/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -3,6 +3,7 @@
 DISTNAME = clamav-unofficial-sigs-$(VERSION)
 WORKSRC = $(WORKDIR)/$(DISTNAME)
 CATEGORIES = utils
+GARTYPE = v2
 
 DESCRIPTION = ClamAV Unofficial Signature Databases Update Script
 define BLURB

Modified: csw/mgar/pkg/clearsilver/trunk/Makefile
===================================================================
--- csw/mgar/pkg/clearsilver/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/clearsilver/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = clearsilver
 VERSION = 0.10.5
 CATEGORIES = utils
+GARTYPE = v2
 
 DESCRIPTION = Language-neutral HTML template system
 define BLURB

Modified: csw/mgar/pkg/cloog/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cloog/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cloog/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -5,6 +5,7 @@
 NAME = cloog
 VERSION = 0.16.3
 CATEGORIES = lib
+GARTYPE = v2
 DESCRIPTION = Code Generator in the Polyhedral Model
 define BLURB
 endef

Modified: csw/mgar/pkg/clpbar/trunk/Makefile
===================================================================
--- csw/mgar/pkg/clpbar/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/clpbar/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -5,6 +5,7 @@
 NAME = bar
 VERSION = 1.11.1
 CATEGORIES = apps
+GARTYPE = v2
 DESCRIPTION = A command line tool to display information about a data transfer stream
 
 define BLURB

Modified: csw/mgar/pkg/clusterit/trunk/Makefile
===================================================================
--- csw/mgar/pkg/clusterit/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/clusterit/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = clusterit
 VERSION = 2.5
 CATEGORIES = net
+GARTYPE = v2
 
 DESCRIPTION = Suite of tools for managing large clusters of machines
 define BLURB

Modified: csw/mgar/pkg/clusterssh/trunk/Makefile
===================================================================
--- csw/mgar/pkg/clusterssh/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/clusterssh/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -3,6 +3,7 @@
 NAME = clusterssh
 VERSION = 3.28
 CATEGORIES = net
+GARTYPE = v2
 
 DESCRIPTION = ClusterSSH controls a number of xterm windows via a single graphical console window
 define BLURB

Modified: csw/mgar/pkg/clzip/trunk/Makefile
===================================================================
--- csw/mgar/pkg/clzip/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/clzip/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = clzip
 VERSION = 1.0
 CATEGORIES = utils
+GARTYPE = v2
 
 DESCRIPTION = a lossless data compressor based on the LZMA algorithm
 define BLURB

Modified: csw/mgar/pkg/cmake/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cmake/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cmake/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -3,6 +3,7 @@
 NAME = cmake
 VERSION = 2.8.7
 CATEGORIES = devel
+GARTYPE = v2
 
 DESCRIPTION = Cross-platform make
 define BLURB

Modified: csw/mgar/pkg/colordiff/trunk/Makefile
===================================================================
--- csw/mgar/pkg/colordiff/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/colordiff/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = colordiff
 VERSION = 1.0.9
 CATEGORIES = utils
+GARTYPE = v2
 
 DESCRIPTION = Wrapper for for the diff command producing colored output
 define BLURB

Modified: csw/mgar/pkg/colormake/trunk/Makefile
===================================================================
--- csw/mgar/pkg/colormake/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/colormake/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = colormake
 VERSION = 0.2
 CATEGORIES = utils
+GARTYPE = v2
 
 DESCRIPTION = A colorizer for make
 define BLURB

Modified: csw/mgar/pkg/colortail/trunk/Makefile
===================================================================
--- csw/mgar/pkg/colortail/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/colortail/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -2,6 +2,7 @@
 NAME = colortail
 VERSION = 0.3.0
 CATEGORIES = utils
+GARTYPE = v2
 
 DESCRIPTION = Tail-variant with color support for easier log file reading
 define BLURB

Modified: csw/mgar/pkg/conserver/trunk/Makefile
===================================================================
--- csw/mgar/pkg/conserver/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/conserver/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -2,6 +2,7 @@
 NAME = conserver
 VERSION = 8.1.7
 CATEGORIES = apps
+GARTYPE = v2
 
 DESCRIPTION = Client/Server console server software
 define BLURB

Modified: csw/mgar/pkg/convmv/trunk/Makefile
===================================================================
--- csw/mgar/pkg/convmv/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/convmv/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = convmv
 VERSION = 1.14
 CATEGORIES = utils
+GARTYPE = v2
 
 DESCRIPTION = Converts filenames from one encoding to another
 define BLURB

Modified: csw/mgar/pkg/coreutils/trunk/Makefile
===================================================================
--- csw/mgar/pkg/coreutils/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/coreutils/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = coreutils
 VERSION = 8.15
 CATEGORIES = utils
+GARTYPE = v2
 
 # seq has issues related to the handling of long double's with -O2.
 # this issue manifested on sol8 and sol9 x86 only.  sparc was unaffected

Modified: csw/mgar/pkg/cpan/Algorithm-Annotate/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Algorithm-Annotate/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cpan/Algorithm-Annotate/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = Algorithm-Annotate
 VERSION = 0.10
 CATEGORIES = cpan
+GARTYPE = v2
 AUTHOR = CLKAO
 
 DESCRIPTION = Represent a series of changes in annotate form

Modified: csw/mgar/pkg/cpan/Algorithm-CheckDigits/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Algorithm-CheckDigits/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cpan/Algorithm-CheckDigits/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = Algorithm-CheckDigits
 VERSION = v1.1.1
 CATEGORIES = cpan
+GARTYPE = v2
 AUTHOR = MAMAWE
 
 DESCRIPTION = Generate and test check digits

Modified: csw/mgar/pkg/cpan/Algorithm-Depedency/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Algorithm-Depedency/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cpan/Algorithm-Depedency/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = Algorithm-Dependency
 VERSION = 1.110
 CATEGORIES = cpan
+GARTYPE = v2
 AUTHOR = ADAMK
 
 DESCRIPTION = Base class for implementing various dependency trees

Modified: csw/mgar/pkg/cpan/Algorithm-Diff/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Algorithm-Diff/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cpan/Algorithm-Diff/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = Algorithm-Diff
 VERSION = 1.1902
 CATEGORIES = cpan
+GARTYPE = v2
 AUTHOR = TYEMQ
 
 DESCRIPTION = Compute intelligent differences between two files/lists

Modified: csw/mgar/pkg/cpan/AnyData/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/AnyData/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cpan/AnyData/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = AnyData
 VERSION = 0.10
 CATEGORIES = cpan
+GARTYPE = v2
 AUTHOR = JZUCKER
 
 DESCRIPTION = easy access to data in many formats

Modified: csw/mgar/pkg/cpan/Apache-AuthPAM/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Apache-AuthPAM/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cpan/Apache-AuthPAM/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = Apache-AuthPAM
 VERSION = 0.01
 CATEGORIES = cpan
+GARTYPE = v2
 AUTHOR = HDANIEL
 
 DESCRIPTION = authenticate apache request using PAM services

Modified: csw/mgar/pkg/cpan/Apache-DBI/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Apache-DBI/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cpan/Apache-DBI/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = Apache-DBI
 VERSION = 1.08
 CATEGORIES = cpan
+GARTYPE = v2
 AUTHOR = ABH
 
 DESCRIPTION = Initiate a persistent database connection

Modified: csw/mgar/pkg/cpan/Apache-PAR/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Apache-PAR/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cpan/Apache-PAR/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = Apache-PAR
 VERSION = 0.30
 CATEGORIES = cpan
+GARTYPE = v2
 AUTHOR = NBYRD
 
 DESCRIPTION = PAR extension for mod_perl

Modified: csw/mgar/pkg/cpan/Apache-Session/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Apache-Session/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cpan/Apache-Session/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = Apache-Session
 VERSION = 1.6
 CATEGORIES = cpan
+GARTYPE = v2
 AUTHOR = JBAKER
 
 DESCRIPTION = a persistence framework for session data

Modified: csw/mgar/pkg/cpan/Apache-Template/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Apache-Template/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cpan/Apache-Template/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = Apache-Template
 VERSION = 0.09
 CATEGORIES = cpan
+GARTYPE = v2
 AUTHOR = ABW
 
 DESCRIPTION = apache/mod_perl interface to the Template Toolkit

Modified: csw/mgar/pkg/cpan/Apache-Test/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Apache-Test/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cpan/Apache-Test/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = Apache-Test
 VERSION = 1.30
 CATEGORIES = cpan
+GARTYPE = v2
 AUTHOR = PHRED
 
 DESCRIPTION = Test.pm wrapper with helpers for testing Apache

Modified: csw/mgar/pkg/cpan/Apache2-AuthzNIS/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Apache2-AuthzNIS/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cpan/Apache2-AuthzNIS/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = Apache2-AuthzNIS
 VERSION = 0.13
 CATEGORIES = cpan
+GARTYPE = v2
 AUTHOR = ITEAHAUS
 
 DESCRIPTION = mod_perl2 NIS Group Authorization module

Modified: csw/mgar/pkg/cpan/App-CLI/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/App-CLI/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cpan/App-CLI/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = App-CLI
 VERSION = 0.313
 CATEGORIES = cpan
+GARTYPE = v2
 AUTHOR = CORNELIUS
 
 DESCRIPTION = Dispatcher module for command line interface programs

Modified: csw/mgar/pkg/cpan/AppConfig/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/AppConfig/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cpan/AppConfig/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = AppConfig
 VERSION = 1.66
 CATEGORIES = cpan
+GARTYPE = v2
 AUTHOR = ABW
 
 DESCRIPTION = Perl5 module for configuration files and command line arguments.

Modified: csw/mgar/pkg/cpan/Archive-Extract/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Archive-Extract/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cpan/Archive-Extract/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = Archive-Extract
 VERSION = 0.48
 CATEGORIES = cpan
+GARTYPE = v2
 AUTHOR = BINGOS
 
 DESCRIPTION = A generic archive extracting mechanism

Modified: csw/mgar/pkg/cpan/Archive-SelfExtract/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Archive-SelfExtract/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cpan/Archive-SelfExtract/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = Archive-SelfExtract
 VERSION = 1.3
 CATEGORIES = cpan
+GARTYPE = v2
 AUTHOR = GREGFAST
 
 DESCRIPTION = bundle compressed archives with Perl code

Modified: csw/mgar/pkg/cpan/Archive-Tar/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Archive-Tar/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cpan/Archive-Tar/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = Archive-Tar
 VERSION = stub
 CATEGORIES = cpan
+GARTYPE = v2
 AUTHOR = BINGOS
 
 DESCRIPTION = Stub to the Perl build-in module Archive::Tar

Modified: csw/mgar/pkg/cpan/Archive-Zip/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Archive-Zip/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cpan/Archive-Zip/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = Archive-Zip
 VERSION = 1.30
 CATEGORIES = cpan
+GARTYPE = v2
 AUTHOR = ADAMK
 
 DESCRIPTION = Provides an interface to ZIP archive files

Modified: csw/mgar/pkg/cpan/Array-Compare/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Array-Compare/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cpan/Array-Compare/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = Array-Compare
 VERSION = 1.13
 CATEGORIES = cpan
+GARTYPE = v2
 AUTHOR = DAVECROSS
 
 DESCRIPTION = extension for comparing arrays.

Modified: csw/mgar/pkg/cpan/Array-Window/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Array-Window/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cpan/Array-Window/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = Array-Window
 VERSION = 1.00
 CATEGORIES = cpan
+GARTYPE = v2
 AUTHOR = ADAMK
 
 DESCRIPTION = calculate windows/subsets/pages of arrays.

Modified: csw/mgar/pkg/cpan/Astro-FITS-Header/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Astro-FITS-Header/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cpan/Astro-FITS-Header/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = Astro-FITS-Header
 VERSION = 3.01
 CATEGORIES = cpan
+GARTYPE = v2
 AUTHOR = TJENNESS
 
 DESCRIPTION = Object Orientated interface to FITS HDUs

Modified: csw/mgar/pkg/cpan/Attribute-Handlers/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Attribute-Handlers/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cpan/Attribute-Handlers/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = Attribute-Handlers
 VERSION = 0.78
 CATEGORIES = cpan
+GARTYPE = v2
 AUTHOR = ABERGMAN
 
 DESCRIPTION = simpler definition of attribute handlers

Modified: csw/mgar/pkg/cpan/Audio-TagLib/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Audio-TagLib/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cpan/Audio-TagLib/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = Audio-TagLib
 VERSION = 1.50_01
 CATEGORIES = cpan
+GARTYPE = v2
 AUTHOR = DONGXU
 
 DESCRIPTION = A library for reading and editing audio meta data

Modified: csw/mgar/pkg/cpan/Authen-PAM/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Authen-PAM/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cpan/Authen-PAM/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = Authen-PAM
 VERSION = 0.16
 CATEGORIES = cpan
+GARTYPE = v2
 AUTHOR = NIKIP
 
 DESCRIPTION = interface to PAM library

Modified: csw/mgar/pkg/cpan/Authen-SASL/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Authen-SASL/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cpan/Authen-SASL/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = Authen-SASL
 VERSION = 2.15
 CATEGORIES = cpan
+GARTYPE = v2
 AUTHOR = GBARR
 
 DESCRIPTION = SASL Authentication framework

Modified: csw/mgar/pkg/cpan/AutoXS-Header/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/AutoXS-Header/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cpan/AutoXS-Header/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = AutoXS-Header
 VERSION = 1.02
 CATEGORIES = cpan
+GARTYPE = v2
 AUTHOR = SMUELLER
 
 DESCRIPTION = Container for the AutoXS header files

Modified: csw/mgar/pkg/cpan/B-C/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/B-C/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cpan/B-C/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = B-C
 VERSION = 1.27
 CATEGORIES = cpan
+GARTYPE = v2
 AUTHOR = RURBAN
 
 DESCRIPTION = Perl compiler's C backend

Modified: csw/mgar/pkg/cpan/B-Flags/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/B-Flags/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cpan/B-Flags/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = B-Flags
 VERSION = 0.04
 CATEGORIES = cpan
+GARTYPE = v2
 AUTHOR = RURBAN
 
 DESCRIPTION = Friendlier flags for B

Modified: csw/mgar/pkg/cpan/B-Generate/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/B-Generate/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cpan/B-Generate/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = B-Generate
 VERSION = 1.26
 CATEGORIES = cpan
+GARTYPE = v2
 AUTHOR = RURBAN
 
 DESCRIPTION = Create your own op trees

Modified: csw/mgar/pkg/cpan/B-Keywords/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/B-Keywords/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cpan/B-Keywords/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = B-Keywords
 VERSION = 1.09
 CATEGORIES = cpan
+GARTYPE = v2
 AUTHOR = JJORE
 
 DESCRIPTION = Lists of reserved barewords and symbol names

Modified: csw/mgar/pkg/cpan/B-Utils/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/B-Utils/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cpan/B-Utils/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = B-Utils
 VERSION = 0.11
 CATEGORIES = cpan
+GARTYPE = v2
 AUTHOR = JJORE
 
 DESCRIPTION = Helper functions for op tree manipulation

Modified: csw/mgar/pkg/cpan/BSD-Resource/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/BSD-Resource/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cpan/BSD-Resource/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = BSD-Resource
 VERSION = 1.28
 CATEGORIES = cpan
+GARTYPE = v2
 AUTHOR = JHI
 
 DESCRIPTION = BSD process resource limit and priority functions

Modified: csw/mgar/pkg/cpan/Barcode-Code128/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Barcode-Code128/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cpan/Barcode-Code128/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = Barcode-Code128
 VERSION = 2.01
 CATEGORIES = cpan
+GARTYPE = v2
 AUTHOR = WRW
 
 DESCRIPTION = Generate CODE 128 bar codes

Modified: csw/mgar/pkg/cpan/BerkeleyDB/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/BerkeleyDB/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cpan/BerkeleyDB/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = BerkeleyDB
 VERSION = 0.43
 CATEGORIES = cpan
+GARTYPE = v2
 AUTHOR = PMQS
 
 DESCRIPTION = BerkeleyDB module

Modified: csw/mgar/pkg/cpan/Biblio-EndnoteStyle/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Biblio-EndnoteStyle/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cpan/Biblio-EndnoteStyle/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = Biblio-EndnoteStyle
 VERSION = 0.05
 CATEGORIES = cpan
+GARTYPE = v2
 AUTHOR = MIRK
 
 DESCRIPTION = Reference formatting using Endnote-like templates

Modified: csw/mgar/pkg/cpan/Bit-Vector/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Bit-Vector/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cpan/Bit-Vector/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = Bit-Vector
 VERSION = 7.1
 CATEGORIES = cpan
+GARTYPE = v2
 AUTHOR = STBEY
 
 DESCRIPTION = Efficient bit vector, set of integers and big int math library.

Modified: csw/mgar/pkg/cpan/C-Scan/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/C-Scan/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cpan/C-Scan/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = C-Scan
 VERSION = 0.74
 CATEGORIES = cpan
+GARTYPE = v2
 AUTHOR = HVDS
 
 DESCRIPTION = Scan C language files for easily recognized constructs.

Modified: csw/mgar/pkg/cpan/CGI/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/CGI/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cpan/CGI/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = CGI.pm
 VERSION = 3.27
 CATEGORIES = cpan
+GARTYPE = v2
 AUTHOR = LDS
 
 DESCRIPTION = simple common gateway interface class

Modified: csw/mgar/pkg/cpan/CGI-Application/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/CGI-Application/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cpan/CGI-Application/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = CGI-Application
 VERSION = 4.31
 CATEGORIES = cpan
+GARTYPE = v2
 AUTHOR = MARKSTOS
 
 DESCRIPTION = Framework for building reusable web-applications

Modified: csw/mgar/pkg/cpan/CGI-Application-Dispatch/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/CGI-Application-Dispatch/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cpan/CGI-Application-Dispatch/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = CGI-Application-Dispatch
 VERSION = 2.10
 CATEGORIES = cpan
+GARTYPE = v2
 AUTHOR = WONKO
 
 DESCRIPTION = Dispatch requests to CGI::Application based objects

Modified: csw/mgar/pkg/cpan/CGI-Application-Plugin-LogDispatch/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/CGI-Application-Plugin-LogDispatch/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cpan/CGI-Application-Plugin-LogDispatch/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = CGI-Application-Plugin-LogDispatch
 VERSION = 1.00
 CATEGORIES = cpan
+GARTYPE = v2
 AUTHOR = CEESHEK
 
 DESCRIPTION = Add Log::Dispatch support to CGI::Application

Modified: csw/mgar/pkg/cpan/CGI-Builder/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/CGI-Builder/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cpan/CGI-Builder/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = CGI-Builder
 VERSION = 1.36
 CATEGORIES = cpan
+GARTYPE = v2
 AUTHOR = DOMIZIO
 
 DESCRIPTION = Framework to build simple or complex web-apps

Modified: csw/mgar/pkg/cpan/CGI-Session/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/CGI-Session/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cpan/CGI-Session/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = CGI-Session
 VERSION = 4.43
 CATEGORIES = cpan
+GARTYPE = v2
 AUTHOR = MARKSTOS
 
 DESCRIPTION = Persistent session data in CGI applications

Modified: csw/mgar/pkg/cpan/CGI-SpeedyCGI/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/CGI-SpeedyCGI/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cpan/CGI-SpeedyCGI/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = CGI-SpeedyCGI
 VERSION = 2.22
 CATEGORIES = cpan
+GARTYPE = v2
 AUTHOR = HORROCKS
 
 DESCRIPTION = Speed up perl scripts by running them persistently

Modified: csw/mgar/pkg/cpan/CGP-CLI/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/CGP-CLI/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cpan/CGP-CLI/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = CGP-CLI
 VERSION = 2.7.5
 CATEGORIES = cpan
+GARTYPE = v2
 AUTHOR = JBUHACOFF
 
 DESCRIPTION = CommunigatePro Command Line Interface perl module

Modified: csw/mgar/pkg/cpan/CPANPLUS/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/CPANPLUS/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cpan/CPANPLUS/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = CPANPLUS
 VERSION = 0.9007
 CATEGORIES = cpan
+GARTYPE = v2
 AUTHOR = BINGOS
 
 DESCRIPTION = API and CLI access to the CPAN mirrors

Modified: csw/mgar/pkg/cpan/CSS-DOM/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/CSS-DOM/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cpan/CSS-DOM/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = CSS-DOM
 VERSION = 0.11
 CATEGORIES = cpan
+GARTYPE = v2
 AUTHOR = SPROUT
 
 DESCRIPTION = Document Object Model for Cascading Style Sheets

Modified: csw/mgar/pkg/cpan/Cache/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Cache/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cpan/Cache/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = Cache
 VERSION = 2.04
 CATEGORIES = cpan
+GARTYPE = v2
 AUTHOR = CLEISHMAN
 
 DESCRIPTION = new cache interface.

Modified: csw/mgar/pkg/cpan/Cache-Cache/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Cache-Cache/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cpan/Cache-Cache/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = Cache-Cache
 VERSION = 1.06
 CATEGORIES = cpan
+GARTYPE = v2
 AUTHOR = JSWARTZ
 
 DESCRIPTION = Cache interface

Modified: csw/mgar/pkg/cpan/Cache-Memcached/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Cache-Memcached/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cpan/Cache-Memcached/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = Cache-Memcached
 VERSION = 1.29
 CATEGORIES = cpan
+GARTYPE = v2
 AUTHOR = DORMANDO
 
 DESCRIPTION = Client library for memcached

Modified: csw/mgar/pkg/cpan/Cache-Simple-TimedExpiry/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Cache-Simple-TimedExpiry/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cpan/Cache-Simple-TimedExpiry/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = Cache-Simple-TimedExpiry
 VERSION = 0.27
 CATEGORIES = cpan
+GARTYPE = v2
 AUTHOR = JESSE
 
 DESCRIPTION = A lightweight cache with timed expiration

Modified: csw/mgar/pkg/cpan/Cairo/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Cairo/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cpan/Cairo/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = Cairo
 VERSION = 1.061
 CATEGORIES = cpan
+GARTYPE = v2
 AUTHOR = TSCH
 
 DESCRIPTION = Perl interface to the cairo library

Modified: csw/mgar/pkg/cpan/Calendar-CSA/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Calendar-CSA/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cpan/Calendar-CSA/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = Calendar-CSA
 VERSION = 0.8
 CATEGORIES = cpan
+GARTYPE = v2
 AUTHOR = KJALB
 
 DESCRIPTION = Perl extension to interface with CDE Calendar Manager

Modified: csw/mgar/pkg/cpan/Calendar-Simple/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Calendar-Simple/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cpan/Calendar-Simple/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = Calendar-Simple
 VERSION = 1.21
 CATEGORIES = cpan
+GARTYPE = v2
 AUTHOR = DAVECROSS
 
 DESCRIPTION = Perl extension to create simple calendars

Modified: csw/mgar/pkg/cpan/Capitalization/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Capitalization/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cpan/Capitalization/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = capitalization
 VERSION = 0.03
 CATEGORIES = cpan
+GARTYPE = v2
 AUTHOR = MIYAGAWA
 
 DESCRIPTION = No capitalization on method names

Modified: csw/mgar/pkg/cpan/Carp-Assert/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Carp-Assert/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cpan/Carp-Assert/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = Carp-Assert
 VERSION = 0.20
 CATEGORIES = cpan
+GARTYPE = v2
 AUTHOR = MSCHWERN
 
 DESCRIPTION = Executable comments

Modified: csw/mgar/pkg/cpan/Carp-Assert-More/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Carp-Assert-More/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cpan/Carp-Assert-More/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = Carp-Assert-More
 VERSION = 1.12
 CATEGORIES = cpan
+GARTYPE = v2
 AUTHOR = PETDANCE
 
 DESCRIPTION = Convenience wrappers around Carp::Assert

Modified: csw/mgar/pkg/cpan/Carp-Clan/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Carp-Clan/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cpan/Carp-Clan/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = Carp-Clan
 VERSION = 6.04
 CATEGORIES = cpan
+GARTYPE = v2
 AUTHOR = STBEY
 
 DESCRIPTION = report errors from perspective of caller of a "clan" of modules

Modified: csw/mgar/pkg/cpan/Catalyst/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Catalyst/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cpan/Catalyst/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = Catalyst
 VERSION = 5.61
 CATEGORIES = cpan
+GARTYPE = v2
 AUTHOR = SRI
 
 DESCRIPTION = The Elegant MVC Web Application Framework

Modified: csw/mgar/pkg/cpan/Chart/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Chart/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cpan/Chart/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = Chart
 VERSION = 2.4.1
 CATEGORIES = cpan
+GARTYPE = v2
 AUTHOR = CHARTGRP
 
 DESCRIPTION = A series of charting modules based on GD

Modified: csw/mgar/pkg/cpan/Check-ISA/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Check-ISA/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cpan/Check-ISA/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = Check-ISA
 VERSION = 0.04
 CATEGORIES = cpan
+GARTYPE = v2
 AUTHOR = NUFFIN
 
 DESCRIPTION = DWIM, correct checking of an object's class

Modified: csw/mgar/pkg/cpan/Class-Accessor/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Class-Accessor/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cpan/Class-Accessor/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = Class-Accessor
 VERSION = 0.33
 CATEGORIES = cpan
+GARTYPE = v2
 AUTHOR = KASEI
 
 DESCRIPTION = Automated accessor generation

Modified: csw/mgar/pkg/cpan/Class-Accessor-Chained/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Class-Accessor-Chained/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cpan/Class-Accessor-Chained/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = Class-Accessor-Chained
 VERSION = 0.01
 CATEGORIES = cpan
+GARTYPE = v2
 AUTHOR = RCLAMP
 
 DESCRIPTION = Make chained accessors

Modified: csw/mgar/pkg/cpan/Class-Adapter/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Class-Adapter/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cpan/Class-Adapter/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = Class-Adapter
 VERSION = 1.07
 CATEGORIES = cpan
+GARTYPE = v2
 AUTHOR = ADAMK
 
 DESCRIPTION = Perl implementation of the "Adapter" Design Pattern

Modified: csw/mgar/pkg/cpan/Class-Autouse/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Class-Autouse/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cpan/Class-Autouse/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = Class-Autouse
 VERSION = 1.29
 CATEGORIES = cpan
+GARTYPE = v2
 AUTHOR = ADAMK
 
 DESCRIPTION = Run-time class loading on first method call

Modified: csw/mgar/pkg/cpan/Class-BlackHole/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Class-BlackHole/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cpan/Class-BlackHole/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = Class-BlackHole
 VERSION = 0.04
 CATEGORIES = cpan
+GARTYPE = v2
 AUTHOR = SBURKE
 
 DESCRIPTION = base class to treat unhandled method calls as no-ops

Modified: csw/mgar/pkg/cpan/Class-Container/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Class-Container/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cpan/Class-Container/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = Class-Container
 VERSION = 0.12
 CATEGORIES = cpan
+GARTYPE = v2
 AUTHOR = KWILLIAMS
 
 DESCRIPTION = Glues object frameworks together transparently

Modified: csw/mgar/pkg/cpan/Class-DBI/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Class-DBI/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cpan/Class-DBI/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = Class-DBI
 VERSION = 3.0.3
 CATEGORIES = cpan
+GARTYPE = v2
 AUTHOR = TMTM
 
 DESCRIPTION = simple database abstraction

Modified: csw/mgar/pkg/cpan/Class-DBI-Loader/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Class-DBI-Loader/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cpan/Class-DBI-Loader/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = Class-DBI-Loader
 VERSION = 0.03
 CATEGORIES = cpan
+GARTYPE = v2
 AUTHOR = IKEBE
 
 DESCRIPTION = dynamic definition of Class::DBI sub classes.

Modified: csw/mgar/pkg/cpan/Class-DBI-Pg/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Class-DBI-Pg/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cpan/Class-DBI-Pg/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = Class-DBI-Pg
 VERSION = 0.03
 CATEGORIES = cpan
+GARTYPE = v2
 AUTHOR = IKEBE
 
 DESCRIPTION = Class::DBI extension for Postgres

Modified: csw/mgar/pkg/cpan/Class-DBI-SQLite/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Class-DBI-SQLite/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cpan/Class-DBI-SQLite/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = Class-DBI-SQLite
 VERSION = 0.11
 CATEGORIES = cpan
+GARTYPE = v2
 AUTHOR = MIYAGAWA
 
 DESCRIPTION = extension to Class::DBI for sqlite

Modified: csw/mgar/pkg/cpan/Class-DBI-mysql/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Class-DBI-mysql/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cpan/Class-DBI-mysql/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = Class-DBI-mysql
 VERSION = 1.00
 CATEGORIES = cpan
+GARTYPE = v2
 AUTHOR = TMTM
 
 DESCRIPTION = extensions to Class::DBI for MySQL

Modified: csw/mgar/pkg/cpan/Class-Data-Inheritable/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Class-Data-Inheritable/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cpan/Class-Data-Inheritable/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = Class-Data-Inheritable
 VERSION = 0.08
 CATEGORIES = cpan
+GARTYPE = v2
 AUTHOR = TMTM
 
 DESCRIPTION = Inheritable, overridable class data

Modified: csw/mgar/pkg/cpan/Class-Factory-Util/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Class-Factory-Util/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cpan/Class-Factory-Util/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = Class-Factory-Util
 VERSION = 1.7
 CATEGORIES = cpan
+GARTYPE = v2
 AUTHOR = DROLSKY
 
 DESCRIPTION = Provide utility methods for factory classes

Modified: csw/mgar/pkg/cpan/Class-ISA/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Class-ISA/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cpan/Class-ISA/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = Class-ISA
 VERSION = 0.33
 CATEGORIES = cpan
+GARTYPE = v2
 AUTHOR = SBURKE
 
 DESCRIPTION = report the search path for a class ISA tree

Modified: csw/mgar/pkg/cpan/Class-Inspector/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Class-Inspector/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cpan/Class-Inspector/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = Class-Inspector
 VERSION = 1.24
 CATEGORIES = cpan
+GARTYPE = v2
 AUTHOR = ADAMK
 
 DESCRIPTION = Get information about a class and its structure

Modified: csw/mgar/pkg/cpan/Class-Loader/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Class-Loader/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cpan/Class-Loader/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = Class-Loader
 VERSION = 2.03
 CATEGORIES = cpan
+GARTYPE = v2
 AUTHOR = VIPUL
 
 DESCRIPTION = load modules and create objects on demand.

Modified: csw/mgar/pkg/cpan/Class-ReturnValue/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Class-ReturnValue/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cpan/Class-ReturnValue/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = Class-ReturnValue
 VERSION = 0.55
 CATEGORIES = cpan
+GARTYPE = v2
 AUTHOR = JESSE
 
 DESCRIPTION = Treat a return value as boolean, array or object

Modified: csw/mgar/pkg/cpan/Class-Singleton/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Class-Singleton/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cpan/Class-Singleton/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = Class-Singleton
 VERSION = 1.4
 CATEGORIES = cpan
+GARTYPE = v2
 AUTHOR = ABW
 
 DESCRIPTION = Implementation of a "Singleton" class

Modified: csw/mgar/pkg/cpan/Class-Std/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Class-Std/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cpan/Class-Std/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = Class-Std
 VERSION = 0.011
 CATEGORIES = cpan
+GARTYPE = v2
 AUTHOR = DCONWAY
 
 DESCRIPTION = Class::Std - Support for creating standard "inside-out" classes

Modified: csw/mgar/pkg/cpan/Class-Trigger/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Class-Trigger/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cpan/Class-Trigger/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = Class-Trigger
 VERSION = 0.11
 CATEGORIES = cpan
+GARTYPE = v2
 AUTHOR = MIYAGAWA
 
 DESCRIPTION = mixin to add / call inheritable triggers

Modified: csw/mgar/pkg/cpan/Class-WhiteHole/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Class-WhiteHole/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cpan/Class-WhiteHole/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = Class-WhiteHole
 VERSION = 0.04
 CATEGORIES = cpan
+GARTYPE = v2
 AUTHOR = MSCHWERN
 
 DESCRIPTION = base class to treat unhandled method calls as errors

Modified: csw/mgar/pkg/cpan/Class-XSAccessor/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Class-XSAccessor/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cpan/Class-XSAccessor/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = Class-XSAccessor
 VERSION = 1.05
 CATEGORIES = cpan
+GARTYPE = v2
 AUTHOR = SMUELLER
 
 DESCRIPTION = Generate fast XS accessors without runtime compilation

Modified: csw/mgar/pkg/cpan/Clone/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Clone/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cpan/Clone/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = Clone
 VERSION = 0.31
 CATEGORIES = cpan
+GARTYPE = v2
 AUTHOR = RDF
 
 DESCRIPTION = Recursively copy Perl datatypes

Modified: csw/mgar/pkg/cpan/Compress-Bzip2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Compress-Bzip2/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cpan/Compress-Bzip2/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = Compress-Bzip2
 VERSION = 2.09
 CATEGORIES = cpan
+GARTYPE = v2
 AUTHOR = ARJAY
 
 DESCRIPTION = Interface to Bzip2 compression library

Modified: csw/mgar/pkg/cpan/Compress-Raw-Bzip2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Compress-Raw-Bzip2/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cpan/Compress-Raw-Bzip2/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = Compress-Raw-Bzip2
 VERSION = 2.033
 CATEGORIES = cpan
+GARTYPE = v2
 AUTHOR = PMQS
 
 DESCRIPTION = Low-Level Interface to bzip2 compression library

Modified: csw/mgar/pkg/cpan/Compress-Raw-Zlib/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Compress-Raw-Zlib/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cpan/Compress-Raw-Zlib/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = Compress-Raw-Zlib
 VERSION = 2.033
 CATEGORIES = cpan
+GARTYPE = v2
 AUTHOR = PMQS
 
 DESCRIPTION = Low-Level Interface to zlib compression library

Modified: csw/mgar/pkg/cpan/Compress-Zlib/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Compress-Zlib/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cpan/Compress-Zlib/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = Compress-Zlib
 VERSION = 2.020
 CATEGORIES = cpan
+GARTYPE = v2
 AUTHOR = PMQS
 
 DESCRIPTION = This is a stub, the contents has been integrated into CSWpmiocompress

Modified: csw/mgar/pkg/cpan/Config-Augeas/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Config-Augeas/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cpan/Config-Augeas/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = Config-Augeas
 VERSION = 0.701
 CATEGORIES = cpan
+GARTYPE = v2
 AUTHOR = DDUMONT
 
 DESCRIPTION = Augeas Perl Binding

Modified: csw/mgar/pkg/cpan/Config-General/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Config-General/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cpan/Config-General/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = Config-General
 VERSION = 2.44
 CATEGORIES = cpan
+GARTYPE = v2
 AUTHOR = TLINDEN
 
 DESCRIPTION = Generic Config Module

Modified: csw/mgar/pkg/cpan/Config-IniFiles/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Config-IniFiles/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cpan/Config-IniFiles/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = Config-IniFiles
 VERSION = 2.66
 CATEGORIES = cpan
+GARTYPE = v2
 AUTHOR = SHLOMIF
 
 DESCRIPTION = A module for reading .ini-style configuration files.

Modified: csw/mgar/pkg/cpan/Config-Tiny/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Config-Tiny/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cpan/Config-Tiny/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = Config-Tiny
 VERSION = 2.12
 CATEGORIES = cpan
+GARTYPE = v2
 AUTHOR = ADAMK
 
 DESCRIPTION = Read/Write .ini style files with as little code as possible

Modified: csw/mgar/pkg/cpan/Convert-ASCII-Armour/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Convert-ASCII-Armour/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cpan/Convert-ASCII-Armour/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = Convert-ASCII-Armour
 VERSION = 1.4
 CATEGORIES = cpan
+GARTYPE = v2
 AUTHOR = VIPUL
 
 DESCRIPTION = convert binary octets into ASCII armoured messages.

Modified: csw/mgar/pkg/cpan/Convert-ASN1/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Convert-ASN1/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cpan/Convert-ASN1/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = Convert-ASN1
 VERSION = 0.22
 CATEGORIES = cpan
+GARTYPE = v2
 AUTHOR = GBARR
 
 DESCRIPTION = ASN.1 Encode/Decode library

Modified: csw/mgar/pkg/cpan/Convert-BinHex/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Convert-BinHex/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cpan/Convert-BinHex/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = Convert-BinHex
 VERSION = 1.119
 CATEGORIES = cpan
+GARTYPE = v2
 AUTHOR = ERYQ
 
 DESCRIPTION = Perl module to extract data from Macintosh BinHex files

Modified: csw/mgar/pkg/cpan/Convert-EBCDIC/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Convert-EBCDIC/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cpan/Convert-EBCDIC/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = Convert-EBCDIC
 VERSION = 0.06
 CATEGORIES = cpan
+GARTYPE = v2
 AUTHOR = CXL
 
 DESCRIPTION = Perl module for string conversion between EBCDIC and ASCII

Modified: csw/mgar/pkg/cpan/Convert-PEM/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Convert-PEM/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cpan/Convert-PEM/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = Convert-PEM
 VERSION = 0.07
 CATEGORIES = cpan
+GARTYPE = v2
 AUTHOR = BTROTT
 
 DESCRIPTION = read/write encrypted ASN.1 PEM files

Modified: csw/mgar/pkg/cpan/Convert-TNEF/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Convert-TNEF/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cpan/Convert-TNEF/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = Convert-TNEF
 VERSION = 0.17
 CATEGORIES = cpan
+GARTYPE = v2
 AUTHOR = DOUGW
 
 DESCRIPTION = Perl module to read TNEF files

Modified: csw/mgar/pkg/cpan/Convert-UUlib/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Convert-UUlib/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cpan/Convert-UUlib/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = Convert-UUlib
 VERSION = 1.33
 CATEGORIES = cpan
+GARTYPE = v2
 AUTHOR = MLEHMANN
 
 DESCRIPTION = Perl interface to the uulib library

Modified: csw/mgar/pkg/cpan/Crypt-Blowfish/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Crypt-Blowfish/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cpan/Crypt-Blowfish/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = Crypt-Blowfish
 VERSION = 2.12
 CATEGORIES = cpan
+GARTYPE = v2
 AUTHOR = DPARIS
 
 DESCRIPTION = Perl Blowfish encryption module

Modified: csw/mgar/pkg/cpan/Crypt-CAST5/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Crypt-CAST5/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cpan/Crypt-CAST5/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = Crypt-CAST5
 VERSION = 0.05
 CATEGORIES = cpan
+GARTYPE = v2
 AUTHOR = BOBMATH
 
 DESCRIPTION = CAST5 block cipher

Modified: csw/mgar/pkg/cpan/Crypt-CBC/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Crypt-CBC/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cpan/Crypt-CBC/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = Crypt-CBC
 VERSION = 2.30
 CATEGORIES = cpan
+GARTYPE = v2
 AUTHOR = LDS
 
 DESCRIPTION = Encrypt Data with Cipher Block Chaining Mode

Modified: csw/mgar/pkg/cpan/Crypt-DES/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Crypt-DES/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cpan/Crypt-DES/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = Crypt-DES
 VERSION = 2.05
 CATEGORIES = cpan
+GARTYPE = v2
 AUTHOR = DPARIS
 
 DESCRIPTION = Perl DES encryption module

Modified: csw/mgar/pkg/cpan/Crypt-DES_EDE3/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Crypt-DES_EDE3/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cpan/Crypt-DES_EDE3/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = Crypt-DES_EDE3
 VERSION = 0.01
 CATEGORIES = cpan
+GARTYPE = v2
 AUTHOR = BTROTT
 
 DESCRIPTION = Triple-DES EDE encryption/decryption

Modified: csw/mgar/pkg/cpan/Crypt-DH/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Crypt-DH/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cpan/Crypt-DH/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = Crypt-DH
 VERSION = 0.06
 CATEGORIES = cpan
+GARTYPE = v2
 AUTHOR = BTROTT
 
 DESCRIPTION = Diffie-Hellman key exchange system

Modified: csw/mgar/pkg/cpan/Crypt-DSA/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Crypt-DSA/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cpan/Crypt-DSA/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = Crypt-DSA
 VERSION = 0.14
 CATEGORIES = cpan
+GARTYPE = v2
 AUTHOR = BTROTT
 
 DESCRIPTION = DSA signatures and key generation

Modified: csw/mgar/pkg/cpan/Crypt-IDEA/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Crypt-IDEA/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cpan/Crypt-IDEA/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = Crypt-IDEA
 VERSION = 1.08
 CATEGORIES = cpan
+GARTYPE = v2
 AUTHOR = DPARIS
 
 DESCRIPTION = Perl interface to IDEA block cipher

Modified: csw/mgar/pkg/cpan/Crypt-OpenPGP/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Crypt-OpenPGP/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cpan/Crypt-OpenPGP/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = Crypt-OpenPGP
 VERSION = 1.03
 CATEGORIES = cpan
+GARTYPE = v2
 AUTHOR = BTROTT
 
 DESCRIPTION = pure-Perl OpenPGP implementation

Modified: csw/mgar/pkg/cpan/Crypt-OpenSSL-Bignum/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Crypt-OpenSSL-Bignum/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cpan/Crypt-OpenSSL-Bignum/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = Crypt-OpenSSL-Bignum
 VERSION = 0.04
 CATEGORIES = cpan
+GARTYPE = v2
 AUTHOR = IROBERTS
 
 DESCRIPTION = OpenSSL's multiprecision integer arithmetic

Modified: csw/mgar/pkg/cpan/Crypt-OpenSSL-DSA/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Crypt-OpenSSL-DSA/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cpan/Crypt-OpenSSL-DSA/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = Crypt-OpenSSL-DSA
 VERSION = 0.13
 CATEGORIES = cpan
+GARTYPE = v2
 AUTHOR = TJMATHER
 
 DESCRIPTION = digital signature algorithm using OpenSSL

Modified: csw/mgar/pkg/cpan/Crypt-OpenSSL-PKCS12/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Crypt-OpenSSL-PKCS12/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cpan/Crypt-OpenSSL-PKCS12/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = Crypt-OpenSSL-PKCS12
 VERSION = 0.3
 CATEGORIES = cpan
+GARTYPE = v2
 AUTHOR = DANIEL
 
 DESCRIPTION = Perl extension to OpenSSL PKCS12 API.

Modified: csw/mgar/pkg/cpan/Crypt-OpenSSL-RSA/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Crypt-OpenSSL-RSA/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cpan/Crypt-OpenSSL-RSA/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = Crypt-OpenSSL-RSA
 VERSION = 0.25
 CATEGORIES = cpan
+GARTYPE = v2
 AUTHOR = IROBERTS
 
 DESCRIPTION = RSA encoding and decoding, using the openSSL libraries

Modified: csw/mgar/pkg/cpan/Crypt-OpenSSL-Random/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Crypt-OpenSSL-Random/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cpan/Crypt-OpenSSL-Random/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = Crypt-OpenSSL-Random
 VERSION = 0.04
 CATEGORIES = cpan
+GARTYPE = v2
 AUTHOR = IROBERTS
 
 DESCRIPTION = Perl Crypt::OpenSSL::Random module

Modified: csw/mgar/pkg/cpan/Crypt-OpenSSL-X509/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Crypt-OpenSSL-X509/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cpan/Crypt-OpenSSL-X509/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = Crypt-OpenSSL-X509
 VERSION = 0.4
 CATEGORIES = cpan
+GARTYPE = v2
 AUTHOR = DANIEL
 
 DESCRIPTION = Perl extension to OpenSSL X509 API.

Modified: csw/mgar/pkg/cpan/Crypt-PasswdMD5/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Crypt-PasswdMD5/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cpan/Crypt-PasswdMD5/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = Crypt-PasswdMD5
 VERSION = 1.3
 CATEGORIES = cpan
+GARTYPE = v2
 AUTHOR = LUISMUNOZ
 
 DESCRIPTION = Provides interoperable MD5-based crypt() functions

Modified: csw/mgar/pkg/cpan/Crypt-Primes/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Crypt-Primes/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cpan/Crypt-Primes/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = Crypt-Primes
 VERSION = 0.50
 CATEGORIES = cpan
+GARTYPE = v2
 AUTHOR = VIPUL
 
 DESCRIPTION = prime number generator suitable for cryptographic applications.

Modified: csw/mgar/pkg/cpan/Crypt-RC4/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Crypt-RC4/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cpan/Crypt-RC4/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = Crypt-RC4
 VERSION = 2.02
 CATEGORIES = cpan
+GARTYPE = v2
 AUTHOR = SIFUKURT
 
 DESCRIPTION = Perl implementation of the RC4 encryption algorithm

Modified: csw/mgar/pkg/cpan/Crypt-RC5/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Crypt-RC5/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cpan/Crypt-RC5/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = Crypt-RC5
 VERSION = 2.00
 CATEGORIES = cpan
+GARTYPE = v2
 AUTHOR = SIFUKURT
 
 DESCRIPTION = Perl implementation of the RC5 encryption algorithm

Modified: csw/mgar/pkg/cpan/Crypt-RIPEMD160/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Crypt-RIPEMD160/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cpan/Crypt-RIPEMD160/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = Crypt-RIPEMD160
 VERSION = 0.04
 CATEGORIES = cpan
+GARTYPE = v2
 AUTHOR = CHGEUER
 
 DESCRIPTION = Perl extension for the RIPEMD-160 Hash function

Modified: csw/mgar/pkg/cpan/Crypt-RSA/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Crypt-RSA/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cpan/Crypt-RSA/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = Crypt-RSA
 VERSION = 1.58
 CATEGORIES = cpan
+GARTYPE = v2
 AUTHOR = VIPUL
 
 DESCRIPTION = RSA public-key cryptosystem.

Modified: csw/mgar/pkg/cpan/Crypt-Rijndael/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Crypt-Rijndael/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cpan/Crypt-Rijndael/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = Crypt-Rijndael
 VERSION = 1.09
 CATEGORIES = cpan
+GARTYPE = v2
 AUTHOR = BDFOY
 
 DESCRIPTION = Crypt::CBC compliant Rijndael encryption module

Modified: csw/mgar/pkg/cpan/Crypt-SSLeay/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Crypt-SSLeay/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cpan/Crypt-SSLeay/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = Crypt-SSLeay
 VERSION = 0.57
 CATEGORIES = cpan
+GARTYPE = v2
 AUTHOR = DLAND
 
 DESCRIPTION = OpenSSL glue that provides LWP https support

Modified: csw/mgar/pkg/cpan/Crypt-Twofish/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Crypt-Twofish/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cpan/Crypt-Twofish/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = Crypt-Twofish
 VERSION = 2.12
 CATEGORIES = cpan
+GARTYPE = v2
 AUTHOR = AMS
 
 DESCRIPTION = the Twofish encryption algorithm

Modified: csw/mgar/pkg/cpan/Curses/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Curses/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cpan/Curses/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = Curses
 VERSION = 1.06
 CATEGORIES = cpan
+GARTYPE = v2
 AUTHOR = WPS
 
 DESCRIPTION = terminal screen handling and optimization

Modified: csw/mgar/pkg/cpan/Curses-UI/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Curses-UI/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cpan/Curses-UI/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = Curses-UI
 VERSION = 0.95
 CATEGORIES = cpan
+GARTYPE = v2
 AUTHOR = MARCUS
 
 DESCRIPTION = a curses based OO user interface framework

Modified: csw/mgar/pkg/cpan/DBD-AnyData/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/DBD-AnyData/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)
+++ csw/mgar/pkg/cpan/DBD-AnyData/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
@@ -1,6 +1,7 @@
 NAME = DBD-AnyData
 VERSION = 0.08
 CATEGORIES = cpan
+GARTYPE = v2
 AUTHOR = JZUCKER
 
 DESCRIPTION = DBI access to XML, CSV and other formats

Modified: csw/mgar/pkg/cpan/DBD-CSV/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/DBD-CSV/trunk/Makefile	2012-01-26 11:47:39 UTC (rev 16915)

@@ 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 cgrzemba at users.sourceforge.net  Thu Jan 26 16:34:11 2012
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Thu, 26 Jan 2012 15:34:11 +0000
Subject: [csw-devel] SF.net SVN: gar:[16917] csw/mgar/pkg/389-admin/trunk
Message-ID: <E1RqRL1-0003oe-Rs@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 16917
          http://gar.svn.sourceforge.net/gar/?rev=16917&view=rev
Author:   cgrzemba
Date:     2012-01-26 15:34:11 +0000 (Thu, 26 Jan 2012)
Log Message:
-----------
389-admin/trunk: fix scrimmage with openldap header files

Modified Paths:
--------------
    csw/mgar/pkg/389-admin/trunk/Makefile
    csw/mgar/pkg/389-admin/trunk/files/CSW389admin.preremove

Added Paths:
-----------
    csw/mgar/pkg/389-admin/trunk/files/0004-change-include-preferences-in-Makefile.am.patch

Modified: csw/mgar/pkg/389-admin/trunk/Makefile
===================================================================
--- csw/mgar/pkg/389-admin/trunk/Makefile	2012-01-26 13:25:13 UTC (rev 16916)
+++ csw/mgar/pkg/389-admin/trunk/Makefile	2012-01-26 15:34:11 UTC (rev 16917)
@@ -28,6 +28,7 @@
 PATCHFILES += 0001-change-includedir-preference-in-Makefile.am.patch
 PATCHFILES += 0002-add-i386-platform-to-configure.ac.patch
 PATCHFILES += 0003-correct-initscript-and-http.conf.in.patch
+PATCHFILES += 0004-change-include-preferences-in-Makefile.am.patch
 
 PACKAGES += CSWlibds-admin-serv0
 CATALOGNAME_CSWlibds-admin-serv0 = libds_admin_serv0
@@ -86,21 +87,19 @@
 EXTRA_LINKER_FLAGS = -xnorunpath -norunpath -liconv
 
 CONFIGURE_ARGS = $(DIRPATHS)
-CONFIGURE_ARGS_OPT += --with-ldapsdk-inc=/opt/csw/include/dirsrv 
-CONFIGURE_ARGS_OPT += --with-ldapsdk-lib=/opt/csw/lib
-CONFIGURE_ARGS_OPT += --with-icu-inc=/opt/csw/include 
-CONFIGURE_ARGS_OPT += --with-icu-lib=/opt/csw/lib
-CONFIGURE_ARGS_OPT += --with-icu-bin=/opt/csw/bin 
-CONFIGURE_ARGS_OPT += --with-sasl-inc=/opt/csw/include/sasl 
-CONFIGURE_ARGS_OPT += --with-sasl-lib=/opt/csw/lib
-CONFIGURE_ARGS_OPT += --with-nss-lib=/opt/csw/lib
-CONFIGURE_ARGS_OPT += --with-nss-inc=/opt/csw/include/nss 
-CONFIGURE_ARGS_OPT += --with-apxs=/opt/csw/apache2/sbin/apxs
-CONFIGURE_ARGS_OPT += --with-httpd=/opt/csw/apache2/sbin/httpd
-CONFIGURE_ARGS_OPT += --with-modnss-lib=/opt/csw/apache2/libexec
-CONFIGURE_ARGS_OPT += --with-modnss-bin=/opt/csw/apache2/sbin
-CONFIGURE_ARGS_OPT += --disable-threading
-CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARFLAVOR))
+CONFIGURE_ARGS += --with-ldapsdk-inc=/opt/csw/include/dirsrv 
+CONFIGURE_ARGS += --with-ldapsdk-lib=/opt/csw/lib
+CONFIGURE_ARGS += --with-icu-inc=/opt/csw/include 
+CONFIGURE_ARGS += --with-icu-lib=/opt/csw/lib
+CONFIGURE_ARGS += --with-icu-bin=/opt/csw/bin 
+CONFIGURE_ARGS += --with-sasl-inc=/opt/csw/include/sasl 
+CONFIGURE_ARGS += --with-sasl-lib=/opt/csw/lib
+CONFIGURE_ARGS += --with-nss-lib=/opt/csw/lib
+CONFIGURE_ARGS += --with-nss-inc=/opt/csw/include/nss 
+CONFIGURE_ARGS += --with-apxs=/opt/csw/apache2/sbin/apxs
+CONFIGURE_ARGS += --with-httpd=/opt/csw/apache2/sbin/httpd
+CONFIGURE_ARGS += --with-modnss-lib=/opt/csw/apache2/libexec
+CONFIGURE_ARGS += --with-modnss-bin=/opt/csw/apache2/sbin
 
 include gar/category.mk
 

Added: csw/mgar/pkg/389-admin/trunk/files/0004-change-include-preferences-in-Makefile.am.patch
===================================================================
--- csw/mgar/pkg/389-admin/trunk/files/0004-change-include-preferences-in-Makefile.am.patch	                        (rev 0)
+++ csw/mgar/pkg/389-admin/trunk/files/0004-change-include-preferences-in-Makefile.am.patch	2012-01-26 15:34:11 UTC (rev 16917)
@@ -0,0 +1,25 @@
+From 75a3e53349b14539b1d3325af7df7e35b4d5e6d5 Mon Sep 17 00:00:00 2001
+From: Carsten Grzemba <cgrzemba at opencsw.org>
+Date: Thu, 26 Jan 2012 16:12:09 +0100
+Subject: [PATCH] change include preferences in Makefile.am
+
+---
+ Makefile.am |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 25ae853..51327db 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -371,7 +371,7 @@ ds_snmpctrl_LINK = $(MYLINK)
+ 
+ ############## mod_admserv ################
+ mod_admserv_la_SOURCES = mod_admserv/mod_admserv.c
+-mod_admserv_la_CPPFLAGS = -I at apache_inc@ @apr_inc@ $(AM_CPPFLAGS) @extra_cppflags@
++mod_admserv_la_CPPFLAGS = -I at apache_inc@ $(AM_CPPFLAGS) @apr_inc@ @extra_cppflags@
+ mod_admserv_la_LDFLAGS = -module -avoid-version
+ mod_admserv_la_LIBADD = $(DEFAULT_LIBS)
+ mod_admserv_la_LINK = $(MYLINK) $(mod_admserv_la_LDFLAGS)
+-- 
+1.7.8.3
+

Modified: csw/mgar/pkg/389-admin/trunk/files/CSW389admin.preremove
===================================================================
--- csw/mgar/pkg/389-admin/trunk/files/CSW389admin.preremove	2012-01-26 13:25:13 UTC (rev 16916)
+++ csw/mgar/pkg/389-admin/trunk/files/CSW389admin.preremove	2012-01-26 15:34:11 UTC (rev 16917)
@@ -1,4 +1,4 @@
-( cd /etc/opt/csw/dirsrv/adm-serv
+( cd /etc/opt/csw/dirsrv/admin-serv
   cp -p console.conf console.conf.configured
   cp -p httpd.conf httpd.conf.configured
   cp -p admserv.conf admserv.conf.configured

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


From dmichelsen at users.sourceforge.net  Thu Jan 26 17:26:40 2012
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu, 26 Jan 2012 16:26:40 +0000
Subject: [csw-devel] SF.net SVN: gar:[16918] csw/mgar/gar/v2/lib/web
Message-ID: <E1RqS9o-0004WB-Bz@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 16918
          http://gar.svn.sourceforge.net/gar/?rev=16918&view=rev
Author:   dmichelsen
Date:     2012-01-26 16:26:40 +0000 (Thu, 26 Jan 2012)
Log Message:
-----------
python web: Make modpython_gateway.py an external reference and automatically link to it

Modified Paths:
--------------
    csw/mgar/gar/v2/lib/web/README

Added Paths:
-----------
    csw/mgar/gar/v2/lib/web/modpython_gateway.py

Property Changed:
----------------
    csw/mgar/gar/v2/lib/web/


Property changes on: csw/mgar/gar/v2/lib/web
___________________________________________________________________
Added: svn:externals
   + modpython http://svn.aminus.net/misc


Modified: csw/mgar/gar/v2/lib/web/README
===================================================================
--- csw/mgar/gar/v2/lib/web/README	2012-01-26 15:34:11 UTC (rev 16917)
+++ csw/mgar/gar/v2/lib/web/README	2012-01-26 16:26:40 UTC (rev 16918)
@@ -3,7 +3,8 @@
 Configuring scripts with mod_python on Apache:
 
 modpython_gateway.py needs to be downloaded from [1] and put into the
-lib/web/ directory.
+lib/web/ directory. This is done via an external reference in svn
+and pulled in automatically.
 
 [1] http://svn.aminus.net/misc/modpython_gateway.py
 

Added: csw/mgar/gar/v2/lib/web/modpython_gateway.py
===================================================================
--- csw/mgar/gar/v2/lib/web/modpython_gateway.py	                        (rev 0)
+++ csw/mgar/gar/v2/lib/web/modpython_gateway.py	2012-01-26 16:26:40 UTC (rev 16918)
@@ -0,0 +1 @@
+link modpython/modpython_gateway.py
\ No newline at end of file


Property changes on: csw/mgar/gar/v2/lib/web/modpython_gateway.py
___________________________________________________________________
Added: svn:special
   + *

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


From cgrzemba at users.sourceforge.net  Fri Jan 27 10:32:32 2012
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Fri, 27 Jan 2012 09:32:32 +0000
Subject: [csw-devel] SF.net SVN: gar:[16919]
	csw/mgar/pkg/lang-java/389-console/trunk
Message-ID: <E1RqiAa-0002hp-PP@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 16919
          http://gar.svn.sourceforge.net/gar/?rev=16919&view=rev
Author:   cgrzemba
Date:     2012-01-27 09:32:32 +0000 (Fri, 27 Jan 2012)
Log Message:
-----------
lang-java/389-console/trunk: add patch for java version check

Modified Paths:
--------------
    csw/mgar/pkg/lang-java/389-console/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/lang-java/389-console/trunk/files/0001-add-java-version-check-in-389-console.patch

Modified: csw/mgar/pkg/lang-java/389-console/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-java/389-console/trunk/Makefile	2012-01-26 16:26:40 UTC (rev 16918)
+++ csw/mgar/pkg/lang-java/389-console/trunk/Makefile	2012-01-27 09:32:32 UTC (rev 16919)
@@ -17,6 +17,8 @@
 MASTER_SITES = http://port389.org/sources
 DISTFILES  = $(NAME)-$(VERSION).tar.bz2
 
+PATCHFILES += 0001-add-java-version-check-in-389-console.patch
+
 PACKAGING_PLATFORMS = solaris10x
 
 PACKAGES = CSW389-console
@@ -51,7 +53,7 @@
 		-e 's+ at mcclangjar@+idm-console-mcc_en.jar+' \
 		-e 's+ at nmclfjar@+idm-console-nmclf.jar+' \
 		-e 's+ at nmclflangjar@+idm-console-nmclf_en.jar+' \
-		-e 's+ at themejar@+$(NAME).jar+' \
+		-e 's+ at themejar@+$(NAME)_en.jar+' \
 		-e 's+ at classdest@+$(datadir)/java+' \
 		-e 's+ at prefsdir@+389-console+' \
 		-e 's+ at libdir@+$(libdir)+' \

Added: csw/mgar/pkg/lang-java/389-console/trunk/files/0001-add-java-version-check-in-389-console.patch
===================================================================
--- csw/mgar/pkg/lang-java/389-console/trunk/files/0001-add-java-version-check-in-389-console.patch	                        (rev 0)
+++ csw/mgar/pkg/lang-java/389-console/trunk/files/0001-add-java-version-check-in-389-console.patch	2012-01-27 09:32:32 UTC (rev 16919)
@@ -0,0 +1,38 @@
+From 844773a46daf4618d6bdd233d3183d6ac3f247c8 Mon Sep 17 00:00:00 2001
+From: Carsten Grzemba <cgrzemba at opencsw.org>
+Date: Fri, 27 Jan 2012 10:29:18 +0100
+Subject: [PATCH] add java version check in 389-console
+
+---
+ 389-console |    8 +++++++-
+ 1 files changed, 7 insertions(+), 1 deletions(-)
+
+diff --git a/389-console b/389-console
+index cd42ef3..8f06d30 100755
+--- a/389-console
++++ b/389-console
+@@ -25,6 +25,12 @@ then
+   echo "$0: The java program is not in your path, or is not executable.";
+   exit 1
+ fi
++VER=`$JAVA -version 2>&1 | grep version | cut -d. -f2`
++if [ $VER -lt 6 ]; then
++  echo "$0: The java program is not the right version. JDK 1.6 or newer is needed";
++  exit 1
++fi
++
+ 
+ CLASSDEST=@classdest@
+ 
+@@ -39,7 +45,7 @@ fi
+ #
+ # Launch the Console
+ #
+-java \
++$JAVA \
+     -cp @jssjar@:@ldapjdkjar@:$CLASSDEST/@basejar@:$CLASSDEST/@mccjar@:$CLASSDEST/@mcclangjar@:$CLASSDEST/@nmclfjar@:$CLASSDEST/@nmclflangjar@:$CLASSDEST/@themejar@ \
+     -Djava.util.prefs.systemRoot="$HOME/. at prefsdir@" \
+     -Djava.util.prefs.userRoot="$HOME/. at prefsdir@" \
+-- 
+1.7.8.3
+

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


From dmichelsen at users.sourceforge.net  Fri Jan 27 11:21:20 2012
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Fri, 27 Jan 2012 10:21:20 +0000
Subject: [csw-devel] SF.net SVN: gar:[16920]
 csw/mgar/pkg/opencsw-manual/trunk/files/ for-administrators
Message-ID: <E1Rqivo-0001k2-3u@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 16920
          http://gar.svn.sourceforge.net/gar/?rev=16920&view=rev
Author:   dmichelsen
Date:     2012-01-27 10:21:19 +0000 (Fri, 27 Jan 2012)
Log Message:
-----------
opencsw-manaual: Enhance mirroring contents

Modified Paths:
--------------
    csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/bootstrapping.rst
    csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/introduction.rst

Added Paths:
-----------
    csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/glossary.txt

Modified: csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/bootstrapping.rst
===================================================================
--- csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/bootstrapping.rst	2012-01-27 09:32:32 UTC (rev 16919)
+++ csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/bootstrapping.rst	2012-01-27 10:21:19 UTC (rev 16920)
@@ -100,7 +100,7 @@
 
 Then you need to import the public key::
 
-  root# wget -O - http://www.opencsw.org/get-it/mirrors/  | gpg --import -
+  root# wget -O - http://www.opencsw.org/security/  | gpg --import -
   
 The current fingerprint looks like this::
 
@@ -110,6 +110,9 @@
   uid                  OpenCSW catalog signing <board at opencsw.org>
   sub   2048g/971EDE93 2011-08-31
 
+You may also trust the key once you verified the fingerprint::
+  root# /opt/csw/bin/gpg --edit-key board at opencsw.org trust
+
 Now everything is in place for enabling security in ``pkgutil``. Edit the ``/etc/opt/csw/pkgutil.conf``
 and uncomment the two lines with ``use_gpg`` and ``use_md5`` so they look like this::
 
@@ -138,3 +141,66 @@
   ==> 3173 packages loaded from /var/opt/csw/pkgutil/catalog.mirror_opencsw_current_sparc_5.10
   ...
 
+
+--------------------
+Package dependencies
+--------------------
+
+The OpenCSW packages have been compiled to allow easy forward migration and
+crossgrades/mixing between Sparc and x64 CPUs. That means the same version of the
+package is available for Solaris 10 and 11 for both Sparc and i386. There are
+some exceptions where the software is absolutely not available or has a version
+mismatch (e.g. acroread). To allow this there are usually no dependencies to
+SUNW packages. This sometimes leads to large dependency chains (and people
+thinking of OpenCSW packages as "bloated") but that is the price to pay for
+the interoperability and we feel that in times of ever growing disks the
+flexibility is worth more than the saved bytes.
+
+Package dependencies are modeled in the OpenCSW `catalog`_s" to allow automatic
+dependency resolution via pkgutil. To view the current dependencies for a
+package you can use
+::
+  pkgutil --deptree <pkg>
+
+
+Solaris 9/10/11 sparc vs. i386
+packaging strategy IPS may change
+graphviz tree
+pkgutil --deptree
+
+TBD: Identify packages depending on obsolete ones
+
+
+---------------------------
+Setting up a private mirror
+---------------------------
+
+Sometimes it is sufficient to just go on with a mirror on the internet. However, there are situations
+where a local mirror can be useful. When you have a lot of servers accessing the repository, want to control
+the package updates exactly or when your production servers just can't access the internet at all
+a local mirror is necessary.
+
+To set up the mirror you should use rsync as it can update your local copy quickly and with low
+bandwidth use and also preserves hardlinks. Not all mirrors provide access via the rsync protocol,
+a list can be found at http://www.opencsw.org/get-it/mirrors/ .
+To make a full copy of the OpenCSW repository use this::
+
+  pkgutil -y -i rsync
+  rsync -aH --delete rsync://rsync.opencsw.org/opencsw /my/server/repo
+
+The directory ``repo`` can either be shared via HTTP or via NFS to the pkgutil clients.
+Use http://myserver/url-to-repo/ for HTTP and file:///myserver/dir-to-repo for NFS as
+mirror option in pkgutil.
+
+
+Mirroring only a subset
+=======================
+
+You can also mirror only a subset of the repository, e.g. the 'unstable' catalog or even
+just a few packages.
+
+pkgutil --stream
+
+
+Layout of the mirror
+====================

Added: csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/glossary.txt
===================================================================
--- csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/glossary.txt	                        (rev 0)
+++ csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/glossary.txt	2012-01-27 10:21:19 UTC (rev 16920)
@@ -0,0 +1,8 @@
+--------
+Glossary
+--------
+
+catalog
+
+A catalog contains a list of packages together with their catalog names, version, checksum
+and a list of dependencies to other packages.

Modified: csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/introduction.rst
===================================================================
--- csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/introduction.rst	2012-01-27 09:32:32 UTC (rev 16919)
+++ csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/introduction.rst	2012-01-27 10:21:19 UTC (rev 16920)
@@ -2,5 +2,13 @@
 Introduction
 ------------
 
+System administrators have to work with software every day. Solaris brings
+more and more programs with every release. However, the world of open source is
+big and there is always missing something. OpenCSW fills this gap by providing
+a large amount of precompiled software and open source build recipes.
+The p\xC3ackages can be installed comfortably with automatic dependency resolution
+but require root access to the machine. If you really want to compile your
+own software the build recipes are available for all packages too.
+
 Solaris 10 is fully supported whereas Solaris 8 and 9 are best effort
 and only get sporadic updates.

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


From dmichelsen at users.sourceforge.net  Fri Jan 27 13:38:41 2012
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Fri, 27 Jan 2012 12:38:41 +0000
Subject: [csw-devel] SF.net SVN: gar:[16921] csw/mgar/pkg/rbgems/Makefile
Message-ID: <E1Rql4i-0007gB-W5@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 16921
          http://gar.svn.sourceforge.net/gar/?rev=16921&view=rev
Author:   dmichelsen
Date:     2012-01-27 12:38:40 +0000 (Fri, 27 Jan 2012)
Log Message:
-----------
rbgems: Adjust newpkg for gems for mgar layout

Modified Paths:
--------------
    csw/mgar/pkg/rbgems/Makefile

Modified: csw/mgar/pkg/rbgems/Makefile
===================================================================
--- csw/mgar/pkg/rbgems/Makefile	2012-01-27 10:21:19 UTC (rev 16920)
+++ csw/mgar/pkg/rbgems/Makefile	2012-01-27 12:38:40 UTC (rev 16921)
@@ -34,10 +34,10 @@
 	@svn mkdir $(dir) $(dir)/tags $(dir)/branches $(dir)/trunk $(dir)/trunk/files
 	@svn cp ../template/Makefile $(dir)/Makefile
 	@echo "work\n" | svn propset svn:ignore -F /dev/fd/0 $(dir)/trunk
-	@(cd $(dir)/trunk/; gem fetch $*; gar/bin/gem2pkg *gem > Makefile; rm *gem)
-	@( cd $(dir)/trunk; gmake fetch; gmake makesums; gmake garchive );
+	@(cd $(dir)/trunk/; gem fetch $*; ../../../.buildsys/v2/gar/bin/gem2pkg *gem > Makefile; rm *gem)
+	@#( cd $(dir)/trunk; gmake fetch; gmake makesums; gmake garchive );
+	@touch $(dir)/trunk/checksums
 	@svn add $(dir)/trunk/Makefile $(dir)/trunk/checksums
-	@echo "work\n" | svn propset svn:ignore -F /dev/fd/0 $(dir)/trunk
 	@echo
 	@echo "Your package is set up for editing at $(dir)/trunk"
 

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


From cgrzemba at users.sourceforge.net  Fri Jan 27 14:32:13 2012
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Fri, 27 Jan 2012 13:32:13 +0000
Subject: [csw-devel] SF.net SVN: gar:[16922]
	csw/mgar/pkg/mozldap/trunk/Makefile
Message-ID: <E1RqluX-0001wF-RE@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 16922
          http://gar.svn.sourceforge.net/gar/?rev=16922&view=rev
Author:   cgrzemba
Date:     2012-01-27 13:32:13 +0000 (Fri, 27 Jan 2012)
Log Message:
-----------
mozldap/trunk: update dependency sasl2-2

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

Modified: csw/mgar/pkg/mozldap/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mozldap/trunk/Makefile	2012-01-27 12:38:40 UTC (rev 16921)
+++ csw/mgar/pkg/mozldap/trunk/Makefile	2012-01-27 13:32:13 UTC (rev 16922)
@@ -38,7 +38,7 @@
 PKGFILES_CSWlibldap60 += $(call baseisadirs,$(libdir),libldap60\.so)
 PKGFILES_CSWlibldap60 += $(call baseisadirs,$(libdir),libldap60\.so(\.\d+)*)
 SPKG_DESC_CSWlibldap60 += $(DESCRIPTION), libldap60.so
-RUNTIME_DEP_PKGS_CSWlibldap60 += CSWsasl
+RUNTIME_DEP_PKGS_CSWlibldap60 += CSWsasl2-2
 CHECKPKG_OVERRIDES_CSWlibldap60 += soname-equals-filename|file=/opt/csw/lib/libldap60.so
 CHECKPKG_OVERRIDES_CSWlibldap60 += soname-equals-filename|file=/opt/csw/lib/sparcv9/libldap60.so
 CHECKPKG_OVERRIDES_CSWlibldap60 += soname-equals-filename|file=/opt/csw/lib/amd64/libldap60.so
@@ -102,7 +102,7 @@
 RUNTIME_DEP_PKGS_CSWmozldap-tools += CSWlibnss3
 RUNTIME_DEP_PKGS_CSWmozldap-tools += CSWlibplc4
 RUNTIME_DEP_PKGS_CSWmozldap-tools += CSWlibsvrcore0
-RUNTIME_DEP_PKGS_CSWmozldap-tools += CSWsasl
+RUNTIME_DEP_PKGS_CSWmozldap-tools += CSWsasl2-2
 RUNTIME_DEP_PKGS_CSWmozldap-tools += CSWlibplds4
 RUNTIME_DEP_PKGS_CSWmozldap-tools += CSWlibiconv2
 # it not depends on oldapclient!

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


From cgrzemba at users.sourceforge.net  Fri Jan 27 14:51:31 2012
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Fri, 27 Jan 2012 13:51:31 +0000
Subject: [csw-devel] SF.net SVN: gar:[16923]
	csw/mgar/pkg/mozldap/trunk/Makefile
Message-ID: <E1RqmDD-0002O6-Iv@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 16923
          http://gar.svn.sourceforge.net/gar/?rev=16923&view=rev
Author:   cgrzemba
Date:     2012-01-27 13:51:31 +0000 (Fri, 27 Jan 2012)
Log Message:
-----------
mozldap/trunk: update dependencies

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

Modified: csw/mgar/pkg/mozldap/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mozldap/trunk/Makefile	2012-01-27 13:32:13 UTC (rev 16922)
+++ csw/mgar/pkg/mozldap/trunk/Makefile	2012-01-27 13:51:31 UTC (rev 16923)
@@ -38,7 +38,7 @@
 PKGFILES_CSWlibldap60 += $(call baseisadirs,$(libdir),libldap60\.so)
 PKGFILES_CSWlibldap60 += $(call baseisadirs,$(libdir),libldap60\.so(\.\d+)*)
 SPKG_DESC_CSWlibldap60 += $(DESCRIPTION), libldap60.so
-RUNTIME_DEP_PKGS_CSWlibldap60 += CSWsasl2-2
+RUNTIME_DEP_PKGS_CSWlibldap60 += CSWlibsasl2-2
 CHECKPKG_OVERRIDES_CSWlibldap60 += soname-equals-filename|file=/opt/csw/lib/libldap60.so
 CHECKPKG_OVERRIDES_CSWlibldap60 += soname-equals-filename|file=/opt/csw/lib/sparcv9/libldap60.so
 CHECKPKG_OVERRIDES_CSWlibldap60 += soname-equals-filename|file=/opt/csw/lib/amd64/libldap60.so
@@ -76,6 +76,9 @@
 RUNTIME_DEP_PKGS_CSWlibssldap60 += CSWlibplds4
 RUNTIME_DEP_PKGS_CSWlibssldap60 += CSWlibldap60
 RUNTIME_DEP_PKGS_CSWlibssldap60 += CSWlibprldap60
+RUNTIME_DEP_PKGS_CSWlibssldap60 += CSWlibsoftokn3
+RUNTIME_DEP_PKGS_CSWlibssldap60 += CSWlibssl3
+
 CHECKPKG_OVERRIDES_CSWlibssldap60 += soname-equals-filename|file=/opt/csw/lib/libssldap60.so
 CHECKPKG_OVERRIDES_CSWlibssldap60 += soname-equals-filename|file=/opt/csw/lib/sparcv9/libssldap60.so
 CHECKPKG_OVERRIDES_CSWlibssldap60 += soname-equals-filename|file=/opt/csw/lib/amd64/libssldap60.so
@@ -102,9 +105,11 @@
 RUNTIME_DEP_PKGS_CSWmozldap-tools += CSWlibnss3
 RUNTIME_DEP_PKGS_CSWmozldap-tools += CSWlibplc4
 RUNTIME_DEP_PKGS_CSWmozldap-tools += CSWlibsvrcore0
-RUNTIME_DEP_PKGS_CSWmozldap-tools += CSWsasl2-2
 RUNTIME_DEP_PKGS_CSWmozldap-tools += CSWlibplds4
 RUNTIME_DEP_PKGS_CSWmozldap-tools += CSWlibiconv2
+RUNTIME_DEP_PKGS_CSWmozldap-tools += CSWlibsoftokn3
+RUNTIME_DEP_PKGS_CSWmozldap-tools += CSWlibssl3
+RUNTIME_DEP_PKGS_CSWmozldap-tools += CSWlibsasl2-2
 # it not depends on oldapclient!
 CHECKPKG_OVERRIDES_CSWmozldap-tools += missing-dependency|CSWoldapclient
 

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


From cgrzemba at users.sourceforge.net  Fri Jan 27 16:04:58 2012
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Fri, 27 Jan 2012 15:04:58 +0000
Subject: [csw-devel] SF.net SVN: gar:[16924]
	csw/mgar/pkg/389-dsgw/trunk/Makefile
Message-ID: <E1RqnMI-0001G7-Sj@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 16924
          http://gar.svn.sourceforge.net/gar/?rev=16924&view=rev
Author:   cgrzemba
Date:     2012-01-27 15:04:58 +0000 (Fri, 27 Jan 2012)
Log Message:
-----------
389-dsgw/trunk: update dependencies

Modified Paths:
--------------
    csw/mgar/pkg/389-dsgw/trunk/Makefile

Modified: csw/mgar/pkg/389-dsgw/trunk/Makefile
===================================================================
--- csw/mgar/pkg/389-dsgw/trunk/Makefile	2012-01-27 13:51:31 UTC (rev 16923)
+++ csw/mgar/pkg/389-dsgw/trunk/Makefile	2012-01-27 15:04:58 UTC (rev 16924)
@@ -39,6 +39,9 @@
 RUNTIME_DEP_PKGS_CSW389-dsgw += CSWlibnss3
 RUNTIME_DEP_PKGS_CSW389-dsgw += CSWlibplds4
 RUNTIME_DEP_PKGS_CSW389-dsgw += CSWlibssldap60
+RUNTIME_DEP_PKGS_CSW389-dsgw += CSWlibsoftokn3
+RUNTIME_DEP_PKGS_CSW389-dsgw += CSWlibsmime3
+RUNTIME_DEP_PKGS_CSW389-dsgw += CSWlibssl3
 CHECKPKG_OVERRIDES_CSW389-dsgw += file-with-bad-content|/usr/local|root/opt/csw/share/dirsrv/manual/en/dsgw/attribut.htm
 
 PATCHFILES += 0001-change-include-path-preference-in-Makefile.am.patch

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


From chninkel at users.sourceforge.net  Fri Jan 27 21:37:42 2012
From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net)
Date: Fri, 27 Jan 2012 20:37:42 +0000
Subject: [csw-devel] SF.net SVN: gar:[16925]
	csw/mgar/pkg/openssl/trunk/Makefile
Message-ID: <E1RqsYI-00085y-S0@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 16925
          http://gar.svn.sourceforge.net/gar/?rev=16925&view=rev
Author:   chninkel
Date:     2012-01-27 20:37:42 +0000 (Fri, 27 Jan 2012)
Log Message:
-----------
openssl: enable hardware crypto acceleration support

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

Modified: csw/mgar/pkg/openssl/trunk/Makefile
===================================================================
--- csw/mgar/pkg/openssl/trunk/Makefile	2012-01-27 15:04:58 UTC (rev 16924)
+++ csw/mgar/pkg/openssl/trunk/Makefile	2012-01-27 20:37:42 UTC (rev 16925)
@@ -11,7 +11,7 @@
 #####################################################################
 
 # Uncomment to enable PKCS11 engine
-# PKCS11 = 1
+PKCS11 = 1
 
 ###### Package information #######
 

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


From rthurner at users.sourceforge.net  Sun Jan 29 05:55:43 2012
From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net)
Date: Sun, 29 Jan 2012 04:55:43 +0000
Subject: [csw-devel] SF.net SVN: gar:[16926] csw/mgar/pkg/trac/trunk
Message-ID: <E1RrMnn-00041F-4K@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 16926
          http://gar.svn.sourceforge.net/gar/?rev=16926&view=rev
Author:   rthurner
Date:     2012-01-29 04:55:42 +0000 (Sun, 29 Jan 2012)
Log Message:
-----------
trac: upgrade to 0.12.2

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

Modified: csw/mgar/pkg/trac/trunk/Makefile
===================================================================
--- csw/mgar/pkg/trac/trunk/Makefile	2012-01-27 20:37:42 UTC (rev 16925)
+++ csw/mgar/pkg/trac/trunk/Makefile	2012-01-29 04:55:42 UTC (rev 16926)
@@ -1,7 +1,7 @@
 # $Id$
 
 NAME = Trac
-VERSION = 0.12.1
+VERSION = 0.12.2
 CATEGORIES = python
 GARTYPE = v2
 

Modified: csw/mgar/pkg/trac/trunk/checksums
===================================================================
--- csw/mgar/pkg/trac/trunk/checksums	2012-01-27 20:37:42 UTC (rev 16925)
+++ csw/mgar/pkg/trac/trunk/checksums	2012-01-29 04:55:42 UTC (rev 16926)
@@ -1 +1 @@
-35a9c53ec35466b24a535d19bb6cdfa2  Trac-0.12.1.tar.gz
+f70c7676601f2592bcb7871319e62dd7  Trac-0.12.2.tar.gz

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


From rthurner at users.sourceforge.net  Sun Jan 29 06:19:36 2012
From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net)
Date: Sun, 29 Jan 2012 05:19:36 +0000
Subject: [csw-devel] SF.net SVN: gar:[16927] csw/mgar/pkg/trac/trunk/Makefile
Message-ID: <E1RrNAu-0004UB-He@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 16927
          http://gar.svn.sourceforge.net/gar/?rev=16927&view=rev
Author:   rthurner
Date:     2012-01-29 05:19:36 +0000 (Sun, 29 Jan 2012)
Log Message:
-----------
trac-0.12.2, checkpkg adjustments

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

Modified: csw/mgar/pkg/trac/trunk/Makefile
===================================================================
--- csw/mgar/pkg/trac/trunk/Makefile	2012-01-29 04:55:42 UTC (rev 16926)
+++ csw/mgar/pkg/trac/trunk/Makefile	2012-01-29 05:19:36 UTC (rev 16927)
@@ -31,6 +31,16 @@
 CHECKPKG_OVERRIDES_CSWtrac += surplus-dependency|CSWpysetuptools
 CHECKPKG_OVERRIDES_CSWtrac += surplus-dependency|CSWgenshi
 CHECKPKG_OVERRIDES_CSWtrac += surplus-dependency|CSWpythonsvn
+CHECKPKG_OVERRIDES_CSWtrac += file-with-bad-content|/usr/local|root/opt/csw/share/doc/trac/contrib/bugzilla2trac.py
+CHECKPKG_OVERRIDES_CSWtrac += file-with-bad-content|/usr/local|root/opt/csw/share/doc/trac/contrib/trac-svn-hook
+CHECKPKG_OVERRIDES_CSWtrac += file-with-bad-content|/usr/local|root/opt/csw/lib/python/site-packages/trac/wiki/default-pages/TracModPython
+CHECKPKG_OVERRIDES_CSWtrac += file-with-bad-content|/usr/local|root/opt/csw/lib/python/site-packages/trac/wiki/default-pages/TracPlugins
+CHECKPKG_OVERRIDES_CSWtrac += file-with-bad-content|/usr/local|root/opt/csw/lib/python/site-packages/trac/wiki/default-pages/TracModWSGI
+CHECKPKG_OVERRIDES_CSWtrac += file-with-bad-content|/usr/local|root/opt/csw/lib/python/site-packages/trac/wiki/default-pages/TracFineGrainedPermissions
+CHECKPKG_OVERRIDES_CSWtrac += file-with-bad-content|/usr/local|root/opt/csw/lib/python/site-packages/trac/wiki/default-pages/TracInstall
+CHECKPKG_OVERRIDES_CSWtrac += file-with-bad-content|/usr/share|root/opt/csw/lib/python/site-packages/trac/wiki/default-pages/TracModPython
+CHECKPKG_OVERRIDES_CSWtrac += file-with-bad-content|/usr/share|root/opt/csw/lib/python/site-packages/trac/wiki/default-pages/TracFastCgi
+CHECKPKG_OVERRIDES_CSWtrac += file-with-bad-content|/usr/share|root/opt/csw/lib/python/site-packages/trac/wiki/default-pages/TracInstall
 
 
 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  Sun Jan 29 06:31:55 2012
From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net)
Date: Sun, 29 Jan 2012 05:31:55 +0000
Subject: [csw-devel] SF.net SVN: gar:[16928]
	csw/mgar/pkg/lang-python/subvertpy/trunk
Message-ID: <E1RrNMp-0004kB-Ae@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 16928
          http://gar.svn.sourceforge.net/gar/?rev=16928&view=rev
Author:   rthurner
Date:     2012-01-29 05:31:55 +0000 (Sun, 29 Jan 2012)
Log Message:
-----------
subvertpy: upgrade to 0.8.10

Modified Paths:
--------------
    csw/mgar/pkg/lang-python/subvertpy/trunk/Makefile
    csw/mgar/pkg/lang-python/subvertpy/trunk/checksums

Modified: csw/mgar/pkg/lang-python/subvertpy/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-python/subvertpy/trunk/Makefile	2012-01-29 05:19:36 UTC (rev 16927)
+++ csw/mgar/pkg/lang-python/subvertpy/trunk/Makefile	2012-01-29 05:31:55 UTC (rev 16928)
@@ -1,7 +1,7 @@
 # $Id$
 #
 NAME = subvertpy
-VERSION = 0.8.9
+VERSION = 0.8.10
 GARTYPE = v2
 CATEGORIES = python
 

Modified: csw/mgar/pkg/lang-python/subvertpy/trunk/checksums
===================================================================
--- csw/mgar/pkg/lang-python/subvertpy/trunk/checksums	2012-01-29 05:19:36 UTC (rev 16927)
+++ csw/mgar/pkg/lang-python/subvertpy/trunk/checksums	2012-01-29 05:31:55 UTC (rev 16928)
@@ -1 +1 @@
-e6f9e33bd93269897461dae87cffbfd4  subvertpy-0.8.9.tar.gz
+e8a762128ff5f656fd5488e3d14a8516  subvertpy-0.8.10.tar.gz

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


From rthurner at users.sourceforge.net  Sun Jan 29 06:55:53 2012
From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net)
Date: Sun, 29 Jan 2012 05:55:53 +0000
Subject: [csw-devel] SF.net SVN: gar:[16929]
	csw/mgar/pkg/subversion/trunk/Makefile
Message-ID: <E1RrNk1-0005D8-Hg@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 16929
          http://gar.svn.sourceforge.net/gar/?rev=16929&view=rev
Author:   rthurner
Date:     2012-01-29 05:55:53 +0000 (Sun, 29 Jan 2012)
Log Message:
-----------
subverison, place python files in csw std dir

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

Modified: csw/mgar/pkg/subversion/trunk/Makefile
===================================================================
--- csw/mgar/pkg/subversion/trunk/Makefile	2012-01-29 05:31:55 UTC (rev 16928)
+++ csw/mgar/pkg/subversion/trunk/Makefile	2012-01-29 05:55:53 UTC (rev 16929)
@@ -371,7 +371,7 @@
 		$(WORKSRC)/subversion/bindings/swig/python/*.c \
 		$(WORKSRC)/subversion/bindings/swig/python/*.py
 	@$(BUILD_ENV)   gmake -C $(WORKSRC) swig-py
-	@$(INSTALL_ENV) gmake -C $(WORKSRC) install-swig-py 
+	@$(INSTALL_ENV) gmake -C $(WORKSRC) install-swig-py DESTDIR=$(DESTDIR)
 	#@$(TEST_ENV)    gmake -C $(WORKSRC) check-swig-py
 	@$(MAKECOOKIE)
 

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


From rthurner at users.sourceforge.net  Sun Jan 29 07:10:37 2012
From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net)
Date: Sun, 29 Jan 2012 06:10:37 +0000
Subject: [csw-devel] SF.net SVN: gar:[16930]
	csw/mgar/pkg/subversion/trunk/Makefile
Message-ID: <E1RrNyH-0007fX-Om@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 16930
          http://gar.svn.sourceforge.net/gar/?rev=16930&view=rev
Author:   rthurner
Date:     2012-01-29 06:10:37 +0000 (Sun, 29 Jan 2012)
Log Message:
-----------
subversion: use $\(libdir<)/python as destdir for swig install

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

Modified: csw/mgar/pkg/subversion/trunk/Makefile
===================================================================
--- csw/mgar/pkg/subversion/trunk/Makefile	2012-01-29 05:55:53 UTC (rev 16929)
+++ csw/mgar/pkg/subversion/trunk/Makefile	2012-01-29 06:10:37 UTC (rev 16930)
@@ -371,7 +371,7 @@
 		$(WORKSRC)/subversion/bindings/swig/python/*.c \
 		$(WORKSRC)/subversion/bindings/swig/python/*.py
 	@$(BUILD_ENV)   gmake -C $(WORKSRC) swig-py
-	@$(INSTALL_ENV) gmake -C $(WORKSRC) install-swig-py DESTDIR=$(DESTDIR)
+	@$(INSTALL_ENV) gmake -C $(WORKSRC) install-swig-py DESTDIR=$(libdir)/python
 	#@$(TEST_ENV)    gmake -C $(WORKSRC) check-swig-py
 	@$(MAKECOOKIE)
 

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


From rthurner at users.sourceforge.net  Sun Jan 29 11:34:59 2012
From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net)
Date: Sun, 29 Jan 2012 10:34:59 +0000
Subject: [csw-devel] SF.net SVN: gar:[16931] csw/mgar/pkg/lzip/trunk
Message-ID: <E1RrS67-0002ul-9V@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 16931
          http://gar.svn.sourceforge.net/gar/?rev=16931&view=rev
Author:   rthurner
Date:     2012-01-29 10:34:59 +0000 (Sun, 29 Jan 2012)
Log Message:
-----------
lzip, upgrade to 1.12

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

Modified: csw/mgar/pkg/lzip/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lzip/trunk/Makefile	2012-01-29 06:10:37 UTC (rev 16930)
+++ csw/mgar/pkg/lzip/trunk/Makefile	2012-01-29 10:34:59 UTC (rev 16931)
@@ -1,5 +1,5 @@
 NAME = lzip
-VERSION = 1.11
+VERSION = 1.12
 CATEGORIES = utils
 GARTYPE = v2
 

Modified: csw/mgar/pkg/lzip/trunk/checksums
===================================================================
--- csw/mgar/pkg/lzip/trunk/checksums	2012-01-29 06:10:37 UTC (rev 16930)
+++ csw/mgar/pkg/lzip/trunk/checksums	2012-01-29 10:34:59 UTC (rev 16931)
@@ -1 +1 @@
-ba9d0a705e47bcd2b73145d238aa7b58  lzip-1.11.tar.gz
+69a40172db5ce896b58d862c50fcd517  lzip-1.12.tar.gz

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


From rthurner at users.sourceforge.net  Sun Jan 29 11:49:31 2012
From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net)
Date: Sun, 29 Jan 2012 10:49:31 +0000
Subject: [csw-devel] SF.net SVN: gar:[16932]
	csw/mgar/pkg/subversion/trunk/Makefile
Message-ID: <E1RrSKB-0007W7-C9@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 16932
          http://gar.svn.sourceforge.net/gar/?rev=16932&view=rev
Author:   rthurner
Date:     2012-01-29 10:49:31 +0000 (Sun, 29 Jan 2012)
Log Message:
-----------
subversion, adjust checkpkg

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

Modified: csw/mgar/pkg/subversion/trunk/Makefile
===================================================================
--- csw/mgar/pkg/subversion/trunk/Makefile	2012-01-29 10:34:59 UTC (rev 16931)
+++ csw/mgar/pkg/subversion/trunk/Makefile	2012-01-29 10:49:31 UTC (rev 16932)
@@ -54,7 +54,7 @@
 CATALOGNAME_CSWsvn         = subversion
 CHECKPKG_OVERRIDES_CSWsvn += catalogname-does-not-match-pkgname|pkgname=CSWsvn|catalogname=subversion|expected-catalogname=svn
 RUNTIME_DEP_PKGS_CSWsvn      = CSWbdb48
-RUNTIME_DEP_PKGS_CSWsvn      += CSWsasl
+RUNTIME_DEP_PKGS_CSWsvn      += CSWlibsasl2-2
 RUNTIME_DEP_PKGS_CSWsvn += CSWlibmagic1
 RUNTIME_DEP_PKGS_CSWsvn += CSWlibsqlite3-0
 RUNTIME_DEP_PKGS_CSWsvn += CSWlibexpat1
@@ -64,7 +64,7 @@
 RUNTIME_DEP_PKGS_CSWsvn += CSWlibapr1-0
 RUNTIME_DEP_PKGS_CSWsvn += CSWlibaprutil1-0
 RUNTIME_DEP_PKGS_CSWsvn += CSWlibneon27
-RUNTIME_DEP_PKGS_CSWsvn += CSWosslrt
+RUNTIME_DEP_PKGS_CSWsvn += CSWlibssl0-9-8
 RUNTIME_DEP_PKGS_CSWsvn += CSWlibgnome-keyring0
 RUNTIME_DEP_PKGS_CSWsvn += CSWlibdbus1-3
 RUNTIME_DEP_PKGS_CSWsvn += CSWlibglib2-0-0
@@ -129,8 +129,8 @@
 RUNTIME_DEP_PKGS_CSWjavasvn += CSWlibneon27
 RUNTIME_DEP_PKGS_CSWjavasvn += CSWlibsqlite3-0
 RUNTIME_DEP_PKGS_CSWjavasvn += CSWlibz1
-RUNTIME_DEP_PKGS_CSWjavasvn += CSWosslrt
-RUNTIME_DEP_PKGS_CSWjavasvn += CSWsasl
+RUNTIME_DEP_PKGS_CSWjavasvn += CSWlibssl0-9-8
+RUNTIME_DEP_PKGS_CSWjavasvn += CSWlibsasl2-2
 RUNTIME_DEP_PKGS_CSWjavasvn += CSWsvn
 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
@@ -176,8 +176,8 @@
 RUNTIME_DEP_PKGS_CSWrbsvn += CSWlibruby18-1
 RUNTIME_DEP_PKGS_CSWrbsvn += CSWlibsqlite3-0
 RUNTIME_DEP_PKGS_CSWrbsvn += CSWlibz1
-RUNTIME_DEP_PKGS_CSWrbsvn += CSWosslrt
-RUNTIME_DEP_PKGS_CSWrbsvn += CSWsasl
+RUNTIME_DEP_PKGS_CSWrbsvn += CSWlibssl0-9-8
+RUNTIME_DEP_PKGS_CSWrbsvn += CSWlibsasl2-2
 
 
 PACKAGES += CSWpythonsvn
@@ -187,24 +187,6 @@
 PKGFILES_CSWpythonsvn            = $(SVNLIB)/python.*
 PKGFILES_CSWpythonsvn           += $(SVNLIB)/.*swig_py.*
 PKGFILES_CSWpythonsvn           += $(docdir)/$(CATALOGNAME_CSWpythonsvn)/changelog.CSW
-CHECKPKG_OVERRIDES_CSWpythonsvn += discouraged-path-in-pkgmap|/opt/csw/lib/svn/python/site-packages/svn/repos.pyc
-CHECKPKG_OVERRIDES_CSWpythonsvn += discouraged-path-in-pkgmap|/opt/csw/lib/svn/python/site-packages/svn/wc.pyc
-CHECKPKG_OVERRIDES_CSWpythonsvn += discouraged-path-in-pkgmap|/opt/csw/lib/svn/python/site-packages/libsvn/__init__.pyc
-CHECKPKG_OVERRIDES_CSWpythonsvn += discouraged-path-in-pkgmap|/opt/csw/lib/svn/python/site-packages/libsvn/client.pyc
-CHECKPKG_OVERRIDES_CSWpythonsvn += discouraged-path-in-pkgmap|/opt/csw/lib/svn/python/site-packages/libsvn/core.pyc
-CHECKPKG_OVERRIDES_CSWpythonsvn += discouraged-path-in-pkgmap|/opt/csw/lib/svn/python/site-packages/libsvn/delta.pyc
-CHECKPKG_OVERRIDES_CSWpythonsvn += discouraged-path-in-pkgmap|/opt/csw/lib/svn/python/site-packages/libsvn/diff.pyc
-CHECKPKG_OVERRIDES_CSWpythonsvn += discouraged-path-in-pkgmap|/opt/csw/lib/svn/python/site-packages/libsvn/fs.pyc
-CHECKPKG_OVERRIDES_CSWpythonsvn += discouraged-path-in-pkgmap|/opt/csw/lib/svn/python/site-packages/libsvn/ra.pyc
-CHECKPKG_OVERRIDES_CSWpythonsvn += discouraged-path-in-pkgmap|/opt/csw/lib/svn/python/site-packages/libsvn/repos.pyc
-CHECKPKG_OVERRIDES_CSWpythonsvn += discouraged-path-in-pkgmap|/opt/csw/lib/svn/python/site-packages/libsvn/wc.pyc
-CHECKPKG_OVERRIDES_CSWpythonsvn += discouraged-path-in-pkgmap|/opt/csw/lib/svn/python/site-packages/svn/__init__.pyc
-CHECKPKG_OVERRIDES_CSWpythonsvn += discouraged-path-in-pkgmap|/opt/csw/lib/svn/python/site-packages/svn/client.pyc
-CHECKPKG_OVERRIDES_CSWpythonsvn += discouraged-path-in-pkgmap|/opt/csw/lib/svn/python/site-packages/svn/core.pyc
-CHECKPKG_OVERRIDES_CSWpythonsvn += discouraged-path-in-pkgmap|/opt/csw/lib/svn/python/site-packages/svn/delta.pyc
-CHECKPKG_OVERRIDES_CSWpythonsvn += discouraged-path-in-pkgmap|/opt/csw/lib/svn/python/site-packages/svn/diff.pyc
-CHECKPKG_OVERRIDES_CSWpythonsvn += discouraged-path-in-pkgmap|/opt/csw/lib/svn/python/site-packages/svn/fs.pyc
-CHECKPKG_OVERRIDES_CSWpythonsvn += discouraged-path-in-pkgmap|/opt/csw/lib/svn/python/site-packages/svn/ra.pyc
 RUNTIME_DEP_PKGS_CSWpythonsvn += CSWlibmagic1
 RUNTIME_DEP_PKGS_CSWpythonsvn += CSWlibiconv2
 RUNTIME_DEP_PKGS_CSWpythonsvn += CSWlibexpat1
@@ -214,10 +196,10 @@
 RUNTIME_DEP_PKGS_CSWpythonsvn += CSWsvn
 RUNTIME_DEP_PKGS_CSWpythonsvn += CSWbdb48
 RUNTIME_DEP_PKGS_CSWpythonsvn += CSWlibaprutil1-0
-RUNTIME_DEP_PKGS_CSWpythonsvn += CSWsasl
+RUNTIME_DEP_PKGS_CSWpythonsvn += CSWlibsasl2-2
 RUNTIME_DEP_PKGS_CSWpythonsvn += CSWlibneon27
 RUNTIME_DEP_PKGS_CSWpythonsvn += CSWlibsqlite3-0
-RUNTIME_DEP_PKGS_CSWpythonsvn += CSWosslrt
+RUNTIME_DEP_PKGS_CSWpythonsvn += CSWlibssl0-9-8
 RUNTIME_DEP_PKGS_CSWpythonsvn += CSWpython
 
 
@@ -371,7 +353,7 @@
 		$(WORKSRC)/subversion/bindings/swig/python/*.c \
 		$(WORKSRC)/subversion/bindings/swig/python/*.py
 	@$(BUILD_ENV)   gmake -C $(WORKSRC) swig-py
-	@$(INSTALL_ENV) gmake -C $(WORKSRC) install-swig-py DESTDIR=$(libdir)/python
+	@$(INSTALL_ENV) gmake -C $(WORKSRC) install-swig-py DESTDIR=$(DESTDIR)/lib/python
 	#@$(TEST_ENV)    gmake -C $(WORKSRC) check-swig-py
 	@$(MAKECOOKIE)
 

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


From guengel at users.sourceforge.net  Sun Jan 29 22:14:02 2012
From: guengel at users.sourceforge.net (guengel at users.sourceforge.net)
Date: Sun, 29 Jan 2012 21:14:02 +0000
Subject: [csw-devel] SF.net SVN: gar:[16933] csw/mgar/pkg/glib2/trunk
Message-ID: <E1Rrc4Y-0002n5-Qb@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 16933
          http://gar.svn.sourceforge.net/gar/?rev=16933&view=rev
Author:   guengel
Date:     2012-01-29 21:14:02 +0000 (Sun, 29 Jan 2012)
Log Message:
-----------
glib2/trunk: Commenced working on glib 2.30.2

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

Added Paths:
-----------
    csw/mgar/pkg/glib2/trunk/files/0001-Disable-inf-nan-mini-test.patch

Modified: csw/mgar/pkg/glib2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/glib2/trunk/Makefile	2012-01-29 10:49:31 UTC (rev 16932)
+++ csw/mgar/pkg/glib2/trunk/Makefile	2012-01-29 21:14:02 UTC (rev 16933)
@@ -6,10 +6,11 @@
 # should make it pass, though. --raos
 
 NAME = glib
-VERSION = 2.28.8
+VERSION = 2.30.2
 CATEGORIES = lib
 GARTYPE = v2
 GARCOMPILER = SOS12U1
+GARFLAVOR=DBG
 
 DESCRIPTION = The GLib library of C routines.
 define BLURB
@@ -22,40 +23,43 @@
 
 DISTFILES = $(NAME)-$(VERSION).tar.bz2
 
-PATCHFILES = 0001-Use-proper-locale-for-collate-tests.patch
-PATCHFILES += 0002-Make-glib-work-with-zoneinfo-version-1.patch
-PATCHFILES += 0003-Ad-hoc-macro-for-comparing-double.patch
-PATCHFILES += 0004-Use-smtp-instead-of-http-in-network-address-test.patch
-PATCHFILES += 0005-Fix-hard-coded-paths.patch
-PATCHFILES += 0006-Fix-path-to-dbus-machine-id.patch
-PATCHFILES += 0007-Fix-configure-_XOPEN_SOURCE.patch
-PATCHFILES += 0009-make-gsocket.c-word-with-solaris.patch
-# Disabled until fixed:
-#  https://bugzilla.gnome.org/show_bug.cgi?id=659306
-PATCHFILES += 0010-Disable-GFileMonitor-tests-in-gio-tests-file.patch
-PATCHFILES += 0011-Remove-support-for-abstract-sockets-from-g_socket_ad.patch
-PATCHFILES += 0012-Use-proper-locale-for-collate-tests-2.patch
-PATCHFILES += 0013-Fix-test-shell-script.patch
-PATCHFILES += 0019-Fix-gdbus-peer-tests.patch
-# Disable test on sparc v9
-#  https://bugzilla.gnome.org/show_bug.cgi?id=660638
-PATCHFILES += 0020-Disable-buffered-input-stream-set-buffer-size-on-spa.patch
+# Reported: https://bugzilla.gnome.org/show_bug.cgi?id=668973
+PATCHFILES += 0001-Disable-inf-nan-mini-test.patch
 
-# Those patches are for tests that fail on the build farm
-# but not on other build hosts.
-PATCHFILES += 0015-Do-not-ellipses-in-switch-cases.patch
-PATCHFILES += 0016-Format-string-for-Solaris-lt.-10u9.patch
-PATCHFILES += 0017-Disable-gapplication-gapplication-basic-test.patch
-PATCHFILES += 0017-Fix-disable-testglib-tests.patch
-PATCHFILES += 0018-Disable-gdbus-connection-large_message-on-sparc.patch
-PATCHFILES += 0019-Disable-gdbus-threading-gdbus-method-calls-in-thread.patch
-PATCHFILES += 0019-Disable-volumemonitor-tests.patch
-PATCHFILES += 0023-Disable-data-input-stream-read-int-test-on-sparc.patch
-PATCHFILES += 0023-Disable-failing-gsettings-tests.patch
+# PATCHFILES = 0001-Use-proper-locale-for-collate-tests.patch
+# PATCHFILES += 0002-Make-glib-work-with-zoneinfo-version-1.patch
+# PATCHFILES += 0003-Ad-hoc-macro-for-comparing-double.patch
+# PATCHFILES += 0004-Use-smtp-instead-of-http-in-network-address-test.patch
+# PATCHFILES += 0005-Fix-hard-coded-paths.patch
+# PATCHFILES += 0006-Fix-path-to-dbus-machine-id.patch
+# PATCHFILES += 0007-Fix-configure-_XOPEN_SOURCE.patch
+# PATCHFILES += 0009-make-gsocket.c-word-with-solaris.patch
+# # Disabled until fixed:
+# #  https://bugzilla.gnome.org/show_bug.cgi?id=659306
+# PATCHFILES += 0010-Disable-GFileMonitor-tests-in-gio-tests-file.patch
+# PATCHFILES += 0011-Remove-support-for-abstract-sockets-from-g_socket_ad.patch
+# PATCHFILES += 0012-Use-proper-locale-for-collate-tests-2.patch
+# PATCHFILES += 0013-Fix-test-shell-script.patch
+# PATCHFILES += 0019-Fix-gdbus-peer-tests.patch
+# # Disable test on sparc v9
+# #  https://bugzilla.gnome.org/show_bug.cgi?id=660638
+# PATCHFILES += 0020-Disable-buffered-input-stream-set-buffer-size-on-spa.patch
 
-# SPARCv9 Specific Patches
-PATCHFILES_isa-sparcv9 += 0023-Disable-run-assert-msg-test.sh.patch
+# # Those patches are for tests that fail on the build farm
+# # but not on other build hosts.
+# PATCHFILES += 0015-Do-not-ellipses-in-switch-cases.patch
+# PATCHFILES += 0016-Format-string-for-Solaris-lt.-10u9.patch
+# PATCHFILES += 0017-Disable-gapplication-gapplication-basic-test.patch
+# PATCHFILES += 0017-Fix-disable-testglib-tests.patch
+# PATCHFILES += 0018-Disable-gdbus-connection-large_message-on-sparc.patch
+# PATCHFILES += 0019-Disable-gdbus-threading-gdbus-method-calls-in-thread.patch
+# PATCHFILES += 0019-Disable-volumemonitor-tests.patch
+# PATCHFILES += 0023-Disable-data-input-stream-read-int-test-on-sparc.patch
+# PATCHFILES += 0023-Disable-failing-gsettings-tests.patch
 
+# # SPARCv9 Specific Patches
+# PATCHFILES_isa-sparcv9 += 0023-Disable-run-assert-msg-test.sh.patch
+
 PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
 
 
@@ -154,14 +158,14 @@
 LD_OPTIONS =
 EXTRA_LINKER_FLAGS = $(RUNPATH_LINKER_FLAGS)
 
-EXTRA_CFLAGS = -features=extensions
+EXTRA_CFLAGS = -features=extensions -xc99 -D_XPG6
 
-EXTRA_CFLAGS-5.10 += -xc99 -D__EXTENSIONS__ -D_XOPEN_SOURCE=600 -D_XPG6
-EXTRA_CFLAGS += $(EXTRA_CFLAGS-$(GAROSREL))
+#EXTRA_CFLAGS-5.10 += -xc99 -D__EXTENSIONS__ -D_XOPEN_SOURCE=600 -D_XPG6
+#EXTRA_CFLAGS += $(EXTRA_CFLAGS-$(GAROSREL))
 
 EXTRA_LDFLAGS = -lsocket
 
-BUILD64_LIBS_ONLY = 1
+BUILD64 = 1
 
 CONFIGURE_ARGS  = $(DIRPATHS)
 CONFIGURE_ARGS += --with-libiconv=gnu

Modified: csw/mgar/pkg/glib2/trunk/checksums
===================================================================
--- csw/mgar/pkg/glib2/trunk/checksums	2012-01-29 10:49:31 UTC (rev 16932)
+++ csw/mgar/pkg/glib2/trunk/checksums	2012-01-29 21:14:02 UTC (rev 16933)
@@ -1 +1 @@
-789e7520f71c6a4bf08bc683ec764d24  glib-2.28.8.tar.bz2
+b40f3889e8d24e1b367763673ca6deb5  glib-2.30.2.tar.bz2

Added: csw/mgar/pkg/glib2/trunk/files/0001-Disable-inf-nan-mini-test.patch
===================================================================
--- csw/mgar/pkg/glib2/trunk/files/0001-Disable-inf-nan-mini-test.patch	                        (rev 0)
+++ csw/mgar/pkg/glib2/trunk/files/0001-Disable-inf-nan-mini-test.patch	2012-01-29 21:14:02 UTC (rev 16933)
@@ -0,0 +1,32 @@
+From 66516bc1f5e1794fed30b9638060469f7c05d2b8 Mon Sep 17 00:00:00 2001
+From: Rafael Ostertag <raos at opencsw.org>
+Date: Sun, 29 Jan 2012 21:50:28 +0100
+Subject: [PATCH] Disable inf/nan mini test
+
+---
+ glib/tests/gvariant.c |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/glib/tests/gvariant.c b/glib/tests/gvariant.c
+index e943bb2..69eccd6 100644
+--- a/glib/tests/gvariant.c
++++ b/glib/tests/gvariant.c
+@@ -3716,6 +3716,7 @@ test_parses (void)
+   }
+ 
+   /* inf/nan mini test */
++  /* Doesn't work. Bug reported
+   {
+     const gchar *tests[] = { "inf", "-inf", "nan" };
+     GVariant *value;
+@@ -3731,6 +3732,7 @@ test_parses (void)
+         g_free (printed);
+       }
+   }
++  */
+ 
+   g_variant_type_info_assert_no_infos ();
+ }
+-- 
+1.7.8.3
+

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


From bdwalton at users.sourceforge.net  Mon Jan 30 02:30:33 2012
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Mon, 30 Jan 2012 01:30:33 +0000
Subject: [csw-devel] SF.net SVN: gar:[16934]
	csw/mgar/pkg/gettext/trunk/Makefile
Message-ID: <E1Rrg4n-00035P-FV@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 16934
          http://gar.svn.sourceforge.net/gar/?rev=16934&view=rev
Author:   bdwalton
Date:     2012-01-30 01:30:33 +0000 (Mon, 30 Jan 2012)
Log Message:
-----------
gettext/trunk: drop the old lib versions as they were released already

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

Modified: csw/mgar/pkg/gettext/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gettext/trunk/Makefile	2012-01-29 21:14:02 UTC (rev 16933)
+++ csw/mgar/pkg/gettext/trunk/Makefile	2012-01-30 01:30:33 UTC (rev 16934)
@@ -14,11 +14,8 @@
 PACKAGES += CSWggettext
 PACKAGES += CSWggettextdoc
 PACKAGES += CSWlibasprintf0
-PACKAGES += CSWlibgettextlib0-14-1
-PACKAGES += CSWlibgettextlib0-17
 PACKAGES += CSWlibgettextlib0-18-1
 PACKAGES += CSWlibgettextpo0
-PACKAGES += CSWlibgettextsrc0-17
 PACKAGES += CSWlibgettextsrc0-18-1
 PACKAGES += CSWlibintl2
 PACKAGES += CSWlibintl3
@@ -30,11 +27,8 @@
 CATALOGNAME_CSWlibasprintf0 = libasprintf0
 CATALOGNAME_CSWggettext = ggettext
 CATALOGNAME_CSWggettextdoc = ggettextdoc
-CATALOGNAME_CSWlibgettextlib0-14-1 = libgettextlib0_14_1
-CATALOGNAME_CSWlibgettextlib0-17 = libgettextlib0_17
 CATALOGNAME_CSWlibgettextlib0-18-1 = libgettextlib0_18_1
 CATALOGNAME_CSWlibgettextpo0 = libgettextpo0
-CATALOGNAME_CSWlibgettextsrc0-17 = libgettextsrc0_17
 CATALOGNAME_CSWlibgettextsrc0-18-1 = libgettextsrc0_18_1
 CATALOGNAME_CSWlibintl2 = libintl2
 CATALOGNAME_CSWlibintl3 = libintl3
@@ -48,10 +42,8 @@
 SPKG_DESC_CSWggettextdoc = GNU locale utility documentation
 SPKG_DESC_CSWlibasprintf0 += GNU locale utilities, libasprintf.so.0
 SPKG_DESC_CSWggettext-dev = GNU locale utilities, development files
-SPKG_DESC_CSWlibgettextlib0-17 += GNU locale utilities, libgettextlib-0.17.so
 SPKG_DESC_CSWlibgettextlib0-18-1 += GNU locale utilities, libgettextlib-0.18.1.so
 SPKG_DESC_CSWlibgettextpo0 += GNU locale utilities, libgettextpo.so.0
-SPKG_DESC_CSWlibgettextsrc0-17 += GNU locale utilities, libgettextsrc-0.17.so
 SPKG_DESC_CSWlibgettextsrc0-18-1 += GNU locale utilities, libgettextsrc-0.18.1.so
 SPKG_DESC_CSWlibintl2 += GNU locale utilities, libintl.so.2
 SPKG_DESC_CSWlibintl3 += GNU locale utilities, libintl.so.3
@@ -62,8 +54,6 @@
 
 RUNTIME_DEP_PKGS_CSWggettext += CSWexpat
 RUNTIME_DEP_PKGS_CSWggettext += CSWiconv
-RUNTIME_DEP_PKGS_CSWggettext += CSWlibgettextlib0-14-1
-RUNTIME_DEP_PKGS_CSWggettext += CSWlibgettextlib0-17
 RUNTIME_DEP_PKGS_CSWggettext += CSWlibgettextlib0-18-1
 RUNTIME_DEP_PKGS_CSWggettext += CSWlibgettextsrc0-18-1
 RUNTIME_DEP_PKGS_CSWggettext += CSWlibintl2
@@ -75,7 +65,6 @@
 RUNTIME_DEP_PKGS_CSWggettext-dev += CSWlibasprintf0
 RUNTIME_DEP_PKGS_CSWggettext-dev += CSWlibgettextlib0-18-1
 RUNTIME_DEP_PKGS_CSWggettext-dev += CSWlibgettextpo0
-RUNTIME_DEP_PKGS_CSWggettext-dev += CSWlibgettextsrc0-17
 RUNTIME_DEP_PKGS_CSWggettext-dev += CSWlibgettextsrc0-18-1
 RUNTIME_DEP_PKGS_CSWggettext-dev += CSWlibintl8
 RUNTIME_DEP_PKGS_CSWggettextrt += CSWlibasprintf0
@@ -85,11 +74,6 @@
 RUNTIME_DEP_PKGS_CSWggettextrt += CSWlibintl8
 RUNTIME_DEP_PKGS_CSWggettextrt += CSWggettext-data
 RUNTIME_DEP_PKGS_CSWlibasprintf0 += CSWggettext-data
-RUNTIME_DEP_PKGS_CSWlibgettextlib0-14-1 += CSWiconv
-RUNTIME_DEP_PKGS_CSWlibgettextlib0-14-1 += CSWlibintl3
-RUNTIME_DEP_PKGS_CSWlibgettextlib0-17 += CSWiconv
-RUNTIME_DEP_PKGS_CSWlibgettextlib0-17 += CSWlibintl8
-RUNTIME_DEP_PKGS_CSWlibgettextlib0-17 += CSWlibncurses5
 RUNTIME_DEP_PKGS_CSWlibgettextlib0-18-1 += CSWiconv
 RUNTIME_DEP_PKGS_CSWlibgettextlib0-18-1 += CSWlibintl8
 RUNTIME_DEP_PKGS_CSWlibgettextlib0-18-1 += CSWlibxml2-2
@@ -98,9 +82,6 @@
 RUNTIME_DEP_PKGS_CSWlibgettextpo0 += CSWiconv
 RUNTIME_DEP_PKGS_CSWlibgettextpo0 += CSWlibintl8
 RUNTIME_DEP_PKGS_CSWlibgettextpo0 += CSWggettext-data
-RUNTIME_DEP_PKGS_CSWlibgettextsrc0-17 += CSWiconv
-RUNTIME_DEP_PKGS_CSWlibgettextsrc0-17 += CSWlibgettextlib0-17
-RUNTIME_DEP_PKGS_CSWlibgettextsrc0-17 += CSWlibintl8
 RUNTIME_DEP_PKGS_CSWlibgettextsrc0-18-1 += CSWiconv
 RUNTIME_DEP_PKGS_CSWlibgettextsrc0-18-1 += CSWlibgettextlib0-18-1
 RUNTIME_DEP_PKGS_CSWlibgettextsrc0-18-1 += CSWlibintl8
@@ -119,8 +100,6 @@
 PKGFILES_CSWlibgettextpo0 += $(call baseisadirs,$(libdir),libgettextpo\.so\.0\.4\.0)
 PKGFILES_CSWlibgettextpo0 += $(call baseisadirs,$(libdir),libgettextpo\.so\.0(\.\d+)*)
 PKGFILES_CSWlibgettextpo0 += $(call baseisadirs,$(libdir),libgettextpo\.so\.0\.5\.1)
-PKGFILES_CSWlibgettextsrc0-17 += $(call baseisadirs,$(libdir),libgettextsrc-0\.17\.so)
-PKGFILES_CSWlibgettextsrc0-17 += $(call baseisadirs,$(libdir),libgettextsrc-0\.17\.so(\.\d+)*)
 PKGFILES_CSWlibgettextsrc0-18-1 += $(call baseisadirs,$(libdir),libgettextsrc-0\.18\.1\.so)
 PKGFILES_CSWlibgettextsrc0-18-1 += $(call baseisadirs,$(libdir),libgettextsrc-0\.18\.1\.so(\.\d+)*)
 PKGFILES_CSWlibintl2 += $(call baseisadirs,$(libdir),libintl\.so\.2)
@@ -134,11 +113,6 @@
 PKGFILES_CSWlibgettextlib0-18-1 += $(call baseisadirs,$(libdir),libgettextlib-0\.18\.1\.so(\.\d+)*)
 PKGFILES_CSWlibasprintf0 += $(call baseisadirs,$(libdir),libasprintf\.so\.0\.0\.0)
 PKGFILES_CSWlibasprintf0 += $(call baseisadirs,$(libdir),libasprintf\.so\.0(\.\d+)*)
-PKGFILES_CSWlibgettextlib0-14-1 += $(call baseisadirs,$(libdir),libgettextlib-0\.14\.1\.so)
-PKGFILES_CSWlibgettextlib0-14-1 += $(call baseisadirs,$(libdir),libgettextlib-0\.14\.1\.so(\.\d+)*)
-SPKG_DESC_CSWlibgettextlib0-14-1 += GNU locale utilities, libgettextlib-0.14.1.so
-PKGFILES_CSWlibgettextlib0-17 += $(call baseisadirs,$(libdir),libgettextlib-0\.17\.so)
-PKGFILES_CSWlibgettextlib0-17 += $(call baseisadirs,$(libdir),libgettextlib-0\.17\.so(\.\d+)*)
 PKGFILES_CSWggettext-dev += $(PKGFILES_DEVEL)
 PKGFILES_CSWggettext-data += /opt/csw/share/locale/.*mo
 PKGFILES_CSWggettextrt += /opt/csw/share/.*ggettextrt.*
@@ -159,11 +133,6 @@
 CHECKPKG_OVERRIDES_CSWggettextrt += surplus-dependency|CSWlibintl3
 CHECKPKG_OVERRIDES_CSWggettextrt += surplus-dependency|CSWlibasprintf0
 CHECKPKG_OVERRIDES_CSWlibgettextpo0 += bad-rpath-entry|/opt/csw/lib/|opt/csw/lib/libgettextpo.so.0.4.0
-CHECKPKG_OVERRIDES_CSWlibgettextlib0-14-1 += soname-equals-filename|file=/opt/csw/lib/libgettextlib-0.14.1.so
-CHECKPKG_OVERRIDES_CSWlibgettextlib0-17 += bad-rpath-entry|/opt/csw/lib/|opt/csw/lib/libgettextlib-0.17.so
-CHECKPKG_OVERRIDES_CSWlibgettextlib0-17 += soname-equals-filename|file=/opt/csw/lib/libgettextlib-0.17.so
-CHECKPKG_OVERRIDES_CSWlibgettextsrc0-17 += bad-rpath-entry|/opt/csw/lib/|opt/csw/lib/libgettextsrc-0.17.so
-CHECKPKG_OVERRIDES_CSWlibgettextsrc0-17 += soname-equals-filename|file=/opt/csw/lib/libgettextsrc-0.17.so
 CHECKPKG_OVERRIDES_CSWlibgettextpo0 += surplus-dependency|CSWggettext-data
 CHECKPKG_OVERRIDES_CSWlibgettextsrc0-18-1 += surplus-dependency|CSWggettext-data
 CHECKPKG_OVERRIDES_CSWlibgettextsrc0-18-1 += soname-equals-filename
@@ -176,8 +145,6 @@
 
 CHECKPKG_OVERRIDES_CSWggettext += surplus-dependency|CSWlibintl2
 CHECKPKG_OVERRIDES_CSWggettext += surplus-dependency|CSWlibintl3
-CHECKPKG_OVERRIDES_CSWggettext += surplus-dependency|CSWlibgettextlib0-14-1
-CHECKPKG_OVERRIDES_CSWggettext += surplus-dependency|CSWlibgettextlib0-17
 CHECKPKG_OVERRIDES_CSWggettext += file-with-bad-content|/usr/local|root/opt/csw/share/aclocal/lib-prefix.m4
 CHECKPKG_OVERRIDES_CSWggettext += file-with-bad-content|/usr/local|root/opt/csw/share/aclocal/lib-link.m4
 
@@ -237,23 +204,19 @@
 post-install-isa-sparcv8:
 	@mkdir $(INSTALLISADIR)/opt/csw/share/java
 	@mv $(INSTALLISADIR)/opt/csw/share/gettext/libintl.jar $(INSTALLISADIR)/opt/csw/share/java
-	@( for f in $(FILEDIR)/*.s; do gcp $$f $(INSTALLISADIR)/opt/csw/lib/$$(gbasename $$f .s); done )
 	$(MAKECOOKIE)
 
 post-install-isa-sparcv9:
 	@rm $(INSTALLISADIR)/opt/csw/share/gettext/libintl.jar
-	@( for f in $(FILEDIR)/*.s9; do gcp $$f $(INSTALLISADIR)/opt/csw/lib/$$(gbasename $$f .s9); done )
 	$(MAKECOOKIE)
 
 post-install-isa-i386:
 	@mkdir $(INSTALLISADIR)/opt/csw/share/java
 	@mv $(INSTALLISADIR)/opt/csw/share/gettext/libintl.jar $(INSTALLISADIR)/opt/csw/share/java
-	@( for f in $(FILEDIR)/*.i; do gcp $$f $(INSTALLISADIR)/opt/csw/lib/$$(gbasename $$f .i); done )
 	$(MAKECOOKIE)
 
 post-install-isa-amd64:
 	@rm $(INSTALLISADIR)/opt/csw/share/gettext/libintl.jar
-	@( for f in $(FILEDIR)/*.amd64; do gcp $$f $(INSTALLISADIR)/opt/csw/lib/$$(gbasename $$f .amd64); done )
 	$(MAKECOOKIE)
 
 post-merge:

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


From dam at opencsw.org  Mon Jan 30 09:00:28 2012
From: dam at opencsw.org (Dagobert Michelsen)
Date: Mon, 30 Jan 2012 09:00:28 +0100
Subject: [csw-devel] SF.net SVN: gar:[16934]
	csw/mgar/pkg/gettext/trunk/Makefile
In-Reply-To: <E1Rrg4n-00035P-FV@sfp-svn-6.v30.ch3.sourceforge.com>
References: <E1Rrg4n-00035P-FV@sfp-svn-6.v30.ch3.sourceforge.com>
Message-ID: <16EEF4F1-28D8-4698-97A8-37B27718DB5D@opencsw.org>

Hi Ben,

Am 30.01.2012 um 02:30 schrieb bdwalton at users.sourceforge.net:
> Revision: 16934
>          http://gar.svn.sourceforge.net/gar/?rev=16934&view=rev
> Author:   bdwalton
> Date:     2012-01-30 01:30:33 +0000 (Mon, 30 Jan 2012)
> Log Message:
> -----------
> gettext/trunk: drop the old lib versions as they were released already
> 
> Modified Paths:
> --------------
>    csw/mgar/pkg/gettext/trunk/Makefile
> 
> Modified: csw/mgar/pkg/gettext/trunk/Makefile
> ===================================================================
> --- csw/mgar/pkg/gettext/trunk/Makefile	2012-01-29 21:14:02 UTC (rev 16933)
> +++ csw/mgar/pkg/gettext/trunk/Makefile	2012-01-30 01:30:33 UTC (rev 16934)
> @@ -14,11 +14,8 @@
> PACKAGES += CSWggettext
> PACKAGES += CSWggettextdoc
> PACKAGES += CSWlibasprintf0
> -PACKAGES += CSWlibgettextlib0-14-1
> -PACKAGES += CSWlibgettextlib0-17
> PACKAGES += CSWlibgettextlib0-18-1
> PACKAGES += CSWlibgettextpo0
> -PACKAGES += CSWlibgettextsrc0-17
> PACKAGES += CSWlibgettextsrc0-18-1
> PACKAGES += CSWlibintl2
> PACKAGES += CSWlibintl3
> @@ -30,11 +27,8 @@
> CATALOGNAME_CSWlibasprintf0 = libasprintf0
> CATALOGNAME_CSWggettext = ggettext
> CATALOGNAME_CSWggettextdoc = ggettextdoc
> -CATALOGNAME_CSWlibgettextlib0-14-1 = libgettextlib0_14_1
> -CATALOGNAME_CSWlibgettextlib0-17 = libgettextlib0_17
> CATALOGNAME_CSWlibgettextlib0-18-1 = libgettextlib0_18_1
> CATALOGNAME_CSWlibgettextpo0 = libgettextpo0
> -CATALOGNAME_CSWlibgettextsrc0-17 = libgettextsrc0_17
> CATALOGNAME_CSWlibgettextsrc0-18-1 = libgettextsrc0_18_1
> CATALOGNAME_CSWlibintl2 = libintl2
> CATALOGNAME_CSWlibintl3 = libintl3
> @@ -48,10 +42,8 @@
> SPKG_DESC_CSWggettextdoc = GNU locale utility documentation
> SPKG_DESC_CSWlibasprintf0 += GNU locale utilities, libasprintf.so.0
> SPKG_DESC_CSWggettext-dev = GNU locale utilities, development files
> -SPKG_DESC_CSWlibgettextlib0-17 += GNU locale utilities, libgettextlib-0.17.so
> SPKG_DESC_CSWlibgettextlib0-18-1 += GNU locale utilities, libgettextlib-0.18.1.so
> SPKG_DESC_CSWlibgettextpo0 += GNU locale utilities, libgettextpo.so.0
> -SPKG_DESC_CSWlibgettextsrc0-17 += GNU locale utilities, libgettextsrc-0.17.so
> SPKG_DESC_CSWlibgettextsrc0-18-1 += GNU locale utilities, libgettextsrc-0.18.1.so
> SPKG_DESC_CSWlibintl2 += GNU locale utilities, libintl.so.2
> SPKG_DESC_CSWlibintl3 += GNU locale utilities, libintl.so.3
> @@ -62,8 +54,6 @@
> 
> RUNTIME_DEP_PKGS_CSWggettext += CSWexpat
> RUNTIME_DEP_PKGS_CSWggettext += CSWiconv
> -RUNTIME_DEP_PKGS_CSWggettext += CSWlibgettextlib0-14-1
> -RUNTIME_DEP_PKGS_CSWggettext += CSWlibgettextlib0-17

You cannot take out the dependencies yet without breaking other packages as
there are still dependencies to the old libs and the legacy packages are
still depending on CSWggettext and expecting the libs to be pulled in:
  http://www.opencsw.org/packages/CSWlibgettextlib0-14-1/
However, you could rebuild mailutils or stop building the lib packages in favor
of using FOREIGN_PACKAGES.


Best regards

  -- Dago

> RUNTIME_DEP_PKGS_CSWggettext += CSWlibgettextlib0-18-1
> RUNTIME_DEP_PKGS_CSWggettext += CSWlibgettextsrc0-18-1
> RUNTIME_DEP_PKGS_CSWggettext += CSWlibintl2
> @@ -75,7 +65,6 @@
> RUNTIME_DEP_PKGS_CSWggettext-dev += CSWlibasprintf0
> RUNTIME_DEP_PKGS_CSWggettext-dev += CSWlibgettextlib0-18-1
> RUNTIME_DEP_PKGS_CSWggettext-dev += CSWlibgettextpo0
> -RUNTIME_DEP_PKGS_CSWggettext-dev += CSWlibgettextsrc0-17
> RUNTIME_DEP_PKGS_CSWggettext-dev += CSWlibgettextsrc0-18-1
> RUNTIME_DEP_PKGS_CSWggettext-dev += CSWlibintl8
> RUNTIME_DEP_PKGS_CSWggettextrt += CSWlibasprintf0
> @@ -85,11 +74,6 @@
> RUNTIME_DEP_PKGS_CSWggettextrt += CSWlibintl8
> RUNTIME_DEP_PKGS_CSWggettextrt += CSWggettext-data
> RUNTIME_DEP_PKGS_CSWlibasprintf0 += CSWggettext-data
> -RUNTIME_DEP_PKGS_CSWlibgettextlib0-14-1 += CSWiconv
> -RUNTIME_DEP_PKGS_CSWlibgettextlib0-14-1 += CSWlibintl3
> -RUNTIME_DEP_PKGS_CSWlibgettextlib0-17 += CSWiconv
> -RUNTIME_DEP_PKGS_CSWlibgettextlib0-17 += CSWlibintl8
> -RUNTIME_DEP_PKGS_CSWlibgettextlib0-17 += CSWlibncurses5
> RUNTIME_DEP_PKGS_CSWlibgettextlib0-18-1 += CSWiconv
> RUNTIME_DEP_PKGS_CSWlibgettextlib0-18-1 += CSWlibintl8
> RUNTIME_DEP_PKGS_CSWlibgettextlib0-18-1 += CSWlibxml2-2
> @@ -98,9 +82,6 @@
> RUNTIME_DEP_PKGS_CSWlibgettextpo0 += CSWiconv
> RUNTIME_DEP_PKGS_CSWlibgettextpo0 += CSWlibintl8
> RUNTIME_DEP_PKGS_CSWlibgettextpo0 += CSWggettext-data
> -RUNTIME_DEP_PKGS_CSWlibgettextsrc0-17 += CSWiconv
> -RUNTIME_DEP_PKGS_CSWlibgettextsrc0-17 += CSWlibgettextlib0-17
> -RUNTIME_DEP_PKGS_CSWlibgettextsrc0-17 += CSWlibintl8
> RUNTIME_DEP_PKGS_CSWlibgettextsrc0-18-1 += CSWiconv
> RUNTIME_DEP_PKGS_CSWlibgettextsrc0-18-1 += CSWlibgettextlib0-18-1
> RUNTIME_DEP_PKGS_CSWlibgettextsrc0-18-1 += CSWlibintl8
> @@ -119,8 +100,6 @@
> PKGFILES_CSWlibgettextpo0 += $(call baseisadirs,$(libdir),libgettextpo\.so\.0\.4\.0)
> PKGFILES_CSWlibgettextpo0 += $(call baseisadirs,$(libdir),libgettextpo\.so\.0(\.\d+)*)
> PKGFILES_CSWlibgettextpo0 += $(call baseisadirs,$(libdir),libgettextpo\.so\.0\.5\.1)
> -PKGFILES_CSWlibgettextsrc0-17 += $(call baseisadirs,$(libdir),libgettextsrc-0\.17\.so)
> -PKGFILES_CSWlibgettextsrc0-17 += $(call baseisadirs,$(libdir),libgettextsrc-0\.17\.so(\.\d+)*)
> PKGFILES_CSWlibgettextsrc0-18-1 += $(call baseisadirs,$(libdir),libgettextsrc-0\.18\.1\.so)
> PKGFILES_CSWlibgettextsrc0-18-1 += $(call baseisadirs,$(libdir),libgettextsrc-0\.18\.1\.so(\.\d+)*)
> PKGFILES_CSWlibintl2 += $(call baseisadirs,$(libdir),libintl\.so\.2)
> @@ -134,11 +113,6 @@
> PKGFILES_CSWlibgettextlib0-18-1 += $(call baseisadirs,$(libdir),libgettextlib-0\.18\.1\.so(\.\d+)*)
> PKGFILES_CSWlibasprintf0 += $(call baseisadirs,$(libdir),libasprintf\.so\.0\.0\.0)
> PKGFILES_CSWlibasprintf0 += $(call baseisadirs,$(libdir),libasprintf\.so\.0(\.\d+)*)
> -PKGFILES_CSWlibgettextlib0-14-1 += $(call baseisadirs,$(libdir),libgettextlib-0\.14\.1\.so)
> -PKGFILES_CSWlibgettextlib0-14-1 += $(call baseisadirs,$(libdir),libgettextlib-0\.14\.1\.so(\.\d+)*)
> -SPKG_DESC_CSWlibgettextlib0-14-1 += GNU locale utilities, libgettextlib-0.14.1.so
> -PKGFILES_CSWlibgettextlib0-17 += $(call baseisadirs,$(libdir),libgettextlib-0\.17\.so)
> -PKGFILES_CSWlibgettextlib0-17 += $(call baseisadirs,$(libdir),libgettextlib-0\.17\.so(\.\d+)*)
> PKGFILES_CSWggettext-dev += $(PKGFILES_DEVEL)
> PKGFILES_CSWggettext-data += /opt/csw/share/locale/.*mo
> PKGFILES_CSWggettextrt += /opt/csw/share/.*ggettextrt.*
> @@ -159,11 +133,6 @@
> CHECKPKG_OVERRIDES_CSWggettextrt += surplus-dependency|CSWlibintl3
> CHECKPKG_OVERRIDES_CSWggettextrt += surplus-dependency|CSWlibasprintf0
> CHECKPKG_OVERRIDES_CSWlibgettextpo0 += bad-rpath-entry|/opt/csw/lib/|opt/csw/lib/libgettextpo.so.0.4.0
> -CHECKPKG_OVERRIDES_CSWlibgettextlib0-14-1 += soname-equals-filename|file=/opt/csw/lib/libgettextlib-0.14.1.so
> -CHECKPKG_OVERRIDES_CSWlibgettextlib0-17 += bad-rpath-entry|/opt/csw/lib/|opt/csw/lib/libgettextlib-0.17.so
> -CHECKPKG_OVERRIDES_CSWlibgettextlib0-17 += soname-equals-filename|file=/opt/csw/lib/libgettextlib-0.17.so
> -CHECKPKG_OVERRIDES_CSWlibgettextsrc0-17 += bad-rpath-entry|/opt/csw/lib/|opt/csw/lib/libgettextsrc-0.17.so
> -CHECKPKG_OVERRIDES_CSWlibgettextsrc0-17 += soname-equals-filename|file=/opt/csw/lib/libgettextsrc-0.17.so
> CHECKPKG_OVERRIDES_CSWlibgettextpo0 += surplus-dependency|CSWggettext-data
> CHECKPKG_OVERRIDES_CSWlibgettextsrc0-18-1 += surplus-dependency|CSWggettext-data
> CHECKPKG_OVERRIDES_CSWlibgettextsrc0-18-1 += soname-equals-filename
> @@ -176,8 +145,6 @@
> 
> CHECKPKG_OVERRIDES_CSWggettext += surplus-dependency|CSWlibintl2
> CHECKPKG_OVERRIDES_CSWggettext += surplus-dependency|CSWlibintl3
> -CHECKPKG_OVERRIDES_CSWggettext += surplus-dependency|CSWlibgettextlib0-14-1
> -CHECKPKG_OVERRIDES_CSWggettext += surplus-dependency|CSWlibgettextlib0-17
> CHECKPKG_OVERRIDES_CSWggettext += file-with-bad-content|/usr/local|root/opt/csw/share/aclocal/lib-prefix.m4
> CHECKPKG_OVERRIDES_CSWggettext += file-with-bad-content|/usr/local|root/opt/csw/share/aclocal/lib-link.m4
> 
> @@ -237,23 +204,19 @@
> post-install-isa-sparcv8:
> 	@mkdir $(INSTALLISADIR)/opt/csw/share/java
> 	@mv $(INSTALLISADIR)/opt/csw/share/gettext/libintl.jar $(INSTALLISADIR)/opt/csw/share/java
> -	@( for f in $(FILEDIR)/*.s; do gcp $$f $(INSTALLISADIR)/opt/csw/lib/$$(gbasename $$f .s); done )
> 	$(MAKECOOKIE)
> 
> post-install-isa-sparcv9:
> 	@rm $(INSTALLISADIR)/opt/csw/share/gettext/libintl.jar
> -	@( for f in $(FILEDIR)/*.s9; do gcp $$f $(INSTALLISADIR)/opt/csw/lib/$$(gbasename $$f .s9); done )
> 	$(MAKECOOKIE)
> 
> post-install-isa-i386:
> 	@mkdir $(INSTALLISADIR)/opt/csw/share/java
> 	@mv $(INSTALLISADIR)/opt/csw/share/gettext/libintl.jar $(INSTALLISADIR)/opt/csw/share/java
> -	@( for f in $(FILEDIR)/*.i; do gcp $$f $(INSTALLISADIR)/opt/csw/lib/$$(gbasename $$f .i); done )
> 	$(MAKECOOKIE)
> 
> post-install-isa-amd64:
> 	@rm $(INSTALLISADIR)/opt/csw/share/gettext/libintl.jar
> -	@( for f in $(FILEDIR)/*.amd64; do gcp $$f $(INSTALLISADIR)/opt/csw/lib/$$(gbasename $$f .amd64); done )
> 	$(MAKECOOKIE)
> 
> post-merge:
> 
> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
> 
> _______________________________________________
> devel mailing list
> devel at lists.opencsw.org
> https://lists.opencsw.org/mailman/listinfo/devel

-- 
"You don't become great by trying to be great, you become great by wanting to do something,
and then doing it so hard that you become great in the process." - xkcd #896


From wahwah at users.sourceforge.net  Mon Jan 30 13:51:17 2012
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Mon, 30 Jan 2012 12:51:17 +0000
Subject: [csw-devel] SF.net SVN: gar:[16935]
 csw/mgar/pkg/opencsw-manual/trunk/files/ for-administrators
Message-ID: <E1RrqhZ-0002sk-Be@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 16935
          http://gar.svn.sourceforge.net/gar/?rev=16935&view=rev
Author:   wahwah
Date:     2012-01-30 12:51:17 +0000 (Mon, 30 Jan 2012)
Log Message:
-----------
opencsw-manual: minor changes, glossary update

Modified Paths:
--------------
    csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/bootstrapping.rst
    csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/glossary.txt
    csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/index.rst
    csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/introduction.rst

Modified: csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/bootstrapping.rst
===================================================================
--- csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/bootstrapping.rst	2012-01-30 01:30:33 UTC (rev 16934)
+++ csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/bootstrapping.rst	2012-01-30 12:51:17 UTC (rev 16935)
@@ -2,8 +2,8 @@
 Bootstrapping
 -------------
 
-OpenCSW uses a tool named pkgutil on top of the Solaris packaging utilities
-to automatically download, install and update packages. This has to be installed
+OpenCSW uses a tool named pkgutil on top of the Solaris packaging utilities to
+automatically download, install and update packages. It needs to be installed
 manually once, after that all maintenance is done via pkgutil.
 
 On a Solaris 10 system, you can use the capacity of pkgadd to download
@@ -11,28 +11,21 @@
 
   pkgadd -d http://get.opencsw.org/now
 
-On Solaris 8 and 9 you need to download the package manually e.g. using wget
+On Solaris 8 and 9 you need to download the package manually, e.g. using wget
 and then install it::
 
   wget http://mirror.opencsw.org/opencsw/pkgutil.pkg
-  pkgadd -d pkgutil.pkg
+  pkgadd -d pkgutil.pkg all
 
-Now is a good time to modify your profile to honour the OpenCSW programs.
-For a bourne shell add the following lines to your ``.profile``::
+For easy access to OpenCSW programs, put ``/opt/csw/bin`` in front of PATH,
+and ``/opt/csw/share/man`` in front of MANPATH.
 
-  PATH=$PATH:/opt/csw/bin
-  MANPATH=$MANPATH:/opt/csw/share/man
+You can now start installing packages. For a list of available packages use::
 
-Please source it or logout and login again to make sure the environment is adjusted.
-
-You can now start installing packages. For a list of available packages use
-::
-
   pkgutil -l
 
 As the list is quite long and you probably have an idea what you are looking for the
-list can be fuzzy-matched with
-::
+list can be fuzzy-matched with::
 
   root# pkgutil -a vim
   common               package              catalog                        size
@@ -55,12 +48,11 @@
 
 Now that you are about to install lots of stuff it may be a good time to select
 one of the mirrors from ``mirror.opencsw.org`` close to you. The official mirrors
-are listed at
-::
+are listed at::
 
   http://www.opencsw.org/get-it/mirrors/
 
-It is important to note that ``pkgutil`` has **two** configuration files:
+It is important to note that ``pkgutil`` can use **two** configuration files:
 
 - ``/etc/opt/csw/pkgutil.conf``
 - ``/opt/csw/etc/pkgutil.conf``
@@ -156,10 +148,10 @@
 the interoperability and we feel that in times of ever growing disks the
 flexibility is worth more than the saved bytes.
 
-Package dependencies are modeled in the OpenCSW `catalog`_s" to allow automatic
+Package dependencies are modeled in the OpenCSW `catalogs`_ to allow automatic
 dependency resolution via pkgutil. To view the current dependencies for a
-package you can use
-::
+package you can use::
+
   pkgutil --deptree <pkg>
 
 

Modified: csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/glossary.txt
===================================================================
--- csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/glossary.txt	2012-01-30 01:30:33 UTC (rev 16934)
+++ csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/glossary.txt	2012-01-30 12:51:17 UTC (rev 16935)
@@ -3,6 +3,15 @@
 --------
 
 catalog
+    A directory with packages and an index, for a specific architecture (SPARC
+    or Intel) and OS release (e.g. Solaris 9 or Solaris 10).  A catalog index
+    file contains a list of packages together with their catalog names,
+    version, checksum and a list of dependencies to other packages.
 
-A catalog contains a list of packages together with their catalog names, version, checksum
-and a list of dependencies to other packages.
+catalogname
+    A name of a package as it shows in the catalog index file, and in pkgutil
+    output.
+
+pkgname
+    A name of a package as it shows in the output of the ``pkginfo`` command.
+    Usually has the form of CSWfoo.

Modified: csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/index.rst
===================================================================
--- csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/index.rst	2012-01-30 01:30:33 UTC (rev 16934)
+++ csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/index.rst	2012-01-30 12:51:17 UTC (rev 16935)
@@ -11,6 +11,7 @@
   bootstrapping
   configuring-services
   pkgutil-reference
+  glossary
 
 .. [#dagosscrapbook]
    `Dago's Scrapbook`_

Modified: csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/introduction.rst
===================================================================
--- csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/introduction.rst	2012-01-30 01:30:33 UTC (rev 16934)
+++ csw/mgar/pkg/opencsw-manual/trunk/files/for-administrators/introduction.rst	2012-01-30 12:51:17 UTC (rev 16935)
@@ -6,9 +6,10 @@
 more and more programs with every release. However, the world of open source is
 big and there is always missing something. OpenCSW fills this gap by providing
 a large amount of precompiled software and open source build recipes.
-The p\xC3ackages can be installed comfortably with automatic dependency resolution
+The packages can be installed comfortably with automatic dependency resolution
 but require root access to the machine. If you really want to compile your
-own software the build recipes are available for all packages too.
+own software, the build recipes are available for all packages too.
 
-Solaris 10 is fully supported whereas Solaris 8 and 9 are best effort
-and only get sporadic updates.
+Solaris 10 is fully supported. Solaris 8 and 9 get best effort support level.
+As of January 2012, Solaris 8 catalogs do not get any updates, and Solaris
+9 catalogs get some amount of updates.

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


From bwalton at opencsw.org  Mon Jan 30 16:02:15 2012
From: bwalton at opencsw.org (Ben Walton)
Date: Mon, 30 Jan 2012 10:02:15 -0500
Subject: [csw-devel] SF.net SVN: gar:[16934]
	csw/mgar/pkg/gettext/trunk/Makefile
In-Reply-To: <16EEF4F1-28D8-4698-97A8-37B27718DB5D@opencsw.org>
References: <E1Rrg4n-00035P-FV@sfp-svn-6.v30.ch3.sourceforge.com>
	<16EEF4F1-28D8-4698-97A8-37B27718DB5D@opencsw.org>
Message-ID: <1327935581-sup-3191@pinkfloyd.chass.utoronto.ca>

Excerpts from Dagobert Michelsen's message of Mon Jan 30 03:00:28 -0500 2012:

Hi Dago,

> However, you could rebuild mailutils or stop building the lib
> packages in favor of using FOREIGN_PACKAGES.

The immediate fix will be FOREIGN_PACKAGES, but rebuilding is the
better solution in the log run...I just don't want to release updates
for the legacy things going forward as there is no point.

Time was sapped before I could continue on this last night.

Thanks
-Ben
--
Ben Walton
Systems Programmer - CHASS
University of Toronto
C:416.407.5610 | W:416.978.4302


From dmichelsen at users.sourceforge.net  Mon Jan 30 18:14:12 2012
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Mon, 30 Jan 2012 17:14:12 +0000
Subject: [csw-devel] SF.net SVN: gar:[16936] csw/mgar/pkg/gnupg/trunk
Message-ID: <E1Rruo0-0002d9-Gr@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 16936
          http://gar.svn.sourceforge.net/gar/?rev=16936&view=rev
Author:   dmichelsen
Date:     2012-01-30 17:14:12 +0000 (Mon, 30 Jan 2012)
Log Message:
-----------
gnupg/trunk: Update to 1.4.12

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

Modified: csw/mgar/pkg/gnupg/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gnupg/trunk/Makefile	2012-01-30 12:51:17 UTC (rev 16935)
+++ csw/mgar/pkg/gnupg/trunk/Makefile	2012-01-30 17:14:12 UTC (rev 16936)
@@ -1,5 +1,5 @@
 NAME = gnupg
-VERSION = 1.4.11
+VERSION = 1.4.12
 CATEGORIES = apps
 GARTYPE = v2
 

Modified: csw/mgar/pkg/gnupg/trunk/checksums
===================================================================
--- csw/mgar/pkg/gnupg/trunk/checksums	2012-01-30 12:51:17 UTC (rev 16935)
+++ csw/mgar/pkg/gnupg/trunk/checksums	2012-01-30 17:14:12 UTC (rev 16936)
@@ -1 +1 @@
-411744e1ef8ce90b87938c4203f001f1  gnupg-1.4.11.tar.bz2
+ce3742e5c7912559cab7894ad8ba7f6b  gnupg-1.4.12.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 Jan 31 00:01:39 2012
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Mon, 30 Jan 2012 23:01:39 +0000
Subject: [csw-devel] SF.net SVN: gar:[16937]
	csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files
Message-ID: <E1Rs0EF-0003az-OS@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 16937
          http://gar.svn.sourceforge.net/gar/?rev=16937&view=rev
Author:   wahwah
Date:     2012-01-30 23:01:39 +0000 (Mon, 30 Jan 2012)
Log Message:
-----------
mysql5/branches/mysql-5.5.x: backported changes from mysql-5.0

Modified Paths:
--------------
    csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/cswmysql55.tpl
    csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/quick_start-csw

Modified: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/cswmysql55.tpl
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/cswmysql55.tpl	2012-01-30 17:14:12 UTC (rev 16936)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/cswmysql55.tpl	2012-01-30 23:01:39 UTC (rev 16937)
@@ -26,6 +26,7 @@
 MYSQLD_DATADIR=$MYSQL_VAR
 MYSQLD_PID_FILE=$MYSQL_VAR/mysql.pid
 CONFFILE=${sysconfdir}/my.cnf
+MYSQLD_PROG=${MYSQLD_PROG:-mysqld-${BASE_VERSION}}
 
 # Source the configuration
 [ -r /opt/csw/mysql5/etc/mysql5rc ] && . /opt/csw/mysql5/etc/mysql5rc
@@ -78,12 +79,12 @@
 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."
+            echo "${MYSQLD_PROG} (`cat $MYSQLD_PID_FILE`) seems to be running."
             return 1
         fi
     fi
 
-    printf "%-60s" "Starting mysqld: "
+    printf "%-60s" "Starting ${MYSQLD_PROG}: "
 
     # 2006-03-11
     # This script no longer creates the default database. You may create the
@@ -192,7 +193,7 @@
 
     restart)
     stop_it
-    while pgrep `pgrep_opts` mysqld > /dev/null
+    while pgrep `pgrep_opts` ${MYSQLD_PROG} > /dev/null
       do
       sleep 1
     done

Modified: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/quick_start-csw
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/quick_start-csw	2012-01-30 17:14:12 UTC (rev 16936)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/quick_start-csw	2012-01-30 23:01:39 UTC (rev 16937)
@@ -8,10 +8,13 @@
 # This script creates a default database with the small-memory footprint.
 # Input may be provided for DATADIR and DEFAULTS_FILE
 #
-BASEDIR=/opt/csw/mysql51
-MYSQL_VAR=/var/opt/csw/mysql51
-DEFAULTS_FILE=$BASEDIR/my.cnf
-SAVE_DEFAULTS_FILE=$MYSQL_VAR/my.cnf
+# TODO: This file should be integrated with CSWmysql5.postinstall file.
+
+prefix=/opt/csw
+MYSQL_HOME=${prefix}
+MYSQL_VAR=/var${prefix}
+sysconfdir=/etc${prefix}
+DEFAULTS_FILE=${prefix}/support-files/my-small.cnf
 MYSQLD_USER=mysql
 #
 # Provide a default data directory
@@ -21,7 +24,7 @@
 echo  "This is the start script to setup a MySQL-5 database"
 echo  "  directory."
 echo
-echo  "  The base directory is $BASEDIR."
+echo  "  The base directory is $MYSQL_HOME."
 echo  "  The default database directory is $MYSQLD_DATADIR."
 echo
 echo  "  If you have not setup a partition for the database and"
@@ -51,7 +54,7 @@
     ` || exit $?
 if [ $usrin = "[default]" ]; then
     if [ ! -f "$DEFAULTS_FILE" ]; then
-        IN_DEFAULTS_FILE=$BASEDIR/share/mysql/my-small.cnf
+        IN_DEFAULTS_FILE=$MYSQL_HOME/support-files/my-small.cnf
         echo "Using $IN_DEFAULTS_FILE to create the options file."
     else
         IN_DEFAULTS_FILE=$DEFAULTS_FILE
@@ -102,10 +105,10 @@
 echo "Creating MySQL core database in $MYSQLD_DATADIR"
 echo
 echo "###  The following messages are from mysql_install_db."
-$BASEDIR/bin/mysql_install_db \
+$MYSQL_HOME/bin/mysql_install_db \
     --defaults-extra-file=$DEFAULTS_FILE \
     --user=$MYSQLD_USER \
-    --basedir=$BASEDIR \
+    --basedir=$MYSQL_HOME \
     --datadir=$MYSQLD_DATADIR
 
 #
@@ -115,7 +118,7 @@
 #
 # Update --datadir in the cnf file with the correct value if file was copied
 if [ x"$CNFCOPIED" = xyes ]; then
-    sed -e "s|/var/opt/csw/mysql51|$MYSQLD_DATADIR|g" $DEFAULTS_FILE >$DEFAULTS_FILE.new
+    sed -e "s|/var/opt/csw|$MYSQLD_DATADIR|g" $DEFAULTS_FILE >$DEFAULTS_FILE.new
     mv $DEFAULTS_FILE.new $DEFAULTS_FILE
 fi
 
@@ -123,17 +126,17 @@
 # Ending message
 echo
 echo "###  The following messages are from quick_start-csw."
-echo "See /opt/csw/mysql51/share/mysql/doc/README.CSW for packaging changes."
+echo "See /opt/csw/share/mysql/doc/README.CSW for packaging changes."
 echo "Please ignore references to starting mysqld_safe in the messages above."
 echo "  These messages are from mysql_install_db.  See the following"
-echo "  for starting CSWmysql51."
+echo "  for starting CSWmysql55."
 smf=no
 if [ -f /usr/sbin/svccfg -a -f /usr/sbin/svcadm ] ; then smf=yes ; fi
 if [ $smf = yes ]
 then
-    echo "To start mysqld; run \`svcadm enable cswmysql51\` on Solaris 10 or later"
+    echo "To start mysqld; run \`svcadm enable cswmysql55\` on Solaris 10 or later"
 else
-    echo "To start mysqld; run \`/etc/opt/csw/init.d/cswmysql51 start\` on Solaris 9 or earlier"
+    echo "To start mysqld; run \`/etc/opt/csw/init.d/cswmysql55 start\` on Solaris 9 or earlier"
 fi
 
 exit 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 Jan 31 02:03:01 2012
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Tue, 31 Jan 2012 01:03:01 +0000
Subject: [csw-devel] SF.net SVN: gar:[16938]
	csw/mgar/pkg/gettext/trunk/Makefile
Message-ID: <E1Rs27h-00079g-TF@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 16938
          http://gar.svn.sourceforge.net/gar/?rev=16938&view=rev
Author:   bdwalton
Date:     2012-01-31 01:03:01 +0000 (Tue, 31 Jan 2012)
Log Message:
-----------
gettext/trunk: more dep cleanup; instate the foreign_packages list for use in this transition

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

Modified: csw/mgar/pkg/gettext/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gettext/trunk/Makefile	2012-01-30 23:01:39 UTC (rev 16937)
+++ csw/mgar/pkg/gettext/trunk/Makefile	2012-01-31 01:03:01 UTC (rev 16938)
@@ -8,6 +8,13 @@
 	GNU gettext utilities are a set of tools that provides a framework to help other GNU packages produce multi-lingual messages
 endef
 
+# a few legacy packages that we still need to depend on for dependency reasons
+# that we no longer want to rebuild and carry.
+FOREIGN_PACKAGES += CSWlibgettextlib0-14-1
+FOREIGN_PACKAGES += CSWlibgettextlib0-17
+FOREIGN_PACKAGES += CSWlibgettextsrc0-17
+FOREIGN_PACKAGES += CSWlibintl2
+FOREIGN_PACKAGES += CSWlibintl3
 
 BUILD_DEP_PKGS += CSWlibncurses-dev CSWlibxml2-dev
 
@@ -17,8 +24,6 @@
 PACKAGES += CSWlibgettextlib0-18-1
 PACKAGES += CSWlibgettextpo0
 PACKAGES += CSWlibgettextsrc0-18-1
-PACKAGES += CSWlibintl2
-PACKAGES += CSWlibintl3
 PACKAGES += CSWlibintl8
 PACKAGES += CSWggettext-dev
 PACKAGES += CSWggettext-data
@@ -30,8 +35,6 @@
 CATALOGNAME_CSWlibgettextlib0-18-1 = libgettextlib0_18_1
 CATALOGNAME_CSWlibgettextpo0 = libgettextpo0
 CATALOGNAME_CSWlibgettextsrc0-18-1 = libgettextsrc0_18_1
-CATALOGNAME_CSWlibintl2 = libintl2
-CATALOGNAME_CSWlibintl3 = libintl3
 CATALOGNAME_CSWlibintl8 = libintl8
 CATALOGNAME_CSWlibgettextlib0-18-1 = libgettextlib0_18_1
 CATALOGNAME_CSWggettext-dev = ggettext_dev
@@ -45,8 +48,6 @@
 SPKG_DESC_CSWlibgettextlib0-18-1 += GNU locale utilities, libgettextlib-0.18.1.so
 SPKG_DESC_CSWlibgettextpo0 += GNU locale utilities, libgettextpo.so.0
 SPKG_DESC_CSWlibgettextsrc0-18-1 += GNU locale utilities, libgettextsrc-0.18.1.so
-SPKG_DESC_CSWlibintl2 += GNU locale utilities, libintl.so.2
-SPKG_DESC_CSWlibintl3 += GNU locale utilities, libintl.so.3
 SPKG_DESC_CSWlibintl8 += GNU locale utilities, libintl.so.8
 SPKG_DESC_CSWlibgettextlib0-18-1 += GNU locale utilities, libgettextlib-0.18.1.so
 SPKG_DESC_CSWggettext-data += GNU locale utilities, translation files
@@ -54,6 +55,8 @@
 
 RUNTIME_DEP_PKGS_CSWggettext += CSWexpat
 RUNTIME_DEP_PKGS_CSWggettext += CSWiconv
+RUNTIME_DEP_PKGS_CSWggettext += CSWlibgettextlib0-14-1
+RUNTIME_DEP_PKGS_CSWggettext += CSWlibgettextlib0-17
 RUNTIME_DEP_PKGS_CSWggettext += CSWlibgettextlib0-18-1
 RUNTIME_DEP_PKGS_CSWggettext += CSWlibgettextsrc0-18-1
 RUNTIME_DEP_PKGS_CSWggettext += CSWlibintl2
@@ -65,6 +68,7 @@
 RUNTIME_DEP_PKGS_CSWggettext-dev += CSWlibasprintf0
 RUNTIME_DEP_PKGS_CSWggettext-dev += CSWlibgettextlib0-18-1
 RUNTIME_DEP_PKGS_CSWggettext-dev += CSWlibgettextpo0
+RUNTIME_DEP_PKGS_CSWggettext-dev += CSWlibgettextsrc0-17
 RUNTIME_DEP_PKGS_CSWggettext-dev += CSWlibgettextsrc0-18-1
 RUNTIME_DEP_PKGS_CSWggettext-dev += CSWlibintl8
 RUNTIME_DEP_PKGS_CSWggettextrt += CSWlibasprintf0
@@ -88,10 +92,6 @@
 RUNTIME_DEP_PKGS_CSWlibgettextsrc0-18-1 += CSWlibxml2-2
 RUNTIME_DEP_PKGS_CSWlibgettextsrc0-18-1 += CSWlibncurses5
 RUNTIME_DEP_PKGS_CSWlibgettextsrc0-18-1 += CSWggettext-data
-RUNTIME_DEP_PKGS_CSWlibintl2 += CSWiconv
-RUNTIME_DEP_PKGS_CSWlibintl2 += CSWggettext-data
-RUNTIME_DEP_PKGS_CSWlibintl3 += CSWiconv
-RUNTIME_DEP_PKGS_CSWlibintl3 += CSWggettext-data
 RUNTIME_DEP_PKGS_CSWlibintl8 += CSWiconv
 RUNTIME_DEP_PKGS_CSWlibintl8 += CSWggettext-data
 
@@ -102,10 +102,6 @@
 PKGFILES_CSWlibgettextpo0 += $(call baseisadirs,$(libdir),libgettextpo\.so\.0\.5\.1)
 PKGFILES_CSWlibgettextsrc0-18-1 += $(call baseisadirs,$(libdir),libgettextsrc-0\.18\.1\.so)
 PKGFILES_CSWlibgettextsrc0-18-1 += $(call baseisadirs,$(libdir),libgettextsrc-0\.18\.1\.so(\.\d+)*)
-PKGFILES_CSWlibintl2 += $(call baseisadirs,$(libdir),libintl\.so\.2)
-PKGFILES_CSWlibintl2 += $(call baseisadirs,$(libdir),libintl\.so\.2(\.\d+)*)
-PKGFILES_CSWlibintl3 += $(call baseisadirs,$(libdir),libintl\.so\.3)
-PKGFILES_CSWlibintl3 += $(call baseisadirs,$(libdir),libintl\.so\.3(\.\d+)*)
 PKGFILES_CSWlibintl8 += $(call baseisadirs,$(libdir),libintl\.so\.8\.0\.2)
 PKGFILES_CSWlibintl8 += $(call baseisadirs,$(libdir),libintl\.so\.8\.1\.1)
 PKGFILES_CSWlibintl8 += $(call baseisadirs,$(libdir),libintl\.so\.8(\.\d+)*)
@@ -129,8 +125,6 @@
 CHECKPKG_OVERRIDES_CSWggettextrt += surplus-dependency|CSWlibintl8
 CHECKPKG_OVERRIDES_CSWggettextrt += surplus-dependency|CSWlibgettextpo0
 CHECKPKG_OVERRIDES_CSWggettextrt += surplus-dependency|CSWggettext-data
-CHECKPKG_OVERRIDES_CSWggettextrt += surplus-dependency|CSWlibintl2
-CHECKPKG_OVERRIDES_CSWggettextrt += surplus-dependency|CSWlibintl3
 CHECKPKG_OVERRIDES_CSWggettextrt += surplus-dependency|CSWlibasprintf0
 CHECKPKG_OVERRIDES_CSWlibgettextpo0 += bad-rpath-entry|/opt/csw/lib/|opt/csw/lib/libgettextpo.so.0.4.0
 CHECKPKG_OVERRIDES_CSWlibgettextpo0 += surplus-dependency|CSWggettext-data
@@ -138,13 +132,9 @@
 CHECKPKG_OVERRIDES_CSWlibgettextsrc0-18-1 += soname-equals-filename
 CHECKPKG_OVERRIDES_CSWlibgettextlib0-18-1 += surplus-dependency|CSWggettext-data
 CHECKPKG_OVERRIDES_CSWlibgettextlib0-18-1 += soname-equals-filename
-CHECKPKG_OVERRIDES_CSWlibintl2 += surplus-dependency|CSWggettext-data
-CHECKPKG_OVERRIDES_CSWlibintl3 += surplus-dependency|CSWggettext-data
 CHECKPKG_OVERRIDES_CSWlibintl8 += surplus-dependency|CSWggettext-data
 CHECKPKG_OVERRIDES_CSWlibasprintf0 += surplus-dependency|CSWggettext-data
 
-CHECKPKG_OVERRIDES_CSWggettext += surplus-dependency|CSWlibintl2
-CHECKPKG_OVERRIDES_CSWggettext += surplus-dependency|CSWlibintl3
 CHECKPKG_OVERRIDES_CSWggettext += file-with-bad-content|/usr/local|root/opt/csw/share/aclocal/lib-prefix.m4
 CHECKPKG_OVERRIDES_CSWggettext += file-with-bad-content|/usr/local|root/opt/csw/share/aclocal/lib-link.m4
 

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


From bdwalton at users.sourceforge.net  Tue Jan 31 02:07:22 2012
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Tue, 31 Jan 2012 01:07:22 +0000
Subject: [csw-devel] SF.net SVN: gar:[16939]
	csw/mgar/pkg/gettext/trunk/Makefile
Message-ID: <E1Rs2Bu-0007Fk-MK@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 16939
          http://gar.svn.sourceforge.net/gar/?rev=16939&view=rev
Author:   bdwalton
Date:     2012-01-31 01:07:22 +0000 (Tue, 31 Jan 2012)
Log Message:
-----------
gettext/trunk: update a few dep names for split changes; fill in some missing build deps

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

Modified: csw/mgar/pkg/gettext/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gettext/trunk/Makefile	2012-01-31 01:03:01 UTC (rev 16938)
+++ csw/mgar/pkg/gettext/trunk/Makefile	2012-01-31 01:07:22 UTC (rev 16939)
@@ -16,7 +16,8 @@
 FOREIGN_PACKAGES += CSWlibintl2
 FOREIGN_PACKAGES += CSWlibintl3
 
-BUILD_DEP_PKGS += CSWlibncurses-dev CSWlibxml2-dev
+BUILD_DEP_PKGS += CSWlibncurses-dev CSWlibxml2-dev CSWlibexpat-dev
+BUILD_DEP_PKGS += CSWlibiconv-dev CSWggettext-dev
 
 PACKAGES += CSWggettext
 PACKAGES += CSWggettextdoc
@@ -53,8 +54,8 @@
 SPKG_DESC_CSWggettext-data += GNU locale utilities, translation files
 SPKG_DESC_CSWggettextrt += GNU locale utilities, transitional dependency package
 
-RUNTIME_DEP_PKGS_CSWggettext += CSWexpat
-RUNTIME_DEP_PKGS_CSWggettext += CSWiconv
+RUNTIME_DEP_PKGS_CSWggettext += CSWlibexpat1
+RUNTIME_DEP_PKGS_CSWggettext += CSWlibiconv2
 RUNTIME_DEP_PKGS_CSWggettext += CSWlibgettextlib0-14-1
 RUNTIME_DEP_PKGS_CSWggettext += CSWlibgettextlib0-17
 RUNTIME_DEP_PKGS_CSWggettext += CSWlibgettextlib0-18-1
@@ -78,21 +79,21 @@
 RUNTIME_DEP_PKGS_CSWggettextrt += CSWlibintl8
 RUNTIME_DEP_PKGS_CSWggettextrt += CSWggettext-data
 RUNTIME_DEP_PKGS_CSWlibasprintf0 += CSWggettext-data
-RUNTIME_DEP_PKGS_CSWlibgettextlib0-18-1 += CSWiconv
+RUNTIME_DEP_PKGS_CSWlibgettextlib0-18-1 += CSWlibiconv2
 RUNTIME_DEP_PKGS_CSWlibgettextlib0-18-1 += CSWlibintl8
 RUNTIME_DEP_PKGS_CSWlibgettextlib0-18-1 += CSWlibxml2-2
 RUNTIME_DEP_PKGS_CSWlibgettextlib0-18-1 += CSWlibncurses5
 RUNTIME_DEP_PKGS_CSWlibgettextlib0-18-1 += CSWggettext-data
-RUNTIME_DEP_PKGS_CSWlibgettextpo0 += CSWiconv
+RUNTIME_DEP_PKGS_CSWlibgettextpo0 += CSWlibiconv2
 RUNTIME_DEP_PKGS_CSWlibgettextpo0 += CSWlibintl8
 RUNTIME_DEP_PKGS_CSWlibgettextpo0 += CSWggettext-data
-RUNTIME_DEP_PKGS_CSWlibgettextsrc0-18-1 += CSWiconv
+RUNTIME_DEP_PKGS_CSWlibgettextsrc0-18-1 += CSWlibiconv2
 RUNTIME_DEP_PKGS_CSWlibgettextsrc0-18-1 += CSWlibgettextlib0-18-1
 RUNTIME_DEP_PKGS_CSWlibgettextsrc0-18-1 += CSWlibintl8
 RUNTIME_DEP_PKGS_CSWlibgettextsrc0-18-1 += CSWlibxml2-2
 RUNTIME_DEP_PKGS_CSWlibgettextsrc0-18-1 += CSWlibncurses5
 RUNTIME_DEP_PKGS_CSWlibgettextsrc0-18-1 += CSWggettext-data
-RUNTIME_DEP_PKGS_CSWlibintl8 += CSWiconv
+RUNTIME_DEP_PKGS_CSWlibintl8 += CSWlibiconv2
 RUNTIME_DEP_PKGS_CSWlibintl8 += CSWggettext-data
 
 PKGFILES_CSWlibgettextlib0-18-1 += $(call baseisadirs,$(libdir),libgettextlib-0\.18\.1\.so)

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


From bdwalton at users.sourceforge.net  Tue Jan 31 02:09:31 2012
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Tue, 31 Jan 2012 01:09:31 +0000
Subject: [csw-devel] SF.net SVN: gar:[16940] csw/mgar/pkg/gettext/trunk
Message-ID: <E1Rs2Dz-0007IR-IF@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 16940
          http://gar.svn.sourceforge.net/gar/?rev=16940&view=rev
Author:   bdwalton
Date:     2012-01-31 01:09:31 +0000 (Tue, 31 Jan 2012)
Log Message:
-----------
gettext/trunk: drop the gnulinks file dup overrides as both packages are sane now

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

Removed Paths:
-------------
    csw/mgar/pkg/gettext/trunk/gnulinks.checkpkg.mk

Modified: csw/mgar/pkg/gettext/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gettext/trunk/Makefile	2012-01-31 01:07:22 UTC (rev 16939)
+++ csw/mgar/pkg/gettext/trunk/Makefile	2012-01-31 01:09:31 UTC (rev 16940)
@@ -115,10 +115,6 @@
 PKGFILES_CSWggettextrt += /opt/csw/share/.*ggettextrt.*
 PKGFILES_CSWggettextdoc = $(PKGFILES_DOC)
 
-# override all file collissions for now.  release updated gnulinks with this
-# update and then remove this file and include
-include gnulinks.checkpkg.mk
-
 CHECKPKG_OVERRIDES_CSWggettextdoc += missing-dependency|CSWperl
 CHECKPKG_OVERRIDES_CSWggettext += surplus-dependency|CSWggettext-data
 CHECKPKG_OVERRIDES_CSWggettext += discouraged-path-in-pkgmap|/opt/csw/share/gettext/archive.git.tar.gz

Deleted: csw/mgar/pkg/gettext/trunk/gnulinks.checkpkg.mk
===================================================================
--- csw/mgar/pkg/gettext/trunk/gnulinks.checkpkg.mk	2012-01-31 01:07:22 UTC (rev 16939)
+++ csw/mgar/pkg/gettext/trunk/gnulinks.checkpkg.mk	2012-01-31 01:09:31 UTC (rev 16940)
@@ -1,22 +0,0 @@
-CHECKPKG_OVERRIDES_CSWggettext += file-collision|/opt/csw/gnu/msgunfmt|CSWggettext|CSWgnulinks
-CHECKPKG_OVERRIDES_CSWggettext += file-collision|/opt/csw/gnu/msguniq|CSWggettext|CSWgnulinks
-CHECKPKG_OVERRIDES_CSWggettext += file-collision|/opt/csw/gnu/ngettext|CSWggettext|CSWgnulinks
-CHECKPKG_OVERRIDES_CSWggettext += file-collision|/opt/csw/gnu/gettextize|CSWggettext|CSWgnulinks
-CHECKPKG_OVERRIDES_CSWggettext += file-collision|/opt/csw/gnu/msgmerge|CSWggettext|CSWgnulinks
-CHECKPKG_OVERRIDES_CSWggettext += file-collision|/opt/csw/gnu/msggrep|CSWggettext|CSWgnulinks
-CHECKPKG_OVERRIDES_CSWggettext += file-collision|/opt/csw/gnu/msgcomm|CSWggettext|CSWgnulinks
-CHECKPKG_OVERRIDES_CSWggettext += file-collision|/opt/csw/gnu/msgen|CSWggettext|CSWgnulinks
-CHECKPKG_OVERRIDES_CSWggettext += file-collision|/opt/csw/gnu/gettext|CSWggettext|CSWgnulinks
-CHECKPKG_OVERRIDES_CSWggettext += file-collision|/opt/csw/gnu/msginit|CSWggettext|CSWgnulinks
-CHECKPKG_OVERRIDES_CSWggettext += file-collision|/opt/csw/gnu/envsubst|CSWggettext|CSWgnulinks
-CHECKPKG_OVERRIDES_CSWggettext += file-collision|/opt/csw/gnu/msgconv|CSWggettext|CSWgnulinks
-CHECKPKG_OVERRIDES_CSWggettext += file-collision|/opt/csw/gnu/msgfmt|CSWggettext|CSWgnulinks
-CHECKPKG_OVERRIDES_CSWggettext += file-collision|/opt/csw/gnu/msgcat|CSWggettext|CSWgnulinks
-CHECKPKG_OVERRIDES_CSWggettext += file-collision|/opt/csw/gnu/msgattrib|CSWggettext|CSWgnulinks
-CHECKPKG_OVERRIDES_CSWggettext += file-collision|/opt/csw/gnu/xgettext|CSWggettext|CSWgnulinks
-CHECKPKG_OVERRIDES_CSWggettext += file-collision|/opt/csw/gnu/msgexec|CSWggettext|CSWgnulinks
-CHECKPKG_OVERRIDES_CSWggettext += file-collision|/opt/csw/gnu/autopoint|CSWggettext|CSWgnulinks
-CHECKPKG_OVERRIDES_CSWggettext += file-collision|/opt/csw/gnu/msgcmp|CSWggettext|CSWgnulinks
-CHECKPKG_OVERRIDES_CSWggettext += file-collision|/opt/csw/gnu/gettext.sh|CSWggettext|CSWgnulinks
-CHECKPKG_OVERRIDES_CSWggettext += file-collision|/opt/csw/gnu/msgfilter|CSWggettext|CSWgnulinks
-CHECKPKG_OVERRIDES_CSWggettext += file-collision|/opt/csw/gnu/recode-sr-latin|CSWggettext|CSWgnulinks

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


From bdwalton at users.sourceforge.net  Tue Jan 31 02:44:14 2012
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Tue, 31 Jan 2012 01:44:14 +0000
Subject: [csw-devel] SF.net SVN: gar:[16941] csw/mgar/pkg/git/trunk
Message-ID: <E1Rs2la-0002rQ-9w@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 16941
          http://gar.svn.sourceforge.net/gar/?rev=16941&view=rev
Author:   bdwalton
Date:     2012-01-31 01:44:13 +0000 (Tue, 31 Jan 2012)
Log Message:
-----------
git/trunk: drop an old (merged) patch and create a new one (still needs cleanup before submission)

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

Added Paths:
-----------
    csw/mgar/pkg/git/trunk/files/0007-on-solaris-we-need-to-use-lintl-to-allow-the-new-i18.patch

Removed Paths:
-------------
    csw/mgar/pkg/git/trunk/files/0007-Use-perl-instead-of-sed-for-t8006-blame-textconv-tes.patch

Modified: csw/mgar/pkg/git/trunk/Makefile
===================================================================
--- csw/mgar/pkg/git/trunk/Makefile	2012-01-31 01:09:31 UTC (rev 16940)
+++ csw/mgar/pkg/git/trunk/Makefile	2012-01-31 01:44:13 UTC (rev 16941)
@@ -1,13 +1,13 @@
 NAME = git
-VERSION = 1.7.8.3
+VERSION = 1.7.9
 #PATCHLEVEL = rc1
 CATEGORIES = devel
 GARTYPE = v2
 
 VENDOR_URL = http://git-scm.org/
 
-NO_SVN_TESTS=YesPlease
-EXTRA_TEST_EXPORTS = NO_SVN_TESTS
+# NO_SVN_TESTS=YesPlease
+# EXTRA_TEST_EXPORTS = NO_SVN_TESTS
 
 # disable tests until next version bump (at the top so it stands out)
 # 1.7.2.1 and 1.7.3 have a failure on current9s when fr.UFT-8 is
@@ -111,7 +111,7 @@
 # to the selection of available utf8 locales.
 PATCHFILES_isa-sparcv8 += 0005-Force-en_US.UTF-8-for-a-git-svn-test.patch
 PATCHFILES += 0006-Patch-out-a-few-usr-share-references.patch
-PATCHFILES += 0007-Use-perl-instead-of-sed-for-t8006-blame-textconv-tes.patch
+PATCHFILES += 0007-on-solaris-we-need-to-use-lintl-to-allow-the-new-i18.patch
 
 fdirs = $(bindir_install) $(mandir) $(libexecdir_install)
 define _git_files

Modified: csw/mgar/pkg/git/trunk/checksums
===================================================================
--- csw/mgar/pkg/git/trunk/checksums	2012-01-31 01:09:31 UTC (rev 16940)
+++ csw/mgar/pkg/git/trunk/checksums	2012-01-31 01:44:13 UTC (rev 16941)
@@ -1 +1 @@
-7a4bc5160166537d4da5eb48a7670dff  git-1.7.8.3.tar.gz
+d94314eb49622a945b22595b36b7fc47  git-1.7.9.tar.gz

Deleted: csw/mgar/pkg/git/trunk/files/0007-Use-perl-instead-of-sed-for-t8006-blame-textconv-tes.patch
===================================================================
--- csw/mgar/pkg/git/trunk/files/0007-Use-perl-instead-of-sed-for-t8006-blame-textconv-tes.patch	2012-01-31 01:09:31 UTC (rev 16940)
+++ csw/mgar/pkg/git/trunk/files/0007-Use-perl-instead-of-sed-for-t8006-blame-textconv-tes.patch	2012-01-31 01:44:13 UTC (rev 16941)
@@ -1,43 +0,0 @@
-From df9fcdc3e9f415416b86ec572f0a248264483c06 Mon Sep 17 00:00:00 2001
-From: Ben Walton <bwalton at opencsw.org>
-Date: Sat, 31 Dec 2011 05:02:05 +0100
-Subject: [PATCH] Use perl instead of sed for t8006-blame-textconv test
-
-In test 'blame --textconv with local changes' of t8006-blame-textconv,
-using /usr/xpg4/bin/sed (as set by SANE_TOOL_PATH), an additional
-newline was added to the output from the 'helper' script.
-
-This was noted by sed with a message such as:
-sed: Missing newline at end of file zero.bin.
-
-Sed then exits with status 2 causing the helper script to also exit
-with status 2.
-
-In turn, this was triggering a fatal error from git blame:
-fatal: unable to read files to diff
-
-To work around this difference in sed behaviour, use perl -p instead
-of sed -e as it exits cleanly and does not insert the additional
-newline.
-
-Signed-off-by: Ben Walton <bwalton at opencsw.org>
----
- t/t8006-blame-textconv.sh |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/t/t8006-blame-textconv.sh b/t/t8006-blame-textconv.sh
-index 4ee42f1..c3c22f7 100755
---- a/t/t8006-blame-textconv.sh
-+++ b/t/t8006-blame-textconv.sh
-@@ -10,7 +10,7 @@ find_blame() {
- cat >helper <<'EOF'
- #!/bin/sh
- grep -q '^bin: ' "$1" || { echo "E: $1 is not \"binary\" file" 1>&2; exit 1; }
--sed 's/^bin: /converted: /' "$1"
-+perl -p -e 's/^bin: /converted: /' "$1"
- EOF
- chmod +x helper
- 
--- 
-1.7.8.2
-

Added: csw/mgar/pkg/git/trunk/files/0007-on-solaris-we-need-to-use-lintl-to-allow-the-new-i18.patch
===================================================================
--- csw/mgar/pkg/git/trunk/files/0007-on-solaris-we-need-to-use-lintl-to-allow-the-new-i18.patch	                        (rev 0)
+++ csw/mgar/pkg/git/trunk/files/0007-on-solaris-we-need-to-use-lintl-to-allow-the-new-i18.patch	2012-01-31 01:44:13 UTC (rev 16941)
@@ -0,0 +1,26 @@
+From a62835b110e5111939d599108ee887c1ddf3e40f Mon Sep 17 00:00:00 2001
+From: Ben Walton <bwalton at opencsw.org>
+Date: Tue, 31 Jan 2012 01:46:04 +0100
+Subject: [PATCH] on solaris, we need to use -lintl to allow the new i18n work
+ to build
+
+Signed-off-by: Ben Walton <bwalton at opencsw.org>
+---
+ Makefile |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index a782409..3a2662e 100644
+--- a/Makefile
++++ b/Makefile
+@@ -939,6 +939,7 @@ ifeq ($(uname_S),SunOS)
+ 	NO_REGEX = YesPlease
+ 	NO_FNMATCH_CASEFOLD = YesPlease
+ 	NO_MSGFMT_EXTENDED_OPTIONS = YesPlease
++	EXTLIBS += -lintl
+ 	ifeq ($(uname_R),5.6)
+ 		SOCKLEN_T = int
+ 		NO_HSTRERROR = YesPlease
+-- 
+1.7.8.3
+

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


From bdwalton at users.sourceforge.net  Tue Jan 31 04:58:33 2012
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Tue, 31 Jan 2012 03:58:33 +0000
Subject: [csw-devel] SF.net SVN: gar:[16942]
	csw/mgar/pkg/gettext/trunk/Makefile
Message-ID: <E1Rs4rZ-0006HU-2M@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 16942
          http://gar.svn.sourceforge.net/gar/?rev=16942&view=rev
Author:   bdwalton
Date:     2012-01-31 03:58:32 +0000 (Tue, 31 Jan 2012)
Log Message:
-----------
gettext/trunk: update devel package file list (poorly named shared libs)

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

Modified: csw/mgar/pkg/gettext/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gettext/trunk/Makefile	2012-01-31 01:44:13 UTC (rev 16941)
+++ csw/mgar/pkg/gettext/trunk/Makefile	2012-01-31 03:58:32 UTC (rev 16942)
@@ -110,7 +110,18 @@
 PKGFILES_CSWlibgettextlib0-18-1 += $(call baseisadirs,$(libdir),libgettextlib-0\.18\.1\.so(\.\d+)*)
 PKGFILES_CSWlibasprintf0 += $(call baseisadirs,$(libdir),libasprintf\.so\.0\.0\.0)
 PKGFILES_CSWlibasprintf0 += $(call baseisadirs,$(libdir),libasprintf\.so\.0(\.\d+)*)
-PKGFILES_CSWggettext-dev += $(PKGFILES_DEVEL)
+PKGFILES_CSWggettext-dev += $(PKGFILES_DEVEL_CONFIG)
+PKGFILES_CSWggettext-dev += $(PKGFILES_DEVEL_STATICLIB)
+PKGFILES_CSWggettext-dev += $(PKGFILES_DEVEL_LIBTOOL)
+PKGFILES_CSWggettext-dev += $(PKGFILES_DEVEL_PKGCONFIG)
+PKGFILES_CSWggettext-dev += $(PKGFILES_DEVEL_INCLUDEDIR)
+PKGFILES_CSWggettext-dev += $(PKGFILES_DEVEL_ACLOCAL)
+PKGFILES_CSWggettext-dev += $(PKGFILES_DEVEL_CONFIG_MANPAGE)
+PKGFILES_CSWggettext-dev += $(PKGFILES_DEVEL_MAN3_MANPAGE)
+PKGFILES_CSWggettest-dev += $(libdir)/libgettextlib.so
+PKGFILES_CSWggettest-dev += $(libdir)/libgettextpo.so
+PKGFILES_CSWggettest-dev += $(libdir)/libgettextsrc.so
+PKGFILES_CSWggettest-dev += $(libdir)/libintl.so
 PKGFILES_CSWggettext-data += /opt/csw/share/locale/.*mo
 PKGFILES_CSWggettextrt += /opt/csw/share/.*ggettextrt.*
 PKGFILES_CSWggettextdoc = $(PKGFILES_DOC)

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


From dam at opencsw.org  Tue Jan 31 07:22:58 2012
From: dam at opencsw.org (Dagobert Michelsen)
Date: Tue, 31 Jan 2012 07:22:58 +0100
Subject: [csw-devel] SF.net SVN: gar:[16942]
	csw/mgar/pkg/gettext/trunk/Makefile
In-Reply-To: <E1Rs4rZ-0006HU-2M@sfp-svn-5.v30.ch3.sourceforge.com>
References: <E1Rs4rZ-0006HU-2M@sfp-svn-5.v30.ch3.sourceforge.com>
Message-ID: <7F290E73-7874-49F7-882A-28B21A870A0D@opencsw.org>

Hi Ben,



Am 31.01.2012 um 04:58 schrieb bdwalton at users.sourceforge.net:

> Revision: 16942
>          http://gar.svn.sourceforge.net/gar/?rev=16942&view=rev
> Author:   bdwalton
> Date:     2012-01-31 03:58:32 +0000 (Tue, 31 Jan 2012)
> Log Message:
> -----------
> gettext/trunk: update devel package file list (poorly named shared libs)
> 
> Modified Paths:
> --------------
>    csw/mgar/pkg/gettext/trunk/Makefile
> 
> Modified: csw/mgar/pkg/gettext/trunk/Makefile
> ===================================================================
> --- csw/mgar/pkg/gettext/trunk/Makefile    2012-01-31 01:44:13 UTC (rev 16941)
> +++ csw/mgar/pkg/gettext/trunk/Makefile    2012-01-31 03:58:32 UTC (rev 16942)
> @@ -110,7 +110,18 @@
> PKGFILES_CSWlibgettextlib0-18-1 += $(call baseisadirs,$(libdir),libgettextlib-0\.18\.1\.so(\.\d+)*)
> PKGFILES_CSWlibasprintf0 += $(call baseisadirs,$(libdir),libasprintf\.so\.0\.0\.0)
> PKGFILES_CSWlibasprintf0 += $(call baseisadirs,$(libdir),libasprintf\.so\.0(\.\d+)*)
> -PKGFILES_CSWggettext-dev += $(PKGFILES_DEVEL)
> +PKGFILES_CSWggettext-dev += $(PKGFILES_DEVEL_CONFIG)
> +PKGFILES_CSWggettext-dev += $(PKGFILES_DEVEL_STATICLIB)
> +PKGFILES_CSWggettext-dev += $(PKGFILES_DEVEL_LIBTOOL)
> +PKGFILES_CSWggettext-dev += $(PKGFILES_DEVEL_PKGCONFIG)
> +PKGFILES_CSWggettext-dev += $(PKGFILES_DEVEL_INCLUDEDIR)
> +PKGFILES_CSWggettext-dev += $(PKGFILES_DEVEL_ACLOCAL)
> +PKGFILES_CSWggettext-dev += $(PKGFILES_DEVEL_CONFIG_MANPAGE)
> +PKGFILES_CSWggettext-dev += $(PKGFILES_DEVEL_MAN3_MANPAGE)
> +PKGFILES_CSWggettest-dev += $(libdir)/libgettextlib.so

ggettest? Really?? ;-)

> +PKGFILES_CSWggettest-dev += $(libdir)/libgettextpo.so
> +PKGFILES_CSWggettest-dev += $(libdir)/libgettextsrc.so
> +PKGFILES_CSWggettest-dev += $(libdir)/libintl.so
> PKGFILES_CSWggettext-data += /opt/csw/share/locale/.*mo
> PKGFILES_CSWggettextrt += /opt/csw/share/.*ggettextrt.*
> PKGFILES_CSWggettextdoc = $(PKGFILES_DOC)
> 
> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
> 
> _______________________________________________
> devel mailing list
> devel at lists.opencsw.org
> https://lists.opencsw.org/mailman/listinfo/devel

From wahwah at users.sourceforge.net  Tue Jan 31 09:18:13 2012
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Tue, 31 Jan 2012 08:18:13 +0000
Subject: [csw-devel] SF.net SVN: gar:[16943]
	csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile
Message-ID: <E1Rs8ur-0002fX-Ps@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 16943
          http://gar.svn.sourceforge.net/gar/?rev=16943&view=rev
Author:   wahwah
Date:     2012-01-31 08:18:13 +0000 (Tue, 31 Jan 2012)
Log Message:
-----------
mysql5/branches/mysql-5.5.x: CSWosslrt --> CSWlibssl0-9-8

Modified Paths:
--------------
    csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile

Modified: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile	2012-01-31 03:58:32 UTC (rev 16942)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile	2012-01-31 08:18:13 UTC (rev 16943)
@@ -78,7 +78,7 @@
 PKGFILES_CSWlibmysqlclient$(MYSQL_LIB_VER) += $(call baseisadirs,$(libdir),libmysqlclient\.so\.$(MYSQL_LIB_VER)(\.\d+)*)
 SPKG_DESC_CSWlibmysqlclient$(MYSQL_LIB_VER) += MySQL $(BASE_VERSION) client library, libmysqlclient.so.$(MYSQL_LIB_VER)
 RUNTIME_DEP_PKGS_CSWlibmysqlclient$(MYSQL_LIB_VER) += CSWlibz1
-RUNTIME_DEP_PKGS_CSWlibmysqlclient$(MYSQL_LIB_VER) += CSWosslrt
+RUNTIME_DEP_PKGS_CSWlibmysqlclient$(MYSQL_LIB_VER) += CSWlibssl0-9-8
 RUNTIME_DEP_PKGS_CSWlibmysqlclient18 += CSWlibgcc-s1
 
 PACKAGES += CSWlibmysqlclient-r$(MYSQL_LIB_VER)
@@ -118,7 +118,7 @@
 # RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibncursesw5
 RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibstdc++6
 RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibz1
-RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWosslrt
+RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibssl0-9-8
 CHECKPKG_OVERRIDES_CSW$(NAME)client += bad-rpath-entry
 
 # It's intentional. There's a sparcv8-incompatible assembler code there, so we
@@ -136,7 +136,7 @@
 RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibstdc++6
 # RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibwrap1
 RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibz1
-RUNTIME_DEP_PKGS_CSW$(NAME) += CSWosslrt
+RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibssl0-9-8
 CHECKPKG_OVERRIDES_CSW$(NAME) += bad-rpath-entry
 CHECKPKG_OVERRIDES_CSW$(NAME) += file-with-bad-content
 

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


From cgrzemba at users.sourceforge.net  Tue Jan 31 10:09:21 2012
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Tue, 31 Jan 2012 09:09:21 +0000
Subject: [csw-devel] SF.net SVN: gar:[16944] csw/mgar/pkg
Message-ID: <E1Rs9iL-0001Np-1m@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 16944
          http://gar.svn.sourceforge.net/gar/?rev=16944&view=rev
Author:   cgrzemba
Date:     2012-01-31 09:09:20 +0000 (Tue, 31 Jan 2012)
Log Message:
-----------
389-posix-ws-plugin/trunk: Initial commit

Added Paths:
-----------
    csw/mgar/pkg/389-posix-ws-plugin/
    csw/mgar/pkg/389-posix-ws-plugin/Makefile
    csw/mgar/pkg/389-posix-ws-plugin/branches/
    csw/mgar/pkg/389-posix-ws-plugin/tags/
    csw/mgar/pkg/389-posix-ws-plugin/trunk/
    csw/mgar/pkg/389-posix-ws-plugin/trunk/Makefile
    csw/mgar/pkg/389-posix-ws-plugin/trunk/checksums
    csw/mgar/pkg/389-posix-ws-plugin/trunk/files/

Added: csw/mgar/pkg/389-posix-ws-plugin/Makefile
===================================================================
--- csw/mgar/pkg/389-posix-ws-plugin/Makefile	                        (rev 0)
+++ csw/mgar/pkg/389-posix-ws-plugin/Makefile	2012-01-31 09:09:20 UTC (rev 16944)
@@ -0,0 +1,2 @@
+%:
+	$(MAKE) -C trunk $*


Property changes on: csw/mgar/pkg/389-posix-ws-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/389-posix-ws-plugin/trunk/Makefile
===================================================================
--- csw/mgar/pkg/389-posix-ws-plugin/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/389-posix-ws-plugin/trunk/Makefile	2012-01-31 09:09:20 UTC (rev 16944)
@@ -0,0 +1,33 @@
+# $Id$
+# TODO (release-critical prefixed with !, non release-critical with *)
+#
+NAME = 389-posix-ws-plugin
+VERSION = 8b7d38c957
+GARTYPE = v2
+CATEGORIES = lib
+
+DESCRIPTION = Posix WinsSync Plugin for 389 Directory Server
+define BLURB
+  This plugin adds posix attributes to the winsync aggreement, so that posix attributes between MS-AD and DS will synced. The MS-AD MMC can get a IMU snap-in so that Posiy Attributes of Users and Groups can also maintian in the MS-AD. Normaly these attributs will not synced with the winsync agreement of a 389 Directory Server.
+endef
+
+MASTER_SITES = https://github.com/cgrzemba/Posix-Winsync-Plugin-for-389-directory-server/tarball/master
+# DISTFILES = cgrzemba-Posix-Winsync-Plugin-for-389-directory-server-7a12af0.zip 
+GIT_REPOS = git://github.com/cgrzemba/Posix-Winsync-Plugin-for-389-directory-server.git
+GIT_USE_PROXY = 1
+# GIT_TREEISH_Posix-Winsync-Plugin-for-389-directory-server.git = $(VERSION)
+
+BUILDDEPS += CSW389-ds-base-dev
+BUILDDEPS += CSWnspr-dev
+
+CONFIGURE_ARGS = $(DIRPATHS)
+CONFIGURE_ARGS += --with-ds-inc=/opt/csw/include/dirsrv
+CONFIGURE_ARGS += --with-nspr-inc=/opt/csw/include/nspr
+
+include gar/category.mk
+
+pre-configure-modulated:
+	cd $(WORKSRC) && aclocal
+	cd $(WORKSRC) && autoconf --force
+	cd $(WORKSRC) && automake -a -c -f
+	@$(MAKECOOKIE)


Property changes on: csw/mgar/pkg/389-posix-ws-plugin/trunk/Makefile
___________________________________________________________________
Added: svn:keywords
   + Id

Added: csw/mgar/pkg/389-posix-ws-plugin/trunk/checksums
===================================================================
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


From maciej at opencsw.org  Tue Jan 31 12:04:40 2012
From: maciej at opencsw.org (=?UTF-8?Q?Maciej_=28Matchek=29_Blizi=C5=84ski?=)
Date: Tue, 31 Jan 2012 11:04:40 +0000
Subject: [csw-devel] SF.net SVN: gar:[16942]
	csw/mgar/pkg/gettext/trunk/Makefile
In-Reply-To: <7F290E73-7874-49F7-882A-28B21A870A0D@opencsw.org>
References: <E1Rs4rZ-0006HU-2M@sfp-svn-5.v30.ch3.sourceforge.com>
	<7F290E73-7874-49F7-882A-28B21A870A0D@opencsw.org>
Message-ID: <CALtRa-5w+H9q5XcgxzHEGLe1f2gD8310mbrdG6hncfZbq70iqA@mail.gmail.com>

2012/1/31 Dagobert Michelsen <dam at opencsw.org>:
> ggettest? Really?? ;-)

It's ggettest on Soalris!

From wahwah at users.sourceforge.net  Tue Jan 31 13:01:16 2012
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Tue, 31 Jan 2012 12:01:16 +0000
Subject: [csw-devel] SF.net SVN: gar:[16945]
	csw/mgar/pkg/openldap/trunk/Makefile
Message-ID: <E1RsCOi-0004Fm-8J@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 16945
          http://gar.svn.sourceforge.net/gar/?rev=16945&view=rev
Author:   wahwah
Date:     2012-01-31 12:01:15 +0000 (Tue, 31 Jan 2012)
Log Message:
-----------
openldap/trunk: Adding $Id$ to the Makefile

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

Property Changed:
----------------
    csw/mgar/pkg/openldap/trunk/Makefile

Modified: csw/mgar/pkg/openldap/trunk/Makefile
===================================================================
--- csw/mgar/pkg/openldap/trunk/Makefile	2012-01-31 09:09:20 UTC (rev 16944)
+++ csw/mgar/pkg/openldap/trunk/Makefile	2012-01-31 12:01:15 UTC (rev 16945)
@@ -1,3 +1,5 @@
+# $Id$
+
 NAME = openldap
 VERSION = 2.4.28
 GARTYPE = v2


Property changes on: csw/mgar/pkg/openldap/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 cgrzemba at users.sourceforge.net  Tue Jan 31 13:23:52 2012
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Tue, 31 Jan 2012 12:23:52 +0000
Subject: [csw-devel] SF.net SVN: gar:[16946]
	csw/mgar/pkg/389-posix-ws-plugin/trunk/Makefile
Message-ID: <E1RsCka-0000KW-UV@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 16946
          http://gar.svn.sourceforge.net/gar/?rev=16946&view=rev
Author:   cgrzemba
Date:     2012-01-31 12:23:52 +0000 (Tue, 31 Jan 2012)
Log Message:
-----------
389-posix-ws-plugin/trunk: Initial release

Modified Paths:
--------------
    csw/mgar/pkg/389-posix-ws-plugin/trunk/Makefile

Modified: csw/mgar/pkg/389-posix-ws-plugin/trunk/Makefile
===================================================================
--- csw/mgar/pkg/389-posix-ws-plugin/trunk/Makefile	2012-01-31 12:01:15 UTC (rev 16945)
+++ csw/mgar/pkg/389-posix-ws-plugin/trunk/Makefile	2012-01-31 12:23:52 UTC (rev 16946)
@@ -14,8 +14,9 @@
 MASTER_SITES = https://github.com/cgrzemba/Posix-Winsync-Plugin-for-389-directory-server/tarball/master
 # DISTFILES = cgrzemba-Posix-Winsync-Plugin-for-389-directory-server-7a12af0.zip 
 GIT_REPOS = git://github.com/cgrzemba/Posix-Winsync-Plugin-for-389-directory-server.git
-GIT_USE_PROXY = 1
+# GIT_USE_PROXY = 1
 # GIT_TREEISH_Posix-Winsync-Plugin-for-389-directory-server.git = $(VERSION)
+GIT_TREEISH_389-posix-ws-plugin.git = $(VERSION)
 
 BUILDDEPS += CSW389-ds-base-dev
 BUILDDEPS += CSWnspr-dev

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


From wahwah at users.sourceforge.net  Tue Jan 31 19:35:51 2012
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Tue, 31 Jan 2012 18:35:51 +0000
Subject: [csw-devel] SF.net SVN: gar:[16947]
	csw/mgar/pkg/openldap/trunk/Makefile
Message-ID: <E1RsIYZ-0001BK-O2@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 16947
          http://gar.svn.sourceforge.net/gar/?rev=16947&view=rev
Author:   wahwah
Date:     2012-01-31 18:35:51 +0000 (Tue, 31 Jan 2012)
Log Message:
-----------
openldap/trunk: updated dependencies, worked around surplus libnet linking

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

Modified: csw/mgar/pkg/openldap/trunk/Makefile
===================================================================
--- csw/mgar/pkg/openldap/trunk/Makefile	2012-01-31 12:23:52 UTC (rev 16946)
+++ csw/mgar/pkg/openldap/trunk/Makefile	2012-01-31 18:35:51 UTC (rev 16947)
@@ -41,17 +41,20 @@
 SPKG_DESC_CSWopenldap = OpenLDAP server for Lightweight Directory Access Protocol
 # PKGFILES is catchall
 RUNTIME_DEP_PKGS_CSWopenldap += CSWbdb48
+RUNTIME_DEP_PKGS_CSWopenldap += CSWlibicudata48
+RUNTIME_DEP_PKGS_CSWopenldap += CSWlibicuuc48
+RUNTIME_DEP_PKGS_CSWopenldap += CSWliblber2-4-2
+RUNTIME_DEP_PKGS_CSWopenldap += CSWlibldap-r2-4-2
 RUNTIME_DEP_PKGS_CSWopenldap += CSWlibltdl7
-RUNTIME_DEP_PKGS_CSWopenldap += CSWosslrt
-RUNTIME_DEP_PKGS_CSWopenldap += CSWsasl
-RUNTIME_DEP_PKGS_CSWopenldap += CSWunixodbc
-RUNTIME_DEP_PKGS_CSWopenldap += CSWperl
+# We do not want that dependency.
+# RUNTIME_DEP_PKGS_CSWopenldap += CSWlibnet
+# RUNTIME_DEP_PKGS_CSWopenldap += CSWlibnet1
+RUNTIME_DEP_PKGS_CSWopenldap += CSWlibodbc2
+RUNTIME_DEP_PKGS_CSWopenldap += CSWlibsasl2-2
 RUNTIME_DEP_PKGS_CSWopenldap += CSWlibslp1
-RUNTIME_DEP_PKGS_CSWopenldap += CSWliblber2-4-2
-RUNTIME_DEP_PKGS_CSWopenldap += CSWlibldap-r2-4-2
-RUNTIME_DEP_PKGS_CSWopenldap += CSWlibicuuc48
-RUNTIME_DEP_PKGS_CSWopenldap += CSWlibicudata48
+RUNTIME_DEP_PKGS_CSWopenldap += CSWlibssl0-9-8
 RUNTIME_DEP_PKGS_CSWopenldap += CSWlibwrap1
+RUNTIME_DEP_PKGS_CSWopenldap += CSWperl
 OBSOLETED_BY_CSWopenldap += CSWoldap
 CATALOGNAME_CSWoldap = openldap_stub
 
@@ -62,10 +65,10 @@
 SPKG_DESC_CSWopenldap-client = OpenLDAP client executables
 PKGFILES_CSWopenldap-client += $(bindir)/.*
 PKGFILES_CSWopenldap-client += $(mandir)/man1/.*
-RUNTIME_DEP_PKGS_CSWopenldap-client += CSWosslrt
-RUNTIME_DEP_PKGS_CSWopenldap-client += CSWsasl 
 RUNTIME_DEP_PKGS_CSWopenldap-client += CSWliblber2-4-2
 RUNTIME_DEP_PKGS_CSWopenldap-client += CSWlibldap2-4-2
+RUNTIME_DEP_PKGS_CSWopenldap-client += CSWlibsasl2-2
+RUNTIME_DEP_PKGS_CSWopenldap-client += CSWlibssl0-9-8
 OBSOLETED_BY_CSWopenldap-client += CSWoldapclient
 CATALOGNAME_CSWoldapclient = openldap_client_stub
 
@@ -82,6 +85,8 @@
 PACKAGES += CSWliblber2-4-2
 SPKG_DESC_CSWliblber2-4-2 = OpenLDAP ASN.1 BER library, liblber-2.4.so.2
 PKGFILES_CSWliblber2-4-2 += $(call pkgfiles_lib,liblber-2.4.so.2)
+RUNTIME_DEP_PKGS_CSWlibldap2-4-2 += CSWlibsasl2-2
+RUNTIME_DEP_PKGS_CSWlibldap2-4-2 += CSWlibssl0-9-8
 OBSOLETED_BY_CSWliblber2-4-2 += CSWoldaprt
 CATALOGNAME_CSWoldaprt = openldap_rt_stub
 
@@ -91,8 +96,6 @@
 PKGFILES_CSWlibldap2-4-2 += $(sysconfdir)/ldap.conf
 PKGFILES_CSWlibldap2-4-2 += $(mandir)/man5/ldap.conf.5
 RUNTIME_DEP_PKGS_CSWlibldap2-4-2 += CSWliblber2-4-2
-RUNTIME_DEP_PKGS_CSWlibldap2-4-2 += CSWosslrt
-RUNTIME_DEP_PKGS_CSWlibldap2-4-2 += CSWsasl
 OBSOLETED_BY_CSWlibldap2-4-2 += CSWoldaprt
 
 # Evaluate later
@@ -102,8 +105,8 @@
 SPKG_DESC_CSWlibldap-r2-4-2 = OpenLDAP reentrant LDAP library, libldap_r-2.4.so.2
 PKGFILES_CSWlibldap-r2-4-2 += $(call pkgfiles_lib,libldap_r-2.4.so.2)
 RUNTIME_DEP_PKGS_CSWlibldap-r2-4-2 += CSWliblber2-4-2
-RUNTIME_DEP_PKGS_CSWlibldap-r2-4-2 += CSWosslrt
-RUNTIME_DEP_PKGS_CSWlibldap-r2-4-2 += CSWsasl
+RUNTIME_DEP_PKGS_CSWlibldap-r2-4-2 += CSWlibsasl2-2
+RUNTIME_DEP_PKGS_CSWlibldap-r2-4-2 += CSWlibssl0-9-8
 OBSOLETED_BY_CSWlibldap-r2-4-2 += CSWoldaprt
 
 FOREIGN_PACKAGES += CSWliblber2-3-0
@@ -161,6 +164,7 @@
 # is completely unrelated. Disable the linkage until this is fixed:
 #   http://www.openldap.org/its/index.cgi?findid=7071
 CONFIGURE_ARGS += ac_cv_lib_net_main=no
+CONFIGURE_ARGS += ac_cv_lib_net_socket=no
 
 # spasswd requires Cyrus SASL
 CONFIGURE_ARGS_32 += --enable-spasswd

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


From guengel at users.sourceforge.net  Tue Jan 31 20:02:21 2012
From: guengel at users.sourceforge.net (guengel at users.sourceforge.net)
Date: Tue, 31 Jan 2012 19:02:21 +0000
Subject: [csw-devel] SF.net SVN: gar:[16948] csw/mgar/pkg/glib2/trunk
Message-ID: <E1RsIyD-00072E-Bh@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 16948
          http://gar.svn.sourceforge.net/gar/?rev=16948&view=rev
Author:   guengel
Date:     2012-01-31 19:02:21 +0000 (Tue, 31 Jan 2012)
Log Message:
-----------
glib2/trunk: Added two more patches.

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

Added Paths:
-----------
    csw/mgar/pkg/glib2/trunk/files/0002-Replace-sh-by-svcs-in-utils-find-program.patch

Modified: csw/mgar/pkg/glib2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/glib2/trunk/Makefile	2012-01-31 18:35:51 UTC (rev 16947)
+++ csw/mgar/pkg/glib2/trunk/Makefile	2012-01-31 19:02:21 UTC (rev 16948)
@@ -23,11 +23,16 @@
 
 DISTFILES = $(NAME)-$(VERSION).tar.bz2
 
-# Reported: https://bugzilla.gnome.org/show_bug.cgi?id=668973
+# Reported: https://bugzilla.gnome.org/show_bug.cgi?id=668973. New in glib-2.30.2
 PATCHFILES += 0001-Disable-inf-nan-mini-test.patch
+# The test looks for sh and expects it to be in /bin, but it is found
+# in /opt/csw/bin. So the patch makes it look for svcs. New in glib-2.30.2
+PATCHFILES += 0002-Replace-sh-by-svcs-in-utils-find-program.patch
+# Patch from glib-2.28.8
+PATCHFILES += 0002-Make-glib-work-with-zoneinfo-version-1.patch
 
 # PATCHFILES = 0001-Use-proper-locale-for-collate-tests.patch
-# PATCHFILES += 0002-Make-glib-work-with-zoneinfo-version-1.patch
+
 # PATCHFILES += 0003-Ad-hoc-macro-for-comparing-double.patch
 # PATCHFILES += 0004-Use-smtp-instead-of-http-in-network-address-test.patch
 # PATCHFILES += 0005-Fix-hard-coded-paths.patch

Added: csw/mgar/pkg/glib2/trunk/files/0002-Replace-sh-by-svcs-in-utils-find-program.patch
===================================================================
--- csw/mgar/pkg/glib2/trunk/files/0002-Replace-sh-by-svcs-in-utils-find-program.patch	                        (rev 0)
+++ csw/mgar/pkg/glib2/trunk/files/0002-Replace-sh-by-svcs-in-utils-find-program.patch	2012-01-31 19:02:21 UTC (rev 16948)
@@ -0,0 +1,34 @@
+From 903ddf339228d00341b397ec4c172ca64d3b6887 Mon Sep 17 00:00:00 2001
+From: Rafael Ostertag <raos at opencsw.org>
+Date: Mon, 30 Jan 2012 08:00:40 +0100
+Subject: [PATCH] Replace sh by svcs in utils/find-program
+
+---
+ glib/tests/utils.c |    9 +++++----
+ 1 files changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/glib/tests/utils.c b/glib/tests/utils.c
+index 81f2706..c8344c7 100644
+--- a/glib/tests/utils.c
++++ b/glib/tests/utils.c
+@@ -210,12 +210,13 @@ test_find_program (void)
+ {
+   gchar *res;
+ 
+-  res = g_find_program_in_path ("sh");
+-  g_assert_cmpstr (res, ==, "/bin/sh");
++  /* sh may be ambigous on Solaris */
++  res = g_find_program_in_path ("svcs");
++  g_assert_cmpstr (res, ==, "/usr/bin/svcs");
+   g_free (res);
+ 
+-  res = g_find_program_in_path ("/bin/sh");
+-  g_assert_cmpstr (res, ==, "/bin/sh");
++  res = g_find_program_in_path ("/usr/bin/svcs");
++  g_assert_cmpstr (res, ==, "/usr/bin/svcs");
+   g_free (res);
+ 
+   res = g_find_program_in_path ("this_program_does_not_exit");
+-- 
+1.7.8.3
+

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


From wahwah at users.sourceforge.net  Tue Jan 31 20:19:29 2012
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Tue, 31 Jan 2012 19:19:29 +0000
Subject: [csw-devel] SF.net SVN: gar:[16949]
	csw/mgar/pkg/openldap/trunk/Makefile
Message-ID: <E1RsJEn-0001z1-0L@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 16949
          http://gar.svn.sourceforge.net/gar/?rev=16949&view=rev
Author:   wahwah
Date:     2012-01-31 19:19:28 +0000 (Tue, 31 Jan 2012)
Log Message:
-----------
openldap/trunk: use post-merge-modulated because otherwise it gets invoked in the global modulation and fails

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

Modified: csw/mgar/pkg/openldap/trunk/Makefile
===================================================================
--- csw/mgar/pkg/openldap/trunk/Makefile	2012-01-31 19:02:21 UTC (rev 16948)
+++ csw/mgar/pkg/openldap/trunk/Makefile	2012-01-31 19:19:28 UTC (rev 16949)
@@ -201,7 +201,7 @@
 CFLAGS := $(filter-out -I%,$(CFLAGS))
 DIRECTORY_EXPORTS := $(filter-out includedir,$(DIRECTORY_EXPORTS))
 
-post-merge:
+post-merge-modulated:
 	ginstall -D $(WORKDIR)/cswopenldap \
 		$(PKGROOT)/etc/opt/csw/init.d/cswopenldap
 	$(foreach F,$(EXTRA_DOCS),ginstall --mode=644 -D $(WORKDIR)/$F $(PKGROOT)$(docdir)/$(NAME)/$F;)

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


From guengel at users.sourceforge.net  Tue Jan 31 20:38:41 2012
From: guengel at users.sourceforge.net (guengel at users.sourceforge.net)
Date: Tue, 31 Jan 2012 19:38:41 +0000
Subject: [csw-devel] SF.net SVN: gar:[16950]
	csw/mgar/pkg/spamass-milter/trunk
Message-ID: <E1RsJXN-0007bR-8w@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 16950
          http://gar.svn.sourceforge.net/gar/?rev=16950&view=rev
Author:   guengel
Date:     2012-01-31 19:38:41 +0000 (Tue, 31 Jan 2012)
Log Message:
-----------
spamass-milter/trunk: Bumped to 0.3.2. Changed MASTER_SITES.

Modified Paths:
--------------
    csw/mgar/pkg/spamass-milter/trunk/Makefile
    csw/mgar/pkg/spamass-milter/trunk/checksums

Modified: csw/mgar/pkg/spamass-milter/trunk/Makefile
===================================================================
--- csw/mgar/pkg/spamass-milter/trunk/Makefile	2012-01-31 19:19:28 UTC (rev 16949)
+++ csw/mgar/pkg/spamass-milter/trunk/Makefile	2012-01-31 19:38:41 UTC (rev 16950)
@@ -1,5 +1,5 @@
 NAME = spamass-milter
-VERSION = 0.3.1
+VERSION = 0.3.2
 CATEGORIES = net
 GARTYPE = v2
 
@@ -8,7 +8,7 @@
   Plugin for the Sendmail Milter library for SpamAssassin
 endef
 
-MASTER_SITES = http://mirrors.aixtools.net/sv/spamass-milt/
+MASTER_SITES = http://download.savannah.gnu.org/releases/spamass-milt/
 DISTFILES  = $(NAME)-$(VERSION).tar.gz
 DISTFILES += COPYING
 

Modified: csw/mgar/pkg/spamass-milter/trunk/checksums
===================================================================
--- csw/mgar/pkg/spamass-milter/trunk/checksums	2012-01-31 19:19:28 UTC (rev 16949)
+++ csw/mgar/pkg/spamass-milter/trunk/checksums	2012-01-31 19:38:41 UTC (rev 16950)
@@ -1,2 +1 @@
-751419260aa954499f7abaabaa882bbe  COPYING
-ca6bf6a9c88db74a6bfea41f499c0ba6  spamass-milter-0.3.1.tar.gz
+964b011fe7d7eddfdb6d94f4767feab8  spamass-milter-0.3.2.tar.gz

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


From bonivart at users.sourceforge.net  Tue Jan 31 21:34:18 2012
From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net)
Date: Tue, 31 Jan 2012 20:34:18 +0000
Subject: [csw-devel] SF.net SVN: gar:[16951]
	csw/mgar/pkg/sendmail/trunk/Makefile
Message-ID: <E1RsKPC-00046j-Ng@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 16951
          http://gar.svn.sourceforge.net/gar/?rev=16951&view=rev
Author:   bonivart
Date:     2012-01-31 20:34:18 +0000 (Tue, 31 Jan 2012)
Log Message:
-----------
sendmail/trunk: fix some deps and ownership and permission of sendmail binary

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

Modified: csw/mgar/pkg/sendmail/trunk/Makefile
===================================================================
--- csw/mgar/pkg/sendmail/trunk/Makefile	2012-01-31 19:38:41 UTC (rev 16950)
+++ csw/mgar/pkg/sendmail/trunk/Makefile	2012-01-31 20:34:18 UTC (rev 16951)
@@ -52,10 +52,10 @@
 CATALOGNAME_CSWsendmail       = sendmail
 SPKG_DESC_CSWsendmail         = $(DESCRIPTION)
 RUNTIME_DEP_PKGS_CSWsendmail  = CSWoldaprt
-RUNTIME_DEP_PKGS_CSWsendmail += CSWosslrt
-RUNTIME_DEP_PKGS_CSWsendmail += CSWsasl
 RUNTIME_DEP_PKGS_CSWsendmail += CSWbdb48
 RUNTIME_DEP_PKGS_CSWsendmail += CSWlibwrap1
+RUNTIME_DEP_PKGS_CSWsendmail += CSWlibssl0-9-8
+RUNTIME_DEP_PKGS_CSWsendmail += CSWlibsasl2-2
 
 PACKAGES                += CSWlibmilter 
 CATALOGNAME_CSWlibmilter = libmilter
@@ -115,11 +115,15 @@
 MIGRATE_SOURCE_DIR_CSWsendmail = /opt/csw/etc/mail
 MIGRATE_DEST_DIR_CSWsendmail   = /etc/opt/csw/mail
 
-PROTOTYPE_MODIFIERS = 1
+PROTOTYPE_MODIFIERS = 1 2
 PROTOTYPE_FILES_1   = /var/opt/csw/spool/clientmqueue
 PROTOTYPE_USER_1    = smmsp
 PROTOTYPE_GROUP_1   = smmsp
 PROTOTYPE_PERMS_1   = 0750
+PROTOTYPE_FILES_2   = /opt/csw/lib/sendmail
+PROTOTYPE_USER_2    = root
+PROTOTYPE_GROUP_2   = smmsp
+PROTOTYPE_PERMS_2   = 2555
 
 CONFIGURE_SCRIPTS   = custom
 BUILD_SCRIPTS       = custom

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