From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Oct 5 09:50:21 2005 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7C2BE16A421 for ; Wed, 5 Oct 2005 09:50:21 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5593D43D5A for ; Wed, 5 Oct 2005 09:50:19 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j959oJLc001119 for ; Wed, 5 Oct 2005 09:50:19 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j959oJJr001118; Wed, 5 Oct 2005 09:50:19 GMT (envelope-from gnats) Resent-Date: Wed, 5 Oct 2005 09:50:19 GMT Resent-Message-Id: <200510050950.j959oJJr001118@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Simon Dick Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0324F16A41F for ; Wed, 5 Oct 2005 09:41:27 +0000 (GMT) (envelope-from simond@www.irrelevant.org) Received: from www.irrelevant.org (dsl82-163-99-113.as15444.net [82.163.99.113]) by mx1.FreeBSD.org (Postfix) with ESMTP id D240C43D77 for ; Wed, 5 Oct 2005 09:41:22 +0000 (GMT) (envelope-from simond@www.irrelevant.org) Received: from simond by www.irrelevant.org with local (Exim 4.53 (FreeBSD)) id 1EN5mj-0008U6-1M for FreeBSD-gnats-submit@freebsd.org; Wed, 05 Oct 2005 10:42:01 +0100 Message-Id: Date: Wed, 05 Oct 2005 10:42:01 +0100 From: Simon Dick Sender: Simon Dick To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/86935: Maintainer port update: emulators/uae X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Simon Dick List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 Oct 2005 09:50:21 -0000 >Number: 86935 >Category: ports >Synopsis: Maintainer port update: emulators/uae >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Wed Oct 05 09:50:18 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Simon Dick >Release: FreeBSD 6.0-BETA4 amd64 >Organization: >Environment: System: FreeBSD amd64.irrelevant.org 6.0-BETA4 FreeBSD 6.0-BETA4 #2: Thu Sep 8 16:31:16 BST 2005 root@amd64.irrelevant.org:/usr/obj/usr/src/sys/HOME amd64 >Description: Update emulators/uae port to 0.8.25 and allow installation without port docs >How-To-Repeat: >Fix: diff -ruN uae.orig/Makefile uae/Makefile --- uae.orig/Makefile Thu Sep 30 19:14:15 2004 +++ uae/Makefile Wed Oct 5 10:22:31 2005 @@ -6,8 +6,7 @@ # PORTNAME= uae -PORTVERSION= 0.8.22 -PORTREVISION= 2 +PORTVERSION= 0.8.25 CATEGORIES= emulators MASTER_SITES= ftp://ftp.freiburg.linux.de/pub/uae/sources/develop/ @@ -16,10 +15,10 @@ USE_GMAKE= yes GNU_CONFIGURE= yes -USE_AUTOCONF_VER= 213 +USE_AUTOCONF_VER= 259 CONFIGURE_ARGS= --enable-sound --enable-vidmode --enable-dga USE_XLIB= yes -USE_GNOME= gtk12 +USE_GNOME= gtk20 USE_REINPLACE= yes CFLAGS+= ${PTHREAD_CFLAGS} @@ -31,6 +30,7 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/uae ${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/readdisk ${PREFIX}/bin +.if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/docs/COMPATIBILITY ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/docs/CREDITS ${DOCSDIR} @@ -39,6 +39,7 @@ ${INSTALL_DATA} ${WRKSRC}/docs/README ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/docs/README.PROGRAMMERS ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/docs/unix/README ${DOCSDIR}/README.unix +.endif @${MKDIR} ${DATADIR}/amiga ${INSTALL_DATA} ${WRKSRC}/amiga/mousehack ${DATADIR}/amiga/ ${INSTALL_DATA} ${WRKSRC}/amiga/timehack ${DATADIR}/amiga/ @@ -48,5 +49,10 @@ ${INSTALL_DATA} ${WRKSRC}/amiga/uae-control.info ${DATADIR}/amiga/ ${INSTALL_DATA} ${WRKSRC}/amiga/uae_rcli ${DATADIR}/amiga/ ${INSTALL_DATA} ${WRKSRC}/amiga/uaectrl ${DATADIR}/amiga/ + @${MKDIR} ${DATADIR}/amiga/devs + @${MKDIR} ${DATADIR}/amiga/devs/AHI + @${MKDIR} ${DATADIR}/amiga/devs/AudioModes + ${INSTALL_DATA} ${WRKSRC}/amiga/devs/AHI/uae.audio ${DATADIR}/amiga/devs/AHI/ + ${INSTALL_DATA} ${WRKSRC}/amiga/devs/AudioModes/UAE ${DATADIR}/amiga/devs/AudioModes/ .include diff -ruN uae.orig/distinfo uae/distinfo --- uae.orig/distinfo Thu Mar 18 10:35:10 2004 +++ uae/distinfo Wed Oct 5 10:09:58 2005 @@ -1,2 +1,2 @@ -MD5 (uae-0.8.22.tar.gz) = f3d1d0fabf6fa626dc531687cb2bb94d -SIZE (uae-0.8.22.tar.gz) = 937486 +MD5 (uae-0.8.25.tar.gz) = e660ca2bec3c016c978ef88117b0c432 +SIZE (uae-0.8.25.tar.gz) = 970727 diff -ruN uae.orig/files/patch-src+Makefile.in uae/files/patch-src+Makefile.in --- uae.orig/files/patch-src+Makefile.in Mon Feb 24 23:54:29 2003 +++ uae/files/patch-src+Makefile.in Thu Jan 1 01:00:00 1970 @@ -1,15 +0,0 @@ ---- src/Makefile.in.orig Mon Feb 24 23:47:30 2003 -+++ src/Makefile.in Mon Feb 24 23:49:01 2003 -@@ -120,10 +120,8 @@ - cpustbl.c: cpuemu.c - cputbl.h: cpuemu.c - --cpufast.s: cpuemu.c tools/cpuopti -- $(CC) $(INCLUDES) -S $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $(DEBUGFLAGS) $(NO_SCHED_CFLAGS) $< -o cputmp.s -- ./tools/cpuopti $@ -- rm cputmp.s -+cpufast.s: cpuemu.c -+ $(CC) $(INCLUDES) -S $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $(DEBUGFLAGS) $(NO_SCHED_CFLAGS) $< -o $@ - - console_missing.o: missing.c - $(CC) $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $(DEBUGFLAGS) $(CFLAGS_$@) $< -o $@ diff -ruN uae.orig/files/patch-src+include+sysdeps.h uae/files/patch-src+include+sysdeps.h --- uae.orig/files/patch-src+include+sysdeps.h Thu Sep 30 19:14:15 2004 +++ uae/files/patch-src+include+sysdeps.h Thu Jan 1 01:00:00 1970 @@ -1,20 +0,0 @@ ---- src/include/sysdeps.h.orig Mon Nov 19 23:58:46 2001 -+++ src/include/sysdeps.h Thu Sep 30 16:59:24 2004 -@@ -103,12 +103,12 @@ - }; - #endif - --#if defined(__GNUC__) && defined(AMIGA) --/* gcc on the amiga need that __attribute((regparm)) must */ --/* be defined in function prototypes as well as in */ --/* function definitions ! */ -+#if defined(__GNUC__) -+/* recent gcc needs that __attribute((regparm)) must */ -+/* be defined in function prototypes as well as in */ -+/* function definitions ! */ - #define REGPARAM2 REGPARAM --#else /* not(GCC & AMIGA) */ -+#else /* not GCC */ - #define REGPARAM2 - #endif - diff -ruN uae.orig/pkg-plist uae/pkg-plist --- uae.orig/pkg-plist Mon Jun 30 03:15:44 2003 +++ uae/pkg-plist Wed Oct 5 10:25:05 2005 @@ -8,13 +8,18 @@ %%DATADIR%%/amiga/uae-control.info %%DATADIR%%/amiga/uae_rcli %%DATADIR%%/amiga/uaectrl -%%DOCSDIR%%/COMPATIBILITY -%%DOCSDIR%%/CREDITS -%%DOCSDIR%%/FAQ -%%DOCSDIR%%/NEWS -%%DOCSDIR%%/README -%%DOCSDIR%%/README.PROGRAMMERS -%%DOCSDIR%%/README.unix -@dirrm %%DOCSDIR%% +%%DATADIR%%/amiga/devs/AHI/uae.audio +%%DATADIR%%/amiga/devs/AudioModes/UAE +%%PORTDOCS%%%%DOCSDIR%%/COMPATIBILITY +%%PORTDOCS%%%%DOCSDIR%%/CREDITS +%%PORTDOCS%%%%DOCSDIR%%/FAQ +%%PORTDOCS%%%%DOCSDIR%%/NEWS +%%PORTDOCS%%%%DOCSDIR%%/README +%%PORTDOCS%%%%DOCSDIR%%/README.PROGRAMMERS +%%PORTDOCS%%%%DOCSDIR%%/README.unix +%%PORTDOCS%%@dirrm %%DOCSDIR%% +@dirrm %%DATADIR%%/amiga/devs/AudioModes +@dirrm %%DATADIR%%/amiga/devs/AHI +@dirrm %%DATADIR%%/amiga/devs @dirrm %%DATADIR%%/amiga @dirrm %%DATADIR%% >Release-Note: >Audit-Trail: >Unformatted: