From ba3206da99ac6463fd29a87ad6a7bd3ccdb3f3ed Mon Sep 17 00:00:00 2001
From: Joe Marcus Clarke <marcus@FreeBSD.org>
Date: Sun, 31 Jul 2011 08:09:45 +0000
Subject: [PATCH] Add optional Zeroconf (Bonjour) support and enable it by
 default.

Requested by:	Jan Glaubitz <jan@glaubitz.org>
---
 net/netatalk/Makefile              | 13 ++++++++++++-
 net/netatalk/files/patch-configure | 23 +++++++++--------------
 2 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/net/netatalk/Makefile b/net/netatalk/Makefile
index 8b0a7318b510..552c4b4574ca 100644
--- a/net/netatalk/Makefile
+++ b/net/netatalk/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	netatalk
 PORTVERSION=	2.2.0
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	net print
 MASTER_SITES=	SF/netatalk/netatalk/2.2
@@ -23,7 +24,10 @@ USE_ICONV=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_PERL5=	yes
+WANT_GNOME=	yes
 USE_RC_SUBR=	netatalk
+CPPFLAGS=	-I${LOCALBASE}/include
+CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
 
 CONFIGURE_ARGS+=	--with-tcp-wrappers \
 			--with-pkgconfdir=${PREFIX}/etc \
@@ -36,7 +40,8 @@ OPTIONS=	APPLETALK	"Enable AppleTalk protocol support" on \
 		SRVLOC		"Enable Service Location Protocol support" off \
 		PAM		"Enable PAM support" off \
 		TIMELORD	"Enable Timelord network time service" off \
-		KRB5		"Enable Kerberos V UAM" off
+		KRB5		"Enable Kerberos V UAM" off \
+		ZEROCONF	"Enable Zeroconf (Bonjour) support" on
 
 FILES=		AppleVolumes.default AppleVolumes.system afpd.conf \
 		atalkd.conf papd.conf netatalk.conf
@@ -98,6 +103,12 @@ PLIST_SUB+=		TIMELORD=""
 PLIST_SUB+=		TIMELORD="@comment "
 .endif
 
+.if defined (WITH_ZEROCONF)
+CONFIGURE_ARGS+=	--enable-zeroconf=${LOCALBASE}
+LIB_DEPENDS+=		avahi-client.3:${PORTSDIR}/net/avahi-app
+USE_GNOME+=		pkgconfig
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%DB_NAME%%|${BDB_INCLUDE_DIR:T}| ; \
 	    	s|%%DB_LIB%%|-l${BDB_LIB_NAME}|g' \
diff --git a/net/netatalk/files/patch-configure b/net/netatalk/files/patch-configure
index fd67276b8504..16268021ebb7 100644
--- a/net/netatalk/files/patch-configure
+++ b/net/netatalk/files/patch-configure
@@ -1,19 +1,14 @@
 --- configure.orig	2011-07-27 07:59:28.000000000 -0400
-+++ configure	2011-07-30 18:23:04.000000000 -0400
-@@ -20316,10 +20316,10 @@ fi
++++ configure	2011-07-31 04:02:35.000000000 -0400
+@@ -27039,6 +27039,7 @@ fi
  
+         savedcflags="$CFLAGS"
+         savedldflags="$LDFLAGS"
++        saved_CPPFLAGS="$CPPFLAGS"
+ 	ICONV_CFLAGS=""
+ 	ICONV_LIBS=""
  
- # This can be used to rebuild libtool when needed
--LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+LIBTOOL_DEPS=" /usr/local/share/libtool/config/ltmain.sh"
- 
- # Always use our own libtool.
--LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-+LIBTOOL='$(SHELL) /usr/local/bin/libtool'
- 
- # Prevent multiple expansion
- 
-@@ -31357,7 +31357,7 @@ if test "x$bdb_required" = "xyes"; then
+@@ -31357,7 +31358,7 @@ if test "x$bdb_required" = "xyes"; then
      trybdbdir=""
      dobdbsearch=yes
      bdb_search_dirs="/usr/local /usr"
@@ -22,7 +17,7 @@
  
      bdbfound=no
      savedcflags="$CFLAGS"
-@@ -33387,7 +33387,7 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -33387,7 +33388,7 @@ rm -f core conftest.err conftest.$ac_obj
  fi
  { echo "$as_me:$LINENO: result: $netatalk_cv_HAVE_ACL_GET_PERM_NP" >&5
  echo "${ECHO_T}$netatalk_cv_HAVE_ACL_GET_PERM_NP" >&6; }