date:20120124

[csw-devel] SF.net SVN: gar:[16899] csw/mgar/pkg/lang-java/389-admin-console/trunk/ Makefile

2012-01-24 Thread cgrzemba

Revision: 16899
  http://gar.svn.sourceforge.net/gar/?rev=16899&view=rev
Author:   cgrzemba
Date: 2012-01-24 10:43:34 + (Tue, 24 Jan 2012)
Log Message:
---
lang-java/389-admin-console/trunk: fix brocken links

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

Modified: csw/mgar/pkg/lang-java/389-admin-console/trunk/Makefile
===
--- csw/mgar/pkg/lang-java/389-admin-console/trunk/Makefile 2012-01-23 
20:50:26 UTC (rev 16898)
+++ csw/mgar/pkg/lang-java/389-admin-console/trunk/Makefile 2012-01-24 
10:43:34 UTC (rev 16899)
@@ -4,6 +4,7 @@
 NAME = 389-admin-console
 SHORTNAME = 389-admin
 VERSION = 1.1.8
+MAJOR_VERSION = 1.1
 GARTYPE = v2
 CATEGORIES = java
 

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

___
devel mailing list
devel@lists.opencsw.org
https://lists.opencsw.org/mailman/listinfo/devel

[csw-devel] SF.net SVN: gar:[16900] csw/mgar/pkg/lang-java/389-ds-console/trunk/ Makefile

2012-01-24 Thread cgrzemba

Revision: 16900
  http://gar.svn.sourceforge.net/gar/?rev=16900&view=rev
Author:   cgrzemba
Date: 2012-01-24 11:46:55 + (Tue, 24 Jan 2012)
Log Message:
---
lang-java/389-ds-console/trunk: fix broken links

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

Modified: csw/mgar/pkg/lang-java/389-ds-console/trunk/Makefile
===
--- csw/mgar/pkg/lang-java/389-ds-console/trunk/Makefile2012-01-24 
10:43:34 UTC (rev 16899)
+++ csw/mgar/pkg/lang-java/389-ds-console/trunk/Makefile2012-01-24 
11:46:55 UTC (rev 16900)
@@ -4,6 +4,7 @@
 NAME = 389-ds-console
 SHORTNAME = 389-ds
 VERSION = 1.2.6
+MAJOR_VERSION = 1.2
 GARTYPE = v2
 CATEGORIES = java
 

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

___
devel mailing list
devel@lists.opencsw.org
https://lists.opencsw.org/mailman/listinfo/devel

[csw-devel] SF.net SVN: gar:[16901] csw/mgar/pkg/389-admin/trunk

2012-01-24 Thread cgrzemba

Revision: 16901
  http://gar.svn.sourceforge.net/gar/?rev=16901&view=rev
Author:   cgrzemba
Date: 2012-01-24 12:48:29 + (Tue, 24 Jan 2012)
Log Message:
---
389-admin/trunk: fix configuration

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

csw/mgar/pkg/389-admin/trunk/files/0003-correct-initscript-and-http.conf.in.patch

Added Paths:
---
csw/mgar/pkg/389-admin/trunk/files/CSW389admin.preremove

Removed Paths:
-
csw/mgar/pkg/389-admin/trunk/files/0004-disable-SMF-service-at-install.patch

csw/mgar/pkg/389-admin/trunk/files/0005-comment-out-httpd-thread-options-in-httpd.conf.patch

Modified: csw/mgar/pkg/389-admin/trunk/Makefile
===
--- csw/mgar/pkg/389-admin/trunk/Makefile   2012-01-24 11:46:55 UTC (rev 
16900)
+++ csw/mgar/pkg/389-admin/trunk/Makefile   2012-01-24 12:48:29 UTC (rev 
16901)
@@ -79,7 +79,12 @@
 # remove -I/opt/csw/include
 CPPFLAGS = 
 # no optimization
-CFLAGS = 
+CFLAGS = -g
+FFLAGS=
+FCFLAGS=
+OPTFLAGS=
+CXXFLAGS=
+
 EXTRA_LINKER_FLAGS = -xnorunpath -norunpath -liconv
 
 CONFIGURE_ARGS = $(DIRPATHS)
@@ -96,6 +101,7 @@
 CONFIGURE_ARGS_OPT += --with-httpd=/opt/csw/apache2/sbin/httpd
 CONFIGURE_ARGS_OPT += --with-modnss-lib=/opt/csw/apache2/libexec
 CONFIGURE_ARGS_OPT += --with-modnss-bin=/opt/csw/apache2/sbin
+CONFIGURE_ARGS_OPT += --disable-threading
 CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARFLAVOR))
 
 include gar/category.mk

Modified: 
csw/mgar/pkg/389-admin/trunk/files/0003-correct-initscript-and-http.conf.in.patch
===
--- 
csw/mgar/pkg/389-admin/trunk/files/0003-correct-initscript-and-http.conf.in.patch
   2012-01-24 11:46:55 UTC (rev 16900)
+++ 
csw/mgar/pkg/389-admin/trunk/files/0003-correct-initscript-and-http.conf.in.patch
   2012-01-24 12:48:29 UTC (rev 16901)
@@ -4,14 +4,14 @@
 Subject: [PATCH] correct initscript and http.conf.in
 
 ---
- admserv/cfgstuff/httpd.conf.in |   10 +-
+ admserv/cfgstuff/httpd-2.2.conf.in |   10 +-
  wrappers/initscript.in |6 --
  2 files changed, 9 insertions(+), 7 deletions(-)
 
-diff --git a/admserv/cfgstuff/httpd.conf.in b/admserv/cfgstuff/httpd.conf.in
+diff --git a/admserv/cfgstuff/httpd-2.2.conf.in 
b/admserv/cfgstuff/httpd-2.2.conf.in
 index a66eb21..b4098d9 100644
 a/admserv/cfgstuff/httpd.conf.in
-+++ b/admserv/cfgstuff/httpd.conf.in
+--- a/admserv/cfgstuff/httpd-2.2.conf.in
 b/admserv/cfgstuff/httpd-2.2.conf.in
 @@ -99,12 +99,12 @@ ServerTokens Minor
  # start one server in multi threaded mode
  StartServers 1
@@ -43,24 +43,27 @@
  
  # Source function library.
  if [ -f /etc/rc.d/init.d/functions ] ; then
-@@ -94,7 +96,7 @@ prog="@package_name@"
+@@ -94,7 +96,8 @@ prog="@package_name@"
  piddir="@localstatedir@/run/@PACKAGE_BASE_NAME@"
  # PID file
  pidfile=$piddir/admin-serv.pid
 -lockfile=/var/lock/subsys/@package_name@
 +lockfile=@localstatedir@/lock/subsys/@package_name@
++lockdir=`dirname $lockfile`
  
  [ -f $exec ] || exit 0
  
-@@ -163,7 +165,7 @@ start() {
+@@ -163,7 +166,8 @@ start() {
  RETVAL=1
  fi
  fi
 -[ $RETVAL -eq 0 -a -d /var/lock/subsys ] && touch $lockfile
-+[ $RETVAL -eq 0 -a -d @localstatedir@/lock/subsys ] && touch $lockfile
++[ ! -d $lockdir ] && mkdir -p $lockdir
++[ $RETVAL -eq 0 -a -d $lockdir ] && touch $lockfile
  }
  
  stop() {
+
 -- 
 1.7.8.3
 

Deleted: 
csw/mgar/pkg/389-admin/trunk/files/0004-disable-SMF-service-at-install.patch
===
--- 
csw/mgar/pkg/389-admin/trunk/files/0004-disable-SMF-service-at-install.patch
2012-01-24 11:46:55 UTC (rev 16900)
+++ 
csw/mgar/pkg/389-admin/trunk/files/0004-disable-SMF-service-at-install.patch
2012-01-24 12:48:29 UTC (rev 16901)
@@ -1,25 +0,0 @@
-From fc16535d4003f8fc7df6f451b6c785e975ce9bc0 Mon Sep 17 00:00:00 2001
-From: Carsten Grzemba 
-Date: Mon, 23 Jan 2012 14:27:18 +0100
-Subject: [PATCH 4/5] disable SMF service at install
-

- wrappers/initscript.in |2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/wrappers/initscript.in b/wrappers/initscript.in
-index 82dd20e..2971c35 100644
 a/wrappers/initscript.in
-+++ b/wrappers/initscript.in
-@@ -7,6 +7,8 @@
- # processname: @sbindir@/httpd
- # piddir:  @localstatedir@/run/@PACKAGE_BASE_NAME@
- #
-+#AUTOENABLE no # no CSW SMF enable at install!
-+#
- 
- # Source function library.
- if [ -f /etc/rc.d/init.d/functions ] ; then
--- 
-1.7.8.3
-

Deleted: 
csw/mgar/pkg/389-admin/trunk/files/0005-comment-out-httpd-thread-options-in-httpd.conf.patch
===
--- 
csw/mgar/pkg/389-admin/trunk/files/0005-comment-out-httpd-thread-options-in-httpd.conf.patch
2012-01-24 11:46:55 UTC (rev 16900)
+++ 
csw/mgar/pkg/389-admin/trunk/files/0005-comment-out-httpd-

[csw-devel] SF.net SVN: gar:[16902] csw/mgar/pkg/rrdtool/trunk

2012-01-24 Thread dmichelsen

Revision: 16902
  http://gar.svn.sourceforge.net/gar/?rev=16902&view=rev
Author:   dmichelsen
Date: 2012-01-24 13:19:55 + (Tue, 24 Jan 2012)
Log Message:
---
rrdtool/trunk: Update to 1.4.7

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

Removed Paths:
-

csw/mgar/pkg/rrdtool/trunk/files/0001-Do-not-reference-tm.tm_gmtoff-on-Solaris.patch

Modified: csw/mgar/pkg/rrdtool/trunk/Makefile
===
--- csw/mgar/pkg/rrdtool/trunk/Makefile 2012-01-24 12:48:29 UTC (rev 16901)
+++ csw/mgar/pkg/rrdtool/trunk/Makefile 2012-01-24 13:19:55 UTC (rev 16902)
@@ -1,5 +1,5 @@
 NAME = rrdtool
-VERSION = 1.4.6
+VERSION = 1.4.7
 CATEGORIES = utils
 
 DESCRIPTION = Time-series data logging and graphing
@@ -12,10 +12,6 @@
 MASTER_SITES = http://oss.oetiker.ch/$(NAME)/pub/
 DISTFILES = $(DISTNAME).tar.gz
 
-# Use patch until this is fixed:
-#   http://oss.oetiker.ch/rrdtool-trac/ticket/330
-PATCHFILES += 0001-Do-not-reference-tm.tm_gmtoff-on-Solaris.patch
-
 PATCHFILES += 0002-Always-link-local-libs-first-during-Perl-module.patch
 
 # Make sure to link against libperl.so to make shared libraries self-contained.
@@ -49,40 +45,40 @@
 RUNTIME_DEP_PKGS_CSWrrdtool += CSWlibintl8
 RUNTIME_DEP_PKGS_CSWrrdtool += CSWlibwrap1
 RUNTIME_DEP_PKGS_CSWrrdtool += CSWlibdbi1
-RUNTIME_DEP_PKGS_CSWrrdtool += CSWlibrrd3
-RUNTIME_DEP_PKGS_CSWrrdtool += CSWlibrrd-th3
+RUNTIME_DEP_PKGS_CSWrrdtool += CSWlibrrd4
+RUNTIME_DEP_PKGS_CSWrrdtool += CSWlibrrd-th4
 OBSOLETED_BY_CSWrrdtool = CSWrrd
 CATALOGNAME_CSWrrd = rrd_stub
 
 PACKAGES += CSWrrdtool-dev
-SPKG_DESC_CSWrrdtool-dev = Development files for librrd.so.3
+SPKG_DESC_CSWrrdtool-dev = Development files for librrd.so.4
 # Explicitly do not include *.3perl
 PKGFILES_DEVEL_MAN3_MANPAGE = $(mandir)/man3/.*\.3
 PKGFILES_CSWrrdtool-dev = $(PKGFILES_DEVEL)
-RUNTIME_DEP_PKGS_CSWrrdtool-dev += CSWlibrrd3
-RUNTIME_DEP_PKGS_CSWrrdtool-dev += CSWlibrrd-th3
+RUNTIME_DEP_PKGS_CSWrrdtool-dev += CSWlibrrd4
+RUNTIME_DEP_PKGS_CSWrrdtool-dev += CSWlibrrd-th4
 
-PACKAGES += CSWlibrrd3
-SPKG_DESC_CSWlibrrd3 = Runtime library for RRDtool, librrd.so.3
-PKGFILES_CSWlibrrd3 += $(call pkgfiles_lib,librrd.so.3)
-RUNTIME_DEP_PKGS_CSWlibrrd3 += CSWlibglib2-0-0
-RUNTIME_DEP_PKGS_CSWlibrrd3 += CSWlibcairo2
-RUNTIME_DEP_PKGS_CSWlibrrd3 += CSWpango
-RUNTIME_DEP_PKGS_CSWlibrrd3 += CSWlibxml2-2
-RUNTIME_DEP_PKGS_CSWlibrrd3 += CSWlibintl8
-RUNTIME_DEP_PKGS_CSWlibrrd3 += CSWlibwrap1
-RUNTIME_DEP_PKGS_CSWlibrrd3 += CSWlibdbi1
+PACKAGES += CSWlibrrd4
+SPKG_DESC_CSWlibrrd4 = Runtime library for RRDtool, librrd.so.4
+PKGFILES_CSWlibrrd4 += $(call pkgfiles_lib,librrd.so.4)
+RUNTIME_DEP_PKGS_CSWlibrrd4 += CSWlibglib2-0-0
+RUNTIME_DEP_PKGS_CSWlibrrd4 += CSWlibcairo2
+RUNTIME_DEP_PKGS_CSWlibrrd4 += CSWpango
+RUNTIME_DEP_PKGS_CSWlibrrd4 += CSWlibxml2-2
+RUNTIME_DEP_PKGS_CSWlibrrd4 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibrrd4 += CSWlibwrap1
+RUNTIME_DEP_PKGS_CSWlibrrd4 += CSWlibdbi1
 
-PACKAGES += CSWlibrrd-th3
-SPKG_DESC_CSWlibrrd-th3 = Runtime library for RRDtool, librrd_th.so.3
-PKGFILES_CSWlibrrd-th3 += $(call pkgfiles_lib,librrd_th.so.3)
-RUNTIME_DEP_PKGS_CSWlibrrd-th3 += CSWlibwrap1
-RUNTIME_DEP_PKGS_CSWlibrrd-th3 += CSWlibintl8
-RUNTIME_DEP_PKGS_CSWlibrrd-th3 += CSWlibcairo2
-RUNTIME_DEP_PKGS_CSWlibrrd-th3 += CSWlibxml2-2
-RUNTIME_DEP_PKGS_CSWlibrrd-th3 += CSWpango
-RUNTIME_DEP_PKGS_CSWlibrrd-th3 += CSWlibglib2-0-0
-RUNTIME_DEP_PKGS_CSWlibrrd-th3 += CSWlibdbi1
+PACKAGES += CSWlibrrd-th4
+SPKG_DESC_CSWlibrrd-th4 = Runtime library for RRDtool, librrd_th.so.4
+PKGFILES_CSWlibrrd-th4 += $(call pkgfiles_lib,librrd_th.so.4)
+RUNTIME_DEP_PKGS_CSWlibrrd-th4 += CSWlibwrap1
+RUNTIME_DEP_PKGS_CSWlibrrd-th4 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibrrd-th4 += CSWlibcairo2
+RUNTIME_DEP_PKGS_CSWlibrrd-th4 += CSWlibxml2-2
+RUNTIME_DEP_PKGS_CSWlibrrd-th4 += CSWpango
+RUNTIME_DEP_PKGS_CSWlibrrd-th4 += CSWlibglib2-0-0
+RUNTIME_DEP_PKGS_CSWlibrrd-th4 += CSWlibdbi1
 
 PACKAGES += CSWpm-rrdtool
 SPKG_DESC_CSWpm-rrdtool = RRDs: Access RRDtool as a shared module (part of 
RRDtool)
@@ -92,21 +88,21 @@
 PKGFILES_CSWpm-rrdtool += .*\.3perl
 
 RUNTIME_DEP_PKGS_CSWpm-rrdtool += CSWperl
-RUNTIME_DEP_PKGS_CSWpm-rrdtool += CSWlibrrd3
+RUNTIME_DEP_PKGS_CSWpm-rrdtool += CSWlibrrd4
 OBSOLETED_BY_CSWpm-rrdtool = CSWrrd
 
 PACKAGES += CSWpy-rrdtool
 SPKG_DESC_CSWrb-rrdtool = Ruby binding for RRD access (part of RRDtool)
 PKGFILES_CSWpy-rrdtool = $(libdir)/python/.*
 RUNTIME_DEP_PKGS_CSWpy-rrdtool += CSWlibpython2-6-1-0
-RUNTIME_DEP_PKGS_CSWpy-rrdtool += CSWlibrrd3
+RUNTIME_DEP_PKGS_CSWpy-rrdtool += CSWlibrrd4
 OBSOLETED_BY_CSWpy-rrdtool = CSWrrd
 
 PACKAGES += CSWrb-rrdtool
 SPKG_DESC_CSWpy-rrdtool = Python egg for RRD access (part of RRDtool)
 PKGFILES_CSWrb-rrdtool = $(libdir)/ruby/.*
 RUNTIME_DEP_PKGS_CSWrb-rrdtool += CSWlibruby18-1
-RUNTIME_DEP_PKGS_CSWrb-rrdtool += CSWlibrrd3
+RUNTIME_DEP_PKGS_CSWrb-rrdtool += C

[csw-devel] SF.net SVN: gar:[16903] csw/mgar/pkg/389-admin/trunk/Makefile

2012-01-24 Thread cgrzemba

Revision: 16903
  http://gar.svn.sourceforge.net/gar/?rev=16903&view=rev
Author:   cgrzemba
Date: 2012-01-24 16:04:09 + (Tue, 24 Jan 2012)
Log Message:
---
389-admin/trunk: add preremove script

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

Modified: csw/mgar/pkg/389-admin/trunk/Makefile
===
--- csw/mgar/pkg/389-admin/trunk/Makefile   2012-01-24 13:19:55 UTC (rev 
16902)
+++ csw/mgar/pkg/389-admin/trunk/Makefile   2012-01-24 16:04:09 UTC (rev 
16903)
@@ -13,6 +13,8 @@
 
 MASTER_SITES = http://port389.org/sources
 DISTFILES  = $(NAME)-$(VERSION).tar.bz2
+DISTFILES += CSW389admin.preremove
+
 # BUILD64  = 1
 PACKAGING_PLATFORMS += solaris10-sparc
 PACKAGING_PLATFORMS += solaris10-i386

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

___
devel mailing list
devel@lists.opencsw.org
https://lists.opencsw.org/mailman/listinfo/devel

[csw-devel] SF.net SVN: opencsw:[597] gar-wrapper

2012-01-24 Thread skayser

Revision: 597
  http://opencsw.svn.sourceforge.net/opencsw/?rev=597&view=rev
Author:   skayser
Date: 2012-01-24 16:28:06 + (Tue, 24 Jan 2012)
Log Message:
---
mgar: mark as 0.95

Modified Paths:
--
gar-wrapper/CHANGES
gar-wrapper/mgar

Modified: gar-wrapper/CHANGES
===
--- gar-wrapper/CHANGES 2012-01-23 20:52:45 UTC (rev 596)
+++ gar-wrapper/CHANGES 2012-01-24 16:28:06 UTC (rev 597)
@@ -1,5 +1,7 @@
-Changes with 0.95 (r???):
+Changes with 0.95 (r597):
 * CHANGE "list-categories" will now show category.mk locations
+* DROP "newpkg" will not create svn:externals any more (Dagobert Michelsen)
+* DROP no more fallback to svn:externals when looking for GAR (Dagobert M.)
 
 Changes with 0.94 (r564):
 * NEW command "status" to query VCS status (^= svn status)

Modified: gar-wrapper/mgar
===
--- gar-wrapper/mgar2012-01-23 20:52:45 UTC (rev 596)
+++ gar-wrapper/mgar2012-01-24 16:28:06 UTC (rev 597)
@@ -33,6 +33,7 @@
 #
 # Todos:
 # * Add template for ~/.garrc (think new users)
+# * Verify that required config variables are set in ~/.garrc
 # * Add "diag" command to display CC versions, ~/.garrc settings, and such
 # * Improve error messages when buildsys can't be found
 # * Enable checkout of a specific revision for build recipe + GAR
@@ -54,7 +55,7 @@
 set -u
 set -e
 
-VERSION=0.95-dev
+VERSION=0.95
 EDITOR=${EDITOR:-vi}
 PATH=$PATH:/opt/csw/bin
 DEF_BUILDTREE=~/opencsw

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

___
devel mailing list
devel@lists.opencsw.org
https://lists.opencsw.org/mailman/listinfo/devel

[csw-devel] SF.net SVN: gar:[16904] csw/mgar/pkg/mgar/trunk

2012-01-24 Thread skayser

Revision: 16904
  http://gar.svn.sourceforge.net/gar/?rev=16904&view=rev
Author:   skayser
Date: 2012-01-24 16:55:19 + (Tue, 24 Jan 2012)
Log Message:
---
mgar/trunk: bump to 0.95

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

Modified: csw/mgar/pkg/mgar/trunk/Makefile
===
--- csw/mgar/pkg/mgar/trunk/Makefile2012-01-24 16:04:09 UTC (rev 16903)
+++ csw/mgar/pkg/mgar/trunk/Makefile2012-01-24 16:55:19 UTC (rev 16904)
@@ -2,7 +2,7 @@
 # TODO (release-critical prefixed with !, non release-critical with *)
 #
 NAME = mgar
-VERSION = 0.94
+VERSION = 0.95
 CATEGORIES = apps
 
 DESCRIPTION = Command line interface to the OpenCSW build system
@@ -12,7 +12,7 @@
 
 VENDOR_URL = http://gar.opencsw.org
 SVNROOT= https://opencsw.svn.sourceforge.net/svnroot/opencsw/gar-wrapper
-SVNREV = 564
+SVNREV = 597
 
 ARCHALL = 1
 

Modified: csw/mgar/pkg/mgar/trunk/files/changelog.CSW
===
--- csw/mgar/pkg/mgar/trunk/files/changelog.CSW 2012-01-24 16:04:09 UTC (rev 
16903)
+++ csw/mgar/pkg/mgar/trunk/files/changelog.CSW 2012-01-24 16:55:19 UTC (rev 
16904)
@@ -1,3 +1,8 @@
+mgar (0.95,REV=2012.01.24)
+
+  * Bump to version 0.95.
+
+ -- Sebastian Kayser   Tue, 24 Jan 2012 17:27:54 +0100
 mgar (0.94,REV=2011.09.28)
 
   * Depend on CSWgar-dev instead of obsolete CSWgardevel

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

___
devel mailing list
devel@lists.opencsw.org
https://lists.opencsw.org/mailman/listinfo/devel

[csw-devel] SF.net SVN: gar:[16905] csw/mgar/pkg/php5/trunk/Makefile

2012-01-24 Thread bdwalton

Revision: 16905
  http://gar.svn.sourceforge.net/gar/?rev=16905&view=rev
Author:   bdwalton
Date: 2012-01-25 01:38:32 + (Wed, 25 Jan 2012)
Log Message:
---
php5/trunk: update dependencies (most modules link to libz1 now!)

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

Modified: csw/mgar/pkg/php5/trunk/Makefile
===
--- csw/mgar/pkg/php5/trunk/Makefile2012-01-24 16:55:19 UTC (rev 16904)
+++ csw/mgar/pkg/php5/trunk/Makefile2012-01-25 01:38:32 UTC (rev 16905)
@@ -86,6 +86,8 @@
 CATALOGNAME_CSWphp5= php5
 SPKG_DESC_CSWphp5  = A High-Level Scripting Language
 RUNTIME_DEP_PKGS_CSWphp5 += CSWlibxml2-2 CSWlibiconv2 CSWlibexpat1 CSWlibz1
+RUNTIME_DEP_PKGS_CSWphp5 += CSWlibicuio48 CSWlibicuuc48 CSWlibicui18n48
+RUNTIME_DEP_PKGS_CSWphp5 += CSWlibicudata48
 INCOMPATIBLE_PKGS_CSWphp5 = CSWphp5mimemagic CSWphp5mhash CSWphp5dbase
 INCOMPATIBLE_PKGS_CSWphp5 += CSWphp5ncurses CSWmodphp5
 # embeded 'magic' information to detect file types...odd, but...
@@ -132,83 +134,85 @@
 SPKG_DESC_CSWap2-modphp5 = The apache 2.2.x php5 module
 RUNTIME_DEP_PKGS_CSWap2-modphp5  = CSWphp5 CSWapache2 CSWlibxml2-2 CSWlibiconv2
 RUNTIME_DEP_PKGS_CSWap2-modphp5 += CSWlibexpat1 CSWlibz1
+RUNTIME_DEP_PKGS_CSWap2-modphp5 += CSWlibicuio48 CSWlibicuuc48
+RUNTIME_DEP_PKGS_CSWap2-modphp5 += CSWlibicui18n48 CSWlibicudata48 
 OBSOLETED_BY_CSWap2-modphp5 = CSWap2modphp5
 PKGFILES_CSWap2-modphp5 += $(prefix)/apache2.*
 CHECKPKG_OVERRIDES_CSWap2-modphp5 += surplus-dependency|CSWphp5
 CHECKPKG_OVERRIDES_CSWap2-modphp5 += 
file-with-bad-content|/usr/local|root/opt/csw/apache2/libexec/libphp5.so
 
-$(eval $(call php5_subpackage,bcmath))
-$(eval $(call php5_subpackage,bz2,CSWlibbz2-1-0))
-$(eval $(call php5_subpackage,calendar))
-$(eval $(call php5_subpackage,ctype))
+$(eval $(call php5_subpackage,bcmath,CSWlibz1))
+$(eval $(call php5_subpackage,bz2,CSWlibbz2-1-0 CSWlibz1))
+$(eval $(call php5_subpackage,calendar,CSWlibz1))
+$(eval $(call php5_subpackage,ctype,CSWlibz1))
 $(eval $(call php5_subpackage,curl,CSWlibcurl4 CSWlibidn11 CSWosslrt CSWlibz1))
-$(eval $(call php5_subpackage,dba,CSWlibgdbm3 CSWbdb42))
+$(eval $(call php5_subpackage,dba,CSWlibgdbm4 CSWbdb42, CSWlibz1))
 $(eval $(call php5_subpackage,dom,CSWlibiconv2 CSWlibxml2-2 CSWlibz1))
 PKGFILES_CSWphp5-dom += .*include/php/ext/dom.*
-$(eval $(call php5_subpackage,exif))
-$(eval $(call php5_subpackage,ftp,CSWosslrt))
-$(eval $(call php5_subpackage,gd,CSWftype2 CSWlibgd2 CSWjpeg CSWlibpng12-0 
CSWt1lib CSWxpm CSWlibz1))
+$(eval $(call php5_subpackage,exif,CSWlibz1))
+$(eval $(call php5_subpackage,ftp,CSWosslrt CSWlibz1))
+$(eval $(call php5_subpackage,gd,CSWlibfreetype6 CSWlibgd2 CSWlibjpeg7 
CSWlibpng12-0 CSWt1lib CSWxpm CSWlibz1))
 PKGFILES_CSWphp5-gd += .*/include/php/ext/gd.*
-$(eval $(call php5_subpackage,gettext,CSWlibintl8))
-$(eval $(call php5_subpackage,gmp,CSWlibgmp10))
-$(eval $(call php5_subpackage,hash))
+$(eval $(call php5_subpackage,gettext,CSWlibintl8 CSWlibz1))
+$(eval $(call php5_subpackage,gmp,CSWlibgmp10 CSWlibz1))
+$(eval $(call php5_subpackage,hash,CSWlibz1))
 PKGFILES_CSWphp5-hash += .*/include/php/ext/hash.*
-$(eval $(call php5_subpackage,iconv,CSWlibiconv2))
+$(eval $(call php5_subpackage,iconv,CSWlibiconv2 CSWlibz))
 PKGFILES_CSWphp5-iconv += .*/include/php/ext/iconv.*
-$(eval $(call php5_subpackage,imap,CSWimaprt CSWlibk5crypto3 
CSWlibgssapi-krb5-2 CSWlibcom-err3 CSWlibkrb5-3 CSWosslrt))
-$(eval $(call php5_subpackage,json))
-$(eval $(call php5_subpackage,ldap,CSWoldaprt CSWsasl))
-$(eval $(call php5_subpackage,mbstring))
+$(eval $(call php5_subpackage,imap,CSWimaprt CSWlibk5crypto3 
CSWlibgssapi-krb5-2 CSWlibcom-err3 CSWlibkrb5-3 CSWosslrt CSWlibz1))
+$(eval $(call php5_subpackage,json,CSWlibz1))
+$(eval $(call php5_subpackage,ldap,CSWoldaprt CSWlibsasl2-2 CSWlibz1))
+$(eval $(call php5_subpackage,mbstring,CSWlibz1))
 PKGFILES_CSWphp5-mbstring += .*/include/php/ext/mbstring.*
-$(eval $(call php5_subpackage,mcrypt,CSWlibmcrypt CSWlibltdl7))
-$(eval $(call php5_subpackage,mssql,CSWfreetds))
-$(eval $(call php5_subpackage,mysql,CSWlibmysqlclient15))
+$(eval $(call php5_subpackage,mcrypt,CSWlibmcrypt4 CSWlibltdl7 CSWlibz1))
+$(eval $(call php5_subpackage,mssql,CSWlibsybdb5 CSWlibz1))
+$(eval $(call php5_subpackage,mysql,CSWlibmysqlclient15 CSWlibz1))
 $(eval $(call php5_subpackage,mysqli,CSWlibmysqlclient15 CSWlibz1))
-$(eval $(call php5_subpackage,odbc,CSWunixodbc))
-$(eval $(call php5_subpackage,openssl,CSWosslrt CSWlibgssapi-krb5-2 
CSWlibkrb5-3 CSWlibk5crypto3 CSWlibcom-err3))
-$(eval $(call php5_subpackage,pcntl))
-$(eval $(call php5_subpackage,pdo))
+$(eval $(call php5_subpackage,odbc,CSWlibodbc2 CSWlibz1))
+$(eval $(call php5_subpackage,openssl,CSWosslrt CSWlibgssapi-krb5-2 
CSWlibkrb5-3 CSWlibk5crypto3 CSWlibcom-err3 CSWlibz1))
+$(eval $(call php5_subpackage,pcntl,CSWlibz1))
+$(eval $(call php5_subpackage,pdo,CSWlibz1))
 PKGFILES_CSWphp5

[csw-devel] SF.net SVN: gar:[16906] csw/mgar/pkg/php5/trunk/Makefile

2012-01-24 Thread bdwalton

Revision: 16906
  http://gar.svn.sourceforge.net/gar/?rev=16906&view=rev
Author:   bdwalton
Date: 2012-01-25 02:41:08 + (Wed, 25 Jan 2012)
Log Message:
---
php5/trunk: more dependency fixes

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

Modified: csw/mgar/pkg/php5/trunk/Makefile
===
--- csw/mgar/pkg/php5/trunk/Makefile2012-01-25 01:38:32 UTC (rev 16905)
+++ csw/mgar/pkg/php5/trunk/Makefile2012-01-25 02:41:08 UTC (rev 16906)
@@ -145,21 +145,21 @@
 $(eval $(call php5_subpackage,bz2,CSWlibbz2-1-0 CSWlibz1))
 $(eval $(call php5_subpackage,calendar,CSWlibz1))
 $(eval $(call php5_subpackage,ctype,CSWlibz1))
-$(eval $(call php5_subpackage,curl,CSWlibcurl4 CSWlibidn11 CSWosslrt CSWlibz1))
-$(eval $(call php5_subpackage,dba,CSWlibgdbm4 CSWbdb42, CSWlibz1))
+$(eval $(call php5_subpackage,curl,CSWlibcurl4 CSWlibidn11 CSWlibssl0-9-8 
CSWlibz1))
+$(eval $(call php5_subpackage,dba,CSWlibgdbm4 CSWbdb42 CSWlibz1))
 $(eval $(call php5_subpackage,dom,CSWlibiconv2 CSWlibxml2-2 CSWlibz1))
 PKGFILES_CSWphp5-dom += .*include/php/ext/dom.*
 $(eval $(call php5_subpackage,exif,CSWlibz1))
-$(eval $(call php5_subpackage,ftp,CSWosslrt CSWlibz1))
+$(eval $(call php5_subpackage,ftp,CSWlibssl0-9-8 CSWlibz1))
 $(eval $(call php5_subpackage,gd,CSWlibfreetype6 CSWlibgd2 CSWlibjpeg7 
CSWlibpng12-0 CSWt1lib CSWxpm CSWlibz1))
 PKGFILES_CSWphp5-gd += .*/include/php/ext/gd.*
 $(eval $(call php5_subpackage,gettext,CSWlibintl8 CSWlibz1))
 $(eval $(call php5_subpackage,gmp,CSWlibgmp10 CSWlibz1))
 $(eval $(call php5_subpackage,hash,CSWlibz1))
 PKGFILES_CSWphp5-hash += .*/include/php/ext/hash.*
-$(eval $(call php5_subpackage,iconv,CSWlibiconv2 CSWlibz))
+$(eval $(call php5_subpackage,iconv,CSWlibiconv2 CSWlibz1))
 PKGFILES_CSWphp5-iconv += .*/include/php/ext/iconv.*
-$(eval $(call php5_subpackage,imap,CSWimaprt CSWlibk5crypto3 
CSWlibgssapi-krb5-2 CSWlibcom-err3 CSWlibkrb5-3 CSWosslrt CSWlibz1))
+$(eval $(call php5_subpackage,imap,CSWimaprt CSWlibk5crypto3 
CSWlibgssapi-krb5-2 CSWlibcom-err3 CSWlibkrb5-3 CSWlibssl0-9-8 CSWlibz1))
 $(eval $(call php5_subpackage,json,CSWlibz1))
 $(eval $(call php5_subpackage,ldap,CSWoldaprt CSWlibsasl2-2 CSWlibz1))
 $(eval $(call php5_subpackage,mbstring,CSWlibz1))
@@ -169,7 +169,7 @@
 $(eval $(call php5_subpackage,mysql,CSWlibmysqlclient15 CSWlibz1))
 $(eval $(call php5_subpackage,mysqli,CSWlibmysqlclient15 CSWlibz1))
 $(eval $(call php5_subpackage,odbc,CSWlibodbc2 CSWlibz1))
-$(eval $(call php5_subpackage,openssl,CSWosslrt CSWlibgssapi-krb5-2 
CSWlibkrb5-3 CSWlibk5crypto3 CSWlibcom-err3 CSWlibz1))
+$(eval $(call php5_subpackage,openssl,CSWlibssl0-9-8 CSWlibgssapi-krb5-2 
CSWlibkrb5-3 CSWlibk5crypto3 CSWlibcom-err3 CSWlibz1))
 $(eval $(call php5_subpackage,pcntl,CSWlibz1))
 $(eval $(call php5_subpackage,pdo,CSWlibz1))
 PKGFILES_CSWphp5-pdo += .*/include/php/ext/pdo.*

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

___
devel mailing list
devel@lists.opencsw.org
https://lists.opencsw.org/mailman/listinfo/devel

[csw-devel] SF.net SVN: gar:[16899] csw/mgar/pkg/lang-java/389-admin-console/trunk/ Makefile

[csw-devel] SF.net SVN: gar:[16900] csw/mgar/pkg/lang-java/389-ds-console/trunk/ Makefile

[csw-devel] SF.net SVN: gar:[16901] csw/mgar/pkg/389-admin/trunk

[csw-devel] SF.net SVN: gar:[16902] csw/mgar/pkg/rrdtool/trunk

[csw-devel] SF.net SVN: gar:[16903] csw/mgar/pkg/389-admin/trunk/Makefile

[csw-devel] SF.net SVN: opencsw:[597] gar-wrapper

[csw-devel] SF.net SVN: gar:[16904] csw/mgar/pkg/mgar/trunk

[csw-devel] SF.net SVN: gar:[16905] csw/mgar/pkg/php5/trunk/Makefile

[csw-devel] SF.net SVN: gar:[16906] csw/mgar/pkg/php5/trunk/Makefile

9 matches

Site Navigation

Mail list logo

Footer information