Update to 3.1.3 and disable DTRACE option as it is broken.

PR:		191157 (dtrace)

6 files changed, 24 insertions, 26 deletions

diff --git a/net/netatalk3/Makefile b/net/netatalk3/Makefile
index 0ee1ce1df674..c45c6d177c87 100644
--- a/net/netatalk3/Makefile
+++ b/net/netatalk3/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	netatalk
-PORTVERSION=	3.1.2
-PORTREVISION=	1
+PORTVERSION=	3.1.3
 PORTEPOCH=	1
 CATEGORIES=	net
 MASTER_SITES=	SF
@@ -33,7 +32,7 @@ CONFIGURE_ARGS+=	--with-pkgconfdir=${PREFIX}/etc \
 			--disable-bundled-libevent \
 			--with-libevent-header=${LOCALBASE}/include
 
-OPTIONS_DEFINE=PAM KRB5 LDAP SENDFILE KERBEROS DTRACE DBUS MYSQL ACL TCPWRAP
+OPTIONS_DEFINE=PAM KRB5 LDAP SENDFILE KERBEROS DBUS MYSQL ACL TCPWRAP
 OPTIONS_DEFAULT=KERBEROS DBUS TCPWRAP
 OPTIONS_RADIO=ZEROCONF
 OPTIONS_RADIO_ZEROCONF=AVAHI MDNSRESPONDER
@@ -41,7 +40,7 @@ OPTIONS_DEFAULT+=AVAHI
 
 NOZEROCONF_DESC=Disable Zeroconf(Bonjour) support
 KRB5_DESC=	Enable Kerberos V UAM
-DTRACE_DESC=	Enable DTrace support
+#DTRACE_DESC=	Enable DTrace support
 MYSQL_DESC=	Enable MySQL CNID backend support
 SENDFILE_DESC=	Enable Sendfile support
 ACL_DESC=	Enable ACL support
diff --git a/net/netatalk3/distinfo b/net/netatalk3/distinfo
index f9e1104253ac..287782e4ed16 100644
--- a/net/netatalk3/distinfo
+++ b/net/netatalk3/distinfo
@@ -1,2 +1,2 @@
-SHA256 (netatalk-3.1.2.tar.bz2) = 040b6e9add6ad9f2a0a9a58f5f1381ee5e6b9a60e7610f6722747c834f1de990
-SIZE (netatalk-3.1.2.tar.bz2) = 1785777
+SHA256 (netatalk-3.1.3.tar.bz2) = e19d289400d7c9600653e2e6155506c00bbd4f5b6fe45f2e53b1843fe15f6b37
+SIZE (netatalk-3.1.3.tar.bz2) = 1823258
diff --git a/net/netatalk3/files/patch-etc_apfd_Makefile.in b/net/netatalk3/files/patch-etc_apfd_Makefile.in
index aae2407073ba..2af7515ab8b7 100644
--- a/net/netatalk3/files/patch-etc_apfd_Makefile.in
+++ b/net/netatalk3/files/patch-etc_apfd_Makefile.in
@@ -1,15 +1,15 @@
---- etc/afpd/Makefile.in.orig	2014-03-13 07:33:40.000000000 -0400
-+++ etc/afpd/Makefile.in	2014-03-17 15:02:55.000000000 -0400
-@@ -141,7 +141,7 @@ spot_DEPENDENCIES = $(top_builddir)/liba
- spot_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
- 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(spot_CFLAGS) $(CFLAGS) \
- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+--- etc/afpd/Makefile.in.orig	2014-07-03 03:56:14.000000000 -0400
++++ etc/afpd/Makefile.in	2014-07-28 10:51:17.000000000 -0400
+@@ -198,7 +198,7 @@ AM_V_at = $(am__v_at_@AM_V@)
+ am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+ am__v_at_0 = @
+ am__v_at_1 = 
 -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/include
  depcomp = $(SHELL) $(top_srcdir)/depcomp
  am__depfiles_maybe = depfiles
  am__mv = mv -f
-@@ -404,7 +404,7 @@ afpd_SOURCES = afp_avahi.c afp_config.c 
+@@ -479,7 +479,7 @@ afpd_SOURCES = afp_avahi.c afp_config.c 
  afpd_LDADD = $(top_builddir)/libatalk/libatalk.la @LIBGCRYPT_LIBS@ \
  	@QUOTA_LIBS@ @WRAP_LIBS@ @LIBADD_DL@ @ACL_LIBS@ \
  	@ZEROCONF_LIBS@ @PTHREAD_LIBS@ @GSSAPI_LIBS@ @KRB5_LIBS@ \
diff --git a/net/netatalk3/files/patch-include_atalk_acl.h b/net/netatalk3/files/patch-include_atalk_acl.h
new file mode 100644
index 000000000000..22d69aa3c152
--- /dev/null
+++ b/net/netatalk3/files/patch-include_atalk_acl.h
@@ -0,0 +1,10 @@
+--- include/atalk/acl.h.orig	2014-07-28 11:01:46.000000000 -0400
++++ include/atalk/acl.h	2014-07-28 11:01:58.000000000 -0400
+@@ -61,6 +61,7 @@ extern int remove_acl_vfs(const char *na
+ #else /* HAVE_ACLS=no */
+ 
+ #define O_NETATALK_ACL 0
++#define O_IGNORE 0
+ #define chmod_acl chmod
+ 
+ #endif /* HAVE_ACLS */
diff --git a/net/netatalk3/files/patch-libatalk_adouble_ad_open.c b/net/netatalk3/files/patch-libatalk_adouble_ad_open.c
deleted file mode 100644
index 8f1b75bc0ebb..000000000000
--- a/net/netatalk3/files/patch-libatalk_adouble_ad_open.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- libatalk/adouble/ad_open.c.orig	2014-05-27 12:33:15.000000000 -0400
-+++ libatalk/adouble/ad_open.c	2014-05-27 12:34:00.000000000 -0400
-@@ -586,7 +586,7 @@ static int ad_convert_osx(const char *pa
- 
-     origlen = ad_getentryoff(ad, ADEID_RFORK) + ad_getentrylen(ad, ADEID_RFORK);
- 
--    map = mmap(NULL, origlen, PROT_WRITE, MAP_SHARED, ad_reso_fileno(ad), 0);
-+    map = mmap(NULL, origlen, PROT_READ | PROT_WRITE, MAP_SHARED, ad_reso_fileno(ad), 0);
-     if (map == MAP_FAILED) {
-         LOG(log_error, logtype_ad, "mmap AppleDouble: %s\n", strerror(errno));
-         EC_FAIL;
diff --git a/net/netatalk3/pkg-plist b/net/netatalk3/pkg-plist
index 0bb0dc43d5b6..e8bde7366db4 100644
--- a/net/netatalk3/pkg-plist
+++ b/net/netatalk3/pkg-plist
@@ -61,8 +61,8 @@ include/atalk/vfs.h
 include/atalk/volume.h
 lib/libatalk.a
 lib/libatalk.so
-lib/libatalk.so.14
-lib/libatalk.so.14.0.0
+lib/libatalk.so.15
+lib/libatalk.so.15.0.0
 man/man1/ad.1.gz
 man/man1/afpldaptest.1.gz
 man/man1/afppasswd.1.gz