Date: Sat, 9 Aug 2014 10:17:23 +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: r364424 - in head/emulators/i386-wine-devel: . files Message-ID: <53e5f534.2b30.1e470891@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dbn Date: Sat Aug 9 10:17:23 2014 New Revision: 364424 URL: http://svnweb.freebsd.org/changeset/ports/364424 QAT: https://qat.redports.org/buildarchive/r364424/ Log: Various improvements for emulators/i386-wine-devel. * Add support for a forthcoming i386-wine-compholio port [1] * Fix binbounce for RPATH issues [1] A port revision bump is not possible due to the complexities for the wine ports. The impact is minimised by timing these updates closely with the underlying updates of wine-devel. Requested by: [1] Kris Moore <kris@pcbsd.org> Reported by: [2] Nils Beyer <nbe@renzel.net> Modified: head/emulators/i386-wine-devel/Makefile.i386 head/emulators/i386-wine-devel/Makefile.inc head/emulators/i386-wine-devel/files/binbounce head/emulators/i386-wine-devel/files/nvidia.sh Modified: head/emulators/i386-wine-devel/Makefile.i386 ============================================================================== --- head/emulators/i386-wine-devel/Makefile.i386 Sat Aug 9 10:06:54 2014 (r364423) +++ head/emulators/i386-wine-devel/Makefile.i386 Sat Aug 9 10:17:23 2014 (r364424) @@ -7,8 +7,9 @@ MAINTAINER= dbn@FreeBSD.org COMMENT= 32bit Microsoft Windows compatibility environment for 64bit FreeBSD # Use the wine port to do most of the heavy lifting -MASTERDIR= ${.CURDIR}/../wine-devel -PKGINSTALL= ${.CURDIR}/files/pkg-install +SLAVEDIR?= ${.CURDIR} +MASTERDIR= ${SLAVEDIR}/../wine-devel +PKGINSTALL= ${SLAVEDIR}/files/pkg-install PKGDEINSTALL= ${PKGINSTALL} RUN_DEPENDS= dri>0:${PORTSDIR}/graphics/dri @@ -27,7 +28,7 @@ USE_LDCONFIG32= ${WINELIBDIR} ${WINELIBD # under FreeBSD/amd64 post-install-script: # Install bounce script to access the 32bit executables - ${INSTALL_SCRIPT} ${.CURDIR}/files/binbounce ${STAGEDIR}${PREFIX}/bin/wine + ${INSTALL_SCRIPT} ${SLAVEDIR}/files/binbounce ${STAGEDIR}${PREFIX}/bin/wine for i in `grep ^bin ${TMPPLIST} | xargs -n1 basename` ; do \ [ "$${i}" = "wine" ] || ${LN} -f ${STAGEDIR}${PREFIX}/bin/wine ${STAGEDIR}${PREFIX}/bin/$${i} ; \ echo bin32/$${i} >> ${TMPPLIST} ; \ @@ -72,7 +73,7 @@ post-install-script: fi echo '@dirrm bin32' >> ${TMPPLIST} # Install nvidia patching script - ${INSTALL_SCRIPT} ${.CURDIR}/files/nvidia.sh ${STAGEDIR}${DATADIR}/patch-nvidia.sh + ${INSTALL_SCRIPT} ${SLAVEDIR}/files/nvidia.sh ${STAGEDIR}${DATADIR}/patch-nvidia.sh echo ${DATADIR:S|$(PREFIX)/||}/patch-nvidia.sh >> ${TMPPLIST} @${CAT} ${PKGMESSAGE} Modified: head/emulators/i386-wine-devel/Makefile.inc ============================================================================== --- head/emulators/i386-wine-devel/Makefile.inc Sat Aug 9 10:06:54 2014 (r364423) +++ head/emulators/i386-wine-devel/Makefile.inc Sat Aug 9 10:17:23 2014 (r364424) @@ -73,11 +73,13 @@ ${PLIST}: fetch port-update: ${RM} -f ${.CURDIR}/distinfo ${.CURDIR}/distinfo~ ${.CURDIR}/pkg-plist.* .for osrel in 8 9 10 11 - ${MAKE} fetch OSREL=${osrel} - ${MAKE} makesum OSREL=${osrel} +.for suffix in -devel -compholio + ${MAKE} fetch OSREL=${osrel} PKGNAMESUFFIX=${suffix} + ${MAKE} makesum OSREL=${osrel} PKGNAMESUFFIX=${suffix} ${CAT} ${.CURDIR}/distinfo >> ${.CURDIR}/distinfo~ ${RM} ${.CURDIR}/distinfo - ${MAKE} pkg-plist.${osrel} PLIST=pkg-plist.${osrel} OSREL=${osrel} + [ "${suffix}" != "-devel" ] || ${MAKE} pkg-plist.${osrel} PLIST=pkg-plist.${osrel} OSREL=${osrel} +.endfor .endfor ${MV} ${.CURDIR}/distinfo~ ${.CURDIR}/distinfo python ${FILESDIR}/mergeplist.py ${.CURDIR}/pkg-plist.* > ${PLIST} Modified: head/emulators/i386-wine-devel/files/binbounce ============================================================================== --- head/emulators/i386-wine-devel/files/binbounce Sat Aug 9 10:06:54 2014 (r364423) +++ head/emulators/i386-wine-devel/files/binbounce Sat Aug 9 10:17:23 2014 (r364424) @@ -11,10 +11,13 @@ then if [ `uname -p` = i386 ] then export LD_LIBRARY_PATH="$LOCALBASE/lib32":"$LOCALBASE/lib32/wine":"$LD_LIBRARY_PATH" + export LD_LIBRARY_PATH_RPATH="$LOCALBASE/lib32":"$LOCALBASE/lib32/wine":"$LD_LIBRARY_PATH_RPATH" else export LD_32_LIBRARY_PATH="$LOCALBASE/lib32":"$LOCALBASE/lib32/wine":"$LD_32_LIBRARY_PATH":/usr/lib32 + export LD_32_LIBRARY_PATH_RPATH="$LOCALBASE/lib32":"$LOCALBASE/lib32/wine":"$LD_32_LIBRARY_PATH_RPATH":/usr/lib32 fi export PATH="$LOCALBASE/bin32":"$PATH" + export __BINBOUNCE_BOOTSTRAP="1" fi exec "$LOCALBASE/bin32/$BINNAME" "$@" Modified: head/emulators/i386-wine-devel/files/nvidia.sh ============================================================================== --- head/emulators/i386-wine-devel/files/nvidia.sh Sat Aug 9 10:06:54 2014 (r364423) +++ head/emulators/i386-wine-devel/files/nvidia.sh Sat Aug 9 10:17:23 2014 (r364424) @@ -63,6 +63,8 @@ # - add deinstall option # Version 1.12 - 2013/11/03 # - add detection for i386-wine-devel +# Version 1.13 - 2014/08/05 +# - add detection for i386-wine-compholio set -e @@ -147,7 +149,7 @@ echo "===> Patching i386-wine to work wi if [ -z "${WINE}" ] then - WINE=`version i386-wine; version i386-wine-devel` + WINE=`version i386-wine; version i386-wine-devel; version i386-wine-compholio` fi [ -n "$WINE" ] \ || terminate 255 "Unable to detect i386-wine, please install first"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?53e5f534.2b30.1e470891>