Date: Wed, 10 Oct 2007 11:56:07 +0800 (CST) From: Li-Lun Wang (Leland Wang) <llwang@infor.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/117054: [maintainer] Fix build and unbreak port emulators/hugo Message-ID: <200710100356.l9A3u7aw054104@Hermes.club.infor.org> Resent-Message-ID: <200710100430.l9A4U3FE062750@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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 <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 700042
-BROKEN= Does not compile with GCC 4.2
-.endif
-
-.if ${ARCH} != "i386"
-BROKEN= fails to install
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200710100356.l9A3u7aw054104>