6 files changed, 10 insertions, 76 deletions

diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile
index 6d323353ecab..3f4226c8d857 100644
--- a/emulators/wine-devel/Makefile
+++ b/emulators/wine-devel/Makefile
@@ -3,12 +3,12 @@
 # Date created:         Fri Oct  6 23:43:28 MET 1995
 # Whom:			se
 #
-# $Id: Makefile,v 1.19 1996/01/16 14:44:36 se Exp $
+# $Id: Makefile,v 1.20 1996/02/02 22:51:38 se Exp $
 #
 
-DATE=		960131
+DATE=		960218
 DISTNAME=	Wine-${DATE}
-PKGNAME=	wine-96.01.31
+PKGNAME=	wine-96.02.18
 CATEGORIES+=	emulators x11
 MASTER_SITES=	ftp://sunsite.unc.edu/pub/Linux/ALPHA/wine/ \
 		ftp://aris.com/pub/linux/ALPHA/Wine/development/ \
@@ -28,7 +28,7 @@ pre-configure:
 		>> ${WRKSRC}/autoconf.h
 
 do-install:
-	install -cs ${WRKSRC}/wine ${PREFIX}/bin
+	install -c ${WRKSRC}/wine ${PREFIX}/bin
 	-@mkdir ${PREFIX}/etc 2>/dev/null
 	[ -f ${PREFIX}/etc/wine.conf ] \
 		|| cp ${WRKSRC}/wine.ini ${PREFIX}/etc/wine.conf
diff --git a/emulators/wine-devel/distinfo b/emulators/wine-devel/distinfo
index e7ae829f2c6f..29e3f6cfd031 100644
--- a/emulators/wine-devel/distinfo
+++ b/emulators/wine-devel/distinfo
@@ -1 +1 @@
-MD5 (Wine-960131.tar.gz) = 47e546d3b5940fe48ef7cf168ae7ae76
+MD5 (Wine-960218.tar.gz) = 71e14a423c10a567522dc5159c9ddfb2
diff --git a/emulators/wine-devel/files/patch-ad b/emulators/wine-devel/files/patch-ad
index 7280adcd4307..3a580d555c91 100644
--- a/emulators/wine-devel/files/patch-ad
+++ b/emulators/wine-devel/files/patch-ad
@@ -38,36 +38,3 @@
 ! Lpt1=/dev/lpt0
   
   [spy]
-*** files/drive.c~	Wed Jan 31 19:57:23 1996
---- files/drive.c	Fri Feb  2 22:33:16 1996
-***************
-*** 8,11 ****
---- 8,12 ----
-  #include <string.h>
-  #include <stdlib.h>
-+ #include <sys/types.h>
-  #include <sys/stat.h>
-  
-*** files/directory.c~	Wed Jan 31 19:57:23 1996
---- files/directory.c	Wed Feb  7 00:10:58 1996
-***************
-*** 165,173 ****
-      /* Put the temp and Windows directories into the environment */
-  
-!     env_p = (char *)xmalloc( strlen(DIR_TempDosDir) + 5 );
-      strcpy( env_p, "TEMP=" );
-      strcpy( env_p + 5, DIR_TempDosDir );
-      putenv( env_p );
-!     env_p = (char *)xmalloc( strlen(DIR_WindowsDosDir) + 7 );
-      strcpy( env_p, "windir=" );
-      strcpy( env_p + 7, DIR_WindowsDosDir );
---- 165,173 ----
-      /* Put the temp and Windows directories into the environment */
-  
-!     env_p = (char *)xmalloc( strlen(DIR_TempDosDir) + 6 );
-      strcpy( env_p, "TEMP=" );
-      strcpy( env_p + 5, DIR_TempDosDir );
-      putenv( env_p );
-!     env_p = (char *)xmalloc( strlen(DIR_WindowsDosDir) + 8 );
-      strcpy( env_p, "windir=" );
-      strcpy( env_p + 7, DIR_WindowsDosDir );
diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile
index 6d323353ecab..3f4226c8d857 100644
--- a/emulators/wine/Makefile
+++ b/emulators/wine/Makefile
@@ -3,12 +3,12 @@
 # Date created:         Fri Oct  6 23:43:28 MET 1995
 # Whom:			se
 #
-# $Id: Makefile,v 1.19 1996/01/16 14:44:36 se Exp $
+# $Id: Makefile,v 1.20 1996/02/02 22:51:38 se Exp $
 #
 
-DATE=		960131
+DATE=		960218
 DISTNAME=	Wine-${DATE}
-PKGNAME=	wine-96.01.31
+PKGNAME=	wine-96.02.18
 CATEGORIES+=	emulators x11
 MASTER_SITES=	ftp://sunsite.unc.edu/pub/Linux/ALPHA/wine/ \
 		ftp://aris.com/pub/linux/ALPHA/Wine/development/ \
@@ -28,7 +28,7 @@ pre-configure:
 		>> ${WRKSRC}/autoconf.h
 
 do-install:
-	install -cs ${WRKSRC}/wine ${PREFIX}/bin
+	install -c ${WRKSRC}/wine ${PREFIX}/bin
 	-@mkdir ${PREFIX}/etc 2>/dev/null
 	[ -f ${PREFIX}/etc/wine.conf ] \
 		|| cp ${WRKSRC}/wine.ini ${PREFIX}/etc/wine.conf
diff --git a/emulators/wine/distinfo b/emulators/wine/distinfo
index e7ae829f2c6f..29e3f6cfd031 100644
--- a/emulators/wine/distinfo
+++ b/emulators/wine/distinfo
@@ -1 +1 @@
-MD5 (Wine-960131.tar.gz) = 47e546d3b5940fe48ef7cf168ae7ae76
+MD5 (Wine-960218.tar.gz) = 71e14a423c10a567522dc5159c9ddfb2
diff --git a/emulators/wine/files/patch-ad b/emulators/wine/files/patch-ad
index 7280adcd4307..3a580d555c91 100644
--- a/emulators/wine/files/patch-ad
+++ b/emulators/wine/files/patch-ad
@@ -38,36 +38,3 @@
 ! Lpt1=/dev/lpt0
   
   [spy]
-*** files/drive.c~	Wed Jan 31 19:57:23 1996
---- files/drive.c	Fri Feb  2 22:33:16 1996
-***************
-*** 8,11 ****
---- 8,12 ----
-  #include <string.h>
-  #include <stdlib.h>
-+ #include <sys/types.h>
-  #include <sys/stat.h>
-  
-*** files/directory.c~	Wed Jan 31 19:57:23 1996
---- files/directory.c	Wed Feb  7 00:10:58 1996
-***************
-*** 165,173 ****
-      /* Put the temp and Windows directories into the environment */
-  
-!     env_p = (char *)xmalloc( strlen(DIR_TempDosDir) + 5 );
-      strcpy( env_p, "TEMP=" );
-      strcpy( env_p + 5, DIR_TempDosDir );
-      putenv( env_p );
-!     env_p = (char *)xmalloc( strlen(DIR_WindowsDosDir) + 7 );
-      strcpy( env_p, "windir=" );
-      strcpy( env_p + 7, DIR_WindowsDosDir );
---- 165,173 ----
-      /* Put the temp and Windows directories into the environment */
-  
-!     env_p = (char *)xmalloc( strlen(DIR_TempDosDir) + 6 );
-      strcpy( env_p, "TEMP=" );
-      strcpy( env_p + 5, DIR_TempDosDir );
-      putenv( env_p );
-!     env_p = (char *)xmalloc( strlen(DIR_WindowsDosDir) + 8 );
-      strcpy( env_p, "windir=" );
-      strcpy( env_p + 7, DIR_WindowsDosDir );