[pkgsrc/trunk]: pkgsrc/sysutils/855resolution Support NetBSD/amd64. This is ...

[obache <obache%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/3fc93fcbe1c7
branches:  trunk
changeset: 521475:3fc93fcbe1c7
user:      obache <obache%pkgsrc.org@localhost>
date:      Mon Nov 13 15:00:56 2006 +0000

description:
Support NetBSD/amd64.  This is also suggested in PR 35044.

diffstat:

 sysutils/855resolution/Makefile         |  10 ++++++++--
 sysutils/855resolution/distinfo         |   6 +++---
 sysutils/855resolution/patches/patch-aa |   8 ++++++--
 sysutils/855resolution/patches/patch-ab |   6 +++---
 4 files changed, 20 insertions(+), 10 deletions(-)

diffs (99 lines):

diff -r 574855a97e27 -r 3fc93fcbe1c7 sysutils/855resolution/Makefile
--- a/sysutils/855resolution/Makefile   Mon Nov 13 14:51:08 2006 +0000
+++ b/sysutils/855resolution/Makefile   Mon Nov 13 15:00:56 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2006/10/04 21:59:34 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2006/11/13 15:00:56 obache Exp $
 #
 
 DISTNAME=      855resolution-0.4
@@ -11,11 +11,17 @@
 HOMEPAGE=      http://perso.orange.fr/apoirier/
 COMMENT=       BIOS VESA resolution utility for 855/865/915 Intel chips
 
-ONLY_FOR_PLATFORM=     NetBSD-*-i386
+ONLY_FOR_PLATFORM=     NetBSD-*-i386 NetBSD-*-x86_64 Linux-*-i386
 
 WRKSRC=                ${WRKDIR}/855resolution
 USE_TOOLS+=    gmake
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "NetBSD"
+MAKE_ENV+=     EXTRA_LIBS=-l${MACHINE_ARCH}
+.endif
+
 post-install:
        ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/855resolution
        ${INSTALL_DATA} ${WRKSRC}/README.txt ${PREFIX}/share/doc/855resolution
diff -r 574855a97e27 -r 3fc93fcbe1c7 sysutils/855resolution/distinfo
--- a/sysutils/855resolution/distinfo   Mon Nov 13 14:51:08 2006 +0000
+++ b/sysutils/855resolution/distinfo   Mon Nov 13 15:00:56 2006 +0000
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.3 2006/10/02 21:02:43 rillig Exp $
+$NetBSD: distinfo,v 1.4 2006/11/13 15:00:56 obache Exp $
 
 SHA1 (855resolution-0.4.tgz) = aabba504d0592cac676188f1ce73bd25389d8fda
 RMD160 (855resolution-0.4.tgz) = d075d239257b778f509c8fd96619bfd810194d3b
 Size (855resolution-0.4.tgz) = 6740 bytes
-SHA1 (patch-aa) = 61308f93c5825b4f374e86fc852dcc67fea1e078
-SHA1 (patch-ab) = 03dfcce60e6ed34a890e2cdec0d3ee6c9adab88e
+SHA1 (patch-aa) = b230470c91957efc67b448233140b91a600e7def
+SHA1 (patch-ab) = bb8c918da7af28567f05072399170c7cf4293f58
diff -r 574855a97e27 -r 3fc93fcbe1c7 sysutils/855resolution/patches/patch-aa
--- a/sysutils/855resolution/patches/patch-aa   Mon Nov 13 14:51:08 2006 +0000
+++ b/sysutils/855resolution/patches/patch-aa   Mon Nov 13 15:00:56 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.2 2005/10/12 02:15:30 christos Exp $
+$NetBSD: patch-aa,v 1.3 2006/11/13 15:00:56 obache Exp $
 
 --- 855resolution.c    2005-05-08 15:46:02.000000000 -0400
 +++ 855resolution.c    2005-10-11 17:24:05.000000000 -0400
@@ -118,7 +118,7 @@
  
 --- vbios.h    2005-05-08 15:47:45.000000000 -0400
 +++ vbios.h    2005-10-11 17:21:51.000000000 -0400
-@@ -16,6 +16,20 @@
+@@ -16,6 +16,24 @@
  
  #define VBIOS_SIZE 0x10000
  
@@ -131,7 +131,11 @@
 +#ifdef __NetBSD__
 +#include <machine/pio.h>
 +#include <machine/sysarch.h>
++# if defined(__i386__)
 +#define iopl(a) i386_iopl(a)
++# elif defined(__x86_64__)
++#define iopl(a) x86_64_iopl(a)
++# endif
 +#define OUTL(a, b)    outl(b, a)
 +#define OUTB(a, b)    outb(b, a)
 +#endif
diff -r 574855a97e27 -r 3fc93fcbe1c7 sysutils/855resolution/patches/patch-ab
--- a/sysutils/855resolution/patches/patch-ab   Mon Nov 13 14:51:08 2006 +0000
+++ b/sysutils/855resolution/patches/patch-ab   Mon Nov 13 15:00:56 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.1 2005/10/12 02:15:30 christos Exp $
+$NetBSD: patch-ab,v 1.2 2006/11/13 15:00:56 obache Exp $
 
 --- Makefile.orig      2005-05-08 11:27:59.000000000 -0400
 +++ Makefile   2005-10-11 18:12:19.000000000 -0400
@@ -16,7 +16,7 @@
  PLUGINS_ADDR:=${shell echo ${PLUGINS_LIST} | sed -e 's/^/\&/g' -e 's/,/,\&/g' }
  VERSION:=${shell cat VERSION.txt}
 -LDLIBS:=-lm
-+LDLIBS:=-lm -li386
++LDLIBS:=-lm ${EXTRA_LIBS}
  
  CFLAGS:=-Wall -I`pwd` -DVERSION='"${VERSION}"' -DPLUGINS='${PLUGINS_LIST}' -DREF_PLUGINS='${PLUGINS_ADDR}' ${VBIOS_FILE}
  LDFLAGS:=-s
@@ -25,7 +25,7 @@
  
  install: ${PRG}
 -      cp ${PRG} /usr/sbin
-+      install -m 555 ${PRG} ${PREFIX}/sbin
++      ${BSD_INSTALL_PROGRAM} ${PRG} ${PREFIX}/sbin
  
  distrib: clean
        tar -C .. -zcvf /tmp/${PRG}-`cat VERSION.txt`.tgz --exclude '.*' ${PRG}