6 files changed, 26 insertions, 31 deletions

diff --git a/net/netatalk3/Makefile b/net/netatalk3/Makefile
index 1003c448bf28..6a05476cebfe 100644
--- a/net/netatalk3/Makefile
+++ b/net/netatalk3/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	netatalk
-PORTVERSION=	3.0
-PORTREVISION=	1
+PORTVERSION=	3.0.1
 CATEGORIES=	net
 MASTER_SITES=	SF
 
@@ -37,7 +36,9 @@ CONFIGURE_ARGS+=	--enable-tcp-wrappers \
 			--with-uams-path=${PREFIX}/libexec/netatalk-uams \
 			--with-bdb=${LOCALBASE} \
 			--localstatedir=/var \
-			--disable-bundled-libevent
+			--disable-bundled-libevent \
+			--with-libevent-header=${LOCALBASE}/include/event2 \
+			--with-libevent-lib=${LOCALBASE}/lib/event2
 
 OPTIONS=	PAM		"Enable PAM support" off \
 		KRB5		"Enable Kerberos V UAM" off \
@@ -105,8 +106,7 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|%%DB_NAME%%|${BDB_INCLUDE_DIR:T}| ; \
 	    	s|%%DB_LIB%%|-l${BDB_LIB_NAME}|g ; \
 		s|%%LOCALBASE%%|${LOCALBASE}|g' \
-		${WRKSRC}/configure \
-		${WRKSRC}/etc/netatalk/Makefile.in
+		${WRKSRC}/configure
 
 post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/contrib/macusers/macusers \
diff --git a/net/netatalk3/distinfo b/net/netatalk3/distinfo
index f5fc3498663c..c9588eec6062 100644
--- a/net/netatalk3/distinfo
+++ b/net/netatalk3/distinfo
@@ -1,2 +1,2 @@
-SHA256 (netatalk-3.0.tar.bz2) = b7babbc986dbd6f0fca55103637de6947892b29287cb7cfbbaaa77dea3ead54c
-SIZE (netatalk-3.0.tar.bz2) = 1628026
+SHA256 (netatalk-3.0.1.tar.bz2) = 31f2a30d8eac0de5a8b8beddbd7b3418ba898a0d60b4d20c3ed6b568e91cc203
+SIZE (netatalk-3.0.1.tar.bz2) = 1633970
diff --git a/net/netatalk3/files/netatalk.in b/net/netatalk3/files/netatalk.in
index f174db95e8ac..565478f03f10 100644
--- a/net/netatalk3/files/netatalk.in
+++ b/net/netatalk3/files/netatalk.in
@@ -20,4 +20,7 @@ name=netatalk
 rcvar=netatalk_enable
 
 load_rc_config ${name}
+
+command=%%PREFIX%%/sbin/${name}
+
 run_rc_command "$1"
diff --git a/net/netatalk3/files/patch-Makefile.in b/net/netatalk3/files/patch-Makefile.in
deleted file mode 100644
index 2b5026732548..000000000000
--- a/net/netatalk3/files/patch-Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
-$FreeBSD$
-
---- Makefile.in.orig	2012-09-03 11:10:13.000000000 -0400
-+++ Makefile.in	2012-09-03 11:10:22.000000000 -0400
-@@ -344,7 +344,7 @@ target_vendor = @target_vendor@
- top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--SUBDIRS = libatalk libevent bin config etc man contrib distrib include doc macros test
-+SUBDIRS = libatalk bin config etc man contrib distrib include doc macros test
- EXTRA_DIST = CONTRIBUTORS COPYRIGHT COPYING NEWS VERSION
- ACLOCAL_AMFLAGS = -I macros
- AUTOMAKE_OPTIONS = foreign
diff --git a/net/netatalk3/files/patch-etc_netatalk_Makefile.in b/net/netatalk3/files/patch-etc_netatalk_Makefile.in
index 78d2c54f7704..038587e7312b 100644
--- a/net/netatalk3/files/patch-etc_netatalk_Makefile.in
+++ b/net/netatalk3/files/patch-etc_netatalk_Makefile.in
@@ -1,17 +1,13 @@
 $FreeBSD$
 
---- etc/netatalk/Makefile.in.orig	2012-09-03 11:16:51.000000000 -0400
-+++ etc/netatalk/Makefile.in	2012-09-03 11:19:41.000000000 -0400
-@@ -62,6 +62,12 @@ sbin_PROGRAMS = netatalk$(EXEEXT)
- @USE_BUILTIN_LIBEVENT_TRUE@am__append_2 = \
+--- etc/netatalk/Makefile.in.orig	2012-09-28 05:17:54.000000000 -0400
++++ etc/netatalk/Makefile.in	2012-09-29 01:00:04.000000000 -0400
+@@ -63,7 +63,7 @@ sbin_PROGRAMS = netatalk$(EXEEXT)
  @USE_BUILTIN_LIBEVENT_TRUE@	$(top_builddir)/libevent/libevent.la
  
-+am__append_1 = \
-+	       -I%%LOCALBASE%%/include/event2
-+
-+am__append_2 = \
-+	       %%LOCALBASE%%/lib/event2/libevent.la
-+
+ @USE_BUILTIN_LIBEVENT_FALSE@am__append_3 = @LIBEVENT_CFLAGS@
+-@USE_BUILTIN_LIBEVENT_FALSE@am__append_4 = @LIBEVENT_LDFLAGS@ -levent
++@USE_BUILTIN_LIBEVENT_FALSE@am__append_4 = @LIBEVENT_LDFLAGS@ -levent-2.0
  subdir = etc/netatalk
  DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
diff --git a/net/netatalk3/pkg-plist b/net/netatalk3/pkg-plist
index 14c7298c32b4..eaa5246b6222 100644
--- a/net/netatalk3/pkg-plist
+++ b/net/netatalk3/pkg-plist
@@ -44,11 +44,20 @@ libexec/netatalk-uams/uams_randnum.so
 include/atalk/acl.h
 include/atalk/adouble.h
 include/atalk/afp.h
+include/atalk/bstrlib.h
 include/atalk/cnid.h
+include/atalk/compat.h
+include/atalk/dictionary.h
 include/atalk/ea.h
+include/atalk/globals.h
+include/atalk/hash.h
+include/atalk/iniparser.h
+include/atalk/list.h
 include/atalk/logger.h
 include/atalk/netatalk_conf.h
 include/atalk/paths.h
+include/atalk/standards.h
+include/atalk/uam.h
 include/atalk/unicode.h
 include/atalk/unix.h
 include/atalk/util.h
@@ -57,7 +66,7 @@ include/atalk/volume.h
 lib/libatalk.a
 lib/libatalk.la
 lib/libatalk.so
-lib/libatalk.so.1
+lib/libatalk.so.2
 sbin/afpd
 sbin/cnid_dbd
 sbin/cnid_metad