Date: Sun, 30 Nov 2014 19:56:03 +0000 (UTC) From: Alex Kozlov <ak@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r373684 - in head/emulators: wine wine-devel Message-ID: <201411301956.sAUJu3ow052297@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ak Date: Sun Nov 30 19:56:02 2014 New Revision: 373684 URL: https://svnweb.freebsd.org/changeset/ports/373684 QAT: https://qat.redports.org/buildarchive/r373684/ Log: - Remove obsolete comments - Make failure to create DOCSDIR fatal - Include bsd.port.mk instead of pre/post.mk in emulators/wine Approved by: gerald (maintainer) Modified: head/emulators/wine-devel/Makefile head/emulators/wine/Makefile Modified: head/emulators/wine-devel/Makefile ============================================================================== --- head/emulators/wine-devel/Makefile Sun Nov 30 19:28:20 2014 (r373683) +++ head/emulators/wine-devel/Makefile Sun Nov 30 19:56:02 2014 (r373684) @@ -55,7 +55,6 @@ WINEMAKER_DESC= Fully support winemaker GECKO_DESC= Bundle Gecko MSI package for Wine MONO_DESC= Bundle Mono MSI package for Wine -# USES needs to be before bsd.port.pre.mk CUPS_CONFIGURE_WITH= cups CUPS_LIB_DEPENDS= libcups.so:${PORTSDIR}/print/cups-client @@ -120,7 +119,7 @@ post-install: @${MV} -f ${STAGEDIR}${WINELIBDIR}/libwine.so.1.0 \ ${STAGEDIR}${WINELIBDIR}/libwine.so.1 @${LN} -sf libwine.so.1 ${STAGEDIR}/${WINELIBDIR}/libwine.so - -@${MKDIR} ${STAGEDIR}${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} .for i in README ANNOUNCE AUTHORS ${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR} .endfor Modified: head/emulators/wine/Makefile ============================================================================== --- head/emulators/wine/Makefile Sun Nov 30 19:28:20 2014 (r373683) +++ head/emulators/wine/Makefile Sun Nov 30 19:56:02 2014 (r373684) @@ -93,8 +93,6 @@ OPENAL_USES= openal WINEMAKER_RUN_DEPENDS= p5-XML-LibXML>0:${PORTSDIR}/textproc/p5-XML-LibXML -.include <bsd.port.pre.mk> - pre-build: cd ${WRKSRC} && ${MAKE_CMD} depend @@ -102,11 +100,11 @@ post-install: @${MV} -f ${STAGEDIR}${WINELIBDIR}/libwine.so.1.0 \ ${STAGEDIR}${WINELIBDIR}/libwine.so.1 @${LN} -sf libwine.so.1 ${STAGEDIR}/${WINELIBDIR}/libwine.so - -@${MKDIR} ${STAGEDIR}${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} .for i in README ANNOUNCE AUTHORS ${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR} .endfor ${INSTALL_DATA} ${WRKSRC}/programs/winedbg/README ${STAGEDIR}${DOCSDIR}/README.winedbg ${INSTALL_DATA} ${WRKSRC}/tools/winedump/README ${STAGEDIR}${DOCSDIR}/README.winedump -.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?201411301956.sAUJu3ow052297>