From c9f33bc8b7c310e71f7a1b4f52de5b7d0a953ec5 Mon Sep 17 00:00:00 2001 From: gerald Date: Mon, 6 Sep 2010 00:07:36 +0000 Subject: Fix package list around OpenGL.[1] Make the port more resilient by explicitly configuring with OpenGL and GLU support, forcing failure in case there is any problem. Bump PORTREVISION since some users of the latest version will have an incorrect package list. Reported by: erwin [1] --- emulators/wine-devel/Makefile | 2 ++ emulators/wine-devel/pkg-plist | 6 ++++++ emulators/wine/Makefile | 2 ++ emulators/wine/pkg-plist | 6 ++++++ 4 files changed, 16 insertions(+) (limited to 'emulators') diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile index f560fbd1d1a5..8725bd34850d 100644 --- a/emulators/wine-devel/Makefile +++ b/emulators/wine-devel/Makefile @@ -8,6 +8,7 @@ PORTNAME= wine DISTVERSION= 1.3.2 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= emulators MASTER_SITES= SF/${PORTNAME}/Source \ @@ -26,6 +27,7 @@ LIB_DEPENDS= fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig \ GNU_CONFIGURE= yes CONFIGURE_ARGS= --datadir=${DATADIR} --verbose --disable-tests \ + --with-opengl --with-glu \ --without-capi --without-gphoto \ --without-gsm --without-mpg123 --without-openal \ --without-sane diff --git a/emulators/wine-devel/pkg-plist b/emulators/wine-devel/pkg-plist index e5b517a0ed2b..2eaa206bb48f 100644 --- a/emulators/wine-devel/pkg-plist +++ b/emulators/wine-devel/pkg-plist @@ -924,6 +924,7 @@ lib/wine/fakedlls/gameux.dll lib/wine/fakedlls/gdi.exe16 lib/wine/fakedlls/gdi32.dll lib/wine/fakedlls/gdiplus.dll +lib/wine/fakedlls/glu32.dll lib/wine/fakedlls/gphoto2.ds lib/wine/fakedlls/gpkcsp.dll lib/wine/fakedlls/hal.dll @@ -1056,6 +1057,7 @@ lib/wine/fakedlls/olesvr.dll16 lib/wine/fakedlls/olesvr32.dll lib/wine/fakedlls/olethk32.dll lib/wine/fakedlls/oleview.exe +lib/wine/fakedlls/opengl32.dll lib/wine/fakedlls/pdh.dll lib/wine/fakedlls/pidgen.dll lib/wine/fakedlls/ping.exe @@ -1234,6 +1236,7 @@ lib/wine/gameux.dll.so lib/wine/gdi.exe16.so lib/wine/gdi32.dll.so lib/wine/gdiplus.dll.so +lib/wine/glu32.dll.so lib/wine/gphoto2.ds.so lib/wine/gpkcsp.dll.so lib/wine/hal.dll.so @@ -1318,6 +1321,7 @@ lib/wine/libdxgi.def lib/wine/libdxguid.a lib/wine/libgdi32.def lib/wine/libgdiplus.def +lib/wine/libglu32.def lib/wine/libhid.def lib/wine/libhlink.def lib/wine/libimagehlp.def @@ -1361,6 +1365,7 @@ lib/wine/libolecli32.def lib/wine/liboledlg.def lib/wine/libolepro32.def lib/wine/libolesvr32.def +lib/wine/libopengl32.def lib/wine/libpdh.def lib/wine/libpowrprof.def lib/wine/libpropsys.def @@ -1518,6 +1523,7 @@ lib/wine/olesvr.dll16.so lib/wine/olesvr32.dll.so lib/wine/olethk32.dll.so lib/wine/oleview.exe.so +lib/wine/opengl32.dll.so lib/wine/pdh.dll.so lib/wine/pidgen.dll.so lib/wine/ping.exe.so diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile index f560fbd1d1a5..8725bd34850d 100644 --- a/emulators/wine/Makefile +++ b/emulators/wine/Makefile @@ -8,6 +8,7 @@ PORTNAME= wine DISTVERSION= 1.3.2 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= emulators MASTER_SITES= SF/${PORTNAME}/Source \ @@ -26,6 +27,7 @@ LIB_DEPENDS= fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig \ GNU_CONFIGURE= yes CONFIGURE_ARGS= --datadir=${DATADIR} --verbose --disable-tests \ + --with-opengl --with-glu \ --without-capi --without-gphoto \ --without-gsm --without-mpg123 --without-openal \ --without-sane diff --git a/emulators/wine/pkg-plist b/emulators/wine/pkg-plist index e5b517a0ed2b..2eaa206bb48f 100644 --- a/emulators/wine/pkg-plist +++ b/emulators/wine/pkg-plist @@ -924,6 +924,7 @@ lib/wine/fakedlls/gameux.dll lib/wine/fakedlls/gdi.exe16 lib/wine/fakedlls/gdi32.dll lib/wine/fakedlls/gdiplus.dll +lib/wine/fakedlls/glu32.dll lib/wine/fakedlls/gphoto2.ds lib/wine/fakedlls/gpkcsp.dll lib/wine/fakedlls/hal.dll @@ -1056,6 +1057,7 @@ lib/wine/fakedlls/olesvr.dll16 lib/wine/fakedlls/olesvr32.dll lib/wine/fakedlls/olethk32.dll lib/wine/fakedlls/oleview.exe +lib/wine/fakedlls/opengl32.dll lib/wine/fakedlls/pdh.dll lib/wine/fakedlls/pidgen.dll lib/wine/fakedlls/ping.exe @@ -1234,6 +1236,7 @@ lib/wine/gameux.dll.so lib/wine/gdi.exe16.so lib/wine/gdi32.dll.so lib/wine/gdiplus.dll.so +lib/wine/glu32.dll.so lib/wine/gphoto2.ds.so lib/wine/gpkcsp.dll.so lib/wine/hal.dll.so @@ -1318,6 +1321,7 @@ lib/wine/libdxgi.def lib/wine/libdxguid.a lib/wine/libgdi32.def lib/wine/libgdiplus.def +lib/wine/libglu32.def lib/wine/libhid.def lib/wine/libhlink.def lib/wine/libimagehlp.def @@ -1361,6 +1365,7 @@ lib/wine/libolecli32.def lib/wine/liboledlg.def lib/wine/libolepro32.def lib/wine/libolesvr32.def +lib/wine/libopengl32.def lib/wine/libpdh.def lib/wine/libpowrprof.def lib/wine/libpropsys.def @@ -1518,6 +1523,7 @@ lib/wine/olesvr.dll16.so lib/wine/olesvr32.dll.so lib/wine/olethk32.dll.so lib/wine/oleview.exe.so +lib/wine/opengl32.dll.so lib/wine/pdh.dll.so lib/wine/pidgen.dll.so lib/wine/ping.exe.so -- cgit