Date: Tue, 7 Jan 2014 14:35:36 +0000 (UTC) From: David Naylor <dbn@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r339006 - head/emulators/wine-devel Message-ID: <201401071435.s07EZaYb045140@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401071435.s07EZaYb045140>