[Midnightbsd-cvs] mports [24736] trunk/net/netatalk: update netatalk to 2.2.5

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sat Dec 22 16:39:01 EST 2018 

Revision: 24736
          http://svnweb.midnightbsd.org/mports/?rev=24736
Author:   laffer1
Date:     2018-12-22 16:39:01 -0500 (Sat, 22 Dec 2018)
Log Message:
-----------
update netatalk to 2.2.5

Modified Paths:
--------------
    trunk/net/netatalk/Makefile
    trunk/net/netatalk/distinfo
    trunk/net/netatalk/files/netatalk.in
    trunk/net/netatalk/pkg-plist

Modified: trunk/net/netatalk/Makefile
===================================================================
--- trunk/net/netatalk/Makefile	2018-12-08 16:40:17 UTC (rev 24735)
+++ trunk/net/netatalk/Makefile	2018-12-22 21:39:01 UTC (rev 24736)
@@ -1,7 +1,7 @@
 # $MidnightBSD$
 
 PORTNAME=	netatalk
-PORTVERSION=	2.2.4
+PORTVERSION=	2.2.5
 PORTEPOCH=	1
 CATEGORIES=	net print
 MASTER_SITES=	SF
@@ -8,38 +8,42 @@
 
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	File server for Mac OS X
-LICENSE=	gpl2
 
-LIB_DEPENDS=	gcrypt:${PORTSDIR}/security/libgcrypt
+LIB_DEPENDS=	libgcrypt.so:security/libgcrypt
 
-USES=	libtool tar:bzip2 iconv gmake
-USE_BDB=	48+
+USES=		bdb gmake iconv libtool perl5 tar:bzip2
 GNU_CONFIGURE=	yes
-USE_PERL5=	yes
-WANT_GNOME=	yes
+CPPFLAGS+=	-D_IPP_PRIVATE_STRUCTURES
+INSTALL_TARGET=	install-strip
 USE_RC_SUBR=	netatalk
 
 CONFIGURE_ARGS+=	--with-tcp-wrappers \
 			--with-pkgconfdir=${PREFIX}/etc \
-			--with-libiconv=${LOCALBASE} \
+			${ICONV_CONFIGURE_BASE} \
 			--with-libgcrypt-dir=${LOCALBASE} \
-			--with-uams-path=${LOCALBASE}/libexec/netatalk-uams \
-			--with-bdb=${LOCALBASE} --program-prefix=''
+			--with-uams-path=${PREFIX}/libexec/netatalk-uams \
+			--with-bdb=${LOCALBASE}
 
-OPTIONS_DEFINE=	APPLETALK SRVLOC PAM TIMELORD KRB5 ZEROCONF LDAP SENDFILE
-OPTIONS_DEFAULT=	APPLETALK
-APPLETALK_DESC=	AppleTalk protocol support
+OPTIONS_DEFINE=	SRVLOC PAM KRB5 ZEROCONF LDAP SENDFILE
 SRVLOC_DESC=	Service Location Protocol support
-TIMELORD_DESC=	Timelord network time service
 KRB5_DESC=	Kerberos V UAM
 ZEROCONF_DESC=	Zeroconf (Bonjour) support
 SENDFILE_DESC=	sendfile support
 
-FILES=		AppleVolumes.default AppleVolumes.system afpd.conf netatalk.conf
+FILES=		AppleVolumes.default AppleVolumes.system afp_ldap.conf \
+		afpd.conf netatalk.conf
 LINKS=		unbin unhex unsingle hqx2bin single2bin macbinary \
 		binheader nadheader
+
 CONFLICTS=	bigloo-2.* cap-6.0.* tct-1.* netatalk-1* yudit-[0-9]*
 
+.if exists(/usr/include/netatalk/ddp.h)
+OPTIONS_DEFINE+=APPLETALK TIMELORD
+OPTIONS_DEFAULT=APPLETALK
+APPLETALK_DESC=	AppleTalk protocol support
+TIMELORD_DESC=	Timelord network time service
+.endif
+
 .include <bsd.mport.options.mk>
 
 .if ${PORT_OPTIONS:MKRB5}
@@ -67,7 +71,7 @@
 
 .if ${PORT_OPTIONS:MSRVLOC}
 CONFIGURE_ARGS+=	--enable-srvloc=${LOCALBASE}
-LIB_DEPENDS+=		slp.1:${PORTSDIR}/net/openslp
+LIB_DEPENDS+=		libslp.so:net/openslp
 SUB_LIST+=		SRVLOC="slpd"
 .else
 SUB_LIST+=		SRVLOC=""
@@ -83,8 +87,8 @@
 .if ${PORT_OPTIONS:MZEROCONF}
 CONFIGURE_ARGS+=	--enable-zeroconf=${LOCALBASE}
 CFLAGS+=		-I${LOCALBASE}/include -L${LOCALBASE}/lib
-LIB_DEPENDS+=		avahi-client.3:${PORTSDIR}/net/avahi-app
-USE_GNOME+=		pkgconfig
+LIB_DEPENDS+=		libavahi-client.so:net/avahi-app
+USES+=			pkgconfig
 SUB_LIST+=		ZEROCONF="avahi_daemon"
 .else
 CONFIGURE_ARGS+=	--disable-zerconf
@@ -107,22 +111,18 @@
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%DB_NAME%%|${BDB_INCLUDE_DIR:T}| ; \
-	    	s|%%DB_LIB%%|-l${BDB_LIB_NAME}|g ; \
+		s|%%DB_LIB%%|-l${BDB_LIB_NAME}|g ; \
 		s|%%LOCALBASE%%|${LOCALBASE}|g' \
 		${WRKSRC}/configure
 
 post-install:
-	@${RM} -f ${PREFIX}/bin/nu ${PREFIX}/bin/lp2pap.sh \
-		${PREFIX}/bin/test_parse_mtab \
-		${PREFIX}/bin/afpd-mtab.pl
 	${INSTALL_SCRIPT} ${WRKSRC}/contrib/macusers/macusers \
-		${PREFIX}/bin/macusers
+		${STAGEDIR}${PREFIX}/bin/macusers
 .for i in ${FILES}
-	[ -f ${PREFIX}/etc/${i} ] || \
-		${INSTALL_DATA} -c ${PREFIX}/etc/${i}.dist ${PREFIX}/etc/${i}
+	${MV} ${PREFIX}/etc/${i}.dist ${STAGEDIR}${PREFIX}/etc/${i}.sample
 .endfor
 .for i in ${LINKS}
-	( cd ${PREFIX}/bin && ${LN} -sf megatron ${i} )
+	${LN} -sf megatron ${STAGEDIR}${PREFIX}/bin/${i}
 .endfor
 
 .include <bsd.port.mk>

Modified: trunk/net/netatalk/distinfo
===================================================================
--- trunk/net/netatalk/distinfo	2018-12-08 16:40:17 UTC (rev 24735)
+++ trunk/net/netatalk/distinfo	2018-12-22 21:39:01 UTC (rev 24736)
@@ -1,2 +1,2 @@
-SHA256 (netatalk-2.2.4.tar.bz2) = 9a01b94d9b873a928c6cf0b7a07da0963b6f14aff41013fef455077ec55e22e7
-SIZE (netatalk-2.2.4.tar.bz2) = 1289663
+SHA256 (netatalk-2.2.5.tar.bz2) = 7658afc793ab36f1cda7df5719598acbf366e213e27be1cbbc2d93631c368869
+SIZE (netatalk-2.2.5.tar.bz2) = 1290761

Modified: trunk/net/netatalk/files/netatalk.in
===================================================================
--- trunk/net/netatalk/files/netatalk.in	2018-12-08 16:40:17 UTC (rev 24735)
+++ trunk/net/netatalk/files/netatalk.in	2018-12-22 21:39:01 UTC (rev 24736)
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: head/net/netatalk/files/netatalk.in 340872 2014-01-24 00:14:07Z mat $
 #
 # PROVIDE: atalkd papd cnid_metad timelord afpd
 # REQUIRE: DAEMON %%SRVLOC%% %%ZEROCONF%%

Modified: trunk/net/netatalk/pkg-plist
===================================================================
--- trunk/net/netatalk/pkg-plist	2018-12-08 16:40:17 UTC (rev 24735)
+++ trunk/net/netatalk/pkg-plist	2018-12-22 21:39:01 UTC (rev 24736)
@@ -12,20 +12,13 @@
 %%APPLETALK%%bin/getzones
 bin/macusers
 bin/megatron
- at exec cd %B && ln -s megatron hqx2bin
- at exec cd %B && ln -s megatron macbinary
- at exec cd %B && ln -s megatron nadheader
- at exec cd %B && ln -s megatron single2bin
- at exec cd %B && ln -s megatron unbin
- at exec cd %B && ln -s megatron unhex
- at exec cd %B && ln -s megatron unsingle
- at unexec rm -f %B/hqx2bin
- at unexec rm -f %B/macbinary
- at unexec rm -f %B/nadheader
- at unexec rm -f %B/single2bin
- at unexec rm -f %B/unbin
- at unexec rm -f %B/unhex
- at unexec rm -f %B/unsingle
+bin/hqx2bin
+bin/macbinary
+bin/nadheader
+bin/single2bin
+bin/unbin
+bin/unhex
+bin/unsingle
 %%APPLETALK%%bin/nbplkup
 %%APPLETALK%%bin/nbprgstr
 %%APPLETALK%%bin/nbpunrgstr
@@ -35,56 +28,33 @@
 %%APPLETALK%%bin/psorder
 %%APPLETALK%%bin/showppd
 bin/uniconv
- at unexec if cmp -s %D/etc/AppleVolumes.default %D/etc/AppleVolumes.default.dist; then rm -f %D/etc/AppleVolumes.default; fi
-etc/AppleVolumes.default.dist
- at exec [ ! -f %B/AppleVolumes.default ] && cp %B/%f %B/AppleVolumes.default
- at unexec if cmp -s %D/etc/AppleVolumes.system %D/etc/AppleVolumes.system.dist; then rm -f %D/etc/AppleVolumes.system; fi
-etc/AppleVolumes.system.dist
- at exec [ ! -f %B/AppleVolumes.system ] && cp %B/%f %B/AppleVolumes.system
- at unexec if cmp -s %D/etc/afpd.conf %D/etc/afpd.conf.dist; then rm -f %D/etc/afpd.conf; fi
-etc/afpd.conf.dist
- at exec [ ! -f %B/afpd.conf ] && cp %B/%f %B/afpd.conf
- at unexec if cmp -s %D/etc/afp_ldap.conf %D/etc/afp_ldap.conf.dist; then rm -f %D/etc/afp_ldap.conf; fi
-etc/afp_ldap.conf.dist
- at exec [ ! -f %B/afp_ldap.conf ] && cp %B/%f %B/afp_ldap.conf
-%%APPLETALK%%@unexec if cmp -s %D/etc/atalkd.conf %D/etc/atalkd.conf.dist; then rm -f %D/etc/atalkd.conf; fi
-%%APPLETALK%%etc/atalkd.conf.dist
-%%APPLETALK%%@exec [ ! -f %B/atalkd.conf ] && cp %B/%f %B/atalkd.conf
- at unexec if cmp -s %D/etc/netatalk.conf %D/etc/netatalk.conf.dist; then rm -f %D/etc/netatalk.conf; fi
-etc/netatalk.conf.dist
- at exec [ ! -f %B/netatalk.conf ] && cp %B/%f %B/netatalk.conf
- at unexec if cmp -s %D/etc/papd.conf %D/etc/papd.conf.dist; then rm -f %D/etc/papd.conf; fi
-%%APPLETALK%%etc/papd.conf.dist
-%%APPLETALK%%@exec [ ! -f %B/papd.conf ] && cp %B/%f %B/papd.conf
+ at sample etc/AppleVolumes.default.sample
+ at sample etc/AppleVolumes.system.sample
+ at sample etc/afpd.conf.sample
+ at sample etc/afp_ldap.conf.sample
+%%APPLETALK%%@sample etc/atalkd.conf.sample
+ at sample etc/netatalk.conf.sample
+%%APPLETALK%%@sample etc/papd.conf.sample
 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.la
 %%NETATALKPAM%%libexec/netatalk-uams/uams_dhx2_pam.so
 libexec/netatalk-uams/uams_dhx2_passwd.a
-libexec/netatalk-uams/uams_dhx2_passwd.la
 libexec/netatalk-uams/uams_dhx2_passwd.so
 %%NETATALKPAM%%libexec/netatalk-uams/uams_dhx_pam.a
-%%NETATALKPAM%%libexec/netatalk-uams/uams_dhx_pam.la
 %%NETATALKPAM%%libexec/netatalk-uams/uams_dhx_pam.so
 libexec/netatalk-uams/uams_dhx_passwd.a
-libexec/netatalk-uams/uams_dhx_passwd.la
 libexec/netatalk-uams/uams_dhx_passwd.so
 %%NETATALKKRB5%%libexec/netatalk-uams/uams_gss.a
-%%NETATALKKRB5%%libexec/netatalk-uams/uams_gss.la
 %%NETATALKKRB5%%libexec/netatalk-uams/uams_gss.so
 libexec/netatalk-uams/uams_guest.a
-libexec/netatalk-uams/uams_guest.la
 libexec/netatalk-uams/uams_guest.so
 %%NETATALKPAM%%libexec/netatalk-uams/uams_pam.a
-%%NETATALKPAM%%libexec/netatalk-uams/uams_pam.la
 %%NETATALKPAM%%libexec/netatalk-uams/uams_pam.so
 libexec/netatalk-uams/uams_passwd.a
-libexec/netatalk-uams/uams_passwd.la
 libexec/netatalk-uams/uams_passwd.so
 libexec/netatalk-uams/uams_randnum.a
-libexec/netatalk-uams/uams_randnum.la
 libexec/netatalk-uams/uams_randnum.so
 include/atalk/acl.h
 include/atalk/adouble.h
@@ -128,7 +98,6 @@
 include/netatalk/endian.h
 include/netatalk/phase2.h
 lib/libatalk.a
-lib/libatalk.la
 %%APPLETALK%%libexec/etc2ps.sh
 %%APPLETALK%%libexec/ifmpap
 %%APPLETALK%%libexec/ifmpaprev
@@ -152,6 +121,52 @@
 %%APPLETALK%%libexec/tfwmpaprev
 %%APPLETALK%%libexec/tfwpap
 %%APPLETALK%%libexec/tfwpaprev
+man/man1/ad.1.gz
+%%APPLETALK%%man/man1/aecho.1.gz
+man/man1/afpldaptest.1.gz
+man/man1/afppasswd.1.gz
+man/man1/apple_dump.1.gz
+man/man1/asip-status.pl.1.gz
+man/man1/dbd.1.gz
+%%APPLETALK%%man/man1/getzones.1.gz
+man/man1/hqx2bin.1.gz
+man/man1/macbinary.1.gz
+man/man1/macusers.1.gz
+man/man1/megatron.1.gz
+%%APPLETALK%%man/man1/nbp.1.gz
+%%APPLETALK%%man/man1/nbplkup.1.gz
+%%APPLETALK%%man/man1/nbprgstr.1.gz
+%%APPLETALK%%man/man1/nbpunrgstr.1.gz
+man/man1/netatalk-config.1.gz
+%%APPLETALK%%man/man1/pap.1.gz
+%%APPLETALK%%man/man1/papstatus.1.gz
+%%APPLETALK%%man/man1/psorder.1.gz
+man/man1/single2bin.1.gz
+man/man1/unbin.1.gz
+man/man1/unhex.1.gz
+man/man1/uniconv.1.gz
+man/man1/unsingle.1.gz
+%%APPLETALK%%man/man3/atalk_aton.3.gz
+%%APPLETALK%%man/man3/nbp_name.3.gz
+%%APPLETALK%%man/man4/atalk.4.gz
+man/man5/AppleVolumes.5.gz
+man/man5/AppleVolumes.default.5.gz
+man/man5/AppleVolumes.system.5.gz
+man/man5/afp_ldap.conf.5.gz
+man/man5/afp_signature.conf.5.gz
+man/man5/afp_voluuid.conf.5.gz
+man/man5/afpd.conf.5.gz
+%%APPLETALK%%man/man5/atalkd.conf.5.gz
+man/man5/netatalk.conf.5.gz
+%%APPLETALK%%man/man5/papd.conf.5.gz
+man/man8/afpd.8.gz
+%%APPLETALK%%man/man8/atalkd.8.gz
+man/man8/cnid_dbd.8.gz
+man/man8/cnid_metad.8.gz
+%%APPLETALK%%man/man8/papd.8.gz
+%%APPLETALK%%man/man8/papstatus.8.gz
+%%APPLETALK%%man/man8/psf.8.gz
+man/man8/timelord.8.gz
 sbin/afpd
 %%APPLETALK%%sbin/atalkd
 sbin/cnid_dbd
@@ -160,7 +175,3 @@
 %%TIMELORD%%sbin/timelord
 share/aclocal/netatalk.m4
 %%APPLETALK%%%%DATADIR%%/pagecount.ps
-%%APPLETALK%%@dirrm share/netatalk
- at dirrm include/netatalk
- at dirrm include/atalk
- at dirrm libexec/netatalk-uams

More information about the Midnightbsd-cvs mailing list