Revision: 18913
http://gar.svn.sourceforge.net/gar/?rev=18913&view=rev
Author: chninkel
Date: 2012-08-12 18:04:53 +0000 (Sun, 12 Aug 2012)
Log Message:
-----------
cadaver/trunk: removed superfluous dependencies
Modified Paths:
--------------
csw/mgar/pkg/cadaver/trunk/Makefile
csw/mgar/pkg/cadaver/trunk/files/changelog.CSW
Added Paths:
-----------
csw/mgar/pkg/cadaver/trunk/files/0001-no-curses-dependency.patch
csw/mgar/pkg/cadaver/trunk/files/0002-Neon-LD-option-fix.patch
Modified: csw/mgar/pkg/cadaver/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cadaver/trunk/Makefile 2012-08-11 17:31:25 UTC (rev 18912)
+++ csw/mgar/pkg/cadaver/trunk/Makefile 2012-08-12 18:04:53 UTC (rev 18913)
@@ -26,18 +26,16 @@
PACKAGES = CSWcadaver
SPKG_DESC_CSWcadaver = $(DESCRIPTION)
-RUNTIME_DEP_PKGS_CSWcadaver = CSWlibssl1-0-0
-RUNTIME_DEP_PKGS_CSWcadaver += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWcadaver = CSWlibintl8
RUNTIME_DEP_PKGS_CSWcadaver += CSWlibneon27
RUNTIME_DEP_PKGS_CSWcadaver += CSWlibreadline6
-RUNTIME_DEP_PKGS_CSWcadaver += CSWlibexpat1
-RUNTIME_DEP_PKGS_CSWcadaver += CSWlibz1
# Stub package that allow us to rename transparently the package
# from CSWcadav to CSWcadaver
OBSOLETED_BY_CSWcadaver = CSWcadav
CATALOGNAME_CSWcadav = cadaver_stub
+PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
###### Upstream and opencsw files information #######
@@ -46,6 +44,17 @@
DISTFILES = $(NAME)-$(VERSION).tar.gz
DISTFILES += changelog.CSW
+# cadaver wants to links with curses because of readline
+# but it's not necessary as readline already depends on
+# ncurses
+PATCHFILES = 0001-no-curses-dependency.patch
+
+# Let's not trust neon-config until Bug 4984 is fixed
+# https://www.opencsw.org/mantis/view.php?id=4984
+# This allow us to not depend directly anymore on a bunch
+# of libraries
+PATCHFILES += 0002-Neon-LD-option-fix.patch
+
##### Build and installation information #####
CONFIGURE_ARGS = $(DIRPATHS)
@@ -57,6 +66,10 @@
include gar/category.mk
+pre-configure-modulated:
+ cd $(WORKSRC) && autoconf
+ @$(MAKECOOKIE)
+
post-merge:
ginstall -D $(DOWNLOADDIR)/changelog.CSW $(PKGROOT)$(docdir)/$(NAME)/changelog.CSW
Added: csw/mgar/pkg/cadaver/trunk/files/0001-no-curses-dependency.patch
===================================================================
--- csw/mgar/pkg/cadaver/trunk/files/0001-no-curses-dependency.patch (rev 0)
+++ csw/mgar/pkg/cadaver/trunk/files/0001-no-curses-dependency.patch 2012-08-12 18:04:53 UTC (rev 18913)
@@ -0,0 +1,25 @@
+From 089acd5c1748266e91a7dec91cfbc49c94bfd58e Mon Sep 17 00:00:00 2001
+From: Yann Rouillard <yann at pleiades.fr.eu.org>
+Date: Sun, 12 Aug 2012 16:15:34 +0200
+Subject: [PATCH] no curses dependency
+
+---
+ m4/readline.m4 | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/m4/readline.m4 b/m4/readline.m4
+index c0ab8af..5606814 100644
+--- a/m4/readline.m4
++++ b/m4/readline.m4
+@@ -10,8 +10,6 @@ AC_ARG_ENABLE(readline,
+ [use_readline=yes]) dnl Defaults to ON (if found)
+
+ if test "$use_readline" = "yes"; then
+- AC_CHECK_LIB(curses, tputs, LIBS="$LIBS -lcurses",
+- AC_CHECK_LIB(ncurses, tputs))
+ AC_CHECK_LIB(readline, readline)
+
+ AC_SEARCH_LIBS(add_history, history,
+--
+1.7.10.3
+
Added: csw/mgar/pkg/cadaver/trunk/files/0002-Neon-LD-option-fix.patch
===================================================================
--- csw/mgar/pkg/cadaver/trunk/files/0002-Neon-LD-option-fix.patch (rev 0)
+++ csw/mgar/pkg/cadaver/trunk/files/0002-Neon-LD-option-fix.patch 2012-08-12 18:04:53 UTC (rev 18913)
@@ -0,0 +1,34 @@
+From a2877acd081224c3c624eafa876dd7fb33e2382d Mon Sep 17 00:00:00 2001
+From: Yann Rouillard <yann at pleiades.fr.eu.org>
+Date: Sun, 12 Aug 2012 16:20:27 +0200
+Subject: [PATCH] sdfksdfsdf
+
+---
+ m4/neon/neon.m4 | 4 +-
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/m4/neon/neon.m4 b/m4/neon/neon.m4
+index edff529..d06ab70 100644
+--- a/m4/neon/neon.m4
++++ b/m4/neon/neon.m4
+@@ -181,7 +181,7 @@ m4_ifdef([ne_require_major], [
+ ne_save_LIBS="$LIBS"
+ ne_save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS `$NEON_CONFIG --cflags`"
+- LIBS="$LIBS `$NEON_CONFIG --libs`"
++ LIBS="$LIBS -lneon"
+ ne_libver=`$NEON_CONFIG --version | sed -e "s/neon //g"`
+ # Check whether it's possible to link against neon
+ AC_CACHE_CHECK([linking against neon], [ne_cv_lib_neon],
+@@ -252,7 +252,7 @@ neon_prefix=`$NEON_CONFIG --prefix`
+ NEON_CHECK_VERSION([
+ # Pick up CFLAGS and LIBS needed
+ CFLAGS="$CFLAGS `$NEON_CONFIG --cflags`"
+- NEON_LIBS="$NEON_LIBS `$NEON_CONFIG --libs`"
++ NEON_LIBS="$NEON_LIBS -lneon"
+ # Pick up library version
+ set dummy `$NEON_CONFIG --version | sed 's/\./ /g'`
+ NE_VERSION_MAJOR=[$]3; NE_VERSION_MINOR=[$]4; NE_VERSION_PATCH=[$]5
+--
+1.7.10.3
+
Modified: csw/mgar/pkg/cadaver/trunk/files/changelog.CSW
===================================================================
--- csw/mgar/pkg/cadaver/trunk/files/changelog.CSW 2012-08-11 17:31:25 UTC (rev 18912)
+++ csw/mgar/pkg/cadaver/trunk/files/changelog.CSW 2012-08-12 18:04:53 UTC (rev 18913)
@@ -1,3 +1,10 @@
+cadaver (0.23.3,rev=2012.08.12) unstable
+
+ * Removed superfluous dependancies:
+ CSWlibz1, CSWlibexpat1, CSWlibssl1-0-0
+
+ -- Yann rouillard <yann at opencsw.org> Sun, 12 Aug 2012 19:51:48 +0200
+
cadaver (0.23.3,rev=2012.05.17) unstable
* Rebuilt against libssl 1.0
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.