Fix installation part. Separate Makefile patch.

4 files changed, 37 insertions, 22 deletions

diff --git a/sysutils/855resolution/PLIST b/sysutils/855resolution/PLIST
index 2d824329a9c..01b9581dd64 100644
--- a/sysutils/855resolution/PLIST
+++ b/sysutils/855resolution/PLIST
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1 2005/10/12 02:06:37 christos Exp $
-bin/855resolution
+@comment $NetBSD: PLIST,v 1.2 2005/10/12 02:15:30 christos Exp $
+sbin/855resolution
diff --git a/sysutils/855resolution/distinfo b/sysutils/855resolution/distinfo
index 7a1be937d39..d401fd23be2 100644
--- a/sysutils/855resolution/distinfo
+++ b/sysutils/855resolution/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.1 2005/10/12 02:06:37 christos Exp $
+$NetBSD: distinfo,v 1.2 2005/10/12 02:15:30 christos Exp $
 
 SHA1 (855resolution-0.4.tgz) = aabba504d0592cac676188f1ce73bd25389d8fda
 RMD160 (855resolution-0.4.tgz) = d075d239257b778f509c8fd96619bfd810194d3b
 Size (855resolution-0.4tgz) = 6740 bytes
-SHA1 (patch-aa) = 5e549802a60e11a50d1c700f5937e12adfb04124
+SHA1 (patch-aa) = 61308f93c5825b4f374e86fc852dcc67fea1e078
+SHA1 (patch-ab) = 03dfcce60e6ed34a890e2cdec0d3ee6c9adab88e
diff --git a/sysutils/855resolution/patches/patch-aa b/sysutils/855resolution/patches/patch-aa
index 57ff8546f80..26272209e2c 100644
--- a/sysutils/855resolution/patches/patch-aa
+++ b/sysutils/855resolution/patches/patch-aa
@@ -1,5 +1,4 @@
-$NetBSD: patch-aa,v 1.1 2005/10/12 02:06:37 christos Exp $
-
+$NetBSD: patch-aa,v 1.2 2005/10/12 02:15:30 christos Exp $
 
 --- 855resolution.c	2005-05-08 15:46:02.000000000 -0400
 +++ 855resolution.c	2005-10-11 17:24:05.000000000 -0400
@@ -20,22 +19,6 @@ $NetBSD: patch-aa,v 1.1 2005/10/12 02:06:37 christos Exp $
          close_bios();
          return 2;
      }
---- Makefile	2005-05-08 11:27:59.000000000 -0400
-+++ Makefile	2005-10-11 17:30:36.000000000 -0400
-@@ -7,10 +7,10 @@
- SRCS=855resolution.c vbios.c plugin.c ${PLUGINS_SRCS}
- OBJS=${SRCS:.c=.o}
- 
--PLUGINS_LIST:=${shell cd plugins;ls -x *.c | sed -e 's/.c//g' -e 's/  */,/g' }
-+PLUGINS_LIST:=${shell cd plugins;ls -x *.c | sed -e 's/.c/,/g' -e 's/,[ ]*$$//g' }
- PLUGINS_ADDR:=${shell echo ${PLUGINS_LIST} | sed -e 's/^/\&/g' -e 's/,/,\&/g' }
- VERSION:=${shell cat VERSION.txt}
--LDLIBS:=-lm
-+LDLIBS:=-lm -li386
- 
- CFLAGS:=-Wall -I`pwd` -DVERSION='"${VERSION}"' -DPLUGINS='${PLUGINS_LIST}' -DREF_PLUGINS='${PLUGINS_ADDR}' ${VBIOS_FILE}
- LDFLAGS:=-s
-Only in .: o
 --- plugins/plugin1.c	2005-05-08 15:56:35.000000000 -0400
 +++ plugins/plugin1.c	2005-10-11 17:22:30.000000000 -0400
 @@ -12,7 +12,6 @@
diff --git a/sysutils/855resolution/patches/patch-ab b/sysutils/855resolution/patches/patch-ab
new file mode 100644
index 00000000000..5c741d40f33
--- /dev/null
+++ b/sysutils/855resolution/patches/patch-ab
@@ -0,0 +1,31 @@
+$NetBSD: patch-ab,v 1.1 2005/10/12 02:15:30 christos Exp $
+
+--- Makefile.orig	2005-05-08 11:27:59.000000000 -0400
++++ Makefile	2005-10-11 18:12:19.000000000 -0400
+@@ -3,14 +3,15 @@
+ # Uncomment this line if you want to test with a VBIOS image file
+ # VBIOS_FILE:=-DVBIOS_FILE='"../dump/vbios-865.dmp"'
+ 
++PREFIX?=/usr
+ PLUGINS_SRCS:=${shell ls plugins/*.c}
+ SRCS=855resolution.c vbios.c plugin.c ${PLUGINS_SRCS}
+ OBJS=${SRCS:.c=.o}
+ 
+-PLUGINS_LIST:=${shell cd plugins;ls -x *.c | sed -e 's/.c//g' -e 's/  */,/g' }
++PLUGINS_LIST:=${shell cd plugins;ls -x *.c | sed -e 's/.c/,/g' -e 's/,[ ]*$$//g' }
+ PLUGINS_ADDR:=${shell echo ${PLUGINS_LIST} | sed -e 's/^/\&/g' -e 's/,/,\&/g' }
+ VERSION:=${shell cat VERSION.txt}
+-LDLIBS:=-lm
++LDLIBS:=-lm -li386
+ 
+ CFLAGS:=-Wall -I`pwd` -DVERSION='"${VERSION}"' -DPLUGINS='${PLUGINS_LIST}' -DREF_PLUGINS='${PLUGINS_ADDR}' ${VBIOS_FILE}
+ LDFLAGS:=-s
+@@ -23,7 +24,7 @@
+ 	rm -f ${OBJS} ${PRG} *~ plugins/*~
+ 
+ install: ${PRG}
+-	cp ${PRG} /usr/sbin
++	install -m 555 ${PRG} ${PREFIX}/sbin
+ 
+ distrib: clean
+ 	tar -C .. -zcvf /tmp/${PRG}-`cat VERSION.txt`.tgz --exclude '.*' ${PRG}