From dfd223649995c394f0a7911d3952d78278aece3c Mon Sep 17 00:00:00 2001 From: Gerald Pfeifer Date: Sun, 14 Dec 2003 01:18:02 +0000 Subject: Update to the 20031212 snapshot of Wine, which brings some simplifications. Remove specific versions of Windows from pkg-descr and COMMENT, as there are simply too many now, due to Microsoft's marketing. --- emulators/wine/Makefile | 19 ++++-------------- emulators/wine/distinfo | 2 +- emulators/wine/files/patch-program::Makefile.in | 26 +++++++++++++++++++++++++ emulators/wine/pkg-descr | 4 ++-- emulators/wine/pkg-plist | 10 ++++------ 5 files changed, 37 insertions(+), 24 deletions(-) create mode 100644 emulators/wine/files/patch-program::Makefile.in (limited to 'emulators/wine') diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile index 3e9ae783ae22..976ed23a552b 100644 --- a/emulators/wine/Makefile +++ b/emulators/wine/Makefile @@ -7,14 +7,14 @@ # PORTNAME= wine -PORTVERSION= 20031118 +PORTVERSION= 20031212 CATEGORIES= emulators MASTER_SITES= ${MASTER_SITE_SUNSITE} MASTER_SITE_SUBDIR= ALPHA/wine/development DISTNAME= Wine-${PORTVERSION} MAINTAINER= gerald@FreeBSD.org -COMMENT= Microsoft Windows 3.1/95/98/NT/2000 emulator for Unix +COMMENT= Microsoft Windows emulator for Unix WRKSRC= ${WRKDIR}/wine-${PORTVERSION} GNU_CONFIGURE= yes @@ -56,10 +56,6 @@ post-extract: post-configure: cd ${WRKSRC} && make depend -post-build: - ${SED} 's-\./\(reg.*\.pl\)-'${PREFIX}/lib/wine/reg/'\1-' \ - ${WRKSRC}/programs/regapi/regSet.sh > ${WRKDIR}/regSet.sh - do-install: cd ${WRKSRC} && ${GMAKE} install ${INSTALL_SCRIPT} ${WRKDIR}/regSet.sh ${PREFIX}/bin @@ -73,21 +69,14 @@ do-install: .for i in README ANNOUNCE AUTHORS LICENSE @${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/share/doc/${PORTNAME} .endfor -.for i in regapi wcmd winedbg +.for i in wcmd winedbg ${INSTALL_DATA} ${WRKSRC}/programs/${i}/README \ ${PREFIX}/share/doc/${PORTNAME}/README.${i} .endfor ${INSTALL_DATA} ${WRKSRC}/tools/winedump/README \ ${PREFIX}/share/doc/${PORTNAME}/README.winedump .endif - -@${MKDIR} ${PREFIX}/lib/wine/reg - ${INSTALL_SCRIPT} ${WRKSRC}/tools/bug_report.pl \ - ${PREFIX}/lib/wine - ${INSTALL_PROGRAM} ${WRKSRC}/programs/regapi/regapi.exe.so ${PREFIX}/lib/wine - ${INSTALL_SCRIPT} \ - ${WRKSRC}/programs/regapi/regFixer.pl \ - ${WRKSRC}/programs/regapi/regRestorer.pl \ - ${PREFIX}/lib/wine/reg + ${INSTALL_SCRIPT} ${WRKSRC}/tools/bug_report.pl ${PREFIX}/lib/wine ${INSTALL_DATA} ${WRKSRC}/winedefault.reg ${PREFIX}/lib/wine ${ECHO} @${SED} s+%%PREFIX%%+${PREFIX}+g <${PKGMESSAGE} diff --git a/emulators/wine/distinfo b/emulators/wine/distinfo index 346f29d9b3ba..5a8daf851797 100644 --- a/emulators/wine/distinfo +++ b/emulators/wine/distinfo @@ -1 +1 @@ -MD5 (Wine-20031118.tar.gz) = 5787e6b3205b54f2230b4c4c0d422c3c +MD5 (Wine-20031212.tar.gz) = eaac8e7f9864d4c4069cfb2b202e22a5 diff --git a/emulators/wine/files/patch-program::Makefile.in b/emulators/wine/files/patch-program::Makefile.in new file mode 100644 index 000000000000..a11e87a3a0d1 --- /dev/null +++ b/emulators/wine/files/patch-program::Makefile.in @@ -0,0 +1,26 @@ +--- programs/Makefile.in.orig Sun Dec 14 01:20:59 2003 ++++ programs/Makefile.in Sun Dec 14 01:21:45 2003 +@@ -29,7 +29,6 @@ SUBDIRS = \ + winemenubuilder \ + winemine \ + winepath \ +- winetest \ + winevdm \ + winhelp \ + winver +@@ -57,7 +56,6 @@ INSTALLSUBDIRS = \ + winemenubuilder \ + winemine \ + winepath \ +- winetest \ + winevdm \ + winhelp \ + winver +@@ -106,7 +104,6 @@ SYMLINKS = \ + winemenubuilder.exe \ + winemine.exe \ + winepath.exe \ +- winetest.exe \ + winevdm.exe \ + winhelp.exe \ + winver.exe diff --git a/emulators/wine/pkg-descr b/emulators/wine/pkg-descr index c28836270e1f..e8a6b98d624b 100644 --- a/emulators/wine/pkg-descr +++ b/emulators/wine/pkg-descr @@ -1,5 +1,5 @@ -Wine is a Microsoft Windows 3.1/95/98/NT/2000 emulator running under Unix -on i386 (and compatible) CPUs. +Wine is a Microsoft Windows emulator running under Unix on i386 (and +compatible) CPUs. It is still alpha quality, but is definitely making progress. Most applications already work, more or less, including several games. diff --git a/emulators/wine/pkg-plist b/emulators/wine/pkg-plist index 3448d93ca68c..bd0e4f614b7f 100644 --- a/emulators/wine/pkg-plist +++ b/emulators/wine/pkg-plist @@ -1,7 +1,6 @@ bin/function_grep.pl bin/notepad bin/progman -bin/regSet.sh bin/regedit bin/regsvr32 bin/uninstaller @@ -335,6 +334,7 @@ lib/wine/dsound.dll.so lib/wine/expand.exe.so lib/wine/gdi.exe.so lib/wine/gdi32.dll.so +lib/wine/glut32.dll.so lib/wine/icinfo.exe.so lib/wine/icmp.dll.so lib/wine/imaadp32.acm.so @@ -377,6 +377,7 @@ lib/wine/libdmsynth.def lib/wine/libdmusic.def lib/wine/libdmusic32.def lib/wine/libdpnhpast.def +lib/wine/libglut32.def lib/wine/libmshtml.def lib/wine/libmsvcrtd.def lib/wine/libdplay.def @@ -430,6 +431,7 @@ lib/wine/libsti.def lib/wine/libtapi32.def lib/wine/libttydrv.def lib/wine/libtwain_32.def +lib/wine/libunicows.def lib/wine/liburl.def lib/wine/liburlmon.def lib/wine/libuser32.def @@ -505,7 +507,6 @@ lib/wine/qcap.dll.so lib/wine/quartz.dll.so lib/wine/rasapi16.dll.so lib/wine/rasapi32.dll.so -lib/wine/regapi.exe.so lib/wine/regedit.exe.so lib/wine/regsvr32.exe.so lib/wine/riched32.dll.so @@ -532,6 +533,7 @@ lib/wine/toolhelp.dll.so lib/wine/ttydrv.dll.so lib/wine/twain_32.dll.so lib/wine/typelib.dll.so +lib/wine/unicows.dll.so lib/wine/uninstaller.exe.so lib/wine/url.dll.so lib/wine/urlmon.dll.so @@ -586,21 +588,17 @@ lib/wine/wprocs.dll.so lib/wine/ws2_32.dll.so lib/wine/wsock32.dll.so lib/wine/x11drv.dll.so -lib/wine/reg/regFixer.pl -lib/wine/reg/regRestorer.pl share/aclocal/wine.m4 %%DOCSDIR%%/ANNOUNCE %%DOCSDIR%%/AUTHORS %%DOCSDIR%%/LICENSE %%DOCSDIR%%/README -%%DOCSDIR%%/README.regapi %%DOCSDIR%%/README.wcmd %%DOCSDIR%%/README.winedbg %%DOCSDIR%%/README.winedump %%PORTDOCS%%@dirrm share/doc/wine @unexec if [ -f %D/lib/wine/glu32.dll.so ]; then rm %D/lib/wine/glu32.dll.so; fi @unexec if [ -f %D/lib/wine/opengl32.dll.so ]; then rm %D/lib/wine/opengl32.dll.so; fi -@dirrm lib/wine/reg @dirrm lib/wine @dirrm include/wine/msvcrt/sys @dirrm include/wine/msvcrt -- cgit v1.2.3