aboutsummaryrefslogtreecommitdiff
path: root/emulators
diff options
context:
space:
mode:
authorGerald Pfeifer <gerald@FreeBSD.org>2003-04-14 07:23:24 +0000
committerGerald Pfeifer <gerald@FreeBSD.org>2003-04-14 07:23:24 +0000
commit2e6e886c75874b055a9de11254df625d27a93707 (patch)
treece429ab0456ccc95f69be5a1d07b3fc1c09a2eba /emulators
parent1c841e8918df53f48a18bf2f0e878c93d4a68fc7 (diff)
downloadports-2e6e886c75874b055a9de11254df625d27a93707.tar.gz
ports-2e6e886c75874b055a9de11254df625d27a93707.zip
Notes
Diffstat (limited to 'emulators')
-rw-r--r--emulators/wine-devel/Makefile8
-rw-r--r--emulators/wine-devel/distinfo2
-rw-r--r--emulators/wine-devel/files/patch-dlls-ntdll-cdrom.c13
-rw-r--r--emulators/wine-devel/files/patch-gb23
-rw-r--r--emulators/wine-devel/pkg-plist32
-rw-r--r--emulators/wine/Makefile8
-rw-r--r--emulators/wine/distinfo2
-rw-r--r--emulators/wine/files/patch-dlls-ntdll-cdrom.c13
-rw-r--r--emulators/wine/files/patch-gb23
-rw-r--r--emulators/wine/pkg-plist32
10 files changed, 82 insertions, 74 deletions
diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile
index 8c8dafea8420..21680a3784eb 100644
--- a/emulators/wine-devel/Makefile
+++ b/emulators/wine-devel/Makefile
@@ -7,7 +7,7 @@
#
PORTNAME= wine
-PORTVERSION= 2003.03.18
+PORTVERSION= 2003.04.08
CATEGORIES= emulators
MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= ALPHA/wine/development
@@ -50,12 +50,6 @@ pre-extract:
@${ECHO} "that when running, only when it has to enter the debugger...)"
.endif
-post-patch:
-.for D in ../library ../unicode
- @${REINPLACE_CMD} -e 's/SOVERSION = 1.0/SOVERSION = 1/g' \
- ${WRKSRC}/dlls/${D}/Makefile.in
-.endfor
-
post-configure:
cd ${WRKSRC} && make depend
diff --git a/emulators/wine-devel/distinfo b/emulators/wine-devel/distinfo
index 1afb93879669..15716a2e616a 100644
--- a/emulators/wine-devel/distinfo
+++ b/emulators/wine-devel/distinfo
@@ -1 +1 @@
-MD5 (Wine-20030318.tar.gz) = a4d1596fb27a9f1530c979250a4a48cd
+MD5 (Wine-20030408.tar.gz) = 8c578d05d60ef627e7f2959c220f3056
diff --git a/emulators/wine-devel/files/patch-dlls-ntdll-cdrom.c b/emulators/wine-devel/files/patch-dlls-ntdll-cdrom.c
deleted file mode 100644
index 93f48db51cfe..000000000000
--- a/emulators/wine-devel/files/patch-dlls-ntdll-cdrom.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- dlls/ntdll/cdrom.c 19 Feb 2003 22:08:50 -0000 1.25
-+++ dlls/ntdll/cdrom.c 20 Feb 2003 09:30:31 -0000
-@@ -1038,7 +1049,9 @@ static DWORD CDROM_SeekAudioMSF(int dev,
- if (i <= toc.FirstTrack || i > toc.LastTrack+1)
- return STATUS_INVALID_PARAMETER;
- i--;
-- cp->FormatCode = CDROM_MSF;
-+#ifdef CDROM_MSF
-+ cp->FormatCode = CDROM_MSF;
-+#endif
- cp->Control = toc.TrackData[i-toc.FirstTrack].Control;
- cp->ADR = toc.TrackData[i-toc.FirstTrack].Adr;
- cp->TrackNumber = toc.TrackData[i-toc.FirstTrack].TrackNumber;
diff --git a/emulators/wine-devel/files/patch-gb b/emulators/wine-devel/files/patch-gb
index 3182a5a0a7c2..428621682509 100644
--- a/emulators/wine-devel/files/patch-gb
+++ b/emulators/wine-devel/files/patch-gb
@@ -1,21 +1,12 @@
---- Makefile.in.orig Thu Dec 12 23:03:14 2002
-+++ Makefile.in Wed Dec 25 17:08:41 2002
-@@ -88,18 +88,6 @@ install-lib:: $(INSTALLLIBSUBDIRS:%=%/__
+--- Makefile.in.orig Wed Apr 9 08:10:49 2003
++++ Makefile.in Wed Apr 9 08:14:06 2003
+@@ -82,8 +82,7 @@
install-dev:: $(INSTALLDEVSUBDIRS:%=%/__install__) $(INSTALLBOTHSUBDIRS:%=%/__install-dev__) install-aclocal
install:: install-lib install-dev install-aclocal
- -$(LDCONFIG)
- @if test -n "`LANG=C $(LDD) $(bindir)/wine|grep not.found`"; \
-- then \
-- echo "*************************************************" ; \
-- echo "*************************************************" ; \
-- echo "The installed Wine libraries will not be found!" ; \
-- echo "You can either:" ; \
-- echo " Add the line '$(libdir)' to /etc/ld.so.conf" ; \
-- echo ' export LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:$(libdir)' ; \
-- echo "*************************************************" ; \
-- echo "*************************************************" ; \
-- fi
-
- uninstall:: $(INSTALLBOTHSUBDIRS:%=%/__uninstall__)
- $(RM) $(datadir)/aclocal/wine.m4
++ @if false ; \
+ then \
+ echo "*************************************************" ; \
+ echo "*************************************************" ; \
diff --git a/emulators/wine-devel/pkg-plist b/emulators/wine-devel/pkg-plist
index 5e974965b16d..55bd10a6b563 100644
--- a/emulators/wine-devel/pkg-plist
+++ b/emulators/wine-devel/pkg-plist
@@ -119,9 +119,18 @@ include/wine/windows/digitalv.h
include/wine/windows/dinput.h
include/wine/windows/dispdib.h
include/wine/windows/dlgs.h
+include/wine/windows/dls1.h
+include/wine/windows/dmdls.h
+include/wine/windows/dmerror.h
include/wine/windows/dmo.h
include/wine/windows/dmoreg.h
include/wine/windows/dmort.h
+include/wine/windows/dmplugin.h
+include/wine/windows/dmusbuff.h
+include/wine/windows/dmusicc.h
+include/wine/windows/dmusicf.h
+include/wine/windows/dmusici.h
+include/wine/windows/dmusics.h
include/wine/windows/docobj.h
include/wine/windows/dplay.h
include/wine/windows/dplobby.h
@@ -282,6 +291,16 @@ lib/wine/dinput.dll.so
lib/wine/dinput8.dll.so
lib/wine/dispdib.dll.so
lib/wine/display.dll.so
+lib/wine/dmband.dll.so
+lib/wine/dmcompos.dll.so
+lib/wine/dmime.dll.so
+lib/wine/dmloader.dll.so
+lib/wine/dmscript.dll.so
+lib/wine/dmstyle.dll.so
+lib/wine/dmsynth.dll.so
+lib/wine/dmusic.dll.so
+lib/wine/dmusic32.dll.so
+lib/wine/dpnhpast.dll.so
lib/wine/dplay.dll.so
lib/wine/dplayx.dll.so
lib/wine/dsound.dll.so
@@ -316,6 +335,17 @@ lib/wine/libddraw.def
lib/wine/libdevenum.def
lib/wine/libdinput.def
lib/wine/libdinput8.def
+lib/wine/libdmband.def
+lib/wine/libdmcompos.def
+lib/wine/libdmime.def
+lib/wine/libdmloader.def
+lib/wine/libdmscript.def
+lib/wine/libdmstyle.def
+lib/wine/libdmsynth.def
+lib/wine/libdmusic.def
+lib/wine/libdmusic32.def
+lib/wine/libdpnhpast.def
+lib/wine/libmsvcrtd.def
lib/wine/libdplay.def
lib/wine/libdplayx.def
lib/wine/libdsound.def
@@ -411,6 +441,7 @@ lib/wine/msnet32.dll.so
lib/wine/msrle32.dll.so
lib/wine/msvcrt.dll.so
lib/wine/msvcrt20.dll.so
+lib/wine/msvcrtd.dll.so
lib/wine/msvfw32.dll.so
lib/wine/msvideo.dll.so
lib/wine/netapi32.dll.so
@@ -482,6 +513,7 @@ lib/wine/winealsa.drv.so
lib/wine/winearts.drv.so
lib/wine/wineaudioio.drv.so
lib/wine/wineboot.exe.so
+lib/wine/winecfg.exe.so
lib/wine/wineconsole.exe.so
lib/wine/winedbg.exe.so
lib/wine/winedos.dll.so
diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile
index 8c8dafea8420..21680a3784eb 100644
--- a/emulators/wine/Makefile
+++ b/emulators/wine/Makefile
@@ -7,7 +7,7 @@
#
PORTNAME= wine
-PORTVERSION= 2003.03.18
+PORTVERSION= 2003.04.08
CATEGORIES= emulators
MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= ALPHA/wine/development
@@ -50,12 +50,6 @@ pre-extract:
@${ECHO} "that when running, only when it has to enter the debugger...)"
.endif
-post-patch:
-.for D in ../library ../unicode
- @${REINPLACE_CMD} -e 's/SOVERSION = 1.0/SOVERSION = 1/g' \
- ${WRKSRC}/dlls/${D}/Makefile.in
-.endfor
-
post-configure:
cd ${WRKSRC} && make depend
diff --git a/emulators/wine/distinfo b/emulators/wine/distinfo
index 1afb93879669..15716a2e616a 100644
--- a/emulators/wine/distinfo
+++ b/emulators/wine/distinfo
@@ -1 +1 @@
-MD5 (Wine-20030318.tar.gz) = a4d1596fb27a9f1530c979250a4a48cd
+MD5 (Wine-20030408.tar.gz) = 8c578d05d60ef627e7f2959c220f3056
diff --git a/emulators/wine/files/patch-dlls-ntdll-cdrom.c b/emulators/wine/files/patch-dlls-ntdll-cdrom.c
deleted file mode 100644
index 93f48db51cfe..000000000000
--- a/emulators/wine/files/patch-dlls-ntdll-cdrom.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- dlls/ntdll/cdrom.c 19 Feb 2003 22:08:50 -0000 1.25
-+++ dlls/ntdll/cdrom.c 20 Feb 2003 09:30:31 -0000
-@@ -1038,7 +1049,9 @@ static DWORD CDROM_SeekAudioMSF(int dev,
- if (i <= toc.FirstTrack || i > toc.LastTrack+1)
- return STATUS_INVALID_PARAMETER;
- i--;
-- cp->FormatCode = CDROM_MSF;
-+#ifdef CDROM_MSF
-+ cp->FormatCode = CDROM_MSF;
-+#endif
- cp->Control = toc.TrackData[i-toc.FirstTrack].Control;
- cp->ADR = toc.TrackData[i-toc.FirstTrack].Adr;
- cp->TrackNumber = toc.TrackData[i-toc.FirstTrack].TrackNumber;
diff --git a/emulators/wine/files/patch-gb b/emulators/wine/files/patch-gb
index 3182a5a0a7c2..428621682509 100644
--- a/emulators/wine/files/patch-gb
+++ b/emulators/wine/files/patch-gb
@@ -1,21 +1,12 @@
---- Makefile.in.orig Thu Dec 12 23:03:14 2002
-+++ Makefile.in Wed Dec 25 17:08:41 2002
-@@ -88,18 +88,6 @@ install-lib:: $(INSTALLLIBSUBDIRS:%=%/__
+--- Makefile.in.orig Wed Apr 9 08:10:49 2003
++++ Makefile.in Wed Apr 9 08:14:06 2003
+@@ -82,8 +82,7 @@
install-dev:: $(INSTALLDEVSUBDIRS:%=%/__install__) $(INSTALLBOTHSUBDIRS:%=%/__install-dev__) install-aclocal
install:: install-lib install-dev install-aclocal
- -$(LDCONFIG)
- @if test -n "`LANG=C $(LDD) $(bindir)/wine|grep not.found`"; \
-- then \
-- echo "*************************************************" ; \
-- echo "*************************************************" ; \
-- echo "The installed Wine libraries will not be found!" ; \
-- echo "You can either:" ; \
-- echo " Add the line '$(libdir)' to /etc/ld.so.conf" ; \
-- echo ' export LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:$(libdir)' ; \
-- echo "*************************************************" ; \
-- echo "*************************************************" ; \
-- fi
-
- uninstall:: $(INSTALLBOTHSUBDIRS:%=%/__uninstall__)
- $(RM) $(datadir)/aclocal/wine.m4
++ @if false ; \
+ then \
+ echo "*************************************************" ; \
+ echo "*************************************************" ; \
diff --git a/emulators/wine/pkg-plist b/emulators/wine/pkg-plist
index 5e974965b16d..55bd10a6b563 100644
--- a/emulators/wine/pkg-plist
+++ b/emulators/wine/pkg-plist
@@ -119,9 +119,18 @@ include/wine/windows/digitalv.h
include/wine/windows/dinput.h
include/wine/windows/dispdib.h
include/wine/windows/dlgs.h
+include/wine/windows/dls1.h
+include/wine/windows/dmdls.h
+include/wine/windows/dmerror.h
include/wine/windows/dmo.h
include/wine/windows/dmoreg.h
include/wine/windows/dmort.h
+include/wine/windows/dmplugin.h
+include/wine/windows/dmusbuff.h
+include/wine/windows/dmusicc.h
+include/wine/windows/dmusicf.h
+include/wine/windows/dmusici.h
+include/wine/windows/dmusics.h
include/wine/windows/docobj.h
include/wine/windows/dplay.h
include/wine/windows/dplobby.h
@@ -282,6 +291,16 @@ lib/wine/dinput.dll.so
lib/wine/dinput8.dll.so
lib/wine/dispdib.dll.so
lib/wine/display.dll.so
+lib/wine/dmband.dll.so
+lib/wine/dmcompos.dll.so
+lib/wine/dmime.dll.so
+lib/wine/dmloader.dll.so
+lib/wine/dmscript.dll.so
+lib/wine/dmstyle.dll.so
+lib/wine/dmsynth.dll.so
+lib/wine/dmusic.dll.so
+lib/wine/dmusic32.dll.so
+lib/wine/dpnhpast.dll.so
lib/wine/dplay.dll.so
lib/wine/dplayx.dll.so
lib/wine/dsound.dll.so
@@ -316,6 +335,17 @@ lib/wine/libddraw.def
lib/wine/libdevenum.def
lib/wine/libdinput.def
lib/wine/libdinput8.def
+lib/wine/libdmband.def
+lib/wine/libdmcompos.def
+lib/wine/libdmime.def
+lib/wine/libdmloader.def
+lib/wine/libdmscript.def
+lib/wine/libdmstyle.def
+lib/wine/libdmsynth.def
+lib/wine/libdmusic.def
+lib/wine/libdmusic32.def
+lib/wine/libdpnhpast.def
+lib/wine/libmsvcrtd.def
lib/wine/libdplay.def
lib/wine/libdplayx.def
lib/wine/libdsound.def
@@ -411,6 +441,7 @@ lib/wine/msnet32.dll.so
lib/wine/msrle32.dll.so
lib/wine/msvcrt.dll.so
lib/wine/msvcrt20.dll.so
+lib/wine/msvcrtd.dll.so
lib/wine/msvfw32.dll.so
lib/wine/msvideo.dll.so
lib/wine/netapi32.dll.so
@@ -482,6 +513,7 @@ lib/wine/winealsa.drv.so
lib/wine/winearts.drv.so
lib/wine/wineaudioio.drv.so
lib/wine/wineboot.exe.so
+lib/wine/winecfg.exe.so
lib/wine/wineconsole.exe.so
lib/wine/winedbg.exe.so
lib/wine/winedos.dll.so