Date: Sat, 16 Feb 2013 14:21:34 +0000 (UTC) From: Emanuel Haupt <ehaupt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r312354 - head/audio/xmp Message-ID: <201302161421.r1GELYfr013815@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ehaupt Date: Sat Feb 16 14:21:33 2013 New Revision: 312354 URL: http://svnweb.freebsd.org/changeset/ports/312354 Log: - Work around a case where .if !exists(${ETCDIR}/${f}) fails - Consistent usage of %%ETCDIR%% Modified: head/audio/xmp/Makefile head/audio/xmp/pkg-plist Modified: head/audio/xmp/Makefile ============================================================================== --- head/audio/xmp/Makefile Sat Feb 16 14:10:55 2013 (r312353) +++ head/audio/xmp/Makefile Sat Feb 16 14:21:33 2013 (r312354) @@ -50,11 +50,9 @@ post-patch: @${REINPLACE_CMD} -e 's|\ install-conf||' ${WRKSRC}/Makefile.in post-install: - ${MKDIR} ${PREFIX}/etc/xmp + ${MKDIR} ${ETCDIR} .for f in ${CONFIG_FILES} -.if !exists(${ETCDIR}/${f}) - ${INSTALL_DATA} ${WRKSRC}/src/${f} ${ETCDIR}/${f} -.endif + @test -f ${ETCDIR}/${f} || ${INSTALL_DATA} ${WRKSRC}/src/${f} ${ETCDIR}/${f} ${INSTALL_DATA} ${WRKSRC}/src/${f} ${ETCDIR}/${f}.sample .endfor Modified: head/audio/xmp/pkg-plist ============================================================================== --- head/audio/xmp/pkg-plist Sat Feb 16 14:10:55 2013 (r312353) +++ head/audio/xmp/pkg-plist Sat Feb 16 14:21:33 2013 (r312354) @@ -1,8 +1,8 @@ -@unexec if cmp -s %D/etc/xmp/xmp.conf %D/etc/xmp/xmp.conf.sample; then rm -f %D/etc/xmp/xmp.conf; fi -etc/xmp/xmp.conf.sample +@unexec if cmp -s %D/%%ETCDIR%%/xmp.conf %D/%%ETCDIR%%/xmp.conf.sample; then rm -f %D/%%ETCDIR%%/xmp.conf; fi +%%ETCDIR%%/xmp.conf.sample @exec [ -f %B/xmp.conf ] || cp %B/%f %B/xmp.conf bin/xmp -@unexec if cmp -s %D/etc/xmp/modules.conf %D/etc/xmp/modules.conf.sample; then rm -f %D/etc/xmp/modules.conf; fi -etc/xmp/modules.conf.sample +@unexec if cmp -s %D/%%ETCDIR%%/modules.conf %D/%%ETCDIR%%/modules.conf.sample; then rm -f %D/%%ETCDIR%%/modules.conf; fi +%%ETCDIR%%/modules.conf.sample @exec [ -f %B/modules.conf ] || cp %B/%f %B/modules.conf -@dirrmtry etc/xmp +@dirrmtry %%ETCDIR%%
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201302161421.r1GELYfr013815>