svn commit: r384284 - in head/emulators: i386-wine i386-wine-devel wine wine-devel

[David Naylor]

Author: dbn
Date: Sun Apr 19 12:37:10 2015
New Revision: 384284
URL: https://svnweb.freebsd.org/changeset/ports/384284

Log:
  emulators/i386-wine(-devel|-compholio): add BUNDLE_LIBS.
  
  The i386-wine ports bundle their own (32-bit) libraries that cause pkg-1.5
  issues.  Since these libraries are under lib32 it does not cause issues
  with other software.
  
  Bump PORTREVISION [1] for the 32-bit side of the ports.  The 64-bit side of
  the ports will be bumped when new packages have been prepared.
  
  Approved by:	gerald@ [1]
  Reported by:	bapt@

Modified:
  head/emulators/i386-wine-devel/Makefile.i386
  head/emulators/i386-wine-devel/Makefile.inc
  head/emulators/i386-wine/Makefile.i386
  head/emulators/i386-wine/Makefile.inc
  head/emulators/wine-devel/Makefile
  head/emulators/wine/Makefile

Modified: head/emulators/i386-wine-devel/Makefile.i386
==============================================================================
--- head/emulators/i386-wine-devel/Makefile.i386	Sun Apr 19 12:33:29 2015	(r384283)
+++ head/emulators/i386-wine-devel/Makefile.i386	Sun Apr 19 12:37:10 2015	(r384284)
@@ -24,6 +24,7 @@ PLIST_REINPLACE+=	winelib
 PLIST_REINPLACE_WINELIB=	s!lib/!lib32/!g
 WINE_SLAVE_BUILD=	yes
 USE_LDCONFIG32=	${WINELIBDIR} ${WINELIBDIR}/wine
+BUNDLE_LIBS=	yes
 
 .if !defined(WINE_CROSS_BUILD)
 IGNORE=		This port is not for consumption on FreeBSD/i386.  To cross-build for FreeBSD/amd64: make -DWINE_CROSS_BUILD

Modified: head/emulators/i386-wine-devel/Makefile.inc
==============================================================================
--- head/emulators/i386-wine-devel/Makefile.inc	Sun Apr 19 12:33:29 2015	(r384283)
+++ head/emulators/i386-wine-devel/Makefile.inc	Sun Apr 19 12:37:10 2015	(r384284)
@@ -40,6 +40,7 @@ PKGMESSAGE=	${WRKDIR}/pkg-message
 SUB_FILES=	pkg-message
 USE_LDCONFIG32=	${PREFIX}/lib32 ${PREFIX}/lib32/wine
 USES=		tar:xz
+BUNDLE_LIBS=	yes
 
 GECKO_RUN_DEPENDS=	${DATADIR}/gecko/wine_gecko-2.36-x86.msi:${PORTSDIR}/emulators/wine-gecko-devel
 MONO_RUN_DEPENDS=	${DATADIR}/mono/wine-mono-4.5.6.msi:${PORTSDIR}/emulators/wine-mono-devel

Modified: head/emulators/i386-wine/Makefile.i386
==============================================================================
--- head/emulators/i386-wine/Makefile.i386	Sun Apr 19 12:33:29 2015	(r384283)
+++ head/emulators/i386-wine/Makefile.i386	Sun Apr 19 12:37:10 2015	(r384284)
@@ -24,6 +24,7 @@ PLIST_REINPLACE+=	winelib
 PLIST_REINPLACE_WINELIB=	s!lib/!lib32/!g
 WINE_SLAVE_BUILD=	yes
 USE_LDCONFIG32=	${WINELIBDIR} ${WINELIBDIR}/wine
+BUNDLE_LIBS=	yes
 
 .if !defined(WINE_CROSS_BUILD)
 IGNORE=		This port is not for consumption on FreeBSD/i386.  To cross-build for FreeBSD/amd64: make -DWINE_CROSS_BUILD

Modified: head/emulators/i386-wine/Makefile.inc
==============================================================================
--- head/emulators/i386-wine/Makefile.inc	Sun Apr 19 12:33:29 2015	(r384283)
+++ head/emulators/i386-wine/Makefile.inc	Sun Apr 19 12:37:10 2015	(r384284)
@@ -40,6 +40,7 @@ PKGMESSAGE=	${WRKDIR}/pkg-message
 SUB_FILES=	pkg-message
 USE_LDCONFIG32=	${PREFIX}/lib32 ${PREFIX}/lib32/wine
 USES=		tar:xz
+BUNDLE_LIBS=	yes
 
 GECKO_RUN_DEPENDS=   ${DATADIR}/gecko/wine_gecko-2.21-x86.msi:${PORTSDIR}/emulators/wine-gecko
 MONO_RUN_DEPENDS=   ${DATADIR}/mono/wine-mono-0.0.8.msi:${PORTSDIR}/emulators/wine-mono

Modified: head/emulators/wine-devel/Makefile
==============================================================================
--- head/emulators/wine-devel/Makefile	Sun Apr 19 12:33:29 2015	(r384283)
+++ head/emulators/wine-devel/Makefile	Sun Apr 19 12:37:10 2015	(r384284)
@@ -3,6 +3,7 @@
 
 PORTNAME=	wine
 DISTVERSION=	1.7.40
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	emulators
 MASTER_SITES=	SF/${PORTNAME}/Source \

Modified: head/emulators/wine/Makefile
==============================================================================
--- head/emulators/wine/Makefile	Sun Apr 19 12:33:29 2015	(r384283)
+++ head/emulators/wine/Makefile	Sun Apr 19 12:37:10 2015	(r384284)
@@ -3,7 +3,7 @@
 
 PORTNAME=	wine
 DISTVERSION=	1.6.2
-PORTREVISION=	9
+PORTREVISION=	10
 PORTEPOCH=	1
 CATEGORIES=	emulators
 MASTER_SITES=	SF/${PORTNAME}/Source \