Date: Wed, 12 Oct 2011 21:51:28 GMT From: Xin LI <delphij@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: marcus@FreeBSD.org Subject: ports/161525: [PATCH] Fix plist for net/netatalk when using custom build options Message-ID: <201110122151.p9CLpSBt079241@freefall.freebsd.org> Resent-Message-ID: <201110122200.p9CM0Khn079631@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 161525 >Category: ports >Synopsis: [PATCH] Fix plist for net/netatalk when using custom build options >Confidential: no >Severity: serious >Priority: high >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Wed Oct 12 22:00:20 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Xin LI >Release: FreeBSD 8.2-STABLE i386 >Organization: iXsystems, Inc >Environment: System: FreeBSD freefall.freebsd.org 8.2-STABLE FreeBSD 8.2-STABLE #4 r220774: Mon Apr 18 13:56:14 UTC 2011 simon@freefall.freebsd.org:/usr/obj/usr/src/sys/FREEFALL i386 >Description: When building with PAM, the port would list a few non-existing files in plist. The proposed patch fixes various issues with the port. >How-To-Repeat: Build the port with different option combinations. >Fix: --- netatalk.diff begins here --- Index: Makefile =================================================================== RCS file: /home/ncvs/ports/net/netatalk/Makefile,v retrieving revision 1.103 diff -u -r1.103 Makefile --- Makefile 10 Sep 2011 18:40:45 -0000 1.103 +++ Makefile 12 Oct 2011 21:40:33 -0000 @@ -58,9 +58,6 @@ .if defined(WITH_KRB5) CONFIGURE_ARGS+= --enable-krbV-uam -PLIST_SUB+= NETATALKKRB5="" -.else -PLIST_SUB+= NETATALKKRB5="@comment " .endif .if defined(WITH_APPLETALK) @@ -79,10 +76,8 @@ .if defined(WITH_PAM) CONFIGURE_ARGS+= --with-pam -PLIST_SUB+= NETATALKPAM="" .else CONFIGURE_ARGS+= --without-pam -PLIST_SUB+= NETATALKPAM="@comment " .endif .if defined(WITH_SRVLOC) Index: pkg-plist =================================================================== RCS file: /home/ncvs/ports/net/netatalk/pkg-plist,v retrieving revision 1.33 diff -u -r1.33 pkg-plist --- pkg-plist 7 Aug 2011 17:43:59 -0000 1.33 +++ pkg-plist 12 Oct 2011 21:34:44 -0000 @@ -1,5 +1,5 @@ %%ATFUNCS%%bin/ad -bin/add_netatalk_printer +%%APPLETALK%%bin/add_netatalk_printer bin/adv1tov2 %%APPLETALK%%bin/aecho bin/afpldaptest @@ -33,7 +33,7 @@ %%APPLETALK%%bin/pap %%APPLETALK%%bin/papstatus %%APPLETALK%%bin/psorder -bin/showppd +%%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 @@ -56,36 +56,6 @@ @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 -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 include/atalk/aep.h @@ -130,29 +100,29 @@ include/netatalk/phase2.h lib/libatalk.a lib/libatalk.la -libexec/etc2ps.sh -libexec/ifmpap -libexec/ifmpaprev -libexec/ifpap -libexec/ifpaprev -libexec/ifwmpap -libexec/ifwmpaprev -libexec/ifwpap -libexec/ifwpaprev -libexec/ofmpap -libexec/ofpap -libexec/ofwmpap -libexec/ofwpap -libexec/psa +%%APPLETALK%%libexec/etc2ps.sh +%%APPLETALK%%libexec/ifmpap +%%APPLETALK%%libexec/ifmpaprev +%%APPLETALK%%libexec/ifpap +%%APPLETALK%%libexec/ifpaprev +%%APPLETALK%%libexec/ifwmpap +%%APPLETALK%%libexec/ifwmpaprev +%%APPLETALK%%libexec/ifwpap +%%APPLETALK%%libexec/ifwpaprev +%%APPLETALK%%libexec/ofmpap +%%APPLETALK%%libexec/ofpap +%%APPLETALK%%libexec/ofwmpap +%%APPLETALK%%libexec/ofwpap +%%APPLETALK%%libexec/psa %%APPLETALK%%libexec/psf -libexec/tfmpap -libexec/tfmpaprev -libexec/tfpap -libexec/tfpaprev -libexec/tfwmpap -libexec/tfwmpaprev -libexec/tfwpap -libexec/tfwpaprev +%%APPLETALK%%libexec/tfmpap +%%APPLETALK%%libexec/tfmpaprev +%%APPLETALK%%libexec/tfpap +%%APPLETALK%%libexec/tfpaprev +%%APPLETALK%%libexec/tfwmpap +%%APPLETALK%%libexec/tfwmpaprev +%%APPLETALK%%libexec/tfwpap +%%APPLETALK%%libexec/tfwpaprev sbin/afpd %%APPLETALK%%sbin/atalkd sbin/cnid_dbd @@ -160,8 +130,7 @@ %%APPLETALK%%sbin/papd %%TIMELORD%%sbin/timelord share/aclocal/netatalk.m4 -%%DATADIR%%/pagecount.ps -@dirrm share/netatalk +%%APPLETALK%%%%DATADIR%%/pagecount.ps +%%APPLETALK%%@dirrm share/netatalk @dirrm include/netatalk @dirrm include/atalk -@dirrm libexec/netatalk-uams --- netatalk.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201110122151.p9CLpSBt079241>