diff options
author | dbn <dbn@FreeBSD.org> | 2015-04-19 20:37:10 +0800 |
---|---|---|
committer | dbn <dbn@FreeBSD.org> | 2015-04-19 20:37:10 +0800 |
commit | 8783d3cfabcf1a1a85d8aaa5ca59589789b4dc47 (patch) | |
tree | 8c5804e82c3a23dcd48d391c550ab0545a0032a9 /emulators/i386-wine-devel | |
parent | 58fa575ab1358d4a4bf8cd76d6fbbe8a086ced9d (diff) | |
download | freebsd-ports-gnome-8783d3cfabcf1a1a85d8aaa5ca59589789b4dc47.tar.gz freebsd-ports-gnome-8783d3cfabcf1a1a85d8aaa5ca59589789b4dc47.tar.zst freebsd-ports-gnome-8783d3cfabcf1a1a85d8aaa5ca59589789b4dc47.zip |
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@
Diffstat (limited to 'emulators/i386-wine-devel')
-rw-r--r-- | emulators/i386-wine-devel/Makefile.i386 | 1 | ||||
-rw-r--r-- | emulators/i386-wine-devel/Makefile.inc | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/emulators/i386-wine-devel/Makefile.i386 b/emulators/i386-wine-devel/Makefile.i386 index 4812c6774603..c2ba0f0dedb2 100644 --- a/emulators/i386-wine-devel/Makefile.i386 +++ b/emulators/i386-wine-devel/Makefile.i386 @@ -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 diff --git a/emulators/i386-wine-devel/Makefile.inc b/emulators/i386-wine-devel/Makefile.inc index cad3d3501a72..27bd941da486 100644 --- a/emulators/i386-wine-devel/Makefile.inc +++ b/emulators/i386-wine-devel/Makefile.inc @@ -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 |