From chninkel at users.sourceforge.net  Mon Apr  1 00:27:44 2013
From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net)
Date: Sun, 31 Mar 2013 22:27:44 +0000
Subject: [csw-devel] SF.net SVN: gar:[20555] csw/mgar/pkg/httping/trunk
Message-ID: <E1UMQj2-0002yy-4K@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 20555
          http://gar.svn.sourceforge.net/gar/?rev=20555&view=rev
Author:   chninkel
Date:     2013-03-31 22:27:43 +0000 (Sun, 31 Mar 2013)
Log Message:
-----------
httping/trunk: bumped to 1.5.4 again

Modified Paths:
--------------
    csw/mgar/pkg/httping/trunk/Makefile
    csw/mgar/pkg/httping/trunk/files/0001-Makefile-make-options-and-tools-configurable.patch

Modified: csw/mgar/pkg/httping/trunk/Makefile
===================================================================
--- csw/mgar/pkg/httping/trunk/Makefile	2013-03-31 21:58:20 UTC (rev 20554)
+++ csw/mgar/pkg/httping/trunk/Makefile	2013-03-31 22:27:43 UTC (rev 20555)
@@ -3,7 +3,7 @@
 #   feedback pending.
 #
 NAME = httping
-VERSION = 1.4.1
+VERSION = 1.5.3
 GARTYPE = v2
 
 PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
@@ -30,7 +30,7 @@
 # strndup is not defined anymore in httping source (file str.c)
 # starting from at least 1.5.3 but it still doesn't exist under
 # Solaris 9 so we have to define the function
-#PATCHFILES += 0002-Define-strndup-function.patch
+PATCHFILES += 0002-Define-strndup-function.patch
 
 CONFIGURE_SCRIPTS =
 TEST_SCRIPTS =

Modified: csw/mgar/pkg/httping/trunk/files/0001-Makefile-make-options-and-tools-configurable.patch
===================================================================
--- csw/mgar/pkg/httping/trunk/files/0001-Makefile-make-options-and-tools-configurable.patch	2013-03-31 21:58:20 UTC (rev 20554)
+++ csw/mgar/pkg/httping/trunk/files/0001-Makefile-make-options-and-tools-configurable.patch	2013-03-31 22:27:43 UTC (rev 20555)
@@ -1,25 +1,26 @@
-From 93f4891fa7d19a152dcd0d10a4207933010b2fc9 Mon Sep 17 00:00:00 2001
-From: Yann Rouillard <yann at pleiades.fr.eu.org>
-Date: Sun, 31 Mar 2013 23:49:28 +0200
+From acfa6600510090092bd64b759400fbee81827f3b Mon Sep 17 00:00:00 2001
+From: Ben Walton <bwalton at opencsw.org>
+Date: Fri, 22 Jun 2012 04:15:19 +0200
 Subject: [PATCH] Makefile: make options and tools configurable
 
+Signed-off-by: Ben Walton <bwalton at opencsw.org>
 ---
- Makefile | 20 ++++++++++----------
+ Makefile |   20 ++++++++++----------
  1 file changed, 10 insertions(+), 10 deletions(-)
 
 diff --git a/Makefile b/Makefile
-index c27bf22..0133741 100644
+index 1351e33..da3695b 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -16,26 +16,26 @@ include version
- 
+@@ -17,26 +17,26 @@ include version
  TARGET=httping
  
+ DEBUG=yes
 -WFLAGS=-Wall -W
 -OFLAGS=-O2
 +WFLAGS?=-Wall -W
 +OFLAGS?=-O2
- CFLAGS+=$(WFLAGS) $(OFLAGS) -DVERSION=\"$(VERSION)\"
+ CFLAGS+=$(WFLAGS) $(OFLAGS) -DVERSION=\"$(VERSION)\" -g
  
  PACKAGE=$(TARGET)-$(VERSION)
 -PREFIX=/usr
@@ -47,7 +48,7 @@
  
  OBJS=mem.o http.o io.o str.o error.o utils.o main.o tcp.o res.o
  
-@@ -62,7 +62,7 @@ endif
+@@ -63,7 +63,7 @@ endif
  all: $(TARGET)
  
  $(TARGET): $(OBJS)
@@ -57,5 +58,5 @@
  	# Oh, blatant plug: http://keetweej.vanheusden.com/wishlist.html
  
 -- 
-1.8.1.4
+1.7.10.3
 

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


From wahwah at users.sourceforge.net  Mon Apr  1 00:32:35 2013
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Sun, 31 Mar 2013 22:32:35 +0000
Subject: [csw-devel] SF.net SVN: gar:[20556] csw/mgar/gar/v2/lib
Message-ID: <E1UMQnj-000383-9x@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 20556
          http://gar.svn.sourceforge.net/gar/?rev=20556&view=rev
Author:   wahwah
Date:     2013-03-31 22:32:35 +0000 (Sun, 31 Mar 2013)
Log Message:
-----------
pkgdb-web: Don't try to access HTTP_AUTHORIZATION

We only need the user name and there's a better way to get it, without
exposing user's password to the script.

Modified Paths:
--------------
    csw/mgar/gar/v2/lib/python/rest.py
    csw/mgar/gar/v2/lib/web/releases_web.py

Modified: csw/mgar/gar/v2/lib/python/rest.py
===================================================================
--- csw/mgar/gar/v2/lib/python/rest.py	2013-03-31 22:27:43 UTC (rev 20555)
+++ csw/mgar/gar/v2/lib/python/rest.py	2013-03-31 22:32:35 UTC (rev 20556)
@@ -120,7 +120,7 @@
     """Set basic HTTP auth options on given Curl object."""
     if self.username:
       logging.debug("Using basic AUTH for user %s", self.username)
-      c.setopt(pycurl.HTTPAUTH, pycurl.HTTPAUTH_ANY)
+      c.setopt(pycurl.HTTPAUTH, pycurl.HTTPAUTH_BASIC)
       c.setopt(pycurl.USERPWD, "%s:%s" % (self.username, self.password))
     else:
       logging.debug("User and password not set, not using HTTP AUTH")

Modified: csw/mgar/gar/v2/lib/web/releases_web.py
===================================================================
--- csw/mgar/gar/v2/lib/web/releases_web.py	2013-03-31 22:27:43 UTC (rev 20555)
+++ csw/mgar/gar/v2/lib/web/releases_web.py	2013-03-31 22:32:35 UTC (rev 20556)
@@ -151,7 +151,7 @@
     if catrel_name not in CAN_UPLOAD_TO_CATALOGS:
       # Updates via web are allowed only for the unstable catalog.
       # We should return an error message instead.
-      raise web.forbidden()
+      raise web.forbidden('Not allowed to upload to %s' % catrel_name)
     try:
       if arch_name == 'all':
         raise checkpkg_lib.CatalogDatabaseError(
@@ -191,13 +191,8 @@
           srv4_to_remove = pkg_in_catalog.srv4file
           c.RemoveSrv4(srv4_to_remove, osrel_name, arch_name, catrel_name)
 
-      # Retrieving authentication data from the HTTP environment.
-      # If the auth data isn't there, this code will fail.
-      auth = web.ctx.env.get('HTTP_AUTHORIZATION')
-      if not auth:
-        raise web.forbidden()
-      auth = re.sub('^Basic ','',auth)
-      username, password = base64.decodestring(auth).split(':')
+      # Retrieving logged in user name from the HTTP environment.
+      username = web.ctx.env.get('REMOTE_USER')
 
       c.AddSrv4ToCatalog(srv4, osrel_name, arch_name, catrel_name, who=username)
       web.header(

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


From chninkel at users.sourceforge.net  Mon Apr  1 00:45:18 2013
From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net)
Date: Sun, 31 Mar 2013 22:45:18 +0000
Subject: [csw-devel] SF.net SVN: gar:[20557] csw/mgar/pkg/socat/trunk
Message-ID: <E1UMR02-0003RY-9S@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 20557
          http://gar.svn.sourceforge.net/gar/?rev=20557&view=rev
Author:   chninkel
Date:     2013-03-31 22:45:18 +0000 (Sun, 31 Mar 2013)
Log Message:
-----------
socat/trunk: rebuilt against libssl1.0.

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

Modified: csw/mgar/pkg/socat/trunk/Makefile
===================================================================
--- csw/mgar/pkg/socat/trunk/Makefile	2013-03-31 22:32:35 UTC (rev 20556)
+++ csw/mgar/pkg/socat/trunk/Makefile	2013-03-31 22:45:18 UTC (rev 20557)
@@ -40,7 +40,7 @@
 UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
 
 
-RUNTIME_DEP_PKGS = CSWosslrt CSWreadline CSWtcpwrap
+RUNTIME_DEP_PKGS = CSWlibssl1-0-0 CSWlibreadline6 CSWlibwrap1
 
 # test.sh uses unescaped nested double quotes (doesn't work with /bin/bash)
 PATCHFILES += 0001-Escape-nested-double-quotes.patch
@@ -121,6 +121,8 @@
 # where TESTNAME is one of the uppercase testnames from above 
 # (for example PTMXWAITSLAVE).
 
+TEST_SCRIPTS =
+
 include gar/category.mk
 
 post-install-modulated: DOCDEST=$(DESTDIR)$(docdir)/$(NAME)

Modified: csw/mgar/pkg/socat/trunk/files/changelog.CSW
===================================================================
--- csw/mgar/pkg/socat/trunk/files/changelog.CSW	2013-03-31 22:32:35 UTC (rev 20556)
+++ csw/mgar/pkg/socat/trunk/files/changelog.CSW	2013-03-31 22:45:18 UTC (rev 20557)
@@ -1,3 +1,9 @@
+socat (1.7.1.1,REV=2013.04.01)
+
+  * Rebuilt against libssl1.0.0
+
+ -- Yann Rouillard <yann at opencsw.org>  Mon, 01 Apr 2013 00:31:55 +0200
+
 socat (1.7.1.1,REV=2009.05.10)
 
   * Updated to 1.7.1.1 (Closes: #3594).

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


From chninkel at users.sourceforge.net  Mon Apr  1 01:21:26 2013
From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net)
Date: Sun, 31 Mar 2013 23:21:26 +0000
Subject: [csw-devel] SF.net SVN: gar:[20558] csw/mgar/pkg/w3m/trunk/Makefile
Message-ID: <E1UMRZ0-0004UU-IN@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 20558
          http://gar.svn.sourceforge.net/gar/?rev=20558&view=rev
Author:   chninkel
Date:     2013-03-31 23:21:26 +0000 (Sun, 31 Mar 2013)
Log Message:
-----------
w3m/trunk: rebuilt against libssl 1.0.0

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

Modified: csw/mgar/pkg/w3m/trunk/Makefile
===================================================================
--- csw/mgar/pkg/w3m/trunk/Makefile	2013-03-31 22:45:18 UTC (rev 20557)
+++ csw/mgar/pkg/w3m/trunk/Makefile	2013-03-31 23:21:26 UTC (rev 20558)
@@ -15,7 +15,7 @@
 
 SPKG_SOURCEURL = http://w3m.sourceforge.net/
 
-RUNTIME_DEP_PKGS += CSWggettextrt CSWlibgc CSWosslrt CSWzlib
+RUNTIME_DEP_PKGS += CSWlibgc1 CSWlibssl1-0-0 CSWlibz1 CSWlibintl8 CSWperl
 
 # We define upstream file regex so we can be notifed of new upstream software release
 UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=39518
@@ -26,6 +26,9 @@
 # uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES
 # UPSTREAM_MASTER_SITES = 
 
+CHECKPKG_OVERRIDES_CSWw3m += file-with-bad-content|/usr/local|root/opt/csw/libexec/w3m/cgi-bin/multipart.cgi
+CHECKPKG_OVERRIDES_CSWw3m += file-with-bad-content|/usr/local|root/opt/csw/libexec/w3m/cgi-bin/w3mman2html.cgi
+
 #LD_OPTIONS = -R/opt/csw/lib/\$$ISALIST -R/opt/csw/lib -R/usr/openwin/lib
 #export LD_OPTIONS
 
@@ -33,6 +36,7 @@
 CONFIGURE_ARGS += --with-gc=$(BUILD_PREFIX)
 CONFIGURE_ARGS += --enable-image=no_
 
+
 TEST_TARGET = 
 
 include gar/category.mk

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


From pfelecan at users.sourceforge.net  Mon Apr  1 11:01:06 2013
From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net)
Date: Mon, 01 Apr 2013 09:01:06 +0000
Subject: [csw-devel] SF.net SVN: gar:[20559]
	csw/mgar/pkg/emacs/trunk/Makefile
Message-ID: <E1UMaby-00021D-DI@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 20559
          http://gar.svn.sourceforge.net/gar/?rev=20559&view=rev
Author:   pfelecan
Date:     2013-04-01 09:01:04 +0000 (Mon, 01 Apr 2013)
Log Message:
-----------
emacs/trunk: re-activated link mapping

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

Modified: csw/mgar/pkg/emacs/trunk/Makefile
===================================================================
--- csw/mgar/pkg/emacs/trunk/Makefile	2013-03-31 23:21:26 UTC (rev 20558)
+++ csw/mgar/pkg/emacs/trunk/Makefile	2013-04-01 09:01:04 UTC (rev 20559)
@@ -66,9 +66,9 @@
 BUILD_DEP_PKGS		+=	CSWpkgconfig
 BUILD_DEP_PKGS		+=	CSWsunx11devel
 
-LINKER_MAPS			=
-LINKER_DIRECT		=
-LINKER_IGNORE		=
+# LINKER_MAPS			=
+# LINKER_DIRECT		=
+# LINKER_IGNORE		=
 
 PACKAGING_PLATFORMS	=	solaris10-sparc
 PACKAGING_PLATFORMS	+=	solaris10-i386

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


From pfelecan at users.sourceforge.net  Mon Apr  1 13:15:49 2013
From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net)
Date: Mon, 01 Apr 2013 11:15:49 +0000
Subject: [csw-devel] SF.net SVN: gar:[20560]
	csw/mgar/pkg/emacs/trunk/Makefile
Message-ID: <E1UMciL-0005Oa-3I@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 20560
          http://gar.svn.sourceforge.net/gar/?rev=20560&view=rev
Author:   pfelecan
Date:     2013-04-01 11:15:46 +0000 (Mon, 01 Apr 2013)
Log Message:
-----------
emacs/trunk:
- removed some uneeded run-time dependencies
- removed all overrides to re-check the recipe

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

Modified: csw/mgar/pkg/emacs/trunk/Makefile
===================================================================
--- csw/mgar/pkg/emacs/trunk/Makefile	2013-04-01 09:01:04 UTC (rev 20559)
+++ csw/mgar/pkg/emacs/trunk/Makefile	2013-04-01 11:15:46 UTC (rev 20560)
@@ -141,47 +141,6 @@
 PACKAGES							=	CSWemacs-common
 SPKG_DESC_CSWemacs-common			=	$(DESCRIPTION) - architecture neutral common components
 CATALOGNAME_CSWemacs-common			=	emacs_common
-CHECKPKG_OVERRIDES_CSWemacs-common	+=	missing-dependency|CSWemacscommon
-CHECKPKG_OVERRIDES_CSWemacs-common	+=	file-with-bad-content|/usr/share|root/opt/csw/share/emacs/$(VERSION)/etc/compilation.txt
-CHECKPKG_OVERRIDES_CSWemacs-common	+=	file-with-bad-content|/usr/share|root/opt/csw/share/emacs/$(VERSION)/etc/PROBLEMS
-CHECKPKG_OVERRIDES_CSWemacs-common	+=	file-with-bad-content|/usr/share|root/opt/csw/share/emacs/$(VERSION)/etc/DOC-$(VERSION).1
-CHECKPKG_OVERRIDES_CSWemacs-common	+=	file-with-bad-content|/usr/share|root/opt/csw/share/emacs/$(VERSION)/lisp/hfy-cmap.elc
-CHECKPKG_OVERRIDES_CSWemacs-common	+=	file-with-bad-content|/usr/share|root/opt/csw/share/emacs/$(VERSION)/lisp/printing.elc
-CHECKPKG_OVERRIDES_CSWemacs-common	+=	file-with-bad-content|/usr/share|root/opt/csw/share/emacs/$(VERSION)/lisp/woman.elc
-CHECKPKG_OVERRIDES_CSWemacs-common	+=	file-with-bad-content|/usr/share|root/opt/csw/share/emacs/$(VERSION)/lisp/cedet/semantic/bovine/scm.elc
-CHECKPKG_OVERRIDES_CSWemacs-common	+=	file-with-bad-content|/usr/share|root/opt/csw/share/emacs/$(VERSION)/lisp/international/mule-cmds.elc
-CHECKPKG_OVERRIDES_CSWemacs-common	+=	file-with-bad-content|/usr/share|root/opt/csw/share/emacs/$(VERSION)/lisp/international/eucjp-ms.el
-CHECKPKG_OVERRIDES_CSWemacs-common	+=	file-with-bad-content|/usr/share|root/opt/csw/share/emacs/$(VERSION)/lisp/term/x-win.elc
-CHECKPKG_OVERRIDES_CSWemacs-common	+=	file-with-bad-content|/usr/share|root/opt/csw/share/emacs/$(VERSION)/lisp/textmodes/ispell.elc
-CHECKPKG_OVERRIDES_CSWemacs-common	+=	file-with-bad-content|/usr/share|root/opt/csw/share/emacs/$(VERSION)/lisp/mh-e/mh-xface.elc
-CHECKPKG_OVERRIDES_CSWemacs-common	+=	file-with-bad-content|/usr/share|root/opt/csw/share/emacs/$(VERSION)/lisp/mh-e/mh-alias.elc
-CHECKPKG_OVERRIDES_CSWemacs-common	+=	file-with-bad-content|/usr/share|root/opt/csw/share/emacs/$(VERSION)/lisp/gnus/gnus-art.elc
-CHECKPKG_OVERRIDES_CSWemacs-common	+=	file-with-bad-content|/usr/local|root/opt/csw/share/emacs/$(VERSION)/etc/MH-E-NEWS
-CHECKPKG_OVERRIDES_CSWemacs-common	+=	file-with-bad-content|/usr/local|root/opt/csw/share/emacs/$(VERSION)/etc/NEWS.20
-CHECKPKG_OVERRIDES_CSWemacs-common	+=	file-with-bad-content|/usr/local|root/opt/csw/share/emacs/$(VERSION)/etc/PROBLEMS
-CHECKPKG_OVERRIDES_CSWemacs-common	+=	file-with-bad-content|/usr/local|root/opt/csw/share/emacs/$(VERSION)/etc/NEWS.19
-CHECKPKG_OVERRIDES_CSWemacs-common	+=	file-with-bad-content|/usr/local|root/opt/csw/share/emacs/$(VERSION)/etc/DOC-$(VERSION).1
-CHECKPKG_OVERRIDES_CSWemacs-common	+=	file-with-bad-content|/usr/local|root/opt/csw/share/emacs/$(VERSION)/lisp/man.elc
-CHECKPKG_OVERRIDES_CSWemacs-common	+=	file-with-bad-content|/usr/local|root/opt/csw/share/emacs/$(VERSION)/lisp/ffap.elc
-CHECKPKG_OVERRIDES_CSWemacs-common	+=	file-with-bad-content|/usr/local|root/opt/csw/share/emacs/$(VERSION)/lisp/ps-bdf.elc
-CHECKPKG_OVERRIDES_CSWemacs-common	+=	file-with-bad-content|/usr/local|root/opt/csw/share/emacs/$(VERSION)/lisp/find-file.elc
-CHECKPKG_OVERRIDES_CSWemacs-common	+=	file-with-bad-content|/usr/local|root/opt/csw/share/emacs/$(VERSION)/lisp/loaddefs.el
-CHECKPKG_OVERRIDES_CSWemacs-common	+=	file-with-bad-content|/usr/local|root/opt/csw/share/emacs/$(VERSION)/lisp/ldefs-boot.el
-CHECKPKG_OVERRIDES_CSWemacs-common	+=	file-with-bad-content|/usr/local|root/opt/csw/share/emacs/$(VERSION)/lisp/woman.elc
-CHECKPKG_OVERRIDES_CSWemacs-common	+=	file-with-bad-content|/usr/local|root/opt/csw/share/emacs/$(VERSION)/lisp/obsolete/complete.elc
-CHECKPKG_OVERRIDES_CSWemacs-common	+=	file-with-bad-content|/usr/local|root/opt/csw/share/emacs/$(VERSION)/lisp/progmodes/idlwave.elc
-CHECKPKG_OVERRIDES_CSWemacs-common	+=	file-with-bad-content|/usr/local|root/opt/csw/share/emacs/$(VERSION)/lisp/progmodes/idlw-help.elc
-CHECKPKG_OVERRIDES_CSWemacs-common	+=	file-with-bad-content|/usr/local|root/opt/csw/share/emacs/$(VERSION)/lisp/progmodes/m4-mode.elc
-CHECKPKG_OVERRIDES_CSWemacs-common	+=	file-with-bad-content|/usr/local|root/opt/csw/share/emacs/$(VERSION)/lisp/progmodes/ada-mode.elc
-CHECKPKG_OVERRIDES_CSWemacs-common	+=	file-with-bad-content|/usr/local|root/opt/csw/share/emacs/$(VERSION)/lisp/play/dunnet.elc
-CHECKPKG_OVERRIDES_CSWemacs-common	+=	file-with-bad-content|/usr/local|root/opt/csw/share/emacs/$(VERSION)/lisp/textmodes/ispell.elc
-CHECKPKG_OVERRIDES_CSWemacs-common	+=	file-with-bad-content|/usr/local|root/opt/csw/share/emacs/$(VERSION)/lisp/mh-e/mh-e.elc
-CHECKPKG_OVERRIDES_CSWemacs-common	+=	file-with-bad-content|/usr/local|root/opt/csw/share/emacs/$(VERSION)/lisp/gnus/gnus-setup.elc
-CHECKPKG_OVERRIDES_CSWemacs-common	+=	file-with-bad-content|/usr/local|root/opt/csw/share/emacs/$(VERSION)/lisp/gnus/gnus-art.elc
-CHECKPKG_OVERRIDES_CSWemacs-common	+=	file-with-bad-content|/usr/local|root/opt/csw/share/emacs/$(VERSION)/lisp/gnus/mailcap.elc
-CHECKPKG_OVERRIDES_CSWemacs-common	+=	file-with-bad-content|/usr/local|root/opt/csw/share/emacs/$(VERSION)/lisp/net/tramp-loaddefs.el
-CHECKPKG_OVERRIDES_CSWemacs-common	+=	file-with-bad-content|/usr/local|root/opt/csw/share/emacs/$(VERSION)/lisp/net/tramp-sh.elc
-CHECKPKG_OVERRIDES_CSWemacs-common	+=	file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/emacs.1
 # as we use alternatives, we need to obsolete emacs_chooser;
 # emacs_common, being the root dependence of all emacs related
 # packages, seems the best place to do it.
@@ -192,29 +151,6 @@
 # specialize the variable:
 EXTRA_TEXINFO						=	$(infodir)/.*
 ARCHALL_CSWemacs-common				=	1
-CHECKPKG_OVERRIDES_CSWemacs-common	+=	file-with-bad-content|/usr/local|root/opt/csw/share/info/gnus.info
-CHECKPKG_OVERRIDES_CSWemacs-common	+=	file-with-bad-content|/usr/local|root/opt/csw/share/info/tramp.info
-CHECKPKG_OVERRIDES_CSWemacs-common	+=	file-with-bad-content|/usr/local|root/opt/csw/share/info/eintr.info
-CHECKPKG_OVERRIDES_CSWemacs-common	+=	file-with-bad-content|/usr/local|root/opt/csw/share/info/reftex.info
-CHECKPKG_OVERRIDES_CSWemacs-common	+=	file-with-bad-content|/usr/local|root/opt/csw/share/info/emacs.info
-CHECKPKG_OVERRIDES_CSWemacs-common	+=	file-with-bad-content|/usr/local|root/opt/csw/share/info/efaq.info
-CHECKPKG_OVERRIDES_CSWemacs-common	+=	file-with-bad-content|/usr/local|root/opt/csw/share/info/eshell.info
-CHECKPKG_OVERRIDES_CSWemacs-common	+=	file-with-bad-content|/usr/local|root/opt/csw/share/info/elisp.info
-CHECKPKG_OVERRIDES_CSWemacs-common	+=	file-with-bad-content|/usr/local|root/opt/csw/share/info/woman.info
-CHECKPKG_OVERRIDES_CSWemacs-common	+=	file-with-bad-content|/usr/local|root/opt/csw/share/info/mh-e.info
-CHECKPKG_OVERRIDES_CSWemacs-common	+=	file-with-bad-content|/usr/local|root/opt/csw/share/info/idlwave.info
-CHECKPKG_OVERRIDES_CSWemacs-common	+=	file-with-bad-content|/usr/local|root/opt/csw/share/emacs/24.3/lisp/info.elc
-CHECKPKG_OVERRIDES_CSWemacs-common	+=	file-with-bad-content|/usr/local|root/opt/csw/share/emacs/24.3/lisp/gnus/nnspool.elc
-CHECKPKG_OVERRIDES_CSWemacs-common	+=	file-with-bad-content|/usr/local|root/opt/csw/share/emacs/24.3/etc/NEWS
-CHECKPKG_OVERRIDES_CSWemacs-common	+=	file-with-bad-content|/usr/share|root/opt/csw/share/info/eintr.info
-CHECKPKG_OVERRIDES_CSWemacs-common	+=	file-with-bad-content|/usr/share|root/opt/csw/share/info/dbus.info
-CHECKPKG_OVERRIDES_CSWemacs-common	+=	file-with-bad-content|/usr/share|root/opt/csw/share/info/emacs.info
-CHECKPKG_OVERRIDES_CSWemacs-common	+=	file-with-bad-content|/usr/share|root/opt/csw/share/info/efaq.info
-CHECKPKG_OVERRIDES_CSWemacs-common	+=	file-with-bad-content|/usr/share|root/opt/csw/share/info/elisp.info
-CHECKPKG_OVERRIDES_CSWemacs-common	+=	file-with-bad-content|/usr/share|root/opt/csw/share/emacs/24.3/lisp/ldefs-boot.el
-CHECKPKG_OVERRIDES_CSWemacs-common	+=	file-with-bad-content|/usr/share|root/opt/csw/share/emacs/24.3/lisp/loaddefs.el
-CHECKPKG_OVERRIDES_CSWemacs-common	+=	file-with-bad-content|/usr/share|root/opt/csw/share/emacs/24.3/lisp/org/org-version.el
-CHECKPKG_OVERRIDES_CSWemacs-common	+=	file-with-bad-content|/usr/share|root/opt/csw/share/emacs/24.3/lisp/org/org-odt.elc
 
 PACKAGES						+=	CSWemacs-el
 SPKG_DESC_CSWemacs-el			=	$(DESCRIPTION) - elisp sources
@@ -233,9 +169,6 @@
 CATALOGNAME_CSWemacsbincommon			=	emacsbincommon_stub
 RUNTIME_DEP_PKGS_CSWemacs-bin-common	=	CSWemacs-common
 RUNTIME_DEP_PKGS_CSWemacs-common		+=	CSWperl
-CHECKPKG_OVERRIDES_CSWemacs-bin-common	+=	surplus-dependency|CSWemacs-common
-CHECKPKG_OVERRIDES_CSWemacs-bin-common	+=	no-direct-binding|/opt/csw/libexec/emacs/24.3/sparc-sun-solaris2.10/movemail|is|not|directly|bound|to|soname|libmail.so.1
-CHECKPKG_OVERRIDES_CSWemacs-bin-common	+=	no-direct-binding|/opt/csw/libexec/emacs/24.3/i386-pc-solaris2.10/movemail|is|not|directly|bound|to|soname|libmail.so.1
 PKGFILES_CSWemacs-bin-common			=	/opt/csw/bin/b2m
 PKGFILES_CSWemacs-bin-common			+=	/opt/csw/bin/ctags.emacs
 PKGFILES_CSWemacs-bin-common			+=	/opt/csw/bin/ebrowse
@@ -257,8 +190,6 @@
 RUNTIME_DEP_PKGS_CSWemacs-athena	=	CSWemacs-bin-common
 RUNTIME_DEP_PKGS_CSWemacs-athena	+=	CSWemacs-common
 RUNTIME_DEP_PKGS_CSWemacs-athena	+=	CSWfconfig
-RUNTIME_DEP_PKGS_CSWemacs-athena	+=	CSWlibbz2-1-0
-RUNTIME_DEP_PKGS_CSWemacs-athena	+=	CSWlibcairo2
 RUNTIME_DEP_PKGS_CSWemacs-athena	+=	CSWlibcroco
 RUNTIME_DEP_PKGS_CSWemacs-athena	+=	CSWlibdatrie1
 RUNTIME_DEP_PKGS_CSWemacs-athena	+=	CSWlibexpat1
@@ -272,7 +203,6 @@
 RUNTIME_DEP_PKGS_CSWemacs-athena	+=	CSWlibgnutls26
 RUNTIME_DEP_PKGS_CSWemacs-athena	+=	CSWlibgobject2-0-0
 RUNTIME_DEP_PKGS_CSWemacs-athena	+=	CSWlibiconv2
-RUNTIME_DEP_PKGS_CSWemacs-athena	+=	CSWlibintl8
 RUNTIME_DEP_PKGS_CSWemacs-athena	+=	CSWlibjbig2
 RUNTIME_DEP_PKGS_CSWemacs-athena	+=	CSWlibjpeg7
 RUNTIME_DEP_PKGS_CSWemacs-athena	+=	CSWlibm17n-utils
@@ -291,61 +221,7 @@
 RUNTIME_DEP_PKGS_CSWemacs-athena	+=	CSWlibxml2-2
 RUNTIME_DEP_PKGS_CSWemacs-athena	+=	CSWlibxpm4
 RUNTIME_DEP_PKGS_CSWemacs-athena	+=	CSWlibxrender
-RUNTIME_DEP_PKGS_CSWemacs-athena	+=	CSWlibz1
 RUNTIME_DEP_PKGS_CSWemacs-athena	+=	CSWpango
-CHECKPKG_OVERRIDES_CSWemacs-athena	+=	file-with-bad-content|/usr/local|root/opt/csw/bin/emacs-athena
-CHECKPKG_OVERRIDES_CSWemacs-athena	+=	file-with-bad-content|/usr/share|root/opt/csw/bin/emacs-athena
-CHECKPKG_OVERRIDES_CSWemacs-athena	+=	file-with-bad-content|/usr/local|root/opt/csw/bin/emacs-$(VERSION)-athena
-CHECKPKG_OVERRIDES_CSWemacs-athena	+=	file-with-bad-content|/usr/share|root/opt/csw/bin/emacs-$(VERSION)-athena
-CHECKPKG_OVERRIDES_CSWemacs-athena	+=	surplus-dependency|CSWlibcroco
-CHECKPKG_OVERRIDES_CSWemacs-athena	+=	surplus-dependency|CSWemacs-common
-CHECKPKG_OVERRIDES_CSWemacs-athena	+=	surplus-dependency|CSWlibiconv2
-CHECKPKG_OVERRIDES_CSWemacs-athena	+=	surplus-dependency|CSWlibotf0
-CHECKPKG_OVERRIDES_CSWemacs-athena	+=	surplus-dependency|CSWlibdatrie1
-CHECKPKG_OVERRIDES_CSWemacs-athena	+=	surplus-dependency|CSWlibthai0
-CHECKPKG_OVERRIDES_CSWemacs-athena	+=	surplus-dependency|CSWlibgcc-s1
-CHECKPKG_OVERRIDES_CSWemacs-athena	+=	surplus-dependency|CSWlibm17n0
-CHECKPKG_OVERRIDES_CSWemacs-athena	+=	surplus-dependency|CSWlibjbig2
-CHECKPKG_OVERRIDES_CSWemacs-athena	+=	surplus-dependency|CSWpango
-CHECKPKG_OVERRIDES_CSWemacs-athena	+=	surplus-dependency|CSWemacs-bin-common
-CHECKPKG_OVERRIDES_CSWemacs-athena	+=	surplus-dependency|CSWlibexpat1
-CHECKPKG_OVERRIDES_CSWemacs-athena	+=	surplus-dependency|CSWlibpixman1-0
-CHECKPKG_OVERRIDES_CSWemacs-athena	+=	surplus-dependency|CSWfconfig
-CHECKPKG_OVERRIDES_CSWemacs-athena	+=	soname-unused|libz.so.1|is|needed|by|/opt/csw/bin/emacs-24.3-athena|but|never|used
-CHECKPKG_OVERRIDES_CSWemacs-athena	+=	soname-unused|libXext.so.0|is|needed|by|/opt/csw/bin/emacs-24.3-athena|but|never|used
-CHECKPKG_OVERRIDES_CSWemacs-athena	+=	soname-unused|libcairo.so.2|is|needed|by|/opt/csw/bin/emacs-24.3-athena|but|never|used
-CHECKPKG_OVERRIDES_CSWemacs-athena	+=	soname-unused|libintl.so.8|is|needed|by|/opt/csw/bin/emacs-24.3-athena|but|never|used
-CHECKPKG_OVERRIDES_CSWemacs-athena	+=	soname-unused|libbz2.so.1.0|is|needed|by|/opt/csw/bin/emacs-24.3-athena|but|never|used
-CHECKPKG_OVERRIDES_CSWemacs-athena	+=	no-direct-binding|/opt/csw/bin/emacs-24.3-athena|is|not|directly|bound|to|soname|libXft.so.2
-CHECKPKG_OVERRIDES_CSWemacs-athena	+=	no-direct-binding|/opt/csw/bin/emacs-24.3-athena|is|not|directly|bound|to|soname|libXt.so.4
-CHECKPKG_OVERRIDES_CSWemacs-athena	+=	no-direct-binding|/opt/csw/bin/emacs-24.3-athena|is|not|directly|bound|to|soname|libm17n-flt.so.0
-CHECKPKG_OVERRIDES_CSWemacs-athena	+=	no-direct-binding|/opt/csw/bin/emacs-24.3-athena|is|not|directly|bound|to|soname|libgnutls.so.26
-CHECKPKG_OVERRIDES_CSWemacs-athena	+=	no-direct-binding|/opt/csw/bin/emacs-24.3-athena|is|not|directly|bound|to|soname|libglib-2.0.so.0
-CHECKPKG_OVERRIDES_CSWemacs-athena	+=	no-direct-binding|/opt/csw/bin/emacs-24.3-athena|is|not|directly|bound|to|soname|libjpeg.so.7
-CHECKPKG_OVERRIDES_CSWemacs-athena	+=	no-direct-binding|/opt/csw/bin/emacs-24.3-athena|is|not|directly|bound|to|soname|libotf.so.0
-CHECKPKG_OVERRIDES_CSWemacs-athena	+=	no-direct-binding|/opt/csw/bin/emacs-24.3-athena|is|not|directly|bound|to|soname|libXpm.so.4
-CHECKPKG_OVERRIDES_CSWemacs-athena	+=	no-direct-binding|/opt/csw/bin/emacs-24.3-athena|is|not|directly|bound|to|soname|libMagickCore.so.5
-CHECKPKG_OVERRIDES_CSWemacs-athena	+=	no-direct-binding|/opt/csw/bin/emacs-24.3-athena|is|not|directly|bound|to|soname|librsvg-2.so.2
-CHECKPKG_OVERRIDES_CSWemacs-athena	+=	no-direct-binding|/opt/csw/bin/emacs-24.3-athena|is|not|directly|bound|to|soname|libgio-2.0.so.0
-CHECKPKG_OVERRIDES_CSWemacs-athena	+=	no-direct-binding|/opt/csw/bin/emacs-24.3-athena|is|not|directly|bound|to|soname|libxml2.so.2
-CHECKPKG_OVERRIDES_CSWemacs-athena	+=	no-direct-binding|/opt/csw/bin/emacs-24.3-athena|is|not|directly|bound|to|soname|libXaw.so.5
-CHECKPKG_OVERRIDES_CSWemacs-athena	+=	no-direct-binding|/opt/csw/bin/emacs-24.3-athena|is|not|directly|bound|to|soname|libX11.so.4
-CHECKPKG_OVERRIDES_CSWemacs-athena	+=	no-direct-binding|/opt/csw/bin/emacs-24.3-athena|is|not|directly|bound|to|soname|libSM.so.6
-CHECKPKG_OVERRIDES_CSWemacs-athena	+=	no-direct-binding|/opt/csw/bin/emacs-24.3-athena|is|not|directly|bound|to|soname|libfontconfig.so.1
-CHECKPKG_OVERRIDES_CSWemacs-athena	+=	no-direct-binding|/opt/csw/bin/emacs-24.3-athena|is|not|directly|bound|to|soname|libgobject-2.0.so.0
-CHECKPKG_OVERRIDES_CSWemacs-athena	+=	no-direct-binding|/opt/csw/bin/emacs-24.3-athena|is|not|directly|bound|to|soname|libXmu.so.4
-CHECKPKG_OVERRIDES_CSWemacs-athena	+=	no-direct-binding|/opt/csw/bin/emacs-24.3-athena|is|not|directly|bound|to|soname|libgdk_pixbuf-2.0.so.0
-CHECKPKG_OVERRIDES_CSWemacs-athena	+=	no-direct-binding|/opt/csw/bin/emacs-24.3-athena|is|not|directly|bound|to|soname|libncurses.so.5
-CHECKPKG_OVERRIDES_CSWemacs-athena	+=	no-direct-binding|/opt/csw/bin/emacs-24.3-athena|is|not|directly|bound|to|soname|libXrender.so.1
-CHECKPKG_OVERRIDES_CSWemacs-athena	+=	no-direct-binding|/opt/csw/bin/emacs-24.3-athena|is|not|directly|bound|to|soname|libpng15.so.15
-CHECKPKG_OVERRIDES_CSWemacs-athena	+=	no-direct-binding|/opt/csw/bin/emacs-24.3-athena|is|not|directly|bound|to|soname|libICE.so.6
-CHECKPKG_OVERRIDES_CSWemacs-athena	+=	no-direct-binding|/opt/csw/bin/emacs-24.3-athena|is|not|directly|bound|to|soname|libMagickWand.so.5
-CHECKPKG_OVERRIDES_CSWemacs-athena	+=	no-direct-binding|/opt/csw/bin/emacs-24.3-athena|is|not|directly|bound|to|soname|libm17n-core.so.0
-CHECKPKG_OVERRIDES_CSWemacs-athena	+=	no-direct-binding|/opt/csw/bin/emacs-24.3-athena|is|not|directly|bound|to|soname|libMagickWand.so.5
-CHECKPKG_OVERRIDES_CSWemacs-athena	+=	no-direct-binding|/opt/csw/bin/emacs-24.3-athena|is|not|directly|bound|to|soname|libm17n-core.so.0
-CHECKPKG_OVERRIDES_CSWemacs-athena	+=	no-direct-binding|/opt/csw/bin/emacs-24.3-athena|is|not|directly|bound|to|soname|libgif.so.4
-CHECKPKG_OVERRIDES_CSWemacs-athena	+=	no-direct-binding|/opt/csw/bin/emacs-24.3-athena|is|not|directly|bound|to|soname|libfreetype.so.6
-CHECKPKG_OVERRIDES_CSWemacs-athena	+=	no-direct-binding|/opt/csw/bin/emacs-24.3-athena|is|not|directly|bound|to|soname|libtiff.so.3
 PKGFILES_CSWemacs-athena			=	/opt/csw/bin/emacs-athena
 PKGFILES_CSWemacs-athena			+=	/opt/csw/bin/emacs-$(VERSION)-athena
 
@@ -357,9 +233,6 @@
 RUNTIME_DEP_PKGS_CSWemacs-gtk	=	CSWemacs-bin-common
 RUNTIME_DEP_PKGS_CSWemacs-gtk	+=	CSWemacs-common
 RUNTIME_DEP_PKGS_CSWemacs-gtk	+=	CSWfconfig
-RUNTIME_DEP_PKGS_CSWemacs-gtk	+=	CSWlibatk1-0-0
-RUNTIME_DEP_PKGS_CSWemacs-gtk	+=	CSWlibbz2-1-0
-RUNTIME_DEP_PKGS_CSWemacs-gtk	+=	CSWlibcairo2
 RUNTIME_DEP_PKGS_CSWemacs-gtk	+=	CSWlibcroco
 RUNTIME_DEP_PKGS_CSWemacs-gtk	+=	CSWlibdatrie1
 RUNTIME_DEP_PKGS_CSWemacs-gtk	+=	CSWlibdbus1-3
@@ -373,12 +246,10 @@
 RUNTIME_DEP_PKGS_CSWemacs-gtk	+=	CSWlibgif4
 RUNTIME_DEP_PKGS_CSWemacs-gtk	+=	CSWlibgio2-0-0
 RUNTIME_DEP_PKGS_CSWemacs-gtk	+=	CSWlibglib2-0-0
-RUNTIME_DEP_PKGS_CSWemacs-gtk	+=	CSWlibgmodule2-0-0
 RUNTIME_DEP_PKGS_CSWemacs-gtk	+=	CSWlibgnutls26
 RUNTIME_DEP_PKGS_CSWemacs-gtk	+=	CSWlibgobject2-0-0
 RUNTIME_DEP_PKGS_CSWemacs-gtk	+=	CSWlibgtk-x11-2-0-0
 RUNTIME_DEP_PKGS_CSWemacs-gtk	+=	CSWlibiconv2
-RUNTIME_DEP_PKGS_CSWemacs-gtk	+=	CSWlibintl8
 RUNTIME_DEP_PKGS_CSWemacs-gtk	+=	CSWlibjbig2
 RUNTIME_DEP_PKGS_CSWemacs-gtk	+=	CSWlibjpeg7
 RUNTIME_DEP_PKGS_CSWemacs-gtk	+=	CSWlibm17n-utils
@@ -397,66 +268,7 @@
 RUNTIME_DEP_PKGS_CSWemacs-gtk	+=	CSWlibxml2-2
 RUNTIME_DEP_PKGS_CSWemacs-gtk	+=	CSWlibxpm4
 RUNTIME_DEP_PKGS_CSWemacs-gtk	+=	CSWlibxrender
-RUNTIME_DEP_PKGS_CSWemacs-gtk	+=	CSWlibz1
 RUNTIME_DEP_PKGS_CSWemacs-gtk	+=	CSWorbit2
-RUNTIME_DEP_PKGS_CSWemacs-gtk	+=	CSWpango
-CHECKPKG_OVERRIDES_CSWemacs-gtk	+=	file-with-bad-content|/usr/local|root/opt/csw/bin/emacs-gtk
-CHECKPKG_OVERRIDES_CSWemacs-gtk	+=	file-with-bad-content|/usr/share|root/opt/csw/bin/emacs-gtk
-CHECKPKG_OVERRIDES_CSWemacs-gtk	+=	file-with-bad-content|/usr/local|root/opt/csw/bin/emacs-$(VERSION)-gtk
-CHECKPKG_OVERRIDES_CSWemacs-gtk	+=	file-with-bad-content|/usr/share|root/opt/csw/bin/emacs-$(VERSION)-gtk
-CHECKPKG_OVERRIDES_CSWemacs-gtk	+=	surplus-dependency|CSWlibcroco
-CHECKPKG_OVERRIDES_CSWemacs-gtk	+=	surplus-dependency|CSWemacs-common
-CHECKPKG_OVERRIDES_CSWemacs-gtk	+=	surplus-dependency|CSWlibiconv2
-CHECKPKG_OVERRIDES_CSWemacs-gtk	+=	surplus-dependency|CSWlibthai0
-CHECKPKG_OVERRIDES_CSWemacs-gtk	+=	surplus-dependency|CSWlibdatrie1
-CHECKPKG_OVERRIDES_CSWemacs-gtk	+=	surplus-dependency|CSWlibotf0
-CHECKPKG_OVERRIDES_CSWemacs-gtk	+=	surplus-dependency|CSWlibgcc-s1
-CHECKPKG_OVERRIDES_CSWemacs-gtk	+=	surplus-dependency|CSWlibm17n0
-CHECKPKG_OVERRIDES_CSWemacs-gtk	+=	surplus-dependency|CSWlibjbig2
-CHECKPKG_OVERRIDES_CSWemacs-gtk	+=	surplus-dependency|CSWemacs-bin-common
-CHECKPKG_OVERRIDES_CSWemacs-gtk	+=	surplus-dependency|CSWlibexpat1
-CHECKPKG_OVERRIDES_CSWemacs-gtk	+=	surplus-dependency|CSWlibpixman1-0
-CHECKPKG_OVERRIDES_CSWemacs-gtk	+=	surplus-dependency|CSWfconfig
-CHECKPKG_OVERRIDES_CSWemacs-gtk	+=	surplus-dependency|CSWorbit2
-CHECKPKG_OVERRIDES_CSWemacs-gtk	+=	soname-unused|libz.so.1|is|needed|by|/opt/csw/bin/emacs-24.3-gtk|but|never|used
-CHECKPKG_OVERRIDES_CSWemacs-gtk	+=	soname-unused|libatk-1.0.so.0|is|needed|by|/opt/csw/bin/emacs-24.3-gtk|but|never|used
-CHECKPKG_OVERRIDES_CSWemacs-gtk	+=	soname-unused|libpangoft2-1.0.so.0|is|needed|by|/opt/csw/bin/emacs-24.3-gtk|but|never|used
-CHECKPKG_OVERRIDES_CSWemacs-gtk	+=	soname-unused|libpangocairo-1.0.so.0|is|needed|by|/opt/csw/bin/emacs-24.3-gtk|but|never|used
-CHECKPKG_OVERRIDES_CSWemacs-gtk	+=	soname-unused|libcairo.so.2|is|needed|by|/opt/csw/bin/emacs-24.3-gtk|but|never|used
-CHECKPKG_OVERRIDES_CSWemacs-gtk	+=	soname-unused|libpango-1.0.so.0|is|needed|by|/opt/csw/bin/emacs-24.3-gtk|but|never|used
-CHECKPKG_OVERRIDES_CSWemacs-gtk	+=	soname-unused|libgmodule-2.0.so.0|is|needed|by|/opt/csw/bin/emacs-24.3-gtk|but|never|used
-CHECKPKG_OVERRIDES_CSWemacs-gtk	+=	soname-unused|libintl.so.8|is|needed|by|/opt/csw/bin/emacs-24.3-gtk|but|never|used
-CHECKPKG_OVERRIDES_CSWemacs-gtk	+=	soname-unused|libbz2.so.1.0|is|needed|by|/opt/csw/bin/emacs-24.3-gtk|but|never|used
-CHECKPKG_OVERRIDES_CSWemacs-gtk	+=	no-direct-binding|/opt/csw/bin/emacs-24.3-gtk|is|not|directly|bound|to|soname|libgio-2.0.so.0
-CHECKPKG_OVERRIDES_CSWemacs-gtk	+=	no-direct-binding|/opt/csw/bin/emacs-24.3-gtk|is|not|directly|bound|to|soname|libm17n-flt.so.0
-CHECKPKG_OVERRIDES_CSWemacs-gtk	+=	no-direct-binding|/opt/csw/bin/emacs-24.3-gtk|is|not|directly|bound|to|soname|libgnutls.so.26
-CHECKPKG_OVERRIDES_CSWemacs-gtk	+=	no-direct-binding|/opt/csw/bin/emacs-24.3-gtk|is|not|directly|bound|to|soname|libglib-2.0.so.0
-CHECKPKG_OVERRIDES_CSWemacs-gtk	+=	no-direct-binding|/opt/csw/bin/emacs-24.3-gtk|is|not|directly|bound|to|soname|libjpeg.so.7
-CHECKPKG_OVERRIDES_CSWemacs-gtk	+=	no-direct-binding|/opt/csw/bin/emacs-24.3-gtk|is|not|directly|bound|to|soname|libgtk-x11-2.0.so.0
-CHECKPKG_OVERRIDES_CSWemacs-gtk	+=	no-direct-binding|/opt/csw/bin/emacs-24.3-gtk|is|not|directly|bound|to|soname|libXpm.so.4
-CHECKPKG_OVERRIDES_CSWemacs-gtk	+=	no-direct-binding|/opt/csw/bin/emacs-24.3-gtk|is|not|directly|bound|to|soname|libMagickCore.so.5
-CHECKPKG_OVERRIDES_CSWemacs-gtk	+=	no-direct-binding|/opt/csw/bin/emacs-24.3-gtk|is|not|directly|bound|to|soname|librsvg-2.so.2
-CHECKPKG_OVERRIDES_CSWemacs-gtk	+=	no-direct-binding|/opt/csw/bin/emacs-24.3-gtk|is|not|directly|bound|to|soname|libXft.so.2
-CHECKPKG_OVERRIDES_CSWemacs-gtk	+=	no-direct-binding|/opt/csw/bin/emacs-24.3-gtk|is|not|directly|bound|to|soname|libgdk-x11-2.0.so.0
-CHECKPKG_OVERRIDES_CSWemacs-gtk	+=	no-direct-binding|/opt/csw/bin/emacs-24.3-gtk|is|not|directly|bound|to|soname|libxml2.so.2
-CHECKPKG_OVERRIDES_CSWemacs-gtk	+=	no-direct-binding|/opt/csw/bin/emacs-24.3-gtk|is|not|directly|bound|to|soname|libgconf-2.so.4
-CHECKPKG_OVERRIDES_CSWemacs-gtk	+=	no-direct-binding|/opt/csw/bin/emacs-24.3-gtk|is|not|directly|bound|to|soname|libotf.so.0
-CHECKPKG_OVERRIDES_CSWemacs-gtk	+=	no-direct-binding|/opt/csw/bin/emacs-24.3-gtk|is|not|directly|bound|to|soname|libX11.so.4
-CHECKPKG_OVERRIDES_CSWemacs-gtk	+=	no-direct-binding|/opt/csw/bin/emacs-24.3-gtk|is|not|directly|bound|to|soname|libSM.so.6
-CHECKPKG_OVERRIDES_CSWemacs-gtk	+=	no-direct-binding|/opt/csw/bin/emacs-24.3-gtk|is|not|directly|bound|to|soname|libfontconfig.so.1
-CHECKPKG_OVERRIDES_CSWemacs-gtk	+=	no-direct-binding|/opt/csw/bin/emacs-24.3-gtk|is|not|directly|bound|to|soname|libthread.so.1
-CHECKPKG_OVERRIDES_CSWemacs-gtk	+=	no-direct-binding|/opt/csw/bin/emacs-24.3-gtk|is|not|directly|bound|to|soname|libgobject-2.0.so.0
-CHECKPKG_OVERRIDES_CSWemacs-gtk	+=	no-direct-binding|/opt/csw/bin/emacs-24.3-gtk|is|not|directly|bound|to|soname|libdbus-1.so.3
-CHECKPKG_OVERRIDES_CSWemacs-gtk	+=	no-direct-binding|/opt/csw/bin/emacs-24.3-gtk|is|not|directly|bound|to|soname|libgdk_pixbuf-2.0.so.0
-CHECKPKG_OVERRIDES_CSWemacs-gtk	+=	no-direct-binding|/opt/csw/bin/emacs-24.3-gtk|is|not|directly|bound|to|soname|libncurses.so.5
-CHECKPKG_OVERRIDES_CSWemacs-gtk	+=	no-direct-binding|/opt/csw/bin/emacs-24.3-gtk|is|not|directly|bound|to|soname|libXrender.so.1
-CHECKPKG_OVERRIDES_CSWemacs-gtk	+=	no-direct-binding|/opt/csw/bin/emacs-24.3-gtk|is|not|directly|bound|to|soname|libpng15.so.15
-CHECKPKG_OVERRIDES_CSWemacs-gtk	+=	no-direct-binding|/opt/csw/bin/emacs-24.3-gtk|is|not|directly|bound|to|soname|libICE.so.6
-CHECKPKG_OVERRIDES_CSWemacs-gtk	+=	no-direct-binding|/opt/csw/bin/emacs-24.3-gtk|is|not|directly|bound|to|soname|libMagickWand.so.5
-CHECKPKG_OVERRIDES_CSWemacs-gtk	+=	no-direct-binding|/opt/csw/bin/emacs-24.3-gtk|is|not|directly|bound|to|soname|libm17n-core.so.0
-CHECKPKG_OVERRIDES_CSWemacs-gtk	+=	no-direct-binding|/opt/csw/bin/emacs-24.3-gtk|is|not|directly|bound|to|soname|libgif.so.4
-CHECKPKG_OVERRIDES_CSWemacs-gtk	+=	no-direct-binding|/opt/csw/bin/emacs-24.3-gtk|is|not|directly|bound|to|soname|libfreetype.so.6
-CHECKPKG_OVERRIDES_CSWemacs-gtk	+=	no-direct-binding|/opt/csw/bin/emacs-24.3-gtk|is|not|directly|bound|to|soname|libtiff.so.3
 PKGFILES_CSWemacs-gtk			=	/opt/csw/bin/emacs-gtk
 PKGFILES_CSWemacs-gtk			+=	/opt/csw/bin/emacs-$(VERSION)-gtk
 
@@ -470,15 +282,6 @@
 RUNTIME_DEP_PKGS_CSWemacs-nox	+=	CSWlibgnutls26
 RUNTIME_DEP_PKGS_CSWemacs-nox	+=	CSWlibncurses5
 RUNTIME_DEP_PKGS_CSWemacs-nox	+=	CSWlibxml2-2
-CHECKPKG_OVERRIDES_CSWemacs-nox	+=	file-with-bad-content|/usr/local|root/opt/csw/bin/emacs-$(VERSION)-nox
-CHECKPKG_OVERRIDES_CSWemacs-nox	+=	file-with-bad-content|/usr/share|root/opt/csw/bin/emacs-$(VERSION)-nox
-CHECKPKG_OVERRIDES_CSWemacs-nox	+=	file-with-bad-content|/usr/local|root/opt/csw/bin/emacs-nox
-CHECKPKG_OVERRIDES_CSWemacs-nox	+=	file-with-bad-content|/usr/share|root/opt/csw/bin/emacs-nox
-CHECKPKG_OVERRIDES_CSWemacs-nox	+=	surplus-dependency|CSWemacs-bin-common
-CHECKPKG_OVERRIDES_CSWemacs-nox	+=	surplus-dependency|CSWemacs-common
-CHECKPKG_OVERRIDES_CSWemacs-nox	+=	no-direct-binding|/opt/csw/bin/emacs-24.3-nox|is|not|directly|bound|to|soname|libncurses.so.5
-CHECKPKG_OVERRIDES_CSWemacs-nox	+=	no-direct-binding|/opt/csw/bin/emacs-24.3-nox|is|not|directly|bound|to|soname|libxml2.so.2
-CHECKPKG_OVERRIDES_CSWemacs-nox	+=	no-direct-binding|/opt/csw/bin/emacs-24.3-nox|is|not|directly|bound|to|soname|libgnutls.so.26
 PKGFILES_CSWemacs-nox			=	/opt/csw/bin/emacs-nox
 PKGFILES_CSWemacs-nox			+=	/opt/csw/bin/emacs-$(VERSION)-nox
 

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


From pfelecan at users.sourceforge.net  Mon Apr  1 15:28:48 2013
From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net)
Date: Mon, 01 Apr 2013 13:28:48 +0000
Subject: [csw-devel] SF.net SVN: gar:[20561]
	csw/mgar/pkg/emacs/trunk/Makefile
Message-ID: <E1UMen2-00009g-LS@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 20561
          http://gar.svn.sourceforge.net/gar/?rev=20561&view=rev
Author:   pfelecan
Date:     2013-04-01 13:28:44 +0000 (Mon, 01 Apr 2013)
Log Message:
-----------
emacs/trunk: re-verified and validated overrides

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

Modified: csw/mgar/pkg/emacs/trunk/Makefile
===================================================================
--- csw/mgar/pkg/emacs/trunk/Makefile	2013-04-01 11:15:46 UTC (rev 20560)
+++ csw/mgar/pkg/emacs/trunk/Makefile	2013-04-01 13:28:44 UTC (rev 20561)
@@ -151,6 +151,69 @@
 # specialize the variable:
 EXTRA_TEXINFO						=	$(infodir)/.*
 ARCHALL_CSWemacs-common				=	1
+CHECKPKG_OVERRIDES_CSWemacs-common	+=	file-with-bad-content|/usr/local|root/opt/csw/share/info/reftex.info
+CHECKPKG_OVERRIDES_CSWemacs-common	+=	file-with-bad-content|/usr/local|root/opt/csw/share/info/idlwave.info
+CHECKPKG_OVERRIDES_CSWemacs-common	+=	file-with-bad-content|/usr/local|root/opt/csw/share/info/woman.info
+CHECKPKG_OVERRIDES_CSWemacs-common	+=	file-with-bad-content|/usr/local|root/opt/csw/share/info/gnus.info
+CHECKPKG_OVERRIDES_CSWemacs-common	+=	file-with-bad-content|/usr/local|root/opt/csw/share/info/elisp.info
+CHECKPKG_OVERRIDES_CSWemacs-common	+=	file-with-bad-content|/usr/local|root/opt/csw/share/info/eintr.info
+CHECKPKG_OVERRIDES_CSWemacs-common	+=	file-with-bad-content|/usr/local|root/opt/csw/share/info/emacs.info
+CHECKPKG_OVERRIDES_CSWemacs-common	+=	file-with-bad-content|/usr/local|root/opt/csw/share/info/efaq.info
+CHECKPKG_OVERRIDES_CSWemacs-common	+=	file-with-bad-content|/usr/local|root/opt/csw/share/info/eshell.info
+CHECKPKG_OVERRIDES_CSWemacs-common	+=	file-with-bad-content|/usr/local|root/opt/csw/share/info/mh-e.info
+CHECKPKG_OVERRIDES_CSWemacs-common	+=	file-with-bad-content|/usr/local|root/opt/csw/share/info/tramp.info
+CHECKPKG_OVERRIDES_CSWemacs-common	+=	file-with-bad-content|/usr/local|root/opt/csw/share/emacs/24.3/etc/NEWS.19
+CHECKPKG_OVERRIDES_CSWemacs-common	+=	file-with-bad-content|/usr/local|root/opt/csw/share/emacs/24.3/etc/NEWS
+CHECKPKG_OVERRIDES_CSWemacs-common	+=	file-with-bad-content|/usr/local|root/opt/csw/share/emacs/24.3/etc/MH-E-NEWS
+CHECKPKG_OVERRIDES_CSWemacs-common	+=	file-with-bad-content|/usr/local|root/opt/csw/share/emacs/24.3/etc/NEWS.20
+CHECKPKG_OVERRIDES_CSWemacs-common	+=	file-with-bad-content|/usr/local|root/opt/csw/share/emacs/24.3/etc/DOC-24.3.1
+CHECKPKG_OVERRIDES_CSWemacs-common	+=	file-with-bad-content|/usr/local|root/opt/csw/share/emacs/24.3/etc/PROBLEMS
+CHECKPKG_OVERRIDES_CSWemacs-common	+=	file-with-bad-content|/usr/local|root/opt/csw/share/emacs/24.3/lisp/ldefs-boot.el
+CHECKPKG_OVERRIDES_CSWemacs-common	+=	file-with-bad-content|/usr/local|root/opt/csw/share/emacs/24.3/lisp/ffap.elc
+CHECKPKG_OVERRIDES_CSWemacs-common	+=	file-with-bad-content|/usr/local|root/opt/csw/share/emacs/24.3/lisp/woman.elc
+CHECKPKG_OVERRIDES_CSWemacs-common	+=	file-with-bad-content|/usr/local|root/opt/csw/share/emacs/24.3/lisp/find-file.elc
+CHECKPKG_OVERRIDES_CSWemacs-common	+=	file-with-bad-content|/usr/local|root/opt/csw/share/emacs/24.3/lisp/man.elc
+CHECKPKG_OVERRIDES_CSWemacs-common	+=	file-with-bad-content|/usr/local|root/opt/csw/share/emacs/24.3/lisp/info.elc
+CHECKPKG_OVERRIDES_CSWemacs-common	+=	file-with-bad-content|/usr/local|root/opt/csw/share/emacs/24.3/lisp/loaddefs.el
+CHECKPKG_OVERRIDES_CSWemacs-common	+=	file-with-bad-content|/usr/local|root/opt/csw/share/emacs/24.3/lisp/ps-bdf.elc
+CHECKPKG_OVERRIDES_CSWemacs-common	+=	file-with-bad-content|/usr/local|root/opt/csw/share/emacs/24.3/lisp/textmodes/ispell.elc
+CHECKPKG_OVERRIDES_CSWemacs-common	+=	file-with-bad-content|/usr/local|root/opt/csw/share/emacs/24.3/lisp/play/dunnet.elc
+CHECKPKG_OVERRIDES_CSWemacs-common	+=	file-with-bad-content|/usr/local|root/opt/csw/share/emacs/24.3/lisp/progmodes/idlwave.elc
+CHECKPKG_OVERRIDES_CSWemacs-common	+=	file-with-bad-content|/usr/local|root/opt/csw/share/emacs/24.3/lisp/progmodes/ada-mode.elc
+CHECKPKG_OVERRIDES_CSWemacs-common	+=	file-with-bad-content|/usr/local|root/opt/csw/share/emacs/24.3/lisp/progmodes/m4-mode.elc
+CHECKPKG_OVERRIDES_CSWemacs-common	+=	file-with-bad-content|/usr/local|root/opt/csw/share/emacs/24.3/lisp/progmodes/idlw-help.elc
+CHECKPKG_OVERRIDES_CSWemacs-common	+=	file-with-bad-content|/usr/local|root/opt/csw/share/emacs/24.3/lisp/mh-e/mh-e.elc
+CHECKPKG_OVERRIDES_CSWemacs-common	+=	file-with-bad-content|/usr/local|root/opt/csw/share/emacs/24.3/lisp/gnus/gnus-setup.elc
+CHECKPKG_OVERRIDES_CSWemacs-common	+=	file-with-bad-content|/usr/local|root/opt/csw/share/emacs/24.3/lisp/gnus/gnus-art.elc
+CHECKPKG_OVERRIDES_CSWemacs-common	+=	file-with-bad-content|/usr/local|root/opt/csw/share/emacs/24.3/lisp/gnus/nnspool.elc
+CHECKPKG_OVERRIDES_CSWemacs-common	+=	file-with-bad-content|/usr/local|root/opt/csw/share/emacs/24.3/lisp/gnus/mailcap.elc
+CHECKPKG_OVERRIDES_CSWemacs-common	+=	file-with-bad-content|/usr/local|root/opt/csw/share/emacs/24.3/lisp/obsolete/complete.elc
+CHECKPKG_OVERRIDES_CSWemacs-common	+=	file-with-bad-content|/usr/local|root/opt/csw/share/emacs/24.3/lisp/net/tramp-sh.elc
+CHECKPKG_OVERRIDES_CSWemacs-common	+=	file-with-bad-content|/usr/local|root/opt/csw/share/emacs/24.3/lisp/net/tramp-loaddefs.el
+CHECKPKG_OVERRIDES_CSWemacs-common	+=	file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/emacs.1
+CHECKPKG_OVERRIDES_CSWemacs-common	+=	file-with-bad-content|/usr/share|root/opt/csw/share/info/dbus.info
+CHECKPKG_OVERRIDES_CSWemacs-common	+=	file-with-bad-content|/usr/share|root/opt/csw/share/info/elisp.info
+CHECKPKG_OVERRIDES_CSWemacs-common	+=	file-with-bad-content|/usr/share|root/opt/csw/share/info/eintr.info
+CHECKPKG_OVERRIDES_CSWemacs-common	+=	file-with-bad-content|/usr/share|root/opt/csw/share/info/emacs.info
+CHECKPKG_OVERRIDES_CSWemacs-common	+=	file-with-bad-content|/usr/share|root/opt/csw/share/info/efaq.info
+CHECKPKG_OVERRIDES_CSWemacs-common	+=	file-with-bad-content|/usr/share|root/opt/csw/share/emacs/24.3/etc/DOC-24.3.1
+CHECKPKG_OVERRIDES_CSWemacs-common	+=	file-with-bad-content|/usr/share|root/opt/csw/share/emacs/24.3/etc/PROBLEMS
+CHECKPKG_OVERRIDES_CSWemacs-common	+=	file-with-bad-content|/usr/share|root/opt/csw/share/emacs/24.3/etc/compilation.txt
+CHECKPKG_OVERRIDES_CSWemacs-common	+=	file-with-bad-content|/usr/share|root/opt/csw/share/emacs/24.3/lisp/ldefs-boot.el
+CHECKPKG_OVERRIDES_CSWemacs-common	+=	file-with-bad-content|/usr/share|root/opt/csw/share/emacs/24.3/lisp/woman.elc
+CHECKPKG_OVERRIDES_CSWemacs-common	+=	file-with-bad-content|/usr/share|root/opt/csw/share/emacs/24.3/lisp/printing.elc
+CHECKPKG_OVERRIDES_CSWemacs-common	+=	file-with-bad-content|/usr/share|root/opt/csw/share/emacs/24.3/lisp/loaddefs.el
+CHECKPKG_OVERRIDES_CSWemacs-common	+=	file-with-bad-content|/usr/share|root/opt/csw/share/emacs/24.3/lisp/hfy-cmap.elc
+CHECKPKG_OVERRIDES_CSWemacs-common	+=	file-with-bad-content|/usr/share|root/opt/csw/share/emacs/24.3/lisp/textmodes/ispell.elc
+CHECKPKG_OVERRIDES_CSWemacs-common	+=	file-with-bad-content|/usr/share|root/opt/csw/share/emacs/24.3/lisp/international/eucjp-ms.el
+CHECKPKG_OVERRIDES_CSWemacs-common	+=	file-with-bad-content|/usr/share|root/opt/csw/share/emacs/24.3/lisp/international/mule-cmds.elc
+CHECKPKG_OVERRIDES_CSWemacs-common	+=	file-with-bad-content|/usr/share|root/opt/csw/share/emacs/24.3/lisp/mh-e/mh-xface.elc
+CHECKPKG_OVERRIDES_CSWemacs-common	+=	file-with-bad-content|/usr/share|root/opt/csw/share/emacs/24.3/lisp/mh-e/mh-alias.elc
+CHECKPKG_OVERRIDES_CSWemacs-common	+=	file-with-bad-content|/usr/share|root/opt/csw/share/emacs/24.3/lisp/gnus/gnus-art.elc
+CHECKPKG_OVERRIDES_CSWemacs-common	+=	file-with-bad-content|/usr/share|root/opt/csw/share/emacs/24.3/lisp/cedet/semantic/bovine/scm.elc
+CHECKPKG_OVERRIDES_CSWemacs-common	+=	file-with-bad-content|/usr/share|root/opt/csw/share/emacs/24.3/lisp/term/x-win.elc
+CHECKPKG_OVERRIDES_CSWemacs-common	+=	file-with-bad-content|/usr/share|root/opt/csw/share/emacs/24.3/lisp/org/org-odt.elc
+CHECKPKG_OVERRIDES_CSWemacs-common	+=	file-with-bad-content|/usr/share|root/opt/csw/share/emacs/24.3/lisp/org/org-version.el
 
 PACKAGES						+=	CSWemacs-el
 SPKG_DESC_CSWemacs-el			=	$(DESCRIPTION) - elisp sources
@@ -175,6 +238,7 @@
 PKGFILES_CSWemacs-bin-common			+=	/opt/csw/bin/emacsclient
 PKGFILES_CSWemacs-bin-common			+=	/opt/csw/bin/etags
 PKGFILES_CSWemacs-bin-common			+=	/opt/csw/libexec/emacs/$(VERSION)/.*
+CHECKPKG_OVERRIDES_CSWemacs-bin-common	+=	surplus-dependency|CSWemacs-common
 
 PACKAGES					+=	CSWemacs
 SPKG_DESC_CSWemacs			=	$(DESCRIPTION) - metapackage for generic dependencies
@@ -190,40 +254,33 @@
 RUNTIME_DEP_PKGS_CSWemacs-athena	=	CSWemacs-bin-common
 RUNTIME_DEP_PKGS_CSWemacs-athena	+=	CSWemacs-common
 RUNTIME_DEP_PKGS_CSWemacs-athena	+=	CSWfconfig
-RUNTIME_DEP_PKGS_CSWemacs-athena	+=	CSWlibcroco
-RUNTIME_DEP_PKGS_CSWemacs-athena	+=	CSWlibdatrie1
-RUNTIME_DEP_PKGS_CSWemacs-athena	+=	CSWlibexpat1
 RUNTIME_DEP_PKGS_CSWemacs-athena	+=	CSWlibfontconfig1
 RUNTIME_DEP_PKGS_CSWemacs-athena	+=	CSWlibfreetype6
-RUNTIME_DEP_PKGS_CSWemacs-athena	+=	CSWlibgcc-s1
 RUNTIME_DEP_PKGS_CSWemacs-athena	+=	CSWlibgdk-pixbuf2-0-0
 RUNTIME_DEP_PKGS_CSWemacs-athena	+=	CSWlibgif4
 RUNTIME_DEP_PKGS_CSWemacs-athena	+=	CSWlibgio2-0-0
 RUNTIME_DEP_PKGS_CSWemacs-athena	+=	CSWlibglib2-0-0
 RUNTIME_DEP_PKGS_CSWemacs-athena	+=	CSWlibgnutls26
 RUNTIME_DEP_PKGS_CSWemacs-athena	+=	CSWlibgobject2-0-0
-RUNTIME_DEP_PKGS_CSWemacs-athena	+=	CSWlibiconv2
-RUNTIME_DEP_PKGS_CSWemacs-athena	+=	CSWlibjbig2
 RUNTIME_DEP_PKGS_CSWemacs-athena	+=	CSWlibjpeg7
 RUNTIME_DEP_PKGS_CSWemacs-athena	+=	CSWlibm17n-utils
-RUNTIME_DEP_PKGS_CSWemacs-athena	+=	CSWlibm17n0
 RUNTIME_DEP_PKGS_CSWemacs-athena	+=	CSWlibmagickcore5
 RUNTIME_DEP_PKGS_CSWemacs-athena	+=	CSWlibmagickwand5
 RUNTIME_DEP_PKGS_CSWemacs-athena	+=	CSWlibncurses5
 RUNTIME_DEP_PKGS_CSWemacs-athena	+=	CSWlibotf-utils
-RUNTIME_DEP_PKGS_CSWemacs-athena	+=	CSWlibotf0
-RUNTIME_DEP_PKGS_CSWemacs-athena	+=	CSWlibpixman1-0
 RUNTIME_DEP_PKGS_CSWemacs-athena	+=	CSWlibpng15-15
 RUNTIME_DEP_PKGS_CSWemacs-athena	+=	CSWlibrsvg2-2
-RUNTIME_DEP_PKGS_CSWemacs-athena	+=	CSWlibthai0
 RUNTIME_DEP_PKGS_CSWemacs-athena	+=	CSWlibtiff3
 RUNTIME_DEP_PKGS_CSWemacs-athena	+=	CSWlibxft2
 RUNTIME_DEP_PKGS_CSWemacs-athena	+=	CSWlibxml2-2
 RUNTIME_DEP_PKGS_CSWemacs-athena	+=	CSWlibxpm4
 RUNTIME_DEP_PKGS_CSWemacs-athena	+=	CSWlibxrender
-RUNTIME_DEP_PKGS_CSWemacs-athena	+=	CSWpango
 PKGFILES_CSWemacs-athena			=	/opt/csw/bin/emacs-athena
 PKGFILES_CSWemacs-athena			+=	/opt/csw/bin/emacs-$(VERSION)-athena
+CHECKPKG_OVERRIDES_CSWemacs-athena	+=	file-with-bad-content|/usr/local|root/opt/csw/bin/emacs-24.3-athena
+CHECKPKG_OVERRIDES_CSWemacs-athena	+=	file-with-bad-content|/usr/share|root/opt/csw/bin/emacs-24.3-athena
+CHECKPKG_OVERRIDES_CSWemacs-athena += surplus-dependency|CSWemacs-common
+CHECKPKG_OVERRIDES_CSWemacs-athena += surplus-dependency|CSWfconfig
 
 PACKAGES						+=	CSWemacs-gtk
 SPKG_DESC_CSWemacs-gtk			=	$(DESCRIPTION) - based on the GTK toolkit
@@ -233,13 +290,9 @@
 RUNTIME_DEP_PKGS_CSWemacs-gtk	=	CSWemacs-bin-common
 RUNTIME_DEP_PKGS_CSWemacs-gtk	+=	CSWemacs-common
 RUNTIME_DEP_PKGS_CSWemacs-gtk	+=	CSWfconfig
-RUNTIME_DEP_PKGS_CSWemacs-gtk	+=	CSWlibcroco
-RUNTIME_DEP_PKGS_CSWemacs-gtk	+=	CSWlibdatrie1
 RUNTIME_DEP_PKGS_CSWemacs-gtk	+=	CSWlibdbus1-3
-RUNTIME_DEP_PKGS_CSWemacs-gtk	+=	CSWlibexpat1
 RUNTIME_DEP_PKGS_CSWemacs-gtk	+=	CSWlibfontconfig1
 RUNTIME_DEP_PKGS_CSWemacs-gtk	+=	CSWlibfreetype6
-RUNTIME_DEP_PKGS_CSWemacs-gtk	+=	CSWlibgcc-s1
 RUNTIME_DEP_PKGS_CSWemacs-gtk	+=	CSWlibgconf2-4
 RUNTIME_DEP_PKGS_CSWemacs-gtk	+=	CSWlibgdk-pixbuf2-0-0
 RUNTIME_DEP_PKGS_CSWemacs-gtk	+=	CSWlibgdk-x11-2-0-0
@@ -249,28 +302,25 @@
 RUNTIME_DEP_PKGS_CSWemacs-gtk	+=	CSWlibgnutls26
 RUNTIME_DEP_PKGS_CSWemacs-gtk	+=	CSWlibgobject2-0-0
 RUNTIME_DEP_PKGS_CSWemacs-gtk	+=	CSWlibgtk-x11-2-0-0
-RUNTIME_DEP_PKGS_CSWemacs-gtk	+=	CSWlibiconv2
-RUNTIME_DEP_PKGS_CSWemacs-gtk	+=	CSWlibjbig2
 RUNTIME_DEP_PKGS_CSWemacs-gtk	+=	CSWlibjpeg7
 RUNTIME_DEP_PKGS_CSWemacs-gtk	+=	CSWlibm17n-utils
-RUNTIME_DEP_PKGS_CSWemacs-gtk	+=	CSWlibm17n0
 RUNTIME_DEP_PKGS_CSWemacs-gtk	+=	CSWlibmagickcore5
 RUNTIME_DEP_PKGS_CSWemacs-gtk	+=	CSWlibmagickwand5
 RUNTIME_DEP_PKGS_CSWemacs-gtk	+=	CSWlibncurses5
 RUNTIME_DEP_PKGS_CSWemacs-gtk	+=	CSWlibotf-utils
-RUNTIME_DEP_PKGS_CSWemacs-gtk	+=	CSWlibotf0
-RUNTIME_DEP_PKGS_CSWemacs-gtk	+=	CSWlibpixman1-0
 RUNTIME_DEP_PKGS_CSWemacs-gtk	+=	CSWlibpng15-15
 RUNTIME_DEP_PKGS_CSWemacs-gtk	+=	CSWlibrsvg2-2
-RUNTIME_DEP_PKGS_CSWemacs-gtk	+=	CSWlibthai0
 RUNTIME_DEP_PKGS_CSWemacs-gtk	+=	CSWlibtiff3
 RUNTIME_DEP_PKGS_CSWemacs-gtk	+=	CSWlibxft2
 RUNTIME_DEP_PKGS_CSWemacs-gtk	+=	CSWlibxml2-2
 RUNTIME_DEP_PKGS_CSWemacs-gtk	+=	CSWlibxpm4
 RUNTIME_DEP_PKGS_CSWemacs-gtk	+=	CSWlibxrender
-RUNTIME_DEP_PKGS_CSWemacs-gtk	+=	CSWorbit2
 PKGFILES_CSWemacs-gtk			=	/opt/csw/bin/emacs-gtk
 PKGFILES_CSWemacs-gtk			+=	/opt/csw/bin/emacs-$(VERSION)-gtk
+CHECKPKG_OVERRIDES_CSWemacs-gtk	+=	file-with-bad-content|/usr/local|root/opt/csw/bin/emacs-24.3-gtk
+CHECKPKG_OVERRIDES_CSWemacs-gtk	+=	file-with-bad-content|/usr/share|root/opt/csw/bin/emacs-24.3-gtk
+CHECKPKG_OVERRIDES_CSWemacs-gtk += surplus-dependency|CSWemacs-common
+CHECKPKG_OVERRIDES_CSWemacs-gtk	+=	surplus-dependency|CSWfconfig
 
 PACKAGES						+=	CSWemacs-nox
 SPKG_DESC_CSWemacs-nox			=	$(DESCRIPTION) - without any XWindows dependencies
@@ -284,6 +334,9 @@
 RUNTIME_DEP_PKGS_CSWemacs-nox	+=	CSWlibxml2-2
 PKGFILES_CSWemacs-nox			=	/opt/csw/bin/emacs-nox
 PKGFILES_CSWemacs-nox			+=	/opt/csw/bin/emacs-$(VERSION)-nox
+CHECKPKG_OVERRIDES_CSWemacs-nox	+=	file-with-bad-content|/usr/local|root/opt/csw/bin/emacs-24.3-nox
+CHECKPKG_OVERRIDES_CSWemacs-nox	+=	file-with-bad-content|/usr/share|root/opt/csw/bin/emacs-24.3-nox
+CHECKPKG_OVERRIDES_CSWemacs-nox	+=	surplus-dependency|CSWemacs-common
 
 include gar/category.mk
 

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


From wahwah at users.sourceforge.net  Mon Apr  1 15:46:51 2013
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Mon, 01 Apr 2013 13:46:51 +0000
Subject: [csw-devel] SF.net SVN: gar:[20562]
	csw/mgar/gar/v2/lib/python/csw_upload_pkg.py
Message-ID: <E1UMf4V-00036S-FK@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 20562
          http://gar.svn.sourceforge.net/gar/?rev=20562&view=rev
Author:   wahwah
Date:     2013-04-01 13:46:50 +0000 (Mon, 01 Apr 2013)
Log Message:
-----------
csw-upload-pkg: Don't try without authentication.

Use basic http auth right from the start.

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	2013-04-01 13:28:44 UTC (rev 20561)
+++ csw/mgar/gar/v2/lib/python/csw_upload_pkg.py	2013-04-01 13:46:50 UTC (rev 20562)
@@ -106,7 +106,7 @@
     """Set basic HTTP auth options on given Curl object."""
     if self.username:
       logging.debug("Using basic AUTH for user %s", self.username)
-      c.setopt(pycurl.HTTPAUTH, pycurl.HTTPAUTH_ANY)
+      c.setopt(pycurl.HTTPAUTH, pycurl.HTTPAUTH_BASIC)
       c.setopt(pycurl.USERPWD, "%s:%s" % (self.username, self.password))
     else:
       logging.debug("User and password not set, not using HTTP AUTH")

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


From chninkel at users.sourceforge.net  Mon Apr  1 22:52:54 2013
From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net)
Date: Mon, 01 Apr 2013 20:52:54 +0000
Subject: [csw-devel] SF.net SVN: gar:[20563] csw/mgar/pkg/htmldoc/trunk
Message-ID: <E1UMlio-0003jE-HT@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 20563
          http://gar.svn.sourceforge.net/gar/?rev=20563&view=rev
Author:   chninkel
Date:     2013-04-01 20:52:54 +0000 (Mon, 01 Apr 2013)
Log Message:
-----------
htmldoc/trunk: rebuilt against libssl 1.0.0

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

Added Paths:
-----------
    csw/mgar/pkg/htmldoc/trunk/files/0002-libpng15-compatibility-fix.patch

Modified: csw/mgar/pkg/htmldoc/trunk/Makefile
===================================================================
--- csw/mgar/pkg/htmldoc/trunk/Makefile	2013-04-01 13:46:50 UTC (rev 20562)
+++ csw/mgar/pkg/htmldoc/trunk/Makefile	2013-04-01 20:52:54 UTC (rev 20563)
@@ -2,7 +2,7 @@
 VERSION = 1.8.27
 GARTYPE = v2
 
-DESCRIPTION = converts HTML files and web pages into indexed HTML PostScript and PDF
+DESCRIPTION = Converts HTML files and web pages into indexed HTML PostScript and PDF
 define BLURB
  HTMLDOC is a program for writing documentation in HTML and producing indexed
  HTML, PostScript, or PDF output (with tables of contents). It supports most
@@ -16,13 +16,17 @@
 SPKG_DESC_CSWhtmldoc-common = This package contains the htmldoc files common to all architectures.
 ARCHALL_CSWhtmldoc-common = 1
 
-RUNTIME_DEP_PKGS_CSWhtmldoc  = CSWfltk CSWjpeg CSWosslrt CSWpng CSWzlib
+RUNTIME_DEP_PKGS_CSWhtmldoc  = CSWfltk CSWlibjpeg7 CSWlibssl1-0-0 CSWlibpng15-15 CSWlibz1
 RUNTIME_DEP_PKGS_CSWhtmldoc += CSWhtmldoc-common
 #RUNTIME_DEP_PKGS_CSWhtmldoc-common = 
 
+CHECKPKG_OVERRIDES_CSWhtmldoc += surplus-dependency|CSWhtmldoc-common
+CHECKPKG_OVERRIDES_CSWhtmldoc-common += file-with-bad-content|/usr/share|root/opt/csw/share/man/man1/htmldoc.1
+
 PKGFILES_CSWhtmldoc = $(bindir)/.*
 PKGFILES_CSWhtmldoc-common = $(datadir)/.*
 
+
 MASTER_SITES = http://ftp.easysw.com/pub/htmldoc/$(VERSION)/
 DISTFILES  = $(NAME)-$(VERSION)-source.tar.bz2
 #DISTFILES    += $(call admfiles,CSWhtmldoc, )
@@ -41,6 +45,8 @@
 
 PATCHFILES = mainpatch
 
+PATCHFILES += 0002-libpng15-compatibility-fix.patch
+
 CONFIGURE_ARGS = $(DIRPATHS)
 
 TEST_SCRIPTS =
@@ -48,3 +54,6 @@
 # Disable check until package is released
 #ENABLE_CHECK = 0
 include gar/category.mk
+
+post-configure:
+	gsed -i -e 's/-xnorunpath//' $(WORKSRC)/Makedefs

Added: csw/mgar/pkg/htmldoc/trunk/files/0002-libpng15-compatibility-fix.patch
===================================================================
--- csw/mgar/pkg/htmldoc/trunk/files/0002-libpng15-compatibility-fix.patch	                        (rev 0)
+++ csw/mgar/pkg/htmldoc/trunk/files/0002-libpng15-compatibility-fix.patch	2013-04-01 20:52:54 UTC (rev 20563)
@@ -0,0 +1,118 @@
+From 4e383faed46df19cde2f83e83d60e7c6606487df Mon Sep 17 00:00:00 2001
+From: Yann Rouillard <yann at pleiades.fr.eu.org>
+Date: Mon, 1 Apr 2013 01:49:30 +0200
+Subject: [PATCH] libpng15 compatibility fix
+
+---
+ htmldoc/image.cxx | 31 ++++++++++++++++++-------------
+ 1 file changed, 18 insertions(+), 13 deletions(-)
+
+diff --git a/htmldoc/image.cxx b/htmldoc/image.cxx
+index 574ff7c..22ed300 100644
+--- a/htmldoc/image.cxx
++++ b/htmldoc/image.cxx
+@@ -1472,6 +1472,9 @@ image_load_png(image_t *img,	/* I - Image pointer */
+   png_bytep	*rows;		/* PNG row pointers */
+   uchar		*inptr,		/* Input pixels */
+ 		*outptr;	/* Output pixels */
++  png_bytep     trans_alpha; 
++  int           num_trans; 
++  png_color_16p trans_color;
+ 
+ 
+  /*
+@@ -1499,7 +1502,7 @@ image_load_png(image_t *img,	/* I - Image pointer */
+ 
+   rows = NULL;
+ 
+-  if (setjmp(pp->jmpbuf)) 
++  if (setjmp(png_jmpbuf(pp))) 
+   {
+     progress_error(HD_ERROR_BAD_FORMAT, "PNG file contains errors!");
+ 
+@@ -1526,7 +1529,9 @@ image_load_png(image_t *img,	/* I - Image pointer */
+ 
+   png_read_info(pp, info);
+ 
+-  if (info->color_type & PNG_COLOR_MASK_PALETTE)
++  png_get_tRNS(pp, info, &trans_alpha, &num_trans, &trans_color);
++
++  if (png_get_color_type(pp, info) & PNG_COLOR_MASK_PALETTE)
+   {
+     png_set_expand(pp);
+ 
+@@ -1535,15 +1540,15 @@ image_load_png(image_t *img,	/* I - Image pointer */
+     if (Encryption)
+       img->use ++;
+   }
+-  else if (info->bit_depth < 8)
++  else if (png_get_bit_depth(pp, info) < 8)
+   {
+     png_set_packing(pp);
+     png_set_expand(pp);
+   }
+-  else if (info->bit_depth == 16)
++  else if (png_get_bit_depth(pp, info) == 16)
+     png_set_strip_16(pp);
+ 
+-  if (info->color_type & PNG_COLOR_MASK_COLOR)
++  if (png_get_color_type(pp, info) & PNG_COLOR_MASK_COLOR)
+   {
+     depth      = 3;
+     img->depth = gray ? 1 : 3;
+@@ -1554,10 +1559,10 @@ image_load_png(image_t *img,	/* I - Image pointer */
+     img->depth = 1;
+   }
+ 
+-  img->width  = info->width;
+-  img->height = info->height;
++  img->width  = png_get_image_width(pp, info);
++  img->height = png_get_image_height(pp, info);
+ 
+-  if ((info->color_type & PNG_COLOR_MASK_ALPHA) || info->num_trans)
++  if ((png_get_color_type(pp, info) & PNG_COLOR_MASK_ALPHA) || num_trans)
+   {
+     if ((PSLevel == 0 && PDFVersion >= 14) || PSLevel == 3)
+       image_need_mask(img, 8);
+@@ -1576,7 +1581,7 @@ image_load_png(image_t *img,	/* I - Image pointer */
+     puts("    COLOR");
+   else
+     puts("    GRAYSCALE");
+-  if ((info->color_type & PNG_COLOR_MASK_ALPHA) || info->num_trans)
++  if ((info->color_type & PNG_COLOR_MASK_ALPHA) || num_trans)
+     puts("    ALPHA");
+   if (info->color_type & PNG_COLOR_MASK_PALETTE)
+     puts("    PALETTE");
+@@ -1594,9 +1599,9 @@ image_load_png(image_t *img,	/* I - Image pointer */
+   * Allocate pointers...
+   */
+ 
+-  rows = (png_bytep *)calloc(info->height, sizeof(png_bytep));
++  rows = (png_bytep *)calloc(png_get_image_height(pp, info), sizeof(png_bytep));
+ 
+-  for (i = 0; i < (int)info->height; i ++)
++  for (i = 0; i < (int)png_get_image_height(pp, info); i ++)
+     rows[i] = img->pixels + i * img->width * depth;
+ 
+  /*
+@@ -1610,7 +1615,7 @@ image_load_png(image_t *img,	/* I - Image pointer */
+   * Generate the alpha mask as necessary...
+   */
+ 
+-  if ((info->color_type & PNG_COLOR_MASK_ALPHA) || info->num_trans)
++  if ((png_get_color_type(pp, info) & PNG_COLOR_MASK_ALPHA) || num_trans)
+   {
+ #ifdef DEBUG
+     for (inptr = img->pixels, i = 0; i < img->height; i ++)
+@@ -1639,7 +1644,7 @@ image_load_png(image_t *img,	/* I - Image pointer */
+   * Reformat the data as necessary for the reader...
+   */
+ 
+-  if (gray && info->color_type & PNG_COLOR_MASK_COLOR)
++  if (gray && png_get_color_type(pp, info) & PNG_COLOR_MASK_COLOR)
+   {
+    /*
+     * Greyscale output needed...
+-- 
+1.8.1.4
+

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


From romeotheriault at users.sourceforge.net  Tue Apr  2 02:26:52 2013
From: romeotheriault at users.sourceforge.net (romeotheriault at users.sourceforge.net)
Date: Tue, 02 Apr 2013 00:26:52 +0000
Subject: [csw-devel] SF.net SVN: gar:[20564]
	csw/mgar/pkg/lang-python/salt/trunk
Message-ID: <E1UMp3s-0008TE-FW@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 20564
          http://gar.svn.sourceforge.net/gar/?rev=20564&view=rev
Author:   romeotheriault
Date:     2013-04-02 00:26:52 +0000 (Tue, 02 Apr 2013)
Log Message:
-----------
lang-python/salt/trunk: version bump to 0.14.0

Modified Paths:
--------------
    csw/mgar/pkg/lang-python/salt/trunk/Makefile
    csw/mgar/pkg/lang-python/salt/trunk/checksums

Modified: csw/mgar/pkg/lang-python/salt/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-python/salt/trunk/Makefile	2013-04-01 20:52:54 UTC (rev 20563)
+++ csw/mgar/pkg/lang-python/salt/trunk/Makefile	2013-04-02 00:26:52 UTC (rev 20564)
@@ -1,5 +1,5 @@
 NAME = salt
-VERSION = 0.10.4
+VERSION = 0.14.0
 GARTYPE = v2
 CATEGORIES = python
 
@@ -8,7 +8,7 @@
   Salt is a distributed remote execution system used to execute commands and query data. 
 endef
 
-MASTER_SITES = https://github.com/downloads/saltstack/salt/
+MASTER_SITES = http://pypi.python.org/packages/source/s/salt/
 DISTFILES += $(DISTNAME).tar.gz
 DISTFILES += salt-minion
 DISTFILES += salt-master
@@ -44,18 +44,16 @@
 include gar/category.mk
 
 post-install-modulated: CONFDEST = $(DESTDIR)$(sysconfdir)/salt
-post-install-modulated: CONFS = minion.template master.template 
+post-install-modulated: CONFS = minion master
 post-install-modulated:
 
 	# Copy config files (upstream)
 	ginstall -d $(CONFDEST)
 	cp $(addprefix $(WORKSRC)/conf/,$(CONFS)) $(CONFDEST)
-	gsed -i -e 's+/etc/salt+/etc/opt/csw/salt+g' $(DESTDIR)$(sysconfdir)/salt/master.template
-	gsed -i -e 's+/etc/salt+/etc/opt/csw/salt+g' $(DESTDIR)$(sysconfdir)/salt/minion.template
-	gsed -i -e 's+#pki_dir:+pki_dir:+g' $(DESTDIR)$(sysconfdir)/salt/master.template
-	gsed -i -e 's+#pki_dir:+pki_dir:+g' $(DESTDIR)$(sysconfdir)/salt/minion.template
-	mv $(CONFDEST)/minion.template $(CONFDEST)/minion
-	mv $(CONFDEST)/master.template $(CONFDEST)/master
+	gsed -i -e 's+/etc/salt+/etc/opt/csw/salt+g' $(DESTDIR)$(sysconfdir)/salt/master
+	gsed -i -e 's+/etc/salt+/etc/opt/csw/salt+g' $(DESTDIR)$(sysconfdir)/salt/minion
+	gsed -i -e 's+#pki_dir:+pki_dir:+g' $(DESTDIR)$(sysconfdir)/salt/master
+	gsed -i -e 's+#pki_dir:+pki_dir:+g' $(DESTDIR)$(sysconfdir)/salt/minion
 	# Copy init script in place
 	ginstall -d -m 755 $(DESTDIR)$(sysconfdir)/init.d
 	ginstall -m 755 $(DOWNLOADDIR)/salt-minion $(DESTDIR)$(sysconfdir)/init.d

Modified: csw/mgar/pkg/lang-python/salt/trunk/checksums
===================================================================
--- csw/mgar/pkg/lang-python/salt/trunk/checksums	2013-04-01 20:52:54 UTC (rev 20563)
+++ csw/mgar/pkg/lang-python/salt/trunk/checksums	2013-04-02 00:26:52 UTC (rev 20564)
@@ -1 +1 @@
-18022f153f9071d605483d3c92862e48  salt-0.10.4.tar.gz
+0f9fa32f208356e41ac8e0976e927b41  salt-0.14.0.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  Tue Apr  2 08:55:00 2013
From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net)
Date: Tue, 02 Apr 2013 06:55:00 +0000
Subject: [csw-devel] SF.net SVN: gar:[20565] csw/mgar/pkg/sudo/trunk/Makefile
Message-ID: <E1UMv7U-0000Be-EA@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 20565
          http://gar.svn.sourceforge.net/gar/?rev=20565&view=rev
Author:   janholzh
Date:     2013-04-02 06:54:56 +0000 (Tue, 02 Apr 2013)
Log Message:
-----------
sudo/trunk: enable fqdn support

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

Modified: csw/mgar/pkg/sudo/trunk/Makefile
===================================================================
--- csw/mgar/pkg/sudo/trunk/Makefile	2013-04-02 00:26:52 UTC (rev 20564)
+++ csw/mgar/pkg/sudo/trunk/Makefile	2013-04-02 06:54:56 UTC (rev 20565)
@@ -109,6 +109,7 @@
 CONFIGURE_ARGS += --with-iologdir=$(IOLOGPATH)
 CONFIGURE_ARGS += --with-timedir=$(TIMEPATH)
 CONFIGURE_ARGS += --with-project
+CONFIGURE_ARGS += --with-fqdn
 
 CONFIGURE_ARGS_LDAP-enabled += --with-ldap=$(prefix)
 CONFIGURE_ARGS_LDAP-enabled += --with-ldap-conf-file=$(sysconfdir)/ldap.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  Tue Apr  2 13:49:30 2013
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Tue, 02 Apr 2013 11:49:30 +0000
Subject: [csw-devel] SF.net SVN: gar:[20566] csw/mgar/pkg/qt4-gcc/trunk
Message-ID: <E1UMziU-0007K1-DM@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 20566
          http://gar.svn.sourceforge.net/gar/?rev=20566&view=rev
Author:   cgrzemba
Date:     2013-04-02 11:49:29 +0000 (Tue, 02 Apr 2013)
Log Message:
-----------
qt4-gcc/trunk: fix ShapeInput patch

Modified Paths:
--------------
    csw/mgar/pkg/qt4-gcc/trunk/Makefile
    csw/mgar/pkg/qt4-gcc/trunk/files/0001-shapeinput.patch

Modified: csw/mgar/pkg/qt4-gcc/trunk/Makefile
===================================================================
--- csw/mgar/pkg/qt4-gcc/trunk/Makefile	2013-04-02 06:54:56 UTC (rev 20565)
+++ csw/mgar/pkg/qt4-gcc/trunk/Makefile	2013-04-02 11:49:29 UTC (rev 20566)
@@ -10,7 +10,6 @@
   development and internationalization.
 endef
 
-prefix = $(BUILD_PREFIX)/gxx
 GARCOMPILER = GNU
 
 MASTER_SITES = ftp://ftp.qt-project.org/qt/source/
@@ -51,7 +50,8 @@
 CONFIGURE_ARGS += -qt-libjpeg -qt-libpng -qt-libmng -qt-zlib 
 # compile error: error: 'QGtkStyle' has not been declared ??? since 10.12.2012
 CONFIGURE_ARGS += -no-gtkstyle
-CONFIGURE_ARGS += -I/usr/include -I/usr/X11/include 
+CONFIGURE_ARGS += -I$(BUILD_PREFIX)/include/gtk-2.0
+CONFIGURE_ARGS += -I/usr/X11/include 
 CONFIGURE_ARGS += -I/usr/X11/share/include
 CONFIGURE_ARGS_sparc += -big-endian -host-big-endian
 # CONFIGURE_ARGS_i386 += -little-endian -host-big-endian
@@ -63,241 +63,241 @@
 EXTRA_INSTALL_EXPORTS = INSTALL_ROOT
 
 
-PACKAGES += CSWlibqtcore4-gxx
-PKGFILES_CSWlibqtcore4-gxx += $(call baseisadirs,$(libdir),libQtCore\.so\.4(\.\d+)*)
-SPKG_DESC_CSWlibqtcore4-gxx += $(DESCRIPTION), libQtCore.so.4
-# RUNTIME_DEP_PKGS_CSWlibqtcore4-gxx += CSWlibgthread2-0-0
-RUNTIME_DEP_PKGS_CSWlibqtcore4-gxx += CSWlibiconv2
-# RUNTIME_DEP_PKGS_CSWlibqtcore4-gxx += CSWlibintl8
-RUNTIME_DEP_PKGS_CSWlibqtcore4-gxx += CSWlibstdc++6
-RUNTIME_DEP_PKGS_CSWlibqtcore4-gxx += CSWlibglib2-0-0
-RUNTIME_DEP_PKGS_CSWlibqtcore4-gxx += CSWlibgcc-s1
+PACKAGES += CSWlibqtcore4
+PKGFILES_CSWlibqtcore4 += $(call baseisadirs,$(libdir),libQtCore\.so\.4(\.\d+)*)
+SPKG_DESC_CSWlibqtcore4 += $(DESCRIPTION), libQtCore.so.4
+# RUNTIME_DEP_PKGS_CSWlibqtcore4 += CSWlibgthread2-0-0
+RUNTIME_DEP_PKGS_CSWlibqtcore4 += CSWlibiconv2
+# RUNTIME_DEP_PKGS_CSWlibqtcore4 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibqtcore4 += CSWlibstdc++6
+RUNTIME_DEP_PKGS_CSWlibqtcore4 += CSWlibglib2-0-0
+RUNTIME_DEP_PKGS_CSWlibqtcore4 += CSWlibgcc-s1
 
-PACKAGES += CSWlibqtgui4-gxx
-CATALOGNAME_CSWlibqtgui4-gxx = libqtgui4_gxx
-PKGFILES_CSWlibqtgui4-gxx += $(call baseisadirs,$(libdir),libQtGui\.so\.4(\.\d+)*)
-SPKG_DESC_CSWlibqtgui4-gxx += $(DESCRIPTION), libQtGui.so.4
-# RUNTIME_DEP_PKGS_CSWlibqtgui4-gxx += CSWlibgthread2-0-0
-# RUNTIME_DEP_PKGS_CSWlibqtgui4-gxx += CSWlibintl8
-RUNTIME_DEP_PKGS_CSWlibqtgui4-gxx += CSWlibxrender
-RUNTIME_DEP_PKGS_CSWlibqtgui4-gxx += CSWlibstdc++6
-RUNTIME_DEP_PKGS_CSWlibqtgui4-gxx += CSWlibglib2-0-0
-RUNTIME_DEP_PKGS_CSWlibqtgui4-gxx += CSWlibgcc-s1
-RUNTIME_DEP_PKGS_CSWlibqtgui4-gxx += CSWlibqtcore4-gxx
-RUNTIME_DEP_PKGS_CSWlibqtgui4-gxx_sparc += CSWlibgobject2-0-0
-RUNTIME_DEP_PKGS_CSWlibqtgui4-gxx_sparc += CSWlibfontconfig1
-RUNTIME_DEP_PKGS_CSWlibqtgui4-gxx += CSWlibfreetype6
-RUNTIME_DEP_PKGS_CSWlibqtgui4-gxx += $(RUNTIME_DEP_PKGS_CSWlibqtgui4-gxx_$(GARCH))
-CHECKPKG_OVERRIDES_CSWlibqtgui4-gxx += file-with-bad-content|/usr/share|root/opt/csw/gxx/lib/libQtGui.so.4.8.1
+PACKAGES += CSWlibqtgui4
+CATALOGNAME_CSWlibqtgui4 = libqtgui4_gxx
+PKGFILES_CSWlibqtgui4 += $(call baseisadirs,$(libdir),libQtGui\.so\.4(\.\d+)*)
+SPKG_DESC_CSWlibqtgui4 += $(DESCRIPTION), libQtGui.so.4
+# RUNTIME_DEP_PKGS_CSWlibqtgui4 += CSWlibgthread2-0-0
+# RUNTIME_DEP_PKGS_CSWlibqtgui4 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibqtgui4 += CSWlibxrender
+RUNTIME_DEP_PKGS_CSWlibqtgui4 += CSWlibstdc++6
+RUNTIME_DEP_PKGS_CSWlibqtgui4 += CSWlibglib2-0-0
+RUNTIME_DEP_PKGS_CSWlibqtgui4 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibqtgui4 += CSWlibqtcore4
+RUNTIME_DEP_PKGS_CSWlibqtgui4_sparc += CSWlibgobject2-0-0
+RUNTIME_DEP_PKGS_CSWlibqtgui4_sparc += CSWlibfontconfig1
+RUNTIME_DEP_PKGS_CSWlibqtgui4 += CSWlibfreetype6
+RUNTIME_DEP_PKGS_CSWlibqtgui4 += $(RUNTIME_DEP_PKGS_CSWlibqtgui4_$(GARCH))
+CHECKPKG_OVERRIDES_CSWlibqtgui4 += file-with-bad-content|/usr/share|root/opt/csw/gxx/lib/libQtGui.so.4.8.1
 
-PACKAGES += CSWqt4-gxx-dev
-SPKG_DESC_CSWqt4-gxx-dev += $(DESCRIPTION), development files
-PKGFILES_CSWqt4-gxx-dev += $(PKGFILES_DEVEL)
-PKGFILES_CSWqt4-gxx-dev += $(call baseisadirs,$(bindir),.*)
-PKGFILES_CSWqt4-gxx-dev += $(prefix)/examples/.*
-PKGFILES_CSWqt4-gxx-dev += $(prefix)/plugins/.*
-PKGFILES_CSWqt4-gxx-dev += $(prefix)/demos/.*
-PKGFILES_CSWqt4-gxx-dev += $(prefix)/imports/.*
-PKGFILES_CSWqt4-gxx-dev += $(prefix)/mkspecs/.*
-RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibqtscript4-gxx
-RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibqtdesignercomponents4-gxx
-RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibqtdesigner4-gxx
-RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibqtxml4-gxx
-RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibqthelp4-gxx
-RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibqttest4-gxx
-RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibqtnetwork4-gxx
-RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibqtdbus4-gxx
-RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWdbus
-RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibqtclucene4-gxx
-RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibqtcore4-gxx
-RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibqtscripttools4-gxx
-RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibqtdeclarative4-gxx
-RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibqtgui4-gxx
-RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibqtopengl4-gxx
-RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibqtmultimedia4-gxx
-RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibqtsvg4-gxx
-RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibphonon4-gxx
-RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibqtsql4-gxx
-# RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibgthread2-0-0
-# RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibgmodule2-0-0
-# RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibintl8
-RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWgstreamer
-# RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibxrender
-RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibgobject2-0-0
-RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWmesa
-RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibstdc++6
-RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibglib2-0-0
-# RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibxml2-2
-RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWgstplugins
-RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibgcc-s1
-RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibsybdb5
-RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWsqlite
-RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibpq5
-RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibodbc2
-RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibtiff3
-RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibmysqlclient18
-RUNTIME_DEP_PKGS_CSWqt4-gxx-dev_sparc += CSWlibfontconfig1
-RUNTIME_DEP_PKGS_CSWqt4-gxx-dev_sparc += CSWlibfreetype6
-RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += $(RUNTIME_DEP_PKGS_CSWqt4-gxx-dev_$(GARCH))
+PACKAGES += CSWqt4-dev
+SPKG_DESC_CSWqt4-dev += $(DESCRIPTION), development files
+PKGFILES_CSWqt4-dev += $(PKGFILES_DEVEL)
+PKGFILES_CSWqt4-dev += $(call baseisadirs,$(bindir),.*)
+PKGFILES_CSWqt4-dev += $(prefix)/examples/.*
+PKGFILES_CSWqt4-dev += $(prefix)/plugins/.*
+PKGFILES_CSWqt4-dev += $(prefix)/demos/.*
+PKGFILES_CSWqt4-dev += $(prefix)/imports/.*
+PKGFILES_CSWqt4-dev += $(prefix)/mkspecs/.*
+RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibqtscript4
+RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibqtdesignercomponents4
+RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibqtdesigner4
+RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibqtxml4
+RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibqthelp4
+RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibqttest4
+RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibqtnetwork4
+RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibqtdbus4
+RUNTIME_DEP_PKGS_CSWqt4-dev += CSWdbus
+RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibqtclucene4
+RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibqtcore4
+RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibqtscripttools4
+RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibqtdeclarative4
+RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibqtgui4
+RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibqtopengl4
+RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibqtmultimedia4
+RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibqtsvg4
+RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibphonon4
+RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibqtsql4
+# RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibgthread2-0-0
+# RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibgmodule2-0-0
+# RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWqt4-dev += CSWgstreamer
+# RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibxrender
+RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibgobject2-0-0
+RUNTIME_DEP_PKGS_CSWqt4-dev += CSWmesa
+RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibstdc++6
+RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibglib2-0-0
+# RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibxml2-2
+RUNTIME_DEP_PKGS_CSWqt4-dev += CSWgstplugins
+RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibsybdb5
+RUNTIME_DEP_PKGS_CSWqt4-dev += CSWsqlite
+RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibpq5
+RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibodbc2
+RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibtiff3
+RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibmysqlclient18
+RUNTIME_DEP_PKGS_CSWqt4-dev_sparc += CSWlibfontconfig1
+RUNTIME_DEP_PKGS_CSWqt4-dev_sparc += CSWlibfreetype6
+RUNTIME_DEP_PKGS_CSWqt4-dev += $(RUNTIME_DEP_PKGS_CSWqt4-dev_$(GARCH))
 # These are code examples.
-CHECKPKG_OVERRIDES_CSWqt4-gxx-dev += binary-architecture-does-not-match-placement
+CHECKPKG_OVERRIDES_CSWqt4-dev += binary-architecture-does-not-match-placement
 
 # REFINE this later!
-CHECKPKG_OVERRIDES_CSWqt4-gxx-dev += file-with-bad-content
-CHECKPKG_OVERRIDES_CSWqt4-gxx-dev += discouraged-path-in-pkgmap
+CHECKPKG_OVERRIDES_CSWqt4-dev += file-with-bad-content
+CHECKPKG_OVERRIDES_CSWqt4-dev += discouraged-path-in-pkgmap
 # because libdbus needs /etc/machine-id which can generated with a tool of CSWdbus
-CHECKPKG_OVERRIDES_CSWqt4-gxx-dev += surplus-dependency|CSWdbus
+CHECKPKG_OVERRIDES_CSWqt4-dev += surplus-dependency|CSWdbus
 
-PACKAGES += CSWlibqthelp4-gxx
-PKGFILES_CSWlibqthelp4-gxx += $(call baseisadirs,$(libdir),libQtHelp\.so\.4(\.\d+)*)
-SPKG_DESC_CSWlibqthelp4-gxx += $(DESCRIPTION), libQtHelp.so.4
-RUNTIME_DEP_PKGS_CSWlibqthelp4-gxx += CSWlibqtnetwork4-gxx
-RUNTIME_DEP_PKGS_CSWlibqthelp4-gxx += CSWlibstdc++6
-RUNTIME_DEP_PKGS_CSWlibqthelp4-gxx += CSWlibqtgui4-gxx
-RUNTIME_DEP_PKGS_CSWlibqthelp4-gxx += CSWlibgcc-s1
-RUNTIME_DEP_PKGS_CSWlibqthelp4-gxx += CSWlibqtcore4-gxx
-RUNTIME_DEP_PKGS_CSWlibqthelp4-gxx += CSWlibqtsql4-gxx
-RUNTIME_DEP_PKGS_CSWlibqthelp4-gxx += CSWlibqtclucene4-gxx
+PACKAGES += CSWlibqthelp4
+PKGFILES_CSWlibqthelp4 += $(call baseisadirs,$(libdir),libQtHelp\.so\.4(\.\d+)*)
+SPKG_DESC_CSWlibqthelp4 += $(DESCRIPTION), libQtHelp.so.4
+RUNTIME_DEP_PKGS_CSWlibqthelp4 += CSWlibqtnetwork4
+RUNTIME_DEP_PKGS_CSWlibqthelp4 += CSWlibstdc++6
+RUNTIME_DEP_PKGS_CSWlibqthelp4 += CSWlibqtgui4
+RUNTIME_DEP_PKGS_CSWlibqthelp4 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibqthelp4 += CSWlibqtcore4
+RUNTIME_DEP_PKGS_CSWlibqthelp4 += CSWlibqtsql4
+RUNTIME_DEP_PKGS_CSWlibqthelp4 += CSWlibqtclucene4
 
-PACKAGES += CSWlibqtmultimedia4-gxx
-PKGFILES_CSWlibqtmultimedia4-gxx += $(call baseisadirs,$(libdir),libQtMultimedia\.so\.4(\.\d+)*)
-SPKG_DESC_CSWlibqtmultimedia4-gxx += $(DESCRIPTION), libQtMultimedia.so.4
-RUNTIME_DEP_PKGS_CSWlibqtmultimedia4-gxx += CSWlibgcc-s1
-RUNTIME_DEP_PKGS_CSWlibqtmultimedia4-gxx += CSWlibstdc++6
-RUNTIME_DEP_PKGS_CSWlibqtmultimedia4-gxx += CSWlibqtgui4-gxx
-RUNTIME_DEP_PKGS_CSWlibqtmultimedia4-gxx += CSWlibqtcore4-gxx
+PACKAGES += CSWlibqtmultimedia4
+PKGFILES_CSWlibqtmultimedia4 += $(call baseisadirs,$(libdir),libQtMultimedia\.so\.4(\.\d+)*)
+SPKG_DESC_CSWlibqtmultimedia4 += $(DESCRIPTION), libQtMultimedia.so.4
+RUNTIME_DEP_PKGS_CSWlibqtmultimedia4 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibqtmultimedia4 += CSWlibstdc++6
+RUNTIME_DEP_PKGS_CSWlibqtmultimedia4 += CSWlibqtgui4
+RUNTIME_DEP_PKGS_CSWlibqtmultimedia4 += CSWlibqtcore4
 
-PACKAGES += CSWlibqtnetwork4-gxx
-PKGFILES_CSWlibqtnetwork4-gxx += $(call baseisadirs,$(libdir),libQtNetwork\.so\.4(\.\d+)*)
-SPKG_DESC_CSWlibqtnetwork4-gxx += $(DESCRIPTION), libQtNetwork.so.4
-RUNTIME_DEP_PKGS_CSWlibqtnetwork4-gxx += CSWlibgcc-s1
-RUNTIME_DEP_PKGS_CSWlibqtnetwork4-gxx += CSWlibstdc++6
-RUNTIME_DEP_PKGS_CSWlibqtnetwork4-gxx += CSWlibqtcore4-gxx
-CHECKPKG_OVERRIDES_CSWlibqtnetwork4-gxx += file-with-bad-content|/usr/share|root/opt/csw/gxx/lib/libQtNetwork.so.4.8.1
+PACKAGES += CSWlibqtnetwork4
+PKGFILES_CSWlibqtnetwork4 += $(call baseisadirs,$(libdir),libQtNetwork\.so\.4(\.\d+)*)
+SPKG_DESC_CSWlibqtnetwork4 += $(DESCRIPTION), libQtNetwork.so.4
+RUNTIME_DEP_PKGS_CSWlibqtnetwork4 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibqtnetwork4 += CSWlibstdc++6
+RUNTIME_DEP_PKGS_CSWlibqtnetwork4 += CSWlibqtcore4
+CHECKPKG_OVERRIDES_CSWlibqtnetwork4 += file-with-bad-content|/usr/share|root/opt/csw/gxx/lib/libQtNetwork.so.4.8.1
 
-PACKAGES += CSWlibqtopengl4-gxx
-PKGFILES_CSWlibqtopengl4-gxx += $(call baseisadirs,$(libdir),libQtOpenGL\.so\.4(\.\d+)*)
-SPKG_DESC_CSWlibqtopengl4-gxx += $(DESCRIPTION), libQtOpenGL.so.4
-RUNTIME_DEP_PKGS_CSWlibqtopengl4-gxx += CSWlibxrender
-RUNTIME_DEP_PKGS_CSWlibqtopengl4-gxx += CSWlibqtcore4-gxx
-RUNTIME_DEP_PKGS_CSWlibqtopengl4-gxx += CSWmesa
-RUNTIME_DEP_PKGS_CSWlibqtopengl4-gxx += CSWlibstdc++6
-RUNTIME_DEP_PKGS_CSWlibqtopengl4-gxx += CSWlibqtgui4-gxx
-RUNTIME_DEP_PKGS_CSWlibqtopengl4-gxx += CSWlibgcc-s1
-RUNTIME_DEP_PKGS_CSWlibqtopengl4-gxx_sparc += CSWlibfontconfig1
-RUNTIME_DEP_PKGS_CSWlibqtopengl4-gxx_sparc += CSWlibfreetype6
-RUNTIME_DEP_PKGS_CSWlibqtopengl4-gxx += $(RUNTIME_DEP_PKGS_CSWlibqtopengl4-gxx_$(GARCH))
+PACKAGES += CSWlibqtopengl4
+PKGFILES_CSWlibqtopengl4 += $(call baseisadirs,$(libdir),libQtOpenGL\.so\.4(\.\d+)*)
+SPKG_DESC_CSWlibqtopengl4 += $(DESCRIPTION), libQtOpenGL.so.4
+RUNTIME_DEP_PKGS_CSWlibqtopengl4 += CSWlibxrender
+RUNTIME_DEP_PKGS_CSWlibqtopengl4 += CSWlibqtcore4
+RUNTIME_DEP_PKGS_CSWlibqtopengl4 += CSWmesa
+RUNTIME_DEP_PKGS_CSWlibqtopengl4 += CSWlibstdc++6
+RUNTIME_DEP_PKGS_CSWlibqtopengl4 += CSWlibqtgui4
+RUNTIME_DEP_PKGS_CSWlibqtopengl4 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibqtopengl4_sparc += CSWlibfontconfig1
+RUNTIME_DEP_PKGS_CSWlibqtopengl4_sparc += CSWlibfreetype6
+RUNTIME_DEP_PKGS_CSWlibqtopengl4 += $(RUNTIME_DEP_PKGS_CSWlibqtopengl4_$(GARCH))
 
 
-PACKAGES += CSWlibqtscript4-gxx
-PKGFILES_CSWlibqtscript4-gxx += $(call baseisadirs,$(libdir),libQtScript\.so\.4(\.\d+)*)
-SPKG_DESC_CSWlibqtscript4-gxx += $(DESCRIPTION), libQtScript.so.4
-RUNTIME_DEP_PKGS_CSWlibqtscript4-gxx += CSWlibgcc-s1
-RUNTIME_DEP_PKGS_CSWlibqtscript4-gxx += CSWlibstdc++6
-RUNTIME_DEP_PKGS_CSWlibqtscript4-gxx += CSWlibqtcore4-gxx
+PACKAGES += CSWlibqtscript4
+PKGFILES_CSWlibqtscript4 += $(call baseisadirs,$(libdir),libQtScript\.so\.4(\.\d+)*)
+SPKG_DESC_CSWlibqtscript4 += $(DESCRIPTION), libQtScript.so.4
+RUNTIME_DEP_PKGS_CSWlibqtscript4 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibqtscript4 += CSWlibstdc++6
+RUNTIME_DEP_PKGS_CSWlibqtscript4 += CSWlibqtcore4
 
-PACKAGES += CSWlibqtscripttools4-gxx
-PKGFILES_CSWlibqtscripttools4-gxx += $(call baseisadirs,$(libdir),libQtScriptTools\.so\.4(\.\d+)*)
-SPKG_DESC_CSWlibqtscripttools4-gxx += $(DESCRIPTION), libQtScriptTools.so.4
-RUNTIME_DEP_PKGS_CSWlibqtscripttools4-gxx += CSWlibqtscript4-gxx
-RUNTIME_DEP_PKGS_CSWlibqtscripttools4-gxx += CSWlibgcc-s1
-RUNTIME_DEP_PKGS_CSWlibqtscripttools4-gxx += CSWlibstdc++6
-RUNTIME_DEP_PKGS_CSWlibqtscripttools4-gxx += CSWlibqtgui4-gxx
-RUNTIME_DEP_PKGS_CSWlibqtscripttools4-gxx += CSWlibqtcore4-gxx
+PACKAGES += CSWlibqtscripttools4
+PKGFILES_CSWlibqtscripttools4 += $(call baseisadirs,$(libdir),libQtScriptTools\.so\.4(\.\d+)*)
+SPKG_DESC_CSWlibqtscripttools4 += $(DESCRIPTION), libQtScriptTools.so.4
+RUNTIME_DEP_PKGS_CSWlibqtscripttools4 += CSWlibqtscript4
+RUNTIME_DEP_PKGS_CSWlibqtscripttools4 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibqtscripttools4 += CSWlibstdc++6
+RUNTIME_DEP_PKGS_CSWlibqtscripttools4 += CSWlibqtgui4
+RUNTIME_DEP_PKGS_CSWlibqtscripttools4 += CSWlibqtcore4
 
-PACKAGES += CSWlibqtsql4-gxx
-PKGFILES_CSWlibqtsql4-gxx += $(call baseisadirs,$(libdir),libQtSql\.so\.4(\.\d+)*)
-SPKG_DESC_CSWlibqtsql4-gxx += $(DESCRIPTION), libQtSql.so.4
-RUNTIME_DEP_PKGS_CSWlibqtsql4-gxx += CSWlibgcc-s1
-RUNTIME_DEP_PKGS_CSWlibqtsql4-gxx += CSWlibstdc++6
-RUNTIME_DEP_PKGS_CSWlibqtsql4-gxx += CSWlibqtcore4-gxx
+PACKAGES += CSWlibqtsql4
+PKGFILES_CSWlibqtsql4 += $(call baseisadirs,$(libdir),libQtSql\.so\.4(\.\d+)*)
+SPKG_DESC_CSWlibqtsql4 += $(DESCRIPTION), libQtSql.so.4
+RUNTIME_DEP_PKGS_CSWlibqtsql4 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibqtsql4 += CSWlibstdc++6
+RUNTIME_DEP_PKGS_CSWlibqtsql4 += CSWlibqtcore4
 
-PACKAGES += CSWlibqtsvg4-gxx
-PKGFILES_CSWlibqtsvg4-gxx += $(call baseisadirs,$(libdir),libQtSvg\.so\.4(\.\d+)*)
-SPKG_DESC_CSWlibqtsvg4-gxx += $(DESCRIPTION), libQtSvg.so.4
-RUNTIME_DEP_PKGS_CSWlibqtsvg4-gxx += CSWlibgcc-s1
-RUNTIME_DEP_PKGS_CSWlibqtsvg4-gxx += CSWlibstdc++6
-RUNTIME_DEP_PKGS_CSWlibqtsvg4-gxx += CSWlibqtgui4-gxx
-RUNTIME_DEP_PKGS_CSWlibqtsvg4-gxx += CSWlibqtcore4-gxx
+PACKAGES += CSWlibqtsvg4
+PKGFILES_CSWlibqtsvg4 += $(call baseisadirs,$(libdir),libQtSvg\.so\.4(\.\d+)*)
+SPKG_DESC_CSWlibqtsvg4 += $(DESCRIPTION), libQtSvg.so.4
+RUNTIME_DEP_PKGS_CSWlibqtsvg4 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibqtsvg4 += CSWlibstdc++6
+RUNTIME_DEP_PKGS_CSWlibqtsvg4 += CSWlibqtgui4
+RUNTIME_DEP_PKGS_CSWlibqtsvg4 += CSWlibqtcore4
 
-PACKAGES += CSWlibqttest4-gxx
-PKGFILES_CSWlibqttest4-gxx += $(call baseisadirs,$(libdir),libQtTest\.so\.4(\.\d+)*)
-SPKG_DESC_CSWlibqttest4-gxx += $(DESCRIPTION), libQtTest.so.4
-RUNTIME_DEP_PKGS_CSWlibqttest4-gxx += CSWlibgcc-s1
-RUNTIME_DEP_PKGS_CSWlibqttest4-gxx += CSWlibstdc++6
-RUNTIME_DEP_PKGS_CSWlibqttest4-gxx += CSWlibqtcore4-gxx
+PACKAGES += CSWlibqttest4
+PKGFILES_CSWlibqttest4 += $(call baseisadirs,$(libdir),libQtTest\.so\.4(\.\d+)*)
+SPKG_DESC_CSWlibqttest4 += $(DESCRIPTION), libQtTest.so.4
+RUNTIME_DEP_PKGS_CSWlibqttest4 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibqttest4 += CSWlibstdc++6
+RUNTIME_DEP_PKGS_CSWlibqttest4 += CSWlibqtcore4
 
-PACKAGES += CSWlibphonon4-gxx
-PKGFILES_CSWlibphonon4-gxx += $(call baseisadirs,$(libdir),libphonon\.so\.4(\.\d+)*)
-SPKG_DESC_CSWlibphonon4-gxx += $(DESCRIPTION), libphonon.so.4
-RUNTIME_DEP_PKGS_CSWlibphonon4-gxx += CSWlibqtxml4-gxx
-RUNTIME_DEP_PKGS_CSWlibphonon4-gxx += CSWlibqtdbus4-gxx
-RUNTIME_DEP_PKGS_CSWlibphonon4-gxx += CSWlibqtcore4-gxx
-RUNTIME_DEP_PKGS_CSWlibphonon4-gxx += CSWlibstdc++6
-RUNTIME_DEP_PKGS_CSWlibphonon4-gxx += CSWlibqtgui4-gxx
-RUNTIME_DEP_PKGS_CSWlibphonon4-gxx += CSWlibgcc-s1
+PACKAGES += CSWlibphonon4
+PKGFILES_CSWlibphonon4 += $(call baseisadirs,$(libdir),libphonon\.so\.4(\.\d+)*)
+SPKG_DESC_CSWlibphonon4 += $(DESCRIPTION), libphonon.so.4
+RUNTIME_DEP_PKGS_CSWlibphonon4 += CSWlibqtxml4
+RUNTIME_DEP_PKGS_CSWlibphonon4 += CSWlibqtdbus4
+RUNTIME_DEP_PKGS_CSWlibphonon4 += CSWlibqtcore4
+RUNTIME_DEP_PKGS_CSWlibphonon4 += CSWlibstdc++6
+RUNTIME_DEP_PKGS_CSWlibphonon4 += CSWlibqtgui4
+RUNTIME_DEP_PKGS_CSWlibphonon4 += CSWlibgcc-s1
 
-PACKAGES += CSWlibqtclucene4-gxx
-PKGFILES_CSWlibqtclucene4-gxx += $(call baseisadirs,$(libdir),libQtCLucene\.so\.4(\.\d+)*)
-SPKG_DESC_CSWlibqtclucene4-gxx += $(DESCRIPTION), libQtCLucene.so.4
-RUNTIME_DEP_PKGS_CSWlibqtclucene4-gxx += CSWlibgcc-s1
-RUNTIME_DEP_PKGS_CSWlibqtclucene4-gxx += CSWlibstdc++6
-RUNTIME_DEP_PKGS_CSWlibqtclucene4-gxx += CSWlibqtcore4-gxx
-RUNTIME_DEP_PKGS_CSWlibqtclucene4-gxx += CSWlibqtdbus4-gxx
+PACKAGES += CSWlibqtclucene4
+PKGFILES_CSWlibqtclucene4 += $(call baseisadirs,$(libdir),libQtCLucene\.so\.4(\.\d+)*)
+SPKG_DESC_CSWlibqtclucene4 += $(DESCRIPTION), libQtCLucene.so.4
+RUNTIME_DEP_PKGS_CSWlibqtclucene4 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibqtclucene4 += CSWlibstdc++6
+RUNTIME_DEP_PKGS_CSWlibqtclucene4 += CSWlibqtcore4
+RUNTIME_DEP_PKGS_CSWlibqtclucene4 += CSWlibqtdbus4
 
-PACKAGES += CSWlibqtdbus4-gxx
-PKGFILES_CSWlibqtdbus4-gxx += $(call baseisadirs,$(libdir),libQtDBus\.so\.4(\.\d+)*)
-SPKG_DESC_CSWlibqtdbus4-gxx += $(DESCRIPTION), libQtDBus.so.4
-RUNTIME_DEP_PKGS_CSWlibqtdbus4-gxx += CSWlibgcc-s1
-RUNTIME_DEP_PKGS_CSWlibqtdbus4-gxx += CSWlibstdc++6
-RUNTIME_DEP_PKGS_CSWlibqtdbus4-gxx += CSWlibqtxml4-gxx
-RUNTIME_DEP_PKGS_CSWlibqtdbus4-gxx += CSWlibqtcore4-gxx
+PACKAGES += CSWlibqtdbus4
+PKGFILES_CSWlibqtdbus4 += $(call baseisadirs,$(libdir),libQtDBus\.so\.4(\.\d+)*)
+SPKG_DESC_CSWlibqtdbus4 += $(DESCRIPTION), libQtDBus.so.4
+RUNTIME_DEP_PKGS_CSWlibqtdbus4 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibqtdbus4 += CSWlibstdc++6
+RUNTIME_DEP_PKGS_CSWlibqtdbus4 += CSWlibqtxml4
+RUNTIME_DEP_PKGS_CSWlibqtdbus4 += CSWlibqtcore4
 
-PACKAGES += CSWlibqtdeclarative4-gxx
-PKGFILES_CSWlibqtdeclarative4-gxx += $(call baseisadirs,$(libdir),libQtDeclarative\.so\.4(\.\d+)*)
-SPKG_DESC_CSWlibqtdeclarative4-gxx += $(DESCRIPTION), libQtDeclarative.so.4
-RUNTIME_DEP_PKGS_CSWlibqtdeclarative4-gxx += CSWlibqtscript4-gxx
-RUNTIME_DEP_PKGS_CSWlibqtdeclarative4-gxx += CSWlibqtnetwork4-gxx
-RUNTIME_DEP_PKGS_CSWlibqtdeclarative4-gxx += CSWlibqtcore4-gxx
-RUNTIME_DEP_PKGS_CSWlibqtdeclarative4-gxx += CSWlibstdc++6
-RUNTIME_DEP_PKGS_CSWlibqtdeclarative4-gxx += CSWlibqtgui4-gxx
-RUNTIME_DEP_PKGS_CSWlibqtdeclarative4-gxx += CSWlibqtsvg4-gxx
-RUNTIME_DEP_PKGS_CSWlibqtdeclarative4-gxx += CSWlibgcc-s1
-RUNTIME_DEP_PKGS_CSWlibqtdeclarative4-gxx += CSWlibqtsql4-gxx
+PACKAGES += CSWlibqtdeclarative4
+PKGFILES_CSWlibqtdeclarative4 += $(call baseisadirs,$(libdir),libQtDeclarative\.so\.4(\.\d+)*)
+SPKG_DESC_CSWlibqtdeclarative4 += $(DESCRIPTION), libQtDeclarative.so.4
+RUNTIME_DEP_PKGS_CSWlibqtdeclarative4 += CSWlibqtscript4
+RUNTIME_DEP_PKGS_CSWlibqtdeclarative4 += CSWlibqtnetwork4
+RUNTIME_DEP_PKGS_CSWlibqtdeclarative4 += CSWlibqtcore4
+RUNTIME_DEP_PKGS_CSWlibqtdeclarative4 += CSWlibstdc++6
+RUNTIME_DEP_PKGS_CSWlibqtdeclarative4 += CSWlibqtgui4
+RUNTIME_DEP_PKGS_CSWlibqtdeclarative4 += CSWlibqtsvg4
+RUNTIME_DEP_PKGS_CSWlibqtdeclarative4 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibqtdeclarative4 += CSWlibqtsql4
 
-PACKAGES += CSWlibqtdesigner4-gxx
-PKGFILES_CSWlibqtdesigner4-gxx += $(call baseisadirs,$(libdir),libQtDesigner\.so\.4(\.\d+)*)
-SPKG_DESC_CSWlibqtdesigner4-gxx += $(DESCRIPTION), libQtDesigner.so.4
-RUNTIME_DEP_PKGS_CSWlibqtdesigner4-gxx += CSWlibqtscript4-gxx
-RUNTIME_DEP_PKGS_CSWlibqtdesigner4-gxx += CSWlibqtxml4-gxx
-RUNTIME_DEP_PKGS_CSWlibqtdesigner4-gxx += CSWlibqtcore4-gxx
-RUNTIME_DEP_PKGS_CSWlibqtdesigner4-gxx += CSWlibstdc++6
-RUNTIME_DEP_PKGS_CSWlibqtdesigner4-gxx += CSWlibqtgui4-gxx
-RUNTIME_DEP_PKGS_CSWlibqtdesigner4-gxx += CSWlibgcc-s1
+PACKAGES += CSWlibqtdesigner4
+PKGFILES_CSWlibqtdesigner4 += $(call baseisadirs,$(libdir),libQtDesigner\.so\.4(\.\d+)*)
+SPKG_DESC_CSWlibqtdesigner4 += $(DESCRIPTION), libQtDesigner.so.4
+RUNTIME_DEP_PKGS_CSWlibqtdesigner4 += CSWlibqtscript4
+RUNTIME_DEP_PKGS_CSWlibqtdesigner4 += CSWlibqtxml4
+RUNTIME_DEP_PKGS_CSWlibqtdesigner4 += CSWlibqtcore4
+RUNTIME_DEP_PKGS_CSWlibqtdesigner4 += CSWlibstdc++6
+RUNTIME_DEP_PKGS_CSWlibqtdesigner4 += CSWlibqtgui4
+RUNTIME_DEP_PKGS_CSWlibqtdesigner4 += CSWlibgcc-s1
 
-PACKAGES += CSWlibqtdesignercomponents4-gxx
-PKGFILES_CSWlibqtdesignercomponents4-gxx += $(call baseisadirs,$(libdir),libQtDesignerComponents\.so\.4(\.\d+)*)
-SPKG_DESC_CSWlibqtdesignercomponents4-gxx += $(DESCRIPTION), libQtDesignerComponents.so.4
-RUNTIME_DEP_PKGS_CSWlibqtdesignercomponents4-gxx += CSWlibqtscript4-gxx
-RUNTIME_DEP_PKGS_CSWlibqtdesignercomponents4-gxx += CSWlibqtdesigner4-gxx
-RUNTIME_DEP_PKGS_CSWlibqtdesignercomponents4-gxx += CSWlibqtxml4-gxx
-RUNTIME_DEP_PKGS_CSWlibqtdesignercomponents4-gxx += CSWlibqtcore4-gxx
-RUNTIME_DEP_PKGS_CSWlibqtdesignercomponents4-gxx += CSWlibstdc++6
-RUNTIME_DEP_PKGS_CSWlibqtdesignercomponents4-gxx += CSWlibqtgui4-gxx
-RUNTIME_DEP_PKGS_CSWlibqtdesignercomponents4-gxx += CSWlibgcc-s1
+PACKAGES += CSWlibqtdesignercomponents4
+PKGFILES_CSWlibqtdesignercomponents4 += $(call baseisadirs,$(libdir),libQtDesignerComponents\.so\.4(\.\d+)*)
+SPKG_DESC_CSWlibqtdesignercomponents4 += $(DESCRIPTION), libQtDesignerComponents.so.4
+RUNTIME_DEP_PKGS_CSWlibqtdesignercomponents4 += CSWlibqtscript4
+RUNTIME_DEP_PKGS_CSWlibqtdesignercomponents4 += CSWlibqtdesigner4
+RUNTIME_DEP_PKGS_CSWlibqtdesignercomponents4 += CSWlibqtxml4
+RUNTIME_DEP_PKGS_CSWlibqtdesignercomponents4 += CSWlibqtcore4
+RUNTIME_DEP_PKGS_CSWlibqtdesignercomponents4 += CSWlibstdc++6
+RUNTIME_DEP_PKGS_CSWlibqtdesignercomponents4 += CSWlibqtgui4
+RUNTIME_DEP_PKGS_CSWlibqtdesignercomponents4 += CSWlibgcc-s1
 
-PACKAGES += CSWlibqtxml4-gxx
-PKGFILES_CSWlibqtxml4-gxx += $(call baseisadirs,$(libdir),libQtXml\.so\.4(\.\d+)*)
-SPKG_DESC_CSWlibqtxml4-gxx += $(DESCRIPTION), libQtXml.so.4
-RUNTIME_DEP_PKGS_CSWlibqtxml4-gxx += CSWlibgcc-s1
-RUNTIME_DEP_PKGS_CSWlibqtxml4-gxx += CSWlibstdc++6
-RUNTIME_DEP_PKGS_CSWlibqtxml4-gxx += CSWlibqtcore4-gxx
+PACKAGES += CSWlibqtxml4
+PKGFILES_CSWlibqtxml4 += $(call baseisadirs,$(libdir),libQtXml\.so\.4(\.\d+)*)
+SPKG_DESC_CSWlibqtxml4 += $(DESCRIPTION), libQtXml.so.4
+RUNTIME_DEP_PKGS_CSWlibqtxml4 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibqtxml4 += CSWlibstdc++6
+RUNTIME_DEP_PKGS_CSWlibqtxml4 += CSWlibqtcore4
 
-PACKAGES += CSWqt4-gxx-doc
-SPKG_DESC_CSWqt4-gxx-doc += $(DESCRIPTION), documentation
+PACKAGES += CSWqt4-doc
+SPKG_DESC_CSWqt4-doc += $(DESCRIPTION), documentation
 # Catch-all
-ARCHALL_CSWqt4-gxx-doc = 1
-CHECKPKG_OVERRIDES_CSWqt4-gxx-doc += file-with-bad-content
+ARCHALL_CSWqt4-doc = 1
+CHECKPKG_OVERRIDES_CSWqt4-doc += file-with-bad-content
 
 include gar/category.mk
 

Modified: csw/mgar/pkg/qt4-gcc/trunk/files/0001-shapeinput.patch
===================================================================
--- csw/mgar/pkg/qt4-gcc/trunk/files/0001-shapeinput.patch	2013-04-02 06:54:56 UTC (rev 20565)
+++ csw/mgar/pkg/qt4-gcc/trunk/files/0001-shapeinput.patch	2013-04-02 11:49:29 UTC (rev 20566)
@@ -24,7 +24,7 @@
                                     AnyPropertyType, &type, &f,&n,&a,&data);
                  if (data) XFree(data);
 +
-+#ifdef QT_NO_SHAPE
++#ifndef QT_NO_SHAPE
                  if (type) {
                      // When ShapeInput and ShapeBounding are not set they return a single rectangle with the geometry of the window, this is why we
                      // need an && here so that in the case one is set and the other is not we still get the correct result.
@@ -42,7 +42,7 @@
                  // innermost window.
              }
  
-+#ifdef QT_NO_SHAPE
++#ifndef QT_NO_SHAPE
              // No children!
              if (!windowContainsMouse)
                  return 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  Tue Apr  2 14:37:59 2013
From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net)
Date: Tue, 02 Apr 2013 12:37:59 +0000
Subject: [csw-devel] SF.net SVN: gar:[20567] csw/mgar/pkg/dsniff/trunk
Message-ID: <E1UN0TP-0007xu-EX@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 20567
          http://gar.svn.sourceforge.net/gar/?rev=20567&view=rev
Author:   chninkel
Date:     2013-04-02 12:37:59 +0000 (Tue, 02 Apr 2013)
Log Message:
-----------
dsniff/trunk: rebuilt against libssl 1.0.0

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

Added Paths:
-----------
    csw/mgar/pkg/dsniff/trunk/files/0002-fix-berkeleydb-detection.patch
    csw/mgar/pkg/dsniff/trunk/files/0004-ethernet-header-inclusion.patch
    csw/mgar/pkg/dsniff/trunk/files/07_libnet_1.1.patch

Modified: csw/mgar/pkg/dsniff/trunk/Makefile
===================================================================
--- csw/mgar/pkg/dsniff/trunk/Makefile	2013-04-02 11:49:29 UTC (rev 20566)
+++ csw/mgar/pkg/dsniff/trunk/Makefile	2013-04-02 12:37:59 UTC (rev 20567)
@@ -2,7 +2,7 @@
 VERSION = 2.4b1
 GARTYPE = v2
 
-DESCRIPTION = a collection of tools for network auditing and penetration testing
+DESCRIPTION = A collection of tools for network auditing and penetration testing
 define BLURB
   dsniff is a collection of tools for network auditing and penetration testing.
 	dsniff, filesnarf, mailsnarf, msgsnarf, urlsnarf, and webspy passively monitor
@@ -18,8 +18,11 @@
 
 DISTNAME = $(NAME)-2.4
 
-RUNTIME_DEP_PKGS += CSWbdb3 CSWlibnet CSWlibnids CSWlibpcap CSWosslrt
+RUNTIME_DEP_PKGS += CSWbdb48 CSWlibnet1 CSWlibnids1-24 CSWlibpcap1 CSWlibssl1-0-0
 
+CHECKPKG_OVERRIDES_CSWdsniff += file-with-bad-content|/usr/local|root/opt/csw/share/man/man8/dnsspoof.8
+CHECKPKG_OVERRIDES_CSWdsniff += file-with-bad-content|/usr/local|root/opt/csw/share/man/man8/dsniff.8
+
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
 
@@ -29,8 +32,29 @@
 
 PATCHFILES = buildpatch
 
+# configure tries to detect libdb.a presence but we don't
+# have it in the opencsw package, we just have libdb.so (which is fine)
+PATCHFILES += 0002-fix-berkeleydb-detection.patch
+
+# update code to be able to compile against libnet 1.1
+# Patch borrowed from Debian
+PATCHFILES += 07_libnet_1.1.patch
+
+# Include Solaris <sys/ethernet.h> header
+# and fix prototypes
+PATCHFILES += 0004-ethernet-header-inclusion.patch
+
 CONFIGURE_ARGS = $(DIRPATHS)
+CONFIGURE_ARGS += --with-db=/opt/csw/bdb48
 
 TEST_SCRIPTS =
 
+EXTRA_LD_OPTIONS = -L$(prefix)/lib/libnet-new/
+EXTRA_LIB += $(prefix)/bdb48/lib
+
 include gar/category.mk
+
+# we re-run autoconf because we patched configure.in
+pre-configure-modulated:
+	cd $(WORKSRC) && autoconf
+	@$(MAKECOOKIE)

Added: csw/mgar/pkg/dsniff/trunk/files/0002-fix-berkeleydb-detection.patch
===================================================================
--- csw/mgar/pkg/dsniff/trunk/files/0002-fix-berkeleydb-detection.patch	                        (rev 0)
+++ csw/mgar/pkg/dsniff/trunk/files/0002-fix-berkeleydb-detection.patch	2013-04-02 12:37:59 UTC (rev 20567)
@@ -0,0 +1,25 @@
+From 4eee78cb46273bf8d18f28b99d8d5aadae63d21b Mon Sep 17 00:00:00 2001
+From: Yann Rouillard <yann at pleiades.fr.eu.org>
+Date: Sun, 31 Mar 2013 10:39:28 +0200
+Subject: [PATCH] fix berkeleydb detection
+
+---
+ configure.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.in b/configure.in
+index 912ab6c..e97bf37 100644
+--- a/configure.in
++++ b/configure.in
+@@ -110,7 +110,7 @@ AC_ARG_WITH(db,
+ 	DBINC="-I$withval/dist"
+ 	DBLIB="-L$withval/dist -ldb"
+      elif test -f $withval/include/db_185.h -a \
+-	       -f $withval/lib/libdb.a; then
++	       -f $withval/lib/libdb.so; then
+ 	owd=`pwd`
+ 	if cd $withval; then withval=`pwd`; cd $owd; fi
+ 	AC_DEFINE(HAVE_DB_185_H)
+-- 
+1.8.1.4
+

Added: csw/mgar/pkg/dsniff/trunk/files/0004-ethernet-header-inclusion.patch
===================================================================
--- csw/mgar/pkg/dsniff/trunk/files/0004-ethernet-header-inclusion.patch	                        (rev 0)
+++ csw/mgar/pkg/dsniff/trunk/files/0004-ethernet-header-inclusion.patch	2013-04-02 12:37:59 UTC (rev 20567)
@@ -0,0 +1,30 @@
+From 2b602f7476ebb1ad5ea603f03fbfe294f1b8da88 Mon Sep 17 00:00:00 2001
+From: Yann Rouillard <yann at pleiades.fr.eu.org>
+Date: Mon, 1 Apr 2013 23:28:47 +0200
+Subject: [PATCH] ethernet header inclusion
+
+---
+ arpspoof.c |    3 +-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/arpspoof.c b/arpspoof.c
+index 6b22f91..6efd364 100644
+--- a/arpspoof.c
++++ b/arpspoof.c
+@@ -13,6 +13,7 @@
+ 
+ #include <sys/types.h>
+ #include <sys/param.h>
++#include <sys/ethernet.h>
+ #include <netinet/in.h>
+ 
+ #include <stdio.h>
+@@ -25,7 +26,7 @@
+ #include "arp.h"
+ #include "version.h"
+ 
+-extern char *ether_ntoa(struct ether_addr *);
++extern char *ether_ntoa(const struct ether_addr *);
+ 
+ static libnet_t *l;
+ static struct ether_addr spoof_mac, target_mac;

Added: csw/mgar/pkg/dsniff/trunk/files/07_libnet_1.1.patch
===================================================================
--- csw/mgar/pkg/dsniff/trunk/files/07_libnet_1.1.patch	                        (rev 0)
+++ csw/mgar/pkg/dsniff/trunk/files/07_libnet_1.1.patch	2013-04-02 12:37:59 UTC (rev 20567)
@@ -0,0 +1,904 @@
+Author: Faidon Liambotis <paravoid at debian.org>
+Modified by: Yann Rouillard <yann at opencsw.org>
+Description: Use libnet v1.1 instead of v1.0
+--- a/arpspoof.c	2011-06-19 17:15:04.591999376 -0500
++++ b/arpspoof.c	2011-06-19 17:15:10.511999375 -0500
+@@ -27,7 +27,7 @@
+ 
+ extern char *ether_ntoa(struct ether_addr *);
+ 
+-static struct libnet_link_int *llif;
++static libnet_t *l;
+ static struct ether_addr spoof_mac, target_mac;
+ static in_addr_t spoof_ip, target_ip;
+ static char *intf;
+@@ -41,47 +41,49 @@
+ }
+ 
+ static int
+-arp_send(struct libnet_link_int *llif, char *dev,
+-	 int op, u_char *sha, in_addr_t spa, u_char *tha, in_addr_t tpa)
++arp_send(libnet_t *l, int op, uint8_t *sha,
++	 in_addr_t spa, uint8_t *tha, in_addr_t tpa)
+ {
+-	char ebuf[128];
+-	u_char pkt[60];
+-	
++	int retval;
++
+ 	if (sha == NULL &&
+-	    (sha = (u_char *)libnet_get_hwaddr(llif, dev, ebuf)) == NULL) {
++	    (sha = (uint8_t *)libnet_get_hwaddr(l)) == NULL) {
+ 		return (-1);
+ 	}
+ 	if (spa == 0) {
+-		if ((spa = libnet_get_ipaddr(llif, dev, ebuf)) == 0)
++		if ((spa = libnet_get_ipaddr4(l)) == -1)
+ 			return (-1);
+-		spa = htonl(spa); /* XXX */
+ 	}
+ 	if (tha == NULL)
+ 		tha = "\xff\xff\xff\xff\xff\xff";
+ 	
+-	libnet_build_ethernet(tha, sha, ETHERTYPE_ARP, NULL, 0, pkt);
++	libnet_autobuild_arp(op, sha, (uint8_t *)&spa,
++			     tha, (uint8_t *)&tpa, l);
++	libnet_build_ethernet(tha, sha, ETHERTYPE_ARP, NULL, 0, l, 0);
+ 	
+-	libnet_build_arp(ARPHRD_ETHER, ETHERTYPE_IP, ETHER_ADDR_LEN, 4,
+-			 op, sha, (u_char *)&spa, tha, (u_char *)&tpa,
+-			 NULL, 0, pkt + ETH_H);
+-
+ 	fprintf(stderr, "%s ",
+ 		ether_ntoa((struct ether_addr *)sha));
+ 
+ 	if (op == ARPOP_REQUEST) {
+ 		fprintf(stderr, "%s 0806 42: arp who-has %s tell %s\n",
+ 			ether_ntoa((struct ether_addr *)tha),
+-			libnet_host_lookup(tpa, 0),
+-			libnet_host_lookup(spa, 0));
++			libnet_addr2name4(tpa, LIBNET_DONT_RESOLVE),
++			libnet_addr2name4(spa, LIBNET_DONT_RESOLVE));
+ 	}
+ 	else {
+ 		fprintf(stderr, "%s 0806 42: arp reply %s is-at ",
+ 			ether_ntoa((struct ether_addr *)tha),
+-			libnet_host_lookup(spa, 0));
++			libnet_addr2name4(spa, LIBNET_DONT_RESOLVE));
+ 		fprintf(stderr, "%s\n",
+ 			ether_ntoa((struct ether_addr *)sha));
+ 	}
+-	return (libnet_write_link_layer(llif, dev, pkt, sizeof(pkt)) == sizeof(pkt));
++	retval = libnet_write(l);
++	if (retval)
++		fprintf(stderr, "%s", libnet_geterror(l));
++
++	libnet_clear_packet(l);
++
++	return retval;
+ }
+ 
+ #ifdef __linux__
+@@ -119,7 +121,7 @@
+ 		/* XXX - force the kernel to arp. feh. */
+ 		arp_force(ip);
+ #else
+-		arp_send(llif, intf, ARPOP_REQUEST, NULL, 0, NULL, ip);
++		arp_send(l, ARPOP_REQUEST, NULL, 0, NULL, ip);
+ #endif
+ 		sleep(1);
+ 	}
+@@ -136,9 +138,9 @@
+ 	if (arp_find(spoof_ip, &spoof_mac)) {
+ 		for (i = 0; i < 3; i++) {
+ 			/* XXX - on BSD, requires ETHERSPOOF kernel. */
+-			arp_send(llif, intf, ARPOP_REPLY,
+-				 (u_char *)&spoof_mac, spoof_ip,
+-				 (target_ip ? (u_char *)&target_mac : NULL),
++			arp_send(l, ARPOP_REPLY,
++				 (uint8_t *)&spoof_mac, spoof_ip,
++				 (target_ip ? (uint8_t *)&target_mac : NULL),
+ 				 target_ip);
+ 			sleep(1);
+ 		}
+@@ -151,7 +153,8 @@
+ {
+ 	extern char *optarg;
+ 	extern int optind;
+-	char ebuf[PCAP_ERRBUF_SIZE];
++	char pcap_ebuf[PCAP_ERRBUF_SIZE];
++	char libnet_ebuf[LIBNET_ERRBUF_SIZE];
+ 	int c;
+ 	
+ 	intf = NULL;
+@@ -163,7 +166,7 @@
+ 			intf = optarg;
+ 			break;
+ 		case 't':
+-			if ((target_ip = libnet_name_resolve(optarg, 1)) == -1)
++			if ((target_ip = libnet_name2addr4(l, optarg, LIBNET_RESOLVE)) == -1)
+ 				usage();
+ 			break;
+ 		default:
+@@ -176,26 +179,26 @@
+ 	if (argc != 1)
+ 		usage();
+ 	
+-	if ((spoof_ip = libnet_name_resolve(argv[0], 1)) == -1)
++	if ((spoof_ip = libnet_name2addr4(l, argv[0], LIBNET_RESOLVE)) == -1)
+ 		usage();
+ 	
+-	if (intf == NULL && (intf = pcap_lookupdev(ebuf)) == NULL)
+-		errx(1, "%s", ebuf);
++	if (intf == NULL && (intf = pcap_lookupdev(pcap_ebuf)) == NULL)
++		errx(1, "%s", pcap_ebuf);
+ 	
+-	if ((llif = libnet_open_link_interface(intf, ebuf)) == 0)
+-		errx(1, "%s", ebuf);
++	if ((l = libnet_init(LIBNET_LINK, intf, libnet_ebuf)) == NULL)
++		errx(1, "%s", libnet_ebuf);
+ 	
+ 	if (target_ip != 0 && !arp_find(target_ip, &target_mac))
+ 		errx(1, "couldn't arp for host %s",
+-		     libnet_host_lookup(target_ip, 0));
++		     libnet_addr2name4(target_ip, LIBNET_DONT_RESOLVE));
+ 	
+ 	signal(SIGHUP, cleanup);
+ 	signal(SIGINT, cleanup);
+ 	signal(SIGTERM, cleanup);
+ 	
+ 	for (;;) {
+-		arp_send(llif, intf, ARPOP_REPLY, NULL, spoof_ip,
+-			 (target_ip ? (u_char *)&target_mac : NULL),
++		arp_send(l, ARPOP_REPLY, NULL, spoof_ip,
++			 (target_ip ? (uint8_t *)&target_mac : NULL),
+ 			 target_ip);
+ 		sleep(2);
+ 	}
+--- a/dnsspoof.c	2011-06-19 17:14:04.651999389 -0500
++++ b/dnsspoof.c	2011-06-19 17:15:10.515999375 -0500
+@@ -38,7 +38,7 @@
+ 
+ pcap_t		*pcap_pd = NULL;
+ int		 pcap_off = -1;
+-int		 lnet_sock = -1;
++libnet_t	*l;
+ u_long		 lnet_ip = -1;
+ 
+ static void
+@@ -90,19 +90,18 @@
+ dns_init(char *dev, char *filename)
+ {
+ 	FILE *f;
+-	struct libnet_link_int *llif;
++	libnet_t *l;
++	char libnet_ebuf[LIBNET_ERRBUF_SIZE];
+ 	struct dnsent *de;
+ 	char *ip, *name, buf[1024];
+ 
+-	if ((llif = libnet_open_link_interface(dev, buf)) == NULL)
+-		errx(1, "%s", buf);
++	if ((l = libnet_init(LIBNET_LINK, dev, libnet_ebuf)) == NULL)
++		errx(1, "%s", libnet_ebuf);
+ 	
+-	if ((lnet_ip = libnet_get_ipaddr(llif, dev, buf)) == -1)
+-		errx(1, "%s", buf);
++	if ((lnet_ip = libnet_get_ipaddr4(l)) == -1)
++		errx(1, "%s", libnet_geterror(l));
+ 
+-	lnet_ip = htonl(lnet_ip);
+-	
+-	libnet_close_link_interface(llif);
++	libnet_destroy(l);
+ 
+ 	SLIST_INIT(&dns_entries);
+ 	
+@@ -180,7 +179,7 @@
+ static void
+ dns_spoof(u_char *u, const struct pcap_pkthdr *pkthdr, const u_char *pkt)
+ {
+-	struct libnet_ip_hdr *ip;
++	struct libnet_ipv4_hdr *ip;
+ 	struct libnet_udp_hdr *udp;
+ 	HEADER *dns;
+ 	char name[MAXHOSTNAMELEN];
+@@ -189,7 +188,7 @@
+ 	in_addr_t dst;
+ 	u_short type, class;
+ 
+-	ip = (struct libnet_ip_hdr *)(pkt + pcap_off);
++	ip = (struct libnet_ipv4_hdr *)(pkt + pcap_off);
+ 	udp = (struct libnet_udp_hdr *)(pkt + pcap_off + (ip->ip_hl * 4));
+ 	dns = (HEADER *)(udp + 1);
+ 	p = (u_char *)(dns + 1);
+@@ -212,7 +211,7 @@
+ 	if (class != C_IN)
+ 		return;
+ 
+-	p = buf + IP_H + UDP_H + dnslen;
++	p = buf + dnslen;
+ 	
+ 	if (type == T_A) {
+ 		if ((dst = dns_lookup_a(name)) == -1)
+@@ -234,38 +233,38 @@
+ 		anslen += 12;
+ 	}
+ 	else return;
+-	
+-	libnet_build_ip(UDP_H + dnslen + anslen, 0, libnet_get_prand(PRu16),
+-			0, 64, IPPROTO_UDP, ip->ip_dst.s_addr,
+-			ip->ip_src.s_addr, NULL, 0, buf);
+-	
+-	libnet_build_udp(ntohs(udp->uh_dport), ntohs(udp->uh_sport),
+-			 NULL, dnslen + anslen, buf + IP_H);
+ 
+-	memcpy(buf + IP_H + UDP_H, (u_char *)dns, dnslen);
++	memcpy(buf, (u_char *)dns, dnslen);
+ 
+-	dns = (HEADER *)(buf + IP_H + UDP_H);
++	dns = (HEADER *)buf;
+ 	dns->qr = dns->ra = 1;
+ 	if (type == T_PTR) dns->aa = 1;
+ 	dns->ancount = htons(1);
+ 
+ 	dnslen += anslen;
++
++	libnet_clear_packet(l);
++	libnet_build_udp(ntohs(udp->uh_dport), ntohs(udp->uh_sport),
++			 LIBNET_UDP_H + dnslen, 0,
++			 (uint8_t *)buf, dnslen, l, 0);
++
++	libnet_build_ipv4(LIBNET_IPV4_H + LIBNET_UDP_H + dnslen, 0,
++			  libnet_get_prand(LIBNET_PRu16), 0, 64, IPPROTO_UDP, 0,
++			  ip->ip_dst.s_addr, ip->ip_src.s_addr, NULL, 0, l, 0);
+ 	
+-	libnet_do_checksum(buf, IPPROTO_UDP, UDP_H + dnslen);
+-	
+-	if (libnet_write_ip(lnet_sock, buf, IP_H + UDP_H + dnslen) < 0)
++	if (libnet_write(l) < 0)
+ 		warn("write");
+ 
+ 	fprintf(stderr, "%s.%d > %s.%d:  %d+ %s? %s\n",
+-	      libnet_host_lookup(ip->ip_src.s_addr, 0), ntohs(udp->uh_sport),
+-	      libnet_host_lookup(ip->ip_dst.s_addr, 0), ntohs(udp->uh_dport),
++	      libnet_addr2name4(ip->ip_src.s_addr, 0), ntohs(udp->uh_sport),
++	      libnet_addr2name4(ip->ip_dst.s_addr, 0), ntohs(udp->uh_dport),
+ 	      ntohs(dns->id), type == T_A ? "A" : "PTR", name);
+ }
+ 
+ static void
+ cleanup(int sig)
+ {
+-	libnet_close_raw_sock(lnet_sock);
++	libnet_destroy(l);
+ 	pcap_close(pcap_pd);
+ 	exit(0);
+ }
+@@ -276,6 +275,7 @@
+ 	extern char *optarg;
+ 	extern int optind;
+ 	char *p, *dev, *hosts, buf[1024];
++	char ebuf[LIBNET_ERRBUF_SIZE];
+ 	int i;
+ 
+ 	dev = hosts = NULL;
+@@ -306,7 +306,7 @@
+ 		strlcpy(buf, p, sizeof(buf));
+ 	}
+ 	else snprintf(buf, sizeof(buf), "udp dst port 53 and not src %s",
+-		      libnet_host_lookup(lnet_ip, 0));
++		      libnet_addr2name4(lnet_ip, LIBNET_DONT_RESOLVE));
+ 	
+ 	if ((pcap_pd = pcap_init(dev, buf, 128)) == NULL)
+ 		errx(1, "couldn't initialize sniffing");
+@@ -314,10 +314,10 @@
+ 	if ((pcap_off = pcap_dloff(pcap_pd)) < 0)
+ 		errx(1, "couldn't determine link layer offset");
+ 	
+-	if ((lnet_sock = libnet_open_raw_sock(IPPROTO_RAW)) == -1)
++	if ((l = libnet_init(LIBNET_RAW4, dev, ebuf)) == NULL)
+ 		errx(1, "couldn't initialize sending");
+ 	
+-	libnet_seed_prand();
++	libnet_seed_prand(l);
+ 	
+ 	signal(SIGHUP, cleanup);
+ 	signal(SIGINT, cleanup);
+--- a/filesnarf.c	2011-06-19 17:15:01.075999376 -0500
++++ b/filesnarf.c	2011-06-19 17:15:10.519999375 -0500
+@@ -134,8 +134,8 @@
+ 	int fd;
+ 
+ 	warnx("%s.%d > %s.%d: %s (%d@%d)",
+-	      libnet_host_lookup(addr->daddr, 0), addr->dest,
+-	      libnet_host_lookup(addr->saddr, 0), addr->source,
++	      libnet_addr2name4(addr->daddr, LIBNET_DONT_RESOLVE), addr->dest,
++	      libnet_addr2name4(addr->saddr, LIBNET_DONT_RESOLVE), addr->source,
+ 	      ma->filename, len, ma->offset);
+ 	
+ 	if ((fd = open(ma->filename, O_WRONLY|O_CREAT, 0644)) >= 0) {
+@@ -353,7 +353,7 @@
+ }
+ 
+ static void
+-decode_udp_nfs(struct libnet_ip_hdr *ip)
++decode_udp_nfs(struct libnet_ipv4_hdr *ip)
+ {
+ 	static struct tuple4 addr;
+ 	struct libnet_udp_hdr *udp;
+--- a/macof.c	2011-06-19 17:14:04.959999389 -0500
++++ b/macof.c	2011-06-19 17:15:10.523999375 -0500
+@@ -48,8 +48,8 @@
+ static void
+ gen_mac(u_char *mac)
+ {
+-	*((in_addr_t *)mac) = libnet_get_prand(PRu32);
+-	*((u_short *)(mac + 4)) = libnet_get_prand(PRu16);
++	*((in_addr_t *)mac) = libnet_get_prand(LIBNET_PRu32);
++	*((u_short *)(mac + 4)) = libnet_get_prand(LIBNET_PRu16);
+ }
+ 
+ int
+@@ -59,22 +59,23 @@
+ 	extern int optind;
+ 	int c, i;
+ 	struct libnet_link_int *llif;
+-	char ebuf[PCAP_ERRBUF_SIZE];
++	char pcap_ebuf[PCAP_ERRBUF_SIZE];
++	char libnet_ebuf[LIBNET_ERRBUF_SIZE];
+ 	u_char sha[ETHER_ADDR_LEN], tha[ETHER_ADDR_LEN];
+ 	in_addr_t src, dst;
+ 	u_short sport, dport;
+ 	u_int32_t seq;
+-	u_char pkt[ETH_H + IP_H + TCP_H];
++	libnet_t *l;
+ 	
+ 	while ((c = getopt(argc, argv, "vs:d:e:x:y:i:n:h?V")) != -1) {
+ 		switch (c) {
+ 		case 'v':
+ 			break;
+ 		case 's':
+-			Src = libnet_name_resolve(optarg, 0);
++			Src = libnet_name2addr4(l, optarg, 0);
+ 			break;
+ 		case 'd':
+-			Dst = libnet_name_resolve(optarg, 0);
++			Dst = libnet_name2addr4(l, optarg, 0);
+ 			break;
+ 		case 'e':
+ 			Tha = (u_char *)ether_aton(optarg);
+@@ -101,13 +102,13 @@
+ 	if (argc != 0)
+ 		usage();
+ 	
+-	if (!Intf && (Intf = pcap_lookupdev(ebuf)) == NULL)
+-		errx(1, "%s", ebuf);
++	if (!Intf && (Intf = pcap_lookupdev(pcap_ebuf)) == NULL)
++		errx(1, "%s", pcap_ebuf);
+ 	
+-	if ((llif = libnet_open_link_interface(Intf, ebuf)) == 0)
+-		errx(1, "%s", ebuf);
++	if ((l = libnet_init(LIBNET_LINK, Intf, libnet_ebuf)) == NULL)
++		errx(1, "%s", libnet_ebuf);
+ 	
+-	libnet_seed_prand();
++	libnet_seed_prand(l);
+ 	
+ 	for (i = 0; i != Repeat; i++) {
+ 		
+@@ -117,39 +118,39 @@
+ 		else memcpy(tha, Tha, sizeof(tha));
+ 		
+ 		if (Src != 0) src = Src;
+-		else src = libnet_get_prand(PRu32);
++		else src = libnet_get_prand(LIBNET_PRu32);
+ 		
+ 		if (Dst != 0) dst = Dst;
+-		else dst = libnet_get_prand(PRu32);
++		else dst = libnet_get_prand(LIBNET_PRu32);
+ 		
+ 		if (Sport != 0) sport = Sport;
+-		else sport = libnet_get_prand(PRu16);
++		else sport = libnet_get_prand(LIBNET_PRu16);
+ 		
+ 		if (Dport != 0) dport = Dport;
+-		else dport = libnet_get_prand(PRu16);
++		else dport = libnet_get_prand(LIBNET_PRu16);
+ 
+-		seq = libnet_get_prand(PRu32);
+-		
+-		libnet_build_ethernet(tha, sha, ETHERTYPE_IP, NULL, 0, pkt);
+-		
+-		libnet_build_ip(TCP_H, 0, libnet_get_prand(PRu16), 0, 64,
+-				IPPROTO_TCP, src, dst, NULL, 0, pkt + ETH_H);
++		seq = libnet_get_prand(LIBNET_PRu32);
+ 		
+ 		libnet_build_tcp(sport, dport, seq, 0, TH_SYN, 512,
+-				 0, NULL, 0, pkt + ETH_H + IP_H);
++				 0, 0, LIBNET_TCP_H, NULL, 0, l, 0);
+ 		
+-		libnet_do_checksum(pkt + ETH_H, IPPROTO_IP, IP_H);
+-		libnet_do_checksum(pkt + ETH_H, IPPROTO_TCP, TCP_H);
++		libnet_build_ipv4(LIBNET_TCP_H, 0,
++				  libnet_get_prand(LIBNET_PRu16), 0, 64,
++				  IPPROTO_TCP, 0, src, dst, NULL, 0, l, 0);
+ 		
+-		if (libnet_write_link_layer(llif, Intf, pkt, sizeof(pkt)) < 0)
++		libnet_build_ethernet(tha, sha, ETHERTYPE_IP, NULL, 0, l, 0);
++		
++		if (libnet_write(l) < 0)
+ 			errx(1, "write");
+ 
++		libnet_clear_packet(l);
++
+ 		fprintf(stderr, "%s ",
+ 			ether_ntoa((struct ether_addr *)sha));
+ 		fprintf(stderr, "%s %s.%d > %s.%d: S %u:%u(0) win 512\n",
+ 			ether_ntoa((struct ether_addr *)tha),
+-			libnet_host_lookup(Src, 0), sport,
+-			libnet_host_lookup(Dst, 0), dport, seq, seq);
++			libnet_addr2name4(Src, 0), sport,
++			libnet_addr2name4(Dst, 0), dport, seq, seq);
+ 	}
+ 	exit(0);
+ }
+--- a/record.c	2011-06-19 17:14:06.627999389 -0500
++++ b/record.c	2011-06-19 17:15:10.523999375 -0500
+@@ -65,8 +65,8 @@
+ 	tm = localtime(&rec->time);
+ 	strftime(tstr, sizeof(tstr), "%x %X", tm);
+ 	
+-	srcp = libnet_host_lookup(rec->src, Opt_dns);
+-	dstp = libnet_host_lookup(rec->dst, Opt_dns);
++	srcp = libnet_addr2name4(rec->src, Opt_dns);
++	dstp = libnet_addr2name4(rec->dst, Opt_dns);
+ 
+ 	if ((pr = getprotobynumber(rec->proto)) == NULL)
+ 		protop = "unknown";
+--- a/sshmitm.c	2011-06-19 17:14:05.687999389 -0500
++++ b/sshmitm.c	2011-06-19 17:15:10.527999375 -0500
+@@ -389,7 +389,7 @@
+ 	if (argc < 1)
+ 		usage();
+ 	
+-	if ((ip = libnet_name_resolve(argv[0], 1)) == -1)
++	if ((ip = libnet_name2addr4(NULL, argv[0], LIBNET_RESOLVE)) == -1)
+ 		usage();
+ 
+ 	if (argc == 2 && (rport = atoi(argv[1])) == 0)
+--- a/tcpkill.c	2011-06-19 17:14:05.823999389 -0500
++++ b/tcpkill.c	2011-06-19 17:15:10.535999375 -0500
+@@ -39,17 +39,18 @@
+ static void
+ tcp_kill_cb(u_char *user, const struct pcap_pkthdr *pcap, const u_char *pkt)
+ {
+-	struct libnet_ip_hdr *ip;
++	struct libnet_ipv4_hdr *ip;
+ 	struct libnet_tcp_hdr *tcp;
+-	u_char ctext[64], buf[IP_H + TCP_H];
++	u_char ctext[64];
+ 	u_int32_t seq, win;
+-	int i, *sock, len;
++	int i, len;
++	libnet_t *l;
+ 
+-	sock = (int *)user;
++	l = (libnet_t *)user;
+ 	pkt += pcap_off;
+ 	len = pcap->caplen - pcap_off;
+ 
+-	ip = (struct libnet_ip_hdr *)pkt;
++	ip = (struct libnet_ipv4_hdr *)pkt;
+ 	if (ip->ip_p != IPPROTO_TCP)
+ 		return;
+ 	
+@@ -57,34 +58,31 @@
+ 	if (tcp->th_flags & (TH_SYN|TH_FIN|TH_RST))
+ 		return;
+ 
+-	libnet_build_ip(TCP_H, 0, 0, 0, 64, IPPROTO_TCP,
+-			ip->ip_dst.s_addr, ip->ip_src.s_addr,
+-			NULL, 0, buf);
+-
+-	libnet_build_tcp(ntohs(tcp->th_dport), ntohs(tcp->th_sport),
+-			 0, 0, TH_RST, 0, 0, NULL, 0, buf + IP_H);
+-	
+ 	seq = ntohl(tcp->th_ack);
+ 	win = ntohs(tcp->th_win);
+ 	
+ 	snprintf(ctext, sizeof(ctext), "%s:%d > %s:%d:",
+-		 libnet_host_lookup(ip->ip_src.s_addr, 0),
++		 libnet_addr2name4(ip->ip_src.s_addr, LIBNET_DONT_RESOLVE),
+ 		 ntohs(tcp->th_sport),
+-		 libnet_host_lookup(ip->ip_dst.s_addr, 0),
++		 libnet_addr2name4(ip->ip_dst.s_addr, LIBNET_DONT_RESOLVE),
+ 		 ntohs(tcp->th_dport));
+ 	
+-	ip = (struct libnet_ip_hdr *)buf;
+-	tcp = (struct libnet_tcp_hdr *)(ip + 1);
+-	
+ 	for (i = 0; i < Opt_severity; i++) {
+-		ip->ip_id = libnet_get_prand(PRu16);
+ 		seq += (i * win);
+-		tcp->th_seq = htonl(seq);
+ 		
+-		libnet_do_checksum(buf, IPPROTO_TCP, TCP_H);
++		libnet_clear_packet(l);
++		
++		libnet_build_tcp(ntohs(tcp->th_dport), ntohs(tcp->th_sport),
++				 seq, 0, TH_RST, 0, 0, 0, LIBNET_TCP_H, 
++				 NULL, 0, l, 0);
++		
++		libnet_build_ipv4(LIBNET_IPV4_H + LIBNET_TCP_H, 0,
++				  libnet_get_prand(LIBNET_PRu16), 0, 64,
++				  IPPROTO_TCP, 0, ip->ip_dst.s_addr,
++				  ip->ip_src.s_addr, NULL, 0, l, 0);
+ 		
+-		if (libnet_write_ip(*sock, buf, sizeof(buf)) < 0)
+-			warn("write_ip");
++		if (libnet_write(l) < 0)
++			warn("write");
+ 		
+ 		fprintf(stderr, "%s R %lu:%lu(0) win 0\n", ctext, seq, seq);
+ 	}
+@@ -95,8 +93,10 @@
+ {
+ 	extern char *optarg;
+ 	extern int optind;
+-	int c, sock;
++	int c;
+ 	char *p, *intf, *filter, ebuf[PCAP_ERRBUF_SIZE];
++	char libnet_ebuf[LIBNET_ERRBUF_SIZE];
++	libnet_t *l;
+ 	pcap_t *pd;
+ 	
+ 	intf = NULL;
+@@ -136,14 +136,14 @@
+ 	if ((pcap_off = pcap_dloff(pd)) < 0)
+ 		errx(1, "couldn't determine link layer offset");
+ 	
+-	if ((sock = libnet_open_raw_sock(IPPROTO_RAW)) == -1)
++	if ((l = libnet_init(LIBNET_RAW4, intf, libnet_ebuf)) == NULL)
+ 		errx(1, "couldn't initialize sending");
+ 	
+-	libnet_seed_prand();
++	libnet_seed_prand(l);
+ 	
+ 	warnx("listening on %s [%s]", intf, filter);
+ 	
+-	pcap_loop(pd, -1, tcp_kill_cb, (u_char *)&sock);
++	pcap_loop(pd, -1, tcp_kill_cb, (u_char *)l);
+   
+ 	/* NOTREACHED */
+ 	
+--- a/tcpnice.c	2011-06-19 17:14:04.547999389 -0500
++++ b/tcpnice.c	2011-06-19 17:15:10.539999375 -0500
+@@ -41,107 +41,106 @@
+ }
+ 
+ static void
+-send_tcp_window_advertisement(int sock, struct libnet_ip_hdr *ip,
++send_tcp_window_advertisement(libnet_t *l, struct libnet_ipv4_hdr *ip,
+ 			     struct libnet_tcp_hdr *tcp)
+ {
+ 	int len;
+ 	
+ 	ip->ip_hl = 5;
+-	ip->ip_len = htons(IP_H + TCP_H);
+-	ip->ip_id = libnet_get_prand(PRu16);
+-	memcpy(buf, (u_char *)ip, IP_H);
++	ip->ip_len = htons(LIBNET_IPV4_H + LIBNET_TCP_H);
++	ip->ip_id = libnet_get_prand(LIBNET_PRu16);
++	memcpy(buf, (u_char *)ip, LIBNET_IPV4_H);
+ 	
+ 	tcp->th_off = 5;
+ 	tcp->th_win = htons(MIN_WIN);
+-	memcpy(buf + IP_H, (u_char *)tcp, TCP_H);
++	memcpy(buf + LIBNET_IPV4_H, (u_char *)tcp, LIBNET_TCP_H);
+ 	
+-	libnet_do_checksum(buf, IPPROTO_TCP, TCP_H);
++	libnet_do_checksum(l, buf, IPPROTO_TCP, LIBNET_TCP_H);
+ 	
+-	len = IP_H + TCP_H;
++	len = LIBNET_IPV4_H + LIBNET_TCP_H;
+ 	
+-	if (libnet_write_ip(sock, buf, len) != len)
++	if (libnet_write_raw_ipv4(l, buf, len) != len)
+ 		warn("write");
+ 	
+ 	fprintf(stderr, "%s:%d > %s:%d: . ack %lu win %d\n",
+-		libnet_host_lookup(ip->ip_src.s_addr, 0), ntohs(tcp->th_sport),
+-		libnet_host_lookup(ip->ip_dst.s_addr, 0), ntohs(tcp->th_dport),
++		libnet_addr2name4(ip->ip_src.s_addr, 0), ntohs(tcp->th_sport),
++		libnet_addr2name4(ip->ip_dst.s_addr, 0), ntohs(tcp->th_dport),
+ 		ntohl(tcp->th_ack), 1);
+ }
+ 
+ static void
+-send_icmp_source_quench(int sock, struct libnet_ip_hdr *ip)
++send_icmp_source_quench(libnet_t *l, struct libnet_ipv4_hdr *ip)
+ {
+-	struct libnet_icmp_hdr *icmp;
++	struct libnet_icmpv4_hdr *icmp;
+ 	int len;
+ 	
+ 	len = (ip->ip_hl * 4) + 8;
+ 
+-	libnet_build_ip(ICMP_ECHO_H + len, 0, libnet_get_prand(PRu16),
+-			0, 64, IPPROTO_ICMP, ip->ip_dst.s_addr,
+-			ip->ip_src.s_addr, NULL, 0, buf);
+-	
+-	icmp = (struct libnet_icmp_hdr *)(buf + IP_H);
++	icmp = (struct libnet_icmpv4_hdr *)(buf + LIBNET_IPV4_H);
+ 	icmp->icmp_type = ICMP_SOURCEQUENCH;
+ 	icmp->icmp_code = 0;
+-	memcpy((u_char *)icmp + ICMP_ECHO_H, (u_char *)ip, len);
++	memcpy((u_char *)icmp + LIBNET_ICMPV4_ECHO_H, (u_char *)ip, len);
+ 	
+-	libnet_do_checksum(buf, IPPROTO_ICMP, ICMP_ECHO_H + len);
++	len += LIBNET_ICMPV4_ECHO_H;
+ 	
+-	len += (IP_H + ICMP_ECHO_H);
++	libnet_build_ipv4(LIBNET_IPV4_H + len, 0,
++			  libnet_get_prand(LIBNET_PRu16), 0, 64, IPPROTO_ICMP,
++			  0, ip->ip_dst.s_addr, ip->ip_src.s_addr,
++			  (uint8_t *) icmp, len, l, 0);
+ 	
+-	if (libnet_write_ip(sock, buf, len) != len)
++	if (libnet_write(l) != len)
+ 		warn("write");
+ 	
+ 	fprintf(stderr, "%s > %s: icmp: source quench\n",
+-		libnet_host_lookup(ip->ip_dst.s_addr, 0),
+-		libnet_host_lookup(ip->ip_src.s_addr, 0));
++		libnet_addr2name4(ip->ip_dst.s_addr, 0),
++		libnet_addr2name4(ip->ip_src.s_addr, 0));
+ }
+ 
+ static void
+-send_icmp_frag_needed(int sock, struct libnet_ip_hdr *ip)
++send_icmp_frag_needed(libnet_t *l, struct libnet_ipv4_hdr *ip)
+ {
+-	struct libnet_icmp_hdr *icmp;
++	struct libnet_icmpv4_hdr *icmp;
+ 	int len;
+ 
+ 	len = (ip->ip_hl * 4) + 8;
+ 	
+-	libnet_build_ip(ICMP_MASK_H + len, 4, libnet_get_prand(PRu16),
+-			0, 64, IPPROTO_ICMP, ip->ip_dst.s_addr,
+-			ip->ip_src.s_addr, NULL, 0, buf);
+-
+-	icmp = (struct libnet_icmp_hdr *)(buf + IP_H);
++	icmp = (struct libnet_icmpv4_hdr *)(buf + LIBNET_IPV4_H);
+ 	icmp->icmp_type = ICMP_UNREACH;
+ 	icmp->icmp_code = ICMP_UNREACH_NEEDFRAG;
+ 	icmp->hun.frag.pad = 0;
+ 	icmp->hun.frag.mtu = htons(MIN_MTU);
+-	memcpy((u_char *)icmp + ICMP_MASK_H, (u_char *)ip, len);
++	memcpy((u_char *)icmp + LIBNET_ICMPV4_MASK_H, (u_char *)ip, len);
+ 
+-	libnet_do_checksum(buf, IPPROTO_ICMP, ICMP_MASK_H + len);
+-	
+-	len += (IP_H + ICMP_MASK_H);
++	len += LIBNET_ICMPV4_MASK_H;
++
++	libnet_build_ipv4(LIBNET_IPV4_H + len, 4,
++			  libnet_get_prand(LIBNET_PRu16), 0, 64, IPPROTO_ICMP,
++			  0, ip->ip_dst.s_addr, ip->ip_src.s_addr,
++			  (uint8_t *) icmp, len, l, 0);
+ 	
+-	if (libnet_write_ip(sock, buf, len) != len)
++	if (libnet_write(l) != len)
+ 		warn("write");
+ 	
+ 	fprintf(stderr, "%s > %s: icmp: ",
+-		libnet_host_lookup(ip->ip_dst.s_addr, 0),
+-		libnet_host_lookup(ip->ip_src.s_addr, 0));
++		libnet_addr2name4(ip->ip_dst.s_addr, 0),
++		libnet_addr2name4(ip->ip_src.s_addr, 0));
+ 	fprintf(stderr, "%s unreachable - need to frag (mtu %d)\n",
+-		libnet_host_lookup(ip->ip_src.s_addr, 0), MIN_MTU);
++		libnet_addr2name4(ip->ip_src.s_addr, 0), MIN_MTU);
+ }
+ 
+ static void
+ tcp_nice_cb(u_char *user, const struct pcap_pkthdr *pcap, const u_char *pkt)
+ {
+-	struct libnet_ip_hdr *ip;
++	struct libnet_ipv4_hdr *ip;
+ 	struct libnet_tcp_hdr *tcp;
+-	int *sock, len;
++	int len;
++	libnet_t *l;
+ 
+-	sock = (int *)user;
++	l = (libnet_t *)user;
+ 	pkt += pcap_off;
+ 	len = pcap->caplen - pcap_off;
+ 
+-	ip = (struct libnet_ip_hdr *)pkt;
++	ip = (struct libnet_ipv4_hdr *)pkt;
+ 	if (ip->ip_p != IPPROTO_TCP)
+ 		return;
+ 	
+@@ -151,11 +150,11 @@
+ 	
+ 	if (ntohs(ip->ip_len) > (ip->ip_hl << 2) + (tcp->th_off << 2)) {
+ 		if (Opt_icmp)
+-			send_icmp_source_quench(*sock, ip);
++			send_icmp_source_quench(l, ip);
+ 		if (Opt_win)
+-			send_tcp_window_advertisement(*sock, ip, tcp);
++			send_tcp_window_advertisement(l, ip, tcp);
+ 		if (Opt_pmtu)
+-			send_icmp_frag_needed(*sock, ip);
++			send_icmp_frag_needed(l, ip);
+ 	}
+ }
+ 
+@@ -164,8 +163,10 @@
+ {
+ 	extern char *optarg;
+ 	extern int optind;
+-	int c, sock;
++	int c;
+ 	char *intf, *filter, ebuf[PCAP_ERRBUF_SIZE];
++	char libnet_ebuf[LIBNET_ERRBUF_SIZE];
++	libnet_t *l;
+ 	pcap_t *pd;
+ 	
+ 	intf = NULL;
+@@ -209,14 +210,14 @@
+ 	if ((pcap_off = pcap_dloff(pd)) < 0)
+ 		errx(1, "couldn't determine link layer offset");
+ 	
+-	if ((sock = libnet_open_raw_sock(IPPROTO_RAW)) == -1)
++	if ((l = libnet_init(LIBNET_RAW4, intf, libnet_ebuf)) == NULL)
+ 		errx(1, "couldn't initialize sending");
+ 	
+-	libnet_seed_prand();
++	libnet_seed_prand(l);
+ 	
+ 	warnx("listening on %s [%s]", intf, filter);
+ 	
+-	pcap_loop(pd, -1, tcp_nice_cb, (u_char *)&sock);
++	pcap_loop(pd, -1, tcp_nice_cb, (u_char *)l);
+ 	
+ 	/* NOTREACHED */
+ 	
+--- a/tcp_raw.c	2011-06-19 17:14:06.375999389 -0500
++++ b/tcp_raw.c	2011-06-19 17:15:10.543999375 -0500
+@@ -119,7 +119,7 @@
+ }
+ 
+ struct iovec *
+-tcp_raw_input(struct libnet_ip_hdr *ip, struct libnet_tcp_hdr *tcp, int len)
++tcp_raw_input(struct libnet_ipv4_hdr *ip, struct libnet_tcp_hdr *tcp, int len)
+ {
+ 	struct tha tha;
+ 	struct tcp_conn *conn;
+@@ -131,7 +131,7 @@
+ 
+ 	/* Verify TCP checksum. */
+ 	cksum = tcp->th_sum;
+-	libnet_do_checksum((u_char *) ip, IPPROTO_TCP, len);
++	libnet_do_checksum(NULL, (u_char *) ip, IPPROTO_TCP, len);
+ 
+ 	if (cksum != tcp->th_sum)
+ 		return (NULL);
+--- a/tcp_raw.h	2011-06-19 17:14:05.079999389 -0500
++++ b/tcp_raw.h	2011-06-19 17:15:10.547999375 -0500
+@@ -15,7 +15,7 @@
+ 				   u_short sport, u_short dport,
+ 				   u_char *buf, int len);
+ 
+-struct iovec   *tcp_raw_input(struct libnet_ip_hdr *ip,
++struct iovec   *tcp_raw_input(struct libnet_ipv4_hdr *ip,
+ 			      struct libnet_tcp_hdr *tcp, int len);
+ 
+ void		tcp_raw_timeout(int timeout, tcp_raw_callback_t callback);
+--- a/trigger.c	2011-06-19 17:14:05.483999389 -0500
++++ b/trigger.c	2011-06-19 17:15:10.551999375 -0500
+@@ -276,7 +276,7 @@
+ }
+ 	
+ void
+-trigger_ip(struct libnet_ip_hdr *ip)
++trigger_ip(struct libnet_ipv4_hdr *ip)
+ {
+ 	struct trigger *t, tr;
+ 	u_char *buf;
+@@ -305,7 +305,7 @@
+ 
+ /* libnids needs a nids_register_udp()... */
+ void
+-trigger_udp(struct libnet_ip_hdr *ip)
++trigger_udp(struct libnet_ipv4_hdr *ip)
+ {
+ 	struct trigger *t, tr;
+ 	struct libnet_udp_hdr *udp;
+@@ -437,7 +437,7 @@
+ }
+ 
+ void
+-trigger_tcp_raw(struct libnet_ip_hdr *ip)
++trigger_tcp_raw(struct libnet_ipv4_hdr *ip)
+ {
+ 	struct trigger *t, tr;
+ 	struct libnet_tcp_hdr *tcp;
+--- a/trigger.h	2011-06-19 17:14:04.371999389 -0500
++++ b/trigger.h	2011-06-19 17:15:10.555999375 -0500
+@@ -24,10 +24,10 @@
+ int	trigger_set_tcp(int port, char *name);
+ int	trigger_set_rpc(int program, char *name);
+ 
+-void	trigger_ip(struct libnet_ip_hdr *ip);
+-void	trigger_udp(struct libnet_ip_hdr *ip);
++void	trigger_ip(struct libnet_ipv4_hdr *ip);
++void	trigger_udp(struct libnet_ipv4_hdr *ip);
+ void	trigger_tcp(struct tcp_stream *ts, void **conn_save);
+-void	trigger_tcp_raw(struct libnet_ip_hdr *ip);
++void	trigger_tcp_raw(struct libnet_ipv4_hdr *ip);
+ void	trigger_tcp_raw_timeout(int signal);
+ void	trigger_rpc(int program, int proto, int port);
+ 
+--- a/urlsnarf.c	2011-06-19 17:15:08.631999375 -0500
++++ b/urlsnarf.c	2011-06-19 17:15:10.559999375 -0500
+@@ -145,14 +145,14 @@
+ 		if (user == NULL)
+ 			user = "-";
+ 		if (vhost == NULL)
+-			vhost = libnet_host_lookup(addr->daddr, Opt_dns);
++			vhost = libnet_addr2name4(addr->daddr, Opt_dns);
+ 		if (referer == NULL)
+ 			referer = "-";
+ 		if (agent == NULL)
+ 			agent = "-";
+ 		
+ 		printf("%s - %s [%s] \"%s http://%s%s\" - - \"%s\" \"%s\"\n",
+-		       libnet_host_lookup(addr->saddr, Opt_dns),
++		       libnet_addr2name4(addr->saddr, Opt_dns),
+ 		       user, timestamp(), req, vhost, uri, referer, agent);
+ 	}
+ 	fflush(stdout);
+--- a/webmitm.c	2011-06-19 17:14:07.231999387 -0500
++++ b/webmitm.c	2011-06-19 17:15:10.559999375 -0500
+@@ -242,7 +242,7 @@
+ 			word = buf_tok(&msg, "/", 1);
+ 			vhost = buf_strdup(word);
+ 		}
+-		ssin.sin_addr.s_addr = libnet_name_resolve(vhost, 1);
++		ssin.sin_addr.s_addr = libnet_name2addr4(NULL, vhost, 1);
+ 		free(vhost);
+ 		
+ 		if (ssin.sin_addr.s_addr == ntohl(INADDR_LOOPBACK) ||
+@@ -510,7 +510,7 @@
+ 	argv += optind;
+ 
+ 	if (argc == 1) {
+-		if ((static_host = libnet_name_resolve(argv[0], 1)) == -1)
++		if ((static_host = libnet_name2addr4(NULL, argv[0], 1)) == -1)
+ 			usage();
+ 	}
+ 	else if (argc != 0) usage();
+--- a/webspy.c	2011-06-19 17:15:01.111999376 -0500
++++ b/webspy.c	2011-06-19 17:15:10.563999375 -0500
+@@ -126,7 +126,7 @@
+ 		if (auth == NULL)
+ 			auth = "";
+ 		if (vhost == NULL)
+-			vhost = libnet_host_lookup(addr->daddr, 0);
++			vhost = libnet_addr2name4(addr->daddr, 0);
+ 		
+ 		snprintf(cmd, sizeof(cmd), "openURL(http://%s%s%s%s)",
+ 			 auth, *auth ? "@" : "", vhost, uri);
+@@ -205,7 +205,7 @@
+ 	cmdtab[0] = cmd;
+ 	cmdtab[1] = NULL;
+ 	
+-	if ((host = libnet_name_resolve(argv[0], 1)) == -1)
++	if ((host = libnet_name2addr4(NULL, argv[0], 1)) == -1)
+ 		errx(1, "unknown host");
+ 	
+ 	if ((dpy = XOpenDisplay(NULL)) == NULL)

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 Apr  2 18:22:11 2013
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Tue, 02 Apr 2013 16:22:11 +0000
Subject: [csw-devel] SF.net SVN: gar:[20568] csw/mgar/pkg
Message-ID: <E1UN3yN-0004YC-6L@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 20568
          http://gar.svn.sourceforge.net/gar/?rev=20568&view=rev
Author:   wahwah
Date:     2013-04-02 16:22:08 +0000 (Tue, 02 Apr 2013)
Log Message:
-----------
paste/trunk: Initial commit (I thought we already had it?)

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

Added: csw/mgar/pkg/paste/Makefile
===================================================================
--- csw/mgar/pkg/paste/Makefile	                        (rev 0)
+++ csw/mgar/pkg/paste/Makefile	2013-04-02 16:22:08 UTC (rev 20568)
@@ -0,0 +1,2 @@
+%:
+	$(MAKE) -C trunk $*


Property changes on: csw/mgar/pkg/paste/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/paste/trunk/Makefile
===================================================================
--- csw/mgar/pkg/paste/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/paste/trunk/Makefile	2013-04-02 16:22:08 UTC (rev 20568)
@@ -0,0 +1,23 @@
+# $Id$
+# TODO (release-critical prefixed with !, non release-critical with *)
+#
+NAME = Paste
+VERSION = 1.7.5.1
+GARTYPE = v2
+
+DESCRIPTION = Tools for using a Web Server Gateway Interface stack
+define BLURB
+endef
+
+CATEGORIES = python
+
+MASTER_SITES = $(PYPI_MIRROR)
+DISTFILES  = $(DISTNAME).tar.gz
+
+CONFIGURE_ARGS = $(DIRPATHS)
+SKIPTEST = 1
+
+PACKAGES = CSWpy-paste
+
+include gar/category.mk
+


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

Added: csw/mgar/pkg/paste/trunk/checksums
===================================================================
--- csw/mgar/pkg/paste/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/paste/trunk/checksums	2013-04-02 16:22:08 UTC (rev 20568)
@@ -0,0 +1 @@
+7ea5fabed7dca48eb46dc613c4b6c4ed  Paste-1.7.5.1.tar.gz

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


From wahwah at users.sourceforge.net  Tue Apr  2 18:24:55 2013
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Tue, 02 Apr 2013 16:24:55 +0000
Subject: [csw-devel] SF.net SVN: gar:[20569] csw/mgar/pkg/paste/trunk
Message-ID: <E1UN411-0004cw-Qy@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 20569
          http://gar.svn.sourceforge.net/gar/?rev=20569&view=rev
Author:   wahwah
Date:     2013-04-02 16:24:55 +0000 (Tue, 02 Apr 2013)
Log Message:
-----------
paste/trunk: Why is 'mgar newpkg' adding the old gar symlink?

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

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


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


Modified: csw/mgar/pkg/paste/trunk/Makefile
===================================================================
--- csw/mgar/pkg/paste/trunk/Makefile	2013-04-02 16:22:08 UTC (rev 20568)
+++ csw/mgar/pkg/paste/trunk/Makefile	2013-04-02 16:24:55 UTC (rev 20569)
@@ -18,6 +18,6 @@
 SKIPTEST = 1
 
 PACKAGES = CSWpy-paste
+ARCHALL_CSWpy-paste = 1
 
 include gar/category.mk
-

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


From wahwah at users.sourceforge.net  Tue Apr  2 18:30:56 2013
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Tue, 02 Apr 2013 16:30:56 +0000
Subject: [csw-devel] SF.net SVN: gar:[20570] csw/mgar/pkg
Message-ID: <E1UN46q-0004mK-HD@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 20570
          http://gar.svn.sourceforge.net/gar/?rev=20570&view=rev
Author:   wahwah
Date:     2013-04-02 16:30:56 +0000 (Tue, 02 Apr 2013)
Log Message:
-----------
py-paste: Move to lang-python

Added Paths:
-----------
    csw/mgar/pkg/lang-python/paste/

Removed Paths:
-------------
    csw/mgar/pkg/paste/

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 Apr  2 18:32:44 2013
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Tue, 02 Apr 2013 16:32:44 +0000
Subject: [csw-devel] SF.net SVN: gar:[20571]
	csw/mgar/pkg/lang-python/webpy/trunk
Message-ID: <E1UN48a-0004o8-6u@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 20571
          http://gar.svn.sourceforge.net/gar/?rev=20571&view=rev
Author:   wahwah
Date:     2013-04-02 16:32:43 +0000 (Tue, 02 Apr 2013)
Log Message:
-----------
lang-python/webpy/trunk: version upgrade

Modified Paths:
--------------
    csw/mgar/pkg/lang-python/webpy/trunk/Makefile
    csw/mgar/pkg/lang-python/webpy/trunk/checksums

Modified: csw/mgar/pkg/lang-python/webpy/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-python/webpy/trunk/Makefile	2013-04-02 16:30:56 UTC (rev 20570)
+++ csw/mgar/pkg/lang-python/webpy/trunk/Makefile	2013-04-02 16:32:43 UTC (rev 20571)
@@ -3,7 +3,7 @@
 # $Id$
 
 NAME = web
-VERSION = 0.36
+VERSION = 0.37
 CATEGORIES = python
 GARTYPE = v2
 DESCRIPTION = Simple web framework for Python

Modified: csw/mgar/pkg/lang-python/webpy/trunk/checksums
===================================================================
--- csw/mgar/pkg/lang-python/webpy/trunk/checksums	2013-04-02 16:30:56 UTC (rev 20570)
+++ csw/mgar/pkg/lang-python/webpy/trunk/checksums	2013-04-02 16:32:43 UTC (rev 20571)
@@ -1 +1 @@
-3f9ee778c5c34357a0233c1f0e024d00  web.py-0.36.tar.gz
+93375e3f03e74d6bf5c5096a4962a8db  web.py-0.37.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 Apr  2 20:57:43 2013
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Tue, 02 Apr 2013 18:57:43 +0000
Subject: [csw-devel] SF.net SVN: gar:[20572]
	csw/mgar/gar/v2/lib/python/integrate_catalogs.py
Message-ID: <E1UN6Ot-0001su-LW@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 20572
          http://gar.svn.sourceforge.net/gar/?rev=20572&view=rev
Author:   wahwah
Date:     2013-04-02 18:57:43 +0000 (Tue, 02 Apr 2013)
Log Message:
-----------
integrate-catalogs: Better flag names

--from-catalog is a better name than --catrel-from.

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

Modified: csw/mgar/gar/v2/lib/python/integrate_catalogs.py
===================================================================
--- csw/mgar/gar/v2/lib/python/integrate_catalogs.py	2013-04-02 16:32:43 UTC (rev 20571)
+++ csw/mgar/gar/v2/lib/python/integrate_catalogs.py	2013-04-02 18:57:43 UTC (rev 20572)
@@ -243,11 +243,11 @@
 
 def main():
   parser = optparse.OptionParser()
-  parser.add_option("--catrel-from",
+  parser.add_option("--from-catalog",
       dest="catrel_from",
       default="unstable",
       help="Catalog release to integrate from, e.g. 'unstable'.")
-  parser.add_option("--catrel-to",
+  parser.add_option("--to-catalog",
       dest="catrel_to",
       default="testing",
       help="Catalog release to integrate to, e.g. 'testing'.")

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 Apr  2 20:58:47 2013
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Tue, 02 Apr 2013 18:58:47 +0000
Subject: [csw-devel] SF.net SVN: gar:[20573]
	csw/mgar/gar/v2/lib/python/pkgdb.py
Message-ID: <E1UN6Pv-0001vN-FR@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 20573
          http://gar.svn.sourceforge.net/gar/?rev=20573&view=rev
Author:   wahwah
Date:     2013-04-02 18:58:46 +0000 (Tue, 02 Apr 2013)
Log Message:
-----------
pkgdb: Use SunOS5.10 by default

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	2013-04-02 18:57:43 UTC (rev 20572)
+++ csw/mgar/gar/v2/lib/python/pkgdb.py	2013-04-02 18:58:46 UTC (rev 20573)
@@ -371,8 +371,8 @@
   parser.add_option("-t", "--pkg-review-template", dest="pkg_review_template",
                     help="A Cheetah template used for package review reports.")
   parser.add_option("-r", "--os-release", dest="osrel",
-                    default="SunOS5.9",
-                    help="E.g. SunOS5.9")
+                    default="SunOS5.10",
+                    help="E.g. SunOS5.10")
   parser.add_option("-a", "--arch", dest="arch",
                     default="sparc",
                     help="'i386' or 'sparc'")

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


From chninkel at users.sourceforge.net  Tue Apr  2 21:30:27 2013
From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net)
Date: Tue, 02 Apr 2013 19:30:27 +0000
Subject: [csw-devel] SF.net SVN: gar:[20574] csw/mgar/pkg/sasl/trunk/Makefile
Message-ID: <E1UN6uZ-0002px-R6@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 20574
          http://gar.svn.sourceforge.net/gar/?rev=20574&view=rev
Author:   chninkel
Date:     2013-04-02 19:30:26 +0000 (Tue, 02 Apr 2013)
Log Message:
-----------
sasl/trunk: update to build against libssl1.0.0

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

Modified: csw/mgar/pkg/sasl/trunk/Makefile
===================================================================
--- csw/mgar/pkg/sasl/trunk/Makefile	2013-04-02 18:58:46 UTC (rev 20573)
+++ csw/mgar/pkg/sasl/trunk/Makefile	2013-04-02 19:30:26 UTC (rev 20574)
@@ -44,21 +44,17 @@
 
 PACKAGES += CSWsasl
 SPKG_DESC_CSWsasl = Cyrus Simple Authentication and Security Layer
-RUNTIME_DEP_PKGS_CSWsasl += CSWlibssl0-9-8
+RUNTIME_DEP_PKGS_CSWsasl += CSWlibssl1-0-0
 RUNTIME_DEP_PKGS_CSWsasl += CSWbdb48
 RUNTIME_DEP_PKGS_CSWsasl += CSWlibsasl2-2
 
 PACKAGES += CSWsaslauthd
 SPKG_DESC_CSWsaslauthd = Cyrus Simple Authentication and Security Layer Authentication Daemon
 RUNTIME_DEP_PKGS_CSWsaslauthd += CSWsasl
-RUNTIME_DEP_PKGS_CSWsaslauthd += CSWlibssl0-9-8
+RUNTIME_DEP_PKGS_CSWsaslauthd += CSWlibssl1-0-0
 RUNTIME_DEP_PKGS_CSWsaslauthd += CSWliblber2-4-2
 RUNTIME_DEP_PKGS_CSWsaslauthd += CSWlibldap2-4-2
-RUNTIME_DEP_PKGS_CSWsaslauthd += CSWlibcom-err3
 RUNTIME_DEP_PKGS_CSWsaslauthd += CSWlibkrb5-3
-RUNTIME_DEP_PKGS_CSWsaslauthd += CSWlibk5crypto3
-RUNTIME_DEP_PKGS_CSWsaslauthd += CSWlibgssapi-krb5-2
-RUNTIME_DEP_PKGS_CSWsaslauthd += CSWlibkrb5support0
 CHECKPKG_OVERRIDES_CSWsaslauthd += surplus-dependency|CSWsasl
 PKGFILES_CSWsaslauthd = $(sysconfdir)/init.d/cswsaslauthd
 PKGFILES_CSWsaslauthd += $(sysconfdir)/saslauthd.init.CSW
@@ -75,11 +71,8 @@
 PACKAGES += CSWsaslgssapi
 CATALOGNAME_CSWsaslgssapi = sasl_gssapi
 SPKG_DESC_CSWsaslgssapi = Cyrus Simple Authentication and Security Layer GSSAPI Binding
-RUNTIME_DEP_PKGS_CSWsaslgssapi = CSWsasl CSWlibkrb5-3
-RUNTIME_DEP_PKGS_CSWsaslgssapi += CSWlibcom-err3
-RUNTIME_DEP_PKGS_CSWsaslgssapi += CSWlibk5crypto3
+RUNTIME_DEP_PKGS_CSWsaslgssapi = CSWsasl 
 RUNTIME_DEP_PKGS_CSWsaslgssapi += CSWlibgssapi-krb5-2
-RUNTIME_DEP_PKGS_CSWsaslgssapi += CSWlibkrb5support0
 CHECKPKG_OVERRIDES_CSWsaslgssapi += catalogname-does-not-match-pkgname|pkgname=CSWsaslgssapi|catalogname=sasl_gssapi|expected-catalogname=saslgssapi
 PKGFILES_CSWsaslgssapi = $(call pkgfiles_lib,sasl2/libgs2.so)
 PKGFILES_CSWsaslgssapi += $(call pkgfiles_lib,sasl2/libgssapiv2.so)
@@ -94,7 +87,7 @@
 RUNTIME_DEP_PKGS_CSWsaslsql += CSWlibpq5
 endif
 RUNTIME_DEP_PKGS_CSWsaslsql += CSWlibsqlite3-0
-RUNTIME_DEP_PKGS_CSWsaslsql += CSWlibmysqlclient15
+RUNTIME_DEP_PKGS_CSWsaslsql += CSWlibmysqlclient18
 CHECKPKG_OVERRIDES_CSWsaslsql += catalogname-does-not-match-pkgname|pkgname=CSWsaslsql|catalogname=sasl_sql|expected-catalogname=saslsql
 PKGFILES_CSWsaslsql = $(call pkgfiles_lib,sasl2/libsql.so)
 
@@ -112,11 +105,7 @@
 SPKG_DESC_CSWsaslsample = Cyrus Simple Authentication and Security Layer sample client/server
 RUNTIME_DEP_PKGS_CSWsaslsample = CSWsasl
 RUNTIME_DEP_PKGS_CSWsaslsample += CSWlibsasl2-2
-RUNTIME_DEP_PKGS_CSWsaslsample += CSWlibcom-err3
 RUNTIME_DEP_PKGS_CSWsaslsample += CSWlibgssapi-krb5-2
-RUNTIME_DEP_PKGS_CSWsaslsample += CSWlibk5crypto3
-RUNTIME_DEP_PKGS_CSWsaslsample += CSWlibkrb5-3
-RUNTIME_DEP_PKGS_CSWsaslsample += CSWlibkrb5support0
 PKGFILES_CSWsaslsample = $(bindir)/sasl-sample-server
 PKGFILES_CSWsaslsample += $(bindir)/sasl-sample-client
 # The plugins of CSWsasl are needed, else the functionality
@@ -128,9 +117,9 @@
 BUILD_DEP_PKGS += CSWlibkrb5-dev
 BUILD_DEP_PKGS += CSWmysql-dev
 BUILD_DEP_PKGS += CSWpostgresql-dev
-BUILD_DEP_PKGS += CSWoldapdevel 
+BUILD_DEP_PKGS += CSWopenldap-dev
 BUILD_DEP_PKGS += CSWlibsqlite3-dev
-BUILD_DEP_PKGS += CSWossldevel
+BUILD_DEP_PKGS += CSWlibssl-dev
 BUILD_DEP_PKGS += CSWbdb48devel
 
 EXTRA_CFLAGS = -D__EXTENSIONS__

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


From chninkel at users.sourceforge.net  Tue Apr  2 21:31:15 2013
From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net)
Date: Tue, 02 Apr 2013 19:31:15 +0000
Subject: [csw-devel] SF.net SVN: gar:[20575]
	csw/mgar/pkg/lang-python/pyopenssl/trunk/Makefile
Message-ID: <E1UN6vL-0002rg-Ea@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 20575
          http://gar.svn.sourceforge.net/gar/?rev=20575&view=rev
Author:   chninkel
Date:     2013-04-02 19:31:15 +0000 (Tue, 02 Apr 2013)
Log Message:
-----------
lang-python/pyopenssl/trunk: updated to build against libssl1.0.0

Modified Paths:
--------------
    csw/mgar/pkg/lang-python/pyopenssl/trunk/Makefile

Modified: csw/mgar/pkg/lang-python/pyopenssl/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-python/pyopenssl/trunk/Makefile	2013-04-02 19:30:26 UTC (rev 20574)
+++ csw/mgar/pkg/lang-python/pyopenssl/trunk/Makefile	2013-04-02 19:31:15 UTC (rev 20575)
@@ -15,7 +15,7 @@
 DISTFILES  = $(DISTNAME).tar.gz
 
 PACKAGES = CSWpy-openssl
-RUNTIME_DEP_PKGS_CSWpy-openssl += CSWosslrt
+RUNTIME_DEP_PKGS_CSWpy-openssl += CSWlibssl1-0-0
 RUNTIME_DEP_PKGS_CSWpy-openssl += CSWlibpython2-6-1-0
 
 TEST_SCRIPTS =

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


From chninkel at users.sourceforge.net  Tue Apr  2 23:00:30 2013
From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net)
Date: Tue, 02 Apr 2013 21:00:30 +0000
Subject: [csw-devel] SF.net SVN: gar:[20576] csw/mgar/pkg/lynx/trunk/Makefile
Message-ID: <E1UN8Jh-0002OE-WC@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 20576
          http://gar.svn.sourceforge.net/gar/?rev=20576&view=rev
Author:   chninkel
Date:     2013-04-02 21:00:29 +0000 (Tue, 02 Apr 2013)
Log Message:
-----------
lynx/trunk: updated to build against libssl 1.0.0

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

Modified: csw/mgar/pkg/lynx/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lynx/trunk/Makefile	2013-04-02 19:31:15 UTC (rev 20575)
+++ csw/mgar/pkg/lynx/trunk/Makefile	2013-04-02 21:00:29 UTC (rev 20576)
@@ -2,7 +2,7 @@
 VERSION = 2.8.7
 GARTYPE = v2
 
-DESCRIPTION = lynx - text browser for the World Wide Web
+DESCRIPTION = A text browser for the World Wide Web
 define BLURB
   Lynx is a web browser, a software program used by people to navigate
   the World Wide Web. The Web is a part of the global Internet, a network
@@ -15,7 +15,7 @@
 DISTFILES  = $(NAME)$(VERSION).tar.bz2
 DISTFILES += COPYING
 
-DEP_PKGS = CSWbzip2 CSWncurses CSWosslrt CSWzlib
+DEP_PKGS = CSWlibbz2-1-0 CSWlibncurses5 CSWlibssl1-0-0 CSWlibz1
 
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2
@@ -34,6 +34,9 @@
 PRESERVECONF  = /etc/opt/csw/lynx.lss
 PRESERVECONF += /etc/opt/csw/lynx.cfg
 
+# The /usr/local strings are just comments in the configuration file
+CHECKPKG_OVERRIDES_CSWlynx += file-with-bad-content|/usr/local|root/etc/opt/csw/lynx.cfg.CSW
+
 # This ensures that Lynx picks up its own entities.h, not the one installed
 # in one of the system directories, i. e. /opt/csw (that one's part of GD).
 SUN_CPP_FLAGS = -I./chrtrans
@@ -43,4 +46,7 @@
 #    --enable-gzip-help \
 #    --enable-nls
 
+TEST_SCRIPTS =
+
+
 include gar/category.mk

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


From dmichelsen at users.sourceforge.net  Wed Apr  3 16:17:04 2013
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Wed, 03 Apr 2013 14:17:04 +0000
Subject: [csw-devel] SF.net SVN: gar:[20577] csw/mgar/pkg/dbus/trunk
Message-ID: <E1UNOUq-00070n-PE@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 20577
          http://gar.svn.sourceforge.net/gar/?rev=20577&view=rev
Author:   dmichelsen
Date:     2013-04-03 14:17:04 +0000 (Wed, 03 Apr 2013)
Log Message:
-----------
dbus/trunk: Update to 1.7.0

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

Added Paths:
-----------
    csw/mgar/pkg/dbus/trunk/files/0001-If-alloca.h-is-available-it-is-required-e.g.-on-Sola.patch

Removed Paths:
-------------
    csw/mgar/pkg/dbus/trunk/files/0001-Use-LOG_PERROR-only-when-available.patch
    csw/mgar/pkg/dbus/trunk/files/0002-Add-missing-inclusion-of-inttypes.h.patch
    csw/mgar/pkg/dbus/trunk/files/attachment-50480.patch
    csw/mgar/pkg/dbus/trunk/files/attachment.cgi?id=50498
    csw/mgar/pkg/dbus/trunk/files/dbus-sysdeps-unix.c.diff

Modified: csw/mgar/pkg/dbus/trunk/Makefile
===================================================================
--- csw/mgar/pkg/dbus/trunk/Makefile	2013-04-02 21:00:29 UTC (rev 20576)
+++ csw/mgar/pkg/dbus/trunk/Makefile	2013-04-03 14:17:04 UTC (rev 20577)
@@ -5,7 +5,7 @@
 # ! cleanup of /usr/share, /usr/local occurrences
 
 NAME = dbus
-VERSION = 1.5.6
+VERSION = 1.7.0
 GARTYPE = v2
 
 DESCRIPTION  = DBus Message Bus System
@@ -30,22 +30,10 @@
 DISTFILES += cswusergroup
 DISTFILES += cswdbus
 
-# Use this patch until this issue is fixed:
-#   http://bugs.freedesktop.org/show_bug.cgi?id=40235
-#PATCHFILES += dbus-sysdeps-unix.c.diff
-
-#PATCHFILES += dbus-sysdeps.h.diff
-
 # Use patch until this is fixed:
-#   http://bugs.freedesktop.org/show_bug.cgi?id=40313
-PATCHFILES += 0002-Add-missing-inclusion-of-inttypes.h.patch
+#   https://bugs.freedesktop.org/show_bug.cgi?id=63071
+PATCHFILES += 0001-If-alloca.h-is-available-it-is-required-e.g.-on-Sola.patch
 
-# Use this custom-patch unless this is fixed:
-#   http://bugs.freedesktop.org/show_bug.cgi?id=39987
-PATCHFILES += 0001-Use-LOG_PERROR-only-when-available.patch
-
-PATCHFILES += attachment-50480.patch
-
 PACKAGES += CSWdbus
 CATALOGNAME_CSWdbus = dbus
 SPKG_DESC_CSWdbus = $(DESCRIPTION)
@@ -58,6 +46,7 @@
 CHECKPKG_OVERRIDES_CSWdbus += file-with-bad-content|/usr/share|root/opt/csw/libexec/dbus-daemon-launch-helper
 CHECKPKG_OVERRIDES_CSWdbus += file-with-bad-content|/usr/local|root/opt/csw/bin/dbus-daemon
 CHECKPKG_OVERRIDES_CSWdbus += file-with-bad-content|/usr/share|root/opt/csw/bin/dbus-daemon
+
 # This is an example
 CHECKPKG_OVERRIDES_CSWdbus += file-with-bad-content|/usr/share|root/opt/csw/share/man/man1/dbus-daemon.1
 
@@ -67,12 +56,12 @@
 OBSOLETED_BY_CSWlibdbus1-3 += CSWlibdbus
 # These are search pathes:
 #   /opt/csw/share:/usr/local/share:/usr/share:
-CHECKPKG_OVERRIDES_CSWlibdbus1-3 += file-with-bad-content|/usr/local|root/opt/csw/lib/libdbus-1.so.3.6.3
-CHECKPKG_OVERRIDES_CSWlibdbus1-3 += file-with-bad-content|/usr/share|root/opt/csw/lib/libdbus-1.so.3.6.3
-CHECKPKG_OVERRIDES_CSWlibdbus1-3 += file-with-bad-content|/usr/local|root/opt/csw/lib/sparcv9/libdbus-1.so.3.6.3
-CHECKPKG_OVERRIDES_CSWlibdbus1-3 += file-with-bad-content|/usr/share|root/opt/csw/lib/sparcv9/libdbus-1.so.3.6.3
-CHECKPKG_OVERRIDES_CSWlibdbus1-3 += file-with-bad-content|/usr/local|root/opt/csw/lib/amd64/libdbus-1.so.3.6.3
-CHECKPKG_OVERRIDES_CSWlibdbus1-3 += file-with-bad-content|/usr/share|root/opt/csw/lib/amd64/libdbus-1.so.3.6.3
+CHECKPKG_OVERRIDES_CSWlibdbus1-3 += file-with-bad-content|/usr/local|root/opt/csw/lib/libdbus-1.so.3.8.0
+CHECKPKG_OVERRIDES_CSWlibdbus1-3 += file-with-bad-content|/usr/share|root/opt/csw/lib/libdbus-1.so.3.8.0
+CHECKPKG_OVERRIDES_CSWlibdbus1-3 += file-with-bad-content|/usr/local|root/opt/csw/lib/sparcv9/libdbus-1.so.3.8.0
+CHECKPKG_OVERRIDES_CSWlibdbus1-3 += file-with-bad-content|/usr/share|root/opt/csw/lib/sparcv9/libdbus-1.so.3.8.0
+CHECKPKG_OVERRIDES_CSWlibdbus1-3 += file-with-bad-content|/usr/local|root/opt/csw/lib/amd64/libdbus-1.so.3.8.0
+CHECKPKG_OVERRIDES_CSWlibdbus1-3 += file-with-bad-content|/usr/share|root/opt/csw/lib/amd64/libdbus-1.so.3.8.0
 
 PACKAGES += CSWlibdbus-dev
 SPKG_DESC_CSWlibdbus-dev = Development files for libdbus
@@ -87,6 +76,9 @@
 CHECKPKG_OVERRIDES_CSWlibdbus-dev += file-with-bad-content|/usr/share|root/opt/csw/share/doc/dbus/api/dbus-sysdeps-unix_8c_source.html
 CHECKPKG_OVERRIDES_CSWlibdbus-dev += file-with-bad-content|/usr/share|root/opt/csw/share/doc/dbus/api/group__DBusSysdeps.html
 CHECKPKG_OVERRIDES_CSWlibdbus-dev += file-with-bad-content|/usr/share|root/opt/csw/share/doc/dbus/system-activation.txt
+CHECKPKG_OVERRIDES_CSWlibdbus-dev += file-with-bad-content|/usr/share|root/opt/csw/share/doc/dbus/dbus-daemon.1.html
+CHECKPKG_OVERRIDES_CSWlibdbus-dev += file-with-bad-content|/usr/share|root/opt/csw/share/doc/dbus/dbus-specification.html
+CHECKPKG_OVERRIDES_CSWlibdbus-dev += file-with-bad-content|/usr/local|root/opt/csw/share/doc/dbus/dbus-specification.html
 
 INITSMF += /etc/opt/csw/init.d/cswdbus
 PRESERVECONF += /etc/opt/csw/dbus-1/system.conf
@@ -108,9 +100,14 @@
 
 include gar/category.mk
 
-post-merge:
+post-patch:
+	cd $(WORKSRC) && PATH=$(prefix)/gnu:$(PATH) ./autogen.sh
+	@$(MAKECOOKIE)
+
+post-merge-all:
 	ginstall -d $(PKGROOT)/etc/opt/csw/init.d
 	ginstall $(WORKDIR)/cswdbus $(PKGROOT)/etc/opt/csw/init.d/cswdbus
 	ginstall -d $(PKGROOT)/etc/opt/csw/pkg/CSWdbus
 	ginstall $(WORKDIR)/cswusergroup $(PKGROOT)/etc/opt/csw/pkg/CSWdbus/cswusergroup
+	@$(MAKECOOKIE)
 

Modified: csw/mgar/pkg/dbus/trunk/checksums
===================================================================
--- csw/mgar/pkg/dbus/trunk/checksums	2013-04-02 21:00:29 UTC (rev 20576)
+++ csw/mgar/pkg/dbus/trunk/checksums	2013-04-03 14:17:04 UTC (rev 20577)
@@ -1 +1 @@
-0cf9cb877a5c1508b89844050ff9f45f  dbus-1.5.6.tar.gz
+a23c223efd7003b88bef6a4d32d82a99  dbus-1.7.0.tar.gz

Added: csw/mgar/pkg/dbus/trunk/files/0001-If-alloca.h-is-available-it-is-required-e.g.-on-Sola.patch
===================================================================
--- csw/mgar/pkg/dbus/trunk/files/0001-If-alloca.h-is-available-it-is-required-e.g.-on-Sola.patch	                        (rev 0)
+++ csw/mgar/pkg/dbus/trunk/files/0001-If-alloca.h-is-available-it-is-required-e.g.-on-Sola.patch	2013-04-03 14:17:04 UTC (rev 20577)
@@ -0,0 +1,40 @@
+From 713c89789b8e5f7e4a0cbe69d11d07829141201f Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Wed, 3 Apr 2013 10:38:51 +0200
+Subject: [PATCH] If alloca.h is available it is required (e.g. on Solaris 10)
+
+---
+ configure.ac             | 2 ++
+ dbus/dbus-sysdeps-unix.c | 3 +++
+ 2 files changed, 5 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index ee89dcb..3bd2405 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -688,6 +688,8 @@ AC_CHECK_HEADERS(ws2tcpip.h)
+ 
+ AC_CHECK_HEADERS(wspiapi.h)
+ 
++AC_CHECK_HEADERS(alloca.h)
++
+ # Add -D_POSIX_PTHREAD_SEMANTICS if on Solaris
+ #
+ case $host_os in
+diff --git a/dbus/dbus-sysdeps-unix.c b/dbus/dbus-sysdeps-unix.c
+index 30606ff..88db415 100644
+--- a/dbus/dbus-sysdeps-unix.c
++++ b/dbus/dbus-sysdeps-unix.c
+@@ -72,6 +72,9 @@
+ #ifdef HAVE_GETPEERUCRED
+ #include <ucred.h>
+ #endif
++#ifdef HAVE_ALLOCA_H
++#include <alloca.h>
++#endif
+ 
+ #ifdef HAVE_ADT
+ #include <bsm/adt.h>
+-- 
+1.8.1.4
+

Deleted: csw/mgar/pkg/dbus/trunk/files/0001-Use-LOG_PERROR-only-when-available.patch
===================================================================
--- csw/mgar/pkg/dbus/trunk/files/0001-Use-LOG_PERROR-only-when-available.patch	2013-04-02 21:00:29 UTC (rev 20576)
+++ csw/mgar/pkg/dbus/trunk/files/0001-Use-LOG_PERROR-only-when-available.patch	2013-04-03 14:17:04 UTC (rev 20577)
@@ -1,30 +0,0 @@
-From 940bca742236bc7be8ff157175b43630f6bf84dd Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen <dam at opencsw.org>
-Date: Thu, 11 Aug 2011 17:28:18 +0200
-Subject: [PATCH] Use LOG_PERROR only when available
-
----
- dbus/dbus-sysdeps-util-unix.c |    7 ++++++-
- 1 files changed, 6 insertions(+), 1 deletions(-)
-
-diff --git a/dbus/dbus-sysdeps-util-unix.c b/dbus/dbus-sysdeps-util-unix.c
-index a80f643..079a14d 100644
---- a/dbus/dbus-sysdeps-util-unix.c
-+++ b/dbus/dbus-sysdeps-util-unix.c
-@@ -425,7 +425,12 @@ _dbus_request_file_descriptor_limit (unsigned int limit)
- void 
- _dbus_init_system_log (void)
- {
--  openlog ("dbus", LOG_PID | LOG_PERROR, LOG_DAEMON);
-+  openlog ("dbus", LOG_PID
-+#ifdef LOG_PERROR
-+  | LOG_PERROR
-+#endif
-+    , LOG_DAEMON);
-+
- }
- /**
-  * Log a message to the system log file (e.g. syslog on Unix).
--- 
-1.7.6
-

Deleted: csw/mgar/pkg/dbus/trunk/files/0002-Add-missing-inclusion-of-inttypes.h.patch
===================================================================
--- csw/mgar/pkg/dbus/trunk/files/0002-Add-missing-inclusion-of-inttypes.h.patch	2013-04-02 21:00:29 UTC (rev 20576)
+++ csw/mgar/pkg/dbus/trunk/files/0002-Add-missing-inclusion-of-inttypes.h.patch	2013-04-03 14:17:04 UTC (rev 20577)
@@ -1,27 +0,0 @@
-From e54601c6645a7e6041c808866029866990d27f69 Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen <dam at opencsw.org>
-Date: Tue, 23 Aug 2011 16:52:46 +0200
-Subject: [PATCH] Add missing inclusion of inttypes.h
-
----
- dbus/dbus-sysdeps.h |    4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
-
-diff --git a/dbus/dbus-sysdeps.h b/dbus/dbus-sysdeps.h
-index f66efaa..f8438f4 100644
---- a/dbus/dbus-sysdeps.h
-+++ b/dbus/dbus-sysdeps.h
-@@ -31,6 +31,10 @@
- #include <stdint.h>
- #endif
- 
-+#ifdef HAVE_INTTYPES_H
-+#include <inttypes.h>
-+#endif
-+
- #include <dbus/dbus-errors.h>
- #include <dbus/dbus-file.h>
- #include <dbus/dbus-string.h>
--- 
-1.7.6
-

Deleted: csw/mgar/pkg/dbus/trunk/files/attachment-50480.patch
===================================================================
--- csw/mgar/pkg/dbus/trunk/files/attachment-50480.patch	2013-04-02 21:00:29 UTC (rev 20576)
+++ csw/mgar/pkg/dbus/trunk/files/attachment-50480.patch	2013-04-03 14:17:04 UTC (rev 20577)
@@ -1,57 +0,0 @@
-From 66e0c1525bca0830ea8e9f420927d18f4676e46f Mon Sep 17 00:00:00 2001
-From: Simon McVittie <simon.mcvittie at collabora.co.uk>
-Date: Tue, 23 Aug 2011 12:05:00 +0100
-Subject: [PATCH] On Solaris, define CMSG_ALIGN, CMSG_LEN, CMSG_SPACE if
- undefined
-
-Bug: https://bugs.freedesktop.org/show_bug.cgi?id=40235
----
- dbus/dbus-sysdeps-unix.c |   32 ++++++++++++++++++++++++++++++++
- 1 files changed, 32 insertions(+), 0 deletions(-)
-
-diff --git a/dbus/dbus-sysdeps-unix.c b/dbus/dbus-sysdeps-unix.c
-index e69f3b5..171977d 100644
---- a/dbus/dbus-sysdeps-unix.c
-+++ b/dbus/dbus-sysdeps-unix.c
-@@ -90,6 +90,38 @@
- #define socklen_t int
- #endif
- 
-+#if defined (__sun) || defined (__sun__)
-+/*
-+ * CMS_SPACE etc. definitions for Solaris < 10, based on
-+ *   http://mailman.videolan.org/pipermail/vlc-devel/2006-May/024402.html
-+ * via
-+ *   http://wiki.opencsw.org/porting-faq#toc10
-+ *
-+ * These are only redefined for Solaris, for now: if your OS needs these too,
-+ * please file a bug. (Or preferably, improve your OS so they're not needed.)
-+ */
-+
-+# ifndef CMSG_ALIGN
-+#   ifdef __sun__
-+#     define CMSG_ALIGN(len) _CMSG_DATA_ALIGN (len)
-+#   else
-+      /* aligning to sizeof (long) is assumed to be portable (fd.o#40235) */
-+#     define CMSG_ALIGN(len) (((len) + sizeof (long) - 1) & \
-+                              ~(sizeof (long) - 1))
-+#   endif
-+# endif
-+
-+# ifndef CMSG_SPACE
-+#   define CMSG_SPACE(len) (CMSG_ALIGN (sizeof (struct cmsghdr)) + \
-+                            CMSG_ALIGN (len))
-+# endif
-+
-+# ifndef CMSG_LEN
-+#   define CMSG_LEN(len) (CMSG_ALIGN (sizeof (struct cmsghdr)) + (len))
-+# endif
-+
-+#endif /* Solaris */
-+
- static dbus_bool_t
- _dbus_open_socket (int              *fd_p,
-                    int               domain,
--- 
-1.7.5.4
-

Deleted: csw/mgar/pkg/dbus/trunk/files/attachment.cgi?id=50498
===================================================================
--- csw/mgar/pkg/dbus/trunk/files/attachment.cgi?id=50498	2013-04-02 21:00:29 UTC (rev 20576)
+++ csw/mgar/pkg/dbus/trunk/files/attachment.cgi?id=50498	2013-04-03 14:17:04 UTC (rev 20577)
@@ -1,143 +0,0 @@
-From bf6bd403c7d74b2bc9e7bef53bce3d69d47870ac Mon Sep 17 00:00:00 2001
-From: Simon McVittie <simon.mcvittie at collabora.co.uk>
-Date: Tue, 23 Aug 2011 16:14:21 +0100
-Subject: [PATCH 2/2] Add a semi-automatic test for _dbus_system_log
-
----
- test/Makefile.am        |    5 ++
- test/internals/syslog.c |  100 +++++++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 105 insertions(+), 0 deletions(-)
- create mode 100644 test/internals/syslog.c
-
-diff --git a/test/Makefile.am b/test/Makefile.am
-index e5fd756..54ba823 100644
---- a/test/Makefile.am
-+++ b/test/Makefile.am
-@@ -101,6 +101,10 @@ test_refs_SOURCES = internals/refs.c
- test_refs_CPPFLAGS = -DDBUS_STATIC_BUILD $(GLIB_CFLAGS)
- test_refs_LDADD = libdbus-testutils.la $(GLIB_LIBS) $(TEST_LIBS)
- 
-+test_syslog_SOURCES = internals/syslog.c
-+test_syslog_CPPFLAGS = -DDBUS_STATIC_BUILD $(GLIB_CFLAGS)
-+test_syslog_LDADD = libdbus-testutils.la $(GLIB_LIBS) $(TEST_LIBS)
-+
- EXTRA_DIST = dbus-test-runner
- 
- testexecdir = $(libdir)/dbus-1.0/test
-@@ -114,6 +118,7 @@ installable_tests = \
- 	test-marshal \
- 	test-refs \
- 	test-relay \
-+	test-syslog \
- 	$(NULL)
- 
- installcheck_tests =
-diff --git a/test/internals/syslog.c b/test/internals/syslog.c
-new file mode 100644
-index 0000000..4f6b7c2
---- /dev/null
-+++ b/test/internals/syslog.c
-@@ -0,0 +1,100 @@
-+/* Manual regression test for syslog support
-+ *
-+ * Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
-+ * Copyright ? 2011 Nokia Corporation
-+ *
-+ * Permission is hereby granted, free of charge, to any person
-+ * obtaining a copy of this software and associated documentation files
-+ * (the "Software"), to deal in the Software without restriction,
-+ * including without limitation the rights to use, copy, modify, merge,
-+ * publish, distribute, sublicense, and/or sell copies of the Software,
-+ * and to permit persons to whom the Software is furnished to do so,
-+ * subject to the following conditions:
-+ *
-+ * The above copyright notice and this permission notice shall be
-+ * included in all copies or substantial portions of the Software.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
-+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-+ * SOFTWARE.
-+ */
-+
-+#include <config.h>
-+
-+#include <stdlib.h>
-+
-+#include <glib.h>
-+
-+#define DBUS_COMPILATION    /* this test uses libdbus-internal */
-+#include <dbus/dbus.h>
-+#include <dbus/dbus-sysdeps.h>
-+
-+typedef struct {
-+    int dummy;
-+} Fixture;
-+
-+static void
-+setup (Fixture *f,
-+    gconstpointer data)
-+{
-+}
-+
-+/* hopefully clear enough that people don't think these messages in syslog
-+ * are a bug */
-+#define MESSAGE "regression test for _dbus_system_log(): "
-+
-+static void
-+test_syslog (Fixture *f,
-+    gconstpointer data)
-+{
-+  if (g_test_trap_fork (0, 0))
-+    {
-+      _dbus_init_system_log ();
-+      _dbus_system_log (DBUS_SYSTEM_LOG_FATAL, MESSAGE "%d", 23);
-+      /* should not be reached: exit 0 so the assertion in the main process
-+       * will fail */
-+      exit (0);
-+    }
-+
-+  g_test_trap_assert_failed ();
-+  g_test_trap_assert_stderr ("*" MESSAGE "23\n*");
-+
-+  if (g_test_trap_fork (0, 0))
-+    {
-+      _dbus_init_system_log ();
-+      _dbus_system_log (DBUS_SYSTEM_LOG_INFO, MESSAGE "%d", 42);
-+      _dbus_system_log (DBUS_SYSTEM_LOG_SECURITY, MESSAGE "%d", 666);
-+      exit (0);
-+    }
-+
-+  g_test_trap_assert_passed ();
-+  g_test_trap_assert_stderr ("*" MESSAGE "42\n*" MESSAGE "666\n*");
-+
-+  /* manual test (this is the best we can do on Windows) */
-+  _dbus_init_system_log ();
-+  _dbus_system_log (DBUS_SYSTEM_LOG_INFO, MESSAGE "%d", 42);
-+  _dbus_system_log (DBUS_SYSTEM_LOG_SECURITY, MESSAGE "%d", 666);
-+}
-+
-+static void
-+teardown (Fixture *f,
-+    gconstpointer data)
-+{
-+}
-+
-+int
-+main (int argc,
-+    char **argv)
-+{
-+  g_test_init (&argc, &argv, NULL);
-+  g_test_bug_base ("https://bugs.freedesktop.org/show_bug.cgi?id=");
-+
-+  g_test_add ("/syslog", Fixture, NULL, setup, test_syslog, teardown);
-+
-+  return g_test_run ();
-+}
--- 
-1.7.5.4
-

Deleted: csw/mgar/pkg/dbus/trunk/files/dbus-sysdeps-unix.c.diff
===================================================================
--- csw/mgar/pkg/dbus/trunk/files/dbus-sysdeps-unix.c.diff	2013-04-02 21:00:29 UTC (rev 20576)
+++ csw/mgar/pkg/dbus/trunk/files/dbus-sysdeps-unix.c.diff	2013-04-03 14:17:04 UTC (rev 20577)
@@ -1,30 +0,0 @@
---- dbus-1.3.1.orig/dbus/dbus-sysdeps-unix.c    2009-07-16 16:04:55.000000000 +0200
-+++ dbus-1.3.1/dbus/dbus-sysdeps-unix.c         2010-02-28 16:49:51.561773000 +0100
-@@ -54,6 +54,9 @@
- #include <netinet/in.h>
- #include <netdb.h>
- #include <grp.h>
-+#include <alloca.h>
-+#define XXXCMSG_SPACE(l) ((size_t)_CMSG_HDR_ALIGN(sizeof (struct cmsghdr) + (l)))
-+#define XXXCMSG_LEN(l) ((size_t)_CMSG_DATA_ALIGN(sizeof (struct cmsghdr)) + (l))
-
- #ifdef HAVE_ERRNO_H
- #include <errno.h>
-@@ -3268,7 +3271,7 @@
-     }
-   else
-     {
--      if (!_dbus_string_append (&servicedir_path, "/usr/local/share:/usr/share:"))
-+      if (!_dbus_string_append (&servicedir_path, "/opt/csw/share:/usr/local/share:/usr/share:"))
-         goto oom;
-     }
-
-@@ -3355,7 +3358,7 @@
-     }
-   else
-     {
--      if (!_dbus_string_append (&servicedir_path, "/usr/local/share:/usr/share:"))
-+      if (!_dbus_string_append (&servicedir_path, "/opt/csw/share:/usr/local/share:/usr/share:"))
-         goto oom;
-     }
-

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


From rthurner at users.sourceforge.net  Wed Apr  3 21:56:08 2013
From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net)
Date: Wed, 03 Apr 2013 19:56:08 +0000
Subject: [csw-devel] SF.net SVN: gar:[20578] csw/mgar/pkg/mercurial/trunk
Message-ID: <E1UNTmy-0007nm-Ci@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 20578
          http://gar.svn.sourceforge.net/gar/?rev=20578&view=rev
Author:   rthurner
Date:     2013-04-03 19:56:07 +0000 (Wed, 03 Apr 2013)
Log Message:
-----------
mercurial: upgrade to hg-2.5.3

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

Modified: csw/mgar/pkg/mercurial/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mercurial/trunk/Makefile	2013-04-03 14:17:04 UTC (rev 20577)
+++ csw/mgar/pkg/mercurial/trunk/Makefile	2013-04-03 19:56:07 UTC (rev 20578)
@@ -1,5 +1,5 @@
 NAME = mercurial
-VERSION = 2.5.2
+VERSION = 2.5.3
 CATEGORIES = python
 GARTYPE = v2
 

Modified: csw/mgar/pkg/mercurial/trunk/checksums
===================================================================
--- csw/mgar/pkg/mercurial/trunk/checksums	2013-04-03 14:17:04 UTC (rev 20577)
+++ csw/mgar/pkg/mercurial/trunk/checksums	2013-04-03 19:56:07 UTC (rev 20578)
@@ -1 +1 @@
-6b467f41a262e2537cf927ed42d0fdda  mercurial-2.5.2.tar.gz
+373ae7c970d8cf2df9d1160d7dde8127  mercurial-2.5.3.tar.gz

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


From wahwah at users.sourceforge.net  Wed Apr  3 22:51:56 2013
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Wed, 03 Apr 2013 20:51:56 +0000
Subject: [csw-devel] SF.net SVN: gar:[20579] csw/mgar/pkg
Message-ID: <E1UNUey-0007Zj-8P@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 20579
          http://gar.svn.sourceforge.net/gar/?rev=20579&view=rev
Author:   wahwah
Date:     2013-04-03 20:51:55 +0000 (Wed, 03 Apr 2013)
Log Message:
-----------
pyelftools/trunk: Initial commit

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

Added: csw/mgar/pkg/pyelftools/Makefile
===================================================================
--- csw/mgar/pkg/pyelftools/Makefile	                        (rev 0)
+++ csw/mgar/pkg/pyelftools/Makefile	2013-04-03 20:51:55 UTC (rev 20579)
@@ -0,0 +1,2 @@
+%:
+	$(MAKE) -C trunk $*


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



Added: csw/mgar/pkg/pyelftools/trunk/Makefile
===================================================================
--- csw/mgar/pkg/pyelftools/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/pyelftools/trunk/Makefile	2013-04-03 20:51:55 UTC (rev 20579)
@@ -0,0 +1,22 @@
+# $Id$
+# TODO (release-critical prefixed with !, non release-critical with *)
+#
+NAME = pyelftools
+VERSION = 0.20
+GARTYPE = v2
+
+DESCRIPTION = Library for analyzing ELF files and DWARF debugging information
+define BLURB
+endef
+
+CATEGORIES = python
+MASTER_SITES = $(PYPI_MIRROR)
+DISTFILES  = $(DISTNAME).tar.gz
+
+CONFIGURE_ARGS = $(DIRPATHS)
+TEST_SCRIPTS =
+
+ARCHALL_CSWpy-pyelftools = 1
+
+include gar/category.mk
+


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

Added: csw/mgar/pkg/pyelftools/trunk/checksums
===================================================================
--- csw/mgar/pkg/pyelftools/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/pyelftools/trunk/checksums	2013-04-03 20:51:55 UTC (rev 20579)
@@ -0,0 +1 @@
+5ac7b279a01c41e5b022a1a382eb9d92  pyelftools-0.20.tar.gz

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


From wahwah at users.sourceforge.net  Wed Apr  3 22:53:15 2013
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Wed, 03 Apr 2013 20:53:15 +0000
Subject: [csw-devel] SF.net SVN: gar:[20580] csw/mgar/pkg
Message-ID: <E1UNUgF-0007dP-NX@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 20580
          http://gar.svn.sourceforge.net/gar/?rev=20580&view=rev
Author:   wahwah
Date:     2013-04-03 20:53:15 +0000 (Wed, 03 Apr 2013)
Log Message:
-----------
pyelftools: Move to lang-python

Added Paths:
-----------
    csw/mgar/pkg/lang-python/pyelftools/

Removed Paths:
-------------
    csw/mgar/pkg/pyelftools/

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 Apr  4 13:16:23 2013
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Thu, 04 Apr 2013 11:16:23 +0000
Subject: [csw-devel] SF.net SVN: gar:[20581]
	csw/mgar/pkg/qt4-gcc/trunk/Makefile
Message-ID: <E1UNi9X-0005Ko-Ux@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 20581
          http://gar.svn.sourceforge.net/gar/?rev=20581&view=rev
Author:   cgrzemba
Date:     2013-04-04 11:16:23 +0000 (Thu, 04 Apr 2013)
Log Message:
-----------
qt4-gcc/trunk: update dependencies

Modified Paths:
--------------
    csw/mgar/pkg/qt4-gcc/trunk/Makefile

Modified: csw/mgar/pkg/qt4-gcc/trunk/Makefile
===================================================================
--- csw/mgar/pkg/qt4-gcc/trunk/Makefile	2013-04-03 20:53:15 UTC (rev 20580)
+++ csw/mgar/pkg/qt4-gcc/trunk/Makefile	2013-04-04 11:16:23 UTC (rev 20581)
@@ -74,7 +74,6 @@
 RUNTIME_DEP_PKGS_CSWlibqtcore4 += CSWlibgcc-s1
 
 PACKAGES += CSWlibqtgui4
-CATALOGNAME_CSWlibqtgui4 = libqtgui4_gxx
 PKGFILES_CSWlibqtgui4 += $(call baseisadirs,$(libdir),libQtGui\.so\.4(\.\d+)*)
 SPKG_DESC_CSWlibqtgui4 += $(DESCRIPTION), libQtGui.so.4
 # RUNTIME_DEP_PKGS_CSWlibqtgui4 += CSWlibgthread2-0-0
@@ -85,10 +84,10 @@
 RUNTIME_DEP_PKGS_CSWlibqtgui4 += CSWlibgcc-s1
 RUNTIME_DEP_PKGS_CSWlibqtgui4 += CSWlibqtcore4
 RUNTIME_DEP_PKGS_CSWlibqtgui4_sparc += CSWlibgobject2-0-0
-RUNTIME_DEP_PKGS_CSWlibqtgui4_sparc += CSWlibfontconfig1
+RUNTIME_DEP_PKGS_CSWlibqtgui4 += CSWlibfontconfig1
 RUNTIME_DEP_PKGS_CSWlibqtgui4 += CSWlibfreetype6
 RUNTIME_DEP_PKGS_CSWlibqtgui4 += $(RUNTIME_DEP_PKGS_CSWlibqtgui4_$(GARCH))
-CHECKPKG_OVERRIDES_CSWlibqtgui4 += file-with-bad-content|/usr/share|root/opt/csw/gxx/lib/libQtGui.so.4.8.1
+CHECKPKG_OVERRIDES_CSWlibqtgui4 += file-with-bad-content|/usr/share|root/opt/csw/lib/libQtGui.so.4.8.1
 
 PACKAGES += CSWqt4-dev
 SPKG_DESC_CSWqt4-dev += $(DESCRIPTION), development files
@@ -173,7 +172,7 @@
 RUNTIME_DEP_PKGS_CSWlibqtnetwork4 += CSWlibgcc-s1
 RUNTIME_DEP_PKGS_CSWlibqtnetwork4 += CSWlibstdc++6
 RUNTIME_DEP_PKGS_CSWlibqtnetwork4 += CSWlibqtcore4
-CHECKPKG_OVERRIDES_CSWlibqtnetwork4 += file-with-bad-content|/usr/share|root/opt/csw/gxx/lib/libQtNetwork.so.4.8.1
+CHECKPKG_OVERRIDES_CSWlibqtnetwork4 += file-with-bad-content|/usr/share|root/opt/csw/lib/libQtNetwork.so.4.8.1
 
 PACKAGES += CSWlibqtopengl4
 PKGFILES_CSWlibqtopengl4 += $(call baseisadirs,$(libdir),libQtOpenGL\.so\.4(\.\d+)*)
@@ -185,7 +184,7 @@
 RUNTIME_DEP_PKGS_CSWlibqtopengl4 += CSWlibqtgui4
 RUNTIME_DEP_PKGS_CSWlibqtopengl4 += CSWlibgcc-s1
 RUNTIME_DEP_PKGS_CSWlibqtopengl4_sparc += CSWlibfontconfig1
-RUNTIME_DEP_PKGS_CSWlibqtopengl4_sparc += CSWlibfreetype6
+RUNTIME_DEP_PKGS_CSWlibqtopengl4 += CSWlibfreetype6
 RUNTIME_DEP_PKGS_CSWlibqtopengl4 += $(RUNTIME_DEP_PKGS_CSWlibqtopengl4_$(GARCH))
 
 
@@ -230,7 +229,7 @@
 PACKAGES += CSWlibphonon4
 PKGFILES_CSWlibphonon4 += $(call baseisadirs,$(libdir),libphonon\.so\.4(\.\d+)*)
 SPKG_DESC_CSWlibphonon4 += $(DESCRIPTION), libphonon.so.4
-RUNTIME_DEP_PKGS_CSWlibphonon4 += CSWlibqtxml4
+# RUNTIME_DEP_PKGS_CSWlibphonon4 += CSWlibqtxml4
 RUNTIME_DEP_PKGS_CSWlibphonon4 += CSWlibqtdbus4
 RUNTIME_DEP_PKGS_CSWlibphonon4 += CSWlibqtcore4
 RUNTIME_DEP_PKGS_CSWlibphonon4 += CSWlibstdc++6
@@ -243,7 +242,7 @@
 RUNTIME_DEP_PKGS_CSWlibqtclucene4 += CSWlibgcc-s1
 RUNTIME_DEP_PKGS_CSWlibqtclucene4 += CSWlibstdc++6
 RUNTIME_DEP_PKGS_CSWlibqtclucene4 += CSWlibqtcore4
-RUNTIME_DEP_PKGS_CSWlibqtclucene4 += CSWlibqtdbus4
+# RUNTIME_DEP_PKGS_CSWlibqtclucene4 += CSWlibqtdbus4
 
 PACKAGES += CSWlibqtdbus4
 PKGFILES_CSWlibqtdbus4 += $(call baseisadirs,$(libdir),libQtDBus\.so\.4(\.\d+)*)
@@ -261,7 +260,7 @@
 RUNTIME_DEP_PKGS_CSWlibqtdeclarative4 += CSWlibqtcore4
 RUNTIME_DEP_PKGS_CSWlibqtdeclarative4 += CSWlibstdc++6
 RUNTIME_DEP_PKGS_CSWlibqtdeclarative4 += CSWlibqtgui4
-RUNTIME_DEP_PKGS_CSWlibqtdeclarative4 += CSWlibqtsvg4
+# RUNTIME_DEP_PKGS_CSWlibqtdeclarative4 += CSWlibqtsvg4
 RUNTIME_DEP_PKGS_CSWlibqtdeclarative4 += CSWlibgcc-s1
 RUNTIME_DEP_PKGS_CSWlibqtdeclarative4 += CSWlibqtsql4
 
@@ -278,7 +277,7 @@
 PACKAGES += CSWlibqtdesignercomponents4
 PKGFILES_CSWlibqtdesignercomponents4 += $(call baseisadirs,$(libdir),libQtDesignerComponents\.so\.4(\.\d+)*)
 SPKG_DESC_CSWlibqtdesignercomponents4 += $(DESCRIPTION), libQtDesignerComponents.so.4
-RUNTIME_DEP_PKGS_CSWlibqtdesignercomponents4 += CSWlibqtscript4
+# RUNTIME_DEP_PKGS_CSWlibqtdesignercomponents4 += CSWlibqtscript4
 RUNTIME_DEP_PKGS_CSWlibqtdesignercomponents4 += CSWlibqtdesigner4
 RUNTIME_DEP_PKGS_CSWlibqtdesignercomponents4 += CSWlibqtxml4
 RUNTIME_DEP_PKGS_CSWlibqtdesignercomponents4 += CSWlibqtcore4

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 Apr  5 09:26:22 2013
From: guengel at users.sourceforge.net (guengel at users.sourceforge.net)
Date: Fri, 05 Apr 2013 07:26:22 +0000
Subject: [csw-devel] SF.net SVN: gar:[20582]
 csw/mgar/pkg/postgresql/branches/postgresql-8.3/ files/changelog.CSW
Message-ID: <E1UO12U-0004aB-5C@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 20582
          http://gar.svn.sourceforge.net/gar/?rev=20582&view=rev
Author:   guengel
Date:     2013-04-05 07:26:19 +0000 (Fri, 05 Apr 2013)
Log Message:
-----------
postgresql/branches/postgresql-8.3: Updated changelog.

Modified Paths:
--------------
    csw/mgar/pkg/postgresql/branches/postgresql-8.3/files/changelog.CSW

Modified: csw/mgar/pkg/postgresql/branches/postgresql-8.3/files/changelog.CSW
===================================================================
--- csw/mgar/pkg/postgresql/branches/postgresql-8.3/files/changelog.CSW	2013-04-04 11:16:23 UTC (rev 20581)
+++ csw/mgar/pkg/postgresql/branches/postgresql-8.3/files/changelog.CSW	2013-04-05 07:26:19 UTC (rev 20582)
@@ -1,3 +1,9 @@
+postgresql83 (8.3.23,REV=2013.04.05)
+
+  * New upstream release 8.3.22.
+
+ -- Rafael Ostertag <raos at opencsw.org>  Fri, 05 Apr 2013 09:24:10 +0200
+
 postgresql83 (8.3.22,REV=2012.12.09)
 
   * New upstream release 8.3.22.

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


From pfelecan at users.sourceforge.net  Fri Apr  5 09:30:39 2013
From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net)
Date: Fri, 05 Apr 2013 07:30:39 +0000
Subject: [csw-devel] SF.net SVN: gar:[20583] csw/mgar/pkg/autogen/trunk
Message-ID: <E1UO16d-0004h5-Gt@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 20583
          http://gar.svn.sourceforge.net/gar/?rev=20583&view=rev
Author:   pfelecan
Date:     2013-04-05 07:30:39 +0000 (Fri, 05 Apr 2013)
Log Message:
-----------
autogen/trunk: version bump

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

Modified: csw/mgar/pkg/autogen/trunk/Makefile
===================================================================
--- csw/mgar/pkg/autogen/trunk/Makefile	2013-04-05 07:26:19 UTC (rev 20582)
+++ csw/mgar/pkg/autogen/trunk/Makefile	2013-04-05 07:30:39 UTC (rev 20583)
@@ -2,7 +2,7 @@
 
 NAME = autogen
 
-VERSION = 5.17.2
+VERSION = 5.17.3
 GARTYPE = v2
 
 DESCRIPTION = The Automated Text and Program Generation Tool
@@ -146,7 +146,7 @@
 # there is one test failing (keyword.test) and I choose to ignore it
 # as the remaining ones pass.
 test-custom:
-	cd $(WORKSRC) && /usr/bin/env -i $(BUILD_ENV) && $(MAKE) -i -k -C $(OBJDIR) check
+	cd $(WORKSRC) && /usr/bin/env -i $(BUILD_ENV) VERBOSE=true && $(MAKE) -i -k -C $(OBJDIR) check
 	$(MAKECOOKIE)
 
 install-nominal:

Modified: csw/mgar/pkg/autogen/trunk/checksums
===================================================================
--- csw/mgar/pkg/autogen/trunk/checksums	2013-04-05 07:26:19 UTC (rev 20582)
+++ csw/mgar/pkg/autogen/trunk/checksums	2013-04-05 07:30:39 UTC (rev 20583)
@@ -1 +1 @@
-154c93f1061cc50ed1c99bb8bca8cbbd  autogen-5.17.2.tar.gz
+2d14ced1c28f71e61bb7c58e93317a40  autogen-5.17.3.tar.gz

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


From guengel at users.sourceforge.net  Fri Apr  5 09:35:23 2013
From: guengel at users.sourceforge.net (guengel at users.sourceforge.net)
Date: Fri, 05 Apr 2013 07:35:23 +0000
Subject: [csw-devel] SF.net SVN: gar:[20584]
	csw/mgar/pkg/postgresql/branches/postgresql-8.4
Message-ID: <E1UO1BD-0002Gp-Gc@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 20584
          http://gar.svn.sourceforge.net/gar/?rev=20584&view=rev
Author:   guengel
Date:     2013-04-05 07:35:23 +0000 (Fri, 05 Apr 2013)
Log Message:
-----------
postgresql/branches/postgresql-8.4: New upstream release.

Modified Paths:
--------------
    csw/mgar/pkg/postgresql/branches/postgresql-8.4/Makefile
    csw/mgar/pkg/postgresql/branches/postgresql-8.4/checksums
    csw/mgar/pkg/postgresql/branches/postgresql-8.4/files/changelog.CSW

Modified: csw/mgar/pkg/postgresql/branches/postgresql-8.4/Makefile
===================================================================
--- csw/mgar/pkg/postgresql/branches/postgresql-8.4/Makefile	2013-04-05 07:30:39 UTC (rev 20583)
+++ csw/mgar/pkg/postgresql/branches/postgresql-8.4/Makefile	2013-04-05 07:35:23 UTC (rev 20584)
@@ -90,7 +90,7 @@
 BASE_VERSION = 8.4
 VERSION_NODOT = $(subst .,_,$(BASE_VERSION))
 BASE_VERSION_NODOT = $(subst .,,$(BASE_VERSION))
-PATCHLEVEL = 16
+PATCHLEVEL = 17
 VERSION = $(BASE_VERSION).$(PATCHLEVEL)
 
 PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386

Modified: csw/mgar/pkg/postgresql/branches/postgresql-8.4/checksums
===================================================================
--- csw/mgar/pkg/postgresql/branches/postgresql-8.4/checksums	2013-04-05 07:30:39 UTC (rev 20583)
+++ csw/mgar/pkg/postgresql/branches/postgresql-8.4/checksums	2013-04-05 07:35:23 UTC (rev 20584)
@@ -1 +1 @@
-a59090ab397ee4357df8ced48e11b94d  postgresql-8.4.16.tar.bz2
+5cffae539198764301c0b2a36ae63fe1  postgresql-8.4.17.tar.bz2

Modified: csw/mgar/pkg/postgresql/branches/postgresql-8.4/files/changelog.CSW
===================================================================
--- csw/mgar/pkg/postgresql/branches/postgresql-8.4/files/changelog.CSW	2013-04-05 07:30:39 UTC (rev 20583)
+++ csw/mgar/pkg/postgresql/branches/postgresql-8.4/files/changelog.CSW	2013-04-05 07:35:23 UTC (rev 20584)
@@ -1,3 +1,10 @@
+postgresql84 (8.4.17,REV=2013.04.05)
+
+  * New upstream release 8.4.17.
+
+ -- Rafael Ostertag <raos at opencsw.org>  Fri, 05 Apr 2013 09:28:23 +0200
+
+
 postgresql84 (8.4.15,REV=2012.12.09)
 
   * New upstream release 8.4.15.

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 Apr  5 09:37:35 2013
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Fri, 05 Apr 2013 07:37:35 +0000
Subject: [csw-devel] SF.net SVN: gar:[20585]
	csw/mgar/pkg/qt4-gcc/trunk/Makefile
Message-ID: <E1UO1DL-0002J1-I3@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 20585
          http://gar.svn.sourceforge.net/gar/?rev=20585&view=rev
Author:   cgrzemba
Date:     2013-04-05 07:37:35 +0000 (Fri, 05 Apr 2013)
Log Message:
-----------
qt4-gcc/trunk: remove suspicious and not longer necessary arch dependend runtime dependencies

Modified Paths:
--------------
    csw/mgar/pkg/qt4-gcc/trunk/Makefile

Modified: csw/mgar/pkg/qt4-gcc/trunk/Makefile
===================================================================
--- csw/mgar/pkg/qt4-gcc/trunk/Makefile	2013-04-05 07:35:23 UTC (rev 20584)
+++ csw/mgar/pkg/qt4-gcc/trunk/Makefile	2013-04-05 07:37:35 UTC (rev 20585)
@@ -83,7 +83,7 @@
 RUNTIME_DEP_PKGS_CSWlibqtgui4 += CSWlibglib2-0-0
 RUNTIME_DEP_PKGS_CSWlibqtgui4 += CSWlibgcc-s1
 RUNTIME_DEP_PKGS_CSWlibqtgui4 += CSWlibqtcore4
-RUNTIME_DEP_PKGS_CSWlibqtgui4_sparc += CSWlibgobject2-0-0
+# RUNTIME_DEP_PKGS_CSWlibqtgui4_sparc += CSWlibgobject2-0-0
 RUNTIME_DEP_PKGS_CSWlibqtgui4 += CSWlibfontconfig1
 RUNTIME_DEP_PKGS_CSWlibqtgui4 += CSWlibfreetype6
 RUNTIME_DEP_PKGS_CSWlibqtgui4 += $(RUNTIME_DEP_PKGS_CSWlibqtgui4_$(GARCH))
@@ -135,9 +135,9 @@
 RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibodbc2
 RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibtiff3
 RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibmysqlclient18
-RUNTIME_DEP_PKGS_CSWqt4-dev_sparc += CSWlibfontconfig1
-RUNTIME_DEP_PKGS_CSWqt4-dev_sparc += CSWlibfreetype6
-RUNTIME_DEP_PKGS_CSWqt4-dev += $(RUNTIME_DEP_PKGS_CSWqt4-dev_$(GARCH))
+# RUNTIME_DEP_PKGS_CSWqt4-dev_sparc += CSWlibfontconfig1
+# RUNTIME_DEP_PKGS_CSWqt4-dev_sparc += CSWlibfreetype6
+# RUNTIME_DEP_PKGS_CSWqt4-dev += $(RUNTIME_DEP_PKGS_CSWqt4-dev_$(GARCH))
 # These are code examples.
 CHECKPKG_OVERRIDES_CSWqt4-dev += binary-architecture-does-not-match-placement
 

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 Apr  5 10:45:20 2013
From: guengel at users.sourceforge.net (guengel at users.sourceforge.net)
Date: Fri, 05 Apr 2013 08:45:20 +0000
Subject: [csw-devel] SF.net SVN: gar:[20586]
	csw/mgar/pkg/postgresql/branches/postgresql-9.0
Message-ID: <E1UO2Gu-0005JS-R1@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 20586
          http://gar.svn.sourceforge.net/gar/?rev=20586&view=rev
Author:   guengel
Date:     2013-04-05 08:45:19 +0000 (Fri, 05 Apr 2013)
Log Message:
-----------
postgresql/branches/postgresql-9.0: New upstream release.

Modified Paths:
--------------
    csw/mgar/pkg/postgresql/branches/postgresql-9.0/Makefile
    csw/mgar/pkg/postgresql/branches/postgresql-9.0/checksums
    csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/changelog.CSW

Modified: csw/mgar/pkg/postgresql/branches/postgresql-9.0/Makefile
===================================================================
--- csw/mgar/pkg/postgresql/branches/postgresql-9.0/Makefile	2013-04-05 07:37:35 UTC (rev 20585)
+++ csw/mgar/pkg/postgresql/branches/postgresql-9.0/Makefile	2013-04-05 08:45:19 UTC (rev 20586)
@@ -90,7 +90,7 @@
 BASE_VERSION = 9.0
 VERSION_NODOT = $(subst .,_,$(BASE_VERSION))
 BASE_VERSION_NODOT = $(subst .,,$(BASE_VERSION))
-PATCHLEVEL = 12
+PATCHLEVEL = 13
 VERSION = $(BASE_VERSION).$(PATCHLEVEL)
 
 PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386

Modified: csw/mgar/pkg/postgresql/branches/postgresql-9.0/checksums
===================================================================
--- csw/mgar/pkg/postgresql/branches/postgresql-9.0/checksums	2013-04-05 07:37:35 UTC (rev 20585)
+++ csw/mgar/pkg/postgresql/branches/postgresql-9.0/checksums	2013-04-05 08:45:19 UTC (rev 20586)
@@ -1 +1 @@
-ed4dce92b432a099084128c3d26a4b6b  postgresql-9.0.12.tar.bz2
+1cb7a32fafdb192cb53d6f44810e6fa6  postgresql-9.0.13.tar.bz2

Modified: csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/changelog.CSW
===================================================================
--- csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/changelog.CSW	2013-04-05 07:37:35 UTC (rev 20585)
+++ csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/changelog.CSW	2013-04-05 08:45:19 UTC (rev 20586)
@@ -1,3 +1,10 @@
+postgresql90 (9.0.13,REV=2013.04.05)
+
+  * New upstream release 9.0.13
+
+ -- Rafael Ostertag <raos at opencsw.org>  Fri, 05 Apr 2013 10:36:50 +0200
+
+
 postgresql90 (9.0.11,REV=2012.12.09)
 
   * New upstream release 9.0.11.

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


From guengel at users.sourceforge.net  Fri Apr  5 11:03:03 2013
From: guengel at users.sourceforge.net (guengel at users.sourceforge.net)
Date: Fri, 05 Apr 2013 09:03:03 +0000
Subject: [csw-devel] SF.net SVN: gar:[20587]
	csw/mgar/pkg/postgresql/branches/postgresql-9.1
Message-ID: <E1UO2Y3-0005jA-22@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 20587
          http://gar.svn.sourceforge.net/gar/?rev=20587&view=rev
Author:   guengel
Date:     2013-04-05 09:03:02 +0000 (Fri, 05 Apr 2013)
Log Message:
-----------
postgresql/branches/postgresql-9.1: New upstream release.

Modified Paths:
--------------
    csw/mgar/pkg/postgresql/branches/postgresql-9.1/Makefile
    csw/mgar/pkg/postgresql/branches/postgresql-9.1/checksums
    csw/mgar/pkg/postgresql/branches/postgresql-9.1/files/changelog.CSW

Modified: csw/mgar/pkg/postgresql/branches/postgresql-9.1/Makefile
===================================================================
--- csw/mgar/pkg/postgresql/branches/postgresql-9.1/Makefile	2013-04-05 08:45:19 UTC (rev 20586)
+++ csw/mgar/pkg/postgresql/branches/postgresql-9.1/Makefile	2013-04-05 09:03:02 UTC (rev 20587)
@@ -90,7 +90,7 @@
 BASE_VERSION = 9.1
 VERSION_NODOT = $(subst .,_,$(BASE_VERSION))
 BASE_VERSION_NODOT = $(subst .,,$(BASE_VERSION))
-PATCHLEVEL = 8
+PATCHLEVEL = 9
 VERSION = $(BASE_VERSION).$(PATCHLEVEL)
 GARTYPE = v2
 

Modified: csw/mgar/pkg/postgresql/branches/postgresql-9.1/checksums
===================================================================
--- csw/mgar/pkg/postgresql/branches/postgresql-9.1/checksums	2013-04-05 08:45:19 UTC (rev 20586)
+++ csw/mgar/pkg/postgresql/branches/postgresql-9.1/checksums	2013-04-05 09:03:02 UTC (rev 20587)
@@ -1 +1 @@
-54783b516880a586dcd7c07992d8c0b3  postgresql-9.1.8.tar.bz2
+6b5ea53dde48fcd79acfc8c196b83535  postgresql-9.1.9.tar.bz2

Modified: csw/mgar/pkg/postgresql/branches/postgresql-9.1/files/changelog.CSW
===================================================================
--- csw/mgar/pkg/postgresql/branches/postgresql-9.1/files/changelog.CSW	2013-04-05 08:45:19 UTC (rev 20586)
+++ csw/mgar/pkg/postgresql/branches/postgresql-9.1/files/changelog.CSW	2013-04-05 09:03:02 UTC (rev 20587)
@@ -1,3 +1,10 @@
+postgresql91 (9.1.9,REV=2013.04.05)
+
+  * New upstream release 9.1.9.
+
+ -- Rafael Ostertag <raos at opencsw.org>  Fri, 05 Apr 2013 11:01:35 +0200
+
+
 postgresql91 (9.1.7,REV=2012.12.09)
 
   * New upstream release 9.1.7.

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


From cgrzemba at users.sourceforge.net  Fri Apr  5 11:06:49 2013
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Fri, 05 Apr 2013 09:06:49 +0000
Subject: [csw-devel] SF.net SVN: gar:[20588]
	csw/mgar/pkg/qt4-gcc/trunk/Makefile
Message-ID: <E1UO2bh-0005q3-Fc@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 20588
          http://gar.svn.sourceforge.net/gar/?rev=20588&view=rev
Author:   cgrzemba
Date:     2013-04-05 09:06:49 +0000 (Fri, 05 Apr 2013)
Log Message:
-----------
qt4-gcc/trunk: remove suspicious and not longer necessary arch dependend runtime dependencies, second attempt

Modified Paths:
--------------
    csw/mgar/pkg/qt4-gcc/trunk/Makefile

Modified: csw/mgar/pkg/qt4-gcc/trunk/Makefile
===================================================================
--- csw/mgar/pkg/qt4-gcc/trunk/Makefile	2013-04-05 09:03:02 UTC (rev 20587)
+++ csw/mgar/pkg/qt4-gcc/trunk/Makefile	2013-04-05 09:06:49 UTC (rev 20588)
@@ -83,10 +83,8 @@
 RUNTIME_DEP_PKGS_CSWlibqtgui4 += CSWlibglib2-0-0
 RUNTIME_DEP_PKGS_CSWlibqtgui4 += CSWlibgcc-s1
 RUNTIME_DEP_PKGS_CSWlibqtgui4 += CSWlibqtcore4
-# RUNTIME_DEP_PKGS_CSWlibqtgui4_sparc += CSWlibgobject2-0-0
 RUNTIME_DEP_PKGS_CSWlibqtgui4 += CSWlibfontconfig1
 RUNTIME_DEP_PKGS_CSWlibqtgui4 += CSWlibfreetype6
-RUNTIME_DEP_PKGS_CSWlibqtgui4 += $(RUNTIME_DEP_PKGS_CSWlibqtgui4_$(GARCH))
 CHECKPKG_OVERRIDES_CSWlibqtgui4 += file-with-bad-content|/usr/share|root/opt/csw/lib/libQtGui.so.4.8.1
 
 PACKAGES += CSWqt4-dev
@@ -135,9 +133,6 @@
 RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibodbc2
 RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibtiff3
 RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibmysqlclient18
-# RUNTIME_DEP_PKGS_CSWqt4-dev_sparc += CSWlibfontconfig1
-# RUNTIME_DEP_PKGS_CSWqt4-dev_sparc += CSWlibfreetype6
-# RUNTIME_DEP_PKGS_CSWqt4-dev += $(RUNTIME_DEP_PKGS_CSWqt4-dev_$(GARCH))
 # These are code examples.
 CHECKPKG_OVERRIDES_CSWqt4-dev += binary-architecture-does-not-match-placement
 
@@ -183,7 +178,6 @@
 RUNTIME_DEP_PKGS_CSWlibqtopengl4 += CSWlibstdc++6
 RUNTIME_DEP_PKGS_CSWlibqtopengl4 += CSWlibqtgui4
 RUNTIME_DEP_PKGS_CSWlibqtopengl4 += CSWlibgcc-s1
-RUNTIME_DEP_PKGS_CSWlibqtopengl4_sparc += CSWlibfontconfig1
 RUNTIME_DEP_PKGS_CSWlibqtopengl4 += CSWlibfreetype6
 RUNTIME_DEP_PKGS_CSWlibqtopengl4 += $(RUNTIME_DEP_PKGS_CSWlibqtopengl4_$(GARCH))
 

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 Apr  5 13:03:46 2013
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Fri, 05 Apr 2013 11:03:46 +0000
Subject: [csw-devel] SF.net SVN: gar:[20589] csw/mgar/pkg/easytag/trunk
Message-ID: <E1UO4Qs-0006vX-7I@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 20589
          http://gar.svn.sourceforge.net/gar/?rev=20589&view=rev
Author:   dmichelsen
Date:     2013-04-05 11:03:45 +0000 (Fri, 05 Apr 2013)
Log Message:
-----------
easytag/trunk: Update to 2.1.7 and new dependencies

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

Modified: csw/mgar/pkg/easytag/trunk/Makefile
===================================================================
--- csw/mgar/pkg/easytag/trunk/Makefile	2013-04-05 09:06:49 UTC (rev 20588)
+++ csw/mgar/pkg/easytag/trunk/Makefile	2013-04-05 11:03:45 UTC (rev 20589)
@@ -1,5 +1,5 @@
 NAME = easytag
-VERSION = 2.1.6
+VERSION = 2.1.7
 GARTYPE = v2
 
 DESCRIPTION = Tag editor for MP3, Ogg Vorbis files and more
@@ -10,8 +10,7 @@
 endef
 
 MASTER_SITES = $(SF_MIRRORS)
-DISTFILES  = $(NAME)-$(VERSION).tar.bz2
-PATCHFILES += patch_easytag_216_cddb_manual_search_fix.diff
+DISTFILES += $(NAME)-$(VERSION).tar.bz2
 
 BUILD_DEP_PKGS += CSWlibogg-dev
 BUILD_DEP_PKGS += CSWlibvorbis-dev
@@ -19,26 +18,26 @@
 BUILD_DEP_PKGS += CSWlibspeex-dev
 BUILD_DEP_PKGS += CSWlibwavpack-dev
 
+RUNTIME_DEP_PKGS_CSWeasytag += CSWlibgdk-x11-2-0-0
+RUNTIME_DEP_PKGS_CSWeasytag += CSWlibgdk-pixbuf2-0-0
+RUNTIME_DEP_PKGS_CSWeasytag += CSWlibid3-3-8-3
+RUNTIME_DEP_PKGS_CSWeasytag += CSWlibgobject2-0-0
+RUNTIME_DEP_PKGS_CSWeasytag += CSWlibglib2-0-0
+RUNTIME_DEP_PKGS_CSWeasytag += CSWlibgtk-x11-2-0-0
 RUNTIME_DEP_PKGS_CSWeasytag += CSWlibintl8
 RUNTIME_DEP_PKGS_CSWeasytag += CSWlibogg0
+RUNTIME_DEP_PKGS_CSWeasytag += CSWlibid3tag
 RUNTIME_DEP_PKGS_CSWeasytag += CSWlibvorbis0
-RUNTIME_DEP_PKGS_CSWeasytag += CSWlibflac8
-RUNTIME_DEP_PKGS_CSWeasytag += CSWlibspeex1
 RUNTIME_DEP_PKGS_CSWeasytag += CSWlibwavpack1
-RUNTIME_DEP_PKGS_CSWeasytag += CSWfconfig
+RUNTIME_DEP_PKGS_CSWeasytag += CSWlibflac8
 RUNTIME_DEP_PKGS_CSWeasytag += CSWpango
-RUNTIME_DEP_PKGS_CSWeasytag += CSWftype2
-RUNTIME_DEP_PKGS_CSWeasytag += CSWlibid3tag
-RUNTIME_DEP_PKGS_CSWeasytag += CSWzlib
-RUNTIME_DEP_PKGS_CSWeasytag += CSWgtk2
-RUNTIME_DEP_PKGS_CSWeasytag += CSWlibatk
-RUNTIME_DEP_PKGS_CSWeasytag += CSWlibcairo2
+RUNTIME_DEP_PKGS_CSWeasytag += CSWlibspeex1
 RUNTIME_DEP_PKGS_CSWeasytag += CSWlibvorbisfile3
-RUNTIME_DEP_PKGS_CSWeasytag += CSWglib2
 
-RUNTIME_DEP_PKGS_CSWeasytag += CSWgcc3g++rt
-
 # Needed for gethostbyname
-EXTRA_LINKER_FLAGS =  -lnsl
+EXTRA_LINKER_FLAGS = -lnsl
 
+EXTRA_CONFIGURE_EXPORTS += LIBS
+CONFIGURE_ENV_LIBS = -lCrun
+
 include gar/category.mk

Modified: csw/mgar/pkg/easytag/trunk/checksums
===================================================================
--- csw/mgar/pkg/easytag/trunk/checksums	2013-04-05 09:06:49 UTC (rev 20588)
+++ csw/mgar/pkg/easytag/trunk/checksums	2013-04-05 11:03:45 UTC (rev 20589)
@@ -1,2 +1 @@
-6c5b9dc2bf1f3b0a11bd4efc81aaa9ee  easytag-2.1.6.tar.bz2
-3e968c6c990e931c1d6002437c8be5c5  patch_easytag_216_cddb_manual_search_fix.diff
+9df3e800d80e754670642f2ba5e03539  easytag-2.1.7.tar.bz2

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


From guengel at users.sourceforge.net  Fri Apr  5 13:27:24 2013
From: guengel at users.sourceforge.net (guengel at users.sourceforge.net)
Date: Fri, 05 Apr 2013 11:27:24 +0000
Subject: [csw-devel] SF.net SVN: gar:[20590] csw/mgar/pkg/postgresql/trunk
Message-ID: <E1UO4nk-0001l8-0s@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 20590
          http://gar.svn.sourceforge.net/gar/?rev=20590&view=rev
Author:   guengel
Date:     2013-04-05 11:27:23 +0000 (Fri, 05 Apr 2013)
Log Message:
-----------
postgresql/trunk: New upstream release.

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

Modified: csw/mgar/pkg/postgresql/trunk/Makefile
===================================================================
--- csw/mgar/pkg/postgresql/trunk/Makefile	2013-04-05 11:03:45 UTC (rev 20589)
+++ csw/mgar/pkg/postgresql/trunk/Makefile	2013-04-05 11:27:23 UTC (rev 20590)
@@ -90,7 +90,7 @@
 BASE_VERSION = 9.2
 VERSION_NODOT = $(subst .,_,$(BASE_VERSION))
 BASE_VERSION_NODOT = $(subst .,,$(BASE_VERSION))
-PATCHLEVEL = 3
+PATCHLEVEL = 4
 VERSION = $(BASE_VERSION).$(PATCHLEVEL)
 GARTYPE = v2
 

Modified: csw/mgar/pkg/postgresql/trunk/checksums
===================================================================
--- csw/mgar/pkg/postgresql/trunk/checksums	2013-04-05 11:03:45 UTC (rev 20589)
+++ csw/mgar/pkg/postgresql/trunk/checksums	2013-04-05 11:27:23 UTC (rev 20590)
@@ -1 +1 @@
-59f42a93695b0186ed5eb03c2653a7d4  postgresql-9.2.3.tar.bz2
+6ee5bb53b97da7c6ad9cb0825d3300dd  postgresql-9.2.4.tar.bz2

Modified: csw/mgar/pkg/postgresql/trunk/files/changelog.CSW
===================================================================
--- csw/mgar/pkg/postgresql/trunk/files/changelog.CSW	2013-04-05 11:03:45 UTC (rev 20589)
+++ csw/mgar/pkg/postgresql/trunk/files/changelog.CSW	2013-04-05 11:27:23 UTC (rev 20590)
@@ -1,3 +1,10 @@
+postgresql92 (9.2.4,REV=2013.04.05)
+
+  * New upstream release 9.2.4.
+
+ -- Rafael Ostertag <raos at opencsw.org>  Fri, 05 Apr 2013 13:24:31 +0200
+
+
 postgresql92 (9.2.2,REV=2012.12.09)
 
   * New upstream release 9.2.2.

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 Apr  5 22:08:32 2013
From: guengel at users.sourceforge.net (guengel at users.sourceforge.net)
Date: Fri, 05 Apr 2013 20:08:32 +0000
Subject: [csw-devel] SF.net SVN: gar:[20591]
 csw/mgar/pkg/postgresql/branches/postgresql-8.3/ Makefile
Message-ID: <E1UOCw4-0002AH-Ik@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 20591
          http://gar.svn.sourceforge.net/gar/?rev=20591&view=rev
Author:   guengel
Date:     2013-04-05 20:08:32 +0000 (Fri, 05 Apr 2013)
Log Message:
-----------
postgresql/branches/postgresql-8.3: Fixed alternatives.

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

Modified: csw/mgar/pkg/postgresql/branches/postgresql-8.3/Makefile
===================================================================
--- csw/mgar/pkg/postgresql/branches/postgresql-8.3/Makefile	2013-04-05 11:27:23 UTC (rev 20590)
+++ csw/mgar/pkg/postgresql/branches/postgresql-8.3/Makefile	2013-04-05 20:08:32 UTC (rev 20591)
@@ -444,8 +444,11 @@
 	$(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)))) \
+		$(eval firstbin=$(firstword $(BIN_NAMES_$(uppercase_$(pkg))))) \
+		$(eval mybindir=$(prefix)/bin) \
+		$(eval mylibexecdir=$(prefix)/libexec/$(alt)) \
+		$(eval ALTERNATIVE_$(pkg)_$(alt) = $(subst /$(ISA_DEFAULT)/,/,$(mybindir)/$(firstbin)-$(BASE_VERSION_NODOT) $(NAME)$(BASE_VERSION_NODOT)-$(pkg) $(mylibexecdir)/$(NAME)/$(BASE_VERSION_NODOT)/$(firstbin)) $(alt_priority)) \
+		$(eval ALTERNATIVE_$(pkg)_$(alt) += $(subst /$(ISA_DEFAULT)/,/,$(foreach n,$(wordlist 2,$(words $(BIN_NAMES_$(uppercase_$(pkg)))),$(BIN_NAMES_$(uppercase_$(pkg)))),$(mybindir)/$(n)-$(BASE_VERSION_NODOT) $(NAME)$(BASE_VERSION_NODOT)-$(pkg) $(mylibexecdir)/$(NAME)/$(BASE_VERSION_NODOT)/$(n)))) \
 	)\
 )
 
@@ -583,7 +586,7 @@
 		fi ; \
 	done
 	@echo " ===> Checking for extra libraries in SO_NAMES_*"
-	for n in $(SO_NAMES_SERVER) $(SO_NAMES_CONTRIB) ; do \
+	@for n in $(SO_NAMES_SERVER) $(SO_NAMES_CONTRIB) ; do \
 		if [ -f $(PKGROOT)$(subst 64,$(ISA),$(libdir))/$(NAME)/$(BASE_VERSION_NODOT)/$$n ] ; then\
 			: ; \
 		else \

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 Apr  5 22:08:53 2013
From: guengel at users.sourceforge.net (guengel at users.sourceforge.net)
Date: Fri, 05 Apr 2013 20:08:53 +0000
Subject: [csw-devel] SF.net SVN: gar:[20592]
 csw/mgar/pkg/postgresql/branches/postgresql-8.4/ Makefile
Message-ID: <E1UOCwP-0002Ak-Bz@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 20592
          http://gar.svn.sourceforge.net/gar/?rev=20592&view=rev
Author:   guengel
Date:     2013-04-05 20:08:53 +0000 (Fri, 05 Apr 2013)
Log Message:
-----------
postgresql/branches/postgresql-8.4: Fixed alternatives.

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

Modified: csw/mgar/pkg/postgresql/branches/postgresql-8.4/Makefile
===================================================================
--- csw/mgar/pkg/postgresql/branches/postgresql-8.4/Makefile	2013-04-05 20:08:32 UTC (rev 20591)
+++ csw/mgar/pkg/postgresql/branches/postgresql-8.4/Makefile	2013-04-05 20:08:53 UTC (rev 20592)
@@ -444,11 +444,13 @@
 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)))) \
+		$(eval firstbin=$(firstword $(BIN_NAMES_$(uppercase_$(pkg))))) \
+		$(eval mybindir=$(prefix)/bin) \
+		$(eval mylibexecdir=$(prefix)/libexec/$(alt)) \
+		$(eval ALTERNATIVE_$(pkg)_$(alt) = $(subst /$(ISA_DEFAULT)/,/,$(mybindir)/$(firstbin)-$(BASE_VERSION_NODOT) $(NAME)$(BASE_VERSION_NODOT)-$(pkg) $(mylibexecdir)/$(NAME)/$(BASE_VERSION_NODOT)/$(firstbin)) $(alt_priority)) \
+		$(eval ALTERNATIVE_$(pkg)_$(alt) += $(subst /$(ISA_DEFAULT)/,/,$(foreach n,$(wordlist 2,$(words $(BIN_NAMES_$(uppercase_$(pkg)))),$(BIN_NAMES_$(uppercase_$(pkg)))),$(mybindir)/$(n)-$(BASE_VERSION_NODOT) $(NAME)$(BASE_VERSION_NODOT)-$(pkg) $(mylibexecdir)/$(NAME)/$(BASE_VERSION_NODOT)/$(n)))) \
 	)\
 )
 

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 Apr  5 22:09:09 2013
From: guengel at users.sourceforge.net (guengel at users.sourceforge.net)
Date: Fri, 05 Apr 2013 20:09:09 +0000
Subject: [csw-devel] SF.net SVN: gar:[20593]
 csw/mgar/pkg/postgresql/branches/postgresql-9.0/ Makefile
Message-ID: <E1UOCwf-0002C7-Lp@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 20593
          http://gar.svn.sourceforge.net/gar/?rev=20593&view=rev
Author:   guengel
Date:     2013-04-05 20:09:09 +0000 (Fri, 05 Apr 2013)
Log Message:
-----------
postgresql/branches/postgresql-9.0: Fixed alternatives.

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

Modified: csw/mgar/pkg/postgresql/branches/postgresql-9.0/Makefile
===================================================================
--- csw/mgar/pkg/postgresql/branches/postgresql-9.0/Makefile	2013-04-05 20:08:53 UTC (rev 20592)
+++ csw/mgar/pkg/postgresql/branches/postgresql-9.0/Makefile	2013-04-05 20:09:09 UTC (rev 20593)
@@ -446,8 +446,11 @@
 	$(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)))) \
+		$(eval firstbin=$(firstword $(BIN_NAMES_$(uppercase_$(pkg))))) \
+		$(eval mybindir=$(prefix)/bin) \
+		$(eval mylibexecdir=$(prefix)/libexec/$(alt)) \
+		$(eval ALTERNATIVE_$(pkg)_$(alt) = $(subst /$(ISA_DEFAULT)/,/,$(mybindir)/$(firstbin)-$(BASE_VERSION_NODOT) $(NAME)$(BASE_VERSION_NODOT)-$(pkg) $(mylibexecdir)/$(NAME)/$(BASE_VERSION_NODOT)/$(firstbin)) $(alt_priority)) \
+		$(eval ALTERNATIVE_$(pkg)_$(alt) += $(subst /$(ISA_DEFAULT)/,/,$(foreach n,$(wordlist 2,$(words $(BIN_NAMES_$(uppercase_$(pkg)))),$(BIN_NAMES_$(uppercase_$(pkg)))),$(mybindir)/$(n)-$(BASE_VERSION_NODOT) $(NAME)$(BASE_VERSION_NODOT)-$(pkg) $(mylibexecdir)/$(NAME)/$(BASE_VERSION_NODOT)/$(n)))) \
 	)\
 )
 

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 Apr  5 22:09:39 2013
From: guengel at users.sourceforge.net (guengel at users.sourceforge.net)
Date: Fri, 05 Apr 2013 20:09:39 +0000
Subject: [csw-devel] SF.net SVN: gar:[20594]
 csw/mgar/pkg/postgresql/branches/postgresql-9.1/ Makefile
Message-ID: <E1UOCx9-0002CZ-2l@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 20594
          http://gar.svn.sourceforge.net/gar/?rev=20594&view=rev
Author:   guengel
Date:     2013-04-05 20:09:38 +0000 (Fri, 05 Apr 2013)
Log Message:
-----------
postgresql/branches/postgresql-9.1: Fixed alternatives.

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

Modified: csw/mgar/pkg/postgresql/branches/postgresql-9.1/Makefile
===================================================================
--- csw/mgar/pkg/postgresql/branches/postgresql-9.1/Makefile	2013-04-05 20:09:09 UTC (rev 20593)
+++ csw/mgar/pkg/postgresql/branches/postgresql-9.1/Makefile	2013-04-05 20:09:38 UTC (rev 20594)
@@ -502,12 +502,15 @@
 uppercase_server = SERVER
 uppercase_client = CLIENT
 uppercase_contrib = CONTRIB
-$(foreach pkg,$(myALTERNATIVES),\
+(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) $(n)-$(BASE_VERSION_NODOT) $(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) $(n)-$(BASE_VERSION_NODOT) $(libexecdir)/$(alt)/$(NAME)/$(BASE_VERSION_NODOT)/$(n)))) \
+		$(eval firstbin=$(firstword $(BIN_NAMES_$(uppercase_$(pkg))))) \
+		$(eval mybindir=$(prefix)/bin) \
+		$(eval mylibexecdir=$(prefix)/libexec/$(alt)) \
+		$(eval ALTERNATIVE_$(pkg)_$(alt) = $(subst /$(ISA_DEFAULT)/,/,$(mybindir)/$(firstbin)-$(BASE_VERSION_NODOT) $(NAME)$(BASE_VERSION_NODOT)-$(pkg) $(mylibexecdir)/$(NAME)/$(BASE_VERSION_NODOT)/$(firstbin)) $(alt_priority)) \
+		$(eval ALTERNATIVE_$(pkg)_$(alt) += $(subst /$(ISA_DEFAULT)/,/,$(foreach n,$(wordlist 2,$(words $(BIN_NAMES_$(uppercase_$(pkg)))),$(BIN_NAMES_$(uppercase_$(pkg)))),$(mybindir)/$(n)-$(BASE_VERSION_NODOT) $(NAME)$(BASE_VERSION_NODOT)-$(pkg) $(mylibexecdir)/$(NAME)/$(BASE_VERSION_NODOT)/$(n)))) \
 	)\
 )
 

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 Apr  5 22:09:59 2013
From: guengel at users.sourceforge.net (guengel at users.sourceforge.net)
Date: Fri, 05 Apr 2013 20:09:59 +0000
Subject: [csw-devel] SF.net SVN: gar:[20595]
	csw/mgar/pkg/postgresql/trunk/Makefile
Message-ID: <E1UOCxT-0002D7-T2@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 20595
          http://gar.svn.sourceforge.net/gar/?rev=20595&view=rev
Author:   guengel
Date:     2013-04-05 20:09:59 +0000 (Fri, 05 Apr 2013)
Log Message:
-----------
postgresql/trunk: Fixed alternatives.

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

Modified: csw/mgar/pkg/postgresql/trunk/Makefile
===================================================================
--- csw/mgar/pkg/postgresql/trunk/Makefile	2013-04-05 20:09:38 UTC (rev 20594)
+++ csw/mgar/pkg/postgresql/trunk/Makefile	2013-04-05 20:09:59 UTC (rev 20595)
@@ -512,8 +512,11 @@
 	$(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) $(n)-$(BASE_VERSION_NODOT) $(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) $(n)-$(BASE_VERSION_NODOT) $(libexecdir)/$(alt)/$(NAME)/$(BASE_VERSION_NODOT)/$(n)))) \
+		$(eval firstbin=$(firstword $(BIN_NAMES_$(uppercase_$(pkg))))) \
+		$(eval mybindir=$(prefix)/bin) \
+		$(eval mylibexecdir=$(prefix)/libexec/$(alt)) \
+		$(eval ALTERNATIVE_$(pkg)_$(alt) = $(subst /$(ISA_DEFAULT)/,/,$(mybindir)/$(firstbin)-$(BASE_VERSION_NODOT) $(NAME)$(BASE_VERSION_NODOT)-$(pkg) $(mylibexecdir)/$(NAME)/$(BASE_VERSION_NODOT)/$(firstbin)) $(alt_priority)) \
+		$(eval ALTERNATIVE_$(pkg)_$(alt) += $(subst /$(ISA_DEFAULT)/,/,$(foreach n,$(wordlist 2,$(words $(BIN_NAMES_$(uppercase_$(pkg)))),$(BIN_NAMES_$(uppercase_$(pkg)))),$(mybindir)/$(n)-$(BASE_VERSION_NODOT) $(NAME)$(BASE_VERSION_NODOT)-$(pkg) $(mylibexecdir)/$(NAME)/$(BASE_VERSION_NODOT)/$(n)))) \
 	)\
 )
 

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 Apr  5 22:16:01 2013
From: guengel at users.sourceforge.net (guengel at users.sourceforge.net)
Date: Fri, 05 Apr 2013 20:16:01 +0000
Subject: [csw-devel] SF.net SVN: gar:[20596]
 csw/mgar/pkg/postgresql/branches/postgresql-9.1/ Makefile
Message-ID: <E1UOD3J-0002LT-TY@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 20596
          http://gar.svn.sourceforge.net/gar/?rev=20596&view=rev
Author:   guengel
Date:     2013-04-05 20:16:01 +0000 (Fri, 05 Apr 2013)
Log Message:
-----------
postgresql/branches/postgresql-9.1: Fixed syntax error

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

Modified: csw/mgar/pkg/postgresql/branches/postgresql-9.1/Makefile
===================================================================
--- csw/mgar/pkg/postgresql/branches/postgresql-9.1/Makefile	2013-04-05 20:09:59 UTC (rev 20595)
+++ csw/mgar/pkg/postgresql/branches/postgresql-9.1/Makefile	2013-04-05 20:16:01 UTC (rev 20596)
@@ -502,7 +502,7 @@
 uppercase_server = SERVER
 uppercase_client = CLIENT
 uppercase_contrib = CONTRIB
-(foreach pkg,$(myALTERNATIVES),\
+$(foreach pkg,$(myALTERNATIVES),\
 	$(eval alt_priority = 20) \
 	$(foreach alt,$(NEEDED_ISAS), \
 		$(eval alt_priority=$(shell expr $(alt_priority) + 10)) \

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 Apr  5 23:36:02 2013
From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net)
Date: Fri, 05 Apr 2013 21:36:02 +0000
Subject: [csw-devel] SF.net SVN: gar:[20597]
	csw/mgar/pkg/pound/tags/pound-1.x/Makefile
Message-ID: <E1UOEIk-00046i-Il@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 20597
          http://gar.svn.sourceforge.net/gar/?rev=20597&view=rev
Author:   chninkel
Date:     2013-04-05 21:36:02 +0000 (Fri, 05 Apr 2013)
Log Message:
-----------
pound/tags/pound-1.x: updated recipe to rebuild against libssl 1.0.0

Modified Paths:
--------------
    csw/mgar/pkg/pound/tags/pound-1.x/Makefile

Modified: csw/mgar/pkg/pound/tags/pound-1.x/Makefile
===================================================================
--- csw/mgar/pkg/pound/tags/pound-1.x/Makefile	2013-04-05 20:16:01 UTC (rev 20596)
+++ csw/mgar/pkg/pound/tags/pound-1.x/Makefile	2013-04-05 21:36:02 UTC (rev 20597)
@@ -1,9 +1,8 @@
 NAME = pound
 VERSION = 1.10
-GARTYPE = v1
-CATEGORIES = net
+GARTYPE = v2
 
-DESCRIPTION = reverse proxy load balancer
+DESCRIPTION = Reverse proxy load balancer
 define BLURB
   The Pound program is a reverse proxy, load balancer and HTTPS front-end for
   Web server(s). Pound was developed to enable distributing the load among
@@ -21,8 +20,15 @@
 UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tgz
 
 # we require
-RUNTIME_DEP_PKGS = CSWosslrt
+RUNTIME_DEP_PKGS = CSWlibssl1-0-0
 
+# This reference to /usr/local is harmless
+CHECKPKG_OVERRIDES_CSWpound += file-with-bad-content|/usr/local|root/opt/csw/share/doc/pound/README
+# There is just an optional helper script for zope written in python
+# No need to depend on python for that
+CHECKPKG_OVERRIDES_CSWpound += missing-dependency|CSWpython
+
+
 # patch conf/pid directory to fit our needs
 PATCHFILES  = patch-pound.h
 PATCHFILES += patch-pound.8

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 Apr  6 00:21:53 2013
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Fri, 05 Apr 2013 22:21:53 +0000
Subject: [csw-devel] SF.net SVN: gar:[20598] csw/mgar/pkg/stunnel/trunk
Message-ID: <E1UOF17-00056N-4b@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 20598
          http://gar.svn.sourceforge.net/gar/?rev=20598&view=rev
Author:   bdwalton
Date:     2013-04-05 22:21:52 +0000 (Fri, 05 Apr 2013)
Log Message:
-----------
stunnel/trunk: version bump

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

Modified: csw/mgar/pkg/stunnel/trunk/Makefile
===================================================================
--- csw/mgar/pkg/stunnel/trunk/Makefile	2013-04-05 21:36:02 UTC (rev 20597)
+++ csw/mgar/pkg/stunnel/trunk/Makefile	2013-04-05 22:21:52 UTC (rev 20598)
@@ -7,7 +7,7 @@
 #       Test on Solaris 8 / 9 for comparison
 #
 NAME = stunnel
-VERSION = 4.53
+VERSION = 4.56
 GARTYPE = v2
 
 DESCRIPTION = Universal SSL Wrapper

Modified: csw/mgar/pkg/stunnel/trunk/checksums
===================================================================
--- csw/mgar/pkg/stunnel/trunk/checksums	2013-04-05 21:36:02 UTC (rev 20597)
+++ csw/mgar/pkg/stunnel/trunk/checksums	2013-04-05 22:21:52 UTC (rev 20598)
@@ -1 +1 @@
-ab3bfc915357d67da18c73f73610d593  stunnel-4.53.tar.gz
+ac4c4a30bd7a55b6687cbd62d864054c  stunnel-4.56.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  Sat Apr  6 00:27:05 2013
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Fri, 05 Apr 2013 22:27:05 +0000
Subject: [csw-devel] SF.net SVN: gar:[20599]
	csw/mgar/pkg/stunnel/trunk/Makefile
Message-ID: <E1UOF69-0002Ya-3n@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 20599
          http://gar.svn.sourceforge.net/gar/?rev=20599&view=rev
Author:   bdwalton
Date:     2013-04-05 22:27:04 +0000 (Fri, 05 Apr 2013)
Log Message:
-----------
stunnel/trunk: drop dependency on libz1 (direct binding detected this extraneous dep)

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

Modified: csw/mgar/pkg/stunnel/trunk/Makefile
===================================================================
--- csw/mgar/pkg/stunnel/trunk/Makefile	2013-04-05 22:21:52 UTC (rev 20598)
+++ csw/mgar/pkg/stunnel/trunk/Makefile	2013-04-05 22:27:04 UTC (rev 20599)
@@ -34,7 +34,6 @@
 
 RUNTIME_DEP_PKGS += CSWlibssl1-0-0
 RUNTIME_DEP_PKGS += CSWlibwrap1
-RUNTIME_DEP_PKGS += CSWlibz1
 
 # Make stunnel.conf-sample.in honor our $localstatedir. Issue description:
 # cf. http://marc.info/?l=stunnel-users&m=128035848632004&w=2

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 Apr  6 08:15:57 2013
From: guengel at users.sourceforge.net (guengel at users.sourceforge.net)
Date: Sat, 06 Apr 2013 06:15:57 +0000
Subject: [csw-devel] SF.net SVN: gar:[20600]
	csw/mgar/pkg/postgresql/branches/postgresql-8.4
Message-ID: <E1UOMPt-0006Zj-6c@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 20600
          http://gar.svn.sourceforge.net/gar/?rev=20600&view=rev
Author:   guengel
Date:     2013-04-06 06:15:55 +0000 (Sat, 06 Apr 2013)
Log Message:
-----------
postgresql/branches/postgresql-8.4: Fixed alternatives creation script.

Modified Paths:
--------------
    csw/mgar/pkg/postgresql/branches/postgresql-8.4/Makefile
    csw/mgar/pkg/postgresql/branches/postgresql-8.4/files/changelog.CSW

Modified: csw/mgar/pkg/postgresql/branches/postgresql-8.4/Makefile
===================================================================
--- csw/mgar/pkg/postgresql/branches/postgresql-8.4/Makefile	2013-04-05 22:27:04 UTC (rev 20599)
+++ csw/mgar/pkg/postgresql/branches/postgresql-8.4/Makefile	2013-04-06 06:15:55 UTC (rev 20600)
@@ -444,6 +444,7 @@
 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 firstbin=$(firstword $(BIN_NAMES_$(uppercase_$(pkg))))) \

Modified: csw/mgar/pkg/postgresql/branches/postgresql-8.4/files/changelog.CSW
===================================================================
--- csw/mgar/pkg/postgresql/branches/postgresql-8.4/files/changelog.CSW	2013-04-05 22:27:04 UTC (rev 20599)
+++ csw/mgar/pkg/postgresql/branches/postgresql-8.4/files/changelog.CSW	2013-04-06 06:15:55 UTC (rev 20600)
@@ -1,4 +1,4 @@
-postgresql84 (8.4.17,REV=2013.04.05)
+postgresql84 (8.4.17,REV=2013.04.06)
 
   * New upstream release 8.4.17.
 

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 Apr  6 09:41:15 2013
From: guengel at users.sourceforge.net (guengel at users.sourceforge.net)
Date: Sat, 06 Apr 2013 07:41:15 +0000
Subject: [csw-devel] SF.net SVN: gar:[20601]
	csw/mgar/pkg/postgresql/branches/postgresql-8.3
Message-ID: <E1UONkR-0008Ht-OK@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 20601
          http://gar.svn.sourceforge.net/gar/?rev=20601&view=rev
Author:   guengel
Date:     2013-04-06 07:41:15 +0000 (Sat, 06 Apr 2013)
Log Message:
-----------
postgresql/branches/postgresql-8.3: Fixed man page renaming.

Modified Paths:
--------------
    csw/mgar/pkg/postgresql/branches/postgresql-8.3/Makefile
    csw/mgar/pkg/postgresql/branches/postgresql-8.3/files/changelog.CSW

Modified: csw/mgar/pkg/postgresql/branches/postgresql-8.3/Makefile
===================================================================
--- csw/mgar/pkg/postgresql/branches/postgresql-8.3/Makefile	2013-04-06 06:15:55 UTC (rev 20600)
+++ csw/mgar/pkg/postgresql/branches/postgresql-8.3/Makefile	2013-04-06 07:41:15 UTC (rev 20601)
@@ -499,15 +499,12 @@
 		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} ; \
+			bname="`basename $${f_no_suffix}`" ; \
+			if echo $${bname} | ggrep -- '-$(BASE_VERSION_NODOT)$$' >/dev/null 2>&1 ; then \
+				: ; \
+			else \
+				mv $$f $${f_no_suffix}-$(BASE_VERSION_NODOT).$${suffix} ; \
+			fi ; \
 		done ;\
 	done
 # Change path names in documentation

Modified: csw/mgar/pkg/postgresql/branches/postgresql-8.3/files/changelog.CSW
===================================================================
--- csw/mgar/pkg/postgresql/branches/postgresql-8.3/files/changelog.CSW	2013-04-06 06:15:55 UTC (rev 20600)
+++ csw/mgar/pkg/postgresql/branches/postgresql-8.3/files/changelog.CSW	2013-04-06 07:41:15 UTC (rev 20601)
@@ -1,9 +1,10 @@
-postgresql83 (8.3.23,REV=2013.04.05)
+postgresql83 (8.3.23,REV=2013.04.06)
 
   * New upstream release 8.3.22.
 
  -- Rafael Ostertag <raos at opencsw.org>  Fri, 05 Apr 2013 09:24:10 +0200
 
+
 postgresql83 (8.3.22,REV=2012.12.09)
 
   * New upstream release 8.3.22.

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 Apr  6 09:41:51 2013
From: guengel at users.sourceforge.net (guengel at users.sourceforge.net)
Date: Sat, 06 Apr 2013 07:41:51 +0000
Subject: [csw-devel] SF.net SVN: gar:[20602]
 csw/mgar/pkg/postgresql/branches/postgresql-8.4/ Makefile
Message-ID: <E1UONl1-0008Iw-Qi@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 20602
          http://gar.svn.sourceforge.net/gar/?rev=20602&view=rev
Author:   guengel
Date:     2013-04-06 07:41:51 +0000 (Sat, 06 Apr 2013)
Log Message:
-----------
postgresql/branches/postgresql-8.4: Fixed man page renaming.

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

Modified: csw/mgar/pkg/postgresql/branches/postgresql-8.4/Makefile
===================================================================
--- csw/mgar/pkg/postgresql/branches/postgresql-8.4/Makefile	2013-04-06 07:41:15 UTC (rev 20601)
+++ csw/mgar/pkg/postgresql/branches/postgresql-8.4/Makefile	2013-04-06 07:41:51 UTC (rev 20602)
@@ -502,15 +502,12 @@
 		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} ; \
+			bname="`basename $${f_no_suffix}`" ; \
+			if echo $${bname} | ggrep -- '-$(BASE_VERSION_NODOT)$$' >/dev/null 2>&1 ; then \
+				: ; \
+			else \
+				mv $$f $${f_no_suffix}-$(BASE_VERSION_NODOT).$${suffix} ; \
+			fi ; \
 		done ;\
 	done
 # Change path names in documentation

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 Apr  6 09:42:18 2013
From: guengel at users.sourceforge.net (guengel at users.sourceforge.net)
Date: Sat, 06 Apr 2013 07:42:18 +0000
Subject: [csw-devel] SF.net SVN: gar:[20603]
	csw/mgar/pkg/postgresql/branches/postgresql-9.0
Message-ID: <E1UONlS-0008Jf-G5@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 20603
          http://gar.svn.sourceforge.net/gar/?rev=20603&view=rev
Author:   guengel
Date:     2013-04-06 07:42:17 +0000 (Sat, 06 Apr 2013)
Log Message:
-----------
postgresql/branches/postgresql-9.0: Fixed man page renaming.

Modified Paths:
--------------
    csw/mgar/pkg/postgresql/branches/postgresql-9.0/Makefile
    csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/changelog.CSW

Modified: csw/mgar/pkg/postgresql/branches/postgresql-9.0/Makefile
===================================================================
--- csw/mgar/pkg/postgresql/branches/postgresql-9.0/Makefile	2013-04-06 07:41:51 UTC (rev 20602)
+++ csw/mgar/pkg/postgresql/branches/postgresql-9.0/Makefile	2013-04-06 07:42:17 UTC (rev 20603)
@@ -502,15 +502,12 @@
 		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} ; \
+			bname="`basename $${f_no_suffix}`" ; \
+			if echo $${bname} | ggrep -- '-$(BASE_VERSION_NODOT)$$' >/dev/null 2>&1 ; then \
+				: ; \
+			else \
+				mv $$f $${f_no_suffix}-$(BASE_VERSION_NODOT).$${suffix} ; \
+			fi ; \
 		done ;\
 	done
 # Change path names in documentation

Modified: csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/changelog.CSW
===================================================================
--- csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/changelog.CSW	2013-04-06 07:41:51 UTC (rev 20602)
+++ csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/changelog.CSW	2013-04-06 07:42:17 UTC (rev 20603)
@@ -1,6 +1,6 @@
-postgresql90 (9.0.13,REV=2013.04.05)
+postgresql90 (9.0.13,REV=2013.04.06)
 
-  * New upstream release 9.0.13
+  * New upstream release 9.0.13.
 
  -- Rafael Ostertag <raos at opencsw.org>  Fri, 05 Apr 2013 10:36:50 +0200
 

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 Apr  6 09:42:40 2013
From: guengel at users.sourceforge.net (guengel at users.sourceforge.net)
Date: Sat, 06 Apr 2013 07:42:40 +0000
Subject: [csw-devel] SF.net SVN: gar:[20604]
	csw/mgar/pkg/postgresql/branches/postgresql-9.1
Message-ID: <E1UONlo-0008Km-F8@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 20604
          http://gar.svn.sourceforge.net/gar/?rev=20604&view=rev
Author:   guengel
Date:     2013-04-06 07:42:40 +0000 (Sat, 06 Apr 2013)
Log Message:
-----------
postgresql/branches/postgresql-9.1: Fixed man page renaming.

Modified Paths:
--------------
    csw/mgar/pkg/postgresql/branches/postgresql-9.1/Makefile
    csw/mgar/pkg/postgresql/branches/postgresql-9.1/files/changelog.CSW

Modified: csw/mgar/pkg/postgresql/branches/postgresql-9.1/Makefile
===================================================================
--- csw/mgar/pkg/postgresql/branches/postgresql-9.1/Makefile	2013-04-06 07:42:17 UTC (rev 20603)
+++ csw/mgar/pkg/postgresql/branches/postgresql-9.1/Makefile	2013-04-06 07:42:40 UTC (rev 20604)
@@ -562,15 +562,12 @@
 		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} ; \
+			bname="`basename $${f_no_suffix}`" ; \
+			if echo $${bname} | ggrep -- '-$(BASE_VERSION_NODOT)$$' >/dev/null 2>&1 ; then \
+				: ; \
+			else \
+				mv $$f $${f_no_suffix}-$(BASE_VERSION_NODOT).$${suffix} ; \
+			fi ; \
 		done ;\
 	done
 # Change path names in documentation

Modified: csw/mgar/pkg/postgresql/branches/postgresql-9.1/files/changelog.CSW
===================================================================
--- csw/mgar/pkg/postgresql/branches/postgresql-9.1/files/changelog.CSW	2013-04-06 07:42:17 UTC (rev 20603)
+++ csw/mgar/pkg/postgresql/branches/postgresql-9.1/files/changelog.CSW	2013-04-06 07:42:40 UTC (rev 20604)
@@ -1,4 +1,4 @@
-postgresql91 (9.1.9,REV=2013.04.05)
+postgresql91 (9.1.9,REV=2013.04.06)
 
   * New upstream release 9.1.9.
 

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 Apr  6 09:43:09 2013
From: guengel at users.sourceforge.net (guengel at users.sourceforge.net)
Date: Sat, 06 Apr 2013 07:43:09 +0000
Subject: [csw-devel] SF.net SVN: gar:[20605] csw/mgar/pkg/postgresql/trunk
Message-ID: <E1UONmH-0008LF-Lf@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 20605
          http://gar.svn.sourceforge.net/gar/?rev=20605&view=rev
Author:   guengel
Date:     2013-04-06 07:43:09 +0000 (Sat, 06 Apr 2013)
Log Message:
-----------
postgresql/trunk: Fixed man page renaming.

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

Modified: csw/mgar/pkg/postgresql/trunk/Makefile
===================================================================
--- csw/mgar/pkg/postgresql/trunk/Makefile	2013-04-06 07:42:40 UTC (rev 20604)
+++ csw/mgar/pkg/postgresql/trunk/Makefile	2013-04-06 07:43:09 UTC (rev 20605)
@@ -574,15 +574,12 @@
 		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} ; \
+			bname="`basename $${f_no_suffix}`" ; \
+			if echo $${bname} | ggrep -- '-$(BASE_VERSION_NODOT)$$' >/dev/null 2>&1 ; then \
+				: ; \
+			else \
+				mv $$f $${f_no_suffix}-$(BASE_VERSION_NODOT).$${suffix} ; \
+			fi ; \
 		done ;\
 	done
 # Change path names in documentation

Modified: csw/mgar/pkg/postgresql/trunk/files/changelog.CSW
===================================================================
--- csw/mgar/pkg/postgresql/trunk/files/changelog.CSW	2013-04-06 07:42:40 UTC (rev 20604)
+++ csw/mgar/pkg/postgresql/trunk/files/changelog.CSW	2013-04-06 07:43:09 UTC (rev 20605)
@@ -1,4 +1,4 @@
-postgresql92 (9.2.4,REV=2013.04.05)
+postgresql92 (9.2.4,REV=2013.04.06)
 
   * New upstream release 9.2.4.
 

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 Apr  6 17:17:18 2013
From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net)
Date: Sat, 06 Apr 2013 15:17:18 +0000
Subject: [csw-devel] SF.net SVN: gar:[20606]
	csw/mgar/pkg/siege/trunk/Makefile
Message-ID: <E1UOUrm-0000jO-1z@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 20606
          http://gar.svn.sourceforge.net/gar/?rev=20606&view=rev
Author:   chninkel
Date:     2013-04-06 15:17:17 +0000 (Sat, 06 Apr 2013)
Log Message:
-----------
siege/trunk: updated recipe to rebuild against libssl 1.0.0

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

Modified: csw/mgar/pkg/siege/trunk/Makefile
===================================================================
--- csw/mgar/pkg/siege/trunk/Makefile	2013-04-06 07:43:09 UTC (rev 20605)
+++ csw/mgar/pkg/siege/trunk/Makefile	2013-04-06 15:17:17 UTC (rev 20606)
@@ -18,8 +18,17 @@
 UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
 
 # we require
-RUNTIME_DEP_PKGS = CSWosslrt
+RUNTIME_DEP_PKGS = CSWlibssl1-0-0
 
+# the references are located in comments and are harmless, so the errors can be ignored
+CHECKPKG_OVERRIDES_CSWsiege += file-with-bad-content|/usr/local|root/opt/csw/bin/siege.config
+CHECKPKG_OVERRIDES_CSWsiege += file-with-bad-content|/usr/local|root/opt/csw/share/man/man5/urls_txt.5
+CHECKPKG_OVERRIDES_CSWsiege += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/siege.1
+CHECKPKG_OVERRIDES_CSWsiege += file-with-bad-content|/export/home|root/opt/csw/bin/siege.config
+
+# We use SUNW perl and not CSW perl
+CHECKPKG_OVERRIDES_CSWsiege += missing-dependency|CSWperl
+
 # handle config file
 PRESERVECONF = $(sysconfdir)/urls.txt
 
@@ -31,6 +40,11 @@
 CONFIGURE_ARGS  = $(DIRPATHS)
 CONFIGURE_ARGS += --with-ssl=$(prefix)
 
+# No need to depend on opencsw perl for the simple
+# perl script sieve2csv.pl
+EXTRA_CONFIGURE_ENV += PERL="/usr/bin/perl"
+
+
 # no build tests
 SKIPTEST = 1
 

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 Apr  6 17:45:35 2013
From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net)
Date: Sat, 06 Apr 2013 15:45:35 +0000
Subject: [csw-devel] SF.net SVN: gar:[20607] csw/mgar/pkg/pound/trunk
Message-ID: <E1UOVJ9-0007o1-08@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 20607
          http://gar.svn.sourceforge.net/gar/?rev=20607&view=rev
Author:   chninkel
Date:     2013-04-06 15:45:34 +0000 (Sat, 06 Apr 2013)
Log Message:
-----------
pound/trunk: temporary revert to 2.4.5 to rebuild against libssl 1.0.0

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

Added Paths:
-----------
    csw/mgar/pkg/pound/trunk/files/openssl1.0.0.patch

Modified: csw/mgar/pkg/pound/trunk/Makefile
===================================================================
--- csw/mgar/pkg/pound/trunk/Makefile	2013-04-06 15:17:17 UTC (rev 20606)
+++ csw/mgar/pkg/pound/trunk/Makefile	2013-04-06 15:45:34 UTC (rev 20607)
@@ -1,5 +1,5 @@
-NAME = pound
-VERSION = 2.6
+NAME = pound2
+VERSION = 2.4.5
 GARTYPE = v2
 
 DESCRIPTION = Reverse proxy load balancer
@@ -28,17 +28,18 @@
 RUNTIME_DEP_PKGS += CSWlibssl-dev
 RUNTIME_DEP_PKGS += CSWlibcurl-dev
 
-PACKAGES += CSWpound
-SPKG_DESC_CSWpound = Reverse proxy load balancer
+SPKG_DESC_CSWpound2 = Reverse proxy load balancer
 # PKGFILES is catchall
-RUNTIME_DEP_PKGS_CSWpound += CSWlibpcreposix0
-RUNTIME_DEP_PKGS_CSWpound += CSWlibssl1-0-0
-OBSOLETED_BY_CSWpound = CSWpound2
+RUNTIME_DEP_PKGS_CSWpound2 += CSWlibpcreposix0
+RUNTIME_DEP_PKGS_CSWpound2 += CSWlibssl1-0-0
 
 # This is just for example scripts
 CHECKPKG_OVERRIDES_CSWpound += missing-dependency|CSWpython
 CHECKPKG_OVERRIDES_CSWpound += file-with-bad-content|/usr/local|root/opt/csw/share/doc/pound/README
 
+# Patch taken from upstream to compile against libssl 1.0.0
+PATCHFILES = openssl1.0.0.patch
+
 EXTRA_DOCS += README
 EXTRA_DOCS += FAQ
 EXTRA_DOCS += CHANGELOG

Modified: csw/mgar/pkg/pound/trunk/checksums
===================================================================
--- csw/mgar/pkg/pound/trunk/checksums	2013-04-06 15:17:17 UTC (rev 20606)
+++ csw/mgar/pkg/pound/trunk/checksums	2013-04-06 15:45:34 UTC (rev 20607)
@@ -1 +1 @@
-8c913b527332694943c4c67c8f152071  Pound-2.6.tgz
+4c4613e857ee14c06c61ab09e28ae503  Pound-2.4.5.tgz

Added: csw/mgar/pkg/pound/trunk/files/openssl1.0.0.patch
===================================================================
--- csw/mgar/pkg/pound/trunk/files/openssl1.0.0.patch	                        (rev 0)
+++ csw/mgar/pkg/pound/trunk/files/openssl1.0.0.patch	2013-04-06 15:45:34 UTC (rev 20607)
@@ -0,0 +1,310 @@
+Description: Port to OpenSSL 1.0.0. Patch backported from upstream version
+ 2.6c.
+Author: Ilya Barygin <barygin at gmail.com>
+Bug-Debian: http://bugs.debian.org/622041
+--- pound-2.5.orig/svc.c
++++ pound-2.5/svc.c
+@@ -27,12 +27,17 @@
+ 
+ #include    "pound.h"
+ 
++#ifndef LHASH_OF
++#define LHASH_OF(x) LHASH
++#define CHECKED_LHASH_OF(type, h) h
++#endif
++
+ /*
+  * Add a new key/content pair to a hash table
+  * the table should be already locked
+  */
+ static void
+-t_add(LHASH *const tab, const char *key, const void *content, const size_t cont_len)
++t_add(LHASH_OF(TABNODE) *const tab, const char *key, const void *content, const size_t cont_len)
+ {
+     TABNODE *t, *old;
+ 
+@@ -53,7 +58,11 @@
+     }
+     memcpy(t->content, content, cont_len);
+     t->last_acc = time(NULL);
++#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++    if((old = LHM_lh_insert(TABNODE, tab, t)) != NULL) {
++#else
+     if((old = (TABNODE *)lh_insert(tab, t)) != NULL) {
++#endif
+         free(old->key);
+         free(old->content);
+         free(old);
+@@ -68,12 +77,16 @@
+  * side-effect: update the time of last access
+  */
+ static void *
+-t_find(LHASH *const tab, char *const key)
++t_find(LHASH_OF(TABNODE) *const tab, char *const key)
+ {
+     TABNODE t, *res;
+ 
+     t.key = key;
++#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++    if((res = LHM_lh_retrieve(TABNODE, tab, &t)) != NULL) {
++#else
+     if((res = (TABNODE *)lh_retrieve(tab, &t)) != NULL) {
++#endif
+         res->last_acc = time(NULL);
+         return res->content;
+     }
+@@ -84,12 +97,16 @@
+  * Delete a key
+  */
+ static void
+-t_remove(LHASH *const tab, char *const key)
++t_remove(LHASH_OF(TABNODE) *const tab, char *const key)
+ {
+     TABNODE t, *res;
+ 
+     t.key = key;
++#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++    if((res = LHM_lh_delete(TABNODE, tab, &t)) != NULL) {
++#else
+     if((res = (TABNODE *)lh_delete(tab, &t)) != NULL) {
++#endif
+         free(res->key);
+         free(res->content);
+         free(res);
+@@ -98,59 +115,77 @@
+ }
+ 
+ typedef struct  {
+-    LHASH   *tab;
++    LHASH_OF(TABNODE)   *tab;
+     time_t  lim;
+     void    *content;
+     int     cont_len;
+ }   ALL_ARG;
+ 
+ static void
+-t_old(TABNODE *t, void *arg)
++t_old_doall_arg(TABNODE *t, ALL_ARG *a)
+ {
+-    ALL_ARG *a;
+ 
+-    a = (ALL_ARG *)arg;
+     if(t->last_acc < a->lim)
++#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++        LHM_lh_delete(TABNODE, a->tab, t);
++#else
+         lh_delete(a->tab, t);
++#endif
+     return;
+ }
+-IMPLEMENT_LHASH_DOALL_ARG_FN(t_old, TABNODE *, void *)
++#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++IMPLEMENT_LHASH_DOALL_ARG_FN(t_old, TABNODE, ALL_ARG)
++#else
++#define t_old t_old_doall_arg
++IMPLEMENT_LHASH_DOALL_ARG_FN(t_old, TABNODE *, ALL_ARG *)
++#endif
+ 
+ /*
+  * Expire all old nodes
+  */
+ static void
+-t_expire(LHASH *const tab, const time_t lim)
++t_expire(LHASH_OF(TABNODE) *const tab, const time_t lim)
+ {
+     ALL_ARG a;
+     int down_load;
+ 
+     a.tab = tab;
+     a.lim = lim;
+-    down_load = tab->down_load;
+-    tab->down_load = 0;
++    down_load = CHECKED_LHASH_OF(TABNODE, tab)->down_load;
++    CHECKED_LHASH_OF(TABNODE, tab)->down_load = 0;
++#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++    LHM_lh_doall_arg(TABNODE, tab, LHASH_DOALL_ARG_FN(t_old), ALL_ARG, &a);
++#else
+     lh_doall_arg(tab, LHASH_DOALL_ARG_FN(t_old), &a);
+-    tab->down_load = down_load;
++#endif
++    CHECKED_LHASH_OF(TABNODE, tab)->down_load = down_load;
+     return;
+ }
+ 
+ static void
+-t_cont(TABNODE *t, void *arg)
++t_cont_doall_arg(TABNODE *t, ALL_ARG *arg)
+ {
+-    ALL_ARG *a;
+ 
+-    a = (ALL_ARG *)arg;
+-    if(memcmp(t->content, a->content, a->cont_len) == 0)
+-        lh_delete(a->tab, t);
++    if(memcmp(t->content, arg->content, arg->cont_len) == 0)
++#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++        LHM_lh_delete(TABNODE, arg->tab, t);
++#else
++        lh_delete(arg->tab, t);
++#endif
+     return;
+ }
+-IMPLEMENT_LHASH_DOALL_ARG_FN(t_cont, TABNODE *, void *)
++#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++IMPLEMENT_LHASH_DOALL_ARG_FN(t_cont, TABNODE, ALL_ARG)
++#else
++#define t_cont t_cont_doall_arg
++IMPLEMENT_LHASH_DOALL_ARG_FN(t_cont, TABNODE *, ALL_ARG *)
++#endif
+ 
+ /*
+  * Remove all nodes with the given content
+  */
+ static void
+-t_clean(LHASH *const tab, void *const content, const size_t cont_len)
++t_clean(LHASH_OF(TABNODE) *const tab, void *const content, const size_t cont_len)
+ {
+     ALL_ARG a;
+     int down_load;
+@@ -158,10 +193,14 @@
+     a.tab = tab;
+     a.content = content;
+     a.cont_len = cont_len;
+-    down_load = tab->down_load;
+-    tab->down_load = 0;
++    down_load = CHECKED_LHASH_OF(TABNODE, tab)->down_load;
++    CHECKED_LHASH_OF(TABNODE, tab)->down_load = 0;
++#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++    LHM_lh_doall_arg(TABNODE, tab, LHASH_DOALL_ARG_FN(t_cont), ALL_ARG, &a);
++#else
+     lh_doall_arg(tab, LHASH_DOALL_ARG_FN(t_cont), &a);
+-    tab->down_load = down_load;
++#endif
++    CHECKED_LHASH_OF(TABNODE, tab)->down_load = down_load;
+     return;
+ }
+ 
+@@ -1410,41 +1449,47 @@
+ }   DUMP_ARG;
+ 
+ static void
+-t_dump(TABNODE *t, void *arg)
++t_dump_doall_arg(TABNODE *t, DUMP_ARG *arg)
+ {
+-    DUMP_ARG    *a;
+     BACKEND     *be, *bep;
+     int         n_be, sz;
+ 
+-    a = (DUMP_ARG *)arg;
+     memcpy(&bep, t->content, sizeof(bep));
+-    for(n_be = 0, be = a->backends; be; be = be->next, n_be++)
++    for(n_be = 0, be = arg->backends; be; be = be->next, n_be++)
+         if(be == bep)
+             break;
+     if(!be)
+         /* should NEVER happen */
+         n_be = 0;
+-    write(a->control_sock, t, sizeof(TABNODE));
+-    write(a->control_sock, &n_be, sizeof(n_be));
++    write(arg->control_sock, t, sizeof(TABNODE));
++    write(arg->control_sock, &n_be, sizeof(n_be));
+     sz = strlen(t->key);
+-    write(a->control_sock, &sz, sizeof(sz));
+-    write(a->control_sock, t->key, sz);
++    write(arg->control_sock, &sz, sizeof(sz));
++    write(arg->control_sock, t->key, sz);
+     return;
+ }
+-
+-IMPLEMENT_LHASH_DOALL_ARG_FN(t_dump, TABNODE *, void *)
++#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++IMPLEMENT_LHASH_DOALL_ARG_FN(t_dump, TABNODE, DUMP_ARG)
++#else
++#define t_dump t_dump_doall_arg
++IMPLEMENT_LHASH_DOALL_ARG_FN(t_dump, TABNODE *, DUMP_ARG *)
++#endif
+ 
+ /*
+  * write sessions to the control socket
+  */
+ static void
+-dump_sess(const int control_sock, LHASH *const sess, BACKEND *const backends)
++dump_sess(const int control_sock, LHASH_OF(TABNODE) *const sess, BACKEND *const backends)
+ {
+     DUMP_ARG a;
+ 
+     a.control_sock = control_sock;
+     a.backends = backends;
++#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++    LHM_lh_doall_arg(TABNODE, sess, LHASH_DOALL_ARG_FN(t_dump), DUMP_ARG, &a);
++#else
+     lh_doall_arg(sess, LHASH_DOALL_ARG_FN(t_dump), &a);
++#endif
+     return;
+ }
+ 
+--- pound-2.5.orig/pound.h
++++ pound-2.5/pound.h
+@@ -322,6 +322,10 @@
+ /* maximal session key size */
+ #define KEY_SIZE    127
+ 
++#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++DECLARE_LHASH_OF(TABNODE);
++#endif
++
+ /* service definition */
+ typedef struct _service {
+     char                name[KEY_SIZE + 1]; /* symbolic name */
+@@ -337,7 +341,11 @@
+     int                 sess_ttl;   /* session time-to-live */
+     regex_t             sess_pat;   /* pattern to match the session data */
+     char                *sess_parm; /* session cookie or parameter */
++#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++    LHASH_OF(TABNODE)   *sessions;  /* currently active sessions */
++#else
+     LHASH               *sessions;  /* currently active sessions */
++#endif
+     int                 dynscale;   /* true if the back-ends should be dynamically rescaled */
+     int                 disabled;   /* true if the service is disabled */
+     struct _service     *next;
+--- pound-2.5.orig/config.c
++++ pound-2.5/config.c
+@@ -431,14 +431,25 @@
+         res = (res ^ *k++) * 16777619;
+     return res;
+ }
+-static IMPLEMENT_LHASH_HASH_FN(t_hash, const TABNODE *)
+ 
++#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++static IMPLEMENT_LHASH_HASH_FN(t, TABNODE)
++#else
++static IMPLEMENT_LHASH_HASH_FN(t_hash, const TABNODE *)
++#endif
++ 
+ static int
+ t_cmp(const TABNODE *d1, const TABNODE *d2)
+ {
+     return strcmp(d1->key, d2->key);
+ }
++
++#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++static IMPLEMENT_LHASH_COMP_FN(t, TABNODE)
++#else
+ static IMPLEMENT_LHASH_COMP_FN(t_cmp, const TABNODE *)
++#endif
++
+ 
+ /*
+  * parse a service
+@@ -460,7 +471,11 @@
+     pthread_mutex_init(&res->mut, NULL);
+     if(svc_name)
+         strncpy(res->name, svc_name, KEY_SIZE);
++#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++    if((res->sessions = LHM_lh_new(TABNODE, t)) == NULL) {
++#else
+     if((res->sessions = lh_new(LHASH_HASH_FN(t_hash), LHASH_COMP_FN(t_cmp))) == NULL) {
++#endif
+         logmsg(LOG_ERR, "line %d: lh_new failed - aborted", n_lin);
+         exit(1);
+    }

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 Apr  6 18:12:34 2013
From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net)
Date: Sat, 06 Apr 2013 16:12:34 +0000
Subject: [csw-devel] SF.net SVN: gar:[20608]
	csw/mgar/pkg/monit/trunk/Makefile
Message-ID: <E1UOVjG-0008UP-DV@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 20608
          http://gar.svn.sourceforge.net/gar/?rev=20608&view=rev
Author:   chninkel
Date:     2013-04-06 16:12:34 +0000 (Sat, 06 Apr 2013)
Log Message:
-----------
monit/trunk: temporary revert to 4.10.1 to build against libssl 1.0.0

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

Modified: csw/mgar/pkg/monit/trunk/Makefile
===================================================================
--- csw/mgar/pkg/monit/trunk/Makefile	2013-04-06 15:45:34 UTC (rev 20607)
+++ csw/mgar/pkg/monit/trunk/Makefile	2013-04-06 16:12:34 UTC (rev 20608)
@@ -2,7 +2,7 @@
 # TODO (release-critical prefixed with !, non release-critical with *)
 #
 NAME = monit
-VERSION = 5.3.1
+VERSION = 4.10.1
 GARTYPE = v2
 
 DESCRIPTION = Utility for monitoring and managing daemons or similar programs
@@ -15,9 +15,13 @@
 VENDOR_URL = http://mmonit.com/monit/
 MASTER_SITES = http://mmonit.com/monit/dist/
 DISTFILES  = $(DISTNAME).tar.gz
-PATCHFILES += 0001-Drop-some-build-flags-that-get-hard-coded-by-configu.patch
-PATCHFILES += 0002-fix-usr-local-references-drop-usr-local-etc-monitrc-.patch
+#PATCHFILES += 0001-Drop-some-build-flags-that-get-hard-coded-by-configu.patch
+#PATCHFILES += 0002-fix-usr-local-references-drop-usr-local-etc-monitrc-.patch
 
+CHECKPKG_OVERRIDES_CSWmonit += file-with-bad-content|/usr/local|root/opt/csw/bin/amd64/monit
+CHECKPKG_OVERRIDES_CSWmonit += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/monit.1
+
+
 GARCOMPILER = GNU
 BUILD64_ONLY = 1
 
@@ -28,5 +32,7 @@
 
 RUNTIME_DEP_PKGS_CSWmonit += CSWlibssl1-0-0
 
+TEST_SCRIPTS = 
+
 include gar/category.mk
 

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


From chninkel at users.sourceforge.net  Sat Apr  6 18:17:18 2013
From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net)
Date: Sat, 06 Apr 2013 16:17:18 +0000
Subject: [csw-devel] SF.net SVN: gar:[20609]
	csw/mgar/pkg/monit/trunk/checksums
Message-ID: <E1UOVnq-0005aR-Bu@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 20609
          http://gar.svn.sourceforge.net/gar/?rev=20609&view=rev
Author:   chninkel
Date:     2013-04-06 16:17:17 +0000 (Sat, 06 Apr 2013)
Log Message:
-----------
monit/trunk: checksum update

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

Modified: csw/mgar/pkg/monit/trunk/checksums
===================================================================
--- csw/mgar/pkg/monit/trunk/checksums	2013-04-06 16:12:34 UTC (rev 20608)
+++ csw/mgar/pkg/monit/trunk/checksums	2013-04-06 16:17:17 UTC (rev 20609)
@@ -1 +1 @@
-2e97eac9750f68945ca860028d9ef0f3  monit-5.3.1.tar.gz
+d3143b0bbd79b53f1b019d2fc1dae656  monit-4.10.1.tar.gz

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


From chninkel at users.sourceforge.net  Sat Apr  6 18:18:15 2013
From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net)
Date: Sat, 06 Apr 2013 16:18:15 +0000
Subject: [csw-devel] SF.net SVN: gar:[20610] csw/mgar/pkg/nginx/trunk
Message-ID: <E1UOVol-0005bq-F7@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 20610
          http://gar.svn.sourceforge.net/gar/?rev=20610&view=rev
Author:   chninkel
Date:     2013-04-06 16:18:15 +0000 (Sat, 06 Apr 2013)
Log Message:
-----------
nginx/trunk: reverted to 1.1.8 to rebuild against openssl 1.0.0

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

Modified: csw/mgar/pkg/nginx/trunk/Makefile
===================================================================
--- csw/mgar/pkg/nginx/trunk/Makefile	2013-04-06 16:17:17 UTC (rev 20609)
+++ csw/mgar/pkg/nginx/trunk/Makefile	2013-04-06 16:18:15 UTC (rev 20610)
@@ -1,5 +1,5 @@
 NAME       = nginx
-VERSION    = 1.2.5
+VERSION    = 1.1.8
 GARTYPE = v2
 
 GARCOMPILER = SOS11
@@ -19,19 +19,11 @@
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = -(\d+(?:\.\d+)*).tar.gz
 
-BUILD_DEP_PKGS += CSWlibz-dev
+BUILD_DEP_PKGS = CSWlibz-dev
+RUNTIME_DEP_PKGS = CSWlibssl1-0-0 CSWlibpcre1 CSWlibz1 CSWperl
 
-PACKAGES += CSWnginx
-SPKG_DESC_CSWnginx = HTTP server and mail proxy server
-RUNTIME_DEP_PKGS_CSWnginx += CSWlibexslt0
-RUNTIME_DEP_PKGS_CSWnginx += CSWlibgeoip1
-RUNTIME_DEP_PKGS_CSWnginx += CSWlibssl1-0-0
-RUNTIME_DEP_PKGS_CSWnginx += CSWlibpcre1
-RUNTIME_DEP_PKGS_CSWnginx += CSWlibxslt1
-RUNTIME_DEP_PKGS_CSWnginx += CSWlibgd2
-RUNTIME_DEP_PKGS_CSWnginx += CSWlibxml2-2
-RUNTIME_DEP_PKGS_CSWnginx += CSWlibz1
-RUNTIME_DEP_PKGS_CSWnginx += CSWperl
+PACKAGING_PLATFORMS  = solaris9-sparc  solaris9-i386
+PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386
 
 # default sparc arch is set to sparcv8plus because nginx contains
 # assembler parts specific to v8plus and v9 arches:
@@ -43,15 +35,12 @@
 #	casxa   [%o2] 0x80, %o1, %o0
 #	.end
 
-# These are the default now
+ISAEXEC                = 1
+ISA_DEFAULT_sparc      = sparcv8plus
+EXTRA_BUILD_ISAS_i386  = amd64
+EXTRA_BUILD_ISAS_sparc = sparcv9
 
-#ISA_DEFAULT_sparc      = sparcv8plus
-#EXTRA_BUILD_ISAS_i386  = pentium_pro amd64
-#EXTRA_BUILD_ISAS_sparc = sparcv9
-
-ISAEXEC = 1
-
-NGINXCPU_i386          = pentium
+NGINXCPU_i386          = pentium3
 NGINXCPU_pentium_pro   = pentium3
 NGINXCPU_sparcv8plus   = sparc32
 NGINXCPU_sparcv9       = sparc64
@@ -60,6 +49,9 @@
 
 CFLAGS =
 
+sysconfdir=/etc/opt/csw
+localstatedir=/var/opt/csw
+
 #CONFIGURE_ARGS += --with-debug
 CONFIGURE_ARGS += --with-cpu-opt=$(NGINXCPU)
 CONFIGURE_ARGS += --with-cc-opt="-I$(includedir) -I$(includedir)/openssl"
@@ -80,34 +72,15 @@
 CONFIGURE_ARGS += --with-http_addition_module
 CONFIGURE_ARGS += --with-http_dav_module
 CONFIGURE_ARGS += --with-http_flv_module
-CONFIGURE_ARGS += --with-http_mp4_module
 CONFIGURE_ARGS += --with-http_realip_module
 CONFIGURE_ARGS += --with-http_secure_link_module
 CONFIGURE_ARGS += --with-http_ssl_module
 CONFIGURE_ARGS += --with-http_stub_status_module
-CONFIGURE_ARGS += --with-http_gzip_static_module
-CONFIGURE_ARGS += --with-http_geoip_module
-CONFIGURE_ARGS += --with-http_xslt_module
-CONFIGURE_ARGS += --with-http_image_filter_module
-CONFIGURE_ARGS += --with-http_sub_module
-CONFIGURE_ARGS += --with-http_random_index_module
-CONFIGURE_ARGS += --with-http_secure_link_module
-CONFIGURE_ARGS += --with-http_degradation_module
-CONFIGURE_ARGS += --with-http_stub_status_module
-# Enable when we have 64 bit perl
-# CONFIGURE_ARGS += --with-http_perl_module
 
 TEST_SCRIPTS =
 
 INITSMF      = $(sysconfdir)/init.d/cswnginx
-PRESERVECONF += $(sysconfdir)/nginx/fastcgi.conf
-PRESERVECONF += $(sysconfdir)/nginx/fastcgi_params
-PRESERVECONF += $(sysconfdir)/nginx/mime.types
-PRESERVECONF += $(sysconfdir)/nginx/nginx.conf
-PRESERVECONF += $(sysconfdir)/nginx/scgi_params
-PRESERVECONF += $(sysconfdir)/nginx/uwsgi_params
-PRESERVECONF += $(localstatedir)/nginx/html/50x.html
-PRESERVECONF += $(localstatedir)/nginx/html/index.html
+PRESERVECONF = $(sysconfdir)/nginx/fastcgi.conf $(sysconfdir)/nginx/fastcgi_params $(sysconfdir)/nginx/mime.types $(sysconfdir)/nginx/nginx.conf $(sysconfdir)/nginx/scgi_params $(sysconfdir)/nginx/uwsgi_params $(localstatedir)/nginx/html/50x.html $(localstatedir)/nginx/html/index.html
 
 NGINXDOCS    = CHANGES CHANGES.ru LICENSE README
 
@@ -117,7 +90,7 @@
 post-configure-modulated:
 	gsed -i  s#/...ISALIST#/'$$ISALIST'# $(WORKSRC)/objs/ngx_auto_config.h
 	gsed -i 's#  pause#  rep; nop#'      $(WORKSRC)/src/os/unix/ngx_sunpro_amd64.il
-	@$(MAKECOOKIE)
+	$(MAKECOOKIE)
 
 post-install-modulated:
 	ginstall -d $(DESTDIR)$(sysconfdir)/init.d
@@ -136,4 +109,4 @@
 	cp -r contrib/* $(DESTDIR)$(sharedstatedir)/nginx/contrib; \
 	cp $(NGINXDOCS) $(DESTDIR)$(docdir)/nginx
 	rm -rf $(DESTDIR)/var/run/nginx
-	@$(MAKECOOKIE)
+	$(MAKECOOKIE)

Modified: csw/mgar/pkg/nginx/trunk/checksums
===================================================================
--- csw/mgar/pkg/nginx/trunk/checksums	2013-04-06 16:17:17 UTC (rev 20609)
+++ csw/mgar/pkg/nginx/trunk/checksums	2013-04-06 16:18:15 UTC (rev 20610)
@@ -1 +1 @@
-4f5a55187a3d45fa37d99d07ddd90800  nginx-1.2.5.tar.gz
+f9f3e60f498b7ffac778ee72ea7db309  nginx-1.1.8.tar.gz

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


From chninkel at users.sourceforge.net  Sat Apr  6 18:19:52 2013
From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net)
Date: Sat, 06 Apr 2013 16:19:52 +0000
Subject: [csw-devel] SF.net SVN: gar:[20611] csw/mgar/pkg/pound/trunk
Message-ID: <E1UOVqK-0005fD-31@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 20611
          http://gar.svn.sourceforge.net/gar/?rev=20611&view=rev
Author:   chninkel
Date:     2013-04-06 16:19:51 +0000 (Sat, 06 Apr 2013)
Log Message:
-----------
pound/trunk: reverted to the recipe of the last shipped package to rebuild against libssl 1.0.0

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

Removed Paths:
-------------
    csw/mgar/pkg/pound/trunk/files/openssl1.0.0.patch

Modified: csw/mgar/pkg/pound/trunk/Makefile
===================================================================
--- csw/mgar/pkg/pound/trunk/Makefile	2013-04-06 16:18:15 UTC (rev 20610)
+++ csw/mgar/pkg/pound/trunk/Makefile	2013-04-06 16:19:51 UTC (rev 20611)
@@ -12,67 +12,63 @@
 endef
 
 MASTER_SITES = http://www.apsis.ch/pound/
-DISTNAME = Pound-$(VERSION)
-DISTFILES += $(DISTNAME).tgz
+DISTFILES  = Pound-$(VERSION).tgz
+DISTNAME   = Pound-$(VERSION)
 
-# adjust log/run files
-PATCHFILES  = patch-pound.h
-PATCHFILES += patch-pound.8
+# We define upstream file regex so we can be notifed of new upstream software release
+UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tgz
 
-PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
+# we require
+RUNTIME_DEP_PKGS = CSWlibssl1-0-0 CSWlibpcreposix0
 
-VENDOR_URL = http://www.apsis.ch/pound/
+# This is just for example scripts we can ignore it
+CHECKPKG_OVERRIDES_CSWpound2 += missing-dependency|CSWpython
 
-LICENSE = GPL.txt
+# These are harmless reference located in doc or man files
+CHECKPKG_OVERRIDES_CSWpound2 += file-with-bad-content|/usr/local|root/opt/csw/share/doc/pound2/README
+CHECKPKG_OVERRIDES_CSWpound2 += file-with-bad-content|/usr/local|root/opt/csw/share/man/man8/pound2.8
 
-RUNTIME_DEP_PKGS += CSWlibssl-dev
-RUNTIME_DEP_PKGS += CSWlibcurl-dev
 
-SPKG_DESC_CSWpound2 = Reverse proxy load balancer
-# PKGFILES is catchall
-RUNTIME_DEP_PKGS_CSWpound2 += CSWlibpcreposix0
-RUNTIME_DEP_PKGS_CSWpound2 += CSWlibssl1-0-0
-
-# This is just for example scripts
-CHECKPKG_OVERRIDES_CSWpound += missing-dependency|CSWpython
-CHECKPKG_OVERRIDES_CSWpound += file-with-bad-content|/usr/local|root/opt/csw/share/doc/pound/README
-
-# Patch taken from upstream to compile against libssl 1.0.0
-PATCHFILES = openssl1.0.0.patch
-
-EXTRA_DOCS += README
-EXTRA_DOCS += FAQ
-EXTRA_DOCS += CHANGELOG
-EXTRA_DOCS += z2_2_5_1.py
-EXTRA_DOCS += z2_2_6_1.py
-
 CONFIGURE_ARGS  = $(DIRPATHS)
 CONFIGURE_ARGS += --enable-super
 CONFIGURE_ARGS += --enable-msdav
 CONFIGURE_ARGS += --with-maxbuf=8192
 CONFIGURE_ARGS += --with-ssl=$(prefix)
 
+# adjust log/run files
+PATCHFILES  = patch-pound.h
+PATCHFILES += patch-pound.8
+
+# Patch taken from upstream to compile against libssl 1.0.0
+PATCHFILES = openssl1.0.0.patch
+
 # No test suite available
 TEST_SCRIPTS =
 
 # use a custom install
-INSTALL_SCRIPTS = custom extra-docs
+INSTALL_SCRIPTS = custom docs
 
-PRESERVECONF = $(sysconfdir)/pound.cfg
-
 include gar/category.mk
 
 install-custom: 
 	ginstall -d $(DESTDIR)$(sbindir)
-	ginstall -m 555 $(WORKSRC)/pound $(DESTDIR)$(sbindir)/pound
-	ginstall -m 555 $(WORKSRC)/poundctl $(DESTDIR)$(sbindir)/poundctl
+	ginstall -m 555 $(WORKSRC)/pound $(DESTDIR)$(sbindir)/pound2
+	ginstall -m 555 $(WORKSRC)/poundctl $(DESTDIR)$(sbindir)/pound2ctl
 	ginstall -d $(DESTDIR)$(mandir)/man8
-	ginstall -m 644 $(WORKSRC)/pound.8 $(DESTDIR)$(mandir)/man8/pound.8
-	ginstall -m 644 $(WORKSRC)/poundctl.8 $(DESTDIR)$(mandir)/man8/poundctl.8
+	ginstall -m 644 $(WORKSRC)/pound.8 $(DESTDIR)$(mandir)/man8/pound2.8
+	ginstall -m 644 $(WORKSRC)/poundctl.8 $(DESTDIR)$(mandir)/man8/pound2ctl.8
 	ginstall -d $(DESTDIR)$(sysconfdir)/$(NAME)
-	ginstall -m 644 $(FILEDIR)/pound2-sample.cfg $(DESTDIR)$(sysconfdir)/pound.cfg
+	ginstall -m 644 $(FILEDIR)/pound2-sample.cfg $(DESTDIR)$(sysconfdir)/$(NAME)
+	ginstall -d $(DESTDIR)/var/opt/csw/run
 
-install-extra-docs:
+docs-list  = $(WORKSRC)/README
+docs-list += $(WORKSRC)/FAQ
+docs-list += $(WORKSRC)/CHANGELOG
+docs-list += $(WORKSRC)/z2_2_5_1.py
+docs-list += $(WORKSRC)/z2_2_6_1.py
+install-docs:
 	ginstall -d $(DESTDIR)$(docdir)/$(NAME)
-	ginstall -m 644 $(addprefix $(WORKSRC)/,$(EXTRA_DOCS)) $(DESTDIR)$(docdir)/$(NAME)
+	@( for file in $(docs-list) ; do \
+		ginstall -m 644 $$file $(DESTDIR)$(docdir)/$(NAME) ; \
+			done )
 	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/pound/trunk/checksums
===================================================================
--- csw/mgar/pkg/pound/trunk/checksums	2013-04-06 16:18:15 UTC (rev 20610)
+++ csw/mgar/pkg/pound/trunk/checksums	2013-04-06 16:19:51 UTC (rev 20611)
@@ -1 +1,3 @@
-4c4613e857ee14c06c61ab09e28ae503  Pound-2.4.5.tgz
+4c4613e857ee14c06c61ab09e28ae503  download/Pound-2.4.5.tgz
+30fabf8e6abf2e1af1cc65bc740c0124  download/patch-pound.8
+e7acc61f9ff01ecaaa628a08b207176f  download/patch-pound.h

Deleted: csw/mgar/pkg/pound/trunk/files/openssl1.0.0.patch
===================================================================
--- csw/mgar/pkg/pound/trunk/files/openssl1.0.0.patch	2013-04-06 16:18:15 UTC (rev 20610)
+++ csw/mgar/pkg/pound/trunk/files/openssl1.0.0.patch	2013-04-06 16:19:51 UTC (rev 20611)
@@ -1,310 +0,0 @@
-Description: Port to OpenSSL 1.0.0. Patch backported from upstream version
- 2.6c.
-Author: Ilya Barygin <barygin at gmail.com>
-Bug-Debian: http://bugs.debian.org/622041
---- pound-2.5.orig/svc.c
-+++ pound-2.5/svc.c
-@@ -27,12 +27,17 @@
- 
- #include    "pound.h"
- 
-+#ifndef LHASH_OF
-+#define LHASH_OF(x) LHASH
-+#define CHECKED_LHASH_OF(type, h) h
-+#endif
-+
- /*
-  * Add a new key/content pair to a hash table
-  * the table should be already locked
-  */
- static void
--t_add(LHASH *const tab, const char *key, const void *content, const size_t cont_len)
-+t_add(LHASH_OF(TABNODE) *const tab, const char *key, const void *content, const size_t cont_len)
- {
-     TABNODE *t, *old;
- 
-@@ -53,7 +58,11 @@
-     }
-     memcpy(t->content, content, cont_len);
-     t->last_acc = time(NULL);
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+    if((old = LHM_lh_insert(TABNODE, tab, t)) != NULL) {
-+#else
-     if((old = (TABNODE *)lh_insert(tab, t)) != NULL) {
-+#endif
-         free(old->key);
-         free(old->content);
-         free(old);
-@@ -68,12 +77,16 @@
-  * side-effect: update the time of last access
-  */
- static void *
--t_find(LHASH *const tab, char *const key)
-+t_find(LHASH_OF(TABNODE) *const tab, char *const key)
- {
-     TABNODE t, *res;
- 
-     t.key = key;
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+    if((res = LHM_lh_retrieve(TABNODE, tab, &t)) != NULL) {
-+#else
-     if((res = (TABNODE *)lh_retrieve(tab, &t)) != NULL) {
-+#endif
-         res->last_acc = time(NULL);
-         return res->content;
-     }
-@@ -84,12 +97,16 @@
-  * Delete a key
-  */
- static void
--t_remove(LHASH *const tab, char *const key)
-+t_remove(LHASH_OF(TABNODE) *const tab, char *const key)
- {
-     TABNODE t, *res;
- 
-     t.key = key;
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+    if((res = LHM_lh_delete(TABNODE, tab, &t)) != NULL) {
-+#else
-     if((res = (TABNODE *)lh_delete(tab, &t)) != NULL) {
-+#endif
-         free(res->key);
-         free(res->content);
-         free(res);
-@@ -98,59 +115,77 @@
- }
- 
- typedef struct  {
--    LHASH   *tab;
-+    LHASH_OF(TABNODE)   *tab;
-     time_t  lim;
-     void    *content;
-     int     cont_len;
- }   ALL_ARG;
- 
- static void
--t_old(TABNODE *t, void *arg)
-+t_old_doall_arg(TABNODE *t, ALL_ARG *a)
- {
--    ALL_ARG *a;
- 
--    a = (ALL_ARG *)arg;
-     if(t->last_acc < a->lim)
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+        LHM_lh_delete(TABNODE, a->tab, t);
-+#else
-         lh_delete(a->tab, t);
-+#endif
-     return;
- }
--IMPLEMENT_LHASH_DOALL_ARG_FN(t_old, TABNODE *, void *)
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+IMPLEMENT_LHASH_DOALL_ARG_FN(t_old, TABNODE, ALL_ARG)
-+#else
-+#define t_old t_old_doall_arg
-+IMPLEMENT_LHASH_DOALL_ARG_FN(t_old, TABNODE *, ALL_ARG *)
-+#endif
- 
- /*
-  * Expire all old nodes
-  */
- static void
--t_expire(LHASH *const tab, const time_t lim)
-+t_expire(LHASH_OF(TABNODE) *const tab, const time_t lim)
- {
-     ALL_ARG a;
-     int down_load;
- 
-     a.tab = tab;
-     a.lim = lim;
--    down_load = tab->down_load;
--    tab->down_load = 0;
-+    down_load = CHECKED_LHASH_OF(TABNODE, tab)->down_load;
-+    CHECKED_LHASH_OF(TABNODE, tab)->down_load = 0;
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+    LHM_lh_doall_arg(TABNODE, tab, LHASH_DOALL_ARG_FN(t_old), ALL_ARG, &a);
-+#else
-     lh_doall_arg(tab, LHASH_DOALL_ARG_FN(t_old), &a);
--    tab->down_load = down_load;
-+#endif
-+    CHECKED_LHASH_OF(TABNODE, tab)->down_load = down_load;
-     return;
- }
- 
- static void
--t_cont(TABNODE *t, void *arg)
-+t_cont_doall_arg(TABNODE *t, ALL_ARG *arg)
- {
--    ALL_ARG *a;
- 
--    a = (ALL_ARG *)arg;
--    if(memcmp(t->content, a->content, a->cont_len) == 0)
--        lh_delete(a->tab, t);
-+    if(memcmp(t->content, arg->content, arg->cont_len) == 0)
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+        LHM_lh_delete(TABNODE, arg->tab, t);
-+#else
-+        lh_delete(arg->tab, t);
-+#endif
-     return;
- }
--IMPLEMENT_LHASH_DOALL_ARG_FN(t_cont, TABNODE *, void *)
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+IMPLEMENT_LHASH_DOALL_ARG_FN(t_cont, TABNODE, ALL_ARG)
-+#else
-+#define t_cont t_cont_doall_arg
-+IMPLEMENT_LHASH_DOALL_ARG_FN(t_cont, TABNODE *, ALL_ARG *)
-+#endif
- 
- /*
-  * Remove all nodes with the given content
-  */
- static void
--t_clean(LHASH *const tab, void *const content, const size_t cont_len)
-+t_clean(LHASH_OF(TABNODE) *const tab, void *const content, const size_t cont_len)
- {
-     ALL_ARG a;
-     int down_load;
-@@ -158,10 +193,14 @@
-     a.tab = tab;
-     a.content = content;
-     a.cont_len = cont_len;
--    down_load = tab->down_load;
--    tab->down_load = 0;
-+    down_load = CHECKED_LHASH_OF(TABNODE, tab)->down_load;
-+    CHECKED_LHASH_OF(TABNODE, tab)->down_load = 0;
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+    LHM_lh_doall_arg(TABNODE, tab, LHASH_DOALL_ARG_FN(t_cont), ALL_ARG, &a);
-+#else
-     lh_doall_arg(tab, LHASH_DOALL_ARG_FN(t_cont), &a);
--    tab->down_load = down_load;
-+#endif
-+    CHECKED_LHASH_OF(TABNODE, tab)->down_load = down_load;
-     return;
- }
- 
-@@ -1410,41 +1449,47 @@
- }   DUMP_ARG;
- 
- static void
--t_dump(TABNODE *t, void *arg)
-+t_dump_doall_arg(TABNODE *t, DUMP_ARG *arg)
- {
--    DUMP_ARG    *a;
-     BACKEND     *be, *bep;
-     int         n_be, sz;
- 
--    a = (DUMP_ARG *)arg;
-     memcpy(&bep, t->content, sizeof(bep));
--    for(n_be = 0, be = a->backends; be; be = be->next, n_be++)
-+    for(n_be = 0, be = arg->backends; be; be = be->next, n_be++)
-         if(be == bep)
-             break;
-     if(!be)
-         /* should NEVER happen */
-         n_be = 0;
--    write(a->control_sock, t, sizeof(TABNODE));
--    write(a->control_sock, &n_be, sizeof(n_be));
-+    write(arg->control_sock, t, sizeof(TABNODE));
-+    write(arg->control_sock, &n_be, sizeof(n_be));
-     sz = strlen(t->key);
--    write(a->control_sock, &sz, sizeof(sz));
--    write(a->control_sock, t->key, sz);
-+    write(arg->control_sock, &sz, sizeof(sz));
-+    write(arg->control_sock, t->key, sz);
-     return;
- }
--
--IMPLEMENT_LHASH_DOALL_ARG_FN(t_dump, TABNODE *, void *)
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+IMPLEMENT_LHASH_DOALL_ARG_FN(t_dump, TABNODE, DUMP_ARG)
-+#else
-+#define t_dump t_dump_doall_arg
-+IMPLEMENT_LHASH_DOALL_ARG_FN(t_dump, TABNODE *, DUMP_ARG *)
-+#endif
- 
- /*
-  * write sessions to the control socket
-  */
- static void
--dump_sess(const int control_sock, LHASH *const sess, BACKEND *const backends)
-+dump_sess(const int control_sock, LHASH_OF(TABNODE) *const sess, BACKEND *const backends)
- {
-     DUMP_ARG a;
- 
-     a.control_sock = control_sock;
-     a.backends = backends;
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+    LHM_lh_doall_arg(TABNODE, sess, LHASH_DOALL_ARG_FN(t_dump), DUMP_ARG, &a);
-+#else
-     lh_doall_arg(sess, LHASH_DOALL_ARG_FN(t_dump), &a);
-+#endif
-     return;
- }
- 
---- pound-2.5.orig/pound.h
-+++ pound-2.5/pound.h
-@@ -322,6 +322,10 @@
- /* maximal session key size */
- #define KEY_SIZE    127
- 
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+DECLARE_LHASH_OF(TABNODE);
-+#endif
-+
- /* service definition */
- typedef struct _service {
-     char                name[KEY_SIZE + 1]; /* symbolic name */
-@@ -337,7 +341,11 @@
-     int                 sess_ttl;   /* session time-to-live */
-     regex_t             sess_pat;   /* pattern to match the session data */
-     char                *sess_parm; /* session cookie or parameter */
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+    LHASH_OF(TABNODE)   *sessions;  /* currently active sessions */
-+#else
-     LHASH               *sessions;  /* currently active sessions */
-+#endif
-     int                 dynscale;   /* true if the back-ends should be dynamically rescaled */
-     int                 disabled;   /* true if the service is disabled */
-     struct _service     *next;
---- pound-2.5.orig/config.c
-+++ pound-2.5/config.c
-@@ -431,14 +431,25 @@
-         res = (res ^ *k++) * 16777619;
-     return res;
- }
--static IMPLEMENT_LHASH_HASH_FN(t_hash, const TABNODE *)
- 
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+static IMPLEMENT_LHASH_HASH_FN(t, TABNODE)
-+#else
-+static IMPLEMENT_LHASH_HASH_FN(t_hash, const TABNODE *)
-+#endif
-+ 
- static int
- t_cmp(const TABNODE *d1, const TABNODE *d2)
- {
-     return strcmp(d1->key, d2->key);
- }
-+
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+static IMPLEMENT_LHASH_COMP_FN(t, TABNODE)
-+#else
- static IMPLEMENT_LHASH_COMP_FN(t_cmp, const TABNODE *)
-+#endif
-+
- 
- /*
-  * parse a service
-@@ -460,7 +471,11 @@
-     pthread_mutex_init(&res->mut, NULL);
-     if(svc_name)
-         strncpy(res->name, svc_name, KEY_SIZE);
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+    if((res->sessions = LHM_lh_new(TABNODE, t)) == NULL) {
-+#else
-     if((res->sessions = lh_new(LHASH_HASH_FN(t_hash), LHASH_COMP_FN(t_cmp))) == NULL) {
-+#endif
-         logmsg(LOG_ERR, "line %d: lh_new failed - aborted", n_lin);
-         exit(1);
-    }

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 Apr  6 18:24:02 2013
From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net)
Date: Sat, 06 Apr 2013 16:24:02 +0000
Subject: [csw-devel] SF.net SVN: gar:[20612]
	csw/mgar/pkg/pound/trunk/files/openssl1.0.0.patch
Message-ID: <E1UOVuM-0005mY-D7@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 20612
          http://gar.svn.sourceforge.net/gar/?rev=20612&view=rev
Author:   chninkel
Date:     2013-04-06 16:24:02 +0000 (Sat, 06 Apr 2013)
Log Message:
-----------
pound/trunk: added missing openssl 1.0.0 patch

Added Paths:
-----------
    csw/mgar/pkg/pound/trunk/files/openssl1.0.0.patch

Added: csw/mgar/pkg/pound/trunk/files/openssl1.0.0.patch
===================================================================
--- csw/mgar/pkg/pound/trunk/files/openssl1.0.0.patch	                        (rev 0)
+++ csw/mgar/pkg/pound/trunk/files/openssl1.0.0.patch	2013-04-06 16:24:02 UTC (rev 20612)
@@ -0,0 +1,310 @@
+Description: Port to OpenSSL 1.0.0. Patch backported from upstream version
+ 2.6c.
+Author: Ilya Barygin <barygin at gmail.com>
+Bug-Debian: http://bugs.debian.org/622041
+--- pound-2.5.orig/svc.c
++++ pound-2.5/svc.c
+@@ -27,12 +27,17 @@
+ 
+ #include    "pound.h"
+ 
++#ifndef LHASH_OF
++#define LHASH_OF(x) LHASH
++#define CHECKED_LHASH_OF(type, h) h
++#endif
++
+ /*
+  * Add a new key/content pair to a hash table
+  * the table should be already locked
+  */
+ static void
+-t_add(LHASH *const tab, const char *key, const void *content, const size_t cont_len)
++t_add(LHASH_OF(TABNODE) *const tab, const char *key, const void *content, const size_t cont_len)
+ {
+     TABNODE *t, *old;
+ 
+@@ -53,7 +58,11 @@
+     }
+     memcpy(t->content, content, cont_len);
+     t->last_acc = time(NULL);
++#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++    if((old = LHM_lh_insert(TABNODE, tab, t)) != NULL) {
++#else
+     if((old = (TABNODE *)lh_insert(tab, t)) != NULL) {
++#endif
+         free(old->key);
+         free(old->content);
+         free(old);
+@@ -68,12 +77,16 @@
+  * side-effect: update the time of last access
+  */
+ static void *
+-t_find(LHASH *const tab, char *const key)
++t_find(LHASH_OF(TABNODE) *const tab, char *const key)
+ {
+     TABNODE t, *res;
+ 
+     t.key = key;
++#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++    if((res = LHM_lh_retrieve(TABNODE, tab, &t)) != NULL) {
++#else
+     if((res = (TABNODE *)lh_retrieve(tab, &t)) != NULL) {
++#endif
+         res->last_acc = time(NULL);
+         return res->content;
+     }
+@@ -84,12 +97,16 @@
+  * Delete a key
+  */
+ static void
+-t_remove(LHASH *const tab, char *const key)
++t_remove(LHASH_OF(TABNODE) *const tab, char *const key)
+ {
+     TABNODE t, *res;
+ 
+     t.key = key;
++#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++    if((res = LHM_lh_delete(TABNODE, tab, &t)) != NULL) {
++#else
+     if((res = (TABNODE *)lh_delete(tab, &t)) != NULL) {
++#endif
+         free(res->key);
+         free(res->content);
+         free(res);
+@@ -98,59 +115,77 @@
+ }
+ 
+ typedef struct  {
+-    LHASH   *tab;
++    LHASH_OF(TABNODE)   *tab;
+     time_t  lim;
+     void    *content;
+     int     cont_len;
+ }   ALL_ARG;
+ 
+ static void
+-t_old(TABNODE *t, void *arg)
++t_old_doall_arg(TABNODE *t, ALL_ARG *a)
+ {
+-    ALL_ARG *a;
+ 
+-    a = (ALL_ARG *)arg;
+     if(t->last_acc < a->lim)
++#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++        LHM_lh_delete(TABNODE, a->tab, t);
++#else
+         lh_delete(a->tab, t);
++#endif
+     return;
+ }
+-IMPLEMENT_LHASH_DOALL_ARG_FN(t_old, TABNODE *, void *)
++#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++IMPLEMENT_LHASH_DOALL_ARG_FN(t_old, TABNODE, ALL_ARG)
++#else
++#define t_old t_old_doall_arg
++IMPLEMENT_LHASH_DOALL_ARG_FN(t_old, TABNODE *, ALL_ARG *)
++#endif
+ 
+ /*
+  * Expire all old nodes
+  */
+ static void
+-t_expire(LHASH *const tab, const time_t lim)
++t_expire(LHASH_OF(TABNODE) *const tab, const time_t lim)
+ {
+     ALL_ARG a;
+     int down_load;
+ 
+     a.tab = tab;
+     a.lim = lim;
+-    down_load = tab->down_load;
+-    tab->down_load = 0;
++    down_load = CHECKED_LHASH_OF(TABNODE, tab)->down_load;
++    CHECKED_LHASH_OF(TABNODE, tab)->down_load = 0;
++#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++    LHM_lh_doall_arg(TABNODE, tab, LHASH_DOALL_ARG_FN(t_old), ALL_ARG, &a);
++#else
+     lh_doall_arg(tab, LHASH_DOALL_ARG_FN(t_old), &a);
+-    tab->down_load = down_load;
++#endif
++    CHECKED_LHASH_OF(TABNODE, tab)->down_load = down_load;
+     return;
+ }
+ 
+ static void
+-t_cont(TABNODE *t, void *arg)
++t_cont_doall_arg(TABNODE *t, ALL_ARG *arg)
+ {
+-    ALL_ARG *a;
+ 
+-    a = (ALL_ARG *)arg;
+-    if(memcmp(t->content, a->content, a->cont_len) == 0)
+-        lh_delete(a->tab, t);
++    if(memcmp(t->content, arg->content, arg->cont_len) == 0)
++#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++        LHM_lh_delete(TABNODE, arg->tab, t);
++#else
++        lh_delete(arg->tab, t);
++#endif
+     return;
+ }
+-IMPLEMENT_LHASH_DOALL_ARG_FN(t_cont, TABNODE *, void *)
++#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++IMPLEMENT_LHASH_DOALL_ARG_FN(t_cont, TABNODE, ALL_ARG)
++#else
++#define t_cont t_cont_doall_arg
++IMPLEMENT_LHASH_DOALL_ARG_FN(t_cont, TABNODE *, ALL_ARG *)
++#endif
+ 
+ /*
+  * Remove all nodes with the given content
+  */
+ static void
+-t_clean(LHASH *const tab, void *const content, const size_t cont_len)
++t_clean(LHASH_OF(TABNODE) *const tab, void *const content, const size_t cont_len)
+ {
+     ALL_ARG a;
+     int down_load;
+@@ -158,10 +193,14 @@
+     a.tab = tab;
+     a.content = content;
+     a.cont_len = cont_len;
+-    down_load = tab->down_load;
+-    tab->down_load = 0;
++    down_load = CHECKED_LHASH_OF(TABNODE, tab)->down_load;
++    CHECKED_LHASH_OF(TABNODE, tab)->down_load = 0;
++#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++    LHM_lh_doall_arg(TABNODE, tab, LHASH_DOALL_ARG_FN(t_cont), ALL_ARG, &a);
++#else
+     lh_doall_arg(tab, LHASH_DOALL_ARG_FN(t_cont), &a);
+-    tab->down_load = down_load;
++#endif
++    CHECKED_LHASH_OF(TABNODE, tab)->down_load = down_load;
+     return;
+ }
+ 
+@@ -1410,41 +1449,47 @@
+ }   DUMP_ARG;
+ 
+ static void
+-t_dump(TABNODE *t, void *arg)
++t_dump_doall_arg(TABNODE *t, DUMP_ARG *arg)
+ {
+-    DUMP_ARG    *a;
+     BACKEND     *be, *bep;
+     int         n_be, sz;
+ 
+-    a = (DUMP_ARG *)arg;
+     memcpy(&bep, t->content, sizeof(bep));
+-    for(n_be = 0, be = a->backends; be; be = be->next, n_be++)
++    for(n_be = 0, be = arg->backends; be; be = be->next, n_be++)
+         if(be == bep)
+             break;
+     if(!be)
+         /* should NEVER happen */
+         n_be = 0;
+-    write(a->control_sock, t, sizeof(TABNODE));
+-    write(a->control_sock, &n_be, sizeof(n_be));
++    write(arg->control_sock, t, sizeof(TABNODE));
++    write(arg->control_sock, &n_be, sizeof(n_be));
+     sz = strlen(t->key);
+-    write(a->control_sock, &sz, sizeof(sz));
+-    write(a->control_sock, t->key, sz);
++    write(arg->control_sock, &sz, sizeof(sz));
++    write(arg->control_sock, t->key, sz);
+     return;
+ }
+-
+-IMPLEMENT_LHASH_DOALL_ARG_FN(t_dump, TABNODE *, void *)
++#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++IMPLEMENT_LHASH_DOALL_ARG_FN(t_dump, TABNODE, DUMP_ARG)
++#else
++#define t_dump t_dump_doall_arg
++IMPLEMENT_LHASH_DOALL_ARG_FN(t_dump, TABNODE *, DUMP_ARG *)
++#endif
+ 
+ /*
+  * write sessions to the control socket
+  */
+ static void
+-dump_sess(const int control_sock, LHASH *const sess, BACKEND *const backends)
++dump_sess(const int control_sock, LHASH_OF(TABNODE) *const sess, BACKEND *const backends)
+ {
+     DUMP_ARG a;
+ 
+     a.control_sock = control_sock;
+     a.backends = backends;
++#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++    LHM_lh_doall_arg(TABNODE, sess, LHASH_DOALL_ARG_FN(t_dump), DUMP_ARG, &a);
++#else
+     lh_doall_arg(sess, LHASH_DOALL_ARG_FN(t_dump), &a);
++#endif
+     return;
+ }
+ 
+--- pound-2.5.orig/pound.h
++++ pound-2.5/pound.h
+@@ -322,6 +322,10 @@
+ /* maximal session key size */
+ #define KEY_SIZE    127
+ 
++#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++DECLARE_LHASH_OF(TABNODE);
++#endif
++
+ /* service definition */
+ typedef struct _service {
+     char                name[KEY_SIZE + 1]; /* symbolic name */
+@@ -337,7 +341,11 @@
+     int                 sess_ttl;   /* session time-to-live */
+     regex_t             sess_pat;   /* pattern to match the session data */
+     char                *sess_parm; /* session cookie or parameter */
++#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++    LHASH_OF(TABNODE)   *sessions;  /* currently active sessions */
++#else
+     LHASH               *sessions;  /* currently active sessions */
++#endif
+     int                 dynscale;   /* true if the back-ends should be dynamically rescaled */
+     int                 disabled;   /* true if the service is disabled */
+     struct _service     *next;
+--- pound-2.5.orig/config.c
++++ pound-2.5/config.c
+@@ -431,14 +431,25 @@
+         res = (res ^ *k++) * 16777619;
+     return res;
+ }
+-static IMPLEMENT_LHASH_HASH_FN(t_hash, const TABNODE *)
+ 
++#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++static IMPLEMENT_LHASH_HASH_FN(t, TABNODE)
++#else
++static IMPLEMENT_LHASH_HASH_FN(t_hash, const TABNODE *)
++#endif
++ 
+ static int
+ t_cmp(const TABNODE *d1, const TABNODE *d2)
+ {
+     return strcmp(d1->key, d2->key);
+ }
++
++#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++static IMPLEMENT_LHASH_COMP_FN(t, TABNODE)
++#else
+ static IMPLEMENT_LHASH_COMP_FN(t_cmp, const TABNODE *)
++#endif
++
+ 
+ /*
+  * parse a service
+@@ -460,7 +471,11 @@
+     pthread_mutex_init(&res->mut, NULL);
+     if(svc_name)
+         strncpy(res->name, svc_name, KEY_SIZE);
++#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++    if((res->sessions = LHM_lh_new(TABNODE, t)) == NULL) {
++#else
+     if((res->sessions = lh_new(LHASH_HASH_FN(t_hash), LHASH_COMP_FN(t_cmp))) == NULL) {
++#endif
+         logmsg(LOG_ERR, "line %d: lh_new failed - aborted", n_lin);
+         exit(1);
+    }

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 Apr  6 19:14:58 2013
From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net)
Date: Sat, 06 Apr 2013 17:14:58 +0000
Subject: [csw-devel] SF.net SVN: gar:[20613]
	csw/mgar/pkg/monit/trunk/Makefile
Message-ID: <E1UOWhe-0007Bv-5q@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 20613
          http://gar.svn.sourceforge.net/gar/?rev=20613&view=rev
Author:   chninkel
Date:     2013-04-06 17:14:57 +0000 (Sat, 06 Apr 2013)
Log Message:
-----------
monit/trunk: fixed checkpkg override and reverted to old configuration directory

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

Modified: csw/mgar/pkg/monit/trunk/Makefile
===================================================================
--- csw/mgar/pkg/monit/trunk/Makefile	2013-04-06 16:24:02 UTC (rev 20612)
+++ csw/mgar/pkg/monit/trunk/Makefile	2013-04-06 17:14:57 UTC (rev 20613)
@@ -18,10 +18,13 @@
 #PATCHFILES += 0001-Drop-some-build-flags-that-get-hard-coded-by-configu.patch
 #PATCHFILES += 0002-fix-usr-local-references-drop-usr-local-etc-monitrc-.patch
 
-CHECKPKG_OVERRIDES_CSWmonit += file-with-bad-content|/usr/local|root/opt/csw/bin/amd64/monit
-CHECKPKG_OVERRIDES_CSWmonit += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/monit.1
+CHECKPKG_OVERRIDES_CSWmonit = file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/monit.1
+CHECKPKG_OVERRIDES_CSWmonit += $(CHECKPKG_OVERRIDES_CSWmonit_$(GARCH))
+CHECKPKG_OVERRIDES_CSWmonit_sparc = file-with-bad-content|/usr/local|root/opt/csw/bin/sparcv8/monit
+CHECKPKG_OVERRIDES_CSWmonit_i386 = file-with-bad-content|/usr/local|root/opt/csw/bin/amd64/monit
 
 
+
 GARCOMPILER = GNU
 BUILD64_ONLY = 1
 
@@ -34,5 +37,10 @@
 
 TEST_SCRIPTS = 
 
+# Revert to the old configuration path 
+# so we don't change anything 
+# for the ssl update
+sysconfdir = $(prefix)/etc
+
 include gar/category.mk
 

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


From chninkel at users.sourceforge.net  Sat Apr  6 20:01:31 2013
From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net)
Date: Sat, 06 Apr 2013 18:01:31 +0000
Subject: [csw-devel] SF.net SVN: gar:[20614]
	csw/mgar/pkg/openvpn/trunk/Makefile
Message-ID: <E1UOXQh-0004o9-KV@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 20614
          http://gar.svn.sourceforge.net/gar/?rev=20614&view=rev
Author:   chninkel
Date:     2013-04-06 18:01:30 +0000 (Sat, 06 Apr 2013)
Log Message:
-----------
openvpn/trunk: updated recipe to build against libssl 1.0.0

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

Modified: csw/mgar/pkg/openvpn/trunk/Makefile
===================================================================
--- csw/mgar/pkg/openvpn/trunk/Makefile	2013-04-06 17:14:57 UTC (rev 20613)
+++ csw/mgar/pkg/openvpn/trunk/Makefile	2013-04-06 18:01:30 UTC (rev 20614)
@@ -1,8 +1,8 @@
 NAME = openvpn
 VERSION = 2.0.9
-GARTYPE = v1
+GARTYPE = v2
 
-DESCRIPTION = secure IP tunnel daemon
+DESCRIPTION = Secure IP tunnel daemon
 define BLURB
 OpenVPN is a full-featured SSL VPN solution which can accomodate a wide range of configurations, including remote access, site-to-site VPNs, WiFi security, and enterprise-scale remote access solutions with load balancing, failover, and fine-grained access-controls
 endef
@@ -12,8 +12,18 @@
 DISTFILES = $(NAME)-$(VERSION).tar.gz
 
 # we require
-RUNTIME_DEP_PKGS = CSWosslrt CSWlzo
+RUNTIME_DEP_PKGS = CSWlibssl1-0-0 CSWliblzo2-2
 
+# The references are located in document or sample files and are harmless
+CHECKPKG_OVERRIDES_CSWopenvpn += file-with-bad-content|/usr/share|root/opt/csw/share/doc/openvpn/easy-rsa/vars
+CHECKPKG_OVERRIDES_CSWopenvpn += file-with-bad-content|/usr/share|root/opt/csw/share/doc/openvpn/easy-rsa/2.0/vars
+CHECKPKG_OVERRIDES_CSWopenvpn += file-with-bad-content|/usr/share|root/opt/csw/share/doc/openvpn/easy-rsa/2.0/Makefile
+CHECKPKG_OVERRIDES_CSWopenvpn += file-with-bad-content|/usr/share|root/opt/csw/share/man/man8/openvpn.8
+CHECKPKG_OVERRIDES_CSWopenvpn += file-with-bad-content|/usr/local|root/opt/csw/share/doc/openvpn/sample-scripts/openvpn.init
+
+# The perl script use SUNW perl and not CSW perl
+CHECKPKG_OVERRIDES_CSWopenvpn += missing-dependency|CSWperl
+
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
 

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


From chninkel at users.sourceforge.net  Sat Apr  6 21:29:27 2013
From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net)
Date: Sat, 06 Apr 2013 19:29:27 +0000
Subject: [csw-devel] SF.net SVN: gar:[20615] csw/mgar/pkg/pound/trunk
Message-ID: <E1UOYnn-000595-6V@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 20615
          http://gar.svn.sourceforge.net/gar/?rev=20615&view=rev
Author:   chninkel
Date:     2013-04-06 19:29:26 +0000 (Sat, 06 Apr 2013)
Log Message:
-----------
pound/trunk: reverted to the recipe with the most recent version

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

Removed Paths:
-------------
    csw/mgar/pkg/pound/trunk/files/openssl1.0.0.patch

Modified: csw/mgar/pkg/pound/trunk/Makefile
===================================================================
--- csw/mgar/pkg/pound/trunk/Makefile	2013-04-06 18:01:30 UTC (rev 20614)
+++ csw/mgar/pkg/pound/trunk/Makefile	2013-04-06 19:29:26 UTC (rev 20615)
@@ -1,5 +1,5 @@
-NAME = pound2
-VERSION = 2.4.5
+NAME = pound
+VERSION = 2.6
 GARTYPE = v2
 
 DESCRIPTION = Reverse proxy load balancer
@@ -12,63 +12,66 @@
 endef
 
 MASTER_SITES = http://www.apsis.ch/pound/
-DISTFILES  = Pound-$(VERSION).tgz
-DISTNAME   = Pound-$(VERSION)
+DISTNAME = Pound-$(VERSION)
+DISTFILES += $(DISTNAME).tgz
 
-# We define upstream file regex so we can be notifed of new upstream software release
-UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tgz
+# adjust log/run files
+PATCHFILES  = patch-pound.h
+PATCHFILES += patch-pound.8
 
-# we require
-RUNTIME_DEP_PKGS = CSWlibssl1-0-0 CSWlibpcreposix0
+PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
 
-# This is just for example scripts we can ignore it
-CHECKPKG_OVERRIDES_CSWpound2 += missing-dependency|CSWpython
+VENDOR_URL = http://www.apsis.ch/pound/
 
-# These are harmless reference located in doc or man files
-CHECKPKG_OVERRIDES_CSWpound2 += file-with-bad-content|/usr/local|root/opt/csw/share/doc/pound2/README
-CHECKPKG_OVERRIDES_CSWpound2 += file-with-bad-content|/usr/local|root/opt/csw/share/man/man8/pound2.8
+LICENSE = GPL.txt
 
+RUNTIME_DEP_PKGS += CSWlibssl-dev
+RUNTIME_DEP_PKGS += CSWlibcurl-dev
 
+PACKAGES += CSWpound
+SPKG_DESC_CSWpound = Reverse proxy load balancer
+# PKGFILES is catchall
+RUNTIME_DEP_PKGS_CSWpound += CSWlibpcreposix0
+RUNTIME_DEP_PKGS_CSWpound += CSWlibssl1-0-0
+OBSOLETED_BY_CSWpound = CSWpound2
+
+# This is just for example scripts
+CHECKPKG_OVERRIDES_CSWpound += missing-dependency|CSWpython
+CHECKPKG_OVERRIDES_CSWpound += file-with-bad-content|/usr/local|root/opt/csw/share/doc/pound/README
+
+EXTRA_DOCS += README
+EXTRA_DOCS += FAQ
+EXTRA_DOCS += CHANGELOG
+EXTRA_DOCS += z2_2_5_1.py
+EXTRA_DOCS += z2_2_6_1.py
+
 CONFIGURE_ARGS  = $(DIRPATHS)
 CONFIGURE_ARGS += --enable-super
 CONFIGURE_ARGS += --enable-msdav
 CONFIGURE_ARGS += --with-maxbuf=8192
 CONFIGURE_ARGS += --with-ssl=$(prefix)
 
-# adjust log/run files
-PATCHFILES  = patch-pound.h
-PATCHFILES += patch-pound.8
-
-# Patch taken from upstream to compile against libssl 1.0.0
-PATCHFILES = openssl1.0.0.patch
-
 # No test suite available
 TEST_SCRIPTS =
 
 # use a custom install
-INSTALL_SCRIPTS = custom docs
+INSTALL_SCRIPTS = custom extra-docs
 
+PRESERVECONF = $(sysconfdir)/pound.cfg
+
 include gar/category.mk
 
 install-custom: 
 	ginstall -d $(DESTDIR)$(sbindir)
-	ginstall -m 555 $(WORKSRC)/pound $(DESTDIR)$(sbindir)/pound2
-	ginstall -m 555 $(WORKSRC)/poundctl $(DESTDIR)$(sbindir)/pound2ctl
+	ginstall -m 555 $(WORKSRC)/pound $(DESTDIR)$(sbindir)/pound
+	ginstall -m 555 $(WORKSRC)/poundctl $(DESTDIR)$(sbindir)/poundctl
 	ginstall -d $(DESTDIR)$(mandir)/man8
-	ginstall -m 644 $(WORKSRC)/pound.8 $(DESTDIR)$(mandir)/man8/pound2.8
-	ginstall -m 644 $(WORKSRC)/poundctl.8 $(DESTDIR)$(mandir)/man8/pound2ctl.8
+	ginstall -m 644 $(WORKSRC)/pound.8 $(DESTDIR)$(mandir)/man8/pound.8
+	ginstall -m 644 $(WORKSRC)/poundctl.8 $(DESTDIR)$(mandir)/man8/poundctl.8
 	ginstall -d $(DESTDIR)$(sysconfdir)/$(NAME)
-	ginstall -m 644 $(FILEDIR)/pound2-sample.cfg $(DESTDIR)$(sysconfdir)/$(NAME)
-	ginstall -d $(DESTDIR)/var/opt/csw/run
+	ginstall -m 644 $(FILEDIR)/pound2-sample.cfg $(DESTDIR)$(sysconfdir)/pound.cfg
 
-docs-list  = $(WORKSRC)/README
-docs-list += $(WORKSRC)/FAQ
-docs-list += $(WORKSRC)/CHANGELOG
-docs-list += $(WORKSRC)/z2_2_5_1.py
-docs-list += $(WORKSRC)/z2_2_6_1.py
-install-docs:
+install-extra-docs:
 	ginstall -d $(DESTDIR)$(docdir)/$(NAME)
-	@( for file in $(docs-list) ; do \
-		ginstall -m 644 $$file $(DESTDIR)$(docdir)/$(NAME) ; \
-			done )
+	ginstall -m 644 $(addprefix $(WORKSRC)/,$(EXTRA_DOCS)) $(DESTDIR)$(docdir)/$(NAME)
 	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/pound/trunk/checksums
===================================================================
--- csw/mgar/pkg/pound/trunk/checksums	2013-04-06 18:01:30 UTC (rev 20614)
+++ csw/mgar/pkg/pound/trunk/checksums	2013-04-06 19:29:26 UTC (rev 20615)
@@ -1,3 +1 @@
-4c4613e857ee14c06c61ab09e28ae503  download/Pound-2.4.5.tgz
-30fabf8e6abf2e1af1cc65bc740c0124  download/patch-pound.8
-e7acc61f9ff01ecaaa628a08b207176f  download/patch-pound.h
+8c913b527332694943c4c67c8f152071  Pound-2.6.tgz

Deleted: csw/mgar/pkg/pound/trunk/files/openssl1.0.0.patch
===================================================================
--- csw/mgar/pkg/pound/trunk/files/openssl1.0.0.patch	2013-04-06 18:01:30 UTC (rev 20614)
+++ csw/mgar/pkg/pound/trunk/files/openssl1.0.0.patch	2013-04-06 19:29:26 UTC (rev 20615)
@@ -1,310 +0,0 @@
-Description: Port to OpenSSL 1.0.0. Patch backported from upstream version
- 2.6c.
-Author: Ilya Barygin <barygin at gmail.com>
-Bug-Debian: http://bugs.debian.org/622041
---- pound-2.5.orig/svc.c
-+++ pound-2.5/svc.c
-@@ -27,12 +27,17 @@
- 
- #include    "pound.h"
- 
-+#ifndef LHASH_OF
-+#define LHASH_OF(x) LHASH
-+#define CHECKED_LHASH_OF(type, h) h
-+#endif
-+
- /*
-  * Add a new key/content pair to a hash table
-  * the table should be already locked
-  */
- static void
--t_add(LHASH *const tab, const char *key, const void *content, const size_t cont_len)
-+t_add(LHASH_OF(TABNODE) *const tab, const char *key, const void *content, const size_t cont_len)
- {
-     TABNODE *t, *old;
- 
-@@ -53,7 +58,11 @@
-     }
-     memcpy(t->content, content, cont_len);
-     t->last_acc = time(NULL);
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+    if((old = LHM_lh_insert(TABNODE, tab, t)) != NULL) {
-+#else
-     if((old = (TABNODE *)lh_insert(tab, t)) != NULL) {
-+#endif
-         free(old->key);
-         free(old->content);
-         free(old);
-@@ -68,12 +77,16 @@
-  * side-effect: update the time of last access
-  */
- static void *
--t_find(LHASH *const tab, char *const key)
-+t_find(LHASH_OF(TABNODE) *const tab, char *const key)
- {
-     TABNODE t, *res;
- 
-     t.key = key;
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+    if((res = LHM_lh_retrieve(TABNODE, tab, &t)) != NULL) {
-+#else
-     if((res = (TABNODE *)lh_retrieve(tab, &t)) != NULL) {
-+#endif
-         res->last_acc = time(NULL);
-         return res->content;
-     }
-@@ -84,12 +97,16 @@
-  * Delete a key
-  */
- static void
--t_remove(LHASH *const tab, char *const key)
-+t_remove(LHASH_OF(TABNODE) *const tab, char *const key)
- {
-     TABNODE t, *res;
- 
-     t.key = key;
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+    if((res = LHM_lh_delete(TABNODE, tab, &t)) != NULL) {
-+#else
-     if((res = (TABNODE *)lh_delete(tab, &t)) != NULL) {
-+#endif
-         free(res->key);
-         free(res->content);
-         free(res);
-@@ -98,59 +115,77 @@
- }
- 
- typedef struct  {
--    LHASH   *tab;
-+    LHASH_OF(TABNODE)   *tab;
-     time_t  lim;
-     void    *content;
-     int     cont_len;
- }   ALL_ARG;
- 
- static void
--t_old(TABNODE *t, void *arg)
-+t_old_doall_arg(TABNODE *t, ALL_ARG *a)
- {
--    ALL_ARG *a;
- 
--    a = (ALL_ARG *)arg;
-     if(t->last_acc < a->lim)
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+        LHM_lh_delete(TABNODE, a->tab, t);
-+#else
-         lh_delete(a->tab, t);
-+#endif
-     return;
- }
--IMPLEMENT_LHASH_DOALL_ARG_FN(t_old, TABNODE *, void *)
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+IMPLEMENT_LHASH_DOALL_ARG_FN(t_old, TABNODE, ALL_ARG)
-+#else
-+#define t_old t_old_doall_arg
-+IMPLEMENT_LHASH_DOALL_ARG_FN(t_old, TABNODE *, ALL_ARG *)
-+#endif
- 
- /*
-  * Expire all old nodes
-  */
- static void
--t_expire(LHASH *const tab, const time_t lim)
-+t_expire(LHASH_OF(TABNODE) *const tab, const time_t lim)
- {
-     ALL_ARG a;
-     int down_load;
- 
-     a.tab = tab;
-     a.lim = lim;
--    down_load = tab->down_load;
--    tab->down_load = 0;
-+    down_load = CHECKED_LHASH_OF(TABNODE, tab)->down_load;
-+    CHECKED_LHASH_OF(TABNODE, tab)->down_load = 0;
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+    LHM_lh_doall_arg(TABNODE, tab, LHASH_DOALL_ARG_FN(t_old), ALL_ARG, &a);
-+#else
-     lh_doall_arg(tab, LHASH_DOALL_ARG_FN(t_old), &a);
--    tab->down_load = down_load;
-+#endif
-+    CHECKED_LHASH_OF(TABNODE, tab)->down_load = down_load;
-     return;
- }
- 
- static void
--t_cont(TABNODE *t, void *arg)
-+t_cont_doall_arg(TABNODE *t, ALL_ARG *arg)
- {
--    ALL_ARG *a;
- 
--    a = (ALL_ARG *)arg;
--    if(memcmp(t->content, a->content, a->cont_len) == 0)
--        lh_delete(a->tab, t);
-+    if(memcmp(t->content, arg->content, arg->cont_len) == 0)
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+        LHM_lh_delete(TABNODE, arg->tab, t);
-+#else
-+        lh_delete(arg->tab, t);
-+#endif
-     return;
- }
--IMPLEMENT_LHASH_DOALL_ARG_FN(t_cont, TABNODE *, void *)
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+IMPLEMENT_LHASH_DOALL_ARG_FN(t_cont, TABNODE, ALL_ARG)
-+#else
-+#define t_cont t_cont_doall_arg
-+IMPLEMENT_LHASH_DOALL_ARG_FN(t_cont, TABNODE *, ALL_ARG *)
-+#endif
- 
- /*
-  * Remove all nodes with the given content
-  */
- static void
--t_clean(LHASH *const tab, void *const content, const size_t cont_len)
-+t_clean(LHASH_OF(TABNODE) *const tab, void *const content, const size_t cont_len)
- {
-     ALL_ARG a;
-     int down_load;
-@@ -158,10 +193,14 @@
-     a.tab = tab;
-     a.content = content;
-     a.cont_len = cont_len;
--    down_load = tab->down_load;
--    tab->down_load = 0;
-+    down_load = CHECKED_LHASH_OF(TABNODE, tab)->down_load;
-+    CHECKED_LHASH_OF(TABNODE, tab)->down_load = 0;
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+    LHM_lh_doall_arg(TABNODE, tab, LHASH_DOALL_ARG_FN(t_cont), ALL_ARG, &a);
-+#else
-     lh_doall_arg(tab, LHASH_DOALL_ARG_FN(t_cont), &a);
--    tab->down_load = down_load;
-+#endif
-+    CHECKED_LHASH_OF(TABNODE, tab)->down_load = down_load;
-     return;
- }
- 
-@@ -1410,41 +1449,47 @@
- }   DUMP_ARG;
- 
- static void
--t_dump(TABNODE *t, void *arg)
-+t_dump_doall_arg(TABNODE *t, DUMP_ARG *arg)
- {
--    DUMP_ARG    *a;
-     BACKEND     *be, *bep;
-     int         n_be, sz;
- 
--    a = (DUMP_ARG *)arg;
-     memcpy(&bep, t->content, sizeof(bep));
--    for(n_be = 0, be = a->backends; be; be = be->next, n_be++)
-+    for(n_be = 0, be = arg->backends; be; be = be->next, n_be++)
-         if(be == bep)
-             break;
-     if(!be)
-         /* should NEVER happen */
-         n_be = 0;
--    write(a->control_sock, t, sizeof(TABNODE));
--    write(a->control_sock, &n_be, sizeof(n_be));
-+    write(arg->control_sock, t, sizeof(TABNODE));
-+    write(arg->control_sock, &n_be, sizeof(n_be));
-     sz = strlen(t->key);
--    write(a->control_sock, &sz, sizeof(sz));
--    write(a->control_sock, t->key, sz);
-+    write(arg->control_sock, &sz, sizeof(sz));
-+    write(arg->control_sock, t->key, sz);
-     return;
- }
--
--IMPLEMENT_LHASH_DOALL_ARG_FN(t_dump, TABNODE *, void *)
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+IMPLEMENT_LHASH_DOALL_ARG_FN(t_dump, TABNODE, DUMP_ARG)
-+#else
-+#define t_dump t_dump_doall_arg
-+IMPLEMENT_LHASH_DOALL_ARG_FN(t_dump, TABNODE *, DUMP_ARG *)
-+#endif
- 
- /*
-  * write sessions to the control socket
-  */
- static void
--dump_sess(const int control_sock, LHASH *const sess, BACKEND *const backends)
-+dump_sess(const int control_sock, LHASH_OF(TABNODE) *const sess, BACKEND *const backends)
- {
-     DUMP_ARG a;
- 
-     a.control_sock = control_sock;
-     a.backends = backends;
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+    LHM_lh_doall_arg(TABNODE, sess, LHASH_DOALL_ARG_FN(t_dump), DUMP_ARG, &a);
-+#else
-     lh_doall_arg(sess, LHASH_DOALL_ARG_FN(t_dump), &a);
-+#endif
-     return;
- }
- 
---- pound-2.5.orig/pound.h
-+++ pound-2.5/pound.h
-@@ -322,6 +322,10 @@
- /* maximal session key size */
- #define KEY_SIZE    127
- 
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+DECLARE_LHASH_OF(TABNODE);
-+#endif
-+
- /* service definition */
- typedef struct _service {
-     char                name[KEY_SIZE + 1]; /* symbolic name */
-@@ -337,7 +341,11 @@
-     int                 sess_ttl;   /* session time-to-live */
-     regex_t             sess_pat;   /* pattern to match the session data */
-     char                *sess_parm; /* session cookie or parameter */
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+    LHASH_OF(TABNODE)   *sessions;  /* currently active sessions */
-+#else
-     LHASH               *sessions;  /* currently active sessions */
-+#endif
-     int                 dynscale;   /* true if the back-ends should be dynamically rescaled */
-     int                 disabled;   /* true if the service is disabled */
-     struct _service     *next;
---- pound-2.5.orig/config.c
-+++ pound-2.5/config.c
-@@ -431,14 +431,25 @@
-         res = (res ^ *k++) * 16777619;
-     return res;
- }
--static IMPLEMENT_LHASH_HASH_FN(t_hash, const TABNODE *)
- 
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+static IMPLEMENT_LHASH_HASH_FN(t, TABNODE)
-+#else
-+static IMPLEMENT_LHASH_HASH_FN(t_hash, const TABNODE *)
-+#endif
-+ 
- static int
- t_cmp(const TABNODE *d1, const TABNODE *d2)
- {
-     return strcmp(d1->key, d2->key);
- }
-+
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+static IMPLEMENT_LHASH_COMP_FN(t, TABNODE)
-+#else
- static IMPLEMENT_LHASH_COMP_FN(t_cmp, const TABNODE *)
-+#endif
-+
- 
- /*
-  * parse a service
-@@ -460,7 +471,11 @@
-     pthread_mutex_init(&res->mut, NULL);
-     if(svc_name)
-         strncpy(res->name, svc_name, KEY_SIZE);
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+    if((res->sessions = LHM_lh_new(TABNODE, t)) == NULL) {
-+#else
-     if((res->sessions = lh_new(LHASH_HASH_FN(t_hash), LHASH_COMP_FN(t_cmp))) == NULL) {
-+#endif
-         logmsg(LOG_ERR, "line %d: lh_new failed - aborted", n_lin);
-         exit(1);
-    }

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 Apr  6 21:36:12 2013
From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net)
Date: Sat, 06 Apr 2013 19:36:12 +0000
Subject: [csw-devel] SF.net SVN: gar:[20616] csw/mgar/pkg/openvpn/trunk
Message-ID: <E1UOYuJ-0007FO-WC@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 20616
          http://gar.svn.sourceforge.net/gar/?rev=20616&view=rev
Author:   chninkel
Date:     2013-04-06 19:36:11 +0000 (Sat, 06 Apr 2013)
Log Message:
-----------
openvpn/trunk: updated configuration file path in init script and removed duplicate CSW suffix in default configuration file

Modified Paths:
--------------
    csw/mgar/pkg/openvpn/trunk/Makefile
    csw/mgar/pkg/openvpn/trunk/files/cswopenvpn

Modified: csw/mgar/pkg/openvpn/trunk/Makefile
===================================================================
--- csw/mgar/pkg/openvpn/trunk/Makefile	2013-04-06 19:29:26 UTC (rev 20615)
+++ csw/mgar/pkg/openvpn/trunk/Makefile	2013-04-06 19:36:11 UTC (rev 20616)
@@ -31,7 +31,7 @@
 PATCHFILES = patch.openvpn-2.0.9.tun.c
 
 # use classes for install/removal
-PRESERVECONF = $(sysconfdir)/$(NAME)/$(NAME).conf.CSW
+PRESERVECONF = $(sysconfdir)/$(NAME)/$(NAME).conf
 INITSMF = /etc/opt/csw/init.d/cswopenvpn
 
 # no build tests
@@ -48,7 +48,7 @@
 	@echo "Installing $(NAME).conf.CSW"
 	@ginstall -d -m 755 $(DESTDIR)$(sysconfdir)/$(NAME)
 	@cp -pr $(WORKSRC)/sample-config-files/server.conf \
-		$(DESTDIR)$(sysconfdir)/$(NAME)/$(NAME).conf.CSW
+		$(DESTDIR)$(sysconfdir)/$(NAME)/$(NAME).conf
 	@echo "Installing start/stop script"
 	@ginstall -d -m 755 $(DESTDIR)/etc/opt/csw/init.d
 	@ginstall -m 755 $(FILEDIR)/cswopenvpn  \

Modified: csw/mgar/pkg/openvpn/trunk/files/cswopenvpn
===================================================================
--- csw/mgar/pkg/openvpn/trunk/files/cswopenvpn	2013-04-06 19:29:26 UTC (rev 20615)
+++ csw/mgar/pkg/openvpn/trunk/files/cswopenvpn	2013-04-06 19:36:11 UTC (rev 20616)
@@ -5,7 +5,7 @@
 # Multiple openvpd daemon processes are possible, but this script will
 # only handle the first one.
 # AUTOENABLE no
-OPENVPN_CONF=/opt/csw/etc/openvpn/openvpn.conf
+OPENVPN_CONF=/etc/opt/csw/openvpn/openvpn.conf
 PATH=/opt/csw/bin:$PATH
 OPENVPN_DAEMON=/opt/csw/sbin/openvpn
 

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 Apr  6 21:37:51 2013
From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net)
Date: Sat, 06 Apr 2013 19:37:51 +0000
Subject: [csw-devel] SF.net SVN: gar:[20617]
	csw/mgar/pkg/openvpn/trunk/Makefile
Message-ID: <E1UOYvv-0007Gm-C4@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 20617
          http://gar.svn.sourceforge.net/gar/?rev=20617&view=rev
Author:   chninkel
Date:     2013-04-06 19:37:51 +0000 (Sat, 06 Apr 2013)
Log Message:
-----------
openvpn/trunk: do not install default configuration file by default

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

Modified: csw/mgar/pkg/openvpn/trunk/Makefile
===================================================================
--- csw/mgar/pkg/openvpn/trunk/Makefile	2013-04-06 19:36:11 UTC (rev 20616)
+++ csw/mgar/pkg/openvpn/trunk/Makefile	2013-04-06 19:37:51 UTC (rev 20617)
@@ -31,7 +31,7 @@
 PATCHFILES = patch.openvpn-2.0.9.tun.c
 
 # use classes for install/removal
-PRESERVECONF = $(sysconfdir)/$(NAME)/$(NAME).conf
+#PRESERVECONF = $(sysconfdir)/$(NAME)/$(NAME).conf
 INITSMF = /etc/opt/csw/init.d/cswopenvpn
 
 # no build tests
@@ -48,7 +48,7 @@
 	@echo "Installing $(NAME).conf.CSW"
 	@ginstall -d -m 755 $(DESTDIR)$(sysconfdir)/$(NAME)
 	@cp -pr $(WORKSRC)/sample-config-files/server.conf \
-		$(DESTDIR)$(sysconfdir)/$(NAME)/$(NAME).conf
+		$(DESTDIR)$(sysconfdir)/$(NAME)/$(NAME).conf.CSW
 	@echo "Installing start/stop script"
 	@ginstall -d -m 755 $(DESTDIR)/etc/opt/csw/init.d
 	@ginstall -m 755 $(FILEDIR)/cswopenvpn  \

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 Apr  6 21:40:24 2013
From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net)
Date: Sat, 06 Apr 2013 19:40:24 +0000
Subject: [csw-devel] SF.net SVN: gar:[20618]
	csw/mgar/pkg/openvpn/trunk/Makefile
Message-ID: <E1UOYyO-0007MS-0U@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 20618
          http://gar.svn.sourceforge.net/gar/?rev=20618&view=rev
Author:   chninkel
Date:     2013-04-06 19:40:23 +0000 (Sat, 06 Apr 2013)
Log Message:
-----------
openvpn/trunk: added the build dependency CSWtun

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

Modified: csw/mgar/pkg/openvpn/trunk/Makefile
===================================================================
--- csw/mgar/pkg/openvpn/trunk/Makefile	2013-04-06 19:37:51 UTC (rev 20617)
+++ csw/mgar/pkg/openvpn/trunk/Makefile	2013-04-06 19:40:23 UTC (rev 20618)
@@ -12,6 +12,7 @@
 DISTFILES = $(NAME)-$(VERSION).tar.gz
 
 # we require
+BUILD_DEP_PKGS = CSWtun
 RUNTIME_DEP_PKGS = CSWlibssl1-0-0 CSWliblzo2-2
 
 # The references are located in document or sample files and are harmless

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 Apr  6 21:42:24 2013
From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net)
Date: Sat, 06 Apr 2013 19:42:24 +0000
Subject: [csw-devel] SF.net SVN: gar:[20619] csw/mgar/pkg/xchat/trunk
Message-ID: <E1UOZ0K-0007OX-Lq@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 20619
          http://gar.svn.sourceforge.net/gar/?rev=20619&view=rev
Author:   chninkel
Date:     2013-04-06 19:42:24 +0000 (Sat, 06 Apr 2013)
Log Message:
-----------
xchat/trunk: updated to 2.8.8 and rebuilt against libssl 1.0.0

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

Added Paths:
-----------
    csw/mgar/pkg/xchat/trunk/files/patch-glib-2.32.diff

Modified: csw/mgar/pkg/xchat/trunk/Makefile
===================================================================
--- csw/mgar/pkg/xchat/trunk/Makefile	2013-04-06 19:40:23 UTC (rev 20618)
+++ csw/mgar/pkg/xchat/trunk/Makefile	2013-04-06 19:42:24 UTC (rev 20619)
@@ -1,5 +1,5 @@
 NAME = xchat
-VERSION = 2.8.6
+VERSION = 2.8.8
 CATEGORIES = gnome
 GARTYPE = v2
 
@@ -40,10 +40,13 @@
 # upstream software release
 UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2
 
-# Official XChat patches
-PATCHFILES  = xc286-smallfixes.diff
-PATCHFILES += xchat26-compiletime.diff
+# Fix some compilation problem under Solaris
+PATCHFILES = xchat26-compiletime.diff
 
+# Patch taken http://trac.macports.org/ticket/33959 and updated
+# to be able to compile against a more recent version of glib
+PATCHFILES += patch-glib-2.32.diff
+
 LDFLAGS =
 NOISALIST = 1
 CONFIGURE_ARGS  = $(DIRPATHS)

Modified: csw/mgar/pkg/xchat/trunk/checksums
===================================================================
--- csw/mgar/pkg/xchat/trunk/checksums	2013-04-06 19:40:23 UTC (rev 20618)
+++ csw/mgar/pkg/xchat/trunk/checksums	2013-04-06 19:42:24 UTC (rev 20619)
@@ -1,4 +1 @@
-1f2670865d43a23a9abc596dde999aca  download/xchat-2.8.6.tar.bz2
-41ec540885de7c34625768aa1fb9682b  download/fixme.sh
-eb68b6261bf6740cb5f223627eb8f384  download/xc286-smallfixes.diff
-02f27ba7bcf10d36523618fb201d9634  download/xchat26-compiletime.diff
+6775c44f38e84d06c06c336b32c4a452  xchat-2.8.8.tar.bz2

Added: csw/mgar/pkg/xchat/trunk/files/patch-glib-2.32.diff
===================================================================
--- csw/mgar/pkg/xchat/trunk/files/patch-glib-2.32.diff	                        (rev 0)
+++ csw/mgar/pkg/xchat/trunk/files/patch-glib-2.32.diff	2013-04-06 19:42:24 UTC (rev 20619)
@@ -0,0 +1,63 @@
+diff -Naurp ./src/common/modes.c ./src/common/modes.c
+--- ./src/common/modes.c	2010-05-29 18:52:18.000000000 -0700
++++ ./src/common/modes.c	2012-04-09 14:02:12.000000000 -0700
+@@ -20,7 +20,7 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <glib.h>
+-#include <glib/gprintf.h>
++#include <glib.h>
+ 
+ #include "xchat.h"
+ #include "xchatc.h"
+diff -Naurp ./src/common/servlist.c ./src/common/servlist.c
+--- ./src/common/servlist.c	2010-05-16 00:24:26.000000000 -0700
++++ ./src/common/servlist.c	2012-04-09 14:02:12.000000000 -0700
+@@ -24,7 +24,7 @@
+ #include <unistd.h>
+ 
+ #include "xchat.h"
+-#include <glib/ghash.h>
++#include <glib.h>
+ 
+ #include "cfgfiles.h"
+ #include "fe.h"
+diff -Naurp ./src/common/text.c ./src/common/text.c
+--- ./src/common/text.c	2010-05-29 19:14:41.000000000 -0700
++++ ./src/common/text.c	2012-04-09 14:02:12.000000000 -0700
+@@ -28,7 +28,7 @@
+ #include <sys/mman.h>
+ 
+ #include "xchat.h"
+-#include <glib/ghash.h>
++#include <glib.h>
+ #include "cfgfiles.h"
+ #include "chanopt.h"
+ #include "plugin.h"
+diff -Naurp ./src/common/util.c ./src/common/util.c
+--- ./src/common/util.c	2009-08-16 02:40:16.000000000 -0700
++++ ./src/common/util.c	2012-04-09 14:02:12.000000000 -0700
+@@ -39,7 +39,7 @@
+ #include <errno.h>
+ #include "xchat.h"
+ #include "xchatc.h"
+-#include <glib/gmarkup.h>
++#include <glib.h>
+ #include <ctype.h>
+ #include "util.h"
+ #include "../../config.h"
+diff -Naurp ./src/common/xchat.h ./src/common/xchat.h
+--- ./src/common/xchat.h	2009-08-16 02:40:16.000000000 -0700
++++ ./src/common/xchat.h	2012-04-09 14:01:05.000000000 -0700
+@@ -1,10 +1,6 @@
+ #include "../../config.h"
+ 
+-#include <glib/gslist.h>
+-#include <glib/glist.h>
+-#include <glib/gutils.h>
+-#include <glib/giochannel.h>
+-#include <glib/gstrfuncs.h>
++#include <glib.h>
+ #include <time.h>			/* need time_t */
+ 
+ #ifndef XCHAT_H

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 Apr  6 22:23:51 2013
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Sat, 06 Apr 2013 20:23:51 +0000
Subject: [csw-devel] SF.net SVN: gar:[20620] csw/mgar/pkg/easytag/trunk
Message-ID: <E1UOZeR-0008Lr-Li@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 20620
          http://gar.svn.sourceforge.net/gar/?rev=20620&view=rev
Author:   dmichelsen
Date:     2013-04-06 20:23:51 +0000 (Sat, 06 Apr 2013)
Log Message:
-----------
easytag/trunk: Merge changes from Laurent Blume for 2.1.8

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

Modified: csw/mgar/pkg/easytag/trunk/Makefile
===================================================================
--- csw/mgar/pkg/easytag/trunk/Makefile	2013-04-06 19:42:24 UTC (rev 20619)
+++ csw/mgar/pkg/easytag/trunk/Makefile	2013-04-06 20:23:51 UTC (rev 20620)
@@ -1,5 +1,5 @@
 NAME = easytag
-VERSION = 2.1.7
+VERSION = 2.1.8
 GARTYPE = v2
 
 DESCRIPTION = Tag editor for MP3, Ogg Vorbis files and more
@@ -9,9 +9,11 @@
   interface makes tagging easier under GNU/Linux or Windows.
 endef
 
-MASTER_SITES = $(SF_MIRRORS)
-DISTFILES += $(NAME)-$(VERSION).tar.bz2
+MASTER_SITES = $(GNOME_MIRRORS)
+DISTFILES += $(NAME)-$(VERSION).tar.xz
 
+VENDOR_URL = http://projects.gnome.org/easytag/
+
 BUILD_DEP_PKGS += CSWlibogg-dev
 BUILD_DEP_PKGS += CSWlibvorbis-dev
 BUILD_DEP_PKGS += CSWlibflac-dev
@@ -33,11 +35,15 @@
 RUNTIME_DEP_PKGS_CSWeasytag += CSWpango
 RUNTIME_DEP_PKGS_CSWeasytag += CSWlibspeex1
 RUNTIME_DEP_PKGS_CSWeasytag += CSWlibvorbisfile3
+RUNTIME_DEP_PKGS_CSWeasytag += CSWlibgio2-0-0
 
-# Needed for gethostbyname
-EXTRA_LINKER_FLAGS = -lnsl
+# This macro is being phased out of Pango, so this seems like an acceptable fix for now:
+#   https://bugzilla.gnome.org/show_bug.cgi?id=652202
+EXTRA_CFLAGS += -DG_CONST_RETURN=const
 
-EXTRA_CONFIGURE_EXPORTS += LIBS
-CONFIGURE_ENV_LIBS = -lCrun
+EXTRA_LINKER_FLAGS = -norunpath
 
+# For msgfmt, msgmerge, xgettext and gettext to be used from GNU
+CONFIGURE_ENV_PATH = $(prefix)/gnu:$(PATH)
+
 include gar/category.mk

Modified: csw/mgar/pkg/easytag/trunk/checksums
===================================================================
--- csw/mgar/pkg/easytag/trunk/checksums	2013-04-06 19:42:24 UTC (rev 20619)
+++ csw/mgar/pkg/easytag/trunk/checksums	2013-04-06 20:23:51 UTC (rev 20620)
@@ -1 +1 @@
-9df3e800d80e754670642f2ba5e03539  easytag-2.1.7.tar.bz2
+5eb6ae2dc7f6d6ecbf7ea6ba230c7ea1  easytag-2.1.8.tar.xz

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 Apr  6 22:35:21 2013
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Sat, 06 Apr 2013 20:35:21 +0000
Subject: [csw-devel] SF.net SVN: gar:[20621]
	csw/mgar/pkg/mysql5/branches/mysql-5.5.x-debug/
Message-ID: <E1UOZpZ-0000CV-Mo@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 20621
          http://gar.svn.sourceforge.net/gar/?rev=20621&view=rev
Author:   wahwah
Date:     2013-04-06 20:35:21 +0000 (Sat, 06 Apr 2013)
Log Message:
-----------
msyql-5.5.x: A branch for debug builds

Added Paths:
-----------
    csw/mgar/pkg/mysql5/branches/mysql-5.5.x-debug/

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 Apr  6 22:38:49 2013
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Sat, 06 Apr 2013 20:38:49 +0000
Subject: [csw-devel] SF.net SVN: gar:[20622]
 csw/mgar/pkg/mysql5/branches/mysql-5.5.x-debug/ Makefile
Message-ID: <E1UOZsv-0000Fr-CP@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 20622
          http://gar.svn.sourceforge.net/gar/?rev=20622&view=rev
Author:   wahwah
Date:     2013-04-06 20:38:49 +0000 (Sat, 06 Apr 2013)
Log Message:
-----------
mysql5/branches/mysql-5.5.x-debug: A debug build

Modified Paths:
--------------
    csw/mgar/pkg/mysql5/branches/mysql-5.5.x-debug/Makefile

Modified: csw/mgar/pkg/mysql5/branches/mysql-5.5.x-debug/Makefile
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.5.x-debug/Makefile	2013-04-06 20:35:21 UTC (rev 20621)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x-debug/Makefile	2013-04-06 20:38:49 UTC (rev 20622)
@@ -18,7 +18,7 @@
 VERSION = $(BASE_VERSION).$(PATCHLEVEL)
 
 # Useful when making a series of builds on the same day
-# GARFLAVOR ?= DBG
+GARFLAVOR ?= DBG
 
 PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386
 PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386
@@ -235,6 +235,7 @@
 CMAKE_ARGS += "-DCMAKE_C_FLAGS=$(CFLAGS)"
 CMAKE_ARGS += "-DCMAKE_CXX_FLAGS=$(CXXFLAGS)"
 CMAKE_ARGS += -DCMAKE_VERBOSE_MAKEFILE=ON
+CMAKE_ARGS += -DWITH_DEBUG=1
 
 # TODO: Make the tests pass. They don't at the moment.
 SKIPTEST ?= 1

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


From chninkel at users.sourceforge.net  Sat Apr  6 22:44:39 2013
From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net)
Date: Sat, 06 Apr 2013 20:44:39 +0000
Subject: [csw-devel] SF.net SVN: gar:[20623]
	csw/mgar/pkg/xchat/trunk/Makefile
Message-ID: <E1UOZyZ-0000Qe-Ab@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 20623
          http://gar.svn.sourceforge.net/gar/?rev=20623&view=rev
Author:   chninkel
Date:     2013-04-06 20:44:38 +0000 (Sat, 06 Apr 2013)
Log Message:
-----------
xchat/trunk: bumped version to 2.8.8 and updated recipe to build against libssl 1.0.0

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

Modified: csw/mgar/pkg/xchat/trunk/Makefile
===================================================================
--- csw/mgar/pkg/xchat/trunk/Makefile	2013-04-06 20:38:49 UTC (rev 20622)
+++ csw/mgar/pkg/xchat/trunk/Makefile	2013-04-06 20:44:38 UTC (rev 20623)
@@ -19,23 +19,21 @@
 CATALOGNAME_CSWxchat-py  = xchat_py
 CATALOGNAME_CSWxchat-tcl = xchat_tcl
 SPKG_DESC_CSWxchat     = GTK+ based IRC client, similar to AmIRC (Amiga).
-SPKG_DESC_CSWxchat-pl  = xChat Perl Plugin
-SPKG_DESC_CSWxchat-py  = xChat Python Plugin
-SPKG_DESC_CSWxchat-tcl = xChat TCL Plugin
-RUNTIME_DEP_PKGS_CSWxchat  = CSWdbusglib CSWexpat CSWfconfig CSWftype2 CSWlibntlm
-RUNTIME_DEP_PKGS_CSWxchat += CSWggettextrt CSWglib2 CSWgtk2 CSWiconv CSWlibatk 
-RUNTIME_DEP_PKGS_CSWxchat += CSWlibcairo CSWlibdbus CSWlibxft2 CSWlibxrender 
-RUNTIME_DEP_PKGS_CSWxchat += CSWosslrt CSWpango CSWpng CSWsunmath CSWzlib
-RUNTIME_DEP_PKGS_CSWxchat-pl   = CSWxchat CSWperl CSWosslrt CSWglib2
-RUNTIME_DEP_PKGS_CSWxchat-pl  += CSWggettextrt CSWlibntlm
-RUNTIME_DEP_PKGS_CSWxchat-py   = CSWxchat CSWpython CSWosslrt CSWglib2
-RUNTIME_DEP_PKGS_CSWxchat-py  += CSWggettextrt CSWlibntlm
-RUNTIME_DEP_PKGS_CSWxchat-tcl  = CSWxchat CSWtcl CSWosslrt CSWglib2
-RUNTIME_DEP_PKGS_CSWxchat-tcl += CSWggettextrt CSWlibntlm
+SPKG_DESC_CSWxchat-pl  = X-Chat Perl Plugin
+SPKG_DESC_CSWxchat-py  = X-Chat Python Plugin
+SPKG_DESC_CSWxchat-tcl = X-Chat TCL Plugin
+RUNTIME_DEP_PKGS_CSWxchat  = CSWlibgtk-x11-2-0-0 CSWlibgobject2-0-0
+RUNTIME_DEP_PKGS_CSWxchat += CSWlibglib2-0-0 CSWlibdbus-glib1-2 CSWlibgmodule2-0-0
+RUNTIME_DEP_PKGS_CSWxchat += CSWlibintl8 CSWlibgdk-pixbuf2-0-0 CSWlibssl1-0-0
+RUNTIME_DEP_PKGS_CSWxchat += CSWpango CSWlibgdk-x11-2-0-0
+RUNTIME_DEP_PKGS_CSWxchat-pl   = CSWperl
+RUNTIME_DEP_PKGS_CSWxchat-py   = CSWlibpython2-6-1-0 CSWlibglib2-0-0
+RUNTIME_DEP_PKGS_CSWxchat-tcl  = CSWlibtcl8-5
 PKGFILES_CSWxchat-pl  = $(libdir)/.*/perl.so
 PKGFILES_CSWxchat-py  = $(libdir)/.*/python.so
 PKGFILES_CSWxchat-tcl = $(libdir)/.*/tcl.so
 
+
 # We define upstream file regex so we can be notifed of new 
 # upstream software release
 UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2
@@ -57,7 +55,6 @@
 CONFIGURE_ARGS += --enable-ipv6
 
 ## run checkpkg manually
-ENABLE_CHECK = 0
 EXTRA_INC = $(prefix)/bdb44/include
 EXTRA_LIB = $(prefix)/bdb44/lib
 
@@ -67,4 +64,8 @@
 	@$(DOWNLOADDIR)/fixme.sh $(WORKSRC)
 	$(DONADA)
 
+post-merge:
+	rm -f $(PKGROOT)/$(libdir)/charset.alias
+	rm -f $(PKGROOT)/$(sharedstatedir)/locale/locale.alias
+
 include gar/category.mk

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


From chninkel at users.sourceforge.net  Sat Apr  6 22:51:47 2013
From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net)
Date: Sat, 06 Apr 2013 20:51:47 +0000
Subject: [csw-devel] SF.net SVN: gar:[20624]
	csw/mgar/pkg/fbopenssl/trunk/Makefile
Message-ID: <E1UOa5T-0000aj-V0@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 20624
          http://gar.svn.sourceforge.net/gar/?rev=20624&view=rev
Author:   chninkel
Date:     2013-04-06 20:51:47 +0000 (Sat, 06 Apr 2013)
Log Message:
-----------
fbopenssl/trunk: updated recipe to rebuild against libssl 1.0.0

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

Modified: csw/mgar/pkg/fbopenssl/trunk/Makefile
===================================================================
--- csw/mgar/pkg/fbopenssl/trunk/Makefile	2013-04-06 20:44:38 UTC (rev 20623)
+++ csw/mgar/pkg/fbopenssl/trunk/Makefile	2013-04-06 20:51:47 UTC (rev 20624)
@@ -17,8 +17,8 @@
 
 VENDOR_URL = http://sourceforge.net/projects/modgssapache
 
-BUILD_DEP_PKGS = CSWossldevel
-RUNTIME_DEP_PKGS = CSWosslrt
+BUILD_DEP_PKGS = CSWlibssl-dev
+RUNTIME_DEP_PKGS = CSWlibssl1-0-0
 
 PACKAGES += CSWlibfbopenssl0
 SPKG_DESC_CSWlibfbopenssl0 = Extensions to OpenSSL including support for GSS-API and SPNEGO, libfbopenssl.so.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 Apr  7 01:03:49 2013
From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net)
Date: Sat, 06 Apr 2013 23:03:49 +0000
Subject: [csw-devel] SF.net SVN: gar:[20625] csw/mgar/pkg/ntop/trunk/Makefile
Message-ID: <E1UOc9F-0003f4-TQ@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 20625
          http://gar.svn.sourceforge.net/gar/?rev=20625&view=rev
Author:   chninkel
Date:     2013-04-06 23:03:49 +0000 (Sat, 06 Apr 2013)
Log Message:
-----------
ntop/trunk: updated recipe to build against libssl 1.0.0

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

Modified: csw/mgar/pkg/ntop/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ntop/trunk/Makefile	2013-04-06 20:51:47 UTC (rev 20624)
+++ csw/mgar/pkg/ntop/trunk/Makefile	2013-04-06 23:03:49 UTC (rev 20625)
@@ -38,14 +38,13 @@
 UFILES_REGEX = (\d+(?:\.\d+)*)
 
 RUNTIME_DEP_PKGS_CSWntop += CSWlibpython2-6-1-0
-RUNTIME_DEP_PKGS_CSWntop += CSWlibpcap
-RUNTIME_DEP_PKGS_CSWntop += CSWosslrt
-RUNTIME_DEP_PKGS_CSWntop += CSWrrd
-RUNTIME_DEP_PKGS_CSWntop += CSWgeoip
+RUNTIME_DEP_PKGS_CSWntop += CSWlibpcap1
+RUNTIME_DEP_PKGS_CSWntop += CSWlibssl1-0-0
+RUNTIME_DEP_PKGS_CSWntop += CSWlibrrd-th4
+RUNTIME_DEP_PKGS_CSWntop += CSWlibgeoip1
 RUNTIME_DEP_PKGS_CSWntop += CSWpython
-RUNTIME_DEP_PKGS_CSWntop += CSWlibgdbm3
-RUNTIME_DEP_PKGS_CSWntop += CSWzlib
-RUNTIME_DEP_PKGS_CSWntop += CSWiconv
+RUNTIME_DEP_PKGS_CSWntop += CSWlibgdbm4
+RUNTIME_DEP_PKGS_CSWntop += CSWlibz1
 
 ## Following package enables optional functionality
 #RUNTIME_DEP_PKGS_CSWntop += CSWgraphviz
@@ -53,9 +52,19 @@
 
 BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS_CSWntop)
 BUILD_DEP_PKGS += CSWlibtool CSWautoconf CSWautomake
-BUILD_DEP_PKGS += CSWlibpcapdevel CSWossldevel
-BUILD_DEP_PKGS += CSWlibgdbm-dev
+BUILD_DEP_PKGS += CSWlibpcap-dev CSWlibssl-dev
+BUILD_DEP_PKGS += CSWlibgdbm-dev CSWgeoip-dev
 
+# These are ntop plugins so these check alerts are not important
+CHECKPKG_OVERRIDES_CSWntop += soname-equals-filename|file=/opt/csw/lib/libcpacketPlugin-4.0.3.so
+CHECKPKG_OVERRIDES_CSWntop += soname-equals-filename|file=/opt/csw/lib/libicmpPlugin-4.0.3.so
+CHECKPKG_OVERRIDES_CSWntop += soname-equals-filename|file=/opt/csw/lib/libnetflowPlugin-4.0.3.so
+CHECKPKG_OVERRIDES_CSWntop += soname-equals-filename|file=/opt/csw/lib/libntop-4.0.3.so
+CHECKPKG_OVERRIDES_CSWntop += soname-equals-filename|file=/opt/csw/lib/libntopreport-4.0.3.so
+CHECKPKG_OVERRIDES_CSWntop += soname-equals-filename|file=/opt/csw/lib/librrdPlugin-4.0.3.so
+CHECKPKG_OVERRIDES_CSWntop += soname-equals-filename|file=/opt/csw/lib/libsflowPlugin-4.0.3.so
+
+
 CONFIGURE_SCRIPTS = $(WORKSRC)/autogen.sh
 
 sysconfdir = /etc/opt/csw

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


From bonivart at users.sourceforge.net  Sun Apr  7 01:35:47 2013
From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net)
Date: Sat, 06 Apr 2013 23:35:47 +0000
Subject: [csw-devel] SF.net SVN: gar:[20626] csw/mgar/pkg
Message-ID: <E1UOceB-0004Tg-N3@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 20626
          http://gar.svn.sourceforge.net/gar/?rev=20626&view=rev
Author:   bonivart
Date:     2013-04-06 23:35:47 +0000 (Sat, 06 Apr 2013)
Log Message:
-----------
ntp/trunk: initial commit

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

Added: csw/mgar/pkg/ntp/Makefile
===================================================================
--- csw/mgar/pkg/ntp/Makefile	                        (rev 0)
+++ csw/mgar/pkg/ntp/Makefile	2013-04-06 23:35:47 UTC (rev 20626)
@@ -0,0 +1,2 @@
+%:
+	$(MAKE) -C trunk $*


Property changes on: csw/mgar/pkg/ntp/trunk
___________________________________________________________________
Added: svn:ignore
   + work


Added: csw/mgar/pkg/ntp/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ntp/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/ntp/trunk/Makefile	2013-04-06 23:35:47 UTC (rev 20626)
@@ -0,0 +1,20 @@
+NAME = ntp
+VERSION = 4.2.6p5
+GARTYPE = v2
+
+DESCRIPTION = The Network Time Protocol Distribution
+define BLURB
+endef
+
+MASTER_SITES = http://archive.ntp.org/ntp4/ntp-4.2/
+DISTFILES = $(DISTNAME).tar.gz
+
+RUNTIME_DEP_PKGS_CSWntp += CSWlibnetsnmp25
+RUNTIME_DEP_PKGS_CSWntp += CSWlibssl1-0-0
+RUNTIME_DEP_PKGS_CSWntp += CSWlibnetsnmpagent25
+
+CONFIGURE_ARGS  = $(DIRPATHS)
+CONFIGURE_ARGS += --with-openssl-libdir=/opt/csw/lib
+CONFIGURE_ARGS += --with-openssl-incdir=/opt/csw/include
+
+include gar/category.mk


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

Added: csw/mgar/pkg/ntp/trunk/checksums
===================================================================
--- csw/mgar/pkg/ntp/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/ntp/trunk/checksums	2013-04-06 23:35:47 UTC (rev 20626)
@@ -0,0 +1 @@
+00df80a84ec9528fcfb09498075525bc  ntp-4.2.6p5.tar.gz

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


From chninkel at users.sourceforge.net  Sun Apr  7 09:59:34 2013
From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net)
Date: Sun, 07 Apr 2013 07:59:34 +0000
Subject: [csw-devel] SF.net SVN: gar:[20627] csw/mgar/pkg/nmap/trunk
Message-ID: <E1UOkVi-0005Tf-Eh@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 20627
          http://gar.svn.sourceforge.net/gar/?rev=20627&view=rev
Author:   chninkel
Date:     2013-04-07 07:59:32 +0000 (Sun, 07 Apr 2013)
Log Message:
-----------
nmap/trunk: fixed compilation bug, disabled lua support, update dependencies names

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

Added Paths:
-----------
    csw/mgar/pkg/nmap/trunk/files/0001-Fix-IFF_IPMP-compilation-bug.patch

Modified: csw/mgar/pkg/nmap/trunk/Makefile
===================================================================
--- csw/mgar/pkg/nmap/trunk/Makefile	2013-04-06 23:35:47 UTC (rev 20626)
+++ csw/mgar/pkg/nmap/trunk/Makefile	2013-04-07 07:59:32 UTC (rev 20627)
@@ -24,13 +24,16 @@
 
 PACKAGES += CSWnmap
 SPKG_DESC_CSWnmap = A network exploration tool and security/port scanner
-RUNTIME_DEP_PKGS_CSWnmap += CSWlibpcre0
+RUNTIME_DEP_PKGS_CSWnmap += CSWlibpcre1
 RUNTIME_DEP_PKGS_CSWnmap += CSWlibssl1-0-0
 RUNTIME_DEP_PKGS_CSWnmap += CSWlibpcap1
-RUNTIME_DEP_PKGS_CSWnmap += CSWlua
+RUNTIME_DEP_PKGS_CSWnmap += CSWlibstdc++6
+RUNTIME_DEP_PKGS_CSWnmap += CSWlibgcc-s1
+#RUNTIME_DEP_PKGS_CSWnmap += CSWlua
 RUNTIME_DEP_PKGS_CSWnmap += CSWpython
+
 # For Zenmap
-RUNTIME_DEP_PKGS_CSWnmap += CSWpygtk
+#RUNTIME_DEP_PKGS_CSWnmap += CSWpygtk
 
 # Tons of docs and identification of programs installed there
 CHECKPKG_OVERRIDES_CSWnmap += file-with-bad-content
@@ -47,6 +50,8 @@
 PKGFILES_CSWzenmap += $(sharedstatedir)/zenmap/.*
 
 
+PATCHFILES = 0001-Fix-IFF_IPMP-compilation-bug.patch
+
 # See standards(5) for details
 # we disable this (for) now, because we're switching the compiler to GCC4
 #EXTRA_CPPFLAGS += -features=extensions -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED=1 -D__EXTENSIONS__
@@ -64,7 +69,8 @@
 #   http://nmap.org/svn/libdnet-stripped/NMAP_MODIFICATIONS
 CONFIGURE_ARGS += --with-libdnet=included
 
-CONFIGURE_ARGS += --with-liblua=$(prefix)
+#CONFIGURE_ARGS += --with-liblua=$(prefix)
+CONFIGURE_ARGS += --without-liblua
 
 # Not necessary
 # CONFIGURE_ARGS += --with-libnbase=

Added: csw/mgar/pkg/nmap/trunk/files/0001-Fix-IFF_IPMP-compilation-bug.patch
===================================================================
--- csw/mgar/pkg/nmap/trunk/files/0001-Fix-IFF_IPMP-compilation-bug.patch	                        (rev 0)
+++ csw/mgar/pkg/nmap/trunk/files/0001-Fix-IFF_IPMP-compilation-bug.patch	2013-04-07 07:59:32 UTC (rev 20627)
@@ -0,0 +1,28 @@
+From 2c44837792045bd96917bbd6f8a664afc655c270 Mon Sep 17 00:00:00 2001
+From: Yann Rouillard <yann at pleiades.fr.eu.org>
+Date: Sat, 6 Apr 2013 22:09:45 +0200
+Subject: [PATCH] Fix IFF_IPMP compilation bug
+
+---
+ libdnet-stripped/src/intf.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/libdnet-stripped/src/intf.c b/libdnet-stripped/src/intf.c
+index 25ae999..865e500 100644
+--- a/libdnet-stripped/src/intf.c
++++ b/libdnet-stripped/src/intf.c
+@@ -954,9 +954,11 @@ intf_loop(intf_t *intf, intf_handler callback, void *arg)
+ 			;
+ 		else
+ 			return (-1);
++#ifdef IFF_IPMP
+ 		if (lifr->lifr_flags & IFF_IPMP) {
+ 			continue;
+ 		}
++#endif
+ 		
+ 		if (_intf_get_noalias(intf, entry) < 0)
+ 			return (-1);
+-- 
+1.8.1.4
+

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 Apr  7 10:09:31 2013
From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net)
Date: Sun, 07 Apr 2013 08:09:31 +0000
Subject: [csw-devel] SF.net SVN: gar:[20628] csw/mgar/pkg/slrn/trunk
Message-ID: <E1UOkfL-0005ll-S7@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 20628
          http://gar.svn.sourceforge.net/gar/?rev=20628&view=rev
Author:   chninkel
Date:     2013-04-07 08:09:31 +0000 (Sun, 07 Apr 2013)
Log Message:
-----------
slrn/trunk: bumped to 1.0.1, rebuilt against libssl 1.0.0

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

Modified: csw/mgar/pkg/slrn/trunk/Makefile
===================================================================
--- csw/mgar/pkg/slrn/trunk/Makefile	2013-04-07 07:59:32 UTC (rev 20627)
+++ csw/mgar/pkg/slrn/trunk/Makefile	2013-04-07 08:09:31 UTC (rev 20628)
@@ -1,8 +1,8 @@
 NAME = slrn
-VERSION = 0.9.8.1
-GARTYPE = v1
+VERSION = 1.0.1
+GARTYPE = v2
 
-DESCRIPTION = command-line news reader
+DESCRIPTION = Command-line news reader
 define BLURB
   slrn (``s-lang read news'') is a newsreader, i.e. a program that accesses
   a newsserver to read messages from the Internet News service (also known
@@ -15,22 +15,34 @@
 endef
 
 MASTER_SITES = $(SF_MIRRORS)
-DISTFILES  = $(NAME)-$(VERSION).tar.bz2
-DISTFILES += $(call admfiles,CSWslrn,prototype depend)
+DISTFILES  = $(NAME)-$(VERSION).tar.gz
 
 # We define upstream file regex so we can be notifed of new upstream software release
 UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=7768
 UPSTREAM_USE_SF = 1
 UFILES_REGEX = $(NAME)-((\d+(?:\.\d+)*)(p\d+)?)
 
-LD_OPTIONS = -R/opt/csw/lib/\$$ISALIST -R/opt/csw/lib
 
+CHECKPKG_OVERRIDES_CSWslrn += file-with-bad-content|/usr/local|root/opt/csw/share/doc/slrn/FAQ
+CHECKPKG_OVERRIDES_CSWslrn += file-with-bad-content|/usr/local|root/opt/csw/share/doc/slrn/README.multiuser
+CHECKPKG_OVERRIDES_CSWslrn += file-with-bad-content|/usr/local|root/opt/csw/share/doc/slrn/score.txt
+CHECKPKG_OVERRIDES_CSWslrn += file-with-bad-content|/usr/local|root/opt/csw/share/doc/slrn/changes.txt
+CHECKPKG_OVERRIDES_CSWslrn += file-with-bad-content|/usr/local|root/opt/csw/share/doc/slrn/manual.txt
+CHECKPKG_OVERRIDES_CSWslrn += file-with-bad-content|/usr/local|root/opt/csw/share/doc/slrn/README.SSL
+CHECKPKG_OVERRIDES_CSWslrn += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/slrn.1
+CHECKPKG_OVERRIDES_CSWslrn += file-with-bad-content|/usr/local|root/opt/csw/share/slrn/slang/mailcap.sl
+CHECKPKG_OVERRIDES_CSWslrn += file-with-bad-content|/usr/share|root/opt/csw/share/doc/slrn/FAQ
+CHECKPKG_OVERRIDES_CSWslrn += file-with-bad-content|/usr/share|root/opt/csw/share/doc/slrn/changes.txt
+CHECKPKG_OVERRIDES_CSWslrn += file-with-bad-content|/usr/share|root/opt/csw/share/doc/slrn/manual.txt
+
+RUNTIME_DEP_PKGS = CSWlibintl8 CSWlibslang2 CSWlibiconv2 CSWlibssl1-0-0
+
 CONFIGURE_ARGS = $(DIRPATHS) --with-ssl=/opt/csw
 CONFIGURE_ARGS += --with-slang-library=/opt/csw/lib --with-slrnpull
 CONFIGURE_ARGS += --enable-setgid-code --enable-spool
 CONFIGURE_ARGS += --with-mta=/usr/lib/sendmail --enable-hardcode-libs
 
-INSTALL_ARGS = install install-contrib
+INSTALL_ARGS = install 
 
 # slrn doesn't have a test target
 TEST_TARGET =

Modified: csw/mgar/pkg/slrn/trunk/checksums
===================================================================
--- csw/mgar/pkg/slrn/trunk/checksums	2013-04-07 07:59:32 UTC (rev 20627)
+++ csw/mgar/pkg/slrn/trunk/checksums	2013-04-07 08:09:31 UTC (rev 20628)
@@ -1,4 +1 @@
-8db91e851893e3d88664c2ec70ea2707  download/CSWslrn.depend
-08ba30e74d624367f5c410738be5f0c0  download/CSWslrn.gspec
-3788968cf51d4f25f106f29ac19c8e6b  download/CSWslrn.prototype
-9b613007df537444a5f8a4a2994fadb7  download/slrn-0.9.8.1.tar.bz2
+232670ab76a045967b137e5124b3d681  slrn-1.0.1.tar.gz

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


From chninkel at users.sourceforge.net  Sun Apr  7 10:40:25 2013
From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net)
Date: Sun, 07 Apr 2013 08:40:25 +0000
Subject: [csw-devel] SF.net SVN: gar:[20629] csw/mgar/pkg/conserver/trunk
Message-ID: <E1UOl9F-0003jI-3h@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 20629
          http://gar.svn.sourceforge.net/gar/?rev=20629&view=rev
Author:   chninkel
Date:     2013-04-07 08:40:22 +0000 (Sun, 07 Apr 2013)
Log Message:
-----------
conserver/trunk: updated recipe to build against libssl 1.0.0

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

Modified: csw/mgar/pkg/conserver/trunk/Makefile
===================================================================
--- csw/mgar/pkg/conserver/trunk/Makefile	2013-04-07 08:09:31 UTC (rev 20628)
+++ csw/mgar/pkg/conserver/trunk/Makefile	2013-04-07 08:40:22 UTC (rev 20629)
@@ -1,6 +1,6 @@
 # : Makefile 9089 2010-03-11 08:34:46Z wahwah $
 NAME = conserver
-VERSION = 8.1.7
+VERSION = 8.1.11
 GARTYPE = v2
 
 DESCRIPTION = Client/Server console server software
@@ -30,6 +30,11 @@
 # uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES
 # UPSTREAM_MASTER_SITES = 
 
+RUNTIME_DEP_PKGS = CSWlibssl1-0-0
+
+CHECKPKG_OVERRIDES  = file-with-bad-content|/usr/local|root/opt/csw/share/examples/conserver/conserver.rc
+CHECKPKG_OVERRIDES += file-with-bad-content|/usr/local|root/opt/csw/share/examples/conserver/conserver.cf
+
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --with-uds
 CONFIGURE_ARGS += --with-libwrap
@@ -39,17 +44,16 @@
 LICENSE = LICENSE
 
 DISTFILES += cswconserver
-INITSMF = /opt/csw/etc/init.d/cswconserver
+INITSMF = $(sysconfdir)/init.d/cswconserver
 
+TEST_SCRIPTS = 
+
 include gar/category.mk
 
-RUNTIME_DEP_PKGS_CSWconserver += CSWtcpwrap
-RUNTIME_DEP_PKGS_CSWconserver += CSWosslrt
-
 post-merge: merge-init-script
 
 #
 merge-init-script:
-	ginstall -m 755 -d $(PKGROOT)/opt/csw/etc/init.d
-	ginstall -m 755 $(FILEDIR)/cswconserver $(PKGROOT)/opt/csw/etc/init.d/cswconserver
+	ginstall -m 755 -d $(PKGROOT)$(sysconfdir)/init.d/
+	ginstall -m 755 $(FILEDIR)/cswconserver $(PKGROOT)$(sysconfdir)/init.d/cswconserver
 

Modified: csw/mgar/pkg/conserver/trunk/checksums
===================================================================
--- csw/mgar/pkg/conserver/trunk/checksums	2013-04-07 08:09:31 UTC (rev 20628)
+++ csw/mgar/pkg/conserver/trunk/checksums	2013-04-07 08:40:22 UTC (rev 20629)
@@ -1,2 +1 @@
-9796099c4fca9f751a0ff4765288f8e4  conserver-8.1.7.tar.gz
-d1b417c462f745b2fc34e1519a2a1807  cswconserver
+94259cd71f38e94b3f247768e3bc731f  conserver-8.1.11.tar.gz

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


From bonivart at users.sourceforge.net  Sun Apr  7 11:00:19 2013
From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net)
Date: Sun, 07 Apr 2013 09:00:19 +0000
Subject: [csw-devel] SF.net SVN: gar:[20630] csw/mgar/pkg/ntp/trunk
Message-ID: <E1UOlSV-0007AW-QE@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 20630
          http://gar.svn.sourceforge.net/gar/?rev=20630&view=rev
Author:   bonivart
Date:     2013-04-07 09:00:19 +0000 (Sun, 07 Apr 2013)
Log Message:
-----------
ntp/trunk: add start script, sample conf file, split package

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

Added Paths:
-----------
    csw/mgar/pkg/ntp/trunk/files/cswntp
    csw/mgar/pkg/ntp/trunk/files/ntp
    csw/mgar/pkg/ntp/trunk/files/ntp.conf

Modified: csw/mgar/pkg/ntp/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ntp/trunk/Makefile	2013-04-07 08:40:22 UTC (rev 20629)
+++ csw/mgar/pkg/ntp/trunk/Makefile	2013-04-07 09:00:19 UTC (rev 20630)
@@ -9,12 +9,38 @@
 MASTER_SITES = http://archive.ntp.org/ntp4/ntp-4.2/
 DISTFILES = $(DISTNAME).tar.gz
 
-RUNTIME_DEP_PKGS_CSWntp += CSWlibnetsnmp25
+SPKG_SOURCEURL = http://www.isc.org/software/ntp
+
+PACKAGES += CSWntp
+CATALOGNAME_CSWntp = ntp
+SPKG_DESC_CSWntp = $(DESCRIPTION)
 RUNTIME_DEP_PKGS_CSWntp += CSWlibssl1-0-0
-RUNTIME_DEP_PKGS_CSWntp += CSWlibnetsnmpagent25
 
+PACKAGES += CSWntp-snmp
+CATALOGNAME_CSWntp-snmp = ntp_snmp
+SPKG_DESC_CSWntp-snmp = $(DESCRIPTION) (SNMP)
+RUNTIME_DEP_PKGS_CSWntp-snmp += CSWlibnetsnmp25
+RUNTIME_DEP_PKGS_CSWntp-snmp += CSWlibnetsnmpagent25
+RUNTIME_DEP_PKGS_CSWntp-snmp += CSWlibssl1-0-0
+RUNTIME_DEP_PKGS_CSWntp-snmp += CSWntp
+PKGFILES_CSWntp-snmp = .*ntpsnmpd.*
+
+INITSMF = /etc/opt/csw/init.d/cswntp
+
 CONFIGURE_ARGS  = $(DIRPATHS)
 CONFIGURE_ARGS += --with-openssl-libdir=/opt/csw/lib
 CONFIGURE_ARGS += --with-openssl-incdir=/opt/csw/include
 
+# Doesn't make much sense without parent package
+CHECKPKG_OVERRIDES_CSWntp-snmp += surplus-dependency|CSWntp                     
+
 include gar/category.mk
+
+post-install-modulated:
+	@echo " ==> Post-install for $(NAME) (custom)"
+	ginstall -d $(DESTDIR)/etc/opt/csw/init.d
+	ginstall -m 755 $(FILEDIR)/cswntp $(DESTDIR)/etc/opt/csw/init.d/
+	ginstall -d $(DESTDIR)/etc/opt/csw/pkg/CSW$(NAME)
+	ginstall -m 755 $(FILEDIR)/ntp $(DESTDIR)/etc/opt/csw/pkg/CSW$(NAME)/
+	ginstall -d $(DESTDIR)/var/opt/csw/$(NAME)
+	touch $(DESTDIR)/var/opt/csw/$(NAME)/ntp.drift

Added: csw/mgar/pkg/ntp/trunk/files/cswntp
===================================================================
--- csw/mgar/pkg/ntp/trunk/files/cswntp	                        (rev 0)
+++ csw/mgar/pkg/ntp/trunk/files/cswntp	2013-04-07 09:00:19 UTC (rev 20630)
@@ -0,0 +1,39 @@
+#!/sbin/sh
+
+# rc-script for CSW NTP
+# Peter Bonivart, 2013-04-07
+
+# Source config file
+[ -r /etc/opt/csw/pkg/CSWntp/ntp ] && . /etc/opt/csw/pkg/CSWntp/ntp
+
+ZONE= # used for initialization, do not change
+
+case "$1" in
+  start)
+    if [ -f /opt/csw/bin/ntp -a -f /etc/opt/csw/ntp.conf ]; then
+      echo "Starting ntp."
+      /opt/csw/bin/ntp $OPTIONS
+    fi
+    ;;
+  stop)
+    echo "Shutting down ntp."
+    if [ -x /usr/bin/zonename ]; then
+      if [ "`/usr/bin/zonename`" = "global" ]; then
+        ZONE="-z global"
+      fi
+    fi
+    pkill $ZONE -x ntp
+    ;;
+  reload|refresh)
+    echo "Reloading ntp."
+    if [ -x /usr/bin/zonename ]; then
+      if [ "`/usr/bin/zonename`" = "global" ]; then
+        ZONE="-z global"
+      fi
+    fi
+    pkill -HUP $ZONE -x ntp
+    ;;
+  *)
+    echo "Usage: $0 { start | stop | reload | refresh }"
+    ;;
+esac

Added: csw/mgar/pkg/ntp/trunk/files/ntp
===================================================================
--- csw/mgar/pkg/ntp/trunk/files/ntp	                        (rev 0)
+++ csw/mgar/pkg/ntp/trunk/files/ntp	2013-04-07 09:00:19 UTC (rev 20630)
@@ -0,0 +1,8 @@
+# This is where you customize some settings of your NTP installation so
+# you don't have to edit the scripts themselves as they will be replaced during
+# upgrades.
+#
+# Peter Bonivart, OpenCSW
+
+# Options
+#OPTIONS="-c /etc/opt/csw/ntp.conf"

Added: csw/mgar/pkg/ntp/trunk/files/ntp.conf
===================================================================
--- csw/mgar/pkg/ntp/trunk/files/ntp.conf	                        (rev 0)
+++ csw/mgar/pkg/ntp/trunk/files/ntp.conf	2013-04-07 09:00:19 UTC (rev 20630)
@@ -0,0 +1,6 @@
+driftfile /var/opt/csw/ntp/ntp.drift
+
+server 0.pool.ntp.org
+server 1.pool.ntp.org
+server 2.pool.ntp.org
+server 3.pool.ntp.org

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 Apr  7 11:29:16 2013
From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net)
Date: Sun, 07 Apr 2013 09:29:16 +0000
Subject: [csw-devel] SF.net SVN: gar:[20631]
	csw/mgar/pkg/conserver/trunk/Makefile
Message-ID: <E1UOluW-0004n8-I7@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 20631
          http://gar.svn.sourceforge.net/gar/?rev=20631&view=rev
Author:   chninkel
Date:     2013-04-07 09:29:16 +0000 (Sun, 07 Apr 2013)
Log Message:
-----------
conserver/trunk: make sure the new package will be compatible with the previous one

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

Modified: csw/mgar/pkg/conserver/trunk/Makefile
===================================================================
--- csw/mgar/pkg/conserver/trunk/Makefile	2013-04-07 09:00:19 UTC (rev 20630)
+++ csw/mgar/pkg/conserver/trunk/Makefile	2013-04-07 09:29:16 UTC (rev 20631)
@@ -35,6 +35,11 @@
 CHECKPKG_OVERRIDES  = file-with-bad-content|/usr/local|root/opt/csw/share/examples/conserver/conserver.rc
 CHECKPKG_OVERRIDES += file-with-bad-content|/usr/local|root/opt/csw/share/examples/conserver/conserver.cf
 
+# Temporary override and conf path for the next package release which is just rebuilt against libssl 1.0
+CHECKPKG_OVERRIDES += discouraged-path-in-pkgmap|/opt/csw/var/log
+sysconfdir = $(prefix)/etc
+localstatedir = $(prefix)/var
+
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --with-uds
 CONFIGURE_ARGS += --with-libwrap
@@ -44,7 +49,7 @@
 LICENSE = LICENSE
 
 DISTFILES += cswconserver
-INITSMF = $(sysconfdir)/init.d/cswconserver
+INITSMF = /etc$(prefix)/init.d/cswconserver
 
 TEST_SCRIPTS = 
 
@@ -52,8 +57,8 @@
 
 post-merge: merge-init-script
 
-#
 merge-init-script:
-	ginstall -m 755 -d $(PKGROOT)$(sysconfdir)/init.d/
-	ginstall -m 755 $(FILEDIR)/cswconserver $(PKGROOT)$(sysconfdir)/init.d/cswconserver
+	ginstall -m 755 -d $(PKGROOT)/etc/$(prefix)/init.d/
+	ginstall -m 755 -d $(PKGROOT)/$(localstatedir)/log
+	ginstall -m 755 $(FILEDIR)/cswconserver $(PKGROOT)/etc/$(prefix)/init.d/cswconserver
 

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


From bonivart at users.sourceforge.net  Sun Apr  7 11:32:36 2013
From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net)
Date: Sun, 07 Apr 2013 09:32:36 +0000
Subject: [csw-devel] SF.net SVN: gar:[20632] csw/mgar/pkg/ntp/trunk
Message-ID: <E1UOlxk-0004ta-3D@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 20632
          http://gar.svn.sourceforge.net/gar/?rev=20632&view=rev
Author:   bonivart
Date:     2013-04-07 09:32:35 +0000 (Sun, 07 Apr 2013)
Log Message:
-----------
ntp/trunk: add missing conf file, fix start script

Modified Paths:
--------------
    csw/mgar/pkg/ntp/trunk/Makefile
    csw/mgar/pkg/ntp/trunk/files/cswntp

Modified: csw/mgar/pkg/ntp/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ntp/trunk/Makefile	2013-04-07 09:29:16 UTC (rev 20631)
+++ csw/mgar/pkg/ntp/trunk/Makefile	2013-04-07 09:32:35 UTC (rev 20632)
@@ -42,5 +42,6 @@
 	ginstall -m 755 $(FILEDIR)/cswntp $(DESTDIR)/etc/opt/csw/init.d/
 	ginstall -d $(DESTDIR)/etc/opt/csw/pkg/CSW$(NAME)
 	ginstall -m 755 $(FILEDIR)/ntp $(DESTDIR)/etc/opt/csw/pkg/CSW$(NAME)/
+	ginstall -m 755 $(FILEDIR)/ntp.conf $(DESTDIR)/etc/opt/csw/
 	ginstall -d $(DESTDIR)/var/opt/csw/$(NAME)
 	touch $(DESTDIR)/var/opt/csw/$(NAME)/ntp.drift

Modified: csw/mgar/pkg/ntp/trunk/files/cswntp
===================================================================
--- csw/mgar/pkg/ntp/trunk/files/cswntp	2013-04-07 09:29:16 UTC (rev 20631)
+++ csw/mgar/pkg/ntp/trunk/files/cswntp	2013-04-07 09:32:35 UTC (rev 20632)
@@ -10,9 +10,9 @@
 
 case "$1" in
   start)
-    if [ -f /opt/csw/bin/ntp -a -f /etc/opt/csw/ntp.conf ]; then
+    if [ -f /opt/csw/bin/ntpd -a -f /etc/opt/csw/ntp.conf ]; then
       echo "Starting ntp."
-      /opt/csw/bin/ntp $OPTIONS
+      /opt/csw/bin/ntpd $OPTIONS
     fi
     ;;
   stop)
@@ -22,7 +22,7 @@
         ZONE="-z global"
       fi
     fi
-    pkill $ZONE -x ntp
+    pkill $ZONE -x ntpd
     ;;
   reload|refresh)
     echo "Reloading ntp."
@@ -31,7 +31,7 @@
         ZONE="-z global"
       fi
     fi
-    pkill -HUP $ZONE -x ntp
+    pkill -HUP $ZONE -x ntpd
     ;;
   *)
     echo "Usage: $0 { start | stop | reload | refresh }"

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


From bonivart at users.sourceforge.net  Sun Apr  7 11:43:36 2013
From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net)
Date: Sun, 07 Apr 2013 09:43:36 +0000
Subject: [csw-devel] SF.net SVN: gar:[20633] csw/mgar/pkg/ntp/trunk/files/ntp
Message-ID: <E1UOm8O-0005OH-4J@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 20633
          http://gar.svn.sourceforge.net/gar/?rev=20633&view=rev
Author:   bonivart
Date:     2013-04-07 09:43:34 +0000 (Sun, 07 Apr 2013)
Log Message:
-----------
ntp/trunk: fix conf option

Modified Paths:
--------------
    csw/mgar/pkg/ntp/trunk/files/ntp

Modified: csw/mgar/pkg/ntp/trunk/files/ntp
===================================================================
--- csw/mgar/pkg/ntp/trunk/files/ntp	2013-04-07 09:32:35 UTC (rev 20632)
+++ csw/mgar/pkg/ntp/trunk/files/ntp	2013-04-07 09:43:34 UTC (rev 20633)
@@ -5,4 +5,4 @@
 # Peter Bonivart, OpenCSW
 
 # Options
-#OPTIONS="-c /etc/opt/csw/ntp.conf"
+OPTIONS="-c /etc/opt/csw/ntp.conf"

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 Apr  7 12:14:52 2013
From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net)
Date: Sun, 07 Apr 2013 10:14:52 +0000
Subject: [csw-devel] SF.net SVN: gar:[20634] csw/mgar/pkg/nginx/trunk
Message-ID: <E1UOmce-0000gk-TV@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 20634
          http://gar.svn.sourceforge.net/gar/?rev=20634&view=rev
Author:   chninkel
Date:     2013-04-07 10:14:52 +0000 (Sun, 07 Apr 2013)
Log Message:
-----------
nginx/trunk: reverted to 1.2.5

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

Modified: csw/mgar/pkg/nginx/trunk/Makefile
===================================================================
--- csw/mgar/pkg/nginx/trunk/Makefile	2013-04-07 09:43:34 UTC (rev 20633)
+++ csw/mgar/pkg/nginx/trunk/Makefile	2013-04-07 10:14:52 UTC (rev 20634)
@@ -1,5 +1,5 @@
 NAME       = nginx
-VERSION    = 1.1.8
+VERSION    = 1.2.5
 GARTYPE = v2
 
 GARCOMPILER = SOS11
@@ -19,11 +19,19 @@
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = -(\d+(?:\.\d+)*).tar.gz
 
-BUILD_DEP_PKGS = CSWlibz-dev
-RUNTIME_DEP_PKGS = CSWlibssl1-0-0 CSWlibpcre1 CSWlibz1 CSWperl
+BUILD_DEP_PKGS += CSWlibz-dev
 
-PACKAGING_PLATFORMS  = solaris9-sparc  solaris9-i386
-PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386
+PACKAGES += CSWnginx
+SPKG_DESC_CSWnginx = HTTP server and mail proxy server
+RUNTIME_DEP_PKGS_CSWnginx += CSWlibexslt0
+RUNTIME_DEP_PKGS_CSWnginx += CSWlibgeoip1
+RUNTIME_DEP_PKGS_CSWnginx += CSWlibssl1-0-0
+RUNTIME_DEP_PKGS_CSWnginx += CSWlibpcre1
+RUNTIME_DEP_PKGS_CSWnginx += CSWlibxslt1
+RUNTIME_DEP_PKGS_CSWnginx += CSWlibgd2
+RUNTIME_DEP_PKGS_CSWnginx += CSWlibxml2-2
+RUNTIME_DEP_PKGS_CSWnginx += CSWlibz1
+RUNTIME_DEP_PKGS_CSWnginx += CSWperl
 
 # default sparc arch is set to sparcv8plus because nginx contains
 # assembler parts specific to v8plus and v9 arches:
@@ -35,12 +43,15 @@
 #	casxa   [%o2] 0x80, %o1, %o0
 #	.end
 
-ISAEXEC                = 1
-ISA_DEFAULT_sparc      = sparcv8plus
-EXTRA_BUILD_ISAS_i386  = amd64
-EXTRA_BUILD_ISAS_sparc = sparcv9
+# These are the default now
 
-NGINXCPU_i386          = pentium3
+#ISA_DEFAULT_sparc      = sparcv8plus
+#EXTRA_BUILD_ISAS_i386  = pentium_pro amd64
+#EXTRA_BUILD_ISAS_sparc = sparcv9
+
+ISAEXEC = 1
+
+NGINXCPU_i386          = pentium
 NGINXCPU_pentium_pro   = pentium3
 NGINXCPU_sparcv8plus   = sparc32
 NGINXCPU_sparcv9       = sparc64
@@ -49,9 +60,6 @@
 
 CFLAGS =
 
-sysconfdir=/etc/opt/csw
-localstatedir=/var/opt/csw
-
 #CONFIGURE_ARGS += --with-debug
 CONFIGURE_ARGS += --with-cpu-opt=$(NGINXCPU)
 CONFIGURE_ARGS += --with-cc-opt="-I$(includedir) -I$(includedir)/openssl"
@@ -72,15 +80,34 @@
 CONFIGURE_ARGS += --with-http_addition_module
 CONFIGURE_ARGS += --with-http_dav_module
 CONFIGURE_ARGS += --with-http_flv_module
+CONFIGURE_ARGS += --with-http_mp4_module
 CONFIGURE_ARGS += --with-http_realip_module
 CONFIGURE_ARGS += --with-http_secure_link_module
 CONFIGURE_ARGS += --with-http_ssl_module
 CONFIGURE_ARGS += --with-http_stub_status_module
+CONFIGURE_ARGS += --with-http_gzip_static_module
+CONFIGURE_ARGS += --with-http_geoip_module
+CONFIGURE_ARGS += --with-http_xslt_module
+CONFIGURE_ARGS += --with-http_image_filter_module
+CONFIGURE_ARGS += --with-http_sub_module
+CONFIGURE_ARGS += --with-http_random_index_module
+CONFIGURE_ARGS += --with-http_secure_link_module
+CONFIGURE_ARGS += --with-http_degradation_module
+CONFIGURE_ARGS += --with-http_stub_status_module
+# Enable when we have 64 bit perl
+# CONFIGURE_ARGS += --with-http_perl_module
 
 TEST_SCRIPTS =
 
 INITSMF      = $(sysconfdir)/init.d/cswnginx
-PRESERVECONF = $(sysconfdir)/nginx/fastcgi.conf $(sysconfdir)/nginx/fastcgi_params $(sysconfdir)/nginx/mime.types $(sysconfdir)/nginx/nginx.conf $(sysconfdir)/nginx/scgi_params $(sysconfdir)/nginx/uwsgi_params $(localstatedir)/nginx/html/50x.html $(localstatedir)/nginx/html/index.html
+PRESERVECONF += $(sysconfdir)/nginx/fastcgi.conf
+PRESERVECONF += $(sysconfdir)/nginx/fastcgi_params
+PRESERVECONF += $(sysconfdir)/nginx/mime.types
+PRESERVECONF += $(sysconfdir)/nginx/nginx.conf
+PRESERVECONF += $(sysconfdir)/nginx/scgi_params
+PRESERVECONF += $(sysconfdir)/nginx/uwsgi_params
+PRESERVECONF += $(localstatedir)/nginx/html/50x.html
+PRESERVECONF += $(localstatedir)/nginx/html/index.html
 
 NGINXDOCS    = CHANGES CHANGES.ru LICENSE README
 
@@ -90,7 +117,7 @@
 post-configure-modulated:
 	gsed -i  s#/...ISALIST#/'$$ISALIST'# $(WORKSRC)/objs/ngx_auto_config.h
 	gsed -i 's#  pause#  rep; nop#'      $(WORKSRC)/src/os/unix/ngx_sunpro_amd64.il
-	$(MAKECOOKIE)
+	@$(MAKECOOKIE)
 
 post-install-modulated:
 	ginstall -d $(DESTDIR)$(sysconfdir)/init.d
@@ -109,4 +136,4 @@
 	cp -r contrib/* $(DESTDIR)$(sharedstatedir)/nginx/contrib; \
 	cp $(NGINXDOCS) $(DESTDIR)$(docdir)/nginx
 	rm -rf $(DESTDIR)/var/run/nginx
-	$(MAKECOOKIE)
+	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/nginx/trunk/checksums
===================================================================
--- csw/mgar/pkg/nginx/trunk/checksums	2013-04-07 09:43:34 UTC (rev 20633)
+++ csw/mgar/pkg/nginx/trunk/checksums	2013-04-07 10:14:52 UTC (rev 20634)
@@ -1 +1 @@
-f9f3e60f498b7ffac778ee72ea7db309  nginx-1.1.8.tar.gz
+4f5a55187a3d45fa37d99d07ddd90800  nginx-1.2.5.tar.gz

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


From chninkel at users.sourceforge.net  Sun Apr  7 12:17:58 2013
From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net)
Date: Sun, 07 Apr 2013 10:17:58 +0000
Subject: [csw-devel] SF.net SVN: gar:[20635]
	csw/mgar/pkg/fetchmail/trunk/Makefile
Message-ID: <E1UOmfe-0000nD-27@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 20635
          http://gar.svn.sourceforge.net/gar/?rev=20635&view=rev
Author:   chninkel
Date:     2013-04-07 10:17:57 +0000 (Sun, 07 Apr 2013)
Log Message:
-----------
fetchmail/trunk: updated dependencies

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

Modified: csw/mgar/pkg/fetchmail/trunk/Makefile
===================================================================
--- csw/mgar/pkg/fetchmail/trunk/Makefile	2013-04-07 10:14:52 UTC (rev 20634)
+++ csw/mgar/pkg/fetchmail/trunk/Makefile	2013-04-07 10:17:57 UTC (rev 20635)
@@ -18,9 +18,8 @@
 # PKGFILES is catchall
 RUNTIME_DEP_PKGS_CSWfetchmail += CSWlibintl8
 RUNTIME_DEP_PKGS_CSWfetchmail += CSWlibkrb5-3
-RUNTIME_DEP_PKGS_CSWfetchmail += CSWlibk5crypto3
 RUNTIME_DEP_PKGS_CSWfetchmail += CSWlibcom-err3
-RUNTIME_DEP_PKGS_CSWfetchmail += CSWosslrt
+RUNTIME_DEP_PKGS_CSWfetchmail += CSWlibssl1-0-0
 
 PACKAGES += CSWfetchmailconf
 SPKG_DESC_CSWfetchmailconf = A GUI to configure and run fetchmail

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 Apr  7 12:22:47 2013
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Sun, 07 Apr 2013 10:22:47 +0000
Subject: [csw-devel] SF.net SVN: gar:[20636] csw/mgar/pkg/lynx/trunk
Message-ID: <E1UOmkJ-0000v6-Ku@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 20636
          http://gar.svn.sourceforge.net/gar/?rev=20636&view=rev
Author:   dmichelsen
Date:     2013-04-07 10:22:47 +0000 (Sun, 07 Apr 2013)
Log Message:
-----------
lynx/trunk: Some cosmetical fixes

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

Modified: csw/mgar/pkg/lynx/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lynx/trunk/Makefile	2013-04-07 10:17:57 UTC (rev 20635)
+++ csw/mgar/pkg/lynx/trunk/Makefile	2013-04-07 10:22:47 UTC (rev 20636)
@@ -14,21 +14,26 @@
 MASTER_SITES = http://lynx.isc.org/release/
 DISTFILES  = $(NAME)$(VERSION).tar.bz2
 DISTFILES += COPYING
+DISTNAME = $(NAME)$(subst .,-,$(VERSION))
 
 DEP_PKGS = CSWlibbz2-1-0 CSWlibncurses5 CSWlibssl1-0-0 CSWlibz1
 
-# We define upstream file regex so we can be notifed of new upstream software release
-UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2
+# This ensures that Lynx picks up its own entities.h, not the one installed
+# in one of the system directories, i. e. /opt/csw (that one's part of GD).
+EXTRA_CPP_FLAGS = -I./chrtrans
 
-WORKSRC = $(WORKDIR)/$(subst .,-,$(NAME)$(VERSION))
-
-sysconfdir = /etc/opt/csw
-
 CONFIGURE_ARGS  = $(DIRPATHS)
-CONFIGURE_ARGS += --with-screen=ncurses --enable-default-colors
-CONFIGURE_ARGS += --with-ssl --with-bzlib --with-zlib
-CONFIGURE_ARGS += --disable-finger --disable-gopher --disable-news
-CONFIGURE_ARGS += --enable-cgi-links --enable-exec-links --enable-exec-scripts
+CONFIGURE_ARGS += --with-screen=ncurses
+CONFIGURE_ARGS += --enable-default-colors
+CONFIGURE_ARGS += --with-ssl
+CONFIGURE_ARGS += --with-bzlib
+CONFIGURE_ARGS += --with-zlib
+CONFIGURE_ARGS += --disable-finger
+CONFIGURE_ARGS += --disable-gopher
+CONFIGURE_ARGS += --disable-news
+CONFIGURE_ARGS += --enable-cgi-links
+CONFIGURE_ARGS += --enable-exec-links
+CONFIGURE_ARGS += --enable-exec-scripts
 
 MIGRATE_FILES = lynx.lss lynx.cfg
 PRESERVECONF  = /etc/opt/csw/lynx.lss
@@ -42,7 +47,6 @@
 SUN_CPP_FLAGS = -I./chrtrans
 
 #    --enable-prettysrc \
-#    --with-zlib \
 #    --enable-gzip-help \
 #    --enable-nls
 

Modified: csw/mgar/pkg/lynx/trunk/checksums
===================================================================
--- csw/mgar/pkg/lynx/trunk/checksums	2013-04-07 10:17:57 UTC (rev 20635)
+++ csw/mgar/pkg/lynx/trunk/checksums	2013-04-07 10:22:47 UTC (rev 20636)
@@ -1,2 +1 @@
-8d3f03612be5f6b135124e4c06573e94  COPYING
 493af4c77ef6761e3f0157cd1be033a0  lynx2.8.7.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  Sun Apr  7 12:28:13 2013
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Sun, 07 Apr 2013 10:28:13 +0000
Subject: [csw-devel] SF.net SVN: gar:[20637] csw/mgar/pkg
Message-ID: <E1UOmpZ-00013a-Ho@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 20637
          http://gar.svn.sourceforge.net/gar/?rev=20637&view=rev
Author:   dmichelsen
Date:     2013-04-07 10:28:13 +0000 (Sun, 07 Apr 2013)
Log Message:
-----------
freeipmi/trunk: Intermediate commit, manpages are not properly generated

Added Paths:
-----------
    csw/mgar/pkg/freeipmi/
    csw/mgar/pkg/freeipmi/Makefile
    csw/mgar/pkg/freeipmi/branches/
    csw/mgar/pkg/freeipmi/tags/
    csw/mgar/pkg/freeipmi/trunk/
    csw/mgar/pkg/freeipmi/trunk/Makefile
    csw/mgar/pkg/freeipmi/trunk/checksums
    csw/mgar/pkg/freeipmi/trunk/files/
    csw/mgar/pkg/freeipmi/trunk/files/0001-Add-missing-sighandler_t-on-Solaris.patch

Added: csw/mgar/pkg/freeipmi/Makefile
===================================================================
--- csw/mgar/pkg/freeipmi/Makefile	                        (rev 0)
+++ csw/mgar/pkg/freeipmi/Makefile	2013-04-07 10:28:13 UTC (rev 20637)
@@ -0,0 +1,2 @@
+%:
+	$(MAKE) -C trunk $*


Property changes on: csw/mgar/pkg/freeipmi/trunk
___________________________________________________________________
Added: svn:ignore
   + work


Added: csw/mgar/pkg/freeipmi/trunk/Makefile
===================================================================
--- csw/mgar/pkg/freeipmi/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/freeipmi/trunk/Makefile	2013-04-07 10:28:13 UTC (rev 20637)
@@ -0,0 +1,22 @@
+# $Id$
+# TODO (release-critical prefixed with !, non release-critical with *)
+#
+NAME = freeipmi
+VERSION = 1.2.5
+
+DESCRIPTION = IPMI software based on the IPMI v1.5/2.0 specification
+
+MASTER_SITES = $(GNU_MIRROR)
+DISTFILES += $(DISTNAME).tar.gz
+
+# This should better be detected during autoconf time
+PATCHFILES += 0001-Add-missing-sighandler_t-on-Solaris.patch
+
+VEMNDOR_URL = http://www.gnu.org/software/freeipmi/index.html
+
+GARCOMPILER = GCC4
+
+CONFIGURE_ARGS = $(DIRPATHS)
+
+include gar/category.mk
+


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

Added: csw/mgar/pkg/freeipmi/trunk/checksums
===================================================================
--- csw/mgar/pkg/freeipmi/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/freeipmi/trunk/checksums	2013-04-07 10:28:13 UTC (rev 20637)
@@ -0,0 +1 @@
+d8441fe365b631c61c7b78a96242763c  freeipmi-1.2.5.tar.gz

Added: csw/mgar/pkg/freeipmi/trunk/files/0001-Add-missing-sighandler_t-on-Solaris.patch
===================================================================
--- csw/mgar/pkg/freeipmi/trunk/files/0001-Add-missing-sighandler_t-on-Solaris.patch	                        (rev 0)
+++ csw/mgar/pkg/freeipmi/trunk/files/0001-Add-missing-sighandler_t-on-Solaris.patch	2013-04-07 10:28:13 UTC (rev 20637)
@@ -0,0 +1,25 @@
+From 914449712a08ff8797249162e2e32e8ffaa71d93 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Sat, 6 Apr 2013 19:32:26 +0200
+Subject: [PATCH] Add missing sighandler_t on Solaris
+
+---
+ common/toolcommon/tool-daemon-common.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/common/toolcommon/tool-daemon-common.h b/common/toolcommon/tool-daemon-common.h
+index a436bcb..eaaf4fa 100644
+--- a/common/toolcommon/tool-daemon-common.h
++++ b/common/toolcommon/tool-daemon-common.h
+@@ -24,6 +24,8 @@
+ 
+ int daemonize_common (const char *pidfile);
+ 
++typedef void (*sighandler_t)(int);
++
+ /* can pass NULL for no callback */
+ int daemon_signal_handler_setup (sighandler_t cb);
+ 
+-- 
+1.8.1.4
+

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


From wahwah at users.sourceforge.net  Sun Apr  7 15:30:59 2013
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Sun, 07 Apr 2013 13:30:59 +0000
Subject: [csw-devel] SF.net SVN: gar:[20638] csw/mgar/gar/v2
Message-ID: <E1UOpgR-0001uN-BD@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 20638
          http://gar.svn.sourceforge.net/gar/?rev=20638&view=rev
Author:   wahwah
Date:     2013-04-07 13:30:56 +0000 (Sun, 07 Apr 2013)
Log Message:
-----------
checkpkg: Remove the checkpkg.py file

Modified Paths:
--------------
    csw/mgar/gar/v2/bin/checkpkg_collect_stats_test.py
    csw/mgar/gar/v2/bin/checkpkg_inspect_stats.py
    csw/mgar/gar/v2/lib/python/checkpkg_lib.py
    csw/mgar/gar/v2/lib/python/checkpkg_lib_test.py
    csw/mgar/gar/v2/lib/python/dependency_checks.py
    csw/mgar/gar/v2/lib/python/package_checks.py
    csw/mgar/gar/v2/lib/python/package_checks_test.py

Removed Paths:
-------------
    csw/mgar/gar/v2/lib/python/checkpkg.py
    csw/mgar/gar/v2/lib/python/checkpkg_test.py

Modified: csw/mgar/gar/v2/bin/checkpkg_collect_stats_test.py
===================================================================
--- csw/mgar/gar/v2/bin/checkpkg_collect_stats_test.py	2013-04-07 10:28:13 UTC (rev 20637)
+++ csw/mgar/gar/v2/bin/checkpkg_collect_stats_test.py	2013-04-07 13:30:56 UTC (rev 20638)
@@ -11,7 +11,6 @@
 path_list = [os.path.dirname(__file__),
              "..", "lib", "python"]
 sys.path.append(os.path.join(*path_list))
-import checkpkg
 import opencsw
 
 

Modified: csw/mgar/gar/v2/bin/checkpkg_inspect_stats.py
===================================================================
--- csw/mgar/gar/v2/bin/checkpkg_inspect_stats.py	2013-04-07 10:28:13 UTC (rev 20637)
+++ csw/mgar/gar/v2/bin/checkpkg_inspect_stats.py	2013-04-07 13:30:56 UTC (rev 20638)
@@ -16,7 +16,6 @@
 path_list = [os.path.dirname(__file__),
              "..", "lib", "python"]
 sys.path.append(os.path.join(*path_list))
-import checkpkg
 import opencsw
 import configuration
 
@@ -35,7 +34,7 @@
     logging.basicConfig(level=logging.INFO)
   logging.debug("Collecting statistics about given package files.")
   configuration.SetUpSqlobjectConnection()
-  pkgstat_objs = checkpkg.GetPackageStatsByFilenamesOrMd5s(
+  pkgstat_objs = checkpkg_lib.GetPackageStatsByFilenamesOrMd5s(
       args,
       options.debug)
   bar = progressbar.ProgressBar()

Deleted: csw/mgar/gar/v2/lib/python/checkpkg.py
===================================================================
--- csw/mgar/gar/v2/lib/python/checkpkg.py	2013-04-07 10:28:13 UTC (rev 20637)
+++ csw/mgar/gar/v2/lib/python/checkpkg.py	2013-04-07 13:30:56 UTC (rev 20638)
@@ -1,96 +0,0 @@
-# $Id$
-#
-# This is the checkpkg library, common for all checkpkg tests written in
-# Python.
-
-import itertools
-import logging
-import optparse
-import os.path
-import re
-import pprint
-import progressbar
-import sqlobject
-import subprocess
-import database
-
-import inspective_package
-import models as m
-import common_constants
-import package_stats
-import struct_util
-
-
-DESCRIPTION_RE = r"^([\S]+) - (.*)$"
-
-INSTALL_CONTENTS_AVG_LINE_LENGTH = 102.09710677919261
-SYS_DEFAULT_RUNPATH = [
-    "/usr/lib/$ISALIST",
-    "/usr/lib",
-    "/lib/$ISALIST",
-    "/lib",
-]
-
-class Error(Exception):
-  pass
-
-
-class ConfigurationError(Error):
-  pass
-
-
-class PackageError(Error):
-  pass
-
-
-class StdoutSyntaxError(Error):
-  pass
-
-
-class SetupError(Error):
-  pass
-
-
-class InternalDataError(Error):
-  """Problem with internal checkpkg data structures."""
-
-
-def ExtractDescription(pkginfo):
-  desc_re = re.compile(DESCRIPTION_RE)
-  m = re.match(desc_re, pkginfo["NAME"])
-  return m.group(2) if m else None
-
-
-def ExtractMaintainerName(pkginfo):
-  maint_re = re.compile("^.*for CSW by (.*)$")
-  m = re.match(maint_re, pkginfo["VENDOR"])
-  return m.group(1) if m else None
-
-
-def ExtractBuildUsername(pkginfo):
-  m = re.match(common_constants.PSTAMP_RE, pkginfo["PSTAMP"])
-  return m.group("username") if m else None
-
-
-def GetPackageStatsByFilenamesOrMd5s(args, debug=False):
-  filenames = []
-  md5s = []
-  for arg in args:
-    if struct_util.IsMd5(arg):
-      md5s.append(arg)
-    else:
-      filenames.append(arg)
-  srv4_pkgs = [inspective_package.InspectiveCswSrv4File(x) for x in filenames]
-  pkgstat_objs = []
-  pbar = progressbar.ProgressBar()
-  pbar.maxval = len(md5s) + len(srv4_pkgs)
-  pbar.start()
-  counter = itertools.count()
-  for pkg in srv4_pkgs:
-    pkgstat_objs.append(package_stats.PackageStats(pkg, debug=debug))
-    pbar.update(counter.next())
-  for md5 in md5s:
-    pkgstat_objs.append(package_stats.PackageStats(None, md5sum=md5, debug=debug))
-    pbar.update(counter.next())
-  pbar.finish()
-  return pkgstat_objs

Modified: csw/mgar/gar/v2/lib/python/checkpkg_lib.py
===================================================================
--- csw/mgar/gar/v2/lib/python/checkpkg_lib.py	2013-04-07 10:28:13 UTC (rev 20637)
+++ csw/mgar/gar/v2/lib/python/checkpkg_lib.py	2013-04-07 13:30:56 UTC (rev 20638)
@@ -29,18 +29,73 @@
 import re
 
 
+DESCRIPTION_RE = r"^([\S]+) - (.*)$"
+
+INSTALL_CONTENTS_AVG_LINE_LENGTH = 102.09710677919261
+SYS_DEFAULT_RUNPATH = [
+    "/usr/lib/$ISALIST",
+    "/usr/lib",
+    "/lib/$ISALIST",
+    "/lib",
+]
+
 class Error(Exception):
-  pass
+  """Generic error."""
 
 
 class CatalogDatabaseError(Error):
-  pass
+  """Problem with the catalog database."""
 
 
 class DataError(Error):
   """A problem with reading required data."""
 
 
+class ConfigurationError(Error):
+  """A problem with checkpkg configuration."""
+
+
+class PackageError(Error):
+  pass
+
+
+class StdoutSyntaxError(Error):
+  pass
+
+
+class SetupError(Error):
+  pass
+
+
+class InternalDataError(Error):
+  """Problem with internal checkpkg data structures."""
+
+
+def GetPackageStatsByFilenamesOrMd5s(args, debug=False):
+  filenames = []
+  md5s = []
+  for arg in args:
+    if struct_util.IsMd5(arg):
+      md5s.append(arg)
+    else:
+      filenames.append(arg)
+  srv4_pkgs = [inspective_package.InspectiveCswSrv4File(x) for x in filenames]
+  pkgstat_objs = []
+  pbar = progressbar.ProgressBar()
+  pbar.maxval = len(md5s) + len(srv4_pkgs)
+  pbar.start()
+  counter = itertools.count()
+  for pkg in srv4_pkgs:
+    pkgstat_objs.append(package_stats.PackageStats(pkg, debug=debug))
+    pbar.update(counter.next())
+  for md5 in md5s:
+    pkgstat_objs.append(package_stats.PackageStats(None, md5sum=md5, debug=debug))
+    pbar.update(counter.next())
+  pbar.finish()
+  return pkgstat_objs
+
+
+
 REPORT_TMPL = u"""#if $missing_deps or $surplus_deps or $orphan_sonames
 Dependency issues of $pkgname:
 #end if
@@ -112,6 +167,23 @@
 """
 
 
+def ExtractDescription(pkginfo):
+  desc_re = re.compile(DESCRIPTION_RE)
+  m = re.match(desc_re, pkginfo["NAME"])
+  return m.group(2) if m else None
+
+
+def ExtractMaintainerName(pkginfo):
+  maint_re = re.compile("^.*for CSW by (.*)$")
+  m = re.match(maint_re, pkginfo["VENDOR"])
+  return m.group(1) if m else None
+
+
+def ExtractBuildUsername(pkginfo):
+  m = re.match(common_constants.PSTAMP_RE, pkginfo["PSTAMP"])
+  return m.group("username") if m else None
+
+
 class SqlobjectHelperMixin(object):
 
   def __init__(self):

Modified: csw/mgar/gar/v2/lib/python/checkpkg_lib_test.py
===================================================================
--- csw/mgar/gar/v2/lib/python/checkpkg_lib_test.py	2013-04-07 10:28:13 UTC (rev 20637)
+++ csw/mgar/gar/v2/lib/python/checkpkg_lib_test.py	2013-04-07 13:30:56 UTC (rev 20638)
@@ -7,6 +7,7 @@
   import unittest
 
 import checkpkg_lib
+import common_constants
 import copy
 import cPickle
 import database
@@ -16,6 +17,8 @@
 import package_stats
 import package_stats
 import pprint
+import re
+import sqlite3
 import sqlobject
 import tag
 import test_base
@@ -479,5 +482,93 @@
     self.assertEqual("Because.", needed_file.reason)
 
 
+class ExtractorsUnitTest(unittest.TestCase):
+
+  def testExtractDescriptionFromGoodData(self):
+    data = {"NAME": "nspr_devel - Netscape Portable Runtime header files"}
+    result = "Netscape Portable Runtime header files"
+    self.assertEqual(result, checkpkg_lib.ExtractDescription(data))
+
+  def testExtractDescriptionWithBadCatalogname(self):
+    data = {"NAME": "foo-bar - Bad catalogname shouldn't break this function"}
+    result = "Bad catalogname shouldn't break this function"
+    self.assertEqual(result, checkpkg_lib.ExtractDescription(data))
+
+  def testExtractMaintainerName(self):
+    data = {"VENDOR": "https://ftp.mozilla.org/pub/mozilla.org/"
+                      "nspr/releases/v4.8/src/ packaged for CSW by "
+                      "Maciej Blizinski"}
+    result = "Maciej Blizinski"
+    self.assertEqual(result, checkpkg_lib.ExtractMaintainerName(data))
+
+  def testPstampRegex(self):
+    pstamp = "hson at solaris9s-csw-20100313144445"
+    expected = {
+        'username': 'hson',
+        'timestamp': '20100313144445',
+        'hostname': 'solaris9s-csw'
+    }
+    self.assertEqual(expected, re.match(common_constants.PSTAMP_RE, pstamp).groupdict())
+
+
+class SliceListUnitTest(unittest.TestCase):
+
+  def testOne(self):
+    l = [1, 2, 3, 4, 5]
+    s = 1
+    expected = [[1], [2], [3], [4], [5]]
+    self.assertTrue(expected, checkpkg_lib.SliceList(l, s))
+
+  def testTwo(self):
+    l = [1, 2, 3, 4, 5]
+    s = 2
+    expected = [[1, 2], [3, 4], [5]]
+    self.assertTrue(expected, checkpkg_lib.SliceList(l, s))
+
+
+class SqliteUnitTest(unittest.TestCase):
+
+  """Makes sure that we can lose state between tests."""
+
+  def setUp(self):
+    self.conn = sqlite3.connect(":memory:")
+    self.c = self.conn.cursor()
+
+  def tearDown(self):
+    self.conn = None
+
+  def testCannotCreateTwoTables(self):
+    self.c.execute("CREATE TABLE foo (INT bar);")
+    self.assertRaises(
+        sqlite3.OperationalError,
+        self.c.execute, "CREATE TABLE foo (INT bar);")
+
+  def testOne(self):
+    self.c.execute("CREATE TABLE foo (INT bar);")
+
+  def testTwo(self):
+    self.c.execute("CREATE TABLE foo (INT bar);")
+
+class SqlobjectUnitTest(test_base.SqlObjectTestMixin, unittest.TestCase):
+
+  "Makes sure that we can lose state between methods."
+
+  class TestModel(sqlobject.SQLObject):
+    name = sqlobject.UnicodeCol(length=255, unique=True, notNone=True)
+
+  # This does not work. Why?
+  # def testCannotCreateTwoTables(self):
+  #   self.TestModel.createTable()
+  #   self.assertRaises(
+  #       sqlite3.OperationalError,
+  #       self.TestModel.createTable)
+
+  def testOne(self):
+    self.TestModel.createTable()
+
+  def testTwo(self):
+    self.TestModel.createTable()
+
+
 if __name__ == '__main__':
   unittest.main()

Deleted: csw/mgar/gar/v2/lib/python/checkpkg_test.py
===================================================================
--- csw/mgar/gar/v2/lib/python/checkpkg_test.py	2013-04-07 10:28:13 UTC (rev 20637)
+++ csw/mgar/gar/v2/lib/python/checkpkg_test.py	2013-04-07 13:30:56 UTC (rev 20638)
@@ -1,127 +0,0 @@
-#!/usr/bin/env python2.6
-# $Id$
-
-import copy
-import re
-import unittest
-import mox
-import difflib
-import checkpkg
-import checkpkg_lib
-import database
-import models as m
-import tag
-import package_stats
-import sqlite3
-import sqlobject
-import test_base
-import common_constants
-
-from testdata.tree_stats import pkgstats as tree_stats
-from testdata.neon_stats import pkgstats as neon_stats
-
-"""A set of unit tests for the library checking code.
-
-A bunch of lines to test in the interactive Python shell.
-
-import sys
-sys.path.append("lib/python")
-import checkpkg
-
-sqlite3 ~/.checkpkg/var-sadm-install-contents-cache-build8x
-SELECT * FROM systempkgmap WHERE basename = 'libncursesw.so.5';
-"""
-
-class ExtractorsUnitTest(unittest.TestCase):
-
-  def testExtractDescriptionFromGoodData(self):
-    data = {"NAME": "nspr_devel - Netscape Portable Runtime header files"}
-    result = "Netscape Portable Runtime header files"
-    self.assertEqual(result, checkpkg.ExtractDescription(data))
-
-  def testExtractDescriptionWithBadCatalogname(self):
-    data = {"NAME": "foo-bar - Bad catalogname shouldn't break this function"}
-    result = "Bad catalogname shouldn't break this function"
-    self.assertEqual(result, checkpkg.ExtractDescription(data))
-
-  def testExtractMaintainerName(self):
-    data = {"VENDOR": "https://ftp.mozilla.org/pub/mozilla.org/"
-                      "nspr/releases/v4.8/src/ packaged for CSW by "
-                      "Maciej Blizinski"}
-    result = "Maciej Blizinski"
-    self.assertEqual(result, checkpkg.ExtractMaintainerName(data))
-
-  def testPstampRegex(self):
-    pstamp = "hson at solaris9s-csw-20100313144445"
-    expected = {
-        'username': 'hson',
-        'timestamp': '20100313144445',
-        'hostname': 'solaris9s-csw'
-    }
-    self.assertEqual(expected, re.match(common_constants.PSTAMP_RE, pstamp).groupdict())
-
-
-class SliceListUnitTest(unittest.TestCase):
-
-  def testOne(self):
-    l = [1, 2, 3, 4, 5]
-    s = 1
-    expected = [[1], [2], [3], [4], [5]]
-    self.assertTrue(expected, checkpkg_lib.SliceList(l, s))
-
-  def testTwo(self):
-    l = [1, 2, 3, 4, 5]
-    s = 2
-    expected = [[1, 2], [3, 4], [5]]
-    self.assertTrue(expected, checkpkg_lib.SliceList(l, s))
-
-
-class SqliteUnitTest(unittest.TestCase):
-
-  "Makes sure that we can lose state between tests."
-
-  def setUp(self):
-    self.conn = sqlite3.connect(":memory:")
-    self.c = self.conn.cursor()
-
-  def tearDown(self):
-    self.conn = None
-
-  def testCannotCreateTwoTables(self):
-    self.c.execute("CREATE TABLE foo (INT bar);")
-    self.assertRaises(
-        sqlite3.OperationalError,
-        self.c.execute, "CREATE TABLE foo (INT bar);")
-
-  def testOne(self):
-    self.c.execute("CREATE TABLE foo (INT bar);")
-
-  def testTwo(self):
-    self.c.execute("CREATE TABLE foo (INT bar);")
-
-
-class SqlobjectUnitTest(test_base.SqlObjectTestMixin, unittest.TestCase):
-
-  "Makes sure that we can lose state between methods."
-
-  class TestModel(sqlobject.SQLObject):
-    name = sqlobject.UnicodeCol(length=255, unique=True, notNone=True)
-
-  # This does not work. Why?
-  # def testCannotCreateTwoTables(self):
-  #   self.TestModel.createTable()
-  #   self.assertRaises(
-  #       sqlite3.OperationalError,
-  #       self.TestModel.createTable)
-
-  def testOne(self):
-    self.TestModel.createTable()
-
-  def testTwo(self):
-    self.TestModel.createTable()
-
-
-if __name__ == '__main__':
-  # import logging
-  # logging.basicConfig(level=logging.DEBUG)
-  unittest.main()

Modified: csw/mgar/gar/v2/lib/python/dependency_checks.py
===================================================================
--- csw/mgar/gar/v2/lib/python/dependency_checks.py	2013-04-07 10:28:13 UTC (rev 20637)
+++ csw/mgar/gar/v2/lib/python/dependency_checks.py	2013-04-07 13:30:56 UTC (rev 20638)
@@ -1,6 +1,6 @@
 # $Id$
 
-import checkpkg
+import checkpkg_lib
 import os.path
 import re
 import ldd_emul
@@ -79,7 +79,7 @@
   path_list = path_and_pkg_by_basename[soname].keys()
   runpath_tuple = (
       tuple(binary_info["runpath"])
-      + tuple(checkpkg.SYS_DEFAULT_RUNPATH))
+      + tuple(checkpkg_lib.SYS_DEFAULT_RUNPATH))
   runpath_history = []
   first_lib = None
   already_resolved_paths = set()

Modified: csw/mgar/gar/v2/lib/python/package_checks.py
===================================================================
--- csw/mgar/gar/v2/lib/python/package_checks.py	2013-04-07 10:28:13 UTC (rev 20637)
+++ csw/mgar/gar/v2/lib/python/package_checks.py	2013-04-07 13:30:56 UTC (rev 20638)
@@ -20,6 +20,7 @@
 import operator
 import os
 import checkpkg
+import checkpkg_lib
 import opencsw
 import pprint
 import textwrap
@@ -275,7 +276,7 @@
 
 def CheckDescription(pkg_data, error_mgr, logger, messenger):
   pkginfo = pkg_data["pkginfo"]
-  desc = checkpkg.ExtractDescription(pkginfo)
+  desc = checkpkg_lib.ExtractDescription(pkginfo)
   if not desc:
     error_mgr.ReportError("pkginfo-description-missing")
   else:
@@ -603,7 +604,7 @@
   if not "VERSION" in pkginfo or not pkginfo["VERSION"]:
     error_mgr.ReportError("pkginfo-version-field-missing")
   # maintname=`sed -n 's/^VENDOR=.*for CSW by //p' $TMPFILE`
-  maintname = checkpkg.ExtractMaintainerName(pkginfo)
+  maintname = checkpkg_lib.ExtractMaintainerName(pkginfo)
   if not maintname:
     error_mgr.ReportError("pkginfo-maintainer-name-not-set")
   # email
@@ -689,7 +690,7 @@
 
 def CheckBuildingUser(pkg_data, error_mgr, logger, messenger):
   pkgname = pkg_data["basic_stats"]["pkgname"]
-  username = checkpkg.ExtractBuildUsername(pkg_data["pkginfo"])
+  username = checkpkg_lib.ExtractBuildUsername(pkg_data["pkginfo"])
   for entry in pkg_data["pkgmap"]:
     if entry["user"] and entry["user"] == username:
       error_mgr.ReportError("file-owned-by-building-user"
@@ -814,44 +815,6 @@
           "%s %s" % (bad, binary_info["path"]))
 
 
-def DisabledCheckForMissingSymbols(pkgs_data, debug):
-  """Analyzes missing symbols reported by ldd -r.
-
-  1. Collect triplets: pkgname, binary, missing symbol
-  2. If there are any missing symbols, collect all the symbols that are provided
-     by the set of packages.
-  3. From the list of missing symbols, remove all symbols that are provided
-     by the set of packages.
-  4. Report any remaining symbols as errors.
-
-  What indexes do we need?
-
-  symbol -> (pkgname, binary)
-  set(allsymbols)
-  """
-  errors = []
-  missing_symbols = []
-  all_symbols = set()
-  for pkg_data in pkgs_data:
-    pkgname = pkg_data["basic_stats"]["pkgname"]
-    binaries = pkg_data["binaries"]
-    for binary in binaries:
-      for ldd_elem in pkg_data["ldd_dash_r"][binary]:
-        if ldd_elem["state"] == "symbol-not-found":
-          missing_symbols.append((pkgname,
-                                  binary,
-                                  ldd_elem["symbol"]))
-      for symbol in pkg_data["defined_symbols"][binary]:
-        all_symbols.add(symbol)
-  # Remove symbols defined elsewhere.
-  while missing_symbols:
-    ms_pkgname, ms_binary, ms_symbol = missing_symbols.pop()
-    if ms_symbol not in all_symbols:
-      errors.append(checkpkg.CheckpkgTag(
-        ms_pkgname, "symbol-not-found", "%s %s" % (ms_binary, ms_symbol)))
-  return errors
-
-
 def DisabledCheckForMissingSymbolsDumb(pkg_data, error_mgr, logger, messenger):
   """Analyzes missing symbols reported by ldd -r.
 
@@ -973,7 +936,7 @@
     # only available from the file name.
     os_release = pkg_data["basic_stats"]["parsed_basename"]["osrel"]
     if os_release not in machine_data["allowed"]:
-      raise checkpkg.InternalDataError(
+      raise checkpkg_lib.InternalDataError(
           "%s not found in machine_data" % os_release)
     allowed_paths = set(machine_data["allowed"][os_release])
     disallowed_paths = set(machine_data["disallowed"])

Modified: csw/mgar/gar/v2/lib/python/package_checks_test.py
===================================================================
--- csw/mgar/gar/v2/lib/python/package_checks_test.py	2013-04-07 10:28:13 UTC (rev 20637)
+++ csw/mgar/gar/v2/lib/python/package_checks_test.py	2013-04-07 13:30:56 UTC (rev 20638)
@@ -6,7 +6,6 @@
 import datetime
 import unittest
 import package_checks as pc
-import checkpkg
 import checkpkg_lib
 import os.path
 import mox

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


From wahwah at users.sourceforge.net  Sun Apr  7 15:31:10 2013
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Sun, 07 Apr 2013 13:31:10 +0000
Subject: [csw-devel] SF.net SVN: gar:[20639] csw/mgar/gar/v2/lib/web/README
Message-ID: <E1UOpgc-0001up-SQ@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 20639
          http://gar.svn.sourceforge.net/gar/?rev=20639&view=rev
Author:   wahwah
Date:     2013-04-07 13:31:10 +0000 (Sun, 07 Apr 2013)
Log Message:
-----------
lib/web/README: Updated pkgdb and releases setup

We no longer run under mod_python, instructions are now updated to mod_wsgi.

Modified Paths:
--------------
    csw/mgar/gar/v2/lib/web/README

Modified: csw/mgar/gar/v2/lib/web/README
===================================================================
--- csw/mgar/gar/v2/lib/web/README	2013-04-07 13:30:56 UTC (rev 20638)
+++ csw/mgar/gar/v2/lib/web/README	2013-04-07 13:31:10 UTC (rev 20639)
@@ -1,52 +1,57 @@
 Web-serving components of the checkpkg infrastructure.
 
-Configuring scripts with mod_python on Apache:
+Configuring 'pkgdb' and 'releases' scripts with mod_wsgi on Apache:
 
-modpython_gateway.py needs to be downloaded from [1] and put into the
-lib/web/ directory. This is done via an external reference in svn
-and pulled in automatically.
+  DocumentRoot "/opt/csw/apache2/share/htdocs/buildfarm"
+  ServerName buildfarm.example.com
 
-[1] http://svn.aminus.net/misc/modpython_gateway.py
+  # General WSGI settings
+  <IfModule wsgi_module>
+    WSGIDaemonProcess buildfarm.example.com display-name=pkgdb threads=15 maximum-requests=1000
+    WSGIProcessGroup buildfarm.example.com
+  </IfModule>
 
-A piece of Apache configuration:
+  # Static files such as CSS stylesheets.
+  Alias /pkgdb-static /path/to/gar/v2/lib/web/static
+  <Directory /path/to/gar/v2/lib/web/static>
+    Order allow,deny
+    Allow from all
+    Options +Indexes
+  </Directory>
 
-  Alias /pkgdb .../pkgdb_web
-  <Directory .../pkgdb_web>
+  # http://buildfarm.example.com/pkgdb/
+  <IfModule wsgi_module>
+    WSGIScriptAlias /pkgdb /path/to/gar/v2/lib/web/pkgdb_web.py/
+  </IfModule>
+  <Location /pkgdb>
     Order allow,deny
     Allow from all
+  </Location>
 
-    <IfModule python_module>
-      SetHandler python-program
-      PythonPath "sys.path + ['.../gar/v2/lib/web', '.../gar/v2']"
-      PythonHandler modpython_gateway::handler
-      PythonOption wsgi.application pkgdb_web::main
-      PythonOption SCRIPT_NAME /pkgdb
-      PythonDebug on
-    </IfModule>
+  <Directory /opt/csw/apache2/share/htdocs/buildfarm/pkgdb>
+    Order allow,deny
+    Allow from all
   </Directory>
 
   # I don't know why the Deny/Allow rules need to be duplicated, but I haven't
   # been able to run the thing with just one set of permissions.
-  # The directory does not need to exist, but the name must match
-  # location ("releases").
-  <Directory /virtual/host/root/releases>
+  <Directory /opt/csw/apache2/share/htdocs/buildfarm/releases>
     Order deny,allow
     Deny from all
+    Allow from 1.2.3.4
+  </Directory>
 
-    Allow from <internal IPs>
-
-  </Directory>
+  # http://buildfarm.example.com/releases/
+  <IfModule wsgi_module>
+    WSGIScriptAlias /releases /path/to/gar/v2/lib/web/releases_web.py/
+  </IfModule>
   <Location /releases>
     Order deny,allow
     Deny from all
-    Allow from <internal IPs>
+    Allow from 1.2.3.4
 
-    <IfModule python_module>
-      SetHandler python-program
-      PythonPath "sys.path + ['.../gar/v2/lib/web', '.../gar/v2']"
-      PythonHandler modpython_gateway::handler
-      PythonOption wsgi.application releases_web::main
-      PythonOption SCRIPT_NAME /releases
-      PythonDebug on
-    </IfModule>
+    AuthName "Package releases REST interface"
+    AuthType Basic
+    AuthUserFile /path/to/buildfarm-users.htpasswd
+    Require valid-user
   </Location>

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


From wahwah at users.sourceforge.net  Sun Apr  7 16:25:03 2013
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Sun, 07 Apr 2013 14:25:03 +0000
Subject: [csw-devel] SF.net SVN: gar:[20640] csw/mgar/gar/v2/lib/web
Message-ID: <E1UOqWl-0004dV-R4@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 20640
          http://gar.svn.sourceforge.net/gar/?rev=20640&view=rev
Author:   wahwah
Date:     2013-04-07 14:25:03 +0000 (Sun, 07 Apr 2013)
Log Message:
-----------
lib/web/README: Moved the example config

It's a long text, so it's better as a separate file.

I couldn't find instructions how to set up lighttpd with wsgi, maybe there
isn't a ready to go solution like there is for Apache.

Modified Paths:
--------------
    csw/mgar/gar/v2/lib/web/README
    csw/mgar/gar/v2/lib/web/example-apache.conf
    csw/mgar/gar/v2/lib/web/example-lighttpd.conf

Modified: csw/mgar/gar/v2/lib/web/README
===================================================================
--- csw/mgar/gar/v2/lib/web/README	2013-04-07 13:31:10 UTC (rev 20639)
+++ csw/mgar/gar/v2/lib/web/README	2013-04-07 14:25:03 UTC (rev 20640)
@@ -1,57 +1,6 @@
 Web-serving components of the checkpkg infrastructure.
 
-Configuring 'pkgdb' and 'releases' scripts with mod_wsgi on Apache:
+Example Apache and lighttpd configurations are available:
 
-  DocumentRoot "/opt/csw/apache2/share/htdocs/buildfarm"
-  ServerName buildfarm.example.com
-
-  # General WSGI settings
-  <IfModule wsgi_module>
-    WSGIDaemonProcess buildfarm.example.com display-name=pkgdb threads=15 maximum-requests=1000
-    WSGIProcessGroup buildfarm.example.com
-  </IfModule>
-
-  # Static files such as CSS stylesheets.
-  Alias /pkgdb-static /path/to/gar/v2/lib/web/static
-  <Directory /path/to/gar/v2/lib/web/static>
-    Order allow,deny
-    Allow from all
-    Options +Indexes
-  </Directory>
-
-  # http://buildfarm.example.com/pkgdb/
-  <IfModule wsgi_module>
-    WSGIScriptAlias /pkgdb /path/to/gar/v2/lib/web/pkgdb_web.py/
-  </IfModule>
-  <Location /pkgdb>
-    Order allow,deny
-    Allow from all
-  </Location>
-
-  <Directory /opt/csw/apache2/share/htdocs/buildfarm/pkgdb>
-    Order allow,deny
-    Allow from all
-  </Directory>
-
-  # I don't know why the Deny/Allow rules need to be duplicated, but I haven't
-  # been able to run the thing with just one set of permissions.
-  <Directory /opt/csw/apache2/share/htdocs/buildfarm/releases>
-    Order deny,allow
-    Deny from all
-    Allow from 1.2.3.4
-  </Directory>
-
-  # http://buildfarm.example.com/releases/
-  <IfModule wsgi_module>
-    WSGIScriptAlias /releases /path/to/gar/v2/lib/web/releases_web.py/
-  </IfModule>
-  <Location /releases>
-    Order deny,allow
-    Deny from all
-    Allow from 1.2.3.4
-
-    AuthName "Package releases REST interface"
-    AuthType Basic
-    AuthUserFile /path/to/buildfarm-users.htpasswd
-    Require valid-user
-  </Location>
+  - example-apache.conf
+  - example-lighttpd.conf

Modified: csw/mgar/gar/v2/lib/web/example-apache.conf
===================================================================
--- csw/mgar/gar/v2/lib/web/example-apache.conf	2013-04-07 13:31:10 UTC (rev 20639)
+++ csw/mgar/gar/v2/lib/web/example-apache.conf	2013-04-07 14:25:03 UTC (rev 20640)
@@ -4,53 +4,58 @@
 #
 # This file is an example apache configuration used to run the application.
 
-  <Location /pkgdb>
+Configuring 'pkgdb' and 'releases' scripts with mod_wsgi on Apache:
+
+  DocumentRoot "/opt/csw/apache2/share/htdocs/buildfarm"
+  ServerName buildfarm.example.com
+
+  # General WSGI settings
+  <IfModule wsgi_module>
+    WSGIDaemonProcess buildfarm.example.com display-name=pkgdb threads=15 maximum-requests=1000
+    WSGIProcessGroup buildfarm.example.com
+  </IfModule>
+
+  # Static files such as CSS stylesheets.
+  Alias /pkgdb-static /path/to/gar/v2/lib/web/static
+  <Directory /path/to/gar/v2/lib/web/static>
     Order allow,deny
     Allow from all
+    Options +Indexes
+  </Directory>
 
-    <IfModule python_module>
-      SetHandler python-program
-      PythonPath "sys.path + ['/path/to/gar/v2/lib/web', '/path/to/gar/v2']"
-      PythonHandler modpython_gateway::handler
-      PythonOption wsgi.application pkgdb_web::main
-      PythonOption SCRIPT_NAME /pkgdb
-      PythonDebug on
-    </IfModule>
-  </Location>
-  # In this example, /path/to/documentroot is the document root setting for
-  # that virtual host.
-  <Directory /path/to/documentroot/pkgdb>
+  # http://buildfarm.example.com/pkgdb/
+  <IfModule wsgi_module>
+    WSGIScriptAlias /pkgdb /path/to/gar/v2/lib/web/pkgdb_web.py/
+  </IfModule>
+  <Location /pkgdb>
     Order allow,deny
     Allow from all
-  </Directory>
+  </Location>
 
-  Alias /pkgdb-static /path/to/gar/v2/lib/web/static
-  <Directory /path/to/gar/v2/lib/web/static>
+  <Directory /opt/csw/apache2/share/htdocs/buildfarm/pkgdb>
     Order allow,deny
     Allow from all
-    Options +Indexes
   </Directory>
 
   # I don't know why the Deny/Allow rules need to be duplicated, but I haven't
   # been able to run the thing with just one set of permissions.
-  <Directory /path/to/documentroot/releases>
+  <Directory /opt/csw/apache2/share/htdocs/buildfarm/releases>
     Order deny,allow
     Deny from all
-    # Allowing access only from chosen hosts.
-    # Allow from 192.168.1.0/24
+    Allow from 1.2.3.4
   </Directory>
 
+  # http://buildfarm.example.com/releases/
+  <IfModule wsgi_module>
+    WSGIScriptAlias /releases /path/to/gar/v2/lib/web/releases_web.py/
+  </IfModule>
   <Location /releases>
     Order deny,allow
     Deny from all
-    # Allowing access only from chosen hosts.
-    # Allow from 192.168.1.0/24
-    <IfModule python_module>
-      SetHandler python-program
-      PythonPath "sys.path + ['/path/to/gar/v2/lib/web', '/path/to/gar/v2']"
-      PythonHandler modpython_gateway::handler
-      PythonOption wsgi.application releases_web::main
-      PythonOption SCRIPT_NAME /releases
-      PythonDebug on
-    </IfModule>
+    Allow from 1.2.3.4
+
+    AuthName "Package releases REST interface"
+    AuthType Basic
+    AuthUserFile /path/to/buildfarm-users.htpasswd
+    Require valid-user
   </Location>

Modified: csw/mgar/gar/v2/lib/web/example-lighttpd.conf
===================================================================
--- csw/mgar/gar/v2/lib/web/example-lighttpd.conf	2013-04-07 13:31:10 UTC (rev 20639)
+++ csw/mgar/gar/v2/lib/web/example-lighttpd.conf	2013-04-07 14:25:03 UTC (rev 20640)
@@ -16,7 +16,7 @@
 ## PythonPath "sys.path + ['.../gar/v2/lib/web', '.../gar/v2']"
 fastcgi.server = (
 "/pkgdb_web.py" =>
-(( 
+((
    "socket" => "/tmp/fastcgi-pkgdb.socket",
    "bin-path" => ".../gar/v2/lib/web/pkgdb_web.py",
    "max-procs" => 1,
@@ -26,7 +26,7 @@
    "check-local" => "disable"
 )),
 "/releases_web.py" =>
-(( 
+((
    "socket" => "/tmp/fastcgi-releases.socket",
    "bin-path" => ".../gar/v2/lib/web/releases_web.py",
    "max-procs" => 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  Sun Apr  7 17:39:08 2013
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Sun, 07 Apr 2013 15:39:08 +0000
Subject: [csw-devel] SF.net SVN: gar:[20641] csw/mgar/pkg/lang-python/poster/
Message-ID: <E1UOrgS-0006xu-S1@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 20641
          http://gar.svn.sourceforge.net/gar/?rev=20641&view=rev
Author:   wahwah
Date:     2013-04-07 15:39:07 +0000 (Sun, 07 Apr 2013)
Log Message:
-----------
lang-python/poster: copy another recipe to start this one

Added Paths:
-----------
    csw/mgar/pkg/lang-python/poster/

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


From wahwah at users.sourceforge.net  Sun Apr  7 17:45:17 2013
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Sun, 07 Apr 2013 15:45:17 +0000
Subject: [csw-devel] SF.net SVN: gar:[20642]
	csw/mgar/pkg/lang-python/poster/trunk
Message-ID: <E1UOrmP-000781-1s@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 20642
          http://gar.svn.sourceforge.net/gar/?rev=20642&view=rev
Author:   wahwah
Date:     2013-04-07 15:45:16 +0000 (Sun, 07 Apr 2013)
Log Message:
-----------
lang-python/poster/trunk: Initial commit

Modified Paths:
--------------
    csw/mgar/pkg/lang-python/poster/trunk/Makefile
    csw/mgar/pkg/lang-python/poster/trunk/checksums

Modified: csw/mgar/pkg/lang-python/poster/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-python/poster/trunk/Makefile	2013-04-07 15:39:07 UTC (rev 20641)
+++ csw/mgar/pkg/lang-python/poster/trunk/Makefile	2013-04-07 15:45:16 UTC (rev 20642)
@@ -1,11 +1,11 @@
 # $Id$
 # TODO (release-critical prefixed with !, non release-critical with *)
 #
-NAME = Paste
-VERSION = 1.7.5.1
+NAME = poster
+VERSION = 0.8.1
 GARTYPE = v2
 
-DESCRIPTION = Tools for using a Web Server Gateway Interface stack
+DESCRIPTION = Streaming HTTP uploads and multipart/form-data encoding
 define BLURB
 endef
 
@@ -17,7 +17,8 @@
 CONFIGURE_ARGS = $(DIRPATHS)
 SKIPTEST = 1
 
-PACKAGES = CSWpy-paste
-ARCHALL_CSWpy-paste = 1
+ARCHALL_CSWpy-poster = 1
 
+EXTRA_MERGE_EXCLUDE_FILES += $(libdir)/python/site-packages/tests/__init__.py
+
 include gar/category.mk

Modified: csw/mgar/pkg/lang-python/poster/trunk/checksums
===================================================================
--- csw/mgar/pkg/lang-python/poster/trunk/checksums	2013-04-07 15:39:07 UTC (rev 20641)
+++ csw/mgar/pkg/lang-python/poster/trunk/checksums	2013-04-07 15:45:16 UTC (rev 20642)
@@ -1 +1 @@
-7ea5fabed7dca48eb46dc613c4b6c4ed  Paste-1.7.5.1.tar.gz
+2db12704538781fbaa7e63f1505d6fc8  poster-0.8.1.tar.gz

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


From chninkel at users.sourceforge.net  Sun Apr  7 21:36:25 2013
From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net)
Date: Sun, 07 Apr 2013 19:36:25 +0000
Subject: [csw-devel] SF.net SVN: gar:[20643]
	csw/mgar/pkg/monit/trunk/Makefile
Message-ID: <E1UOvO5-0004LN-Fy@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 20643
          http://gar.svn.sourceforge.net/gar/?rev=20643&view=rev
Author:   chninkel
Date:     2013-04-07 19:36:24 +0000 (Sun, 07 Apr 2013)
Log Message:
-----------
monit/trunk: switched to SUNWspro and added missing override

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

Modified: csw/mgar/pkg/monit/trunk/Makefile
===================================================================
--- csw/mgar/pkg/monit/trunk/Makefile	2013-04-07 15:45:16 UTC (rev 20642)
+++ csw/mgar/pkg/monit/trunk/Makefile	2013-04-07 19:36:24 UTC (rev 20643)
@@ -21,11 +21,12 @@
 CHECKPKG_OVERRIDES_CSWmonit = file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/monit.1
 CHECKPKG_OVERRIDES_CSWmonit += $(CHECKPKG_OVERRIDES_CSWmonit_$(GARCH))
 CHECKPKG_OVERRIDES_CSWmonit_sparc = file-with-bad-content|/usr/local|root/opt/csw/bin/sparcv8/monit
+CHECKPKG_OVERRIDES_CSWmonit_sparc += file-with-bad-content|/usr/local|root/opt/csw/bin/sparcv9/monit
 CHECKPKG_OVERRIDES_CSWmonit_i386 = file-with-bad-content|/usr/local|root/opt/csw/bin/amd64/monit
 
 
 
-GARCOMPILER = GNU
+#GARCOMPILER = GNU
 BUILD64_ONLY = 1
 
 BUILD_DEP_PKGS += CSWlibssl-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 Apr  8 10:19:34 2013
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Mon, 08 Apr 2013 08:19:34 +0000
Subject: [csw-devel] SF.net SVN: gar:[20644]
	csw/mgar/pkg/muparser/trunk/Makefile
Message-ID: <E1UP7Ic-0000SJ-Nr@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 20644
          http://gar.svn.sourceforge.net/gar/?rev=20644&view=rev
Author:   cgrzemba
Date:     2013-04-08 08:19:34 +0000 (Mon, 08 Apr 2013)
Log Message:
-----------
muparser/trunk: remove gxx prefix

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

Modified: csw/mgar/pkg/muparser/trunk/Makefile
===================================================================
--- csw/mgar/pkg/muparser/trunk/Makefile	2013-04-07 19:36:24 UTC (rev 20643)
+++ csw/mgar/pkg/muparser/trunk/Makefile	2013-04-08 08:19:34 UTC (rev 20644)
@@ -19,20 +19,19 @@
 PACKAGING_PLATFORMS = solaris10-i386 solaris10-sparc
 
 GARCOMPILER = GNU
-prefix = $(BUILD_PREFIX)/gxx
+# prefix = $(BUILD_PREFIX)/gxx
 
-PACKAGES += CSWlibmuparser2-gxx
-CATALOGNAME_CSWlibmuparser2-gxx = libmuparser2_gxx
-PKGFILES_CSWlibmuparser2-gxx += $(call baseisadirs,$(libdir),libmuparser\.so\.2(\.\d+)*)
-SPKG_DESC_CSWlibmuparser2-gxx += $(DESCRIPTION), libmuparser.so.2
-RUNTIME_DEP_PKGS_CSWlibmuparser2-gxx += CSWlibgcc-s1
-RUNTIME_DEP_PKGS_CSWlibmuparser2-gxx += CSWlibstdc++6
-RUNTIME_DEP_PKGS_CSWmuparser-dev += CSWlibmuparser2-gxx
+PACKAGES += CSWlibmuparser2
+PKGFILES_CSWlibmuparser2 += $(call baseisadirs,$(libdir),libmuparser\.so\.2(\.\d+)*)
+SPKG_DESC_CSWlibmuparser2 += $(DESCRIPTION), libmuparser.so.2
+RUNTIME_DEP_PKGS_CSWlibmuparser2 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibmuparser2 += CSWlibstdc++6
 
 PACKAGES += CSWmuparser-dev
 CATALOGNAME_CSWmuparser-dev = muparser_dev
 SPKG_DESC_CSWmuparser-dev += $(DESCRIPTION), development files
 PKGFILES_CSWmuparser-dev += $(PKGFILES_DEVEL)
+RUNTIME_DEP_PKGS_CSWmuparser-dev += CSWlibmuparser2
 
 # no target
 SKIPTEST = 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 Apr  8 10:38:59 2013
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Mon, 08 Apr 2013 08:38:59 +0000
Subject: [csw-devel] SF.net SVN: gar:[20645] csw/mgar/pkg/muparser/trunk
Message-ID: <E1UP7bP-0004gE-PM@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 20645
          http://gar.svn.sourceforge.net/gar/?rev=20645&view=rev
Author:   cgrzemba
Date:     2013-04-08 08:38:58 +0000 (Mon, 08 Apr 2013)
Log Message:
-----------
muparser/trunk: new upstream version 2.2.3, remove prefix gxx

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

Modified: csw/mgar/pkg/muparser/trunk/Makefile
===================================================================
--- csw/mgar/pkg/muparser/trunk/Makefile	2013-04-08 08:19:34 UTC (rev 20644)
+++ csw/mgar/pkg/muparser/trunk/Makefile	2013-04-08 08:38:58 UTC (rev 20645)
@@ -2,8 +2,8 @@
 # TODO (release-critical prefixed with !, non release-critical with *)
 #
 NAME = muparser
-VERSION = v2_2_2
-GARTYPE = v2
+VERSION = v2_2_3
+# GARTYPE = v2
 
 DESCRIPTION = A fast math parser library
 define BLURB

Modified: csw/mgar/pkg/muparser/trunk/checksums
===================================================================
--- csw/mgar/pkg/muparser/trunk/checksums	2013-04-08 08:19:34 UTC (rev 20644)
+++ csw/mgar/pkg/muparser/trunk/checksums	2013-04-08 08:38:58 UTC (rev 20645)
@@ -1 +1 @@
-6d77b5cb8096fe2c50afe36ad41bc14a  muparser_v2_2_2.zip
+9de40ec1dab5bd2787ee344fce5846ad  muparser_v2_2_3.zip

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


From janholzh at users.sourceforge.net  Mon Apr  8 10:58:21 2013
From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net)
Date: Mon, 08 Apr 2013 08:58:21 +0000
Subject: [csw-devel] SF.net SVN: gar:[20646] csw/mgar/gar/v2/gar.conf.mk
Message-ID: <E1UP7u8-0005Ac-Vy@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 20646
          http://gar.svn.sourceforge.net/gar/?rev=20646&view=rev
Author:   janholzh
Date:     2013-04-08 08:58:20 +0000 (Mon, 08 Apr 2013)
Log Message:
-----------
bump GCC_VERSION to 4.8

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

Modified: csw/mgar/gar/v2/gar.conf.mk
===================================================================
--- csw/mgar/gar/v2/gar.conf.mk	2013-04-08 08:38:58 UTC (rev 20645)
+++ csw/mgar/gar/v2/gar.conf.mk	2013-04-08 08:58:20 UTC (rev 20646)
@@ -546,7 +546,7 @@
 SOS12U2_CC_HOME ?= /opt/solstudio12.2
 SOS12U3_CC_HOME ?= /opt/solarisstudio12.3
 
-   GCC4_VERSION ?= 4.7
+   GCC4_VERSION ?= 4.8
 
      GCC3_CC ?= $(GCC3_CC_HOME)/bin/gcc
      GCC4_CC ?= $(GCC4_CC_HOME)/bin/gcc-$(GCC4_VERSION)

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


From dmichelsen at users.sourceforge.net  Mon Apr  8 11:21:12 2013
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Mon, 08 Apr 2013 09:21:12 +0000
Subject: [csw-devel] SF.net SVN: gar:[20647]
	csw/mgar/pkg/easytag/trunk/Makefile
Message-ID: <E1UP8GG-00024J-6r@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 20647
          http://gar.svn.sourceforge.net/gar/?rev=20647&view=rev
Author:   dmichelsen
Date:     2013-04-08 09:21:11 +0000 (Mon, 08 Apr 2013)
Log Message:
-----------
easytag/trunk: Add more build deps as suggested by Laurent Blume

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

Modified: csw/mgar/pkg/easytag/trunk/Makefile
===================================================================
--- csw/mgar/pkg/easytag/trunk/Makefile	2013-04-08 08:58:20 UTC (rev 20646)
+++ csw/mgar/pkg/easytag/trunk/Makefile	2013-04-08 09:21:11 UTC (rev 20647)
@@ -20,6 +20,25 @@
 BUILD_DEP_PKGS += CSWlibspeex-dev
 BUILD_DEP_PKGS += CSWlibwavpack-dev
 
+# Add more dependencies as suggested by Laurent Blume in
+#   http://lists.opencsw.org/pipermail/users/2013-April/009549.html
+BUILD_DEP_PKGS += CSWintltool
+BUILD_DEP_PKGS += CSWpkgconfig
+BUILD_DEP_PKGS += CSWlibgtk2-dev
+BUILD_DEP_PKGS += CSWlibpcre-dev
+BUILD_DEP_PKGS += CSWfconfig-dev
+BUILD_DEP_PKGS += CSWlibfreetype-dev
+BUILD_DEP_PKGS += CSWlibpng-dev
+BUILD_DEP_PKGS += CSWx11xproto
+BUILD_DEP_PKGS += CSWx11renderproto
+BUILD_DEP_PKGS += CSWlibx11devel
+BUILD_DEP_PKGS += CSWlibxcbdevel
+BUILD_DEP_PKGS += CSWlibxaudevel
+BUILD_DEP_PKGS += CSWlibxdmcpdevel
+BUILD_DEP_PKGS += CSWlibid3-dev
+BUILD_DEP_PKGS += CSWlibiconv-dev
+BUILD_DEP_PKGS += CSWggettext-dev
+
 RUNTIME_DEP_PKGS_CSWeasytag += CSWlibgdk-x11-2-0-0
 RUNTIME_DEP_PKGS_CSWeasytag += CSWlibgdk-pixbuf2-0-0
 RUNTIME_DEP_PKGS_CSWeasytag += CSWlibid3-3-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 Apr  8 11:26:06 2013
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Mon, 08 Apr 2013 09:26:06 +0000
Subject: [csw-devel] SF.net SVN: gar:[20648]
	csw/mgar/pkg/qt4-gcc/trunk/Makefile
Message-ID: <E1UP8L0-0002KF-AA@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 20648
          http://gar.svn.sourceforge.net/gar/?rev=20648&view=rev
Author:   cgrzemba
Date:     2013-04-08 09:26:04 +0000 (Mon, 08 Apr 2013)
Log Message:
-----------
qt4-gcc/trunk: add runtime dependency icu, not detected automaticaly

Modified Paths:
--------------
    csw/mgar/pkg/qt4-gcc/trunk/Makefile

Modified: csw/mgar/pkg/qt4-gcc/trunk/Makefile
===================================================================
--- csw/mgar/pkg/qt4-gcc/trunk/Makefile	2013-04-08 09:21:11 UTC (rev 20647)
+++ csw/mgar/pkg/qt4-gcc/trunk/Makefile	2013-04-08 09:26:04 UTC (rev 20648)
@@ -133,6 +133,7 @@
 RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibodbc2
 RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibtiff3
 RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibmysqlclient18
+RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibicui18n50
 # These are code examples.
 CHECKPKG_OVERRIDES_CSWqt4-dev += binary-architecture-does-not-match-placement
 

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 Apr  8 14:11:28 2013
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Mon, 08 Apr 2013 12:11:28 +0000
Subject: [csw-devel] SF.net SVN: gar:[20649] csw/mgar/pkg/librecad/trunk
Message-ID: <E1UPAv2-0001s2-M1@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 20649
          http://gar.svn.sourceforge.net/gar/?rev=20649&view=rev
Author:   cgrzemba
Date:     2013-04-08 12:11:27 +0000 (Mon, 08 Apr 2013)
Log Message:
-----------
librecad/trunk: bump version, build with qt4.8.1

Modified Paths:
--------------
    csw/mgar/pkg/librecad/trunk/Makefile
    csw/mgar/pkg/librecad/trunk/files/0000-adjust-for-csw-environment.patch
    csw/mgar/pkg/librecad/trunk/files/0001-adjust-rs_system-forcsw.patch

Added Paths:
-----------
    csw/mgar/pkg/librecad/trunk/files/0002-set-version-from-git.patch

Modified: csw/mgar/pkg/librecad/trunk/Makefile
===================================================================
--- csw/mgar/pkg/librecad/trunk/Makefile	2013-04-08 09:26:04 UTC (rev 20648)
+++ csw/mgar/pkg/librecad/trunk/Makefile	2013-04-08 12:11:27 UTC (rev 20649)
@@ -1,9 +1,8 @@
 # $Id$
 # TODO (release-critical prefixed with !, non release-critical with *)
 #
-NAME = libreCAD
-GITNAME = LibreCAD
-VERSION = 2.0.0beta1
+NAME = LibreCAD
+VERSION = 2.0.0beta2
 # GIT_VERSION = 216dc66b2a
 GARTYPE = v2
 CATEGORIES = gnome
@@ -23,40 +22,41 @@
 # https://github.com/LibreCAD/LibreCAD/tarball/master
 MASTER_SITES = 
 # DISTFILES  = $(DISTNAME).tar.gz
-GIT_REPOS = http://github.com/$(GITNAME)/$(GITNAME).git
+GIT_REPOS = http://github.com/$(NAME)/$(NAME).git
 GIT_USE_PROXY = 1
 # GIT_TREEISH_LibreCAD.git = $(GIT_VERSION)
 
 GARCOMPILER = GNU
-prefix = $(BUILD_PREFIX)/gxx
+# prefix = $(BUILD_PREFIX)/gxx
 PACKAGING_PLATFORMS = solaris10-i386 solaris10-sparc
 
 PATCHFILES += 0000-adjust-for-csw-environment.patch
 PATCHFILES += 0000-add-csw-settings.patch
 PATCHFILES += 0001-adjust-rs_system-forcsw.patch
+PATCHFILES += 0002-set-version-from-git.patch
 
-BUILD_DEP_PKGS += CSWqt4-gxx-dev
+BUILD_DEP_PKGS += CSWqt4-dev
 BUILD_DEP_PKGS += CSWmuparser-dev
 BUILD_DEP_PKGS += CSWboost-gcc-dev
 BUILD_DEP_PKGS += CSWlibfreetype-dev
 
-PACKAGES = CSWlibrecad
-CATALOGNAME_CSWlibrecad = librecad
-SPKG_DESC_CSWlibrecad = $(DESCRIPTION)
-# PKGFILES_CSWlibrecad += $(call baseisadirs,$(bindir),.*)
-# PKGFILES_CSWlibrecad += $(datadir)/$(call tolower,$(NAME))/.*
-RUNTIME_DEP_PKGS_CSWlibrecad += CSWlibqthelp4-gxx
-RUNTIME_DEP_PKGS_CSWlibrecad += CSWlibqtcore4-gxx
-RUNTIME_DEP_PKGS_CSWlibrecad += CSWlibstdc++6
-RUNTIME_DEP_PKGS_CSWlibrecad += CSWlibqtgui4-gxx
-RUNTIME_DEP_PKGS_CSWlibrecad += CSWlibqtsvg4-gxx
-RUNTIME_DEP_PKGS_CSWlibrecad += CSWlibgcc-s1
-RUNTIME_DEP_PKGS_CSWlibrecad += CSWlibfreetype6
-RUNTIME_DEP_PKGS_CSWlibrecad += CSWlibmuparser2-gxx
-# RUNTIME_DEP_PKGS_CSWlibrecad += CSWlibqtsql4-gxx
-# it had never exists: remove that as soon checkpkg could forget this
-OBSOLETED_BY_CSWlibrecad = CSWLibreCAD
+PACKAGES += CSWlibreCAD
+CATALOGNAME_CSWlibreCAD = libreCAD
+PKGFILES_CSWlibreCAD += $(call baseisadirs,$(bindir),.*)
+PKGFILES_CSWlibreCAD += $(datadir)/$(call tolower,$(NAME))/.*
+RUNTIME_DEP_PKGS_CSWlibreCAD += CSWlibqthelp4
+RUNTIME_DEP_PKGS_CSWlibreCAD += CSWlibqtcore4
+RUNTIME_DEP_PKGS_CSWlibreCAD += CSWlibstdc++6
+RUNTIME_DEP_PKGS_CSWlibreCAD += CSWlibqtgui4
+RUNTIME_DEP_PKGS_CSWlibreCAD += CSWlibqtsvg4
+RUNTIME_DEP_PKGS_CSWlibreCAD += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibreCAD += CSWlibfreetype6
+RUNTIME_DEP_PKGS_CSWlibreCAD += CSWlibmuparser2
+# RUNTIME_DEP_PKGS_CSWlibreCAD += CSWlibqtsql4
+CHECKPKG_OVERRIDES_CSWlibreCAD += file-with-bad-content|/usr/share|root/opt/csw/bin/librecad
+CHECKPKG_OVERRIDES_CSWlibreCAD += catalogname-not-lowercase
 
+
 CONFIGURE_ARGS = $(DIRPATHS)
 
 CONFIGURE_SCRIPTS = custom
@@ -73,10 +73,10 @@
 	ginstall -d $(DESTDIR)$(libdir)/$(call tolower, $(NAME))/resources
 	gcp -rfp  $(WORKSRC)/unix/resources/* \
                   $(DESTDIR)$(libdir)/$(call tolower, $(NAME))/resources
-	ginstall -d $(DESTDIR)$(subst gxx/,,$(docdir))/$(CATALOGNAME_CSWlibrecad)
-	$(foreach L,$(EXTRA_LICENSE),gcp $(WORKSRC)/$L $(DESTDIR)$(subst gxx/,,$(docdir))/$(CATALOGNAME_CSWlibrecad);)
+	ginstall -d $(DESTDIR)$(docdir)/$(CATALOGNAME_CSWlibreCAD)
+	$(foreach L,$(EXTRA_LICENSE),gcp $(WORKSRC)/$L $(DESTDIR)$(docdir)/$(CATALOGNAME_CSWlibreCAD);)
 	@$(MAKECOOKIE)
 
 include gar/category.mk
 
-PATH := /opt/csw/gnu:$(PATH):/opt/csw/gcc4/bin:/opt/csw/gxx/bin
+PATH := /opt/csw/gnu:$(PATH):/opt/csw/gcc4/bin

Modified: csw/mgar/pkg/librecad/trunk/files/0000-adjust-for-csw-environment.patch
===================================================================
--- csw/mgar/pkg/librecad/trunk/files/0000-adjust-for-csw-environment.patch	2013-04-08 09:26:04 UTC (rev 20648)
+++ csw/mgar/pkg/librecad/trunk/files/0000-adjust-for-csw-environment.patch	2013-04-08 12:11:27 UTC (rev 20649)
@@ -1,27 +1,3 @@
-From 9ae6c98ce011215619dd63c1060a8f836fce5b8b Mon Sep 17 00:00:00 2001
-From: Carsten Grzemba <cgrzemba at opencsw.org>
-Date: Thu, 24 May 2012 15:48:53 +0200
-Subject: [PATCH] adjust for csw environment
-
----
- librecad/src/src.pro |    1 -
- settings.pro         |    4 +++-
- 2 Dateien ge?ndert, 3 Zeilen hinzugef?gt(+), 2 Zeilen entfernt(-)
-
-diff --git a/librecad/src/src.pro b/librecad/src/src.pro
-index 4e1a0d3..e6a1ea8 100755
---- a/librecad/src/src.pro
-+++ b/librecad/src/src.pro
-@@ -38,7 +38,6 @@ DESTDIR = $${INSTALLDIR}
- 
- # Make translations at the end of the process
- unix {
--    SCMREVISION=$$system([ "$(which git)x" != "x" -a -d ../../.git ] && echo "$(git describe --tags)" || echo "$${SCMREVISION}")
- 
-     DEFINES += QC_SCMREVISION=\"$$SCMREVISION\"
-     macx {
-diff --git a/settings.pro b/settings.pro
-index b120052..b5354ea 100644
 --- a/settings.pro
 +++ b/settings.pro
 @@ -5,6 +5,6 @@ unix {

Modified: csw/mgar/pkg/librecad/trunk/files/0001-adjust-rs_system-forcsw.patch
===================================================================
--- csw/mgar/pkg/librecad/trunk/files/0001-adjust-rs_system-forcsw.patch	2013-04-08 09:26:04 UTC (rev 20648)
+++ csw/mgar/pkg/librecad/trunk/files/0001-adjust-rs_system-forcsw.patch	2013-04-08 12:11:27 UTC (rev 20649)
@@ -4,7 +4,7 @@
  
          // Others, RVT April 25, 2011 removed, doesn anybody use that still?
          // dirList.append("/usr/X11R6/share/" + appDirName + "/" + subDirectory);
-+        dirList.append("/opt/csw/gxx/share/" + appDirName + "/" + subDirectory);
++        dirList.append("/opt/csw/share/" + appDirName + "/" + subDirectory);
  
  
  #ifdef Q_OS_MAC
@@ -12,7 +12,7 @@
          // Add support directory if librecad is run-in-place,
          // not for Apple because it uses resources this is more for unix systems
          dirList.append(appDir + "/resources/" + subDirectory);
-+        dirList.append("/opt/csw/gxx/lib/"+ appDirName + "/resources/" + subDirectory);
++        dirList.append("/opt/csw/lib/"+ appDirName + "/resources/" + subDirectory);
  #endif
  
      // Individual directories:

Added: csw/mgar/pkg/librecad/trunk/files/0002-set-version-from-git.patch
===================================================================
--- csw/mgar/pkg/librecad/trunk/files/0002-set-version-from-git.patch	                        (rev 0)
+++ csw/mgar/pkg/librecad/trunk/files/0002-set-version-from-git.patch	2013-04-08 12:11:27 UTC (rev 20649)
@@ -0,0 +1,11 @@
+--- a/librecad/src/src.pro
++++ b/librecad/src/src.pro
+@@ -37,7 +37,7 @@ DESTDIR = $${INSTALLDIR}
+ 
+ # Make translations at the end of the process
+ unix {
+-    SCMREVISION=$$system([ "$(which git)x" != "x" -a -d ../../.git ] && echo "$(git describe --tags)" || echo "$${SCMREVISION}")
++    SCMREVISION=$$system(echo "$(git describe --tags)" || echo "$${SCMREVISION}")
+ 
+     DEFINES += QC_SCMREVISION=\"$$SCMREVISION\"
+     macx {

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 Apr  8 16:11:26 2013
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Mon, 08 Apr 2013 14:11:26 +0000
Subject: [csw-devel] SF.net SVN: gar:[20650]
	csw/mgar/pkg/librecad/trunk/Makefile
Message-ID: <E1UPCn7-0007p7-Q8@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 20650
          http://gar.svn.sourceforge.net/gar/?rev=20650&view=rev
Author:   cgrzemba
Date:     2013-04-08 14:11:25 +0000 (Mon, 08 Apr 2013)
Log Message:
-----------
librecad/trunk: add resources to the package; fonts,doc etc.

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

Modified: csw/mgar/pkg/librecad/trunk/Makefile
===================================================================
--- csw/mgar/pkg/librecad/trunk/Makefile	2013-04-08 12:11:27 UTC (rev 20649)
+++ csw/mgar/pkg/librecad/trunk/Makefile	2013-04-08 14:11:25 UTC (rev 20650)
@@ -44,6 +44,7 @@
 CATALOGNAME_CSWlibreCAD = libreCAD
 PKGFILES_CSWlibreCAD += $(call baseisadirs,$(bindir),.*)
 PKGFILES_CSWlibreCAD += $(datadir)/$(call tolower,$(NAME))/.*
+PKGFILES_CSWlibreCAD += $(libdir)/$(call tolower,$(NAME))/.*
 RUNTIME_DEP_PKGS_CSWlibreCAD += CSWlibqthelp4
 RUNTIME_DEP_PKGS_CSWlibreCAD += CSWlibqtcore4
 RUNTIME_DEP_PKGS_CSWlibreCAD += CSWlibstdc++6

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 Apr  8 17:12:56 2013
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Mon, 08 Apr 2013 15:12:56 +0000
Subject: [csw-devel] SF.net SVN: gar:[20651]
	csw/mgar/pkg/easytag/trunk/Makefile
Message-ID: <E1UPDke-000117-Ow@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 20651
          http://gar.svn.sourceforge.net/gar/?rev=20651&view=rev
Author:   wahwah
Date:     2013-04-08 15:12:56 +0000 (Mon, 08 Apr 2013)
Log Message:
-----------
easytag/trunk: A patch from Laurent, using sun X11 headers, also sorted deps alphabetically

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

Property Changed:
----------------
    csw/mgar/pkg/easytag/trunk/Makefile

Modified: csw/mgar/pkg/easytag/trunk/Makefile
===================================================================
--- csw/mgar/pkg/easytag/trunk/Makefile	2013-04-08 14:11:25 UTC (rev 20650)
+++ csw/mgar/pkg/easytag/trunk/Makefile	2013-04-08 15:12:56 UTC (rev 20651)
@@ -1,3 +1,5 @@
+# $Id$
+
 NAME = easytag
 VERSION = 2.1.8
 GARTYPE = v2
@@ -22,39 +24,34 @@
 
 # Add more dependencies as suggested by Laurent Blume in
 #   http://lists.opencsw.org/pipermail/users/2013-April/009549.html
+BUILD_DEP_PKGS += CSWfconfig-dev
+BUILD_DEP_PKGS += CSWggettext-dev
 BUILD_DEP_PKGS += CSWintltool
-BUILD_DEP_PKGS += CSWpkgconfig
+BUILD_DEP_PKGS += CSWlibfreetype-dev
 BUILD_DEP_PKGS += CSWlibgtk2-dev
+BUILD_DEP_PKGS += CSWlibiconv-dev
+BUILD_DEP_PKGS += CSWlibid3-dev
 BUILD_DEP_PKGS += CSWlibpcre-dev
-BUILD_DEP_PKGS += CSWfconfig-dev
-BUILD_DEP_PKGS += CSWlibfreetype-dev
 BUILD_DEP_PKGS += CSWlibpng-dev
-BUILD_DEP_PKGS += CSWx11xproto
-BUILD_DEP_PKGS += CSWx11renderproto
-BUILD_DEP_PKGS += CSWlibx11devel
-BUILD_DEP_PKGS += CSWlibxcbdevel
-BUILD_DEP_PKGS += CSWlibxaudevel
-BUILD_DEP_PKGS += CSWlibxdmcpdevel
-BUILD_DEP_PKGS += CSWlibid3-dev
-BUILD_DEP_PKGS += CSWlibiconv-dev
-BUILD_DEP_PKGS += CSWggettext-dev
+BUILD_DEP_PKGS += CSWpkgconfig
+BUILD_DEP_PKGS += CSWsunx11devel
 
-RUNTIME_DEP_PKGS_CSWeasytag += CSWlibgdk-x11-2-0-0
+RUNTIME_DEP_PKGS_CSWeasytag += CSWlibflac8
 RUNTIME_DEP_PKGS_CSWeasytag += CSWlibgdk-pixbuf2-0-0
-RUNTIME_DEP_PKGS_CSWeasytag += CSWlibid3-3-8-3
-RUNTIME_DEP_PKGS_CSWeasytag += CSWlibgobject2-0-0
+RUNTIME_DEP_PKGS_CSWeasytag += CSWlibgdk-x11-2-0-0
+RUNTIME_DEP_PKGS_CSWeasytag += CSWlibgio2-0-0
 RUNTIME_DEP_PKGS_CSWeasytag += CSWlibglib2-0-0
+RUNTIME_DEP_PKGS_CSWeasytag += CSWlibgobject2-0-0
 RUNTIME_DEP_PKGS_CSWeasytag += CSWlibgtk-x11-2-0-0
+RUNTIME_DEP_PKGS_CSWeasytag += CSWlibid3-3-8-3
+RUNTIME_DEP_PKGS_CSWeasytag += CSWlibid3tag
 RUNTIME_DEP_PKGS_CSWeasytag += CSWlibintl8
 RUNTIME_DEP_PKGS_CSWeasytag += CSWlibogg0
-RUNTIME_DEP_PKGS_CSWeasytag += CSWlibid3tag
+RUNTIME_DEP_PKGS_CSWeasytag += CSWlibspeex1
 RUNTIME_DEP_PKGS_CSWeasytag += CSWlibvorbis0
+RUNTIME_DEP_PKGS_CSWeasytag += CSWlibvorbisfile3
 RUNTIME_DEP_PKGS_CSWeasytag += CSWlibwavpack1
-RUNTIME_DEP_PKGS_CSWeasytag += CSWlibflac8
 RUNTIME_DEP_PKGS_CSWeasytag += CSWpango
-RUNTIME_DEP_PKGS_CSWeasytag += CSWlibspeex1
-RUNTIME_DEP_PKGS_CSWeasytag += CSWlibvorbisfile3
-RUNTIME_DEP_PKGS_CSWeasytag += CSWlibgio2-0-0
 
 # This macro is being phased out of Pango, so this seems like an acceptable fix for now:
 #   https://bugzilla.gnome.org/show_bug.cgi?id=652202


Property changes on: csw/mgar/pkg/easytag/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 wahwah at users.sourceforge.net  Mon Apr  8 17:38:35 2013
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Mon, 08 Apr 2013 15:38:35 +0000
Subject: [csw-devel] SF.net SVN: gar:[20652]
	csw/mgar/pkg/lang-python/python/branches/python-3.3
Message-ID: <E1UPE9T-0001un-7t@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 20652
          http://gar.svn.sourceforge.net/gar/?rev=20652&view=rev
Author:   wahwah
Date:     2013-04-08 15:38:33 +0000 (Mon, 08 Apr 2013)
Log Message:
-----------
lang-python/python/branches/python-3.3: version bump to 3.3.1

Modified Paths:
--------------
    csw/mgar/pkg/lang-python/python/branches/python-3.3/Makefile
    csw/mgar/pkg/lang-python/python/branches/python-3.3/checksums

Modified: csw/mgar/pkg/lang-python/python/branches/python-3.3/Makefile
===================================================================
--- csw/mgar/pkg/lang-python/python/branches/python-3.3/Makefile	2013-04-08 15:12:56 UTC (rev 20651)
+++ csw/mgar/pkg/lang-python/python/branches/python-3.3/Makefile	2013-04-08 15:38:33 UTC (rev 20652)
@@ -1,7 +1,7 @@
 # $Id$
 
 NAME = Python
-VERSION = 3.3.0
+VERSION = 3.3.1
 VER = 3.3
 DVER = 3-3
 UVER = 3_3

Modified: csw/mgar/pkg/lang-python/python/branches/python-3.3/checksums
===================================================================
--- csw/mgar/pkg/lang-python/python/branches/python-3.3/checksums	2013-04-08 15:12:56 UTC (rev 20651)
+++ csw/mgar/pkg/lang-python/python/branches/python-3.3/checksums	2013-04-08 15:38:33 UTC (rev 20652)
@@ -1 +1 @@
-b3b2524f72409d919a4137826a870a8f  Python-3.3.0.tar.bz2
+fb7147a15359a941e0b048c641fd7123  Python-3.3.1.tar.bz2

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


From rthurner at users.sourceforge.net  Tue Apr  9 01:00:34 2013
From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net)
Date: Mon, 08 Apr 2013 23:00:34 +0000
Subject: [csw-devel] SF.net SVN: gar:[20653] csw/mgar/pkg/subversion/trunk
Message-ID: <E1UPL3C-0000fu-2s@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 20653
          http://gar.svn.sourceforge.net/gar/?rev=20653&view=rev
Author:   rthurner
Date:     2013-04-08 23:00:33 +0000 (Mon, 08 Apr 2013)
Log Message:
-----------
subversion, upgrade to svn-1.7.9

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

Modified: csw/mgar/pkg/subversion/trunk/Makefile
===================================================================
--- csw/mgar/pkg/subversion/trunk/Makefile	2013-04-08 15:38:33 UTC (rev 20652)
+++ csw/mgar/pkg/subversion/trunk/Makefile	2013-04-08 23:00:33 UTC (rev 20653)
@@ -20,7 +20,7 @@
 #   http://subversion.apache.org/mailing-lists.html
 
 NAME = subversion
-VERSION = 1.7.8
+VERSION = 1.7.9
 GARTYPE = v2
 
 DESCRIPTION = Version control rethought

Modified: csw/mgar/pkg/subversion/trunk/checksums
===================================================================
--- csw/mgar/pkg/subversion/trunk/checksums	2013-04-08 15:38:33 UTC (rev 20652)
+++ csw/mgar/pkg/subversion/trunk/checksums	2013-04-08 23:00:33 UTC (rev 20653)
@@ -1 +1 @@
-454b9f398415c3504435bf8c3f6ed127  subversion-1.7.8.tar.bz2
+8d532025771a67c06c23f299699f056f  subversion-1.7.9.tar.bz2

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


From cgrzemba at users.sourceforge.net  Tue Apr  9 10:28:32 2013
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Tue, 09 Apr 2013 08:28:32 +0000
Subject: [csw-devel] SF.net SVN: gar:[20654]
	csw/mgar/pkg/qt4-gcc/trunk/Makefile
Message-ID: <E1UPTuq-0005T9-Bv@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 20654
          http://gar.svn.sourceforge.net/gar/?rev=20654&view=rev
Author:   cgrzemba
Date:     2013-04-09 08:28:31 +0000 (Tue, 09 Apr 2013)
Log Message:
-----------
qt4-gcc/trunk: add checkpkg_overrides

Modified Paths:
--------------
    csw/mgar/pkg/qt4-gcc/trunk/Makefile

Modified: csw/mgar/pkg/qt4-gcc/trunk/Makefile
===================================================================
--- csw/mgar/pkg/qt4-gcc/trunk/Makefile	2013-04-08 23:00:33 UTC (rev 20653)
+++ csw/mgar/pkg/qt4-gcc/trunk/Makefile	2013-04-09 08:28:31 UTC (rev 20654)
@@ -134,6 +134,7 @@
 RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibtiff3
 RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibmysqlclient18
 RUNTIME_DEP_PKGS_CSWqt4-dev += CSWlibicui18n50
+CHECKPKG_OVERRIDES_CSWqt4-dev += surplus-dependency|CSWlibicui18n50
 # These are code examples.
 CHECKPKG_OVERRIDES_CSWqt4-dev += binary-architecture-does-not-match-placement
 

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


From mattdarcy at users.sourceforge.net  Tue Apr  9 15:50:55 2013
From: mattdarcy at users.sourceforge.net (mattdarcy at users.sourceforge.net)
Date: Tue, 09 Apr 2013 13:50:55 +0000
Subject: [csw-devel] SF.net SVN: gar:[20655]
	csw/mgar/pkg/tree/branches/bratislava/trunk/
Message-ID: <E1UPYwp-0001lp-7G@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 20655
          http://gar.svn.sourceforge.net/gar/?rev=20655&view=rev
Author:   mattdarcy
Date:     2013-04-09 13:50:54 +0000 (Tue, 09 Apr 2013)
Log Message:
-----------


Added Paths:
-----------
    csw/mgar/pkg/tree/branches/bratislava/trunk/

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


From wahwah at users.sourceforge.net  Tue Apr  9 20:09:17 2013
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Tue,  9 Apr 2013 18:09:17 +0000
Subject: [csw-devel] SF.net SVN: opencsw:[661]
 web/wordpresscsw/wp-content/themes/opencsw/ maintainer.php
Message-ID: <20130409180933.8CB8E417@mail.opencsw.org>

Revision: 661
          http://sourceforge.net/p/opencsw/code/661
Author:   wahwah
Date:     2013-04-09 18:09:16 +0000 (Tue, 09 Apr 2013)
Log Message:
-----------
OpenCSW website: change 'maintained' to 'uploaded'

This makes the page consistent with the individual package page.

I grepped for 'maintained by', this was the only occurrence in the code.

Modified Paths:
--------------
    web/wordpresscsw/wp-content/themes/opencsw/maintainer.php

Modified: web/wordpresscsw/wp-content/themes/opencsw/maintainer.php
===================================================================
--- web/wordpresscsw/wp-content/themes/opencsw/maintainer.php	2013-03-15 08:29:59 UTC (rev 660)
+++ web/wordpresscsw/wp-content/themes/opencsw/maintainer.php	2013-04-09 18:09:16 UTC (rev 661)
@@ -96,7 +96,7 @@
         print "</ul>";
 
         print "<h3>Packages ( " . count($arrayPkg) . " )</h3>";
-        print "<p>List of packages maintained by $arrayInfo[1].</p>";
+        print "<p>List of packages uploaded by $arrayInfo[1].</p>";
         print "<table border=\"0\">";
         print "<tbody  class=\"package-list\">";
         print "<tr>";

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 Apr  9 20:24:41 2013
From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net)
Date: Tue, 09 Apr 2013 18:24:41 +0000
Subject: [csw-devel] SF.net SVN: gar:[20656]
	csw/mgar/pkg/cpan/Devel-NYTProf/trunk
Message-ID: <E1UPdDl-0001dV-A3@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 20656
          http://gar.svn.sourceforge.net/gar/?rev=20656&view=rev
Author:   bonivart
Date:     2013-04-09 18:24:40 +0000 (Tue, 09 Apr 2013)
Log Message:
-----------
cpan/Devel-NYTProf/trunk: update to 5.00

Modified Paths:
--------------
    csw/mgar/pkg/cpan/Devel-NYTProf/trunk/Makefile
    csw/mgar/pkg/cpan/Devel-NYTProf/trunk/checksums

Modified: csw/mgar/pkg/cpan/Devel-NYTProf/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Devel-NYTProf/trunk/Makefile	2013-04-09 13:50:54 UTC (rev 20655)
+++ csw/mgar/pkg/cpan/Devel-NYTProf/trunk/Makefile	2013-04-09 18:24:40 UTC (rev 20656)
@@ -1,12 +1,11 @@
 NAME = Devel-NYTProf
-VERSION = 4.06
+VERSION = 5.00
 CATEGORIES = cpan
 GARTYPE = v2
 AUTHOR = TIMB
 
 DESCRIPTION = Powerful fast feature-rich perl source code profiler
 define BLURB
-  Powerful fast feature-rich perl source code profiler
 endef
 
 DISTFILES += COPYING
@@ -14,9 +13,10 @@
 PACKAGES = CSWpm-devel-nytprof
 CATALOGNAME = pm_devel_nytprof
 
+RUNTIME_DEP_PKGS += CSWlibz1
 RUNTIME_DEP_PKGS += CSWpm-json-any
+RUNTIME_DEP_PKGS += CSWpm-test-differences
 
-# Temporary override since CSWpm-json-any is not released yet, remove this next time
-CHECKPKG_OVERRIDES_CSWpm-devel-nytprof += unidentified-dependency|CSWpm-json-any
+CONFIGURE_ARGS =
 
 include gar/category.mk

Modified: csw/mgar/pkg/cpan/Devel-NYTProf/trunk/checksums
===================================================================
--- csw/mgar/pkg/cpan/Devel-NYTProf/trunk/checksums	2013-04-09 13:50:54 UTC (rev 20655)
+++ csw/mgar/pkg/cpan/Devel-NYTProf/trunk/checksums	2013-04-09 18:24:40 UTC (rev 20656)
@@ -1 +1 @@
-6a945649e49d353ddd083a4427f9f96c  Devel-NYTProf-4.06.tar.gz
+df8b1b88c652625bbcdd14d8f5825d80  Devel-NYTProf-5.00.tar.gz

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


From wahwah at users.sourceforge.net  Wed Apr 10 09:57:57 2013
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Wed, 10 Apr 2013 07:57:57 +0000
Subject: [csw-devel] SF.net SVN: gar:[20657] csw/mgar/pkg/expect/trunk
Message-ID: <E1UPpun-00065S-5y@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 20657
          http://gar.svn.sourceforge.net/gar/?rev=20657&view=rev
Author:   wahwah
Date:     2013-04-10 07:57:56 +0000 (Wed, 10 Apr 2013)
Log Message:
-----------
Update to a newer version

Modified Paths:
--------------
    csw/mgar/pkg/expect/trunk/Makefile
    csw/mgar/pkg/expect/trunk/checksums
    csw/mgar/pkg/expect/trunk/files/solaris.patch

Modified: csw/mgar/pkg/expect/trunk/Makefile
===================================================================
--- csw/mgar/pkg/expect/trunk/Makefile	2013-04-09 18:24:40 UTC (rev 20656)
+++ csw/mgar/pkg/expect/trunk/Makefile	2013-04-10 07:57:56 UTC (rev 20657)
@@ -1,5 +1,7 @@
+# $Id$
+
 NAME = expect
-VERSION = 5.43
+VERSION = 5.45
 GARTYPE = v2
 
 DESCRIPTION = Tool for automating interactive applications
@@ -17,10 +19,9 @@
 
 # For some reason upstream have recalled 5.44.1 and has 5.43 as primary on 
 # homepage as expect.tar.gz
-MASTER_SITES = http://expect.nist.gov/
-MASTER_SITES += http://downloads.sourceforge.net/tcl/
-DISTNAME  = $(NAME)-$(VERSION)
-DISTFILES  = $(NAME).tar.gz
+MASTER_SITES = $(SF_MIRROR)
+DISTNAME  = $(NAME)$(VERSION)
+DISTFILES  = $(DISTNAME).tar.gz
 DISTFILES += expect.m4
 DISTFILES += license
 
@@ -40,37 +41,19 @@
 
 LICENSE = license
 
-RUNTIME_DEP_PKGS_CSWexpect += CSWtcl
-RUNTIME_DEP_PKGS_CSWexpect += CSWtk
-RUNTIME_DEP_PKGS_CSWexpect += CSWfconfig
-RUNTIME_DEP_PKGS_CSWexpect += CSWftype2
-RUNTIME_DEP_PKGS_CSWexpect += CSWlibx11
-RUNTIME_DEP_PKGS_CSWexpect += CSWlibxft2
-RUNTIME_DEP_PKGS_CSWexpect += CSWlibxrender
-RUNTIME_DEP_PKGS_CSWexpect += CSWlibxext
-RUNTIME_DEP_PKGS_CSWexpect += CSWlibxscrnsaver
-RUNTIME_DEP_PKGS_CSWexpect += CSWsunmath
+RUNTIME_DEP_PKGS_CSWexpect += CSWlibtcl8-5
 
-UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
-
-EXTRA_INC = $(prefix)/X11/include
-EXTRA_LIB = $(prefix)/X11/lib
-EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib
-#EXTRA_SOS_LD_FLAGS = -L$(abspath $(prefix)/X11/lib/$(MM_LIBDIR))
-
 INSTALL_ROOT=$(DESTDIR)
 INSTALL_EXPORTS += INSTALL_ROOT
 INSTALL_EXPORTS += LD_OPTIONS
 
 CONFIGURE_ARGS = $(DIRPATHS)
-CONFIGURE_ARGS += --x-includes=$(prefix)/X11/include
-CONFIGURE_ARGS += --x-libraries=$(abspath $(prefix)/X11/lib/$(MM_LIBDIR))
 CONFIGURE_ARGS += --enable-shared
 CONFIGURE_ARGS += --with-tcl=$(libdir) --with-tk=$(libdir)
 CONFIGURE_ARGS += --with-tclinclude=$(includedir)
 CONFIGURE_ARGS += --with-tkinclude=$(includedir)
 
-TEST_TARGET = 
+TEST_TARGET =
 
 BUILD64_LIBS_ONLY = 1
 
@@ -80,7 +63,6 @@
 	( cd $(WORKSRC);	mv ../expect.m4 .; )
 	( cd $(WORKSRC);	\
 	gsed -i.orig 's#/usr/local/bin#/opt/csw/bin#' expect.man	; \
-	gsed -i.orig 's#/usr/local/bin#/opt/csw/bin#' expectk.man	; \
 	)
 	#stops any example scripts being installed by default
 	( cd $(WORKSRC);	\

Modified: csw/mgar/pkg/expect/trunk/checksums
===================================================================
--- csw/mgar/pkg/expect/trunk/checksums	2013-04-09 18:24:40 UTC (rev 20656)
+++ csw/mgar/pkg/expect/trunk/checksums	2013-04-10 07:57:56 UTC (rev 20657)
@@ -1,10 +1 @@
-c488d8e53c265fe25964a274ea4aff1e  Makefile.in.patch
-c458386d5502fab2b49da03d16fb108c  expect-5.39.0-libdir.patch
-5661004ca23ddc9592f488142367c2f5  expect-5.43.0-avoid-tcl-internals-1.patch
-3d67a79c1d7790c7e49b5df7f57b0290  expect-5.43.0-missing-includes.patch
-2103ff302f6e8a0dd748772f6512b3a5  expect-5.43.0-multilib.patch
-595b7a7c63f7ddb42e19c2537bb2891b  expect.m4
-43e1dc0e0bc9492cf2e1a6f59f276bc3  expect.tar.gz
-040cd3fa024e1b8fb313da63db17f699  license
-9cd31c4268e88029322348a1ac13cffd  solaris.patch
-21c1566a06d28c027a8cdf632b46fcb8  warnings.patch
+44e1a4f4c877e9ddc5a542dfa7ecc92b  expect5.45.tar.gz

Modified: csw/mgar/pkg/expect/trunk/files/solaris.patch
===================================================================
--- csw/mgar/pkg/expect/trunk/files/solaris.patch	2013-04-09 18:24:40 UTC (rev 20656)
+++ csw/mgar/pkg/expect/trunk/files/solaris.patch	2013-04-10 07:57:56 UTC (rev 20657)
@@ -21,18 +21,6 @@
  #ifdef NO_STDLIB_H
  
  /*
-diff -Nru expect-5.43.orig/exp_main_tk.c expect-5.43/exp_main_tk.c
---- expect-5.43.orig/exp_main_tk.c	2003-07-31 20:27:20.000000000 +0200
-+++ expect-5.43/exp_main_tk.c	2010-03-20 06:11:38.913371288 +0100
-@@ -33,6 +33,8 @@
- #endif /* not lint */
- 
- #include <ctype.h>
-+/* For strrchr, strcpy */
-+#include <string.h>
- 
- #include "tk.h"
- 
 diff -Nru expect-5.43.orig/exp_pty.c expect-5.43/exp_pty.c
 --- expect-5.43.orig/exp_pty.c	2002-04-08 01:09:00.000000000 +0200
 +++ expect-5.43/exp_pty.c	2010-03-20 06:07:09.035909728 +0100

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 Apr 10 11:17:36 2013
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Wed, 10 Apr 2013 09:17:36 +0000
Subject: [csw-devel] SF.net SVN: gar:[20658]
	csw/mgar/pkg/lang-python/M2Crypto/trunk/Makefile
Message-ID: <E1UPr9s-0008Gl-On@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 20658
          http://gar.svn.sourceforge.net/gar/?rev=20658&view=rev
Author:   dmichelsen
Date:     2013-04-10 09:17:36 +0000 (Wed, 10 Apr 2013)
Log Message:
-----------
lang-python/M2Crypto/trunk: Add build dep

Modified Paths:
--------------
    csw/mgar/pkg/lang-python/M2Crypto/trunk/Makefile

Modified: csw/mgar/pkg/lang-python/M2Crypto/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-python/M2Crypto/trunk/Makefile	2013-04-10 07:57:56 UTC (rev 20657)
+++ csw/mgar/pkg/lang-python/M2Crypto/trunk/Makefile	2013-04-10 09:17:36 UTC (rev 20658)
@@ -16,6 +16,7 @@
 
 VENDOR_URL = http://chandlerproject.org/Projects/MeTooCrypto
 
+BUILD_DEP_PKGS += CSWlibssl-dev
 BUILD_DEP_PKGS += CSWswig
 
 PACKAGES = CSWpy-m2crypto

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 Apr 10 13:53:03 2013
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Wed, 10 Apr 2013 11:53:03 +0000
Subject: [csw-devel] SF.net SVN: gar:[20659] csw/mgar/pkg/nginx/trunk
Message-ID: <E1UPtaJ-0000KS-PY@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 20659
          http://gar.svn.sourceforge.net/gar/?rev=20659&view=rev
Author:   dmichelsen
Date:     2013-04-10 11:53:03 +0000 (Wed, 10 Apr 2013)
Log Message:
-----------
nginx/trunk: Update to 1.3.15

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

Modified: csw/mgar/pkg/nginx/trunk/Makefile
===================================================================
--- csw/mgar/pkg/nginx/trunk/Makefile	2013-04-10 09:17:36 UTC (rev 20658)
+++ csw/mgar/pkg/nginx/trunk/Makefile	2013-04-10 11:53:03 UTC (rev 20659)
@@ -1,9 +1,7 @@
-NAME       = nginx
-VERSION    = 1.2.5
+NAME = nginx
+VERSION = 1.3.15
 GARTYPE = v2
 
-GARCOMPILER = SOS11
-
 DESCRIPTION = HTTP server and mail proxy server
 define BLURB
   Nginx (pronounced "engine x") is a free, open-source, high-performance
@@ -11,15 +9,22 @@
 endef
 
 MASTER_SITES = http://nginx.org/download/
-DISTFILES    = $(NAME)-$(VERSION).tar.gz
+DISTFILES    = $(DISTNAME).tar.gz
 DISTFILES   += cswnginx
 
-LICENSE      = LICENSE
+LICENSE = LICENSE
 
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = -(\d+(?:\.\d+)*).tar.gz
 
+BUILD_DEP_PKGS += CSWlibxslt-dev
+BUILD_DEP_PKGS += CSWgeoip-dev
+BUILD_DEP_PKGS += CSWlibssl-dev
+BUILD_DEP_PKGS += CSWlibpcre-dev
+BUILD_DEP_PKGS += CSWlibgd-dev
+BUILD_DEP_PKGS += CSWlibxml2-dev
 BUILD_DEP_PKGS += CSWlibz-dev
+BUILD_DEP_PKGS += CSWperl
 
 PACKAGES += CSWnginx
 SPKG_DESC_CSWnginx = HTTP server and mail proxy server
@@ -31,7 +36,6 @@
 RUNTIME_DEP_PKGS_CSWnginx += CSWlibgd2
 RUNTIME_DEP_PKGS_CSWnginx += CSWlibxml2-2
 RUNTIME_DEP_PKGS_CSWnginx += CSWlibz1
-RUNTIME_DEP_PKGS_CSWnginx += CSWperl
 
 # default sparc arch is set to sparcv8plus because nginx contains
 # assembler parts specific to v8plus and v9 arches:
@@ -49,6 +53,7 @@
 #EXTRA_BUILD_ISAS_i386  = pentium_pro amd64
 #EXTRA_BUILD_ISAS_sparc = sparcv9
 
+BUILD64 = 1
 ISAEXEC = 1
 
 NGINXCPU_i386          = pentium

Modified: csw/mgar/pkg/nginx/trunk/checksums
===================================================================
--- csw/mgar/pkg/nginx/trunk/checksums	2013-04-10 09:17:36 UTC (rev 20658)
+++ csw/mgar/pkg/nginx/trunk/checksums	2013-04-10 11:53:03 UTC (rev 20659)
@@ -1 +1 @@
-4f5a55187a3d45fa37d99d07ddd90800  nginx-1.2.5.tar.gz
+ded252047393c79a31b0862e9166a065  nginx-1.3.15.tar.gz

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


From dmichelsen at users.sourceforge.net  Wed Apr 10 14:08:21 2013
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Wed, 10 Apr 2013 12:08:21 +0000
Subject: [csw-devel] SF.net SVN: gar:[20660]
	csw/mgar/pkg/cpan/Net-SSLeay/trunk
Message-ID: <E1UPtp7-0000jq-PG@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 20660
          http://gar.svn.sourceforge.net/gar/?rev=20660&view=rev
Author:   dmichelsen
Date:     2013-04-10 12:08:21 +0000 (Wed, 10 Apr 2013)
Log Message:
-----------
cpan/Net-SSLeay/trunk: Update to 1.54

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

Modified: csw/mgar/pkg/cpan/Net-SSLeay/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Net-SSLeay/trunk/Makefile	2013-04-10 11:53:03 UTC (rev 20659)
+++ csw/mgar/pkg/cpan/Net-SSLeay/trunk/Makefile	2013-04-10 12:08:21 UTC (rev 20660)
@@ -1,5 +1,5 @@
 NAME = Net-SSLeay
-VERSION = 1.48
+VERSION = 1.54
 CATEGORIES = cpan
 GARTYPE = v2
 AUTHOR = MIKEM
@@ -10,7 +10,7 @@
 
 CATALOG_RELEASE = unstable
 
-LICENSE_TEXT = This module is licensed under the unknown license
+LICENSE_TEXT = This module is licensed under the SSLeay license
 
 PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
 

Modified: csw/mgar/pkg/cpan/Net-SSLeay/trunk/checksums
===================================================================
--- csw/mgar/pkg/cpan/Net-SSLeay/trunk/checksums	2013-04-10 11:53:03 UTC (rev 20659)
+++ csw/mgar/pkg/cpan/Net-SSLeay/trunk/checksums	2013-04-10 12:08:21 UTC (rev 20660)
@@ -1 +1 @@
-4e10d9da28f26732e37807820bf72af5  Net-SSLeay-1.48.tar.gz
+26e758fff1c90cb00e9358fea7e1e22f  Net-SSLeay-1.54.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 Apr 10 14:14:20 2013
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Wed, 10 Apr 2013 12:14:20 +0000
Subject: [csw-devel] SF.net SVN: gar:[20661] csw/mgar/pkg/libarchive/trunk
Message-ID: <E1UPtuu-0000t2-KV@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 20661
          http://gar.svn.sourceforge.net/gar/?rev=20661&view=rev
Author:   dmichelsen
Date:     2013-04-10 12:14:20 +0000 (Wed, 10 Apr 2013)
Log Message:
-----------
libarchive/trunk: Update to 3.1.2, some tests still fail

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

Added Paths:
-----------
    csw/mgar/pkg/libarchive/trunk/files/0001-Consider-name-to-be-NULL-in-ACL-test.patch

Modified: csw/mgar/pkg/libarchive/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libarchive/trunk/Makefile	2013-04-10 12:08:21 UTC (rev 20660)
+++ csw/mgar/pkg/libarchive/trunk/Makefile	2013-04-10 12:14:20 UTC (rev 20661)
@@ -1,17 +1,22 @@
 # : Makefile 9089 2010-03-11 08:34:46Z wahwah $
 NAME = libarchive
-VERSION = 2.8.4
+VERSION = 3.1.2
 GARTYPE = v2
 
 DESCRIPTION = C library for reading and writing various archive formats
-define BLURB
-endef
 
-MASTER_SITES = $(GOOGLE_MIRROR)
-DISTFILES  = $(NAME)-$(VERSION).tar.gz
+MASTER_SITES = http://www.libarchive.org/downloads/
+DISTFILES += $(DISTNAME).tar.gz
+PATCHFILES += 0001-Consider-name-to-be-NULL-in-ACL-test.patch
 
-VENDOR_URL = http://code.google.com/p/libarchive/
+VENDOR_URL = http://www.libarchive.org
 
+BUILD_DEP_PKGS += CSWliblzma-dev
+BUILD_DEP_PKGS += CSWlibz-dev
+BUILD_DEP_PKGS += CSWlibbz2-dev
+BUILD_DEP_PKGS += CSWlibxml2-dev
+BUILD_DEP_PKGS += CSWlibssl-dev
+
 PACKAGES += CSWlibarchive2
 SPKG_DESC_CSWlibarchive2 = C library for reading and writing various archive formats, libarchive.so.2
 PKGFILES_CSWlibarchive2 = $(call pkgfiles_lib,libarchive.so.2)
@@ -38,19 +43,18 @@
 RUNTIME_DEP_PKGS_CSWlibarchive-utils += CSWlibbz2-1-0
 RUNTIME_DEP_PKGS_CSWlibarchive-utils += CSWosslrt
 
-BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS_CSWlibarchive2)
-BUILD_DEP_PKGS += CSWliblzma-dev
-BUILD_DEP_PKGS += CSWlibz-dev
-BUILD_DEP_PKGS += CSWlibbz2-dev
-BUILD_DEP_PKGS += CSWlibxml2devel
-BUILD_DEP_PKGS += CSWossldevel 
-
 EXTRA_INC = $(includedir)/cryptopp
 
 BUILD64_LIBS_ONLY = 1
 
+BUILD_OVERRIDE_VARS += COMMON_CFLAGS
+BUILD_OVERRIDE_VAR_COMMON_CFLAGS =
+
+TEST_OVERRIDE_VARS += COMMON_CFLAGS
+TEST_OVERRIDE_VAR_COMMON_CFLAGS =
+
 # There is currently one test failing. Skip until this is fixed:
 #   http://code.google.com/p/libarchive/issues/detail?id=171
-SKIPTEST ?= 1
+# SKIPTEST ?= 1
 
 include gar/category.mk

Modified: csw/mgar/pkg/libarchive/trunk/checksums
===================================================================
--- csw/mgar/pkg/libarchive/trunk/checksums	2013-04-10 12:08:21 UTC (rev 20660)
+++ csw/mgar/pkg/libarchive/trunk/checksums	2013-04-10 12:14:20 UTC (rev 20661)
@@ -1 +1 @@
-83b237a542f27969a8d68ac217dc3796  libarchive-2.8.4.tar.gz
+efad5a503f66329bb9d2f4308b5de98a  libarchive-3.1.2.tar.gz

Added: csw/mgar/pkg/libarchive/trunk/files/0001-Consider-name-to-be-NULL-in-ACL-test.patch
===================================================================
--- csw/mgar/pkg/libarchive/trunk/files/0001-Consider-name-to-be-NULL-in-ACL-test.patch	                        (rev 0)
+++ csw/mgar/pkg/libarchive/trunk/files/0001-Consider-name-to-be-NULL-in-ACL-test.patch	2013-04-10 12:14:20 UTC (rev 20661)
@@ -0,0 +1,33 @@
+From 33be69e8909e541a7852fa41784d012f63fa0090 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Wed, 10 Apr 2013 13:56:06 +0200
+Subject: [PATCH] Consider name to be NULL in ACL test
+
+---
+ libarchive/test/test_acl_nfs4.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/libarchive/test/test_acl_nfs4.c b/libarchive/test/test_acl_nfs4.c
+index c8f5937..76ac023 100644
+--- a/libarchive/test/test_acl_nfs4.c
++++ b/libarchive/test/test_acl_nfs4.c
+@@ -233,14 +233,14 @@ compare_acls(struct archive_entry *ae, struct acl_t *acls, int n)
+ 		}
+ 		failure("Could not find match for ACL "
+ 		    "(type=%d,permset=%d,tag=%d,qual=%d,name=``%s'')",
+-		    type, permset, tag, qual, name);
++		    type, permset, tag, qual, name == NULL ? "<NULL>" : name);
+ 		assertEqualInt(1, matched);
+ 	}
+ 	assertEqualInt(ARCHIVE_EOF, r);
+ 	failure("Could not find match for ACL "
+ 	    "(type=%d,permset=%d,tag=%d,qual=%d,name=``%s'')",
+ 	    acls[marker[0]].type, acls[marker[0]].permset,
+-	    acls[marker[0]].tag, acls[marker[0]].qual, acls[marker[0]].name);
++	    acls[marker[0]].tag, acls[marker[0]].qual, acls[marker[0]].name == NULL ? "<NULL>" : acls[marker[0]].name);
+ 	assertEqualInt(0, n); /* Number of ACLs not matched should == 0 */
+ 	free(marker);
+ }
+-- 
+1.8.1.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 Apr 10 14:18:04 2013
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Wed, 10 Apr 2013 12:18:04 +0000
Subject: [csw-devel] SF.net SVN: gar:[20662]
	csw/mgar/pkg/nginx/trunk/Makefile
Message-ID: <E1UPtyV-00010A-OM@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 20662
          http://gar.svn.sourceforge.net/gar/?rev=20662&view=rev
Author:   dmichelsen
Date:     2013-04-10 12:18:03 +0000 (Wed, 10 Apr 2013)
Log Message:
-----------
nginx/trunk: Really, we don't to depend on Perl

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

Modified: csw/mgar/pkg/nginx/trunk/Makefile
===================================================================
--- csw/mgar/pkg/nginx/trunk/Makefile	2013-04-10 12:14:20 UTC (rev 20661)
+++ csw/mgar/pkg/nginx/trunk/Makefile	2013-04-10 12:18:03 UTC (rev 20662)
@@ -37,6 +37,9 @@
 RUNTIME_DEP_PKGS_CSWnginx += CSWlibxml2-2
 RUNTIME_DEP_PKGS_CSWnginx += CSWlibz1
 
+# There is just one script on contrib/, do not pull in Perl for that
+CHECKPKG_OVERRIDES_CSWnginx += missing-dependency|CSWperl
+
 # default sparc arch is set to sparcv8plus because nginx contains
 # assembler parts specific to v8plus and v9 arches:
 #	.inline ngx_casa,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 Apr 10 15:05:07 2013
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Wed, 10 Apr 2013 13:05:07 +0000
Subject: [csw-devel] SF.net SVN: gar:[20663] csw/mgar/pkg/rdesktop/trunk
Message-ID: <E1UPui3-00069D-3O@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 20663
          http://gar.svn.sourceforge.net/gar/?rev=20663&view=rev
Author:   dmichelsen
Date:     2013-04-10 13:05:06 +0000 (Wed, 10 Apr 2013)
Log Message:
-----------
rdesktop/trunk: Update to 1.7.1 and add 64 bit isaexec

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

Modified: csw/mgar/pkg/rdesktop/trunk/Makefile
===================================================================
--- csw/mgar/pkg/rdesktop/trunk/Makefile	2013-04-10 12:18:03 UTC (rev 20662)
+++ csw/mgar/pkg/rdesktop/trunk/Makefile	2013-04-10 13:05:06 UTC (rev 20663)
@@ -1,5 +1,5 @@
 NAME = rdesktop
-VERSION = 1.7.0
+VERSION = 1.7.1
 GARTYPE = v2
 
 DESCRIPTION = RDP client for Windows NT/2000/2003/XP Terminal Server
@@ -13,25 +13,25 @@
 MASTER_SITES = $(SF_MIRROR)
 DISTFILES  = $(NAME)-$(VERSION).tar.gz
 
-PACKAGES = CSWrdesktop
-CATALOGNAME_CSWrdesktop = rdesktop
+VENDOR_URL = http://www.rdesktop.org
 
-VENDOR_URL = http://www.rdesktop.org/
-
 BUILD_DEP_PKGS += CSWlibao-dev
 BUILD_DEP_PKGS += CSWlibsamplerate-dev
-BUILD_DEP_PKGS += CSWossldevel
+BUILD_DEP_PKGS += CSWlibssl-dev
 
-CONFIGURE_ARGS  = $(DIRPATHS)
-CONFIGURE_ARGS += --with-openssl=/opt/csw
-
-UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
-
-RUNTIME_DEP_PKGS_CSWrdesktop += CSWiconv
+PACKAGES += CSWrdesktop
+SPKG_DESC_CSWrdesktop = RDP client for Windows NT/2000/2003/XP Terminal Server
+RUNTIME_DEP_PKGS_CSWrdesktop += CSWlibiconv2
 RUNTIME_DEP_PKGS_CSWrdesktop += CSWlibao4
 RUNTIME_DEP_PKGS_CSWrdesktop += CSWlibsamplerate0
-RUNTIME_DEP_PKGS_CSWrdesktop += CSWosslrt
+RUNTIME_DEP_PKGS_CSWrdesktop += CSWlibssl1-0-0
 
+BUILD64 = 1
+ISAEXEC = 1
+
+CONFIGURE_ARGS  = $(DIRPATHS)
+CONFIGURE_ARGS += --with-openssl=$(prefix)
+
 # No test/check target provided by rdesktop
 TEST_SCRIPTS =
 

Modified: csw/mgar/pkg/rdesktop/trunk/checksums
===================================================================
--- csw/mgar/pkg/rdesktop/trunk/checksums	2013-04-10 12:18:03 UTC (rev 20662)
+++ csw/mgar/pkg/rdesktop/trunk/checksums	2013-04-10 13:05:06 UTC (rev 20663)
@@ -1 +1 @@
-77fa93b21aa38837a85e81c00e757228  rdesktop-1.7.0.tar.gz
+c4b39115951c4a6d74f511c99b18fcf9  rdesktop-1.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  Wed Apr 10 15:10:23 2013
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Wed, 10 Apr 2013 13:10:23 +0000
Subject: [csw-devel] SF.net SVN: gar:[20664] csw/mgar/pkg/libiconv/branches
Message-ID: <E1UPun9-0002De-8K@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 20664
          http://gar.svn.sourceforge.net/gar/?rev=20664&view=rev
Author:   dmichelsen
Date:     2013-04-10 13:10:22 +0000 (Wed, 10 Apr 2013)
Log Message:
-----------
libiconv/branches/bts: Make branch

Modified Paths:
--------------
    csw/mgar/pkg/libiconv/branches/bts/Makefile

Added Paths:
-----------
    csw/mgar/pkg/libiconv/branches/bts/

Modified: csw/mgar/pkg/libiconv/branches/bts/Makefile
===================================================================
--- csw/mgar/pkg/libiconv/trunk/Makefile	2013-03-31 21:01:25 UTC (rev 20553)
+++ csw/mgar/pkg/libiconv/branches/bts/Makefile	2013-04-10 13:10:22 UTC (rev 20664)
@@ -5,7 +5,7 @@
 #
 NAME = libiconv
 VERSION = 1.14
-GARTYPE = v2
+GARTYPE = bts
 
 DESCRIPTION = GNU iconv library
 define BLURB
@@ -21,44 +21,44 @@
 MASTER_SITES = $(GNU_MIRROR)
 DISTFILES = $(DISTNAME).tar.gz
 
-PACKAGES += CSWlibiconv2
-CATALOGNAME_CSWlibiconv2 = libiconv2
-SPKG_DESC_CSWlibiconv2 = GNU iconv library, libiconv.so.2
-PKGFILES_CSWlibiconv2 += $(call pkgfiles_lib,libiconv.so.2)
-OBSOLETED_BY_CSWlibiconv2 += CSWiconv
+PACKAGES += libiconv2
+CATALOGNAME_libiconv2 = libiconv2
+SPKG_DESC_libiconv2 = GNU iconv library, libiconv.so.2
+PKGFILES_libiconv2 += $(call pkgfiles_lib,libiconv.so.2)
+OBSOLETED_BY_libiconv2 += iconv
 
-PACKAGES += CSWlibcharset1
-CATALOGNAME_CSWlibcharset1 = libcharset1
-SPKG_DESC_CSWlibcharset1 = GNU iconv charset library, libcharset.so.1
-PKGFILES_CSWlibcharset1 += $(call pkgfiles_lib,libcharset.so.1)
+PACKAGES += libcharset1
+CATALOGNAME_libcharset1 = libcharset1
+SPKG_DESC_libcharset1 = GNU iconv charset library, libcharset.so.1
+PKGFILES_libcharset1 += $(call pkgfiles_lib,libcharset.so.1)
 # Now *this* time it is ok, iconv is the only package that is allowed to ship this!
-CHECKPKG_OVERRIDES_CSWlibcharset1 += disallowed-path|opt/csw/lib/charset.alias
-PKGFILES_CSWlibcharset1 += $(call baseisadirs,$(libdir),charset\.alias)
-OBSOLETED_BY_CSWlibcharset1 += CSWiconv
+CHECKPKG_OVERRIDES_ibcharset1 += disallowed-path|opt/csw/lib/charset.alias
+PKGFILES_libcharset1 += $(call baseisadirs,$(libdir),charset\.alias)
+OBSOLETED_BY_libcharset1 += iconv
 
-PACKAGES += CSWlibiconv-dev
-CATALOGNAME_CSWlibiconv-dev = libiconv_dev
-SPKG_DESC_CSWlibiconv-dev = Development files for libiconv.so.2
+PACKAGES += libiconv-dev
+CATALOGNAME_libiconv-dev = libiconv_dev
+SPKG_DESC_libiconv-dev = Development files for libiconv.so.2
 # PKGFILES is catchall
-RUNTIME_DEP_PKGS_CSWlibiconv-dev += CSWlibiconv2
-RUNTIME_DEP_PKGS_CSWlibiconv-dev += CSWlibcharset1
+RUNTIME_DEP_PKGS_libiconv-dev += libiconv2
+RUNTIME_DEP_PKGS_libiconv-dev += libcharset1
 # This is from an example in a comment
-CHECKPKG_OVERRIDES_CSWlibiconv-dev += file-with-bad-content|/usr/local|root/opt/csw/include/iconv.h
+CHECKPKG_OVERRIDES_libiconv-dev += file-with-bad-content|/usr/local|root/opt/csw/include/iconv.h
 
-PACKAGES += CSWlibiconv-utils
-CATALOGNAME_CSWlibiconv-utils = libiconv_utils
-SPKG_DESC_CSWlibiconv-utils = GNU iconv utility programs
-PKGFILES_CSWlibiconv-utils += $(bindir)/.*
-PKGFILES_CSWlibiconv-utils += .*iconv\.1.*
-PKGFILES_CSWlibiconv-utils += .*/libiconv\.mo
-PKGFILES_CSWlibiconv-utils += $(call baseisadirs,$(libdir),preloadable_libiconv\.so)
+PACKAGES += libiconv-utils
+CATALOGNAME_libiconv-utils = libiconv_utils
+SPKG_DESC_libiconv-utils = GNU iconv utility programs
+PKGFILES_libiconv-utils += $(bindir)/.*
+PKGFILES_libiconv-utils += .*iconv\.1.*
+PKGFILES_libiconv-utils += .*/libiconv\.mo
+PKGFILES_libiconv-utils += $(call baseisadirs,$(libdir),preloadable_libiconv\.so)
 # The SONAME of preloadable_libiconv.so is set to libiconv.so.0, although it doesn't
 # matter in any way as this library is only used for LD_PRELOAD and is never being
 # linked against during compile time.
-CHECKPKG_OVERRIDES_CSWlibiconv-utils += soname-not-part-of-filename|soname=libiconv.so.0|filename=preloadable_libiconv.so
-CHECKPKG_OVERRIDES_CSWlibiconv-utils += shared-lib-pkgname-mismatch
-RUNTIME_DEP_PKGS_CSWlibiconv-utils += CSWlibiconv2
-RUNTIME_DEP_PKGS_CSWlibiconv-utils += CSWlibintl8
+CHECKPKG_OVERRIDES_libiconv-utils += soname-not-part-of-filename|soname=libiconv.so.0|filename=preloadable_libiconv.so
+CHECKPKG_OVERRIDES_libiconv-utils += shared-lib-pkgname-mismatch
+RUNTIME_DEP_PKGS_libiconv-utils += libiconv2
+RUNTIME_DEP_PKGS_libiconv-utils += libintl8
 
 # Removing this dependency to break a dependency cycle.
 # See:

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 Apr 10 17:51:06 2013
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Wed, 10 Apr 2013 15:51:06 +0000
Subject: [csw-devel] SF.net SVN: gar:[20665]
	csw/mgar/pkg/freeipmi/trunk/Makefile
Message-ID: <E1UPxIg-00067P-L7@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 20665
          http://gar.svn.sourceforge.net/gar/?rev=20665&view=rev
Author:   dmichelsen
Date:     2013-04-10 15:51:05 +0000 (Wed, 10 Apr 2013)
Log Message:
-----------
freeipmi/trunk: Overrides and temporary fixes

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

Modified: csw/mgar/pkg/freeipmi/trunk/Makefile
===================================================================
--- csw/mgar/pkg/freeipmi/trunk/Makefile	2013-04-10 13:10:22 UTC (rev 20664)
+++ csw/mgar/pkg/freeipmi/trunk/Makefile	2013-04-10 15:51:05 UTC (rev 20665)
@@ -12,11 +12,33 @@
 # This should better be detected during autoconf time
 PATCHFILES += 0001-Add-missing-sighandler_t-on-Solaris.patch
 
-VEMNDOR_URL = http://www.gnu.org/software/freeipmi/index.html
+VENDOR_URL = http://www.gnu.org/software/freeipmi/index.html
 
+PACKAGES += CSWfreeipmi
+SPKG_DESC_CSWfreeipmi = IPMI software based on the IPMI v1.5/2.0 specification
+RUNTIME_DEP_PKGS_CSWfreeipmi += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWfreeipmi += CSWlibgcrypt11
+RUNTIME_DEP_PKGS_CSWfreeipmi += CSWperl
+
+# I don't care for now
+CHECKPKG_OVERRIDES_CSWfreeipmi += file-with-bad-content|/usr/local|root/opt/csw/share/doc/freeipmi/README.build
+CHECKPKG_OVERRIDES_CSWfreeipmi += file-with-bad-content|/usr/local|root/opt/csw/share/doc/freeipmi/INSTALL
+CHECKPKG_OVERRIDES_CSWfreeipmi += file-with-bad-content|/usr/local|root/opt/csw/share/doc/freeipmi/ChangeLog
+CHECKPKG_OVERRIDES_CSWfreeipmi += file-with-bad-content|/usr/share|root/opt/csw/share/doc/freeipmi/README.build
+CHECKPKG_OVERRIDES_CSWfreeipmi += file-with-bad-content|/usr/share|root/opt/csw/share/doc/freeipmi/contrib/pet/README
+CHECKPKG_OVERRIDES_CSWfreeipmi += shared-lib-pkgname-mismatch
+CHECKPKG_OVERRIDES_CSWfreeipmi += shared-lib-package-contains-so-symlink
+CHECKPKG_OVERRIDES_CSWfreeipmi += init-file-missing-cswinitsmf-class|/etc/opt/csw/init.d/bmc-watchdog|class=none
+CHECKPKG_OVERRIDES_CSWfreeipmi += init-file-missing-cswinitsmf-class|/etc/opt/csw/init.d/ipmidetectd|class=none
+CHECKPKG_OVERRIDES_CSWfreeipmi += init-file-missing-cswinitsmf-class|/etc/opt/csw/init.d/ipmiseld|class=none
+
 GARCOMPILER = GCC4
 
 CONFIGURE_ARGS = $(DIRPATHS)
 
+# Otherwise it falls back to gcc which interprets the manpage as C code
+EXTRA_CONFIGURE_EXPORTS += CPP
+CONFIGURE_ENV_CPP = $(bindir)/cpp
+
 include gar/category.mk
 

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


From dmichelsen at users.sourceforge.net  Wed Apr 10 17:52:30 2013
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Wed, 10 Apr 2013 15:52:30 +0000
Subject: [csw-devel] SF.net SVN: gar:[20666] csw/mgar/pkg/gd/trunk/Makefile
Message-ID: <E1UPxK2-0006BF-74@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 20666
          http://gar.svn.sourceforge.net/gar/?rev=20666&view=rev
Author:   dmichelsen
Date:     2013-04-10 15:52:29 +0000 (Wed, 10 Apr 2013)
Log Message:
-----------
gd/trunk: Update dependencies

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

Modified: csw/mgar/pkg/gd/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gd/trunk/Makefile	2013-04-10 15:51:05 UTC (rev 20665)
+++ csw/mgar/pkg/gd/trunk/Makefile	2013-04-10 15:52:29 UTC (rev 20666)
@@ -19,38 +19,28 @@
 
 PATCHFILES += gdkanji.c.patch
 
-#GARCOMPILER = GCC4
-
 PACKAGES = CSWgd
 CATALOGNAME_CSWgd = gd
 SPKG_DESC_CSWgd = Utilities facilitating libgd for dynamic image creation
 # PKGFILES is catchall
-RUNTIME_DEP_pkgs_CSWgd = CSWlibgd2
-RUNTIME_DEP_PKGS_CSWgd += CSWiconv
-RUNTIME_DEP_PKGS_CSWgd += CSWpng
-RUNTIME_DEP_PKGS_CSWgd += CSWjpeg
-RUNTIME_DEP_PKGS_CSWgd += CSWzlib
-RUNTIME_DEP_PKGS_CSWgd += CSWftype2
 RUNTIME_DEP_PKGS_CSWgd += CSWlibgd2
-RUNTIME_DEP_PKGS_CSWgd += CSWxpm
-RUNTIME_DEP_PKGS_CSWgd += CSWfconfig
 
 PACKAGES += CSWlibgd2
 CATALOGNAME_CSWlibgd2 = libgd2
 SPKG_DESC_CSWlibgd2 = A library used for dynamic image creation providing libgd.so.2
-PKGFILES_CSWlibgd2 = $(call baseisadirs,$(libdir),libgd\.so\.2(\.\d+)*)
-RUNTIME_DEP_PKGS_CSWlibgd2 += CSWfconfig
-RUNTIME_DEP_PKGS_CSWlibgd2 += CSWftype2
-RUNTIME_DEP_PKGS_CSWlibgd2 += CSWiconv 
-RUNTIME_DEP_PKGS_CSWlibgd2 += CSWjpeg
-RUNTIME_DEP_PKGS_CSWlibgd2 += CSWpng
-RUNTIME_DEP_PKGS_CSWlibgd2 += CSWxpm
-RUNTIME_DEP_PKGS_CSWlibgd2 += CSWzlib
+PKGFILES_CSWlibgd2 += $(call pkgfiles_lib,libgd.so.2)
+RUNTIME_DEP_PKGS_CSWlibgd2 += CSWlibfontconfig1
+RUNTIME_DEP_PKGS_CSWlibgd2 += CSWlibfreetype6
+RUNTIME_DEP_PKGS_CSWlibgd2 += CSWlibiconv2
+RUNTIME_DEP_PKGS_CSWlibgd2 += CSWlibjpeg7
+RUNTIME_DEP_PKGS_CSWlibgd2 += CSWlibpng15-15
+RUNTIME_DEP_PKGS_CSWlibgd2 += CSWlibxpm4
+RUNTIME_DEP_PKGS_CSWlibgd2 += CSWlibz1
 
 PACKAGES += CSWlibgd-dev
 CATALOGNAME_CSWlibgd-dev = libgd_dev
-SPKG_DESC_CSWlibgd-dev = Development files for libgd.so
-PKGFILES_CSWlibgd-dev = $(PKGFILES_DEVEL)
+SPKG_DESC_CSWlibgd-dev = Development files for libgd.so.2
+PKGFILES_CSWlibgd-dev += $(PKGFILES_DEVEL)
 RUNTIME_DEP_PKGS_CSWlibgd-dev = CSWlibgd2
 
 UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz

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


From wilbury at users.sourceforge.net  Thu Apr 11 00:09:36 2013
From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net)
Date: Wed, 10 Apr 2013 22:09:36 +0000
Subject: [csw-devel] SF.net SVN: gar:[20667] csw/mgar/pkg/tomcat7/trunk
Message-ID: <E1UQ3Cy-0003S8-Sb@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 20667
          http://gar.svn.sourceforge.net/gar/?rev=20667&view=rev
Author:   wilbury
Date:     2013-04-10 22:09:36 +0000 (Wed, 10 Apr 2013)
Log Message:
-----------
tomcat7/trunk: Upgrade to newer version, take 1

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

Modified: csw/mgar/pkg/tomcat7/trunk/Makefile
===================================================================
--- csw/mgar/pkg/tomcat7/trunk/Makefile	2013-04-10 15:52:29 UTC (rev 20666)
+++ csw/mgar/pkg/tomcat7/trunk/Makefile	2013-04-10 22:09:36 UTC (rev 20667)
@@ -1,6 +1,5 @@
 NAME      = tomcat7
-VERSION   = 7.0.32
-CATEGORIES   = server
+VERSION   = 7.0.39
 GARTYPE = v2
 
 DESCRIPTION  =  Apache Jakarta Tomcat 7 Servlet/JSP Container

Modified: csw/mgar/pkg/tomcat7/trunk/checksums
===================================================================
--- csw/mgar/pkg/tomcat7/trunk/checksums	2013-04-10 15:52:29 UTC (rev 20666)
+++ csw/mgar/pkg/tomcat7/trunk/checksums	2013-04-10 22:09:36 UTC (rev 20667)
@@ -1 +1 @@
-5c2576600ceb3c93a712820c7c16fa70  apache-tomcat-7.0.32.tar.gz
+1c195fc456d771ff1637f4758273c584  apache-tomcat-7.0.39.tar.gz

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


From wilbury at users.sourceforge.net  Thu Apr 11 00:11:51 2013
From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net)
Date: Wed, 10 Apr 2013 22:11:51 +0000
Subject: [csw-devel] SF.net SVN: gar:[20668]
	csw/mgar/pkg/tomcat7/trunk/Makefile
Message-ID: <E1UQ3F9-0007jL-Eq@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 20668
          http://gar.svn.sourceforge.net/gar/?rev=20668&view=rev
Author:   wilbury
Date:     2013-04-10 22:11:51 +0000 (Wed, 10 Apr 2013)
Log Message:
-----------
tomcat7/trunk: Newer version has different directory

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

Modified: csw/mgar/pkg/tomcat7/trunk/Makefile
===================================================================
--- csw/mgar/pkg/tomcat7/trunk/Makefile	2013-04-10 22:09:36 UTC (rev 20667)
+++ csw/mgar/pkg/tomcat7/trunk/Makefile	2013-04-10 22:11:51 UTC (rev 20668)
@@ -64,7 +64,7 @@
 	@$(MAKECOOKIE)
 
 post-extract:
-	( mv $(WORKDIR)/apache-tomcat-$(VERSION) $(WORKDIR)/$(DISTNAME) )
+	( mv $(WORKDIR)/tomcat-$(VERSION) $(WORKDIR)/$(DISTNAME) )
 	( for i in temp work logs conf ; do  find $(WORKDIR)/$(DISTNAME)/$$i -type d -exec chmod 0750 {} \;  ; find $(WORKDIR)/$(DISTNAME)/$$i -type f -exec chmod 0640 {} \; ; done )
 	@$(MAKECOOKIE)
 
@@ -75,7 +75,7 @@
 	( mkdir -p $(DESTDIR)/opt/csw/etc/$(NAME) )
 	( mkdir -p $(DESTDIR)/var/opt/csw/$(NAME) )
 	( mkdir -p $(DESTDIR)/opt/csw/share )
-	( cp -fr $(WORKDIR)/apache-tomcat-$(VERSION) $(DESTDIR)/opt/csw/share/$(NAME) )
+	( cp -fr $(WORKDIR)/tomcat-$(VERSION) $(DESTDIR)/opt/csw/share/$(NAME) )
 	( cp -fr $(FILEDIR)/csw$(NAME) $(DESTDIR)/etc/opt/csw/init.d )
 	( mv     $(DESTDIR)/opt/csw/share/$(NAME)/conf $(DESTDIR)/etc/opt/csw/$(NAME)/conf )
 	( mv     $(DESTDIR)/opt/csw/share/$(NAME)/logs $(DESTDIR)/var/opt/csw/$(NAME) )

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


From wilbury at users.sourceforge.net  Thu Apr 11 00:18:11 2013
From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net)
Date: Wed, 10 Apr 2013 22:18:11 +0000
Subject: [csw-devel] SF.net SVN: gar:[20669]
	csw/mgar/pkg/tomcat7/trunk/Makefile
Message-ID: <E1UQ3LH-0003gh-Jq@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 20669
          http://gar.svn.sourceforge.net/gar/?rev=20669&view=rev
Author:   wilbury
Date:     2013-04-10 22:18:11 +0000 (Wed, 10 Apr 2013)
Log Message:
-----------
tomcat7/trunk: Correct the previous commit.

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

Modified: csw/mgar/pkg/tomcat7/trunk/Makefile
===================================================================
--- csw/mgar/pkg/tomcat7/trunk/Makefile	2013-04-10 22:11:51 UTC (rev 20668)
+++ csw/mgar/pkg/tomcat7/trunk/Makefile	2013-04-10 22:18:11 UTC (rev 20669)
@@ -64,7 +64,7 @@
 	@$(MAKECOOKIE)
 
 post-extract:
-	( mv $(WORKDIR)/tomcat-$(VERSION) $(WORKDIR)/$(DISTNAME) )
+	( mv $(WORKDIR)/apache-tomcat-$(VERSION) $(WORKDIR)/$(DISTNAME) )
 	( for i in temp work logs conf ; do  find $(WORKDIR)/$(DISTNAME)/$$i -type d -exec chmod 0750 {} \;  ; find $(WORKDIR)/$(DISTNAME)/$$i -type f -exec chmod 0640 {} \; ; done )
 	@$(MAKECOOKIE)
 
@@ -75,7 +75,7 @@
 	( mkdir -p $(DESTDIR)/opt/csw/etc/$(NAME) )
 	( mkdir -p $(DESTDIR)/var/opt/csw/$(NAME) )
 	( mkdir -p $(DESTDIR)/opt/csw/share )
-	( cp -fr $(WORKDIR)/tomcat-$(VERSION) $(DESTDIR)/opt/csw/share/$(NAME) )
+	( cp -fr $(WORKDIR)/$(DISTNAME) $(DESTDIR)/opt/csw/share/$(NAME) )
 	( cp -fr $(FILEDIR)/csw$(NAME) $(DESTDIR)/etc/opt/csw/init.d )
 	( mv     $(DESTDIR)/opt/csw/share/$(NAME)/conf $(DESTDIR)/etc/opt/csw/$(NAME)/conf )
 	( mv     $(DESTDIR)/opt/csw/share/$(NAME)/logs $(DESTDIR)/var/opt/csw/$(NAME) )

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


From wilbury at users.sourceforge.net  Thu Apr 11 00:20:24 2013
From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net)
Date: Wed, 10 Apr 2013 22:20:24 +0000
Subject: [csw-devel] SF.net SVN: gar:[20670]
	csw/mgar/pkg/tomcat7/trunk/Makefile
Message-ID: <E1UQ3NQ-0003jm-HN@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 20670
          http://gar.svn.sourceforge.net/gar/?rev=20670&view=rev
Author:   wilbury
Date:     2013-04-10 22:20:24 +0000 (Wed, 10 Apr 2013)
Log Message:
-----------
tomcat7/trunk: Do not create .git

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

Modified: csw/mgar/pkg/tomcat7/trunk/Makefile
===================================================================
--- csw/mgar/pkg/tomcat7/trunk/Makefile	2013-04-10 22:18:11 UTC (rev 20669)
+++ csw/mgar/pkg/tomcat7/trunk/Makefile	2013-04-10 22:20:24 UTC (rev 20670)
@@ -15,6 +15,7 @@
 DISTFILES    += cswusergroup
 DISTFILES    += cswtomcat7
 DISTFILES    += LICENSE
+NOGITPATCH    = 1
 
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = v(\d+(?:\.\d+)*)

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 Apr 11 09:38:56 2013
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu, 11 Apr 2013 07:38:56 +0000
Subject: [csw-devel] SF.net SVN: gar:[20671]
	csw/mgar/pkg/cpan/ExtUtils-F77/trunk
Message-ID: <E1UQC5w-0005tB-SQ@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 20671
          http://gar.svn.sourceforge.net/gar/?rev=20671&view=rev
Author:   dmichelsen
Date:     2013-04-11 07:38:56 +0000 (Thu, 11 Apr 2013)
Log Message:
-----------
cpan/ExtUtils-F77/trunk: Update to 1.17 and sanitize package name

Modified Paths:
--------------
    csw/mgar/pkg/cpan/ExtUtils-F77/trunk/Makefile
    csw/mgar/pkg/cpan/ExtUtils-F77/trunk/checksums

Modified: csw/mgar/pkg/cpan/ExtUtils-F77/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/ExtUtils-F77/trunk/Makefile	2013-04-10 22:20:24 UTC (rev 20670)
+++ csw/mgar/pkg/cpan/ExtUtils-F77/trunk/Makefile	2013-04-11 07:38:56 UTC (rev 20671)
@@ -1,23 +1,24 @@
 NAME = ExtUtils-F77
-VERSION = 1.16
+VERSION = 1.17
 CATEGORIES = cpan
 GARTYPE = v2
 AUTHOR = KGB
 
-DESCRIPTION = Simple interface to F77 libs
+DESCRIPTION = Facilitate use of FORTRAN from Perl/XS code
 define BLURB
-  This module tries to figure out how to link C programs with Fortran
-  subroutines on your system. Basically one must add a list of Fortran runtime
-  libraries. The problem is their location and name varies with each
-  OS/compiler combination!
 endef
 
-PACKAGES = CSWpmextutilsf77
-CATALOGNAME = pm_extutilsf77
+CATALOG_RELEASE = unstable
 
-ARCHALL = 1
+LICENSE = COPYING
 
-# Exclude crap the author has accidently left there from his Mac OS system
-EXTRA_MERGE_EXCLUDE_FILES = .*/\..*
+REINPLACE_USRLOCAL += F77.pm
 
+PACKAGES += CSWpm-extutils-f77
+CATALOGNAME_CSWpm-extutils-f77 = pm_extutils_f77
+SPKG_DESC_CSWpm-extutils-f77 = Facilitate use of FORTRAN from Perl/XS code
+ARCHALL_CSWpm-extutils-f77 = 1
+OBSOLETED_BY_CSWpm-extutils-f77 += CSWpmextutilsf77
+CATALOGNAME_CSWpmextutilsf77 = pm_extutilsf77_stub
+
 include gar/category.mk

Modified: csw/mgar/pkg/cpan/ExtUtils-F77/trunk/checksums
===================================================================
--- csw/mgar/pkg/cpan/ExtUtils-F77/trunk/checksums	2013-04-10 22:20:24 UTC (rev 20670)
+++ csw/mgar/pkg/cpan/ExtUtils-F77/trunk/checksums	2013-04-11 07:38:56 UTC (rev 20671)
@@ -1 +1 @@
-af925e7e8a2876a5fd9b6c4660e37664  ExtUtils-F77-1.16.tar.gz
+c0143b5342587ed2ee5db3f6cfb9cc13  ExtUtils-F77-1.17.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 Apr 11 09:57:33 2013
From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net)
Date: Thu, 11 Apr 2013 07:57:33 +0000
Subject: [csw-devel] SF.net SVN: gar:[20672]
	csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile
Message-ID: <E1UQCNx-0006J8-GS@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 20672
          http://gar.svn.sourceforge.net/gar/?rev=20672&view=rev
Author:   janholzh
Date:     2013-04-11 07:57:33 +0000 (Thu, 11 Apr 2013)
Log Message:
-----------
mysql5/branches/mysql-5.5.x: change compiler on 5.10 build

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	2013-04-11 07:38:56 UTC (rev 20671)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile	2013-04-11 07:57:33 UTC (rev 20672)
@@ -23,6 +23,11 @@
 PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386
 PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386
 
+#Use newest Sun Stuido on Solaris10 to solve problems on Solaris10 x86 64bit build:
+ifneq ($(shell /usr/bin/uname -r),5.9)
+       GARCOMPILER = SOS12U3
+endif
+
 # There is some assembler code, which doesn't work on sparcv8, and I don't see
 # an easy way to switch it off.
 ISA_DEFAULT_sparc-5.9 = sparcv8plus

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 Apr 11 13:41:27 2013
From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net)
Date: Thu, 11 Apr 2013 11:41:27 +0000
Subject: [csw-devel] SF.net SVN: gar:[20673]
	csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile
Message-ID: <E1UQFsd-0002Sc-PT@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 20673
          http://gar.svn.sourceforge.net/gar/?rev=20673&view=rev
Author:   janholzh
Date:     2013-04-11 11:41:27 +0000 (Thu, 11 Apr 2013)
Log Message:
-----------
mysql5/branches/mysql-5.5.x: use -xO2 on Solaris 9 i386 since there is no Sun Studio 12u3

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	2013-04-11 07:57:33 UTC (rev 20672)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile	2013-04-11 11:41:27 UTC (rev 20673)
@@ -28,6 +28,9 @@
        GARCOMPILER = SOS12U3
 endif
 
+#Since Solaris9 does not have sos12u3 use lower opt 
+OPT_FLAGS_SOS12_i386 = -xO2
+
 # There is some assembler code, which doesn't work on sparcv8, and I don't see
 # an easy way to switch it off.
 ISA_DEFAULT_sparc-5.9 = sparcv8plus

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 Apr 11 14:34:27 2013
From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net)
Date: Thu, 11 Apr 2013 12:34:27 +0000
Subject: [csw-devel] SF.net SVN: gar:[20674]
	csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile
Message-ID: <E1UQGhv-0004O1-GE@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 20674
          http://gar.svn.sourceforge.net/gar/?rev=20674&view=rev
Author:   janholzh
Date:     2013-04-11 12:34:27 +0000 (Thu, 11 Apr 2013)
Log Message:
-----------
mysql5/branches/mysql-5.5.x: Solaris 9 does have libssl.1 now too

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	2013-04-11 11:41:27 UTC (rev 20673)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile	2013-04-11 12:34:27 UTC (rev 20674)
@@ -89,7 +89,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)_5.9 += CSWlibssl0-9-8
+RUNTIME_DEP_PKGS_CSWlibmysqlclient$(MYSQL_LIB_VER)_5.9 += CSWlibssl1-0-0
 RUNTIME_DEP_PKGS_CSWlibmysqlclient$(MYSQL_LIB_VER)_5.10 += CSWlibssl1-0-0
 RUNTIME_DEP_PKGS_CSWlibmysqlclient$(MYSQL_LIB_VER) += $(RUNTIME_DEP_PKGS_CSWlibmysqlclient$(MYSQL_LIB_VER)_$(GAROSREL))
 
@@ -128,7 +128,7 @@
 # RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibmysqlclient-r$(MYSQL_LIB_VER)
 # RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibncursesw5
 RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibz1
-RUNTIME_DEP_PKGS_CSW$(NAME)client_5.9 += CSWlibssl0-9-8
+RUNTIME_DEP_PKGS_CSW$(NAME)client_5.9 += CSWlibssl1-0-0
 RUNTIME_DEP_PKGS_CSW$(NAME)client_5.10 += CSWlibssl1-0-0
 RUNTIME_DEP_PKGS_CSW$(NAME)client += $(RUNTIME_DEP_PKGS_CSW$(NAME)client_$(GAROSREL))
 CHECKPKG_OVERRIDES_CSW$(NAME)client += bad-rpath-entry
@@ -147,7 +147,7 @@
 RUNTIME_DEP_PKGS_CSW$(NAME) += CSW$(NAME)client
 # RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibwrap1
 RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibz1
-RUNTIME_DEP_PKGS_CSW$(NAME)_5.9 += CSWlibssl0-9-8
+RUNTIME_DEP_PKGS_CSW$(NAME)_5.9 += CSWlibssl1-0-0
 RUNTIME_DEP_PKGS_CSW$(NAME)_5.10 += CSWlibssl1-0-0
 RUNTIME_DEP_PKGS_CSW$(NAME) += $(RUNTIME_DEP_PKGS_CSW$(NAME)_$(GAROSREL))
 CHECKPKG_OVERRIDES_CSW$(NAME) += bad-rpath-entry

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 Apr 11 15:04:25 2013
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu, 11 Apr 2013 13:04:25 +0000
Subject: [csw-devel] SF.net SVN: gar:[20675] csw/mgar/pkg/mosh/trunk
Message-ID: <E1UQHAv-0001hx-Qk@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 20675
          http://gar.svn.sourceforge.net/gar/?rev=20675&view=rev
Author:   dmichelsen
Date:     2013-04-11 13:04:25 +0000 (Thu, 11 Apr 2013)
Log Message:
-----------
mosh/trunk: Update to 1.2.4

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

Modified: csw/mgar/pkg/mosh/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mosh/trunk/Makefile	2013-04-11 12:34:27 UTC (rev 20674)
+++ csw/mgar/pkg/mosh/trunk/Makefile	2013-04-11 13:04:25 UTC (rev 20675)
@@ -2,22 +2,24 @@
 # TODO (release-critical prefixed with !, non release-critical with *)
 #
 NAME = mosh
-VERSION = 1.2.3
+VERSION = 1.2.4
 GARTYPE = v2
 
 DESCRIPTION = Mobile shell
 
-MASTER_SITES = https://github.com/downloads/keithw/mosh/
-DISTFILES  = $(DISTNAME).tar.gz
+MASTER_SITES += http://mosh.mit.edu/
+DISTFILES += $(DISTNAME).tar.gz
 
-PATCHFILES += 0001-Add-missing-include.patch
+#PATCHFILES += 0001-Add-missing-include.patch
 
+VENDOR_URL = http://mosh.mit.edu
+
 BUILD_DEP_PKGS += CSWboost-gcc-dev
 BUILD_DEP_PKGS += CSWprotobuf-gxx-dev
 
 PACKAGES += CSWmosh
 SPKG_DESC_CSWmypkg = Mobile shell
-RUNTIME_DEP_PKGS_CSWmosh += CSWlibncurses5
+RUNTIME_DEP_PKGS_CSWmosh += CSWlibncursesw5
 RUNTIME_DEP_PKGS_CSWmosh += CSWlibstdc++6
 RUNTIME_DEP_PKGS_CSWmosh += CSWlibprotobuf7-gxx
 RUNTIME_DEP_PKGS_CSWmosh += CSWlibgcc-s1

Modified: csw/mgar/pkg/mosh/trunk/checksums
===================================================================
--- csw/mgar/pkg/mosh/trunk/checksums	2013-04-11 12:34:27 UTC (rev 20674)
+++ csw/mgar/pkg/mosh/trunk/checksums	2013-04-11 13:04:25 UTC (rev 20675)
@@ -1 +1 @@
-39c20391c84e639fcb51581c56cee762  mosh-1.2.3.tar.gz
+c2d918f4d91fdc32546e2e089f9281b2  mosh-1.2.4.tar.gz

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


From wilbury at users.sourceforge.net  Thu Apr 11 15:18:40 2013
From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net)
Date: Thu, 11 Apr 2013 13:18:40 +0000
Subject: [csw-devel] SF.net SVN: gar:[20676]
	csw/mgar/pkg/tomcat7/trunk/files/cswtomcat7
Message-ID: <E1UQHOi-00024Q-RY@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 20676
          http://gar.svn.sourceforge.net/gar/?rev=20676&view=rev
Author:   wilbury
Date:     2013-04-11 13:18:40 +0000 (Thu, 11 Apr 2013)
Log Message:
-----------
tomcat7/trunk: Do not source directory. Source proper csw file instead.

Modified Paths:
--------------
    csw/mgar/pkg/tomcat7/trunk/files/cswtomcat7

Modified: csw/mgar/pkg/tomcat7/trunk/files/cswtomcat7
===================================================================
--- csw/mgar/pkg/tomcat7/trunk/files/cswtomcat7	2013-04-11 13:04:25 UTC (rev 20675)
+++ csw/mgar/pkg/tomcat7/trunk/files/cswtomcat7	2013-04-11 13:18:40 UTC (rev 20676)
@@ -73,8 +73,8 @@
 # Use the configuration file to supered their value
 #
 
-SPECIFIC_CONFIG_FILE=/etc/opt/csw/tomcat7
-GLOBAL_CONFIG_FILE=/opt/csw/etc/tomcat7/conf/tomcat7
+SPECIFIC_CONFIG_FILE=/etc/opt/csw/cswtomcat7
+GLOBAL_CONFIG_FILE=/opt/csw/etc/cswtomcat7
 
 JAVA_HOME=/usr/java
 TOMCAT_USER=tomcat

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 Apr 11 16:04:26 2013
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu, 11 Apr 2013 14:04:26 +0000
Subject: [csw-devel] SF.net SVN: gar:[20677] csw/mgar/pkg/rsync/trunk
Message-ID: <E1UQI70-0005Tc-15@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 20677
          http://gar.svn.sourceforge.net/gar/?rev=20677&view=rev
Author:   dmichelsen
Date:     2013-04-11 14:04:24 +0000 (Thu, 11 Apr 2013)
Log Message:
-----------
rsync/trunk: Add rsyncd.conf example

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

Added Paths:
-----------
    csw/mgar/pkg/rsync/trunk/files/rsyncd.conf.CSW

Modified: csw/mgar/pkg/rsync/trunk/Makefile
===================================================================
--- csw/mgar/pkg/rsync/trunk/Makefile	2013-04-11 13:18:40 UTC (rev 20676)
+++ csw/mgar/pkg/rsync/trunk/Makefile	2013-04-11 14:04:24 UTC (rev 20677)
@@ -15,8 +15,9 @@
 endef
 
 MASTER_SITES = http://samba.anu.edu.au/ftp/rsync/
-DISTFILES = $(DISTNAME).tar.gz
+DISTFILES += $(DISTNAME).tar.gz
 DISTFILES += cswrsyncd
+DISTFILES += rsyncd.conf.CSW
 
 VENDOR_URL = http://rsync.samba.org/
 
@@ -30,7 +31,7 @@
 
 PACKAGES += CSWrsyncd
 SPKG_DESC_CSWrsyncd = Daemon for rsyncd server
-PKGFILES_CSWrsyncd += $(sysconfdir)/rsyncd.conf
+PKGFILES_CSWrsyncd += $(sysconfdir)/rsyncd.conf.CSW
 PKGFILES_CSWrsyncd += $(mandir)/man5/rsyncd.conf.5
 PKGFILES_CSWrsyncd += $(INITSMF)
 
@@ -42,6 +43,8 @@
 MIGRATE_FILES_CSWrsyncd = rsyncd.conf
 MIGRATE_SOURCE_DIR = /etc
 
+PRESERVECONF += $(sysconfdir)/rsyncd.conf
+
 CONFIGURE_ARGS += $(DIRPATHS)
 CONFIGURE_ARGS += --with-rsyncd-conf=$(sysconfdir)/rsyncd.conf
 
@@ -57,6 +60,8 @@
 
 include gar/category.mk
 
-post-install-modulated:
+post-install:
 	ginstall -d $(DESTDIR)/etc/opt/csw/init.d
 	ginstall -m 0755 $(WORKDIR)/cswrsyncd $(DESTDIR)/etc/opt/csw/init.d/cswrsyncd
+	ginstall -d $(DESTDIR)$(sysconfdir)
+	ginstall -m 0644 $(WORKDIR)/rsyncd.conf.CSW $(DESTDIR)$(sysconfdir)

Added: csw/mgar/pkg/rsync/trunk/files/rsyncd.conf.CSW
===================================================================
--- csw/mgar/pkg/rsync/trunk/files/rsyncd.conf.CSW	                        (rev 0)
+++ csw/mgar/pkg/rsync/trunk/files/rsyncd.conf.CSW	2013-04-11 14:04:24 UTC (rev 20677)
@@ -0,0 +1,17 @@
+#log file = /var/opt/csw/log/rsyncd.log
+
+#[repo1]
+#        path = /path/to/repo1
+#        read only = true
+#        use chroot = yes
+#        exclude = README
+#        comment = This is Repo 1
+
+#[repo2]
+#        path = /path/to/repo2
+#        read only = true
+#        use chroot = yes
+#        exclude = TODO
+#        comment = This is Repo 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 Apr 11 16:47:08 2013
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu, 11 Apr 2013 14:47:08 +0000
Subject: [csw-devel] SF.net SVN: gar:[20678]
	csw/mgar/pkg/rsync/trunk/Makefile
Message-ID: <E1UQImK-0004Ji-Au@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 20678
          http://gar.svn.sourceforge.net/gar/?rev=20678&view=rev
Author:   dmichelsen
Date:     2013-04-11 14:47:07 +0000 (Thu, 11 Apr 2013)
Log Message:
-----------
rsync/trunk: Disable tests for now

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

Modified: csw/mgar/pkg/rsync/trunk/Makefile
===================================================================
--- csw/mgar/pkg/rsync/trunk/Makefile	2013-04-11 14:04:24 UTC (rev 20677)
+++ csw/mgar/pkg/rsync/trunk/Makefile	2013-04-11 14:47:07 UTC (rev 20678)
@@ -58,6 +58,9 @@
 REINPLACE_FILES_conf += $(mandir)/man5/rsyncd.conf.5
 REINPLACE_WHEN_conf = postinstall
 
+# There is one ACL-test on NFSv4 failling
+SKIPTEST ?= 1
+
 include gar/category.mk
 
 post-install:

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


From dmichelsen at users.sourceforge.net  Thu Apr 11 22:28:06 2013
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu, 11 Apr 2013 20:28:06 +0000
Subject: [csw-devel] SF.net SVN: gar:[20679] csw/mgar/pkg/nasm/trunk
Message-ID: <E1UQO6I-00073C-0F@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 20679
          http://gar.svn.sourceforge.net/gar/?rev=20679&view=rev
Author:   dmichelsen
Date:     2013-04-11 20:28:05 +0000 (Thu, 11 Apr 2013)
Log Message:
-----------
nasm/trunk: Update to 2.10.07

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

Modified: csw/mgar/pkg/nasm/trunk/Makefile
===================================================================
--- csw/mgar/pkg/nasm/trunk/Makefile	2013-04-11 14:47:07 UTC (rev 20678)
+++ csw/mgar/pkg/nasm/trunk/Makefile	2013-04-11 20:28:05 UTC (rev 20679)
@@ -1,6 +1,6 @@
 # : Makefile 9089 2010-03-11 08:34:46Z wahwah $
 NAME = nasm
-VERSION = 2.10.06
+VERSION = 2.10.07
 GARTYPE = v2
 
 DESCRIPTION = The Netwide Assembler

Modified: csw/mgar/pkg/nasm/trunk/checksums
===================================================================
--- csw/mgar/pkg/nasm/trunk/checksums	2013-04-11 14:47:07 UTC (rev 20678)
+++ csw/mgar/pkg/nasm/trunk/checksums	2013-04-11 20:28:05 UTC (rev 20679)
@@ -1 +1 @@
-a5553fb4644dba74d02beaed6fd9e20e  nasm-2.10.06.tar.xz
+b13c433bbf3cfe055c5b830066aed4ba  nasm-2.10.07.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  Thu Apr 11 23:22:57 2013
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Thu, 11 Apr 2013 21:22:57 +0000
Subject: [csw-devel] SF.net SVN: gar:[20680] csw/mgar/pkg
Message-ID: <E1UQOxN-00079H-SO@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 20680
          http://gar.svn.sourceforge.net/gar/?rev=20680&view=rev
Author:   bdwalton
Date:     2013-04-11 21:22:55 +0000 (Thu, 11 Apr 2013)
Log Message:
-----------
ruby20/trunk: add a ruby 2.0 package tree

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

Copied: csw/mgar/pkg/ruby20/Makefile (from rev 19488, csw/mgar/pkg/template/Makefile)
===================================================================
--- csw/mgar/pkg/ruby20/Makefile	                        (rev 0)
+++ csw/mgar/pkg/ruby20/Makefile	2013-04-11 21:22:55 UTC (rev 20680)
@@ -0,0 +1,15 @@
+# vim: ft=make ts=4 sw=4 noet
+
+default:
+	@echo "You are in the pkg/ directory."
+
+%:
+	$(MAKE) -C trunk $* 
+
+paranoid-%:
+	$(MAKE) -C trunk $* || exit 2 
+
+export BUILDLOG ?= $(shell pwd)/buildlog.txt
+
+report-%:
+	$(MAKE) -C trunk $* || echo "	*** make $* in $$i failed ***" >> $(BUILDLOG) 


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



Added: csw/mgar/pkg/ruby20/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ruby20/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/ruby20/trunk/Makefile	2013-04-11 21:22:55 UTC (rev 20680)
@@ -0,0 +1,28 @@
+# $Id$
+# TODO (release-critical prefixed with !, non release-critical with *)
+#
+NAME = ruby20
+SHORTVER = 2.0
+DISTVERSION = $(SHORTVER).0
+VERSION = $(DISTVERSION)
+PATCHLEVEL = p0
+GARTYPE = v2
+
+DESCRIPTION = An object-oriented language for quick and easy programming.
+define BLURB
+  Ruby is a language for quick and easy programming. Similar in scope to Perl
+  and Python, it has high-level data types, automatic memory management,
+  dynamic typing, a module system, exceptions, and a rich standard library.
+  What sets Ruby apart is a clean and consistent language design where
+  everything is an object. Other distinguishing features are CLU-style
+  iterators for loop abstraction, singleton classes/methods and lexical
+  closures.
+endef
+
+MASTER_SITES = ftp://ftp.ruby-lang.org/pub/ruby/$(SHORTVER)/
+DISTFILES  = ruby-$(DISTVERSION)-$(PATCHLEVEL).tar.gz
+
+CONFIGURE_ARGS = $(DIRPATHS)
+
+include gar/category.mk
+


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

Added: csw/mgar/pkg/ruby20/trunk/checksums
===================================================================
--- csw/mgar/pkg/ruby20/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/ruby20/trunk/checksums	2013-04-11 21:22:55 UTC (rev 20680)
@@ -0,0 +1 @@
+50d307c4dc9297ae59952527be4e755d  ruby-2.0.0-p0.tar.gz

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


From bdwalton at users.sourceforge.net  Thu Apr 11 23:29:37 2013
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Thu, 11 Apr 2013 21:29:37 +0000
Subject: [csw-devel] SF.net SVN: gar:[20681]
	csw/mgar/pkg/ruby20/trunk/Makefile
Message-ID: <E1UQP3p-0007Hz-MU@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 20681
          http://gar.svn.sourceforge.net/gar/?rev=20681&view=rev
Author:   bdwalton
Date:     2013-04-11 21:29:37 +0000 (Thu, 11 Apr 2013)
Log Message:
-----------
ruby20/trunk: set custom DISTNAME

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

Modified: csw/mgar/pkg/ruby20/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ruby20/trunk/Makefile	2013-04-11 21:22:55 UTC (rev 20680)
+++ csw/mgar/pkg/ruby20/trunk/Makefile	2013-04-11 21:29:37 UTC (rev 20681)
@@ -4,6 +4,7 @@
 NAME = ruby20
 SHORTVER = 2.0
 DISTVERSION = $(SHORTVER).0
+DISTNAME = ruby-$(VERSION)-$(PATCHLEVEL)
 VERSION = $(DISTVERSION)
 PATCHLEVEL = p0
 GARTYPE = 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 Apr 12 09:29:17 2013
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Fri, 12 Apr 2013 07:29:17 +0000
Subject: [csw-devel] SF.net SVN: gar:[20682] csw/mgar/pkg/libicu48/trunk
Message-ID: <E1UQYQ9-0000Sp-3m@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 20682
          http://gar.svn.sourceforge.net/gar/?rev=20682&view=rev
Author:   dmichelsen
Date:     2013-04-12 07:29:15 +0000 (Fri, 12 Apr 2013)
Log Message:
-----------
libicu48/trunk: Update to 4.8.1.1

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

Modified: csw/mgar/pkg/libicu48/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libicu48/trunk/Makefile	2013-04-11 21:29:37 UTC (rev 20681)
+++ csw/mgar/pkg/libicu48/trunk/Makefile	2013-04-12 07:29:15 UTC (rev 20682)
@@ -1,6 +1,6 @@
 # $Id$
 NAME = libicu
-VERSION = 4.8.1
+VERSION = 4.8.1.1
 GARTYPE = v2
 
 DESCRIPTION = International Components for Unicode
@@ -23,12 +23,10 @@
 SPKG_DESC_CSWlibicui18n48 = International Components for Unicode, libicui18n.so.48
 PKGFILES_CSWlibicui18n48 += $(call pkgfiles_lib,libicui18n.so.48)
 RUNTIME_DEP_PKGS_CSWlibicui18n48 += CSWlibicuuc48
-RUNTIME_DEP_PKGS_CSWlibicui18n48 += CSWlibicudata48
 
 PACKAGES += CSWlibicuio48
 SPKG_DESC_CSWlibicuio48 = International Components for Unicode, libicuio.so.48
 PKGFILES_CSWlibicuio48 += $(call pkgfiles_lib,libicuio.so.48)
-RUNTIME_DEP_PKGS_CSWlibicuio48 += CSWlibicudata48
 RUNTIME_DEP_PKGS_CSWlibicuio48 += CSWlibicui18n48
 RUNTIME_DEP_PKGS_CSWlibicuio48 += CSWlibicuuc48
 
@@ -36,20 +34,16 @@
 SPKG_DESC_CSWlibicule48 = International Components for Unicode, libicule.so.48
 PKGFILES_CSWlibicule48 += $(call pkgfiles_lib,libicule.so.48)
 RUNTIME_DEP_PKGS_CSWlibicule48 += CSWlibicuuc48
-RUNTIME_DEP_PKGS_CSWlibicule48 += CSWlibicudata48
 
 PACKAGES += CSWlibiculx48
 SPKG_DESC_CSWlibiculx48 = International Components for Unicode, libiculx.so.48
 PKGFILES_CSWlibiculx48 += $(call pkgfiles_lib,libiculx.so.48)
 RUNTIME_DEP_PKGS_CSWlibiculx48 += CSWlibicuuc48
-RUNTIME_DEP_PKGS_CSWlibiculx48 += CSWlibicudata48
 RUNTIME_DEP_PKGS_CSWlibiculx48 += CSWlibicule48
 
 PACKAGES += CSWlibicutest48
 SPKG_DESC_CSWlibicutest48 = International Components for Unicode, libicutest.so.48
 PKGFILES_CSWlibicutest48 += $(call pkgfiles_lib,libicutest.so.48)
-RUNTIME_DEP_PKGS_CSWlibicutest48 += CSWlibicudata48
-RUNTIME_DEP_PKGS_CSWlibicutest48 += CSWlibicui18n48
 RUNTIME_DEP_PKGS_CSWlibicutest48 += CSWlibicutu48
 RUNTIME_DEP_PKGS_CSWlibicutest48 += CSWlibicuuc48
 
@@ -57,7 +51,6 @@
 SPKG_DESC_CSWlibicutu48 = International Components for Unicode, libicutu.so.48
 PKGFILES_CSWlibicutu48 += $(call pkgfiles_lib,libicutu.so.48)
 RUNTIME_DEP_PKGS_CSWlibicutu48 += CSWlibicuuc48
-RUNTIME_DEP_PKGS_CSWlibicutu48 += CSWlibicudata48
 RUNTIME_DEP_PKGS_CSWlibicutu48 += CSWlibicui18n48
 
 PACKAGES += CSWlibicuuc48

Modified: csw/mgar/pkg/libicu48/trunk/checksums
===================================================================
--- csw/mgar/pkg/libicu48/trunk/checksums	2013-04-11 21:29:37 UTC (rev 20681)
+++ csw/mgar/pkg/libicu48/trunk/checksums	2013-04-12 07:29:15 UTC (rev 20682)
@@ -1 +1 @@
-af36f635271a239d76d038d6cf8da8df  icu4c-4_8_1-src.tgz
+ea93970a0275be6b42f56953cd332c17  icu4c-4_8_1_1-src.tgz

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


From dmichelsen at users.sourceforge.net  Fri Apr 12 09:30:26 2013
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Fri, 12 Apr 2013 07:30:26 +0000
Subject: [csw-devel] SF.net SVN: gar:[20683] csw/mgar/pkg/libicu50/trunk
Message-ID: <E1UQYRG-0000W3-Q6@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 20683
          http://gar.svn.sourceforge.net/gar/?rev=20683&view=rev
Author:   dmichelsen
Date:     2013-04-12 07:30:23 +0000 (Fri, 12 Apr 2013)
Log Message:
-----------
libicu50/trunk: Update to 50.1.2

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

Modified: csw/mgar/pkg/libicu50/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libicu50/trunk/Makefile	2013-04-12 07:29:15 UTC (rev 20682)
+++ csw/mgar/pkg/libicu50/trunk/Makefile	2013-04-12 07:30:23 UTC (rev 20683)
@@ -1,6 +1,6 @@
 # $Id$
 NAME = libicu
-VERSION = 50.1.1
+VERSION = 50.1.2
 GARTYPE = v2
 
 DESCRIPTION = International Components for Unicode

Modified: csw/mgar/pkg/libicu50/trunk/checksums
===================================================================
--- csw/mgar/pkg/libicu50/trunk/checksums	2013-04-12 07:29:15 UTC (rev 20682)
+++ csw/mgar/pkg/libicu50/trunk/checksums	2013-04-12 07:30:23 UTC (rev 20683)
@@ -1 +1 @@
-c721c2e0c8f86975ccea620d09aedc81  icu4c-50_1_1-src.tgz
+beb98aa972219c9fcd9c8a71314943c9  icu4c-50_1_2-src.tgz

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


From dmichelsen at users.sourceforge.net  Fri Apr 12 10:33:33 2013
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Fri, 12 Apr 2013 08:33:33 +0000
Subject: [csw-devel] SF.net SVN: gar:[20684]
	csw/mgar/pkg/automake/trunk/Makefile
Message-ID: <E1UQZQL-0005Q1-Qq@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 20684
          http://gar.svn.sourceforge.net/gar/?rev=20684&view=rev
Author:   dmichelsen
Date:     2013-04-12 08:33:32 +0000 (Fri, 12 Apr 2013)
Log Message:
-----------
automake/trunk: Add necessary  skiptests

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

Modified: csw/mgar/pkg/automake/trunk/Makefile
===================================================================
--- csw/mgar/pkg/automake/trunk/Makefile	2013-04-12 07:30:23 UTC (rev 20683)
+++ csw/mgar/pkg/automake/trunk/Makefile	2013-04-12 08:33:32 UTC (rev 20684)
@@ -90,8 +90,10 @@
 SKIPTEST-1.11.6 ?= 1
 
 # There are 172 of 2968 tests failed in 1.12
-# SKIPTEST-1.12 ?= 1
+SKIPTEST-1.12.6 ?= 1
 
+SKIPTEST-1.13.1 ?= 1
+
 SKIPTEST = $(SKIPTEST-$(VERSION))
 
 ARCHALL = 1

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


From dmichelsen at users.sourceforge.net  Fri Apr 12 10:34:00 2013
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Fri, 12 Apr 2013 08:34:00 +0000
Subject: [csw-devel] SF.net SVN: gar:[20685] csw/mgar/pkg
Message-ID: <E1UQZQm-0005QW-2D@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 20685
          http://gar.svn.sourceforge.net/gar/?rev=20685&view=rev
Author:   dmichelsen
Date:     2013-04-12 08:33:59 +0000 (Fri, 12 Apr 2013)
Log Message:
-----------
libicu51: Initial commit

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

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

Modified: csw/mgar/pkg/libicu51/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libicu50/trunk/Makefile	2013-03-31 21:01:25 UTC (rev 20553)
+++ csw/mgar/pkg/libicu51/trunk/Makefile	2013-04-12 08:33:59 UTC (rev 20685)
@@ -1,6 +1,6 @@
 # $Id$
 NAME = libicu
-VERSION = 50.1.1
+VERSION = 51.1
 GARTYPE = v2
 
 DESCRIPTION = International Components for Unicode
@@ -15,60 +15,65 @@
 
 LICENSE = license.html
 
-PACKAGES += CSWlibicudata50
-SPKG_DESC_CSWlibicudata50 = International Components for Unicode, libicudata.so.50
-PKGFILES_CSWlibicudata50 += $(call pkgfiles_lib,libicudata.so.50)
+PACKAGES += CSWlibicudata51
+SPKG_DESC_CSWlibicudata51 = International Components for Unicode, libicudata.so.51
+PKGFILES_CSWlibicudata51 += $(call pkgfiles_lib,libicudata.so.51)
 
-PACKAGES += CSWlibicui18n50
-SPKG_DESC_CSWlibicui18n50 = International Components for Unicode, libicui18n.so.50
-PKGFILES_CSWlibicui18n50 += $(call pkgfiles_lib,libicui18n.so.50)
-RUNTIME_DEP_PKGS_CSWlibicui18n50 += CSWlibicuuc50
+PACKAGES += CSWlibicui18n51
+SPKG_DESC_CSWlibicui18n51 = International Components for Unicode, libicui18n.so.51
+PKGFILES_CSWlibicui18n51 += $(call pkgfiles_lib,libicui18n.so.51)
+RUNTIME_DEP_PKGS_CSWlibicui18n51 += CSWlibicuuc51
 
-PACKAGES += CSWlibicuio50
-SPKG_DESC_CSWlibicuio50 = International Components for Unicode, libicuio.so.50
-PKGFILES_CSWlibicuio50 += $(call pkgfiles_lib,libicuio.so.50)
-RUNTIME_DEP_PKGS_CSWlibicuio50 += CSWlibicui18n50
-RUNTIME_DEP_PKGS_CSWlibicuio50 += CSWlibicuuc50
+PACKAGES += CSWlibicuio51
+SPKG_DESC_CSWlibicuio51 = International Components for Unicode, libicuio.so.51
+PKGFILES_CSWlibicuio51 += $(call pkgfiles_lib,libicuio.so.51)
+RUNTIME_DEP_PKGS_CSWlibicuio51 += CSWlibicui18n51
+RUNTIME_DEP_PKGS_CSWlibicuio51 += CSWlibicuuc51
 
-PACKAGES += CSWlibicule50
-SPKG_DESC_CSWlibicule50 = International Components for Unicode, libicule.so.50
-PKGFILES_CSWlibicule50 += $(call pkgfiles_lib,libicule.so.50)
-RUNTIME_DEP_PKGS_CSWlibicule50 += CSWlibicuuc50
+PACKAGES += CSWlibicule51
+SPKG_DESC_CSWlibicule51 = International Components for Unicode, libicule.so.51
+PKGFILES_CSWlibicule51 += $(call pkgfiles_lib,libicule.so.51)
+RUNTIME_DEP_PKGS_CSWlibicule51 += CSWlibicuuc51
 
-PACKAGES += CSWlibiculx50
-SPKG_DESC_CSWlibiculx50 = International Components for Unicode, libiculx.so.50
-PKGFILES_CSWlibiculx50 += $(call pkgfiles_lib,libiculx.so.50)
-RUNTIME_DEP_PKGS_CSWlibiculx50 += CSWlibicuuc50
-RUNTIME_DEP_PKGS_CSWlibiculx50 += CSWlibicule50
+PACKAGES += CSWlibiculx51
+SPKG_DESC_CSWlibiculx51 = International Components for Unicode, libiculx.so.51
+PKGFILES_CSWlibiculx51 += $(call pkgfiles_lib,libiculx.so.51)
+RUNTIME_DEP_PKGS_CSWlibiculx51 += CSWlibicuuc51
+RUNTIME_DEP_PKGS_CSWlibiculx51 += CSWlibicule51
 
-PACKAGES += CSWlibicutest50
-SPKG_DESC_CSWlibicutest50 = International Components for Unicode, libicutest.so.50
-PKGFILES_CSWlibicutest50 += $(call pkgfiles_lib,libicutest.so.50)
-RUNTIME_DEP_PKGS_CSWlibicutest50 += CSWlibicutu50
-RUNTIME_DEP_PKGS_CSWlibicutest50 += CSWlibicuuc50
+PACKAGES += CSWlibicutest51
+SPKG_DESC_CSWlibicutest51 = International Components for Unicode, libicutest.so.51
+PKGFILES_CSWlibicutest51 += $(call pkgfiles_lib,libicutest.so.51)
+RUNTIME_DEP_PKGS_CSWlibicutest51 += CSWlibicutu51
+RUNTIME_DEP_PKGS_CSWlibicutest51 += CSWlibicuuc51
 
-PACKAGES += CSWlibicutu50
-SPKG_DESC_CSWlibicutu50 = International Components for Unicode, libicutu.so.50
-PKGFILES_CSWlibicutu50 += $(call pkgfiles_lib,libicutu.so.50)
-RUNTIME_DEP_PKGS_CSWlibicutu50 += CSWlibicuuc50
-RUNTIME_DEP_PKGS_CSWlibicutu50 += CSWlibicui18n50
+PACKAGES += CSWlibicutu51
+SPKG_DESC_CSWlibicutu51 = International Components for Unicode, libicutu.so.51
+PKGFILES_CSWlibicutu51 += $(call pkgfiles_lib,libicutu.so.51)
+RUNTIME_DEP_PKGS_CSWlibicutu51 += CSWlibicuuc51
+RUNTIME_DEP_PKGS_CSWlibicutu51 += CSWlibicui18n51
 
-PACKAGES += CSWlibicuuc50
-SPKG_DESC_CSWlibicuuc50 = International Components for Unicode, libicuuc.so.50
-PKGFILES_CSWlibicuuc50 += $(call pkgfiles_lib,libicuuc.so.50)
-RUNTIME_DEP_PKGS_CSWlibicuuc50 += CSWlibicudata50
+PACKAGES += CSWlibicuuc51
+SPKG_DESC_CSWlibicuuc51 = International Components for Unicode, libicuuc.so.51
+PKGFILES_CSWlibicuuc51 += $(call pkgfiles_lib,libicuuc.so.51)
+RUNTIME_DEP_PKGS_CSWlibicuuc51 += CSWlibicudata51
 
+# This is the presence of /usr/share/lib/zoneinfo which is ok
+CHECKPKG_OVERRIDES_CSWlibicuuc51 += file-with-bad-content|/usr/share|root/opt/csw/lib/libicuuc.so.51.1
+CHECKPKG_OVERRIDES_CSWlibicuuc51 += file-with-bad-content|/usr/share|root/opt/csw/lib/sparcv9/libicuuc.so.51.1
+CHECKPKG_OVERRIDES_CSWlibicuuc51 += file-with-bad-content|/usr/share|root/opt/csw/lib/amd64/libicuuc.so.51.1
+
 PACKAGES += CSWlibicu-dev
-SPKG_DESC_CSWlibicu-dev = Development files for libicu.so.50
+SPKG_DESC_CSWlibicu-dev = Development files for libicu.so.51
 # This package is PKGFILES catchall
-RUNTIME_DEP_PKGS_CSWlibicu-dev += CSWlibicudata50
-RUNTIME_DEP_PKGS_CSWlibicu-dev += CSWlibicui18n50
-RUNTIME_DEP_PKGS_CSWlibicu-dev += CSWlibicuio50
-RUNTIME_DEP_PKGS_CSWlibicu-dev += CSWlibicule50
-RUNTIME_DEP_PKGS_CSWlibicu-dev += CSWlibiculx50
-RUNTIME_DEP_PKGS_CSWlibicu-dev += CSWlibicutest50
-RUNTIME_DEP_PKGS_CSWlibicu-dev += CSWlibicutu50
-RUNTIME_DEP_PKGS_CSWlibicu-dev += CSWlibicuuc50
+RUNTIME_DEP_PKGS_CSWlibicu-dev += CSWlibicudata51
+RUNTIME_DEP_PKGS_CSWlibicu-dev += CSWlibicui18n51
+RUNTIME_DEP_PKGS_CSWlibicu-dev += CSWlibicuio51
+RUNTIME_DEP_PKGS_CSWlibicu-dev += CSWlibicule51
+RUNTIME_DEP_PKGS_CSWlibicu-dev += CSWlibiculx51
+RUNTIME_DEP_PKGS_CSWlibicu-dev += CSWlibicutest51
+RUNTIME_DEP_PKGS_CSWlibicu-dev += CSWlibicutu51
+RUNTIME_DEP_PKGS_CSWlibicu-dev += CSWlibicuuc51
 
 DISTNAME = icu
 WORKSRC = $(WORKDIR)/$(DISTNAME)/source

Modified: csw/mgar/pkg/libicu51/trunk/checksums
===================================================================
--- csw/mgar/pkg/libicu50/trunk/checksums	2013-03-31 21:01:25 UTC (rev 20553)
+++ csw/mgar/pkg/libicu51/trunk/checksums	2013-04-12 08:33:59 UTC (rev 20685)
@@ -1 +1 @@
-c721c2e0c8f86975ccea620d09aedc81  icu4c-50_1_1-src.tgz
+6eef33b229d0239d654983028c9c7053  icu4c-51_1-src.tgz

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 Apr 12 15:51:07 2013
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Fri, 12 Apr 2013 13:51:07 +0000
Subject: [csw-devel] SF.net SVN: gar:[20686]
	csw/mgar/pkg/bind/branches/s11build/
Message-ID: <E1UQeNf-0006lI-JS@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 20686
          http://gar.svn.sourceforge.net/gar/?rev=20686&view=rev
Author:   cgrzemba
Date:     2013-04-12 13:51:06 +0000 (Fri, 12 Apr 2013)
Log Message:
-----------
branch build on S11

Added Paths:
-----------
    csw/mgar/pkg/bind/branches/s11build/

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


From pfelecan at users.sourceforge.net  Fri Apr 12 16:16:48 2013
From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net)
Date: Fri, 12 Apr 2013 14:16:48 +0000
Subject: [csw-devel] SF.net SVN: gar:[20687] csw/mgar/pkg
Message-ID: <E1UQemW-0007RJ-Do@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 20687
          http://gar.svn.sourceforge.net/gar/?rev=20687&view=rev
Author:   pfelecan
Date:     2013-04-12 14:16:47 +0000 (Fri, 12 Apr 2013)
Log Message:
-----------
leocad/trunk: initial build and packaging

Added Paths:
-----------
    csw/mgar/pkg/leocad/
    csw/mgar/pkg/leocad/Makefile
    csw/mgar/pkg/leocad/branches/
    csw/mgar/pkg/leocad/tags/
    csw/mgar/pkg/leocad/trunk/
    csw/mgar/pkg/leocad/trunk/Makefile
    csw/mgar/pkg/leocad/trunk/checksums
    csw/mgar/pkg/leocad/trunk/files/
    csw/mgar/pkg/leocad/trunk/files/0001-Use-POSIX-to-determine-the-file-type.patch

Added: csw/mgar/pkg/leocad/Makefile
===================================================================
--- csw/mgar/pkg/leocad/Makefile	                        (rev 0)
+++ csw/mgar/pkg/leocad/Makefile	2013-04-12 14:16:47 UTC (rev 20687)
@@ -0,0 +1,2 @@
+%:
+	$(MAKE) -C trunk $*


Property changes on: csw/mgar/pkg/leocad/trunk
___________________________________________________________________
Added: svn:ignore
   + work


Added: csw/mgar/pkg/leocad/trunk/Makefile
===================================================================
--- csw/mgar/pkg/leocad/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/leocad/trunk/Makefile	2013-04-12 14:16:47 UTC (rev 20687)
@@ -0,0 +1,41 @@
+# $Id$
+
+NAME			=	leocad
+VERSION			=	0.79.3
+PIECES_VERSION	=	7114
+GARTYPE			=	v2
+
+DESCRIPTION = Virtual Lego brick CAD software
+define BLURB
+  CAD program that allows people to build virtual models using bricks similar
+  to those found in LEGO toys
+endef
+
+MASTER_SITES	=	$(GOOGLE_MIRROR)
+DISTNAME		=	$(NAME)
+DISTFILES		=	$(NAME)-$(VERSION)-src.tgz
+DISTFILES		+=	pieces-$(PIECES_VERSION).zip
+# this raises "warning: 1 line adds whitespace errors"; choosed to ignore
+PATCHFILES		+=	0001-Use-POSIX-to-determine-the-file-type.patch
+
+GARCOMPILER			=	GNU
+
+CONFIGURE_ARGS		=	$(DIRPATHS)
+CONFIGURE_SCRIPTS	=	custom
+
+BUILD_DEP_PKGS		+=	CSWlibglib2-dev
+BUILD_DEP_PKGS		+=	CSWlibgtk2-dev
+BUILD_DEP_PKGS		+=	CSWlibz-dev
+BUILD_DEP_PKGS		+=	CSWlibjpeg-dev
+BUILD_DEP_PKGS		+=	CSWlibpng-dev
+BUILD_DEP_PKGS		+=	CSWmesa
+
+TEST_SCRIPTS		=
+
+include gar/category.mk
+
+PATH := /opt/csw/gnu:/opt/csw/libexec/flex-2.5.35/bin:$(PATH)
+
+configure-custom:
+	cd $(WORKSRC) && $(MAKE) config PREFIX=$(prefix)
+	$(MAKECOOKIE)


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

Added: csw/mgar/pkg/leocad/trunk/checksums
===================================================================
--- csw/mgar/pkg/leocad/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/leocad/trunk/checksums	2013-04-12 14:16:47 UTC (rev 20687)
@@ -0,0 +1,2 @@
+edea92ce268b761c9da46742e78c106d  leocad-0.79.3-src.tgz
+5be3590d960c546edf1d4dcb72dba7c1  pieces-7114.zip

Added: csw/mgar/pkg/leocad/trunk/files/0001-Use-POSIX-to-determine-the-file-type.patch
===================================================================
--- csw/mgar/pkg/leocad/trunk/files/0001-Use-POSIX-to-determine-the-file-type.patch	                        (rev 0)
+++ csw/mgar/pkg/leocad/trunk/files/0001-Use-POSIX-to-determine-the-file-type.patch	2013-04-12 14:16:47 UTC (rev 20687)
@@ -0,0 +1,58 @@
+From f64ec2a672aa68d43bd7e275cc42af4a9b86b0e0 Mon Sep 17 00:00:00 2001
+From: Peter Felecan <pfelecan at opencsw.org>
+Date: Wed, 3 Apr 2013 12:05:18 +0200
+Subject: [PATCH] Use POSIX to determine the file type
+
+---
+ linux/system.cpp | 18 +++++++++++++++---
+ 1 file changed, 15 insertions(+), 3 deletions(-)
+
+diff --git a/linux/system.cpp b/linux/system.cpp
+index bde6901..b3cf12a 100644
+--- a/linux/system.cpp
++++ b/linux/system.cpp
+@@ -7,7 +7,9 @@
+ #include <gtk/gtk.h>
+ #include <X11/keysym.h>
+ #include <sys/time.h>
++#include <fcntl.h>
+ #include <sys/types.h>
++#include <sys/stat.h>
+ #include <dirent.h>
+ #include "opengl.h"
+ #include "gtkmisc.h"
+@@ -124,7 +126,8 @@ void Sys_GetFileList(const char* Path, ObjArray<String>& FileList)
+ {
+ 	struct dirent* Entry;
+ 	char DirPath[LC_MAXPATH], FilePath[LC_MAXPATH];
+-
++	struct stat statBuff;
++	
+ 	strcpy(DirPath, Path);
+ 	int Length = strlen(DirPath);
+ 	if (DirPath[Length - 1] != '/')
+@@ -141,10 +144,19 @@ void Sys_GetFileList(const char* Path, ObjArray<String>& FileList)
+ 
+ 	while ((Entry = readdir(Dir)))
+ 	{
+-		if (Entry->d_type != DT_REG)
++		if(lstat(Entry->d_name, &statBuff) == -1)
++		{
+ 			continue;
++		}
++		else
++		{
++			if(!S_ISREG(statBuff.st_mode))
++			{
++				continue;
++			}
++		}
+ 
+-		sprintf(FilePath, "%s%s", DirPath, Entry->d_name);
++		snprintf(FilePath, LC_MAXPATH, "%s%s", DirPath, Entry->d_name);
+ 		FileList.Add(FilePath);
+ 	}
+ 
+-- 
+1.8.1.4
+

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


From rthurner at users.sourceforge.net  Sat Apr 13 17:04:17 2013
From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net)
Date: Sat, 13 Apr 2013 15:04:17 +0000
Subject: [csw-devel] SF.net SVN: gar:[20688] csw/mgar/pkg/mercurial/trunk
Message-ID: <E1UR201-0006vT-Oq@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 20688
          http://gar.svn.sourceforge.net/gar/?rev=20688&view=rev
Author:   rthurner
Date:     2013-04-13 15:04:15 +0000 (Sat, 13 Apr 2013)
Log Message:
-----------
mercurial, update to hg-2.5.4

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

Modified: csw/mgar/pkg/mercurial/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mercurial/trunk/Makefile	2013-04-12 14:16:47 UTC (rev 20687)
+++ csw/mgar/pkg/mercurial/trunk/Makefile	2013-04-13 15:04:15 UTC (rev 20688)
@@ -1,5 +1,5 @@
 NAME = mercurial
-VERSION = 2.5.3
+VERSION = 2.5.4
 CATEGORIES = python
 GARTYPE = v2
 

Modified: csw/mgar/pkg/mercurial/trunk/checksums
===================================================================
--- csw/mgar/pkg/mercurial/trunk/checksums	2013-04-12 14:16:47 UTC (rev 20687)
+++ csw/mgar/pkg/mercurial/trunk/checksums	2013-04-13 15:04:15 UTC (rev 20688)
@@ -1 +1 @@
-373ae7c970d8cf2df9d1160d7dde8127  mercurial-2.5.3.tar.gz
+f3c64086519c32ba7e892b6215b0fcbc  mercurial-2.5.4.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  Sun Apr 14 09:43:52 2013
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Sun, 14 Apr 2013 07:43:52 +0000
Subject: [csw-devel] SF.net SVN: gar:[20689] csw/mgar/pkg
Message-ID: <E1URHbM-0007z6-Mj@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 20689
          http://gar.svn.sourceforge.net/gar/?rev=20689&view=rev
Author:   wahwah
Date:     2013-04-14 07:43:47 +0000 (Sun, 14 Apr 2013)
Log Message:
-----------
ordereddict/trunk: Initial commit

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

Added: csw/mgar/pkg/ordereddict/Makefile
===================================================================
--- csw/mgar/pkg/ordereddict/Makefile	                        (rev 0)
+++ csw/mgar/pkg/ordereddict/Makefile	2013-04-14 07:43:47 UTC (rev 20689)
@@ -0,0 +1,2 @@
+%:
+	$(MAKE) -C trunk $*


Property changes on: csw/mgar/pkg/ordereddict/trunk
___________________________________________________________________
Added: svn:ignore
   + work


Added: csw/mgar/pkg/ordereddict/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ordereddict/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/ordereddict/trunk/Makefile	2013-04-14 07:43:47 UTC (rev 20689)
@@ -0,0 +1,18 @@
+# $Id$
+# TODO (release-critical prefixed with !, non release-critical with *)
+#
+NAME = ordereddict
+VERSION = 1.1
+GARTYPE = v2
+
+DESCRIPTION = A drop-in substitute for Py2.7 new collections
+define BLURB
+endef
+
+CATEGORIES = python
+TEST_SCRIPTS =
+DISTFILES  = $(DISTNAME).tar.gz
+ARCHALL_CSWpy-ordereddict = 1
+
+include gar/category.mk
+


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

Added: csw/mgar/pkg/ordereddict/trunk/checksums
===================================================================
--- csw/mgar/pkg/ordereddict/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/ordereddict/trunk/checksums	2013-04-14 07:43:47 UTC (rev 20689)
@@ -0,0 +1 @@
+a0ed854ee442051b249bfad0f638bbec  ordereddict-1.1.tar.gz

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


From wahwah at users.sourceforge.net  Sun Apr 14 09:49:20 2013
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Sun, 14 Apr 2013 07:49:20 +0000
Subject: [csw-devel] SF.net SVN: gar:[20690] csw/mgar/pkg
Message-ID: <E1URHge-00069b-RU@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 20690
          http://gar.svn.sourceforge.net/gar/?rev=20690&view=rev
Author:   wahwah
Date:     2013-04-14 07:49:20 +0000 (Sun, 14 Apr 2013)
Log Message:
-----------
beautifulsoup4/trunk: Initial commit

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

Added: csw/mgar/pkg/beautifulsoup4/Makefile
===================================================================
--- csw/mgar/pkg/beautifulsoup4/Makefile	                        (rev 0)
+++ csw/mgar/pkg/beautifulsoup4/Makefile	2013-04-14 07:49:20 UTC (rev 20690)
@@ -0,0 +1,2 @@
+%:
+	$(MAKE) -C trunk $*


Property changes on: csw/mgar/pkg/beautifulsoup4/trunk
___________________________________________________________________
Added: svn:ignore
   + work


Added: csw/mgar/pkg/beautifulsoup4/trunk/Makefile
===================================================================
--- csw/mgar/pkg/beautifulsoup4/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/beautifulsoup4/trunk/Makefile	2013-04-14 07:49:20 UTC (rev 20690)
@@ -0,0 +1,18 @@
+# $Id$
+# TODO (release-critical prefixed with !, non release-critical with *)
+#
+NAME = beautifulsoup4
+VERSION = 4.1.3
+GARTYPE = v2
+
+DESCRIPTION = Pythonic idioms for working with the HTML parse tree
+define BLURB
+endef
+
+CATEGORIES = python
+TEST_SCRIPTS =
+DISTFILES  = $(DISTNAME).tar.gz
+ARCHALL_CSWpy-beautifulsoup4 = 1
+
+include gar/category.mk
+


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

Added: csw/mgar/pkg/beautifulsoup4/trunk/checksums
===================================================================
--- csw/mgar/pkg/beautifulsoup4/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/beautifulsoup4/trunk/checksums	2013-04-14 07:49:20 UTC (rev 20690)
@@ -0,0 +1 @@
+c012adc06217b8532c446d181cc56586  beautifulsoup4-4.1.3.tar.gz

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


From wahwah at users.sourceforge.net  Sun Apr 14 09:52:34 2013
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Sun, 14 Apr 2013 07:52:34 +0000
Subject: [csw-devel] SF.net SVN: gar:[20691] csw/mgar/pkg
Message-ID: <E1URHjm-0006Fs-SW@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 20691
          http://gar.svn.sourceforge.net/gar/?rev=20691&view=rev
Author:   wahwah
Date:     2013-04-14 07:52:32 +0000 (Sun, 14 Apr 2013)
Log Message:
-----------
waitress/trunk: Initial commit

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

Added: csw/mgar/pkg/waitress/Makefile
===================================================================
--- csw/mgar/pkg/waitress/Makefile	                        (rev 0)
+++ csw/mgar/pkg/waitress/Makefile	2013-04-14 07:52:32 UTC (rev 20691)
@@ -0,0 +1,2 @@
+%:
+	$(MAKE) -C trunk $*


Property changes on: csw/mgar/pkg/waitress/trunk
___________________________________________________________________
Added: svn:ignore
   + work


Added: csw/mgar/pkg/waitress/trunk/Makefile
===================================================================
--- csw/mgar/pkg/waitress/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/waitress/trunk/Makefile	2013-04-14 07:52:32 UTC (rev 20691)
@@ -0,0 +1,18 @@
+# $Id$
+# TODO (release-critical prefixed with !, non release-critical with *)
+#
+NAME = waitress
+VERSION = 0.8.2
+GARTYPE = v2
+
+DESCRIPTION = Waitress WSGI server
+define BLURB
+endef
+
+CATEGORIES = python
+TEST_SCRIPTS =
+DISTFILES  = $(DISTNAME).tar.gz
+ARCHALL_CSWpy-$(NAME) = 1
+
+include gar/category.mk
+


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

Added: csw/mgar/pkg/waitress/trunk/checksums
===================================================================
--- csw/mgar/pkg/waitress/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/waitress/trunk/checksums	2013-04-14 07:52:32 UTC (rev 20691)
@@ -0,0 +1 @@
+2d924c85bc1005174da1d14294fcc663  waitress-0.8.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  Sun Apr 14 09:52:59 2013
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Sun, 14 Apr 2013 07:52:59 +0000
Subject: [csw-devel] SF.net SVN: gar:[20692]
	csw/mgar/pkg/ordereddict/trunk/Makefile
Message-ID: <E1URHkB-0006GK-Df@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 20692
          http://gar.svn.sourceforge.net/gar/?rev=20692&view=rev
Author:   wahwah
Date:     2013-04-14 07:52:59 +0000 (Sun, 14 Apr 2013)
Log Message:
-----------
ordereddict/trunk: Use $(NAME) to be more generic and copy-pastable

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

Modified: csw/mgar/pkg/ordereddict/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ordereddict/trunk/Makefile	2013-04-14 07:52:32 UTC (rev 20691)
+++ csw/mgar/pkg/ordereddict/trunk/Makefile	2013-04-14 07:52:59 UTC (rev 20692)
@@ -12,7 +12,7 @@
 CATEGORIES = python
 TEST_SCRIPTS =
 DISTFILES  = $(DISTNAME).tar.gz
-ARCHALL_CSWpy-ordereddict = 1
+ARCHALL_CSWpy-$(NAME) = 1
 
 include gar/category.mk
 

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


From wahwah at users.sourceforge.net  Sun Apr 14 09:58:34 2013
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Sun, 14 Apr 2013 07:58:34 +0000
Subject: [csw-devel] SF.net SVN: gar:[20693] csw/mgar/pkg/lang-python
Message-ID: <E1URHpa-0006O8-0Q@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 20693
          http://gar.svn.sourceforge.net/gar/?rev=20693&view=rev
Author:   wahwah
Date:     2013-04-14 07:58:33 +0000 (Sun, 14 Apr 2013)
Log Message:
-----------
lang-python/webob/trunk: Initial commit

Added Paths:
-----------
    csw/mgar/pkg/lang-python/webob/
    csw/mgar/pkg/lang-python/webob/Makefile
    csw/mgar/pkg/lang-python/webob/branches/
    csw/mgar/pkg/lang-python/webob/tags/
    csw/mgar/pkg/lang-python/webob/trunk/
    csw/mgar/pkg/lang-python/webob/trunk/Makefile
    csw/mgar/pkg/lang-python/webob/trunk/checksums
    csw/mgar/pkg/lang-python/webob/trunk/files/

Added: csw/mgar/pkg/lang-python/webob/Makefile
===================================================================
--- csw/mgar/pkg/lang-python/webob/Makefile	                        (rev 0)
+++ csw/mgar/pkg/lang-python/webob/Makefile	2013-04-14 07:58:33 UTC (rev 20693)
@@ -0,0 +1,2 @@
+%:
+	$(MAKE) -C trunk $*


Property changes on: csw/mgar/pkg/lang-python/webob/trunk
___________________________________________________________________
Added: svn:ignore
   + work


Added: csw/mgar/pkg/lang-python/webob/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-python/webob/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/lang-python/webob/trunk/Makefile	2013-04-14 07:58:33 UTC (rev 20693)
@@ -0,0 +1,19 @@
+# $Id$
+# TODO (release-critical prefixed with !, non release-critical with *)
+#
+NAME = WebOb
+VERSION = 1.2.3
+GARTYPE = v2
+
+DESCRIPTION = WSGI request and response object
+define BLURB
+endef
+
+CATEGORIES = python
+TEST_SCRIPTS =
+DISTFILES  = $(DISTNAME).tar.gz
+PACKAGES = CSWpy-webob
+ARCHALL_CSWpy-webob = 1
+
+include gar/category.mk
+


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

Added: csw/mgar/pkg/lang-python/webob/trunk/checksums
===================================================================
--- csw/mgar/pkg/lang-python/webob/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/lang-python/webob/trunk/checksums	2013-04-14 07:58:33 UTC (rev 20693)
@@ -0,0 +1 @@
+11825b7074ba7043e157805e4e6e0f55  WebOb-1.2.3.tar.gz

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


From wahwah at users.sourceforge.net  Sun Apr 14 09:59:40 2013
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Sun, 14 Apr 2013 07:59:40 +0000
Subject: [csw-devel] SF.net SVN: gar:[20694] csw/mgar/pkg
Message-ID: <E1URHqe-0006Pr-LV@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 20694
          http://gar.svn.sourceforge.net/gar/?rev=20694&view=rev
Author:   wahwah
Date:     2013-04-14 07:59:39 +0000 (Sun, 14 Apr 2013)
Log Message:
-----------
waitress: move to lang-python

Added Paths:
-----------
    csw/mgar/pkg/lang-python/waitress/

Removed Paths:
-------------
    csw/mgar/pkg/waitress/

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


From wahwah at users.sourceforge.net  Sun Apr 14 10:01:15 2013
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Sun, 14 Apr 2013 08:01:15 +0000
Subject: [csw-devel] SF.net SVN: gar:[20695] csw/mgar/pkg
Message-ID: <E1URHsB-0006S8-3s@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 20695
          http://gar.svn.sourceforge.net/gar/?rev=20695&view=rev
Author:   wahwah
Date:     2013-04-14 08:01:14 +0000 (Sun, 14 Apr 2013)
Log Message:
-----------
beautifulsoup4: move to lang-python

Added Paths:
-----------
    csw/mgar/pkg/lang-python/beautifulsoup4/

Removed Paths:
-------------
    csw/mgar/pkg/beautifulsoup4/

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


From wahwah at users.sourceforge.net  Sun Apr 14 10:05:21 2013
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Sun, 14 Apr 2013 08:05:21 +0000
Subject: [csw-devel] SF.net SVN: gar:[20696] csw/mgar/pkg/lang-python
Message-ID: <E1URHw9-0002vq-Em@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 20696
          http://gar.svn.sourceforge.net/gar/?rev=20696&view=rev
Author:   wahwah
Date:     2013-04-14 08:05:21 +0000 (Sun, 14 Apr 2013)
Log Message:
-----------
lang-python/pyquery/trunk: Initial commit

Added Paths:
-----------
    csw/mgar/pkg/lang-python/pyquery/
    csw/mgar/pkg/lang-python/pyquery/Makefile
    csw/mgar/pkg/lang-python/pyquery/branches/
    csw/mgar/pkg/lang-python/pyquery/tags/
    csw/mgar/pkg/lang-python/pyquery/trunk/
    csw/mgar/pkg/lang-python/pyquery/trunk/Makefile
    csw/mgar/pkg/lang-python/pyquery/trunk/checksums
    csw/mgar/pkg/lang-python/pyquery/trunk/files/

Added: csw/mgar/pkg/lang-python/pyquery/Makefile
===================================================================
--- csw/mgar/pkg/lang-python/pyquery/Makefile	                        (rev 0)
+++ csw/mgar/pkg/lang-python/pyquery/Makefile	2013-04-14 08:05:21 UTC (rev 20696)
@@ -0,0 +1,2 @@
+%:
+	$(MAKE) -C trunk $*


Property changes on: csw/mgar/pkg/lang-python/pyquery/trunk
___________________________________________________________________
Added: svn:ignore
   + work


Added: csw/mgar/pkg/lang-python/pyquery/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-python/pyquery/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/lang-python/pyquery/trunk/Makefile	2013-04-14 08:05:21 UTC (rev 20696)
@@ -0,0 +1,18 @@
+# $Id$
+# TODO (release-critical prefixed with !, non release-critical with *)
+#
+NAME = pyquery
+VERSION = 1.2.4
+GARTYPE = v2
+
+DESCRIPTION = A jquery-like library for python
+define BLURB
+endef
+
+CATEGORIES = python
+TEST_SCRIPTS =
+DISTFILES  = $(DISTNAME).tar.gz
+ARCHALL_CSWpy-$(NAME) = 1
+
+include gar/category.mk
+


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

Added: csw/mgar/pkg/lang-python/pyquery/trunk/checksums
===================================================================
--- csw/mgar/pkg/lang-python/pyquery/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/lang-python/pyquery/trunk/checksums	2013-04-14 08:05:21 UTC (rev 20696)
@@ -0,0 +1 @@
+268f08258738d21bc1920d7522f2a63b  pyquery-1.2.4.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  Sun Apr 14 10:08:10 2013
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Sun, 14 Apr 2013 08:08:10 +0000
Subject: [csw-devel] SF.net SVN: gar:[20697] csw/mgar/pkg/ordereddict/
Message-ID: <E1URHys-00030w-FW@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 20697
          http://gar.svn.sourceforge.net/gar/?rev=20697&view=rev
Author:   wahwah
Date:     2013-04-14 08:08:10 +0000 (Sun, 14 Apr 2013)
Log Message:
-----------
ordereddict: Already existed

Removed Paths:
-------------
    csw/mgar/pkg/ordereddict/

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


From wahwah at users.sourceforge.net  Sun Apr 14 10:26:22 2013
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Sun, 14 Apr 2013 08:26:22 +0000
Subject: [csw-devel] SF.net SVN: gar:[20698] csw/mgar/pkg/lang-python
Message-ID: <E1URIGU-0003UN-44@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 20698
          http://gar.svn.sourceforge.net/gar/?rev=20698&view=rev
Author:   wahwah
Date:     2013-04-14 08:26:21 +0000 (Sun, 14 Apr 2013)
Log Message:
-----------
lang-python/WSGIProxy2/trunk: Initial commit

Added Paths:
-----------
    csw/mgar/pkg/lang-python/WSGIProxy2/
    csw/mgar/pkg/lang-python/WSGIProxy2/Makefile
    csw/mgar/pkg/lang-python/WSGIProxy2/branches/
    csw/mgar/pkg/lang-python/WSGIProxy2/tags/
    csw/mgar/pkg/lang-python/WSGIProxy2/trunk/
    csw/mgar/pkg/lang-python/WSGIProxy2/trunk/Makefile
    csw/mgar/pkg/lang-python/WSGIProxy2/trunk/checksums
    csw/mgar/pkg/lang-python/WSGIProxy2/trunk/files/

Added: csw/mgar/pkg/lang-python/WSGIProxy2/Makefile
===================================================================
--- csw/mgar/pkg/lang-python/WSGIProxy2/Makefile	                        (rev 0)
+++ csw/mgar/pkg/lang-python/WSGIProxy2/Makefile	2013-04-14 08:26:21 UTC (rev 20698)
@@ -0,0 +1,2 @@
+%:
+	$(MAKE) -C trunk $*


Property changes on: csw/mgar/pkg/lang-python/WSGIProxy2/trunk
___________________________________________________________________
Added: svn:ignore
   + work


Added: csw/mgar/pkg/lang-python/WSGIProxy2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-python/WSGIProxy2/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/lang-python/WSGIProxy2/trunk/Makefile	2013-04-14 08:26:21 UTC (rev 20698)
@@ -0,0 +1,19 @@
+# $Id$
+# TODO (release-critical prefixed with !, non release-critical with *)
+#
+NAME = WSGIProxy2
+VERSION = 0.1
+CATEGORIES = python
+GARTYPE = v2
+
+DESCRIPTION = WSGI Proxy with various http client backends
+
+DISTFILES = $(DISTNAME).tar.gz
+VENDOR_URL = https://pypi.python.org/pypi/WSGIProxy2
+PACKAGES = CSWpy-wsgiproxy2
+ARCHALL_CSWpy-wsgiproxy2 = 1
+
+# There is no testsuite
+TEST_SCRIPTS =
+
+include gar/category.mk


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

Added: csw/mgar/pkg/lang-python/WSGIProxy2/trunk/checksums
===================================================================
--- csw/mgar/pkg/lang-python/WSGIProxy2/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/lang-python/WSGIProxy2/trunk/checksums	2013-04-14 08:26:21 UTC (rev 20698)
@@ -0,0 +1 @@
+157049212f1c81a8790efa31146fbabf  WSGIProxy2-0.1.tar.gz

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


From wahwah at users.sourceforge.net  Sun Apr 14 10:31:33 2013
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Sun, 14 Apr 2013 08:31:33 +0000
Subject: [csw-devel] SF.net SVN: gar:[20699] csw/mgar/pkg/lang-python
Message-ID: <E1URILV-0007Ak-JZ@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 20699
          http://gar.svn.sourceforge.net/gar/?rev=20699&view=rev
Author:   wahwah
Date:     2013-04-14 08:31:33 +0000 (Sun, 14 Apr 2013)
Log Message:
-----------
lang-python/PasteDeploy/trunk: Initial commit

Added Paths:
-----------
    csw/mgar/pkg/lang-python/PasteDeploy/
    csw/mgar/pkg/lang-python/PasteDeploy/Makefile
    csw/mgar/pkg/lang-python/PasteDeploy/branches/
    csw/mgar/pkg/lang-python/PasteDeploy/tags/
    csw/mgar/pkg/lang-python/PasteDeploy/trunk/
    csw/mgar/pkg/lang-python/PasteDeploy/trunk/Makefile
    csw/mgar/pkg/lang-python/PasteDeploy/trunk/checksums
    csw/mgar/pkg/lang-python/PasteDeploy/trunk/files/

Added: csw/mgar/pkg/lang-python/PasteDeploy/Makefile
===================================================================
--- csw/mgar/pkg/lang-python/PasteDeploy/Makefile	                        (rev 0)
+++ csw/mgar/pkg/lang-python/PasteDeploy/Makefile	2013-04-14 08:31:33 UTC (rev 20699)
@@ -0,0 +1,2 @@
+%:
+	$(MAKE) -C trunk $*


Property changes on: csw/mgar/pkg/lang-python/PasteDeploy/trunk
___________________________________________________________________
Added: svn:ignore
   + work


Added: csw/mgar/pkg/lang-python/PasteDeploy/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-python/PasteDeploy/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/lang-python/PasteDeploy/trunk/Makefile	2013-04-14 08:31:33 UTC (rev 20699)
@@ -0,0 +1,19 @@
+# $Id$
+# TODO (release-critical prefixed with !, non release-critical with *)
+#
+NAME = PasteDeploy
+VERSION = 1.5.0
+CATEGORIES = python
+GARTYPE = v2
+
+DESCRIPTION = Load, configure, and compose WSGI applications and servers
+
+DISTFILES = $(DISTNAME).tar.gz
+VENDOR_URL = https://pypi.python.org/pypi/PasteDeploy/1.5.0
+PACKAGES = CSWpy-pastedeploy
+ARCHALL_CSWpy-pastedeploy = 1
+
+# There is no testsuite
+TEST_SCRIPTS =
+
+include gar/category.mk


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

Added: csw/mgar/pkg/lang-python/PasteDeploy/trunk/checksums
===================================================================
--- csw/mgar/pkg/lang-python/PasteDeploy/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/lang-python/PasteDeploy/trunk/checksums	2013-04-14 08:31:33 UTC (rev 20699)
@@ -0,0 +1 @@
+f1a068a0b680493b6eaff3dd7690690f  PasteDeploy-1.5.0.tar.gz

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


From wahwah at users.sourceforge.net  Sun Apr 14 10:32:20 2013
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Sun, 14 Apr 2013 08:32:20 +0000
Subject: [csw-devel] SF.net SVN: gar:[20700]
	csw/mgar/pkg/lang-python/mock/trunk
Message-ID: <E1URIMG-0007EO-TU@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 20700
          http://gar.svn.sourceforge.net/gar/?rev=20700&view=rev
Author:   wahwah
Date:     2013-04-14 08:32:20 +0000 (Sun, 14 Apr 2013)
Log Message:
-----------
lang-python/mock/trunk: update to 1.0.1

Modified Paths:
--------------
    csw/mgar/pkg/lang-python/mock/trunk/Makefile
    csw/mgar/pkg/lang-python/mock/trunk/checksums

Modified: csw/mgar/pkg/lang-python/mock/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-python/mock/trunk/Makefile	2013-04-14 08:31:33 UTC (rev 20699)
+++ csw/mgar/pkg/lang-python/mock/trunk/Makefile	2013-04-14 08:32:20 UTC (rev 20700)
@@ -3,15 +3,14 @@
 # $Id$
 
 NAME = mock
-VERSION = 0.7.0
+VERSION = 1.0.1
 CATEGORIES = python
 GARTYPE = v2
+
 DESCRIPTION = A Python Mocking and Patching Library for Testing
-define BLURB
-endef
-ARCHALL = 1
 
-MASTER_SITES = http://pypi.python.org/packages/source/m/mock/
-DISTFILES += $(NAME)-$(VERSION).tar.gz
-
+DISTFILES = $(DISTNAME).tar.gz
+VENDOR_URL = https://pypi.python.org/pypi/mock/1.0.1
+ARCHALL = 1
+TEST_SCRIPTS =
 include gar/category.mk

Modified: csw/mgar/pkg/lang-python/mock/trunk/checksums
===================================================================
--- csw/mgar/pkg/lang-python/mock/trunk/checksums	2013-04-14 08:31:33 UTC (rev 20699)
+++ csw/mgar/pkg/lang-python/mock/trunk/checksums	2013-04-14 08:32:20 UTC (rev 20700)
@@ -1 +1 @@
-be029f8c963c55250a452c400e10cf42  mock-0.7.0.tar.gz
+c3971991738caa55ec7c356bbc154ee2  mock-1.0.1.tar.gz

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


From wahwah at users.sourceforge.net  Sun Apr 14 10:37:44 2013
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Sun, 14 Apr 2013 08:37:44 +0000
Subject: [csw-devel] SF.net SVN: gar:[20701] csw/mgar/pkg/lang-python
Message-ID: <E1URIRU-0003oh-C8@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 20701
          http://gar.svn.sourceforge.net/gar/?rev=20701&view=rev
Author:   wahwah
Date:     2013-04-14 08:37:44 +0000 (Sun, 14 Apr 2013)
Log Message:
-----------
lang-python/coverage/trunk: Initial commit

Added Paths:
-----------
    csw/mgar/pkg/lang-python/coverage/
    csw/mgar/pkg/lang-python/coverage/Makefile
    csw/mgar/pkg/lang-python/coverage/branches/
    csw/mgar/pkg/lang-python/coverage/tags/
    csw/mgar/pkg/lang-python/coverage/trunk/
    csw/mgar/pkg/lang-python/coverage/trunk/Makefile
    csw/mgar/pkg/lang-python/coverage/trunk/checksums
    csw/mgar/pkg/lang-python/coverage/trunk/files/

Added: csw/mgar/pkg/lang-python/coverage/Makefile
===================================================================
--- csw/mgar/pkg/lang-python/coverage/Makefile	                        (rev 0)
+++ csw/mgar/pkg/lang-python/coverage/Makefile	2013-04-14 08:37:44 UTC (rev 20701)
@@ -0,0 +1,2 @@
+%:
+	$(MAKE) -C trunk $*


Property changes on: csw/mgar/pkg/lang-python/coverage/trunk
___________________________________________________________________
Added: svn:ignore
   + work


Added: csw/mgar/pkg/lang-python/coverage/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-python/coverage/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/lang-python/coverage/trunk/Makefile	2013-04-14 08:37:44 UTC (rev 20701)
@@ -0,0 +1,16 @@
+# $Id$
+# TODO (release-critical prefixed with !, non release-critical with *)
+#
+NAME = coverage
+VERSION = 3.6
+CATEGORIES = python
+GARTYPE = v2
+
+DESCRIPTION = Code coverage measurement for Python
+
+DISTFILES = $(DISTNAME).tar.gz
+VENDOR_URL = https://pypi.python.org/pypi/coverage
+
+RUNTIME_DEP_PKGS_CSWpy-coverage += CSWlibpython2-6-1-0
+
+include gar/category.mk


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

Added: csw/mgar/pkg/lang-python/coverage/trunk/checksums
===================================================================
--- csw/mgar/pkg/lang-python/coverage/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/lang-python/coverage/trunk/checksums	2013-04-14 08:37:44 UTC (rev 20701)
@@ -0,0 +1 @@
+67d4e393f4c6a5ffc18605409d2aa1ac  coverage-3.6.tar.gz

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


From wahwah at users.sourceforge.net  Sun Apr 14 12:15:57 2013
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Sun, 14 Apr 2013 10:15:57 +0000
Subject: [csw-devel] SF.net SVN: gar:[20702] csw/mgar/pkg/lang-python
Message-ID: <E1URJyX-0001OE-1s@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 20702
          http://gar.svn.sourceforge.net/gar/?rev=20702&view=rev
Author:   wahwah
Date:     2013-04-14 10:15:55 +0000 (Sun, 14 Apr 2013)
Log Message:
-----------
lang-python/cssselect/trunk: Initial commit

Added Paths:
-----------
    csw/mgar/pkg/lang-python/cssselect/
    csw/mgar/pkg/lang-python/cssselect/Makefile
    csw/mgar/pkg/lang-python/cssselect/branches/
    csw/mgar/pkg/lang-python/cssselect/tags/
    csw/mgar/pkg/lang-python/cssselect/trunk/
    csw/mgar/pkg/lang-python/cssselect/trunk/Makefile
    csw/mgar/pkg/lang-python/cssselect/trunk/checksums
    csw/mgar/pkg/lang-python/cssselect/trunk/files/

Added: csw/mgar/pkg/lang-python/cssselect/Makefile
===================================================================
--- csw/mgar/pkg/lang-python/cssselect/Makefile	                        (rev 0)
+++ csw/mgar/pkg/lang-python/cssselect/Makefile	2013-04-14 10:15:55 UTC (rev 20702)
@@ -0,0 +1,2 @@
+%:
+	$(MAKE) -C trunk $*


Property changes on: csw/mgar/pkg/lang-python/cssselect/trunk
___________________________________________________________________
Added: svn:ignore
   + work


Added: csw/mgar/pkg/lang-python/cssselect/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-python/cssselect/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/lang-python/cssselect/trunk/Makefile	2013-04-14 10:15:55 UTC (rev 20702)
@@ -0,0 +1,17 @@
+# $Id$
+# TODO (release-critical prefixed with !, non release-critical with *)
+#
+NAME = cssselect
+VERSION = 0.8
+CATEGORIES = python
+GARTYPE = v2
+
+DESCRIPTION = Parses CSS3 Selectors and translates them to XPath 1.0
+
+DISTFILES = $(DISTNAME).tar.gz
+VENDOR_URL = https://pypi.python.org/pypi/cssselect
+ARCHALL_CSWpy-cssselect = 1
+
+TEST_SCRIPTS =
+
+include gar/category.mk


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

Added: csw/mgar/pkg/lang-python/cssselect/trunk/checksums
===================================================================
--- csw/mgar/pkg/lang-python/cssselect/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/lang-python/cssselect/trunk/checksums	2013-04-14 10:15:55 UTC (rev 20702)
@@ -0,0 +1 @@
+c4683e050351abcbbd5990b01f5344e2  cssselect-0.8.tar.gz

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


From wahwah at users.sourceforge.net  Sun Apr 14 12:26:46 2013
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Sun, 14 Apr 2013 10:26:46 +0000
Subject: [csw-devel] SF.net SVN: gar:[20703]
	csw/mgar/pkg/lang-python/pylxml/trunk
Message-ID: <E1URK90-0001fn-2N@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 20703
          http://gar.svn.sourceforge.net/gar/?rev=20703&view=rev
Author:   wahwah
Date:     2013-04-14 10:26:45 +0000 (Sun, 14 Apr 2013)
Log Message:
-----------
lang-python/pylxml/trunk: version bump to 3.1.2

Modified Paths:
--------------
    csw/mgar/pkg/lang-python/pylxml/trunk/Makefile
    csw/mgar/pkg/lang-python/pylxml/trunk/checksums

Property Changed:
----------------
    csw/mgar/pkg/lang-python/pylxml/trunk/Makefile

Modified: csw/mgar/pkg/lang-python/pylxml/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-python/pylxml/trunk/Makefile	2013-04-14 10:15:55 UTC (rev 20702)
+++ csw/mgar/pkg/lang-python/pylxml/trunk/Makefile	2013-04-14 10:26:45 UTC (rev 20703)
@@ -1,8 +1,9 @@
+# $Id$
 # TODO
 # - Move this to a pymodules/ subdirectory with the rest of the
 #   python modules (similar to the cpan directory).
-NAME = pylxml
-VERSION = 2.3.6
+NAME = lxml
+VERSION = 3.1.2
 CATEGORIES = python
 GARTYPE = v2
 
@@ -15,10 +16,8 @@
 endef
 
 VENDOR_URL   = http://codespeak.net/lxml/
-MASTER_SITES = http://pypi.python.org/packages/source/l/lxml/
 DISTNAME     = lxml-$(VERSION)
 DISTFILES    = $(DISTNAME).tar.gz
-UFILES_REGEX = lxml-(\d+(?:\.\d+)*).tar.gz
 
 # See http://codespeak.net/lxml/index.html#license
 LICENSE = doc/licenses/BSD.txt


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

Modified: csw/mgar/pkg/lang-python/pylxml/trunk/checksums
===================================================================
--- csw/mgar/pkg/lang-python/pylxml/trunk/checksums	2013-04-14 10:15:55 UTC (rev 20702)
+++ csw/mgar/pkg/lang-python/pylxml/trunk/checksums	2013-04-14 10:26:45 UTC (rev 20703)
@@ -1 +1 @@
-d5d886088e78b1bdbfd66d328fc2d0bc  lxml-2.3.6.tar.gz
+6f2173f4fd5b13fbc9f8a5096d23d524  lxml-3.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  Sun Apr 14 12:56:15 2013
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Sun, 14 Apr 2013 10:56:15 +0000
Subject: [csw-devel] SF.net SVN: gar:[20704]
	csw/mgar/pkg/lang-python/cython/trunk
Message-ID: <E1URKbX-0002Pm-Jv@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 20704
          http://gar.svn.sourceforge.net/gar/?rev=20704&view=rev
Author:   wahwah
Date:     2013-04-14 10:56:15 +0000 (Sun, 14 Apr 2013)
Log Message:
-----------
lang-python/cython/trunk: Version bump to 0.18

Modified Paths:
--------------
    csw/mgar/pkg/lang-python/cython/trunk/Makefile
    csw/mgar/pkg/lang-python/cython/trunk/checksums

Modified: csw/mgar/pkg/lang-python/cython/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-python/cython/trunk/Makefile	2013-04-14 10:26:45 UTC (rev 20703)
+++ csw/mgar/pkg/lang-python/cython/trunk/Makefile	2013-04-14 10:56:15 UTC (rev 20704)
@@ -2,7 +2,7 @@
 # TODO (release-critical prefixed with !, non release-critical with *)
 #
 NAME = Cython
-VERSION = 0.17.4
+VERSION = 0.18
 
 DESCRIPTION = Cython Compiler
 define BLURB
@@ -40,13 +40,14 @@
 STRIP_LIBTOOL = 1
 EXTRA_MERGE_EXCLUDE_FILES = .*\.pyo .*\.pyc
 
-CONFIGURE_ARGS = $(DIRPATHS)
-
 CONFIGURE_SCRIPTS =
 TEST_SCRIPTS =
 INSTALL_SCRIPTS = $(WORKSRC)/setup.py
 INSTALL_ARGS += --root=$(DESTDIR)
 INSTALL_ARGS += --prefix=$(prefix)
 
+CHECKPKG_OVERRIDES_CSWcython += pkgname-does-not-start-with-CSWpy-
+CHECKPKG_OVERRIDES_CSWcython += catalogname-does-not-start-with-py_
+
 include gar/category.mk
 

Modified: csw/mgar/pkg/lang-python/cython/trunk/checksums
===================================================================
--- csw/mgar/pkg/lang-python/cython/trunk/checksums	2013-04-14 10:26:45 UTC (rev 20703)
+++ csw/mgar/pkg/lang-python/cython/trunk/checksums	2013-04-14 10:56:15 UTC (rev 20704)
@@ -1 +1 @@
-cb11463e3a0c8d063e578db64ff61dde  Cython-0.17.4.tar.gz
+6a72d14e72f3df597b34ac326152f8d2  Cython-0.18.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  Sun Apr 14 13:08:54 2013
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Sun, 14 Apr 2013 11:08:54 +0000
Subject: [csw-devel] SF.net SVN: gar:[20705] csw/mgar/pkg/mongodb/trunk
Message-ID: <E1URKnm-0005PF-43@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 20705
          http://gar.svn.sourceforge.net/gar/?rev=20705&view=rev
Author:   wahwah
Date:     2013-04-14 11:08:50 +0000 (Sun, 14 Apr 2013)
Log Message:
-----------
mongodb/trunk: Patches updated, but it doesn't build

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

Added Paths:
-----------
    csw/mgar/pkg/mongodb/trunk/files/0001-OpenCSW-adaptation.patch

Removed Paths:
-------------
    csw/mgar/pkg/mongodb/trunk/files/0002-library-checking-by-locating-.so-files.patch
    csw/mgar/pkg/mongodb/trunk/files/0003-Hardcode-OpenCSW-specifics-in-the-Solaris-section.patch
    csw/mgar/pkg/mongodb/trunk/files/0004-Try-Boost-libs-without-the-mt-suffix-first.patch

Modified: csw/mgar/pkg/mongodb/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mongodb/trunk/Makefile	2013-04-14 10:56:15 UTC (rev 20704)
+++ csw/mgar/pkg/mongodb/trunk/Makefile	2013-04-14 11:08:50 UTC (rev 20705)
@@ -3,7 +3,7 @@
 # $Id$
 
 NAME = mongodb
-VERSION = 2.0.4
+VERSION = 2.4.1
 
 GARTYPE = v2
 DESCRIPTION = A scalable, high-performance, open source, document-oriented database
@@ -23,9 +23,7 @@
 
 GARCOMPILER = GNU
 
-PATCHFILES += 0002-library-checking-by-locating-.so-files.patch
-PATCHFILES += 0003-Hardcode-OpenCSW-specifics-in-the-Solaris-section.patch
-PATCHFILES += 0004-Try-Boost-libs-without-the-mt-suffix-first.patch
+PATCHFILES = 0001-OpenCSW-adaptation.patch
 
 # Depends on V8 which is available on Solaris 10 x86 only.
 # Can only run on little-endian machines.

Modified: csw/mgar/pkg/mongodb/trunk/checksums
===================================================================
--- csw/mgar/pkg/mongodb/trunk/checksums	2013-04-14 10:56:15 UTC (rev 20704)
+++ csw/mgar/pkg/mongodb/trunk/checksums	2013-04-14 11:08:50 UTC (rev 20705)
@@ -1 +1 @@
-099bc701a3d190a040123c58958e8f67  mongodb-src-r2.0.4.tar.gz
+2123758b166144947860b2af490996c1  mongodb-src-r2.4.1.tar.gz

Added: csw/mgar/pkg/mongodb/trunk/files/0001-OpenCSW-adaptation.patch
===================================================================
--- csw/mgar/pkg/mongodb/trunk/files/0001-OpenCSW-adaptation.patch	                        (rev 0)
+++ csw/mgar/pkg/mongodb/trunk/files/0001-OpenCSW-adaptation.patch	2013-04-14 11:08:50 UTC (rev 20705)
@@ -0,0 +1,42 @@
+From 187c0d72ca598fae56c7dbd63558df1c8fc6f155 Mon Sep 17 00:00:00 2001
+From: Maciej Blizinski <maciej at opencsw.org>
+Date: Sun, 14 Apr 2013 12:33:16 +0200
+Subject: [PATCH] OpenCSW adaptation
+
+- librt needs to be used
+- /opt/csw/gxx needs to be searched for libraries
+- the -mt versions of boost libraries must be checked first
+---
+ SConstruct | 9 ++++++---
+ 1 file changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/SConstruct b/SConstruct
+index 219f270..428c24c 100644
+--- a/SConstruct
++++ b/SConstruct
+@@ -535,7 +535,10 @@ elif "sunos5" == os.sys.platform:
+      nix = True
+      solaris = True
+      env.Append( CPPDEFINES=[ "__sunos__" ] )
+-     env.Append( LIBS=["socket","resolv"] )
++     env.Append( LIBS=["socket","resolv","rt"] )
++     env.Append( CPPPATH=[ "/opt/csw/gxx/include", "/opt/csw/include" ] )
++     env.Append( LIBPATH=[ "/opt/csw/gxx/lib", "/opt/csw/lib" ] )
++     env.Append( LINKFLAGS=[ "-R/opt/csw/gxx/lib", "-R/opt/csw/lib" ] )
+ 
+ elif os.sys.platform.startswith( "freebsd" ):
+     nix = True
+@@ -812,8 +815,8 @@ def doConfigure(myenv):
+ 
+         for b in boostLibs:
+             l = "boost_" + b
+-            if not conf.CheckLib([ l + boostCompiler + "-mt" + boostVersion,
+-                                   l + boostCompiler + boostVersion ], language='C++' ):
++            if not conf.CheckLib([ l + boostCompiler + boostVersion,
++                                   l + boostCompiler + "-mt" + boostVersion ], language='C++' ):
+                 Exit(1)
+ 
+     if conf.CheckHeader('unistd.h'):
+-- 
+1.8.1.4
+

Deleted: csw/mgar/pkg/mongodb/trunk/files/0002-library-checking-by-locating-.so-files.patch
===================================================================
--- csw/mgar/pkg/mongodb/trunk/files/0002-library-checking-by-locating-.so-files.patch	2013-04-14 10:56:15 UTC (rev 20704)
+++ csw/mgar/pkg/mongodb/trunk/files/0002-library-checking-by-locating-.so-files.patch	2013-04-14 11:08:50 UTC (rev 20705)
@@ -1,37 +0,0 @@
-From 53a89a29c07b6a140ddb5cbb80ec3df4c6994273 Mon Sep 17 00:00:00 2001
-From: Maciej Blizinski <maciej at opencsw.org>
-Date: Tue, 14 Dec 2010 12:26:39 +0100
-Subject: [PATCH] library checking by locating .so files
-
-Doing this by checking for .a files doesn't make sense on Solaris, as it's
-impossible to create static binaries, and there are no static libraries in the
-system.
----
- SConstruct |    4 +++-
- 1 files changed, 3 insertions(+), 1 deletions(-)
-
-diff --git a/SConstruct b/SConstruct
-index e3046ff..154f46f 100644
---- a/SConstruct
-+++ b/SConstruct
-@@ -865,6 +865,7 @@ def doConfigure( myenv , needPcre=True , shell=False ):
- 
-     def myCheckLib( poss , failIfNotFound=False , staticOnly=False):
- 
-+        print("myCheckLib(%s, %s, %s)" % (poss, failIfNotFound, staticOnly))
-         if type( poss ) != types.ListType :
-             poss = [poss]
- 
-@@ -877,7 +878,8 @@ def doConfigure( myenv , needPcre=True , shell=False ):
- 
-             for p in poss:
-                 for loc in allPlaces:
--                    fullPath = loc + "/lib" + p + ".a"
-+                    fullPath = loc + "/lib" + p + ".so"
-+                    print("Checking for %s" %  fullPath)
-                     if os.path.exists( fullPath ):
-                         myenv['_LIBFLAGS']='${_stripixes(LIBLINKPREFIX, LIBS, LIBLINKSUFFIX, LIBPREFIXES, LIBSUFFIXES, __env__)} $SLIBS'
-                         myenv.Append( SLIBS=" " + fullPath + " " )
--- 
-1.7.3.2
-

Deleted: csw/mgar/pkg/mongodb/trunk/files/0003-Hardcode-OpenCSW-specifics-in-the-Solaris-section.patch
===================================================================
--- csw/mgar/pkg/mongodb/trunk/files/0003-Hardcode-OpenCSW-specifics-in-the-Solaris-section.patch	2013-04-14 10:56:15 UTC (rev 20704)
+++ csw/mgar/pkg/mongodb/trunk/files/0003-Hardcode-OpenCSW-specifics-in-the-Solaris-section.patch	2013-04-14 11:08:50 UTC (rev 20705)
@@ -1,28 +0,0 @@
-From 6ea5d8231df11e63384b0236ab4485294ca2f104 Mon Sep 17 00:00:00 2001
-From: Maciej Blizinski <maciej at opencsw.org>
-Date: Sun, 11 Mar 2012 17:48:51 +0000
-Subject: [PATCH] Hardcode OpenCSW specifics in the Solaris section
-
-If SConstruct has hardcoded Solaris paths, why not add OpenCSW specific
-paths.
----
- SConstruct              |    5 +-
- shell/mongo_vstudio.cpp |  204 +++++++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 208 insertions(+), 1 deletions(-)
-
-diff --git a/SConstruct b/SConstruct
-index 2d0c86f..787a81c 100644
---- a/SConstruct
-+++ b/SConstruct
-@@ -543,7 +543,10 @@ elif "sunos5" == os.sys.platform:
-      nix = True
-      solaris = True
-      env.Append( CPPDEFINES=[ "__sunos__" ] )
--     env.Append( LIBS=["socket","resolv"] )
-+     env.Append( LIBS=["socket","resolv","rt"] )
-+     env.Append( CPPPATH=[ "/opt/csw/gxx/include", "/opt/csw/include" ] )
-+     env.Append( LIBPATH=[ "/opt/csw/gxx/lib", "/opt/csw/lib" ] )
-+     env.Append( LINKFLAGS=[ "-R/opt/csw/gxx/lib", "-R/opt/csw/lib" ] )
- 
- elif os.sys.platform.startswith( "freebsd" ):
-     nix = True

Deleted: csw/mgar/pkg/mongodb/trunk/files/0004-Try-Boost-libs-without-the-mt-suffix-first.patch
===================================================================
--- csw/mgar/pkg/mongodb/trunk/files/0004-Try-Boost-libs-without-the-mt-suffix-first.patch	2013-04-14 10:56:15 UTC (rev 20704)
+++ csw/mgar/pkg/mongodb/trunk/files/0004-Try-Boost-libs-without-the-mt-suffix-first.patch	2013-04-14 11:08:50 UTC (rev 20705)
@@ -1,34 +0,0 @@
-From 7b0401af0182b887a7070ce4efbb3e7acd9ab9c4 Mon Sep 17 00:00:00 2001
-From: Maciej Blizinski <maciej at opencsw.org>
-Date: Mon, 12 Mar 2012 19:10:49 +0100
-Subject: [PATCH] Try Boost libs without the mt suffix first
-
----
- SConstruct |    8 ++++----
- 1 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/SConstruct b/SConstruct
-index 787a81c..db429ee 100644
---- a/SConstruct
-+++ b/SConstruct
-@@ -945,13 +945,13 @@ def doConfigure( myenv , shell=False ):
-             print( "WARNING: old version of boost - you should consider upgrading" )
- 
-     # this will add it if it exists and works
--    myCheckLib( [ "boost_system" + boostCompiler + "-mt" + boostVersion ,
--                  "boost_system" + boostCompiler + boostVersion ] )
-+    myCheckLib( [ "boost_system" + boostCompiler + boostVersion ,
-+                  "boost_system" + boostCompiler + "-mt" + boostVersion ] )
- 
-     for b in boostLibs:
-         l = "boost_" + b
--        myCheckLib( [ l + boostCompiler + "-mt" + boostVersion ,
--                      l + boostCompiler + boostVersion ] ,
-+        myCheckLib( [ l + boostCompiler + boostVersion ,
-+                      l + boostCompiler + "-mt" + boostVersion ] ,
-                     release or not shell)
- 
-     if not conf.CheckCXXHeader( "execinfo.h" ):
--- 
-1.7.9
-

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


From idogan23 at users.sourceforge.net  Sun Apr 14 14:13:19 2013
From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net)
Date: Sun, 14 Apr 2013 12:13:19 +0000
Subject: [csw-devel] SF.net SVN: gar:[20706] csw/mgar/pkg/ldns_drill/trunk
Message-ID: <E1URLo7-0004UW-KX@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 20706
          http://gar.svn.sourceforge.net/gar/?rev=20706&view=rev
Author:   idogan23
Date:     2013-04-14 12:13:19 +0000 (Sun, 14 Apr 2013)
Log Message:
-----------
ldnsdrill: rebuilt with OpenSSL 1.0

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

Modified: csw/mgar/pkg/ldns_drill/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ldns_drill/trunk/Makefile	2013-04-14 11:08:50 UTC (rev 20705)
+++ csw/mgar/pkg/ldns_drill/trunk/Makefile	2013-04-14 12:13:19 UTC (rev 20706)
@@ -27,8 +27,8 @@
 
 LICENSE = LICENSE
 
-RUNTIME_DEP_PKGS = CSWlibldns1
-RUNTIME_DEP_PKGS += CSWosslrt
+RUNTIME_DEP_PKGS_CSWldnsdrill += CSWlibldns1
+RUNTIME_DEP_PKGS_CSWldnsdrill += CSWlibssl1-0-0
 
 INCOMPATIBLE_PKGS_CSWldnsdrill = CSWdrill
 

Modified: csw/mgar/pkg/ldns_drill/trunk/checksums
===================================================================
--- csw/mgar/pkg/ldns_drill/trunk/checksums	2013-04-14 11:08:50 UTC (rev 20705)
+++ csw/mgar/pkg/ldns_drill/trunk/checksums	2013-04-14 12:13:19 UTC (rev 20706)
@@ -1 +1 @@
-e7428ed0d19baed02459e2c55660c9b3  ldns-1.6.12.tar.gz
+bcada4f2e62aa40fcdd5d73aec46f284  ldns-1.6.13.tar.gz

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


From idogan23 at users.sourceforge.net  Sun Apr 14 15:59:46 2013
From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net)
Date: Sun, 14 Apr 2013 13:59:46 +0000
Subject: [csw-devel] SF.net SVN: gar:[20707] csw/mgar/pkg/unbound/trunk
Message-ID: <E1URNT8-0007Ax-Ts@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 20707
          http://gar.svn.sourceforge.net/gar/?rev=20707&view=rev
Author:   idogan23
Date:     2013-04-14 13:59:45 +0000 (Sun, 14 Apr 2013)
Log Message:
-----------
unbound: bump version to 1.4.20, set correct SSL library, some cleanup

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

Modified: csw/mgar/pkg/unbound/trunk/Makefile
===================================================================
--- csw/mgar/pkg/unbound/trunk/Makefile	2013-04-14 12:13:19 UTC (rev 20706)
+++ csw/mgar/pkg/unbound/trunk/Makefile	2013-04-14 13:59:45 UTC (rev 20707)
@@ -1,5 +1,5 @@
 NAME = unbound
-VERSION = 1.4.19
+VERSION = 1.4.20
 GARTYPE = v2
 DESCRIPTION = A validating, recursive, and caching DNS resolver
 define BLUR
@@ -25,18 +25,11 @@
 # UPSTREAM_MASTER_SITES = 
 
 #CONFIGURE_ARGS  = $(DIRPATHS)
-#CONFIGUTE_ARGS += --with-solaris-threads
-#CONFIGURE_ARGS += --with-ldns=/opt/csw
-#CONFIGURE_ARGS += --with-ssl=/opt/csw
 CONFIGURE_ARGS += --with-libevent=/opt/csw
 CONFIGURE_ARGS += --with-libexpat=/opt/csw
-#CONFIGURE_ARGS += --with-pidfile=/var/run/unbound.pid
-#CONFIGURE_ARGS += --sysconfdir=/etc/opt/csw
-
-CONFIGURE_ARGS  = $(DIRPATHS)
 CONFIGUTE_ARGS += --with-solaris-threads
-CONFIGURE_ARGS += --with-ldns
-CONFIGURE_ARGS += --with-ssl
+CONFIGURE_ARGS += --with-ldns=/opt/csw
+CONFIGURE_ARGS += --with-ssl=/opt/csw
 CONFIGURE_ARGS += --with-pidfile=/var/run/unbound.pid
 CONFIGURE_ARGS += --sysconfdir=/etc/opt/csw
 
@@ -56,29 +49,29 @@
 MERGE_DIRS_isa-pentium_pro += $(sbindir)
 
 ISAXEC_DIRS                  = $(sbindir)
-#EXTRA_ISAEXEC_EXCLUDE_FILES  = $(sbindir)/unbound-anchor
-#EXTRA_ISAEXEC_EXCLUDE_FILES += $(sbindir)/unbound-checkconf
-#EXTRA_ISAEXEC_EXCLUDE_FILES += $(sbindir)/unbound-control
-#EXTRA_ISAEXEC_EXCLUDE_FILES += $(sbindir)/unbound-control-setup
-#EXTRA_ISAEXEC_EXCLUDE_FILES += $(sbindir)/unbound-host
+EXTRA_ISAEXEC_EXCLUDE_FILES  = $(sbindir)/unbound-anchor
+EXTRA_ISAEXEC_EXCLUDE_FILES += $(sbindir)/unbound-checkconf
+EXTRA_ISAEXEC_EXCLUDE_FILES += $(sbindir)/unbound-control
+EXTRA_ISAEXEC_EXCLUDE_FILES += $(sbindir)/unbound-control-setup
+EXTRA_ISAEXEC_EXCLUDE_FILES += $(sbindir)/unbound-host
 
-#EXTRA_MERGE_EXCLUDE_FILES_isa-pentium_pro  = $(prefix)/sbin/unbound-anchor
-#EXTRA_MERGE_EXCLUDE_FILES_isa-pentium_pro += $(prefix)/sbin/unbound-checkconf
-#EXTRA_MERGE_EXCLUDE_FILES_isa-pentium_pro += $(prefix)/sbin/unbound-control
-#EXTRA_MERGE_EXCLUDE_FILES_isa-pentium_pro += $(prefix)/sbin/unbound-control-setup
-#EXTRA_MERGE_EXCLUDE_FILES_isa-pentium_pro += $(prefix)/sbin/unbound-host
+EXTRA_MERGE_EXCLUDE_FILES_isa-pentium_pro  = $(prefix)/sbin/unbound-anchor
+EXTRA_MERGE_EXCLUDE_FILES_isa-pentium_pro += $(prefix)/sbin/unbound-checkconf
+EXTRA_MERGE_EXCLUDE_FILES_isa-pentium_pro += $(prefix)/sbin/unbound-control
+EXTRA_MERGE_EXCLUDE_FILES_isa-pentium_pro += $(prefix)/sbin/unbound-control-setup
+EXTRA_MERGE_EXCLUDE_FILES_isa-pentium_pro += $(prefix)/sbin/unbound-host
 
-#EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv8plus  = $(prefix)/sbin/unbound-anchor
-#EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv8plus += $(prefix)/sbin/unbound-checkconf
-#EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv8plus += $(prefix)/sbin/unbound-control
-#EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv8plus += $(prefix)/sbin/unbound-control-setup
-#EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv8plus += $(prefix)/sbin/unbound-host
+EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv8plus  = $(prefix)/sbin/unbound-anchor
+EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv8plus += $(prefix)/sbin/unbound-checkconf
+EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv8plus += $(prefix)/sbin/unbound-control
+EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv8plus += $(prefix)/sbin/unbound-control-setup
+EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv8plus += $(prefix)/sbin/unbound-host
 
-#EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv8plus+vis  = $(prefix)/sbin/unbound-anchor
-#EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv8plus+vis += $(prefix)/sbin/unbound-checkconf
-#EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv8plus+vis += $(prefix)/sbin/unbound-control
-#EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv8plus+vis += $(prefix)/sbin/unbound-control-setup
-#EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv8plus+vis += $(prefix)/sbin/unbound-host
+EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv8plus+vis  = $(prefix)/sbin/unbound-anchor
+EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv8plus+vis += $(prefix)/sbin/unbound-checkconf
+EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv8plus+vis += $(prefix)/sbin/unbound-control
+EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv8plus+vis += $(prefix)/sbin/unbound-control-setup
+EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv8plus+vis += $(prefix)/sbin/unbound-host
 
 SPKG_CLASSES_CSWunbound = none cswusergroup cswcpsampleconf cswinitsmf
 INITSMF                 = /etc/opt/csw/init.d/cswunbound

Modified: csw/mgar/pkg/unbound/trunk/checksums
===================================================================
--- csw/mgar/pkg/unbound/trunk/checksums	2013-04-14 12:13:19 UTC (rev 20706)
+++ csw/mgar/pkg/unbound/trunk/checksums	2013-04-14 13:59:45 UTC (rev 20707)
@@ -1 +1 @@
-39f121e1921c7b5ad2f05a4d756a0487  unbound-1.4.19.tar.gz
+1f2d0b490fd7928a708a326beda21948  unbound-1.4.20.tar.gz

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


From bdwalton at users.sourceforge.net  Sun Apr 14 22:48:30 2013
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Sun, 14 Apr 2013 20:48:30 +0000
Subject: [csw-devel] SF.net SVN: gar:[20708] csw/mgar/pkg/imap-c-client/trunk
Message-ID: <E1URTqg-0006Av-QH@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 20708
          http://gar.svn.sourceforge.net/gar/?rev=20708&view=rev
Author:   bdwalton
Date:     2013-04-14 20:48:30 +0000 (Sun, 14 Apr 2013)
Log Message:
-----------
imap-c-client/trunk: no longer build the legacy 2004g package

Modified Paths:
--------------
    csw/mgar/pkg/imap-c-client/trunk/Makefile

Removed Paths:
-------------
    csw/mgar/pkg/imap-c-client/trunk/files/libc-client.2004g.so.i386
    csw/mgar/pkg/imap-c-client/trunk/files/libc-client.2004g.so.sparc

Modified: csw/mgar/pkg/imap-c-client/trunk/Makefile
===================================================================
--- csw/mgar/pkg/imap-c-client/trunk/Makefile	2013-04-14 13:59:45 UTC (rev 20707)
+++ csw/mgar/pkg/imap-c-client/trunk/Makefile	2013-04-14 20:48:30 UTC (rev 20708)
@@ -29,16 +29,6 @@
 # Make more md5 functions static to reduce namespace pollution
 PATCHFILES += authmd5.diff
 
-PACKAGES += CSWlibc-client2004g
-SPKG_DESC_CSWlibc-client2004g += $(DESCRIPTION), libc-client.2004g.so
-PKGFILES_CSWlibc-client2004g += $(call pkgfiles_lib,libc-client.2004g.so)
-RUNTIME_DEP_PKGS_CSWlibc-client2004g += CSWlibssl0-9-8
-OBSOLETED_BY_CSWlibc-client2004g = CSWimaprt
-CHECKPKG_OVERRIDES_CSWlibc-client2004g += file-with-bad-content|/usr/share|root/opt/csw/lib/libc-client.2004g.so
-CHECKPKG_OVERRIDES_CSWlibc-client2004g += file-with-bad-content|/export/home|root/opt/csw/lib/libc-client.2004g.so
-CHECKPKG_OVERRIDES_CSWlibc-client2004g += file-with-bad-content|/export/medusa|root/opt/csw/lib/libc-client.2004g.so
-CHECKPKG_OVERRIDES_CSWlibc-client2004g += soname-equals-filename|file=/opt/csw/lib/libc-client.2004g.so
-
 PACKAGES += CSWlibc-client2007f
 SPKG_DESC_CSWlibc-client2007f += $(DESCRIPTION), libc-client.2007f.so
 PKGFILES_CSWlibc-client2007f += $(call pkgfiles_lib,libc-client.2007f.so)
@@ -81,6 +71,3 @@
 		$(WORKSRC)/src/osdep/tops-20/shortsym.h $(DESTDIR)$(includedir)/imap
 	cd $(DESTDIR)$(libdir); ln -s libc-client.$(VERSION).so libc-client.so
 	@$(MAKECOOKIE)
-
-post-merge:
-	ginstall -m755 $(FILEDIR)/libc-client.2004g.so.$(GARCH) $(PKGROOT)$(libdir)/libc-client.2004g.so

Deleted: csw/mgar/pkg/imap-c-client/trunk/files/libc-client.2004g.so.i386
===================================================================
(Binary files differ)

Deleted: csw/mgar/pkg/imap-c-client/trunk/files/libc-client.2004g.so.sparc
===================================================================
(Binary files differ)

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 Apr 15 00:55:11 2013
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Sun, 14 Apr 2013 22:55:11 +0000
Subject: [csw-devel] SF.net SVN: gar:[20709]
	csw/mgar/pkg/lang-python/pyelftools/trunk
Message-ID: <E1URVpG-0001nJ-Uh@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 20709
          http://gar.svn.sourceforge.net/gar/?rev=20709&view=rev
Author:   wahwah
Date:     2013-04-14 22:55:09 +0000 (Sun, 14 Apr 2013)
Log Message:
-----------
lang-python/pyelftools/trunk: Add more machine types (most importantly, number 18, EM_SPARC32PLUS)

Modified Paths:
--------------
    csw/mgar/pkg/lang-python/pyelftools/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/lang-python/pyelftools/trunk/files/0001-Updated-list-of-e_machine-values.patch

Modified: csw/mgar/pkg/lang-python/pyelftools/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-python/pyelftools/trunk/Makefile	2013-04-14 20:48:30 UTC (rev 20708)
+++ csw/mgar/pkg/lang-python/pyelftools/trunk/Makefile	2013-04-14 22:55:09 UTC (rev 20709)
@@ -10,10 +10,10 @@
 endef
 
 CATEGORIES = python
-MASTER_SITES = $(PYPI_MIRROR)
 DISTFILES  = $(DISTNAME).tar.gz
 
-CONFIGURE_ARGS = $(DIRPATHS)
+PATCHFILES += 0001-Updated-list-of-e_machine-values.patch
+
 TEST_SCRIPTS =
 
 ARCHALL_CSWpy-pyelftools = 1

Added: csw/mgar/pkg/lang-python/pyelftools/trunk/files/0001-Updated-list-of-e_machine-values.patch
===================================================================
--- csw/mgar/pkg/lang-python/pyelftools/trunk/files/0001-Updated-list-of-e_machine-values.patch	                        (rev 0)
+++ csw/mgar/pkg/lang-python/pyelftools/trunk/files/0001-Updated-list-of-e_machine-values.patch	2013-04-14 22:55:09 UTC (rev 20709)
@@ -0,0 +1,117 @@
+From e384aee31c66e285fe0404d54e633ba2f82a0c69 Mon Sep 17 00:00:00 2001
+From: Maciej Blizinski <maciej at opencsw.org>
+Date: Mon, 15 Apr 2013 00:53:00 +0200
+Subject: [PATCH] Updated list of e_machine values.
+
+Source:
+http://www.scs.stanford.edu/11wi-cs140/pintos/specs/sysv-abi-update.html/ch4.eheader.html
+
+Also for Solaris-relevant stuff:
+http://docs.oracle.com/cd/E26505_01/html/E26506/chapter6-43405.html
+---
+ elftools/elf/enums.py | 76 ++++++++++++++++++++++++++++++++++++++++++++++++---
+ 1 file changed, 72 insertions(+), 4 deletions(-)
+
+diff --git a/elftools/elf/enums.py b/elftools/elf/enums.py
+index 78302ae..72f4fa0 100644
+--- a/elftools/elf/enums.py
++++ b/elftools/elf/enums.py
+@@ -65,7 +65,8 @@ ENUM_E_TYPE = dict(
+ )
+ 
+ # e_machine in the ELF header
+-# (this list is currently somewhat partial...)
++# Source:
++# http://www.scs.stanford.edu/11wi-cs140/pintos/specs/sysv-abi-update.html/ch4.eheader.html
+ ENUM_E_MACHINE = dict(
+     EM_NONE=0,
+     EM_M32=1,
+@@ -73,15 +74,82 @@ ENUM_E_MACHINE = dict(
+     EM_386=3,
+     EM_68K=4,
+     EM_88K=5,
+-    EM_486=6,
+     EM_860=7,
+     EM_MIPS=8,
+     EM_S370=9,
+-    EM_MIPS_RS4_BE=10,
++    EM_MIPS_RS3_LE=10,
++    EM_PARISC=15,
++    EM_VPP500=17,
++    EM_SPARC32PLUS=18,
++    EM_960=19,
++    EM_PPC=20,
++    EM_PPC64=21,
++    EM_S390=22,
++    EM_V800=36,
++    EM_FR20=37,
++    EM_RH32=38,
++    EM_RCE=39,
++    EM_ARM=40,
++    EM_ALPHA=41,
++    EM_SH=42,
++    EM_SPARCV9=43,
++    EM_TRICORE=44,
++    EM_ARC=45,
++    EM_H8_300=46,
++    EM_H8_300H=47,
++    EM_H8S=48,
++    EM_H8_500=49,
+     EM_IA_64=50,
++    EM_MIPS_X=51,
++    EM_COLDFIRE=52,
++    EM_68HC12=53,
++    EM_MMA=54,
++    EM_PCP=55,
++    EM_NCPU=56,
++    EM_NDR1=57,
++    EM_STARCORE=58,
++    EM_ME16=59,
++    EM_ST100=60,
++    EM_TINYJ=61,
+     EM_X86_64=62,
++    EM_PDSP=63,
++    EM_PDP10=64,
++    EM_PDP11=65,
++    EM_FX66=66,
++    EM_ST9PLUS=67,
++    EM_ST7=68,
++    EM_68HC16=69,
++    EM_68HC11=70,
++    EM_68HC08=71,
++    EM_68HC05=72,
++    EM_SVX=73,
++    EM_ST19=74,
++    EM_VAX=75,
++    EM_CRIS=76,
++    EM_JAVELIN=77,
++    EM_FIREPATH=78,
++    EM_ZSP=79,
++    EM_MMIX=80,
++    EM_HUANY=81,
++    EM_PRISM=82,
+     EM_AVR=83,
+-    EM_L10M=180,
++    EM_FR30=84,
++    EM_D10V=85,
++    EM_D30V=86,
++    EM_V850=87,
++    EM_M32R=88,
++    EM_MN10300=89,
++    EM_MN10200=90,
++    EM_PJ=91,
++    EM_OPENRISC=92,
++    EM_ARC_A5=93,
++    EM_XTENSA=94,
++    EM_VIDEOCORE=95,
++    EM_TMM_GPP=96,
++    EM_NS32K=97,
++    EM_TPC=98,
++    EM_SNP1K=99,
++    EM_ST200=100,
+     _default_=Pass,
+ )
+ 
+-- 
+1.8.1.4
+

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


From chninkel at users.sourceforge.net  Mon Apr 15 06:54:58 2013
From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net)
Date: Mon, 15 Apr 2013 04:54:58 +0000
Subject: [csw-devel] SF.net SVN: gar:[20710] csw/mgar/pkg/imap-c-client/trunk
Message-ID: <E1URbRS-0003Jc-5I@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 20710
          http://gar.svn.sourceforge.net/gar/?rev=20710&view=rev
Author:   chninkel
Date:     2013-04-15 04:54:57 +0000 (Mon, 15 Apr 2013)
Log Message:
-----------
imap-c-client/trunk: added CSWimap package in the recipe

Modified Paths:
--------------
    csw/mgar/pkg/imap-c-client/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/imap-c-client/trunk/files/0003-Make-news-active-file-path-opencsw-compliant.patch
    csw/mgar/pkg/imap-c-client/trunk/files/CSWimap.imap.inetd.conf
    csw/mgar/pkg/imap-c-client/trunk/files/CSWimap.imaps.inetd.conf
    csw/mgar/pkg/imap-c-client/trunk/files/CSWimap.pop2.inetd.conf
    csw/mgar/pkg/imap-c-client/trunk/files/CSWimap.pop3.inetd.conf
    csw/mgar/pkg/imap-c-client/trunk/files/CSWimap.pop3s.inetd.conf
    csw/mgar/pkg/imap-c-client/trunk/files/CSWimap.services
    csw/mgar/pkg/imap-c-client/trunk/files/README.CSW

Modified: csw/mgar/pkg/imap-c-client/trunk/Makefile
===================================================================
--- csw/mgar/pkg/imap-c-client/trunk/Makefile	2013-04-14 22:55:09 UTC (rev 20709)
+++ csw/mgar/pkg/imap-c-client/trunk/Makefile	2013-04-15 04:54:57 UTC (rev 20710)
@@ -29,6 +29,9 @@
 # Make more md5 functions static to reduce namespace pollution
 PATCHFILES += authmd5.diff
 
+# Change the path of the active file to be opencsw compliant
+PATCHFILES += 0003-Make-news-active-file-path-opencsw-compliant.patch
+
 PACKAGES += CSWlibc-client2007f
 SPKG_DESC_CSWlibc-client2007f += $(DESCRIPTION), libc-client.2007f.so
 PKGFILES_CSWlibc-client2007f += $(call pkgfiles_lib,libc-client.2007f.so)
@@ -46,9 +49,30 @@
 CHECKPKG_OVERRIDES_CSWlibc-client-dev += surplus-dependency|CSWlibc-client2007f
 CHECKPKG_OVERRIDES_CSWlibc-client-dev += file-with-bad-content|/usr/share|root/opt/csw/lib/c-client.a
 
+PACKAGES += CSWimap
+SPKG_DESC_CSWimap = Mail server daemon (UW)
+RUNTIME_DEP_PKGS_CSWimap = CSWlibssl1-0-0
+
+CHECKPKG_OVERRIDES_CSWimap += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/tmail.1
+CHECKPKG_OVERRIDES_CSWimap += file-with-bad-content|/usr/local|root/opt/csw/share/doc/imap/SSLBUILD
+CHECKPKG_OVERRIDES_CSWimap += file-with-bad-content|/usr/local|root/opt/csw/share/doc/imap/bugs.txt
+CHECKPKG_OVERRIDES_CSWimap += file-with-bad-content|/usr/local|root/opt/csw/share/doc/imap/IPv6.txt
+CHECKPKG_OVERRIDES_CSWimap += file-with-bad-content|/usr/local|root/opt/csw/share/doc/imap/BUILD
+CHECKPKG_OVERRIDES_CSWimap += file-with-bad-content|/usr/local|root/opt/csw/share/doc/imap/FAQ.html
+CHECKPKG_OVERRIDES_CSWimap += file-with-bad-content|/usr/local|root/opt/csw/share/doc/imap/FAQ.txt
+
+
+INETDCONF  = $(sysconfdir)/pkg/CSWimap/imap.inetd.conf
+INETDCONF += $(sysconfdir)/pkg/CSWimap/imaps.inetd.conf
+INETDCONF += $(sysconfdir)/pkg/CSWimap/pop.inetd.conf
+INETDCONF += $(sysconfdir)/pkg/CSWimap/pop3.inetd.conf
+INETDCONF += $(sysconfdir)/pkg/CSWimap/pop3s.inetd.conf
+
+ETCSERVICES = $(sysconfdir)/pkg/CSWimap/services
+
 CONFIGURE_SCRIPTS =
 BUILD_SCRIPTS = custom
-INSTALL_SCRIPTS = custom
+INSTALL_SCRIPTS = libc-client uwimap
 
 # No test suite
 TEST_SCRIPTS =
@@ -59,7 +83,36 @@
 	@( cd $(WORKSRC) ; $(BUILD_ENV) DISTVERSION=$(VERSION) make soc )
 	@$(MAKECOOKIE)
 
-install-custom:
+install-uwimap:
+	ginstall -d "$(DESTDIR)$(sbindir)"
+	for DAEMON in imapd/imapd ipopd/ipop2d ipopd/ipop3d; do \
+		ginstall -p -m755 "$(WORKSRC)/$$DAEMON" "$(DESTDIR)$(sbindir)"; \
+	done
+	 
+	ginstall -d "$(DESTDIR)$(bindir)"
+	ginstall -d "$(DESTDIR)$(mandir)/man1"
+	for BINARY in mailutil tmail dmail mlock; do \
+		ginstall -p -m755 "$(WORKSRC)/$$BINARY/$$BINARY" "$(DESTDIR)$(bindir)"; \
+		[ ! -f "$(WORKSRC)/src/$$BINARY/$$BINARY.1" ] || \
+			ginstall -p -m644 "$(WORKSRC)/src/$$BINARY/$$BINARY.1" "$(DESTDIR)$(mandir)/man1"; \
+	done	
+	 
+	ginstall -d "$(DESTDIR)$(docdir)/imap"
+	for FILE in "$(WORKSRC)/docs"/*; do \
+		[ ! -f "$$FILE" ] || ginstall -p -m 644 "$$FILE" "$(DESTDIR)$(docdir)/imap/"; \
+	done
+	ginstall -p -m644 "$(FILEDIR)/README.CSW" "$(DESTDIR)$(docdir)/imap/"
+	
+	ginstall -d "$(DESTDIR)$(sysconfdir)/pkg/CSWimap"
+	for INETCONF in pop2 pop3 pop3s imap imaps; do \
+		ginstall -p -m644 "$(FILEDIR)/CSWimap.$$INETCONF.inetd.conf" \
+			"$(DESTDIR)$(sysconfdir)/pkg/CSWimap/$$INETCONF.inetd.conf"; \
+	done
+	ginstall -p -m644 "$(FILEDIR)/CSWimap.services" "$(DESTDIR)$(sysconfdir)/pkg/CSWimap/services"
+	
+	@$(MAKECOOKIE)
+
+install-libc-client:
 	ginstall -d $(DESTDIR)$(libdir)
 	ginstall -p -m644 $(WORKSRC)/c-client/c-client.a $(DESTDIR)$(libdir)
 	ginstall -p -m755 \
@@ -69,5 +122,5 @@
 	ginstall -p -m644 $(WORKSRC)/c-client/linkage.c $(DESTDIR)$(includedir)/imap
 	ginstall -p -m644 \
 		$(WORKSRC)/src/osdep/tops-20/shortsym.h $(DESTDIR)$(includedir)/imap
-	cd $(DESTDIR)$(libdir); ln -s libc-client.$(VERSION).so libc-client.so
+	cd $(DESTDIR)$(libdir); ln -sf libc-client.$(VERSION).so libc-client.so
 	@$(MAKECOOKIE)

Added: csw/mgar/pkg/imap-c-client/trunk/files/0003-Make-news-active-file-path-opencsw-compliant.patch
===================================================================
--- csw/mgar/pkg/imap-c-client/trunk/files/0003-Make-news-active-file-path-opencsw-compliant.patch	                        (rev 0)
+++ csw/mgar/pkg/imap-c-client/trunk/files/0003-Make-news-active-file-path-opencsw-compliant.patch	2013-04-15 04:54:57 UTC (rev 20710)
@@ -0,0 +1,25 @@
+From cc1c1834c7e3737316bd0ffba9e0cc726a1052b4 Mon Sep 17 00:00:00 2001
+From: Yann Rouillard <yann at pleiades.fr.eu.org>
+Date: Sun, 14 Apr 2013 21:43:34 +0200
+Subject: [PATCH] Make news active file path opencsw compliant
+
+---
+ imap-2007f/src/osdep/unix/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/imap-2007f/src/osdep/unix/Makefile b/imap-2007f/src/osdep/unix/Makefile
+index fd89c18..77ea0d8 100644
+--- a/imap-2007f/src/osdep/unix/Makefile
++++ b/imap-2007f/src/osdep/unix/Makefile
+@@ -728,7 +728,7 @@ soc:	os_sol.h	# Solaris with cc
+ 	$(BUILD) `$(CAT) SPECIALS` OS=sol \
+ 	 SIGTYPE=psx CHECKPW=psx CRXTYPE=nfs \
+ 	 SPOOLDIR=/var/spool MAILSPOOL=/var/mail \
+-	 ACTIVEFILE=/usr/share/news/active \
++	 ACTIVEFILE=/var/opt/csw/news/active \
+ 	 RSHPATH=/usr/bin/rsh \
+ 	 BASECFLAGS="$(CFLAGS)" \
+ 	 BASELDFLAGS="-lsocket -lnsl -lgen" \
+-- 
+1.8.1.4
+

Added: csw/mgar/pkg/imap-c-client/trunk/files/CSWimap.imap.inetd.conf
===================================================================
--- csw/mgar/pkg/imap-c-client/trunk/files/CSWimap.imap.inetd.conf	                        (rev 0)
+++ csw/mgar/pkg/imap-c-client/trunk/files/CSWimap.imap.inetd.conf	2013-04-15 04:54:57 UTC (rev 20710)
@@ -0,0 +1 @@
+imap    stream  tcp     nowait  root    /opt/csw/sbin/imapd     imapd

Added: csw/mgar/pkg/imap-c-client/trunk/files/CSWimap.imaps.inetd.conf
===================================================================
--- csw/mgar/pkg/imap-c-client/trunk/files/CSWimap.imaps.inetd.conf	                        (rev 0)
+++ csw/mgar/pkg/imap-c-client/trunk/files/CSWimap.imaps.inetd.conf	2013-04-15 04:54:57 UTC (rev 20710)
@@ -0,0 +1 @@
+imaps   stream  tcp     nowait  root    /opt/csw/sbin/imapd     imapd

Added: csw/mgar/pkg/imap-c-client/trunk/files/CSWimap.pop2.inetd.conf
===================================================================
--- csw/mgar/pkg/imap-c-client/trunk/files/CSWimap.pop2.inetd.conf	                        (rev 0)
+++ csw/mgar/pkg/imap-c-client/trunk/files/CSWimap.pop2.inetd.conf	2013-04-15 04:54:57 UTC (rev 20710)
@@ -0,0 +1 @@
+pop2     stream  tcp     nowait  root    /opt/csw/sbin/ipop2d    ipop2d

Added: csw/mgar/pkg/imap-c-client/trunk/files/CSWimap.pop3.inetd.conf
===================================================================
--- csw/mgar/pkg/imap-c-client/trunk/files/CSWimap.pop3.inetd.conf	                        (rev 0)
+++ csw/mgar/pkg/imap-c-client/trunk/files/CSWimap.pop3.inetd.conf	2013-04-15 04:54:57 UTC (rev 20710)
@@ -0,0 +1 @@
+pop3    stream  tcp     nowait  root    /opt/csw/sbin/ipop3d    ipop3d

Added: csw/mgar/pkg/imap-c-client/trunk/files/CSWimap.pop3s.inetd.conf
===================================================================
--- csw/mgar/pkg/imap-c-client/trunk/files/CSWimap.pop3s.inetd.conf	                        (rev 0)
+++ csw/mgar/pkg/imap-c-client/trunk/files/CSWimap.pop3s.inetd.conf	2013-04-15 04:54:57 UTC (rev 20710)
@@ -0,0 +1 @@
+pop3s   stream  tcp     nowait  root    /opt/csw/sbin/ipop3d

Added: csw/mgar/pkg/imap-c-client/trunk/files/CSWimap.services
===================================================================
--- csw/mgar/pkg/imap-c-client/trunk/files/CSWimap.services	                        (rev 0)
+++ csw/mgar/pkg/imap-c-client/trunk/files/CSWimap.services	2013-04-15 04:54:57 UTC (rev 20710)
@@ -0,0 +1,4 @@
+pop2            109/tcp         pop-2           # Post Office Protocol - V2
+pop3            110/tcp                         # Post Office Protocol - Version 3
+imaps           993/tcp                         # SSL'd version of imap
+pop3s           995/tcp                         # SSL'd version of pop3

Added: csw/mgar/pkg/imap-c-client/trunk/files/README.CSW
===================================================================
--- csw/mgar/pkg/imap-c-client/trunk/files/README.CSW	                        (rev 0)
+++ csw/mgar/pkg/imap-c-client/trunk/files/README.CSW	2013-04-15 04:54:57 UTC (rev 20710)
@@ -0,0 +1,33 @@
+#     # #     #
+#     # #  #  #     #    #    #    ##    #####
+#     # #  #  #     #    ##  ##   #  #   #    #
+#     # #  #  #     #    # ## #  #    #  #    #
+#     # #  #  #     #    #    #  ######  #####
+#     # #  #  #     #    #    #  #    #  #
+ #####   ## ##      #    #    #  #    #  #
+
+How to install the imap client is to add the following lines to your 
+/etc/services and /etc/inetd.conf and restarting inetd. 
+
+Lines to add or check for existance in /etc/services:
+imap            143/tcp         imap2           # Internet Mail Access Protocol
+imaps           993/tcp                         # SSL'd version of imap
+pop3s           995/tcp                         # SSL'd version of pop3
+
+--- that is if you want both the pop and the imap server capability
+
+Lines to add or check for existance in /etc/inetd.conf(or added by postinstall):
+
+# Imap config for imap clients
+imap    stream  tcp     nowait  root    /opt/csw/sbin/imapd     imapd
+imaps   stream  tcp     nowait  root    /opt/csw/sbin/imapd     imapd
+
+# Pop3 config for pop3 clients
+pop     stream  tcp     nowait  root    /opt/csw/sbin/ipop2d    ipop2d
+pop3    stream  tcp     nowait  root    /opt/csw/sbin/ipop3d    ipop3d
+pop3s   stream  tcp     nowait  root    /opt/csw/sbin/ipop3d    ipop3d
+
+
+Now find your inetd service running and restart it:
+example: pgrep inetd; (take id that returns and kill -HUP $ID)
+or proper way as required for statement find inetd process in /etc/rc*.d scriptsor /etc/init.d/ scripts and restart it that way. 

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 Apr 15 08:24:19 2013
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Mon, 15 Apr 2013 06:24:19 +0000
Subject: [csw-devel] SF.net SVN: gar:[20711]
	csw/mgar/pkg/lang-python/mysql-python/trunk
Message-ID: <E1URcpv-0001O5-0N@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 20711
          http://gar.svn.sourceforge.net/gar/?rev=20711&view=rev
Author:   wahwah
Date:     2013-04-15 06:24:18 +0000 (Mon, 15 Apr 2013)
Log Message:
-----------
lang-python/mysql-python/trunk: Update to a new version, use MySQL in /opt/csw

Modified Paths:
--------------
    csw/mgar/pkg/lang-python/mysql-python/trunk/Makefile
    csw/mgar/pkg/lang-python/mysql-python/trunk/checksums

Property Changed:
----------------
    csw/mgar/pkg/lang-python/mysql-python/trunk/Makefile

Modified: csw/mgar/pkg/lang-python/mysql-python/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-python/mysql-python/trunk/Makefile	2013-04-15 04:54:57 UTC (rev 20710)
+++ csw/mgar/pkg/lang-python/mysql-python/trunk/Makefile	2013-04-15 06:24:18 UTC (rev 20711)
@@ -1,7 +1,7 @@
 # $Id$
 
 NAME = MySQL-python
-VERSION = 1.2.4b4
+VERSION = 1.2.4
 CATEGORIES = python
 GARTYPE = v2
 
@@ -10,29 +10,16 @@
 endef
 
 SF_PROJECT = $(call TOLOWER,$(NAME))
-MASTER_SITES = $(SF_MIRRORS)
-DISTFILES    = $(NAME)-$(VERSION).tar.gz
+# MASTER_SITES = $(SF_MIRRORS)
+DISTFILES    = $(DISTNAME).zip
 
 GARCOMPILER = SOS12U3
 
 PACKAGES = CSWpy-mysql
-CATALOGNAME_CSWpy-mysql = py_mysql
 RUNTIME_DEP_PKGS_CSWpy-mysql += CSWlibpython2-6-1-0
 RUNTIME_DEP_PKGS_CSWpy-mysql += CSWlibmysqlclient18
-
 SPKG_DESC_CSWpy-mysql = MySQL Support for Python
 
-OBSOLETED_BY_CSWpy-mysql = CSWpymysql
-CATALOGNAME_CSWpymysql = pymysql
-
-mysql_prefix = $(prefix)/mysql5
-mysql_bindir = $(mysql_prefix)/bin/$(ISA_DEFAULT_$(GARCH))
-
-CHECKPKG_OVERRIDES_CSWpymysql += surplus-dependency|CSWpython
-
 SKIPTEST = 1
 
 include gar/category.mk
-
-PATH       := $(mysql_bindir):$(PATH)
-export PATH 


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

Modified: csw/mgar/pkg/lang-python/mysql-python/trunk/checksums
===================================================================
--- csw/mgar/pkg/lang-python/mysql-python/trunk/checksums	2013-04-15 04:54:57 UTC (rev 20710)
+++ csw/mgar/pkg/lang-python/mysql-python/trunk/checksums	2013-04-15 06:24:18 UTC (rev 20711)
@@ -1 +1 @@
-0958cb9c23d5a656caac031c4886b1cf  MySQL-python-1.2.4b4.tar.gz
+ddf2386daf10a97af115ffad2ed4a9a0  MySQL-python-1.2.4.zip

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


From wahwah at users.sourceforge.net  Mon Apr 15 08:55:22 2013
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Mon, 15 Apr 2013 06:55:22 +0000
Subject: [csw-devel] SF.net SVN: gar:[20712]
	csw/mgar/pkg/lang-python/pyelftools/trunk/Makefile
Message-ID: <E1URdJy-00026A-RA@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 20712
          http://gar.svn.sourceforge.net/gar/?rev=20712&view=rev
Author:   wahwah
Date:     2013-04-15 06:55:22 +0000 (Mon, 15 Apr 2013)
Log Message:
-----------
lang-python/pyelftools/trunk: Build on 5.9 too

Modified Paths:
--------------
    csw/mgar/pkg/lang-python/pyelftools/trunk/Makefile

Modified: csw/mgar/pkg/lang-python/pyelftools/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-python/pyelftools/trunk/Makefile	2013-04-15 06:24:18 UTC (rev 20711)
+++ csw/mgar/pkg/lang-python/pyelftools/trunk/Makefile	2013-04-15 06:55:22 UTC (rev 20712)
@@ -12,6 +12,11 @@
 CATEGORIES = python
 DISTFILES  = $(DISTNAME).tar.gz
 
+# Since elftools are used for checkpkg, they need to be built for all
+# platforms on which we're building.
+PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386
+PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386
+
 PATCHFILES += 0001-Updated-list-of-e_machine-values.patch
 
 TEST_SCRIPTS =

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


From janholzh at users.sourceforge.net  Mon Apr 15 12:07:55 2013
From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net)
Date: Mon, 15 Apr 2013 10:07:55 +0000
Subject: [csw-devel] SF.net SVN: gar:[20713] csw/mgar/pkg
Message-ID: <E1URgKJ-0003CV-Vi@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 20713
          http://gar.svn.sourceforge.net/gar/?rev=20713&view=rev
Author:   janholzh
Date:     2013-04-15 10:07:55 +0000 (Mon, 15 Apr 2013)
Log Message:
-----------
mod_pubcookie: inital commit, install broken

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

Added: csw/mgar/pkg/mod_pubcookie/Makefile
===================================================================
--- csw/mgar/pkg/mod_pubcookie/Makefile	                        (rev 0)
+++ csw/mgar/pkg/mod_pubcookie/Makefile	2013-04-15 10:07:55 UTC (rev 20713)
@@ -0,0 +1,2 @@
+%:
+	$(MAKE) -C trunk $*


Property changes on: csw/mgar/pkg/mod_pubcookie/trunk
___________________________________________________________________
Added: svn:ignore
   + work


Added: csw/mgar/pkg/mod_pubcookie/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mod_pubcookie/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/mod_pubcookie/trunk/Makefile	2013-04-15 10:07:55 UTC (rev 20713)
@@ -0,0 +1,20 @@
+# $Id$
+# TODO (release-critical prefixed with !, non release-critical with *)
+#
+NAME = pubcookie
+VERSION = 3.3.4a
+GARTYPE = v2
+
+DESCRIPTION = Brief description
+define BLURB
+  Long description
+endef
+
+MASTER_SITES = http://www.pubcookie.org/downloads/
+DISTFILES  = $(DISTNAME).tar.gz
+
+CONFIGURE_ARGS = $(DIRPATHS) --enable-login --enable-ldap --enable-shadow --with-apxs=/opt/csw/apache2/sbin/apxs 
+
+SKIPTEST = 1
+include gar/category.mk
+


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

Added: csw/mgar/pkg/mod_pubcookie/trunk/checksums
===================================================================
--- csw/mgar/pkg/mod_pubcookie/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/mod_pubcookie/trunk/checksums	2013-04-15 10:07:55 UTC (rev 20713)
@@ -0,0 +1 @@
+1a1cdcb5495580313d83567d00929e0e  pubcookie-3.3.4a.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 Apr 15 13:32:38 2013
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Mon, 15 Apr 2013 11:32:38 +0000
Subject: [csw-devel] SF.net SVN: gar:[20714] csw/mgar/pkg
Message-ID: <E1URheI-0005Bk-TU@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 20714
          http://gar.svn.sourceforge.net/gar/?rev=20714&view=rev
Author:   dmichelsen
Date:     2013-04-15 11:32:38 +0000 (Mon, 15 Apr 2013)
Log Message:
-----------
exiftool: Update to 9.26 and drop dublicate Makefile

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

Removed Paths:
-------------
    csw/mgar/pkg/cpan/Image-ExifTool/

Modified: csw/mgar/pkg/exiftool/trunk/Makefile
===================================================================
--- csw/mgar/pkg/exiftool/trunk/Makefile	2013-04-15 10:07:55 UTC (rev 20713)
+++ csw/mgar/pkg/exiftool/trunk/Makefile	2013-04-15 11:32:38 UTC (rev 20714)
@@ -1,5 +1,5 @@
 NAME = exiftool
-VERSION = 8.54
+VERSION = 9.26
 CATEGORIES = cpan
 GARTYPE = v2
 
@@ -13,16 +13,17 @@
 
 MASTER_SITES = http://owl.phy.queensu.ca/~phil/exiftool/
 MODDIST =
-DISTFILES  = $(DISTNAME).tar.gz
-DISTFILES  += COPYING
+DISTFILES += $(DISTNAME).tar.gz
+DISTFILES += COPYING
 
-RUNTIME_DEP_PKGS += CSWpmiocompress 
+RUNTIME_DEP_PKGS += CSWpm-io-compress 
 
 UFILES_REGEX = Image-ExifTool-(\d+(?:\.\d+)*).tar.gz
 
-SPKG_SOURCEURL = http://owl.phy.queensu.ca/~phil/exiftool/
+VENDOR_URL = http://owl.phy.queensu.ca/~phil/exiftool/
 
 CONFIGURE_ARGS = $(DIRPATHS)
 
 ARCHALL = 1 
+
 include gar/category.mk

Modified: csw/mgar/pkg/exiftool/trunk/checksums
===================================================================
--- csw/mgar/pkg/exiftool/trunk/checksums	2013-04-15 10:07:55 UTC (rev 20713)
+++ csw/mgar/pkg/exiftool/trunk/checksums	2013-04-15 11:32:38 UTC (rev 20714)
@@ -1 +1 @@
-1027e84bc2f9ec51dd10c5b319930220  Image-ExifTool-8.54.tar.gz
+0dc385a72b1d9b618044040a69db1c33  Image-ExifTool-9.26.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 Apr 15 13:43:42 2013
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Mon, 15 Apr 2013 11:43:42 +0000
Subject: [csw-devel] SF.net SVN: gar:[20715] csw/mgar/pkg/nettle/trunk
Message-ID: <E1URhp0-00060v-3p@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 20715
          http://gar.svn.sourceforge.net/gar/?rev=20715&view=rev
Author:   dmichelsen
Date:     2013-04-15 11:43:41 +0000 (Mon, 15 Apr 2013)
Log Message:
-----------
nettle/trunk: Update to 2.6

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

Modified: csw/mgar/pkg/nettle/trunk/Makefile
===================================================================
--- csw/mgar/pkg/nettle/trunk/Makefile	2013-04-15 11:32:38 UTC (rev 20714)
+++ csw/mgar/pkg/nettle/trunk/Makefile	2013-04-15 11:43:41 UTC (rev 20715)
@@ -2,7 +2,7 @@
 # TODO (release-critical prefixed with !, non release-critical with *)
 #
 NAME = nettle
-VERSION = 2.5
+VERSION = 2.6
 GARTYPE = v2
 
 DESCRIPTION = A low-level cryptographic library
@@ -41,8 +41,10 @@
 # PKGFILES is catchall
 RUNTIME_DEP_PKGS_CSWlibnettle-utils += CSWlibhogweed2
 RUNTIME_DEP_PKGS_CSWlibnettle-utils += CSWlibnettle4
-RUNTIME_DEP_PKGS_CSWlibnettle-utils += CSWlibgmp10
 
+# This is just the default location
+CHECKPKG_OVERRIDES_CSWlibnettle-utils += file-with-bad-content|/usr/local|root/opt/csw/share/info/nettle.info
+
 BUILD64_LIBS_ONLY = 1
 
 CONFIGURE_ARGS += $(DIRPATHS)
@@ -52,7 +54,7 @@
 CONFIGURE_ARGS += --disable-assembler
 
 # This is the default install location after configure
-CHECKPKG_OVERRIDES_CSWlibnettle-utils += file-with-bad-content|/usr/local|root/opt/csw/share/info/nettle.info
+6HECKPKG_OVERRIDES_CSWlibnettle-utils += file-with-bad-content|/usr/local|root/opt/csw/share/info/nettle.info
 
 include gar/category.mk
 

Modified: csw/mgar/pkg/nettle/trunk/checksums
===================================================================
--- csw/mgar/pkg/nettle/trunk/checksums	2013-04-15 11:32:38 UTC (rev 20714)
+++ csw/mgar/pkg/nettle/trunk/checksums	2013-04-15 11:43:41 UTC (rev 20715)
@@ -1 +1 @@
-d66882e6ad31a9f651b73d7a1a93bd4c  nettle-2.5.tar.gz
+02f76b668855c4da67186c04cd3a222f  nettle-2.6.tar.gz

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


From pfelecan at users.sourceforge.net  Mon Apr 15 16:06:11 2013
From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net)
Date: Mon, 15 Apr 2013 14:06:11 +0000
Subject: [csw-devel] SF.net SVN: gar:[20716] csw/mgar/pkg/guile/trunk
Message-ID: <E1URk2t-00010D-00@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 20716
          http://gar.svn.sourceforge.net/gar/?rev=20716&view=rev
Author:   pfelecan
Date:     2013-04-15 14:06:10 +0000 (Mon, 15 Apr 2013)
Log Message:
-----------
guile/trunk: version bump

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

Modified: csw/mgar/pkg/guile/trunk/Makefile
===================================================================
--- csw/mgar/pkg/guile/trunk/Makefile	2013-04-15 11:43:41 UTC (rev 20715)
+++ csw/mgar/pkg/guile/trunk/Makefile	2013-04-15 14:06:10 UTC (rev 20716)
@@ -1,5 +1,5 @@
 NAME = guile
-VERSION = 2.0.7
+VERSION = 2.0.9
 GARTYPE = v2
 
 DESCRIPTION = GNU extensibility library

Modified: csw/mgar/pkg/guile/trunk/checksums
===================================================================
--- csw/mgar/pkg/guile/trunk/checksums	2013-04-15 11:43:41 UTC (rev 20715)
+++ csw/mgar/pkg/guile/trunk/checksums	2013-04-15 14:06:10 UTC (rev 20716)
@@ -1 +1 @@
-30ff9e94663a2e2098b52f8ce9d050b9  guile-2.0.7.tar.xz
+a69b575d4a633bdd9118f3a4a1e97766  guile-2.0.9.tar.xz

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


From pfelecan at users.sourceforge.net  Mon Apr 15 16:17:07 2013
From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net)
Date: Mon, 15 Apr 2013 14:17:07 +0000
Subject: [csw-devel] SF.net SVN: gar:[20717]
	csw/mgar/pkg/leocad/trunk/Makefile
Message-ID: <E1URkDT-0001Iq-UA@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 20717
          http://gar.svn.sourceforge.net/gar/?rev=20717&view=rev
Author:   pfelecan
Date:     2013-04-15 14:17:07 +0000 (Mon, 15 Apr 2013)
Log Message:
-----------
leocad/trunk: verified and validated overrides.

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

Modified: csw/mgar/pkg/leocad/trunk/Makefile
===================================================================
--- csw/mgar/pkg/leocad/trunk/Makefile	2013-04-15 14:06:10 UTC (rev 20716)
+++ csw/mgar/pkg/leocad/trunk/Makefile	2013-04-15 14:17:07 UTC (rev 20717)
@@ -32,6 +32,21 @@
 
 TEST_SCRIPTS		=
 
+RUNTIME_DEP_PKGS_CSWleocad	+=	CSWlibpng15-15
+RUNTIME_DEP_PKGS_CSWleocad	+=	CSWlibgdk-x11-2-0-0
+RUNTIME_DEP_PKGS_CSWleocad	+=	CSWlibgdk-pixbuf2-0-0
+RUNTIME_DEP_PKGS_CSWleocad	+=	CSWlibz1
+RUNTIME_DEP_PKGS_CSWleocad	+=	CSWlibgobject2-0-0
+RUNTIME_DEP_PKGS_CSWleocad	+=	CSWlibstdc++6
+RUNTIME_DEP_PKGS_CSWleocad	+=	CSWlibglib2-0-0
+RUNTIME_DEP_PKGS_CSWleocad	+=	CSWpango
+RUNTIME_DEP_PKGS_CSWleocad	+=	CSWlibgtk-x11-2-0-0
+RUNTIME_DEP_PKGS_CSWleocad	+=	CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWleocad	+=	CSWlibjpeg7
+
+REINPLACE_WHEN_USRSHARE	=	postinstall
+REINPLACE_USRSHARE		+=	/opt/csw/share/man/man1/leocad.1
+
 include gar/category.mk
 
 PATH := /opt/csw/gnu:/opt/csw/libexec/flex-2.5.35/bin:$(PATH)

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


From dmichelsen at users.sourceforge.net  Mon Apr 15 16:17:32 2013
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Mon, 15 Apr 2013 14:17:32 +0000
Subject: [csw-devel] SF.net SVN: gar:[20718]
	csw/mgar/pkg/cpan/Date-Calc/trunk/Makefile
Message-ID: <E1URkDs-0003Il-Ji@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 20718
          http://gar.svn.sourceforge.net/gar/?rev=20718&view=rev
Author:   dmichelsen
Date:     2013-04-15 14:17:32 +0000 (Mon, 15 Apr 2013)
Log Message:
-----------
cpan/Date-Calc/trunk: Sanitize package name and move to makemake

Modified Paths:
--------------
    csw/mgar/pkg/cpan/Date-Calc/trunk/Makefile

Modified: csw/mgar/pkg/cpan/Date-Calc/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Date-Calc/trunk/Makefile	2013-04-15 14:17:07 UTC (rev 20717)
+++ csw/mgar/pkg/cpan/Date-Calc/trunk/Makefile	2013-04-15 14:17:32 UTC (rev 20718)
@@ -4,19 +4,20 @@
 GARTYPE = v2
 AUTHOR = STBEY
 
-DESCRIPTION = Gregorian calendar date calculations.
+DESCRIPTION = Gregorian calendar date calculations
 define BLURB
-  This package consists of a C library and a Perl module (which uses the C
-  library, internally) for all kinds of date calculations based on the
-  Gregorian calendar (the one used in all western countries today), thereby
-  complying with all relevant norms and standards: ISO/R 2015-1971, DIN 1355
-  and, to some extent, ISO 8601 (where applicable).
 endef
 
-PACKAGES = CSWpmdatecalc
-CATALOGNAME = pm_datecalc
+CATALOG_RELEASE = unstable
 
-BUILD_DEP_PKGS = CSWpmbitvec CSWpmcarpclan
-REQUIRES = CSWpmbitvec CSWpmcarpclan
+LICENSE_TEXT = This module is licensed under the perl license
 
+PACKAGES += CSWpm-date-calc
+CATALOGNAME_CSWpm-date-calc = pm_date_calc
+SPKG_DESC_CSWpm-date-calc = Gregorian calendar date calculations
+RUNTIME_DEP_PKGS_CSWpm-date-calc += CSWpm-bit-vector
+RUNTIME_DEP_PKGS_CSWpm-date-calc += CSWpm-carp-clan
+OBSOLETED_BY_CSWpm-date-calc += CSWpmdatecalc
+CATALOGNAME_CSWpmdatecalc = pm_datecalc_stub
+
 include gar/category.mk

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


From wilbury at users.sourceforge.net  Mon Apr 15 16:18:43 2013
From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net)
Date: Mon, 15 Apr 2013 14:18:43 +0000
Subject: [csw-devel] SF.net SVN: gar:[20719] csw/mgar/pkg
Message-ID: <E1URkF1-0003Ly-C8@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 20719
          http://gar.svn.sourceforge.net/gar/?rev=20719&view=rev
Author:   wilbury
Date:     2013-04-15 14:18:43 +0000 (Mon, 15 Apr 2013)
Log Message:
-----------
php5_memcached/trunk: Initial commit.

Added Paths:
-----------
    csw/mgar/pkg/php5_memcached/
    csw/mgar/pkg/php5_memcached/Makefile
    csw/mgar/pkg/php5_memcached/branches/
    csw/mgar/pkg/php5_memcached/tags/
    csw/mgar/pkg/php5_memcached/trunk/
    csw/mgar/pkg/php5_memcached/trunk/Makefile
    csw/mgar/pkg/php5_memcached/trunk/checksums
    csw/mgar/pkg/php5_memcached/trunk/files/
    csw/mgar/pkg/php5_memcached/trunk/files/0001-Use-proper-libmemcached-headers-dir.patch
    csw/mgar/pkg/php5_memcached/trunk/files/0002-Include-proper-memcached.h.patch

Added: csw/mgar/pkg/php5_memcached/Makefile
===================================================================
--- csw/mgar/pkg/php5_memcached/Makefile	                        (rev 0)
+++ csw/mgar/pkg/php5_memcached/Makefile	2013-04-15 14:18:43 UTC (rev 20719)
@@ -0,0 +1,2 @@
+%:
+	$(MAKE) -C trunk $*


Property changes on: csw/mgar/pkg/php5_memcached/trunk
___________________________________________________________________
Added: svn:ignore
   + work


Added: csw/mgar/pkg/php5_memcached/trunk/Makefile
===================================================================
--- csw/mgar/pkg/php5_memcached/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/php5_memcached/trunk/Makefile	2013-04-15 14:18:43 UTC (rev 20719)
@@ -0,0 +1,83 @@
+# $Id$
+#
+NAME = memcached
+VERSION = 2.1.0
+GARTYPE = v2
+
+# to match php5
+PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
+
+DESCRIPTION = memcached Extention for PHP
+define BLURB
+	The Alternative PHP Cache (APC) is a free and open opcode cache for PHP.
+	It was conceived of to provide a free, open, and robust framework 
+	for caching and optimizing PHP intermediate code. 
+endef
+
+PHP_PREFIX = $(prefix)/php5
+PHP_BIN = $(PHP_PREFIX)/bin
+
+PHP5_EXT = 1
+
+PHP5ROOT    = $(DESTDIR)/$(PHP_PREFIX)
+STRIP_DIRS += $(PHP5ROOT)/lib/php/extensions/*/
+STRIP_DIRS += $(PHP5ROOT)/bin
+
+SPKG_SOURCEURL = http://us.php.net/memcached/
+MASTER_SITES = http://pecl.php.net/get/
+UFILES_REGEX = (\d+(?:\.\d+)*).tgz
+
+DISTFILES = $(DISTNAME).tgz
+PATCHFILES += 0001-Use-proper-libmemcached-headers-dir.patch
+PATCHFILES += 0002-Include-proper-memcached.h.patch
+
+GARCOMPILER = GNU
+
+PACKAGES = CSWphp5-memcached
+OBSOLETED_BY_CSWphp5-memcached = CSWphp5memcached
+CATALOG_NAME_CSWphp5memcached = php5_memcached_stub
+SPKG_DESC_CSWphp5-memcached = APC Extention for PHP5
+RUNTIME_DEP_PKGS_CSWphp5-memcached = CSWphp5
+BUILD_DEPS_CSWphp5-memcached = CSWapache2 CSWphp5-dev
+RUNTIME_DEP_PKGS_CSWphp5-memcached += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWphp5-memcached += CSWlibmemcached8
+RUNTIME_DEP_PKGS_CSWphp5-memcached += CSWlibz1
+
+CONFIGURE_ARGS  = $(DIRPATHS)
+CONFIGURE_ARGS += --with-php-config=$(bindir)/php-config
+CONFIGURE_ARGS += --enable-memcached=shared
+CONFIGURE_ARGS += --with-libmemcached-dir=shared,$(prefix)
+CONFIGURE_ARGS += --enable-memcached-json
+
+LICENSE = LICENSE
+
+# Build flags
+EXTRA_CFLAGS += "-I$(predix)/include/libmemcached"
+
+# These should stop the test suite from asking to send results by
+# mail.
+NO_INTERACTION = 1
+EXTRA_TEST_EXPORTS = NO_INTERACTION
+
+# this thing doesn't use destdir.  export install_root with the same
+# value
+INSTALL_ROOT = $(DESTDIR)
+EXTRA_INSTALL_EXPORTS = INSTALL_ROOT
+
+TEST_TARGET = test
+
+CHECKPKG_OVERRIDES_CSWphp5-memcahcewd += surplus-dependency|CSWphp5
+
+include gar/category.mk
+
+# these are after the include so GARCH is set.
+# attempting to get a usable build on sparc:
+# https://bugs.php.net/bug.php?id=59100
+ifeq ($(GARCH),sparc)
+EXTRA_CFLAGS = -xmemalign=1i
+endif
+
+
+post-extract-isa-$(ISA_DEFAULT_$(GARCH)):
+	@( cd $(WORKSRC) ; $(PHP_BIN)/phpize )
+	@$(MAKECOOKIE)


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

Added: csw/mgar/pkg/php5_memcached/trunk/checksums
===================================================================
--- csw/mgar/pkg/php5_memcached/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/php5_memcached/trunk/checksums	2013-04-15 14:18:43 UTC (rev 20719)
@@ -0,0 +1 @@
+daf070aad13bebffdff50acf6e93043c  memcached-2.1.0.tgz

Added: csw/mgar/pkg/php5_memcached/trunk/files/0001-Use-proper-libmemcached-headers-dir.patch
===================================================================
--- csw/mgar/pkg/php5_memcached/trunk/files/0001-Use-proper-libmemcached-headers-dir.patch	                        (rev 0)
+++ csw/mgar/pkg/php5_memcached/trunk/files/0001-Use-proper-libmemcached-headers-dir.patch	2013-04-15 14:18:43 UTC (rev 20719)
@@ -0,0 +1,25 @@
+From 958bc636ff85ff12071ef24d5db5e6f21019ad4f Mon Sep 17 00:00:00 2001
+From: Juraj Lutter <wilbury at opencsw.org>
+Date: Mon, 15 Apr 2013 15:46:44 +0200
+Subject: [PATCH] Use proper libmemcached headers dir.
+
+---
+ configure | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure b/configure
+index 6cd4bb9..3015af7 100755
+--- a/configure
++++ b/configure
+@@ -5154,7 +5154,7 @@ $as_echo "$memcached_enable_sasl" >&6; }
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libmemcached location" >&5
+ $as_echo_n "checking for libmemcached location... " >&6; }
+   if test "$PHP_LIBMEMCACHED_DIR" != "no" && test "$PHP_LIBMEMCACHED_DIR" != "yes"; then
+-    if ! test -r "$PHP_LIBMEMCACHED_DIR/include/libmemcached-1.0/memcached.h"; then
++    if ! test -r "$PHP_LIBMEMCACHED_DIR/include/libmemcached/memcached.h"; then
+       as_fn_error $? "Can't find libmemcached 1.0.x headers under \"$PHP_LIBMEMCACHED_DIR\"" "$LINENO" 5
+     fi
+   else
+-- 
+1.8.1.4
+

Added: csw/mgar/pkg/php5_memcached/trunk/files/0002-Include-proper-memcached.h.patch
===================================================================
--- csw/mgar/pkg/php5_memcached/trunk/files/0002-Include-proper-memcached.h.patch	                        (rev 0)
+++ csw/mgar/pkg/php5_memcached/trunk/files/0002-Include-proper-memcached.h.patch	2013-04-15 14:18:43 UTC (rev 20719)
@@ -0,0 +1,24 @@
+From b60beed92d4d9eca62a718a4c1fe1b5d18abb03b Mon Sep 17 00:00:00 2001
+From: Juraj Lutter <wilbury at opencsw.org>
+Date: Mon, 15 Apr 2013 15:52:58 +0200
+Subject: [PATCH] Include proper memcached.h
+
+---
+ php_libmemcached_compat.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/php_libmemcached_compat.h b/php_libmemcached_compat.h
+index 6e5f58b..fc6ee7d 100644
+--- a/php_libmemcached_compat.h
++++ b/php_libmemcached_compat.h
+@@ -2,6 +2,6 @@
+ #define PHP_LIBMEMCACHED_COMPAT
+ 
+ /* this is the version(s) we support */
+-#include <libmemcached-1.0/memcached.h>
++#include <libmemcached/memcached.h>
+ 
+ #endif
+-- 
+1.8.1.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  Mon Apr 15 16:27:13 2013
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Mon, 15 Apr 2013 14:27:13 +0000
Subject: [csw-devel] SF.net SVN: gar:[20720]
	csw/mgar/pkg/cpan/Date-Calc/trunk/Makefile
Message-ID: <E1URkNF-0003Wn-Tk@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 20720
          http://gar.svn.sourceforge.net/gar/?rev=20720&view=rev
Author:   dmichelsen
Date:     2013-04-15 14:27:13 +0000 (Mon, 15 Apr 2013)
Log Message:
-----------
cpan/Date-Calc/trunk: Make ARCHALL

Modified Paths:
--------------
    csw/mgar/pkg/cpan/Date-Calc/trunk/Makefile

Modified: csw/mgar/pkg/cpan/Date-Calc/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Date-Calc/trunk/Makefile	2013-04-15 14:18:43 UTC (rev 20719)
+++ csw/mgar/pkg/cpan/Date-Calc/trunk/Makefile	2013-04-15 14:27:13 UTC (rev 20720)
@@ -15,6 +15,7 @@
 PACKAGES += CSWpm-date-calc
 CATALOGNAME_CSWpm-date-calc = pm_date_calc
 SPKG_DESC_CSWpm-date-calc = Gregorian calendar date calculations
+ARCHALL_CSWpm-date-calc = 1
 RUNTIME_DEP_PKGS_CSWpm-date-calc += CSWpm-bit-vector
 RUNTIME_DEP_PKGS_CSWpm-date-calc += CSWpm-carp-clan
 OBSOLETED_BY_CSWpm-date-calc += CSWpmdatecalc

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


From wilbury at users.sourceforge.net  Mon Apr 15 16:51:50 2013
From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net)
Date: Mon, 15 Apr 2013 14:51:50 +0000
Subject: [csw-devel] SF.net SVN: gar:[20721] csw/mgar/pkg
Message-ID: <E1URkl4-00044w-Qh@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 20721
          http://gar.svn.sourceforge.net/gar/?rev=20721&view=rev
Author:   wilbury
Date:     2013-04-15 14:51:50 +0000 (Mon, 15 Apr 2013)
Log Message:
-----------
php5_memcache/trunk: Initial commit.

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

Added: csw/mgar/pkg/php5_memcache/Makefile
===================================================================
--- csw/mgar/pkg/php5_memcache/Makefile	                        (rev 0)
+++ csw/mgar/pkg/php5_memcache/Makefile	2013-04-15 14:51:50 UTC (rev 20721)
@@ -0,0 +1,2 @@
+%:
+	$(MAKE) -C trunk $*


Property changes on: csw/mgar/pkg/php5_memcache/trunk
___________________________________________________________________
Added: svn:ignore
   + work


Added: csw/mgar/pkg/php5_memcache/trunk/Makefile
===================================================================
--- csw/mgar/pkg/php5_memcache/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/php5_memcache/trunk/Makefile	2013-04-15 14:51:50 UTC (rev 20721)
@@ -0,0 +1,79 @@
+# $Id$
+#
+NAME = memcache
+VERSION = 2.2.7
+GARTYPE = v2
+
+# to match php5
+PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
+
+DESCRIPTION = memcache Extention for PHP
+define BLURB
+	The Alternative PHP Cache (APC) is a free and open opcode cache for PHP.
+	It was conceived of to provide a free, open, and robust framework 
+	for caching and optimizing PHP intermediate code. 
+endef
+
+PHP_PREFIX = $(prefix)/php5
+PHP_BIN = $(PHP_PREFIX)/bin
+
+PHP5_EXT = 1
+
+PHP5ROOT    = $(DESTDIR)/$(PHP_PREFIX)
+STRIP_DIRS += $(PHP5ROOT)/lib/php/extensions/*/
+STRIP_DIRS += $(PHP5ROOT)/bin
+
+SPKG_SOURCEURL = http://us.php.net/memcache/
+MASTER_SITES = http://pecl.php.net/get/
+UFILES_REGEX = (\d+(?:\.\d+)*).tgz
+
+DISTFILES = $(DISTNAME).tgz
+
+GARCOMPILER = GNU
+
+PACKAGES = CSWphp5-memcache
+OBSOLETED_BY_CSWphp5-memcache = CSWphp5memcache
+CATALOG_NAME_CSWphp5memcache = php5_memcache_stub
+SPKG_DESC_CSWphp5-memcache = APC Extention for PHP5
+RUNTIME_DEP_PKGS_CSWphp5-memcache = CSWphp5
+BUILD_DEPS_CSWphp5-memcache = CSWapache2 CSWphp5-dev
+RUNTIME_DEP_PKGS_CSWphp5-memcache += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWphp5-memcache += CSWlibmemcache8
+RUNTIME_DEP_PKGS_CSWphp5-memcache += CSWlibz1
+
+CONFIGURE_ARGS  = $(DIRPATHS)
+CONFIGURE_ARGS += --with-php-config=$(bindir)/php-config
+CONFIGURE_ARGS += --enable-memcache=shared,/opt/csw
+
+LICENSE = LICENSE
+
+# Build flags
+EXTRA_CFLAGS += "-I$(predix)/include/libmemcache"
+
+# These should stop the test suite from asking to send results by
+# mail.
+NO_INTERACTION = 1
+EXTRA_TEST_EXPORTS = NO_INTERACTION
+
+# this thing doesn't use destdir.  export install_root with the same
+# value
+INSTALL_ROOT = $(DESTDIR)
+EXTRA_INSTALL_EXPORTS = INSTALL_ROOT
+
+TEST_TARGET = test
+
+CHECKPKG_OVERRIDES_CSWphp5-memcahcewd += surplus-dependency|CSWphp5
+
+include gar/category.mk
+
+# these are after the include so GARCH is set.
+# attempting to get a usable build on sparc:
+# https://bugs.php.net/bug.php?id=59100
+ifeq ($(GARCH),sparc)
+EXTRA_CFLAGS = -xmemalign=1i
+endif
+
+
+post-extract-isa-$(ISA_DEFAULT_$(GARCH)):
+	@( cd $(WORKSRC) ; $(PHP_BIN)/phpize )
+	@$(MAKECOOKIE)


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

Added: csw/mgar/pkg/php5_memcache/trunk/checksums
===================================================================
--- csw/mgar/pkg/php5_memcache/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/php5_memcache/trunk/checksums	2013-04-15 14:51:50 UTC (rev 20721)
@@ -0,0 +1 @@
+171e3f51a9afe18b76348ddf1c952141  memcache-2.2.7.tgz

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


From wilbury at users.sourceforge.net  Mon Apr 15 16:52:53 2013
From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net)
Date: Mon, 15 Apr 2013 14:52:53 +0000
Subject: [csw-devel] SF.net SVN: gar:[20722]
	csw/mgar/pkg/php5_memcache/trunk/Makefile
Message-ID: <E1URkm5-00045f-O1@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 20722
          http://gar.svn.sourceforge.net/gar/?rev=20722&view=rev
Author:   wilbury
Date:     2013-04-15 14:52:53 +0000 (Mon, 15 Apr 2013)
Log Message:
-----------
php5_memcache/trunk: Specify license.

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

Modified: csw/mgar/pkg/php5_memcache/trunk/Makefile
===================================================================
--- csw/mgar/pkg/php5_memcache/trunk/Makefile	2013-04-15 14:51:50 UTC (rev 20721)
+++ csw/mgar/pkg/php5_memcache/trunk/Makefile	2013-04-15 14:52:53 UTC (rev 20722)
@@ -40,6 +40,7 @@
 RUNTIME_DEP_PKGS_CSWphp5-memcache += CSWlibgcc-s1
 RUNTIME_DEP_PKGS_CSWphp5-memcache += CSWlibmemcache8
 RUNTIME_DEP_PKGS_CSWphp5-memcache += CSWlibz1
+LICENSE_TEXT = "PHP license"
 
 CONFIGURE_ARGS  = $(DIRPATHS)
 CONFIGURE_ARGS += --with-php-config=$(bindir)/php-config

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


From wilbury at users.sourceforge.net  Mon Apr 15 16:56:35 2013
From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net)
Date: Mon, 15 Apr 2013 14:56:35 +0000
Subject: [csw-devel] SF.net SVN: gar:[20723]
	csw/mgar/pkg/php5_memcache/trunk/Makefile
Message-ID: <E1URkpf-0004BR-A5@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 20723
          http://gar.svn.sourceforge.net/gar/?rev=20723&view=rev
Author:   wilbury
Date:     2013-04-15 14:56:35 +0000 (Mon, 15 Apr 2013)
Log Message:
-----------
php5_memcache/trunk: Specify license.

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

Modified: csw/mgar/pkg/php5_memcache/trunk/Makefile
===================================================================
--- csw/mgar/pkg/php5_memcache/trunk/Makefile	2013-04-15 14:52:53 UTC (rev 20722)
+++ csw/mgar/pkg/php5_memcache/trunk/Makefile	2013-04-15 14:56:35 UTC (rev 20723)
@@ -40,13 +40,12 @@
 RUNTIME_DEP_PKGS_CSWphp5-memcache += CSWlibgcc-s1
 RUNTIME_DEP_PKGS_CSWphp5-memcache += CSWlibmemcache8
 RUNTIME_DEP_PKGS_CSWphp5-memcache += CSWlibz1
-LICENSE_TEXT = "PHP license"
 
 CONFIGURE_ARGS  = $(DIRPATHS)
 CONFIGURE_ARGS += --with-php-config=$(bindir)/php-config
 CONFIGURE_ARGS += --enable-memcache=shared,/opt/csw
 
-LICENSE = LICENSE
+LICENSE = CREDITS
 
 # Build flags
 EXTRA_CFLAGS += "-I$(predix)/include/libmemcache"

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


From wilbury at users.sourceforge.net  Mon Apr 15 17:00:37 2013
From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net)
Date: Mon, 15 Apr 2013 15:00:37 +0000
Subject: [csw-devel] SF.net SVN: gar:[20724]
	csw/mgar/pkg/php5_memcache/trunk/Makefile
Message-ID: <E1URktZ-0004Gh-IU@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 20724
          http://gar.svn.sourceforge.net/gar/?rev=20724&view=rev
Author:   wilbury
Date:     2013-04-15 15:00:36 +0000 (Mon, 15 Apr 2013)
Log Message:
-----------
php5_memcache/trunk: Fix dependencies.

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

Modified: csw/mgar/pkg/php5_memcache/trunk/Makefile
===================================================================
--- csw/mgar/pkg/php5_memcache/trunk/Makefile	2013-04-15 14:56:35 UTC (rev 20723)
+++ csw/mgar/pkg/php5_memcache/trunk/Makefile	2013-04-15 15:00:36 UTC (rev 20724)
@@ -38,8 +38,6 @@
 RUNTIME_DEP_PKGS_CSWphp5-memcache = CSWphp5
 BUILD_DEPS_CSWphp5-memcache = CSWapache2 CSWphp5-dev
 RUNTIME_DEP_PKGS_CSWphp5-memcache += CSWlibgcc-s1
-RUNTIME_DEP_PKGS_CSWphp5-memcache += CSWlibmemcache8
-RUNTIME_DEP_PKGS_CSWphp5-memcache += CSWlibz1
 
 CONFIGURE_ARGS  = $(DIRPATHS)
 CONFIGURE_ARGS += --with-php-config=$(bindir)/php-config

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


From wilbury at users.sourceforge.net  Mon Apr 15 18:38:02 2013
From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net)
Date: Mon, 15 Apr 2013 16:38:02 +0000
Subject: [csw-devel] SF.net SVN: gar:[20725]
	csw/mgar/pkg/php5_memcached/trunk/Makefile
Message-ID: <E1URmPq-0006Gp-Cu@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 20725
          http://gar.svn.sourceforge.net/gar/?rev=20725&view=rev
Author:   wilbury
Date:     2013-04-15 16:38:02 +0000 (Mon, 15 Apr 2013)
Log Message:
-----------
php5_memcached/trunk: Do not use -xmemalign=11 on SPARC

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

Modified: csw/mgar/pkg/php5_memcached/trunk/Makefile
===================================================================
--- csw/mgar/pkg/php5_memcached/trunk/Makefile	2013-04-15 15:00:36 UTC (rev 20724)
+++ csw/mgar/pkg/php5_memcached/trunk/Makefile	2013-04-15 16:38:02 UTC (rev 20725)
@@ -70,14 +70,6 @@
 
 include gar/category.mk
 
-# these are after the include so GARCH is set.
-# attempting to get a usable build on sparc:
-# https://bugs.php.net/bug.php?id=59100
-ifeq ($(GARCH),sparc)
-EXTRA_CFLAGS = -xmemalign=1i
-endif
-
-
 post-extract-isa-$(ISA_DEFAULT_$(GARCH)):
 	@( cd $(WORKSRC) ; $(PHP_BIN)/phpize )
 	@$(MAKECOOKIE)

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


From wilbury at users.sourceforge.net  Mon Apr 15 18:39:49 2013
From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net)
Date: Mon, 15 Apr 2013 16:39:49 +0000
Subject: [csw-devel] SF.net SVN: gar:[20726]
	csw/mgar/pkg/php5_memcache/trunk/Makefile
Message-ID: <E1URmRZ-0006IX-LT@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 20726
          http://gar.svn.sourceforge.net/gar/?rev=20726&view=rev
Author:   wilbury
Date:     2013-04-15 16:39:49 +0000 (Mon, 15 Apr 2013)
Log Message:
-----------
php5_memcache/trunk: Do not set -xmemalign on SPARC

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

Modified: csw/mgar/pkg/php5_memcache/trunk/Makefile
===================================================================
--- csw/mgar/pkg/php5_memcache/trunk/Makefile	2013-04-15 16:38:02 UTC (rev 20725)
+++ csw/mgar/pkg/php5_memcache/trunk/Makefile	2013-04-15 16:39:49 UTC (rev 20726)
@@ -64,14 +64,6 @@
 
 include gar/category.mk
 
-# these are after the include so GARCH is set.
-# attempting to get a usable build on sparc:
-# https://bugs.php.net/bug.php?id=59100
-ifeq ($(GARCH),sparc)
-EXTRA_CFLAGS = -xmemalign=1i
-endif
-
-
 post-extract-isa-$(ISA_DEFAULT_$(GARCH)):
 	@( cd $(WORKSRC) ; $(PHP_BIN)/phpize )
 	@$(MAKECOOKIE)

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


From wilbury at users.sourceforge.net  Mon Apr 15 18:47:27 2013
From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net)
Date: Mon, 15 Apr 2013 16:47:27 +0000
Subject: [csw-devel] SF.net SVN: gar:[20727]
	csw/mgar/pkg/php5_memcached/trunk/Makefile
Message-ID: <E1URmYx-0006Rq-3x@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 20727
          http://gar.svn.sourceforge.net/gar/?rev=20727&view=rev
Author:   wilbury
Date:     2013-04-15 16:47:26 +0000 (Mon, 15 Apr 2013)
Log Message:
-----------
php5_memcached/trunk: Does not work on SPARC

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

Modified: csw/mgar/pkg/php5_memcached/trunk/Makefile
===================================================================
--- csw/mgar/pkg/php5_memcached/trunk/Makefile	2013-04-15 16:39:49 UTC (rev 20726)
+++ csw/mgar/pkg/php5_memcached/trunk/Makefile	2013-04-15 16:47:26 UTC (rev 20727)
@@ -5,7 +5,7 @@
 GARTYPE = v2
 
 # to match php5
-PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
+PACKAGING_PLATFORMS = solaris10-i386
 
 DESCRIPTION = memcached Extention for PHP
 define BLURB

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


From wilbury at users.sourceforge.net  Mon Apr 15 18:47:39 2013
From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net)
Date: Mon, 15 Apr 2013 16:47:39 +0000
Subject: [csw-devel] SF.net SVN: gar:[20728]
	csw/mgar/pkg/php5_memcache/trunk/Makefile
Message-ID: <E1URmZ9-0006SF-Ok@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 20728
          http://gar.svn.sourceforge.net/gar/?rev=20728&view=rev
Author:   wilbury
Date:     2013-04-15 16:47:39 +0000 (Mon, 15 Apr 2013)
Log Message:
-----------
php5_memcache/trunk: Does not work on SPARC

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

Modified: csw/mgar/pkg/php5_memcache/trunk/Makefile
===================================================================
--- csw/mgar/pkg/php5_memcache/trunk/Makefile	2013-04-15 16:47:26 UTC (rev 20727)
+++ csw/mgar/pkg/php5_memcache/trunk/Makefile	2013-04-15 16:47:39 UTC (rev 20728)
@@ -5,7 +5,7 @@
 GARTYPE = v2
 
 # to match php5
-PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
+PACKAGING_PLATFORMS = solaris10-i386
 
 DESCRIPTION = memcache Extention for PHP
 define BLURB

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 Apr 15 20:06:01 2013
From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net)
Date: Mon, 15 Apr 2013 18:06:01 +0000
Subject: [csw-devel] SF.net SVN: gar:[20729]
	csw/mgar/pkg/spamassassin/trunk/Makefile
Message-ID: <E1URnmz-0007KN-Kq@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 20729
          http://gar.svn.sourceforge.net/gar/?rev=20729&view=rev
Author:   bonivart
Date:     2013-04-15 18:06:01 +0000 (Mon, 15 Apr 2013)
Log Message:
-----------
spamassassin/trunk: rebuild without ssl dep

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

Modified: csw/mgar/pkg/spamassassin/trunk/Makefile
===================================================================
--- csw/mgar/pkg/spamassassin/trunk/Makefile	2013-04-15 16:47:39 UTC (rev 20728)
+++ csw/mgar/pkg/spamassassin/trunk/Makefile	2013-04-15 18:06:01 UTC (rev 20729)
@@ -16,13 +16,14 @@
 #DISTFILES  = $(SPKG_NAME)-$(VERSION)-rc3.tar.gz
 DISTFILES += COPYING
 
+WORKSRC = $(WORKDIR)/$(SPKG_NAME)-$(VERSION)
+SPKG_SOURCEURL = http://spamassassin.apache.org/
+
 RUNTIME_DEP_PKGS  = CSWgnupg
-RUNTIME_DEP_PKGS += CSWosslrt
 RUNTIME_DEP_PKGS += CSWperl
 RUNTIME_DEP_PKGS += CSWpm-dbi
 RUNTIME_DEP_PKGS += CSWpm-html-parser
 RUNTIME_DEP_PKGS += CSWpm-io-socket-inet6
-RUNTIME_DEP_PKGS += CSWpm-io-socket-ssl
 RUNTIME_DEP_PKGS += CSWpmiozlib
 RUNTIME_DEP_PKGS += CSWpmipcountry
 RUNTIME_DEP_PKGS += CSWpm-ldap
@@ -32,10 +33,10 @@
 RUNTIME_DEP_PKGS += CSWpmmailtools
 RUNTIME_DEP_PKGS += CSWpm-mime-base64
 RUNTIME_DEP_PKGS += CSWpm-netaddr-ip
-RUNTIME_DEP_PKGS += CSWpmnetdns
-RUNTIME_DEP_PKGS += CSWpmuri
+RUNTIME_DEP_PKGS += CSWpm-net-dns
+RUNTIME_DEP_PKGS += CSWpm-uri
 RUNTIME_DEP_PKGS += CSWrazor
-RUNTIME_DEP_PKGS += CSWzlib
+RUNTIME_DEP_PKGS += CSWlibz1
 
 SAMPLECONF  = /etc/opt/csw/spamassassin/.+\.pre\.CSW
 SAMPLECONF += /etc/opt/csw/spamassassin/local\.cf\.CSW
@@ -51,75 +52,44 @@
 CONFIGURE_SCRIPTS = custom
 BUILD_SCRIPTS     = custom
 TEST_SCRIPTS      = custom
-#TEST_SCRIPTS      = 
 INSTALL_SCRIPTS   = custom
 
-CHECKPKG_OVERRIDES_CSWspamassassin += surplus-dependency|CSWpmnetdns
+# Doc samples
+CHECKPKG_OVERRIDES_CSWspamassassin += file-with-bad-content
+# Checkpkg can't determine perl deps
+CHECKPKG_OVERRIDES_CSWspamassassin += surplus-dependency|CSWpmmaildkim
+CHECKPKG_OVERRIDES_CSWspamassassin += surplus-dependency|CSWpm-html-parser
 CHECKPKG_OVERRIDES_CSWspamassassin += surplus-dependency|CSWpm-mime-base64
 CHECKPKG_OVERRIDES_CSWspamassassin += surplus-dependency|CSWgnupg
 CHECKPKG_OVERRIDES_CSWspamassassin += surplus-dependency|CSWpm-netaddr-ip
 CHECKPKG_OVERRIDES_CSWspamassassin += surplus-dependency|CSWpm-ldap
 CHECKPKG_OVERRIDES_CSWspamassassin += surplus-dependency|CSWpm-dbi
-CHECKPKG_OVERRIDES_CSWspamassassin += surplus-dependency|CSWpm-io-socket-ssl
 CHECKPKG_OVERRIDES_CSWspamassassin += surplus-dependency|CSWpmmailspf
 CHECKPKG_OVERRIDES_CSWspamassassin += surplus-dependency|CSWrazor
-CHECKPKG_OVERRIDES_CSWspamassassin += surplus-dependency|CSWpmuri
 CHECKPKG_OVERRIDES_CSWspamassassin += surplus-dependency|CSWpm-io-socket-inet6
 CHECKPKG_OVERRIDES_CSWspamassassin += surplus-dependency|CSWpmmailtools
-CHECKPKG_OVERRIDES_CSWspamassassin += surplus-dependency|CSWzlib
 CHECKPKG_OVERRIDES_CSWspamassassin += surplus-dependency|CSWpm-libwww-perl
 CHECKPKG_OVERRIDES_CSWspamassassin += surplus-dependency|CSWpmiozlib
-CHECKPKG_OVERRIDES_CSWspamassassin += surplus-dependency|CSWosslrt
 CHECKPKG_OVERRIDES_CSWspamassassin += surplus-dependency|CSWpmipcountry
-CHECKPKG_OVERRIDES_CSWspamassassin += surplus-dependency|CSWpmmaildkim
-CHECKPKG_OVERRIDES_CSWspamassassin += surplus-dependency|CSWpm-html-parser
-CHECKPKG_OVERRIDES_CSWspamassassin += file-with-bad-content|/usr/local|root/opt/csw/bin/spamassassin
-CHECKPKG_OVERRIDES_CSWspamassassin += file-with-bad-content|/usr/local|root/opt/csw/share/perl/csw/Mail/SpamAssassin.pm
-CHECKPKG_OVERRIDES_CSWspamassassin += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/spamassassin.1
-CHECKPKG_OVERRIDES_CSWspamassassin += file-with-bad-content|/usr/local|root/opt/csw/share/doc/spamassassin/sql/README
-CHECKPKG_OVERRIDES_CSWspamassassin += file-with-bad-content|/usr/share|root/opt/csw/bin/spamd
-CHECKPKG_OVERRIDES_CSWspamassassin += file-with-bad-content|/usr/share|root/opt/csw/bin/spamassassin
-CHECKPKG_OVERRIDES_CSWspamassassin += file-with-bad-content|/usr/local|root/opt/csw/share/doc/spamassassin/README
-CHECKPKG_OVERRIDES_CSWspamassassin += file-with-bad-content|/usr/share|root/opt/csw/bin/sa-compile
-CHECKPKG_OVERRIDES_CSWspamassassin += file-with-bad-content|/usr/share|root/opt/csw/bin/sa-learn
-CHECKPKG_OVERRIDES_CSWspamassassin += file-with-bad-content|/usr/share|root/opt/csw/share/perl/csw/Mail/SpamAssassin/Util/DependencyInfo.pm
-CHECKPKG_OVERRIDES_CSWspamassassin += file-with-bad-content|/usr/share|root/opt/csw/share/perl/csw/Mail/SpamAssassin/Conf.pm
-CHECKPKG_OVERRIDES_CSWspamassassin += file-with-bad-content|/usr/share|root/opt/csw/share/perl/csw/spamassassin-run.pod
-CHECKPKG_OVERRIDES_CSWspamassassin += file-with-bad-content|/usr/share|root/opt/csw/share/perl/csw/Mail/SpamAssassin.pm
-CHECKPKG_OVERRIDES_CSWspamassassin += file-with-bad-content|/usr/share|root/opt/csw/share/perl/csw/Mail/SpamAssassin/Locales.pm
-CHECKPKG_OVERRIDES_CSWspamassassin += file-with-bad-content|/usr/share|root/opt/csw/share/man/man1/sa-learn.1
-CHECKPKG_OVERRIDES_CSWspamassassin += file-with-bad-content|/usr/share|root/opt/csw/share/man/man1/spamd.1
-CHECKPKG_OVERRIDES_CSWspamassassin += file-with-bad-content|/usr/share|root/opt/csw/share/man/man1/sa-compile.1
-CHECKPKG_OVERRIDES_CSWspamassassin += file-with-bad-content|/usr/share|root/opt/csw/share/man/man1/spamassassin.1
-CHECKPKG_OVERRIDES_CSWspamassassin += file-with-bad-content|/usr/share|root/opt/csw/share/man/man3/spamassassin-run.3perl
-CHECKPKG_OVERRIDES_CSWspamassassin += file-with-bad-content|/usr/share|root/opt/csw/share/man/man1/spamassassin-run.1
-CHECKPKG_OVERRIDES_CSWspamassassin += file-with-bad-content|/usr/share|root/opt/csw/share/man/man3/Mail::SpamAssassin::Conf.3perl
-CHECKPKG_OVERRIDES_CSWspamassassin += file-with-bad-content|/usr/share|root/opt/csw/share/doc/spamassassin/README
-CHECKPKG_OVERRIDES_CSWspamassassin += file-with-bad-content|/usr/share|root/opt/csw/share/doc/spamassassin/USAGE
+CHECKPKG_OVERRIDES_CSWspamassassin += surplus-dependency|CSWpm-uri
+CHECKPKG_OVERRIDES_CSWspamassassin += surplus-dependency|CSWpm-net-dns
+# Couldn't make this work...
+CHECKPKG_OVERRIDES_CSWspamassassin += no-direct-binding|/opt/csw/bin/spamc|is|not|directly|bound|to|soname|libz.so.1
 
 include gar/category.mk
 
-WORKSRC = $(WORKDIR)/$(SPKG_NAME)-$(VERSION)
-SPKG_SOURCEURL = http://spamassassin.apache.org/
-
-ifeq ($(shell uname -p), sparc)
-  SEDCFLAGS = -xarch=v8
-else
-  SEDCFLAGS = 
-endif
-
 configure-custom:
 	@echo " ==> Configuring $(NAME) (custom)"
 	@( cd $(WORKSRC) ; \
 	   perl Makefile.PL INSTALLDIRS=vendor DESTDIR=$(DESTDIR) CONFDIR=/etc/opt/csw/spamassassin LOCALSTATEDIR=/var/opt/csw/spamassassin CONTACT_ADDRESS=postmaster )
 	@$(MAKECOOKIE)
 
-pre-build-modulated:
-	@echo " ==> Pre-build $(NAME) (custom)"
-	@( cd $(WORKSRC)/spamc ; \
-	   sed 's/CFLAGS = /CFLAGS = $(SEDCFLAGS) /' Makefile.in > Makefile.tmp ; \
-	   cp Makefile.tmp Makefile.in )
-	@$(MAKECOOKIE)
+#pre-build-modulated:
+#	@echo " ==> Pre-build $(NAME) (custom)"
+#	@( cd $(WORKSRC)/spamc ; \
+#	   sed 's/LDFLAGS = /LDFLAGS = -Bdirect -z ignore /' Makefile.in > Makefile.tmp ; \
+#	   cp Makefile.tmp Makefile.in )
+#	@$(MAKECOOKIE)
 
 build-custom:
 	@echo " ==> Building $(NAME) (custom)"

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 Apr 15 23:22:52 2013
From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net)
Date: Mon, 15 Apr 2013 21:22:52 +0000
Subject: [csw-devel] SF.net SVN: gar:[20730]
	csw/mgar/pkg/spamassassin/trunk/Makefile
Message-ID: <E1URqrU-0004gX-Ov@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 20730
          http://gar.svn.sourceforge.net/gar/?rev=20730&view=rev
Author:   bonivart
Date:     2013-04-15 21:22:52 +0000 (Mon, 15 Apr 2013)
Log Message:
-----------
spamassassin/trunk: fix direct bind (Yann), use reinplace

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

Modified: csw/mgar/pkg/spamassassin/trunk/Makefile
===================================================================
--- csw/mgar/pkg/spamassassin/trunk/Makefile	2013-04-15 18:06:01 UTC (rev 20729)
+++ csw/mgar/pkg/spamassassin/trunk/Makefile	2013-04-15 21:22:52 UTC (rev 20730)
@@ -5,9 +5,6 @@
 
 DESCRIPTION = Mail filter with a wide range of tests
 define BLURB
-  SpamAssassin is a mail filter which attempts to identify spam using
-  a variety of mechanisms including text analysis, Bayesian filtering,
-  DNS blocklists, and collaborative filtering databases.
 endef
 
 MASTER_SITES = http://apache.dataphone.se/spamassassin/source/
@@ -54,8 +51,33 @@
 TEST_SCRIPTS      = custom
 INSTALL_SCRIPTS   = custom
 
-# Doc samples
-CHECKPKG_OVERRIDES_CSWspamassassin += file-with-bad-content
+REINPLACE_WHEN_USRSHARE = postinstall
+REINPLACE_USRSHARE += $(mandir)/man1/spamassassin.1
+REINPLACE_USRSHARE += $(mandir)/man1/sa-learn.1
+REINPLACE_USRSHARE += $(mandir)/man1/sa-compile.1
+REINPLACE_USRSHARE += $(mandir)/man1/spamd.1
+REINPLACE_USRSHARE += $(mandir)/man1/spamassassin-run.1
+REINPLACE_USRSHARE += $(mandir)/man3/spamassassin-run.3perl
+REINPLACE_USRSHARE += $(mandir)/man3/Mail::SpamAssassin::Conf.3perl
+REINPLACE_USRSHARE += $(bindir)/sa-compile
+REINPLACE_USRSHARE += $(bindir)/sa-learn
+REINPLACE_USRSHARE += $(bindir)/spamd
+REINPLACE_USRSHARE += $(bindir)/spamassassin
+REINPLACE_USRSHARE += $(docdir)/spamassassin/USAGE
+REINPLACE_USRSHARE += $(docdir)/spamassassin/README
+REINPLACE_USRSHARE += $(destdir)/opt/csw/share/perl/csw/spamassassin-run.pod
+REINPLACE_USRSHARE += $(destdir)/opt/csw/share/perl/csw/Mail/SpamAssassin.pm
+REINPLACE_USRSHARE += $(destdir)/opt/csw/share/perl/csw/Mail/SpamAssassin/Conf.pm
+REINPLACE_USRSHARE += $(destdir)/opt/csw/share/perl/csw/Mail/SpamAssassin/Locales.pm
+REINPLACE_USRSHARE += $(destdir)/opt/csw/share/perl/csw/Mail/SpamAssassin/Util/DependencyInfo.pm
+
+REINPLACE_WHEN_USRLOCAL = postinstall
+REINPLACE_USRLOCAL += $(destdir)/opt/csw/share/perl/csw/Mail/SpamAssassin.pm
+REINPLACE_USRLOCAL += $(docdir)/spamassassin/README
+REINPLACE_USRLOCAL += $(docdir)/spamassassin/sql/README
+REINPLACE_USRLOCAL += $(mandir)/man1/spamassassin.1
+REINPLACE_USRLOCAL += $(bindir)/spamassassin
+
 # Checkpkg can't determine perl deps
 CHECKPKG_OVERRIDES_CSWspamassassin += surplus-dependency|CSWpmmaildkim
 CHECKPKG_OVERRIDES_CSWspamassassin += surplus-dependency|CSWpm-html-parser
@@ -73,8 +95,6 @@
 CHECKPKG_OVERRIDES_CSWspamassassin += surplus-dependency|CSWpmipcountry
 CHECKPKG_OVERRIDES_CSWspamassassin += surplus-dependency|CSWpm-uri
 CHECKPKG_OVERRIDES_CSWspamassassin += surplus-dependency|CSWpm-net-dns
-# Couldn't make this work...
-CHECKPKG_OVERRIDES_CSWspamassassin += no-direct-binding|/opt/csw/bin/spamc|is|not|directly|bound|to|soname|libz.so.1
 
 include gar/category.mk
 
@@ -84,17 +104,10 @@
 	   perl Makefile.PL INSTALLDIRS=vendor DESTDIR=$(DESTDIR) CONFDIR=/etc/opt/csw/spamassassin LOCALSTATEDIR=/var/opt/csw/spamassassin CONTACT_ADDRESS=postmaster )
 	@$(MAKECOOKIE)
 
-#pre-build-modulated:
-#	@echo " ==> Pre-build $(NAME) (custom)"
-#	@( cd $(WORKSRC)/spamc ; \
-#	   sed 's/LDFLAGS = /LDFLAGS = -Bdirect -z ignore /' Makefile.in > Makefile.tmp ; \
-#	   cp Makefile.tmp Makefile.in )
-#	@$(MAKECOOKIE)
-
 build-custom:
 	@echo " ==> Building $(NAME) (custom)"
 	@( cd $(WORKSRC) ; \
-	   gmake )
+	   $(BUILD_ENV) gmake )
 	@$(MAKECOOKIE)
 
 test-custom:
@@ -106,8 +119,6 @@
 install-custom:
 	@echo " ==> Installing $(NAME) (custom)"
 	@rm -rf $(DESTDIR)
-#	@ginstall -m 755 -d $(DESTDIR)/opt/csw/etc/init.d
-#	@ginstall -m 755 $(FILEDIR)/CSWspamassassin.cswspamd $(DESTDIR)/opt/csw/etc/init.d/cswspamd
 	@ginstall -m 755 -d $(DESTDIR)/etc/opt/csw/init.d
 	@ginstall -m 755 $(FILEDIR)/CSWspamassassin.cswspamd $(DESTDIR)/etc/opt/csw/init.d/cswspamd
 	@ginstall -m 755 -d $(DESTDIR)/etc/opt/csw/pkg/CSWspamassassin

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


From pfelecan at users.sourceforge.net  Tue Apr 16 09:52:54 2013
From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net)
Date: Tue, 16 Apr 2013 07:52:54 +0000
Subject: [csw-devel] SF.net SVN: gar:[20731]
	csw/mgar/pkg/guile/trunk/Makefile
Message-ID: <E1US0hC-0002kj-IG@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 20731
          http://gar.svn.sourceforge.net/gar/?rev=20731&view=rev
Author:   pfelecan
Date:     2013-04-16 07:52:53 +0000 (Tue, 16 Apr 2013)
Log Message:
-----------
guile/trunk:
- split 2 new library packages as proposed by checkpkg
- verified and validated the new proposed overrides

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

Modified: csw/mgar/pkg/guile/trunk/Makefile
===================================================================
--- csw/mgar/pkg/guile/trunk/Makefile	2013-04-15 21:22:52 UTC (rev 20730)
+++ csw/mgar/pkg/guile/trunk/Makefile	2013-04-16 07:52:53 UTC (rev 20731)
@@ -91,13 +91,21 @@
 RUNTIME_DEP_PKGS_CSWlibguilereadline-v18-18		+=	CSWlibguile2-0-22
 RUNTIME_DEP_PKGS_CSWlibguilereadline-v18-18		+=	CSWlibunistring0
 RUNTIME_DEP_PKGS_CSWlibguilereadline-v18-18		+=	CSWlibgcc-s1
-# overrides for old libraries:
-CHECKPKG_OVERRIDES_CSWlibguilereadline-v18-18	+=	soname-unused|libncurses.so.5|is|needed|by|/opt/csw/lib/libguilereadline-v-12.so.12.3.0|but|never|used
-CHECKPKG_OVERRIDES_CSWlibguilereadline-v18-18	+=	no-direct-binding|/opt/csw/lib/libguilereadline-v-12.so.12.3.0|is|not|directly|bound|to|soname|libncurses.so.5
-CHECKPKG_OVERRIDES_CSWlibguilereadline-v18-18	+=	no-direct-binding|/opt/csw/lib/libguilereadline-v-12.so.12.3.0|is|not|directly|bound|to|soname|libguile.so.12
-CHECKPKG_OVERRIDES_CSWlibguilereadline-v18-18	+=	no-direct-binding|/opt/csw/lib/libguilereadline-v-12.so.12.3.0|is|not|directly|bound|to|soname|libreadline.so.5
-CHECKPKG_OVERRIDES_CSWlibguilereadline-v18-18 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libguilereadline-v-12.so.12.3.0|soname=libguilereadline-v-12.so.12|pkgname=CSWlibguilereadline-v18-18|expected=CSWlibguilereadline-v12-12
 
+PACKAGES							+=	CSWlibguile-ltdl1
+CATALOGNAME_CSWlibguile-ltdl1 		= libguile_ltdl1
+PKGFILES_CSWlibguile-ltdl1			+=	$(call baseisadirs,$(libdir),libguile-ltdl\.so\.1\.0\.0)
+PKGFILES_CSWlibguile-ltdl1			+=	$(call baseisadirs,$(libdir),libguile-ltdl\.so\.1(\.\d+)*)
+SPKG_DESC_CSWlibguile-ltdl1			+=	$(DESCRIPTION), libguile-ltdl.so.1
+RUNTIME_DEP_PKGS_CSWlibguile2-0-22	+=	CSWlibguile-ltdl1
+
+PACKAGES							+=	CSWlibguile12
+CATALOGNAME_CSWlibguile12 			= libguile12
+PKGFILES_CSWlibguile12				+=	$(call baseisadirs,$(libdir),libguile\.so\.12\.3\.0)
+PKGFILES_CSWlibguile12				+=	$(call baseisadirs,$(libdir),libguile\.so\.12(\.\d+)*)
+SPKG_DESC_CSWlibguile12				+=	$(DESCRIPTION), libguile.so.12
+RUNTIME_DEP_PKGS_CSWlibguile2-0-22	+=	CSWlibguile12
+
 PACKAGES						+=	CSWguile-dev
 CATALOGNAME_CSWguile-dev		=	guile_dev
 SPKG_DESC_CSWguile-dev			+=	$(DESCRIPTION), development files
@@ -114,6 +122,7 @@
 
 REINPLACE_WHEN_USRSHARE	=	postinstall
 REINPLACE_USRSHARE		+=	/opt/csw/share/guile/2.0/guile-procedures.txt
+REINPLACE_USRSHARE		+=	/opt/csw/share/guile/2.0/ice-9/slib.scm
 
 # this is part of libcharset1 which is built from iconv:
 EXTRA_MERGE_EXCLUDE_FILES	+=	/opt/csw/lib/charset.alias

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 Apr 16 10:11:37 2013
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Tue, 16 Apr 2013 08:11:37 +0000
Subject: [csw-devel] SF.net SVN: gar:[20732]
	csw/mgar/pkg/mailman/trunk/Makefile
Message-ID: <E1US0zJ-0002eE-Lp@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 20732
          http://gar.svn.sourceforge.net/gar/?rev=20732&view=rev
Author:   wahwah
Date:     2013-04-16 08:11:37 +0000 (Tue, 16 Apr 2013)
Log Message:
-----------
mailman/trunk: the mailman build system is doing horrible things

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

Modified: csw/mgar/pkg/mailman/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mailman/trunk/Makefile	2013-04-16 07:52:53 UTC (rev 20731)
+++ csw/mgar/pkg/mailman/trunk/Makefile	2013-04-16 08:11:37 UTC (rev 20732)
@@ -1,6 +1,10 @@
 # $Id$
 # TODO (release-critical prefixed with !, non release-critical with *)
 #
+# ! generally files are installed into wrong directories
+# ! some binaries installed into prefix/bin maybe shouldn't be installed there
+#   at all
+# ! Python modules are clearly installed in a wrong plac
 NAME = mailman
 VERSION = 2.1.15
 
@@ -15,13 +19,22 @@
 RUNTIME_DEP_PKGS_CSWmailman += CSWpython
 RUNTIME_DEP_PKGS_CSWmailman += CSWperl
 
+# The mailman build system puts files in all sorts of strange places
+prefix=$(BUILD_PREFIX)/$(NAME)
+
 CONFIGURE_ARGS += $(DIRPATHS)
 CONFIGURE_ARGS += --without-permcheck
+CONFIGURE_ARGS += --with-python=/opt/csw/bin/python2.6
 
 # There is no testsuite
 TEST_SCRIPTS =
 
 PYCOMPILE = 1
+EXTRA_MERGE_EXCLUDE_FILES = .*\.py[co]
 
+CHECKPKG_OVERRIDES_CSWmailman += binary-architecture-does-not-match-placement|file=opt/csw/mailman/mail/mailman|arch_id=18|arch_name=sparcv8+
+CHECKPKG_OVERRIDES_CSWmailman += file-with-bad-content|/usr/share|root/opt/csw/mailman/Mailman/Defaults.py
+CHECKPKG_OVERRIDES_CSWmailman += file-with-bad-content|/usr/local|root/opt/csw/mailman/messages/hu/README.hu
+
 include gar/category.mk
 

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


From wahwah at users.sourceforge.net  Tue Apr 16 10:31:45 2013
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Tue, 16 Apr 2013 08:31:45 +0000
Subject: [csw-devel] SF.net SVN: gar:[20733]
	csw/mgar/pkg/mailman/trunk/Makefile
Message-ID: <E1US1In-0005cL-FT@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 20733
          http://gar.svn.sourceforge.net/gar/?rev=20733&view=rev
Author:   wahwah
Date:     2013-04-16 08:31:45 +0000 (Tue, 16 Apr 2013)
Log Message:
-----------
mailman/trunk: Additional placement override. This is a temporary location, the package will not be released like this.

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

Modified: csw/mgar/pkg/mailman/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mailman/trunk/Makefile	2013-04-16 08:11:37 UTC (rev 20732)
+++ csw/mgar/pkg/mailman/trunk/Makefile	2013-04-16 08:31:45 UTC (rev 20733)
@@ -33,6 +33,7 @@
 EXTRA_MERGE_EXCLUDE_FILES = .*\.py[co]
 
 CHECKPKG_OVERRIDES_CSWmailman += binary-architecture-does-not-match-placement|file=opt/csw/mailman/mail/mailman|arch_id=18|arch_name=sparcv8+
+CHECKPKG_OVERRIDES_CSWmailman += binary-architecture-does-not-match-placement|file=opt/csw/mailman/mail/mailman|arch_id=3|arch_name=i386
 CHECKPKG_OVERRIDES_CSWmailman += file-with-bad-content|/usr/share|root/opt/csw/mailman/Mailman/Defaults.py
 CHECKPKG_OVERRIDES_CSWmailman += file-with-bad-content|/usr/local|root/opt/csw/mailman/messages/hu/README.hu
 

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 Apr 16 10:37:11 2013
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Tue, 16 Apr 2013 08:37:11 +0000
Subject: [csw-devel] SF.net SVN: gar:[20734] csw/mgar/pkg/diffstat/trunk
Message-ID: <E1US1O3-0003Kb-E9@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 20734
          http://gar.svn.sourceforge.net/gar/?rev=20734&view=rev
Author:   dmichelsen
Date:     2013-04-16 08:37:11 +0000 (Tue, 16 Apr 2013)
Log Message:
-----------
diffstat/trunk: Update to 1.57

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

Modified: csw/mgar/pkg/diffstat/trunk/Makefile
===================================================================
--- csw/mgar/pkg/diffstat/trunk/Makefile	2013-04-16 08:31:45 UTC (rev 20733)
+++ csw/mgar/pkg/diffstat/trunk/Makefile	2013-04-16 08:37:11 UTC (rev 20734)
@@ -1,5 +1,5 @@
 NAME = diffstat
-VERSION = 1.56
+VERSION = 1.57
 GARTYPE = v2
 
 DESCRIPTION = A utility which provides statistics based on the output of diff

Modified: csw/mgar/pkg/diffstat/trunk/checksums
===================================================================
--- csw/mgar/pkg/diffstat/trunk/checksums	2013-04-16 08:31:45 UTC (rev 20733)
+++ csw/mgar/pkg/diffstat/trunk/checksums	2013-04-16 08:37:11 UTC (rev 20734)
@@ -1 +1 @@
-3841a3831122674865d41be39d27052f  diffstat-1.56.tgz
+a70ae35e479ab91da7eb6023a4e9240a  diffstat-1.57.tgz

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


From dmichelsen at users.sourceforge.net  Tue Apr 16 11:09:45 2013
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Tue, 16 Apr 2013 09:09:45 +0000
Subject: [csw-devel] SF.net SVN: gar:[20735]
	csw/mgar/pkg/mod_pubcookie/trunk/Makefile
Message-ID: <E1US1tZ-0000dK-Dv@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 20735
          http://gar.svn.sourceforge.net/gar/?rev=20735&view=rev
Author:   dmichelsen
Date:     2013-04-16 09:09:45 +0000 (Tue, 16 Apr 2013)
Log Message:
-----------
mod_pubcookie/trunk: More adjustments

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

Modified: csw/mgar/pkg/mod_pubcookie/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mod_pubcookie/trunk/Makefile	2013-04-16 08:37:11 UTC (rev 20734)
+++ csw/mgar/pkg/mod_pubcookie/trunk/Makefile	2013-04-16 09:09:45 UTC (rev 20735)
@@ -5,16 +5,34 @@
 VERSION = 3.3.4a
 GARTYPE = v2
 
-DESCRIPTION = Brief description
-define BLURB
-  Long description
-endef
+DESCRIPTION = Open-source software for intra-institutional web authentication
 
-MASTER_SITES = http://www.pubcookie.org/downloads/
-DISTFILES  = $(DISTNAME).tar.gz
+MASTER_SITES += http://www.pubcookie.org/downloads/
+DISTFILES += $(DISTNAME).tar.gz
 
-CONFIGURE_ARGS = $(DIRPATHS) --enable-login --enable-ldap --enable-shadow --with-apxs=/opt/csw/apache2/sbin/apxs 
+VENDOR_URL = http://www.pubcookie.org
 
-SKIPTEST = 1
+AP2_ROOT      = $(prefix)/apache2
+AP2_LIBEXEC   = $(DESTDIR)$(AP2_ROOT)/libexec
+
+CONFIGURE_ARGS += $(DIRPATHS)
+CONFIGURE_ARGS += --enable-login
+CONFIGURE_ARGS += --enable-default-des
+#CONFIGURE_ARGS += --enable-krb5
+CONFIGURE_ARGS += --enable-ldap
+CONFIGURE_ARGS += --enable-shadow
+CONFIGURE_ARGS += --enable-apache
+CONFIGURE_ARGS += --with-apxs=/opt/csw/apache2/sbin/apxs 
+
+CONFIGURE_ARGS += --with-ssl=$(prefix)
+CONFIGURE_ARGS += --with-krb5-dir=$(prefix)
+CONFIGURE_ARGS += --with-ldap-dir=$(prefix)
+
+# The package does not provide a check
+#TEST_SCRIPTS =
+
+INSTALL_OVERRIDE_VARS = AP2_LIBEXEC
+INSTALL_OVERRIDE_VAR_AP2_LIBEXEC = $(AP2_LIBEXEC)
+
 include gar/category.mk
 

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


From pfelecan at users.sourceforge.net  Tue Apr 16 11:54:24 2013
From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net)
Date: Tue, 16 Apr 2013 09:54:24 +0000
Subject: [csw-devel] SF.net SVN: gar:[20736]
	csw/mgar/pkg/leocad/trunk/Makefile
Message-ID: <E1US2am-0001fm-EA@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 20736
          http://gar.svn.sourceforge.net/gar/?rev=20736&view=rev
Author:   pfelecan
Date:     2013-04-16 09:54:24 +0000 (Tue, 16 Apr 2013)
Log Message:
-----------
leocad/trunk: addition of the pieces package

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

Modified: csw/mgar/pkg/leocad/trunk/Makefile
===================================================================
--- csw/mgar/pkg/leocad/trunk/Makefile	2013-04-16 09:09:45 UTC (rev 20735)
+++ csw/mgar/pkg/leocad/trunk/Makefile	2013-04-16 09:54:24 UTC (rev 20736)
@@ -47,6 +47,20 @@
 REINPLACE_WHEN_USRSHARE	=	postinstall
 REINPLACE_USRSHARE		+=	/opt/csw/share/man/man1/leocad.1
 
+PACKAGES						+=	CSWleocad
+CATALOGNAME_CSWleocad			=	leocad
+SPKG_DESC_CSWleocad				+=	$(DESCRIPTION)
+RUNTIME_DEP_PKGS_CSWleocad		+=	CSWleocad-pieces
+CHECKPKG_OVERRIDES_CSWleocad	+=	surplus-dependency|CSWleocad-pieces
+
+leocadDatadir	=	$(datadir)/$(NAME)
+
+PACKAGES							+=	CSWleocad-pieces
+CATALOGNAME_CSWleocad-pieces		=	leocad_pieces
+SPKG_DESC_CSWleocad-pieces			+=	$(DESCRIPTION), pieces
+PKGFILES_CSWleocad-pieces			=	$(leocadDatadir)/library.bin
+ARCHALL_CSWleocad-pieces			=	1
+
 include gar/category.mk
 
 PATH := /opt/csw/gnu:/opt/csw/libexec/flex-2.5.35/bin:$(PATH)
@@ -54,3 +68,9 @@
 configure-custom:
 	cd $(WORKSRC) && $(MAKE) config PREFIX=$(prefix)
 	$(MAKECOOKIE)
+
+post-install-modulated:
+	@echo "executing $@"
+	ginstall --directory --mode=u=rwx,go=rx $(DESTDIR)/$(leocadDatadir)
+	ginstall --preserve-timestamps --mode=u=rwx,go=rx $(WORKDIR)/library.bin $(DESTDIR)/$(leocadDatadir)
+	$(MAKECOOKIE)

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


From pfelecan at users.sourceforge.net  Tue Apr 16 11:58:01 2013
From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net)
Date: Tue, 16 Apr 2013 09:58:01 +0000
Subject: [csw-devel] SF.net SVN: gar:[20737]
	csw/mgar/pkg/guile/trunk/Makefile
Message-ID: <E1US2eH-0001kz-Ex@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 20737
          http://gar.svn.sourceforge.net/gar/?rev=20737&view=rev
Author:   pfelecan
Date:     2013-04-16 09:58:01 +0000 (Tue, 16 Apr 2013)
Log Message:
-----------
guile/trunk: removed contradictory definitions for the new libraries

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

Modified: csw/mgar/pkg/guile/trunk/Makefile
===================================================================
--- csw/mgar/pkg/guile/trunk/Makefile	2013-04-16 09:54:24 UTC (rev 20736)
+++ csw/mgar/pkg/guile/trunk/Makefile	2013-04-16 09:58:01 UTC (rev 20737)
@@ -58,11 +58,6 @@
 PKGFILES_CSWlibguile2-0-22				+=	$(call baseisadirs,$(libdir),libguile-2\.0\.so\.22\.6\.0)
 PKGFILES_CSWlibguile2-0-22				+=	$(call baseisadirs,$(libdir),libguile-2\.0\.so\.22(\.\d+)*)
 # old libraries:
-PKGFILES_CSWlibguile2-0-22				+=	/opt/csw/lib/libguile.so.12.3.0
-PKGFILES_CSWlibguile2-0-22				+=	/opt/csw/lib/libguile.so.12
-CHECKPKG_OVERRIDES_CSWlibguile2-0-22	+=	file-with-bad-content|/export/home|root/opt/csw/lib/libguile.so.12.3.0
-PKGFILES_CSWlibguile2-0-22				+=	/opt/csw/lib/libguile-ltdl.so.1.0.0
-PKGFILES_CSWlibguile2-0-22				+=	/opt/csw/lib/libguile-ltdl.so.1
 SPKG_DESC_CSWlibguile2-0-22				+=	$(DESCRIPTION), libguile-2.0.so.22
 RUNTIME_DEP_PKGS_CSWlibguile2-0-22		+=	CSWlibltdl7
 RUNTIME_DEP_PKGS_CSWlibguile2-0-22		+=	CSWlibiconv2
@@ -73,9 +68,6 @@
 RUNTIME_DEP_PKGS_CSWlibguile2-0-22		+=	CSWlibgmp10
 RUNTIME_DEP_PKGS_CSWlibguile2-0-22		+=	CSWlibffi4
 # overrides for the old libraries:
-CHECKPKG_OVERRIDES_CSWlibguile2-0-22	+=	no-direct-binding|/opt/csw/lib/libguile.so.12.3.0|is|not|directly|bound|to|soname|libguile-ltdl.so.1
-CHECKPKG_OVERRIDES_CSWlibguile2-0-22	+=	shared-lib-pkgname-mismatch|file=opt/csw/lib/libguile.so.12.3.0|soname=libguile.so.12|pkgname=CSWlibguile2-0-22|expected=CSWlibguile12
-CHECKPKG_OVERRIDES_CSWlibguile2-0-22	+=	shared-lib-pkgname-mismatch|file=opt/csw/lib/libguile-ltdl.so.1.0.0|soname=libguile-ltdl.so.1|pkgname=CSWlibguile2-0-22|expected=CSWlibguile-ltdl1
 
 PACKAGES										+=	CSWlibguilereadline-v18-18
 CATALOGNAME_CSWlibguilereadline-v18-18			=	libguilereadline_v18_18

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


From wilbury at users.sourceforge.net  Tue Apr 16 12:38:36 2013
From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net)
Date: Tue, 16 Apr 2013 10:38:36 +0000
Subject: [csw-devel] SF.net SVN: gar:[20738]
	csw/mgar/pkg/php5_memcached/trunk/Makefile
Message-ID: <E1US3HY-00010G-6b@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 20738
          http://gar.svn.sourceforge.net/gar/?rev=20738&view=rev
Author:   wilbury
Date:     2013-04-16 10:38:35 +0000 (Tue, 16 Apr 2013)
Log Message:
-----------
php5_memcached/trunk: Fix overrides.

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

Modified: csw/mgar/pkg/php5_memcached/trunk/Makefile
===================================================================
--- csw/mgar/pkg/php5_memcached/trunk/Makefile	2013-04-16 09:58:01 UTC (rev 20737)
+++ csw/mgar/pkg/php5_memcached/trunk/Makefile	2013-04-16 10:38:35 UTC (rev 20738)
@@ -66,7 +66,8 @@
 
 TEST_TARGET = test
 
-CHECKPKG_OVERRIDES_CSWphp5-memcahcewd += surplus-dependency|CSWphp5
+CHECKPKG_OVERRIDES_CSWphp5-memcached += surplus-dependency|CSWphp5
+CHECKPKG_OVERRIDES_CSWphp5memcached += unidentified-dependency|CSWphp5-memcached
 
 include gar/category.mk
 

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


From wilbury at users.sourceforge.net  Tue Apr 16 12:38:40 2013
From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net)
Date: Tue, 16 Apr 2013 10:38:40 +0000
Subject: [csw-devel] SF.net SVN: gar:[20739]
	csw/mgar/pkg/php5_memcache/trunk/Makefile
Message-ID: <E1US3Hc-00010d-2G@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 20739
          http://gar.svn.sourceforge.net/gar/?rev=20739&view=rev
Author:   wilbury
Date:     2013-04-16 10:38:39 +0000 (Tue, 16 Apr 2013)
Log Message:
-----------
php5_memcache/trunk: Fix overrides.

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

Modified: csw/mgar/pkg/php5_memcache/trunk/Makefile
===================================================================
--- csw/mgar/pkg/php5_memcache/trunk/Makefile	2013-04-16 10:38:35 UTC (rev 20738)
+++ csw/mgar/pkg/php5_memcache/trunk/Makefile	2013-04-16 10:38:39 UTC (rev 20739)
@@ -60,7 +60,8 @@
 
 TEST_TARGET = test
 
-CHECKPKG_OVERRIDES_CSWphp5-memcahcewd += surplus-dependency|CSWphp5
+CHECKPKG_OVERRIDES_CSWphp5-memcache += surplus-dependency|CSWphp5
+CHECKPKG_OVERRIDES_CSWphp5memcache += unidentified-dependency|CSWphp5-memcache
 
 include gar/category.mk
 

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


From wilbury at users.sourceforge.net  Tue Apr 16 13:39:59 2013
From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net)
Date: Tue, 16 Apr 2013 11:39:59 +0000
Subject: [csw-devel] SF.net SVN: gar:[20740] csw/mgar/pkg
Message-ID: <E1US4Ex-0008Mf-Id@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 20740
          http://gar.svn.sourceforge.net/gar/?rev=20740&view=rev
Author:   wilbury
Date:     2013-04-16 11:39:59 +0000 (Tue, 16 Apr 2013)
Log Message:
-----------
dircproxy/trunk: Initial commit.

Added Paths:
-----------
    csw/mgar/pkg/dircproxy/
    csw/mgar/pkg/dircproxy/Makefile
    csw/mgar/pkg/dircproxy/branches/
    csw/mgar/pkg/dircproxy/tags/
    csw/mgar/pkg/dircproxy/trunk/
    csw/mgar/pkg/dircproxy/trunk/Makefile
    csw/mgar/pkg/dircproxy/trunk/checksums
    csw/mgar/pkg/dircproxy/trunk/files/
    csw/mgar/pkg/dircproxy/trunk/files/0001-Include-string.h-to-mitigate-warnings.patch

Added: csw/mgar/pkg/dircproxy/Makefile
===================================================================
--- csw/mgar/pkg/dircproxy/Makefile	                        (rev 0)
+++ csw/mgar/pkg/dircproxy/Makefile	2013-04-16 11:39:59 UTC (rev 20740)
@@ -0,0 +1,2 @@
+%:
+	$(MAKE) -C trunk $*


Property changes on: csw/mgar/pkg/dircproxy/trunk
___________________________________________________________________
Added: svn:ignore
   + work


Added: csw/mgar/pkg/dircproxy/trunk/Makefile
===================================================================
--- csw/mgar/pkg/dircproxy/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/dircproxy/trunk/Makefile	2013-04-16 11:39:59 UTC (rev 20740)
@@ -0,0 +1,27 @@
+# $Id$
+#
+NAME = dircproxy
+VERSION = 1.2.0-RC1
+GARTYPE = v2
+
+DESCRIPTION = IRC proxy
+define BLURB
+  Software for IRC proxy
+endef
+
+MASTER_SITES = http://dircproxy.googlecode.com/files/
+DISTFILES  = $(DISTNAME).tar.gz
+
+PATCHFILES += 0001-Include-string.h-to-mitigate-warnings.patch
+
+GARCOMPILER = GNU
+
+CONFIGURE_ARGS = $(DIRPATHS)
+CONFIGURE_ARGS += --enable-ssl
+
+RUNTIME_DEP_PKGS += CSWperl
+
+REINPLACE_USRLOCAL += conf/dircproxyrc.sample
+
+include gar/category.mk
+


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

Added: csw/mgar/pkg/dircproxy/trunk/checksums
===================================================================
--- csw/mgar/pkg/dircproxy/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/dircproxy/trunk/checksums	2013-04-16 11:39:59 UTC (rev 20740)
@@ -0,0 +1 @@
+4fe2e82619c7b575599bfb236adbd872  dircproxy-1.2.0-RC1.tar.gz

Added: csw/mgar/pkg/dircproxy/trunk/files/0001-Include-string.h-to-mitigate-warnings.patch
===================================================================
--- csw/mgar/pkg/dircproxy/trunk/files/0001-Include-string.h-to-mitigate-warnings.patch	                        (rev 0)
+++ csw/mgar/pkg/dircproxy/trunk/files/0001-Include-string.h-to-mitigate-warnings.patch	2013-04-16 11:39:59 UTC (rev 20740)
@@ -0,0 +1,24 @@
+From 02470ca3a2a629b94ef864bc0b44b5f138849aad Mon Sep 17 00:00:00 2001
+From: Juraj Lutter <wilbury at opencsw.org>
+Date: Tue, 16 Apr 2013 13:19:06 +0200
+Subject: [PATCH] Include string.h to mitigate warnings
+
+---
+ getopt/getopt.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/getopt/getopt.c b/getopt/getopt.c
+index a59a013..98a6f33 100644
+--- a/getopt/getopt.c
++++ b/getopt/getopt.c
+@@ -52,6 +52,7 @@ char *alloca ();
+ #endif
+ 
+ #include <stdio.h>
++#include <string.h>
+ 
+ /* Comment out all this code if we are using the GNU C Library, and are not
+    actually compiling the library itself.  This code is part of the GNU C
+-- 
+1.8.1.4
+

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


From wilbury at users.sourceforge.net  Tue Apr 16 13:57:59 2013
From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net)
Date: Tue, 16 Apr 2013 11:57:59 +0000
Subject: [csw-devel] SF.net SVN: gar:[20741] csw/mgar/pkg/znc/trunk/Makefile
Message-ID: <E1US4WN-0000Qt-Hf@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 20741
          http://gar.svn.sourceforge.net/gar/?rev=20741&view=rev
Author:   wilbury
Date:     2013-04-16 11:57:59 +0000 (Tue, 16 Apr 2013)
Log Message:
-----------
znc/trunk: Update to newer version.

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

Modified: csw/mgar/pkg/znc/trunk/Makefile
===================================================================
--- csw/mgar/pkg/znc/trunk/Makefile	2013-04-16 11:39:59 UTC (rev 20740)
+++ csw/mgar/pkg/znc/trunk/Makefile	2013-04-16 11:57:59 UTC (rev 20741)
@@ -2,7 +2,7 @@
 # TODO (release-critical prefixed with !, non release-critical with *)
 #
 NAME = znc
-VERSION = 0.206
+VERSION = 1.0
 GARTYPE = v2
 
 DESCRIPTION = ZNC, an advanced IRC bouncer
@@ -44,7 +44,7 @@
 # UPSTREAM_MASTER_SITES = 
 
 PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
-GARCOMPILER = GCC4
+GARCOMPILER = GNU
 CONFIGURE_ARGS = $(DIRPATHS) 
 
 # --enable-perl and --enable-python do not work. perl autotools check is broke; python module does not compile

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


From wilbury at users.sourceforge.net  Tue Apr 16 13:58:41 2013
From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net)
Date: Tue, 16 Apr 2013 11:58:41 +0000
Subject: [csw-devel] SF.net SVN: gar:[20742] csw/mgar/pkg/znc/trunk/checksums
Message-ID: <E1US4X3-0000Rq-5T@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 20742
          http://gar.svn.sourceforge.net/gar/?rev=20742&view=rev
Author:   wilbury
Date:     2013-04-16 11:58:40 +0000 (Tue, 16 Apr 2013)
Log Message:
-----------
znc/trunk: checksums, too

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

Modified: csw/mgar/pkg/znc/trunk/checksums
===================================================================
--- csw/mgar/pkg/znc/trunk/checksums	2013-04-16 11:57:59 UTC (rev 20741)
+++ csw/mgar/pkg/znc/trunk/checksums	2013-04-16 11:58:40 UTC (rev 20742)
@@ -1 +1 @@
-b7d3f21da81abaeb553066b0e10beb53  znc-0.206.tar.gz
+23807ca830c27392cccb6774f542df6e  znc-1.0.tar.gz

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


From wahwah at users.sourceforge.net  Tue Apr 16 14:55:15 2013
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Tue, 16 Apr 2013 12:55:15 +0000
Subject: [csw-devel] SF.net SVN: gar:[20743] csw/mgar/pkg/gtk-engines/
Message-ID: <E1US5Pn-0004uo-Gu@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 20743
          http://gar.svn.sourceforge.net/gar/?rev=20743&view=rev
Author:   wahwah
Date:     2013-04-16 12:55:15 +0000 (Tue, 16 Apr 2013)
Log Message:
-----------
gtk-engines and gtk_engines? It looks funny but it really isn't.

Removed Paths:
-------------
    csw/mgar/pkg/gtk-engines/

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 Apr 16 15:04:24 2013
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Tue, 16 Apr 2013 13:04:24 +0000
Subject: [csw-devel] SF.net SVN: gar:[20744]
	csw/mgar/pkg/gtk_engines/trunk/Makefile
Message-ID: <E1US5Yd-0005Ds-W6@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 20744
          http://gar.svn.sourceforge.net/gar/?rev=20744&view=rev
Author:   wahwah
Date:     2013-04-16 13:04:23 +0000 (Tue, 16 Apr 2013)
Log Message:
-----------
gtk_engines: The build procedure finishes with these alterations, but boy does that package throw errors when checked.

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

Modified: csw/mgar/pkg/gtk_engines/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gtk_engines/trunk/Makefile	2013-04-16 12:55:15 UTC (rev 20743)
+++ csw/mgar/pkg/gtk_engines/trunk/Makefile	2013-04-16 13:04:23 UTC (rev 20744)
@@ -19,7 +19,13 @@
 ARCH := $(shell /bin/uname -p)
 
 # for intltool only
-PATH := /opt/csw/gnu:$(PATH)
+# stagepkg is necessary in PATH
+PATH := /opt/csw/gnu:$(shell mgar show-pkgtree)/cswutils/trunk/files:$(PATH)
+export PATH
+CC=/opt/SUNWspro/bin/cc
+export CC
+CXX=/opt/SUNWspro/bin/CC
+export CXX
 
 LDFLAGS_COMMON :=
 

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


From wahwah at users.sourceforge.net  Tue Apr 16 15:05:15 2013
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Tue, 16 Apr 2013 13:05:15 +0000
Subject: [csw-devel] SF.net SVN: gar:[20745]
	csw/mgar/pkg/gtk_engines/branches/
Message-ID: <E1US5ZT-0005Eo-QC@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 20745
          http://gar.svn.sourceforge.net/gar/?rev=20745&view=rev
Author:   wahwah
Date:     2013-04-16 13:05:15 +0000 (Tue, 16 Apr 2013)
Log Message:
-----------
gtk_engines: Make the branches directory

Added Paths:
-----------
    csw/mgar/pkg/gtk_engines/branches/

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 Apr 16 15:06:10 2013
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Tue, 16 Apr 2013 13:06:10 +0000
Subject: [csw-devel] SF.net SVN: gar:[20746] csw/mgar/pkg/gtk_engines
Message-ID: <E1US5aM-0005Gs-5Y@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 20746
          http://gar.svn.sourceforge.net/gar/?rev=20746&view=rev
Author:   wahwah
Date:     2013-04-16 13:06:09 +0000 (Tue, 16 Apr 2013)
Log Message:
-----------
gtk_engines: This is a legacy build.

Added Paths:
-----------
    csw/mgar/pkg/gtk_engines/branches/legacy/

Removed Paths:
-------------
    csw/mgar/pkg/gtk_engines/trunk/

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


From maciej at opencsw.org  Tue Apr 16 15:08:23 2013
From: maciej at opencsw.org (=?UTF-8?Q?Maciej_=28Matchek=29_Blizi=C5=84ski?=)
Date: Tue, 16 Apr 2013 14:08:23 +0100
Subject: [csw-devel] SF.net SVN: gar:[20738]
	csw/mgar/pkg/php5_memcached/trunk/Makefile
In-Reply-To: <E1US3HY-00010G-6b@sfp-svn-2.v30.ch3.sourceforge.com>
References: <E1US3HY-00010G-6b@sfp-svn-2.v30.ch3.sourceforge.com>
Message-ID: <CALtRa-69B2hPm=mcto35ne6fxzZ+nhjc6iWXYdX5VR88Hn4CgA@mail.gmail.com>

2013/4/16  <wilbury at users.sourceforge.net>:
> Revision: 20738
>           http://gar.svn.sourceforge.net/gar/?rev=20738&view=rev
> Author:   wilbury
> Date:     2013-04-16 10:38:35 +0000 (Tue, 16 Apr 2013)
> Log Message:
> -----------
> php5_memcached/trunk: Fix overrides.
>
> Modified Paths:
> --------------
>     csw/mgar/pkg/php5_memcached/trunk/Makefile
>
> Modified: csw/mgar/pkg/php5_memcached/trunk/Makefile
> ===================================================================
> --- csw/mgar/pkg/php5_memcached/trunk/Makefile  2013-04-16 09:58:01 UTC (rev 20737)
> +++ csw/mgar/pkg/php5_memcached/trunk/Makefile  2013-04-16 10:38:35 UTC (rev 20738)
> @@ -66,7 +66,8 @@
>
>  TEST_TARGET = test
>
> -CHECKPKG_OVERRIDES_CSWphp5-memcahcewd += surplus-dependency|CSWphp5
> +CHECKPKG_OVERRIDES_CSWphp5-memcached += surplus-dependency|CSWphp5
> +CHECKPKG_OVERRIDES_CSWphp5memcached += unidentified-dependency|CSWphp5-memcached

Never override the unidentified-dependency error or you will break the
whole catalog and generation will not work.

From wahwah at users.sourceforge.net  Tue Apr 16 15:17:54 2013
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Tue, 16 Apr 2013 13:17:54 +0000
Subject: [csw-devel] SF.net SVN: gar:[20747]
	csw/mgar/gar/v2/lib/python/package_checks.py
Message-ID: <E1US5li-0003uZ-OF@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 20747
          http://gar.svn.sourceforge.net/gar/?rev=20747&view=rev
Author:   wahwah
Date:     2013-04-16 13:17:54 +0000 (Tue, 16 Apr 2013)
Log Message:
-----------
checkpkg: 'dependency-on-nonexistent-package'

dependency-on-nonexistent-package is a better error tag name, it's more
descriptive.

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	2013-04-16 13:06:09 UTC (rev 20746)
+++ csw/mgar/gar/v2/lib/python/package_checks.py	2013-04-16 13:17:54 UTC (rev 20747)
@@ -416,7 +416,8 @@
     pkgname = pkg_data["basic_stats"]["pkgname"]
     for depname, dep_desc in pkg_data["depends"]:
       if depname not in known_pkgs:
-        error_mgr.ReportError(pkgname, "unidentified-dependency", depname)
+        error_mgr.ReportError(
+            pkgname, "dependency-on-nonexistent-package", depname)
 
 
 def CheckDependsOnSelf(pkg_data, error_mgr, logger, messenger):

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


From wilbury at users.sourceforge.net  Tue Apr 16 15:20:39 2013
From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net)
Date: Tue, 16 Apr 2013 13:20:39 +0000
Subject: [csw-devel] SF.net SVN: gar:[20748]
	csw/mgar/pkg/php5_memcache/trunk/Makefile
Message-ID: <E1US5oN-0005hA-3r@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 20748
          http://gar.svn.sourceforge.net/gar/?rev=20748&view=rev
Author:   wilbury
Date:     2013-04-16 13:20:38 +0000 (Tue, 16 Apr 2013)
Log Message:
-----------
php5_memcache/trunk: Remove bad override.

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

Modified: csw/mgar/pkg/php5_memcache/trunk/Makefile
===================================================================
--- csw/mgar/pkg/php5_memcache/trunk/Makefile	2013-04-16 13:17:54 UTC (rev 20747)
+++ csw/mgar/pkg/php5_memcache/trunk/Makefile	2013-04-16 13:20:38 UTC (rev 20748)
@@ -61,7 +61,6 @@
 TEST_TARGET = test
 
 CHECKPKG_OVERRIDES_CSWphp5-memcache += surplus-dependency|CSWphp5
-CHECKPKG_OVERRIDES_CSWphp5memcache += unidentified-dependency|CSWphp5-memcache
 
 include gar/category.mk
 

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


From wahwah at users.sourceforge.net  Tue Apr 16 15:22:11 2013
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Tue, 16 Apr 2013 13:22:11 +0000
Subject: [csw-devel] SF.net SVN: gar:[20749] csw/mgar/pkg
Message-ID: <E1US5pr-0005j3-5j@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 20749
          http://gar.svn.sourceforge.net/gar/?rev=20749&view=rev
Author:   wahwah
Date:     2013-04-16 13:22:10 +0000 (Tue, 16 Apr 2013)
Log Message:
-----------
gtk_engines: Move aside for a moment

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

Removed Paths:
-------------
    csw/mgar/pkg/gtk_engines/

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


From wilbury at users.sourceforge.net  Tue Apr 16 15:25:56 2013
From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net)
Date: Tue, 16 Apr 2013 13:25:56 +0000
Subject: [csw-devel] SF.net SVN: gar:[20750]
	csw/mgar/pkg/php5_memcache/trunk/Makefile
Message-ID: <E1US5tU-0005qy-20@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 20750
          http://gar.svn.sourceforge.net/gar/?rev=20750&view=rev
Author:   wilbury
Date:     2013-04-16 13:25:55 +0000 (Tue, 16 Apr 2013)
Log Message:
-----------
php5_memcache/trunk: Fix dependencies.

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

Modified: csw/mgar/pkg/php5_memcache/trunk/Makefile
===================================================================
--- csw/mgar/pkg/php5_memcache/trunk/Makefile	2013-04-16 13:22:10 UTC (rev 20749)
+++ csw/mgar/pkg/php5_memcache/trunk/Makefile	2013-04-16 13:25:55 UTC (rev 20750)
@@ -60,8 +60,6 @@
 
 TEST_TARGET = test
 
-CHECKPKG_OVERRIDES_CSWphp5-memcache += surplus-dependency|CSWphp5
-
 include gar/category.mk
 
 post-extract-isa-$(ISA_DEFAULT_$(GARCH)):

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


From wilbury at users.sourceforge.net  Tue Apr 16 15:29:25 2013
From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net)
Date: Tue, 16 Apr 2013 13:29:25 +0000
Subject: [csw-devel] SF.net SVN: gar:[20751]
	csw/mgar/pkg/php5_memcached/trunk/Makefile
Message-ID: <E1US5wr-0005xX-Ru@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 20751
          http://gar.svn.sourceforge.net/gar/?rev=20751&view=rev
Author:   wilbury
Date:     2013-04-16 13:29:25 +0000 (Tue, 16 Apr 2013)
Log Message:
-----------
php5_memcached/trunk: Fix dependencies.

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

Modified: csw/mgar/pkg/php5_memcached/trunk/Makefile
===================================================================
--- csw/mgar/pkg/php5_memcached/trunk/Makefile	2013-04-16 13:25:55 UTC (rev 20750)
+++ csw/mgar/pkg/php5_memcached/trunk/Makefile	2013-04-16 13:29:25 UTC (rev 20751)
@@ -66,9 +66,6 @@
 
 TEST_TARGET = test
 
-CHECKPKG_OVERRIDES_CSWphp5-memcached += surplus-dependency|CSWphp5
-CHECKPKG_OVERRIDES_CSWphp5memcached += unidentified-dependency|CSWphp5-memcached
-
 include gar/category.mk
 
 post-extract-isa-$(ISA_DEFAULT_$(GARCH)):

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 Apr 16 15:56:13 2013
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Tue, 16 Apr 2013 13:56:13 +0000
Subject: [csw-devel] SF.net SVN: gar:[20752] csw/mgar/pkg/wireshark/trunk
Message-ID: <E1US6Mn-00052w-2A@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 20752
          http://gar.svn.sourceforge.net/gar/?rev=20752&view=rev
Author:   dmichelsen
Date:     2013-04-16 13:56:11 +0000 (Tue, 16 Apr 2013)
Log Message:
-----------
wireshark/trunk: Update to 1.8.6

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

Modified: csw/mgar/pkg/wireshark/trunk/Makefile
===================================================================
--- csw/mgar/pkg/wireshark/trunk/Makefile	2013-04-16 13:29:25 UTC (rev 20751)
+++ csw/mgar/pkg/wireshark/trunk/Makefile	2013-04-16 13:56:11 UTC (rev 20752)
@@ -1,5 +1,5 @@
 NAME = wireshark
-VERSION = 1.8.2
+VERSION = 1.8.6
 GARTYPE = v2
 
 DESCRIPTION = Wireshark (was Ethereal) is a free network protocol analyzer
@@ -15,7 +15,6 @@
 #new glib2 only on Solaris 10
 PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
 
-
 VENDOR_URL = http://www.wireshark.org/
 
 BUILD_DEP_PKGS += CSWlibgcrypt-dev
@@ -31,7 +30,7 @@
 BUILD_DEP_PKGS += CSWlibkrb5-dev
 BUILD_DEP_PKGS += CSWlibssl-dev
 BUILD_DEP_PKGS += CSWlibgnutls-dev
-# BUILD_DEP_PKGS += CSWlua
+BUILD_DEP_PKGS += CSWliblua5-2
 BUILD_DEP_PKGS += CSWgeoip-dev
 
 # Lua support disabled because luaL_register is checked during autoconf which
@@ -45,29 +44,20 @@
 RUNTIME_DEP_PKGS_CSWwireshark += CSWlibgpg-error0
 RUNTIME_DEP_PKGS_CSWwireshark += CSWpango
 RUNTIME_DEP_PKGS_CSWwireshark += CSWlibz1
-RUNTIME_DEP_PKGS_CSWwireshark += CSWlibintl8
 RUNTIME_DEP_PKGS_CSWwireshark += CSWlibcares2
 RUNTIME_DEP_PKGS_CSWwireshark += CSWlibpcap1
 RUNTIME_DEP_PKGS_CSWwireshark += CSWlibsmi2
-RUNTIME_DEP_PKGS_CSWwireshark += CSWlibcom-err3
 RUNTIME_DEP_PKGS_CSWwireshark += CSWlibkrb5-3
 RUNTIME_DEP_PKGS_CSWwireshark += CSWlibk5crypto3
 RUNTIME_DEP_PKGS_CSWwireshark += CSWlibgnutls26
-# RUNTIME_DEP_PKGS_CSWwireshark += CSWlua
 RUNTIME_DEP_PKGS_CSWwireshark += CSWlibcairo2
 RUNTIME_DEP_PKGS_CSWwireshark += CSWlibgeoip1
-RUNTIME_DEP_PKGS_CSWwireshark += CSWlibfontconfig1
-RUNTIME_DEP_PKGS_CSWwireshark += CSWlibatk1-0-0
-RUNTIME_DEP_PKGS_CSWwireshark += CSWlibfreetype6
-RUNTIME_DEP_PKGS_CSWwireshark += CSWlibssl1-0-0
-RUNTIME_DEP_PKGS_CSWwireshark += CSWlibgthread2-0-0
 RUNTIME_DEP_PKGS_CSWwireshark += CSWlibgmodule2-0-0
 RUNTIME_DEP_PKGS_CSWwireshark += CSWlibgdk-x11-2-0-0
 RUNTIME_DEP_PKGS_CSWwireshark += CSWlibgdk-pixbuf2-0-0
 RUNTIME_DEP_PKGS_CSWwireshark += CSWlibgobject2-0-0
-RUNTIME_DEP_PKGS_CSWwireshark += CSWlibgio2-0-0
-RUNTIME_DEP_PKGS_CSWwireshark += CSWlibgtk-x11-2-0-0
 RUNTIME_DEP_PKGS_CSWwireshark += CSWlibglib2-0-0
+RUNTIME_DEP_PKGS_CSWwireshark += CSWlibgtk-x11-2-0-0
 
 # No more library splitting unless absolutely necessary
 CHECKPKG_OVERRIDES_CSWwireshark += shared-lib-package-contains-so-symlink
@@ -93,9 +83,12 @@
 
 # Do not use LD_OPTIONS as it leads to the new version being built against old
 # wireshark private libs
-LD_OPTIONS =
-EXTRA_LINKER_FLAGS = $(RUNPATH_LINKER_FLAGS)
+#LD_OPTIONS =
+#EXTRA_LINKER_FLAGS = $(RUNPATH_LINKER_FLAGS)
 
+# This is now deprecated in Pango, use workaround until Pango is updated
+EXTRA_CFLAGS += -DG_CONST_RETURN=const
+
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --enable-usr-local=no
 CONFIGURE_ARGS += --with-ssl=/opt/csw

Modified: csw/mgar/pkg/wireshark/trunk/checksums
===================================================================
--- csw/mgar/pkg/wireshark/trunk/checksums	2013-04-16 13:29:25 UTC (rev 20751)
+++ csw/mgar/pkg/wireshark/trunk/checksums	2013-04-16 13:56:11 UTC (rev 20752)
@@ -1 +1 @@
-5e3ea7eed50dace479e12f49d24506f4  wireshark-1.8.2.tar.bz2
+317361e701936c72f7f18f857059b944  wireshark-1.8.6.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 Apr 16 16:23:26 2013
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Tue, 16 Apr 2013 14:23:26 +0000
Subject: [csw-devel] SF.net SVN: gar:[20753] csw/mgar/pkg
Message-ID: <E1US6n8-0005vi-Pw@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 20753
          http://gar.svn.sourceforge.net/gar/?rev=20753&view=rev
Author:   wahwah
Date:     2013-04-16 14:23:26 +0000 (Tue, 16 Apr 2013)
Log Message:
-----------
gtk_engines/trunk: GARificationalization. Different deps for 5.9 and 5.10.

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

Added: csw/mgar/pkg/gtk_engines/Makefile
===================================================================
--- csw/mgar/pkg/gtk_engines/Makefile	                        (rev 0)
+++ csw/mgar/pkg/gtk_engines/Makefile	2013-04-16 14:23:26 UTC (rev 20753)
@@ -0,0 +1,2 @@
+%:
+	$(MAKE) -C trunk $*


Property changes on: csw/mgar/pkg/gtk_engines/trunk
___________________________________________________________________
Added: svn:ignore
   + work


Added: csw/mgar/pkg/gtk_engines/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gtk_engines/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/gtk_engines/trunk/Makefile	2013-04-16 14:23:26 UTC (rev 20753)
@@ -0,0 +1,39 @@
+# $Id$
+# TODO (release-critical prefixed with !, non release-critical with *)
+#
+NAME = gtk-engines
+VERSION = 2.20.2
+GARTYPE = v2
+
+DESCRIPTION = Brief description
+
+PACKAGING_PLATFORMS = solaris9-i386 solaris9-sparc
+PACKAGING_PLATFORMS += solaris10-i386 solaris10-sparc
+
+MASTER_SITES = $(GNOME_MIRROR)
+DISTFILES  = $(DISTNAME).tar.gz
+
+CONFIGURE_ARGS = $(DIRPATHS)
+CONFIGURE_ARGS += LIBS=-lm
+CONFIGURE_ARGS += --enable-static=no
+
+SKIPTEST = 1
+
+PACKAGES = CSWgtkengines
+
+RDEP_PKGS_CSWgtkengines_5.9 += CSWglib2
+RDEP_PKGS_CSWgtkengines_5.9 += CSWgtk2
+RDEP_PKGS_CSWgtkengines_5.9 += CSWlibcairo2
+
+RDEP_PKGS_CSWgtkengines_5.10 += CSWlibgdk-x11-2-0-0
+RDEP_PKGS_CSWgtkengines_5.10 += CSWlibgdk-pixbuf2-0-0
+RDEP_PKGS_CSWgtkengines_5.10 += CSWlibcairo2
+RDEP_PKGS_CSWgtkengines_5.10 += CSWlibgobject2-0-0
+RDEP_PKGS_CSWgtkengines_5.10 += CSWlibglib2-0-0
+RDEP_PKGS_CSWgtkengines_5.10 += CSWlibgtk-x11-2-0-0
+
+RUNTIME_DEP_PKGS_CSWgtkengines += $(RDEP_PKGS_CSWgtkengines_$(GAROSREL))
+
+include gar/category.mk
+
+PATH := /opt/csw/gnu:$(PATH)


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

Added: csw/mgar/pkg/gtk_engines/trunk/checksums
===================================================================
--- csw/mgar/pkg/gtk_engines/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/gtk_engines/trunk/checksums	2013-04-16 14:23:26 UTC (rev 20753)
@@ -0,0 +1 @@
+e0f7ac7eaad3896762804312f03c6f46  gtk-engines-2.20.2.tar.gz

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


From wahwah at users.sourceforge.net  Tue Apr 16 17:02:45 2013
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Tue, 16 Apr 2013 15:02:45 +0000
Subject: [csw-devel] SF.net SVN: gar:[20754]
	csw/mgar/pkg/gtk_engines/trunk/Makefile
Message-ID: <E1US7PB-00074Y-Ng@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 20754
          http://gar.svn.sourceforge.net/gar/?rev=20754&view=rev
Author:   wahwah
Date:     2013-04-16 15:02:45 +0000 (Tue, 16 Apr 2013)
Log Message:
-----------
gtk_engines/trunk: forcing the old catalog name

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

Modified: csw/mgar/pkg/gtk_engines/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gtk_engines/trunk/Makefile	2013-04-16 14:23:26 UTC (rev 20753)
+++ csw/mgar/pkg/gtk_engines/trunk/Makefile	2013-04-16 15:02:45 UTC (rev 20754)
@@ -20,6 +20,8 @@
 SKIPTEST = 1
 
 PACKAGES = CSWgtkengines
+CATALOGNAME_CSWgtkengines = gtk_engines
+CHECKPKG_OVERRIDES_CSWgtkengines += catalogname-does-not-match-pkgname|pkgname=CSWgtkengines|catalogname=gtk_engines|expected-catalogname=gtkengines
 
 RDEP_PKGS_CSWgtkengines_5.9 += CSWglib2
 RDEP_PKGS_CSWgtkengines_5.9 += CSWgtk2

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 Apr 17 11:29:27 2013
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Wed, 17 Apr 2013 09:29:27 +0000
Subject: [csw-devel] SF.net SVN: gar:[20755] csw/mgar/gar/v2-defaultchange/
Message-ID: <E1USOgB-0004Ps-0h@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 20755
          http://gar.svn.sourceforge.net/gar/?rev=20755&view=rev
Author:   dmichelsen
Date:     2013-04-17 09:29:26 +0000 (Wed, 17 Apr 2013)
Log Message:
-----------
mGAR v2-defaultchange: Delete branch as it was integrated in r14023

Revision Links:
--------------
    http://gar.svn.sourceforge.net/gar/?rev=14023&view=rev

Removed Paths:
-------------
    csw/mgar/gar/v2-defaultchange/

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 Apr 17 11:30:09 2013
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Wed, 17 Apr 2013 09:30:09 +0000
Subject: [csw-devel] SF.net SVN: gar:[20756] csw/mgar/gar/v2-build64only/
Message-ID: <E1USOgr-0004Qn-GN@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 20756
          http://gar.svn.sourceforge.net/gar/?rev=20756&view=rev
Author:   dmichelsen
Date:     2013-04-17 09:30:09 +0000 (Wed, 17 Apr 2013)
Log Message:
-----------
mGAR v2-build64only: Delete branch as it was integrated in r16506 and r16965

Revision Links:
--------------
    http://gar.svn.sourceforge.net/gar/?rev=16506&view=rev
    http://gar.svn.sourceforge.net/gar/?rev=16965&view=rev

Removed Paths:
-------------
    csw/mgar/gar/v2-build64only/

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 Apr 17 11:31:13 2013
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Wed, 17 Apr 2013 09:31:13 +0000
Subject: [csw-devel] SF.net SVN: gar:[20757] csw/mgar/pkg/redis/trunk
Message-ID: <E1USOht-0002RB-8P@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 20757
          http://gar.svn.sourceforge.net/gar/?rev=20757&view=rev
Author:   wahwah
Date:     2013-04-17 09:31:12 +0000 (Wed, 17 Apr 2013)
Log Message:
-----------
redis/trunk: Update and a new patch; tests don't pass

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

Added Paths:
-----------
    csw/mgar/pkg/redis/trunk/files/0001-Fix-tclsh-finding.patch

Removed Paths:
-------------
    csw/mgar/pkg/redis/trunk/files/0001-backtrace-is-only-available-on-Solaris-11.patch

Modified: csw/mgar/pkg/redis/trunk/Makefile
===================================================================
--- csw/mgar/pkg/redis/trunk/Makefile	2013-04-17 09:30:09 UTC (rev 20756)
+++ csw/mgar/pkg/redis/trunk/Makefile	2013-04-17 09:31:12 UTC (rev 20757)
@@ -2,15 +2,13 @@
 # TODO (release-critical prefixed with !, non release-critical with *)
 #
 NAME = redis
-VERSION = 2.6.9
+VERSION = 2.6.12
 
 DESCRIPTION = An advanced key-value store
 
 MASTER_SITES = $(GOOGLE_MIRROR)
 DISTFILES  = $(DISTNAME).tar.gz
 
-PATCHFILES += 0001-backtrace-is-only-available-on-Solaris-11.patch
-
 PACKAGES += CSWredis
 SPKG_DESC_CSWredis = An advanced key-value store
 
@@ -19,6 +17,8 @@
 
 GARCOMPILER = GNU
 
+PATCHFILES += 0001-Fix-tclsh-finding.patch
+
 # These are set in the Makefile and are not inherited when we force our CFLAGS in
 EXTRA_CFLAGS += -std=c99 -pedantic -Wall -W -D__EXTENSIONS__ -D_XPG6
 

Modified: csw/mgar/pkg/redis/trunk/checksums
===================================================================
--- csw/mgar/pkg/redis/trunk/checksums	2013-04-17 09:30:09 UTC (rev 20756)
+++ csw/mgar/pkg/redis/trunk/checksums	2013-04-17 09:31:12 UTC (rev 20757)
@@ -1 +1 @@
-5093fb7c5f763e828c857daf260665bc  redis-2.6.9.tar.gz
+d2c87926a650e22c2491c5e4c260849c  redis-2.6.12.tar.gz

Added: csw/mgar/pkg/redis/trunk/files/0001-Fix-tclsh-finding.patch
===================================================================
--- csw/mgar/pkg/redis/trunk/files/0001-Fix-tclsh-finding.patch	                        (rev 0)
+++ csw/mgar/pkg/redis/trunk/files/0001-Fix-tclsh-finding.patch	2013-04-17 09:31:12 UTC (rev 20757)
@@ -0,0 +1,34 @@
+From 7d91804d25372860a60f5dafe57ca6fc2a311edf Mon Sep 17 00:00:00 2001
+From: Maciej Blizinski <maciej at opencsw.org>
+Date: Wed, 17 Apr 2013 11:24:45 +0200
+Subject: [PATCH] Fix tclsh finding
+
+---
+ runtest | 9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/runtest b/runtest
+index d8451df..0fd0f56 100755
+--- a/runtest
++++ b/runtest
+@@ -3,10 +3,15 @@ TCL_VERSIONS="8.5 8.6"
+ TCLSH=""
+ 
+ for VERSION in $TCL_VERSIONS; do
+-	TCL=`which tclsh$VERSION 2>/dev/null` && TCLSH=$TCL
++	TCL=`which tclsh$VERSION 2>/dev/null`
++  if [ -x "${TCL}" ]; then
++    # On Solaris, the 'which' command returns nonsense when the command is not
++    # found.
++    TCLSH=$TCL
++  fi
+ done
+ 
+-if [ -z $TCLSH ]
++if [ -z "$TCLSH" ]
+ then
+     echo "You need tcl 8.5 or newer in order to run the Redis test"
+     exit 1
+-- 
+1.8.1.4
+

Deleted: csw/mgar/pkg/redis/trunk/files/0001-backtrace-is-only-available-on-Solaris-11.patch
===================================================================
--- csw/mgar/pkg/redis/trunk/files/0001-backtrace-is-only-available-on-Solaris-11.patch	2013-04-17 09:30:09 UTC (rev 20756)
+++ csw/mgar/pkg/redis/trunk/files/0001-backtrace-is-only-available-on-Solaris-11.patch	2013-04-17 09:31:12 UTC (rev 20757)
@@ -1,25 +0,0 @@
-From d1163310acf3800e43c3d0cf92dfc543b1c874a8 Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen <da\xC2m at opencsw.org>
-Date: Wed, 14 Mar 2012 15:27:11 +0100
-Subject: [PATCH] backtrace() is only available on Solaris 11+
-
----
- src/config.h |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/config.h b/src/config.h
-index 77fed7d..1057b8b 100644
---- a/src/config.h
-+++ b/src/config.h
-@@ -25,7 +25,7 @@
- #endif
- 
- /* Test for backtrace() */
--#if defined(__APPLE__) || defined(__linux__) || defined(__sun)
-+#if defined(__APPLE__) || defined(__linux__)
- #define HAVE_BACKTRACE 1
- #endif
- 
--- 
-1.7.9
-

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


From pfelecan at users.sourceforge.net  Wed Apr 17 11:34:43 2013
From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net)
Date: Wed, 17 Apr 2013 09:34:43 +0000
Subject: [csw-devel] SF.net SVN: gar:[20758]
	csw/mgar/pkg/guile/trunk/Makefile
Message-ID: <E1USOlH-0002Xq-Oz@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 20758
          http://gar.svn.sourceforge.net/gar/?rev=20758&view=rev
Author:   pfelecan
Date:     2013-04-17 09:34:43 +0000 (Wed, 17 Apr 2013)
Log Message:
-----------
guile/trunk: tweak overrides

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

Modified: csw/mgar/pkg/guile/trunk/Makefile
===================================================================
--- csw/mgar/pkg/guile/trunk/Makefile	2013-04-17 09:31:12 UTC (rev 20757)
+++ csw/mgar/pkg/guile/trunk/Makefile	2013-04-17 09:34:43 UTC (rev 20758)
@@ -51,6 +51,8 @@
 CHECKPKG_OVERRIDES_CSWguile	+=	file-with-bad-content|/usr/local|root/opt/csw/share/info/guile.info-1
 CHECKPKG_OVERRIDES_CSWguile	+=	file-with-bad-content|/usr/share|root/opt/csw/share/info/guile.info-4
 CHECKPKG_OVERRIDES_CSWguile	+=	file-with-bad-content|/usr/share|root/opt/csw/share/info/guile.info-1
+# even though I replace it in the sources ...
+CHECKPKG_OVERRIDES_CSWguile	+=	file-with-bad-content|/usr/share|root/opt/csw/lib/guile/2.0/ccache/ice-9/slib.go
 
 PACKAGES								+=	CSWlibguile2-0-22
 CATALOGNAME_CSWlibguile2-0-22			=	libguile2_0_22
@@ -84,19 +86,22 @@
 RUNTIME_DEP_PKGS_CSWlibguilereadline-v18-18		+=	CSWlibunistring0
 RUNTIME_DEP_PKGS_CSWlibguilereadline-v18-18		+=	CSWlibgcc-s1
 
+# old library provided for those dependencies which didn't change to 2.x
 PACKAGES							+=	CSWlibguile-ltdl1
 CATALOGNAME_CSWlibguile-ltdl1 		= libguile_ltdl1
 PKGFILES_CSWlibguile-ltdl1			+=	$(call baseisadirs,$(libdir),libguile-ltdl\.so\.1\.0\.0)
 PKGFILES_CSWlibguile-ltdl1			+=	$(call baseisadirs,$(libdir),libguile-ltdl\.so\.1(\.\d+)*)
 SPKG_DESC_CSWlibguile-ltdl1			+=	$(DESCRIPTION), libguile-ltdl.so.1
-RUNTIME_DEP_PKGS_CSWlibguile2-0-22	+=	CSWlibguile-ltdl1
 
+# old library provided for those dependencies which didn't change to 2.x
 PACKAGES							+=	CSWlibguile12
 CATALOGNAME_CSWlibguile12 			= libguile12
 PKGFILES_CSWlibguile12				+=	$(call baseisadirs,$(libdir),libguile\.so\.12\.3\.0)
 PKGFILES_CSWlibguile12				+=	$(call baseisadirs,$(libdir),libguile\.so\.12(\.\d+)*)
 SPKG_DESC_CSWlibguile12				+=	$(DESCRIPTION), libguile.so.12
-RUNTIME_DEP_PKGS_CSWlibguile2-0-22	+=	CSWlibguile12
+RUNTIME_DEP_PKGS_CSWlibguile12		+=	CSWlibguile-ltdl1
+CHECKPKG_OVERRIDES_CSWlibguile12 += file-with-bad-content|/export/home|root/opt/csw/lib/libguile.so.12.3.0
+CHECKPKG_OVERRIDES_CSWlibguile12 += no-direct-binding|/opt/csw/lib/libguile.so.12.3.0|is|not|directly|bound|to|soname|libguile-ltdl.so.1
 
 PACKAGES						+=	CSWguile-dev
 CATALOGNAME_CSWguile-dev		=	guile_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  Wed Apr 17 12:17:43 2013
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Wed, 17 Apr 2013 10:17:43 +0000
Subject: [csw-devel] SF.net SVN: gar:[20759]
	csw/mgar/pkg/syslog_ng/trunk/Makefile
Message-ID: <E1USPQt-0005RW-8u@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 20759
          http://gar.svn.sourceforge.net/gar/?rev=20759&view=rev
Author:   wahwah
Date:     2013-04-17 10:17:42 +0000 (Wed, 17 Apr 2013)
Log Message:
-----------
syslog_ng/trunk: Update dependencies

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

Modified: csw/mgar/pkg/syslog_ng/trunk/Makefile
===================================================================
--- csw/mgar/pkg/syslog_ng/trunk/Makefile	2013-04-17 09:34:43 UTC (rev 20758)
+++ csw/mgar/pkg/syslog_ng/trunk/Makefile	2013-04-17 10:17:42 UTC (rev 20759)
@@ -57,15 +57,13 @@
 RUNTIME_DEP_PKGS_CSWsyslog-ng += CSWlibdbi1
 RUNTIME_DEP_PKGS_CSWsyslog-ng += CSWlibevtlog0
 RUNTIME_DEP_PKGS_CSWsyslog-ng += CSWlibgcc-s1
-RUNTIME_DEP_PKGS_CSWsyslog-ng += CSWlibgnutls26
-RUNTIME_DEP_PKGS_CSWsyslog-ng += CSWlibintl8
 RUNTIME_DEP_PKGS_CSWsyslog-ng += CSWlibpcre1
 RUNTIME_DEP_PKGS_CSWsyslog-ng += CSWlibwrap1
 
 # Specifying different dependencies for 5.9 and 5.10.
-RUNTIME_DEP_PKGS_CSWsyslog-ng_5.10 += CSWlibgthread2-0-0
 RUNTIME_DEP_PKGS_CSWsyslog-ng_5.10 += CSWlibglib2-0-0
 RUNTIME_DEP_PKGS_CSWsyslog-ng_5.10 += CSWlibgmodule2-0-0
+RUNTIME_DEP_PKGS_CSWsyslog-ng_5.10 += CSWlibgthread2-0-0
 RUNTIME_DEP_PKGS_CSWsyslog-ng_5.10 += CSWlibssl1-0-0
 
 RUNTIME_DEP_PKGS_CSWsyslog-ng_5.9 += CSWglib2
@@ -107,6 +105,8 @@
 # Missing TLS symbols
 EXTRA_LINKER_FLAGS = -lgnutls
 
+include gar/category.mk
+
 post-install-modulated:
 	ginstall -d $(DESTDIR)/etc/opt/csw
 	ginstall -m 444 $(WORKDIR)/$(NAME).conf.CSW \
@@ -116,5 +116,3 @@
 		$(DESTDIR)/etc/opt/csw/init.d/cswsyslog_ng
 	ginstall -m 755 -d $(DESTDIR)$(localstatedir)/run
 	@$(MAKECOOKIE)
-
-include gar/category.mk

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


From wahwah at users.sourceforge.net  Wed Apr 17 14:12:49 2013
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Wed, 17 Apr 2013 12:12:49 +0000
Subject: [csw-devel] SF.net SVN: gar:[20760]
	csw/mgar/gar/v2/lib/python/package_checks.py
Message-ID: <E1USREH-00077h-RW@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 20760
          http://gar.svn.sourceforge.net/gar/?rev=20760&view=rev
Author:   wahwah
Date:     2013-04-17 12:12:49 +0000 (Wed, 17 Apr 2013)
Log Message:
-----------
checkpkg: Fix the email verification regex

D'oh! It missed "@opencsw-org".

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	2013-04-17 10:17:42 UTC (rev 20759)
+++ csw/mgar/gar/v2/lib/python/package_checks.py	2013-04-17 12:12:49 UTC (rev 20760)
@@ -70,7 +70,7 @@
     },
 }
 ARCH_RE = re.compile(r"(sparcv(8|9)|i386|amd64)")
-EMAIL_RE = re.compile(r"^.*@opencsw.org$")
+EMAIL_RE = re.compile(r"^.*@opencsw\.org$")
 MAX_CATALOGNAME_LENGTH = 29
 MAX_PKGNAME_LENGTH = 32
 ARCH_LIST = common_constants.ARCHITECTURES

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 Apr 17 14:13:00 2013
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Wed, 17 Apr 2013 12:13:00 +0000
Subject: [csw-devel] SF.net SVN: gar:[20761]
	csw/mgar/gar/v2/lib/python/rest.py
Message-ID: <E1USRES-000784-7y@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 20761
          http://gar.svn.sourceforge.net/gar/?rev=20761&view=rev
Author:   wahwah
Date:     2013-04-17 12:13:00 +0000 (Wed, 17 Apr 2013)
Log Message:
-----------
pkgdb: Try to recover from bad local cache

If the local cache is corrupt and doesn't want to deserialize, try fetching
again.

I experienced it with a corrupt local BDB, but it didn't save me in the long
run. Nevertheless, some additional defense won't hurt.

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

Modified: csw/mgar/gar/v2/lib/python/rest.py
===================================================================
--- csw/mgar/gar/v2/lib/python/rest.py	2013-04-17 12:12:49 UTC (rev 20760)
+++ csw/mgar/gar/v2/lib/python/rest.py	2013-04-17 12:13:00 UTC (rev 20761)
@@ -219,12 +219,18 @@
     self.d.close()
 
   def GetPkgstats(self, md5):
+    pkgstats = None
     if str(md5) in self.d:
-      return cjson.decode(self.d[md5])
-    else:
+      serialized_data = self.d[md5]
+      try:
+        return cjson.decode(serialized_data)
+      except (TypeError, cjson.DecodeError) as e:
+        logging.fatal('A problem with %r: %r', md5, e)
+        del self.d[md5]
+    if not pkgstats:
       pkgstats = self.rest_client.GetPkgstatsByMd5(md5)
       self.d[md5] = cjson.encode(pkgstats)
-      return pkgstats
+    return pkgstats
 
   def GetDeps(self, md5):
     if str(md5) in self.deps:

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 Apr 17 15:37:30 2013
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Wed, 17 Apr 2013 13:37:30 +0000
Subject: [csw-devel] SF.net SVN: gar:[20762]
	csw/mgar/pkg/syslog_ng/trunk/Makefile
Message-ID: <E1USSYE-0001P7-4R@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 20762
          http://gar.svn.sourceforge.net/gar/?rev=20762&view=rev
Author:   wahwah
Date:     2013-04-17 13:37:29 +0000 (Wed, 17 Apr 2013)
Log Message:
-----------
syslog_ng/trunk: As it turns out, we now have OpenSSL 1.0 for Solaris 9 as well.

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

Modified: csw/mgar/pkg/syslog_ng/trunk/Makefile
===================================================================
--- csw/mgar/pkg/syslog_ng/trunk/Makefile	2013-04-17 12:13:00 UTC (rev 20761)
+++ csw/mgar/pkg/syslog_ng/trunk/Makefile	2013-04-17 13:37:29 UTC (rev 20762)
@@ -58,16 +58,15 @@
 RUNTIME_DEP_PKGS_CSWsyslog-ng += CSWlibevtlog0
 RUNTIME_DEP_PKGS_CSWsyslog-ng += CSWlibgcc-s1
 RUNTIME_DEP_PKGS_CSWsyslog-ng += CSWlibpcre1
+RUNTIME_DEP_PKGS_CSWsyslog-ng += CSWlibssl1-0-0
 RUNTIME_DEP_PKGS_CSWsyslog-ng += CSWlibwrap1
 
 # Specifying different dependencies for 5.9 and 5.10.
 RUNTIME_DEP_PKGS_CSWsyslog-ng_5.10 += CSWlibglib2-0-0
 RUNTIME_DEP_PKGS_CSWsyslog-ng_5.10 += CSWlibgmodule2-0-0
 RUNTIME_DEP_PKGS_CSWsyslog-ng_5.10 += CSWlibgthread2-0-0
-RUNTIME_DEP_PKGS_CSWsyslog-ng_5.10 += CSWlibssl1-0-0
 
 RUNTIME_DEP_PKGS_CSWsyslog-ng_5.9 += CSWglib2
-RUNTIME_DEP_PKGS_CSWsyslog-ng_5.9 += CSWlibssl0-9-8
 
 RUNTIME_DEP_PKGS_CSWsyslog-ng += $(RUNTIME_DEP_PKGS_CSWsyslog-ng_$(GAROSREL))
 

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 Apr 17 15:44:48 2013
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Wed, 17 Apr 2013 13:44:48 +0000
Subject: [csw-devel] SF.net SVN: gar:[20763] csw/mgar/pkg
Message-ID: <E1USSfI-0004NF-ES@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 20763
          http://gar.svn.sourceforge.net/gar/?rev=20763&view=rev
Author:   dmichelsen
Date:     2013-04-17 13:44:48 +0000 (Wed, 17 Apr 2013)
Log Message:
-----------
pngcrush/trunk: Initial commit, some defined missing

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

Added: csw/mgar/pkg/pngcrush/Makefile
===================================================================
--- csw/mgar/pkg/pngcrush/Makefile	                        (rev 0)
+++ csw/mgar/pkg/pngcrush/Makefile	2013-04-17 13:44:48 UTC (rev 20763)
@@ -0,0 +1,2 @@
+%:
+	$(MAKE) -C trunk $*


Property changes on: csw/mgar/pkg/pngcrush/trunk
___________________________________________________________________
Added: svn:ignore
   + work


Added: csw/mgar/pkg/pngcrush/trunk/Makefile
===================================================================
--- csw/mgar/pkg/pngcrush/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/pngcrush/trunk/Makefile	2013-04-17 13:44:48 UTC (rev 20763)
@@ -0,0 +1,56 @@
+# $Id$
+# TODO (release-critical prefixed with !, non release-critical with *)
+#
+NAME = pngcrush
+VERSION = 1.7.58
+GARTYPE = v2
+
+DESCRIPTION = An optimizer for PNG (Portable Network Graphics) files
+
+SF_PROJECT = pmt
+MASTER_SITES = $(SF_MIRROR)
+DISTFILES += $(DISTNAME).tar.gz
+DISTFILES += COPYING
+
+VENDOR_URL = http://pmt.sourceforge.net/pngcrush/index.html
+
+BUILD64 = 1
+ISAEXEC = 1
+
+# There is no configure
+CONFIGURE_SCRIPTS =
+
+BUILD_OVERRIDE_VARS += CC
+BUILD_OVERRIDE_VAR_CC = $(CC)
+BUILD_OVERRIDE_VARS += LD
+BUILD_OVERRIDE_VAR_LD = $(CC)
+BUILD_OVERRIDE_VARS += CFLAGS
+BUILD_OVERRIDE_VAR_CFLAGS = $(CFLAGS)
+BUILD_OVERRIDE_VARS += LDFLAGS
+BUILD_OVERRIDE_VAR_LDFLAGS = $(LDFLAGS)
+
+BUILD_OVERRIDE_VARS += PNGINC
+BUILD_OVERRIDE_VAR_PNGINC = $(includedir)
+BUILD_OVERRIDE_VARS += PNGLIB
+BUILD_OVERRIDE_VAR_PNGLIB = $(libdir)
+BUILD_OVERRIDE_VARS += ZINC
+BUILD_OVERRIDE_VAR_ZINC = $(includedir)
+BUILD_OVERRIDE_VARS += ZLIB
+BUILD_OVERRIDE_VAR_ZLIB = $(libdir)
+
+BUILD_ARGS += -f Makefile-nolib
+
+# There is no testsuite
+TEST_SCRIPTS =
+
+INSTALL_SCRIPTS = custom
+
+include gar/category.mk
+
+install-custom:
+	ginstall -d $(DESTDIR)$(bindir)	
+	ginstall -m 0755 $(WORKSRC)/pngcrush $(DESTDIR)$(bindir)
+	ginstall -d $(DESTDIR)$(sharedstatedir)$(NAME)
+	ginstall -m 0644 $(WORKSRC)/ChangeLog.html $(DESTDIR)$(sharedstatedir)$(NAME)
+	@$(MAKECOOKIE)
+


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

Added: csw/mgar/pkg/pngcrush/trunk/checksums
===================================================================
--- csw/mgar/pkg/pngcrush/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/pngcrush/trunk/checksums	2013-04-17 13:44:48 UTC (rev 20763)
@@ -0,0 +1 @@
+d6f567fffb2de55eabe04f1727ca9336  pngcrush-1.7.58.tar.gz

Added: csw/mgar/pkg/pngcrush/trunk/files/COPYING
===================================================================
--- csw/mgar/pkg/pngcrush/trunk/files/COPYING	                        (rev 0)
+++ csw/mgar/pkg/pngcrush/trunk/files/COPYING	2013-04-17 13:44:48 UTC (rev 20763)
@@ -0,0 +1,32 @@
+/*
+ * pngcrush.c - recompresses png files
+ * Copyright (C) 1998-2002, 2006-2013 Glenn Randers-Pehrson
+ *                                   (glennrp at users.sf.net)
+ * Portions copyright (C) 2005       Greg Roelofs
+ *
+ * This software is released under a license derived from the libpng
+ * license (see LICENSE, below).
+ *
+ * The most recent version of pngcrush can be found at SourceForge in
+ * http://pmt.sf.net/pngcrush/
+ *
+ * This program reads in a PNG image, and writes it out again, with the
+ * optimum filter_method and zlib_level.  It uses brute force (trying
+ * filter_method none, and libpng adaptive filtering, with compression
+ * levels 3 and 9).
+ *
+ * Optionally, it can remove unwanted chunks or add gAMA, sRGB, bKGD,
+ * tEXt/zTXt, and tRNS chunks.  It will remove some chunks such as gAMA,
+ * cHRM, pHYs, and oFFs when their data fields contain all zero, which is a
+ * mistake.
+ *
+ * Uses libpng and zlib.  This program was based upon libpng's pngtest.c.
+ *
+ * Thanks to Greg Roelofs for various bug fixes, suggestions, and
+ * occasionally creating Linux executables.
+ *
+ * Thanks to Stephan Levavej for some helpful suggestions about gcc compiler
+ * options and for a suggestion to increase the Z_MEM_LEVEL from default.
+ *
+ */
+

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 Apr 17 16:26:15 2013
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Wed, 17 Apr 2013 14:26:15 +0000
Subject: [csw-devel] SF.net SVN: gar:[20764] csw/mgar/pkg/ghostscript/trunk
Message-ID: <E1USTJP-0005e8-75@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 20764
          http://gar.svn.sourceforge.net/gar/?rev=20764&view=rev
Author:   dmichelsen
Date:     2013-04-17 14:26:14 +0000 (Wed, 17 Apr 2013)
Log Message:
-----------
ghostscript/trunk: Intermediate commit

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

Added Paths:
-----------
    csw/mgar/pkg/ghostscript/trunk/files/0007-Do-not-return-something-in-void-context.patch

Modified: csw/mgar/pkg/ghostscript/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ghostscript/trunk/Makefile	2013-04-17 13:44:48 UTC (rev 20763)
+++ csw/mgar/pkg/ghostscript/trunk/Makefile	2013-04-17 14:26:14 UTC (rev 20764)
@@ -1,7 +1,7 @@
 # $Id$
 
 NAME = ghostscript
-VERSION = 9.04
+VERSION = 9.07
 GARTYPE = v2
 
 DESCRIPTION = PostScript and PDF interpreter
@@ -11,11 +11,9 @@
 MASTER_SITES = $(SF_MIRRORS)
 DISTFILES  = $(NAME)-$(VERSION).tar.bz2
 
-PACKAGES = CSWgs
-CATALOGNAME_CSWgs = ghostscript
+PACKAGES = CSWghostscript
 SPKG_DESC_CSWgs = PostScript and PDF interpreter
 
-
 RUNTIME_DEP_PKGS_CSWgs += CSWlibjpeg7
 RUNTIME_DEP_PKGS_CSWgs += CSWlibz1
 RUNTIME_DEP_PKGS_CSWgs += CSWlibssl0-9-8
@@ -54,45 +52,40 @@
 # CHECKPKG_OVERRIDES_CSWgs += symbol-not-found|gsc
 # CHECKPKG_OVERRIDES_CSWgs += symbol-not-found|gsx
 
-SPKG_SOURCEURL = http://www.ghostscript.com
+OSOLETED_BY_CSWghostscript += CSWgs
+CATALOGNAME_CSWgs = ghostscript_stub
 
+VENDOR_URL = http://www.ghostscript.com
+
 LICENSE = LICENSE
 
 UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=
 UPSTREAM_USE_SF = 1
 
-# PATCHFILES += 0001-Support-libjpeg7.patch
-PATCHFILES += 0002-Rearrange-compiler-flags.patch
-PATCHFILES += 0003-Change-gcc-flags-to-sun.patch
-# PATCHFILES += 0004-PLATFORM-is-used-by-GAR.patch
-PATCHFILES += 0005-Fix-pathes-according-to-old-package.patch
-# PATCHFILES += 0006-Fix-dynamic-link-flag.patch
-PATCHFILES += 0007-libidn-needs-L-opt-csw-lib.patch
-PATCHFILES += 0008-Wrong-place-in-configure.patch
+## PATCHFILES += 0001-Support-libjpeg7.patch
+#PATCHFILES += 0002-Rearrange-compiler-flags.patch
+#PATCHFILES += 0003-Change-gcc-flags-to-sun.patch
+## PATCHFILES += 0004-PLATFORM-is-used-by-GAR.patch
+#PATCHFILES += 0005-Fix-pathes-according-to-old-package.patch
+## PATCHFILES += 0006-Fix-dynamic-link-flag.patch
+#PATCHFILES += 0007-libidn-needs-L-opt-csw-lib.patch
+#PATCHFILES += 0008-Wrong-place-in-configure.patch
 
 # Not until libcupsimage.so libcups.so libkrb5.so libk5crypto.so
 # libcom_err.so libkrb5support.so are 64-bit
 
-# EXTRA_INC = $(prefix)/X11/include
-# EXTRA_LIB = $(prefix)/X11/lib
-# EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib
-# We want to be linked with Xrender from $(prefix)/X11/lib not
-# $(prefix)/lib since the latter is linked to /usr/openwin/lib/libX11.so.4
-# EXTRA_SOS_LD_FLAGS = -L$(abspath $(prefix)/X11/lib/$(MM_LIBDIR))
-
 # EXTRA_BUILD_ISAS = sparcv8plus+vis pentium_pro+mmx
 
+EXTRA_CFLAGS += $(LINKER_FLAGS)
+
 CONFIGURE_ARGS  = $(DIRPATHS)
 CONFIGURE_ARGS += --enable-dynamic
 CONFIGURE_ARGS += --enable-cups
 CONFIGURE_ARGS += --with-fontpath=$(datadir)/ghostscript/fonts
-# CONFIGURE_ARGS += --x-includes=$(prefix)/X11/include
-# CONFIGURE_ARGS += --x-libraries=$(prefix)/X11/lib
 
 # This fails due to ghostscript using PLATFORM for internal use which gets set
 # by GAR
-#TEST_TARGET = check
-TEST_TARGET = 
+#TEST_TARGET = 
 
 include gar/category.mk
 
@@ -100,8 +93,8 @@
 # INSTALL_ARGS = install install-so
 
 # Use CSW build packages instead of bundled stuff
-pre-configure-$(MODULATION):
-	@(echo "~~~ Removing bundled binaries ~~~")
-	rm -rf $(WORKSRC)/jpeg
-	rm -rf $(WORKSRC)/jbig2dec
-#	@rm -rf $(WORKSRC)/jasper
+#pre-configure:
+#	@(echo "~~~ Removing bundled binaries ~~~")
+#	rm -rf $(WORKSRC)/jpeg
+#	rm -rf $(WORKSRC)/jbig2dec
+#	rm -rf $(WORKSRC)/jasper

Modified: csw/mgar/pkg/ghostscript/trunk/checksums
===================================================================
--- csw/mgar/pkg/ghostscript/trunk/checksums	2013-04-17 13:44:48 UTC (rev 20763)
+++ csw/mgar/pkg/ghostscript/trunk/checksums	2013-04-17 14:26:14 UTC (rev 20764)
@@ -1 +1 @@
-9f6899e821ab6d78ab2c856f10fa3023  ghostscript-9.04.tar.bz2
+eea27befc1e85bef6d4768202f6b03a5  ghostscript-9.07.tar.bz2

Added: csw/mgar/pkg/ghostscript/trunk/files/0007-Do-not-return-something-in-void-context.patch
===================================================================
--- csw/mgar/pkg/ghostscript/trunk/files/0007-Do-not-return-something-in-void-context.patch	                        (rev 0)
+++ csw/mgar/pkg/ghostscript/trunk/files/0007-Do-not-return-something-in-void-context.patch	2013-04-17 14:26:14 UTC (rev 20764)
@@ -0,0 +1,30 @@
+From fd8d878d5f1bdb7a49dbdfd220e6c7f3525743e1 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Tue, 17 May 2011 16:51:09 +0200
+Subject: [PATCH] Do not return something in void context
+
+---
+ base/gdevdrop.c |    6 ++++--
+ 1 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/base/gdevdrop.c b/base/gdevdrop.c
+index fc52ebe..50a315b 100644
+--- a/base/gdevdrop.c
++++ b/base/gdevdrop.c
+@@ -408,9 +408,11 @@ pack_planar_from_standard(gx_device_memory * dev, int y, int destx,
+     const byte *sp = src;
+     int x, plane;
+ 
+-    if (pdepth == 1 && dev->color_info.num_components == 4)
+-        return pack_planar_cmyk_1bit_from_standard(dev, y, destx, src, width,
++    if (pdepth == 1 && dev->color_info.num_components == 4) {
++        pack_planar_cmyk_1bit_from_standard(dev, y, destx, src, width,
+                                                    depth, src_depth);
++        return;
++    }
+ 
+     for (plane = 0; plane < dev->num_planes; plane++) {
+         byte *dest = scan_line_base(dev, y + plane * dev->height);
+-- 
+1.7.3.2
+

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


From wilbury at users.sourceforge.net  Wed Apr 17 16:34:45 2013
From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net)
Date: Wed, 17 Apr 2013 14:34:45 +0000
Subject: [csw-devel] SF.net SVN: gar:[20765]
	csw/mgar/pkg/php5_memcache/trunk/Makefile
Message-ID: <E1USTRd-0005te-6t@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 20765
          http://gar.svn.sourceforge.net/gar/?rev=20765&view=rev
Author:   wilbury
Date:     2013-04-17 14:34:44 +0000 (Wed, 17 Apr 2013)
Log Message:
-----------
php5_memcache/trunk: Fix typos.

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

Modified: csw/mgar/pkg/php5_memcache/trunk/Makefile
===================================================================
--- csw/mgar/pkg/php5_memcache/trunk/Makefile	2013-04-17 14:26:14 UTC (rev 20764)
+++ csw/mgar/pkg/php5_memcache/trunk/Makefile	2013-04-17 14:34:44 UTC (rev 20765)
@@ -9,9 +9,11 @@
 
 DESCRIPTION = memcache Extention for PHP
 define BLURB
-	The Alternative PHP Cache (APC) is a free and open opcode cache for PHP.
-	It was conceived of to provide a free, open, and robust framework 
-	for caching and optimizing PHP intermediate code. 
+   Memcached is a caching daemon designed especially for
+   dynamic web applications to decrease database load by
+   storing objects in memory.
+   This extension allows you to work with memcached through
+   handy OO and procedural interfaces.
 endef
 
 PHP_PREFIX = $(prefix)/php5
@@ -34,7 +36,7 @@
 PACKAGES = CSWphp5-memcache
 OBSOLETED_BY_CSWphp5-memcache = CSWphp5memcache
 CATALOG_NAME_CSWphp5memcache = php5_memcache_stub
-SPKG_DESC_CSWphp5-memcache = APC Extention for PHP5
+SPKG_DESC_CSWphp5-memcache = memcache Extention for PHP5
 RUNTIME_DEP_PKGS_CSWphp5-memcache = CSWphp5
 BUILD_DEPS_CSWphp5-memcache = CSWapache2 CSWphp5-dev
 RUNTIME_DEP_PKGS_CSWphp5-memcache += CSWlibgcc-s1
@@ -46,7 +48,7 @@
 LICENSE = CREDITS
 
 # Build flags
-EXTRA_CFLAGS += "-I$(predix)/include/libmemcache"
+EXTRA_CFLAGS += "-I$(prefix)/include/libmemcache"
 
 # These should stop the test suite from asking to send results by
 # mail.

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


From wilbury at users.sourceforge.net  Wed Apr 17 16:35:17 2013
From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net)
Date: Wed, 17 Apr 2013 14:35:17 +0000
Subject: [csw-devel] SF.net SVN: gar:[20766]
	csw/mgar/pkg/php5_memcached/trunk/Makefile
Message-ID: <E1USTS9-0005uZ-QR@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 20766
          http://gar.svn.sourceforge.net/gar/?rev=20766&view=rev
Author:   wilbury
Date:     2013-04-17 14:35:17 +0000 (Wed, 17 Apr 2013)
Log Message:
-----------
php5_memcached/trunk: Fix typos.

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

Modified: csw/mgar/pkg/php5_memcached/trunk/Makefile
===================================================================
--- csw/mgar/pkg/php5_memcached/trunk/Makefile	2013-04-17 14:34:44 UTC (rev 20765)
+++ csw/mgar/pkg/php5_memcached/trunk/Makefile	2013-04-17 14:35:17 UTC (rev 20766)
@@ -9,9 +9,7 @@
 
 DESCRIPTION = memcached Extention for PHP
 define BLURB
-	The Alternative PHP Cache (APC) is a free and open opcode cache for PHP.
-	It was conceived of to provide a free, open, and robust framework 
-	for caching and optimizing PHP intermediate code. 
+   This extension uses libmemcached library to provide API for communicating with memcached servers.
 endef
 
 PHP_PREFIX = $(prefix)/php5
@@ -36,7 +34,7 @@
 PACKAGES = CSWphp5-memcached
 OBSOLETED_BY_CSWphp5-memcached = CSWphp5memcached
 CATALOG_NAME_CSWphp5memcached = php5_memcached_stub
-SPKG_DESC_CSWphp5-memcached = APC Extention for PHP5
+SPKG_DESC_CSWphp5-memcached = memcached Extention for PHP5
 RUNTIME_DEP_PKGS_CSWphp5-memcached = CSWphp5
 BUILD_DEPS_CSWphp5-memcached = CSWapache2 CSWphp5-dev
 RUNTIME_DEP_PKGS_CSWphp5-memcached += CSWlibgcc-s1
@@ -52,7 +50,7 @@
 LICENSE = LICENSE
 
 # Build flags
-EXTRA_CFLAGS += "-I$(predix)/include/libmemcached"
+EXTRA_CFLAGS += "-I$(prefix)/include/libmemcached"
 
 # These should stop the test suite from asking to send results by
 # mail.

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


From wilbury at users.sourceforge.net  Wed Apr 17 16:39:55 2013
From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net)
Date: Wed, 17 Apr 2013 14:39:55 +0000
Subject: [csw-devel] SF.net SVN: gar:[20767]
	csw/mgar/pkg/php5_memcached/trunk/Makefile
Message-ID: <E1USTWd-00061z-QD@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 20767
          http://gar.svn.sourceforge.net/gar/?rev=20767&view=rev
Author:   wilbury
Date:     2013-04-17 14:39:55 +0000 (Wed, 17 Apr 2013)
Log Message:
-----------
php5_memcached/trunk: Fix typo, do not use special CFLAGS.

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

Modified: csw/mgar/pkg/php5_memcached/trunk/Makefile
===================================================================
--- csw/mgar/pkg/php5_memcached/trunk/Makefile	2013-04-17 14:35:17 UTC (rev 20766)
+++ csw/mgar/pkg/php5_memcached/trunk/Makefile	2013-04-17 14:39:55 UTC (rev 20767)
@@ -34,7 +34,7 @@
 PACKAGES = CSWphp5-memcached
 OBSOLETED_BY_CSWphp5-memcached = CSWphp5memcached
 CATALOG_NAME_CSWphp5memcached = php5_memcached_stub
-SPKG_DESC_CSWphp5-memcached = memcached Extention for PHP5
+SPKG_DESC_CSWphp5-memcached =  Extention memcached for PHP5
 RUNTIME_DEP_PKGS_CSWphp5-memcached = CSWphp5
 BUILD_DEPS_CSWphp5-memcached = CSWapache2 CSWphp5-dev
 RUNTIME_DEP_PKGS_CSWphp5-memcached += CSWlibgcc-s1
@@ -49,9 +49,6 @@
 
 LICENSE = LICENSE
 
-# Build flags
-EXTRA_CFLAGS += "-I$(prefix)/include/libmemcached"
-
 # These should stop the test suite from asking to send results by
 # mail.
 NO_INTERACTION = 1

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


From wilbury at users.sourceforge.net  Wed Apr 17 16:56:05 2013
From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net)
Date: Wed, 17 Apr 2013 14:56:05 +0000
Subject: [csw-devel] SF.net SVN: gar:[20768]
	csw/mgar/pkg/php5_memcache/trunk/Makefile
Message-ID: <E1USTmH-0006R4-A5@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 20768
          http://gar.svn.sourceforge.net/gar/?rev=20768&view=rev
Author:   wilbury
Date:     2013-04-17 14:56:05 +0000 (Wed, 17 Apr 2013)
Log Message:
-----------
php5_memcache/trunk: Do not use special CFLAGS.

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

Modified: csw/mgar/pkg/php5_memcache/trunk/Makefile
===================================================================
--- csw/mgar/pkg/php5_memcache/trunk/Makefile	2013-04-17 14:39:55 UTC (rev 20767)
+++ csw/mgar/pkg/php5_memcache/trunk/Makefile	2013-04-17 14:56:05 UTC (rev 20768)
@@ -36,7 +36,7 @@
 PACKAGES = CSWphp5-memcache
 OBSOLETED_BY_CSWphp5-memcache = CSWphp5memcache
 CATALOG_NAME_CSWphp5memcache = php5_memcache_stub
-SPKG_DESC_CSWphp5-memcache = memcache Extention for PHP5
+SPKG_DESC_CSWphp5-memcache =  Extention memcache for PHP5
 RUNTIME_DEP_PKGS_CSWphp5-memcache = CSWphp5
 BUILD_DEPS_CSWphp5-memcache = CSWapache2 CSWphp5-dev
 RUNTIME_DEP_PKGS_CSWphp5-memcache += CSWlibgcc-s1
@@ -47,9 +47,6 @@
 
 LICENSE = CREDITS
 
-# Build flags
-EXTRA_CFLAGS += "-I$(prefix)/include/libmemcache"
-
 # These should stop the test suite from asking to send results by
 # mail.
 NO_INTERACTION = 1

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


From maciej at opencsw.org  Wed Apr 17 22:59:26 2013
From: maciej at opencsw.org (Maciej =?utf-8?Q?Blizi=C5=84ski?=)
Date: Wed, 17 Apr 2013 21:59:26 +0100
Subject: [csw-devel] SF.net SVN: gar:[16724]
 csw/mgar/pkg/lang-java/389-admin-console/trunk/ Makefile
In-Reply-To: <E1RkDqp-0005ez-IJ@sfp-svn-5.v30.ch3.sourceforge.com>
References: <E1RkDqp-0005ez-IJ@sfp-svn-5.v30.ch3.sourceforge.com>
Message-ID: <20130417205926.GA6346@cotton.home.blizinski.pl>

On Mon, Jan 09, 2012 at 11:57:19AM +0000, cgrzemba at users.sourceforge.net wrote:
> +CHECKPKG_OVERRIDES_CSW389-admin-console += unidentified-dependency|CSW389-admin

This is a risky override. If you make a mistake during the upload step,
you can put the catalog in a broken state. I think I know why you added
the override: you were building CSW389-admin in another build recipe, so
they weren't built together. You probably intended to upload it together
with CSW389-admin-console. But there are better ways of doing this which
don't risk breaking the catalog. For example, you can build a dummy
package in the CSW389-admin-console recipe, or simply let checkpkg fail
the check at the package build stage. If this was the only error shown,
you know that it will go away when you upload the right set of packages,
so you can upload safely.

Maciej

From maciej at opencsw.org  Wed Apr 17 23:06:36 2013
From: maciej at opencsw.org (Maciej =?utf-8?Q?Blizi=C5=84ski?=)
Date: Wed, 17 Apr 2013 22:06:36 +0100
Subject: [csw-devel] SF.net SVN: gar:[17970]
 csw/mgar/pkg/x264/trunk/Makefile
In-Reply-To: <E1SRfUB-0007YE-K7@sfp-svn-5.v30.ch3.sourceforge.com>
References: <E1SRfUB-0007YE-K7@sfp-svn-5.v30.ch3.sourceforge.com>
Message-ID: <20130417210636.GB6346@cotton.home.blizinski.pl>

On Tue, May 08, 2012 at 08:09:31AM +0000, janholzh at users.sourceforge.net wrote:
>  #Some overrides
>  CHECKPKG_OVERRIDES += pkginfo-description-not-starting-with-uppercase
> -CHECKPKG_OVERRIDES_CSWlibx264-122 += pkginfo-description-not-starting-with-uppercase
> +CHECKPKG_OVERRIDES_CSWlibx264-124 += pkginfo-description-not-starting-with-uppercase

Why not adjust the description?

>  # seems to be checkpkg bug:
> -CHECKPKG_OVERRIDES_CSWlibx264-122 += non-uniform-lib-versions-in-package|sonames=libx264.so.122
> +CHECKPKG_OVERRIDES_CSWlibx264-124 += non-uniform-lib-versions-in-package|sonames=libx264.so.124

Interesting, I'm not sure why that is. It looks like checkpkg thinks
there are multiple sonames in this package.

From maciej at opencsw.org  Wed Apr 17 23:16:13 2013
From: maciej at opencsw.org (Maciej =?utf-8?Q?Blizi=C5=84ski?=)
Date: Wed, 17 Apr 2013 22:16:13 +0100
Subject: [csw-devel] SF.net SVN: gar:[17987]
 csw/mgar/pkg/lsdvd/trunk/Makefile
In-Reply-To: <E1SSoQj-0006ao-Mq@sfp-svn-1.v30.ch3.sourceforge.com>
References: <E1SSoQj-0006ao-Mq@sfp-svn-1.v30.ch3.sourceforge.com>
Message-ID: <20130417211613.GC6346@cotton.home.blizinski.pl>

On Fri, May 11, 2012 at 11:54:41AM +0000, pfelecan at users.sourceforge.net wrote:
>  RUNTIME_DEP_PKGS	=	\
>  						CSWlibdvdread \
>  						CSWlibgcc-s1
> +# this is needed because chkpkg incorrectly complains:
> +CHECKPKG_OVERRIDES_CSWlsdvd += surplus-dependency|CSWlibgcc-s1

Why is that? Checkpkg does say why it thinks certain library is
necessary.

From chninkel at users.sourceforge.net  Wed Apr 17 23:28:35 2013
From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net)
Date: Wed, 17 Apr 2013 21:28:35 +0000
Subject: [csw-devel] SF.net SVN: gar:[20769] csw/mgar/pkg/unbound/trunk
Message-ID: <E1USZu7-00089i-Pq@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 20769
          http://gar.svn.sourceforge.net/gar/?rev=20769&view=rev
Author:   chninkel
Date:     2013-04-17 21:28:32 +0000 (Wed, 17 Apr 2013)
Log Message:
-----------
unbound/trunk: fix for compilation bug

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

Added Paths:
-----------
    csw/mgar/pkg/unbound/trunk/files/0001-fix-preprocessing-bug.patch

Modified: csw/mgar/pkg/unbound/trunk/Makefile
===================================================================
--- csw/mgar/pkg/unbound/trunk/Makefile	2013-04-17 14:56:05 UTC (rev 20768)
+++ csw/mgar/pkg/unbound/trunk/Makefile	2013-04-17 21:28:32 UTC (rev 20769)
@@ -20,11 +20,13 @@
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
 
+PATCHFILES += 0001-fix-preprocessing-bug.patch
+
 # If the url used to check for software update is different of MASTER_SITES, then 
 # uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES
 # UPSTREAM_MASTER_SITES = 
 
-#CONFIGURE_ARGS  = $(DIRPATHS)
+CONFIGURE_ARGS  = $(DIRPATHS)
 CONFIGURE_ARGS += --with-libevent=/opt/csw
 CONFIGURE_ARGS += --with-libexpat=/opt/csw
 CONFIGUTE_ARGS += --with-solaris-threads

Added: csw/mgar/pkg/unbound/trunk/files/0001-fix-preprocessing-bug.patch
===================================================================
--- csw/mgar/pkg/unbound/trunk/files/0001-fix-preprocessing-bug.patch	                        (rev 0)
+++ csw/mgar/pkg/unbound/trunk/files/0001-fix-preprocessing-bug.patch	2013-04-17 21:28:32 UTC (rev 20769)
@@ -0,0 +1,25 @@
+From ea9f488d3dfb3397880937cfac66b1168a852ed2 Mon Sep 17 00:00:00 2001
+From: Yann Rouillard <yann at pleiades.fr.eu.org>
+Date: Wed, 17 Apr 2013 23:10:44 +0200
+Subject: [PATCH] fix preprocessing bug
+
+---
+ util/storage/lookup3.c | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/util/storage/lookup3.c b/util/storage/lookup3.c
+index 845cc38..a96ca05 100644
+--- a/util/storage/lookup3.c
++++ b/util/storage/lookup3.c
+@@ -75,8 +75,6 @@ hash_set_raninit(uint32_t v)
+  */
+ #if (defined(__BYTE_ORDER) && defined(__LITTLE_ENDIAN) && \
+      __BYTE_ORDER == __LITTLE_ENDIAN) || \
+-    (defined(_BYTE_ORDER) && defined(_LITTLE_ENDIAN) && \
+-     _BYTE_ORDER == _LITTLE_ENDIAN) || \
+     (defined(i386) || defined(__i386__) || defined(__i486__) || \
+      defined(__i586__) || defined(__i686__) || defined(vax) || defined(MIPSEL))
+ # define HASH_LITTLE_ENDIAN 1
+-- 
+1.8.1.4
+

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


From maciej at opencsw.org  Wed Apr 17 23:34:10 2013
From: maciej at opencsw.org (Maciej =?utf-8?Q?Blizi=C5=84ski?=)
Date: Wed, 17 Apr 2013 22:34:10 +0100
Subject: [csw-devel] SF.net SVN: gar:[17988]
 csw/mgar/pkg/libotf/trunk/Makefile
In-Reply-To: <E1SSp2H-00050y-H1@sfp-svn-4.v30.ch3.sourceforge.com>
References: <E1SSp2H-00050y-H1@sfp-svn-4.v30.ch3.sourceforge.com>
Message-ID: <20130417213410.GD6346@cotton.home.blizinski.pl>

Hi Peter,

On Fri, May 11, 2012 at 12:33:29PM +0000, pfelecan at users.sourceforge.net wrote:
> Revision: 17988
>           http://gar.svn.sourceforge.net/gar/?rev=17988&view=rev
> Author:   pfelecan
> Date:     2012-05-11 12:33:29 +0000 (Fri, 11 May 2012)
> Log Message:
> -----------
> overrides incorrect chkpkg complaints...
> 
> Modified Paths:
> --------------
>     csw/mgar/pkg/libotf/trunk/Makefile
> 
> Modified: csw/mgar/pkg/libotf/trunk/Makefile
> ===================================================================
> --- csw/mgar/pkg/libotf/trunk/Makefile	2012-05-11 11:54:41 UTC (rev 17987)
> +++ csw/mgar/pkg/libotf/trunk/Makefile	2012-05-11 12:33:29 UTC (rev 17988)
> @@ -55,6 +55,10 @@
>  OBSOLETED_BY_CSWlibotf-utils		+=	CSWlibotf
>  RUNTIME_DEP_PKGS_CSWlibotf-utils	+=	\
>  										CSWlibotf0
> +# checkpkg cincorrectly complains about this:
> +CHECKPKG_OVERRIDES_CSWlibotf-utils += missing-dependency|CSWlibbz2-1-0
> +CHECKPKG_OVERRIDES_CSWlibotf-utils += missing-dependency|CSWlibz1
> +CHECKPKG_OVERRIDES_CSWlibotf-utils += missing-dependency|CSWlibfreetype6

If you look into the otfdump binary, it lists these sonames:

libotf.so.0
libfreetype.so.6
libz.so.1
libbz2.so.1.0
libc.so.1

The dependencies suggested by checkpkg seem entirely correct to me.

Why do you think they are incorrect?

Maciej

From maciej at opencsw.org  Wed Apr 17 23:42:02 2013
From: maciej at opencsw.org (Maciej =?utf-8?Q?Blizi=C5=84ski?=)
Date: Wed, 17 Apr 2013 22:42:02 +0100
Subject: [csw-devel] SF.net SVN: gar:[18142]
 csw/mgar/pkg/cmake/trunk/Makefile
In-Reply-To: <E1SYyLY-0001zt-Vz@sfp-svn-6.v30.ch3.sourceforge.com>
References: <E1SYyLY-0001zt-Vz@sfp-svn-6.v30.ch3.sourceforge.com>
Message-ID: <20130417214202.GE6346@cotton.home.blizinski.pl>

Hi Rupert,

On Mon, May 28, 2012 at 11:42:49AM +0000, rthurner at users.sourceforge.net wrote:
> Revision: 18142
>           http://gar.svn.sourceforge.net/gar/?rev=18142&view=rev
> Author:   rthurner
> Date:     2012-05-28 11:42:48 +0000 (Mon, 28 May 2012)
> Log Message:
> -----------
> checkpkg errors for cmake, man path
> 
> Modified Paths:
> --------------
>     csw/mgar/pkg/cmake/trunk/Makefile
> 
> Modified: csw/mgar/pkg/cmake/trunk/Makefile
> ===================================================================
> --- csw/mgar/pkg/cmake/trunk/Makefile	2012-05-28 09:12:40 UTC (rev 18141)
> +++ csw/mgar/pkg/cmake/trunk/Makefile	2012-05-28 11:42:48 UTC (rev 18142)
> @@ -27,8 +27,22 @@
>  CATALOGNAME_CSWcmake = cmake
>  SPKG_DESC_CSWcmake = $(DESCRIPTION)
>  
> -RUNTIME_DEP_PKGS_CSWcmake += CSWlibidn11
> +RUNTIME_DEP_PKGS_CSWcmake += CSWlibexpat1
> +RUNTIME_DEP_PKGS_CSWcmake += CSWlibcurl4
> +RUNTIME_DEP_PKGS_CSWcmake += CSWlibz1
>  
> +CHECKPKG_OVERRIDES_CSWcmake += disallowed-path|opt/csw/man/man1/cmakepolicies.1
> +CHECKPKG_OVERRIDES_CSWcmake += disallowed-path|opt/csw/man/man1/cmakecompat.1
> +CHECKPKG_OVERRIDES_CSWcmake += disallowed-path|opt/csw/man/man1/cmakemodules.1
> +CHECKPKG_OVERRIDES_CSWcmake += disallowed-path|opt/csw/man/man1/cpack.1
> +CHECKPKG_OVERRIDES_CSWcmake += disallowed-path|opt/csw/man/man1/ccmake.1
> +CHECKPKG_OVERRIDES_CSWcmake += disallowed-path|opt/csw/man/man1/ctest.1
> +CHECKPKG_OVERRIDES_CSWcmake += disallowed-path|opt/csw/man/man1
> +CHECKPKG_OVERRIDES_CSWcmake += disallowed-path|opt/csw/man/man1/cmakeprops.1
> +CHECKPKG_OVERRIDES_CSWcmake += disallowed-path|opt/csw/man/man1/cmakecommands.1
> +CHECKPKG_OVERRIDES_CSWcmake += disallowed-path|opt/csw/man/man1/cmake.1
> +CHECKPKG_OVERRIDES_CSWcmake += disallowed-path|opt/csw/man/man1/cmakevars.1

Why these overrides? This is a wrong place for man pages, we don't put
man pages there and they don't work if we put them there.

If everything else fails, you can always move the man pages to the
correct directory in a postinstall step.

In general, when you put in overrides for anything, please include an
explanation, why the errors thrown by checkpkg are false positives.

Maciej

From maciej at opencsw.org  Wed Apr 17 23:45:11 2013
From: maciej at opencsw.org (Maciej =?utf-8?Q?Blizi=C5=84ski?=)
Date: Wed, 17 Apr 2013 22:45:11 +0100
Subject: [csw-devel] SF.net SVN: gar:[18193]
 csw/mgar/pkg/auctex/trunk/Makefile
In-Reply-To: <E1SaQFh-0004jY-VA@sfp-svn-2.v30.ch3.sourceforge.com>
References: <E1SaQFh-0004jY-VA@sfp-svn-2.v30.ch3.sourceforge.com>
Message-ID: <20130417214511.GF6346@cotton.home.blizinski.pl>

Hi Peter,

On Fri, Jun 01, 2012 at 11:42:45AM +0000, pfelecan at users.sourceforge.net wrote:
> Revision: 18193
>           http://gar.svn.sourceforge.net/gar/?rev=18193&view=rev
> Author:   pfelecan
> Date:     2012-06-01 11:42:45 +0000 (Fri, 01 Jun 2012)
> Log Message:
> -----------
> verified overrides for the checker
> 
(...)
> +# all the "bad content"s are innocuous:
> +CHECKPKG_OVERRIDES_CSWauctex += file-with-bad-content|/usr/local|root/opt/csw/share/info/auctex.info-1
> +CHECKPKG_OVERRIDES_CSWauctex += file-with-bad-content|/usr/local|root/opt/csw/share/doc/auctex/auctex.dvi
> +CHECKPKG_OVERRIDES_CSWauctex += file-with-bad-content|/usr/local|root/opt/csw/share/doc/auctex/auctex.ps
> +CHECKPKG_OVERRIDES_CSWauctex += file-with-bad-content|/usr/local|root/opt/csw/share/doc/auctex/html/auctex_4.html
> +CHECKPKG_OVERRIDES_CSWauctex += file-with-bad-content|/usr/share|root/opt/csw/share/info/preview-latex.info
> +CHECKPKG_OVERRIDES_CSWauctex += file-with-bad-content|/usr/share|root/opt/csw/share/emacs/site-lisp/auctex/tex.el
> +CHECKPKG_OVERRIDES_CSWauctex += file-with-bad-content|/usr/share|root/opt/csw/share/emacs/site-lisp/auctex/tex-jp.el
> +CHECKPKG_OVERRIDES_CSWauctex += file-with-bad-content|/usr/share|root/opt/csw/share/emacs/site-lisp/auctex/tex.elc
> +CHECKPKG_OVERRIDES_CSWauctex += file-with-bad-content|/usr/share|root/opt/csw/share/emacs/site-lisp/auctex/tex-jp.elc
> +CHECKPKG_OVERRIDES_CSWauctex += file-with-bad-content|/usr/share|root/opt/csw/share/doc/auctex/preview-latex.ps
> +CHECKPKG_OVERRIDES_CSWauctex += file-with-bad-content|/usr/share|root/opt/csw/share/doc/auctex/preview-latex.dvi

You can replace all these with a single:

CHECKPKG_OVERRIDES_CSWauctex += file-with-bad-content

> +# depends on CSWemacs wich depends on CSWemacscommon:
> +CHECKPKG_OVERRIDES_CSWauctex += missing-dependency|CSWemacscommon

Our policy is that if there's a reason why one package depends on
another, we should include a direct dependency and not rely in
transitiveness.

Maciej

From maciej at opencsw.org  Wed Apr 17 23:47:34 2013
From: maciej at opencsw.org (Maciej =?utf-8?Q?Blizi=C5=84ski?=)
Date: Wed, 17 Apr 2013 22:47:34 +0100
Subject: [csw-devel] SF.net SVN: gar:[18194]
 csw/mgar/pkg/emacs/trunk/Makefile
In-Reply-To: <E1SaSBQ-0001ol-GI@sfp-svn-4.v30.ch3.sourceforge.com>
References: <E1SaSBQ-0001ol-GI@sfp-svn-4.v30.ch3.sourceforge.com>
Message-ID: <20130417214734.GG6346@cotton.home.blizinski.pl>

Hi Peter,

On Fri, Jun 01, 2012 at 01:46:28PM +0000, pfelecan at users.sourceforge.net wrote:
> Revision: 18194
>           http://gar.svn.sourceforge.net/gar/?rev=18194&view=rev
> Author:   pfelecan
> Date:     2012-06-01 13:46:28 +0000 (Fri, 01 Jun 2012)
> Log Message:
> -----------
> emacs is now a meta-package used for dependencies on emacs; the old
> content is now in a specific emacs_athena package which is a
> dependency of the former.
> 
> +CHECKPKG_OVERRIDES_CSWemacs-athena	+=	missing-dependency|CSWlibm17n-utils
> +CHECKPKG_OVERRIDES_CSWemacs-athena	+=	missing-dependency|CSWlibotf-utils
> +CHECKPKG_OVERRIDES_CSWemacs-athena	+=	missing-dependency|CSWlibfontconfig1

The above error messages are about shared libraries, and checkpkg is
rarely wrong about shared library dependencies. 

> +CHECKPKG_OVERRIDES_CSWemacs-athena	+=	surplus-dependency|CSWlibcroco
> +CHECKPKG_OVERRIDES_CSWemacs-athena	+=	surplus-dependency|CSWemacs-athena-common
> +CHECKPKG_OVERRIDES_CSWemacs-athena	+=	surplus-dependency|CSWlibiconv2
> +CHECKPKG_OVERRIDES_CSWemacs-athena	+=	surplus-dependency|CSWlibotf0
> +CHECKPKG_OVERRIDES_CSWemacs-athena	+=	surplus-dependency|CSWlibdatrie1
> +CHECKPKG_OVERRIDES_CSWemacs-athena	+=	surplus-dependency|CSWlibthai0
> +CHECKPKG_OVERRIDES_CSWemacs-athena	+=	surplus-dependency|CSWlibgcc-s1
> +CHECKPKG_OVERRIDES_CSWemacs-athena	+=	surplus-dependency|CSWlibm17n0
> +CHECKPKG_OVERRIDES_CSWemacs-athena	+=	surplus-dependency|CSWlibjbig2
> +CHECKPKG_OVERRIDES_CSWemacs-athena	+=	surplus-dependency|CSWpango
> +CHECKPKG_OVERRIDES_CSWemacs-athena	+=	surplus-dependency|CSWemacs-athena-bin-common
> +CHECKPKG_OVERRIDES_CSWemacs-athena	+=	surplus-dependency|CSWlibxml2-2
> +CHECKPKG_OVERRIDES_CSWemacs-athena	+=	surplus-dependency|CSWlibexpat1
> +CHECKPKG_OVERRIDES_CSWemacs-athena	+=	surplus-dependency|CSWlibpixman1-0
> +CHECKPKG_OVERRIDES_CSWemacs-athena	+=	surplus-dependency|CSWfconfig

These on the other hand, seem to be unnecessary dependencies. Do
binaries in the CSWemacs-athena package use dlopen? If not, checkpkg is
likely right that they are not necessary.

From maciej at opencsw.org  Wed Apr 17 23:50:26 2013
From: maciej at opencsw.org (Maciej =?utf-8?Q?Blizi=C5=84ski?=)
Date: Wed, 17 Apr 2013 22:50:26 +0100
Subject: [csw-devel] SF.net SVN: gar:[18218]
 csw/mgar/pkg/nagios/trunk/Makefile
In-Reply-To: <E1SbdYz-0003bn-QG@sfp-svn-1.v30.ch3.sourceforge.com>
References: <E1SbdYz-0003bn-QG@sfp-svn-1.v30.ch3.sourceforge.com>
Message-ID: <20130417215026.GH6346@cotton.home.blizinski.pl>

Hi Juergen,

On Mon, Jun 04, 2012 at 08:07:41PM +0000, j_arndt at users.sourceforge.net wrote:
> Revision: 18218
>           http://gar.svn.sourceforge.net/gar/?rev=18218&view=rev
> Author:   j_arndt
> Date:     2012-06-04 20:07:41 +0000 (Mon, 04 Jun 2012)
> Log Message:
> -----------
> nagios: added (temporary) override
> 
> Modified Paths:
> --------------
>     csw/mgar/pkg/nagios/trunk/Makefile
> 
> Modified: csw/mgar/pkg/nagios/trunk/Makefile
> ===================================================================
> --- csw/mgar/pkg/nagios/trunk/Makefile	2012-06-04 19:36:36 UTC (rev 18217)
> +++ csw/mgar/pkg/nagios/trunk/Makefile	2012-06-04 20:07:41 UTC (rev 18218)
> @@ -125,6 +125,8 @@
>  CHECKPKG_OVERRIDES_CSWnagios += surplus-dependency|CSWlibiconv2
>  CHECKPKG_OVERRIDES_CSWnagios += surplus-dependency|CSWjpeg
>  
> +CHECKPKG_OVERRIDES_CSWnagios += unidentified-dependency|CSWnagios-plugins

This is a risky override and there are better ways to handle situations
with package sets built from multiple sources.

More on the topic: 
http://lists.opencsw.org/pipermail/devel/2013-April/026013.html

Maciej

From maciej at opencsw.org  Thu Apr 18 00:04:30 2013
From: maciej at opencsw.org (Maciej =?utf-8?Q?Blizi=C5=84ski?=)
Date: Wed, 17 Apr 2013 23:04:30 +0100
Subject: [csw-devel] SF.net SVN: gar:[18250]
 csw/mgar/pkg/autogen/trunk/Makefile
In-Reply-To: <E1ScdVg-0005Nl-54@sfp-svn-4.v30.ch3.sourceforge.com>
References: <E1ScdVg-0005Nl-54@sfp-svn-4.v30.ch3.sourceforge.com>
Message-ID: <20130417220430.GI6346@cotton.home.blizinski.pl>

Hi Peter,

On Thu, Jun 07, 2012 at 02:16:24PM +0000, pfelecan at users.sourceforge.net wrote:
> Revision: 18250
>           http://gar.svn.sourceforge.net/gar/?rev=18250&view=rev
> Author:   pfelecan
> Date:     2012-06-07 14:16:23 +0000 (Thu, 07 Jun 2012)
> Log Message:
> -----------
> check overrides inserted and validated
> 
> Modified Paths:
> --------------
>     csw/mgar/pkg/autogen/trunk/Makefile
> 
> Modified: csw/mgar/pkg/autogen/trunk/Makefile
> ===================================================================
> --- csw/mgar/pkg/autogen/trunk/Makefile	2012-06-07 13:48:06 UTC (rev 18249)
> +++ csw/mgar/pkg/autogen/trunk/Makefile	2012-06-07 14:16:23 UTC (rev 18250)
> @@ -51,15 +51,25 @@
>  SPKG_DESC_CSWautogen			=	$(DESCRIPTION)
>  RUNTIME_DEP_PKGS_CSWautogen		=	CSWautogen-dev
>  RUNTIME_DEP_PKGS_CSWautogen		+=	CSWautogen-doc
> +CHECKPKG_OVERRIDES_CSWautogen	+=	missing-dependency|CSWlibopts25
> +CHECKPKG_OVERRIDES_CSWautogen	+=	missing-dependency|CSWguilelib12
> +CHECKPKG_OVERRIDES_CSWautogen	+=	missing-dependency|CSWlibiconv2
> +CHECKPKG_OVERRIDES_CSWautogen	+=	missing-dependency|CSWlibxml2-2
> +CHECKPKG_OVERRIDES_CSWautogen	+=	missing-dependency|CSWlibz1
> +CHECKPKG_OVERRIDES_CSWautogen	+=	surplus-dependency|CSWautogen-doc
> +CHECKPKG_OVERRIDES_CSWautogen	+=	surplus-dependency|CSWautogen-dev

You're writing that you've validated dependencies, but it looks like the
package is really missing them, because it contains binaries that need
these libraries. What's happening here?

If checkpkg is right, the recipe should be corrected.

If checkpkg is wrong, we should find the bug and fix it.

Maciej

From maciej at opencsw.org  Thu Apr 18 00:10:29 2013
From: maciej at opencsw.org (Maciej =?utf-8?Q?Blizi=C5=84ski?=)
Date: Wed, 17 Apr 2013 23:10:29 +0100
Subject: [csw-devel] SF.net SVN: gar:[16823]
 csw/mgar/pkg/389-admin/trunk/Makefile
In-Reply-To: <E1RntUv-0002qi-UB@sfp-svn-2.v30.ch3.sourceforge.com>
References: <E1RntUv-0002qi-UB@sfp-svn-2.v30.ch3.sourceforge.com>
Message-ID: <20130417221029.GJ6346@cotton.home.blizinski.pl>

Hi Carsten,

On Thu, Jan 19, 2012 at 03:01:53PM +0000, cgrzemba at users.sourceforge.net wrote:
> +CHECKPKG_OVERRIDES_CSW389admin += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libds-admin-serv.so
> +CHECKPKG_OVERRIDES_CSW389admin += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libds-admin-serv.so

Do these symlinks belong to the package? Normally they should go into
a devel package.

> +CHECKPKG_OVERRIDES_CSW389admin += pkginfo-opencsw-repository-uncommitted

For the record, this will go away on its own when you commit your
changes.

From maciej at opencsw.org  Thu Apr 18 00:20:09 2013
From: maciej at opencsw.org (Maciej =?utf-8?Q?Blizi=C5=84ski?=)
Date: Wed, 17 Apr 2013 23:20:09 +0100
Subject: [csw-devel] SF.net SVN: gar:[17313]
 csw/mgar/pkg/gobject-introspection/trunk
In-Reply-To: <E1S4wG5-0005cN-5M@sfp-svn-4.v30.ch3.sourceforge.com>
References: <E1S4wG5-0005cN-5M@sfp-svn-4.v30.ch3.sourceforge.com>
Message-ID: <20130417222009.GK6346@cotton.home.blizinski.pl>

Hi Carsten,

On Tue, Mar 06, 2012 at 03:25:01PM +0000, cgrzemba at users.sourceforge.net wrote:
> Revision: 17313
>           http://gar.svn.sourceforge.net/gar/?rev=17313&view=rev
> Author:   cgrzemba
> Date:     2012-03-06 15:25:00 +0000 (Tue, 06 Mar 2012)
> Log Message:
> -----------
> gobject-introspection/trunk: skip test target

> +CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/__init__.pyc
> +CHECKPKG_OVERRIDES_CSWgobject-introspection += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/__init__.pyo

Instead of overridding, you can use the EXTRA_MERGE_EXCLUDE_FILES
variable to skip the .pyc and .pyo files from merging.

Maciej

From maciej at opencsw.org  Thu Apr 18 00:26:35 2013
From: maciej at opencsw.org (Maciej =?utf-8?Q?Blizi=C5=84ski?=)
Date: Wed, 17 Apr 2013 23:26:35 +0100
Subject: [csw-devel] SF.net SVN: gar:[17605] csw/mgar/pkg/powerdns/trunk
In-Reply-To: <E1SFSRj-0004gz-42@sfp-svn-4.v30.ch3.sourceforge.com>
References: <E1SFSRj-0004gz-42@sfp-svn-4.v30.ch3.sourceforge.com>
Message-ID: <20130417222635.GL6346@cotton.home.blizinski.pl>

On Wed, Apr 04, 2012 at 03:48:31PM +0000, wilbury at users.sourceforge.net wrote:
> Revision: 17605
>           http://gar.svn.sourceforge.net/gar/?rev=17605&view=rev
> Author:   wilbury
> Date:     2012-04-04 15:48:30 +0000 (Wed, 04 Apr 2012)
> Log Message:
> -----------
> powerdns/trunk: Correct dependencies and reinplacements.
> 
> Modified Paths:
> --------------
>     csw/mgar/pkg/powerdns/trunk/Makefile
> 
> +CHECKPKG_OVERRIDES_CSWpdns += file-with-bad-content|/usr/local|root/etc/opt/csw/pdns/pdns.conf.CSW
> +CHECKPKG_OVERRIDES_CSWpdns += catalogname-does-not-match-pkgname|pkgname=CSWpdns|catalogname=powerdns|expected-catalogname=pdns

It's best if these are in sync. Is it a legacy naming that you're
following?

> +CHECKPKG_OVERRIDES_CSWlibgeobackend += pkginfo-opencsw-repository-uncommitted
> +CHECKPKG_OVERRIDES_CSWpdns += pkginfo-opencsw-repository-uncommitted
> +CHECKPKG_OVERRIDES_CSWlibgmysqlbackend += pkginfo-opencsw-repository-uncommitted

It's not necessary to override these, they go away after you commit your
changes. If you're still getting them, try 'svn status' to see if there
are any leftovers or untracked files.

From jh at opencsw.org  Thu Apr 18 07:09:32 2013
From: jh at opencsw.org (Jan Holzhueter)
Date: Thu, 18 Apr 2013 07:09:32 +0200
Subject: [csw-devel] SF.net SVN: gar:[17970]
	csw/mgar/pkg/x264/trunk/Makefile
In-Reply-To: <20130417210636.GB6346@cotton.home.blizinski.pl>
References: <E1SRfUB-0007YE-K7@sfp-svn-5.v30.ch3.sourceforge.com>
	<20130417210636.GB6346@cotton.home.blizinski.pl>
Message-ID: <516F800C.6000300@opencsw.org>

Hi,
Am 17.04.13 23:06, schrieb Maciej Blizi?ski:
> On Tue, May 08, 2012 at 08:09:31AM +0000, janholzh at users.sourceforge.net wrote:
>>  #Some overrides
>>  CHECKPKG_OVERRIDES += pkginfo-description-not-starting-with-uppercase
>> -CHECKPKG_OVERRIDES_CSWlibx264-122 += pkginfo-description-not-starting-with-uppercase
>> +CHECKPKG_OVERRIDES_CSWlibx264-124 += pkginfo-description-not-starting-with-uppercase
> 
> Why not adjust the description?
will probably do the next time :)
> 
>>  # seems to be checkpkg bug:
>> -CHECKPKG_OVERRIDES_CSWlibx264-122 += non-uniform-lib-versions-in-package|sonames=libx264.so.122
>> +CHECKPKG_OVERRIDES_CSWlibx264-124 += non-uniform-lib-versions-in-package|sonames=libx264.so.124
> 
> Interesting, I'm not sure why that is. It looks like checkpkg thinks
> there are multiple sonames in this package.

Porbably confused with the numbers in the libname :)

Greetings
Jan


From wahwah at users.sourceforge.net  Thu Apr 18 09:44:05 2013
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Thu, 18 Apr 2013 07:44:05 +0000
Subject: [csw-devel] SF.net SVN: gar:[20770]
	csw/mgar/gar/v2/tests/run_tests.py
Message-ID: <E1USjVl-0005hW-2l@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 20770
          http://gar.svn.sourceforge.net/gar/?rev=20770&view=rev
Author:   wahwah
Date:     2013-04-18 07:43:58 +0000 (Thu, 18 Apr 2013)
Log Message:
-----------
pkgdb: remove testing of checkpkg_test

Modified Paths:
--------------
    csw/mgar/gar/v2/tests/run_tests.py

Modified: csw/mgar/gar/v2/tests/run_tests.py
===================================================================
--- csw/mgar/gar/v2/tests/run_tests.py	2013-04-17 21:28:32 UTC (rev 20769)
+++ csw/mgar/gar/v2/tests/run_tests.py	2013-04-18 07:43:58 UTC (rev 20770)
@@ -14,7 +14,6 @@
 from catalog_notifier_test   import *
 from catalog_test            import *
 from checkpkg_lib_test       import *
-from checkpkg_test           import *
 from csw_upload_pkg_test     import *
 from database_test           import *
 from dependency_checks_test  import *

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 Apr 18 09:44:59 2013
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Thu, 18 Apr 2013 07:44:59 +0000
Subject: [csw-devel] SF.net SVN: gar:[20771] csw/mgar/gar/v2/lib/python
Message-ID: <E1USjWc-0005ke-Vw@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 20771
          http://gar.svn.sourceforge.net/gar/?rev=20771&view=rev
Author:   wahwah
Date:     2013-04-18 07:44:55 +0000 (Thu, 18 Apr 2013)
Log Message:
-----------
checkpkg: Disable bad content check /opt/csw/share

In most cases it's just documentation. We worry mostly about binaries and
libraries.

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

Modified: csw/mgar/gar/v2/lib/python/package_checks.py
===================================================================
--- csw/mgar/gar/v2/lib/python/package_checks.py	2013-04-18 07:43:58 UTC (rev 20770)
+++ csw/mgar/gar/v2/lib/python/package_checks.py	2013-04-18 07:44:55 UTC (rev 20771)
@@ -774,6 +774,9 @@
 def CheckBadContent(pkg_data, error_mgr, logger, messenger):
   for regex in pkg_data["bad_paths"]:
     for file_name in pkg_data["bad_paths"][regex]:
+      if "opt/csw/share" in file_name:
+        # We don't want to throw this error on documentation.
+        continue
       messenger.Message(
           "File %s contains bad content: %s. "
           "If it's a legacy file you can't modify, "

Modified: csw/mgar/gar/v2/lib/python/package_checks_test.py
===================================================================
--- csw/mgar/gar/v2/lib/python/package_checks_test.py	2013-04-18 07:43:58 UTC (rev 20770)
+++ csw/mgar/gar/v2/lib/python/package_checks_test.py	2013-04-18 07:44:55 UTC (rev 20771)
@@ -2004,6 +2004,24 @@
                                            packages_to_be_installed))
 
 
+class TestCheckBadContent(CheckTestHelper, unittest.TestCase):
+  FUNCTION_NAME = 'CheckBadContent'
 
+  def testGoodFiles(self):
+    self.pkg_data = copy.deepcopy(neon_stats[0])
+    self.pkg_data['bad_paths'] = {
+        'bad-regex': ['root/opt/csw/share/doc/foo'],
+    }
+
+  def testBadFiles(self):
+    self.pkg_data = copy.deepcopy(neon_stats[0])
+    self.pkg_data['bad_paths'] = {
+        'bad-regex': ['root/opt/csw/bin/foo'],
+    }
+    self.error_mgr_mock.ReportError(
+        'file-with-bad-content',
+        'bad-regex root/opt/csw/bin/foo')
+
+
 if __name__ == '__main__':
   unittest.main()

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


From maciej at opencsw.org  Thu Apr 18 09:58:58 2013
From: maciej at opencsw.org (Maciej =?utf-8?Q?Blizi=C5=84ski?=)
Date: Thu, 18 Apr 2013 08:58:58 +0100
Subject: [csw-devel] SF.net SVN: gar:[17970]
 csw/mgar/pkg/x264/trunk/Makefile
In-Reply-To: <516F800C.6000300@opencsw.org>
References: <E1SRfUB-0007YE-K7@sfp-svn-5.v30.ch3.sourceforge.com>
	<20130417210636.GB6346@cotton.home.blizinski.pl>
	<516F800C.6000300@opencsw.org>
Message-ID: <20130418075858.GA1149@cotton.home.blizinski.pl>

On Thu, Apr 18, 2013 at 07:09:32AM +0200, Jan Holzhueter wrote:
> Hi,
> Am 17.04.13 23:06, schrieb Maciej Blizi?ski:
> > On Tue, May 08, 2012 at 08:09:31AM +0000, janholzh at users.sourceforge.net wrote:
> >>  #Some overrides
> >>  CHECKPKG_OVERRIDES += pkginfo-description-not-starting-with-uppercase
> >> -CHECKPKG_OVERRIDES_CSWlibx264-122 += pkginfo-description-not-starting-with-uppercase
> >> +CHECKPKG_OVERRIDES_CSWlibx264-124 += pkginfo-description-not-starting-with-uppercase
> > 
> > Why not adjust the description?
> will probably do the next time :)
> > 
> >>  # seems to be checkpkg bug:
> >> -CHECKPKG_OVERRIDES_CSWlibx264-122 += non-uniform-lib-versions-in-package|sonames=libx264.so.122
> >> +CHECKPKG_OVERRIDES_CSWlibx264-124 += non-uniform-lib-versions-in-package|sonames=libx264.so.124
> > 
> > Interesting, I'm not sure why that is. It looks like checkpkg thinks
> > there are multiple sonames in this package.
> 
> Porbably confused with the numbers in the libname :)

I can't find that check any more. We might have ditched it, it wasn't
too useful anyway.

From maciej at opencsw.org  Thu Apr 18 10:00:50 2013
From: maciej at opencsw.org (Maciej =?utf-8?Q?Blizi=C5=84ski?=)
Date: Thu, 18 Apr 2013 09:00:50 +0100
Subject: [csw-devel] SF.net SVN: gar:[19190] csw/mgar/pkg/bind/trunk
In-Reply-To: <E1TBisI-0007tz-FL@sfp-svn-1.v30.ch3.sourceforge.com>
References: <E1TBisI-0007tz-FL@sfp-svn-1.v30.ch3.sourceforge.com>
Message-ID: <20130418080050.GB1149@cotton.home.blizinski.pl>

On Wed, Sep 12, 2012 at 09:04:46AM +0000, bonivart at users.sourceforge.net wrote:
> Revision: 19190
>           http://gar.svn.sourceforge.net/gar/?rev=19190&view=rev
> Author:   bonivart
> Date:     2012-09-12 09:04:46 +0000 (Wed, 12 Sep 2012)
> Log Message:
> -----------
> bind/trunk: update to 9.8.4rc1
> 
>  # Will not split out all these libs
> -CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/libbind9.so.80.0.5|soname=libbind9.so.80|pkgname=CSWlibbind|expected=CSWlibbind9-80
> -CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/libdns.so.81.6.1|soname=libdns.so.81|pkgname=CSWlibbind|expected=CSWlibdns81
> -CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/libisc.so.83.0.5|soname=libisc.so.83|pkgname=CSWlibbind|expected=CSWlibisc83
> -CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/libisccc.so.80.0.1|soname=libisccc.so.80|pkgname=CSWlibbind|expected=CSWlibisccc80
> -CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/libisccfg.so.82.0.2|soname=libisccfg.so.82|pkgname=CSWlibbind|expected=CSWlibisccfg82
> -CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/liblwres.so.80.0.2|soname=liblwres.so.80|pkgname=CSWlibbind|expected=CSWliblwres80
> +CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/libbind9.so.80.0.7|soname=libbind9.so.80|pkgname=CSWlibbind|expected=CSWlibbind9-80
> +CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/libdns.so.88.1.0|soname=libdns.so.88|pkgname=CSWlibbind|expected=CSWlibdns88
> +CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/libisc.so.84.0.1|soname=libisc.so.84|pkgname=CSWlibbind|expected=CSWlibisc84
> +CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/libisccc.so.80.0.2|soname=libisccc.so.80|pkgname=CSWlibbind|expected=CSWlibisccc80
> +CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/libisccfg.so.82.0.3|soname=libisccfg.so.82|pkgname=CSWlibbind|expected=CSWlibisccfg82
> +CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/liblwres.so.80.0.3|soname=liblwres.so.80|pkgname=CSWlibbind|expected=CSWliblwres80

If that's the case for the whole package, you can just say:

CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch

From wahwah at users.sourceforge.net  Thu Apr 18 10:21:09 2013
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Thu, 18 Apr 2013 08:21:09 +0000
Subject: [csw-devel] SF.net SVN: gar:[20772] csw/mgar/gar/v2-sqlite/
Message-ID: <E1USk5d-0006km-1V@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 20772
          http://gar.svn.sourceforge.net/gar/?rev=20772&view=rev
Author:   wahwah
Date:     2013-04-18 08:21:08 +0000 (Thu, 18 Apr 2013)
Log Message:
-----------
mGAR/v2-sqlite: Removing an obsolete branch.

I can't even remember what I wanted to do with this. It looks irrelevant
today.

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

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


From pfelecan at users.sourceforge.net  Thu Apr 18 10:50:23 2013
From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net)
Date: Thu, 18 Apr 2013 08:50:23 +0000
Subject: [csw-devel] SF.net SVN: gar:[20773]
	csw/mgar/pkg/lsdvd/trunk/Makefile
Message-ID: <E1USkXv-0007SE-FO@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 20773
          http://gar.svn.sourceforge.net/gar/?rev=20773&view=rev
Author:   pfelecan
Date:     2013-04-18 08:50:21 +0000 (Thu, 18 Apr 2013)
Log Message:
-----------
lsdvd/trunk: following Maciej review

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

Modified: csw/mgar/pkg/lsdvd/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lsdvd/trunk/Makefile	2013-04-18 08:21:08 UTC (rev 20772)
+++ csw/mgar/pkg/lsdvd/trunk/Makefile	2013-04-18 08:50:21 UTC (rev 20773)
@@ -4,7 +4,6 @@
 NAME 		= lsdvd
 VERSION 	= 0.16
 GARTYPE 	= v2
-CATEGORIES 	= apps
 
 DESCRIPTION = Print information about the contents and structure of a DVD
 define BLURB
@@ -24,11 +23,7 @@
 # UPSTREAM_MASTER_SITES = 
 
 BUILD_DEP_PKGS		=	CSWlibdvdreaddevel
-RUNTIME_DEP_PKGS	=	\
-						CSWlibdvdread \
-						CSWlibgcc-s1
-# this is needed because chkpkg incorrectly complains:
-CHECKPKG_OVERRIDES_CSWlsdvd += surplus-dependency|CSWlibgcc-s1
+RUNTIME_DEP_PKGS	=	CSWlibdvdread
 CONFIGURE_ARGS		=	$(DIRPATHS)
 GARCOMPILER			=	GNU
 

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


From pfelecan at users.sourceforge.net  Thu Apr 18 10:58:37 2013
From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net)
Date: Thu, 18 Apr 2013 08:58:37 +0000
Subject: [csw-devel] SF.net SVN: gar:[20774]
	csw/mgar/pkg/lsdvd/trunk/Makefile
Message-ID: <E1USkft-0007gG-J5@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 20774
          http://gar.svn.sourceforge.net/gar/?rev=20774&view=rev
Author:   pfelecan
Date:     2013-04-18 08:58:37 +0000 (Thu, 18 Apr 2013)
Log Message:
-----------
lsdvd/trunk: adapted the build dependency to the new naming style

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

Modified: csw/mgar/pkg/lsdvd/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lsdvd/trunk/Makefile	2013-04-18 08:50:21 UTC (rev 20773)
+++ csw/mgar/pkg/lsdvd/trunk/Makefile	2013-04-18 08:58:37 UTC (rev 20774)
@@ -13,16 +13,7 @@
 MASTER_SITES	=	$(SF_MIRRORS)
 DISTFILES  		=	$(DISTNAME).tar.gz
 
-# File name regex to get notifications about upstream software releases
-# NOTE: Use this only if the automatic regex creation
-#       does not work for your package
-# UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
-
-# If the url used to check for software update is different of MASTER_SITES, then 
-# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES
-# UPSTREAM_MASTER_SITES = 
-
-BUILD_DEP_PKGS		=	CSWlibdvdreaddevel
+BUILD_DEP_PKGS		=	CSWlibdvdread-dev
 RUNTIME_DEP_PKGS	=	CSWlibdvdread
 CONFIGURE_ARGS		=	$(DIRPATHS)
 GARCOMPILER			=	GNU

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


From pfelecan at users.sourceforge.net  Thu Apr 18 10:59:59 2013
From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net)
Date: Thu, 18 Apr 2013 08:59:59 +0000
Subject: [csw-devel] SF.net SVN: gar:[20775]
	csw/mgar/pkg/libotf/trunk/Makefile
Message-ID: <E1USkhD-0007hn-6I@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 20775
          http://gar.svn.sourceforge.net/gar/?rev=20775&view=rev
Author:   pfelecan
Date:     2013-04-18 08:59:58 +0000 (Thu, 18 Apr 2013)
Log Message:
-----------
libotf/trunk: following Maciej review

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

Modified: csw/mgar/pkg/libotf/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libotf/trunk/Makefile	2013-04-18 08:58:37 UTC (rev 20774)
+++ csw/mgar/pkg/libotf/trunk/Makefile	2013-04-18 08:59:58 UTC (rev 20775)
@@ -1,6 +1,5 @@
 # $Id$
-# TODO (release-critical prefixed with !, non release-critical with *)
-#
+
 NAME = libotf
 VERSION = 0.9.12
 GARTYPE = v2
@@ -53,11 +52,10 @@
 CATALOGNAME_CSWlibotf-utils			=	libotf_utils
 OBSOLETED_BY_CSWlibotf-utils		+=	CSWlibotf
 RUNTIME_DEP_PKGS_CSWlibotf-utils	+=	\
-										CSWlibotf0
-# checkpkg cincorrectly complains about this:
-CHECKPKG_OVERRIDES_CSWlibotf-utils += missing-dependency|CSWlibbz2-1-0
-CHECKPKG_OVERRIDES_CSWlibotf-utils += missing-dependency|CSWlibz1
-CHECKPKG_OVERRIDES_CSWlibotf-utils += missing-dependency|CSWlibfreetype6
+										CSWlibotf0 \
+										CSWlibbz2-1-0 \
+										CSWlibfreetype6 \
+										CSWlibz1
 
 include gar/category.mk
 

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


From pfelecan at users.sourceforge.net  Thu Apr 18 11:03:42 2013
From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net)
Date: Thu, 18 Apr 2013 09:03:42 +0000
Subject: [csw-devel] SF.net SVN: gar:[20776]
	csw/mgar/pkg/lsdvd/trunk/Makefile
Message-ID: <E1USkko-0007oH-74@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 20776
          http://gar.svn.sourceforge.net/gar/?rev=20776&view=rev
Author:   pfelecan
Date:     2013-04-18 09:03:41 +0000 (Thu, 18 Apr 2013)
Log Message:
-----------
lsdvd/trunk: adapted the runtime dependecy to the new naming style

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

Modified: csw/mgar/pkg/lsdvd/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lsdvd/trunk/Makefile	2013-04-18 08:59:58 UTC (rev 20775)
+++ csw/mgar/pkg/lsdvd/trunk/Makefile	2013-04-18 09:03:41 UTC (rev 20776)
@@ -14,7 +14,7 @@
 DISTFILES  		=	$(DISTNAME).tar.gz
 
 BUILD_DEP_PKGS		=	CSWlibdvdread-dev
-RUNTIME_DEP_PKGS	=	CSWlibdvdread
+RUNTIME_DEP_PKGS	=	CSWlibdvdread4
 CONFIGURE_ARGS		=	$(DIRPATHS)
 GARCOMPILER			=	GNU
 

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


From wilbury at users.sourceforge.net  Thu Apr 18 11:31:00 2013
From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net)
Date: Thu, 18 Apr 2013 09:31:00 +0000
Subject: [csw-devel] SF.net SVN: gar:[20777]
	csw/mgar/pkg/php5_memcache/trunk/Makefile
Message-ID: <E1USlBE-0008Vr-Ui@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 20777
          http://gar.svn.sourceforge.net/gar/?rev=20777&view=rev
Author:   wilbury
Date:     2013-04-18 09:31:00 +0000 (Thu, 18 Apr 2013)
Log Message:
-----------
php5_memcache/trunk: Fix architecture-dependent settings.

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

Modified: csw/mgar/pkg/php5_memcache/trunk/Makefile
===================================================================
--- csw/mgar/pkg/php5_memcache/trunk/Makefile	2013-04-18 09:03:41 UTC (rev 20776)
+++ csw/mgar/pkg/php5_memcache/trunk/Makefile	2013-04-18 09:31:00 UTC (rev 20777)
@@ -4,16 +4,13 @@
 VERSION = 2.2.7
 GARTYPE = v2
 
-# to match php5
 PACKAGING_PLATFORMS = solaris10-i386
 
-DESCRIPTION = memcache Extention for PHP
+# to match php5
+
+DESCRIPTION = Extention memcache for PHP5
 define BLURB
-   Memcached is a caching daemon designed especially for
-   dynamic web applications to decrease database load by
-   storing objects in memory.
-   This extension allows you to work with memcached through
-   handy OO and procedural interfaces.
+   This extension allows you to work with memcached through handy OO and procedural interfaces.
 endef
 
 PHP_PREFIX = $(prefix)/php5
@@ -40,6 +37,7 @@
 RUNTIME_DEP_PKGS_CSWphp5-memcache = CSWphp5
 BUILD_DEPS_CSWphp5-memcache = CSWapache2 CSWphp5-dev
 RUNTIME_DEP_PKGS_CSWphp5-memcache += CSWlibgcc-s1
+ARCH_CSWphp5-memcache = all
 
 CONFIGURE_ARGS  = $(DIRPATHS)
 CONFIGURE_ARGS += --with-php-config=$(bindir)/php-config
@@ -64,3 +62,4 @@
 post-extract-isa-$(ISA_DEFAULT_$(GARCH)):
 	@( cd $(WORKSRC) ; $(PHP_BIN)/phpize )
 	@$(MAKECOOKIE)
+

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


From wilbury at users.sourceforge.net  Thu Apr 18 11:33:23 2013
From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net)
Date: Thu, 18 Apr 2013 09:33:23 +0000
Subject: [csw-devel] SF.net SVN: gar:[20778]
	csw/mgar/pkg/php5_memcache/trunk/Makefile
Message-ID: <E1USlDW-00006h-WC@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 20778
          http://gar.svn.sourceforge.net/gar/?rev=20778&view=rev
Author:   wilbury
Date:     2013-04-18 09:33:22 +0000 (Thu, 18 Apr 2013)
Log Message:
-----------
php5_memcache/trunk: Fix platforms.

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

Modified: csw/mgar/pkg/php5_memcache/trunk/Makefile
===================================================================
--- csw/mgar/pkg/php5_memcache/trunk/Makefile	2013-04-18 09:31:00 UTC (rev 20777)
+++ csw/mgar/pkg/php5_memcache/trunk/Makefile	2013-04-18 09:33:22 UTC (rev 20778)
@@ -4,7 +4,7 @@
 VERSION = 2.2.7
 GARTYPE = v2
 
-PACKAGING_PLATFORMS = solaris10-i386
+PACKAGING_PLATFORMS = solaris10-i386 solaris10-sparc
 
 # to match php5
 

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


From pfelecan at users.sourceforge.net  Thu Apr 18 11:47:01 2013
From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net)
Date: Thu, 18 Apr 2013 09:47:01 +0000
Subject: [csw-devel] SF.net SVN: gar:[20779] csw/mgar/pkg/libotf/trunk
Message-ID: <E1USlQj-0000cl-BX@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 20779
          http://gar.svn.sourceforge.net/gar/?rev=20779&view=rev
Author:   pfelecan
Date:     2013-04-18 09:47:00 +0000 (Thu, 18 Apr 2013)
Log Message:
-----------
libotf/trunk: version bump implied by the master site change and the
non availability of the previous version.

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

Modified: csw/mgar/pkg/libotf/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libotf/trunk/Makefile	2013-04-18 09:33:22 UTC (rev 20778)
+++ csw/mgar/pkg/libotf/trunk/Makefile	2013-04-18 09:47:00 UTC (rev 20779)
@@ -1,7 +1,7 @@
 # $Id$
 
 NAME = libotf
-VERSION = 0.9.12
+VERSION = 0.9.13
 GARTYPE = v2
 
 DESCRIPTION = A Library for handling OpenType Font (OTF)
@@ -18,7 +18,7 @@
 CTL (complex text layout) by OpenType fonts.
 endef
 
-MASTER_SITES = http://www.m17n.org/libotf/
+MASTER_SITES = http://download.savannah.gnu.org/releases/m17n/
 DISTFILES  = $(DISTNAME).tar.gz
 
 # centralize the build dependencies (it seems that the run-time

Modified: csw/mgar/pkg/libotf/trunk/checksums
===================================================================
--- csw/mgar/pkg/libotf/trunk/checksums	2013-04-18 09:33:22 UTC (rev 20778)
+++ csw/mgar/pkg/libotf/trunk/checksums	2013-04-18 09:47:00 UTC (rev 20779)
@@ -1 +1 @@
-630a0556af3be60360e8a75e59561eda  libotf-0.9.12.tar.gz
+99ca3857016e0bb8944776cfa16e6b2d  libotf-0.9.13.tar.gz

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


From wilbury at users.sourceforge.net  Thu Apr 18 11:56:16 2013
From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net)
Date: Thu, 18 Apr 2013 09:56:16 +0000
Subject: [csw-devel] SF.net SVN: gar:[20780]
	csw/mgar/pkg/php5_memcached/trunk/Makefile
Message-ID: <E1USlZg-0000eN-7o@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 20780
          http://gar.svn.sourceforge.net/gar/?rev=20780&view=rev
Author:   wilbury
Date:     2013-04-18 09:56:15 +0000 (Thu, 18 Apr 2013)
Log Message:
-----------
php5_memcached/trunk: Fix build platforms

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

Modified: csw/mgar/pkg/php5_memcached/trunk/Makefile
===================================================================
--- csw/mgar/pkg/php5_memcached/trunk/Makefile	2013-04-18 09:47:00 UTC (rev 20779)
+++ csw/mgar/pkg/php5_memcached/trunk/Makefile	2013-04-18 09:56:15 UTC (rev 20780)
@@ -5,7 +5,7 @@
 GARTYPE = v2
 
 # to match php5
-PACKAGING_PLATFORMS = solaris10-i386
+PACKAGING_PLATFORMS = solaris10-i386 solaris10-sparc
 
 DESCRIPTION = memcached Extention for PHP
 define BLURB
@@ -40,6 +40,7 @@
 RUNTIME_DEP_PKGS_CSWphp5-memcached += CSWlibgcc-s1
 RUNTIME_DEP_PKGS_CSWphp5-memcached += CSWlibmemcached8
 RUNTIME_DEP_PKGS_CSWphp5-memcached += CSWlibz1
+ARCH_CSWphp5-memcached = all
 
 CONFIGURE_ARGS  = $(DIRPATHS)
 CONFIGURE_ARGS += --with-php-config=$(bindir)/php-config

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


From pfelecan at users.sourceforge.net  Thu Apr 18 11:56:40 2013
From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net)
Date: Thu, 18 Apr 2013 09:56:40 +0000
Subject: [csw-devel] SF.net SVN: gar:[20781]
	csw/mgar/pkg/libotf/trunk/Makefile
Message-ID: <E1USla4-0000tL-Ef@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 20781
          http://gar.svn.sourceforge.net/gar/?rev=20781&view=rev
Author:   pfelecan
Date:     2013-04-18 09:56:39 +0000 (Thu, 18 Apr 2013)
Log Message:
-----------
libotf/trunk: run-time dependecies change

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

Modified: csw/mgar/pkg/libotf/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libotf/trunk/Makefile	2013-04-18 09:56:15 UTC (rev 20780)
+++ csw/mgar/pkg/libotf/trunk/Makefile	2013-04-18 09:56:39 UTC (rev 20781)
@@ -36,10 +36,8 @@
 PKGFILES_CSWlibotf0			+=	$(call pkgfiles_lib,libotf.so.0.0.0)
 OBSOLETED_BY_CSWlibotf0 	+=	CSWlibotf
 RUNTIME_DEP_PKGS_CSWlibotf0	+=	\
-								CSWlibbz2-1-0 \
 								CSWlibfreetype6 \
-								CSWlibgcc-s1 \
-								CSWlibz1
+								CSWlibgcc-s1
 PACKAGES						+=	CSWlibotf-dev
 SPKG_DESC_CSWlibotf-dev			=	$(DESCRIPTION) - development
 PKGFILES_CSWlibotf-dev			=	$(PKGFILES_DEVEL)
@@ -53,9 +51,7 @@
 OBSOLETED_BY_CSWlibotf-utils		+=	CSWlibotf
 RUNTIME_DEP_PKGS_CSWlibotf-utils	+=	\
 										CSWlibotf0 \
-										CSWlibbz2-1-0 \
-										CSWlibfreetype6 \
-										CSWlibz1
+										CSWlibfreetype6
 
 include gar/category.mk
 

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


From pfelecan at users.sourceforge.net  Thu Apr 18 12:57:03 2013
From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net)
Date: Thu, 18 Apr 2013 10:57:03 +0000
Subject: [csw-devel] SF.net SVN: gar:[20782] csw/mgar/pkg/m17n/trunk
Message-ID: <E1USmWV-00025i-DX@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 20782
          http://gar.svn.sourceforge.net/gar/?rev=20782&view=rev
Author:   pfelecan
Date:     2013-04-18 10:57:01 +0000 (Thu, 18 Apr 2013)
Log Message:
-----------
m17n/trunk: version bump implied by master site change and the non
availability of the previous version.

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

Modified: csw/mgar/pkg/m17n/trunk/Makefile
===================================================================
--- csw/mgar/pkg/m17n/trunk/Makefile	2013-04-18 09:56:39 UTC (rev 20781)
+++ csw/mgar/pkg/m17n/trunk/Makefile	2013-04-18 10:57:01 UTC (rev 20782)
@@ -2,7 +2,7 @@
 # TODO (release-critical prefixed with !, non release-critical with *)
 #
 NAME = m17n
-VERSION = 1.6.3
+VERSION = 1.6.4
 GARTYPE = v2
 
 DESCRIPTION = A multilingual text processing library for the C language.
@@ -17,7 +17,7 @@
 	and edit the text.
 endef
 
-MASTER_SITES = http://www.m17n.org/m17n-lib-download/
+MASTER_SITES = http://download.savannah.gnu.org/releases/m17n/
 
 DISTNAME	=	$(NAME)-lib-$(VERSION)
 DISTFILES	=	$(DISTNAME).tar.gz

Modified: csw/mgar/pkg/m17n/trunk/checksums
===================================================================
--- csw/mgar/pkg/m17n/trunk/checksums	2013-04-18 09:56:39 UTC (rev 20781)
+++ csw/mgar/pkg/m17n/trunk/checksums	2013-04-18 10:57:01 UTC (rev 20782)
@@ -1 +1 @@
-24c8f0a2fb167e1a0e25815c8421a2a4  m17n-lib-1.6.3.tar.gz
+569fbde23eba7724c03375979fd982ce  m17n-lib-1.6.4.tar.gz

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


From pfelecan at users.sourceforge.net  Thu Apr 18 13:20:53 2013
From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net)
Date: Thu, 18 Apr 2013 11:20:53 +0000
Subject: [csw-devel] SF.net SVN: gar:[20783] csw/mgar/pkg/m17n/trunk/Makefile
Message-ID: <E1USmtZ-0001wi-DH@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 20783
          http://gar.svn.sourceforge.net/gar/?rev=20783&view=rev
Author:   pfelecan
Date:     2013-04-18 11:20:52 +0000 (Thu, 18 Apr 2013)
Log Message:
-----------
m17n/trunk: temporary recipe to give checkpkg the opportunity to
propose the optimal split, library wise.

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

Modified: csw/mgar/pkg/m17n/trunk/Makefile
===================================================================
--- csw/mgar/pkg/m17n/trunk/Makefile	2013-04-18 10:57:01 UTC (rev 20782)
+++ csw/mgar/pkg/m17n/trunk/Makefile	2013-04-18 11:20:52 UTC (rev 20783)
@@ -28,94 +28,29 @@
 CONFIGURE_ARGS	+=	\
 					--without-included-gettext \
 					--with-libintl-prefix=/opt/csw
-BUILD_DEP_PKGS		=	\
-						CSWfconfig \
-						CSWlibbz2-dev \
-						CSWlibdatrie-dev \
-						CSWlibexpat-dev \
-						CSWlibfreetype-dev \
-						CSWlibfribidi-dev \
-						CSWlibiconv-dev \
-						CSWlibthai-dev \
-						CSWlibotf-dev \
-						CSWlibxft2devel \
-						CSWlibxml2-dev \
-						CSWlibxrenderdevel \
-						CSWlibz-dev
+BUILD_DEP_PKGS		+=	CSWfconfig
+BUILD_DEP_PKGS		+=	CSWlibbz2-dev
+BUILD_DEP_PKGS		+=	CSWlibdatrie-dev
+BUILD_DEP_PKGS		+=	CSWlibexpat-dev
+BUILD_DEP_PKGS		+=	CSWlibfreetype-dev
+BUILD_DEP_PKGS		+=	CSWlibfribidi-dev
+BUILD_DEP_PKGS		+=	CSWlibiconv-dev
+BUILD_DEP_PKGS		+=	CSWlibthai-dev
+BUILD_DEP_PKGS		+=	CSWlibotf-dev
+BUILD_DEP_PKGS		+=	CSWlibxft2devel
+BUILD_DEP_PKGS		+=	CSWlibxml2-dev
+BUILD_DEP_PKGS		+=	CSWlibxrenderdevel
+BUILD_DEP_PKGS		+=	CSWlibz-dev
 
-PACKAGES							+=	CSWlibm17n0
-SPKG_DESC_CSWlibm17n0				+=	$(DESCRIPTION) - runtime.
-PKGFILES_CSWlibm17n0				+=	$(call pkgfiles_lib,libm17n-core.so.0.4.0) $(call pkgfiles_lib,libm17n-flt.so.0.4.0) $(call pkgfiles_lib,libm17n-gui.so.0.4.0) $(call pkgfiles_lib,libm17n.so.0.4.0) $(call pkgfiles_lib,m17n/1.0/libm17n-X.so) $(call pkgfiles_lib,m17n/1.0/libm17n-gd.so) $(call pkgfiles_lib,m17n/1.0/libmimx-anthy.so) $(call pkgfiles_lib,m17n/1.0/libmimx-ispell.so)
-OBSOLETED_BY_CSWlibm17n0 			+=	CSWlibm17n
-RUNTIME_DEP_PKGS_CSWlibm17n0		+=	\
-										CSWfconfig \
-										CSWlibbz2-1-0 \
-										CSWlibdatrie1 \
-										CSWlibexpat1 \
-										CSWlibfreetype6 \
-										CSWlibfribidi0 \
-										CSWlibgcc-s1 \
-										CSWlibgd2 \
-										CSWlibiconv2 \
-										CSWlibintl8 \
-										CSWlibjpeg7 \
-										CSWlibotf0 \
-										CSWlibpng12-0 \
-										CSWlibthai0 \
-										CSWlibxft2 \
-										CSWlibxml2-2 \
-										CSWlibxrender \
-										CSWlibz1 \
-										CSWxpm
-# added this overrides because checkpkg evaluates them incorrectly
-# Remark: checkpkg doesn't support multi-line macro-commands...
-CHECKPKG_OVERRIDES_CSWlibm17n0		+=	missing-dependency|CSWlibgd2
-CHECKPKG_OVERRIDES_CSWlibm17n0		+=	missing-dependency|CSWlibm17n-utils
-CHECKPKG_OVERRIDES_CSWlibm17n0		+=	missing-dependency|CSWlibotf-utils
-CHECKPKG_OVERRIDES_CSWlibm17n0		+=	surplus-dependency|CSWlibdatrie1
-CHECKPKG_OVERRIDES_CSWlibm17n0		+=	surplus-dependency|CSWlibexpat1
-CHECKPKG_OVERRIDES_CSWlibm17n0		+=	surplus-dependency|CSWlibfribidi0
-CHECKPKG_OVERRIDES_CSWlibm17n0		+=	surplus-dependency|CSWlibjpeg7
-CHECKPKG_OVERRIDES_CSWlibm17n0		+=	surplus-dependency|CSWlibotf0
-CHECKPKG_OVERRIDES_CSWlibm17n0		+=	surplus-dependency|CSWlibpng12-0
-CHECKPKG_OVERRIDES_CSWlibm17n0		+=	surplus-dependency|CSWlibthai0
-CHECKPKG_OVERRIDES_CSWlibm17n0		+=	surplus-dependency|CSWxpm
-CHECKPKG_OVERRIDES_CSWlibm17n0		+=	shared-lib-pkgname-mismatch|file=opt/csw/lib/libm17n-core.so.0.4.0|soname=libm17n-core.so.0|pkgname=CSWlibm17n0|expected=CSWlibm17n-core0
-CHECKPKG_OVERRIDES_CSWlibm17n0		+=	shared-lib-pkgname-mismatch|file=opt/csw/lib/libm17n-flt.so.0.4.0|soname=libm17n-flt.so.0|pkgname=CSWlibm17n0|expected=CSWlibm17n-flt0
-CHECKPKG_OVERRIDES_CSWlibm17n0		+=	shared-lib-pkgname-mismatch|file=opt/csw/lib/libm17n-gui.so.0.4.0|soname=libm17n-gui.so.0|pkgname=CSWlibm17n0|expected=CSWlibm17n-gui0
+PACKAGES							+=	CSWlibm17n-utils
+SPKG_DESC_CSWlibm17n-utils			+=	$(DESCRIPTION) - utilities.
 
 PACKAGES							+=	CSWlibm17n-dev
 SPKG_DESC_CSWlibm17n-dev			+=	$(DESCRIPTION) - development.
 PKGFILES_CSWlibm17n-dev				=	$(PKGFILES_DEVEL)
-RUNTIME_DEP_PKGS_CSWlibm17n-dev		+=	\
-										CSWlibm17n0
-OBSOLETED_BY_CSWlibm17n-dev			+=	CSWlibm17ndevel
-CHECKPKG_OVERRIDES_CSWlibm17n-dev	+=	file-with-bad-content|/usr/local|root/opt/csw/bin/m17n-config
-# why this? especially when the package is declared architecture neutral
 CHECKPKG_OVERRIDES_CSWlibm17n-dev 	+= 	archall-devel-package
 ARCHALL_CSWlibm17n-dev				=	1
 
-PACKAGES							+=	CSWlibm17n-utils
-SPKG_DESC_CSWlibm17n-utils			+=	$(DESCRIPTION) - utilities.
-OBSOLETED_BY_CSWlibm17n-utils		+=	CSWlibm17n
-RUNTIME_DEP_PKGS_CSWlibm17n-utils	+=	\
-										CSWlibm17n0
-
-# added this overrides because checkpkg evaluates them incorrectly,
-# i.e., doesn't use transitivity:
-# Remark: checkpkg doesn't support multi-line macro-commands...
-CHECKPKG_OVERRIDES_CSWlibm17n-utils	+=	missing-dependency|CSWlibthai0
-CHECKPKG_OVERRIDES_CSWlibm17n-utils	+=	missing-dependency|CSWlibbz2-1-0
-CHECKPKG_OVERRIDES_CSWlibm17n-utils	+=	missing-dependency|CSWlibfribidi0
-CHECKPKG_OVERRIDES_CSWlibm17n-utils	+=	missing-dependency|CSWlibiconv2
-CHECKPKG_OVERRIDES_CSWlibm17n-utils	+=	missing-dependency|CSWlibotf-utils
-CHECKPKG_OVERRIDES_CSWlibm17n-utils	+=	missing-dependency|CSWlibz1
-CHECKPKG_OVERRIDES_CSWlibm17n-utils	+=	missing-dependency|CSWlibintl8
-CHECKPKG_OVERRIDES_CSWlibm17n-utils	+=	missing-dependency|CSWlibfreetype6
-CHECKPKG_OVERRIDES_CSWlibm17n-utils	+=	missing-dependency|CSWlibgd2
-CHECKPKG_OVERRIDES_CSWlibm17n-utils	+=	missing-dependency|CSWlibxml2-2
-CHECKPKG_OVERRIDES_CSWlibm17n-utils	+=	missing-dependency|CSWfconfig
-
 include gar/category.mk
 
 # this is private and not available publicly yet

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


From pfelecan at users.sourceforge.net  Thu Apr 18 13:56:17 2013
From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net)
Date: Thu, 18 Apr 2013 11:56:17 +0000
Subject: [csw-devel] SF.net SVN: gar:[20784] csw/mgar/pkg/m17n/trunk/Makefile
Message-ID: <E1USnRp-0002eF-JJ@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 20784
          http://gar.svn.sourceforge.net/gar/?rev=20784&view=rev
Author:   pfelecan
Date:     2013-04-18 11:56:17 +0000 (Thu, 18 Apr 2013)
Log Message:
-----------
m17n/trunk: new split

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

Modified: csw/mgar/pkg/m17n/trunk/Makefile
===================================================================
--- csw/mgar/pkg/m17n/trunk/Makefile	2013-04-18 11:20:52 UTC (rev 20783)
+++ csw/mgar/pkg/m17n/trunk/Makefile	2013-04-18 11:56:17 UTC (rev 20784)
@@ -44,12 +44,52 @@
 
 PACKAGES							+=	CSWlibm17n-utils
 SPKG_DESC_CSWlibm17n-utils			+=	$(DESCRIPTION) - utilities.
+RUNTIME_DEP_PKGS_CSWlibm17n-utils	+=	CSWlibm17n-core0
+RUNTIME_DEP_PKGS_CSWlibm17n-utils	+=	CSWlibm17n-flt0
+RUNTIME_DEP_PKGS_CSWlibm17n-utils	+=	CSWlibm17n-gui0
+RUNTIME_DEP_PKGS_CSWlibm17n-utils	+=	CSWlibm17n0
+RUNTIME_DEP_PKGS_CSWlibm17n-utils	+=	CSWlibthai0
+RUNTIME_DEP_PKGS_CSWlibm17n-utils	+=	CSWlibxml2-2
+RUNTIME_DEP_PKGS_CSWlibm17n-utils	+=	CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibm17n-utils	+=	CSWlibxft2
+RUNTIME_DEP_PKGS_CSWlibm17n-utils	+=	CSWlibfreetype6
+RUNTIME_DEP_PKGS_CSWlibm17n-utils	+=	CSWlibgd2
+RUNTIME_DEP_PKGS_CSWlibm17n-utils	+=	CSWlibotf-utils
+RUNTIME_DEP_PKGS_CSWlibm17n-utils	+=	CSWlibfontconfig1
+RUNTIME_DEP_PKGS_CSWlibm17n-utils	+=	CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibm17n-utils	+=	CSWlibfribidi0
 
+PACKAGES						+=	CSWlibm17n-core0
+CATALOGNAME_CSWlibm17n-core0	=	libm17n_core0
+PKGFILES_CSWlibm17n-core0		+=	$(call baseisadirs,$(libdir),libm17n-core\.so\.0\.4\.0)
+PKGFILES_CSWlibm17n-core0		+=	$(call baseisadirs,$(libdir),libm17n-core\.so\.0(\.\d+)*)
+SPKG_DESC_CSWlibm17n-core0		+=	$(DESCRIPTION), libm17n-core.so.0
+
+PACKAGES					+=	CSWlibm17n-flt0
+CATALOGNAME_CSWlibm17n-flt0	=	libm17n_flt0
+PKGFILES_CSWlibm17n-flt0	+=	$(call baseisadirs,$(libdir),libm17n-flt\.so\.0\.4\.0)
+PKGFILES_CSWlibm17n-flt0	+=	$(call baseisadirs,$(libdir),libm17n-flt\.so\.0(\.\d+)*)
+SPKG_DESC_CSWlibm17n-flt0	+=	$(DESCRIPTION), libm17n-flt.so.0
+
+PACKAGES					+=	CSWlibm17n-gui0
+CATALOGNAME_CSWlibm17n-gui0	=	libm17n_gui0
+PKGFILES_CSWlibm17n-gui0	+=	$(call baseisadirs,$(libdir),libm17n-gui\.so\.0\.4\.0)
+PKGFILES_CSWlibm17n-gui0	+=	$(call baseisadirs,$(libdir),libm17n-gui\.so\.0(\.\d+)*)
+SPKG_DESC_CSWlibm17n-gui0	+=	$(DESCRIPTION), libm17n-gui.so.0
+
+PACKAGES				+=	CSWlibm17n0
+CATALOGNAME_CSWlibm17n0	=	libm17n0
+PKGFILES_CSWlibm17n0	+=	$(call baseisadirs,$(libdir),libm17n\.so\.0\.4\.0)
+PKGFILES_CSWlibm17n0	+=	$(call baseisadirs,$(libdir),libm17n\.so\.0(\.\d+)*)
+SPKG_DESC_CSWlibm17n0	+=	$(DESCRIPTION), libm17n.so.0
+
 PACKAGES							+=	CSWlibm17n-dev
 SPKG_DESC_CSWlibm17n-dev			+=	$(DESCRIPTION) - development.
 PKGFILES_CSWlibm17n-dev				=	$(PKGFILES_DEVEL)
 CHECKPKG_OVERRIDES_CSWlibm17n-dev 	+= 	archall-devel-package
 ARCHALL_CSWlibm17n-dev				=	1
+RUNTIME_DEP_PKGS_CSWlibm17n-dev		+=	CSWlibm17n0
+CHECKPKG_OVERRIDES_CSWlibm17n-dev	+=	file-with-bad-content|/usr/local|root/opt/csw/bin/m17n-config
 
 include gar/category.mk
 

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


From pfelecan at users.sourceforge.net  Thu Apr 18 14:11:03 2013
From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net)
Date: Thu, 18 Apr 2013 12:11:03 +0000
Subject: [csw-devel] SF.net SVN: gar:[20785] csw/mgar/pkg/m17n/trunk/Makefile
Message-ID: <E1USng7-0002wC-IT@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 20785
          http://gar.svn.sourceforge.net/gar/?rev=20785&view=rev
Author:   pfelecan
Date:     2013-04-18 12:11:03 +0000 (Thu, 18 Apr 2013)
Log Message:
-----------
m17n/trunk: tweak dependencies

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

Modified: csw/mgar/pkg/m17n/trunk/Makefile
===================================================================
--- csw/mgar/pkg/m17n/trunk/Makefile	2013-04-18 11:56:17 UTC (rev 20784)
+++ csw/mgar/pkg/m17n/trunk/Makefile	2013-04-18 12:11:03 UTC (rev 20785)
@@ -48,40 +48,52 @@
 RUNTIME_DEP_PKGS_CSWlibm17n-utils	+=	CSWlibm17n-flt0
 RUNTIME_DEP_PKGS_CSWlibm17n-utils	+=	CSWlibm17n-gui0
 RUNTIME_DEP_PKGS_CSWlibm17n-utils	+=	CSWlibm17n0
-RUNTIME_DEP_PKGS_CSWlibm17n-utils	+=	CSWlibthai0
-RUNTIME_DEP_PKGS_CSWlibm17n-utils	+=	CSWlibxml2-2
-RUNTIME_DEP_PKGS_CSWlibm17n-utils	+=	CSWlibintl8
 RUNTIME_DEP_PKGS_CSWlibm17n-utils	+=	CSWlibxft2
 RUNTIME_DEP_PKGS_CSWlibm17n-utils	+=	CSWlibfreetype6
 RUNTIME_DEP_PKGS_CSWlibm17n-utils	+=	CSWlibgd2
-RUNTIME_DEP_PKGS_CSWlibm17n-utils	+=	CSWlibotf-utils
 RUNTIME_DEP_PKGS_CSWlibm17n-utils	+=	CSWlibfontconfig1
 RUNTIME_DEP_PKGS_CSWlibm17n-utils	+=	CSWlibgcc-s1
-RUNTIME_DEP_PKGS_CSWlibm17n-utils	+=	CSWlibfribidi0
 
-PACKAGES						+=	CSWlibm17n-core0
-CATALOGNAME_CSWlibm17n-core0	=	libm17n_core0
-PKGFILES_CSWlibm17n-core0		+=	$(call baseisadirs,$(libdir),libm17n-core\.so\.0\.4\.0)
-PKGFILES_CSWlibm17n-core0		+=	$(call baseisadirs,$(libdir),libm17n-core\.so\.0(\.\d+)*)
-SPKG_DESC_CSWlibm17n-core0		+=	$(DESCRIPTION), libm17n-core.so.0
+PACKAGES							+=	CSWlibm17n-core0
+CATALOGNAME_CSWlibm17n-core0		=	libm17n_core0
+PKGFILES_CSWlibm17n-core0			+=	$(call baseisadirs,$(libdir),libm17n-core\.so\.0\.4\.0)
+PKGFILES_CSWlibm17n-core0			+=	$(call baseisadirs,$(libdir),libm17n-core\.so\.0(\.\d+)*)
+SPKG_DESC_CSWlibm17n-core0			+=	$(DESCRIPTION), libm17n-core.so.0
+RUNTIME_DEP_PKGS_CSWlibm17n-core0	+=	CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibm17n-core0	+=	CSWlibthai0
+RUNTIME_DEP_PKGS_CSWlibm17n-core0	+=	CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibm17n-core0	+=	CSWlibxml2-2
 
-PACKAGES					+=	CSWlibm17n-flt0
-CATALOGNAME_CSWlibm17n-flt0	=	libm17n_flt0
-PKGFILES_CSWlibm17n-flt0	+=	$(call baseisadirs,$(libdir),libm17n-flt\.so\.0\.4\.0)
-PKGFILES_CSWlibm17n-flt0	+=	$(call baseisadirs,$(libdir),libm17n-flt\.so\.0(\.\d+)*)
-SPKG_DESC_CSWlibm17n-flt0	+=	$(DESCRIPTION), libm17n-flt.so.0
+PACKAGES							+=	CSWlibm17n-flt0
+CATALOGNAME_CSWlibm17n-flt0			=	libm17n_flt0
+PKGFILES_CSWlibm17n-flt0			+=	$(call baseisadirs,$(libdir),libm17n-flt\.so\.0\.4\.0)
+PKGFILES_CSWlibm17n-flt0			+=	$(call baseisadirs,$(libdir),libm17n-flt\.so\.0(\.\d+)*)
+SPKG_DESC_CSWlibm17n-flt0			+=	$(DESCRIPTION), libm17n-flt.so.0
+RUNTIME_DEP_PKGS_CSWlibm17n-flt0	+=	CSWlibm17n-core0
+RUNTIME_DEP_PKGS_CSWlibm17n-flt0	+=	CSWlibgcc-s1
 
-PACKAGES					+=	CSWlibm17n-gui0
-CATALOGNAME_CSWlibm17n-gui0	=	libm17n_gui0
-PKGFILES_CSWlibm17n-gui0	+=	$(call baseisadirs,$(libdir),libm17n-gui\.so\.0\.4\.0)
-PKGFILES_CSWlibm17n-gui0	+=	$(call baseisadirs,$(libdir),libm17n-gui\.so\.0(\.\d+)*)
-SPKG_DESC_CSWlibm17n-gui0	+=	$(DESCRIPTION), libm17n-gui.so.0
+PACKAGES							+=	CSWlibm17n-gui0
+CATALOGNAME_CSWlibm17n-gui0			=	libm17n_gui0
+PKGFILES_CSWlibm17n-gui0			+=	$(call baseisadirs,$(libdir),libm17n-gui\.so\.0\.4\.0)
+PKGFILES_CSWlibm17n-gui0			+=	$(call baseisadirs,$(libdir),libm17n-gui\.so\.0(\.\d+)*)
+SPKG_DESC_CSWlibm17n-gui0			+=	$(DESCRIPTION), libm17n-gui.so.0
+RUNTIME_DEP_PKGS_CSWlibm17n-gui0	+=	CSWlibm17n-core0
+RUNTIME_DEP_PKGS_CSWlibm17n-gui0	+=	CSWlibm17n-flt0
+RUNTIME_DEP_PKGS_CSWlibm17n-gui0	+=	CSWlibfreetype6
+RUNTIME_DEP_PKGS_CSWlibm17n-gui0	+=	CSWlibm17n0
+RUNTIME_DEP_PKGS_CSWlibm17n-gui0	+=	CSWlibotf-utils
+RUNTIME_DEP_PKGS_CSWlibm17n-gui0	+=	CSWlibfontconfig1
+RUNTIME_DEP_PKGS_CSWlibm17n-gui0	+=	CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibm17n-gui0	+=	CSWlibfribidi0
 
-PACKAGES				+=	CSWlibm17n0
-CATALOGNAME_CSWlibm17n0	=	libm17n0
-PKGFILES_CSWlibm17n0	+=	$(call baseisadirs,$(libdir),libm17n\.so\.0\.4\.0)
-PKGFILES_CSWlibm17n0	+=	$(call baseisadirs,$(libdir),libm17n\.so\.0(\.\d+)*)
-SPKG_DESC_CSWlibm17n0	+=	$(DESCRIPTION), libm17n.so.0
+PACKAGES						+=	CSWlibm17n0
+CATALOGNAME_CSWlibm17n0			=	libm17n0
+PKGFILES_CSWlibm17n0			+=	$(call baseisadirs,$(libdir),libm17n\.so\.0\.4\.0)
+PKGFILES_CSWlibm17n0			+=	$(call baseisadirs,$(libdir),libm17n\.so\.0(\.\d+)*)
+SPKG_DESC_CSWlibm17n0			+=	$(DESCRIPTION), libm17n.so.0
+RUNTIME_DEP_PKGS_CSWlibm17n0	+=	CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibm17n0	+=	CSWlibm17n-core0
+RUNTIME_DEP_PKGS_CSWlibm17n0	+=	CSWlibgcc-s1
 
 PACKAGES							+=	CSWlibm17n-dev
 SPKG_DESC_CSWlibm17n-dev			+=	$(DESCRIPTION) - development.
@@ -89,6 +101,9 @@
 CHECKPKG_OVERRIDES_CSWlibm17n-dev 	+= 	archall-devel-package
 ARCHALL_CSWlibm17n-dev				=	1
 RUNTIME_DEP_PKGS_CSWlibm17n-dev		+=	CSWlibm17n0
+RUNTIME_DEP_PKGS_CSWlibm17n-dev		+=	CSWlibm17n-core0
+RUNTIME_DEP_PKGS_CSWlibm17n-dev		+=	CSWlibm17n-gui0
+RUNTIME_DEP_PKGS_CSWlibm17n-dev		+=	CSWlibm17n-flt0
 CHECKPKG_OVERRIDES_CSWlibm17n-dev	+=	file-with-bad-content|/usr/local|root/opt/csw/bin/m17n-config
 
 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 Apr 18 14:37:22 2013
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu, 18 Apr 2013 12:37:22 +0000
Subject: [csw-devel] SF.net SVN: gar:[20786] csw/mgar/gar/v2-relocate/
Message-ID: <E1USo5a-0005Jt-JV@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 20786
          http://gar.svn.sourceforge.net/gar/?rev=20786&view=rev
Author:   dmichelsen
Date:     2013-04-18 12:37:20 +0000 (Thu, 18 Apr 2013)
Log Message:
-----------
mGAR v2-relocate: Remove branch as it was integrated into v2 in r11739

Revision Links:
--------------
    http://gar.svn.sourceforge.net/gar/?rev=11739&view=rev

Removed Paths:
-------------
    csw/mgar/gar/v2-relocate/

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 Apr 18 14:39:25 2013
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu, 18 Apr 2013 12:39:25 +0000
Subject: [csw-devel] SF.net SVN: gar:[20787] csw/mgar/gar/v2-fortran/
Message-ID: <E1USo7Z-0005Nc-7E@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 20787
          http://gar.svn.sourceforge.net/gar/?rev=20787&view=rev
Author:   dmichelsen
Date:     2013-04-18 12:39:24 +0000 (Thu, 18 Apr 2013)
Log Message:
-----------
mGAR v2-fortran: Remove branch as it was integrated into v2 in r12517

Revision Links:
--------------
    http://gar.svn.sourceforge.net/gar/?rev=12517&view=rev

Removed Paths:
-------------
    csw/mgar/gar/v2-fortran/

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


From pfelecan at users.sourceforge.net  Thu Apr 18 14:39:32 2013
From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net)
Date: Thu, 18 Apr 2013 12:39:32 +0000
Subject: [csw-devel] SF.net SVN: gar:[20788]
	csw/mgar/pkg/auctex/trunk/Makefile
Message-ID: <E1USo7g-0003T6-Lh@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 20788
          http://gar.svn.sourceforge.net/gar/?rev=20788&view=rev
Author:   pfelecan
Date:     2013-04-18 12:39:32 +0000 (Thu, 18 Apr 2013)
Log Message:
-----------
auctex/trunk: following Maciej review

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

Modified: csw/mgar/pkg/auctex/trunk/Makefile
===================================================================
--- csw/mgar/pkg/auctex/trunk/Makefile	2013-04-18 12:39:24 UTC (rev 20787)
+++ csw/mgar/pkg/auctex/trunk/Makefile	2013-04-18 12:39:32 UTC (rev 20788)
@@ -35,28 +35,25 @@
 BUILD_DEP_PKGS		+=	CSWtexlive
 BUILD_DEP_PKGS		+=	CSWtexinfo
 
-RUNTIME_DEP_PKGS	=	CSWemacs
+RUNTIME_DEP_PKGS	=	CSWemacs-common
 RUNTIME_DEP_PKGS	+=	CSWtexlive
 RUNTIME_DEP_PKGS	+=	CSWgs
 
 # all the "bad content"s are innocuous:
-CHECKPKG_OVERRIDES_CSWauctex += file-with-bad-content|/usr/local|root/opt/csw/share/info/auctex.info-1
-CHECKPKG_OVERRIDES_CSWauctex += file-with-bad-content|/usr/local|root/opt/csw/share/doc/auctex/auctex.dvi
-CHECKPKG_OVERRIDES_CSWauctex += file-with-bad-content|/usr/local|root/opt/csw/share/doc/auctex/auctex.ps
-CHECKPKG_OVERRIDES_CSWauctex += file-with-bad-content|/usr/local|root/opt/csw/share/doc/auctex/html/auctex_4.html
-CHECKPKG_OVERRIDES_CSWauctex += file-with-bad-content|/usr/share|root/opt/csw/share/info/preview-latex.info
-CHECKPKG_OVERRIDES_CSWauctex += file-with-bad-content|/usr/share|root/opt/csw/share/emacs/site-lisp/auctex/tex.el
-CHECKPKG_OVERRIDES_CSWauctex += file-with-bad-content|/usr/share|root/opt/csw/share/emacs/site-lisp/auctex/tex-jp.el
-CHECKPKG_OVERRIDES_CSWauctex += file-with-bad-content|/usr/share|root/opt/csw/share/emacs/site-lisp/auctex/tex.elc
-CHECKPKG_OVERRIDES_CSWauctex += file-with-bad-content|/usr/share|root/opt/csw/share/emacs/site-lisp/auctex/tex-jp.elc
-CHECKPKG_OVERRIDES_CSWauctex += file-with-bad-content|/usr/share|root/opt/csw/share/doc/auctex/preview-latex.ps
-CHECKPKG_OVERRIDES_CSWauctex += file-with-bad-content|/usr/share|root/opt/csw/share/doc/auctex/preview-latex.dvi
-# depends on CSWemacs wich depends on CSWemacs-common:
-CHECKPKG_OVERRIDES_CSWauctex += missing-dependency|CSWemacscommon
+CHECKPKG_OVERRIDES_CSWauctex += file-with-bad-content
+CHECKPKG_OVERRIDES_CSWauctex += file-with-bad-content
+CHECKPKG_OVERRIDES_CSWauctex += file-with-bad-content
+CHECKPKG_OVERRIDES_CSWauctex += file-with-bad-content
+CHECKPKG_OVERRIDES_CSWauctex += file-with-bad-content
+CHECKPKG_OVERRIDES_CSWauctex += file-with-bad-content
+CHECKPKG_OVERRIDES_CSWauctex += file-with-bad-content
+CHECKPKG_OVERRIDES_CSWauctex += file-with-bad-content
+CHECKPKG_OVERRIDES_CSWauctex += file-with-bad-content
+CHECKPKG_OVERRIDES_CSWauctex += file-with-bad-content
+CHECKPKG_OVERRIDES_CSWauctex += file-with-bad-content
 # preview-latex depends on the existence at run-time:
 CHECKPKG_OVERRIDES_CSWauctex += surplus-dependency|CSWgs
 # the preview-latex can be used only with a graphical Emacs:
-CHECKPKG_OVERRIDES_CSWauctex += surplus-dependency|CSWemacs
 CHECKPKG_OVERRIDES_CSWauctex	+=	surplus-dependency|CSWtexlive
 
 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 Apr 18 14:46:55 2013
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu, 18 Apr 2013 12:46:55 +0000
Subject: [csw-devel] SF.net SVN: gar:[20789] csw/mgar/gar/v2-bwalton/
Message-ID: <E1USoEp-0005bd-BX@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 20789
          http://gar.svn.sourceforge.net/gar/?rev=20789&view=rev
Author:   dmichelsen
Date:     2013-04-18 12:46:55 +0000 (Thu, 18 Apr 2013)
Log Message:
-----------
mGAR v2-bwalton: Remove branch as it was integrated into v2 in r10012 and r10018

Revision Links:
--------------
    http://gar.svn.sourceforge.net/gar/?rev=10012&view=rev
    http://gar.svn.sourceforge.net/gar/?rev=10018&view=rev

Removed Paths:
-------------
    csw/mgar/gar/v2-bwalton/

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


From pfelecan at users.sourceforge.net  Thu Apr 18 15:43:23 2013
From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net)
Date: Thu, 18 Apr 2013 13:43:23 +0000
Subject: [csw-devel] SF.net SVN: gar:[20790] csw/mgar/pkg
Message-ID: <E1USp7T-0004s9-DO@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 20790
          http://gar.svn.sourceforge.net/gar/?rev=20790&view=rev
Author:   pfelecan
Date:     2013-04-18 13:43:23 +0000 (Thu, 18 Apr 2013)
Log Message:
-----------
m17n-db/trunk: instantiation

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

Added: csw/mgar/pkg/m17n-db/Makefile
===================================================================
--- csw/mgar/pkg/m17n-db/Makefile	                        (rev 0)
+++ csw/mgar/pkg/m17n-db/Makefile	2013-04-18 13:43:23 UTC (rev 20790)
@@ -0,0 +1,2 @@
+%:
+	$(MAKE) -C trunk $*


Property changes on: csw/mgar/pkg/m17n-db/trunk
___________________________________________________________________
Added: svn:ignore
   + work


Added: csw/mgar/pkg/m17n-db/trunk/Makefile
===================================================================
--- csw/mgar/pkg/m17n-db/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/m17n-db/trunk/Makefile	2013-04-18 13:43:23 UTC (rev 20790)
@@ -0,0 +1,31 @@
+# $Id$
+# TODO (release-critical prefixed with !, non release-critical with *)
+#
+NAME = m17n-db
+VERSION = 1.6.4
+glibcVersion	=	2.17
+GARTYPE = v2
+
+DESCRIPTION = Database for the multilingual text processing library for the C language.
+define BLURB
+  Database for m17n
+endef
+
+MASTER_SITES	=	http://download.savannah.gnu.org/releases/m17n/
+DISTFILES		=	$(DISTNAME).tar.gz
+MASTER_SITES	+=	http://ftp.gnu.org/gnu/glibc/
+glibcDirectory	=	glibc-$(glibcVersion)
+glibcArchive	=	$(glibcDirectory).tar.xz
+DISTFILES		+=	$(glibcArchive)
+NOEXTRACT		=	$(glibcArchive)
+
+GARCOMPILER			=	GNU
+CONFIGURE_ARGS		=	$(DIRPATHS)
+CONFIGURE_ARGS		+=	--with-charmaps=$(glibcDirectory)/localedata/charmaps
+
+include gar/category.mk
+
+pre-configure:	$(DOWNLOADDIR)/$(glibcArchive)
+	@echo "executing $@"
+	cd $(WORKSRC) && gtar xf $(PWD)/$(DOWNLOADDIR)/$(glibcArchive) $(glibcDirectory)/localedata/charmaps
+	$(MAKECOOKIE)


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

Added: csw/mgar/pkg/m17n-db/trunk/checksums
===================================================================
--- csw/mgar/pkg/m17n-db/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/m17n-db/trunk/checksums	2013-04-18 13:43:23 UTC (rev 20790)
@@ -0,0 +1,2 @@
+87bf675c8ee523ebda4803e8e1cec638  glibc-2.17.tar.xz
+defac16a36b99334a0948a6e4f343b66  m17n-db-1.6.4.tar.gz

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


From pfelecan at users.sourceforge.net  Thu Apr 18 15:54:49 2013
From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net)
Date: Thu, 18 Apr 2013 13:54:49 +0000
Subject: [csw-devel] SF.net SVN: gar:[20791]
	csw/mgar/pkg/m17n-db/trunk/Makefile
Message-ID: <E1USpIX-0005Ag-Tt@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 20791
          http://gar.svn.sourceforge.net/gar/?rev=20791&view=rev
Author:   pfelecan
Date:     2013-04-18 13:54:49 +0000 (Thu, 18 Apr 2013)
Log Message:
-----------
m17n-db/trunk:
- obsoletes the previous package which didn't have a gar based recipe
- make the package architecture neutral

Modified Paths:
--------------
    csw/mgar/pkg/m17n-db/trunk/Makefile

Modified: csw/mgar/pkg/m17n-db/trunk/Makefile
===================================================================
--- csw/mgar/pkg/m17n-db/trunk/Makefile	2013-04-18 13:43:23 UTC (rev 20790)
+++ csw/mgar/pkg/m17n-db/trunk/Makefile	2013-04-18 13:54:49 UTC (rev 20791)
@@ -23,6 +23,10 @@
 CONFIGURE_ARGS		=	$(DIRPATHS)
 CONFIGURE_ARGS		+=	--with-charmaps=$(glibcDirectory)/localedata/charmaps
 
+ARCHALL	=	1
+
+OBSOLETED_BY_CSWCSWm17n-db	=	CSWm17ndb
+
 include gar/category.mk
 
 pre-configure:	$(DOWNLOADDIR)/$(glibcArchive)

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


From pfelecan at users.sourceforge.net  Thu Apr 18 16:00:10 2013
From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net)
Date: Thu, 18 Apr 2013 14:00:10 +0000
Subject: [csw-devel] SF.net SVN: gar:[20792]
	csw/mgar/pkg/m17n-db/trunk/Makefile
Message-ID: <E1USpNi-0005HI-4q@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 20792
          http://gar.svn.sourceforge.net/gar/?rev=20792&view=rev
Author:   pfelecan
Date:     2013-04-18 14:00:09 +0000 (Thu, 18 Apr 2013)
Log Message:
-----------
m17n-db/trunk: fix redundancy typo

Modified Paths:
--------------
    csw/mgar/pkg/m17n-db/trunk/Makefile

Modified: csw/mgar/pkg/m17n-db/trunk/Makefile
===================================================================
--- csw/mgar/pkg/m17n-db/trunk/Makefile	2013-04-18 13:54:49 UTC (rev 20791)
+++ csw/mgar/pkg/m17n-db/trunk/Makefile	2013-04-18 14:00:09 UTC (rev 20792)
@@ -25,7 +25,7 @@
 
 ARCHALL	=	1
 
-OBSOLETED_BY_CSWCSWm17n-db	=	CSWm17ndb
+OBSOLETED_BY_CSWm17n-db	=	CSWm17ndb
 
 include gar/category.mk
 

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


From pfelecan at users.sourceforge.net  Thu Apr 18 16:10:12 2013
From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net)
Date: Thu, 18 Apr 2013 14:10:12 +0000
Subject: [csw-devel] SF.net SVN: gar:[20793]
	csw/mgar/pkg/m17n-db/trunk/Makefile
Message-ID: <E1USpXQ-0005US-9w@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 20793
          http://gar.svn.sourceforge.net/gar/?rev=20793&view=rev
Author:   pfelecan
Date:     2013-04-18 14:10:11 +0000 (Thu, 18 Apr 2013)
Log Message:
-----------
m17n-db/trunk: explicit package information in trying to solve the
strange file collision error raised by checkpkg.

Modified Paths:
--------------
    csw/mgar/pkg/m17n-db/trunk/Makefile

Modified: csw/mgar/pkg/m17n-db/trunk/Makefile
===================================================================
--- csw/mgar/pkg/m17n-db/trunk/Makefile	2013-04-18 14:00:09 UTC (rev 20792)
+++ csw/mgar/pkg/m17n-db/trunk/Makefile	2013-04-18 14:10:11 UTC (rev 20793)
@@ -1,14 +1,14 @@
 # $Id$
 # TODO (release-critical prefixed with !, non release-critical with *)
 #
-NAME = m17n-db
-VERSION = 1.6.4
+NAME			=	m17n-db
+VERSION			=	1.6.4
 glibcVersion	=	2.17
-GARTYPE = v2
+GARTYPE			=	v2
 
 DESCRIPTION = Database for the multilingual text processing library for the C language.
 define BLURB
-  Database for m17n
+  Database for the multilingual text processing library for the C language.
 endef
 
 MASTER_SITES	=	http://download.savannah.gnu.org/releases/m17n/
@@ -23,10 +23,16 @@
 CONFIGURE_ARGS		=	$(DIRPATHS)
 CONFIGURE_ARGS		+=	--with-charmaps=$(glibcDirectory)/localedata/charmaps
 
-ARCHALL	=	1
+PACKAGES 						+=	CSWm17n-db
+CATALOGNAME_CSWm17n-db			=	m17n_db
+SPKG_DESC_CSWm17n-db			+=	$(DESCRIPTION)
+OBSOLETED_BY_CSWm17n-db			=	CSWm17ndb
+CATALOGNAME_CSWm17ndb			=	m17ndb_stub
+ARCHALL_CSWm17ndb				=	1
+ARCHALL_CSWm17n-db				=	1
+RUNTIME_DEP_PKGS_CSWm17n-db		+=	CSWm17n
+CHECKPKG_OVERRIDES_CSWm17n-db	+=	surplus-dependency|CSWm17n
 
-OBSOLETED_BY_CSWm17n-db	=	CSWm17ndb
-
 include gar/category.mk
 
 pre-configure:	$(DOWNLOADDIR)/$(glibcArchive)

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


From pfelecan at users.sourceforge.net  Thu Apr 18 16:12:33 2013
From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net)
Date: Thu, 18 Apr 2013 14:12:33 +0000
Subject: [csw-devel] SF.net SVN: gar:[20794] csw/mgar/pkg
Message-ID: <E1USpZh-0005YK-Op@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 20794
          http://gar.svn.sourceforge.net/gar/?rev=20794&view=rev
Author:   pfelecan
Date:     2013-04-18 14:12:33 +0000 (Thu, 18 Apr 2013)
Log Message:
-----------
m17n-contrib/trunk: instantiation

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

Added: csw/mgar/pkg/m17n-contrib/Makefile
===================================================================
--- csw/mgar/pkg/m17n-contrib/Makefile	                        (rev 0)
+++ csw/mgar/pkg/m17n-contrib/Makefile	2013-04-18 14:12:33 UTC (rev 20794)
@@ -0,0 +1,2 @@
+%:
+	$(MAKE) -C trunk $*


Property changes on: csw/mgar/pkg/m17n-contrib/trunk
___________________________________________________________________
Added: svn:ignore
   + work


Added: csw/mgar/pkg/m17n-contrib/trunk/Makefile
===================================================================
--- csw/mgar/pkg/m17n-contrib/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/m17n-contrib/trunk/Makefile	2013-04-18 14:12:33 UTC (rev 20794)
@@ -0,0 +1,19 @@
+# $Id$
+
+NAME	=	m17n-contrib
+VERSION	=	1.1.14
+GARTYPE	=	v2
+
+DESCRIPTION = A collection of contributed works to be used with the m17n library.
+define BLURB
+  A collection of contributed works to be used with the m17n library.
+endef
+
+MASTER_SITES	=	http://download.savannah.gnu.org/releases/m17n/
+DISTFILES		=	$(DISTNAME).tar.gz
+
+GARCOMPILER			=	GNU
+CONFIGURE_ARGS		=	$(DIRPATHS)
+
+include gar/category.mk
+


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

Added: csw/mgar/pkg/m17n-contrib/trunk/checksums
===================================================================
--- csw/mgar/pkg/m17n-contrib/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/m17n-contrib/trunk/checksums	2013-04-18 14:12:33 UTC (rev 20794)
@@ -0,0 +1 @@
+ae8c8b57604144a3d40afe54d5a912a3  m17n-contrib-1.1.14.tar.gz

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


From pfelecan at users.sourceforge.net  Thu Apr 18 16:18:02 2013
From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net)
Date: Thu, 18 Apr 2013 14:18:02 +0000
Subject: [csw-devel] SF.net SVN: gar:[20795]
	csw/mgar/pkg/m17n-db/trunk/Makefile
Message-ID: <E1USpf0-0005ew-Ld@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 20795
          http://gar.svn.sourceforge.net/gar/?rev=20795&view=rev
Author:   pfelecan
Date:     2013-04-18 14:18:02 +0000 (Thu, 18 Apr 2013)
Log Message:
-----------
m17n-db/trunk: removed dependency on m17n

Modified Paths:
--------------
    csw/mgar/pkg/m17n-db/trunk/Makefile

Modified: csw/mgar/pkg/m17n-db/trunk/Makefile
===================================================================
--- csw/mgar/pkg/m17n-db/trunk/Makefile	2013-04-18 14:12:33 UTC (rev 20794)
+++ csw/mgar/pkg/m17n-db/trunk/Makefile	2013-04-18 14:18:02 UTC (rev 20795)
@@ -30,8 +30,6 @@
 CATALOGNAME_CSWm17ndb			=	m17ndb_stub
 ARCHALL_CSWm17ndb				=	1
 ARCHALL_CSWm17n-db				=	1
-RUNTIME_DEP_PKGS_CSWm17n-db		+=	CSWm17n
-CHECKPKG_OVERRIDES_CSWm17n-db	+=	surplus-dependency|CSWm17n
 
 include gar/category.mk
 

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


From wahwah at users.sourceforge.net  Thu Apr 18 17:17:17 2013
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Thu, 18 Apr 2013 15:17:17 +0000
Subject: [csw-devel] SF.net SVN: gar:[20796] csw/mgar/gar/v2/lib
Message-ID: <E1USqaL-0006o4-PB@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 20796
          http://gar.svn.sourceforge.net/gar/?rev=20796&view=rev
Author:   wahwah
Date:     2013-04-18 15:17:17 +0000 (Thu, 18 Apr 2013)
Log Message:
-----------
pkgdb: Various cleanup

Collected numerous changes that have no meritoric significance.

pkgdb: Sort imports in the rest.py file

Modified Paths:
--------------
    csw/mgar/gar/v2/lib/python/checkpkg_lib.py
    csw/mgar/gar/v2/lib/python/inspective_package.py
    csw/mgar/gar/v2/lib/python/package.py
    csw/mgar/gar/v2/lib/python/package_stats.py
    csw/mgar/gar/v2/lib/python/pkgdb.py
    csw/mgar/gar/v2/lib/python/rest.py
    csw/mgar/gar/v2/lib/python/system_pkgmap.py
    csw/mgar/gar/v2/lib/web/releases_web.py

Modified: csw/mgar/gar/v2/lib/python/checkpkg_lib.py
===================================================================
--- csw/mgar/gar/v2/lib/python/checkpkg_lib.py	2013-04-18 14:18:02 UTC (rev 20795)
+++ csw/mgar/gar/v2/lib/python/checkpkg_lib.py	2013-04-18 15:17:17 UTC (rev 20796)
@@ -1092,7 +1092,7 @@
     logging.debug("AddSrv4ToCatalog(%s, %s, %s, %s, %s)",
         sqo_srv4, osrel, arch, catrel, who)
     if not who:
-    	who = 'unknown'
+      who = 'unknown'
     # There are only i386 and sparc catalogs.
     if arch != 'i386' and arch != 'sparc':
       raise CatalogDatabaseError("Wrong architecture: %s" % arch)

Modified: csw/mgar/gar/v2/lib/python/inspective_package.py
===================================================================
--- csw/mgar/gar/v2/lib/python/inspective_package.py	2013-04-18 14:18:02 UTC (rev 20795)
+++ csw/mgar/gar/v2/lib/python/inspective_package.py	2013-04-18 15:17:17 UTC (rev 20796)
@@ -56,8 +56,8 @@
         "will probably finish successfully when do you that."
         % full_path)
     if "/opt/csw/share" in full_path:
-    	file_info["mime_type"] = "application/octet-stream; fallback"
-    	logging.error(msg)
+      file_info["mime_type"] = "application/octet-stream; fallback"
+      logging.error(msg)
     else:
       raise package.PackageError(msg)
   if sharedlib_utils.IsBinary(file_info, check_consistency=False):
@@ -214,7 +214,7 @@
       retcode, stdout, stderr = shell.ShellCommand(args)
       if retcode:
         logging.error("%s returned an error: %s", args, stderr)
-      	# Should it just skip over an error?
+        # Should it just skip over an error?
         continue
       nm_out = stdout.splitlines()
 
@@ -300,7 +300,6 @@
 
       cur_section = None
       for line in elfdump_out:
-
         try:
           elf_info, cur_section = self._ParseElfdumpLine(line, cur_section)
         except package.StdoutSyntaxError as e:
@@ -510,7 +509,7 @@
         elfdump_data = m.groupdict()
 
     if not m:
-      raise package.StdoutSyntaxError("Could not parse %s" % (repr(line)))
+      raise package.StdoutSyntaxError("Could not parse %r" % line)
 
     return elfdump_data, section
 

Modified: csw/mgar/gar/v2/lib/python/package.py
===================================================================
--- csw/mgar/gar/v2/lib/python/package.py	2013-04-18 14:18:02 UTC (rev 20795)
+++ csw/mgar/gar/v2/lib/python/package.py	2013-04-18 15:17:17 UTC (rev 20796)
@@ -35,19 +35,23 @@
 proxy=
 """
 
+
 class Error(Exception):
-  pass
+  """A generic error."""
 
 
 class SystemUtilityError(Error):
   """A problem occurred while running system utility, e.g. ldd."""
 
+
 class PackageError(Error):
-  pass
+  """A problem with the package itself that causes problems with examining it."""
 
+
 class StdoutSyntaxError(Error):
-  pass
+  """Problem with data returned by a process."""
 
+
 class CswSrv4File(shell.ShellMixin, object):
   """Represents a package in the srv4 format (pkg)."""
 

Modified: csw/mgar/gar/v2/lib/python/package_stats.py
===================================================================
--- csw/mgar/gar/v2/lib/python/package_stats.py	2013-04-18 14:18:02 UTC (rev 20795)
+++ csw/mgar/gar/v2/lib/python/package_stats.py	2013-04-18 15:17:17 UTC (rev 20796)
@@ -55,6 +55,8 @@
 
 class PackageStatsMixin(object):
   """Collects stats about a package and saves them.
+
+  Takes care of processing data from a SVR4 package and returing them as data structures.
   """
 
   def __init__(self, srv4_pkg, stats_basedir=None, md5sum=None, debug=False):
@@ -223,7 +225,7 @@
         "binaries_elf_info": dir_pkg.GetBinaryElfInfo(),
     }
     self.SaveStats(pkg_stats)
-    logging.debug("Statistics of %s have been collected and saved in the db.",
+    logging.debug("_CollectStats(): Stats of %s have been collected and saved in the db.",
                   repr(dir_pkg.pkgname))
     return pkg_stats
 

Modified: csw/mgar/gar/v2/lib/python/pkgdb.py
===================================================================
--- csw/mgar/gar/v2/lib/python/pkgdb.py	2013-04-18 14:18:02 UTC (rev 20795)
+++ csw/mgar/gar/v2/lib/python/pkgdb.py	2013-04-18 15:17:17 UTC (rev 20796)
@@ -202,6 +202,7 @@
     if catrel not in CATALOGS_ALLOWED_TO_BE_IMPORTED:
       raise UsageError("Catalogs that can be imported: %s"
                        % CATALOGS_ALLOWED_TO_BE_IMPORTED)
+
     catalog_dir = os.path.dirname(catalog_file)
     # The plan:
     # - read in the catalog file, and build a md5-filename correspondence
@@ -214,16 +215,20 @@
     for catalog_entry in catalog_data:
       cat_entry_by_md5[catalog_entry["md5sum"]] = catalog_entry
       cat_entry_by_basename[catalog_entry["file_basename"]] = catalog_entry
+
     # - import all srv4 files that were not in the database so far
     entries_to_import = []
+
     logging.debug("Checking which srv4 files are already in the db.")
     for md5 in cat_entry_by_md5:
       try:
         sqo_list = m.Srv4FileStats.selectBy(md5_sum=md5).getOne()
       except sqlobject.main.SQLObjectNotFound, e:
         entries_to_import.append(cat_entry_by_md5[md5])
+
     basenames = [x["file_basename"] for x in entries_to_import]
     file_list = []
+
     if entries_to_import:
       logging.info("Srv4 files to import:")
       for basename in sorted(basenames):
@@ -242,6 +247,7 @@
       for statdict in new_statdicts:
         new_statdicts_by_md5[statdict["basic_stats"]["md5_sum"]] = statdict
         package_stats.PackageStats.ImportPkg(statdict)
+
     # - sync the specific catalog
     #   - find the md5 sum list of the current catalog
     logging.debug("Retrieving current catalog assigments from the db.")
@@ -264,6 +270,7 @@
         # Since the srv4_in_cat object has lost its reference, there's no use
         # keeping it around.
         srv4_in_cat.destroySelf()
+
     disk_md5s = set(cat_entry_by_md5)
     db_md5s = set(db_srv4s_in_cat_by_md5)
     #   - match the md5 sum lists between db and disk
@@ -278,12 +285,14 @@
         logging.info(
             " - %s",
             db_srv4s_in_cat_by_md5[md5].srv4file.basename)
+
     if md5_sums_to_add:
       logging.info("To add to from %s %s %s:", osrel, arch, catrel)
       for md5 in md5_sums_to_add:
         logging.info(
             " + %s",
             cat_entry_by_md5[md5]["file_basename"])
+
     user = getpass.getuser()
     # Remove
     # We could use checkpkg_lib.Catalog.RemoveSrv4(), but it would redo
@@ -292,6 +301,7 @@
       logging.info("Removing assignments from the catalog.")
       for md5 in md5_sums_to_remove:
         db_srv4s_in_cat_by_md5[md5].destroySelf()
+
     # Add
     if md5_sums_to_add:
       logging.info("Adding srv4 files to the %s %s %s catalog.",
@@ -497,14 +507,16 @@
     c = checkpkg_lib.Catalog()
     md5_sums = args[3:]
     for md5_sum in md5_sums:
-      logging.debug("Adding %s to the catalog", md5_sum)
       try:
         sqo_srv4 = m.Srv4FileStats.select(
             m.Srv4FileStats.q.md5_sum==md5_sum).getOne()
+        logging.debug('Adding %s to the catalog', md5_sum)
         c.AddSrv4ToCatalog(sqo_srv4, osrel, arch, catrel, who=user)
-      except sqlobject.main.SQLObjectNotFound, e:
-        logging.warning("Srv4 file %s was not found in the database.",
-                        md5_sum)
+      except sqlobject.main.SQLObjectNotFound as e:
+        logging.warning('Srv4 file %r, osrel %r, arch %r or catrel %r '
+                        'was not found in the database, '
+                        'and the package was not added: %s',
+                        md5_sum, osrel, arch, catrel, e)
   elif command == 'del-from-cat':
     if len(args) < 4:
       raise UsageError("Not enough arguments, see usage.")

Modified: csw/mgar/gar/v2/lib/python/rest.py
===================================================================
--- csw/mgar/gar/v2/lib/python/rest.py	2013-04-18 14:18:02 UTC (rev 20795)
+++ csw/mgar/gar/v2/lib/python/rest.py	2013-04-18 15:17:17 UTC (rev 20796)
@@ -1,12 +1,12 @@
 #!/usr/bin/env python2.6
 
-import os
 from StringIO import StringIO
+import anydbm
 import cjson
-import anydbm
 import logging
+import os
+import pycurl
 import urllib2
-import pycurl
 
 DEFAULT_URL = "http://buildfarm.opencsw.org"
 RELEASES_APP = "/releases"

Modified: csw/mgar/gar/v2/lib/python/system_pkgmap.py
===================================================================
--- csw/mgar/gar/v2/lib/python/system_pkgmap.py	2013-04-18 14:18:02 UTC (rev 20795)
+++ csw/mgar/gar/v2/lib/python/system_pkgmap.py	2013-04-18 15:17:17 UTC (rev 20796)
@@ -552,20 +552,13 @@
         try:
           sqo_srv4 = self._GetFakeSrv4(pkgname, osrel, arch)
         except sqlobject.main.SQLObjectNotFound, e:
-          print d
+          logging.fatal(d)
           raise
         if sqo_srv4 not in cleaned_pkgs:
           sqo_srv4.RemoveAllCswFiles()
           cleaned_pkgs.add(sqo_srv4)
         sqo_pkginst = self._GetPkginst(pkgname)
         f_path, f_basename = os.path.split(d["path"])
-        # This is really slow (one run ~1h), but works.
-        # To speed it up, raw SQL + cursor.executemany() could be used, but
-        # there's a incompatibility between MySQL and sqlite drivers:
-        # MySQL:  INSERT ... VALUES (%s, %s, %s);
-        # sqlite: INSERT ... VALUES (?, ?, ?);
-        # For now, using the sqlobject ORM which is slow, but at least
-        # handles compatibility issues.
         csw_file = m.CswFile(pkginst=sqo_pkginst,
             line=d["line"], path=f_path, basename=f_basename,
             srv4_file=sqo_srv4)

Modified: csw/mgar/gar/v2/lib/web/releases_web.py
===================================================================
--- csw/mgar/gar/v2/lib/web/releases_web.py	2013-04-18 14:18:02 UTC (rev 20795)
+++ csw/mgar/gar/v2/lib/web/releases_web.py	2013-04-18 15:17:17 UTC (rev 20796)
@@ -21,6 +21,7 @@
 import hashlib
 import logging
 
+
 urls = (
   r'/', 'Index',
   r'/srv4/', 'Srv4List',
@@ -35,7 +36,12 @@
 
 OPENCSW_ROOT = "/home/mirror/opencsw-official"
 ALLPKGS_DIR = os.path.join(OPENCSW_ROOT, "allpkgs")
-CAN_UPLOAD_TO_CATALOGS = frozenset(["unstable", "kiel", "bratislava", "beanie"])
+CAN_UPLOAD_TO_CATALOGS = frozenset([
+    "unstable",
+    "kiel",
+    "bratislava",
+    "beanie",
+])
 
 def ConnectToDatabase():
   configuration.SetUpSqlobjectConnection()
@@ -50,14 +56,10 @@
     messages = []
     configuration.SetUpSqlobjectConnection()
     x = web.input(srv4_file={})
-    # x['srv4_file'].filename
-    # x['srv4_file'].value
-    # x['srv4_file'].file.read()
     web.header(
         'Content-type',
         'application/x-vnd.opencsw.pkg;type=upload-results')
     hash = hashlib.md5()
-    # hash.update(x['srv4_file'].file.read())
     hash.update(x['srv4_file'].value)
     data_md5_sum = hash.hexdigest()
     declared_md5_sum = x['md5_sum']

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 Apr 18 17:17:34 2013
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Thu, 18 Apr 2013 15:17:34 +0000
Subject: [csw-devel] SF.net SVN: gar:[20797] csw/mgar/gar/v2/lib
Message-ID: <E1USqac-0006oc-30@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 20797
          http://gar.svn.sourceforge.net/gar/?rev=20797&view=rev
Author:   wahwah
Date:     2013-04-18 15:17:33 +0000 (Thu, 18 Apr 2013)
Log Message:
-----------
pkgdb: Throw away the unused PackageSurgeon class

Will will not be doing surgery on existing packages.

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

Added Paths:
-----------
    csw/mgar/gar/v2/lib/web/__init__.py

Modified: csw/mgar/gar/v2/lib/python/package.py
===================================================================
--- csw/mgar/gar/v2/lib/python/package.py	2013-04-18 15:17:17 UTC (rev 20796)
+++ csw/mgar/gar/v2/lib/python/package.py	2013-04-18 15:17:33 UTC (rev 20797)
@@ -451,69 +451,3 @@
       less_proc.wait()
     else:
       print "No differences found."
-
-
-class PackageSurgeon(shell.ShellMixin):
-  """Takes an OpenCSW gzipped package and performs surgery on it.
-
-  Sows it up, adjusts checksums, and puts it back together.
-  """
-
-  def __init__(self, pkg_path, debug):
-    self.debug = debug
-    self.pkg_path = pkg_path
-    self.srv4 = CswSrv4File(pkg_path)
-    self.dir_pkg = None
-    self.exported_dir = None
-    self.parsed_filename = opencsw.ParsePackageFileName(self.pkg_path)
-
-  def Transform(self):
-    if not self.dir_pkg:
-      self.dir_pkg = self.srv4.GetDirFormatPkg()
-      logging.debug(repr(self.dir_pkg))
-
-  def Export(self, dest_dir):
-    self.Transform()
-    if not self.exported_dir:
-      basedir, pkgname = os.path.split(self.dir_pkg.directory)
-      self.exported_dir = os.path.join(dest_dir, pkgname)
-      shutil.copytree(
-          self.dir_pkg.directory,
-          self.exported_dir)
-      subprocess.call(["git", "init"], cwd=self.exported_dir)
-      subprocess.call(["git", "add", "."], cwd=self.exported_dir)
-      subprocess.call(["git", "commit", "-a", "-m", "Initial commit"],
-                      cwd=self.exported_dir)
-    else:
-      logging.warn("The package was already exported to %s",
-                   self.exported_dir)
-
-  def Patch(self, patch_file):
-    self.Transform()
-    args = ["gpatch", "-p", "1", "-d", self.dir_pkg.directory, "-i", patch_file]
-    logging.debug(args)
-    subprocess.call(args)
-
-  def ToSrv4(self, dest_dir):
-    self.Transform()
-    pkginfo = self.dir_pkg.GetParsedPkginfo()
-    date_str = datetime.datetime.now().strftime("%Y.%m.%d")
-    self.parsed_filename["revision_info"]["REV"] = date_str
-    new_filename = opencsw.ComposePackageFileName(self.parsed_filename)
-    # Plan:
-    # - Update the version in the pkginfo
-    version_string = opencsw.ComposeVersionString(
-        self.parsed_filename["version"],
-        self.parsed_filename["revision_info"])
-    logging.debug("New version string: %s", repr(version_string))
-    self.dir_pkg.SetPkginfoEntry("VERSION", version_string)
-    # - Update the pkgmap file, setting the checksums
-    # - Transform it back to the srv4 form
-    target_dir, old_path = os.path.split(self.pkg_path)
-    logging.debug("Transforming into %s", new_filename)
-    self.dir_pkg.ToSrv4(target_dir, new_filename)
-    # - Update the pkgmap file, setting the checksums
-    # - Transform it back to the srv4 form
-    target_dir, old_path = os.path.split(self.pkg_path)
-    logging.debug("Transforming into %s", new_filename)
-    self.dir_pkg.ToSrv4(target_dir, new_filename)

Added: csw/mgar/gar/v2/lib/web/__init__.py
===================================================================
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


From wahwah at users.sourceforge.net  Thu Apr 18 17:17:52 2013
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Thu, 18 Apr 2013 15:17:52 +0000
Subject: [csw-devel] SF.net SVN: gar:[20798] csw/mgar/gar/v2
Message-ID: <E1USqau-0006pG-LB@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 20798
          http://gar.svn.sourceforge.net/gar/?rev=20798&view=rev
Author:   wahwah
Date:     2013-04-18 15:17:52 +0000 (Thu, 18 Apr 2013)
Log Message:
-----------
checkpkg: Switch from hachoir_parser to pyelftools

It's a more lightweight library. It turns out that we only need to identify
architectures of binary files.

Modified Paths:
--------------
    csw/mgar/gar/v2/gar.conf.mk
    csw/mgar/gar/v2/lib/python/README
    csw/mgar/gar/v2/lib/python/inspective_package.py

Modified: csw/mgar/gar/v2/gar.conf.mk
===================================================================
--- csw/mgar/gar/v2/gar.conf.mk	2013-04-18 15:17:33 UTC (rev 20797)
+++ csw/mgar/gar/v2/gar.conf.mk	2013-04-18 15:17:52 UTC (rev 20798)
@@ -201,10 +201,9 @@
 DEF_BASE_PKGS += CSWpy-cheetah
 DEF_BASE_PKGS += CSWpy-cjson
 DEF_BASE_PKGS += CSWpy-dateutil
-DEF_BASE_PKGS += CSWpy-hachoir-core
-DEF_BASE_PKGS += CSWpy-hachoir-parser
 DEF_BASE_PKGS += CSWpy-libmagic
 DEF_BASE_PKGS += CSWpy-progressbar
+DEF_BASE_PKGS += CSWpy-pyelftools
 DEF_BASE_PKGS += CSWpy-sqlobject
 DEF_BASE_PKGS += CSWpy-yaml
 DEF_BASE_PKGS += CSWpython

Modified: csw/mgar/gar/v2/lib/python/README
===================================================================
--- csw/mgar/gar/v2/lib/python/README	2013-04-18 15:17:33 UTC (rev 20797)
+++ csw/mgar/gar/v2/lib/python/README	2013-04-18 15:17:52 UTC (rev 20798)
@@ -65,7 +65,6 @@
 
 Known problems:
 - libmagic fails sometimes when processing the whole catalog
-- hachoir_parser fails sometimes on i386 packages when examining them on sparc
 
 Package dependencies:
 
@@ -76,7 +75,6 @@
 sudo aptitude install \
   python-mysql \
   python-cheetah \
-  python-hachoir-parser \
   python-magic \
   python-mox \
   python-progressbar \
@@ -85,24 +83,26 @@
   python-unittest2 \
   python-yaml
 
+Seem unpackaged: elftools from
+http://eli.thegreenplace.net/2012/01/06/pyelftools-python-library-for-parsing-elf-and-dwarf/
+
 Solaris package dependencies.
 
-CSWpy-unittest2
+CSWpy-cheetah
 CSWpy-curl
 CSWpy-libmagic
-CSWpy-sqlobject
-CSWpy-cheetah
 CSWpy-mox
 CSWpy-mysql
 CSWpy-progressbar
+CSWpy-pyelftools
+CSWpy-sqlobject
+CSWpy-unittest2
 
 For pkgdb-web
 
 CSWapache2
-CSWap2modpython
-modpython_gateway (together with pkgdb_web.py in the same dir)
+CSWap2-modwsgi
 
-
 ===Checkpkg database===
 
 Additional database indexes:

Modified: csw/mgar/gar/v2/lib/python/inspective_package.py
===================================================================
--- csw/mgar/gar/v2/lib/python/inspective_package.py	2013-04-18 15:17:33 UTC (rev 20797)
+++ csw/mgar/gar/v2/lib/python/inspective_package.py	2013-04-18 15:17:52 UTC (rev 20798)
@@ -1,3 +1,5 @@
+"""This file isolates code dependent on elftools."""
+
 import package
 import os
 import re
@@ -3,5 +5,4 @@
 import sys
 import logging
-import hachoir_parser
 import sharedlib_utils
 import magic
@@ -13,17 +14,9 @@
 import time
 import shell
 
-"""This file isolates code dependent on hachoir parser.
+from elftools.elf.elffile import ELFFile
+from elftools.elf.enums import ENUM_E_MACHINE
 
-hachoir parser takes quite a while to import.
-"""
-
-# Suppress unhelpful warnings
-# http://bitbucket.org/haypo/hachoir/issue/23
-import hachoir_core.config
-hachoir_core.config.quiet = True
-
-
 ROOT_RE = re.compile(r"^(reloc|root)/")
 
 
@@ -61,26 +54,9 @@
     else:
       raise package.PackageError(msg)
   if sharedlib_utils.IsBinary(file_info, check_consistency=False):
-    parser_tag = ('class', hachoir_parser.program.elf.ElfFile)
-    parser = hachoir_parser.createParser(full_path, tags=[parser_tag])
-    if not parser:
-      logging.warning("Can't parse file %s", file_path)
-    else:
-      try:
-        machine_id = parser["/header/machine"].value
-      except hachoir_core.field.field.MissingField, e:
-        logging.fatal(
-            "hachoir_parser failed to retrieve machine_id for %r. "
-            "checkpkg cannot continue.",
-            file_info)
-        raise
-      try:
-        file_info["mime_type_by_hachoir"] = parser.mime_type
-        file_info["machine_id"] = machine_id
-        file_info["endian"] = parser["/header/endian"].display
-      except hachoir_core.field.field.MissingField, e:
-        logging.warning(
-            "Error in hachoir_parser processing %s: %r", file_path, e)
+    with open(full_path, 'rb') as elf_fd:
+      elffile = ELFFile(elf_fd)
+      file_info["machine_id"] = ENUM_E_MACHINE[elffile.header['e_machine']]
   return file_info
 
 class InspectivePackage(package.DirectoryFormatPackage):

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 Apr 18 17:18:04 2013
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Thu, 18 Apr 2013 15:18:04 +0000
Subject: [csw-devel] SF.net SVN: gar:[20799]
	csw/mgar/gar/v2/lib/python/inspective_package.py
Message-ID: <E1USqb6-0006pa-JT@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 20799
          http://gar.svn.sourceforge.net/gar/?rev=20799&view=rev
Author:   wahwah
Date:     2013-04-18 15:18:04 +0000 (Thu, 18 Apr 2013)
Log Message:
-----------
checkpkg: Free magic cookies on deletion

I was hoping this was the memory leak, but it looks like it isn't it. I still
suspect something around libmagic though, mainly because the process RSS size
is way bigger than reported object sizes in Python memory profiler. libmagic is
the only C module that is used, and this symptom is likely produced by
a C module.

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

Modified: csw/mgar/gar/v2/lib/python/inspective_package.py
===================================================================
--- csw/mgar/gar/v2/lib/python/inspective_package.py	2013-04-18 15:17:52 UTC (rev 20798)
+++ csw/mgar/gar/v2/lib/python/inspective_package.py	2013-04-18 15:18:04 UTC (rev 20799)
@@ -684,43 +684,31 @@
 
   def __init__(self):
     self.cookie_count = 0
-    self.magic_cookie = None
+    self._magic_cookie = None
 
-  def _GetCookie(self):
-    magic_cookie = magic.open(self.cookie_count)
-    self.cookie_count += 1
-    magic_cookie.load()
-    if "MAGIC_MIME" in dir(magic):
-      flag = magic.MAGIC_MIME
-    elif "MIME" in dir(magic):
-      flag = magic.MIME
-    magic_cookie.setflags(flag)
-    return magic_cookie
+  def __del__(self):
+    if self.magic_cookie:
+      self.magic_cookie.close()
 
-  def _LazyInit(self):
-    if not self.magic_cookie:
-      self.magic_cookie = self._GetCookie()
+  @property
+  def magic_cookie(self):
+    if not self._magic_cookie:
+      self._magic_cookie = magic.open(self.cookie_count)
+      self.cookie_count += 1
+      self._magic_cookie.load()
+      if "MAGIC_MIME" in dir(magic):
+        flag = magic.MAGIC_MIME
+      elif "MIME" in dir(magic):
+        flag = magic.MIME
+      self._magic_cookie.setflags(flag)
+    return self._magic_cookie
 
   def GetFileMimeType(self, full_path):
-    """Trying to run magic.file() a few times, not accepting None."""
-    self._LazyInit()
-    mime = None
     logging.debug("GetFileMimeType(%r)", full_path)
-    for i in xrange(10):
-      mime = self.magic_cookie.file(full_path)
-      if mime:
-        break
-      else:
-        # Returned mime is null. Re-initializing the cookie and trying again.
-        logging.error("magic_cookie.file(%s) returned None. Retrying.",
-                      full_path)
-        self.magic_cookie = self._GetCookie()
-        # In practice, this retrying doesn't help.  There seems to be
-        # something process-related which prevents libmagic from
-        # functioning.  The only known workaround is to shutdown the
-        # process and run it again.
-        #
-        # The issues have been observed with file-5.04.
+    mime = self.magic_cookie.file(full_path)
+    if not mime:
+      raise package.SystemUtilityError(
+          "libmagic has failed to return the mime type of %r." % (full_path))
     return mime
 
 

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 Apr 18 17:18:15 2013
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Thu, 18 Apr 2013 15:18:15 +0000
Subject: [csw-devel] SF.net SVN: gar:[20800]
	csw/mgar/gar/v2/lib/python/rest.py
Message-ID: <E1USqbH-0006px-Up@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 20800
          http://gar.svn.sourceforge.net/gar/?rev=20800&view=rev
Author:   wahwah
Date:     2013-04-18 15:18:15 +0000 (Thu, 18 Apr 2013)
Log Message:
-----------
pkgdb: Move a constant to the RestClient class

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

Modified: csw/mgar/gar/v2/lib/python/rest.py
===================================================================
--- csw/mgar/gar/v2/lib/python/rest.py	2013-04-18 15:18:04 UTC (rev 20799)
+++ csw/mgar/gar/v2/lib/python/rest.py	2013-04-18 15:18:15 UTC (rev 20800)
@@ -9,7 +9,6 @@
 import urllib2
 
 DEFAULT_URL = "http://buildfarm.opencsw.org"
-RELEASES_APP = "/releases"
 
 class Error(Exception):
   """Generic error."""
@@ -26,6 +25,7 @@
 class RestClient(object):
 
   PKGDB_APP = "/pkgdb/rest"
+  RELEASES_APP = "/releases"
 
   def __init__(self, rest_url=DEFAULT_URL, username=None, password=None,
       debug=False):
@@ -130,7 +130,7 @@
     url = (
         "%s%s/catalogs/%s/%s/%s/%s/"
         % (self.rest_url,
-           RELEASES_APP,
+           self.RELEASES_APP,
            catrel, arch, osrel,
            md5_sum))
     logging.debug("DELETE @ URL: %s %s", type(url), url)

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 Apr 18 17:18:28 2013
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Thu, 18 Apr 2013 15:18:28 +0000
Subject: [csw-devel] SF.net SVN: gar:[20801] csw/mgar/gar/v2/lib/python
Message-ID: <E1USqbU-0006qJ-Fa@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 20801
          http://gar.svn.sourceforge.net/gar/?rev=20801&view=rev
Author:   wahwah
Date:     2013-04-18 15:18:28 +0000 (Thu, 18 Apr 2013)
Log Message:
-----------
pkgdb: Remove the silly PackageStatsMixin class

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

Modified: csw/mgar/gar/v2/lib/python/package_stats.py
===================================================================
--- csw/mgar/gar/v2/lib/python/package_stats.py	2013-04-18 15:18:15 UTC (rev 20800)
+++ csw/mgar/gar/v2/lib/python/package_stats.py	2013-04-18 15:18:28 UTC (rev 20801)
@@ -53,14 +53,14 @@
   """A utility's output is bad, e.g. impossible to parse."""
 
 
-class PackageStatsMixin(object):
+class PackageStats(object):
   """Collects stats about a package and saves them.
 
   Takes care of processing data from a SVR4 package and returing them as data structures.
   """
 
   def __init__(self, srv4_pkg, stats_basedir=None, md5sum=None, debug=False):
-    super(PackageStatsMixin, self).__init__()
+    super(PackageStats, self).__init__()
     self.srv4_pkg = srv4_pkg
     self.md5sum = md5sum
     self.dir_format_pkg = None
@@ -516,8 +516,3 @@
       pbar.update(counter.next())
     pbar.finish()
     return data_list
-
-
-class PackageStats(PackageStatsMixin):
-  """Without the implicit database initialiation."""
-  pass

Modified: csw/mgar/gar/v2/lib/python/package_stats_test.py
===================================================================
--- csw/mgar/gar/v2/lib/python/package_stats_test.py	2013-04-18 15:18:15 UTC (rev 20800)
+++ csw/mgar/gar/v2/lib/python/package_stats_test.py	2013-04-18 15:18:28 UTC (rev 20801)
@@ -76,7 +76,7 @@
 class DatabaseIntegrationTest(test_base.SqlObjectTestMixin,
                               unittest.TestCase):
 
-  class TestPackageStats(package_stats.PackageStatsMixin):
+  class TestPackageStats(package_stats.PackageStats):
     pass
 
   class TestCatalog(checkpkg_lib.Catalog):

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 Apr 18 17:18:40 2013
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Thu, 18 Apr 2013 15:18:40 +0000
Subject: [csw-devel] SF.net SVN: gar:[20802]
	csw/mgar/gar/v2/lib/python/configuration.py
Message-ID: <E1USqbg-0006qd-Gz@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 20802
          http://gar.svn.sourceforge.net/gar/?rev=20802&view=rev
Author:   wahwah
Date:     2013-04-18 15:18:40 +0000 (Thu, 18 Apr 2013)
Log Message:
-----------
pkgdb: Use 'with' to save the config file.

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

Modified: csw/mgar/gar/v2/lib/python/configuration.py
===================================================================
--- csw/mgar/gar/v2/lib/python/configuration.py	2013-04-18 15:18:28 UTC (rev 20801)
+++ csw/mgar/gar/v2/lib/python/configuration.py	2013-04-18 15:18:40 UTC (rev 20802)
@@ -103,9 +103,8 @@
       config.set("database", "user", "")
       config.set("database", "password", "")
       config.set("database", "auto_manage", "yes")
-      fd = open(config_file, "w")
-      config.write(fd)
-      fd.close()
+      with open(config_file, "w") as fd:
+        config.write(fd)
       logging.debug("Configuration has been written.")
   if not config.has_section("database"):
     logging.fatal(

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 Apr 18 17:18:51 2013
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Thu, 18 Apr 2013 15:18:51 +0000
Subject: [csw-devel] SF.net SVN: gar:[20803]
	csw/mgar/gar/v2/lib/python/rest.py
Message-ID: <E1USqbr-0006qx-8H@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 20803
          http://gar.svn.sourceforge.net/gar/?rev=20803&view=rev
Author:   wahwah
Date:     2013-04-18 15:18:51 +0000 (Thu, 18 Apr 2013)
Log Message:
-----------
pkgdb: Validate md5 sums in RestClient

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

Modified: csw/mgar/gar/v2/lib/python/rest.py
===================================================================
--- csw/mgar/gar/v2/lib/python/rest.py	2013-04-18 15:18:40 UTC (rev 20802)
+++ csw/mgar/gar/v2/lib/python/rest.py	2013-04-18 15:18:51 UTC (rev 20803)
@@ -6,6 +6,7 @@
 import logging
 import os
 import pycurl
+import re
 import urllib2
 
 DEFAULT_URL = "http://buildfarm.opencsw.org"
@@ -34,7 +35,12 @@
     self.password = password
     self.debug = debug
 
+  def ValidateMd5(self, md5_sum):
+    if not re.match(r'^[0-9a-f]{32}$', md5_sum):
+      raise ArgumentError('Passed argument is not a valid md5 sum: %r' % md5_sum)
+
   def GetPkgByMd5(self, md5_sum):
+    self.ValidateMd5(md5_sum)
     url = self.rest_url + self.PKGDB_APP + "/srv4/%s/" % md5_sum
     logging.debug("GetPkgByMd5(): GET %s", url)
     try:
@@ -51,6 +57,7 @@
         raise
 
   def GetPkgstatsByMd5(self, md5_sum):
+    self.ValidateMd5(md5_sum)
     url = self.rest_url + self.PKGDB_APP + "/srv4/%s/pkg-stats/" % md5_sum
     logging.debug("GetPkgstatsByMd5(): GET %s", url)
     try:
@@ -67,6 +74,7 @@
         raise
 
   def GetMaintainerByMd5(self, md5_sum):
+    self.ValidateMd5(md5_sum)
     pkg = self.GetPkgByMd5(md5_sum)
     if not pkg:
       pkg = {"maintainer_email": "Unknown"}

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 Apr 18 17:19:05 2013
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Thu, 18 Apr 2013 15:19:05 +0000
Subject: [csw-devel] SF.net SVN: gar:[20804] csw/mgar/gar/v2/lib
Message-ID: <E1USqc5-0006rN-Qb@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 20804
          http://gar.svn.sourceforge.net/gar/?rev=20804&view=rev
Author:   wahwah
Date:     2013-04-18 15:19:05 +0000 (Thu, 18 Apr 2013)
Log Message:
-----------
pkgdb: Move GetSqoTriad to the models module

It's used from there anyway, and pkgdb is not a good module to import.

Modified Paths:
--------------
    csw/mgar/gar/v2/lib/python/models.py
    csw/mgar/gar/v2/lib/python/pkgdb.py
    csw/mgar/gar/v2/lib/web/releases_web.py

Modified: csw/mgar/gar/v2/lib/python/models.py
===================================================================
--- csw/mgar/gar/v2/lib/python/models.py	2013-04-18 15:18:51 UTC (rev 20803)
+++ csw/mgar/gar/v2/lib/python/models.py	2013-04-18 15:19:05 UTC (rev 20804)
@@ -476,3 +476,9 @@
       join=join,
   ).orderBy('catalogname')
   return res
+
+def GetSqoTriad(osrel, arch, catrel):
+  sqo_osrel = OsRelease.selectBy(short_name=osrel).getOne()
+  sqo_arch = Architecture.selectBy(name=arch).getOne()
+  sqo_catrel = CatalogRelease.selectBy(name=catrel).getOne()
+  return sqo_osrel, sqo_arch, sqo_catrel

Modified: csw/mgar/gar/v2/lib/python/pkgdb.py
===================================================================
--- csw/mgar/gar/v2/lib/python/pkgdb.py	2013-04-18 15:18:51 UTC (rev 20803)
+++ csw/mgar/gar/v2/lib/python/pkgdb.py	2013-04-18 15:19:05 UTC (rev 20804)
@@ -366,13 +366,6 @@
     return os.path.join(base_dir, arch, short_osrel, "catalog")
 
 
-def GetSqoTriad(osrel, arch, catrel):
-  sqo_osrel = m.OsRelease.selectBy(short_name=osrel).getOne()
-  sqo_arch = m.Architecture.selectBy(name=arch).getOne()
-  sqo_catrel = m.CatalogRelease.selectBy(name=catrel).getOne()
-  return sqo_osrel, sqo_arch, sqo_catrel
-
-
 def main():
   parser = optparse.OptionParser(USAGE)
   parser.add_option("-d", "--debug", dest="debug",
@@ -595,7 +588,7 @@
     catrel, base_dir = args
     ci.SyncFromCatalogTree(catrel, base_dir, options.force_unpack)
   elif (command, subcommand) == ('show', 'cat'):
-    sqo_osrel, sqo_arch, sqo_catrel = GetSqoTriad(
+    sqo_osrel, sqo_arch, sqo_catrel = m.GetSqoTriad(
         options.osrel, options.arch, options.catrel)
     res = m.GetCatPackagesResult(sqo_osrel, sqo_arch, sqo_catrel)
     for obj in res:
@@ -630,7 +623,7 @@
     # TODO: Move this definition to a better place
     for osrel in ("SunOS5.%s" % x for x in (8, 9, 10, 11)):
       for arch in archs:
-        sqo_osrel, sqo_arch, sqo_catrel = GetSqoTriad(
+        sqo_osrel, sqo_arch, sqo_catrel = m.GetSqoTriad(
             osrel, arch, catrel)
         pkgs = list(m.GetCatPackagesResult(sqo_osrel, sqo_arch, sqo_catrel))
         logging.debug("The catalog contains %s packages" % len(pkgs))

Modified: csw/mgar/gar/v2/lib/web/releases_web.py
===================================================================
--- csw/mgar/gar/v2/lib/web/releases_web.py	2013-04-18 15:18:51 UTC (rev 20803)
+++ csw/mgar/gar/v2/lib/web/releases_web.py	2013-04-18 15:19:05 UTC (rev 20804)
@@ -125,7 +125,7 @@
   def GET(self, catrel_name, arch_name, osrel_name):
     """See if that package is in that catalog."""
     configuration.SetUpSqlobjectConnection()
-    sqo_osrel, sqo_arch, sqo_catrel = pkgdb.GetSqoTriad(
+    sqo_osrel, sqo_arch, sqo_catrel = models.GetSqoTriad(
         osrel_name, arch_name, catrel_name)
     srv4 = models.Srv4FileStats.selectBy(md5_sum=md5_sum).getOne()
     logging.debug("Srv4CatalogAssignment::GET srv4: %s", srv4.basename)
@@ -172,7 +172,7 @@
         package_stats.PackageStats.ImportPkg(stats, True)
         srv4 = models.Srv4FileStats.selectBy(md5_sum=md5_sum).getOne()
       c = checkpkg_lib.Catalog()
-      sqo_osrel, sqo_arch, sqo_catrel = pkgdb.GetSqoTriad(
+      sqo_osrel, sqo_arch, sqo_catrel = models.GetSqoTriad(
           osrel_name, arch_name, catrel_name)
       # See if there already is a package with that catalogname.
       res = c.GetConflictingSrv4ByCatalognameResult(

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 Apr 18 17:19:15 2013
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Thu, 18 Apr 2013 15:19:15 +0000
Subject: [csw-devel] SF.net SVN: gar:[20805]
	csw/mgar/gar/v2/lib/python/rest.py
Message-ID: <E1USqcF-0006rh-KQ@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 20805
          http://gar.svn.sourceforge.net/gar/?rev=20805&view=rev
Author:   wahwah
Date:     2013-04-18 15:19:15 +0000 (Thu, 18 Apr 2013)
Log Message:
-----------
pkgdb: Refactor RestClient to upload with PUT

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

Modified: csw/mgar/gar/v2/lib/python/rest.py
===================================================================
--- csw/mgar/gar/v2/lib/python/rest.py	2013-04-18 15:19:05 UTC (rev 20804)
+++ csw/mgar/gar/v2/lib/python/rest.py	2013-04-18 15:19:15 UTC (rev 20805)
@@ -166,29 +166,31 @@
           "%s - HTTP code: %s, content: %s"
           % (url, http_code, d.getvalue()))
 
-  def AddSvr4ToCatalog(self, catrel, arch, osrel, md5_sum):
-    url = (
-        "%s%s/catalogs/%s/%s/%s/%s/"
-        % (self.rest_url,
-           RELEASES_APP,
-           catrel,
-           arch,
-           osrel,
-           md5_sum))
-    logging.debug("URL: %s %s", type(url), url)
+  def _CurlPut(self, url, data):
+    """Makes a PUT request, potentially uploading data.
+
+    Some pieces of information left from a few debugging sessions:
+
+    The UPLOAD option must not be set or upload will not work.
+    c.setopt(pycurl.UPLOAD, 1)
+
+    This would disable the chunked encoding, but the problem only appears
+    when the UPLOAD option is set.
+    c.setopt(pycurl.HTTPHEADER, ["Transfer-encoding:"])
+    """
+    for key, value in data:
+      assert isinstance(value, basestring), (value, type(value))
     c = pycurl.Curl()
     d = StringIO()
     h = StringIO()
-    # Bogus data to upload
-    s = StringIO()
     c.setopt(pycurl.URL, str(url))
-    c.setopt(pycurl.PUT, 1)
-    c.setopt(pycurl.UPLOAD, 1)
-    c.setopt(pycurl.INFILESIZE_LARGE, s.len)
-    c.setopt(pycurl.READFUNCTION, s.read)
+    c.setopt(pycurl.HTTPPOST, data)
+    c.setopt(pycurl.CUSTOMREQUEST, "PUT")
     c.setopt(pycurl.WRITEFUNCTION, d.write)
     c.setopt(pycurl.HEADERFUNCTION, h.write)
-    c.setopt(pycurl.HTTPHEADER, ["Expect:"]) # Fixes the HTTP 417 error
+    # The empty Expect: header fixes the HTTP 417 error on the buildfarm,
+    # related to the use of squid as a proxy (squid only supports HTML/1.0).
+    c.setopt(pycurl.HTTPHEADER, ["Expect:"])
     c = self._SetAuth(c)
     if self.debug:
       c.setopt(c.VERBOSE, 1)
@@ -210,7 +212,26 @@
       logging.debug("Response: %s %s", http_code, d.getvalue())
     return http_code
 
+  def AddSvr4ToCatalog(self, catrel, arch, osrel, md5_sum):
+    self.ValidateMd5(md5_sum)
+    url = (
+        "%s%s/catalogs/%s/%s/%s/%s/"
+        % (self.rest_url,
+           self.RELEASES_APP,
+           catrel,
+           arch,
+           osrel,
+           md5_sum))
+    logging.debug("URL: %s %s", type(url), url)
+    return self._CurlPut(url, [])
 
+  def SavePkgstats(self, pkgstats):
+    md5_sum = pkgstats['basic_stats']['md5_sum']
+    url = self.rest_url + self.RELEASES_APP + "/srv4/%s/pkg-stats/" % md5_sum
+    logging.debug("SavePkgstats(): url=%r", url)
+    return self._CurlPut(url, [('pkgstats', cjson.encode(pkgstats))])
+
+
 class CachedPkgstats(object):
   """Class responsible for holding and caching package stats.
 

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


From wahwah at users.sourceforge.net  Thu Apr 18 17:19:28 2013
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Thu, 18 Apr 2013 15:19:28 +0000
Subject: [csw-devel] SF.net SVN: gar:[20806] csw/mgar/gar/v2/lib/python
Message-ID: <E1USqcS-0006sj-CH@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 20806
          http://gar.svn.sourceforge.net/gar/?rev=20806&view=rev
Author:   wahwah
Date:     2013-04-18 15:19:28 +0000 (Thu, 18 Apr 2013)
Log Message:
-----------
pkgdb: Retry failed calls in RestClient

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

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

Modified: csw/mgar/gar/v2/lib/python/rest.py
===================================================================
--- csw/mgar/gar/v2/lib/python/rest.py	2013-04-18 15:19:15 UTC (rev 20805)
+++ csw/mgar/gar/v2/lib/python/rest.py	2013-04-18 15:19:28 UTC (rev 20806)
@@ -9,6 +9,8 @@
 import re
 import urllib2
 
+import retry_decorator
+
 DEFAULT_URL = "http://buildfarm.opencsw.org"
 
 class Error(Exception):
@@ -166,6 +168,7 @@
           "%s - HTTP code: %s, content: %s"
           % (url, http_code, d.getvalue()))
 
+  @retry_decorator.Retry(tries=4, exceptions=RestCommunicationError)
   def _CurlPut(self, url, data):
     """Makes a PUT request, potentially uploading data.
 

Added: csw/mgar/gar/v2/lib/python/retry_decorator.py
===================================================================
--- csw/mgar/gar/v2/lib/python/retry_decorator.py	                        (rev 0)
+++ csw/mgar/gar/v2/lib/python/retry_decorator.py	2013-04-18 15:19:28 UTC (rev 20806)
@@ -0,0 +1,40 @@
+# From: https://gist.github.com/hoffmann/470611
+# With small changes.
+
+import time
+import logging
+
+class Retry(object):
+  default_exceptions = (Exception,)
+  def __init__(self, tries, exceptions=None, delay=0, logger=None):
+    """Decorator for retrying function if exception occurs
+
+    Args:
+      tries: num tries
+      exceptions: exceptions to catch
+      delay: wait seconds between retries
+    """
+    self.tries = tries
+    self.exceptions = exceptions
+    if self.exceptions is None:
+      self.exceptions = Retry.default_exceptions
+    self.delay = delay
+    self.logger=logger
+
+  def __call__(self, f):
+    def fn(*args, **kwargs):
+      last_exception = None
+      for _ in range(self.tries):
+        try:
+          return f(*args, **kwargs)
+        except self.exceptions, e:
+          msg = "Retry, exception: "+str(e)
+          if self.logger:
+            self.logger.info(msg)
+          else:
+            logging.info(msg)
+          time.sleep(self.delay)
+          last_exception = e
+      # If no success after all tries, raise last exception.
+      raise last_exception
+    return fn

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 Apr 18 17:19:39 2013
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Thu, 18 Apr 2013 15:19:39 +0000
Subject: [csw-devel] SF.net SVN: gar:[20807]
	csw/mgar/gar/v2/lib/python/rest.py
Message-ID: <E1USqcd-0006t3-0r@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 20807
          http://gar.svn.sourceforge.net/gar/?rev=20807&view=rev
Author:   wahwah
Date:     2013-04-18 15:19:38 +0000 (Thu, 18 Apr 2013)
Log Message:
-----------
pkgdb: Add missing getpass import to rest.py

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

Modified: csw/mgar/gar/v2/lib/python/rest.py
===================================================================
--- csw/mgar/gar/v2/lib/python/rest.py	2013-04-18 15:19:28 UTC (rev 20806)
+++ csw/mgar/gar/v2/lib/python/rest.py	2013-04-18 15:19:38 UTC (rev 20807)
@@ -3,6 +3,7 @@
 from StringIO import StringIO
 import anydbm
 import cjson
+import getpass
 import logging
 import os
 import pycurl

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


From maciej at opencsw.org  Thu Apr 18 17:23:52 2013
From: maciej at opencsw.org (=?UTF-8?Q?Maciej_=28Matchek=29_Blizi=C5=84ski?=)
Date: Thu, 18 Apr 2013 16:23:52 +0100
Subject: [csw-devel] SF.net SVN: gar:[20788]
	csw/mgar/pkg/auctex/trunk/Makefile
In-Reply-To: <E1USo7g-0003T6-Lh@sfp-svn-3.v30.ch3.sourceforge.com>
References: <E1USo7g-0003T6-Lh@sfp-svn-3.v30.ch3.sourceforge.com>
Message-ID: <CALtRa-63xsyrAVDn6_szTDa_DjcGgcH75f9FwNa1U8MdHWJ0TA@mail.gmail.com>

2013/4/18  <pfelecan at users.sourceforge.net>:
> +CHECKPKG_OVERRIDES_CSWauctex += file-with-bad-content
> +CHECKPKG_OVERRIDES_CSWauctex += file-with-bad-content
> +CHECKPKG_OVERRIDES_CSWauctex += file-with-bad-content

There's no need to repeat the line, after the first one, the
subsequent repeated lines don't do anything.

From maciej at opencsw.org  Thu Apr 18 17:26:27 2013
From: maciej at opencsw.org (=?UTF-8?Q?Maciej_=28Matchek=29_Blizi=C5=84ski?=)
Date: Thu, 18 Apr 2013 16:26:27 +0100
Subject: [csw-devel] SF.net SVN: gar:[20783]
	csw/mgar/pkg/m17n/trunk/Makefile
In-Reply-To: <E1USmtZ-0001wi-DH@sfp-svn-3.v30.ch3.sourceforge.com>
References: <E1USmtZ-0001wi-DH@sfp-svn-3.v30.ch3.sourceforge.com>
Message-ID: <CALtRa-5JQK0x8yWN77uphvY-YEfnxKiO-+1W1QxmGs3dbobdoQ@mail.gmail.com>

Hi Peter,

2013/4/18  <pfelecan at users.sourceforge.net>:
> -# added this overrides because checkpkg evaluates them incorrectly,
> -# i.e., doesn't use transitivity:

We explicitly do not rely on transitivity and only add direct
dependencies. It was discussed on the mailing list:
http://lists.opencsw.org/pipermail/maintainers/2012-June/016921.html

So checkpkg is merely verifying whether the package adheres to the policy
and tells you the right thing.

> -# Remark: checkpkg doesn't support multi-line macro-commands...

What are multi-line macro commands? Where are they?

From dmichelsen at users.sourceforge.net  Thu Apr 18 19:08:51 2013
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu, 18 Apr 2013 17:08:51 +0000
Subject: [csw-devel] SF.net SVN: gar:[20808] csw/mgar/pkg/libgcrypt/trunk
Message-ID: <E1USsKJ-0004xN-PH@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 20808
          http://gar.svn.sourceforge.net/gar/?rev=20808&view=rev
Author:   dmichelsen
Date:     2013-04-18 17:08:51 +0000 (Thu, 18 Apr 2013)
Log Message:
-----------
libgcrypt/trunk: Update to 1.5.2

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

Modified: csw/mgar/pkg/libgcrypt/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libgcrypt/trunk/Makefile	2013-04-18 15:19:38 UTC (rev 20807)
+++ csw/mgar/pkg/libgcrypt/trunk/Makefile	2013-04-18 17:08:51 UTC (rev 20808)
@@ -1,5 +1,5 @@
 NAME = libgcrypt
-VERSION = 1.5.0
+VERSION = 1.5.2
 GARTYPE = v2
 
 DESCRIPTION = GNU libgcrypt

Modified: csw/mgar/pkg/libgcrypt/trunk/checksums
===================================================================
--- csw/mgar/pkg/libgcrypt/trunk/checksums	2013-04-18 15:19:38 UTC (rev 20807)
+++ csw/mgar/pkg/libgcrypt/trunk/checksums	2013-04-18 17:08:51 UTC (rev 20808)
@@ -1 +1 @@
-693f9c64d50c908bc4d6e01da3ff76d8  libgcrypt-1.5.0.tar.bz2
+668aa1a1aae93f5fccb7eda4be403026  libgcrypt-1.5.2.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 Apr 18 21:31:55 2013
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu, 18 Apr 2013 19:31:55 +0000
Subject: [csw-devel] SF.net SVN: gar:[20809] csw/mgar/gar
Message-ID: <E1USuYl-0000WO-SN@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 20809
          http://gar.svn.sourceforge.net/gar/?rev=20809&view=rev
Author:   dmichelsen
Date:     2013-04-18 19:31:55 +0000 (Thu, 18 Apr 2013)
Log Message:
-----------
mGAR v2-solaris11 v2-yann: Remove already integrated branches as confirmed by Yann

Removed Paths:
-------------
    csw/mgar/gar/v2-solaris11/
    csw/mgar/gar/v2-yann/

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


From pfelecan at users.sourceforge.net  Fri Apr 19 09:04:51 2013
From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net)
Date: Fri, 19 Apr 2013 07:04:51 +0000
Subject: [csw-devel] SF.net SVN: gar:[20810]
	csw/mgar/pkg/m17n-db/trunk/Makefile
Message-ID: <E1UT5NL-0002gZ-ID@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 20810
          http://gar.svn.sourceforge.net/gar/?rev=20810&view=rev
Author:   pfelecan
Date:     2013-04-19 07:04:49 +0000 (Fri, 19 Apr 2013)
Log Message:
-----------
m17n-db/trunk: post extract instead of pre-configure and other hopeful tweaks

Modified Paths:
--------------
    csw/mgar/pkg/m17n-db/trunk/Makefile

Modified: csw/mgar/pkg/m17n-db/trunk/Makefile
===================================================================
--- csw/mgar/pkg/m17n-db/trunk/Makefile	2013-04-18 19:31:55 UTC (rev 20809)
+++ csw/mgar/pkg/m17n-db/trunk/Makefile	2013-04-19 07:04:49 UTC (rev 20810)
@@ -33,7 +33,7 @@
 
 include gar/category.mk
 
-pre-configure:	$(DOWNLOADDIR)/$(glibcArchive)
+post-extract-modulated:	$(DOWNLOADDIR)/$(glibcArchive)
 	@echo "executing $@"
-	cd $(WORKSRC) && gtar xf $(PWD)/$(DOWNLOADDIR)/$(glibcArchive) $(glibcDirectory)/localedata/charmaps
+	gtar --directory=$(WORKSRC) --extract --file=$(PWD)/$(DOWNLOADDIR)/$(glibcArchive) $(glibcDirectory)/localedata/charmaps
 	$(MAKECOOKIE)

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


From pfelecan at users.sourceforge.net  Fri Apr 19 09:07:55 2013
From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net)
Date: Fri, 19 Apr 2013 07:07:55 +0000
Subject: [csw-devel] SF.net SVN: gar:[20811]
	csw/mgar/pkg/auctex/trunk/Makefile
Message-ID: <E1UT5QJ-0002mv-As@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 20811
          http://gar.svn.sourceforge.net/gar/?rev=20811&view=rev
Author:   pfelecan
Date:     2013-04-19 07:07:53 +0000 (Fri, 19 Apr 2013)
Log Message:
-----------
auctex/trunk: removed redundant overrides following Maciej review

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

Modified: csw/mgar/pkg/auctex/trunk/Makefile
===================================================================
--- csw/mgar/pkg/auctex/trunk/Makefile	2013-04-19 07:04:49 UTC (rev 20810)
+++ csw/mgar/pkg/auctex/trunk/Makefile	2013-04-19 07:07:53 UTC (rev 20811)
@@ -41,16 +41,6 @@
 
 # all the "bad content"s are innocuous:
 CHECKPKG_OVERRIDES_CSWauctex += file-with-bad-content
-CHECKPKG_OVERRIDES_CSWauctex += file-with-bad-content
-CHECKPKG_OVERRIDES_CSWauctex += file-with-bad-content
-CHECKPKG_OVERRIDES_CSWauctex += file-with-bad-content
-CHECKPKG_OVERRIDES_CSWauctex += file-with-bad-content
-CHECKPKG_OVERRIDES_CSWauctex += file-with-bad-content
-CHECKPKG_OVERRIDES_CSWauctex += file-with-bad-content
-CHECKPKG_OVERRIDES_CSWauctex += file-with-bad-content
-CHECKPKG_OVERRIDES_CSWauctex += file-with-bad-content
-CHECKPKG_OVERRIDES_CSWauctex += file-with-bad-content
-CHECKPKG_OVERRIDES_CSWauctex += file-with-bad-content
 # preview-latex depends on the existence at run-time:
 CHECKPKG_OVERRIDES_CSWauctex += surplus-dependency|CSWgs
 # the preview-latex can be used only with a graphical Emacs:

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 Apr 19 09:41:47 2013
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Fri, 19 Apr 2013 07:41:47 +0000
Subject: [csw-devel] SF.net SVN: gar:[20812]
	csw/mgar/gar/v2/lib/web/pkgdb_web.py
Message-ID: <E1UT5x5-0003dw-IM@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 20812
          http://gar.svn.sourceforge.net/gar/?rev=20812&view=rev
Author:   wahwah
Date:     2013-04-19 07:41:47 +0000 (Fri, 19 Apr 2013)
Log Message:
-----------
pkgdb-web: Fixed a missed module 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	2013-04-19 07:07:53 UTC (rev 20811)
+++ csw/mgar/gar/v2/lib/web/pkgdb_web.py	2013-04-19 07:41:47 UTC (rev 20812)
@@ -16,7 +16,6 @@
 
 from lib.python import models
 from lib.python import configuration
-from lib.python import pkgdb
 from lib.python import checkpkg_lib
 import datetime
 from sqlobject import sqlbuilder
@@ -219,7 +218,7 @@
 class CatalogDetail(object):
   def GET(self, catrel_name, arch_name, osrel_name):
     cat_name = " ".join((catrel_name, arch_name, osrel_name))
-    sqo_osrel, sqo_arch, sqo_catrel = pkgdb.GetSqoTriad(
+    sqo_osrel, sqo_arch, sqo_catrel = models.GetSqoTriad(
         osrel_name, arch_name, catrel_name)
     t2 = time.time()
     pkgs = models.GetCatPackagesResult(sqo_osrel, sqo_arch, sqo_catrel)
@@ -313,7 +312,7 @@
 
 class Catalogs(object):
   def GET(self, catrel_name, arch_name, osrel_name):
-    sqo_osrel, sqo_arch, sqo_catrel = pkgdb.GetSqoTriad(
+    sqo_osrel, sqo_arch, sqo_catrel = models.GetSqoTriad(
         osrel_name, arch_name, catrel_name)
     pkgs = list(models.GetCatPackagesResult(sqo_osrel, sqo_arch, sqo_catrel))
     user_data = web.input(quick='')
@@ -423,7 +422,7 @@
     """Get a srv4 reference by catalog ane catalogname."""
     configuration.SetUpSqlobjectConnection()
     try:
-      sqo_osrel, sqo_arch, sqo_catrel = pkgdb.GetSqoTriad(
+      sqo_osrel, sqo_arch, sqo_catrel = models.GetSqoTriad(
           osrel_name, arch_name, catrel_name)
     except sqlobject.main.SQLObjectNotFound:
       raise web.notfound()
@@ -458,7 +457,7 @@
   def GET(self, catrel_name, arch_name, osrel_name, pkgname):
     """Get a srv4 reference by catalog ane pkgname."""
     configuration.SetUpSqlobjectConnection()
-    sqo_osrel, sqo_arch, sqo_catrel = pkgdb.GetSqoTriad(
+    sqo_osrel, sqo_arch, sqo_catrel = models.GetSqoTriad(
         osrel_name, arch_name, catrel_name)
     join = [
         sqlbuilder.INNERJOINOn(None,

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


From wahwah at users.sourceforge.net  Fri Apr 19 09:45:12 2013
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Fri, 19 Apr 2013 07:45:12 +0000
Subject: [csw-devel] SF.net SVN: gar:[20813]
	csw/mgar/pkg/expect/trunk/Makefile
Message-ID: <E1UT60O-0002Nw-K6@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 20813
          http://gar.svn.sourceforge.net/gar/?rev=20813&view=rev
Author:   wahwah
Date:     2013-04-19 07:45:11 +0000 (Fri, 19 Apr 2013)
Log Message:
-----------
expect/trunk: Set the Id keyword on Makefile

Property Changed:
----------------
    csw/mgar/pkg/expect/trunk/Makefile


Property changes on: csw/mgar/pkg/expect/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 pfelecan at users.sourceforge.net  Fri Apr 19 10:04:05 2013
From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net)
Date: Fri, 19 Apr 2013 08:04:05 +0000
Subject: [csw-devel] SF.net SVN: gar:[20814]
	csw/mgar/pkg/m17n-db/trunk/Makefile
Message-ID: <E1UT6If-0007kN-1T@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 20814
          http://gar.svn.sourceforge.net/gar/?rev=20814&view=rev
Author:   pfelecan
Date:     2013-04-19 08:03:58 +0000 (Fri, 19 Apr 2013)
Log Message:
-----------
m17n-db/trunk: finally pre-configure-modulated instead of post-extract
modulated seems to be a better choice

Modified Paths:
--------------
    csw/mgar/pkg/m17n-db/trunk/Makefile

Modified: csw/mgar/pkg/m17n-db/trunk/Makefile
===================================================================
--- csw/mgar/pkg/m17n-db/trunk/Makefile	2013-04-19 07:45:11 UTC (rev 20813)
+++ csw/mgar/pkg/m17n-db/trunk/Makefile	2013-04-19 08:03:58 UTC (rev 20814)
@@ -33,7 +33,7 @@
 
 include gar/category.mk
 
-post-extract-modulated:	$(DOWNLOADDIR)/$(glibcArchive)
+pre-configure-modulated:	$(DOWNLOADDIR)/$(glibcArchive)
 	@echo "executing $@"
-	gtar --directory=$(WORKSRC) --extract --file=$(PWD)/$(DOWNLOADDIR)/$(glibcArchive) $(glibcDirectory)/localedata/charmaps
+	/usr/bin/env -i $(BUILD_ENV) && gtar --directory=$(PWD)/$(WORKSRC) --extract --file=$(PWD)/$(DOWNLOADDIR)/$(glibcArchive) $(glibcDirectory)/localedata/charmaps
 	$(MAKECOOKIE)

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


From janholzh at users.sourceforge.net  Fri Apr 19 11:27:09 2013
From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net)
Date: Fri, 19 Apr 2013 09:27:09 +0000
Subject: [csw-devel] SF.net SVN: gar:[20815] csw/mgar/pkg/x264/trunk/Makefile
Message-ID: <E1UT7b2-0006QC-QU@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 20815
          http://gar.svn.sourceforge.net/gar/?rev=20815&view=rev
Author:   janholzh
Date:     2013-04-19 09:27:07 +0000 (Fri, 19 Apr 2013)
Log Message:
-----------
x264/trunk: add a note so I don't loose it

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

Modified: csw/mgar/pkg/x264/trunk/Makefile
===================================================================
--- csw/mgar/pkg/x264/trunk/Makefile	2013-04-19 08:03:58 UTC (rev 20814)
+++ csw/mgar/pkg/x264/trunk/Makefile	2013-04-19 09:27:07 UTC (rev 20815)
@@ -1,6 +1,7 @@
 # $Id$
 # TODO (release-critical prefixed with !, non release-critical with *)
 #
+# So it does not get lost. With gcc4.8 you now need -fno-aggressive-loop-optimizations: http://comments.gmane.org/gmane.comp.video.ffmpeg.devel/161226
 NAME = x264
 VERSION = b3065e6
 GARTYPE = 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 Apr 19 14:25:49 2013
From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net)
Date: Fri, 19 Apr 2013 12:25:49 +0000
Subject: [csw-devel] SF.net SVN: gar:[20816]
	csw/mgar/pkg/389-admin/trunk/Makefile
Message-ID: <E1UTANx-0006Gx-CU@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 20816
          http://gar.svn.sourceforge.net/gar/?rev=20816&view=rev
Author:   cgrzemba
Date:     2013-04-19 12:25:46 +0000 (Fri, 19 Apr 2013)
Log Message:
-----------
389-admin/trunk: add maciej's hint (short form)

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

Modified: csw/mgar/pkg/389-admin/trunk/Makefile
===================================================================
--- csw/mgar/pkg/389-admin/trunk/Makefile	2013-04-19 09:27:07 UTC (rev 20815)
+++ csw/mgar/pkg/389-admin/trunk/Makefile	2013-04-19 12:25:46 UTC (rev 20816)
@@ -65,12 +65,14 @@
 RUNTIME_DEP_PKGS_CSW389-admin += CSWlibnss3
 RUNTIME_DEP_PKGS_CSW389-admin += CSW389-admin-console
 RUNTIME_DEP_PKGS_CSW389-admin += CSW389-ds-console
+RUNTIME_DEP_PKGS_CSW389-admin += CSWpm-netaddr-ip
 CHECKPKG_OVERRIDES_CSW389-admin += surplus-dependency|CSWap2modnss
 CHECKPKG_OVERRIDES_CSW389-admin += surplus-dependency|CSWap2worker
 CHECKPKG_OVERRIDES_CSW389-admin += surplus-dependency|CSW389-admin-console
 CHECKPKG_OVERRIDES_CSW389-admin += surplus-dependency|CSW389-ds-console
-CHECKPKG_OVERRIDES_CSW389-admin += unidentified-dependency|CSW389-admin-console
-CHECKPKG_OVERRIDES_CSW389-admin += unidentified-dependency|CSW389-ds-console
+# hint from Maciej: let checkpkg fail the check at the package build stage. If this was the only error shown, you know that it will go away when you upload the right set of packages, so you can upload safely.
+# CHECKPKG_OVERRIDES_CSW389-admin += unidentified-dependency|CSW389-admin-console
+# CHECKPKG_OVERRIDES_CSW389-admin += unidentified-dependency|CSW389-ds-console
 
 # remove -I/opt/csw/include
 CPPFLAGS = 
@@ -85,6 +87,8 @@
 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-nspr-lib=/opt/csw/lib
+CONFIGURE_ARGS += --with-nspr-inc=/opt/csw/include/nspr 
 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

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


From wilbury at users.sourceforge.net  Fri Apr 19 15:53:45 2013
From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net)
Date: Fri, 19 Apr 2013 13:53:45 +0000
Subject: [csw-devel] SF.net SVN: gar:[20817] csw/mgar/pkg/znc/trunk
Message-ID: <E1UTBl3-0005Kd-EG@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 20817
          http://gar.svn.sourceforge.net/gar/?rev=20817&view=rev
Author:   wilbury
Date:     2013-04-19 13:53:43 +0000 (Fri, 19 Apr 2013)
Log Message:
-----------
znc/trunk: Fix build, man pages, install.

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

Added Paths:
-----------
    csw/mgar/pkg/znc/trunk/files/0001-check-for-and-define-timeradd-and-timersub.patch
    csw/mgar/pkg/znc/trunk/files/0003-Fix-mt-libraries.patch
    csw/mgar/pkg/znc/trunk/files/0004-Use-proper-zoneinfo-path.patch
    csw/mgar/pkg/znc/trunk/files/0005-fix-man-pages.patch

Removed Paths:
-------------
    csw/mgar/pkg/znc/trunk/files/0001-fix-man-pages.patch

Modified: csw/mgar/pkg/znc/trunk/Makefile
===================================================================
--- csw/mgar/pkg/znc/trunk/Makefile	2013-04-19 12:25:46 UTC (rev 20816)
+++ csw/mgar/pkg/znc/trunk/Makefile	2013-04-19 13:53:43 UTC (rev 20817)
@@ -13,13 +13,19 @@
 VENDOR_URL = http://http://wiki.znc.in/ZNC
 MASTER_SITES = http://znc.in/releases/ 
 DISTFILES  = $(DISTNAME).tar.gz
-PATCHFILES += 0001-fix-man-pages.patch
+PATCHFILES += 0001-check-for-and-define-timeradd-and-timersub.patch
 PATCHFILES += 0002-fix-znc.1-manpage.patch
+PATCHFILES += 0003-Fix-mt-libraries.patch
+PATCHFILES += 0004-Use-proper-zoneinfo-path.patch
+PATCHFILES += 0005-fix-man-pages.patch
 LICENSE = LICENSE
 
+# Do not create .git
+NOGITPATCH = 1
+
 PACKAGES += CSWznc
 SPKG_DESC_CSWznc = $(DESCRIPTION)
-RUNTIME_DEP_PKGS_CSWznc += CSWlibcares2
+RUNTIME_DEP_PKGS_CSWznc += CSWlibiconv2
 RUNTIME_DEP_PKGS_CSWznc += CSWlibssl1-0-0
 RUNTIME_DEP_PKGS_CSWznc += CSWlibgcc-s1
 RUNTIME_DEP_PKGS_CSWznc += CSWlibstdc++6
@@ -34,6 +40,10 @@
 RUNTIME_DEP_PKGS_CSWznc-dev += CSWznc
 RUNTIME_DEP_PKGS_CSWznc-dev += CSWlibcares-dev
 
+
+# there is /usr/share/lib/zoneinfo
+CHECKPKG_OVERRIDES_CSWznc += file-with-bad-content|/usr/share|root/opt/csw/bin/znc
+
 # File name regex to get notifications about upstream software releases
 # NOTE: Use this only if the automatic regex creation
 #       does not work for your package
@@ -46,6 +56,8 @@
 PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
 GARCOMPILER = GNU
 CONFIGURE_ARGS = $(DIRPATHS) 
+CONFIGURE_ARGS += --with-openssl=/opt/csw
+CONFIGURE_ARGS += --with-module-prefix=$(libexecdir)/znc
 
 # --enable-perl and --enable-python do not work. perl autotools check is broke; python module does not compile
 #CONFIGURE_ARGS = $(DIRPATHS) --enable-perl --enable-python

Added: csw/mgar/pkg/znc/trunk/files/0001-check-for-and-define-timeradd-and-timersub.patch
===================================================================
--- csw/mgar/pkg/znc/trunk/files/0001-check-for-and-define-timeradd-and-timersub.patch	                        (rev 0)
+++ csw/mgar/pkg/znc/trunk/files/0001-check-for-and-define-timeradd-and-timersub.patch	2013-04-19 13:53:43 UTC (rev 20817)
@@ -0,0 +1,51 @@
+From c552454bcb8ffac11a862b1f2d3980282033394b Mon Sep 17 00:00:00 2001
+From: Juraj Lutter <wilbury at opencsw.org>
+Date: Tue, 16 Apr 2013 15:16:33 +0200
+Subject: [PATCH] check for and define timeradd and timersub
+
+---
+ src/Csocket.cpp | 28 ++++++++++++++++++++++++++++
+ 1 file changed, 28 insertions(+)
+
+diff --git a/src/Csocket.cpp b/src/Csocket.cpp
+index 6ba945b..bdcae5d 100644
+--- a/src/Csocket.cpp
++++ b/src/Csocket.cpp
+@@ -57,6 +57,34 @@
+ 
+ using namespace std;
+ 
++#if !defined(timeradd)
++#define timeradd(tvp, uvp, vvp)                                 \
++        do                                                              \
++        {                                                               \
++                (vvp)->tv_sec = (tvp)->tv_sec + (uvp)->tv_sec;          \
++                (vvp)->tv_usec = (tvp)->tv_usec + (uvp)->tv_usec;       \
++                if ((vvp)->tv_usec >= 1000000)                          \
++                {                                                       \
++                        (vvp)->tv_sec++;                                \
++                        (vvp)->tv_usec -= 1000000;                      \
++                }                                                       \
++        } while (0)
++#endif /* !defined(timeradd) */
++
++#if !defined(timersub)
++#define timersub(tvp, uvp, vvp)                                 \
++        do                                                              \
++        {                                                               \
++                (vvp)->tv_sec = (tvp)->tv_sec - (uvp)->tv_sec;          \
++                (vvp)->tv_usec = (tvp)->tv_usec - (uvp)->tv_usec;       \
++                if ((vvp)->tv_usec < 0)                                 \
++                {                                                       \
++                        (vvp)->tv_sec--;                                \
++                        (vvp)->tv_usec += 1000000;                      \
++                }                                                       \
++        } while (0)
++#endif /* !defined(timersub) */
++
+ #define CREATE_ARES_VER( a, b, c ) ((a<<16)|(b<<8)|c)
+ 
+ #ifndef _NO_CSOCKET_NS // some people may not want to use a namespace
+-- 
+1.8.1.4
+

Deleted: csw/mgar/pkg/znc/trunk/files/0001-fix-man-pages.patch
===================================================================
--- csw/mgar/pkg/znc/trunk/files/0001-fix-man-pages.patch	2013-04-19 12:25:46 UTC (rev 20816)
+++ csw/mgar/pkg/znc/trunk/files/0001-fix-man-pages.patch	2013-04-19 13:53:43 UTC (rev 20817)
@@ -1,33 +0,0 @@
-From 57463f22c5abc29dac495340197022fd17a9e986 Mon Sep 17 00:00:00 2001
-From: Jan Holzhueter <jh at opencsw.org>
-Date: Mon, 2 Apr 2012 09:02:40 +0200
-Subject: [PATCH] fix-man-pages
-
----
- man/Makefile.in |    3 +--
- 1 files changed, 1 insertions(+), 2 deletions(-)
-
-diff --git a/man/Makefile.in b/man/Makefile.in
-index 145d14f..19aafdc 100644
---- a/man/Makefile.in
-+++ b/man/Makefile.in
-@@ -11,7 +11,7 @@ mandir      := @mandir@
- INSTALL      := @INSTALL@
- INSTALL_DATA := @INSTALL_DATA@
- 
--MAN1        := znc.1.gz znc-buildmod.1.gz znc-config.1.gz
-+MAN1        := znc.1 znc-buildmod.1 znc-config.1
- 
- ifneq "$(V)" ""
- VERBOSE=1
-@@ -28,7 +28,6 @@ all: $(MAN1)
- 
- %.1.gz: %.1 Makefile
- 	$(E) Packing man page $@...
--	$(Q)gzip -9 <$< >$@
- 
- clean:
- 	-rm -f $(MAN1)
--- 
-1.7.9
-

Added: csw/mgar/pkg/znc/trunk/files/0003-Fix-mt-libraries.patch
===================================================================
--- csw/mgar/pkg/znc/trunk/files/0003-Fix-mt-libraries.patch	                        (rev 0)
+++ csw/mgar/pkg/znc/trunk/files/0003-Fix-mt-libraries.patch	2013-04-19 13:53:43 UTC (rev 20817)
@@ -0,0 +1,31 @@
+diff -ruN znc-1.0/configure znc-1.0-otis/configure
+--- znc-1.0/configure   2012-11-06 17:02:24.000000000 +0100
++++ znc-1.0-otis/configure      2013-04-18 15:08:43.933912666 +0200
+@@ -3670,7 +3670,7 @@
+ # which indicates that we try without any flags at all, and "pthread-config"
+ # which is a program returning the flags for the Pth emulation library.
+ 
+-ax_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config"
++ax_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe pthread-config"
+ 
+ # The ordering *is* (sometimes) important.  Some notes on the
+ # individual items follow:
+@@ -3703,7 +3703,7 @@
+         # who knows whether they'll stub that too in a future libc.)  So,
+         # we'll just look for -pthreads and -lpthread first:
+ 
+-        ax_pthread_flags="-pthreads pthread -mt -pthread $ax_pthread_flags"
++        ax_pthread_flags="-pthreads pthread -pthread $ax_pthread_flags"
+         ;;
+ 
+         *-darwin*)
+@@ -3879,7 +3879,7 @@
+             if test "$GCC" = "yes"; then
+                 flag="-D_REENTRANT"
+             else
+-                flag="-mt -D_REENTRANT"
++                flag="-D_REENTRANT"
+             fi
+             ;;
+         esac
+

Added: csw/mgar/pkg/znc/trunk/files/0004-Use-proper-zoneinfo-path.patch
===================================================================
--- csw/mgar/pkg/znc/trunk/files/0004-Use-proper-zoneinfo-path.patch	                        (rev 0)
+++ csw/mgar/pkg/znc/trunk/files/0004-Use-proper-zoneinfo-path.patch	2013-04-19 13:53:43 UTC (rev 20817)
@@ -0,0 +1,12 @@
+--- znc-1.0/src/Utils.cpp       2012-11-06 17:02:20.000000000 +0100
++++ znc-1.0-otis/src/Utils.cpp  2013-04-19 15:29:29.582526029 +0200
+@@ -426,7 +426,7 @@
+ 
+ SCString CUtils::GetTimezones() {
+        SCString result;
+-       FillTimezones("/usr/share/zoneinfo", result, "");
++       FillTimezones("/usr/share/lib/zoneinfo", result, "");
+        return result;
+ }
+ 
+

Added: csw/mgar/pkg/znc/trunk/files/0005-fix-man-pages.patch
===================================================================
--- csw/mgar/pkg/znc/trunk/files/0005-fix-man-pages.patch	                        (rev 0)
+++ csw/mgar/pkg/znc/trunk/files/0005-fix-man-pages.patch	2013-04-19 13:53:43 UTC (rev 20817)
@@ -0,0 +1,33 @@
+From 57463f22c5abc29dac495340197022fd17a9e986 Mon Sep 17 00:00:00 2001
+From: Jan Holzhueter <jh at opencsw.org>
+Date: Mon, 2 Apr 2012 09:02:40 +0200
+Subject: [PATCH] fix-man-pages
+
+---
+ man/Makefile.in |    3 +--
+ 1 files changed, 1 insertions(+), 2 deletions(-)
+
+diff --git a/man/Makefile.in b/man/Makefile.in
+index 145d14f..19aafdc 100644
+--- a/man/Makefile.in
++++ b/man/Makefile.in
+@@ -11,7 +11,7 @@ mandir      := @mandir@
+ INSTALL      := @INSTALL@
+ INSTALL_DATA := @INSTALL_DATA@
+ 
+-MAN1        := znc.1.gz znc-buildmod.1.gz znc-config.1.gz
++MAN1        := znc.1 znc-buildmod.1 znc-config.1
+ 
+ ifneq "$(V)" ""
+ VERBOSE=1
+@@ -28,7 +28,6 @@ all: $(MAN1)
+ 
+ %.1.gz: %.1 Makefile
+ 	$(E) Packing man page $@...
+-	$(Q)gzip -9 <$< >$@
+ 
+ clean:
+ 	-rm -f $(MAN1)
+-- 
+1.7.9
+

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


From wilbury at users.sourceforge.net  Fri Apr 19 16:05:44 2013
From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net)
Date: Fri, 19 Apr 2013 14:05:44 +0000
Subject: [csw-devel] SF.net SVN: gar:[20818]
 csw/mgar/pkg/znc/trunk/files/0005-fix-man-pages. patch
Message-ID: <E1UTBwd-0005g6-Oh@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 20818
          http://gar.svn.sourceforge.net/gar/?rev=20818&view=rev
Author:   wilbury
Date:     2013-04-19 14:05:42 +0000 (Fri, 19 Apr 2013)
Log Message:
-----------
znc/trunk: Do not pack man pages

Modified Paths:
--------------
    csw/mgar/pkg/znc/trunk/files/0005-fix-man-pages.patch

Modified: csw/mgar/pkg/znc/trunk/files/0005-fix-man-pages.patch
===================================================================
--- csw/mgar/pkg/znc/trunk/files/0005-fix-man-pages.patch	2013-04-19 13:53:43 UTC (rev 20817)
+++ csw/mgar/pkg/znc/trunk/files/0005-fix-man-pages.patch	2013-04-19 14:05:42 UTC (rev 20818)
@@ -1,33 +1,23 @@
-From 57463f22c5abc29dac495340197022fd17a9e986 Mon Sep 17 00:00:00 2001
-From: Jan Holzhueter <jh at opencsw.org>
-Date: Mon, 2 Apr 2012 09:02:40 +0200
-Subject: [PATCH] fix-man-pages
-
----
- man/Makefile.in |    3 +--
- 1 files changed, 1 insertions(+), 2 deletions(-)
-
-diff --git a/man/Makefile.in b/man/Makefile.in
-index 145d14f..19aafdc 100644
---- a/man/Makefile.in
-+++ b/man/Makefile.in
-@@ -11,7 +11,7 @@ mandir      := @mandir@
+diff -ruN znc-1.0/man/Makefile.in znc-1.0-otis/man/Makefile.in
+--- znc-1.0/man/Makefile.in     2012-11-06 17:02:20.000000000 +0100
++++ znc-1.0-otis/man/Makefile.in        2013-04-19 16:04:35.323913734 +0200
+@@ -11,7 +11,7 @@
  INSTALL      := @INSTALL@
  INSTALL_DATA := @INSTALL_DATA@
  
--MAN1        := znc.1.gz znc-buildmod.1.gz znc-config.1.gz
-+MAN1        := znc.1 znc-buildmod.1 znc-config.1
+-MAN1        := znc.1.gz znc-buildmod.1.gz
++MAN1        := znc.1 znc-buildmod.1
  
  ifneq "$(V)" ""
  VERBOSE=1
-@@ -28,7 +28,6 @@ all: $(MAN1)
+@@ -27,8 +27,7 @@
+ all: $(MAN1)
  
  %.1.gz: %.1 Makefile
- 	$(E) Packing man page $@...
--	$(Q)gzip -9 <$< >$@
+-       $(E) Packing man page $@...
+-       $(Q)gzip -9 <$< >$@
++       $(E) Processing man page $@...
  
  clean:
- 	-rm -f $(MAN1)
--- 
-1.7.9
+        -rm -f $(MAN1)
 

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


From wilbury at users.sourceforge.net  Fri Apr 19 16:17:04 2013
From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net)
Date: Fri, 19 Apr 2013 14:17:04 +0000
Subject: [csw-devel] SF.net SVN: gar:[20819] csw/mgar/pkg/znc/trunk/files
Message-ID: <E1UTC7c-00060Y-8P@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 20819
          http://gar.svn.sourceforge.net/gar/?rev=20819&view=rev
Author:   wilbury
Date:     2013-04-19 14:17:03 +0000 (Fri, 19 Apr 2013)
Log Message:
-----------
znc/trunk: Fix patch files.

Modified Paths:
--------------
    csw/mgar/pkg/znc/trunk/files/0004-Use-proper-zoneinfo-path.patch
    csw/mgar/pkg/znc/trunk/files/0005-fix-man-pages.patch

Modified: csw/mgar/pkg/znc/trunk/files/0004-Use-proper-zoneinfo-path.patch
===================================================================
--- csw/mgar/pkg/znc/trunk/files/0004-Use-proper-zoneinfo-path.patch	2013-04-19 14:05:42 UTC (rev 20818)
+++ csw/mgar/pkg/znc/trunk/files/0004-Use-proper-zoneinfo-path.patch	2013-04-19 14:17:03 UTC (rev 20819)
@@ -1,12 +1,12 @@
---- znc-1.0/src/Utils.cpp       2012-11-06 17:02:20.000000000 +0100
-+++ znc-1.0-otis/src/Utils.cpp  2013-04-19 15:29:29.582526029 +0200
+diff -ruN znc-1.0/src/Utils.cpp znc-1.0-otis/src/Utils.cpp
+--- znc-1.0/src/Utils.cpp	2012-11-06 17:02:20.000000000 +0100
++++ znc-1.0-otis/src/Utils.cpp	2013-04-19 16:14:56.984816504 +0200
 @@ -426,7 +426,7 @@
  
  SCString CUtils::GetTimezones() {
-        SCString result;
--       FillTimezones("/usr/share/zoneinfo", result, "");
-+       FillTimezones("/usr/share/lib/zoneinfo", result, "");
-        return result;
+ 	SCString result;
+-	FillTimezones("/usr/share/zoneinfo", result, "");
++	FillTimezones("/usr/lib/share/zoneinfo", result, "");
+ 	return result;
  }
  
-

Modified: csw/mgar/pkg/znc/trunk/files/0005-fix-man-pages.patch
===================================================================
--- csw/mgar/pkg/znc/trunk/files/0005-fix-man-pages.patch	2013-04-19 14:05:42 UTC (rev 20818)
+++ csw/mgar/pkg/znc/trunk/files/0005-fix-man-pages.patch	2013-04-19 14:17:03 UTC (rev 20819)
@@ -1,6 +1,6 @@
 diff -ruN znc-1.0/man/Makefile.in znc-1.0-otis/man/Makefile.in
---- znc-1.0/man/Makefile.in     2012-11-06 17:02:20.000000000 +0100
-+++ znc-1.0-otis/man/Makefile.in        2013-04-19 16:04:35.323913734 +0200
+--- znc-1.0/man/Makefile.in	2012-11-06 17:02:20.000000000 +0100
++++ znc-1.0-otis/man/Makefile.in	2013-04-19 16:11:51.768271878 +0200
 @@ -11,7 +11,7 @@
  INSTALL      := @INSTALL@
  INSTALL_DATA := @INSTALL_DATA@
@@ -14,10 +14,9 @@
  all: $(MAN1)
  
  %.1.gz: %.1 Makefile
--       $(E) Packing man page $@...
--       $(Q)gzip -9 <$< >$@
-+       $(E) Processing man page $@...
+-	$(E) Packing man page $@...
+-	$(Q)gzip -9 <$< >$@
++	$(E) Processing man page $@...
  
  clean:
-        -rm -f $(MAN1)
-
+ 	-rm -f $(MAN1)

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


From wilbury at users.sourceforge.net  Fri Apr 19 16:58:42 2013
From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net)
Date: Fri, 19 Apr 2013 14:58:42 +0000
Subject: [csw-devel] SF.net SVN: gar:[20820] csw/mgar/pkg/znc/trunk/Makefile
Message-ID: <E1UTClu-0001P0-L8@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 20820
          http://gar.svn.sourceforge.net/gar/?rev=20820&view=rev
Author:   wilbury
Date:     2013-04-19 14:58:41 +0000 (Fri, 19 Apr 2013)
Log Message:
-----------
znc/trunk: No need for this override.

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

Modified: csw/mgar/pkg/znc/trunk/Makefile
===================================================================
--- csw/mgar/pkg/znc/trunk/Makefile	2013-04-19 14:17:03 UTC (rev 20819)
+++ csw/mgar/pkg/znc/trunk/Makefile	2013-04-19 14:58:41 UTC (rev 20820)
@@ -41,9 +41,6 @@
 RUNTIME_DEP_PKGS_CSWznc-dev += CSWlibcares-dev
 
 
-# there is /usr/share/lib/zoneinfo
-CHECKPKG_OVERRIDES_CSWznc += file-with-bad-content|/usr/share|root/opt/csw/bin/znc
-
 # 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

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 Apr 19 22:53:05 2013
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Fri, 19 Apr 2013 20:53:05 +0000
Subject: [csw-devel] SF.net SVN: gar:[20821] csw/mgar/gar/v2/lib/python
Message-ID: <E1UTIIr-0000LY-0P@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 20821
          http://gar.svn.sourceforge.net/gar/?rev=20821&view=rev
Author:   wahwah
Date:     2013-04-19 20:53:04 +0000 (Fri, 19 Apr 2013)
Log Message:
-----------
checkpkg: Bugfix: remove unused imports

I've removed all calls to the library, but not the corresponding imports.

But it did work for me! How? I still had the checkpkg.pyc file which Python
accepted instead of the source .py file.

Modified Paths:
--------------
    csw/mgar/gar/v2/lib/python/checkpkg2.py
    csw/mgar/gar/v2/lib/python/package_checks.py
    csw/mgar/gar/v2/lib/python/package_stats.py

Modified: csw/mgar/gar/v2/lib/python/checkpkg2.py
===================================================================
--- csw/mgar/gar/v2/lib/python/checkpkg2.py	2013-04-19 14:58:41 UTC (rev 20820)
+++ csw/mgar/gar/v2/lib/python/checkpkg2.py	2013-04-19 20:53:04 UTC (rev 20821)
@@ -16,7 +16,6 @@
 import common_constants
 import package_stats
 import struct_util
-import checkpkg
 import checkpkg_lib
 import overrides
 import models

Modified: csw/mgar/gar/v2/lib/python/package_checks.py
===================================================================
--- csw/mgar/gar/v2/lib/python/package_checks.py	2013-04-19 14:58:41 UTC (rev 20820)
+++ csw/mgar/gar/v2/lib/python/package_checks.py	2013-04-19 20:53:04 UTC (rev 20821)
@@ -19,7 +19,6 @@
 import re
 import operator
 import os
-import checkpkg
 import checkpkg_lib
 import opencsw
 import pprint

Modified: csw/mgar/gar/v2/lib/python/package_stats.py
===================================================================
--- csw/mgar/gar/v2/lib/python/package_stats.py	2013-04-19 14:58:41 UTC (rev 20820)
+++ csw/mgar/gar/v2/lib/python/package_stats.py	2013-04-19 20:53:04 UTC (rev 20821)
@@ -13,7 +13,6 @@
 import sqlobject
 
 import catalog
-import checkpkg
 import ldd_emul
 import database
 import inspective_package

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


From pfelecan at users.sourceforge.net  Sat Apr 20 13:26:12 2013
From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net)
Date: Sat, 20 Apr 2013 11:26:12 +0000
Subject: [csw-devel] SF.net SVN: gar:[20822]
	csw/mgar/pkg/m17n-db/trunk/Makefile
Message-ID: <E1UTVvo-0003y5-37@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 20822
          http://gar.svn.sourceforge.net/gar/?rev=20822&view=rev
Author:   pfelecan
Date:     2013-04-20 11:26:11 +0000 (Sat, 20 Apr 2013)
Log Message:
-----------
m17n-db/trunk: put the pre-configuration rule before the include

Modified Paths:
--------------
    csw/mgar/pkg/m17n-db/trunk/Makefile

Modified: csw/mgar/pkg/m17n-db/trunk/Makefile
===================================================================
--- csw/mgar/pkg/m17n-db/trunk/Makefile	2013-04-19 20:53:04 UTC (rev 20821)
+++ csw/mgar/pkg/m17n-db/trunk/Makefile	2013-04-20 11:26:11 UTC (rev 20822)
@@ -31,9 +31,9 @@
 ARCHALL_CSWm17ndb				=	1
 ARCHALL_CSWm17n-db				=	1
 
-include gar/category.mk
-
-pre-configure-modulated:	$(DOWNLOADDIR)/$(glibcArchive)
+pre-configure-modulated:
 	@echo "executing $@"
 	/usr/bin/env -i $(BUILD_ENV) && gtar --directory=$(PWD)/$(WORKSRC) --extract --file=$(PWD)/$(DOWNLOADDIR)/$(glibcArchive) $(glibcDirectory)/localedata/charmaps
 	$(MAKECOOKIE)
+
+include gar/category.mk

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


From wahwah at users.sourceforge.net  Sat Apr 20 14:14:38 2013
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Sat, 20 Apr 2013 12:14:38 +0000
Subject: [csw-devel] SF.net SVN: gar:[20823] csw/mgar/gar/v2/lib/python
Message-ID: <E1UTWgg-0005Ag-9J@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 20823
          http://gar.svn.sourceforge.net/gar/?rev=20823&view=rev
Author:   wahwah
Date:     2013-04-20 12:14:37 +0000 (Sat, 20 Apr 2013)
Log Message:
-----------
checkpkg: Explicitly close the file magic object.

Also adjust the unit test.

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

Modified: csw/mgar/gar/v2/lib/python/inspective_package.py
===================================================================
--- csw/mgar/gar/v2/lib/python/inspective_package.py	2013-04-20 11:26:11 UTC (rev 20822)
+++ csw/mgar/gar/v2/lib/python/inspective_package.py	2013-04-20 12:14:37 UTC (rev 20823)
@@ -24,6 +24,12 @@
   return re.sub(strip_re, "", x)
 
 
+def GetMachineIdOfBinary(full_path):
+  with open(full_path, 'rb') as elf_fd:
+    elffile = ELFFile(elf_fd)
+    return ENUM_E_MACHINE[elffile.header['e_machine']]
+
+
 def GetFileMetadata(file_magic, base_dir, file_path):
   full_path = unicode(os.path.join(base_dir, file_path))
   if not os.access(full_path, os.R_OK):
@@ -54,9 +60,7 @@
     else:
       raise package.PackageError(msg)
   if sharedlib_utils.IsBinary(file_info, check_consistency=False):
-    with open(full_path, 'rb') as elf_fd:
-      elffile = ELFFile(elf_fd)
-      file_info["machine_id"] = ENUM_E_MACHINE[elffile.header['e_machine']]
+    file_info["machine_id"] = GetMachineIdOfBinary(full_path)
   return file_info
 
 class InspectivePackage(package.DirectoryFormatPackage):
@@ -85,6 +89,7 @@
         # To prevent files from containing the full temporary path.
         file_info["path"] = StripRe(file_path, ROOT_RE)
         self.files_metadata.append(file_info)
+      file_magic.close()
     return self.files_metadata
 
   def ListBinaries(self):
@@ -686,9 +691,9 @@
     self.cookie_count = 0
     self._magic_cookie = None
 
-  def __del__(self):
-    if self.magic_cookie:
-      self.magic_cookie.close()
+  def close(self):
+    self._magic_cookie.close()
+    self._magic_cookie = None
 
   @property
   def magic_cookie(self):

Modified: csw/mgar/gar/v2/lib/python/inspective_package_test.py
===================================================================
--- csw/mgar/gar/v2/lib/python/inspective_package_test.py	2013-04-20 11:26:11 UTC (rev 20822)
+++ csw/mgar/gar/v2/lib/python/inspective_package_test.py	2013-04-20 12:14:37 UTC (rev 20823)
@@ -137,21 +137,8 @@
 class InspectivePackageUnitTest(mox.MoxTestBase):
 
   def testListBinaries(self):
-    self.mox.StubOutWithMock(hachoir_parser, 'createParser',
-        use_mock_anything=True)
-    hachoir_parser_mock = self.mox.CreateMockAnything()
-    parser_tag = ('class', hachoir_parser.program.elf.ElfFile)
-    hachoir_parser.createParser(
-        u'/fake/path/CSWfoo/root/foo-file',
-        tags = [parser_tag]).AndReturn(hachoir_parser_mock)
     self.mox.StubOutWithMock(os, 'access')
     os.access(u'/fake/path/CSWfoo/root/foo-file', os.R_OK).AndReturn(True)
-    machine_mock = self.mox.CreateMockAnything()
-    machine_mock.value = 2
-    hachoir_parser_mock.__getitem__('/header/machine').AndReturn(machine_mock)
-    endian_mock = self.mox.CreateMockAnything()
-    endian_mock.display = 'fake-endian'
-    hachoir_parser_mock.__getitem__('/header/endian').AndReturn(endian_mock)
     magic_cookie_mock = self.mox.CreateMockAnything()
     self.mox.StubOutWithMock(magic, 'open')
     magic.open(0).AndReturn(magic_cookie_mock)
@@ -164,6 +151,7 @@
     magic_cookie_mock.file(
         u'/fake/path/CSWfoo/root/foo-file').AndReturn(
             "application/x-executable")
+    magic_cookie_mock.close()
     self.mox.StubOutWithMock(os.path, 'isdir')
     self.mox.StubOutWithMock(os.path, 'exists')
     self.mox.StubOutWithMock(os, 'walk')
@@ -178,6 +166,8 @@
           ("/fake/path/CSWfoo/root", [], ["foo-file"]),
         ]
     )
+    self.mox.StubOutWithMock(inspective_package, 'GetMachineIdOfBinary')
+    inspective_package.GetMachineIdOfBinary(u'/fake/path/CSWfoo/root/foo-file').AndReturn(42)
     self.mox.ReplayAll()
     ip = inspective_package.InspectivePackage("/fake/path/CSWfoo")
     ip.pkginfo_dict = {

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 Apr 20 14:15:29 2013
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Sat, 20 Apr 2013 12:15:29 +0000
Subject: [csw-devel] SF.net SVN: gar:[20824]
	csw/mgar/gar/v2/lib/python/sharedlib_utils.py
Message-ID: <E1UTWhV-0005CM-O1@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 20824
          http://gar.svn.sourceforge.net/gar/?rev=20824&view=rev
Author:   wahwah
Date:     2013-04-20 12:15:29 +0000 (Sat, 20 Apr 2013)
Log Message:
-----------
checkpkg: When mime type is missing, fail.

All files must have a mime type (even if it's a fallback one).

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

Modified: csw/mgar/gar/v2/lib/python/sharedlib_utils.py
===================================================================
--- csw/mgar/gar/v2/lib/python/sharedlib_utils.py	2013-04-20 12:14:37 UTC (rev 20823)
+++ csw/mgar/gar/v2/lib/python/sharedlib_utils.py	2013-04-20 12:15:29 UTC (rev 20824)
@@ -235,7 +235,7 @@
   is_a_binary = False
   if "mime_type" not in file_info:
     # This would be a problem in the data.
-    return False
+    raise DataInconsistencyError("%r is missing a file type" % file_info)
   if not file_info["mime_type"]:
     # This should never happen, but it seems to have happened at least once.
     # TODO: Find the affected data and figure out why.

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 Apr 20 14:23:21 2013
From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net)
Date: Sat, 20 Apr 2013 12:23:21 +0000
Subject: [csw-devel] SF.net SVN: gar:[20825]
	csw/mgar/pkg/monit/trunk/Makefile
Message-ID: <E1UTWp7-0005Q2-Pv@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 20825
          http://gar.svn.sourceforge.net/gar/?rev=20825&view=rev
Author:   chninkel
Date:     2013-04-20 12:23:21 +0000 (Sat, 20 Apr 2013)
Log Message:
-----------
monit/trunk: update recipe to build against libssl 1.0

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

Modified: csw/mgar/pkg/monit/trunk/Makefile
===================================================================
--- csw/mgar/pkg/monit/trunk/Makefile	2013-04-20 12:15:29 UTC (rev 20824)
+++ csw/mgar/pkg/monit/trunk/Makefile	2013-04-20 12:23:21 UTC (rev 20825)
@@ -20,14 +20,17 @@
 
 CHECKPKG_OVERRIDES_CSWmonit = file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/monit.1
 CHECKPKG_OVERRIDES_CSWmonit += $(CHECKPKG_OVERRIDES_CSWmonit_$(GARCH))
-CHECKPKG_OVERRIDES_CSWmonit_sparc = file-with-bad-content|/usr/local|root/opt/csw/bin/sparcv8/monit
 CHECKPKG_OVERRIDES_CSWmonit_sparc += file-with-bad-content|/usr/local|root/opt/csw/bin/sparcv9/monit
 CHECKPKG_OVERRIDES_CSWmonit_i386 = file-with-bad-content|/usr/local|root/opt/csw/bin/amd64/monit
 
 
 
 #GARCOMPILER = GNU
+# We build the 64 bits version to be have >2 Go file support
 BUILD64_ONLY = 1
+ISA_DEFAULT_sparc = sparcv9
+ISA_DEFAULT_i386 = amd64
+ISAEXEC_FILES = /opt/csw/bin/monit
 
 BUILD_DEP_PKGS += CSWlibssl-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  Sat Apr 20 15:35:18 2013
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Sat, 20 Apr 2013 13:35:18 +0000
Subject: [csw-devel] SF.net SVN: gar:[20826]
	csw/mgar/pkg/libcurl4/trunk/Makefile
Message-ID: <E1UTXwj-0006ix-VY@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 20826
          http://gar.svn.sourceforge.net/gar/?rev=20826&view=rev
Author:   wahwah
Date:     2013-04-20 13:35:16 +0000 (Sat, 20 Apr 2013)
Log Message:
-----------
curl: Nothing depends on libcurl2 and/or libcurl3 any more

I have verified that looking at the list of error tags here:
http://buildfarm.opencsw.org/pkgdb/error-tags/missing-dependency/

Any package depending on anything other than CSWlibcurl2 but needing the
library shows up on this list. I verified that all of these packages have been
by now removed from the unstable catalog (5.10, 5.11).

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

Modified: csw/mgar/pkg/libcurl4/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libcurl4/trunk/Makefile	2013-04-20 12:23:21 UTC (rev 20825)
+++ csw/mgar/pkg/libcurl4/trunk/Makefile	2013-04-20 13:35:16 UTC (rev 20826)
@@ -19,13 +19,6 @@
 # Because of OpenSSL 1.0 update
 PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
 
-FOREIGN_PACKAGES += CSWlibcurl2
-OBSOLETED_BY_CSWlibcurl2 += CSWcurlrt
-CATALOGNAME_CSWcurlrt = curl_rt_stub
-
-FOREIGN_PACKAGES += CSWlibcurl3
-OBSOLETED_BY_CSWlibcurl3 += CSWcurlrt
-
 PACKAGES += CSWlibcurl4
 CATALOGNAME_CSWlibcurl4 = libcurl4
 SPKG_DESC_CSWlibcurl4 = Library for client-side URL transfers, libcurl.so.4
@@ -76,12 +69,6 @@
 #RUNTIME_DEP_PKGS_CSWcurl += CSWlibidn11
 RUNTIME_DEP_PKGS_CSWcurl += CSWlibcurl4
 #RUNTIME_DEP_PKGS_CSWcurl += CSWlibssl1-0-0
-# Double-legacy packages may not even depend on CSWcurlrt, so we must
-# also directly depend on CSWlibcurl2 and CSWlibcurl3
-RUNTIME_DEP_PKGS_CSWcurl += CSWlibcurl2
-RUNTIME_DEP_PKGS_CSWcurl += CSWlibcurl3
-CHECKPKG_OVERRIDES_CSWcurl += surplus-dependency|CSWlibcurl2
-CHECKPKG_OVERRIDES_CSWcurl += surplus-dependency|CSWlibcurl3
 
 BUILD_DEP_PKGS += CSWopenldap-dev
 BUILD_DEP_PKGS += CSWlibssl-dev

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


From wahwah at users.sourceforge.net  Sat Apr 20 16:37:06 2013
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Sat, 20 Apr 2013 14:37:06 +0000
Subject: [csw-devel] SF.net SVN: gar:[20827]
	csw/mgar/gar/v2/lib/python/package_stats.py
Message-ID: <E1UTYuY-0008RY-4g@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 20827
          http://gar.svn.sourceforge.net/gar/?rev=20827&view=rev
Author:   wahwah
Date:     2013-04-20 14:37:05 +0000 (Sat, 20 Apr 2013)
Log Message:
-----------
pkgdb: Display ETA when indexing the whole catalog

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

Modified: csw/mgar/gar/v2/lib/python/package_stats.py
===================================================================
--- csw/mgar/gar/v2/lib/python/package_stats.py	2013-04-20 13:35:16 UTC (rev 20826)
+++ csw/mgar/gar/v2/lib/python/package_stats.py	2013-04-20 14:37:05 UTC (rev 20827)
@@ -7,6 +7,7 @@
 import logging
 import os
 import progressbar
+import progressbar.widgets
 import mute_progressbar
 import re
 import pprint
@@ -499,7 +500,13 @@
     counter = itertools.count(1)
     self.logger.info("Juicing the svr4 package stream files...")
     if not self.debug:
-      pbar = progressbar.ProgressBar()
+      pbar = progressbar.ProgressBar(widgets=[
+        progressbar.widgets.Percentage(),
+        ' ',
+        progressbar.widgets.ETA(),
+        ' ',
+        progressbar.widgets.Bar()
+      ])
       pbar.maxval = total_packages
       pbar.start()
     else:

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 Apr 20 16:37:18 2013
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Sat, 20 Apr 2013 14:37:18 +0000
Subject: [csw-devel] SF.net SVN: gar:[20828]
	csw/mgar/gar/v2/lib/web/releases_web.py
Message-ID: <E1UTYuk-0008Ru-4E@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 20828
          http://gar.svn.sourceforge.net/gar/?rev=20828&view=rev
Author:   wahwah
Date:     2013-04-20 14:37:17 +0000 (Sat, 20 Apr 2013)
Log Message:
-----------
releases-web: Use cjson for encoding

Modified Paths:
--------------
    csw/mgar/gar/v2/lib/web/releases_web.py

Modified: csw/mgar/gar/v2/lib/web/releases_web.py
===================================================================
--- csw/mgar/gar/v2/lib/web/releases_web.py	2013-04-20 14:37:05 UTC (rev 20827)
+++ csw/mgar/gar/v2/lib/web/releases_web.py	2013-04-20 14:37:17 UTC (rev 20828)
@@ -9,7 +9,7 @@
 import base64
 import web
 import sqlobject
-import json
+import cjson
 from lib.python import models
 from lib.python import configuration
 from lib.python import pkgdb
@@ -80,7 +80,7 @@
         "declared_md5": declared_md5_sum,
         "save_attempt": save_attempt,
     })
-    return json.dumps(messages)
+    return cjson.encode(messages)
 
 
 class Srv4Detail(object):
@@ -118,7 +118,7 @@
         "arch": srv4.arch.name,
         "osrel": srv4.os_rel.short_name,
     }
-    return json.dumps(response_data)
+    return cjson.encode(response_data)
 
 
 class Srv4CatalogAssignment(object):
@@ -140,7 +140,7 @@
     response_data = {
         'srv': unicode(srv4),
     }
-    return json.dumps(response_data)
+    return cjson.encode(response_data)
 
   def PUT(self, catrel_name, arch_name, osrel_name, md5_sum):
     """Adds package to a catalog.
@@ -200,7 +200,7 @@
       web.header(
           'Content-type',
           'application/x-vnd.opencsw.pkg;type=catalog-update')
-      response = json.dumps([
+      response = cjson.encode([
         u"Added to catalog %s %s %s" % (catrel_name, arch_name, osrel_name),
         u"%s" % srv4.basename,
       ])
@@ -212,7 +212,7 @@
       web.header(
           'Content-type',
           'application/x-vnd.opencsw.pkg;type=error-message')
-      response = json.dumps({
+      response = cjson.encode({
         "error_message": unicode(e),
       })
       web.header('Content-Length', len(response))
@@ -241,7 +241,7 @@
     web.header(
         'Content-type',
         'application/x-vnd.opencsw.pkg;type=error-message')
-    response = json.dumps({
+    response = cjson.encode({
       "error_message": unicode(message),
     })
     web.header('Content-Length', len(response))

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 Apr 20 16:37:35 2013
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Sat, 20 Apr 2013 14:37:35 +0000
Subject: [csw-devel] SF.net SVN: gar:[20829]
	csw/mgar/gar/v2/lib/web/releases_web.py
Message-ID: <E1UTYv1-0008SK-Ee@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 20829
          http://gar.svn.sourceforge.net/gar/?rev=20829&view=rev
Author:   wahwah
Date:     2013-04-20 14:37:34 +0000 (Sat, 20 Apr 2013)
Log Message:
-----------
releases-web: Removed unused pkgdb import

Modified Paths:
--------------
    csw/mgar/gar/v2/lib/web/releases_web.py

Modified: csw/mgar/gar/v2/lib/web/releases_web.py
===================================================================
--- csw/mgar/gar/v2/lib/web/releases_web.py	2013-04-20 14:37:17 UTC (rev 20828)
+++ csw/mgar/gar/v2/lib/web/releases_web.py	2013-04-20 14:37:34 UTC (rev 20829)
@@ -12,7 +12,6 @@
 import cjson
 from lib.python import models
 from lib.python import configuration
-from lib.python import pkgdb
 from lib.python import checkpkg_lib
 from lib.python import package_stats
 from lib.python import opencsw

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


From maciej at opencsw.org  Sat Apr 20 18:37:57 2013
From: maciej at opencsw.org (=?UTF-8?Q?Maciej_=28Matchek=29_Blizi=C5=84ski?=)
Date: Sat, 20 Apr 2013 17:37:57 +0100
Subject: [csw-devel] SF.net SVN: gar:[19387]
	csw/mgar/pkg/bzr/trunk/Makefile
In-Reply-To: <7EB39C5A-ACF1-43D4-9864-E66D903E11EB@opencsw.org>
References: <E1TKCoW-0006wZ-8T@sfp-svn-1.v30.ch3.sourceforge.com>
	<7EB39C5A-ACF1-43D4-9864-E66D903E11EB@opencsw.org>
Message-ID: <CALtRa-5bwTcDRLZcNz4-V5M9M8Ehi58OvioUkEJW4zTBFj67TQ@mail.gmail.com>

2012/10/5 Dagobert Michelsen <dam at opencsw.org>:
> Please do not override these pathes as manpages must be in /opt/csw/share/man. Please also see
>   http://wiki.opencsw.org/checkpkg-error-tags#toc18

Hi Cris,

I see the fix is in, but I didn't see the bzr/bazaar package being
released. What's the current status, is there anything standing in the
way?

Maciej

From laurent at opencsw.org  Sat Apr 20 18:40:53 2013
From: laurent at opencsw.org (Laurent Blume)
Date: Sat, 20 Apr 2013 18:40:53 +0200
Subject: [csw-devel] vim/gvim 7.3.905
Message-ID: <5172C515.5070801@opencsw.org>

Hello,

I think my updated recipes for vim & gvim are now ready enough.

I've modified the Makefiles too much at this point to make a useful
diff, so I've posted the new files on the buildfarm. There's also the
additional patch to fix a minor issue (same for both):

vim:
http://buildfarm.opencsw.org/~laurent/vim/Makefile
http://buildfarm.opencsw.org/~laurent/vim/0003-solaris-sleep-does-not-do-decimals.patch

gvim:
http://buildfarm.opencsw.org/~laurent/gvim/Makefile
http://buildfarm.opencsw.org/~laurent/gvim/0003-solaris-sleep-does-not-do-decimals.patch

So until I can update it myself, please review and put in place :-)

Laurent

From maciej at opencsw.org  Sat Apr 20 18:41:05 2013
From: maciej at opencsw.org (Maciej =?utf-8?Q?Blizi=C5=84ski?=)
Date: Sat, 20 Apr 2013 17:41:05 +0100
Subject: [csw-devel] SF.net SVN: gar:[19422]
 csw/mgar/pkg/librecad/trunk/Makefile
In-Reply-To: <E1TMIg8-0001P7-MX@sfp-svn-1.v30.ch3.sourceforge.com>
References: <E1TMIg8-0001P7-MX@sfp-svn-1.v30.ch3.sourceforge.com>
Message-ID: <20130420164105.GA20546@cotton.home.blizinski.pl>

Hi Carsten,

On Thu, Oct 11, 2012 at 01:19:56PM +0000, cgrzemba at users.sourceforge.net wrote:
 +CHECKPKG_OVERRIDES_CSWlibreCAD += file-with-bad-content|/usr/share|root/opt/csw/gxx/bin/librecad

> +CHECKPKG_OVERRIDES_CSWlibreCAD += catalogname-not-lowercase

Why not fix the catalogname?

Maciej
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://lists.opencsw.org/pipermail/devel/attachments/20130420/2a6e98c9/attachment.asc>

From maciej at opencsw.org  Sat Apr 20 18:47:26 2013
From: maciej at opencsw.org (Maciej =?utf-8?Q?Blizi=C5=84ski?=)
Date: Sat, 20 Apr 2013 17:47:26 +0100
Subject: [csw-devel] SF.net SVN: gar:[19541]
 csw/mgar/pkg/libsunperf/trunk/Makefile
In-Reply-To: <E1TTCJn-0003tw-3U@sfp-svn-1.v30.ch3.sourceforge.com>
References: <E1TTCJn-0003tw-3U@sfp-svn-1.v30.ch3.sourceforge.com>
Message-ID: <20130420164726.GB20546@cotton.home.blizinski.pl>

On Tue, Oct 30, 2012 at 01:57:23PM +0000, bdwalton at users.sourceforge.net wrote:
> Revision: 19541
>           http://gar.svn.sourceforge.net/gar/?rev=19541&view=rev
> Author:   bdwalton
> Date:     2012-10-30 13:57:22 +0000 (Tue, 30 Oct 2012)
> Log Message:
> -----------
> libsunperf/trunk: add overrides for the imbalanced version numbers
> 
> Modified Paths:
> --------------
>     csw/mgar/pkg/libsunperf/trunk/Makefile
> 
> Modified: csw/mgar/pkg/libsunperf/trunk/Makefile
> ===================================================================
> --- csw/mgar/pkg/libsunperf/trunk/Makefile	2012-10-30 13:41:28 UTC (rev 19540)
> +++ csw/mgar/pkg/libsunperf/trunk/Makefile	2012-10-30 13:57:22 UTC (rev 19541)
> @@ -39,6 +39,9 @@
>  CHECKPKG_OVERRIDES += surplus-dependency|CSWss12f95rt
>  CHECKPKG_OVERRIDES += surplus-dependency|CSWsunmath
>  
> +CHECKPKG_OVERRIDES += sparc-SunOS5.10-missing|libsunperf2
> +CHECKPKG_OVERRIDES += i386-SunOS5.10-missing|libsunperf7

Hah, but these aren't checkpkg error tags. I might have made them look
deceptively similar.

For these, you just use --no-filename-check when uploading.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://lists.opencsw.org/pipermail/devel/attachments/20130420/0fab4417/attachment-0001.asc>

From wahwah at users.sourceforge.net  Sun Apr 21 10:25:15 2013
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Sun, 21 Apr 2013 08:25:15 +0000
Subject: [csw-devel] SF.net SVN: gar:[20830] csw/mgar/pkg/git/trunk/Makefile
Message-ID: <E1UTpaF-000074-90@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 20830
          http://gar.svn.sourceforge.net/gar/?rev=20830&view=rev
Author:   wahwah
Date:     2013-04-21 08:25:14 +0000 (Sun, 21 Apr 2013)
Log Message:
-----------
git/trunk: do not put zsh and tcsh stuff into the bash completion dir

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

Modified: csw/mgar/pkg/git/trunk/Makefile
===================================================================
--- csw/mgar/pkg/git/trunk/Makefile	2013-04-20 14:37:34 UTC (rev 20829)
+++ csw/mgar/pkg/git/trunk/Makefile	2013-04-21 08:25:14 UTC (rev 20830)
@@ -243,8 +243,12 @@
 	@echo Installing Bash Completion files
 	@( cd $(WORKSRC); \
 		ginstall -c -m 0755 -d $(BD); \
-		cp contrib/completion/* \
-			$(BD)/ )
+		cp contrib/completion/git-completion.bash $(BD)/; \
+		cp contrib/completion/git-prompt.sh $(BD)/; \
+		ginstall -c -m 0755 -d $(GD); \
+		cp contrib/completion/git-completion.tcsh $(GD)/; \
+		cp contrib/completion/git-completion.zsh $(GD)/; \
+		)
 	@( cd $(WORKSRC)/contrib/hooks; \
 		perl -pi -e 's!/usr/share/doc/git-core!/opt/csw/share/doc/git!' post-receive-email; \
 		ginstall -c -d -m 0755 $(CONTHOOKS); \

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 Apr 21 10:29:07 2013
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Sun, 21 Apr 2013 08:29:07 +0000
Subject: [csw-devel] SF.net SVN: gar:[20831] csw/mgar/pkg/tmux/trunk
Message-ID: <E1UTpdz-0000DU-CZ@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 20831
          http://gar.svn.sourceforge.net/gar/?rev=20831&view=rev
Author:   dmichelsen
Date:     2013-04-21 08:29:06 +0000 (Sun, 21 Apr 2013)
Log Message:
-----------
tmux/trunk: Add patches

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

Added Paths:
-----------
    csw/mgar/pkg/tmux/trunk/files/0001-Include-of-paths.h-if-its-presence-has-been-detected.patch
    csw/mgar/pkg/tmux/trunk/files/0002-Use-lockf-instead-of-flock-as-it-is-POSIX-compliant.patch
    csw/mgar/pkg/tmux/trunk/files/0003-Provide-replacement-for-cfmakeraw.patch
    csw/mgar/pkg/tmux/trunk/files/mdoc2man.awk

Modified: csw/mgar/pkg/tmux/trunk/Makefile
===================================================================
--- csw/mgar/pkg/tmux/trunk/Makefile	2013-04-21 08:25:14 UTC (rev 20830)
+++ csw/mgar/pkg/tmux/trunk/Makefile	2013-04-21 08:29:06 UTC (rev 20831)
@@ -1,22 +1,24 @@
 NAME = tmux
-VERSION = 1.7
+VERSION = 1.8
 GARTYPE = v2
 
 DESCRIPTION = Terminal Multiplexer
 
 MASTER_SITES = $(SF_MIRRORS)
+MASTER_SITES += http://sourceforge.net/code-snapshots/git/u/u/u/dmichelsen/tmux.git/
+DISTNAME = u-dmichelsen-tmux-2c4543b9e9bd38bcc45393dad94930bcde872e6c
 DISTFILES  = $(DISTNAME).tar.gz
 
-# From http://pkgbuild.svn.sourceforge.net/viewvc/pkgbuild/spec-files-extra/trunk/patches/
-PATCHFILES += tmux-01-include-netdb.h.diff
-#PATCHFILES += tmux-02-u-for-process-group.patch
+#PATCHFILES += 0001-Modifications-for-Solaris-to-use-fcntl-instead-of-fl.patch
 
-RUNTIME_DEP_PKGS = CSWlibevent2-0-5
-BUILD_DEP_PKGS = CSWlibevent-dev
+LICENSE = NOTES
 
-LICENSE = NOTES
 VENDOR_URL = http://tmux.sourceforge.net
 
+BUILD_DEP_PKGS = CSWlibevent-dev
+
+RUNTIME_DEP_PKGS = CSWlibevent2-0-5
+
 # EXTRA_CPPFLAGS += -I/opt/csw/include/ncursesw
 #EXTRA_CPPFLAGS += -D__inline=inline
 # Grabbed from Solaris 10 /usr/include/iso/math_c99.h
@@ -29,11 +31,12 @@
 REINPLACE_FILES_tmuxconf += tmux.h
 REINPLACE_FILES_tmuxconf += tmux.1
 
-# For LOCK_EX
-EXTRA_CPPFLAGS += -I/usr/ucbinclude
+# CONFIGURE_ENV_PATH = /opt/csw/gnu:$(PATH)
 
-CONFIGURE_ENV_PATH = /opt/csw/gnu:$(PATH)
-
 PRESERVECONF += $(sysconfdir)/tmux.conf
 
 include gar/category.mk
+
+post-extract:
+	cd $(WORKSRC) && ./autogen.sh
+	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/tmux/trunk/checksums
===================================================================
--- csw/mgar/pkg/tmux/trunk/checksums	2013-04-21 08:25:14 UTC (rev 20830)
+++ csw/mgar/pkg/tmux/trunk/checksums	2013-04-21 08:29:06 UTC (rev 20831)
@@ -1 +1 @@
-2c48fb9beb22eedba7a5de3b78dd0c03  tmux-1.7.tar.gz
+21e790162540a85b45553ac3b1515c69  u-dmichelsen-tmux-2c4543b9e9bd38bcc45393dad94930bcde872e6c.tar.gz

Added: csw/mgar/pkg/tmux/trunk/files/0001-Include-of-paths.h-if-its-presence-has-been-detected.patch
===================================================================
--- csw/mgar/pkg/tmux/trunk/files/0001-Include-of-paths.h-if-its-presence-has-been-detected.patch	                        (rev 0)
+++ csw/mgar/pkg/tmux/trunk/files/0001-Include-of-paths.h-if-its-presence-has-been-detected.patch	2013-04-21 08:29:06 UTC (rev 20831)
@@ -0,0 +1,26 @@
+From cf90a6dc2d12ebab373935cad8078ba6da87c57f Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Tue, 16 Apr 2013 13:47:14 +0200
+Subject: [PATCH 1/3] Include of paths.h if its presence has been detected
+
+---
+ tmux.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/tmux.c b/tmux.c
+index e6de5cf..cb1dbb3 100644
+--- a/tmux.c
++++ b/tmux.c
+@@ -23,7 +23,9 @@
+ #include <event.h>
+ #include <fcntl.h>
+ #include <locale.h>
++#if HAVE_PATHS_H
+ #include <paths.h>
++#endif
+ #include <pwd.h>
+ #include <stdlib.h>
+ #include <string.h>
+-- 
+1.8.1.4
+

Added: csw/mgar/pkg/tmux/trunk/files/0002-Use-lockf-instead-of-flock-as-it-is-POSIX-compliant.patch
===================================================================
--- csw/mgar/pkg/tmux/trunk/files/0002-Use-lockf-instead-of-flock-as-it-is-POSIX-compliant.patch	                        (rev 0)
+++ csw/mgar/pkg/tmux/trunk/files/0002-Use-lockf-instead-of-flock-as-it-is-POSIX-compliant.patch	2013-04-21 08:29:06 UTC (rev 20831)
@@ -0,0 +1,27 @@
+From 38aff72c66f79339d3878cb6f15d88847133a39a Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Tue, 16 Apr 2013 14:19:24 +0200
+Subject: [PATCH 2/3] Use lockf instead of flock as it is POSIX-compliant
+
+---
+ client.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/client.c b/client.c
+index 91f4765..691ace3 100644
+--- a/client.c
++++ b/client.c
+@@ -78,8 +78,8 @@ client_get_lock(char *lockfile)
+ 	if ((lockfd = open(lockfile, O_WRONLY|O_CREAT, 0600)) == -1)
+ 		fatal("open failed");
+ 
+-	if (flock(lockfd, LOCK_EX|LOCK_NB) == -1 && errno == EWOULDBLOCK) {
+-		while (flock(lockfd, LOCK_EX) == -1 && errno == EINTR)
++	if (lockf(lockfd, F_TLOCK, 0) == -1 && errno == EAGAIN) {
++		while (lockf(lockfd, F_LOCK, 0) == -1 && errno == EINTR)
+ 			/* nothing */;
+ 		close(lockfd);
+ 		return (-1);
+-- 
+1.8.1.4
+

Added: csw/mgar/pkg/tmux/trunk/files/0003-Provide-replacement-for-cfmakeraw.patch
===================================================================
--- csw/mgar/pkg/tmux/trunk/files/0003-Provide-replacement-for-cfmakeraw.patch	                        (rev 0)
+++ csw/mgar/pkg/tmux/trunk/files/0003-Provide-replacement-for-cfmakeraw.patch	2013-04-21 08:29:06 UTC (rev 20831)
@@ -0,0 +1,110 @@
+From 841091e29096c14caa93cfeea14248652fb53e23 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Sun, 21 Apr 2013 10:27:11 +0200
+Subject: [PATCH 3/3] Provide replacement for cfmakeraw
+
+---
+ Makefile.am        |  3 +++
+ compat.h           |  5 +++++
+ compat/cfmakeraw.c | 32 ++++++++++++++++++++++++++++++++
+ configure.ac       |  8 ++++++++
+ 4 files changed, 48 insertions(+)
+ create mode 100644 compat/cfmakeraw.c
+
+diff --git a/Makefile.am b/Makefile.am
+index 2ce54b1..475ff48 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -231,6 +231,9 @@ endif
+ if NO_B64_NTOP
+ nodist_tmux_SOURCES += compat/b64_ntop.c
+ endif
++if NO_CFMAKERAW
++nodist_tmux_SOURCES += compat/cfmakeraw.c
++endif
+ 
+ # Update SF web site.
+ upload-index.html: update-index.html
+diff --git a/compat.h b/compat.h
+index 622006e..d397379 100644
+--- a/compat.h
++++ b/compat.h
+@@ -236,6 +236,11 @@ int		 setenv(const char *, const char *, int);
+ int		 unsetenv(const char *);
+ #endif
+ 
++#ifndef HAVE_CFMAKERAW
++/* cfmakeraw.c */
++void		cfmakeraw(struct termios *tio);
++#endif
++
+ #ifdef HAVE_GETOPT
+ #include <getopt.h>
+ #else
+diff --git a/compat/cfmakeraw.c b/compat/cfmakeraw.c
+new file mode 100644
+index 0000000..3f8dc7e
+--- /dev/null
++++ b/compat/cfmakeraw.c
+@@ -0,0 +1,32 @@
++/* $Id$ */
++
++/*
++ * Copyright (c) 2013 Dagobert Michelsen
++ * Copyright (c) 2013 Nicholas Marriott <nicm at users.sourceforge.net>
++ *
++ * Permission to use, copy, modify, and distribute this software for any
++ * purpose with or without fee is hereby granted, provided that the above
++ * copyright notice and this permission notice appear in all copies.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
++ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
++ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
++ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
++ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER
++ * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
++ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
++ */
++
++#include <string.h>
++
++#include "tmux.h"
++
++void
++cfmakeraw(struct termios *tio)
++{
++	tio->c_iflag &= ~(IGNBRK|BRKINT|PARMRK|ISTRIP|INLCR|IGNCR|ICRNL|IXON);
++	tio->c_oflag &= ~OPOST;
++	tio->c_lflag &= ~(ECHO|ECHONL|ICANON|ISIG|IEXTEN);
++	tio->c_cflag &= ~(CSIZE|PARENB);
++	tio->c_cflag |= CS8;
++}
+diff --git a/configure.ac b/configure.ac
+index f00937f..3a2514b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -313,6 +313,13 @@ if test "x$found_strnvis" = xyes; then
+ fi
+ AM_CONDITIONAL(NO_VIS, [test "x$found_strnvis" = xno])
+ 
++# Look for cfmakeraw, compat/cfmakeraw.c used if missing.
++AC_CHECK_FUNC(cfmakeraw, found_cfmakeraw=yes, found_cfmakeraw=no)
++if test "x$found_cfmakeraw" = xyes; then
++	AC_DEFINE(HAVE_CFMAKERAW)
++fi
++AM_CONDITIONAL(NO_CFMAKERAW, [test "x$found_cfmakeraw" = xno])
++
+ # Look for getopt. glibc's getopt does not enforce argument order and the ways
+ # of making it do so are stupid, so just use our own instead.
+ AC_CHECK_FUNC(getopt, found_getopt=yes, found_getopt=no)
+@@ -345,6 +352,7 @@ AC_CHECK_FUNCS(
+ 		dirfd \
+ 		setproctitle \
+ 		sysconf \
++		cfmakeraw \
+ 	]
+ )
+ 
+-- 
+1.8.1.4
+

Added: csw/mgar/pkg/tmux/trunk/files/mdoc2man.awk
===================================================================
--- csw/mgar/pkg/tmux/trunk/files/mdoc2man.awk	                        (rev 0)
+++ csw/mgar/pkg/tmux/trunk/files/mdoc2man.awk	2013-04-21 08:29:06 UTC (rev 20831)
@@ -0,0 +1,328 @@
+#!/opt/csw/bin/gawk
+#
+# Copyright (c) 2003 Peter Stuge <stuge-mdoc2man at cdy.org>
+#
+# Permission to use, copy, modify, and distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+# Dramatically overhauled by Tim Kientzle.  This version almost
+# handles library-style pages with Fn, Ft, etc commands.  Still
+# a lot of problems...
+
+BEGIN {
+  displaylines = 0
+  trailer = ""
+  out = ""
+  sep = ""
+  nextsep = " "
+}
+
+# Add a word with appropriate preceding whitespace
+# Maintain a short queue of the expected upcoming word separators.
+function add(str) {
+  out=out sep str
+  sep = nextsep
+  nextsep = " "
+}
+
+# Add a word with no following whitespace
+# Use for opening punctuation such as '('
+function addopen(str) {
+  add(str)
+  sep = ""
+}
+
+# Add a word with no preceding whitespace
+# Use for closing punctuation such as ')' or '.'
+function addclose(str) {
+  sep = ""
+  add(str)
+}
+
+# Add a word with no space before or after
+# Use for separating punctuation such as '='
+function addpunct(str) {
+  sep = ""
+  add(str)
+  sep = ""
+}
+
+# Emit the current line so far
+function endline() {
+  addclose(trailer)
+  trailer = ""
+  if(length(out) > 0) {
+    print out
+    out=""
+  }
+  if(displaylines > 0) {
+    displaylines = displaylines - 1
+    if (displaylines == 0)
+      dispend()
+  }
+  # First word on next line has no preceding whitespace
+  sep = ""
+}
+
+function linecmd(cmd) {
+  endline()
+  add(cmd)
+  endline()
+}
+
+function breakline() {
+  linecmd(".br")
+}
+
+# Start an indented display
+function dispstart() {
+  linecmd(".RS")
+}
+
+# End an indented display
+function dispend() {
+  linecmd(".RE")
+}
+
+# Collect rest of input line
+function wtail() {
+  retval=""
+  while(w<nwords) {
+    if(length(retval))
+      retval=retval " "
+    retval=retval words[++w]
+  }
+  return retval
+}
+
+! /^\./ {
+  out = $0
+  endline()
+  next
+}
+
+/^\.\\"/ { next }
+
+{
+  sub("^\\.","")
+  nwords=split($0,words)
+  # TODO: Instead of iterating 'w' over the array, have a separate
+  # function that returns 'next word' and use that.  This will allow
+  # proper handling of double-quoted arguments as well.
+  for(w=1;w<=nwords;w++) {
+    if(match(words[w],"^Li$")) { # Literal; rest of line is unformatted
+      dispstart()
+      displaylines = 1
+    } else if(match(words[w],"^Dl$")) { # Display literal
+      dispstart()
+      displaylines = 1
+    } else if(match(words[w],"^Bd$")) { # Begin display
+      if(match(words[w+1],"-literal")) {
+        dispstart()
+	displaylines=10000
+	w=nwords
+      }
+    } else if(match(words[w],"^Ed$")) { # End display
+      displaylines = 0
+      dispend()
+    } else if(match(words[w],"^Ns$")) { # Suppress space after next word
+      nextsep = ""
+    } else if(match(words[w],"^No$")) { # Normal text
+      add(words[++w])
+    } else if(match(words[w],"^Dq$")) { # Quote
+      addopen("``")
+      add(words[++w])
+      while(w<nwords&&!match(words[w+1],"^[\\.,]"))
+	add(words[++w])
+      addclose("''")
+    } else if(match(words[w],"^Oo$")) {
+      addopen("[")
+    } else if(match(words[w],"^Oc$")) {
+      addclose("]")
+    } else if(match(words[w],"^Ao$")) {
+      addopen("<")
+    } else if(match(words[w],"^Ac$")) {
+      addclose(">")
+    } else if(match(words[w],"^Dd$")) {
+      date=wtail()
+      next
+    } else if(match(words[w],"^Dt$")) {
+      id=wtail()
+      next
+    } else if(match(words[w],"^Ox$")) {
+      add("OpenBSD")
+    } else if(match(words[w],"^Fx$")) {
+      add("FreeBSD")
+    } else if(match(words[w],"^Nx$")) {
+      add("NetBSD")
+    } else if(match(words[w],"^St$")) {
+      if (match(words[w+1], "^-p1003.1$")) {
+         w++
+         add("IEEE Std 1003.1 (``POSIX.1'')")
+      } else if(match(words[w+1], "^-p1003.1-96$")) {
+         w++
+         add("ISO/IEC 9945-1:1996 (``POSIX.1'')")
+      } else if(match(words[w+1], "^-p1003.1-88$")) {
+         w++
+         add("IEEE Std 1003.1-1988 (``POSIX.1'')")
+      } else if(match(words[w+1], "^-p1003.1-2001$")) {
+         w++
+         add("IEEE Std 1003.1-2001 (``POSIX.1'')")
+      } else if(match(words[w+1], "^-susv2$")) {
+         w++
+         add("Version 2 of the Single UNIX Specification (``SUSv2'')")
+      }
+    } else if(match(words[w],"^Ex$")) {
+      if (match(words[w+1], "^-std$")) {
+         w++
+         add("The \\fB" name "\\fP utility exits 0 on success, and >0 if an error occurs.")
+      }
+    } else if(match(words[w],"^Os$")) {
+      add(".TH " id " \"" date "\" \"" wtail() "\"")
+    } else if(match(words[w],"^Sh$")) {
+      add(".SH")
+      section=words[w+1]
+    } else if(match(words[w],"^Xr$")) {
+      add("\\fB" words[++w] "\\fP(" words[++w] ")" words[++w])
+    } else if(match(words[w],"^Nm$")) {
+      if(match(section,"SYNOPSIS"))
+        breakline()
+      if(w>1)
+        n=name
+      else {
+        n=words[++w]
+        if(!length(name))
+          name=n
+      }
+      if(!length(n))
+        n=name
+      add("\\fB" n "\\fP")
+    } else if(match(words[w],"^Nd$")) {
+      add("\\- " wtail())
+    } else if(match(words[w],"^Fl$")) {
+      add("\\fB\\-" words[++w] "\\fP")
+    } else if(match(words[w],"^Ar$")) {
+      addopen("\\fI")
+      if(w==nwords)
+	add("file ...\\fP")
+      else {
+	add(words[++w] "\\fP")
+	while(match(words[w+1],"^\\|$"))
+	  add(words[++w] " \\fI" words[++w] "\\fP")
+      }
+    } else if(match(words[w],"^Cm$")) {
+      add("\\fB" words[++w] "\\fP")
+    } else if(match(words[w],"^Op$")) {
+      addopen("[")
+      option=1
+      trailer="]" trailer
+    } else if(match(words[w],"^Pp$")) {
+      endline()
+    } else if(match(words[w],"^An$")) {
+      endline()
+    } else if(match(words[w],"^Ss$")) {
+      add(".SS")
+    } else if(match(words[w],"^Ft$")) {
+      addopen("\\fI")
+      trailer = "\\fP" trailer
+      displaylines = 1
+    } else if(match(words[w],"^Fn$")) {
+      # Using '.nh' to suppress hyphenation doesn't really work...
+      # TODO: Fix this.
+      add(".nh")
+      endline()
+      addopen("\\fB")
+      w++
+      add(words[w])
+      addclose("\\fP")
+      endline()
+      add(".hy")
+      endline()
+      addpunct("(")
+      # This is broken; Fn should peek ahead and put each double-quoted
+      # arg in .Ty and be smarter about following punct.
+      trailer = ");" trailer
+    } else if(match(words[w],"^Va$")) {
+      w++
+      add("\\fI" words[w] "\\fP")
+    } else if(match(words[w],"^In$")) {
+      w++
+      add("\\fB#include <" words[w] ">\\fP")
+      breakline()
+    } else if(match(words[w],"^Pa$")) {
+      addopen("\\fI")
+      w++
+      if(match(words[w],"^\\."))
+	add("\\&")
+      add(words[w] "\\fP")
+    } else if(match(words[w],"^Dv$")) {
+      add(".BR")
+    } else if(match(words[w],"^Em|Ev$")) {
+      add(".IR")
+    } else if(match(words[w],"^Pq$")) {
+      addopen("(")
+      trailer=")" trailer
+    } else if(match(words[w],"^Aq$")) {
+      addopen("<")
+      trailer=">" trailer
+    } else if(match(words[w],"^Brq$")) {
+      addopen("{")
+      trailer="}" trailer
+    } else if(match(words[w],"^S[xy]$")) {
+      add(".B " wtail())
+    } else if(match(words[w],"^Ic$")) {
+      add("\\fB")
+      trailer="\\fP" trailer
+    } else if(match(words[w],"^Bl$")) {
+      oldoptlist=optlist
+      if(match(words[w+1],"-bullet"))
+	optlist=1
+      else if(match(words[w+1],"-enum")) {
+	optlist=2
+	enum=0
+      } else if(match(words[w+1],"-tag"))
+	optlist=3
+      else if(match(words[w+1],"-item"))
+	optlist=4
+      else if(match(words[w+1],"-bullet"))
+	optlist=1
+      w=nwords
+    } else if(match(words[w],"^El$")) {
+      optlist=oldoptlist
+    } else if(match(words[w],"^It$")&&optlist) {
+      if(optlist==1)
+	add(".IP \\(bu")
+      else if(optlist==2)
+	add(".IP " ++enum ".")
+      else if(optlist==3) {
+	add(".TP")
+        endline()
+	if(match(words[w+1],"^Pa$|^Ev$")) {
+	  add(".B")
+	  w++
+	}
+      } else if(optlist==4)
+	add(".IP")
+    } else if(match(words[w],"^[=]$")) {
+      addpunct(words[w])
+    } else if(match(words[w],"^[\[{(]$")) {
+      addopen(words[w])
+    } else if(match(words[w],"^[\\\])}.,;:]$")) {
+      addclose(words[w])
+    } else {
+      add(words[w])
+    }
+  }
+  if(match(out,"^\\.[^a-zA-Z]"))
+    sub("^\\.","",out)
+  endline()
+}


Property changes on: csw/mgar/pkg/tmux/trunk/files/mdoc2man.awk
___________________________________________________________________
Added: svn:executable
   + *

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


From dam at opencsw.org  Sun Apr 21 10:33:54 2013
From: dam at opencsw.org (Dagobert Michelsen)
Date: Sun, 21 Apr 2013 10:33:54 +0200
Subject: [csw-devel] [csw-maintainers] vim/gvim 7.3.905
In-Reply-To: <5172C515.5070801@opencsw.org>
References: <5172C515.5070801@opencsw.org>
Message-ID: <39F4FE11-8671-4C79-93FB-E4D03DF0BFF7@opencsw.org>

Hi Laurent,

Am 20.04.2013 um 18:40 schrieb Laurent Blume <laurent at opencsw.org>:
> I think my updated recipes for vim & gvim are now ready enough.
> 
> I've modified the Makefiles too much at this point to make a useful
> diff, so I've posted the new files on the buildfarm. There's also the
> additional patch to fix a minor issue (same for both):
> 
> vim:
> http://buildfarm.opencsw.org/~laurent/vim/Makefile
> http://buildfarm.opencsw.org/~laurent/vim/0003-solaris-sleep-does-not-do-decimals.patch
> 
> gvim:
> http://buildfarm.opencsw.org/~laurent/gvim/Makefile
> http://buildfarm.opencsw.org/~laurent/gvim/0003-solaris-sleep-does-not-do-decimals.patch
> 
> So until I can update it myself, please review and put in place :-)


Why can't you update it yourself? Just give me your sourceforge user name and
I'll add you to the project.


Best regards

  -- Dago

-- 
"You don't become great by trying to be great, you become great by wanting to do something,
and then doing it so hard that you become great in the process." - xkcd #896


From chninkel at users.sourceforge.net  Sun Apr 21 21:02:11 2013
From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net)
Date: Sun, 21 Apr 2013 19:02:11 +0000
Subject: [csw-devel] SF.net SVN: gar:[20832] csw/mgar/pkg/mailutils/trunk
Message-ID: <E1UTzWd-0002ns-Ix@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 20832
          http://gar.svn.sourceforge.net/gar/?rev=20832&view=rev
Author:   chninkel
Date:     2013-04-21 19:02:10 +0000 (Sun, 21 Apr 2013)
Log Message:
-----------
mailutils/trunk: updated recipe to work and to remove openssl dependency

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

Added Paths:
-----------
    csw/mgar/pkg/mailutils/trunk/files/0001-define-asprintf-and-vasprintf.patch
    csw/mgar/pkg/mailutils/trunk/files/0002-Fix-building-with-fribidi2.noautoconf.patch
    csw/mgar/pkg/mailutils/trunk/files/0003-Add-missing-libraries.patch
    csw/mgar/pkg/mailutils/trunk/files/0004-remove-usr-local-etc-mailcap-path.patch
    csw/mgar/pkg/mailutils/trunk/files/README.CSW
    csw/mgar/pkg/mailutils/trunk/files/mailutils.rc

Modified: csw/mgar/pkg/mailutils/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mailutils/trunk/Makefile	2013-04-21 08:29:06 UTC (rev 20831)
+++ csw/mgar/pkg/mailutils/trunk/Makefile	2013-04-21 19:02:10 UTC (rev 20832)
@@ -1,30 +1,99 @@
 # $Id$
 NAME = mailutils
-VERSION = 2.2
+VERSION = 1.2
 GARTYPE = v2
 
 DESCRIPTION = A collection of mail related utilities
 define BLURB
 endef
 
-MASTER_SITES = $(GNU_MIRROR)
-DISTFILES  = $(DISTNAME).tar.xz
+MASTER_SITES = http://ftp.gnu.org/gnu/mailutils/
+DISTFILES  = $(DISTNAME).tar.bz2
 
 # File name regex to get notifications about upstream software releases
-UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
+UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2
 
 VENDOR_URL = http://savannah.gnu.org/projects/mailutils/
 
-# This is needed for __FUNCTION__
-EXTRA_CPPFLAGS = -features=extensions -D__FUNCTION__=__func__
+RUNTIME_DEP_PKGS_CSWmailutils += CSWlibltdl7
+RUNTIME_DEP_PKGS_CSWmailutils += CSWlibiconv2
+RUNTIME_DEP_PKGS_CSWmailutils += CSWlibgssapi-krb5-2
+RUNTIME_DEP_PKGS_CSWmailutils += CSWlibfribidi0
+RUNTIME_DEP_PKGS_CSWmailutils += CSWlibkrb5-3
+RUNTIME_DEP_PKGS_CSWmailutils += CSWlibgnutls26
+RUNTIME_DEP_PKGS_CSWmailutils += CSWlibreadline6
+RUNTIME_DEP_PKGS_CSWmailutils += CSWlibmysqlclient18
+RUNTIME_DEP_PKGS_CSWmailutils += CSWlibintl8
 
+# We will not fix this compliance issue today
+CHECKPKG_OVERRIDES_CSWmailutils += shared-lib-pkgname-mismatch
+CHECKPKG_OVERRIDES_CSWmailutils += shared-lib-package-contains-so-symlink
+
+# emacs is an optional requirement
+CHECKPKG_OVERRIDES_CSWmailutils += missing-dependency|CSWemacs-common
+
+# Solaris doesn't have asprintf until recently so we have
+# to define it, we should rather use gnulib but this 
+# seemed complicated for a tempororary workaround
+PATCHFILES  = 0001-define-asprintf-and-vasprintf.patch
+ 
+PATCHFILES += 0002-Fix-building-with-fribidi2.noautoconf.patch
+
+# Some libraries are missing in a makefile (?!)
+PATCHFILES += 0003-Add-missing-libraries.patch
+
+PATCHFILES += 0004-remove-usr-local-etc-mailcap-path.patch
+
+DOCFILES  = ABOUT-NLS AUTHORS COPYING COPYING.LESSER ChangeLog
+DOCFILES += INSTALL NEWS README THANKS TODO
+
+MIGRATE_FILES = mailutils.rc domain
+MIGRATE_SOURCE_DIR = $(prefix)/etc/
+MIGRATE_DEST_DIR = $(sysconfdir)/
+
+
+GARCOMPILER = SUN
+
 # This is to find the gnulib generated local lib/stdint.h
 EXTRA_CPPFLAGS += -I../lib -I../../lib
 
-CONFIGURE_ARGS = $(DIRPATHS)
+# Mailutils also needs to be compiled  XPG compliant mode
+EXTRA_CPPFLAGS += -D_XPG6
+EXTRA_LDFLAGS  += -D_XPG6
 
+ifeq ($(GARCOMPILER),SUN)
+# Mailutils needs to be compiled in C99 mode
+EXTRA_CFLAGS += -xc99=all
+# This is needed for __FUNCTION__
+EXTRA_CPPFLAGS += -features=extensions -D__FUNCTION__=__func__ 
+else # GNU
+# Mailutils needs to be compiled in C99 mode
+EXTRA_CFLAGS += -std=gnu99
+endif
+
+CONFIGURE_ARGS  = $(DIRPATHS)
+CONFIGURE_ARGS += --disable-rpath
+CONFIGURE_ARGS += --enable-mh-utils
+CONFIGURE_ARGS += --with-gnutls
+CONFIGURE_ARGS += --with-gssapi
+CONFIGURE_ARGS += --with-mysql
+CONFIGURE_ARGS += --without-guile
+
 # Make sure the gnulib is built first
 BUILD_SCRIPTS  = $(WORKSRC)/lib/Makefile
 BUILD_SCRIPTS += $(WORKSRC)/Makefile
 
 include gar/category.mk
+
+pre-build:
+	cd $(WORKSRC)/include/mailutils && $(MAKE) types.h
+
+post-install:
+	ginstall -d "$(PKGROOT)$(sysconfdir)/domain"
+	for FILE in $(DOCFILES); do \
+                ginstall -D "$(WORKSRC)/$$FILE" "$(PKGROOT)$(docdir)/$(NAME)/$$FILE"; \
+        done
+	ginstall -D "$(FILEDIR)/README.CSW" "$(PKGROOT)$(docdir)/$(NAME)/README.CSW"
+	ginstall -D "$(FILEDIR)/mailutils.rc" "$(PKGROOT)$(sysconfdir)/mailutils.rc.CSW"
+	@$(MAKECOOKIE)
+

Modified: csw/mgar/pkg/mailutils/trunk/checksums
===================================================================
--- csw/mgar/pkg/mailutils/trunk/checksums	2013-04-21 08:29:06 UTC (rev 20831)
+++ csw/mgar/pkg/mailutils/trunk/checksums	2013-04-21 19:02:10 UTC (rev 20832)
@@ -1 +1 @@
-e183e91d3f2369c49360c9a07abf4c3c  mailutils-2.2.tar.xz
+0a5bf84e908f15343414c6a95118a373  mailutils-1.2.tar.bz2

Added: csw/mgar/pkg/mailutils/trunk/files/0001-define-asprintf-and-vasprintf.patch
===================================================================
--- csw/mgar/pkg/mailutils/trunk/files/0001-define-asprintf-and-vasprintf.patch	                        (rev 0)
+++ csw/mgar/pkg/mailutils/trunk/files/0001-define-asprintf-and-vasprintf.patch	2013-04-21 19:02:10 UTC (rev 20832)
@@ -0,0 +1,59 @@
+From 9f79b76a93555dda97ca5a9089fb4d23ef3bf96f Mon Sep 17 00:00:00 2001
+From: Yann Rouillard <yann at pleiades.fr.eu.org>
+Date: Sat, 20 Apr 2013 15:30:34 +0200
+Subject: [PATCH] define asprintf and vasprintf
+
+---
+ mailbox/mailer.c               |  36 +++
+ 1 files changed, 36 insertions(+)
+
+diff --git a/mailbox/mailer.c b/mailbox/mailer.c
+index cbb3938..ae10f45 100644
+--- a/mailbox/mailer.c
++++ b/mailbox/mailer.c
+@@ -51,6 +51,42 @@
+ 
+ static char *mailer_url_default;
+ 
++#if (defined (__SVR4) && defined (__sun))
++int vasprintf(char **ret, const char *format, va_list args)
++{
++        va_list copy;
++        va_copy(copy, args);
++
++        /* Make sure it is determinate, despite manuals indicating otherwise */
++        *ret = 0;
++
++        int count = vsnprintf(NULL, 0, format, args);
++        if (count >= 0) {
++                char* buffer = malloc(count + 1);
++                if (buffer != NULL) {
++                        count = vsnprintf(buffer, count + 1, format, copy);
++                        if (count < 0)
++                                free(buffer);
++                        else
++                                *ret = buffer;
++                }
++        }
++        va_end(args);  // Each va_start() or va_copy() needs a va_end()
++
++        return count;
++}
++
++int asprintf(char **strp, const char *fmt, ...)
++{
++        int size;
++        va_list args;
++        va_start(args, fmt);
++        size = vasprintf(strp, fmt, args);
++        va_end(args);
++        return size;
++}
++#endif
++
+ /* FIXME: I'd like to check that the URL is valid, but that requires that the
+    mailers already be registered! */
+ int
+-- 
+1.8.1.4
+

Added: csw/mgar/pkg/mailutils/trunk/files/0002-Fix-building-with-fribidi2.noautoconf.patch
===================================================================
--- csw/mgar/pkg/mailutils/trunk/files/0002-Fix-building-with-fribidi2.noautoconf.patch	                        (rev 0)
+++ csw/mgar/pkg/mailutils/trunk/files/0002-Fix-building-with-fribidi2.noautoconf.patch	2013-04-21 19:02:10 UTC (rev 20832)
@@ -0,0 +1,72 @@
+From 6c03bcffdf2504e7ae757128c3e2335d3fe7cd77 Mon Sep 17 00:00:00 2001
+From: Yann Rouillard <yann at pleiades.fr.eu.org>
+Date: Sat, 20 Apr 2013 19:04:04 +0200
+Subject: [PATCH] Fix building with fribidi2
+
+---
+ frm/common.c | 34 +++++++++++++----------
+ 1 files changed, 16 insertions(+), 11 deletions(-)
+
+diff --git a/frm/common.c b/frm/common.c
+index 4ec73c5..a32b10e 100644
+--- a/frm/common.c
++++ b/frm/common.c
+@@ -62,10 +62,10 @@ static char *output_charset = NULL;
+ const char *
+ get_charset ()
+ {
+-  char *tmp;
+-  
+   if (!output_charset)
+     {
++      char *tmp;
++      const char *str = NULL;
+       char locale[32];
+       
+       memset (locale, 0, sizeof (locale));
+@@ -86,16 +86,16 @@ get_charset ()
+ 	  
+ 	  lang = strtok_r (locale, "_", &sp);
+ 	  terr = strtok_r (NULL, ".", &sp);
+-	  output_charset = strtok_r (NULL, "@", &sp);
++	  str = strtok_r (NULL, "@", &sp);
+ 
+-	  if (output_charset)
+-	    output_charset = xstrdup (output_charset);
+-	  else
+-	    output_charset = mu_charset_lookup (lang, terr);
++	  if (!str)
++	    str = mu_charset_lookup (lang, terr);
+ 	}
+       
+-      if (!output_charset)
+-	output_charset = "ASCII";
++      if (!str)
++        str = "ASCII";
++
++      output_charset = xstrdup (str);
+     }
+   return output_charset;
+ }
+@@ -104,6 +104,9 @@ get_charset ()
+ /* BIDI support (will be moved to lib when it's ready) */
+ #ifdef HAVE_LIBFRIBIDI
+ 
++#   include <wchar.h>
++#   define mu_fribidi_wcwidth(c) wcwidth((wchar_t)c)
++
+ static int fb_charset_num = -1;
+ FriBidiChar *logical;
+ char *outstring;
+@@ -170,7 +184,7 @@ puts_bidi (char *string)
+ 	      if (fb_charset_num != FRIBIDI_CHARSET_CAP_RTL)
+ 		{
+ 		  while (wid > 0 && idx < len)
+-		    wid -= fribidi_wcwidth (visual[idx++]);
++		    wid -= mu_fribidi_wcwidth (visual[idx++]);
+ 		}
+ 	      else
+ 		{
+-- 
+1.8.1.4
+

Added: csw/mgar/pkg/mailutils/trunk/files/0003-Add-missing-libraries.patch
===================================================================
--- csw/mgar/pkg/mailutils/trunk/files/0003-Add-missing-libraries.patch	                        (rev 0)
+++ csw/mgar/pkg/mailutils/trunk/files/0003-Add-missing-libraries.patch	2013-04-21 19:02:10 UTC (rev 20832)
@@ -0,0 +1,28 @@
+From b2c9549631b42638687e261eefb9bc8981032016 Mon Sep 17 00:00:00 2001
+From: Yann Rouillard <yann at pleiades.fr.eu.org>
+Date: Sun, 21 Apr 2013 00:57:25 +0200
+Subject: [PATCH] Add missing libraries
+
+---
+ mail.local/Makefile.in         |   5 +
+ 1 files changed, 5 insertions(+), 0 deletions(-)
+
+diff --git a/mail.local/Makefile.in b/mail.local/Makefile.in
+index 3e2e2d8..00a86b0 100644
+--- a/mail.local/Makefile.in
++++ b/mail.local/Makefile.in
+@@ -374,6 +374,11 @@ mail_local_LDADD = \
+  ../lib/libmuaux.la \
+  ${MU_LIB_SIEVE}\
+  ${MU_LIB_MBOX}\
++ ${MU_LIB_IMAP}\
++ ${MU_LIB_MAILDIR}\
++ ${MU_LIB_MH}\
++ ${MU_LIB_NNTP}\
++ ${MU_LIB_POP}\
+  ${MU_LIB_AUTH}\
+  @MU_AUTHLIBS@\
+  ${MU_LIB_MAILUTILS} \
+-- 
+1.8.1.4
+

Added: csw/mgar/pkg/mailutils/trunk/files/0004-remove-usr-local-etc-mailcap-path.patch
===================================================================
--- csw/mgar/pkg/mailutils/trunk/files/0004-remove-usr-local-etc-mailcap-path.patch	                        (rev 0)
+++ csw/mgar/pkg/mailutils/trunk/files/0004-remove-usr-local-etc-mailcap-path.patch	2013-04-21 19:02:10 UTC (rev 20832)
@@ -0,0 +1,24 @@
+From 8ebbeb7686c5fba4bf52441ac69a80d110d13631 Mon Sep 17 00:00:00 2001
+From: Yann Rouillard <yann at pleiades.fr.eu.org>
+Date: Sun, 21 Apr 2013 10:39:11 +0200
+Subject: [PATCH] remove /usr/local/etc/mailcap path
+
+---
+ lib/mailcap.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/lib/mailcap.c b/lib/mailcap.c
+index 5a43329..65abc13 100644
+--- a/lib/mailcap.c
++++ b/lib/mailcap.c
+@@ -36,7 +36,6 @@
+ 
+ /* Default mailcap path, the $HOME/.mailcap: entry is prepended to it */
+ #define DEFAULT_MAILCAP \
+- "/usr/local/etc/mailcap:"\
+  "/usr/etc/mailcap:"\
+  "/etc/mailcap:"\
+  "/etc/mail/mailcap:"\
+-- 
+1.8.1.4
+

Added: csw/mgar/pkg/mailutils/trunk/files/README.CSW
===================================================================
--- csw/mgar/pkg/mailutils/trunk/files/README.CSW	                        (rev 0)
+++ csw/mgar/pkg/mailutils/trunk/files/README.CSW	2013-04-21 19:02:10 UTC (rev 20832)
@@ -0,0 +1,14 @@
+Mailutils notes:
+The package is built with the default options plus the following-
+	--prefix=/opt/csw --mandir=/opt/csw/share/man --disable-nls
+	--disable-rpath --enable-mh-utils --with-included-gettext
+	--with-gnutls --with-gssapi --with-mysql
+#
+The system configuration directory is /opt/csw/etc.  A small sample
+  configuation file is provided - /opt/csw/etc/mailutils.rc.CSW.
+  Copy this file to /opt/csw/etc/mailutils.rc and make your changes.
+#
+Help text is accessed by info, select Mailutils.
+#
+The options available for the package is listed from the following command.
+/opt/csw/bin/mailutils-config --info

Added: csw/mgar/pkg/mailutils/trunk/files/mailutils.rc
===================================================================
--- csw/mgar/pkg/mailutils/trunk/files/mailutils.rc	                        (rev 0)
+++ csw/mgar/pkg/mailutils/trunk/files/mailutils.rc	2013-04-21 19:02:10 UTC (rev 20832)
@@ -0,0 +1,10 @@
+#The following configuration file specifies that all Mailutils programs
+#should use `/var/mail' as a local mailspool directory. Programs
+#performing authentication will use pam service `mailutils'. All
+#programs, except `imap4d' will issue log messages via `mail' facility,
+#`imap4d' will use facility `local1'.
+
+     :mailbox --mail-spool /var/mail
+     :auth --authentication pam --pam-service mailutils
+     :logging --log-facility mail
+     imap4d --daemon=20 --timeout=1800 --log-facility local1

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 Apr 21 21:03:08 2013
From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net)
Date: Sun, 21 Apr 2013 19:03:08 +0000
Subject: [csw-devel] SF.net SVN: gar:[20833] csw/mgar/pkg/gftp/trunk
Message-ID: <E1UTzXY-0002p6-6H@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 20833
          http://gar.svn.sourceforge.net/gar/?rev=20833&view=rev
Author:   chninkel
Date:     2013-04-21 19:03:07 +0000 (Sun, 21 Apr 2013)
Log Message:
-----------
gftp/trunk: removed useless dependencies and GAR V1 files

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

Removed Paths:
-------------
    csw/mgar/pkg/gftp/trunk/files/CSWgftp.depend
    csw/mgar/pkg/gftp/trunk/files/CSWgftp.gspec

Modified: csw/mgar/pkg/gftp/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gftp/trunk/Makefile	2013-04-21 19:02:10 UTC (rev 20832)
+++ csw/mgar/pkg/gftp/trunk/Makefile	2013-04-21 19:03:07 UTC (rev 20833)
@@ -21,18 +21,9 @@
 RUNTIME_DEP_PKGS_CSWgftp += CSWlibssl1-0-0
 RUNTIME_DEP_PKGS_CSWgftp += CSWlibgdk-x11-2-0-0
 RUNTIME_DEP_PKGS_CSWgftp += CSWlibintl8
-RUNTIME_DEP_PKGS_CSWgftp += CSWlibgdk-pixbuf2-0-0
 RUNTIME_DEP_PKGS_CSWgftp += CSWlibgtk-x11-2-0-0
-RUNTIME_DEP_PKGS_CSWgftp += CSWlibcairo2
-RUNTIME_DEP_PKGS_CSWgftp += CSWlibgmodule2-0-0
 RUNTIME_DEP_PKGS_CSWgftp += CSWlibgobject2-0-0
 RUNTIME_DEP_PKGS_CSWgftp += CSWlibglib2-0-0
-RUNTIME_DEP_PKGS_CSWgftp += CSWpango
-RUNTIME_DEP_PKGS_CSWgftp += CSWlibfontconfig1
-RUNTIME_DEP_PKGS_CSWgftp += CSWlibfreetype6
-RUNTIME_DEP_PKGS_CSWgftp += CSWlibncurses5
-RUNTIME_DEP_PKGS_CSWgftp += CSWlibgio2-0-0
-RUNTIME_DEP_PKGS_CSWgftp += CSWlibatk1-0-0
 
 PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
 

Deleted: csw/mgar/pkg/gftp/trunk/files/CSWgftp.depend
===================================================================
--- csw/mgar/pkg/gftp/trunk/files/CSWgftp.depend	2013-04-21 19:02:10 UTC (rev 20832)
+++ csw/mgar/pkg/gftp/trunk/files/CSWgftp.depend	2013-04-21 19:03:07 UTC (rev 20833)
@@ -1,10 +0,0 @@
-P CSWreadline
-P CSWpango
-P CSWosslrt
-P CSWncurses
-P CSWlibatk
-P CSWiconv
-P CSWgtk2
-P CSWglib2
-P CSWggettextrt
-P CSWlibcairo

Deleted: csw/mgar/pkg/gftp/trunk/files/CSWgftp.gspec
===================================================================
--- csw/mgar/pkg/gftp/trunk/files/CSWgftp.gspec	2013-04-21 19:02:10 UTC (rev 20832)
+++ csw/mgar/pkg/gftp/trunk/files/CSWgftp.gspec	2013-04-21 19:03:07 UTC (rev 20833)
@@ -1,4 +0,0 @@
-%var            bitname gftp
-%var            pkgname CSWgftp
-%include        url file://%{GARDIR}/pkglib/csw_dyndepend.gspec
-%copyright      url file://%{WORKSRC}/COPYING

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


From chninkel at users.sourceforge.net  Sun Apr 21 23:51:21 2013
From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net)
Date: Sun, 21 Apr 2013 21:51:21 +0000
Subject: [csw-devel] SF.net SVN: gar:[20834] csw/mgar/pkg/mailutils/trunk
Message-ID: <E1UU2AL-00017L-C5@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 20834
          http://gar.svn.sourceforge.net/gar/?rev=20834&view=rev
Author:   chninkel
Date:     2013-04-21 21:51:20 +0000 (Sun, 21 Apr 2013)
Log Message:
-----------
mailutils/trunk: updated to 2.2

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

Added Paths:
-----------
    csw/mgar/pkg/mailutils/trunk/files/0001-filter-krb5-config-output.patch
    csw/mgar/pkg/mailutils/trunk/files/0002-remove-usr-local-etc-mailcap-path.patch
    csw/mgar/pkg/mailutils/trunk/files/0003-remove-deprecated-guile-function.patch
    csw/mgar/pkg/mailutils/trunk/files/0004-workaround-guile-compilation-bug-with-solaris-studio.patch

Removed Paths:
-------------
    csw/mgar/pkg/mailutils/trunk/files/0001-define-asprintf-and-vasprintf.patch
    csw/mgar/pkg/mailutils/trunk/files/0002-Fix-building-with-fribidi2.noautoconf.patch
    csw/mgar/pkg/mailutils/trunk/files/0003-Add-missing-libraries.patch
    csw/mgar/pkg/mailutils/trunk/files/0004-remove-usr-local-etc-mailcap-path.patch

Modified: csw/mgar/pkg/mailutils/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mailutils/trunk/Makefile	2013-04-21 19:03:07 UTC (rev 20833)
+++ csw/mgar/pkg/mailutils/trunk/Makefile	2013-04-21 21:51:20 UTC (rev 20834)
@@ -1,6 +1,6 @@
 # $Id$
 NAME = mailutils
-VERSION = 1.2
+VERSION = 2.2
 GARTYPE = v2
 
 DESCRIPTION = A collection of mail related utilities
@@ -23,37 +23,43 @@
 RUNTIME_DEP_PKGS_CSWmailutils += CSWlibgnutls26
 RUNTIME_DEP_PKGS_CSWmailutils += CSWlibreadline6
 RUNTIME_DEP_PKGS_CSWmailutils += CSWlibmysqlclient18
+RUNTIME_DEP_PKGS_CSWmailutils += CSWlibguile2-0-22
 RUNTIME_DEP_PKGS_CSWmailutils += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWmailutils += CSWlibwrap1
+RUNTIME_DEP_PKGS_CSWmailutils += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWmailutils += CSWlibldap2-4-2
 
 # We will not fix this compliance issue today
 CHECKPKG_OVERRIDES_CSWmailutils += shared-lib-pkgname-mismatch
 CHECKPKG_OVERRIDES_CSWmailutils += shared-lib-package-contains-so-symlink
 
-# emacs is an optional requirement
 CHECKPKG_OVERRIDES_CSWmailutils += missing-dependency|CSWemacs-common
 
-# Solaris doesn't have asprintf until recently so we have
-# to define it, we should rather use gnulib but this 
-# seemed complicated for a tempororary workaround
-PATCHFILES  = 0001-define-asprintf-and-vasprintf.patch
- 
-PATCHFILES += 0002-Fix-building-with-fribidi2.noautoconf.patch
+CHECKPKG_OVERRIDES_CSWmailutils += file-with-bad-content|/usr/local|root/opt/csw/bin/mimeview
+CHECKPKG_OVERRIDES_CSWmailutils += file-with-bad-content|/usr/local|root/opt/csw/bin/mail
 
-# Some libraries are missing in a makefile (?!)
-PATCHFILES += 0003-Add-missing-libraries.patch
+# Workaround a bug with krb5-config 
+# see https://www.opencsw.org/mantis/view.php?id=5007
+PATCHFILES += 0001-filter-krb5-config-output.patch
 
-PATCHFILES += 0004-remove-usr-local-etc-mailcap-path.patch
+PATCHFILES += 0002-remove-usr-local-etc-mailcap-path.patch
 
+# scm_i_string_chars is not available anymore in guile
+PATCHFILES += 0003-remove-deprecated-guile-function.patch
+
+
 DOCFILES  = ABOUT-NLS AUTHORS COPYING COPYING.LESSER ChangeLog
-DOCFILES += INSTALL NEWS README THANKS TODO
+DOCFILES += INSTALL NEWS README README.guimb.scm README.libsieve
+DOCFILES += THANKS TODO
 
+PRESERVECONF = $(sysconfdir)/mailutils.rc
+
 MIGRATE_FILES = mailutils.rc domain
 MIGRATE_SOURCE_DIR = $(prefix)/etc/
 MIGRATE_DEST_DIR = $(sysconfdir)/
 
+GARCOMPILER = GNU
 
-GARCOMPILER = SUN
-
 # This is to find the gnulib generated local lib/stdint.h
 EXTRA_CPPFLAGS += -I../lib -I../../lib
 
@@ -62,22 +68,31 @@
 EXTRA_LDFLAGS  += -D_XPG6
 
 ifeq ($(GARCOMPILER),SUN)
+
 # Mailutils needs to be compiled in C99 mode
 EXTRA_CFLAGS += -xc99=all
 # This is needed for __FUNCTION__
 EXTRA_CPPFLAGS += -features=extensions -D__FUNCTION__=__func__ 
+# Workaround bug in guile headers when solaris studio is used
+# see https://www.opencsw.org/mantis/view.php?id=5069
+PATCHFILES += 0004-workaround-guile-compilation-bug-with-solaris-studio.patch
+
 else # GNU
+
 # Mailutils needs to be compiled in C99 mode
 EXTRA_CFLAGS += -std=gnu99
+
 endif
 
+
 CONFIGURE_ARGS  = $(DIRPATHS)
 CONFIGURE_ARGS += --disable-rpath
-CONFIGURE_ARGS += --enable-mh-utils
 CONFIGURE_ARGS += --with-gnutls
 CONFIGURE_ARGS += --with-gssapi
 CONFIGURE_ARGS += --with-mysql
-CONFIGURE_ARGS += --without-guile
+CONFIGURE_ARGS += --with-guile
+CONFIGURE_ARGS += --disable-cxx
+CONFIGURE_ARGS += --without-python
 
 # Make sure the gnulib is built first
 BUILD_SCRIPTS  = $(WORKSRC)/lib/Makefile
@@ -89,11 +104,11 @@
 	cd $(WORKSRC)/include/mailutils && $(MAKE) types.h
 
 post-install:
-	ginstall -d "$(PKGROOT)$(sysconfdir)/domain"
+	@$(MAKECOOKIE)
 	for FILE in $(DOCFILES); do \
                 ginstall -D "$(WORKSRC)/$$FILE" "$(PKGROOT)$(docdir)/$(NAME)/$$FILE"; \
         done
 	ginstall -D "$(FILEDIR)/README.CSW" "$(PKGROOT)$(docdir)/$(NAME)/README.CSW"
 	ginstall -D "$(FILEDIR)/mailutils.rc" "$(PKGROOT)$(sysconfdir)/mailutils.rc.CSW"
-	@$(MAKECOOKIE)
+	rm -f "$(PKGROOT)$(libdir)/charset.alias"
 

Modified: csw/mgar/pkg/mailutils/trunk/checksums
===================================================================
--- csw/mgar/pkg/mailutils/trunk/checksums	2013-04-21 19:03:07 UTC (rev 20833)
+++ csw/mgar/pkg/mailutils/trunk/checksums	2013-04-21 21:51:20 UTC (rev 20834)
@@ -1 +1 @@
-0a5bf84e908f15343414c6a95118a373  mailutils-1.2.tar.bz2
+834d2f616b922856127ecfe6c2de7d1a  mailutils-2.2.tar.bz2

Deleted: csw/mgar/pkg/mailutils/trunk/files/0001-define-asprintf-and-vasprintf.patch
===================================================================
--- csw/mgar/pkg/mailutils/trunk/files/0001-define-asprintf-and-vasprintf.patch	2013-04-21 19:03:07 UTC (rev 20833)
+++ csw/mgar/pkg/mailutils/trunk/files/0001-define-asprintf-and-vasprintf.patch	2013-04-21 21:51:20 UTC (rev 20834)
@@ -1,59 +0,0 @@
-From 9f79b76a93555dda97ca5a9089fb4d23ef3bf96f Mon Sep 17 00:00:00 2001
-From: Yann Rouillard <yann at pleiades.fr.eu.org>
-Date: Sat, 20 Apr 2013 15:30:34 +0200
-Subject: [PATCH] define asprintf and vasprintf
-
----
- mailbox/mailer.c               |  36 +++
- 1 files changed, 36 insertions(+)
-
-diff --git a/mailbox/mailer.c b/mailbox/mailer.c
-index cbb3938..ae10f45 100644
---- a/mailbox/mailer.c
-+++ b/mailbox/mailer.c
-@@ -51,6 +51,42 @@
- 
- static char *mailer_url_default;
- 
-+#if (defined (__SVR4) && defined (__sun))
-+int vasprintf(char **ret, const char *format, va_list args)
-+{
-+        va_list copy;
-+        va_copy(copy, args);
-+
-+        /* Make sure it is determinate, despite manuals indicating otherwise */
-+        *ret = 0;
-+
-+        int count = vsnprintf(NULL, 0, format, args);
-+        if (count >= 0) {
-+                char* buffer = malloc(count + 1);
-+                if (buffer != NULL) {
-+                        count = vsnprintf(buffer, count + 1, format, copy);
-+                        if (count < 0)
-+                                free(buffer);
-+                        else
-+                                *ret = buffer;
-+                }
-+        }
-+        va_end(args);  // Each va_start() or va_copy() needs a va_end()
-+
-+        return count;
-+}
-+
-+int asprintf(char **strp, const char *fmt, ...)
-+{
-+        int size;
-+        va_list args;
-+        va_start(args, fmt);
-+        size = vasprintf(strp, fmt, args);
-+        va_end(args);
-+        return size;
-+}
-+#endif
-+
- /* FIXME: I'd like to check that the URL is valid, but that requires that the
-    mailers already be registered! */
- int
--- 
-1.8.1.4
-

Added: csw/mgar/pkg/mailutils/trunk/files/0001-filter-krb5-config-output.patch
===================================================================
--- csw/mgar/pkg/mailutils/trunk/files/0001-filter-krb5-config-output.patch	                        (rev 0)
+++ csw/mgar/pkg/mailutils/trunk/files/0001-filter-krb5-config-output.patch	2013-04-21 21:51:20 UTC (rev 20834)
@@ -0,0 +1,25 @@
+From 92434e056d3114f0dd1c16f7d7641a9d3def915d Mon Sep 17 00:00:00 2001
+From: Yann Rouillard <yann at pleiades.fr.eu.org>
+Date: Sun, 21 Apr 2013 21:47:28 +0200
+Subject: [PATCH] filter krb5-config output
+
+---
+ configure | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/configure b/configure
+index 2c4dcba..8dd1eec 100755
+--- a/configure
++++ b/configure
+@@ -42872,6 +42872,8 @@ $as_echo "GSSAPI libraries not found" >&6; }
+     do
+       case $arg in
+       -Wl,*) ;;
++      -xchip*) ;;
++      -xarch*) ;;
+       *)     SERV_AUTHLIBS="$SERV_AUTHLIBS $arg"
+       esac
+     done
+-- 
+1.8.1.4
+

Deleted: csw/mgar/pkg/mailutils/trunk/files/0002-Fix-building-with-fribidi2.noautoconf.patch
===================================================================
--- csw/mgar/pkg/mailutils/trunk/files/0002-Fix-building-with-fribidi2.noautoconf.patch	2013-04-21 19:03:07 UTC (rev 20833)
+++ csw/mgar/pkg/mailutils/trunk/files/0002-Fix-building-with-fribidi2.noautoconf.patch	2013-04-21 21:51:20 UTC (rev 20834)
@@ -1,72 +0,0 @@
-From 6c03bcffdf2504e7ae757128c3e2335d3fe7cd77 Mon Sep 17 00:00:00 2001
-From: Yann Rouillard <yann at pleiades.fr.eu.org>
-Date: Sat, 20 Apr 2013 19:04:04 +0200
-Subject: [PATCH] Fix building with fribidi2
-
----
- frm/common.c | 34 +++++++++++++----------
- 1 files changed, 16 insertions(+), 11 deletions(-)
-
-diff --git a/frm/common.c b/frm/common.c
-index 4ec73c5..a32b10e 100644
---- a/frm/common.c
-+++ b/frm/common.c
-@@ -62,10 +62,10 @@ static char *output_charset = NULL;
- const char *
- get_charset ()
- {
--  char *tmp;
--  
-   if (!output_charset)
-     {
-+      char *tmp;
-+      const char *str = NULL;
-       char locale[32];
-       
-       memset (locale, 0, sizeof (locale));
-@@ -86,16 +86,16 @@ get_charset ()
- 	  
- 	  lang = strtok_r (locale, "_", &sp);
- 	  terr = strtok_r (NULL, ".", &sp);
--	  output_charset = strtok_r (NULL, "@", &sp);
-+	  str = strtok_r (NULL, "@", &sp);
- 
--	  if (output_charset)
--	    output_charset = xstrdup (output_charset);
--	  else
--	    output_charset = mu_charset_lookup (lang, terr);
-+	  if (!str)
-+	    str = mu_charset_lookup (lang, terr);
- 	}
-       
--      if (!output_charset)
--	output_charset = "ASCII";
-+      if (!str)
-+        str = "ASCII";
-+
-+      output_charset = xstrdup (str);
-     }
-   return output_charset;
- }
-@@ -104,6 +104,9 @@ get_charset ()
- /* BIDI support (will be moved to lib when it's ready) */
- #ifdef HAVE_LIBFRIBIDI
- 
-+#   include <wchar.h>
-+#   define mu_fribidi_wcwidth(c) wcwidth((wchar_t)c)
-+
- static int fb_charset_num = -1;
- FriBidiChar *logical;
- char *outstring;
-@@ -170,7 +184,7 @@ puts_bidi (char *string)
- 	      if (fb_charset_num != FRIBIDI_CHARSET_CAP_RTL)
- 		{
- 		  while (wid > 0 && idx < len)
--		    wid -= fribidi_wcwidth (visual[idx++]);
-+		    wid -= mu_fribidi_wcwidth (visual[idx++]);
- 		}
- 	      else
- 		{
--- 
-1.8.1.4
-

Copied: csw/mgar/pkg/mailutils/trunk/files/0002-remove-usr-local-etc-mailcap-path.patch (from rev 20833, csw/mgar/pkg/mailutils/trunk/files/0004-remove-usr-local-etc-mailcap-path.patch)
===================================================================
--- csw/mgar/pkg/mailutils/trunk/files/0002-remove-usr-local-etc-mailcap-path.patch	                        (rev 0)
+++ csw/mgar/pkg/mailutils/trunk/files/0002-remove-usr-local-etc-mailcap-path.patch	2013-04-21 21:51:20 UTC (rev 20834)
@@ -0,0 +1,24 @@
+From 8ebbeb7686c5fba4bf52441ac69a80d110d13631 Mon Sep 17 00:00:00 2001
+From: Yann Rouillard <yann at pleiades.fr.eu.org>
+Date: Sun, 21 Apr 2013 10:39:11 +0200
+Subject: [PATCH] remove /usr/local/etc/mailcap path
+
+---
+ lib/mailcap.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/lib/mailcap.c b/lib/mailcap.c
+index 5a43329..65abc13 100644
+--- a/lib/mailcap.c
++++ b/lib/mailcap.c
+@@ -36,7 +36,6 @@
+ 
+ /* Default mailcap path, the $HOME/.mailcap: entry is prepended to it */
+ #define DEFAULT_MAILCAP \
+- "/usr/local/etc/mailcap:"\
+  "/usr/etc/mailcap:"\
+  "/etc/mailcap:"\
+  "/etc/mail/mailcap:"\
+-- 
+1.8.1.4
+

Deleted: csw/mgar/pkg/mailutils/trunk/files/0003-Add-missing-libraries.patch
===================================================================
--- csw/mgar/pkg/mailutils/trunk/files/0003-Add-missing-libraries.patch	2013-04-21 19:03:07 UTC (rev 20833)
+++ csw/mgar/pkg/mailutils/trunk/files/0003-Add-missing-libraries.patch	2013-04-21 21:51:20 UTC (rev 20834)
@@ -1,28 +0,0 @@
-From b2c9549631b42638687e261eefb9bc8981032016 Mon Sep 17 00:00:00 2001
-From: Yann Rouillard <yann at pleiades.fr.eu.org>
-Date: Sun, 21 Apr 2013 00:57:25 +0200
-Subject: [PATCH] Add missing libraries
-
----
- mail.local/Makefile.in         |   5 +
- 1 files changed, 5 insertions(+), 0 deletions(-)
-
-diff --git a/mail.local/Makefile.in b/mail.local/Makefile.in
-index 3e2e2d8..00a86b0 100644
---- a/mail.local/Makefile.in
-+++ b/mail.local/Makefile.in
-@@ -374,6 +374,11 @@ mail_local_LDADD = \
-  ../lib/libmuaux.la \
-  ${MU_LIB_SIEVE}\
-  ${MU_LIB_MBOX}\
-+ ${MU_LIB_IMAP}\
-+ ${MU_LIB_MAILDIR}\
-+ ${MU_LIB_MH}\
-+ ${MU_LIB_NNTP}\
-+ ${MU_LIB_POP}\
-  ${MU_LIB_AUTH}\
-  @MU_AUTHLIBS@\
-  ${MU_LIB_MAILUTILS} \
--- 
-1.8.1.4
-

Added: csw/mgar/pkg/mailutils/trunk/files/0003-remove-deprecated-guile-function.patch
===================================================================
--- csw/mgar/pkg/mailutils/trunk/files/0003-remove-deprecated-guile-function.patch	                        (rev 0)
+++ csw/mgar/pkg/mailutils/trunk/files/0003-remove-deprecated-guile-function.patch	2013-04-21 21:51:20 UTC (rev 20834)
@@ -0,0 +1,50 @@
+From eb851fbc9fec91c1bd095500d3e9b24829ee53cc Mon Sep 17 00:00:00 2001
+From: Sergey Poznyakoff <gray at gnu.org.ua>
+Date: Thu, 04 Aug 2011 13:13:21 +0000
+Subject: Various bugfixes.
+
+* libmu_scm/mu_message.c (string_sloppy_member): Remove.
+(mu-message-get-header-fields): Use scm_member instead of
+string_sloppy_member.
+---
+(limited to 'libmu_scm/mu_message.c')
+
+diff --git a/libmu_scm/mu_message.c b/libmu_scm/mu_message.c
+index 4a99a8e..4ee603e 100644
+--- a/libmu_scm/mu_message.c
++++ b/libmu_scm/mu_message.c
+@@ -495,20 +495,6 @@ SCM_DEFINE_PUBLIC (scm_mu_message_get_header, "mu-message-get-header", 2, 0, 0,
+ }
+ #undef FUNC_NAME
+ 
+-static int
+-string_sloppy_member (SCM lst, char *name)
+-{
+-  for(; SCM_CONSP (lst); lst = SCM_CDR(lst))
+-    {
+-      SCM car = SCM_CAR (lst);
+-      if (scm_is_string (car)
+-	  && mu_c_strncasecmp (scm_i_string_chars (car), name,
+-			       scm_i_string_length (car)) == 0)
+-	return 1;
+-    }
+-  return 0;
+-}
+-
+ SCM_DEFINE_PUBLIC (scm_mu_message_get_header_fields, "mu-message-get-header-fields", 1, 1, 0,
+ 		   (SCM mesg, SCM headers),
+ "Returns list of headers in the message @var{mesg}. optional argument\n" 
+@@ -547,8 +533,9 @@ SCM_DEFINE_PUBLIC (scm_mu_message_get_header_fields, "mu-message-get-header-fiel
+ 	mu_scm_error (FUNC_NAME, status,
+ 		      "Cannot get header field ~A, message ~A",
+ 		      scm_list_2 (scm_from_size_t (i), mesg));
+-      
+-      if (!scm_is_null (headers) && string_sloppy_member (headers, name) == 0)
++
++      if (!scm_is_null (headers) &&
++	  scm_member (headers, scm_from_locale_string (name)) == SCM_BOOL_F)
+ 	continue;
+       status = mu_header_aget_field_value (hdr, i, &value);
+       if (status)
+--
+cgit v0.9.0.2

Deleted: csw/mgar/pkg/mailutils/trunk/files/0004-remove-usr-local-etc-mailcap-path.patch
===================================================================
--- csw/mgar/pkg/mailutils/trunk/files/0004-remove-usr-local-etc-mailcap-path.patch	2013-04-21 19:03:07 UTC (rev 20833)
+++ csw/mgar/pkg/mailutils/trunk/files/0004-remove-usr-local-etc-mailcap-path.patch	2013-04-21 21:51:20 UTC (rev 20834)
@@ -1,24 +0,0 @@
-From 8ebbeb7686c5fba4bf52441ac69a80d110d13631 Mon Sep 17 00:00:00 2001
-From: Yann Rouillard <yann at pleiades.fr.eu.org>
-Date: Sun, 21 Apr 2013 10:39:11 +0200
-Subject: [PATCH] remove /usr/local/etc/mailcap path
-
----
- lib/mailcap.c | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/lib/mailcap.c b/lib/mailcap.c
-index 5a43329..65abc13 100644
---- a/lib/mailcap.c
-+++ b/lib/mailcap.c
-@@ -36,7 +36,6 @@
- 
- /* Default mailcap path, the $HOME/.mailcap: entry is prepended to it */
- #define DEFAULT_MAILCAP \
-- "/usr/local/etc/mailcap:"\
-  "/usr/etc/mailcap:"\
-  "/etc/mailcap:"\
-  "/etc/mail/mailcap:"\
--- 
-1.8.1.4
-

Added: csw/mgar/pkg/mailutils/trunk/files/0004-workaround-guile-compilation-bug-with-solaris-studio.patch
===================================================================
--- csw/mgar/pkg/mailutils/trunk/files/0004-workaround-guile-compilation-bug-with-solaris-studio.patch	                        (rev 0)
+++ csw/mgar/pkg/mailutils/trunk/files/0004-workaround-guile-compilation-bug-with-solaris-studio.patch	2013-04-21 21:51:20 UTC (rev 20834)
@@ -0,0 +1,38 @@
+From 29b1e1311ef537f2e5709015e77be0d7b8fe7b70 Mon Sep 17 00:00:00 2001
+From: Yann Rouillard <yann at pleiades.fr.eu.org>
+Date: Sun, 21 Apr 2013 19:51:18 +0200
+Subject: [PATCH] Workaround guile compilation bug with solaris studio
+
+---
+ configure                 | 1 +
+ include/mailutils/guile.h | 2 ++
+ 2 files changed, 3 insertions(+)
+
+diff --git a/configure b/configure
+index 2c4dcba..e11b3ab 100755
+--- a/configure
++++ b/configure
+@@ -54548,6 +54548,7 @@ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
++extern void scm_remember_upto_here_1();
+ #include <libguile.h>
+ int
+ main ()
+diff --git a/include/mailutils/guile.h b/include/mailutils/guile.h
+index 1db5b8a..9a5be0e 100644
+--- a/include/mailutils/guile.h
++++ b/include/mailutils/guile.h
+@@ -20,6 +20,8 @@
+ #ifndef _MU_SCM_H
+ #define _MU_SCM_H
+ 
++extern void scm_remember_upto_here_1();
++
+ #include <libguile.h>
+ 
+ #define MU_SCM_SYMBOL_VALUE(p) SCM_VARIABLE_REF(scm_c_lookup(p))
+-- 
+1.8.1.4
+

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


From chninkel at users.sourceforge.net  Mon Apr 22 09:29:52 2013
From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net)
Date: Mon, 22 Apr 2013 07:29:52 +0000
Subject: [csw-devel] SF.net SVN: gar:[20835] csw/mgar/gar/v2/lib/python
Message-ID: <E1UUBCC-0004Wl-Ja@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 20835
          http://gar.svn.sourceforge.net/gar/?rev=20835&view=rev
Author:   chninkel
Date:     2013-04-22 07:29:50 +0000 (Mon, 22 Apr 2013)
Log Message:
-----------
pkgdb: Move the machine_id data to a common place

Modified Paths:
--------------
    csw/mgar/gar/v2/lib/python/common_constants.py
    csw/mgar/gar/v2/lib/python/package_checks.py
    csw/mgar/gar/v2/lib/python/pkgdb.py
    csw/mgar/gar/v2/lib/python/sharedlib_utils.py

Modified: csw/mgar/gar/v2/lib/python/common_constants.py
===================================================================
--- csw/mgar/gar/v2/lib/python/common_constants.py	2013-04-21 21:51:20 UTC (rev 20834)
+++ csw/mgar/gar/v2/lib/python/common_constants.py	2013-04-22 07:29:50 UTC (rev 20835)
@@ -91,3 +91,109 @@
 
 # The directory with shared, architecture independent data files.
 OPENCSW_SHARE = "/opt/csw/share/opencsw"
+
+SPARCV8_PATHS = (
+    'sparcv8',
+    'sparcv8-fsmuld',
+    'sparcv7',
+    'sparc')
+SPARCV8PLUS_PATHS = (
+    'sparcv8plus+vis2',
+    'sparcv8plus+vis',
+    'sparcv8plus')
+SPARCV9_PATHS = (
+    'sparcv9+vis2',
+    'sparcv9+vis',
+    'sparcv9')
+INTEL_386_PATHS = (
+    'i486',
+    'i386',
+    'i86')
+INTEL_PENTIUM_PATHS = (
+    'pentium_pro+mmx',
+    'pentium_pro',
+    'pentium+mmx',
+    'pentium')
+AMD64_PATHS = ('amd64',)
+
+# Settings for binary placements: which architectures can live in which
+# directories.
+BASE_BINARY_PATHS = ('bin', 'sbin', 'lib', 'libexec', 'cgi-bin')
+
+MACHINE_ID_METADATA = {
+    # id: (name, allowed_paths, disallowed_paths)
+    -1: {"name": "Unknown",
+         "allowed": {
+           OS_REL_58: (),
+           OS_REL_59: (),
+           OS_REL_510: (),
+           OS_REL_511: (),
+         }, "disallowed": (),
+         "type": "unknown"},
+     2: {"name": "sparcv8",
+         "type": ARCH_SPARC,
+         "allowed": {
+           OS_REL_58: BASE_BINARY_PATHS + SPARCV8_PATHS,
+           OS_REL_59: BASE_BINARY_PATHS + SPARCV8_PATHS,
+           OS_REL_510: BASE_BINARY_PATHS + SPARCV8_PATHS,
+           OS_REL_511: BASE_BINARY_PATHS + SPARCV8_PATHS,
+         },
+         "disallowed": SPARCV9_PATHS + INTEL_386_PATHS + AMD64_PATHS,
+        },
+     # pentium_pro binaries are also identified as 3.
+     3: {"name": "i386",
+         "type": ARCH_i386,
+         "allowed": {
+           OS_REL_58: BASE_BINARY_PATHS + INTEL_386_PATHS,
+           OS_REL_59: BASE_BINARY_PATHS + INTEL_386_PATHS,
+           OS_REL_510: BASE_BINARY_PATHS + INTEL_386_PATHS,
+           OS_REL_511: BASE_BINARY_PATHS + INTEL_386_PATHS,
+         },
+         "disallowed": SPARCV8_PATHS + SPARCV8PLUS_PATHS +
+                       SPARCV9_PATHS + AMD64_PATHS,
+        },
+     6: {"name": "i486",
+         "type": ARCH_i386,
+         "allowed": {
+           OS_REL_58: INTEL_386_PATHS,
+           OS_REL_59: INTEL_386_PATHS,
+           OS_REL_510: INTEL_386_PATHS,
+           OS_REL_511: INTEL_386_PATHS,
+         },
+         "disallowed": SPARCV8_PATHS + SPARCV8PLUS_PATHS +
+                       SPARCV9_PATHS + AMD64_PATHS,
+         },
+    18: {"name": "sparcv8+",
+         "type": ARCH_SPARC,
+         "allowed": {
+           OS_REL_58: SPARCV8PLUS_PATHS,
+           OS_REL_59: SPARCV8PLUS_PATHS,
+           # We allow sparcv8+ as the base architecture on Solaris 10+.
+           OS_REL_510: BASE_BINARY_PATHS + SPARCV8PLUS_PATHS,
+           OS_REL_511: BASE_BINARY_PATHS + SPARCV8PLUS_PATHS,
+         },
+         "disallowed": SPARCV8_PATHS + SPARCV9_PATHS +
+                       AMD64_PATHS + INTEL_386_PATHS,
+        },
+    43: {"name": "sparcv9",
+         "type": ARCH_SPARC,
+         "allowed": {
+           OS_REL_58: SPARCV9_PATHS,
+           OS_REL_59: SPARCV9_PATHS,
+           OS_REL_510: SPARCV9_PATHS,
+           OS_REL_511: SPARCV9_PATHS,
+         },
+         "disallowed": INTEL_386_PATHS + AMD64_PATHS,
+        },
+    62: {"name": "amd64",
+         "type": ARCH_i386,
+         "allowed": {
+           OS_REL_58: AMD64_PATHS,
+           OS_REL_59: AMD64_PATHS,
+           OS_REL_510: AMD64_PATHS,
+           OS_REL_511: AMD64_PATHS,
+         },
+         "disallowed": SPARCV8_PATHS + SPARCV8PLUS_PATHS +
+                       SPARCV9_PATHS,
+        },
+}

Modified: csw/mgar/gar/v2/lib/python/package_checks.py
===================================================================
--- csw/mgar/gar/v2/lib/python/package_checks.py	2013-04-21 21:51:20 UTC (rev 20834)
+++ csw/mgar/gar/v2/lib/python/package_checks.py	2013-04-22 07:29:50 UTC (rev 20835)
@@ -119,86 +119,7 @@
 # Valid URLs in the VENDOR field in pkginfo
 VENDORURL_RE = r"^(http|ftp)s?\://.+\..+$"
 
-# Settings for binary placements: which architectures can live in which
-# directories.
-BASE_BINARY_PATHS = ('bin', 'sbin', 'lib', 'libexec', 'cgi-bin')
-HACHOIR_MACHINES = {
-    # id: (name, allowed_paths, disallowed_paths)
-    -1: {"name": "Unknown",
-         "allowed": {
-           common_constants.OS_REL_58: (),
-           common_constants.OS_REL_59: (),
-           common_constants.OS_REL_510: (),
-           common_constants.OS_REL_511: (),
-         }, "disallowed": (),
-         "type": "unknown"},
-     2: {"name": "sparcv8",
-         "type": common_constants.ARCH_SPARC,
-         "allowed": {
-           common_constants.OS_REL_58: BASE_BINARY_PATHS + su.SPARCV8_PATHS,
-           common_constants.OS_REL_59: BASE_BINARY_PATHS + su.SPARCV8_PATHS,
-           common_constants.OS_REL_510: BASE_BINARY_PATHS + su.SPARCV8_PATHS,
-           common_constants.OS_REL_511: BASE_BINARY_PATHS + su.SPARCV8_PATHS,
-         },
-         "disallowed": su.SPARCV9_PATHS + su.INTEL_386_PATHS + su.AMD64_PATHS,
-        },
-     # pentium_pro binaries are also identified as 3.
-     3: {"name": "i386",
-         "type": common_constants.ARCH_i386,
-         "allowed": {
-           common_constants.OS_REL_58: BASE_BINARY_PATHS + su.INTEL_386_PATHS,
-           common_constants.OS_REL_59: BASE_BINARY_PATHS + su.INTEL_386_PATHS,
-           common_constants.OS_REL_510: BASE_BINARY_PATHS + su.INTEL_386_PATHS,
-           common_constants.OS_REL_511: BASE_BINARY_PATHS + su.INTEL_386_PATHS,
-         },
-         "disallowed": su.SPARCV8_PATHS + su.SPARCV8PLUS_PATHS +
-                       su.SPARCV9_PATHS + su.AMD64_PATHS,
-        },
-     6: {"name": "i486",
-         "type": common_constants.ARCH_i386,
-         "allowed": {
-           common_constants.OS_REL_58: su.INTEL_386_PATHS,
-           common_constants.OS_REL_59: su.INTEL_386_PATHS,
-           common_constants.OS_REL_510: su.INTEL_386_PATHS,
-           common_constants.OS_REL_511: su.INTEL_386_PATHS,
-         },
-         "disallowed": su.SPARCV8_PATHS + su.SPARCV8PLUS_PATHS +
-                       su.SPARCV9_PATHS + su.AMD64_PATHS,
-         },
-    18: {"name": "sparcv8+",
-         "type": common_constants.ARCH_SPARC,
-         "allowed": {
-           common_constants.OS_REL_58: su.SPARCV8PLUS_PATHS,
-           common_constants.OS_REL_59: su.SPARCV8PLUS_PATHS,
-           # We allow sparcv8+ as the base architecture on Solaris 10+.
-           common_constants.OS_REL_510: BASE_BINARY_PATHS + su.SPARCV8PLUS_PATHS,
-           common_constants.OS_REL_511: BASE_BINARY_PATHS + su.SPARCV8PLUS_PATHS,
-         },
-         "disallowed": su.SPARCV8_PATHS + su.SPARCV9_PATHS +
-                       su.AMD64_PATHS + su.INTEL_386_PATHS,
-        },
-    43: {"name": "sparcv9",
-         "type": common_constants.ARCH_SPARC,
-         "allowed": {
-           common_constants.OS_REL_58: su.SPARCV9_PATHS,
-           common_constants.OS_REL_59: su.SPARCV9_PATHS,
-           common_constants.OS_REL_510: su.SPARCV9_PATHS,
-           common_constants.OS_REL_511: su.SPARCV9_PATHS,
-         },
-         "disallowed": su.INTEL_386_PATHS + su.AMD64_PATHS,
-        },
-    62: {"name": "amd64",
-         "type": common_constants.ARCH_i386,
-         "allowed": {
-           common_constants.OS_REL_58: su.AMD64_PATHS,
-           common_constants.OS_REL_59: su.AMD64_PATHS,
-           common_constants.OS_REL_510: su.AMD64_PATHS,
-           common_constants.OS_REL_511: su.AMD64_PATHS,
-         },
-         "disallowed": su.SPARCV8_PATHS + su.SPARCV8PLUS_PATHS +
-                       su.SPARCV9_PATHS,
-        },
-}
+MACHINE_ID_METADATA = common_constants.MACHINE_ID_METADATA
 
 
 ALLOWED_STARTING_PATHS = frozenset([
@@ -537,7 +458,7 @@
 
 
 # TODO: Verify that architecture type of binaries matches the actual binaries.
-# Correlate architecture type from files_metadata and HACHOIR_MACHINES with
+# Correlate architecture type from files_metadata and MACHINE_ID_METADATA with
 # pkginfo.
 
 
@@ -926,14 +847,14 @@
       continue
     logger.debug("CheckArchitecture(): %s", metadata)
     machine_id = metadata["machine_id"]
-    if machine_id not in HACHOIR_MACHINES:
+    if machine_id not in MACHINE_ID_METADATA:
       error_mgr.ReportError(
           "binary-architecture-unknown",
           "file=%s arch_id=%s" % (
             metadata["path"],
             metadata["machine_id"]))
       continue
-    machine_data = HACHOIR_MACHINES[machine_id]
+    machine_data = MACHINE_ID_METADATA[machine_id]
     cpu_type = machine_data["name"]
     # allowed_paths needs to depend on the OS release. The OS release is
     # only available from the file name.
@@ -990,7 +911,7 @@
   files_metadata = pkg_data["files_metadata"]
   for file_metadata in files_metadata:
     if su.IsBinary(file_metadata):
-      machine = HACHOIR_MACHINES[file_metadata["machine_id"]]
+      machine = MACHINE_ID_METADATA[file_metadata["machine_id"]]
       if machine["type"] != pkginfo_arch:
         error_mgr.ReportError(
             "binary-wrong-architecture",
@@ -1318,7 +1239,10 @@
     binaries_path = 'lib|libexec'
 
   if binaries:
-    paths_64 = { 'i386': su.AMD64_PATHS, 'sparc': su.SPARCV9_PATHS }
+    paths_64 = {
+    	  'i386': common_constants.AMD64_PATHS,
+        'sparc': common_constants.SPARCV9_PATHS,
+    }
     paths_64_re = re.compile(r"opt/csw/(%s)/(%s)" %
                              (binaries_path,
                               '|'.join(paths_64[pkginfo['ARCH']])))

Modified: csw/mgar/gar/v2/lib/python/pkgdb.py
===================================================================
--- csw/mgar/gar/v2/lib/python/pkgdb.py	2013-04-21 21:51:20 UTC (rev 20834)
+++ csw/mgar/gar/v2/lib/python/pkgdb.py	2013-04-22 07:29:50 UTC (rev 20835)
@@ -149,7 +149,7 @@
     tmpl_str = open(tmpl_filename, "r").read()
     t = Template(tmpl_str, searchList=[{
       "pkgstats": pkgstats,
-      "hachoir_machines": package_checks.HACHOIR_MACHINES,
+      "hachoir_machines": common_constants.MACHINE_ID_METADATA,
     }])
     return unicode(t)
 

Modified: csw/mgar/gar/v2/lib/python/sharedlib_utils.py
===================================================================
--- csw/mgar/gar/v2/lib/python/sharedlib_utils.py	2013-04-21 21:51:20 UTC (rev 20834)
+++ csw/mgar/gar/v2/lib/python/sharedlib_utils.py	2013-04-22 07:29:50 UTC (rev 20835)
@@ -12,30 +12,6 @@
 class DataError(Error):
   """There's a problem with data."""
 
-# TODO: Merge with common_constants
-SPARCV8_PATHS = (
-    'sparcv8',
-    'sparcv8-fsmuld',
-    'sparcv7',
-    'sparc')
-SPARCV8PLUS_PATHS = (
-    'sparcv8plus+vis2',
-    'sparcv8plus+vis',
-    'sparcv8plus')
-SPARCV9_PATHS = (
-    'sparcv9+vis2',
-    'sparcv9+vis',
-    'sparcv9')
-INTEL_386_PATHS = (
-    'i486',
-    'i386',
-    'i86')
-INTEL_PENTIUM_PATHS = (
-    'pentium_pro+mmx',
-    'pentium_pro',
-    'pentium+mmx',
-    'pentium')
-AMD64_PATHS = ('amd64',)
 LEGIT_CHAR_RE = re.compile(r"[a-zA-Z0-9\+]+")
 SONAME_VERSION_RE = re.compile("^(?P<name>.*)\.so\.(?P<version>[\d\.]+)$")
 BIN_MIMETYPES = (
@@ -57,8 +33,12 @@
 
 
 def ParseLibPath(directory):
-  arch_subdirs = (SPARCV8_PATHS + SPARCV8PLUS_PATHS + SPARCV9_PATHS
-                  + INTEL_386_PATHS + AMD64_PATHS)
+  arch_subdirs = (
+      common_constants.SPARCV8_PATHS
+      + common_constants.SPARCV8PLUS_PATHS
+      + common_constants.SPARCV9_PATHS
+      + common_constants.INTEL_386_PATHS
+      + common_constants.AMD64_PATHS)
   # Need to escape the plus signs because of the regex usage below.
   arch_subdirs = [x.replace(r"+", r"\+") for x in arch_subdirs]
   linkable_re = re.compile(r"^/?opt/csw"

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


From lblume at users.sourceforge.net  Mon Apr 22 09:38:29 2013
From: lblume at users.sourceforge.net (lblume at users.sourceforge.net)
Date: Mon, 22 Apr 2013 07:38:29 +0000
Subject: [csw-devel] SF.net SVN: gar:[20836] csw/mgar/pkg/vim/trunk
Message-ID: <E1UUBKX-0003UH-Ei@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 20836
          http://gar.svn.sourceforge.net/gar/?rev=20836&view=rev
Author:   lblume
Date:     2013-04-22 07:38:26 +0000 (Mon, 22 Apr 2013)
Log Message:
-----------
vim/trunk: Update to 7.3.905; clean up of the recipe, change of download site to http:, update of dependencies

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

Added Paths:
-----------
    csw/mgar/pkg/vim/trunk/files/0003-solaris-sleep-does-not-do-decimals.patch

Modified: csw/mgar/pkg/vim/trunk/Makefile
===================================================================
--- csw/mgar/pkg/vim/trunk/Makefile	2013-04-22 07:29:50 UTC (rev 20835)
+++ csw/mgar/pkg/vim/trunk/Makefile	2013-04-22 07:38:26 UTC (rev 20836)
@@ -1,10 +1,10 @@
-NAME = vim
-DISTVERSION = 7.3
-PATCHREV = 254
-VERSION = $(DISTVERSION).$(PATCHREV)
-GARTYPE = v2
+NAME           = vim
+DISTVERSION    = 7.3
+PATCHREV       = 905
+VERSION        = $(DISTVERSION).$(PATCHREV)
+GARTYPE        = v2
 SPKG_SOURCEURL = http://www.vim.org/download.php
-DESCRIPTION = Vi IMproved
+DESCRIPTION    = Vi IMproved
 define BLURB
   Vim is an almost fully-compatible version of the Unix editor Vi. Many new
   features have been added including multi-level undo, syntax highlighting,
@@ -13,25 +13,32 @@
   Unix, MS Windows, OS/2, Macintosh, VMS, and Amiga.
 endef
 
-PACKAGES = CSWvim
+PACKAGES           = CSWvim
 CATALOGNAME_CSWvim = vim
-SPKG_DESC_CSWvim = Vi IMproved without GUI
+SPKG_DESC_CSWvim   = Vi IMproved without GUI
+
+MASTER_SITES  = http://ftp.vim.org/pub/vim/patches/$(DISTVERSION)/
+MASTER_SITES += http://ftp.vim.org/pub/vim/extra/
+MASTER_SITES += http://ftp.vim.org/pub/vim/unix/
+
+BUILD_DEP_PKGS += CSWpython-dev
+
 RUNTIME_DEP_PKGS_CSWvim += CSWlibintl8
 RUNTIME_DEP_PKGS_CSWvim += CSWlibncurses5
-RUNTIME_DEP_PKGS_CSWvim += CSWiconv
+RUNTIME_DEP_PKGS_CSWvim += CSWlibiconv2
+
 # This contains base configuration stuff checkpkg cannot track
 RUNTIME_DEP_PKGS_CSWvim += CSWvimrt
 CHECKPKG_OVERRIDES_CSWvim += surplus-dependency|CSWvimrt
-INCOMPATIBLE_PKGS_CSWvim = CSWvim-minimal
 
-PACKAGES += CSWvimrt
-CATALOGNAME_CSWvimrt = vimrt
-SPKG_DESC_CSWvimrt = Vi IMproved runtime and documentation
-PKGFILES_CSWvimrt = $(sharedstatedir)/.*
-ARCHALL_CSWvimrt = 1
+PACKAGES             += CSWvimrt
+CATALOGNAME_CSWvimrt  = vimrt
+SPKG_DESC_CSWvimrt    = Vi IMproved runtime and documentation
+PKGFILES_CSWvimrt     = $(sharedstatedir)/.*
+ARCHALL_CSWvimrt      = 1
 
 # We have .el files, but that is purely optional
-CHECKPKG_OVERRIDES_CSWvimrt += missing-dependency|CSWemacscommon
+CHECKPKG_OVERRIDES_CSWvimrt += missing-dependency|CSWemacs-common
 
 # Some tools need Perl and one is hardcoded to CSW Perl:
 #   /opt/csw/share/vim/vim73/tools/efm_perl.pl
@@ -39,13 +46,6 @@
 # Overwrite for the moment.
 CHECKPKG_OVERRIDES_CSWvimrt += missing-dependency|CSWperl
 
-# These are all in the docs
-CHECKPKG_OVERRIDES_CSWvimrt += file-with-bad-content
-
-MASTER_SITES  = ftp://ftp.vim.org/pub/vim/patches/$(DISTVERSION)/
-MASTER_SITES += ftp://ftp.vim.org/pub/vim/extra/
-MASTER_SITES += ftp://ftp.vim.org/pub/vim/unix/
-
 DISTFILES  = $(NAME)-$(DISTVERSION).tar.bz2
 DISTFILES += vimrc
 DISTFILES += vimrc.tiny
@@ -54,8 +54,10 @@
 
 PATCHFILES  = $(foreach T,$(shell gseq -f "%03g" 001 $(PATCHREV)),$(DISTVERSION).$(T))
 
-PATCHFILES += 0001-Expect-tab-instead-of-whitespace.patch
+PATCHFILES += 0003-solaris-sleep-does-not-do-decimals.patch
 
+PATCHDIRLEVEL = 0
+
 DISTNAME = $(NAME)$(subst .,,$(DISTVERSION))
 
 CONFIGURE_ARGS  = $(DIRPATHS)
@@ -75,8 +77,6 @@
 BUILD_ARGS  = "VIMRCLOC=/opt/csw/share/vim"
 BUILD_ARGS += "VIMRUNTIMEDIR=/opt/csw/share/vim/vim$(subst .,,$(DISTVERSION))"
 
-PATCHDIRLEVEL = 0
-
 # Note: Tests require controlling terminal
 TEST_TARGET = test
 
@@ -90,8 +90,8 @@
 	    's/(-l(?:perl|python|ruby|tcl)\S*)/-zlazyload $$1 -znolazyload/' \
 	    $(WORKSRC)/src/auto/config.mk
 
-post-install-isa-sparcv8 post-install-isa-i386:
+post-install-modulated:
 	@cp $(DOWNLOADDIR)/vimrc $(DOWNLOADDIR)/gvimrc $(DOWNLOADDIR)/vimrc.tiny $(DESTDIR)/opt/csw/share/vim
-	@(cd $(DESTDIR)/opt/csw/share/vim;ln -s vim$(subst .,,$(DISTVERSION)) vimcurrent)
+	@(cd $(DESTDIR)/opt/csw/share/vim; ln -s vim$(subst .,,$(DISTVERSION)) vimcurrent)
 	@$(MAKECOOKIE)
 	$(DONADA)

Modified: csw/mgar/pkg/vim/trunk/checksums
===================================================================
--- csw/mgar/pkg/vim/trunk/checksums	2013-04-22 07:29:50 UTC (rev 20835)
+++ csw/mgar/pkg/vim/trunk/checksums	2013-04-22 07:38:26 UTC (rev 20836)
@@ -252,4 +252,655 @@
 54e0f0c2d867cc3e9dc0d619ceab2fa0  7.3.252
 1dba332eda89257de3b4ab6bb7df2ffb  7.3.253
 42135c50e9b0de895fea643b9fbf31ff  7.3.254
+90e0151fc8c6516315a0aae7e659e493  7.3.255
+ff7faa0e5f65cd23c72658a6769be01d  7.3.256
+eefe321ea81f64d5900b0c22807d1548  7.3.257
+e491344e65975e1bd57b2e2e98c3f37c  7.3.258
+408ef7a75b952a1eff9748ee84e3efd7  7.3.259
+2b978f84b6938e6987c8bfa7381f8149  7.3.260
+5b1be0859bacd79aa4a5825797188891  7.3.261
+b6c7e75eff8c8be855f9edd6de76d2b9  7.3.262
+cdcd0dcc3d01f637631d1a0978ebbd16  7.3.263
+cec9db6615a9151e4c8198dcee8b24a7  7.3.264
+93a2c2ac7d15bec2bf9d6534dc502831  7.3.265
+f1898db88e6e05f22fa6aed6651d34ab  7.3.266
+cc87a858ec150f68f9ce8b232940251a  7.3.267
+2828b282286cadc7d87f0d5de269ae87  7.3.268
+c932150eb67cfb4e1c2f4acf46c6b26f  7.3.269
+b9f9d97811f71c5c6adc9500291e8461  7.3.270
+65b0d9a7038a8d9bb0e775f7119339fe  7.3.271
+8002a6bfd7a00b0172d7a418fdf224ed  7.3.272
+280cd76f9ab8ddf770de28676da14cb6  7.3.273
+d2adf98337891833e14fffd57a817620  7.3.274
+44a14ef64d626da28dbc5a1185ed388c  7.3.275
+691dced900aa8bfdd383fa897cc1acbf  7.3.276
+733dc08c161153f78a2c1de92354f804  7.3.277
+674a40b783070104e8e345a56ff1c699  7.3.278
+b91fba133b43d359c7ee2efb9a768b0d  7.3.279
+355e64bf598184b8ca30f8c686d644cc  7.3.280
+662b3d7aa861ec265b36e96410e24dbb  7.3.281
+2e67fffc2588006857c608a2255ddbdd  7.3.282
+21db9145e815b8ac9850d1952da93252  7.3.283
+033eba7e15012d3bcc7ba59c0bae6ede  7.3.284
+d80855715545d181da083a6fcad20391  7.3.285
+aadb1134e05f13d3ba26aa7282068a02  7.3.286
+049b56c1e98fe411d1f2725695966c09  7.3.287
+2cf39d26f643528c7bf9598a5259601e  7.3.288
+89fa11603ddc5960cccecc9e430b61e0  7.3.289
+aa1c97edcd24877fb7fae3c366c05577  7.3.290
+b52a5034ac4817a05c42541b384161eb  7.3.291
+b364c4dab831803d9854d0161aad6a7a  7.3.292
+f612a0927d40cea71778b484eeb7f111  7.3.293
+25c1d60c4ef4f2e3b35fb56a626676ab  7.3.294
+6c94c99c2fbc246f12785b59e341b747  7.3.295
+5ac3dce88881544eb7b465938dbcb94d  7.3.296
+31782093d3af5044ad2db1373a743fdb  7.3.297
+fd444f0a6aec3a5ddf1999f8fa6986e4  7.3.298
+4ee221a91a9926acaac5f89567e7d265  7.3.299
+4244a43b9c668a9bf29dfe04ea35aa70  7.3.300
+ec895a0a0b76b876c2c82492b203d471  7.3.301
+379ec4b8a77d69e54dc4a68944aac3bd  7.3.302
+78e5137c1ae5471b488d75c942d11cc6  7.3.303
+5a3a569d90d20ba8123cc9639d3e7305  7.3.304
+fd76f9e109875f3d4ae9ab152e49ab33  7.3.305
+cd08fe30975fe10f335815362f7f16ed  7.3.306
+6c3d8d62e49f03b5ba253fbd4f3619c7  7.3.307
+8aa8df0fad4c62dfdc59bc109d80e821  7.3.308
+267da2c42e8fd7958ca923a28f95de21  7.3.309
+464e1df22d56232a5e3c83641d2d5386  7.3.310
+39dbb4123a171f0b76f2f9ff24b56e4c  7.3.311
+f312b59b21aa02ce81efeefa949a8508  7.3.312
+a3b75ee13b25ad9189c480fdab885d96  7.3.313
+48977a05c541f1a731ec2ac4e4fb33cd  7.3.314
+192672f46b60d35b71cd3ce94223ea4a  7.3.315
+d8ded5524850fedee9cab77d850f9c03  7.3.316
+7375af7c6204c64705c6fb39734d65e8  7.3.317
+4d710806ecd74804b893c8cdb17e5227  7.3.318
+acbfc765ebe3c47d46e787a7a54c53cd  7.3.319
+af858d90cfeb2d720202203ada0d2693  7.3.320
+3bc5ad99e7ca30cb8450025677755603  7.3.321
+2c79f0a412531bf08c1a2b36a5047d0f  7.3.322
+d246f24b49c15257fe5b305a98ab427f  7.3.323
+c5fd07c7ffa879cf76da06130688f2e2  7.3.324
+7e3098ed5d6228eb8bc823d09409163d  7.3.325
+1b9abd209e33e4fee02892bcfaad29a1  7.3.326
+cd25f51cc118dfde45a873af2d1dde95  7.3.327
+ed256a9ad43fc919ec816c8f79f28f5c  7.3.328
+2b067cc0b8f36cade83d6bf28f2f28f2  7.3.329
+b4c9c95eee16d19d2b9713bc1b60f696  7.3.330
+bb075b263860ed1b80b5bcbe5a57d423  7.3.331
+d7832ef5a54508dacc105e287874a00b  7.3.332
+accb06d73f1463893da2afb501f466fa  7.3.333
+bdf932190d677b98362dae52cf6eadb1  7.3.334
+26766ba9ea0ab84233e2b29332f796fa  7.3.335
+2ddc5da7409fdd5b3c8d10afef6b1ca9  7.3.336
+24691aeaec5277d0afb4106b40ae267e  7.3.337
+54ff1e2fea2a16965959a9f42b8b5fc9  7.3.338
+620d15666807ab219620954ea6fdca1f  7.3.339
+c3ab5f6227530ab9ca6af494cbf77fea  7.3.340
+8326d6b339724dfe5fc99fadc7c57bf0  7.3.341
+362087e621fe59f13f2ef1ef1cb74e50  7.3.342
+869bd67eb3f1e62fd9f5097fea9472d4  7.3.343
+e3d9a945f29f7ceba3e0330e2e510344  7.3.344
+22ed2d9938820b2c99129d8724849304  7.3.345
+ba18fbdc38d774c05ac02bb413f0bb3d  7.3.346
+07e51c946abcdf904cf6856548fa7145  7.3.347
+3b75c5e11e5ef2a62fd0b02e35b71ad8  7.3.348
+fd58c8ce31e087d9a81301addf816767  7.3.349
+8c8025ab73b595e112f8d32d9ac5ef3d  7.3.350
+4d1587f7394e609c5cfb3d3e506b4abe  7.3.351
+fb4251e16f07b76c2bc51b62aaa58735  7.3.352
+f7c88e37014346eeeaeb952b15100b2e  7.3.353
+5208450dac9cd0de8778a236fa72eb08  7.3.354
+d3f5578199874f3234395c33a1eb5461  7.3.355
+6050fae12e337fea78d14e54b4ba3370  7.3.356
+67c7d610d9d58f4c2105eb05dc1522cb  7.3.357
+455fbdbc0a1fefbf94614c829b544511  7.3.358
+1de4c717ec20d7ecded0f84c57cae132  7.3.359
+350dec5064be57bf8928d667a4d40fad  7.3.360
+6f13d2d8f231de47e7ba61072ccea891  7.3.361
+a471ecbbf370fc02b66fc1584c471691  7.3.362
+33fd36b5070c8b35f6cd9e7f22ea23a7  7.3.363
+14f3ec8d4b379eaf47ed1db484d978f7  7.3.364
+5e7813749abb3ebc7ab9e68a1b3e68c2  7.3.365
+c6331acdb22f8c4d499ca581a705ebb8  7.3.366
+f2fdb72b39438f7027c4be24db25b117  7.3.367
+3a8195f83b2d32d8c2032e26716b9f09  7.3.368
+359bc85c3cd63d0fbb6bc5961f72c739  7.3.369
+25f119547ac48f878b3332befc2649cb  7.3.370
+d36fdfdf639394605ea2b308707d6615  7.3.371
+ad0ddf9295efc3294c773381e5e67fe4  7.3.372
+8442d50d418cedec8b2d635644740d5a  7.3.373
+5c95728de7d9a3c4c3987bcde0650778  7.3.374
+c61c2d446414bf1cab32807c389e2e7c  7.3.375
+444c16fa4146e89b2bc9d32b4da2f7c1  7.3.376
+6ed79f1c361f8c0eb2966a55f3ad52f9  7.3.377
+7b191891dc5f67b99bbdbadf976ac845  7.3.378
+a839cc831d81b6d34dfe90627fe8cf09  7.3.379
+24701c12673b2bf379298345d60f37b3  7.3.380
+a9067b6c0641a17f38e2e97301621673  7.3.381
+349a3d34953464b3688bc31469976f24  7.3.382
+20ba52799f0c3d27c478f011472c0022  7.3.383
+6d5298b6a20256ffcc2cf3e65736d387  7.3.384
+69d842f7ced3d84a35044f9c18c3c6e3  7.3.385
+fd5466d49d7c63643554483b15fa97f6  7.3.386
+0315176916ce9ee581e182f87e016179  7.3.387
+41c28b63e3c84682507228be16af2aa7  7.3.388
+ef42ae9d02239408085ee168e514145f  7.3.389
+be7aafd0a6e9dc35983b72382847b88e  7.3.390
+08870e0a7fddac2855b28cfc5fd6bc21  7.3.391
+9f0362cffe6065ca1d3e5f18b78ab5ff  7.3.392
+50fbce54fba5517687bc39bba7636631  7.3.393
+3b6c224a46a6bed39d88ef94287b4920  7.3.394
+5d8e7c36cd9cd6b647e449a71c811c46  7.3.395
+c91ef87675629cd3fab98b28c8bd6057  7.3.396
+825e916750badaa31f74412f7da69e75  7.3.397
+d3cbffdac50dba36e582c6c3b8d6cf3d  7.3.398
+781b1678b00044498e250a6abd89151b  7.3.399
+456655a8e098a1f36611b526489ec4c6  7.3.400
+22b340b307838db563b5a9a8f9c646bb  7.3.401
+26efa76a8cfc8b926540c099a8a7044b  7.3.402
+6fea59460369918ae54b846f3e876ac8  7.3.403
+a9032b6e58b10d8082547f4a9a98218e  7.3.404
+6210b92d8079bff8eb374ec448defbe9  7.3.405
+388afd617c74b67cbaa5f80016877be2  7.3.406
+120b0a9eed884ce705f482d560021435  7.3.407
+7030a491640aa1b42ec864dbd8ed21cc  7.3.408
+d82c2051756cdd5dd802473f4211e457  7.3.409
+29ccb4bbda97575b4da43a60c8d1d26a  7.3.410
+ff25ffb70dd1186d94c1abe967d5f236  7.3.411
+266abd1bd01cafc7e6547010927933de  7.3.412
+a856fce6bb3cfd1a18a883d2015cdf93  7.3.413
+ed1728eda523c254f73c53cfa4049f98  7.3.414
+2ecb53a65f1e860805c3e76de6649810  7.3.415
+7c4d240cd697a5059215cf30031fdb67  7.3.416
+80bc77423d32592e86fe3878e4c9132a  7.3.417
+e29cd40e83a815bbf5f184a21faec19b  7.3.418
+500806b4fb0f70a9d28d39fd78977c5a  7.3.419
+52ca17111e0b0cfd86a6295f47ccb4de  7.3.420
+da9cd8687afd5226942c732fa3969c48  7.3.421
+137378088538084ac84414b06ed194d2  7.3.422
+1be05403e55b1e7386aa1ba1e9b164a1  7.3.423
+553b897f34b415438149fa1dd62c1cb2  7.3.424
+d65d21569ea9357ab8213b24d5bb3edf  7.3.425
+b0a25aeb502e7dccbd33086fc43bb3d5  7.3.426
+bd27e7c5084ad505689ffe234995c340  7.3.427
+c28f26ba59d4495eee3bc76f887662dd  7.3.428
+041c4bcff7b0a9d511eee0d15dbd97f9  7.3.429
+d37e30c3c09cc3c8d031d2f43d9ae58a  7.3.430
+6ea544142e91749e20ec152960cd7898  7.3.431
+27e2fbee220f1317092cd912f869ccde  7.3.432
+dd06ca07e6cd631a643c0455e7a8260b  7.3.433
+c42d11497c9a3a8310ae88f68e663a54  7.3.434
+a9d3a628cd575fac524db5728dd5919c  7.3.435
+b344d4c8afd0a565cfc5ef2a8c6ea62d  7.3.436
+84a6a23e44ee608c116206c5d986fadf  7.3.437
+5e2ac3a4d3400ee3f3790dc0db666a2c  7.3.438
+2b254fc7a6239be6c5488b186abcead9  7.3.439
+ca0f48ad05bd78667af7bf8b33918e1b  7.3.440
+398511e171699e02a717f6082fa31cec  7.3.441
+c2d2d211b377baf66945b3ab3ed4ae26  7.3.442
+78d8d9a2cb8b2da74ac6cb14d48c7550  7.3.443
+d9e4dff7d98129632750ec85492007bc  7.3.444
+11b865b2056b62864ee74ff6d14ceb05  7.3.445
+4314432b04672e0de08abf10c496878f  7.3.446
+3cd998afdb75bf0c383677a891e83e95  7.3.447
+ea30682770af33ee88f1ead239a8e842  7.3.448
+9caa72ee17f6d53d717504981ee75b85  7.3.449
+c182c9886fa2d5bbd6838f72ad8ce093  7.3.450
+cc461810141649483487a68e1bc1adfe  7.3.451
+a1c39615067b40fdf41ae6f588fd9d75  7.3.452
+7b1a46036cb3315e158702c8e4fc8f85  7.3.453
+4f5988e78327ecaed626ecc545756d3b  7.3.454
+979fa19eda9c88fd7a10bbb08b3d0061  7.3.455
+fcf786d70a06e66d98dd0c0946db32d5  7.3.456
+7acba3727d06dd93d5f8e6e74f8dc6a5  7.3.457
+e92eb0f6eb4b9c13faec3e4bffa08949  7.3.458
+cf8b7072cc45f1e44409c0c7ecca8d49  7.3.459
+f7a99e67e2673f753c1ca7091a4d76db  7.3.460
+3c14adaf6d81d131b1fc2a95811d7aea  7.3.461
+c4202a428ac13e833639beb0e74543a2  7.3.462
+615b00a39aef680b62035f53af6efbcf  7.3.463
+d354dc85be61cdd6fe19a3e451ec1b2c  7.3.464
+ede6c2f3ed8705f394ff827e424b0dc7  7.3.465
+9f50c30a4003705472dc593eeec8d991  7.3.466
+47910a4c4c91aac42d677959d447d07f  7.3.467
+a4ea7d57a28fe607cc1d30271d717419  7.3.468
+f93fc094d5c7851018a14792c28cb3e5  7.3.469
+3a5ec43a7016b47afa311c4f1038633d  7.3.470
+aad7c2ad4b4e6b94ec46e9b2863fd330  7.3.471
+86411483bc6cfd20dd06b47ae91d66b7  7.3.472
+99d5c3ed66497f0e653078a4668156a3  7.3.473
+44723cb5a3f4d5564dfebfe846884764  7.3.474
+40e8bafa5e22efb3ba080e3d62bca7e9  7.3.475
+3d2c5a2b5c1076ab5efd2a754b89b90b  7.3.476
+7b0ed92c340f1f0ea2683949f94d5611  7.3.477
+9d3f8ac8dab7c056b84acc93fa57cd6f  7.3.478
+804be1bb570a94ae546aa25b624ea794  7.3.479
+b373d6f49bb360ea6a3c9926c285185c  7.3.480
+7a82d7511b366b2b5f85d9c2a7455f01  7.3.481
+bc79f4d76bfabb779bc7d6b9a64cd64b  7.3.482
+adb74ecb63693c37c643285ba92e44de  7.3.483
+86792ebdd7cc76bec160132c9d33b636  7.3.484
+42c48b198a8061eda180e2311a7534d4  7.3.485
+276bc5a9a7fd8dc927c23b26f643033e  7.3.486
+31007729cff7767cbf220a9b68b194f6  7.3.487
+e1ce3eabeb588b06ce7dddf487f2499a  7.3.488
+3b2dd5536346a54e36b4e03cd0d824ff  7.3.489
+8ae394bb4c88bef95a1024d6364b38b6  7.3.490
+328e9b2d8a31d7c788264483a80e9250  7.3.491
+68c3491611b8150e0ae968a1ea8affe7  7.3.492
+f5d9ada83869fed1d0d91df88c5a9485  7.3.493
+c3a23838992f56b4636e2627eb143924  7.3.494
+888e9843615e3338ab83fd8c66737433  7.3.495
+a8703d0685fa90bc069d308f7b51bb06  7.3.496
+426610e23cad87328eb082d625d1ee62  7.3.497
+329e2214a8a8b545c05fd86adfe8c1bd  7.3.498
+43c0172dd764412d60faa14c6e6666ec  7.3.499
+f3cf44f98a0238c71024dc631d0ec606  7.3.500
+924ab81950b8a7f25b1d55026fafd6b9  7.3.501
+5c8f12ae2e510b05ba067b17cf49893c  7.3.502
+e41bbf789908cf09df630261e3d69e01  7.3.503
+80ea5159a3edf49b58783becfaa39a5d  7.3.504
+912f7d8c2238f094624b785ca7786585  7.3.505
+22600e53470552074a0aa14b8ddad4f6  7.3.506
+dcce2bcae112b2f374928d043bdad9a8  7.3.507
+8b8df2d863d70954d9e26044fb4e0cbd  7.3.508
+4d7e21eaabea5af10755f28f09f827e3  7.3.509
+2eb7b0cb6063f550285f089e754f92a9  7.3.510
+d3b2614aff5849ebf6bb9ac3d89c19ff  7.3.511
+78256e47b0fff030269cbad57b2597e6  7.3.512
+1288d660de7c01fa185dcfc5004c5293  7.3.513
+7428cc377b36f4fe7afd3dde5fa21b61  7.3.514
+b3c5e3a4590ef7e6a075d1b90149c9ac  7.3.515
+0206b98c70fd2c94fc5ff6eaf14f0959  7.3.516
+0e0afa5a9d1dd586bde50703c96ac3a4  7.3.517
+349c2ddac116f97c31b1bd9b88b72b9b  7.3.518
+6106eecd3408726079fcdd12c1425312  7.3.519
+6da6f66434c93887375b556c857a30c6  7.3.520
+507d6e5854c12c694d4812bdfac2548c  7.3.521
+b6b1b25d63291d989e099103f04bdcb6  7.3.522
+0cf738ba8f7d390756fe8e766eaf3d39  7.3.523
+0b0267864da69c4f122e2353d498c487  7.3.524
+9e17f57c70c2c891fad93806c5e6d705  7.3.525
+336e0620ca9eb9c7f342a632efdf8cbd  7.3.526
+c5de73860845db1db28ae99e295c3792  7.3.527
+a9ea4c3f95d297b158453bfffbb40a99  7.3.528
+18ae440b390439ff2fbede969f9c8a1e  7.3.529
+271e2e9de4dfa37289e48f64a6553500  7.3.530
+869bc6b81597a1fced9392bbd8f8fc5a  7.3.531
+a8da4dec0857a9490a2d8778d1124c47  7.3.532
+bb141feaec8df351d1f6699e40a039b9  7.3.533
+92faaab0e90f8480cb9753f486a4e873  7.3.534
+c897a13a04cf5c584bd615b5c6c7c584  7.3.535
+266c83d93a028c5c41e419e545f5b300  7.3.536
+29ed0928f7357b857487c04c317164be  7.3.537
+fe980b731ba1207ffd3e84529bf71ddd  7.3.538
+af3e4fd995f5de5a6177cfd437e13613  7.3.539
+ce419c1403948bb41355f337723ecf4b  7.3.540
+4de666301e91871c38b53063f8e50cf5  7.3.541
+f2282f6c276031b5ac10b1c26b249259  7.3.542
+46291292966ee035181d88ba0def3e9f  7.3.543
+b36f4a6d591216074f059e30185b795b  7.3.544
+4477450c8ebc25f53c69849fde47961a  7.3.545
+5ca25f97d2e8248b0d6063a9ac6067a0  7.3.546
+f5eb24c91a950cbb8bb4197a0c9576c9  7.3.547
+dc458cfe8ffc6b9398c1e2ce9f53d03b  7.3.548
+ad975396a8c6ff6072726a22a449d82b  7.3.549
+1b9a430451c381730566b6997989226c  7.3.550
+46562714604afdaea878000c4c3d207e  7.3.551
+e9ec165f500549d7df5ba1dca13afc9d  7.3.552
+23a5ab0155214e8f0f2c1aaa71950cbc  7.3.553
+dfffb7b5c54c5d9ec8b0dc71e67a2658  7.3.554
+f6c9f15f23e28773411d643afea566e2  7.3.555
+0ea7e9762a526fc078579429e5cb5204  7.3.556
+37b4e98e68f9168dbe170d45cfaee752  7.3.557
+d55e7cb7d754eaa45becba8997f63e1d  7.3.558
+29f57c3b174c62a113a89fd670476e45  7.3.559
+601e5ae0b7aab3e9bfd740913b4de6ad  7.3.560
+eebc28cbb5b8b50152381389714255c5  7.3.561
+9bfdb1b2c2ad5507709e5d087f73cd69  7.3.562
+02e44731e5a40f1f513e1bab93e0c922  7.3.563
+7dab4d26defce84174fc1ce40968f7cd  7.3.564
+bab851bc6d1cacc5b2aa9357091b5850  7.3.565
+a7fc27c3f13890f7985efbf21f436984  7.3.566
+118aea4f408d18c39594ffe2be2d5654  7.3.567
+d222ae3e9bdcfe27e7e56706196afb07  7.3.568
+4fad201269a1868121088104ba2e2cf8  7.3.569
+b0c8bcdb5bca31cda0e3347ed2707e11  7.3.570
+94a1e5061ed54d8c284bf9e9a7a80893  7.3.571
+c8d48801d35d30965c6bef1617271c0d  7.3.572
+d564977f585a6beadc81f3cced20365d  7.3.573
+df348e7ad84f9eb22a90965de5c33799  7.3.574
+749c07df5e36cbd342c3cd9c27d37753  7.3.575
+bafb6e85f0ed5cdb2bb6fa66d83e5219  7.3.576
+e2167696fe85109810cdc8dac0319882  7.3.577
+ce1cd1adadf03ccea372b31059e456ef  7.3.578
+1069ca066d1677e6a4d8e6bc7cda9c1a  7.3.579
+2c8c1c8c879e23f67c7148ee295720f3  7.3.580
+da732dc847b52e0a79a7a95b5496c653  7.3.581
+c81f20d3e7cfe5329a713737fbe6b3a7  7.3.582
+237ca7dc39ffce18d36e778ffd02ef36  7.3.583
+f379b5fb12af3de41d9d966dd6a00bf7  7.3.584
+f4198c4adb7e8746419fbbef68e0a359  7.3.585
+c9f9ee1f94ca881ff6d6640d448a11f1  7.3.586
+f719b5433676977fc5be497cf63b7741  7.3.587
+1669475093547d2f1acc962913528ba9  7.3.588
+c29b13cc89b6c9d72b7d6ae7a92992eb  7.3.589
+352429b56533ba2435e9cf0580097816  7.3.590
+0aee68dbfaaf1afca1244aac3f0b8e6e  7.3.591
+0324c77762c95a4e5668e1b16b4db6c6  7.3.592
+43cd0694cf7ffb60df7d0c34fd631f1f  7.3.593
+966985f5120f5b19080572a4c7958e6b  7.3.594
+d8ecce5da4c377575ce716aeb5f8087c  7.3.595
+e26f6a6804528d875fc3c3241a87f1b3  7.3.596
+c8aebdb727582e57af6be60072f72dae  7.3.597
+9e8b68256c897ef68b33b5d1e268d567  7.3.598
+48920cdf55ae40362efea9fb3c837296  7.3.599
+76222146210a1a5c4ee01d6bf892febb  7.3.600
+0476e6804ba298a664a9d616c2cc9ef3  7.3.601
+e48ef9748a38098f0a635a5f7e0e31ed  7.3.602
+8de3946060c2ac76ca88e50f44b8ece3  7.3.603
+4eae3d63f205a6608bb40e1d7865f5d8  7.3.604
+3576ee02d1746fc657e808079fc47df0  7.3.605
+8946d8ef910bd7d1a2d3c9828d07544e  7.3.606
+bee3ee47bc46604c39baee585be293ba  7.3.607
+652af92be8dfdac047c7beba45a1ba99  7.3.608
+b46cb8c9884ed0ebbadca26d8a9a4118  7.3.609
+73955c09f53a41bd61083a27882810d8  7.3.610
+96534cdfbc2b758eae95fc0f75b5382d  7.3.611
+b3a601f290f2de1bde0465db6dd51e8f  7.3.612
+2f0704a264e2bfc6da3ae7645d0d8d94  7.3.613
+b379d7849f65b805d919a117046653d9  7.3.614
+1d356280b1e9c94bd468ff90db84999d  7.3.615
+227bd899c6ddd5d132224f81c8a0e775  7.3.616
+638e706969de129cca5ae48885f4382c  7.3.617
+085829e53587ae2fa0332cefdd7c3103  7.3.618
+90cec71f1974a3af93323ee4c2059239  7.3.619
+69bcebf038995bd725a54815091433bb  7.3.620
+02efde0de0afa307653fdbb008687a80  7.3.621
+21cdf0443f83de89d2e4b4f84da9569f  7.3.622
+da953a8f9d5d0f483ee7ce4aaf97d564  7.3.623
+36f3829c4a57e55bfb9a39f7cd1735b5  7.3.624
+35da55de3e906fe1e57c2219122579f5  7.3.625
+becff97ecc29fa653983f531f740d861  7.3.626
+f08883ed102ba663e9a5eb797bb7be84  7.3.627
+35a5ea0bd9b039eacf360323e65380b1  7.3.628
+f41c374b71cc8e8c753d3af3521d4a32  7.3.629
+b9a248eeb6bf38f8930cc0315bc1de8f  7.3.630
+701083254e53d9c95fef75a926cb6c7d  7.3.631
+155df5cf0314931f6f7d1860ea77f2d2  7.3.632
+5f0254fdf2a5d256d39ea54060eff41c  7.3.633
+7013ada217b84af75ddb02b0ea181c3a  7.3.634
+28c0360c7323aa5d2cb52767e0ec74f0  7.3.635
+43d7c83dfeb4fad1829a8634745b55a1  7.3.636
+e76d954bae1a76dbeab2a2b4bdfb4308  7.3.637
+42d9c2dfdb505d9d58a9f9ec924250ad  7.3.638
+ae8e9ed38d39091beed265818d3b8a2e  7.3.639
+2e7e7758536e2e22548a38935890695a  7.3.640
+c01f869a60f3a2b50935e807c76d95da  7.3.641
+043004b7a42f71b2be465cc4829f15e0  7.3.642
+17ecc5f7482a3eead289b432c72f29d6  7.3.643
+83dc413bcfcb3c154f248b435e67b0ef  7.3.644
+3b11f430ceb7474fead9a577d5dcf327  7.3.645
+a0a8131dcc472a78362f11772b6408db  7.3.646
+f7d710eb395fb90b9f24cb2a15e69aed  7.3.647
+1356de03af7da1f43fb7afe9cf30fbb5  7.3.648
+b3c336f40f6b564d3890c9659305f3b7  7.3.649
+772a6293443ad6ac9df0c5397bb71a41  7.3.650
+e6389f21300ec51fa723d64dbf1bd97a  7.3.651
+a8ea4c76eb1daf26c14595ef77029c27  7.3.652
+e65adfbc6e793d67d5c9ecfa3a00903e  7.3.653
+ca3dab18ee91cc5b7ec26fc23372bdd6  7.3.654
+ccfc8ef1dae6e6a25d530cb94c8f882f  7.3.655
+634384d0e9bbf8eb66d5c2c597bcc2d6  7.3.656
+e396c1b0455699a5767d568f6e42b30b  7.3.657
+fe1c21dd1e8d7ef6479b1e3491e60b92  7.3.658
+01a2677308db295311003872c176f907  7.3.659
+2c6411e804089d4b8e7740701365143f  7.3.660
+4c407322041b0d2be237704cc0ce1e79  7.3.661
+a1c125774e82a6dd3a62ac85cc6e25ae  7.3.662
+53a8658df813bcf9ff4b296b5ca075f3  7.3.663
+8d53a150a50dd1af9f7c2d2715482b57  7.3.664
+cb6e506a26884804afc49ddac08aa040  7.3.665
+ddb827b7e4d0f4e77b591eaabef42499  7.3.666
+6d116c937bb0f74dde0d61bf76fc209d  7.3.667
+1f000a3231eaed8b7f857d8f55c2b798  7.3.668
+f8d544b185a2bec049c16958fa8821c0  7.3.669
+15b268096d901016abb6dbdad8d9dd2a  7.3.670
+456fd9d031b995c14f9bb21945e83c79  7.3.671
+ee940b5d7fec05c2eaaac0f3ab4ae7f5  7.3.672
+90947aa4094e2944bc27923b186d6943  7.3.673
+5f20b8c5b6986fc26e344381e5ad0977  7.3.674
+18194e59371649d3930f55ca05200e29  7.3.675
+3abe3fc89eb54cdbfa7d08557987cc8b  7.3.676
+9b6243de57af010b3e57d90a7e69a075  7.3.677
+012fc6d1489e1c6be73952697c180038  7.3.678
+1acd608501c119734085f5b69205a797  7.3.679
+ef2d29e8f48447fb3597f2aca40dc4ed  7.3.680
+277c37e4a3c8b263be0f33cbbe6986b1  7.3.681
+009a08f90a4514bcdc0ad19940b91af9  7.3.682
+73125bf6fca5aef494c4c4a27cf9d84c  7.3.683
+d0133c338d5841f1f8818e38e286a518  7.3.684
+37080ef3e4ff09e7f7de092849af68f0  7.3.685
+a7208adeeaa0e20a20b4db55274b19a2  7.3.686
+29a87e724798d68b58351051232f321a  7.3.687
+92777d7e1b029576e0066973fdce0563  7.3.688
+54199fe735f735613e9c6308387f1e31  7.3.689
+42033c6c57e7656ab3d44b8585a260e3  7.3.690
+c4dbe0ca1ac4017686e8dc4027ed056d  7.3.691
+58e3cb2304e79be3d9767189dbb21f49  7.3.692
+4d55900c4ffebf154faac273d57e84e4  7.3.693
+380b60bac510e0ba7e2193af2e3d503e  7.3.694
+a5886f87f798247c2100408fc3b1f6eb  7.3.695
+4434809fd03593ff4b6572cb35d58b40  7.3.696
+f0cec7cd723e33c22c7875e4e95ca71e  7.3.697
+85b50f9d94ec1eac1bfbc116a4ed09a8  7.3.698
+7eb362619743a5dd17b75915d741a39a  7.3.699
+c2fd1cd1b95084d1ccbce8881511b6ed  7.3.700
+fd0a4d9fbde1645b36a181b5ab54b26e  7.3.701
+f7a5b36d208f3442cbbdd347f3a42563  7.3.702
+5ab9e64caf1f760e6d1ef08d4c399c69  7.3.703
+9c0510d0f2ca3438d7b43563e5a12f2e  7.3.704
+bf172f99cb4a39f5b88f944f31b5f9c6  7.3.705
+065ba8d9038326766bb185332b2ff0a3  7.3.706
+c65424ea7df82ec5cbad5e26980a9211  7.3.707
+9629be9c7269cf5112e35d8eaea035a1  7.3.708
+c3988f2feac4f893f3a1ec933a504bdf  7.3.709
+2c7895a305d50f2ea640df9bffe73c33  7.3.710
+3536102ddedcc5412bc6bd347dead877  7.3.711
+53e0c374077627a7dc14acfd656e2b8d  7.3.712
+964b33d3a08aca14c308548f7e196d8b  7.3.713
+f073950bc171acde05e46eeff5b1d188  7.3.714
+c30b3382b17a476f8e4515079b821879  7.3.715
+f7175afb792a76dfe637620127254389  7.3.716
+0d5dd059ef01650364638df7fdf71aa6  7.3.717
+b677364d9169cee792d6d1a5ce018f37  7.3.718
+a8cc9678c21aaa3a3df47fa49ea1d19b  7.3.719
+d158ea2c0180c3a2a78e3e4f852259c9  7.3.720
+49e4ee8774f421bd7c686c10b6cdd16b  7.3.721
+d4275057101d6d3d0d7ebf907577d2a2  7.3.722
+a8050ec35042e9fd51475fd1048bf54b  7.3.723
+1c7ba44c19b1775722678a54e008b20c  7.3.724
+1dd2c402290b87d89ee4b130694a8f9c  7.3.725
+585b01a15ed8f8b63d40c62c75b9d5cb  7.3.726
+ab89149d96d541346fafabe621ef4885  7.3.727
+8c98d6b2ecd613c84560a2856051ee91  7.3.728
+0d6e1d700d8aea1cb98d918691395c1e  7.3.729
+6884a0da581af8ca961439fba8d5d01e  7.3.730
+d990f67daf2bff5b87717d98ff0ca00f  7.3.731
+a5000fa5de2a7fecb2953e2449b93d56  7.3.732
+b9ab33bb195ed0ba2ee2417b9d0228d6  7.3.733
+50bdbfc91cd20e75090706b50281d2cf  7.3.734
+72f6e57958c416181e6748a339eef726  7.3.735
+fdfe9a8e4d0c3573238bbee3ec5836ad  7.3.736
+0c16ec0aba22fd3086007b8ebc454f8f  7.3.737
+41a709ad15a1dfb5e1405fb2e618f173  7.3.738
+61d956ac3c674b930675160f69330483  7.3.739
+6775625a4b05ac2b196889aab109480e  7.3.740
+616970ab5f892ae1f51fb5d0978d926e  7.3.741
+d039389c4766620b6044153af4504f8d  7.3.742
+ed6127482dfe469d338e9ee18f891d20  7.3.743
+cb1a7c02db2a2bc3ae96ab16cd888c8f  7.3.744
+b82e0fa1508b03c84c72d3a44dff1237  7.3.745
+fa4a781e41f0fd01350eb9ad49369794  7.3.746
+dc9750b1b3e2d8188dbfb4a1ca145c87  7.3.747
+ad5b7f392d113743b73f5043b92b85e2  7.3.748
+9663888372ff6e9a3959abe4f3d527c3  7.3.749
+adbe0502203063e5d1059563dc8aa429  7.3.750
+8b6104f0f3361f7d5ebb4734c3dc9d7e  7.3.751
+d2851c26bb5efe3f44b0436a4c295e06  7.3.752
+8c22baf96c2fd9db61a87ff3923d02f8  7.3.753
+a091a2e3d05932de13be54442bf6548d  7.3.754
+c684e684eeb89171719d97852a216802  7.3.755
+f64197967083256346fafef01e7835ff  7.3.756
+f36da7fd453e2bbd8b74c817f8927dd7  7.3.757
+086067a0fb4b10e16c8014d111f116ad  7.3.758
+662d47608952c60f8923dfb54c8b4613  7.3.759
+feede44e7a31055cdc967abb2162ed3e  7.3.760
+109b0ea8a2924338865855a64017de7f  7.3.761
+d11098382b38b12e3b552400421450bc  7.3.762
+41421f5affa5d4d7aace28f9bcf77ea5  7.3.763
+735563349503f9a61dd0cfc7cde6c589  7.3.764
+46c72c3a1dd3ec3f724bcb50d6dade7a  7.3.765
+da189fdac966e978606cb93cb458208d  7.3.766
+b12fffc522168a4171e2719697e0f5db  7.3.767
+a2057e7be90bddf92ac3319a0aa54c5b  7.3.768
+87e6d0e78dd7313609652e785c10b3fd  7.3.769
+c960937e7ee14d1b7ded058dcb8ea508  7.3.770
+a2a42505b2dec3eaeeb051a57c3d19c6  7.3.771
+79a9882a2e79411d56f3e1fd83685918  7.3.772
+65793f976e3cd13d6ba9f3d40584c16a  7.3.773
+5a0e8b6fc2d5784c85ea039832d67641  7.3.774
+a5ba9b3b9a1152c5be34dc13febc7950  7.3.775
+c55117708c70f883e6db1a940a30fe2b  7.3.776
+8338b979e35b7048b50453a98bbf4532  7.3.777
+be191f4db81309b22f16accceead7748  7.3.778
+c25f516df1a6f4e91bb03596ef123952  7.3.779
+29bc8f46fec4f3f5d49d4280feb7fa35  7.3.780
+1207767150015dbafbc74d7b8405cdec  7.3.781
+83a1a0ae88c37c97c237a2d6555e0cd7  7.3.782
+9d7aec8d3c5e4b5344d8203e1b5efce6  7.3.783
+a4b70df647438d5904f6a8ec02879ee1  7.3.784
+abbdecdc9efc9be9f6dac03a37268520  7.3.785
+a020433516fc2d9afab5186fc56d9fa1  7.3.786
+f96930682ad10b23e1a70540b6ab3d8c  7.3.787
+2e53c81838fd8c17018c1f24704bddb8  7.3.788
+ac01ff688623aad44b3ec1c6cf44ffe9  7.3.789
+f4dad2ef2444a565a869c92589c713ce  7.3.790
+38b8fb23f2a7e62c2e085e3908142f4c  7.3.791
+b5f040a56b0ecfa75ec80d3f6e940ce1  7.3.792
+b7ef33f3d9632ce55b18a2c8d566e306  7.3.793
+a495c230f69bfdd8c5759f62b97c602e  7.3.794
+62d2214429441abc2532736046feaa32  7.3.795
+d820b7899584a76615c5bfaeac99cecb  7.3.796
+b9d5040f551e27ba00fa8af05956f8e4  7.3.797
+09c965b1245f4bd4b218a64cef11130b  7.3.798
+6ef0a3c4d4c09ec1d7c3e5a622486281  7.3.799
+d4ae3cb2665e16fcbc5486f59feeaa79  7.3.800
+1681c127f2aa8bdba9d6844b59fecebf  7.3.801
+af0e2f7ee0934107e8f6427f26ce57d7  7.3.802
+6099115d1de823d7c4db760eaf7e0b49  7.3.803
+6595af234c5e2ed6d293b022952620d6  7.3.804
+36f9da91d4275d298a38d8a3782d93c7  7.3.805
+5c87d23889ee90e363418e7225067158  7.3.806
+375e799b20798f0c48da1260f06beb8b  7.3.807
+89d06c08901d59f528c41ff8222726f6  7.3.808
+ca40dd8b3565b95d8ba79f91178b166e  7.3.809
+44da6a1159468cc2f901c38c8b8249f9  7.3.810
+a24bef95639d7a5b949b25a3f4869d7a  7.3.811
+80441a6cf1565be9311ea87668e6fd9e  7.3.812
+7b1626326917577e5949531cd8548474  7.3.813
+8ece3a0fb3f87fa42f7465415e970bd8  7.3.814
+17cc83581cc8c0b3208c5fc11588255f  7.3.815
+b712b854580eb6842c423f75eb0e3474  7.3.816
+cf1c2b392a9b8e0b568e1d0213ea2b2e  7.3.817
+22745f101e8ad1fede4f4b3b6101a9bb  7.3.818
+30137ebb501f34ef25fc740bb3146e84  7.3.819
+0d34f0a6a04288282dcfb2eccb24722b  7.3.820
+be6c083ee5624621eaec22198bc516b1  7.3.821
+4ee4672fdd33a392010542497d4638fc  7.3.822
+083123561537365a520aeb07a0f43b4a  7.3.823
+b97638fa86f0f4651402a58089480ab6  7.3.824
+415a5269dd35fcfbef03a9d82a4f48e4  7.3.825
+c930b4e1c52dfa262cb0a55f12231306  7.3.826
+cdace24f2193d2e4ed04166481d6276d  7.3.827
+4215b471adda7c16bfdbe87da73b6af0  7.3.828
+186bc7b9036620cfa70677951e227b2d  7.3.829
+94f2416ff615a769750b07b7aaa00179  7.3.830
+4d061236f08a1b077e017f0246c9e4a6  7.3.831
+312223ba089ae771aaa564c0d08a662e  7.3.832
+583ff52dfc79893762283ead7a0e3aee  7.3.833
+ccf2e81d30b95d5e706be57f5a72583c  7.3.834
+c71152054f5f2f1296801b1263cb0f82  7.3.835
+0eb860a53f948645085c5236b0819af4  7.3.836
+51f60b66613b7535855d1e592f544d83  7.3.837
+6a8c2cf0c38024d056820f93e3590de5  7.3.838
+3a1e2a7ef2cb8c98a75e4121d58ebd59  7.3.839
+21e3dcb67ba9926ec7ab8b92c1c3869e  7.3.840
+ca0b0640f383d02715aa74ade316fbd9  7.3.841
+a52eb40ecb77d8fc07a8229cd0c07121  7.3.842
+db29c4289936ea6a94ea7cda8aef4e62  7.3.843
+cce5250b4ea9a362bbefc591c519259a  7.3.844
+16c3883653cf2e13a6941f1d5734b48e  7.3.845
+34dd4ebffd4b84e0abbd9271497159fe  7.3.846
+12fd92c34db268c53e386a8bef5fdc30  7.3.847
+81d762df01e532a439a7ce729eb7e13d  7.3.848
+9a25ed7501d8fa17e9961b607470cd21  7.3.849
+5b59690cf254b2c200abed4e99d54afa  7.3.850
+10ba00ee007cfca5100616a77d3d2ea9  7.3.851
+21c9217486bb1e3df06a5f15295c521f  7.3.852
+99397a46ea6c51d1daecd839fc1632b5  7.3.853
+4746af04bc1010db7e7d09b6e093dd7b  7.3.854
+8ee74cd7a5b471a1260c2ad2acea76f9  7.3.855
+e92fba85962d34e3a92029ecf560a1c5  7.3.856
+26624bb8fda0afedbe66958c1eec7934  7.3.857
+676c6846fd6b27ea0b4ce99f577cceac  7.3.858
+5e462df56c193c638ef59ba3c17c3c16  7.3.859
+b64d2e983a97fd6443caf527b7bfcff0  7.3.860
+773f969b30d9319a70e52dad8d1ae9f2  7.3.861
+306503f664cbf27230f7bf3d38241b6d  7.3.862
+334dda5675fdf63514e6c50ed7925300  7.3.863
+226e51b926f21f7ca9eabaf37fd4a163  7.3.864
+48db280a90fa940da0788f6935623482  7.3.865
+98777b095472a723303f0f195f924d46  7.3.866
+70ba85ebf2ff2f5917844cf9a0f27f54  7.3.867
+7945144a244146248727c67f5f868e35  7.3.868
+6c3102de4b796b085622977286825324  7.3.869
+8e03e9399b3f8a0440ac324b75d44db6  7.3.870
+f888f5aea1b5f456fcedcbbfac6b7cb3  7.3.871
+bd47f2b08911ad0db8209c5f02380a5d  7.3.872
+4e1bafa141c88f83d868de096c431e43  7.3.873
+6e4a64e9e9b392bcf0d2488f07c80608  7.3.874
+abb4523022f7c6c86c43256f80a74550  7.3.875
+437a021bf523442732f1e31f29579e68  7.3.876
+8b71b930825e91e8f7af6aef3b714080  7.3.877
+f69bd305333a102f4f76c40143bf3d2f  7.3.878
+82ea66e60b9e1d3d534352d12534ddf2  7.3.879
+553ee873fb23b8df6262db61de925493  7.3.880
+9ab615958983c113e0e90028cc05256e  7.3.881
+5548c8d030b55771e1887f08522cbe36  7.3.882
+e263181d7409e8bde32520c8314ff2f9  7.3.883
+953f60cb265903910a537bf625e096a6  7.3.884
+2a096f77c95248226b7d4b7eda58a995  7.3.885
+ddef20eb6b2651480f1e52da247d84c0  7.3.886
+2aa53676316887e8c5bcaefe51211c3c  7.3.887
+e087de5e2224b5cd050e34fe371d1261  7.3.888
+71cb3a6d8962c31d094fd335422b6554  7.3.889
+17f6cad309413a38ee09d2eff398a23d  7.3.890
+0ec87c049ab5567d27dc8ff3a29957f7  7.3.891
+2b455dccd2b837efc3af2f2541d90c0a  7.3.892
+b788907206eb4f545de17b2bc5d58674  7.3.893
+9e94c1259a0520661394e33a923fb0ff  7.3.894
+023fcd7d2da2c016c104ce8906ac626e  7.3.895
+8b7cf7447274cb1d32c20b36a51a1f54  7.3.896
+dad8233549d769eba5309e83d65c5a65  7.3.897
+6c6ed2327e4fc08f8051ebb30e0a850a  7.3.898
+60d3359f67a739f9b2b3d51d7c72d0b0  7.3.899
+13041bb9c1123664ea7e53bb86efdee8  7.3.900
+9267fe6ba3b2ca1d7e4ca96d53c228d7  7.3.901
+d500094667b57225a2318c264c07a575  7.3.902
+c0699792e503297752b73ae67821e4b6  7.3.903
+d127bb5702e158368edaddb7a4f7a21d  7.3.904
+90e35d3ec6239a976c8489c2eee293db  7.3.905
 5b9510a17074e2b37d8bb38ae09edbf2  vim-7.3.tar.bz2

Added: csw/mgar/pkg/vim/trunk/files/0003-solaris-sleep-does-not-do-decimals.patch
===================================================================
--- csw/mgar/pkg/vim/trunk/files/0003-solaris-sleep-does-not-do-decimals.patch	                        (rev 0)
+++ csw/mgar/pkg/vim/trunk/files/0003-solaris-sleep-does-not-do-decimals.patch	2013-04-22 07:38:26 UTC (rev 20836)
@@ -0,0 +1,11 @@
+--- src/testdir/Makefile.orig	Sat Apr 20 01:19:56 2013
++++ src/testdir/Makefile	Sat Apr 20 11:36:29 2013
+@@ -70,7 +70,7 @@
+ 	-rm -rf $*.failed test.ok $(RM_ON_RUN)
+ 	cp $*.ok test.ok
+ 	# Sleep a moment to avoid that the xterm title is messed up
+-	@-sleep .2
++	@-sleep 1
+ 	-$(RUN_VIM) $*.in
+ 
+ 	# For flaky tests retry one time.

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


From chninkel at users.sourceforge.net  Mon Apr 22 09:51:27 2013
From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net)
Date: Mon, 22 Apr 2013 07:51:27 +0000
Subject: [csw-devel] SF.net SVN: gar:[20837] csw/mgar/gar/v2/lib/python
Message-ID: <E1UUBX5-0005c7-AG@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 20837
          http://gar.svn.sourceforge.net/gar/?rev=20837&view=rev
Author:   chninkel
Date:     2013-04-22 07:51:26 +0000 (Mon, 22 Apr 2013)
Log Message:
-----------
checkpkg: ldd: do not even check binaries from a different architecture

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

Modified: csw/mgar/gar/v2/lib/python/inspective_package.py
===================================================================
--- csw/mgar/gar/v2/lib/python/inspective_package.py	2013-04-22 07:38:26 UTC (rev 20836)
+++ csw/mgar/gar/v2/lib/python/inspective_package.py	2013-04-22 07:51:26 UTC (rev 20837)
@@ -333,7 +333,10 @@
 
   def GetLddMinusRlines(self):
     """Returns ldd -r output."""
-    binaries = self.ListBinaries()
+    pkginfo_arch = self.GetParsedPkginfo()['ARCH']
+    binaries = [ f['path'] for f in self.GetFilesMetadata()
+                 if sharedlib_utils.IsBinary(f) and
+                    common_constants.MACHINE_ID_METADATA[f['machine_id']]['type'] == pkginfo_arch ]
     base_dir = self.GetBasedir()
     ldd_output = {}
     for binary in binaries:
@@ -354,17 +357,13 @@
         #    solaris 9 exists only in 32 bits, so we can't do this
         #    We ignore the error as it is likely that the ldd infos will be
         #    the same on the 32 bits binaries
-        #  - if we are trying to analyze a binary from another architecture
-        #    we ignore this error as it will be caught by another checkpkg test
         #  - if we are trying to analyze a statically linked binaries
         #    we care only about dynamic binary so we ignore the error
         #
         uname_info = os.uname()
         if ((uname_info[2] == '5.9' and uname_info[4] == 'i86pc' and
              '/amd64/' in binary_abspath and
-             'has wrong class or data encoding' in stderr) or
-            re.search(r'ELF machine type: EM_\w+: '
-                      r'is incompatible with system', stderr)
+             'has wrong class or data encoding' in stderr)
             or 'file is not a dynamic executable or shared object' in stderr):
           ldd_output[binary] = []
           continue

Modified: csw/mgar/gar/v2/lib/python/inspective_package_test.py
===================================================================
--- csw/mgar/gar/v2/lib/python/inspective_package_test.py	2013-04-22 07:38:26 UTC (rev 20836)
+++ csw/mgar/gar/v2/lib/python/inspective_package_test.py	2013-04-22 07:51:26 UTC (rev 20837)
@@ -314,14 +314,21 @@
 
   def testGetLddMinusRlinesRoot(self):
     ip = inspective_package.InspectivePackage("/tmp/CSWfake")
+    self.mox.StubOutWithMock(ip, 'GetParsedPkginfo')
+    self.mox.StubOutWithMock(ip, 'GetFilesMetadata')
     self.mox.StubOutWithMock(ip, 'GetBasedir')
     self.mox.StubOutWithMock(ip, 'ListBinaries')
     self.mox.StubOutWithMock(ip, 'GetFilesDir')
     self.mox.StubOutWithMock(os, 'chmod')
     self.mox.StubOutWithMock(os, 'uname')
+    ip.GetParsedPkginfo().AndReturn({'ARCH': 'i386'})
+    ip.GetFilesMetadata().AndReturn([{
+      'path': 'opt/csw/bin/foo',
+      'machine_id': 3,
+      'mime_type': 'application/x-executable; charset=binary'
+      }])
     ip.GetBasedir().AndReturn('')
     os.chmod('/tmp/CSWfake/root/opt/csw/bin/foo', 0755)
-    ip.ListBinaries().AndReturn(['opt/csw/bin/foo'])
     ip.GetFilesDir().AndReturn('root')
     self.mox.StubOutWithMock(shell, 'ShellCommand')
     shell.ShellCommand(
@@ -333,14 +340,20 @@
 
   def testGetLddMinusRlinesReloc(self):
     ip = inspective_package.InspectivePackage("/tmp/CSWfake")
+    self.mox.StubOutWithMock(ip, 'GetParsedPkginfo')
+    self.mox.StubOutWithMock(ip, 'GetFilesMetadata')
     self.mox.StubOutWithMock(ip, 'GetBasedir')
-    self.mox.StubOutWithMock(ip, 'ListBinaries')
     self.mox.StubOutWithMock(ip, 'GetFilesDir')
     self.mox.StubOutWithMock(os, 'chmod')
     self.mox.StubOutWithMock(os, 'uname')
+    ip.GetParsedPkginfo().AndReturn({'ARCH': 'i386'})
+    ip.GetFilesMetadata().AndReturn([{
+      'path': 'bin/foo',
+      'machine_id': 3,
+      'mime_type': 'application/x-executable; charset=binary'
+      }])
     ip.GetBasedir().AndReturn('opt/csw')
     os.chmod('/tmp/CSWfake/reloc/bin/foo', 0755)
-    ip.ListBinaries().AndReturn(['bin/foo'])
     ip.GetFilesDir().AndReturn('reloc')
     self.mox.StubOutWithMock(shell, 'ShellCommand')
     shell.ShellCommand(
@@ -352,16 +365,22 @@
 
   def testGetLddMinusRlinesThrows(self):
     ip = inspective_package.InspectivePackage("/tmp/CSWfake")
+    self.mox.StubOutWithMock(ip, 'GetParsedPkginfo')
+    self.mox.StubOutWithMock(ip, 'GetFilesMetadata')
     self.mox.StubOutWithMock(ip, 'GetBasedir')
-    self.mox.StubOutWithMock(ip, 'ListBinaries')
     self.mox.StubOutWithMock(ip, 'GetFilesDir')
     self.mox.StubOutWithMock(os, 'chmod')
     self.mox.StubOutWithMock(os, 'uname')
+    ip.GetParsedPkginfo().AndReturn({'ARCH': 'i386'})
+    ip.GetFilesMetadata().AndReturn([{
+      'path': 'opt/csw/bin/foo',
+      'machine_id': 3,
+      'mime_type': 'application/x-executable; charset=binary'
+      }])
     ip.GetBasedir().AndReturn('/')
     os.chmod('/tmp/CSWfake/root/opt/csw/bin/foo', 0755)
     os.uname().AndReturn('i86pc')
     ip.GetFilesDir().AndReturn('root')
-    ip.ListBinaries().AndReturn(['opt/csw/bin/foo'])
     self.mox.StubOutWithMock(shell, 'ShellCommand')
     shell.ShellCommand(
         ['ldd', '-Ur', '/tmp/CSWfake/root/opt/csw/bin/foo'],

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


From chninkel at users.sourceforge.net  Mon Apr 22 09:54:09 2013
From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net)
Date: Mon, 22 Apr 2013 07:54:09 +0000
Subject: [csw-devel] SF.net SVN: gar:[20838]
	csw/mgar/gar/v2/lib/python/inspective_package.py
Message-ID: <E1UUBZh-0005ev-K7@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 20838
          http://gar.svn.sourceforge.net/gar/?rev=20838&view=rev
Author:   chninkel
Date:     2013-04-22 07:54:09 +0000 (Mon, 22 Apr 2013)
Log Message:
-----------
pkgdb: ldd: add another error message to handle

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

Modified: csw/mgar/gar/v2/lib/python/inspective_package.py
===================================================================
--- csw/mgar/gar/v2/lib/python/inspective_package.py	2013-04-22 07:51:26 UTC (rev 20837)
+++ csw/mgar/gar/v2/lib/python/inspective_package.py	2013-04-22 07:54:09 UTC (rev 20838)
@@ -515,7 +515,7 @@
                            r' unused dependency of (?P<binary>.*)$')
     unused_object = (r'^\s*unused object=.*$')
     unused_search_path = (r'^\s*unused search path=.*'
-                          r'  \(RUNPATH/RPATH from file .*\)$')
+                          r'  \((?:LD_LIBRARY_PATH|RUNPATH/RPATH from file .*)\)$')
     move_offset_error = (r'^\tmove (?P<move_index>\d+) offset invalid: '
                          r'\(unknown\): offset=(?P<move_offset>0x[0-9a-f]+) '
                          'lies outside memory image; move discarded')

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 Apr 22 14:52:26 2013
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Mon, 22 Apr 2013 12:52:26 +0000
Subject: [csw-devel] SF.net SVN: gar:[20839] csw/mgar/pkg/tmux/trunk/files/
 0001-Make-location-of-tmux.conf-relative-to-sysconfdir.patch
Message-ID: <E1UUGEM-00030M-DB@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 20839
          http://gar.svn.sourceforge.net/gar/?rev=20839&view=rev
Author:   dmichelsen
Date:     2013-04-22 12:52:26 +0000 (Mon, 22 Apr 2013)
Log Message:
-----------
tmux: Add location patch

Added Paths:
-----------
    csw/mgar/pkg/tmux/trunk/files/0001-Make-location-of-tmux.conf-relative-to-sysconfdir.patch

Added: csw/mgar/pkg/tmux/trunk/files/0001-Make-location-of-tmux.conf-relative-to-sysconfdir.patch
===================================================================
--- csw/mgar/pkg/tmux/trunk/files/0001-Make-location-of-tmux.conf-relative-to-sysconfdir.patch	                        (rev 0)
+++ csw/mgar/pkg/tmux/trunk/files/0001-Make-location-of-tmux.conf-relative-to-sysconfdir.patch	2013-04-22 12:52:26 UTC (rev 20839)
@@ -0,0 +1,12374 @@
+From 5547c378f07ecb7b64e2c0f8a0fec345c75873c4 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Sun, 21 Apr 2013 10:24:49 +0200
+Subject: [PATCH] Make location of tmux.conf relative to sysconfdir
+
+---
+ configure.ac |    2 +
+ tmux.1       | 3808 ----------------------------------------------------------
+ tmux.1.in    | 3808 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ tmux.h       | 2352 ------------------------------------
+ tmux.h.in    | 2352 ++++++++++++++++++++++++++++++++++++
+ 5 files changed, 6162 insertions(+), 6160 deletions(-)
+ delete mode 100644 tmux.1
+ create mode 100644 tmux.1.in
+ delete mode 100644 tmux.h
+ create mode 100644 tmux.h.in
+
+diff --git a/configure.ac b/configure.ac
+index f00937f..0163450 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -479,3 +479,5 @@ AM_CONDITIONAL(IS_UNKNOWN, test "x$PLATFORM" = xunknown)
+ 
+ # autoconf should create a Makefile. A shock!
+ AC_OUTPUT(Makefile)
++AC_OUTPUT(tmux.1)
++AC_OUTPUT(tmux.h)
+diff --git a/tmux.1 b/tmux.1
+deleted file mode 100644
+index 98bf957..0000000
+--- a/tmux.1
++++ /dev/null
+@@ -1,3808 +0,0 @@
+-.\" $Id$
+-.\"
+-.\" Copyright (c) 2007 Nicholas Marriott <nicm at users.sourceforge.net>
+-.\"
+-.\" Permission to use, copy, modify, and distribute this software for any
+-.\" purpose with or without fee is hereby granted, provided that the above
+-.\" copyright notice and this permission notice appear in all copies.
+-.\"
+-.\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+-.\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+-.\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+-.\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+-.\" WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER
+-.\" IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+-.\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+-.\"
+-.Dd $Mdocdate: March 25 2013 $
+-.Dt TMUX 1
+-.Os
+-.Sh NAME
+-.Nm tmux
+-.Nd terminal multiplexer
+-.Sh SYNOPSIS
+-.Nm tmux
+-.Bk -words
+-.Op Fl 28lCquvV
+-.Op Fl c Ar shell-command
+-.Op Fl f Ar file
+-.Op Fl L Ar socket-name
+-.Op Fl S Ar socket-path
+-.Op Ar command Op Ar flags
+-.Ek
+-.Sh DESCRIPTION
+-.Nm
+-is a terminal multiplexer:
+-it enables a number of terminals to be created, accessed, and
+-controlled from a single screen.
+-.Nm
+-may be detached from a screen
+-and continue running in the background,
+-then later reattached.
+-.Pp
+-When
+-.Nm
+-is started it creates a new
+-.Em session
+-with a single
+-.Em window
+-and displays it on screen.
+-A status line at the bottom of the screen
+-shows information on the current session
+-and is used to enter interactive commands.
+-.Pp
+-A session is a single collection of
+-.Em pseudo terminals
+-under the management of
+-.Nm .
+-Each session has one or more
+-windows linked to it.
+-A window occupies the entire screen
+-and may be split into rectangular panes,
+-each of which is a separate pseudo terminal
+-(the
+-.Xr pty 4
+-manual page documents the technical details of pseudo terminals).
+-Any number of
+-.Nm
+-instances may connect to the same session,
+-and any number of windows may be present in the same session.
+-Once all sessions are killed,
+-.Nm
+-exits.
+-.Pp
+-Each session is persistent and will survive accidental disconnection
+-(such as
+-.Xr ssh 1
+-connection timeout) or intentional detaching (with the
+-.Ql C-b d
+-key strokes).
+-.Nm
+-may be reattached using:
+-.Pp
+-.Dl $ tmux attach
+-.Pp
+-In
+-.Nm ,
+-a session is displayed on screen by a
+-.Em client
+-and all sessions are managed by a single
+-.Em server .
+-The server and each client are separate processes which communicate through a
+-socket in
+-.Pa /tmp .
+-.Pp
+-The options are as follows:
+-.Bl -tag -width "XXXXXXXXXXXX"
+-.It Fl 2
+-Force
+-.Nm
+-to assume the terminal supports 256 colours.
+-.It Fl C
+-Start in control mode.
+-Given twice
+-.Xo ( Fl CC ) Xc
+-disables echo.
+-.It Fl c Ar shell-command
+-Execute
+-.Ar shell-command
+-using the default shell.
+-If necessary, the
+-.Nm
+-server will be started to retrieve the
+-.Ic default-shell
+-option.
+-This option is for compatibility with
+-.Xr sh 1
+-when
+-.Nm
+-is used as a login shell.
+-.It Fl f Ar file
+-Specify an alternative configuration file.
+-By default,
+-.Nm
+-loads the system configuration file from
+-.Pa /etc/tmux.conf ,
+-if present, then looks for a user configuration file at
+-.Pa ~/.tmux.conf .
+-.Pp
+-The configuration file is a set of
+-.Nm
+-commands which are executed in sequence when the server is first started.
+-.Nm
+-loads configuration files once when the server process has started.
+-The
+-.Ic source-file
+-command may be used to load a file later.
+-.Pp
+-.Nm
+-shows any error messages from commands in configuration files in the first
+-session created, and continues to process the rest of the configuration file.
+-.It Fl L Ar socket-name
+-.Nm
+-stores the server socket in a directory under
+-.Ev TMUX_TMPDIR ,
+-.Ev TMPDIR
+-if it is unset, or
+-.Pa /tmp
+-if both are unset.
+-The default socket is named
+-.Em default .
+-This option allows a different socket name to be specified, allowing several
+-independent
+-.Nm
+-servers to be run.
+-Unlike
+-.Fl S
+-a full path is not necessary: the sockets are all created in the same
+-directory.
+-.Pp
+-If the socket is accidentally removed, the
+-.Dv SIGUSR1
+-signal may be sent to the
+-.Nm
+-server process to recreate it.
+-.It Fl l
+-Behave as a login shell.
+-This flag currently has no effect and is for compatibility with other shells
+-when using tmux as a login shell.
+-.It Fl q
+-Set the
+-.Ic quiet
+-server option to prevent the server sending various informational messages.
+-.It Fl S Ar socket-path
+-Specify a full alternative path to the server socket.
+-If
+-.Fl S
+-is specified, the default socket directory is not used and any
+-.Fl L
+-flag is ignored.
+-.It Fl u
+-.Nm
+-attempts to guess if the terminal is likely to support UTF-8 by checking the
+-first of the
+-.Ev LC_ALL ,
+-.Ev LC_CTYPE
+-and
+-.Ev LANG
+-environment variables to be set for the string "UTF-8".
+-This is not always correct: the
+-.Fl u
+-flag explicitly informs
+-.Nm
+-that UTF-8 is supported.
+-.Pp
+-If the server is started from a client passed
+-.Fl u
+-or where UTF-8 is detected, the
+-.Ic utf8
+-and
+-.Ic status-utf8
+-options are enabled in the global window and session options respectively.
+-.It Fl v
+-Request verbose logging.
+-This option may be specified multiple times for increasing verbosity.
+-Log messages will be saved into
+-.Pa tmux-client-PID.log
+-and
+-.Pa tmux-server-PID.log
+-files in the current directory, where
+-.Em PID
+-is the PID of the server or client process.
+-.It Fl V
+-Report the
+-.Nm
+-version.
+-.It Ar command Op Ar flags
+-This specifies one of a set of commands used to control
+-.Nm ,
+-as described in the following sections.
+-If no commands are specified, the
+-.Ic new-session
+-command is assumed.
+-.El
+-.Sh KEY BINDINGS
+-.Nm
+-may be controlled from an attached client by using a key combination of a
+-prefix key,
+-.Ql C-b
+-(Ctrl-b) by default, followed by a command key.
+-.Pp
+-The default command key bindings are:
+-.Pp
+-.Bl -tag -width "XXXXXXXXXX" -offset indent -compact
+-.It C-b
+-Send the prefix key (C-b) through to the application.
+-.It C-o
+-Rotate the panes in the current window forwards.
+-.It C-z
+-Suspend the
+-.Nm
+-client.
+-.It !
+-Break the current pane out of the window.
+-.It \&"
+-Split the current pane into two, top and bottom.
+-.It #
+-List all paste buffers.
+-.It $
+-Rename the current session.
+-.It %
+-Split the current pane into two, left and right.
+-.It &
+-Kill the current window.
+-.It '
+-Prompt for a window index to select.
+-.It ,
+-Rename the current window.
+-.It -
+-Delete the most recently copied buffer of text.
+-.It .
+-Prompt for an index to move the current window.
+-.It 0 to 9
+-Select windows 0 to 9.
+-.It :
+-Enter the
+-.Nm
+-command prompt.
+-.It ;
+-Move to the previously active pane.
+-.It =
+-Choose which buffer to paste interactively from a list.
+-.It \&?
+-List all key bindings.
+-.It D
+-Choose a client to detach.
+-.It \&[
+-Enter copy mode to copy text or view the history.
+-.It \&]
+-Paste the most recently copied buffer of text.
+-.It c
+-Create a new window.
+-.It d
+-Detach the current client.
+-.It f
+-Prompt to search for text in open windows.
+-.It i
+-Display some information about the current window.
+-.It l
+-Move to the previously selected window.
+-.It n
+-Change to the next window.
+-.It o
+-Select the next pane in the current window.
+-.It p
+-Change to the previous window.
+-.It q
+-Briefly display pane indexes.
+-.It r
+-Force redraw of the attached client.
+-.It s
+-Select a new session for the attached client interactively.
+-.It L
+-Switch the attached client back to the last session.
+-.It t
+-Show the time.
+-.It w
+-Choose the current window interactively.
+-.It x
+-Kill the current pane.
+-.It {
+-Swap the current pane with the previous pane.
+-.It }
+-Swap the current pane with the next pane.
+-.It ~
+-Show previous messages from
+-.Nm ,
+-if any.
+-.It Page Up
+-Enter copy mode and scroll one page up.
+-.It Up, Down
+-.It Left, Right
+-Change to the pane above, below, to the left, or to the right of the current
+-pane.
+-.It M-1 to M-5
+-Arrange panes in one of the five preset layouts: even-horizontal,
+-even-vertical, main-horizontal, main-vertical, or tiled.
+-.It M-n
+-Move to the next window with a bell or activity marker.
+-.It M-o
+-Rotate the panes in the current window backwards.
+-.It M-p
+-Move to the previous window with a bell or activity marker.
+-.It C-Up, C-Down
+-.It C-Left, C-Right
+-Resize the current pane in steps of one cell.
+-.It M-Up, M-Down
+-.It M-Left, M-Right
+-Resize the current pane in steps of five cells.
+-.El
+-.Pp
+-Key bindings may be changed with the
+-.Ic bind-key
+-and
+-.Ic unbind-key
+-commands.
+-.Sh COMMANDS
+-This section contains a list of the commands supported by
+-.Nm .
+-Most commands accept the optional
+-.Fl t
+-argument with one of
+-.Ar target-client ,
+-.Ar target-session
+-.Ar target-window ,
+-or
+-.Ar target-pane .
+-These specify the client, session, window or pane which a command should affect.
+-.Ar target-client
+-is the name of the
+-.Xr pty 4
+-file to which the client is connected, for example either of
+-.Pa /dev/ttyp1
+-or
+-.Pa ttyp1
+-for the client attached to
+-.Pa /dev/ttyp1 .
+-If no client is specified, the current client is chosen, if possible, or an
+-error is reported.
+-Clients may be listed with the
+-.Ic list-clients
+-command.
+-.Pp
+-.Ar target-session
+-is the session id prefixed with a $, the name of a session (as listed by the
+-.Ic list-sessions
+-command), or the name of a client with the same syntax as
+-.Ar target-client ,
+-in which case the session attached to the client is used.
+-When looking for the session name,
+-.Nm
+-initially searches for an exact match; if none is found, the session names
+-are checked for any for which
+-.Ar target-session
+-is a prefix or for which it matches as an
+-.Xr fnmatch 3
+-pattern.
+-If a single match is found, it is used as the target session; multiple matches
+-produce an error.
+-If a session is omitted, the current session is used if available; if no
+-current session is available, the most recently used is chosen.
+-.Pp
+-.Ar target-window
+-specifies a window in the form
+-.Em session Ns \&: Ns Em window .
+-.Em session
+-follows the same rules as for
+-.Ar target-session ,
+-and
+-.Em window
+-is looked for in order: as a window index, for example mysession:1;
+-as a window ID, such as @1;
+-as an exact window name, such as mysession:mywindow; then as an
+-.Xr fnmatch 3
+-pattern or the start of a window name, such as mysession:mywin* or
+-mysession:mywin.
+-An empty window name specifies the next unused index if appropriate (for
+-example the
+-.Ic new-window
+-and
+-.Ic link-window
+-commands)
+-otherwise the current window in
+-.Em session
+-is chosen.
+-The special character
+-.Ql \&!
+-uses the last (previously current) window,
+-.Ql ^
+-selects the highest numbered window,
+-.Ql $
+-selects the lowest numbered window, and
+-.Ql +
+-and
+-.Ql -
+-select the next window or the previous window by number.
+-When the argument does not contain a colon,
+-.Nm
+-first attempts to parse it as window; if that fails, an attempt is made to
+-match a session.
+-.Pp
+-.Ar target-pane
+-takes a similar form to
+-.Ar target-window
+-but with the optional addition of a period followed by a pane index, for
+-example: mysession:mywindow.1.
+-If the pane index is omitted, the currently active pane in the specified
+-window is used.
+-If neither a colon nor period appears,
+-.Nm
+-first attempts to use the argument as a pane index; if that fails, it is looked
+-up as for
+-.Ar target-window .
+-A
+-.Ql +
+-or
+-.Ql -
+-indicate the next or previous pane index, respectively.
+-One of the strings
+-.Em top ,
+-.Em bottom ,
+-.Em left ,
+-.Em right ,
+-.Em top-left ,
+-.Em top-right ,
+-.Em bottom-left
+-or
+-.Em bottom-right
+-may be used instead of a pane index.
+-.Pp
+-The special characters
+-.Ql +
+-and
+-.Ql -
+-may be followed by an offset, for example:
+-.Bd -literal -offset indent
+-select-window -t:+2
+-.Ed
+-.Pp
+-When dealing with a session that doesn't contain sequential window indexes,
+-they will be correctly skipped.
+-.Pp
+-.Nm
+-also gives each pane created in a server an identifier consisting of a
+-.Ql %
+-and a number, starting from zero.
+-A pane's identifier is unique for the life of the
+-.Nm
+-server and is passed to the child process of the pane in the
+-.Ev TMUX_PANE
+-environment variable.
+-It may be used alone to target a pane or the window containing it.
+-.Pp
+-.Ar shell-command
+-arguments are
+-.Xr sh 1
+-commands.
+-These must be passed as a single item, which typically means quoting them, for
+-example:
+-.Bd -literal -offset indent
+-new-window 'vi /etc/passwd'
+-.Ed
+-.Pp
+-.Ar command
+-.Op Ar arguments
+-refers to a
+-.Nm
+-command, passed with the command and arguments separately, for example:
+-.Bd -literal -offset indent
+-bind-key F1 set-window-option force-width 81
+-.Ed
+-.Pp
+-Or if using
+-.Xr sh 1 :
+-.Bd -literal -offset indent
+-$ tmux bind-key F1 set-window-option force-width 81
+-.Ed
+-.Pp
+-Multiple commands may be specified together as part of a
+-.Em command sequence .
+-Each command should be separated by spaces and a semicolon;
+-commands are executed sequentially from left to right and
+-lines ending with a backslash continue on to the next line,
+-except when escaped by another backslash.
+-A literal semicolon may be included by escaping it with a backslash (for
+-example, when specifying a command sequence to
+-.Ic bind-key ) .
+-.Pp
+-Example
+-.Nm
+-commands include:
+-.Bd -literal -offset indent
+-refresh-client -t/dev/ttyp2
+-
+-rename-session -tfirst newname
+-
+-set-window-option -t:0 monitor-activity on
+-
+-new-window ; split-window -d
+-
+-bind-key R source-file ~/.tmux.conf \e; \e
+-	display-message "source-file done"
+-.Ed
+-.Pp
+-Or from
+-.Xr sh 1 :
+-.Bd -literal -offset indent
+-$ tmux kill-window -t :1
+-
+-$ tmux new-window \e; split-window -d
+-
+-$ tmux new-session -d 'vi /etc/passwd' \e; split-window -d \e; attach
+-.Ed
+-.Sh CLIENTS AND SESSIONS
+-The
+-.Nm
+-server manages clients, sessions, windows and panes.
+-Clients are attached to sessions to interact with them, either
+-when they are created with the
+-.Ic new-session
+-command, or later with the
+-.Ic attach-session
+-command.
+-Each session has one or more windows
+-.Em linked
+-into it.
+-Windows may be linked to multiple sessions and are made up of one or
+-more panes,
+-each of which contains a pseudo terminal.
+-Commands for creating, linking and otherwise manipulating windows
+-are covered
+-in the
+-.Sx WINDOWS AND PANES
+-section.
+-.Pp
+-The following commands are available to manage clients and sessions:
+-.Bl -tag -width Ds
+-.It Xo Ic attach-session
+-.Op Fl dr
+-.Op Fl t Ar target-session
+-.Xc
+-.D1 (alias: Ic attach )
+-If run from outside
+-.Nm ,
+-create a new client in the current terminal and attach it to
+-.Ar target-session .
+-If used from inside, switch the current client.
+-If
+-.Fl d
+-is specified, any other clients attached to the session are detached.
+-.Fl r
+-signifies the client is read-only (only keys bound to the
+-.Ic detach-client
+-or
+-.Ic switch-client
+-commands have any effect)
+-.Pp
+-If no server is started,
+-.Ic attach-session
+-will attempt to start it; this will fail unless sessions are created in the
+-configuration file.
+-.Pp
+-The
+-.Ar target-session
+-rules for
+-.Ic attach-session
+-are slightly adjusted: if
+-.Nm
+-needs to select the most recently used session, it will prefer the most
+-recently used
+-.Em unattached
+-session.
+-.It Xo Ic detach-client
+-.Op Fl P
+-.Op Fl a
+-.Op Fl s Ar target-session
+-.Op Fl t Ar target-client
+-.Xc
+-.D1 (alias: Ic detach )
+-Detach the current client if bound to a key, the client specified with
+-.Fl t ,
+-or all clients currently attached to the session specified by
+-.Fl s .
+-The
+-.Fl a
+-option kills all but the client given with
+-.Fl t .
+-If
+-.Fl P
+-is given, send SIGHUP to the parent process of the client, typically causing it
+-to exit.
+-.It Ic has-session Op Fl t Ar target-session
+-.D1 (alias: Ic has )
+-Report an error and exit with 1 if the specified session does not exist.
+-If it does exist, exit with 0.
+-.It Ic kill-server
+-Kill the
+-.Nm
+-server and clients and destroy all sessions.
+-.It Ic kill-session
+-.Op Fl a
+-.Op Fl t Ar target-session
+-Destroy the given session, closing any windows linked to it and no other
+-sessions, and detaching all clients attached to it.
+-If
+-.Fl a
+-is given, all sessions but the specified one is killed.
+-.It Xo Ic list-clients
+-.Op Fl F Ar format
+-.Op Fl t Ar target-session
+-.Xc
+-.D1 (alias: Ic lsc )
+-List all clients attached to the server.
+-For the meaning of the
+-.Fl F
+-flag, see the
+-.Sx FORMATS
+-section.
+-If
+-.Ar target-session
+-is specified, list only clients connected to that session.
+-.It Ic list-commands
+-.D1 (alias: Ic lscm )
+-List the syntax of all commands supported by
+-.Nm .
+-.It Ic list-sessions Op Fl F Ar format
+-.D1 (alias: Ic ls )
+-List all sessions managed by the server.
+-For the meaning of the
+-.Fl F
+-flag, see the
+-.Sx FORMATS
+-section.
+-.It Ic lock-client Op Fl t Ar target-client
+-.D1 (alias: Ic lockc )
+-Lock
+-.Ar target-client ,
+-see the
+-.Ic lock-server
+-command.
+-.It Ic lock-session Op Fl t Ar target-session
+-.D1 (alias: Ic locks )
+-Lock all clients attached to
+-.Ar target-session .
+-.It Xo Ic new-session
+-.Op Fl AdDP
+-.Op Fl F Ar format
+-.Op Fl n Ar window-name
+-.Op Fl s Ar session-name
+-.Op Fl t Ar target-session
+-.Op Fl x Ar width
+-.Op Fl y Ar height
+-.Op Ar shell-command
+-.Xc
+-.D1 (alias: Ic new )
+-Create a new session with name
+-.Ar session-name .
+-.Pp
+-The new session is attached to the current terminal unless
+-.Fl d
+-is given.
+-.Ar window-name
+-and
+-.Ar shell-command
+-are the name of and shell command to execute in the initial window.
+-If
+-.Fl d
+-is used,
+-.Fl x
+-and
+-.Fl y
+-specify the size of the initial window (80 by 24 if not given).
+-.Pp
+-If run from a terminal, any
+-.Xr termios 4
+-special characters are saved and used for new windows in the new session.
+-.Pp
+-The
+-.Fl A
+-flag makes
+-.Ic new-session
+-behave like
+-.Ic attach-session
+-if
+-.Ar session-name
+-already exists; in the case,
+-.Fl D
+-behaves like
+-.Fl d
+-to
+-.Ic attach-session .
+-.Pp
+-If
+-.Fl t
+-is given, the new session is
+-.Em grouped
+-with
+-.Ar target-session .
+-This means they share the same set of windows - all windows from
+-.Ar target-session
+-are linked to the new session and any subsequent new windows or windows being
+-closed are applied to both sessions.
+-The current and previous window and any session options remain independent and
+-either session may be killed without affecting the other.
+-Giving
+-.Fl n
+-or
+-.Ar shell-command
+-are invalid if
+-.Fl t
+-is used.
+-.Pp
+-The
+-.Fl P
+-option prints information about the new session after it has been created.
+-By default, it uses the format
+-.Ql #{session_name}:
+-but a different format may be specified with
+-.Fl F .
+-.It Xo Ic refresh-client
+-.Op Fl S
+-.Op Fl t Ar target-client
+-.Xc
+-.D1 (alias: Ic refresh )
+-Refresh the current client if bound to a key, or a single client if one is given
+-with
+-.Fl t .
+-If
+-.Fl S
+-is specified, only update the client's status bar.
+-.It Xo Ic rename-session
+-.Op Fl t Ar target-session
+-.Ar new-name
+-.Xc
+-.D1 (alias: Ic rename )
+-Rename the session to
+-.Ar new-name .
+-.It Xo Ic show-messages
+-.Op Fl t Ar target-client
+-.Xc
+-.D1 (alias: Ic showmsgs )
+-Any messages displayed on the status line are saved in a per-client message
+-log, up to a maximum of the limit set by the
+-.Ar message-limit
+-session option for the session attached to that client.
+-This command displays the log for
+-.Ar target-client .
+-.It Ic source-file Ar path
+-.D1 (alias: Ic source )
+-Execute commands from
+-.Ar path .
+-.It Ic start-server
+-.D1 (alias: Ic start )
+-Start the
+-.Nm
+-server, if not already running, without creating any sessions.
+-.It Xo Ic suspend-client
+-.Op Fl t Ar target-client
+-.Xc
+-.D1 (alias: Ic suspendc )
+-Suspend a client by sending
+-.Dv SIGTSTP
+-(tty stop).
+-.It Xo Ic switch-client
+-.Op Fl lnpr
+-.Op Fl c Ar target-client
+-.Op Fl t Ar target-session
+-.Xc
+-.D1 (alias: Ic switchc )
+-Switch the current session for client
+-.Ar target-client
+-to
+-.Ar target-session .
+-If
+-.Fl l ,
+-.Fl n
+-or
+-.Fl p
+-is used, the client is moved to the last, next or previous session
+-respectively.
+-.Fl r
+-toggles whether a client is read-only (see the
+-.Ic attach-session
+-command).
+-.El
+-.Sh WINDOWS AND PANES
+-A
+-.Nm
+-window may be in one of several modes.
+-The default permits direct access to the terminal attached to the window.
+-The other is copy mode, which permits a section of a window or its
+-history to be copied to a
+-.Em paste buffer
+-for later insertion into another window.
+-This mode is entered with the
+-.Ic copy-mode
+-command, bound to
+-.Ql \&[
+-by default.
+-It is also entered when a command that produces output, such as
+-.Ic list-keys ,
+-is executed from a key binding.
+-.Pp
+-The keys available depend on whether emacs or vi mode is selected
+-(see the
+-.Ic mode-keys
+-option).
+-The following keys are supported as appropriate for the mode:
+-.Bl -column "FunctionXXXXXXXXXXXXXXXXX" "viXXXXXXXXXX" "emacs" -offset indent
+-.It Sy "Function" Ta Sy "vi" Ta Sy "emacs"
+-.It Li "Back to indentation" Ta "^" Ta "M-m"
+-.It Li "Bottom of history" Ta "G" Ta "M-<"
+-.It Li "Clear selection" Ta "Escape" Ta "C-g"
+-.It Li "Copy selection" Ta "Enter" Ta "M-w"
+-.It Li "Cursor down" Ta "j" Ta "Down"
+-.It Li "Cursor left" Ta "h" Ta "Left"
+-.It Li "Cursor right" Ta "l" Ta "Right"
+-.It Li "Cursor to bottom line" Ta "L" Ta ""
+-.It Li "Cursor to middle line" Ta "M" Ta "M-r"
+-.It Li "Cursor to top line" Ta "H" Ta "M-R"
+-.It Li "Cursor up" Ta "k" Ta "Up"
+-.It Li "Delete entire line" Ta "d" Ta "C-u"
+-.It Li "Delete/Copy to end of line" Ta "D" Ta "C-k"
+-.It Li "End of line" Ta "$" Ta "C-e"
+-.It Li "Go to line" Ta ":" Ta "g"
+-.It Li "Half page down" Ta "C-d" Ta "M-Down"
+-.It Li "Half page up" Ta "C-u" Ta "M-Up"
+-.It Li "Jump forward" Ta "f" Ta "f"
+-.It Li "Jump to forward" Ta "t" Ta ""
+-.It Li "Jump backward" Ta "F" Ta "F"
+-.It Li "Jump to backward" Ta "T" Ta ""
+-.It Li "Jump again" Ta ";" Ta ";"
+-.It Li "Jump again in reverse" Ta "," Ta ","
+-.It Li "Next page" Ta "C-f" Ta "Page down"
+-.It Li "Next space" Ta "W" Ta ""
+-.It Li "Next space, end of word" Ta "E" Ta ""
+-.It Li "Next word" Ta "w" Ta ""
+-.It Li "Next word end" Ta "e" Ta "M-f"
+-.It Li "Paste buffer" Ta "p" Ta "C-y"
+-.It Li "Previous page" Ta "C-b" Ta "Page up"
+-.It Li "Previous word" Ta "b" Ta "M-b"
+-.It Li "Previous space" Ta "B" Ta ""
+-.It Li "Quit mode" Ta "q" Ta "Escape"
+-.It Li "Rectangle toggle" Ta "v" Ta "R"
+-.It Li "Scroll down" Ta "C-Down or C-e" Ta "C-Down"
+-.It Li "Scroll up" Ta "C-Up or C-y" Ta "C-Up"
+-.It Li "Search again" Ta "n" Ta "n"
+-.It Li "Search again in reverse" Ta "N" Ta "N"
+-.It Li "Search backward" Ta "?" Ta "C-r"
+-.It Li "Search forward" Ta "/" Ta "C-s"
+-.It Li "Start of line" Ta "0" Ta "C-a"
+-.It Li "Start selection" Ta "Space" Ta "C-Space"
+-.It Li "Top of history" Ta "g" Ta "M->"
+-.It Li "Transpose characters" Ta "" Ta "C-t"
+-.El
+-.Pp
+-The next and previous word keys use space and the
+-.Ql - ,
+-.Ql _
+-and
+-.Ql @
+-characters as word delimiters by default, but this can be adjusted by
+-setting the
+-.Em word-separators
+-session option.
+-Next word moves to the start of the next word, next word end to the end of the
+-next word and previous word to the start of the previous word.
+-The three next and previous space keys work similarly but use a space alone as
+-the word separator.
+-.Pp
+-The jump commands enable quick movement within a line.
+-For instance, typing
+-.Ql f
+-followed by
+-.Ql /
+-will move the cursor to the next
+-.Ql /
+-character on the current line.
+-A
+-.Ql \&;
+-will then jump to the next occurrence.
+-.Pp
+-Commands in copy mode may be prefaced by an optional repeat count.
+-With vi key bindings, a prefix is entered using the number keys; with
+-emacs, the Alt (meta) key and a number begins prefix entry.
+-For example, to move the cursor forward by ten words, use
+-.Ql M-1 0 M-f
+-in emacs mode, and
+-.Ql 10w
+-in vi.
+-.Pp
+-When copying the selection, the repeat count indicates the buffer index to
+-replace, if used.
+-.Pp
+-Mode key bindings are defined in a set of named tables:
+-.Em vi-edit
+-and
+-.Em emacs-edit
+-for keys used when line editing at the command prompt;
+-.Em vi-choice
+-and
+-.Em emacs-choice
+-for keys used when choosing from lists (such as produced by the
+-.Ic choose-window
+-command); and
+-.Em vi-copy
+-and
+-.Em emacs-copy
+-used in copy mode.
+-The tables may be viewed with the
+-.Ic list-keys
+-command and keys modified or removed with
+-.Ic bind-key
+-and
+-.Ic unbind-key .
+-One command accepts an argument,
+-.Ic copy-pipe ,
+-which copies the selection and pipes it to a command.
+-For example the following will bind
+-.Ql C-q
+-to copy the selection into
+-.Pa /tmp
+-as well as the paste buffer:
+-.Bd -literal -offset indent
+-bind-key -temacs-copy C-q copy-pipe "cat >/tmp/out"
+-.Ed
+-.Pp
+-The paste buffer key pastes the first line from the top paste buffer on the
+-stack.
+-.Pp
+-The synopsis for the
+-.Ic copy-mode
+-command is:
+-.Bl -tag -width Ds
+-.It Xo Ic copy-mode
+-.Op Fl u
+-.Op Fl t Ar target-pane
+-.Xc
+-Enter copy mode.
+-The
+-.Fl u
+-option scrolls one page up.
+-.El
+-.Pp
+-Each window displayed by
+-.Nm
+-may be split into one or more
+-.Em panes ;
+-each pane takes up a certain area of the display and is a separate terminal.
+-A window may be split into panes using the
+-.Ic split-window
+-command.
+-Windows may be split horizontally (with the
+-.Fl h
+-flag) or vertically.
+-Panes may be resized with the
+-.Ic resize-pane
+-command (bound to
+-.Ql C-up ,
+-.Ql C-down
+-.Ql C-left
+-and
+-.Ql C-right
+-by default), the current pane may be changed with the
+-.Ic select-pane
+-command and the
+-.Ic rotate-window
+-and
+-.Ic swap-pane
+-commands may be used to swap panes without changing their position.
+-Panes are numbered beginning from zero in the order they are created.
+-.Pp
+-A number of preset
+-.Em layouts
+-are available.
+-These may be selected with the
+-.Ic select-layout
+-command or cycled with
+-.Ic next-layout
+-(bound to
+-.Ql Space
+-by default); once a layout is chosen, panes within it may be moved and resized
+-as normal.
+-.Pp
+-The following layouts are supported:
+-.Bl -tag -width Ds
+-.It Ic even-horizontal
+-Panes are spread out evenly from left to right across the window.
+-.It Ic even-vertical
+-Panes are spread evenly from top to bottom.
+-.It Ic main-horizontal
+-A large (main) pane is shown at the top of the window and the remaining panes
+-are spread from left to right in the leftover space at the bottom.
+-Use the
+-.Em main-pane-height
+-window option to specify the height of the top pane.
+-.It Ic main-vertical
+-Similar to
+-.Ic main-horizontal
+-but the large pane is placed on the left and the others spread from top to
+-bottom along the right.
+-See the
+-.Em main-pane-width
+-window option.
+-.It Ic tiled
+-Panes are spread out as evenly as possible over the window in both rows and
+-columns.
+-.El
+-.Pp
+-In addition,
+-.Ic select-layout
+-may be used to apply a previously used layout - the
+-.Ic list-windows
+-command displays the layout of each window in a form suitable for use with
+-.Ic select-layout .
+-For example:
+-.Bd -literal -offset indent
+-$ tmux list-windows
+-0: ksh [159x48]
+-    layout: bb62,159x48,0,0{79x48,0,0,79x48,80,0}
+-$ tmux select-layout bb62,159x48,0,0{79x48,0,0,79x48,80,0}
+-.Ed
+-.Pp
+-.Nm
+-automatically adjusts the size of the layout for the current window size.
+-Note that a layout cannot be applied to a window with more panes than that
+-from which the layout was originally defined.
+-.Pp
+-Commands related to windows and panes are as follows:
+-.Bl -tag -width Ds
+-.It Xo Ic break-pane
+-.Op Fl dP
+-.Op Fl F Ar format
+-.Op Fl t Ar target-pane
+-.Xc
+-.D1 (alias: Ic breakp )
+-Break
+-.Ar target-pane
+-off from its containing window to make it the only pane in a new window.
+-If
+-.Fl d
+-is given, the new window does not become the current window.
+-The
+-.Fl P
+-option prints information about the new window after it has been created.
+-By default, it uses the format
+-.Ql #{session_name}:#{window_index}
+-but a different format may be specified with
+-.Fl F .
+-.It Xo Ic capture-pane
+-.Op Fl aepPq
+-.Op Fl b Ar buffer-index
+-.Op Fl E Ar end-line
+-.Op Fl S Ar start-line
+-.Op Fl t Ar target-pane
+-.Xc
+-.D1 (alias: Ic capturep )
+-Capture the contents of a pane.
+-If
+-.Fl p
+-is given, the output goes to stdout, otherwise to the buffer specified with
+-.Fl b
+-or a new buffer if omitted.
+-If
+-.Fl a
+-is given, the alternate screen is used, and the history is not accessible.
+-If no alternate screen exists, an error will be returned unless
+-.Fl q
+-is given.
+-If
+-.Fl e
+-is given, the output includes escape sequences for text and background
+-attributes.
+-.Fl C
+-also escapes non-printable characters as octal \exxx.
+-.Fl J
+-joins wrapped lines and preserves trailing spaces at each line's end.
+-.Fl P
+-captures only any output that the pane has received that is the beginning of an
+-as-yet incomplete escape sequence.
+-.Pp
+-.Fl S
+-and
+-.Fl E
+-specify the starting and ending line numbers, zero is the first line of the
+-visible pane and negative numbers are lines in the history.
+-The default is to capture only the visible contents of the pane.
+-.It Xo
+-.Ic choose-client
+-.Op Fl F Ar format
+-.Op Fl t Ar target-window
+-.Op Ar template
+-.Xc
+-Put a window into client choice mode, allowing a client to be selected
+-interactively from a list.
+-After a client is chosen,
+-.Ql %%
+-is replaced by the client
+-.Xr pty 4
+-path in
+-.Ar template
+-and the result executed as a command.
+-If
+-.Ar template
+-is not given, "detach-client -t '%%'" is used.
+-For the meaning of the
+-.Fl F
+-flag, see the
+-.Sx FORMATS
+-section.
+-This command works only if at least one client is attached.
+-.It Xo
+-.Ic choose-list
+-.Op Fl l Ar items
+-.Op Fl t Ar target-window
+-.Op Ar template
+-.Xc
+-Put a window into list choice mode, allowing
+-.Ar items
+-to be selected.
+-.Ar items
+-can be a comma-separated list to display more than one item.
+-If an item has spaces, that entry must be quoted.
+-After an item is chosen,
+-.Ql %%
+-is replaced by the chosen item in the
+-.Ar template
+-and the result is executed as a command.
+-If
+-.Ar template
+-is not given, "run-shell '%%'" is used.
+-.Ar items
+-also accepts format specifiers.
+-For the meaning of this see the
+-.Sx FORMATS
+-section.
+-This command works only if at least one client is attached.
+-.It Xo
+-.Ic choose-session
+-.Op Fl F Ar format
+-.Op Fl t Ar target-window
+-.Op Ar template
+-.Xc
+-Put a window into session choice mode, where a session may be selected
+-interactively from a list.
+-When one is chosen,
+-.Ql %%
+-is replaced by the session name in
+-.Ar template
+-and the result executed as a command.
+-If
+-.Ar template
+-is not given, "switch-client -t '%%'" is used.
+-For the meaning of the
+-.Fl F
+-flag, see the
+-.Sx FORMATS
+-section.
+-This command works only if at least one client is attached.
+-.It Xo
+-.Ic choose-tree
+-.Op Fl suw
+-.Op Fl b Ar session-template
+-.Op Fl c Ar window-template
+-.Op Fl S Ar format
+-.Op Fl W Ar format
+-.Op Fl t Ar target-window
+-.Xc
+-Put a window into tree choice mode, where either sessions or windows may be
+-selected interactively from a list.
+-By default, windows belonging to a session are indented to show their
+-relationship to a session.
+-.Pp
+-Note that the
+-.Ic choose-window
+-and
+-.Ic choose-session
+-commands are wrappers around
+-.Ic choose-tree .
+-.Pp
+-If
+-.Fl s
+-is given, will show sessions.
+-If
+-.Fl w
+-is given, will show windows.
+-.Pp
+-By default, the tree is collapsed and sessions must be expanded to windows
+-with the right arrow key.
+-The
+-.Fl u
+-option will start with all sessions expanded instead.
+-.Pp
+-If
+-.Fl b
+-is given, will override the default session command.
+-Note that
+-.Ql %%
+-can be used and will be replaced with the session name.
+-The default option if not specified is "switch-client -t '%%'".
+-If
+-.Fl c
+-is given, will override the default window command.
+-Like
+-.Fl b ,
+-.Ql %%
+-can be used and will be replaced with the session name and window index.
+-When a window is chosen from the list, the session command is run before the
+-window command.
+-.Pp
+-If
+-.Fl S
+-is given will display the specified format instead of the default session
+-format.
+-If
+-.Fl W
+-is given will display the specified format instead of the default window
+-format.
+-For the meaning of the
+-.Fl s
+-and
+-.Fl w
+-options, see the
+-.Sx FORMATS
+-section.
+-.Pp
+-This command works only if at least one client is attached.
+-.It Xo
+-.Ic choose-window
+-.Op Fl F Ar format
+-.Op Fl t Ar target-window
+-.Op Ar template
+-.Xc
+-Put a window into window choice mode, where a window may be chosen
+-interactively from a list.
+-After a window is selected,
+-.Ql %%
+-is replaced by the session name and window index in
+-.Ar template
+-and the result executed as a command.
+-If
+-.Ar template
+-is not given, "select-window -t '%%'" is used.
+-For the meaning of the
+-.Fl F
+-flag, see the
+-.Sx FORMATS
+-section.
+-This command works only if at least one client is attached.
+-.It Ic display-panes Op Fl t Ar target-client
+-.D1 (alias: Ic displayp)
+-Display a visible indicator of each pane shown by
+-.Ar target-client .
+-See the
+-.Ic display-panes-time ,
+-.Ic display-panes-colour ,
+-and
+-.Ic display-panes-active-colour
+-session options.
+-While the indicator is on screen, a pane may be selected with the
+-.Ql 0
+-to
+-.Ql 9
+-keys.
+-.It Xo Ic find-window
+-.Op Fl CNT
+-.Op Fl F Ar format
+-.Op Fl t Ar target-window
+-.Ar match-string
+-.Xc
+-.D1 (alias: Ic findw )
+-Search for the
+-.Xr fnmatch 3
+-pattern
+-.Ar match-string
+-in window names, titles, and visible content (but not history).
+-The flags control matching behavior:
+-.Fl C
+-matches only visible window contents,
+-.Fl N
+-matches only the window name and
+-.Fl T
+-matches only the window title.
+-The default is
+-.Fl CNT .
+-If only one window is matched, it'll be automatically selected,
+-otherwise a choice list is shown.
+-For the meaning of the
+-.Fl F
+-flag, see the
+-.Sx FORMATS
+-section.
+-This command works only if at least one client is attached.
+-.It Xo Ic join-pane
+-.Op Fl bdhv
+-.Oo Fl l
+-.Ar size |
+-.Fl p Ar percentage Oc
+-.Op Fl s Ar src-pane
+-.Op Fl t Ar dst-pane
+-.Xc
+-.D1 (alias: Ic joinp )
+-Like
+-.Ic split-window ,
+-but instead of splitting
+-.Ar dst-pane
+-and creating a new pane, split it and move
+-.Ar src-pane
+-into the space.
+-This can be used to reverse
+-.Ic break-pane .
+-The
+-.Fl b
+-option causes
+-.Ar src-pane
+-to be joined to left of or above
+-.Ar dst-pane .
+-.It Xo Ic kill-pane
+-.Op Fl a
+-.Op Fl t Ar target-pane
+-.Xc
+-.D1 (alias: Ic killp )
+-Destroy the given pane.
+-If no panes remain in the containing window, it is also destroyed.
+-The
+-.Fl a
+-option kills all but the pane given with
+-.Fl t .
+-.It Xo Ic kill-window
+-.Op Fl a
+-.Op Fl t Ar target-window
+-.Xc
+-.D1 (alias: Ic killw )
+-Kill the current window or the window at
+-.Ar target-window ,
+-removing it from any sessions to which it is linked.
+-The
+-.Fl a
+-option kills all but the window given with
+-.Fl t .
+-.It Ic last-pane Op Fl t Ar target-window
+-.D1 (alias: Ic lastp )
+-Select the last (previously selected) pane.
+-.It Ic last-window Op Fl t Ar target-session
+-.D1 (alias: Ic last )
+-Select the last (previously selected) window.
+-If no
+-.Ar target-session
+-is specified, select the last window of the current session.
+-.It Xo Ic link-window
+-.Op Fl dk
+-.Op Fl s Ar src-window
+-.Op Fl t Ar dst-window
+-.Xc
+-.D1 (alias: Ic linkw )
+-Link the window at
+-.Ar src-window
+-to the specified
+-.Ar dst-window .
+-If
+-.Ar dst-window
+-is specified and no such window exists, the
+-.Ar src-window
+-is linked there.
+-If
+-.Fl k
+-is given and
+-.Ar dst-window
+-exists, it is killed, otherwise an error is generated.
+-If
+-.Fl d
+-is given, the newly linked window is not selected.
+-.It Xo Ic list-panes
+-.Op Fl as
+-.Op Fl F Ar format
+-.Op Fl t Ar target
+-.Xc
+-.D1 (alias: Ic lsp )
+-If
+-.Fl a
+-is given,
+-.Ar target
+-is ignored and all panes on the server are listed.
+-If
+-.Fl s
+-is given,
+-.Ar target
+-is a session (or the current session).
+-If neither is given,
+-.Ar target
+-is a window (or the current window).
+-For the meaning of the
+-.Fl F
+-flag, see the
+-.Sx FORMATS
+-section.
+-.It Xo Ic list-windows
+-.Op Fl a
+-.Op Fl F Ar format
+-.Op Fl t Ar target-session
+-.Xc
+-.D1 (alias: Ic lsw )
+-If
+-.Fl a
+-is given, list all windows on the server.
+-Otherwise, list windows in the current session or in
+-.Ar target-session .
+-For the meaning of the
+-.Fl F
+-flag, see the
+-.Sx FORMATS
+-section.
+-.It Xo Ic move-pane
+-.Op Fl bdhv
+-.Oo Fl l
+-.Ar size |
+-.Fl p Ar percentage Oc
+-.Op Fl s Ar src-pane
+-.Op Fl t Ar dst-pane
+-.Xc
+-.D1 (alias: Ic movep )
+-Like
+-.Ic join-pane ,
+-but
+-.Ar src-pane
+-and
+-.Ar dst-pane
+-may belong to the same window.
+-.It Xo Ic move-window
+-.Op Fl rdk
+-.Op Fl s Ar src-window
+-.Op Fl t Ar dst-window
+-.Xc
+-.D1 (alias: Ic movew )
+-This is similar to
+-.Ic link-window ,
+-except the window at
+-.Ar src-window
+-is moved to
+-.Ar dst-window .
+-With
+-.Fl r ,
+-all windows in the session are renumbered in sequential order, respecting
+-the
+-.Ic base-index
+-option.
+-.It Xo Ic new-window
+-.Op Fl adkP
+-.Op Fl c Ar start-directory
+-.Op Fl F Ar format
+-.Op Fl n Ar window-name
+-.Op Fl t Ar target-window
+-.Op Ar shell-command
+-.Xc
+-.D1 (alias: Ic neww )
+-Create a new window.
+-With
+-.Fl a ,
+-the new window is inserted at the next index up from the specified
+-.Ar target-window ,
+-moving windows up if necessary,
+-otherwise
+-.Ar target-window
+-is the new window location.
+-.Pp
+-If
+-.Fl d
+-is given, the session does not make the new window the current window.
+-.Ar target-window
+-represents the window to be created; if the target already exists an error is
+-shown, unless the
+-.Fl k
+-flag is used, in which case it is destroyed.
+-.Ar shell-command
+-is the command to execute.
+-If
+-.Ar shell-command
+-is not specified, the value of the
+-.Ic default-command
+-option is used.
+-.Fl c
+-specifies the working directory in which the new window is created.
+-It may have an absolute path or one of the following values (or a subdirectory):
+-.Bl -column "XXXXXXXXXXXX" "XXXXXXXXXXXXXXXXXXXXXXXX" -offset indent
+-.It Li "Empty string" Ta "Current pane's directory"
+-.It Li "~" Ta "User's home directory"
+-.It Li "-" Ta "Where session was started"
+-.It Li "." Ta "Where server was started"
+-.El
+-.Pp
+-When the shell command completes, the window closes.
+-See the
+-.Ic remain-on-exit
+-option to change this behaviour.
+-.Pp
+-The
+-.Ev TERM
+-environment variable must be set to
+-.Dq screen
+-for all programs running
+-.Em inside
+-.Nm .
+-New windows will automatically have
+-.Dq TERM=screen
+-added to their environment, but care must be taken not to reset this in shell
+-start-up files.
+-.Pp
+-The
+-.Fl P
+-option prints information about the new window after it has been created.
+-By default, it uses the format
+-.Ql #{session_name}:#{window_index}
+-but a different format may be specified with
+-.Fl F .
+-.It Ic next-layout Op Fl t Ar target-window
+-.D1 (alias: Ic nextl )
+-Move a window to the next layout and rearrange the panes to fit.
+-.It Xo Ic next-window
+-.Op Fl a
+-.Op Fl t Ar target-session
+-.Xc
+-.D1 (alias: Ic next )
+-Move to the next window in the session.
+-If
+-.Fl a
+-is used, move to the next window with an alert.
+-.It Xo Ic pipe-pane
+-.Op Fl o
+-.Op Fl t Ar target-pane
+-.Op Ar shell-command
+-.Xc
+-.D1 (alias: Ic pipep )
+-Pipe any output sent by the program in
+-.Ar target-pane
+-to a shell command.
+-A pane may only be piped to one command at a time, any existing pipe is
+-closed before
+-.Ar shell-command
+-is executed.
+-The
+-.Ar shell-command
+-string may contain the special character sequences supported by the
+-.Ic status-left
+-option.
+-If no
+-.Ar shell-command
+-is given, the current pipe (if any) is closed.
+-.Pp
+-The
+-.Fl o
+-option only opens a new pipe if no previous pipe exists, allowing a pipe to
+-be toggled with a single key, for example:
+-.Bd -literal -offset indent
+-bind-key C-p pipe-pane -o 'cat >>~/output.#I-#P'
+-.Ed
+-.It Xo Ic previous-layout
+-.Op Fl t Ar target-window
+-.Xc
+-.D1 (alias: Ic prevl )
+-Move to the previous layout in the session.
+-.It Xo Ic previous-window
+-.Op Fl a
+-.Op Fl t Ar target-session
+-.Xc
+-.D1 (alias: Ic prev )
+-Move to the previous window in the session.
+-With
+-.Fl a ,
+-move to the previous window with an alert.
+-.It Xo Ic rename-window
+-.Op Fl t Ar target-window
+-.Ar new-name
+-.Xc
+-.D1 (alias: Ic renamew )
+-Rename the current window, or the window at
+-.Ar target-window
+-if specified, to
+-.Ar new-name .
+-.It Xo Ic resize-pane
+-.Op Fl DLRUZ
+-.Op Fl t Ar target-pane
+-.Op Fl x Ar width
+-.Op Fl y Ar height
+-.Op Ar adjustment
+-.Xc
+-.D1 (alias: Ic resizep )
+-Resize a pane, up, down, left or right by
+-.Ar adjustment
+-with
+-.Fl U ,
+-.Fl D ,
+-.Fl L
+-or
+-.Fl R ,
+-or
+-to an absolute size
+-with
+-.Fl x
+-or
+-.Fl y .
+-The
+-.Ar adjustment
+-is given in lines or cells (the default is 1).
+-.Pp
+-With
+-.Fl Z ,
+-the active pane is toggled between zoomed (occupying the whole of the window)
+-and unzoomed (its normal position in the layout).
+-.It Xo Ic respawn-pane
+-.Op Fl k
+-.Op Fl t Ar target-pane
+-.Op Ar shell-command
+-.Xc
+-.D1 (alias: Ic respawnp )
+-Reactivate a pane in which the command has exited (see the
+-.Ic remain-on-exit
+-window option).
+-If
+-.Ar shell-command
+-is not given, the command used when the pane was created is executed.
+-The pane must be already inactive, unless
+-.Fl k
+-is given, in which case any existing command is killed.
+-.It Xo Ic respawn-window
+-.Op Fl k
+-.Op Fl t Ar target-window
+-.Op Ar shell-command
+-.Xc
+-.D1 (alias: Ic respawnw )
+-Reactivate a window in which the command has exited (see the
+-.Ic remain-on-exit
+-window option).
+-If
+-.Ar shell-command
+-is not given, the command used when the window was created is executed.
+-The window must be already inactive, unless
+-.Fl k
+-is given, in which case any existing command is killed.
+-.It Xo Ic rotate-window
+-.Op Fl DU
+-.Op Fl t Ar target-window
+-.Xc
+-.D1 (alias: Ic rotatew )
+-Rotate the positions of the panes within a window, either upward (numerically
+-lower) with
+-.Fl U
+-or downward (numerically higher).
+-.It Xo Ic select-layout
+-.Op Fl np
+-.Op Fl t Ar target-window
+-.Op Ar layout-name
+-.Xc
+-.D1 (alias: Ic selectl )
+-Choose a specific layout for a window.
+-If
+-.Ar layout-name
+-is not given, the last preset layout used (if any) is reapplied.
+-.Fl n
+-and
+-.Fl p
+-are equivalent to the
+-.Ic next-layout
+-and
+-.Ic previous-layout
+-commands.
+-.It Xo Ic select-pane
+-.Op Fl lDLRU
+-.Op Fl t Ar target-pane
+-.Xc
+-.D1 (alias: Ic selectp )
+-Make pane
+-.Ar target-pane
+-the active pane in window
+-.Ar target-window .
+-If one of
+-.Fl D ,
+-.Fl L ,
+-.Fl R ,
+-or
+-.Fl U
+-is used, respectively the pane below, to the left, to the right, or above the
+-target pane is used.
+-.Fl l
+-is the same as using the
+-.Ic last-pane
+-command.
+-.It Xo Ic select-window
+-.Op Fl lnpT
+-.Op Fl t Ar target-window
+-.Xc
+-.D1 (alias: Ic selectw )
+-Select the window at
+-.Ar target-window .
+-.Fl l ,
+-.Fl n
+-and
+-.Fl p
+-are equivalent to the
+-.Ic last-window ,
+-.Ic next-window
+-and
+-.Ic previous-window
+-commands.
+-If
+-.Fl T
+-is given and the selected window is already the current window,
+-the command behaves like
+-.Ic last-window .
+-.It Xo Ic split-window
+-.Op Fl dhvP
+-.Op Fl c Ar start-directory
+-.Oo Fl l
+-.Ar size |
+-.Fl p Ar percentage Oc
+-.Op Fl t Ar target-pane
+-.Op Ar shell-command
+-.Op Fl F Ar format
+-.Xc
+-.D1 (alias: Ic splitw )
+-Create a new pane by splitting
+-.Ar target-pane :
+-.Fl h
+-does a horizontal split and
+-.Fl v
+-a vertical split; if neither is specified,
+-.Fl v
+-is assumed.
+-The
+-.Fl l
+-and
+-.Fl p
+-options specify the size of the new pane in lines (for vertical split) or in
+-cells (for horizontal split), or as a percentage, respectively.
+-All other options have the same meaning as for the
+-.Ic new-window
+-command.
+-.It Xo Ic swap-pane
+-.Op Fl dDU
+-.Op Fl s Ar src-pane
+-.Op Fl t Ar dst-pane
+-.Xc
+-.D1 (alias: Ic swapp )
+-Swap two panes.
+-If
+-.Fl U
+-is used and no source pane is specified with
+-.Fl s ,
+-.Ar dst-pane
+-is swapped with the previous pane (before it numerically);
+-.Fl D
+-swaps with the next pane (after it numerically).
+-.Fl d
+-instructs
+-.Nm
+-not to change the active pane.
+-.It Xo Ic swap-window
+-.Op Fl d
+-.Op Fl s Ar src-window
+-.Op Fl t Ar dst-window
+-.Xc
+-.D1 (alias: Ic swapw )
+-This is similar to
+-.Ic link-window ,
+-except the source and destination windows are swapped.
+-It is an error if no window exists at
+-.Ar src-window .
+-.It Xo Ic unlink-window
+-.Op Fl k
+-.Op Fl t Ar target-window
+-.Xc
+-.D1 (alias: Ic unlinkw )
+-Unlink
+-.Ar target-window .
+-Unless
+-.Fl k
+-is given, a window may be unlinked only if it is linked to multiple sessions -
+-windows may not be linked to no sessions;
+-if
+-.Fl k
+-is specified and the window is linked to only one session, it is unlinked and
+-destroyed.
+-.El
+-.Sh KEY BINDINGS
+-.Nm
+-allows a command to be bound to most keys, with or without a prefix key.
+-When specifying keys, most represent themselves (for example
+-.Ql A
+-to
+-.Ql Z ) .
+-Ctrl keys may be prefixed with
+-.Ql C-
+-or
+-.Ql ^ ,
+-and Alt (meta) with
+-.Ql M- .
+-In addition, the following special key names are accepted:
+-.Em Up ,
+-.Em Down ,
+-.Em Left ,
+-.Em Right ,
+-.Em BSpace ,
+-.Em BTab ,
+-.Em DC
+-(Delete),
+-.Em End ,
+-.Em Enter ,
+-.Em Escape ,
+-.Em F1
+-to
+-.Em F20 ,
+-.Em Home ,
+-.Em IC
+-(Insert),
+-.Em NPage/PageDown/PgDn ,
+-.Em PPage/PageUp/PgUp ,
+-.Em Space ,
+-and
+-.Em Tab .
+-Note that to bind the
+-.Ql \&"
+-or
+-.Ql '
+-keys, quotation marks are necessary, for example:
+-.Bd -literal -offset indent
+-bind-key '"' split-window
+-bind-key "'" new-window
+-.Ed
+-.Pp
+-Commands related to key bindings are as follows:
+-.Bl -tag -width Ds
+-.It Xo Ic bind-key
+-.Op Fl cnr
+-.Op Fl t Ar key-table
+-.Ar key Ar command Op Ar arguments
+-.Xc
+-.D1 (alias: Ic bind )
+-Bind key
+-.Ar key
+-to
+-.Ar command .
+-By default (without
+-.Fl t )
+-the primary key bindings are modified (those normally activated with the prefix
+-key); in this case, if
+-.Fl n
+-is specified, it is not necessary to use the prefix key,
+-.Ar command
+-is bound to
+-.Ar key
+-alone.
+-The
+-.Fl r
+-flag indicates this key may repeat, see the
+-.Ic repeat-time
+-option.
+-.Pp
+-If
+-.Fl t
+-is present,
+-.Ar key
+-is bound in
+-.Ar key-table :
+-the binding for command mode with
+-.Fl c
+-or for normal mode without.
+-To view the default bindings and possible commands, see the
+-.Ic list-keys
+-command.
+-.It Ic list-keys Op Fl t Ar key-table
+-.D1 (alias: Ic lsk )
+-List all key bindings.
+-Without
+-.Fl t
+-the primary key bindings - those executed when preceded by the prefix key -
+-are printed.
+-.Pp
+-With
+-.Fl t ,
+-the key bindings in
+-.Ar key-table
+-are listed; this may be one of:
+-.Em vi-edit ,
+-.Em emacs-edit ,
+-.Em vi-choice ,
+-.Em emacs-choice ,
+-.Em vi-copy
+-or
+-.Em emacs-copy .
+-.It Xo Ic send-keys
+-.Op Fl lR
+-.Op Fl t Ar target-pane
+-.Ar key Ar ...
+-.Xc
+-.D1 (alias: Ic send )
+-Send a key or keys to a window.
+-Each argument
+-.Ar key
+-is the name of the key (such as
+-.Ql C-a
+-or
+-.Ql npage
+-) to send; if the string is not recognised as a key, it is sent as a series of
+-characters.
+-The
+-.Fl l
+-flag disables key name lookup and sends the keys literally.
+-All arguments are sent sequentially from first to last.
+-The
+-.Fl R
+-flag causes the terminal state to be reset.
+-.It Xo Ic send-prefix
+-.Op Fl 2
+-.Op Fl t Ar target-pane
+-.Xc
+-Send the prefix key, or with
+-.Fl 2
+-the secondary prefix key, to a window as if it was pressed.
+-.It Xo Ic unbind-key
+-.Op Fl acn
+-.Op Fl t Ar key-table
+-.Ar key
+-.Xc
+-.D1 (alias: Ic unbind )
+-Unbind the command bound to
+-.Ar key .
+-Without
+-.Fl t
+-the primary key bindings are modified; in this case, if
+-.Fl n
+-is specified, the command bound to
+-.Ar key
+-without a prefix (if any) is removed.
+-If
+-.Fl a
+-is present, all key bindings are removed.
+-.Pp
+-If
+-.Fl t
+-is present,
+-.Ar key
+-in
+-.Ar key-table
+-is unbound: the binding for command mode with
+-.Fl c
+-or for normal mode without.
+-.El
+-.Sh OPTIONS
+-The appearance and behaviour of
+-.Nm
+-may be modified by changing the value of various options.
+-There are three types of option:
+-.Em server options ,
+-.Em session options
+-and
+-.Em window options .
+-.Pp
+-The
+-.Nm
+-server has a set of global options which do not apply to any particular
+-window or session.
+-These are altered with the
+-.Ic set-option
+-.Fl s
+-command, or displayed with the
+-.Ic show-options
+-.Fl s
+-command.
+-.Pp
+-In addition, each individual session may