Fix missing dependency from pkg-config and compilation problems with

installed samba3-libsmbclient.

2 files changed, 38 insertions, 22 deletions

diff --git a/net/samba34/Makefile b/net/samba34/Makefile
index bb2eaadbfe2f..d2ab2ed21015 100644
--- a/net/samba34/Makefile
+++ b/net/samba34/Makefile
@@ -5,22 +5,17 @@
 # $FreeBSD$
 #
 
-PORTNAME?=		${SAMBA_PORTNAME}
-PORTVERSION?=		${SAMBA_VERSION}
+PORTNAME=		samba34
+PORTVERSION=		3.4.5
 CATEGORIES?=		net
 MASTER_SITES=		${MASTER_SITE_SAMBA}
 MASTER_SITE_SUBDIR=	. old-versions rc pre
-DISTNAME=		${SAMBA_DISTNAME}
+DISTNAME=		${PORTNAME:S|34$||}-${PORTVERSION:S|.p|pre|:S|.r|rc|:S|.t|tp|:S|.a|alpha|}
 
 MAINTAINER?=		timur@FreeBSD.org
 COMMENT?=		A free SMB and CIFS client and server for UNIX
 
 CONFLICTS?=		ja-samba-[23].* samba-[23].* sharity-light-1.* tdb-1.*
-
-SAMBA_PORTNAME=		samba34
-SAMBA_VERSION=		3.4.5
-SAMBA_DISTNAME=		${SAMBA_PORTNAME:S|34$||}-${SAMBA_VERSION:S|.p|pre|:S|.r|rc|:S|.t|tp|:S|.a|alpha|}
-
 # Additional patches from Sernet.de
 PATCH_STRIP=		-p1
 EXTRA_PATCHES=		${PATCHDIR}/sernet.patch
@@ -52,11 +47,7 @@ SAMBA_MODULEDIR=	${SAMBA_LIBDIR}/${PORTNAME}
 SAMBA_INCLUDEDIR=	${PREFIX}/include/${PORTNAME}
 SAMBA_PRIVATEDIR?=	${SAMBA_CONFDIR}/${PORTNAME}
 
-PKGCONFIGDIR?=		${PREFIX}/libdata/pkgconfig
-PKGCONFIGDIR_REL?=	${PKGCONFIGDIR:S|^${PREFIX}/||}
-
 CONFIGURE_ARGS+=	--exec-prefix="${PREFIX}" \
-			--with-fhs \
 			--sysconfdir="${SAMBA_CONFDIR}" \
 			--with-configdir="${SAMBA_CONFDIR}" \
 			--includedir="${SAMBA_INCLUDEDIR}" \
@@ -74,6 +65,13 @@ CONFIGURE_ARGS+=	--exec-prefix="${PREFIX}" \
 CPPFLAGS+=		-I${LOCALBASE}/include
 LDFLAGS+=		-L${LOCALBASE}/lib
 CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+# pkg-config is used to find talloc
+PKGCONFIGDIR?=		${PREFIX}/libdata/pkgconfig
+PKGCONFIGDIR_REL?=	${PKGCONFIGDIR:S|^${PREFIX}/||}
+
+PKG_CONFIG?=		${LOCALBASE}/bin/pkg-config
+CONFIGURE_ENV+=		PKG_CONFIG="${PKG_CONFIG}"
+BUILD_DEPENDS+=		${PKG_CONFIG}:${PORTSDIR}/devel/pkg-config
 # Let process generate meaningful backtrace on a core dump
 LIB_DEPENDS+=		execinfo.1:${PORTSDIR}/devel/libexecinfo
 # Always use external libtalloc
@@ -104,7 +102,7 @@ OPTIONS=	LDAP		"With LDAP support" on \
 .endif
 
 .include <bsd.port.options.mk>
-
+# XXX
 .if ${OSVERSION} >= 701000 && ${OSVERSION} < 702000
 IGNORE=			databases/tdb crashes on FreeBSD 7.1. Please, consider upgrading to 7.2 or higher
 .endif
@@ -256,7 +254,6 @@ CONFIGURE_ARGS+=	--without-dnsupdate
 .endif
 
 .if defined(WITH_DNSSD)
-SAMBA_WANT_PKG_CONFIG=	yes
 CPPFLAGS+=		`${PKG_CONFIG} --cflags avahi-compat-libdns_sd`
 DNSSD_LIBS=		`${PKG_CONFIG} --libs avahi-compat-libdns_sd`
 LIB_DEPENDS+=		dns_sd.1:${PORTSDIR}/net/avahi-libdns
@@ -315,12 +312,6 @@ CONFIGURE_ARGS+=	--with-ldap
 CONFIGURE_ARGS+=	--without-ldap
 .endif
 
-.if defined(SAMBA_WANT_PKG_CONFIG)
-PKG_CONFIG?=		${LOCALBASE}/bin/pkg-config
-CONFIGURE_ENV+=		PKG_CONFIG="${PKG_CONFIG}"
-BUILD_DEPENDS+=		pkg-config:${PORTSDIR}/devel/pkg-config
-.endif
-
 .if defined(WANT_EXP_MODULES) && !empty(WANT_EXP_MODULES)
 CONFIGURE_ARGS+=	--with-shared-modules="${WANT_EXP_MODULES:Q:C/(\\\\ )+/,/g}"
 .endif
diff --git a/net/samba34/files/patch-source3__configure.in b/net/samba34/files/patch-source3__configure.in
index fcd1013fed13..4da33fb9d0e6 100644
--- a/net/samba34/files/patch-source3__configure.in
+++ b/net/samba34/files/patch-source3__configure.in
@@ -1,5 +1,5 @@
---- ./source3/configure.in.orig	2010-01-18 12:38:09.000000000 +0100
-+++ ./source3/configure.in	2010-01-22 02:42:50.000000000 +0100
+--- ./source3/configure.in.orig	2010-01-18 11:38:09.000000000 +0000
++++ ./source3/configure.in	2010-02-06 12:37:49.000000000 +0000
 @@ -210,16 +210,6 @@
         fi
  fi
@@ -17,6 +17,31 @@
  #################################################
  # check for a shared memory profiling support
  AC_MSG_CHECKING(whether to use profiling)
+@@ -781,10 +771,10 @@
+ 
+         if test "x$CUPS_CONFIG" != x; then
+ 
+-		ac_save_CFLAGS=$CFLAGS
+-		ac_save_LDFLAGS=$LDFLAGS
++		ac_save_PRINT_CPPFLAGS=$CPPFLAGS
++		ac_save_PRINT_LDFLAGS=$LDFLAGS
+ 		ac_save_PRINT_LIBS=$PRINT_LIBS
+-		CFLAGS="$CFLAGS `$CUPS_CONFIG --cflags`"
++		CPPFLAGS="$CPPFLAGS `$CUPS_CONFIG --cflags`"
+ 		LDFLAGS="$LDFLAGS `$CUPS_CONFIG --ldflags`"
+ 		PRINT_LIBS="$PRINT_LIBS `$CUPS_CONFIG --libs`"
+ 		AC_CHECK_HEADERS(cups/cups.h cups/language.h)
+@@ -794,8 +784,8 @@
+ 			samba_cv_HAVE_CUPS=yes
+ 		else
+ 			AC_MSG_WARN([cups-config around but cups-devel not installed])
+-			CFLAGS=$ac_save_CFLAGS
+-			LDFLAGS=$ac_save_LDFLAGS
++			CPPFLAGS=$ac_save_PRINT_CPPFLAGS
++			LDFLAGS=$ac_save_PRINT_LDFLAGS
+ 			PRINT_LIBS=$ac_save_PRINT_LIBS
+ 		fi
+ 
 @@ -1747,9 +1737,6 @@
  AC_MSG_CHECKING([PICFLAG])
  AC_MSG_RESULT([$PICFLAG])