Date: Thu, 24 Sep 2015 11:15:08 +0000 (UTC) From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r397687 - head/net/spread Message-ID: <201509241115.t8OBF85k091597@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Thu Sep 24 11:15:07 2015 New Revision: 397687 URL: https://svnweb.freebsd.org/changeset/ports/397687 Log: - Don't needlessly install *.conf from *.conf.sample, this is handled by @sample - Fix stagedir reference in .packlist; this is not handled by default fix-perl-things target as it is run before post-install; fixes stage-qa Approved by: portmgr blanket Modified: head/net/spread/Makefile Modified: head/net/spread/Makefile ============================================================================== --- head/net/spread/Makefile Thu Sep 24 10:28:58 2015 (r397686) +++ head/net/spread/Makefile Thu Sep 24 11:15:07 2015 (r397687) @@ -32,8 +32,6 @@ PKGMESSAGE= ${WRKSRC}/license.txt PORTDOCS= Readme.txt LICENSE HEADERFILES= sp_func.h sp_func.h sp_events.h -.include <bsd.port.pre.mk> - # bsd.port.mk doesn't allow us to use GNU_CONFIGURE and PERL_CONFIGURE together. PERL_CONFIGURE_ARGS= CC="${CC}" CCFLAGS="${CFLAGS}" PREFIX="${PREFIX}" \ INSTALLPRIVLIB="${PREFIX}/lib" INSTALLARCHLIB="${PREFIX}/lib" @@ -55,16 +53,8 @@ post-install: .endfor ${INSTALL_DATA} ${WRKSRC}/sample.spread.conf \ ${STAGEDIR}${PREFIX}/etc/spread.conf.sample -.if !exists(${STAGEDIR}${PREFIX}/etc/${PORTNAME}.conf) - ${INSTALL_DATA} ${WRKSRC}/sample.spread.conf \ - ${STAGEDIR}${PREFIX}/etc/${PORTNAME}.conf -.endif ${INSTALL_DATA} ${WRKSRC}/sample.spread.access_ip \ ${STAGEDIR}${PREFIX}/etc/spread.access_ip.sample -.if !exists(${STAGEDIR}${PREFIX}/etc/spread.access_ip) - ${INSTALL_DATA} ${WRKSRC}/sample.spread.access_ip \ - ${STAGEDIR}${PREFIX}/etc/spread.access_ip -.endif (cd ${WRKSRC}/perl/Spread && ${MAKE} PREFIX=${STAGEDIR}${PREFIX} install) ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/perl/Spread/test.pl ${STAGEDIR}${EXAMPLESDIR} @@ -75,5 +65,7 @@ post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libspread.so.1 ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libtspread.so.1 ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Spread/Spread.so + ${REINPLACE_CMD} -i '' -e 's|^${STAGEDIR}||' ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Spread/.packlist + ${ECHO_CMD} ${PREFIX}/${SITE_ARCH_REL}/auto/Spread/.packlist >> ${TMPPLIST} -.include <bsd.port.post.mk> +.include <bsd.port.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201509241115.t8OBF85k091597>