1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-27 00:57:50 +00:00

Update to the 2002.08.04 version of Wine. (This also removes

patch-winefile.h, which probably shouldn't have been committed.)

Approved by:	obrien (mentor)
This commit is contained in:
Gerald Pfeifer 2002-08-05 11:50:34 +00:00
parent 7b1147e29f
commit 518747a744
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=64041
12 changed files with 62 additions and 84 deletions

View File

@ -7,7 +7,7 @@
#
PORTNAME= wine
PORTVERSION= 2002.07.10
PORTVERSION= 2002.08.04
CATEGORIES= emulators
MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= ALPHA/wine/development

View File

@ -1 +1 @@
MD5 (Wine-20020710.tar.gz) = 51cb48fbebd4d61b01d7cbb95de33d4c
MD5 (Wine-20020804.tar.gz) = d152d3e0fd64b3c40fd7be8976810cfc

View File

@ -1,20 +1,20 @@
--- Make.rules.in.orig Mon Mar 19 20:19:23 2001
+++ Make.rules.in Sun Apr 8 14:31:40 2001
@@ -25,7 +25,7 @@ SHELL = /bin/sh
--- Make.rules.in.orig Fri Aug 2 21:34:21 2002
+++ Make.rules.in Mon Aug 5 13:07:21 2002
@@ -29,7 +29,7 @@ SHELL = /bin/sh
CC = @CC@
CPP = @CPP@
CFLAGS = @CFLAGS@
CFLAGS = @CFLAGS@ $(EXTRACFLAGS)
-OPTIONS = @OPTIONS@ -D_REENTRANT
+OPTIONS = @OPTIONS@ -D_REENTRANT -D_THREAD_SAFE
X_CFLAGS = @X_CFLAGS@
X_LIBS = @X_LIBS@
XLIB = @X_PRE_LIBS@ @XLIB@ @X_EXTRA_LIBS@
@@ -80,7 +80,7 @@ INSTALL_DATA = @INSTALL_DATA@
@@ -100,7 +100,7 @@ INSTALL_DATA = @INSTALL_DATA@ $(INSTA
prefix = @prefix@
exec_prefix = @exec_prefix@
bindir = @bindir@
-libdir = @libdir@
+libdir = @libdir@/wine
datadir = @datadir@
infodir = @infodir@
mandir = @mandir@
prog_manext = 1

View File

@ -1,23 +1,21 @@
*** Makefile.in.orig Thu Jul 11 10:36:16 2002
--- Makefile.in Thu Jul 11 10:36:38 2002
*************** install-lib:: $(INSTALLLIBSUBDIRS:%=%/__
*** 87,104 ****
install-dev:: $(INSTALLDEVSUBDIRS:%=%/__install__)
install::
- -$(LDCONFIG)
- @if test -n "`LANG=C $(LDD) $(bindir)/wine|grep not.found`"; \
- then \
- echo "*************************************************" ; \
- echo "*************************************************" ; \
- echo "The installed Wine libraries will not be found!" ; \
- echo "You can either:" ; \
- echo " Add the line '$(libdir)' to /etc/ld.so.conf" ; \
- echo ' export LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:$(libdir)' ; \
- echo "*************************************************" ; \
- echo "*************************************************" ; \
- fi
.PHONY: install-lib install-dev
--- 87,92 ----
--- Makefile.in.orig Fri Aug 2 21:34:21 2002
+++ Makefile.in Mon Aug 5 13:10:16 2002
@@ -91,18 +91,6 @@ install-lib:: $(INSTALLLIBSUBDIRS:%=%/__
install-dev:: $(INSTALLDEVSUBDIRS:%=%/__install__) install-aclocal
install:: install-aclocal
- -$(LDCONFIG)
- @if test -n "`LANG=C $(LDD) $(bindir)/wine|grep not.found`"; \
- then \
- echo "*************************************************" ; \
- echo "*************************************************" ; \
- echo "The installed Wine libraries will not be found!" ; \
- echo "You can either:" ; \
- echo " Add the line '$(libdir)' to /etc/ld.so.conf" ; \
- echo ' export LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:$(libdir)' ; \
- echo "*************************************************" ; \
- echo "*************************************************" ; \
- fi
uninstall::
$(RM) $(datadir)/aclocal/wine.m4

View File

@ -1,10 +0,0 @@
--- programs/winefile/winefile.h.old Wed Jun 12 13:11:02 2002
+++ programs/winefile/winefile.h Wed Jun 12 13:11:07 2002
@@ -38,7 +38,6 @@
#include <commctrl.h>
#include <shellapi.h>
#include <stdlib.h>
-#include <malloc.h>
#include <stdio.h>
#include <tchar.h>
#include <ctype.h>

View File

@ -187,7 +187,6 @@ include/wine/wine/obj_oleview.h
include/wine/wine/obj_picture.h
include/wine/wine/obj_property.h
include/wine/wine/obj_propertystorage.h
include/wine/wine/obj_queryassociations.h
include/wine/wine/obj_serviceprovider.h
include/wine/wine/obj_shellbrowser.h
include/wine/wine/obj_shellextinit.h
@ -368,6 +367,7 @@ lib/wine/winaspi.dll.so
lib/wine/windebug.dll.so
lib/wine/winealsa.drv.so
lib/wine/winearts.drv.so
lib/wine/wineaudioio.drv.so
lib/wine/wineconsole.exe.so
lib/wine/winedbg.exe.so
lib/wine/winedos.dll.so
@ -375,6 +375,7 @@ lib/wine/winefile.exe.so
lib/wine/winemine.exe.so
lib/wine/winemp3.acm.so
lib/wine/wineoss.drv.so
lib/wine/winenas.drv.so
lib/wine/winepath.exe.so
lib/wine/wineps.dll.so
lib/wine/wineps16.dll.so

View File

@ -7,7 +7,7 @@
#
PORTNAME= wine
PORTVERSION= 2002.07.10
PORTVERSION= 2002.08.04
CATEGORIES= emulators
MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= ALPHA/wine/development

View File

@ -1 +1 @@
MD5 (Wine-20020710.tar.gz) = 51cb48fbebd4d61b01d7cbb95de33d4c
MD5 (Wine-20020804.tar.gz) = d152d3e0fd64b3c40fd7be8976810cfc

View File

@ -1,20 +1,20 @@
--- Make.rules.in.orig Mon Mar 19 20:19:23 2001
+++ Make.rules.in Sun Apr 8 14:31:40 2001
@@ -25,7 +25,7 @@ SHELL = /bin/sh
--- Make.rules.in.orig Fri Aug 2 21:34:21 2002
+++ Make.rules.in Mon Aug 5 13:07:21 2002
@@ -29,7 +29,7 @@ SHELL = /bin/sh
CC = @CC@
CPP = @CPP@
CFLAGS = @CFLAGS@
CFLAGS = @CFLAGS@ $(EXTRACFLAGS)
-OPTIONS = @OPTIONS@ -D_REENTRANT
+OPTIONS = @OPTIONS@ -D_REENTRANT -D_THREAD_SAFE
X_CFLAGS = @X_CFLAGS@
X_LIBS = @X_LIBS@
XLIB = @X_PRE_LIBS@ @XLIB@ @X_EXTRA_LIBS@
@@ -80,7 +80,7 @@ INSTALL_DATA = @INSTALL_DATA@
@@ -100,7 +100,7 @@ INSTALL_DATA = @INSTALL_DATA@ $(INSTA
prefix = @prefix@
exec_prefix = @exec_prefix@
bindir = @bindir@
-libdir = @libdir@
+libdir = @libdir@/wine
datadir = @datadir@
infodir = @infodir@
mandir = @mandir@
prog_manext = 1

View File

@ -1,23 +1,21 @@
*** Makefile.in.orig Thu Jul 11 10:36:16 2002
--- Makefile.in Thu Jul 11 10:36:38 2002
*************** install-lib:: $(INSTALLLIBSUBDIRS:%=%/__
*** 87,104 ****
install-dev:: $(INSTALLDEVSUBDIRS:%=%/__install__)
install::
- -$(LDCONFIG)
- @if test -n "`LANG=C $(LDD) $(bindir)/wine|grep not.found`"; \
- then \
- echo "*************************************************" ; \
- echo "*************************************************" ; \
- echo "The installed Wine libraries will not be found!" ; \
- echo "You can either:" ; \
- echo " Add the line '$(libdir)' to /etc/ld.so.conf" ; \
- echo ' export LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:$(libdir)' ; \
- echo "*************************************************" ; \
- echo "*************************************************" ; \
- fi
.PHONY: install-lib install-dev
--- 87,92 ----
--- Makefile.in.orig Fri Aug 2 21:34:21 2002
+++ Makefile.in Mon Aug 5 13:10:16 2002
@@ -91,18 +91,6 @@ install-lib:: $(INSTALLLIBSUBDIRS:%=%/__
install-dev:: $(INSTALLDEVSUBDIRS:%=%/__install__) install-aclocal
install:: install-aclocal
- -$(LDCONFIG)
- @if test -n "`LANG=C $(LDD) $(bindir)/wine|grep not.found`"; \
- then \
- echo "*************************************************" ; \
- echo "*************************************************" ; \
- echo "The installed Wine libraries will not be found!" ; \
- echo "You can either:" ; \
- echo " Add the line '$(libdir)' to /etc/ld.so.conf" ; \
- echo ' export LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:$(libdir)' ; \
- echo "*************************************************" ; \
- echo "*************************************************" ; \
- fi
uninstall::
$(RM) $(datadir)/aclocal/wine.m4

View File

@ -1,10 +0,0 @@
--- programs/winefile/winefile.h.old Wed Jun 12 13:11:02 2002
+++ programs/winefile/winefile.h Wed Jun 12 13:11:07 2002
@@ -38,7 +38,6 @@
#include <commctrl.h>
#include <shellapi.h>
#include <stdlib.h>
-#include <malloc.h>
#include <stdio.h>
#include <tchar.h>
#include <ctype.h>

View File

@ -187,7 +187,6 @@ include/wine/wine/obj_oleview.h
include/wine/wine/obj_picture.h
include/wine/wine/obj_property.h
include/wine/wine/obj_propertystorage.h
include/wine/wine/obj_queryassociations.h
include/wine/wine/obj_serviceprovider.h
include/wine/wine/obj_shellbrowser.h
include/wine/wine/obj_shellextinit.h
@ -368,6 +367,7 @@ lib/wine/winaspi.dll.so
lib/wine/windebug.dll.so
lib/wine/winealsa.drv.so
lib/wine/winearts.drv.so
lib/wine/wineaudioio.drv.so
lib/wine/wineconsole.exe.so
lib/wine/winedbg.exe.so
lib/wine/winedos.dll.so
@ -375,6 +375,7 @@ lib/wine/winefile.exe.so
lib/wine/winemine.exe.so
lib/wine/winemp3.acm.so
lib/wine/wineoss.drv.so
lib/wine/winenas.drv.so
lib/wine/winepath.exe.so
lib/wine/wineps.dll.so
lib/wine/wineps16.dll.so