From bcaa0f659c1bd2dc5e2b013de2b0cb07eb4adb37 Mon Sep 17 00:00:00 2001 From: David Naylor Date: Mon, 22 Sep 2014 18:25:55 +0000 Subject: [PATCH] Unbreak emulators/i386-wine(-devel) builds. With the removal of REINPLACE_PLIST in r367153 building wine on FreeBSD/i386 broke. This was not detected in an exp-run as i386-wine is marked IGNORE unless WINE_CROSS_BUILD is defined (to protect the build infrastructure and avoid confusion). PR: 193734 --- emulators/i386-wine-devel/Makefile.i386 | 2 ++ emulators/i386-wine/Makefile.i386 | 2 ++ 2 files changed, 4 insertions(+) diff --git a/emulators/i386-wine-devel/Makefile.i386 b/emulators/i386-wine-devel/Makefile.i386 index e6a29c6fc1ff..949ba3a3aff8 100644 --- a/emulators/i386-wine-devel/Makefile.i386 +++ b/emulators/i386-wine-devel/Makefile.i386 @@ -31,6 +31,8 @@ IGNORE= This port is not for consumption on FreeBSD/i386. To cross-build for F # Hook into post-install and do some adapting to make i386 binaries work nicely # under FreeBSD/amd64 post-install-script: + # Fix pkg-plist references + ${REINPLACE_CMD} -e 's!lib/!lib32/!g' ${TMPPLIST} # Install bounce script to access the 32bit executables ${INSTALL_SCRIPT} ${SLAVEDIR}/files/binbounce ${STAGEDIR}${PREFIX}/bin/wine for i in `grep ^bin ${TMPPLIST} | xargs -n1 basename` ; do \ diff --git a/emulators/i386-wine/Makefile.i386 b/emulators/i386-wine/Makefile.i386 index becf581c03b6..12522fbf8c78 100644 --- a/emulators/i386-wine/Makefile.i386 +++ b/emulators/i386-wine/Makefile.i386 @@ -30,6 +30,8 @@ IGNORE= This port is not for consumption on FreeBSD/i386. To cross-build for F # Hook into post-install and do some adapting to make i386 binaries work nicely # under FreeBSD/amd64 post-install-script: + # Fix pkg-plist references + ${REINPLACE_CMD} -e 's!lib/!lib32/!g' ${TMPPLIST} # Install bounce script to access the 32bit executables ${INSTALL_SCRIPT} ${.CURDIR}/files/binbounce ${STAGEDIR}${PREFIX}/bin/wine for i in `grep ^bin ${TMPPLIST} | xargs -n1 basename` ; do \