From owner-svn-ports-all@FreeBSD.ORG Sun Nov 30 19:56:03 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id BC9C81F2; Sun, 30 Nov 2014 19:56:03 +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 8F353BEF; Sun, 30 Nov 2014 19:56:03 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAUJu3gU052300; Sun, 30 Nov 2014 19:56:03 GMT (envelope-from ak@FreeBSD.org) Received: (from ak@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAUJu3ow052297; Sun, 30 Nov 2014 19:56:03 GMT (envelope-from ak@FreeBSD.org) Message-Id: <201411301956.sAUJu3ow052297@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ak set sender to ak@FreeBSD.org using -f From: Alex Kozlov Date: Sun, 30 Nov 2014 19:56:03 +0000 (UTC) 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 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-1 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: Sun, 30 Nov 2014 19:56:03 -0000 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 - 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 +.include