From sat@proxy.gubkin.ru  Fri Nov  4 16:39:36 2005
Return-Path: <sat@proxy.gubkin.ru>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 1A42516A424
	for <FreeBSD-gnats-submit@freebsd.org>; Fri,  4 Nov 2005 16:39:36 +0000 (GMT)
	(envelope-from sat@proxy.gubkin.ru)
Received: from proxy.gubkin.ru (proxy.gubkin.ru [193.233.78.245])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 8348E43D45
	for <FreeBSD-gnats-submit@freebsd.org>; Fri,  4 Nov 2005 16:39:35 +0000 (GMT)
	(envelope-from sat@proxy.gubkin.ru)
Received: from proxy.gubkin.ru (localhost [127.0.0.1])
	by proxy.gubkin.ru (8.13.4/8.13.4) with ESMTP id jA4GdUKb028545
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 4 Nov 2005 19:39:30 +0300 (MSK)
	(envelope-from sat@proxy.gubkin.ru)
Received: (from sat@localhost)
	by proxy.gubkin.ru (8.13.4/8.13.3/Submit) id jA4GdULH028544;
	Fri, 4 Nov 2005 19:39:30 +0300 (MSK)
	(envelope-from sat)
Message-Id: <200511041639.jA4GdULH028544@proxy.gubkin.ru>
Date: Fri, 4 Nov 2005 19:39:30 +0300 (MSK)
From: Andrew Pantyukhin <sat@proxy.gubkin.ru>
Reply-To: infofarmer@gmail.com
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: update emulators/wine to 0.9,1
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         88492
>Category:       ports
>Synopsis:       update emulators/wine to 0.9,1
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    gerald
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Nov 04 16:40:16 GMT 2005
>Closed-Date:    Sun Nov 06 22:22:39 GMT 2005
>Last-Modified:  Sun Nov 06 22:22:39 GMT 2005
>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:
	- Update 0.9
	- Fetch from sourceforge
	
>How-To-Repeat:
	
>Fix:

	
	Tried to test it for a couple of days, seems to be okay.
Frankly, I'm surprised that it took so long (0.9 was released
on October 28), but it might be that I missed something, so be
kind :-)

	We don't need the Makefile.in patch anymore. As for
the makedep.c, I had no time to check into it. Everything I
need works fine without it.

--- wine.diff begins here ---
diff -urN /usr/ports/emulators/wine/Makefile wine/Makefile
--- /usr/ports/emulators/wine/Makefile	Mon Oct  3 22:51:14 2005
+++ wine/Makefile	Fri Nov  4 19:26:05 2005
@@ -7,11 +7,11 @@
 #
 
 PORTNAME=	wine
-PORTVERSION=	20050930
+PORTVERSION=	0.9
+PORTEPOCH=	1
 CATEGORIES=	emulators
-MASTER_SITES=	${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR=	ALPHA/wine/development
-DISTNAME=	Wine-${PORTVERSION}
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	gerald@FreeBSD.org
 COMMENT=	Microsoft Windows compatibility layer for Unix-like systems
@@ -31,6 +31,7 @@
 USE_GL=		yes
 USE_MESA=	yes	# wine/dlls/glut32/ depends on the presence of libglut.
 USE_XPM=	yes
+USE_BZIP2=	yes
 
 .include <bsd.port.pre.mk>
 
diff -urN /usr/ports/emulators/wine/distinfo wine/distinfo
--- /usr/ports/emulators/wine/distinfo	Mon Oct  3 22:51:14 2005
+++ wine/distinfo	Fri Nov  4 12:19:18 2005
@@ -1,2 +1,2 @@
-MD5 (Wine-20050930.tar.gz) = b8cb96e2cb2c89daeba415c734ae4218
-SIZE (Wine-20050930.tar.gz) = 12838537
+MD5 (wine-0.9.tar.bz2) = 20858ca2bcfc6ae765007c40e5cdd550
+SIZE (wine-0.9.tar.bz2) = 10036834
diff -urN /usr/ports/emulators/wine/files/patch-gb wine/files/patch-gb
--- /usr/ports/emulators/wine/files/patch-gb	Mon Apr 14 11:23:24 2003
+++ wine/files/patch-gb	Thu Jan  1 03:00:00 1970
@@ -1,12 +0,0 @@
---- Makefile.in.orig	Wed Apr  9 08:10:49 2003
-+++ Makefile.in	Wed Apr  9 08:14:06 2003
-@@ -82,8 +82,7 @@
- install-dev:: $(INSTALLDEVSUBDIRS:%=%/__install__) $(INSTALLBOTHSUBDIRS:%=%/__install-dev__) install-aclocal
- 
- install:: install-lib install-dev install-aclocal
--	-$(LDCONFIG)
--	@if test -n "`LANG=C $(LDD) $(bindir)/wine|grep not.found`";	\
-+	@if false ; \
- 	then								\
- 		echo "*************************************************" ; \
- 		echo "*************************************************" ; \
diff -urN /usr/ports/emulators/wine/files/patch-tools wine/files/patch-tools
--- /usr/ports/emulators/wine/files/patch-tools	Tue Feb 24 01:39:44 2004
+++ wine/files/patch-tools	Thu Jan  1 03:00:00 1970
@@ -1,27 +0,0 @@
-Index: tools/makedep.c
-===================================================================
-RCS file: /home/wine/wine/tools/makedep.c,v
-retrieving revision 1.17
-diff -u -3 -p -r1.17 makedep.c
---- makedep.c	20 Jun 2003 21:31:13 -0000	1.17
-+++ makedep.c	23 Feb 2004 22:36:23 -0000
-@@ -67,7 +67,8 @@ static const char Usage[] =
-     "   -Idir   Search for include files in directory 'dir'\n"
-     "   -Cdir   Search for source files in directory 'dir'\n"
-     "   -fxxx   Store output in file 'xxx' (default: Makefile)\n"
--    "   -sxxx   Use 'xxx' as separator (default: \"### Dependencies\")\n";
-+    "   -sxxx   Use 'xxx' as separator (default: \"### Dependencies\")\n"
-+    "   -Dxxx   This is a no-op, to work around bugs in other tools\n";
- 
- 
- /*******************************************************************
-@@ -503,6 +504,9 @@ static void parse_option( const char *op
-     case 'C':
-         if (opt[2]) SrcDir = opt + 2;
-         else SrcDir = NULL;
-+        break;
-+    case 'D':
-+        /* Simply ignore -D... options. */
-         break;
-     case 'f':
-         if (opt[2]) OutputFileName = opt + 2;
diff -urN /usr/ports/emulators/wine/pkg-plist wine/pkg-plist
--- /usr/ports/emulators/wine/pkg-plist	Mon Oct  3 22:51:14 2005
+++ wine/pkg-plist	Fri Nov  4 12:19:18 2005
@@ -302,6 +302,7 @@
 include/wine/windows/schemadef.h
 include/wine/windows/sddl.h
 include/wine/windows/secext.h
+include/wine/windows/security.h
 include/wine/windows/sensapi.h
 include/wine/windows/sensevts.h
 include/wine/windows/sensevts.idl
--- wine.diff ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->gerald 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Fri Nov 4 16:42:22 GMT 2005 
Responsible-Changed-Why:  
Over to maintainer 

http://www.freebsd.org/cgi/query-pr.cgi?pr=88492 

From: Gerald Pfeifer <gerald@pfeifer.com>
To: Edwin Groothuis <edwin@FreeBSD.org>
Cc: freebsd-ports-bugs@FreeBSD.org
Subject: Re: ports/88492: update emulators/wine to 0.9,1
Date: Sun, 6 Nov 2005 18:31:05 +0100 (CET)

 Edwin,
 
 On Fri, 4 Nov 2005, Edwin Groothuis wrote:
 > Synopsis: update emulators/wine to 0.9,1
 > 
 > Responsible-Changed-From-To: freebsd-ports-bugs->gerald
 > Responsible-Changed-By: edwin
 > Responsible-Changed-When: Fri Nov 4 16:42:22 GMT 2005
 > Responsible-Changed-Why: 
 > Over to maintainer
 
 I currently cannot access my FreeBSD.org account, but this matches
 exactly what I've had in my local tree for more than a week (that
 is, predating this submission) so it should be okay.
 
 Would you mind committing this on my behalf, with something like the 
 following for the commit log?
 
  Update to the first beta version of Wine, 0.9.
  Unfortunately this requires a port epoch, and also uses bzip2 now.
 
  PR:		88492
  Submitted by:	Andrew Pantyukhin <infofarmer@gmail.com>
  Approved by:	gerald (maintainer)?
 
 Thanks,
 Gerald
 
State-Changed-From-To: open->closed 
State-Changed-By: edwin 
State-Changed-When: Sun Nov 6 22:22:22 GMT 2005 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=88492 
>Unformatted:
