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

[slowfranklin at users.sourceforge.net]

Revision: 21001
          http://gar.svn.sourceforge.net/gar/?rev=21001&view=rev
Author:   slowfranklin
Date:     2013-05-05 16:54:25 +0000 (Sun, 05 May 2013)
Log Message:
-----------
netatalk/trunk: Fix issues reported by checkpkg

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

Added Paths:
-----------
    csw/mgar/pkg/netatalk/trunk/files/0000-Add-rpath-for-bdb.patch

Modified: csw/mgar/pkg/netatalk/trunk/Makefile
===================================================================
--- csw/mgar/pkg/netatalk/trunk/Makefile	2013-05-05 14:45:26 UTC (rev 21000)
+++ csw/mgar/pkg/netatalk/trunk/Makefile	2013-05-05 16:54:25 UTC (rev 21001)
@@ -26,20 +26,25 @@
 BUILD_DEP_PKGS += CSWlibdbus-dev
 BUILD_DEP_PKGS += CSWlibdbus-glib-dev
 
-RUNTIME_DEP_PKGS += CSWlibgssapi-krb5-2
+RUNTIME_DEP_PKGS += CSWlibgthread2-0-0
 RUNTIME_DEP_PKGS += CSWlibgcrypt11
+RUNTIME_DEP_PKGS += CSWperl
+RUNTIME_DEP_PKGS += CSWlibgobject2-0-0
+RUNTIME_DEP_PKGS += CSWlibkrb5-3
+RUNTIME_DEP_PKGS += CSWlibglib2-0-0
+RUNTIME_DEP_PKGS += CSWlibdbus-glib1-2
+RUNTIME_DEP_PKGS += CSWlibiconv2
+RUNTIME_DEP_PKGS += CSWlibldap2-4-2
 RUNTIME_DEP_PKGS += CSWbdb48
-RUNTIME_DEP_PKGS += CSWlibiconv2
-RUNTIME_DEP_PKGS += CSWlibssl1-0-0
-RUNTIME_DEP_PKGS += CSWkrb5lib
-RUNTIME_DEP_PKGS += CSWlibdbus
-RUNTIME_DEP_PKGS += CSWdbusglib
 
-# Both patched are in upstream and will be in 3.0.4
+# Patches are in upstream and will be in 3.0.4
+PATCHFILES += 0000-Add-rpath-for-bdb.patch
 PATCHFILES += 0001-Fix-use-of-unnamed-union-inside-struct.patch
 PATCHFILES += 0003-Fix-misspelled-compiler-variable.patch
 
 CONFIGURE_ARGS = $(DIRPATHS)
+CONFIGURE_ARGS += --libdir=$(prefix)/lib/netatalk
+CONFIGURE_ARGS += --with-uams-path=$(prefix)/lib/netatalk
 CONFIGURE_ARGS += --disable-static
 CONFIGURE_ARGS += --disable-tcp-wrappers
 CONFIGURE_ARGS += --with-bdb=/opt/csw/bdb48
@@ -47,5 +52,9 @@
 CONFIGURE_ARGS += --with-init-style=solaris
 CONFIGURE_ARGS += --with-init-dir=/var/opt/csw/svc/manifest/network/
 
+# Path to XML dtd
+CHECKPKG_OVERRIDES_CSWnetatalk += file-with-bad-content|/usr/share|root/var/opt/csw/svc/manifest/network/netatalk.xml
+
+
 include gar/category.mk
 

Added: csw/mgar/pkg/netatalk/trunk/files/0000-Add-rpath-for-bdb.patch
===================================================================
--- csw/mgar/pkg/netatalk/trunk/files/0000-Add-rpath-for-bdb.patch	                        (rev 0)
+++ csw/mgar/pkg/netatalk/trunk/files/0000-Add-rpath-for-bdb.patch	2013-05-05 16:54:25 UTC (rev 21001)
@@ -0,0 +1,34 @@
+From 702ab8079a32e9049670cdcdc1bd6f169d3e41a9 Mon Sep 17 00:00:00 2001
+From: Ralph Boehme <sloowfranklin at gmail.com>
+Date: Sun, 5 May 2013 18:21:26 +0200
+Subject: [PATCH] Add rpath for bdb
+
+---
+ configure | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure b/configure
+index 3bbb206..5e54b19 100755
+--- a/configure
++++ b/configure
+@@ -16649,7 +16649,7 @@ fi
+ 
+                         if test x"${atalk_cv_bdb_version}" = x"yes"; then
+                             BDB_CFLAGS="-I${bdbdir}/include${subdir}"
+-                            BDB_LIBS="-L${bdblibdir} ${atalk_cv_lib_db}"
++                            BDB_LIBS="-L${bdblibdir} -R${bdblibdir} ${atalk_cv_lib_db}"
+                             BDB_BIN="$bdbbindir"
+                             BDB_PATH="$bdbdir"
+                             bdbfound=yes
+@@ -16742,7 +16742,7 @@ fi
+ 
+                            if test x"${atalk_cv_bdb_version}" = x"yes"; then
+                               BDB_CFLAGS="-I${bdbdir}/include${subdir}"
+-                              BDB_LIBS="-L${bdblibdir} ${atalk_cv_lib_db}"
++                              BDB_LIBS="-L${bdblibdir} -R${bdblibdir} ${atalk_cv_lib_db}"
+                               BDB_BIN="$bdbbindir"
+                               BDB_PATH="$bdbdir"
+                               bdbfound=yes
+-- 
+1.8.1.4
+

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