From owner-freebsd-ports-bugs@FreeBSD.ORG Sat May 24 00:30:17 2003 Return-Path: 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 50A4F37B401 for ; Sat, 24 May 2003 00:30:17 -0700 (PDT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1EB6B43FA3 for ; Sat, 24 May 2003 00:30:16 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.9/8.12.9) with ESMTP id h4O7UFUp094541 for ; Sat, 24 May 2003 00:30:15 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.9/8.12.9/Submit) id h4O7UFGK094540; Sat, 24 May 2003 00:30:15 -0700 (PDT) Resent-Date: Sat, 24 May 2003 00:30:15 -0700 (PDT) Resent-Message-Id: <200305240730.h4O7UFGK094540@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, Volker Stolz Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 43B2637B401 for ; Sat, 24 May 2003 00:23:48 -0700 (PDT) Received: from lambda.foldr.org (lambda.foldr.org [198.78.66.36]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8E45943F75 for ; Sat, 24 May 2003 00:23:47 -0700 (PDT) (envelope-from vs@foldr.org) Received: from theater.foldr.org (root@pD9008CC5.dip.t-dialin.net [217.0.140.197]) by lambda.foldr.org (8.12.9/8.12.8) with ESMTP id h4O7Nfsx004895 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Sat, 24 May 2003 09:23:45 +0200 (CEST) (envelope-from vs@foldr.org) Received: from monster.theater.foldr.org (vs@monster.ipv6.foldr.org [IPv6:3ffe:b80:2de:3:2e0:29ff:fe98:abca]) by theater.foldr.org (8.12.9/8.12.8) with ESMTP id h4O7NHkU005910 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=FAIL) for ; Sat, 24 May 2003 09:23:18 +0200 (CEST) (envelope-from vs@monster.theater.foldr.org) Received: (from vs@localhost) by monster.theater.foldr.org (8.12.9/8.12.9/Submit) id h4O7NLvB013991; Sat, 24 May 2003 09:23:22 +0200 (CEST) (envelope-from vs) Message-Id: <200305240723.h4O7NLvB013991@monster.theater.foldr.org> Date: Sat, 24 May 2003 09:23:22 +0200 (CEST) From: Volker Stolz To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/52633: [maintainer] graphics/hpoj: Fix build on alpha X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Volker Stolz List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 24 May 2003 07:30:17 -0000 >Number: 52633 >Category: ports >Synopsis: [maintainer] graphics/hpoj: Fix build on alpha >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Sat May 24 00:30:15 PDT 2003 >Closed-Date: >Last-Modified: >Originator: Volker Stolz >Release: FreeBSD 5.1-BETA i386 >Organization: >Environment: System: FreeBSD monster.theater.foldr.org 5.1-BETA FreeBSD 5.1-BETA #2: Sun May 18 09:45:22 CEST 2003 root@monster.theater.foldr.org:/opt/obj/usr/src/sys/MONSTER i386 >Description: use libio on alpha (-STABLE & -CURRENT) >How-To-Repeat: >Fix: - Add 3 new patch files for alpha - Add conditional EXTRA_PATCHES to Makefile - No need to bump PORTREV --- hpoj.in begins here --- diff -urN hpoj.orig/Makefile hpoj/Makefile --- hpoj.orig/Makefile Sat May 24 08:56:15 2003 +++ hpoj/Makefile Sat May 24 09:09:38 2003 @@ -28,8 +28,14 @@ .include -.if ${OSVERSION} > 500000 +.if ${ARCH} == "i386" && ${OSVERSION} > 500000 BROKEN= "ffs() clash, see i386/41930" +.endif + +.if ${ARCH} == "alpha" +EXTRA_PATCHES= files/extra-patch-mlcd-Makefile.in \ + files/extra-patch-mlcd-ParPort.cpp \ + files/extra-patch-mlcd-ParPort.h .endif .ifndef(WITHOUT_X11) diff -urN hpoj.orig/files/extra-patch-mlcd-Makefile.in hpoj/files/extra-patch-mlcd-Makefile.in --- hpoj.orig/files/extra-patch-mlcd-Makefile.in Thu Jan 1 01:00:00 1970 +++ hpoj/files/extra-patch-mlcd-Makefile.in Sat May 24 08:04:08 2003 @@ -0,0 +1,11 @@ +--- mlcd/Makefile.in.orig Sat May 24 08:03:14 2003 ++++ mlcd/Makefile.in Sat May 24 08:03:37 2003 +@@ -35,7 +35,7 @@ + for link in $(LINKS) ; do ln -s . $$link ; done + + $(GOAL): $(OBJS) +- $(CXX) -o $(GOAL) $(OBJS) ++ $(CXX) -o $(GOAL) -lio $(OBJS) + + clean: + rm -f $(OBJS) $(GOAL) $(LINKS) diff -urN hpoj.orig/files/extra-patch-mlcd-ParPort.cpp hpoj/files/extra-patch-mlcd-ParPort.cpp --- hpoj.orig/files/extra-patch-mlcd-ParPort.cpp Thu Jan 1 01:00:00 1970 +++ hpoj/files/extra-patch-mlcd-ParPort.cpp Sat May 24 08:04:30 2003 @@ -0,0 +1,12 @@ +--- mlcd/ParPort.cpp.orig Sat May 24 08:03:20 2003 ++++ mlcd/ParPort.cpp Sat May 24 08:03:48 2003 +@@ -926,9 +926,6 @@ + #elif defined(PAR_PLATFORM_FREEBSD) + #include + #include +- extern "C" { +- #include +- } + #else + /* TODO: Handle these more gracefully! */ + #error Undefined platform diff -urN hpoj.orig/files/extra-patch-mlcd-ParPort.h hpoj/files/extra-patch-mlcd-ParPort.h --- hpoj.orig/files/extra-patch-mlcd-ParPort.h Thu Jan 1 01:00:00 1970 +++ hpoj/files/extra-patch-mlcd-ParPort.h Sat May 24 08:03:05 2003 @@ -0,0 +1,14 @@ +--- mlcd/ParPort.h.orig Sat May 24 08:02:19 2003 ++++ mlcd/ParPort.h Sat May 24 07:59:13 2003 +@@ -27,6 +27,11 @@ + + #define ERROR_NO_DATA ERROR /* TODO: Remove. */ + ++extern "C" { ++extern u_char inb (u_int port); ++extern void outb(u_int port, u_char data); ++} ++ + class ParPort { + protected: // ATTRIB + int portType; --- hpoj.in ends here --- >Release-Note: >Audit-Trail: >Unformatted: