summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerald Pfeifer <gerald@FreeBSD.org>2004-02-22 22:55:05 +0000
committerGerald Pfeifer <gerald@FreeBSD.org>2004-02-22 22:55:05 +0000
commit38cda1368066689d41e07c0cc4c5dabe65f48b37 (patch)
tree439df0a2427d1204e4716e5a2f47d5594c119f38
parentUpdate to 1.14: minor new features and bug fixes: (diff)
Set USE_GL=yes to avoid packaging problems on systems without Mesa (and have
a more uniform installation of Wine across systems). Reported by: bento
Notes
Notes: svn path=/head/; revision=101761
-rw-r--r--emulators/wine-devel/Makefile3
-rw-r--r--emulators/wine-devel/pkg-plist4
-rw-r--r--emulators/wine/Makefile3
-rw-r--r--emulators/wine/pkg-plist4
4 files changed, 8 insertions, 6 deletions
diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile
index bc1f8b44639e..6b1256b54a6b 100644
--- a/emulators/wine-devel/Makefile
+++ b/emulators/wine-devel/Makefile
@@ -24,9 +24,10 @@ LDCONFIG_DIRS= %%PREFIX%%/lib/wine
MAN1= wine.1 winebuild.1 winemaker.1 wmc.1 wrc.1
MAN5= wine.conf.5
ONLY_FOR_ARCHS= i386
-USE_XPM= yes
USE_BISON= yes
USE_GMAKE= yes
+USE_GL= yes
+USE_XPM= yes
USE_SIZE= yes
# GCC 3.2 also seems fine, but the ports collection requires specifying
# a concrete version.
diff --git a/emulators/wine-devel/pkg-plist b/emulators/wine-devel/pkg-plist
index 733255b80549..c7766beb03df 100644
--- a/emulators/wine-devel/pkg-plist
+++ b/emulators/wine-devel/pkg-plist
@@ -340,6 +340,7 @@ lib/wine/dswave.dll.so
lib/wine/expand.exe.so
lib/wine/gdi.exe.so
lib/wine/gdi32.dll.so
+lib/wine/glu32.dll.so
lib/wine/glut32.dll.so
lib/wine/iccvid.dll.so
lib/wine/icinfo.exe.so
@@ -519,6 +520,7 @@ lib/wine/oledlg.dll.so
lib/wine/olepro32.dll.so
lib/wine/olesvr.dll.so
lib/wine/olesvr32.dll.so
+lib/wine/opengl32.dll.so
lib/wine/progman.exe.so
lib/wine/psapi.dll.so
lib/wine/qcap.dll.so
@@ -617,8 +619,6 @@ share/aclocal/wine.m4
%%DOCSDIR%%/README.winedbg
%%DOCSDIR%%/README.winedump
%%PORTDOCS%%@dirrm share/doc/wine
-@unexec if [ -f %D/lib/wine/glu32.dll.so ]; then rm -f %D/lib/wine/glu32.dll.so; fi
-@unexec if [ -f %D/lib/wine/opengl32.dll.so ]; then rm -f %D/lib/wine/opengl32.dll.so; fi
@dirrm lib/wine
@dirrm include/wine/msvcrt/sys
@dirrm include/wine/msvcrt
diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile
index bc1f8b44639e..6b1256b54a6b 100644
--- a/emulators/wine/Makefile
+++ b/emulators/wine/Makefile
@@ -24,9 +24,10 @@ LDCONFIG_DIRS= %%PREFIX%%/lib/wine
MAN1= wine.1 winebuild.1 winemaker.1 wmc.1 wrc.1
MAN5= wine.conf.5
ONLY_FOR_ARCHS= i386
-USE_XPM= yes
USE_BISON= yes
USE_GMAKE= yes
+USE_GL= yes
+USE_XPM= yes
USE_SIZE= yes
# GCC 3.2 also seems fine, but the ports collection requires specifying
# a concrete version.
diff --git a/emulators/wine/pkg-plist b/emulators/wine/pkg-plist
index 733255b80549..c7766beb03df 100644
--- a/emulators/wine/pkg-plist
+++ b/emulators/wine/pkg-plist
@@ -340,6 +340,7 @@ lib/wine/dswave.dll.so
lib/wine/expand.exe.so
lib/wine/gdi.exe.so
lib/wine/gdi32.dll.so
+lib/wine/glu32.dll.so
lib/wine/glut32.dll.so
lib/wine/iccvid.dll.so
lib/wine/icinfo.exe.so
@@ -519,6 +520,7 @@ lib/wine/oledlg.dll.so
lib/wine/olepro32.dll.so
lib/wine/olesvr.dll.so
lib/wine/olesvr32.dll.so
+lib/wine/opengl32.dll.so
lib/wine/progman.exe.so
lib/wine/psapi.dll.so
lib/wine/qcap.dll.so
@@ -617,8 +619,6 @@ share/aclocal/wine.m4
%%DOCSDIR%%/README.winedbg
%%DOCSDIR%%/README.winedump
%%PORTDOCS%%@dirrm share/doc/wine
-@unexec if [ -f %D/lib/wine/glu32.dll.so ]; then rm -f %D/lib/wine/glu32.dll.so; fi
-@unexec if [ -f %D/lib/wine/opengl32.dll.so ]; then rm -f %D/lib/wine/opengl32.dll.so; fi
@dirrm lib/wine
@dirrm include/wine/msvcrt/sys
@dirrm include/wine/msvcrt