From owner-freebsd-ports Fri Dec 22 19: 0:16 2000 From owner-freebsd-ports@FreeBSD.ORG Fri Dec 22 19:00:02 2000 Return-Path: Delivered-To: freebsd-ports@hub.freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 24DF337B402 for ; Fri, 22 Dec 2000 19:00:02 -0800 (PST) Received: (from gnats@localhost) by freefall.freebsd.org (8.11.1/8.11.1) id eBN302V89903; Fri, 22 Dec 2000 19:00:02 -0800 (PST) (envelope-from gnats) Resent-Date: Fri, 22 Dec 2000 19:00:02 -0800 (PST) Resent-Message-Id: <200012230300.eBN302V89903@freefall.freebsd.org> Resent-From: gnats-admin@FreeBSD.org (GNATS Management) Resent-To: freebsd-ports@FreeBSD.org Resent-Reply-To: gnats-admin@FreeBSD.org, pfeifer@dbai.tuwien.ac.at (Gerald Pfeifer) Received: from vexpert.dbai.tuwien.ac.at (vexpert.dbai.tuwien.ac.at [128.130.111.12]) by hub.freebsd.org (Postfix) with ESMTP id D4F6737B400 for ; Fri, 22 Dec 2000 18:51:38 -0800 (PST) Received: from deneb.dbai.tuwien.ac.at (deneb [128.130.111.2]) by vexpert.dbai.tuwien.ac.at (8.11.1/8.11.1) with ESMTP id eBN2pZp15451; Sat, 23 Dec 2000 03:51:35 +0100 (MET) Received: (from pfeifer@localhost) by deneb.dbai.tuwien.ac.at (8.11.1/8.11.1) id eBN2pYI53103; Sat, 23 Dec 2000 03:51:34 +0100 (CET) (envelope-from pfeifer) Message-Id: <200012230251.eBN2pYI53103@deneb.dbai.tuwien.ac.at> Date: Sat, 23 Dec 2000 03:51:34 +0100 (CET) From: pfeifer@dbai.tuwien.ac.at (Gerald Pfeifer) To: FreeBSD-gnats-submit@freebsd.org Cc: pfeifer@dbai.tuwien.ac.at X-Send-Pr-Version: 3.2 Subject: ports/23786: Update the Wine port to 2000-12-02 (by maintainer) Resent-Sender: gnats@FreeBSD.org Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 23786 >Category: ports >Synopsis: Update the Wine port to 2000-12-02 (by maintainer) >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Fri Dec 22 19:00:01 PST 2000 >Closed-Date: >Last-Modified: >Originator: Gerald Pfeifer >Release: FreeBSD 4.2-RELEASE i386 >Organization: >Environment: n/a >Description: This updates the Wine port to the 2000-12-12 snapshot. Unfortunately we now required GNU make, but it's not trivial to change that. Approved by myself qua maintainer. >How-To-Repeat: Install the patch below, which will also create a new port-specific patch file files/patch-gf. Remove /files/patch-gd. >Fix: Index: Makefile =================================================================== RCS file: /sw/FreeBSD/CVSUP/ports/emulators/wine/Makefile,v retrieving revision 1.98 diff -u -3 -p -r1.98 Makefile --- Makefile 2000/12/21 10:24:59 1.98 +++ Makefile 2000/12/23 01:51:49 @@ -7,7 +7,7 @@ # PORTNAME= wine -PORTVERSION= 2000.10.26 +PORTVERSION= 2000.12.02 CATEGORIES= emulators MASTER_SITES= ${MASTER_SITE_SUNSITE} MASTER_SITE_SUBDIR= ALPHA/wine/development @@ -26,6 +26,7 @@ MAN5= wine.conf.5 ONLY_FOR_ARCHS= i386 USE_XPM= yes USE_MESA= yes +USE_GMAKE= yes .if !defined(NDEBUG) STRIP= @@ -44,10 +45,10 @@ pre-extract: .endif post-patch: +.for D in . library unicode @${PERL} -pi.sofix -e 's/SOVERSION = 1.0/SOVERSION = 1/g' \ - ${WRKSRC}/Makefile.in - @${PERL} -pi.sofix -e 's/SOVERSION = 1.0/SOVERSION = 1/g' \ - ${WRKSRC}/unicode/Makefile.in + ${WRKSRC}/${D}/Makefile.in +.endfor .for D in advapi32 avifil32 comctl32 commdlg crtdll dciman32 ddraw dinput dplay dplayx dsound gdi icmp imagehlp imm32 kernel lzexpand mpr msacm msnet32 msvideo odbc32 ole32 oleaut32 olecli oledlg olepro32 olesvr opengl32 psapi rasapi32 richedit rpcrt4 serialui setupapi shell32 shfolder shlwapi tapi32 ttydrv urlmon user version win32s winaspi wineps wininet winmm winmm/joystick winmm/mcianim winmm/mciavi winmm/mcicda winmm/mciseq winmm/mciwave winmm/midimap winmm/wavemap winmm/wineoss winsock winspool wow32 wsock32 x11drv @${PERL} -pi.sofix -e 's/SOVERSION = 1.0/SOVERSION = 1/g' \ ${WRKSRC}/dlls/${D}/Makefile.in @@ -57,11 +58,11 @@ post-configure: cd ${WRKSRC} && make depend post-build: - cd ${WRKSRC}/programs/regapi && ${MAKE} + cd ${WRKSRC}/programs/regapi && ${GMAKE} ${SED} '1s/bash/sh/;s-\./\(reg.*\.pl\)-'${PREFIX}/lib/wine/reg/'\1-' <${WRKSRC}/programs/regapi/regSet.sh >${WRKDIR}/regSet.sh do-install: - cd ${WRKSRC} && ${MAKE} install + cd ${WRKSRC} && ${GMAKE} install ${INSTALL_SCRIPT} ${WRKDIR}/regSet.sh ${PREFIX}/bin ${INSTALL_DATA} ${WRKSRC}/wine.ini ${PREFIX}/etc/wine.conf.sample [ -f ${PREFIX}/etc/wine.conf ] \ Index: distinfo =================================================================== RCS file: /sw/FreeBSD/CVSUP/ports/emulators/wine/distinfo,v retrieving revision 1.55 diff -u -3 -p -r1.55 distinfo --- distinfo 2000/11/02 15:05:14 1.55 +++ distinfo 2000/12/09 15:36:00 @@ -1 +1 @@ -MD5 (Wine-20001026.tar.gz) = 933381f05b75ace29931b04e27e6432b +MD5 (Wine-20001202.tar.gz) = 22b4ecd23fc8ac3196eeb97e3a43b7df Index: pkg-plist =================================================================== RCS file: /sw/FreeBSD/CVSUP/ports/emulators/wine/pkg-plist,v retrieving revision 1.16 diff -u -3 -p -r1.16 pkg-plist --- pkg-plist 2000/12/21 10:24:59 1.16 +++ pkg-plist 2000/12/23 02:31:24 @@ -13,6 +13,7 @@ etc/wine.conf.sample include/wine/basetsd.h include/wine/cderr.h include/wine/cguid.h +include/wine/comcat.h include/wine/commctrl.h include/wine/commdlg.h include/wine/compobj.h @@ -65,7 +66,11 @@ include/wine/ras.h include/wine/regstr.h include/wine/richedit.h include/wine/rpc.h +include/wine/rpcdce.h +include/wine/rpcdcep.h +include/wine/rpcndr.h include/wine/servprov.h +include/wine/setupapi.h include/wine/shellapi.h include/wine/shlguid.h include/wine/shlobj.h @@ -108,6 +113,7 @@ include/wine/zmouse.h include/wine/wine/exception.h include/wine/wine/icmpapi.h include/wine/wine/ipexport.h +include/wine/wine/library.h include/wine/wine/obj_base.h include/wine/wine/obj_cache.h include/wine/wine/obj_channel.h @@ -157,80 +163,51 @@ lib/wine/documentation/psdrv.reg lib/wine/documentation/README.debugger lib/wine/documentation/README.regapi lib/wine/libadvapi32.so -lib/wine/libadvapi32.so.1 lib/wine/libavifil32.so -lib/wine/libavifil32.so.1 lib/wine/libavifile.so lib/wine/libcomctl32.so -lib/wine/libcomctl32.so.1 lib/wine/libcomdlg32.so -lib/wine/libcomdlg32.so.1 lib/wine/libcomm.so lib/wine/libcommdlg.so lib/wine/libcompobj.so lib/wine/libcrtdll.so -lib/wine/libcrtdll.so.1 lib/wine/libdciman32.so -lib/wine/libdciman32.so.1 lib/wine/libddeml.so lib/wine/libddraw.so -lib/wine/libddraw.so.1 lib/wine/libdinput.so -lib/wine/libdinput.so.1 lib/wine/libdispdib.so lib/wine/libdisplay.so lib/wine/libdplay.so -lib/wine/libdplay.so.1 lib/wine/libdplayx.so -lib/wine/libdplayx.so.1 lib/wine/libdsound.so -lib/wine/libdsound.so.1 lib/wine/libgdi.so lib/wine/libgdi32.so -lib/wine/libgdi32.so.1 lib/wine/libicmp.so -lib/wine/libicmp.so.1 lib/wine/libimagehlp.so -lib/wine/libimagehlp.so.1 lib/wine/libimm32.so -lib/wine/libimm32.so.1 lib/wine/libjoystick.drv.so -lib/wine/libjoystick.drv.so.1 lib/wine/libkernel.so lib/wine/libkernel32.so -lib/wine/libkernel32.so.1 lib/wine/libkeyboard.so lib/wine/liblz32.so -lib/wine/liblz32.so.1 lib/wine/liblzexpand.so lib/wine/libmcianim.drv.so -lib/wine/libmcianim.drv.so.1 lib/wine/libmciavi.drv.so -lib/wine/libmciavi.drv.so.1 lib/wine/libmcicda.drv.so -lib/wine/libmcicda.drv.so.1 lib/wine/libmciseq.drv.so -lib/wine/libmciseq.drv.so.1 lib/wine/libmciwave.drv.so -lib/wine/libmciwave.drv.so.1 lib/wine/libmidimap.drv.so -lib/wine/libmidimap.drv.so.1 lib/wine/libmmsystem.so lib/wine/libmouse.so lib/wine/libmpr.so -lib/wine/libmpr.so.1 lib/wine/libmsacm.drv.so -lib/wine/libmsacm.drv.so.1 lib/wine/libmsacm.so lib/wine/libmsacm32.so -lib/wine/libmsacm32.so.1 lib/wine/libmsnet32.so -lib/wine/libmsnet32.so.1 lib/wine/libmsvfw32.so -lib/wine/libmsvfw32.so.1 lib/wine/libmsvideo.so +lib/wine/libntdll.so lib/wine/libodbc32.so -lib/wine/libodbc32.so.1 lib/wine/libole2.so lib/wine/libole2conv.so lib/wine/libole2disp.so @@ -238,93 +215,62 @@ lib/wine/libole2nls.so lib/wine/libole2prox.so lib/wine/libole2thk.so lib/wine/libole32.so -lib/wine/libole32.so.1 lib/wine/liboleaut32.so -lib/wine/liboleaut32.so.1 lib/wine/libolecli.so lib/wine/libolecli32.so -lib/wine/libolecli32.so.1 lib/wine/liboledlg.so -lib/wine/liboledlg.so.1 lib/wine/libolepro32.so -lib/wine/libolepro32.so.1 lib/wine/libolesvr.so lib/wine/libolesvr32.so -lib/wine/libolesvr32.so.1 lib/wine/libpsapi.so -lib/wine/libpsapi.so.1 lib/wine/librasapi16.so lib/wine/librasapi32.so -lib/wine/librasapi32.so.1 lib/wine/libriched32.so -lib/wine/libriched32.so.1 lib/wine/librpcrt4.so -lib/wine/librpcrt4.so.1 lib/wine/libserialui.so -lib/wine/libserialui.so.1 lib/wine/libsetupapi.so -lib/wine/libsetupapi.so.1 lib/wine/libsetupx.so lib/wine/libshell.so lib/wine/libshell32.so -lib/wine/libshell32.so.1 lib/wine/libshfolder.so -lib/wine/libshfolder.so.1 lib/wine/libshlwapi.so -lib/wine/libshlwapi.so.1 lib/wine/libsound.so lib/wine/libstorage.so lib/wine/libstress.so lib/wine/libsystem.so lib/wine/libtapi32.so -lib/wine/libtapi32.so.1 lib/wine/libtoolhelp.so lib/wine/libttydrv.so -lib/wine/libttydrv.so.1 lib/wine/libtypelib.so lib/wine/liburlmon.so -lib/wine/liburlmon.so.1 lib/wine/libuser.so lib/wine/libuser32.so -lib/wine/libuser32.so.1 lib/wine/libver.so lib/wine/libversion.so -lib/wine/libversion.so.1 lib/wine/libw32skrnl.so -lib/wine/libw32skrnl.so.1 lib/wine/libw32sys.so lib/wine/libwin32s16.so lib/wine/libwin87em.so lib/wine/libwinaspi.so lib/wine/libwindebug.so +lib/wine/libwine.so lib/wine/libwine.so.1 +lib/wine/libwine_unicode.so +lib/wine/libwine_unicode.so.1 lib/wine/libwineoss.drv.so -lib/wine/libwineoss.drv.so.1 lib/wine/libwineps.so -lib/wine/libwineps.so.1 lib/wine/libwineps16.so lib/wine/libwing.so lib/wine/libwininet.so -lib/wine/libwininet.so.1 lib/wine/libwinmm.so -lib/wine/libwinmm.so.1 lib/wine/libwinsock.so lib/wine/libws2_32.so -lib/wine/libws2_32.so.1 -lib/wine/libwine.so -lib/wine/libwine_unicode.so -lib/wine/libwine_unicode.so.1 lib/wine/libwinspool.drv.so -lib/wine/libwinspool.drv.so.1 lib/wine/libwnaspi32.so -lib/wine/libwnaspi32.so.1 lib/wine/libwow32.so -lib/wine/libwow32.so.1 lib/wine/libwprocs.so lib/wine/libwsock32.so -lib/wine/libwsock32.so.1 lib/wine/libx11drv.so -lib/wine/libx11drv.so.1 @dirrm include/wine/wine @dirrm include/wine @dirrm lib/wine/reg Index: files/patch-ge =================================================================== RCS file: /sw/FreeBSD/CVSUP/ports/emulators/wine/files/patch-ge,v retrieving revision 1.1 diff -u -3 -p -r1.1 patch-ge --- files/patch-ge 2000/10/15 07:32:44 1.1 +++ files/patch-ge 2000/12/09 17:15:46 @@ -1,24 +1,19 @@ -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 +*** dlls/Makedll.rules.in 2000/12/06 00:05:14 1.12 +--- dlls/Makedll.rules.in 2000/12/09 16:39:55 *************** 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) + lib$(MODULE).so: $(ALL_OBJS) Makefile.in +! $(LDSHARED) $(LDDLLFLAGS) $(ALL_OBJS) -o $@ -L$(DLLDIR) $(IMPORTS:%=-l%) $(ALL_LIBS) - $(ALLNAMES): lib$(MODULE).so.$(SOVERSION) - $(RM) $@ && $(LN_S) lib$(MODULE).so.$(SOVERSION) $@ + $(ALTNAMES:%=lib%.$(LIBEXT)): lib$(MODULE).$(LIBEXT) + $(RM) $@ && $(LN_S) lib$(MODULE).$(LIBEXT) $@ --- 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 + lib$(MODULE).so: $(ALL_OBJS) Makefile.in +! $(LDSHARED) $(LDDLLFLAGS) $(ALL_OBJS) -o $@ -L$(DLLDIR) $(IMPORTS:%=-l%) $(ALL_LIBS) -lgcc_pic - $(ALLNAMES): lib$(MODULE).so.$(SOVERSION) - $(RM) $@ && $(LN_S) lib$(MODULE).so.$(SOVERSION) $@ + $(ALTNAMES:%=lib%.$(LIBEXT)): lib$(MODULE).$(LIBEXT) + $(RM) $@ && $(LN_S) lib$(MODULE).$(LIBEXT) $@ --- /dev/null Sat Dec 23 03:44:22 2000 +++ files/patch-gf Tue Dec 12 20:03:02 2000 @@ -0,0 +1,11 @@ +--- include/winsock2.h 2000/09/26 22:20:50 1.5 ++++ include/winsock2.h 2000/11/29 21:00:17 +@@ -7,6 +7,7 @@ + #ifndef __WINSOCK2API__ + #define __WINSOCK2API__ + ++#include "config.h" + #include "winsock.h" + + /* proper 4-byte packing */ + >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message