Date: Mon, 11 Sep 2000 02:22:53 +0200 (CEST) From: Gerald Pfeifer <pfeifer@dbai.tuwien.ac.at> To: alex@freebsd.org Cc: freebsd-ports@freebsd.org Subject: Re: ports/20951: Upgrade Wine port to 2000.08.21 Message-ID: <Pine.BSF.4.21.0009102339520.52680-100000@deneb.dbai.tuwien.ac.at> In-Reply-To: <200009091135.EAA57801@freefall.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Sat, 9 Sep 2000 alex@freebsd.org wrote:
> [many, many more of these lines]
> messages/winerr_enu.rc:2284:1: Warning: Newline in string constant encounterd (started line 2195)
> messages/winerr_enu.rc:2285:1: Warning: Newline in string constant encounterd (started line 2195)
> messages/winerr_enu.rc:2286:1: Warning: Newline in string constant encounterd (started line 2195)
> messages/winerr_enu.rc:2287:1: Warning: Newline in string constant encounterd (started line 2195)
> ./kernel.rc:4:1: Error: Unexpected end of file during preprocessing
> *** Error code 1
> [...]
> What can I do against this?
Hmm... Which version of FreeBSD are you using? And which version of GCC?
What is the output of `gcc -v`?
I just tried again and had no problem whatsoever on a FreeBSD 4.1-RELEASE
box. If you are running 5-CURRENT, well, that's alpha-level application
software (Wine) on an alpha-level operating system with an alpha-level
compiler. :-/
Please find below a patch updated for the latest version of Wine. Perhaps
this solves your problem, but even if it does not, I recommend installing
it (see above).
Gerald
Index: Makefile
===================================================================
RCS file: /sw/FreeBSD/CVSUP/ports/emulators/wine/Makefile,v
retrieving revision 1.92
diff -u -3 -p -r1.92 Makefile
--- Makefile 2000/08/24 08:17:24 1.92
+++ Makefile 2000/09/10 22:03:11
@@ -7,7 +7,7 @@
#
PORTNAME= wine
-PORTVERSION= 2000.08.01
+PORTVERSION= 2000.09.09
CATEGORIES= emulators
MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= ALPHA/wine/development
@@ -60,8 +60,6 @@ post-configure:
post-build:
cd ${WRKSRC}/programs/regapi && ${MAKE}
${SED} '1s/bash/sh/;s-\./\(reg.*\.pl\)-'${PREFIX}/lib/wine/reg/'\1-' <${WRKSRC}/programs/regapi/regSet.sh >${WRKDIR}/regSet.sh
- ${SED} 's-\(Change directory to \)<dirs to wine>/tools$$-\1your program'"'"'s dir (or wherever you need to be to run it)-;s-\./\(bug_report\.pl\)-'${PREFIX}/lib/wine/'\1-' <${WRKSRC}/documentation/bugreports >${WRKDIR}/bugreports
- ${SED} 's-\(look at the file \)<dirs to wine>/wine.ini-\1'${PREFIX}/etc/wine.conf.sample- <${WRKSRC}/documentation/config >${WRKDIR}/config
do-install:
cd ${WRKSRC} && ${MAKE} install
@@ -72,22 +70,13 @@ do-install:
${INSTALL_DATA} ${WRKSRC}/documentation/wine.man ${PREFIX}/man/man1/wine.1
${INSTALL_DATA} ${WRKSRC}/documentation/wine.conf.man ${PREFIX}/man/man5/wine.conf.5
-@${MKDIR} ${PREFIX}/lib/wine/documentation ${PREFIX}/lib/wine/reg 2>/dev/null
- ${INSTALL_DATA} ${WRKDIR}/bugreports ${WRKDIR}/config \
+ ${INSTALL_DATA} \
${WRKSRC}/README \
${WRKSRC}/ANNOUNCE \
${WRKSRC}/AUTHORS \
${WRKSRC}/LICENSE \
${WRKSRC}/WARRANTY \
- ${WRKSRC}/documentation/cdrom-labels \
- ${WRKSRC}/documentation/debugging \
- ${WRKSRC}/documentation/dlls \
- ${WRKSRC}/documentation/fonts \
- ${WRKSRC}/documentation/ioport-trace-hints \
- ${WRKSRC}/documentation/no-windows \
- ${WRKSRC}/documentation/printing \
- ${WRKSRC}/documentation/psdriver \
${WRKSRC}/documentation/psdrv.reg \
- ${WRKSRC}/documentation/ttfserver \
${PREFIX}/lib/wine/documentation
${INSTALL_DATA} ${WRKSRC}/debugger/README \
${PREFIX}/lib/wine/documentation/README.debugger
Index: files/md5
===================================================================
RCS file: /sw/FreeBSD/CVSUP/ports/emulators/wine/files/md5,v
retrieving revision 1.52
diff -u -3 -p -r1.52 md5
--- files/md5 2000/08/19 16:49:20 1.52
+++ files/md5 2000/09/10 22:05:39
@@ -1 +1 @@
-MD5 (Wine-20000801.tar.gz) = 70c70a580b0a9ce072759629b87af4d4
+MD5 (Wine-20000909.tar.gz) = 1b90e357a119aa56cd27a74c23a4d6cf
Index: patches/patch-gd
===================================================================
RCS file: /sw/FreeBSD/CVSUP/ports/emulators/wine/patches/patch-gd,v
retrieving revision 1.1
diff -u -3 -p -r1.1 patch-gd
--- patches/patch-gd 2000/06/19 12:12:12 1.1
+++ patches/patch-gd 2000/08/22 21:13:44
@@ -1,11 +1,3 @@
---- include/ttydrv.h~ Thu Mar 30 21:26:44 2000
-+++ include/ttydrv.h Sat Jun 17 00:03:21 2000
-@@ -11,4 +11,5 @@
- #ifdef HAVE_NCURSES_H
- # include <ncurses.h>
-+# undef trace
- #elif defined(HAVE_CURSES_H)
- # include <curses.h>
--- console/ncurses.c~ Sat Jun 17 01:39:59 2000
+++ console/ncurses.c Sat Jun 17 01:34:56 2000
@@ -30,4 +30,5 @@
Index: pkg/MESSAGE
===================================================================
RCS file: /sw/FreeBSD/CVSUP/ports/emulators/wine/pkg/MESSAGE,v
retrieving revision 1.3
diff -u -3 -p -r1.3 MESSAGE
--- pkg/MESSAGE 2000/08/24 08:17:24 1.3
+++ pkg/MESSAGE 2000/08/30 19:03:45
@@ -10,6 +10,4 @@ but the others are only useful in conjun
source tree, and then you can as well look at them there. (If you
just installed this as a package and don't know how to use the ports
system to have it fetch and extract the source for you have a look at
-http://www.freebsd.org/handbook/ports.html . In short:
-cd /usr/ports/emulators/wine && make configure )
-
+<http://www.freebsd.org/handbook/ports.html>.)
Index: pkg/PLIST
===================================================================
RCS file: /sw/FreeBSD/CVSUP/ports/emulators/wine/pkg/PLIST,v
retrieving revision 1.12
diff -u -3 -p -r1.12 PLIST
--- pkg/PLIST 2000/08/24 08:17:24 1.12
+++ pkg/PLIST 2000/09/10 23:18:36
@@ -5,10 +5,139 @@ bin/winedbg
bin/wineserver
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/dde.h
+include/wine/ddeml.h
+include/wine/ddraw.h
+include/wine/digitalv.h
+include/wine/dinput.h
+include/wine/dispdib.h
+include/wine/dlgs.h
+include/wine/docobj.h
+include/wine/dplay.h
+include/wine/dplobby.h
+include/wine/dsound.h
+include/wine/guiddef.h
+include/wine/imagehlp.h
+include/wine/imm.h
+include/wine/initguid.h
+include/wine/instance.h
+include/wine/lmcons.h
+include/wine/lzexpand.h
+include/wine/mapidefs.h
+include/wine/mmreg.h
+include/wine/mmsystem.h
+include/wine/msacm.h
+include/wine/ntsecapi.h
+include/wine/oaidl.h
+include/wine/objbase.h
+include/wine/objidl.h
+include/wine/ocidl.h
+include/wine/ole2.h
+include/wine/ole2ver.h
+include/wine/oleauto.h
+include/wine/olectl.h
+include/wine/oledlg.h
+include/wine/oleidl.h
+include/wine/poppack.h
+include/wine/prsht.h
+include/wine/psapi.h
+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
+include/wine/rpc.h
+include/wine/servprov.h
+include/wine/shellapi.h
+include/wine/shlguid.h
+include/wine/shlobj.h
+include/wine/shlwapi.h
+include/wine/sql.h
+include/wine/sqlext.h
+include/wine/sqltypes.h
+include/wine/storage.h
+include/wine/tapi.h
+include/wine/tlhelp32.h
+include/wine/unknwn.h
+include/wine/urlmon.h
+include/wine/ver.h
+include/wine/vfw.h
+include/wine/winbase.h
+include/wine/wincon.h
+include/wine/wincrypt.h
include/wine/windef.h
include/wine/windows.h
+include/wine/windowsx.h
+include/wine/winerror.h
include/wine/wingdi.h
+include/wine/wininet.h
+include/wine/winioctl.h
+include/wine/winnetwk.h
+include/wine/winnls.h
+include/wine/winnt.h
+include/wine/winreg.h
+include/wine/winresrc.h
+include/wine/winsock.h
+include/wine/winsock2.h
+include/wine/winspool.h
+include/wine/winsvc.h
include/wine/winuser.h
+include/wine/winver.h
+include/wine/wownt32.h
+include/wine/wtypes.h
+include/wine/wine/exception.h
+include/wine/wine/icmpapi.h
+include/wine/wine/ipexport.h
+include/wine/wine/obj_base.h
+include/wine/wine/obj_cache.h
+include/wine/wine/obj_channel.h
+include/wine/wine/obj_clientserver.h
+include/wine/wine/obj_commdlgbrowser.h
+include/wine/wine/obj_connection.h
+include/wine/wine/obj_contextmenu.h
+include/wine/wine/obj_control.h
+include/wine/wine/obj_dataobject.h
+include/wine/wine/obj_dockingwindowframe.h
+include/wine/wine/obj_dragdrop.h
+include/wine/wine/obj_enumidlist.h
+include/wine/wine/obj_errorinfo.h
+include/wine/wine/obj_extracticon.h
+include/wine/wine/obj_inplace.h
+include/wine/wine/obj_marshal.h
+include/wine/wine/obj_misc.h
+include/wine/wine/obj_moniker.h
+include/wine/wine/obj_oleaut.h
+include/wine/wine/obj_olefont.h
+include/wine/wine/obj_oleobj.h
+include/wine/wine/obj_oleundo.h
+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_shellbrowser.h
+include/wine/wine/obj_shellextinit.h
+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
@@ -20,18 +149,7 @@ lib/wine/documentation/AUTHORS
lib/wine/documentation/LICENSE
lib/wine/documentation/WARRANTY
lib/wine/documentation/README
-lib/wine/documentation/bugreports
-lib/wine/documentation/cdrom-labels
-lib/wine/documentation/config
-lib/wine/documentation/debugging
-lib/wine/documentation/dlls
-lib/wine/documentation/fonts
-lib/wine/documentation/ioport-trace-hints
-lib/wine/documentation/no-windows
-lib/wine/documentation/printing
-lib/wine/documentation/psdriver
lib/wine/documentation/psdrv.reg
-lib/wine/documentation/ttfserver
lib/wine/documentation/README.debugger
lib/wine/documentation/README.regapi
lib/wine/libadvapi32.so
@@ -203,6 +321,7 @@ 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
@dirrm lib/wine/documentation
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?Pine.BSF.4.21.0009102339520.52680-100000>