- USES=libtool tar:bzip2

- Add INSTALL_TARGET=install-strip
- Use @sample
- Simplify handling of symbolic links

3 files changed, 21 insertions, 81 deletions

diff --git a/net/netatalk/Makefile b/net/netatalk/Makefile
index 8ec419ca75de..2a67cd53a789 100644
--- a/net/netatalk/Makefile
+++ b/net/netatalk/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	netatalk
 PORTVERSION=	2.2.5
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	net print
 MASTER_SITES=	SF
@@ -12,12 +13,11 @@ COMMENT=	File server for Mac OS X
 
 LIB_DEPENDS=	libgcrypt.so:${PORTSDIR}/security/libgcrypt
 
-USE_AUTOTOOLS=	libtool
+USES=		gmake iconv libtool perl5 tar:bzip2
 USE_BDB=	46+
-USE_BZIP2=	yes
-USES=		iconv gmake perl5
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-D_IPP_PRIVATE_STRUCTURES
+INSTALL_TARGET=	install-strip
 USE_RC_SUBR=	netatalk
 
 CONFIGURE_ARGS+=	--with-tcp-wrappers \
@@ -34,7 +34,8 @@ 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
 
@@ -124,12 +125,10 @@ post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/contrib/macusers/macusers \
 		${STAGEDIR}${PREFIX}/bin/macusers
 .for i in ${FILES}
-	[ -f ${STAGEDIR}${PREFIX}/etc/${i} ] || \
-		${INSTALL_DATA} -c ${STAGEDIR}${PREFIX}/etc/${i}.dist ${STAGEDIR}${PREFIX}/etc/${i}
+	${MV} ${STAGEDIR}${PREFIX}/etc/${i} ${STAGEDIR}${PREFIX}/etc/${i}.sample
 .endfor
 .for i in ${LINKS}
-	( cd ${STAGEDIR}${PREFIX}/bin && ${LN} -sf megatron ${i} )
+	${LN} -sf megatron ${STAGEDIR}${PREFIX}/bin/${i}
 .endfor
-	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/net/netatalk/files/patch-config_Makefile.in b/net/netatalk/files/patch-config_Makefile.in
deleted file mode 100644
index 98a0c083682f..000000000000
--- a/net/netatalk/files/patch-config_Makefile.in
+++ /dev/null
@@ -1,28 +0,0 @@
---- config/Makefile.in.orig	2010-10-15 06:10:05.000000000 -0400
-+++ config/Makefile.in	2010-11-07 18:38:03.000000000 -0500
-@@ -592,8 +592,8 @@ install-data-local: install-config-files
- 
- uninstall-local:
- 	for f in $(CONFFILES) $(GENFILES); do \
--		echo rm -f $(DESTDIR)$(pkgconfdir)/$$f; \
--		rm -f $(DESTDIR)$(pkgconfdir)/$$f; \
-+		echo rm -f $(DESTDIR)$(pkgconfdir)/$$f.dist; \
-+		rm -f $(DESTDIR)$(pkgconfdir)/$$f.dist; \
- 	done
- 
- @USE_DEBIAN_TRUE@	rm -f $(DESTDIR)/etc/default/netatalk;
-@@ -601,12 +601,8 @@ uninstall-local:
- install-config-files: $(CONFFILES) $(GENFILES)
- 	$(mkinstalldirs) $(DESTDIR)$(pkgconfdir)
- 	for f in $(CONFFILES) $(GENFILES); do \
--		if test "x$(OVERWRITE_CONFIG)" = "xyes" -o ! -f $(DESTDIR)$(pkgconfdir)/$$f; then \
--			echo "$(INSTALL_DATA) $$f $(DESTDIR)$(pkgconfdir)"; \
--			$(INSTALL_DATA) $$f $(DESTDIR)$(pkgconfdir); \
--		else \
--			echo "not overwriting $$f"; \
--		fi; \
-+	    echo "$(INSTALL_DATA) $$f $(DESTDIR)$(pkgconfdir)/$$f.dist"; \
-+	    $(INSTALL_DATA) $$f $(DESTDIR)$(pkgconfdir)/$$f.dist; \
- 	done
- 
- @USE_DEBIAN_TRUE@	$(mkinstalldirs) $(DESTDIR)/default
diff --git a/net/netatalk/pkg-plist b/net/netatalk/pkg-plist
index 80a06610120d..f2f11d7beb0d 100644
--- a/net/netatalk/pkg-plist
+++ b/net/netatalk/pkg-plist
@@ -12,20 +12,13 @@ bin/dbd
 %%APPLETALK%%bin/getzones
 bin/macusers
 bin/megatron
-@exec cd %B && ln -s megatron hqx2bin
-@exec cd %B && ln -s megatron macbinary
-@exec cd %B && ln -s megatron nadheader
-@exec cd %B && ln -s megatron single2bin
-@exec cd %B && ln -s megatron unbin
-@exec cd %B && ln -s megatron unhex
-@exec cd %B && ln -s megatron unsingle
-@unexec rm -f %B/hqx2bin
-@unexec rm -f %B/macbinary
-@unexec rm -f %B/nadheader
-@unexec rm -f %B/single2bin
-@unexec rm -f %B/unbin
-@unexec rm -f %B/unhex
-@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 @@ bin/netatalk-config
 %%APPLETALK%%bin/psorder
 %%APPLETALK%%bin/showppd
 bin/uniconv
-@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
-@exec [ ! -f %B/AppleVolumes.default ] && cp %B/%f %B/AppleVolumes.default
-@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
-@exec [ ! -f %B/AppleVolumes.system ] && cp %B/%f %B/AppleVolumes.system
-@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
-@exec [ ! -f %B/afpd.conf ] && cp %B/%f %B/afpd.conf
-@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
-@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
-@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
-@exec [ ! -f %B/netatalk.conf ] && cp %B/%f %B/netatalk.conf
-@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
+@sample etc/AppleVolumes.default.sample
+@sample etc/AppleVolumes.system.sample
+@sample etc/afpd.conf.sample
+@sample etc/afp_ldap.conf.sample
+%%APPLETALK%%@sample etc/atalkd.conf.sample
+@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/ddp_var.h
 include/netatalk/endian.h
 include/netatalk/phase2.h
 lib/libatalk.a
-lib/libatalk.la
 %%APPLETALK%%libexec/etc2ps.sh
 %%APPLETALK%%libexec/ifmpap
 %%APPLETALK%%libexec/ifmpaprev