Update to version 2000.10.02.

PR:		21961
Submitted by:	maintainer

8 files changed, 66 insertions, 18 deletions

diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile
index 2dc91468594c..4ed64fbe6bd2 100644
--- a/emulators/wine-devel/Makefile
+++ b/emulators/wine-devel/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	wine
-PORTVERSION=	2000.08.21
+PORTVERSION=	2000.10.02
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	ALPHA/wine/development
@@ -18,7 +18,7 @@ MAINTAINER=	pfeifer@dbai.tuwien.ac.at
 WRKSRC=		${WRKDIR}/wine-${PORTVERSION:S/.//g}
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-opengl
-CONFIGURE_ENV= LIBS=-Wl,-rpath,${PREFIX}/lib/wine
+CONFIGURE_ENV=	LIBS=-Wl,-rpath,${PREFIX}/lib/wine
 INSTALLS_SHLIB=	yes
 LDCONFIG_DIRS=	%%PREFIX%%/lib/wine
 MAN1=		wine.1
@@ -89,7 +89,8 @@ do-install:
 		${WRKSRC}/programs/regapi/regRestorer.pl \
 		${PREFIX}/lib/wine/reg
 	${INSTALL_DATA} ${FILESDIR}/README.patch \
-		${FILESDIR}/install-patch-3.3-sys-sigtrap \
+		${PREFIX}/lib/wine
+	${INSTALL_DATA} ${FILESDIR}/install-patch-3.3-sys-sigtrap \
 		${PREFIX}/lib/wine/patch-3.3-sys-sigtrap
 	${INSTALL_DATA} ${WRKSRC}/winedefault.reg ${PREFIX}/lib/wine
 	${ECHO}
diff --git a/emulators/wine-devel/distinfo b/emulators/wine-devel/distinfo
index 42b4509e3b2b..dd70d5a0ca83 100644
--- a/emulators/wine-devel/distinfo
+++ b/emulators/wine-devel/distinfo
@@ -1 +1 @@
-MD5 (Wine-20000821.tar.gz) = 6a335fe05a573dfd7ce919fc5da3b7b5
+MD5 (Wine-20001002.tar.gz) = 9866f93a735c3df7a470e91d911e04a0
diff --git a/emulators/wine-devel/files/patch-ge b/emulators/wine-devel/files/patch-ge
new file mode 100644
index 000000000000..b40f48d4d9d7
--- /dev/null
+++ b/emulators/wine-devel/files/patch-ge
@@ -0,0 +1,24 @@
+Index: dlls/Makedll.rules.in
+===================================================================
+RCS file: /home/wine/wine/dlls/Makedll.rules.in,v
+retrieving revision 1.6
+diff -c -3 -p -r1.6 Makedll.rules.in
+*** Makedll.rules.in	2000/08/03 00:04:24	1.6
+--- Makedll.rules.in	2000/10/13 18:30:44
+*************** all: lib$(MODULE).$(LIBEXT) $(ALTNAMES:%
+*** 25,31 ****
+  # Rules for .so files
+  
+  lib$(MODULE).so.$(SOVERSION): $(OBJS) Makefile.in $(TOPSRCDIR)/Make.rules.in
+! 	$(LDSHARED) $(OBJS) -o $@ -L$(DLLDIR) $(IMPORTS:%=-l%) $(EXTRALIBS)
+  
+  $(ALLNAMES): lib$(MODULE).so.$(SOVERSION)
+  	$(RM) $@ && $(LN_S) lib$(MODULE).so.$(SOVERSION) $@
+--- 25,31 ----
+  # Rules for .so files
+  
+  lib$(MODULE).so.$(SOVERSION): $(OBJS) Makefile.in $(TOPSRCDIR)/Make.rules.in
+! 	$(LDSHARED) $(OBJS) -o $@ -L$(DLLDIR) $(IMPORTS:%=-l%) $(EXTRALIBS) -lgcc_pic
+  
+  $(ALLNAMES): lib$(MODULE).so.$(SOVERSION)
+  	$(RM) $@ && $(LN_S) lib$(MODULE).so.$(SOVERSION) $@
diff --git a/emulators/wine-devel/pkg-plist b/emulators/wine-devel/pkg-plist
index c2bdbd78b60d..0fd2e777ad57 100644
--- a/emulators/wine-devel/pkg-plist
+++ b/emulators/wine-devel/pkg-plist
@@ -7,12 +7,14 @@ bin/regSet.sh
 etc/wine.conf.sample
 include/wine/basetsd.h
 include/wine/cderr.h
+include/wine/cguid.h
 include/wine/commctrl.h
 include/wine/commdlg.h
 include/wine/compobj.h
 include/wine/d3d.h
 include/wine/d3dcaps.h
 include/wine/d3dtypes.h
+include/wine/d3dvec.inl
 include/wine/dde.h
 include/wine/ddeml.h
 include/wine/ddraw.h
@@ -53,7 +55,6 @@ include/wine/pshpack1.h
 include/wine/pshpack2.h
 include/wine/pshpack4.h
 include/wine/pshpack8.h
-include/wine/queue.h
 include/wine/ras.h
 include/wine/regstr.h
 include/wine/richedit.h
@@ -95,7 +96,9 @@ include/wine/winsvc.h
 include/wine/winuser.h
 include/wine/winver.h
 include/wine/wownt32.h
+include/wine/wnaspi32.h
 include/wine/wtypes.h
+include/wine/zmouse.h
 include/wine/wine/exception.h
 include/wine/wine/icmpapi.h
 include/wine/wine/ipexport.h
@@ -132,11 +135,7 @@ include/wine/wine/obj_shellfolder.h
 include/wine/wine/obj_shelllink.h
 include/wine/wine/obj_shellview.h
 include/wine/wine/obj_storage.h
-include/wine/wine/port.h
-include/wine/wine/undocshell.h
 include/wine/wine/unicode.h
-include/wine/wine/w32skrnl.h
-include/wine/wine/winestring.h
 lib/wine/README.patch
 lib/wine/patch-3.3-sys-sigtrap
 lib/wine/winedefault.reg
diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile
index 2dc91468594c..4ed64fbe6bd2 100644
--- a/emulators/wine/Makefile
+++ b/emulators/wine/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	wine
-PORTVERSION=	2000.08.21
+PORTVERSION=	2000.10.02
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	ALPHA/wine/development
@@ -18,7 +18,7 @@ MAINTAINER=	pfeifer@dbai.tuwien.ac.at
 WRKSRC=		${WRKDIR}/wine-${PORTVERSION:S/.//g}
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-opengl
-CONFIGURE_ENV= LIBS=-Wl,-rpath,${PREFIX}/lib/wine
+CONFIGURE_ENV=	LIBS=-Wl,-rpath,${PREFIX}/lib/wine
 INSTALLS_SHLIB=	yes
 LDCONFIG_DIRS=	%%PREFIX%%/lib/wine
 MAN1=		wine.1
@@ -89,7 +89,8 @@ do-install:
 		${WRKSRC}/programs/regapi/regRestorer.pl \
 		${PREFIX}/lib/wine/reg
 	${INSTALL_DATA} ${FILESDIR}/README.patch \
-		${FILESDIR}/install-patch-3.3-sys-sigtrap \
+		${PREFIX}/lib/wine
+	${INSTALL_DATA} ${FILESDIR}/install-patch-3.3-sys-sigtrap \
 		${PREFIX}/lib/wine/patch-3.3-sys-sigtrap
 	${INSTALL_DATA} ${WRKSRC}/winedefault.reg ${PREFIX}/lib/wine
 	${ECHO}
diff --git a/emulators/wine/distinfo b/emulators/wine/distinfo
index 42b4509e3b2b..dd70d5a0ca83 100644
--- a/emulators/wine/distinfo
+++ b/emulators/wine/distinfo
@@ -1 +1 @@
-MD5 (Wine-20000821.tar.gz) = 6a335fe05a573dfd7ce919fc5da3b7b5
+MD5 (Wine-20001002.tar.gz) = 9866f93a735c3df7a470e91d911e04a0
diff --git a/emulators/wine/files/patch-ge b/emulators/wine/files/patch-ge
new file mode 100644
index 000000000000..b40f48d4d9d7
--- /dev/null
+++ b/emulators/wine/files/patch-ge
@@ -0,0 +1,24 @@
+Index: dlls/Makedll.rules.in
+===================================================================
+RCS file: /home/wine/wine/dlls/Makedll.rules.in,v
+retrieving revision 1.6
+diff -c -3 -p -r1.6 Makedll.rules.in
+*** Makedll.rules.in	2000/08/03 00:04:24	1.6
+--- Makedll.rules.in	2000/10/13 18:30:44
+*************** all: lib$(MODULE).$(LIBEXT) $(ALTNAMES:%
+*** 25,31 ****
+  # Rules for .so files
+  
+  lib$(MODULE).so.$(SOVERSION): $(OBJS) Makefile.in $(TOPSRCDIR)/Make.rules.in
+! 	$(LDSHARED) $(OBJS) -o $@ -L$(DLLDIR) $(IMPORTS:%=-l%) $(EXTRALIBS)
+  
+  $(ALLNAMES): lib$(MODULE).so.$(SOVERSION)
+  	$(RM) $@ && $(LN_S) lib$(MODULE).so.$(SOVERSION) $@
+--- 25,31 ----
+  # Rules for .so files
+  
+  lib$(MODULE).so.$(SOVERSION): $(OBJS) Makefile.in $(TOPSRCDIR)/Make.rules.in
+! 	$(LDSHARED) $(OBJS) -o $@ -L$(DLLDIR) $(IMPORTS:%=-l%) $(EXTRALIBS) -lgcc_pic
+  
+  $(ALLNAMES): lib$(MODULE).so.$(SOVERSION)
+  	$(RM) $@ && $(LN_S) lib$(MODULE).so.$(SOVERSION) $@
diff --git a/emulators/wine/pkg-plist b/emulators/wine/pkg-plist
index c2bdbd78b60d..0fd2e777ad57 100644
--- a/emulators/wine/pkg-plist
+++ b/emulators/wine/pkg-plist
@@ -7,12 +7,14 @@ bin/regSet.sh
 etc/wine.conf.sample
 include/wine/basetsd.h
 include/wine/cderr.h
+include/wine/cguid.h
 include/wine/commctrl.h
 include/wine/commdlg.h
 include/wine/compobj.h
 include/wine/d3d.h
 include/wine/d3dcaps.h
 include/wine/d3dtypes.h
+include/wine/d3dvec.inl
 include/wine/dde.h
 include/wine/ddeml.h
 include/wine/ddraw.h
@@ -53,7 +55,6 @@ include/wine/pshpack1.h
 include/wine/pshpack2.h
 include/wine/pshpack4.h
 include/wine/pshpack8.h
-include/wine/queue.h
 include/wine/ras.h
 include/wine/regstr.h
 include/wine/richedit.h
@@ -95,7 +96,9 @@ include/wine/winsvc.h
 include/wine/winuser.h
 include/wine/winver.h
 include/wine/wownt32.h
+include/wine/wnaspi32.h
 include/wine/wtypes.h
+include/wine/zmouse.h
 include/wine/wine/exception.h
 include/wine/wine/icmpapi.h
 include/wine/wine/ipexport.h
@@ -132,11 +135,7 @@ include/wine/wine/obj_shellfolder.h
 include/wine/wine/obj_shelllink.h
 include/wine/wine/obj_shellview.h
 include/wine/wine/obj_storage.h
-include/wine/wine/port.h
-include/wine/wine/undocshell.h
 include/wine/wine/unicode.h
-include/wine/wine/w32skrnl.h
-include/wine/wine/winestring.h
 lib/wine/README.patch
 lib/wine/patch-3.3-sys-sigtrap
 lib/wine/winedefault.reg