From owner-svn-ports-all@FreeBSD.ORG Tue Jan 7 14:35:36 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 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id BFA0C4D7; Tue, 7 Jan 2014 14:35:36 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 91B9B1D9D; Tue, 7 Jan 2014 14:35:36 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s07EZa2E045141; Tue, 7 Jan 2014 14:35:36 GMT (envelope-from dbn@svn.freebsd.org) Received: (from dbn@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s07EZaYb045140; Tue, 7 Jan 2014 14:35:36 GMT (envelope-from dbn@svn.freebsd.org) Message-Id: <201401071435.s07EZaYb045140@svn.freebsd.org> From: David Naylor Date: Tue, 7 Jan 2014 14:35:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r339006 - head/emulators/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.17 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: Tue, 07 Jan 2014 14:35:36 -0000 Author: dbn Date: Tue Jan 7 14:35:36 2014 New Revision: 339006 URL: http://svnweb.freebsd.org/changeset/ports/339006 Log: Fix installation for slave port of emulators/wine-devel. Wine switched to using an internal install script and removed logic to create the underlying directories. As explained in a comment from Makefile: """ Wine expects the install script to make any missing directories, and the default internal tool (/tools/install-sh) does that however the default install script used by Ports does not. """ Disable the specification of the INSTALL scripts and allow wine to use the internal one. Modified: head/emulators/wine-devel/Makefile Modified: head/emulators/wine-devel/Makefile ============================================================================== --- head/emulators/wine-devel/Makefile Tue Jan 7 13:31:52 2014 (r339005) +++ head/emulators/wine-devel/Makefile Tue Jan 7 14:35:36 2014 (r339006) @@ -30,7 +30,11 @@ CONFIGURE_ARGS+=--verbose --disable-test --without-mpg123 --without-opencl \ --with-oss --without-sane --without-tiff \ --without-v4l --without-xcomposite --without-xinerama -CONFIGURE_ENV= FLEX="${LOCALBASE}/bin/flex" +CONFIGURE_ENV= FLEX="${LOCALBASE}/bin/flex" +# Wine expects the install script to make any missing directories, and the default +# internal tool (/tools/install-sh) does that however the default install script used +# by Ports does not. +CONFIGURE_ENV+= ${SETENV} -u INSTALL -u INSTALL_PROGRAM -u INSTALL_SCRIPT -u INSTALL_DATA WINELIBDIR?= ${PREFIX}/lib .if !defined(USE_LDCONFIG32) USE_LDCONFIG= ${WINELIBDIR} ${WINELIBDIR}/wine @@ -95,10 +99,6 @@ PORTDATA= l_intl.nls wine.inf pre-build: cd ${WRKSRC} && ${GMAKE} depend -pre-install: - ${SED} ${PLIST_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} ${PLIST} | ${GREP} ^@dirrm | \ - ${CUT} -f 2 -d ' ' | ${SORT} | ${XARGS} -R 1 -I % ${MKDIR} ${STAGEDIR}${PREFIX}/% - post-install: @${MV} -f ${STAGEDIR}${WINELIBDIR}/libwine.so.1.0 \ ${STAGEDIR}${WINELIBDIR}/libwine.so.1