diff options
-rw-r--r-- | emulators/wine/Makefile | 4 | ||||
-rw-r--r-- | emulators/wine/PLIST | 31 | ||||
-rw-r--r-- | emulators/wine/distinfo | 9 | ||||
-rw-r--r-- | emulators/wine/patches/patch-aa | 23 | ||||
-rw-r--r-- | emulators/wine/patches/patch-ab | 13 |
5 files changed, 41 insertions, 39 deletions
diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile index 3bc48a6105f..bcd5ffecf90 100644 --- a/emulators/wine/Makefile +++ b/emulators/wine/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.34 2002/09/21 00:29:42 jlam Exp $ +# $NetBSD: Makefile,v 1.35 2002/10/10 10:48:20 junyoung Exp $ -DISTNAME= Wine-20020804 +DISTNAME= Wine-20021007 PKGNAME= ${DISTNAME:S/W/w/} WRKSRC= ${WRKDIR}/${PKGNAME} CATEGORIES= emulators diff --git a/emulators/wine/PLIST b/emulators/wine/PLIST index 96d8a531dfe..7698d8b92a2 100644 --- a/emulators/wine/PLIST +++ b/emulators/wine/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.5 2002/08/05 16:38:58 junyoung Exp $ +@comment $NetBSD: PLIST,v 1.6 2002/10/10 10:48:20 junyoung Exp $ bin/function_grep.pl bin/notepad bin/progman @@ -32,7 +32,11 @@ include/wine/commctrl.h include/wine/commdlg.h include/wine/compobj.h include/wine/cpl.h +include/wine/custcntl.h include/wine/d3d.h +include/wine/d3d8.h +include/wine/d3d8caps.h +include/wine/d3d8types.h include/wine/d3dcaps.h include/wine/d3dtypes.h include/wine/d3dvec.inl @@ -56,7 +60,13 @@ include/wine/imagehlp.h include/wine/imm.h include/wine/initguid.h include/wine/instance.h +include/wine/lm.h +include/wine/lmaccess.h +include/wine/lmapibuf.h +include/wine/lmbrowsr.h include/wine/lmcons.h +include/wine/lmerr.h +include/wine/lmwksta.h include/wine/lzexpand.h include/wine/mapi.h include/wine/mapicode.h @@ -70,12 +80,14 @@ include/wine/mmreg.h include/wine/mmsystem.h include/wine/msacm.h include/wine/msacmdlg.h +include/wine/mssip.h include/wine/msvcrt/conio.h include/wine/msvcrt/crtdbg.h include/wine/msvcrt/ctype.h include/wine/msvcrt/direct.h include/wine/msvcrt/dos.h include/wine/msvcrt/eh.h +include/wine/msvcrt/errno.h include/wine/msvcrt/excpt.h include/wine/msvcrt/fcntl.h include/wine/msvcrt/io.h @@ -103,6 +115,7 @@ include/wine/mswsock.h include/wine/nb30.h include/wine/nspapi.h include/wine/ntsecapi.h +include/wine/ntstatus.h include/wine/oaidl.h include/wine/objbase.h include/wine/objidl.h @@ -123,6 +136,7 @@ include/wine/pshpack8.h include/wine/ras.h include/wine/regstr.h include/wine/richedit.h +include/wine/richole.h include/wine/rpc.h include/wine/rpcdce.h include/wine/rpcdcep.h @@ -135,11 +149,13 @@ include/wine/shellapi.h include/wine/shlguid.h include/wine/shlobj.h include/wine/shlwapi.h +include/wine/sipbase.h include/wine/sql.h include/wine/sqlext.h include/wine/sqltypes.h include/wine/storage.h include/wine/tapi.h +include/wine/tchar.h include/wine/tlhelp32.h include/wine/unknwn.h include/wine/urlmon.h @@ -170,6 +186,7 @@ include/wine/wine/obj_control.h include/wine/wine/obj_dataobject.h include/wine/wine/obj_dockingwindowframe.h include/wine/wine/obj_dragdrop.h +include/wine/wine/obj_dragdrophelper.h include/wine/wine/obj_enumguid.h include/wine/wine/obj_enumidlist.h include/wine/wine/obj_errorinfo.h @@ -209,6 +226,7 @@ include/wine/winsock.h include/wine/winsock2.h include/wine/winspool.h include/wine/winsvc.h +include/wine/winternl.h include/wine/winuser.h include/wine/winver.h include/wine/wnaspi32.h @@ -219,14 +237,9 @@ include/wine/wshisotp.h include/wine/wsipx.h include/wine/wtypes.h include/wine/zmouse.h -lib/libgdi32.dll.so -lib/libkernel32.dll.so lib/libntdll.dll.so -lib/libuser32.dll.so lib/libwine.so lib/libwine.so.1.0 -lib/libwine_tsx11.so -lib/libwine_tsx11.so.1.0 lib/libwine_unicode.so lib/libwine_unicode.so.1.0 lib/libwine_uuid.a @@ -237,7 +250,6 @@ lib/wine/avifile.dll.so lib/wine/aviinfo.exe.so lib/wine/aviplay.exe.so lib/wine/clock.exe.so -lib/wine/cmdlgtst.exe.so lib/wine/comcat.dll.so lib/wine/comctl32.dll.so lib/wine/comdlg32.dll.so @@ -318,17 +330,14 @@ lib/wine/olepro32.dll.so lib/wine/olesvr.dll.so lib/wine/olesvr32.dll.so lib/wine/opengl32.dll.so -lib/wine/osversioncheck.exe.so lib/wine/progman.exe.so lib/wine/psapi.dll.so 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/regtest.exe.so lib/wine/riched32.dll.so lib/wine/rpcrt4.dll.so lib/wine/serialui.dll.so @@ -357,7 +366,6 @@ lib/wine/user.exe.so lib/wine/user32.dll.so lib/wine/ver.dll.so lib/wine/version.dll.so -lib/wine/view.exe.so lib/wine/w32skrnl.dll.so lib/wine/w32sys.dll.so lib/wine/wcmd.exe.so @@ -379,7 +387,6 @@ lib/wine/wineoss.drv.so lib/wine/winepath.exe.so lib/wine/wineps.dll.so lib/wine/wineps16.dll.so -lib/wine/winetest.exe.so lib/wine/wing.dll.so lib/wine/winhelp.exe.so lib/wine/wininet.dll.so diff --git a/emulators/wine/distinfo b/emulators/wine/distinfo index 3a6bb201d48..bb2ef59ea52 100644 --- a/emulators/wine/distinfo +++ b/emulators/wine/distinfo @@ -1,6 +1,5 @@ -$NetBSD: distinfo,v 1.9 2002/08/05 16:38:58 junyoung Exp $ +$NetBSD: distinfo,v 1.10 2002/10/10 10:48:20 junyoung Exp $ -SHA1 (Wine-20020804.tar.gz) = 8536d7c15860dbb20d4e609d1bce58ec6d633bb0 -Size (Wine-20020804.tar.gz) = 7497358 bytes -SHA1 (patch-aa) = bf45f5b343bda55a0809459469a2476b566ad7d5 -SHA1 (patch-ab) = 2a1a4432f7e9896f4cc5df066dc0d8581dc78d52 +SHA1 (Wine-20021007.tar.gz) = 004544a9c9688799decc2bfd04b0b0fdfc439c6d +Size (Wine-20021007.tar.gz) = 7846765 bytes +SHA1 (patch-aa) = 3b903517cdde2dbe338bd41819de5a2787e5d0de diff --git a/emulators/wine/patches/patch-aa b/emulators/wine/patches/patch-aa index 4ace8108dfa..190e851c869 100644 --- a/emulators/wine/patches/patch-aa +++ b/emulators/wine/patches/patch-aa @@ -1,13 +1,22 @@ -$NetBSD: patch-aa,v 1.6 2002/03/15 04:10:20 junyoung Exp $ +$NetBSD: patch-aa,v 1.7 2002/10/10 10:48:21 junyoung Exp $ ---- Make.rules.in.orig Tue Jan 15 04:56:46 2002 -+++ Make.rules.in Sat Jan 26 21:08:41 2002 -@@ -31,7 +31,7 @@ - X_CFLAGS = @X_CFLAGS@ - X_LIBS = @X_LIBS@ - XLIB = @X_PRE_LIBS@ @XLIB@ @X_EXTRA_LIBS@ +--- Make.rules.in.orig Wed Oct 2 11:34:09 2002 ++++ Make.rules.in Thu Oct 10 19:01:06 2002 +@@ -26,7 +26,7 @@ + CPP = @CPP@ + CFLAGS = @CFLAGS@ $(EXTRACFLAGS) + OPTIONS = @OPTIONS@ -D_REENTRANT -LIBS = @LIBS@ +LIBS = @LIBS@ -lc YACC = @YACC@ LEX = @LEX@ LEXLIB = @LEXLIB@ +@@ -98,7 +98,7 @@ + CLEAN_FILES = *.o *.a *.so *.ln *.$(LIBEXT) \\\#*\\\# *~ *% .\\\#* *.bak *.orig *.rej \ + *.flc *.spec.c *.spec.def *.glue.c *.dbg.c y.tab.c y.tab.h @LEX_OUTPUT_ROOT@.c core + +-OBJS = $(C_SRCS:.c=.o) $(EXTRA_OBJS) ++OBJS = $(EXTRA_OBJS) $(C_SRCS:.c=.o) + + RCOBJS = $(RC_SRCS:.rc=.res.o) + LINTS = $(C_SRCS:.c=.ln) diff --git a/emulators/wine/patches/patch-ab b/emulators/wine/patches/patch-ab deleted file mode 100644 index e26f0b6a3b7..00000000000 --- a/emulators/wine/patches/patch-ab +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ab,v 1.11 2002/08/05 16:38:58 junyoung Exp $ - ---- Make.rules.in.orig Sat Aug 3 04:34:21 2002 -+++ Make.rules.in Mon Aug 5 14:57:17 2002 -@@ -112,7 +112,7 @@ - CLEAN_FILES = *.o *.a *.so *.ln *.$(LIBEXT) \\\#*\\\# *~ *% .\\\#* *.bak *.orig *.rej \ - *.flc *.spec.c *.spec.def *.glue.c *.dbg.c y.tab.c y.tab.h @LEX_OUTPUT_ROOT@.c core - --OBJS = $(C_SRCS:.c=.o) $(GEN_C_SRCS:.c=.o) $(GEN_ASM_SRCS:.s=.o) $(ASM_SRCS:.S=.o) $(EXTRA_OBJS) -+OBJS = $(EXTRA_OBJS) $(C_SRCS:.c=.o) $(GEN_C_SRCS:.c=.o) $(GEN_ASM_SRCS:.s=.o) $(ASM_SRCS:.S=.o) - - RCOBJS = $(RC_SRCS:.rc=.res.o) - LINTS = $(C_SRCS:.c=.ln) |