From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Oct 10 04:30:03 2007 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8E79016A421 for ; Wed, 10 Oct 2007 04:30:03 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 682C613C4C1 for ; Wed, 10 Oct 2007 04:30:03 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.1/8.14.1) with ESMTP id l9A4U3YD062790 for ; Wed, 10 Oct 2007 04:30:03 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.1/8.14.1/Submit) id l9A4U3FE062750; Wed, 10 Oct 2007 04:30:03 GMT (envelope-from gnats) Resent-Date: Wed, 10 Oct 2007 04:30:03 GMT Resent-Message-Id: <200710100430.l9A4U3FE062750@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, Li-Lun Wang (Leland Wang) Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B334E16A421 for ; Wed, 10 Oct 2007 04:22:52 +0000 (UTC) (envelope-from llwang@Hermes.club.infor.org) Received: from Hermes.club.infor.org (inforweb.ck.tp.edu.tw [203.64.26.201]) by mx1.freebsd.org (Postfix) with ESMTP id 41BAE13C45D for ; Wed, 10 Oct 2007 04:22:51 +0000 (UTC) (envelope-from llwang@Hermes.club.infor.org) Received: from Hermes.club.infor.org (localhost [127.0.0.1]) by Hermes.club.infor.org (8.13.8/8.13.8) with ESMTP id l9A3u7kX054105 for ; Wed, 10 Oct 2007 11:56:07 +0800 (CST) (envelope-from llwang@Hermes.club.infor.org) Received: (from llwang@localhost) by Hermes.club.infor.org (8.13.8/8.13.8/Submit) id l9A3u7aw054104; Wed, 10 Oct 2007 11:56:07 +0800 (CST) (envelope-from llwang) Message-Id: <200710100356.l9A3u7aw054104@Hermes.club.infor.org> Date: Wed, 10 Oct 2007 11:56:07 +0800 (CST) From: Li-Lun Wang (Leland Wang) To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/117054: [maintainer] Fix build and unbreak port emulators/hugo X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: "Li-Lun Wang \(Leland Wang\)" List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Oct 2007 04:30:03 -0000 >Number: 117054 >Category: ports >Synopsis: [maintainer] Fix build and unbreak port emulators/hugo >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 10 04:30:02 UTC 2007 >Closed-Date: >Last-Modified: >Originator: Li-Lun Wang (Leland Wang) >Release: FreeBSD 7.0-CURRENT amd64 >Organization: >Environment: System: FreeBSD ll-c2d 7.0-CURRENT FreeBSD 7.0-CURRENT #43: Tue Oct 9 21:56:03 CDT 2007 root@ll-c2d:/usr/obj/usr/src/sys/C2D amd64 >Description: - Fix build on non-i386 and with gcc-4 - Unbreak port Added files: - hugo/files/patch-pce.c Modified files: - hugo/Makefile - hugo/files/patch-configure >How-To-Repeat: >Fix: diff -urN hugo.orig/Makefile hugo/Makefile --- hugo.orig/Makefile 2007-10-09 15:40:51.000000000 -0500 +++ hugo/Makefile 2007-10-09 22:37:14.000000000 -0500 @@ -56,14 +56,4 @@ post-patch: @${REINPLACE_CMD} -e 's|sdl-config|${SDL_CONFIG}|' ${WRKSRC}/configure -.include - -.if ${OSVERSION} >= 700042 -BROKEN= Does not compile with GCC 4.2 -.endif - -.if ${ARCH} != "i386" -BROKEN= fails to install -.endif - -.include +.include diff -urN hugo.orig/files/patch-configure hugo/files/patch-configure --- hugo.orig/files/patch-configure 2006-05-27 10:24:20.000000000 -0500 +++ hugo/files/patch-configure 2007-10-09 22:46:34.000000000 -0500 @@ -1,5 +1,5 @@ ---- configure.orig Tue Apr 5 14:28:53 2005 -+++ configure Fri May 19 02:02:42 2006 +--- configure.orig 2005-04-05 14:28:53.000000000 -0500 ++++ configure 2007-10-09 21:55:43.000000000 -0500 @@ -3256,7 +3256,7 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -27,7 +27,16 @@ then -@@ -8675,7 +8675,36 @@ +@@ -8657,7 +8659,7 @@ + + fi + ;; +- i386-FreeBSD) ++ *-FreeBSD) + echo "FreeBSD build enabled" + + HUGO_TARGET_MACHINE="FREEBSD" +@@ -8675,6 +8677,35 @@ SDL_FREEBSD_FALSE= fi diff -urN hugo.orig/files/patch-pce.c hugo/files/patch-pce.c --- hugo.orig/files/patch-pce.c 1969-12-31 18:00:00.000000000 -0600 +++ hugo/files/patch-pce.c 2007-10-09 21:33:06.000000000 -0500 @@ -0,0 +1,11 @@ +--- pce.c.orig 2005-03-28 08:17:45.000000000 -0600 ++++ pce.c 2007-10-09 21:32:50.000000000 -0500 +@@ -358,7 +358,7 @@ + int UPeriod = 0; + // Number of frame to skip + +-static int BaseClock; ++int BaseClock; + + UChar video_driver = 0; + /* 0 => Normal driver, normal display >Release-Note: >Audit-Trail: >Unformatted: