From owner-svn-ports-all@FreeBSD.ORG Thu Jul 10 11:59:10 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D655115B; Thu, 10 Jul 2014 11:59:10 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C2FBF2270; Thu, 10 Jul 2014 11:59:10 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6ABxAx7043127; Thu, 10 Jul 2014 11:59:10 GMT (envelope-from tijl@svn.freebsd.org) Received: (from tijl@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6ABxAcZ043125; Thu, 10 Jul 2014 11:59:10 GMT (envelope-from tijl@svn.freebsd.org) Message-Id: <201407101159.s6ABxAcZ043125@svn.freebsd.org> From: Tijl Coosemans Date: Thu, 10 Jul 2014 11:59:10 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r361438 - in head/net/netatalk: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Jul 2014 11:59:10 -0000 Author: tijl Date: Thu Jul 10 11:59:10 2014 New Revision: 361438 URL: http://svnweb.freebsd.org/changeset/ports/361438 QAT: https://qat.redports.org/buildarchive/r361438/ Log: - USES=libtool tar:bzip2 - Add INSTALL_TARGET=install-strip - Use @sample - Simplify handling of symbolic links Deleted: head/net/netatalk/files/patch-config_Makefile.in Modified: head/net/netatalk/Makefile head/net/netatalk/pkg-plist Modified: head/net/netatalk/Makefile ============================================================================== --- head/net/netatalk/Makefile Thu Jul 10 10:27:39 2014 (r361437) +++ head/net/netatalk/Makefile Thu Jul 10 11:59:10 2014 (r361438) @@ -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 Modified: head/net/netatalk/pkg-plist ============================================================================== --- head/net/netatalk/pkg-plist Thu Jul 10 10:27:39 2014 (r361437) +++ head/net/netatalk/pkg-plist Thu Jul 10 11:59:10 2014 (r361438) @@ -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