diff options
author | Alexander Langer <alex@FreeBSD.org> | 2000-07-22 09:47:31 +0000 |
---|---|---|
committer | Alexander Langer <alex@FreeBSD.org> | 2000-07-22 09:47:31 +0000 |
commit | 32a6ce46c4194545dea9ba0ed6d22e095fa69968 (patch) | |
tree | 32b25e0dba292229740802042c8e09e1e730026b /emulators/wine | |
parent | Correct OSVERSION, which I raised for testing but forgot to (diff) |
Update to 2000.07.16 snapshot.
Problems with XFree86 4.0.0 discovered, one is encouraged to update to 4.0.1,
if one really wants to use XFree86-4.
PR: 19979
Submitted by: maintainer
Notes
Notes:
svn path=/head/; revision=30961
Diffstat (limited to 'emulators/wine')
-rw-r--r-- | emulators/wine/Makefile | 9 | ||||
-rw-r--r-- | emulators/wine/distinfo | 3 | ||||
-rw-r--r-- | emulators/wine/files/patch-gb | 27 | ||||
-rw-r--r-- | emulators/wine/pkg-plist | 32 |
4 files changed, 46 insertions, 25 deletions
diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile index 650e35b0061a..1172909353a9 100644 --- a/emulators/wine/Makefile +++ b/emulators/wine/Makefile @@ -7,9 +7,7 @@ # PORTNAME= wine -# We will skip the 2000.06.14 snapshot of Wine as this proved to be -# somewhat unstable (also on other platforms). -PORTVERSION= 2000.05.26 +PORTVERSION= 2000.07.16 CATEGORIES= emulators MASTER_SITES= ${MASTER_SITE_SUNSITE} MASTER_SITE_SUBDIR= ALPHA/wine/development @@ -22,7 +20,8 @@ LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm \ WRKSRC= ${WRKDIR}/wine-${PORTVERSION:S/.//g} GNU_CONFIGURE= yes -CONFIGURE_ENV= LIBS=-Wl,-rpath,${PREFIX}/lib/wine +CONFIGURE_ARGS= --disable-opengl +CONFIGURE_ENV= LIBS=-Wl,-rpath,${PREFIX}/lib/wine INSTALLS_SHLIB= yes LDCONFIG_DIRS= %%PREFIX%%/lib/wine MAN1= wine.1 @@ -48,7 +47,7 @@ pre-extract: post-patch: @${PERL} -pi.sofix -e 's/SOVERSION = 1.0/SOVERSION = 1/g' \ ${WRKSRC}/Makefile.in -.for F in avifil32/Makefile.in comctl32/Makefile.in commdlg/Makefile.in dciman32/Makefile.in ddraw/Makefile.in dinput/Makefile.in dplayx/Makefile.in dsound/Makefile.in gdi/Makefile.in icmp/Makefile.in imagehlp/Makefile.in imm32/Makefile.in lzexpand/Makefile.in mpr/Makefile.in msacm/Makefile.in msacm32/Makefile.in msnet32/Makefile.in msvideo/Makefile.in odbc32/Makefile.in ole32/Makefile.in oleaut32/Makefile.in olecli/Makefile.in oledlg/Makefile.in olepro32/Makefile.in olesvr/Makefile.in opengl32/Makefile.in psapi/Makefile.in rasapi32/Makefile.in richedit/Makefile.in setupx/Makefile.in shell32/Makefile.in sound/Makefile.in stress/Makefile.in tapi32/Makefile.in ttydrv/Makefile.in urlmon/Makefile.in user/Makefile.in version/Makefile.in win32s/Makefile.in win87em/Makefile.in winaspi/Makefile.in windebug/Makefile.in wing/Makefile.in wininet/Makefile.in winmm/Makefile.in winmm/joystick/Makefile.in winmm/mcianim/Makefile.in winmm/mciavi/Makefile.in winmm/mcicda/Makefile.in winmm/mciseq/Makefile.in winmm/mciwave/Makefile.in winmm/midimap/Makefile.in winmm/wavemap/Makefile.in winmm/wineoss/Makefile.in winsock/Makefile.in winspool/Makefile.in x11drv/Makefile.in +.for F in avifil32/Makefile.in comctl32/Makefile.in commdlg/Makefile.in crtdll/Makefile.in dciman32/Makefile.in ddraw/Makefile.in dinput/Makefile.in dplay/Makefile.in dplayx/Makefile.in dsound/Makefile.in gdi/Makefile.in icmp/Makefile.in imagehlp/Makefile.in imm32/Makefile.in kernel/Makefile.in lzexpand/Makefile.in mpr/Makefile.in msacm/Makefile.in msacm32/Makefile.in msnet32/Makefile.in msvideo/Makefile.in odbc32/Makefile.in ole32/Makefile.in oleaut32/Makefile.in olecli/Makefile.in oledlg/Makefile.in olepro32/Makefile.in olesvr/Makefile.in opengl32/Makefile.in psapi/Makefile.in rasapi32/Makefile.in richedit/Makefile.in rpcrt4/Makefile.in serialui/Makefile.in setupapi/Makefile.in setupx/Makefile.in shell32/Makefile.in shfolder/Makefile.in shlwapi/Makefile.in sound/Makefile.in stress/Makefile.in tapi32/Makefile.in ttydrv/Makefile.in urlmon/Makefile.in user/Makefile.in version/Makefile.in win32s/Makefile.in win87em/Makefile.in winaspi/Makefile.in windebug/Makefile.in wineps/Makefile.in wing/Makefile.in wininet/Makefile.in winmm/Makefile.in winmm/joystick/Makefile.in winmm/mcianim/Makefile.in winmm/mciavi/Makefile.in winmm/mcicda/Makefile.in winmm/mciseq/Makefile.in winmm/mciwave/Makefile.in winmm/midimap/Makefile.in winmm/wavemap/Makefile.in winmm/wineoss/Makefile.in winsock/Makefile.in winspool/Makefile.in wow32/Makefile.in wsock32/Makefile.in x11drv/Makefile.in @${PERL} -pi.sofix -e 's/SOVERSION = 1.0/SOVERSION = 1/g' \ ${WRKSRC}/dlls/${F} .endfor diff --git a/emulators/wine/distinfo b/emulators/wine/distinfo index 3ca3bc61ed08..0b98a7c81dcf 100644 --- a/emulators/wine/distinfo +++ b/emulators/wine/distinfo @@ -1,2 +1 @@ -MD5 (Wine-20000430.tar.gz) = 7dd29f68e26c624115e6654d619e9ab5 -MD5 (Wine-20000526.tar.gz) = 50e1108263725091b98ddb2945d44f7a +MD5 (Wine-20000716.tar.gz) = 2d25bfa22e9165923d67407d64919b8c diff --git a/emulators/wine/files/patch-gb b/emulators/wine/files/patch-gb index 8ff5b9008257..f4f61092aa7d 100644 --- a/emulators/wine/files/patch-gb +++ b/emulators/wine/files/patch-gb @@ -1,17 +1,10 @@ -Index: Makefile.in -=================================================================== -RCS file: /home/wine/wine/Makefile.in,v -retrieving revision 1.79 -diff -c -3 -p -r1.79 Makefile.in -*** Makefile.in 2000/04/24 17:17:49 1.79 ---- Makefile.in 2000/05/29 14:30:26 -*************** uninstall_programs: dummy -*** 209,215 **** - - install:: - for i in $(INSTALLSUBDIRS); do (cd $$i && $(MAKE) install) || exit 1; done -- -$(LDCONFIG) - - uninstall:: - for i in $(INSTALLSUBDIRS); do (cd $$i && $(MAKE) uninstall) || exit 1; done ---- 209,214 ---- +--- Makefile.in.old Tue Jul 18 18:36:26 2000 ++++ Makefile.in Tue Jul 18 18:36:36 2000 +@@ -147,7 +147,6 @@ + [ -d $(bindir) ] || $(MKDIR) $(bindir) + $(INSTALL_PROGRAM) wine $(bindir)/wine + $(INSTALL_PROGRAM) loader/dos/dosmod $(bindir)/dosmod +- -$(LDCONFIG) + + uninstall:: $(INSTALLSUBDIRS:%=%/__uninstall__) + cd $(libdir) && $(RM) libwine.a libwine.so libwine.so.$(SOVERSION) diff --git a/emulators/wine/pkg-plist b/emulators/wine/pkg-plist index bf8371cefdca..7a9391046179 100644 --- a/emulators/wine/pkg-plist +++ b/emulators/wine/pkg-plist @@ -1,7 +1,8 @@ bin/wine -bin/wineserver +bin/winebuild bin/wineclipsrv bin/winedbg +bin/wineserver bin/regSet.sh etc/wine.conf.sample include/wine/windef.h @@ -42,8 +43,11 @@ lib/wine/libcomctl32.so lib/wine/libcomctl32.so.1 lib/wine/libcomdlg32.so lib/wine/libcomdlg32.so.1 +lib/wine/libcomm.so lib/wine/libcommdlg.so lib/wine/libcompobj.so +lib/wine/libcrtdll.so +lib/wine/libcrtdll.so.1 lib/wine/libdciman32.so lib/wine/libdciman32.so.1 lib/wine/libddeml.so @@ -51,7 +55,10 @@ lib/wine/libddraw.so lib/wine/libddraw.so.1 lib/wine/libdinput.so lib/wine/libdinput.so.1 +lib/wine/libdispdib.so +lib/wine/libdisplay.so lib/wine/libdplay.so +lib/wine/libdplay.so.1 lib/wine/libdplayx.so lib/wine/libdplayx.so.1 lib/wine/libdsound.so @@ -67,6 +74,9 @@ lib/wine/libimm32.so lib/wine/libimm32.so.1 lib/wine/libjoystick.drv.so lib/wine/libjoystick.drv.so.1 +lib/wine/libkernel.so +lib/wine/libkernel32.so +lib/wine/libkernel32.so.1 lib/wine/libkeyboard.so lib/wine/liblz32.so lib/wine/liblz32.so.1 @@ -84,6 +94,7 @@ lib/wine/libmciwave.drv.so.1 lib/wine/libmidimap.drv.so lib/wine/libmidimap.drv.so.1 lib/wine/libmmsystem.so +lib/wine/libmouse.so lib/wine/libmpr.so lib/wine/libmpr.so.1 lib/wine/libmsacm.drv.so @@ -126,19 +137,30 @@ lib/wine/librasapi32.so lib/wine/librasapi32.so.1 lib/wine/libriched32.so lib/wine/libriched32.so.1 +lib/wine/librpcrt4.so +lib/wine/librpcrt4.so.1 +lib/wine/libserialui.so +lib/wine/libserialui.so.1 +lib/wine/libsetupapi.so +lib/wine/libsetupapi.so.1 lib/wine/libsetupx.so lib/wine/libsetupx.so.1 lib/wine/libshell.so lib/wine/libshell32.so lib/wine/libshell32.so.1 +lib/wine/libshfolder.so +lib/wine/libshfolder.so.1 lib/wine/libshlwapi.so +lib/wine/libshlwapi.so.1 lib/wine/libsound.so lib/wine/libsound.so.1 lib/wine/libstorage.so lib/wine/libstress.so lib/wine/libstress.so.1 +lib/wine/libsystem.so lib/wine/libtapi32.so lib/wine/libtapi32.so.1 +lib/wine/libtoolhelp.so lib/wine/libttydrv.so lib/wine/libttydrv.so.1 lib/wine/libtypelib.so @@ -162,6 +184,9 @@ lib/wine/libwindebug.so.1 lib/wine/libwine.so.1 lib/wine/libwineoss.drv.so lib/wine/libwineoss.drv.so.1 +lib/wine/libwineps.so +lib/wine/libwineps.so.1 +lib/wine/libwineps16.so lib/wine/libwing.so lib/wine/libwing.so.1 lib/wine/libwininet.so @@ -169,10 +194,15 @@ lib/wine/libwininet.so.1 lib/wine/libwinmm.so lib/wine/libwinmm.so.1 lib/wine/libwinsock.so +lib/wine/libws2_32.so +lib/wine/libws2_32.so.1 lib/wine/libwinspool.drv.so lib/wine/libwinspool.drv.so.1 lib/wine/libwnaspi32.so lib/wine/libwnaspi32.so.1 +lib/wine/libwow32.so +lib/wine/libwow32.so.1 +lib/wine/libwprocs.so lib/wine/libwsock32.so lib/wine/libwsock32.so.1 lib/wine/libx11drv.so |