ports/52633: [maintainer] graphics/hpoj: Fix build on alpha

[Volker Stolz]

>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 at 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 <bsd.port.pre.mk>
 
-.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 <unistd.h>
+ 	#include <fcntl.h>
+-    extern "C" {
+-	#include <machine/cpufunc.h>
+-    }
+ #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: