Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 10 Nov 2005 02:05:16 +0300 (MSK)
From:      infofarmer@gmail.com
To:        FreeBSD-gnats-submit@FreeBSD.org
Cc:        gerald@FreeBSD.org
Subject:   ports/88758: update emulators/wine to 0.9.1
Message-ID:  <200511092305.jA9N5GLw029296@proxy.gubkin.ru>
Resent-Message-ID: <200511092310.jA9NAFEi045507@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         88758
>Category:       ports
>Synopsis:       update emulators/wine to 0.9.1
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Nov 09 23:10:15 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Andrew Pantyukhin
>Release:        FreeBSD 6.0-RELEASE i386
>Organization:
>Environment:
System: FreeBSD proxy.gubkin.ru 6.0-RELEASE FreeBSD 6.0-RELEASE #2: Thu Nov 3 19:20:06 MSK 2005 sat@proxy.gubkin.ru:/usr/obj/usr/src/sys/SPG6 i386


	
>Description:
	o Add SHA256
	o Minor fixes
	o Update to 0.9.1:
		* Support for Find function in regedit.
		* Winelib app to eject a CD.
		* Many MSI improvements.
		* Better support for running text-mode apps without X.
		* Improved support for various code obfuscation tools.
		* Lots of bug fixes.
	
>How-To-Repeat:
	
>Fix:

	

--- wine.v0.9.1.diff begins here ---
diff -urN /usr/ports/emulators/wine/Makefile wine/Makefile
--- /usr/ports/emulators/wine/Makefile	Mon Nov  7 01:22:16 2005
+++ wine/Makefile	Thu Nov 10 01:51:30 2005
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	wine
-PORTVERSION=	0.9
+PORTVERSION=	0.9.1
 PORTEPOCH=	1
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
@@ -18,7 +18,6 @@
 
 LIB_DEPENDS=	lcms.1:${PORTSDIR}/graphics/lcms
 
-WRKSRC=		${WRKDIR}/wine-${PORTVERSION}
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS=-I${PREFIX}/include LDFLAGS=-L${PREFIX}/lib LIBS=-Wl,-rpath,${PREFIX}/lib/wine
 INSTALLS_SHLIB=	yes
@@ -32,9 +31,12 @@
 USE_MESA=	yes	# wine/dlls/glut32/ depends on the presence of libglut.
 USE_XPM=	yes
 USE_BZIP2=	yes
+USE_REINPLACE=	yes
 
 .include <bsd.port.pre.mk>
 
+PKGMESSAGE=	${WRKDIR}/pkg-message
+
 .if ${OSVERSION} < 503000
 IGNORE=		fails to work on versions of FreeBSD before 5.3 (due to problems with threading support)
 .endif
@@ -42,7 +44,7 @@
 .if defined(DEBUG)
 STRIP=
 .else
-CFLAGS=	-O2
+CFLAGS+=	-O2
 
 pre-extract:
 	@${ECHO} "DEBUG has not been set, building without debug info."
@@ -51,32 +53,30 @@
 	@${ECHO} "generate a backtrace, please rebuild with DEBUG defined."
 .endif
 
-post-extract:
-	@${SED} -e "s=%%PREFIX%%=${PREFIX}=g" ${FILESDIR}/wine.sh \
-		> ${WRKSRC}/wine.sh
-
-post-configure:
+pre-build:
 	cd ${WRKSRC} && make depend
 
-do-install:
-	cd ${WRKSRC} && ${GMAKE} install
-	-@${MKDIR} ${PREFIX}/etc/rc.d
-	${RM} ${PREFIX}/man/man1/wineg++.1
+post-install:
+	@${INSTALL} -d ${PREFIX}/etc/rc.d
+	${RM} -f ${PREFIX}/man/man1/wineg++.1
 .if !defined(NOPORTDOCS)
-	-@${MKDIR} ${DOCSDIR}
+	@${INSTALL} -d ${DOCSDIR}
 .for i in README ANNOUNCE AUTHORS LICENSE
 	@${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
 .endfor
 .for i in wcmd winedbg
-	${INSTALL_DATA} ${WRKSRC}/programs/${i}/README ${DOCSDIR}/README.${i}
+	@${INSTALL_DATA} ${WRKSRC}/programs/${i}/README ${DOCSDIR}/README.${i}
 .endfor
-	${INSTALL_DATA} ${WRKSRC}/tools/winedump/README ${DOCSDIR}/README.winedump
+	@${INSTALL_DATA} ${WRKSRC}/tools/winedump/README ${DOCSDIR}/README.winedump
 .endif
 	${INSTALL_SCRIPT} ${WRKSRC}/tools/bug_report.pl ${PREFIX}/lib/wine
-	${ECHO}
-	@${SED} s+%%PREFIX%%+${PREFIX}+g <${PKGMESSAGE}
-
-post-install:
-	@${INSTALL_SCRIPT} ${WRKSRC}/wine.sh ${PREFIX}/etc/rc.d/000.wine.sh
+	@${CP} ${FILESDIR}/wine.sh.in ${WRKDIR}/wine.sh
+	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
+			${WRKDIR}/wine.sh
+	@${CP} ${FILESDIR}/pkg-message.in ${PKGMESSAGE}
+	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
+			${PKGMESSAGE}
+	@${CAT} ${PKGMESSAGE}
+	@${INSTALL_SCRIPT} ${WRKDIR}/wine.sh ${PREFIX}/etc/rc.d/000.wine.sh
 
 .include <bsd.port.post.mk>
diff -urN /usr/ports/emulators/wine/distinfo wine/distinfo
--- /usr/ports/emulators/wine/distinfo	Mon Nov  7 01:22:16 2005
+++ wine/distinfo	Wed Nov  9 23:26:32 2005
@@ -1,2 +1,3 @@
-MD5 (wine-0.9.tar.bz2) = 20858ca2bcfc6ae765007c40e5cdd550
-SIZE (wine-0.9.tar.bz2) = 10036834
+MD5 (wine-0.9.1.tar.bz2) = c6453803be17088789ebce61aeefc0d1
+SHA256 (wine-0.9.1.tar.bz2) = 552dce3b7138719dc225a88457afb1f67852a5f0eb307df4907b0096bfb13418
+SIZE (wine-0.9.1.tar.bz2) = 10165557
diff -urN /usr/ports/emulators/wine/files/pkg-message.in wine/files/pkg-message.in
--- /usr/ports/emulators/wine/files/pkg-message.in	Thu Jan  1 03:00:00 1970
+++ wine/files/pkg-message.in	Thu Nov 10 01:51:13 2005
@@ -0,0 +1,6 @@
+
+The port installs some of Wine's doc files which describe additional
+things that are not in the manual pages, see:
+  %%PREFIX%%/share/doc/wine
+Visit http://www.winehq.org/site/documentation for more.
+
diff -urN /usr/ports/emulators/wine/files/wine.sh wine/files/wine.sh
--- /usr/ports/emulators/wine/files/wine.sh	Mon May 19 14:07:37 2003
+++ wine/files/wine.sh	Thu Jan  1 03:00:00 1970
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-case "$1" in
-	start)
-		/sbin/ldconfig -m %%PREFIX%%/lib/wine
-		;;
-	stop)
-		;;
-	*)
-		echo ""
-		echo "Usage: `basename $0` { start | stop }"
-		echo ""
-		exit 64
-		;;
-esac
diff -urN /usr/ports/emulators/wine/files/wine.sh.in wine/files/wine.sh.in
--- /usr/ports/emulators/wine/files/wine.sh.in	Thu Jan  1 03:00:00 1970
+++ wine/files/wine.sh.in	Wed Nov  9 23:24:54 2005
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+case "$1" in
+	start)
+		/sbin/ldconfig -m %%PREFIX%%/lib/wine
+		;;
+	stop)
+		;;
+	*)
+		echo ""
+		echo "Usage: `basename $0` { start | stop }"
+		echo ""
+		exit 64
+		;;
+esac
diff -urN /usr/ports/emulators/wine/pkg-descr wine/pkg-descr
--- /usr/ports/emulators/wine/pkg-descr	Tue Dec 28 15:33:31 2004
+++ wine/pkg-descr	Thu Nov 10 00:49:42 2005
@@ -1,7 +1,7 @@
 Wine is a Microsoft Windows compatibility layer running under Unix-like
 systems on i386 (and compatible) CPUs.
 
-It is still alpha quality, but is definitely making progress. Most
+It is still beta quality, but is definitely making progress. Most
 applications already work, more or less, including several games.
 
 WWW: http://www.winehq.com/
diff -urN /usr/ports/emulators/wine/pkg-message wine/pkg-message
--- /usr/ports/emulators/wine/pkg-message	Tue Dec 28 15:33:31 2004
+++ wine/pkg-message	Thu Jan  1 03:00:00 1970
@@ -1,18 +0,0 @@
-Wine should build on FreeBSD 4.x and FreeBSD 5.x, but versions before
-FreeBSD 5.3 will generally not work properly.
-
-Wine requires a configuration file .wine/config in the home directory of
-every user, where assignments of Unix directories to DOS drive letters and
-other options can be set (see "man wine" for details). You may want to copy
-  %%PREFIX%%/etc/wine.conf
-and tweak it accordingly or edit this file and make .wine/config a symlink   
-there.
-
-The port also installs some of Wine's doc files which describe additional
-things that are not in the manual pages, see:
-  %%PREFIX%%/share/doc/wine
-There are more in the source tree but the others are only useful in
-conjunction with the rest of the source tree, and then you can as well
-look at them there.  (If you just installed this as a package and do not
-know how to use the ports system to have it fetch and extract the source,
-have a look at <http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/ports.html>.)
diff -urN /usr/ports/emulators/wine/pkg-plist wine/pkg-plist
--- /usr/ports/emulators/wine/pkg-plist	Mon Nov  7 01:22:16 2005
+++ wine/pkg-plist	Thu Nov 10 00:41:54 2005
@@ -456,6 +456,7 @@
 lib/wine/dsound.dll.so
 lib/wine/dswave.dll.so
 lib/wine/dxdiagn.dll.so
+lib/wine/eject.exe.so
 lib/wine/expand.exe.so
 lib/wine/gdi.exe.so
 lib/wine/gdi32.dll.so
@@ -682,7 +683,7 @@
 lib/wine/shfolder.dll.so
 lib/wine/shlwapi.dll.so
 lib/wine/snmpapi.dll.so
-lib/wine/sound.dll.so
+lib/wine/sound.drv.so
 lib/wine/start.exe.so
 lib/wine/stdole2.tlb.so
 lib/wine/stdole32.tlb.so
@@ -742,7 +743,6 @@
 lib/wine/wineps.drv.so
 lib/wine/wineps16.drv.so
 lib/wine/winetest.exe.so
-lib/wine/winetty.drv.so
 lib/wine/winevdm.exe.so
 lib/wine/winex11.drv.so
 lib/wine/wing.dll.so
--- wine.v0.9.1.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200511092305.jA9N5GLw029296>