From owner-freebsd-ports Fri Oct 13 13:30:12 2000 Delivered-To: freebsd-ports@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 89BD637B66E for ; Fri, 13 Oct 2000 13:30:01 -0700 (PDT) Received: (from gnats@localhost) by freefall.freebsd.org (8.9.3/8.9.2) id NAA62890; Fri, 13 Oct 2000 13:30:01 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from vexpert.dbai.tuwien.ac.at (vexpert.dbai.tuwien.ac.at [128.130.111.12]) by hub.freebsd.org (Postfix) with ESMTP id B91C737B66D for ; Fri, 13 Oct 2000 13:27:13 -0700 (PDT) Received: from taygeta.dbai.tuwien.ac.at (taygeta [128.130.111.77]) by vexpert.dbai.tuwien.ac.at (8.9.3/8.9.3) with ESMTP id WAA23801; Fri, 13 Oct 2000 22:27:10 +0200 (MET DST) Received: (from pfeifer@localhost) by taygeta.dbai.tuwien.ac.at (8.9.3/8.9.3) id WAA56675; Fri, 13 Oct 2000 22:27:11 +0200 (CEST) (envelope-from pfeifer) Message-Id: <200010132027.WAA56675@taygeta.dbai.tuwien.ac.at> Date: Fri, 13 Oct 2000 22:27:11 +0200 (CEST) From: pfeifer@dbai.tuwien.ac.at (Gerald Pfeifer) To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.2 Subject: ports/21961: Update the Wine port to 2000.10.02 Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 21961 >Category: ports >Synopsis: Update the Wine port to 2000.10.02 >Confidential: no >Severity: non-critical >Priority: high >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Fri Oct 13 13:30:01 PDT 2000 >Closed-Date: >Last-Modified: >Originator: Gerald Pfeifer >Release: FreeBSD 4.1-RELEASE i386 >Organization: >Environment: Tested on FreeBSD 4.1-RELEASE i386. >Description: This updates the Wine port to 2000.10.02. Thanks a lot to Ulrich Weigand who debugged a problem with the (hacked) version of GCC 2.95.2 that is part of 4-STABLE. Without his support files/patch-ge and thus this update of the port would not exist! This update might also fix existing problems with this port on -CURRENT. >How-To-Repeat: n/a >Fix: Install the patch set below. (I'm the current maintainer of this port.) Index: Makefile =================================================================== RCS file: /sw/FreeBSD/CVSUP/ports/emulators/wine/Makefile,v retrieving revision 1.94 diff -u -3 -p -r1.94 Makefile --- Makefile 2000/10/07 21:56:27 1.94 +++ Makefile 2000/10/13 20:10:13 @@ -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 @@ -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} Index: pkg-plist =================================================================== RCS file: /sw/FreeBSD/CVSUP/ports/emulators/wine/pkg-plist,v retrieving revision 1.13 diff -u -3 -p -r1.13 pkg-plist --- pkg-plist 2000/09/15 15:57:15 1.13 +++ pkg-plist 2000/10/13 20:05:35 @@ -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 --- /dev/null Fri Oct 13 22:10:32 2000 +++ checksum Fri Oct 13 20:48:40 2000 @@ -0,0 +1 @@ +MD5 (Wine-20001002.tar.gz) = 9866f93a735c3df7a470e91d911e04a0 --- /dev/null Fri Oct 13 22:10:32 2000 +++ files/patch-ge Fri Oct 13 20:38:12 2000 @@ -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) $@ >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message