Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 23 Nov 2005 04:15:12 +0300 (MSK)
From:      infofarmer@gmail.com
To:        FreeBSD-gnats-submit@FreeBSD.org
Cc:        gerald@pfeifer.com
Subject:   ports/89442: update emulators/wine to 0.9.2
Message-ID:  <200511230115.jAN1FCvK004750@proxy.gubkin.ru>
Resent-Message-ID: <200511230120.jAN1KEBB040892@freefall.freebsd.org>

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

>Number:         89442
>Category:       ports
>Synopsis:       update emulators/wine to 0.9.2
>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 23 01:20:14 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 Update to 0.9.2
	o Add MASTER_SITES to let sf.net take time and redistribute
	o Leverage SUB_FILES instead of literal SED
	o Remove make depend stage, ports don't really need it
	o Add SHA256
	
>How-To-Repeat:
	
>Fix:

	
	Gerald, note that I diffed it against the old (not
today's) version.
	

--- wine092.diff begins here ---
diff -urN /usr/ports/emulators/wine/Makefile wine/Makefile
--- /usr/ports/emulators/wine/Makefile	Tue Nov 15 03:27:48 2005
+++ wine/Makefile	Wed Nov 23 04:06:54 2005
@@ -7,10 +7,12 @@
 #
 
 PORTNAME=	wine
-PORTVERSION=	0.9.1
+PORTVERSION=	0.9.2
 PORTEPOCH=	1
 CATEGORIES=	emulators
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED} \
+		http://ibiblio.org/pub/linux/system/emulators/wine/ \
+		http://prdownloads.sourceforge.net/wine/
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	gerald@FreeBSD.org
@@ -32,19 +34,15 @@
 USE_MESA=	yes	# wine/dlls/glut32/ depends on the presence of libglut.
 USE_XPM=	yes
 
+SUB_FILES=	pkg-message wine.sh
+PKGMESSAGE=	${WRKDIR}/pkg-message
+
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 503000
 IGNORE=		fails to work on versions of FreeBSD before 5.3 (due to problems with threading support)
 .endif
 
-post-extract:
-	@${SED} -e "s=%%PREFIX%%=${PREFIX}=g" ${FILESDIR}/wine.sh \
-		> ${WRKSRC}/wine.sh
-
-pre-build:
-	cd ${WRKSRC} && make depend
-
 post-install:
 	-@${MKDIR} ${PREFIX}/etc/rc.d
 	${RM} ${PREFIX}/man/man1/wineg++.1
@@ -59,8 +57,7 @@
 	${INSTALL_DATA} ${WRKSRC}/tools/winedump/README ${DOCSDIR}/README.winedump
 .endif
 	@${INSTALL_SCRIPT} ${WRKSRC}/tools/bug_report.pl ${PREFIX}/lib/wine
-	@${INSTALL_SCRIPT} ${WRKSRC}/wine.sh ${PREFIX}/etc/rc.d/000.wine.sh
-	${ECHO}
-	@${SED} s+%%PREFIX%%+${PREFIX}+g <${PKGMESSAGE}
+	@${INSTALL_SCRIPT} ${WRKDIR}/wine.sh ${PREFIX}/etc/rc.d/000.wine.sh
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff -urN /usr/ports/emulators/wine/distinfo wine/distinfo
--- /usr/ports/emulators/wine/distinfo	Thu Nov 10 18:29:12 2005
+++ wine/distinfo	Wed Nov 23 00:04:09 2005
@@ -1,2 +1,3 @@
-MD5 (wine-0.9.1.tar.bz2) = c6453803be17088789ebce61aeefc0d1
-SIZE (wine-0.9.1.tar.bz2) = 10165557
+MD5 (wine-0.9.2.tar.bz2) = cda71fc261e415250ea01f2016d1db24
+SHA256 (wine-0.9.2.tar.bz2) = f3b5c9a4d9a68aca89fdf36a83c97710079d3f6ebb2883c8bb6a13a7e382d336
+SIZE (wine-0.9.2.tar.bz2) = 10301088
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	Wed Nov 23 00:02:07 2005
@@ -0,0 +1,11 @@
+Wine should build on FreeBSD 4.x and FreeBSD 5.x, but versions before
+FreeBSD 5.3 will generally not work properly.
+
+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/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 23 00:02:07 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-message wine/pkg-message
--- /usr/ports/emulators/wine/pkg-message	Tue Nov 15 03:27:48 2005
+++ wine/pkg-message	Thu Jan  1 03:00:00 1970
@@ -1,11 +0,0 @@
-Wine should build on FreeBSD 4.x and FreeBSD 5.x, but versions before
-FreeBSD 5.3 will generally not work properly.
-
-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	Wed Nov 16 01:54:52 2005
+++ wine/pkg-plist	Wed Nov 23 00:34:01 2005
@@ -458,6 +458,7 @@
 lib/wine/dxdiagn.dll.so
 lib/wine/eject.exe.so
 lib/wine/expand.exe.so
+lib/wine/explorer.exe.so
 lib/wine/gdi.exe.so
 lib/wine/gdi32.dll.so
 lib/wine/glu32.dll.so
--- wine092.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?200511230115.jAN1FCvK004750>