Update to 3.1.10.

* Clean up the port to use the new OPTIONS framework [1]
* Make sure to use the right Python executable for afpstats [2]

PR:		213192 [2]
Submitted by:	bofh [1]
Differential Revision:	D7537 [1]

9 files changed, 72 insertions, 156 deletions

diff --git a/net/netatalk3/Makefile b/net/netatalk3/Makefile
index bbda2d6e24ea..00e01fc98c11 100644
--- a/net/netatalk3/Makefile
+++ b/net/netatalk3/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	netatalk
-PORTVERSION=	3.1.9
+PORTVERSION=	3.1.10
 PORTEPOCH=	1
 CATEGORIES=	net
 MASTER_SITES=	SF
@@ -16,10 +16,11 @@ LICENSE=	GPLv2
 LIB_DEPENDS=	libgcrypt.so:security/libgcrypt \
 		libevent.so:devel/libevent2
 
-USES=		iconv gmake pkgconfig perl5 libtool tar:bzip2 bdb:5+ ssl
+USES=		bdb:5+ gettext gmake iconv libtool perl5 pkgconfig ssl tar:bzip2
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 USE_RC_SUBR=	netatalk
+INSTALL_TARGET=install-strip
 
 CONFIGURE_ARGS+=	--with-pkgconfdir=${PREFIX}/etc \
 			--with-libgcrypt-dir=${LOCALBASE} \
@@ -30,134 +31,65 @@ CONFIGURE_ARGS+=	--with-pkgconfdir=${PREFIX}/etc \
 			--disable-bundled-libevent \
 			--with-libevent-header=${LOCALBASE}/include \
 			--with-libevent-lib=${LOCALBASE}/lib \
-			--with-ssl-dir=${OPENSSLBASE}
+			--with-ssl-dir=${OPENSSLBASE} \
+			--without-dtrace
 
-OPTIONS_DEFINE=PAM KRB5 LDAP SENDFILE KERBEROS DBUS MYSQL ACL TCPWRAP
-OPTIONS_DEFAULT=KERBEROS DBUS TCPWRAP
+OPTIONS_DEFINE=PAM KERBEROS5 LDAP SENDFILE KERBEROS DBUS MYSQL ACL LIBWRAP \
+	       ZEROCONF
+OPTIONS_DEFAULT=KERBEROS DBUS LIBWRAP ZEROCONF
 OPTIONS_RADIO=ZEROCONF
 OPTIONS_RADIO_ZEROCONF=AVAHI MDNSRESPONDER
-OPTIONS_DEFAULT+=AVAHI
-
-NOZEROCONF_DESC=Disable Zeroconf(Bonjour) support
-KRB5_DESC=	Enable Kerberos V UAM
-#DTRACE_DESC=	Enable DTrace support
+ZEROCONF_IMPLIES=AVAHI
+ZEROCONF_DESC=	Zeroconf(Bonjour) support
 MYSQL_DESC=	Enable MySQL CNID backend support
 SENDFILE_DESC=	Enable Sendfile support
 ACL_DESC=	Enable ACL support
-TCPWRAP_DESC=	Enable TCP Wrappers support
-
-.include <bsd.port.options.mk>
+OPTIONS_SUB=	yes
+KERBEROS5_CONFIGURE_ON=	--enable-krbV-uam
+KERBEROS_CONFIGURE_WITH=kerberos
+KERBEROS_LIB_DEPENDS=libgpg-error.so:security/libgpg-error
+PAM_CONFIGURE_WITH=pam
+ZEROCONF_CONFIGURE_OFF=	--disable-zeroconf
+AVAHI_CONFIGURE_ON=	--enable-zeroconf=${LOCALBASE}
+AVAHI_CFLAGS=		-I${LOCALBASE}/include -L${LOCALBASE}/lib
+AVAHI_LIB_DEPENDS=		libavahi-client.so:net/avahi-app
+MDNSRESPONDER_CONFIGURE_ON=	--enable-zeroconf=${LOCALBASE}
+MDNSRESPONDER_CFLAGS=		-I${LOCALBASE}/include -L${LOCALBASE}/lib
+MDNSRESPONDER_LIB_DEPENDS=		libdns_sd.so:net/mDNSResponder
+LDAP_CONFIGURE_ON=	--with-ldap=${LOCALBASE}
+LDAP_CFLAGS=		-I${LOCALBASE}/include -L${LOCALBASE}/lib
+LDAP_USE=	OPENLDAP=yes
+LDAP_CONFIGURE_OFF=	--without-ldap
+SENDFILE_CONFIGURE_ENABLE=sendfile
+DBUS_USES=	python:2
+DBUS_USE=	GNOME=glib20
+DBUS_LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib \
+			libdbus-1.so:devel/dbus
+DBUS_RUN_DEPENDS=	${PYTHON_SITELIBDIR}/dbus/_dbus.py:devel/py-dbus
+MYSQL_USE=	MYSQL=yes
+MYSQL_CONFIGURE_OFF=--with-mysql-config=/nonexistent
+ACL_LIB_DEPENDS=	libsunacl.so:sysutils/libsunacl
+ACL_CONFIGURE_WITH=acls
+LIBWRAP_CONFIGURE_ENABLE=tcp-wrappers
 
 CONFLICTS=	bigloo-2.* cap-6.0.* tct-1.* netatalk-[12]* yudit-[0-9]*
 
-.if ${PORT_OPTIONS:MKRB5}
-CONFIGURE_ARGS+=	--enable-krbV-uam
-PLIST_SUB+=		NETATALKKRB5=""
-.else
-PLIST_SUB+=		NETATALKKRB5="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MDTRACE}
-CONFIGURE_ARGS+=	--with-dtrace
-.else
-CONFIGURE_ARGS+=	--without-dtrace
-.endif
-
-.if ${PORT_OPTIONS:MKERBEROS}
-CONFIGURE_ARGS+=	--with-kerberos
-.else
-CONFIGURE_ARGS+=	--without-kerberos
-.endif
-
-.if ${PORT_OPTIONS:MPAM}
-CONFIGURE_ARGS+=	--with-pam
-PLIST_SUB+=		NETATALKPAM=""
-.else
-CONFIGURE_ARGS+=	--without-pam
-PLIST_SUB+=		NETATALKPAM="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MNOZEROCONF}
-CONFIGURE_ARGS+=	--disable-zeroconf
-SUB_LIST+=		ZEROCONF=""
-.endif
-
-.if ${PORT_OPTIONS:MAVAHI}
-CONFIGURE_ARGS+=	--enable-zeroconf=${LOCALBASE}
-CFLAGS+=		-I${LOCALBASE}/include
-LDFLAGS+=		-L${LOCALBASE}/lib
-LIB_DEPENDS+=		libavahi-client.so:net/avahi-app
-SUB_LIST+=		ZEROCONF="avahi_daemon"
-.endif
-
-.if ${PORT_OPTIONS:MMDNSRESPONDER}
-CONFIGURE_ARGS+=	--enable-zeroconf=${LOCALBASE}
-CONFIGURE_ENV+=		ac_cv_lib_avahi_client_avahi_client_new=no
-CFLAGS+=		-I${LOCALBASE}/include
-LDFLAGS+=		-L${LOCALBASE}/lib
-LIB_DEPENDS+=		libdns_sd.so:net/mDNSResponder
-SUB_LIST+=		ZEROCONF="mdnsd"
-.endif
-
-.if ${PORT_OPTIONS:MLDAP}
-CONFIGURE_ARGS+=	--with-ldap=${LOCALBASE}
-CFLAGS+=		-I${LOCALBASE}/include
-LDFLAGS+=		-L${LOCALBASE}/lib
-USE_OPENLDAP=		yes
-.else
-CONFIGURE_ARGS+=	--without-ldap
-.endif
-
-.if ${PORT_OPTIONS:MSENDFILE}
-CONFIGURE_ARGS+=	--enable-sendfile
-.else
-CONFIGURE_ARGS+=	--disable-sendfile
-.endif
-
-.if ${PORT_OPTIONS:MDBUS} || exists(${LOCALBASE}/libdata/pkgconfig/dbus-glib-1.pc)
-USES+=			python:2
-LIB_DEPENDS+=		libdbus-glib-1.so:devel/dbus-glib
-RUN_DEPENDS+=		${PYTHON_SITELIBDIR}/dbus/_dbus.py:devel/py-dbus
-PLIST_SUB+=		DBUS=""
-.else
-PLIST_SUB+=		DBUS="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MMYSQL}
-USE_MYSQL=	yes
-.else
-CONFIGURE_ARGS+=--with-mysql-config=/nonexistent
-.endif
-
-.if ${PORT_OPTIONS:MACL}
-LIB_DEPENDS+=	libsunacl.so:sysutils/libsunacl
-CONFIGURE_ARGS+=--with-acls
-.else
-CONFIGURE_ARGS+=--without-acls
-.endif
-
-.if ${PORT_OPTIONS:MTCPWRAP}
-CONFIGURE_ARGS+=--enable-tcp-wrappers
-.else
-CONFIGURE_ARGS+=--disable-tcp-wrappers
-.endif
-
 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
-
-post-stage:
-	@${RM} -f ${STAGEDIR}${PREFIX}/etc/afp.conf \
-		${STAGEDIR}${PREFIX}/etc/extmap.conf
+	@${REINPLACE_CMD} -e 's|\.dist|\.sample|g' \
+	    	${WRKSRC}/config/Makefile.in
+	@${REINPLACE_CMD} -e 's|%%PYTHONCMD%%|${PYTHONCMD}|' \
+	    	${WRKSRC}/contrib/shell_utils/afpstats
 
 post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/contrib/macusers/macusers \
 		${STAGEDIR}${PREFIX}/bin/macusers
-	[ -f ${STAGEDIR}${PREFIX}/etc/afp.conf ] || \
-		${INSTALL_DATA} -c ${STAGEDIR}${PREFIX}/etc/afp.conf.dist ${STAGEDIR}${PREFIX}/etc/afp.conf
-	[ -f ${STAGEDIR}${PREFIX}/etc/extmap.conf ] || \
-		${INSTALL_DATA} -c ${STAGEDIR}${PREFIX}/etc/extmap.conf.dist ${STAGEDIR}${PREFIX}/etc/extmap.conf
+
+post-install-PAM-on:
+	${INSTALL_DATA} ${PATCHDIR}/netatalk \
+	    	${STAGEDIR}${PREFIX}/etc/pam.d/netatalk
 
 .include <bsd.port.mk>
diff --git a/net/netatalk3/distinfo b/net/netatalk3/distinfo
index ef636d050374..44d8bd353889 100644
--- a/net/netatalk3/distinfo
+++ b/net/netatalk3/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1469020005
-SHA256 (netatalk-3.1.9.tar.bz2) = 70db9c82e9e92bbf2083b9b322e58d2a8ddea9f09ac5204c18998439b7feb0d0
-SIZE (netatalk-3.1.9.tar.bz2) = 1801139
+TIMESTAMP = 1475956261
+SHA256 (netatalk-3.1.10.tar.bz2) = 2b40161985bb32cff5660bf689a4704f15c33bb87565efc7805dd5c75ad1fcc7
+SIZE (netatalk-3.1.10.tar.bz2) = 1811929
diff --git a/net/netatalk3/files/patch-config_Makefile.in b/net/netatalk3/files/patch-config_Makefile.in
index fc87e9eea82e..3e6614c3e842 100644
--- a/net/netatalk3/files/patch-config_Makefile.in
+++ b/net/netatalk3/files/patch-config_Makefile.in
@@ -1,6 +1,6 @@
---- config/Makefile.in.orig	2016-06-22 09:01:44 UTC
+--- config/Makefile.in.orig	2016-09-12 09:54:34 UTC
 +++ config/Makefile.in
-@@ -820,8 +820,8 @@ install-data-local: install-config-files
+@@ -825,8 +825,8 @@ install-data-local: install-config-files
  
  uninstall-local:
  	@for f in $(CONFFILES) $(GENFILES); do \
@@ -11,7 +11,7 @@
  	done
  	rm -f $(DESTDIR)$(pkgconfdir)/dbus-session.conf
  	rm -f $(DESTDIR)$(localstatedir)/netatalk/README
-@@ -831,21 +831,16 @@ uninstall-local:
+@@ -836,21 +836,16 @@ uninstall-local:
  install-config-files: $(CONFFILES) $(GENFILES)
  	$(mkinstalldirs) $(DESTDIR)$(pkgconfdir)
  	@for f in $(CONFFILES) ; do \
diff --git a/net/netatalk3/files/patch-configure b/net/netatalk3/files/patch-configure
index 2eae5078ce6f..5b24b6253404 100644
--- a/net/netatalk3/files/patch-configure
+++ b/net/netatalk3/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	2015-12-28 21:02:04.000000000 -0500
-+++ configure	2015-12-31 12:34:21.340885027 -0500
-@@ -17342,7 +17342,7 @@ if test "x$bdb_required" = "xyes"; then
+--- configure.orig	2016-09-12 09:54:34 UTC
++++ configure
+@@ -17360,7 +17360,7 @@ if test "x$bdb_required" = "xyes"; then
      trybdbdir=""
      dobdbsearch=yes
      bdb_search_dirs="/usr/local /usr"
diff --git a/net/netatalk3/files/patch-etc_afpd_Makefile.in b/net/netatalk3/files/patch-etc_afpd_Makefile.in
index 3a51c0f0cdb9..2d68da15b637 100644
--- a/net/netatalk3/files/patch-etc_afpd_Makefile.in
+++ b/net/netatalk3/files/patch-etc_afpd_Makefile.in
@@ -1,6 +1,6 @@
---- etc/afpd/Makefile.in.orig	2016-06-22 09:01:44 UTC
+--- etc/afpd/Makefile.in.orig	2016-09-12 09:54:35 UTC
 +++ etc/afpd/Makefile.in
-@@ -186,7 +186,7 @@ AM_V_at = $(am__v_at_@AM_V@)
+@@ -191,7 +191,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 = 
@@ -9,7 +9,7 @@
  depcomp = $(SHELL) $(top_srcdir)/depcomp
  am__depfiles_maybe = depfiles
  am__mv = mv -f
-@@ -468,7 +468,7 @@ afpd_SOURCES = afp_config.c afp_dsi.c af
+@@ -473,7 +473,7 @@ afpd_SOURCES = afp_config.c afp_dsi.c af
  	$(am__append_7)
  afpd_LDADD = $(top_builddir)/libatalk/libatalk.la @LIBGCRYPT_LIBS@ \
  	@QUOTA_LIBS@ @WRAP_LIBS@ @LIBADD_DL@ @ACL_LIBS@ @PTHREAD_LIBS@ \
diff --git a/net/netatalk3/files/patch-etc_afpd_volume.c b/net/netatalk3/files/patch-etc_afpd_volume.c
deleted file mode 100644
index 5fecade00436..000000000000
--- a/net/netatalk3/files/patch-etc_afpd_volume.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- etc/afpd/volume.c.orig	2016-07-20 13:19:58 UTC
-+++ etc/afpd/volume.c
-@@ -380,7 +380,11 @@ static int getvolparams(const AFPObj *ob
-                         ashort |= VOLPBIT_ATTR_UNIXPRIV;
-                     if (vol->v_flags & AFPVOL_TM)
-                         ashort |= VOLPBIT_ATTR_TM;
-+#ifdef HAVE_LDAP
-                     if (!ldap_config_valid || vol->v_flags & AFPVOL_NONETIDS)
-+#else
-+                    if (vol->v_flags & AFPVOL_NONETIDS)
-+#endif
-                         ashort |= VOLPBIT_ATTR_NONETIDS;
-                     if (obj->afp_version >= 32) {
-                         if (vol->v_vfs_ea)
diff --git a/net/netatalk3/files/patch-libatalk_vfs_extattr.c b/net/netatalk3/files/patch-libatalk_vfs_extattr.c
index 02f7382f820e..d3f5f301b1f4 100644
--- a/net/netatalk3/files/patch-libatalk_vfs_extattr.c
+++ b/net/netatalk3/files/patch-libatalk_vfs_extattr.c
@@ -4,8 +4,8 @@
      const char *attrname = ((s=strchr(name, '.')) == NULL) ? name : s + 1;
  
      if((retval=extattr_get_fd(filedes, attrnamespace, attrname, NULL, 0)) >= 0) {
-+	if (size == 0)
-+	    return retval;
++        if (size == 0)
++            return retval;
          if(retval > size) {
              errno = ERANGE;
              return -1;
diff --git a/net/netatalk3/pkg-install b/net/netatalk3/pkg-install
index 9d9f10e2c81f..a75edb787af2 100644
--- a/net/netatalk3/pkg-install
+++ b/net/netatalk3/pkg-install
@@ -6,9 +6,6 @@ DBDIR=/var/netatalk
 
 case $2 in
 	POST-INSTALL)
-		umask 22
-		mkdir -p $DBDIR/CNID
-		chown root:wheel $DBDIR $DBDIR/CNID
 		tee $DBDIR/README > $DBDIR/CNID/README <<-'EOF'
 			This directory contains modifiable Netatalk configuration files and the CNID databases.
 		EOF
diff --git a/net/netatalk3/pkg-plist b/net/netatalk3/pkg-plist
index b222929f13d6..4fad9a0076d9 100644
--- a/net/netatalk3/pkg-plist
+++ b/net/netatalk3/pkg-plist
@@ -8,27 +8,28 @@ bin/cnid2_create
 bin/dbd
 bin/macusers
 bin/netatalk-config
-@sample etc/afp.conf.dist etc/afp.conf
+@sample etc/afp.conf.sample
 %%DBUS%%etc/dbus-1/system.d/netatalk-dbus.conf
 %%DBUS%%etc/dbus-session.conf.netatalk
-@sample etc/extmap.conf.dist etc/extmap.conf
+@sample etc/extmap.conf.sample
+%%PAM%%etc/pam.d/netatalk
 libexec/netatalk-uams/uams_clrtxt.so
 libexec/netatalk-uams/uams_dhx.so
 libexec/netatalk-uams/uams_dhx2.so
-%%NETATALKPAM%%libexec/netatalk-uams/uams_dhx2_pam.a
-%%NETATALKPAM%%libexec/netatalk-uams/uams_dhx2_pam.so
+%%PAM%%libexec/netatalk-uams/uams_dhx2_pam.a
+%%PAM%%libexec/netatalk-uams/uams_dhx2_pam.so
 libexec/netatalk-uams/uams_dhx2_passwd.a
 libexec/netatalk-uams/uams_dhx2_passwd.so
-%%NETATALKPAM%%libexec/netatalk-uams/uams_dhx_pam.a
-%%NETATALKPAM%%libexec/netatalk-uams/uams_dhx_pam.so
+%%PAM%%libexec/netatalk-uams/uams_dhx_pam.a
+%%PAM%%libexec/netatalk-uams/uams_dhx_pam.so
 libexec/netatalk-uams/uams_dhx_passwd.a
 libexec/netatalk-uams/uams_dhx_passwd.so
-%%NETATALKKRB5%%libexec/netatalk-uams/uams_gss.a
-%%NETATALKKRB5%%libexec/netatalk-uams/uams_gss.so
+%%KERBEROS5%%libexec/netatalk-uams/uams_gss.a
+%%KERBEROS5%%libexec/netatalk-uams/uams_gss.so
 libexec/netatalk-uams/uams_guest.a
 libexec/netatalk-uams/uams_guest.so
-%%NETATALKPAM%%libexec/netatalk-uams/uams_pam.a
-%%NETATALKPAM%%libexec/netatalk-uams/uams_pam.so
+%%PAM%%libexec/netatalk-uams/uams_pam.a
+%%PAM%%libexec/netatalk-uams/uams_pam.so
 libexec/netatalk-uams/uams_passwd.a
 libexec/netatalk-uams/uams_passwd.so
 libexec/netatalk-uams/uams_randnum.a
@@ -57,8 +58,8 @@ include/atalk/vfs.h
 include/atalk/volume.h
 lib/libatalk.a
 lib/libatalk.so
-lib/libatalk.so.17
-lib/libatalk.so.17.0.0
+lib/libatalk.so.18
+lib/libatalk.so.18.0.0
 man/man1/ad.1.gz
 man/man1/afpldaptest.1.gz
 man/man1/afppasswd.1.gz