From nobody@FreeBSD.org  Sun Apr  3 00:50:56 2011
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 542731065673
	for <freebsd-gnats-submit@FreeBSD.org>; Sun,  3 Apr 2011 00:50:56 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22])
	by mx1.freebsd.org (Postfix) with ESMTP id 438AD8FC18
	for <freebsd-gnats-submit@FreeBSD.org>; Sun,  3 Apr 2011 00:50:56 +0000 (UTC)
Received: from red.freebsd.org (localhost [127.0.0.1])
	by red.freebsd.org (8.14.4/8.14.4) with ESMTP id p330otN3014962
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 3 Apr 2011 00:50:55 GMT
	(envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
	by red.freebsd.org (8.14.4/8.14.4/Submit) id p330otDc014961;
	Sun, 3 Apr 2011 00:50:55 GMT
	(envelope-from nobody)
Message-Id: <201104030050.p330otDc014961@red.freebsd.org>
Date: Sun, 3 Apr 2011 00:50:55 GMT
From: Barbara <barbara.xxx1975@libero.it>
To: freebsd-gnats-submit@FreeBSD.org
Subject: emulators/vice: fix patch & build
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         156144
>Category:       ports
>Synopsis:       emulators/vice: fix patch & build
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    dinoex
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sun Apr 03 01:00:21 UTC 2011
>Closed-Date:    Thu Apr 07 05:21:36 CEST 2011
>Last-Modified:  Thu Apr 07 05:21:36 CEST 2011
>Originator:     Barbara
>Release:        RELENG_8
>Organization:
>Environment:
FreeBSD satanasso.local.net 8.2-STABLE FreeBSD 8.2-STABLE #0: Sat Apr  2 16:45:15 CEST 2011     root@satanasso.local.net:/usr/obj/usr/src/sys/SATANASSO  i386

>Description:

Fix patch and build after last commit
>How-To-Repeat:
cd /usr/port/emulators/vice && make
>Fix:


Patch attached with submission follows:

--- Makefile.orig	2011-04-02 20:54:37.000000000 +0200
+++ Makefile	2011-04-03 02:22:33.000000000 +0200
@@ -86,14 +86,6 @@
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_LIBUSB)
-.if ${OSVERSION}<800063
-LIB_DEPENDS+=		usb:${PORTSDIR}/devel/libusb
-.endif
-.else
-CONFIGURE_ARGS+=	--disable-libusb
-.endif
-
 .if exists(${LOCALBASE}/bin/fc-cache)
 PLIST_SUB+=		FCCACHE=""
 PLIST_SUB+=		NOFCCACHE="@comment "
--- files/patch-dynlib.c.orig	2009-12-25 19:24:02.000000000 +0100
+++ files/patch-dynlib.c	2011-04-03 02:33:41.000000000 +0200
@@ -1,11 +1,11 @@
---- src/arch/unix/dynlib.c.orig	2009-10-21 18:46:46.000000000 +0200
-+++ src/arch/unix/dynlib.c	2009-12-25 19:00:10.000000000 +0100
-@@ -51,6 +51,8 @@
- 
- #else
- 
-+#include <string.h>
-+
- void *vice_dynlib_open(const char *name)
- {
-     return NULL;
+--- src/arch/unix/dynlib.c.orig	2009-12-20 18:54:03.000000000 +0100
++++ src/arch/unix/dynlib.c	2011-04-03 02:33:30.000000000 +0200
+@@ -52,6 +52,8 @@
+ 
+ #else
+ 
++#include <stdlib.h>
++
+ void *vice_dynlib_open(const char *name)
+ {
+     return NULL;


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->dinoex 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Sun Apr 3 01:00:40 UTC 2011 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

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

From: Barbara <barbara.xxx1975@libero.it>
To: bug-followup@FreeBSD.org
Cc: cvs-src@yandex.ru
Subject: Re: ports/156144: emulators/vice: fix patch & build
Date: Mon, 4 Apr 2011 07:24:44 +0200 (CEST)

 As suggested by Ruslan Mahmatkhanov, there is no need to patch files/patch-
 dynlib.c changing lines.
 A s/^M//g should fix patching.
 
 
State-Changed-From-To: open->feedback 
State-Changed-By: dinoex 
State-Changed-When: Mon Apr 4 17:15:01 CEST 2011 
State-Changed-Why:  

I can not reproduce the problem! 

please check your files are up to date: 

/ports/emulators/vice$ env LANG=C ls -lR 
total 24 
-rw-r--r--  1 dm  dm  4837 Apr  2 20:54 Makefile 
-rw-r--r--  1 dm  dm   126 Mar  4 09:26 distinfo 
drwxr-xr-x  3 dm  dm   512 Apr  4 05:58 files 
-rw-r--r--  1 dm  dm   488 Feb  7  2009 pkg-descr 
-rw-r--r--  1 dm  dm   292 Mar  4  2007 pkg-message 
-rw-r--r--  1 dm  dm  6759 Mar  5 12:37 pkg-plist 

./files: 
total 14 
-rw-r--r--  1 dm  dm     297 Jun  6  1999 patch-ab 
-rw-r--r--  1 dm  dm     395 Nov 23  2001 patch-ac 
-rw-r--r--  1 dm  dm     246 Dec 25  2009 patch-dynlib.c 
-rw-r--r--  1 dm  dm     273 Dec  3  2005 patch-sound.c 
-rw-r--r--  1 dm  dm     310 Dec  3  2005 patch-sounduss.c 
-rw-r--r--  1 dm  wheel  461 Aug  3  2010 patch-x11video.c 

Makefile:               ASCII text 
distinfo:               ASCII text 
files:                  directory 
pkg-descr:              ASCII English text 
pkg-message:            ASCII English text 
pkg-plist:              ASCII text 
files/patch-ab:         ASCII text 
files/patch-ac:         ASCII English text 
files/patch-dynlib.c:   ASCII C program text 
files/patch-sound.c:    ASCII C program text 
files/patch-sounduss.c: ASCII C program text 
files/patch-x11video.c: ASCII C program text 

MD5 (Makefile) = d3338c249f9f31bba4292ae50b7c71ba 
MD5 (distinfo) = 91a27716cd87985e1de79eb8a3970caa 
MD5 (files) = 08833c133d60eeac647520c93b9d2cac 
MD5 (pkg-descr) = a7c6260cf13bd95fa5072d5675cdd059 
MD5 (pkg-message) = 29a3a7c1a569bbb69b42ec3560a91600 
MD5 (pkg-plist) = 24e163e58bf740dd1ee77844d4bef872 
MD5 (files/patch-ab) = baf949d68a1246927b4b39f189462331 
MD5 (files/patch-ac) = a8a5ee6c2f36b205598491351d54f1f7 
MD5 (files/patch-dynlib.c) = 2b1910a597da0a511a0eb50777f5fd10 
MD5 (files/patch-sound.c) = e55e9833d8b1e2d7289ad36ef13e124d 
MD5 (files/patch-sounduss.c) = bc06d55de7096ee9e9125a9a6f27bbb1 
MD5 (files/patch-x11video.c) = 5fdb186f96b100ef2be47e8ce0e87bb0 


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

From: Barbara <barbara.xxx1975@libero.it>
To: bug-followup@FreeBSD.org
Cc: dinoex@freebsd.org
Subject: Re: ports/156144: emulators/vice: fix patch & build
Date: Mon, 4 Apr 2011 21:06:58 +0200 (CEST)

 The size and the md5 sum of your file doesn't match what I can fetch:
 
 $ fetch http://www.freebsd.org/cgi/cvsweb.
 cgi/~checkout~/ports/emulators/vice/files/patch-dynlib.c && \
 > md5 patch-dynlib.c
 fetch: http://www.freebsd.org/cgi/cvsweb.
 cgi/~checkout~/ports/emulators/vice/files/patch-dynlib.c: size of remote file 
 is not known
 patch-dynlib.c                                         254  B  346 kBps
 MD5 (patch-dynlib.c) = f05b74a51723de5f7ac7ce50923505ab
 
 
 which match with the file I have in /usr/ports/emulators/vice/files:
 $ cd /usr/ports/emulators/vice/files/ && ls -l patch-dynlib.c && md5 patch-
 dynlib.c 
 -rw-r--r--  1 root  wheel  254 Dec 25  2009 patch-dynlib.c
 MD5 (patch-dynlib.c) = f05b74a51723de5f7ac7ce50923505ab
 
 
 Did you try also running make configure?
 
 
 Barbara
 

From: Barbara <barbara.xxx1975@libero.it>
To: <bug-followup@FreeBSD.org>
Cc: <freebsd-ports@freebsd.org>
Subject: Re: ports/156144: emulators/vice: fix patch & build
Date: Wed, 6 Apr 2011 01:04:41 +0200 (CEST)

 So how can you explain that?
 http://pointyhat.freebsd.org/errorlogs/i386-errorlogs/e.8.20110404110656/vice-
 gnome-2.3.log
 

From: Barbara <barbara.xxx1975@libero.it>
To: <bug-followup@FreeBSD.org>
Cc:  
Subject: Re: ports/156144: emulators/vice: fix patch & build
Date: Wed, 6 Apr 2011 01:26:44 +0200 (CEST)

 BTW, maybe I removed too much lines from Makefile.
 Maybe the dependency from devel/libusb is still required when configured 
 WITH_LIBUSB and ${OSVERSION}<800063, I'm not sure and I can't test that, but 
 the else branch leads to this:
 
 # make configure
 ....
 configure: error: invalid option: --disable-libusb
 ===>  Script "configure" failed unexpectedly.
 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/156144: commit references a PR
Date: Thu,  7 Apr 2011 03:18:15 +0000 (UTC)

 dinoex      2011-04-07 03:18:01 UTC
 
   FreeBSD ports repository
 
   Modified files:
     emulators/vice       Makefile 
   Log:
   - drop OPTION WITH_LIBUSB
   PR:             156144
   
   Revision  Changes    Path
   1.75      +0 -4      ports/emulators/vice/Makefile
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: feedback->closed 
State-Changed-By: dinoex 
State-Changed-When: Thu Apr 7 05:21:11 CEST 2011 
State-Changed-Why:  
committed, thanks. 

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