PKG_DESTDIR_SUPPORT=destdir

8 files changed, 33 insertions, 32 deletions

diff --git a/misc/heyu/Makefile b/misc/heyu/Makefile
index e0c4bbf3e2f..3c8f7108d30 100644
--- a/misc/heyu/Makefile
+++ b/misc/heyu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2007/01/08 04:12:35 rillig Exp $
+# $NetBSD: Makefile,v 1.13 2009/12/11 00:11:11 abs Exp $
 #
 
 DISTNAME=	heyu-1.35
@@ -22,7 +22,7 @@ MAKE_FLAGS+=	MAN5=${PREFIX}/${PKGMANDIR}/man5
 REPLACE_SH+=	makesched
 USE_TOOLS+=	sh:run
 
-pre-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/heyu
+INSTALLATION_DIRS+=	bin ${PREFIX}/share/examples/heyu
+PKG_DESTDIR_SUPPORT=	destdir
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/heyu/distinfo b/misc/heyu/distinfo
index dc9ca4ee338..222efc3f80a 100644
--- a/misc/heyu/distinfo
+++ b/misc/heyu/distinfo
@@ -1,12 +1,13 @@
-$NetBSD: distinfo,v 1.9 2005/11/10 18:00:09 joerg Exp $
+$NetBSD: distinfo,v 1.10 2009/12/11 00:11:11 abs Exp $
 
 SHA1 (heyu-1.35/x10_heyu.tgz) = c392bab9e7b2c7f911a8861c598af18d50519f1c
 RMD160 (heyu-1.35/x10_heyu.tgz) = 61c2ff2a2d513dad6e5fca0b4c1df015dd242d83
 Size (heyu-1.35/x10_heyu.tgz) = 84277 bytes
-SHA1 (patch-aa) = 26c4304ee18f0bb2d585eb1ff0338576aee88668
-SHA1 (patch-ab) = 091615c3e1c9d927294512cd557fc6a87b1e5f99
-SHA1 (patch-ac) = 345bf95e4ee0df554bbc635e0f8913ca0f66b987
-SHA1 (patch-ad) = 5f52f30820f5ed8da10fbc650980137a738c1c78
+SHA1 (patch-aa) = a9c1752f20bf8de52cb5c9607e1b439a00672d12
+SHA1 (patch-ab) = 2dd07ae21eb2e57a4adad79717ac700ab64a3cd7
+SHA1 (patch-ac) = feb09a639bb33574665341415289efabe3bbe2fb
+SHA1 (patch-ad) = 976436d32022f9eaa68b4661b6ee7025d9bb5f1c
 SHA1 (patch-ae) = 376c89f594b1ee1b06759b3f3b813a92f74ae1ee
-SHA1 (patch-af) = 3cf25e4abac4e0dd52398381a1c304e2d0ebfc94
-SHA1 (patch-ag) = f5f4783dc4914befd42ba827630568b88ad9b472
+SHA1 (patch-af) = 05586be9010ec36bbde847de13d2d112b5d1501e
+SHA1 (patch-ag) = a8e9d04fea0e1d79bc9ee7999d32e8df9cba1e71
+SHA1 (patch-ah) = 70a99172f97034860045843316229108e04dff89
diff --git a/misc/heyu/patches/patch-aa b/misc/heyu/patches/patch-aa
index 97462c20ad0..c5309a900a8 100644
--- a/misc/heyu/patches/patch-aa
+++ b/misc/heyu/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.6 2003/11/11 10:17:39 wiz Exp $
+$NetBSD: patch-aa,v 1.7 2009/12/11 00:11:11 abs Exp $
 
---- stop.c.orig	Sun Mar 30 22:05:53 2003
+--- stop.c.orig	2003-03-30 20:05:53.000000000 +0000
 +++ stop.c
 @@ -35,17 +35,21 @@ int argc;
  char *argv[];
diff --git a/misc/heyu/patches/patch-ab b/misc/heyu/patches/patch-ab
index 4dc621852cd..93087cb9db0 100644
--- a/misc/heyu/patches/patch-ab
+++ b/misc/heyu/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.3 2003/11/11 10:17:39 wiz Exp $
+$NetBSD: patch-ab,v 1.4 2009/12/11 00:11:11 abs Exp $
 
---- heyu.1.orig	Sun Jul 20 00:38:08 2003
+--- heyu.1.orig	2003-07-19 22:38:08.000000000 +0000
 +++ heyu.1
 @@ -267,7 +267,7 @@ See \fix10sched(5)\fR for more informati
  .br
diff --git a/misc/heyu/patches/patch-ac b/misc/heyu/patches/patch-ac
index c07437b9dd6..f28717381eb 100644
--- a/misc/heyu/patches/patch-ac
+++ b/misc/heyu/patches/patch-ac
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.3 2003/11/11 10:17:39 wiz Exp $
+$NetBSD: patch-ac,v 1.4 2009/12/11 00:11:11 abs Exp $
 
---- tty.c.orig	Sun Mar 30 22:57:59 2003
+--- tty.c.orig	2003-03-30 20:57:59.000000000 +0000
 +++ tty.c
 @@ -93,7 +93,12 @@ struct sgttyb oldsb, newsb;
  #endif
diff --git a/misc/heyu/patches/patch-ad b/misc/heyu/patches/patch-ad
index c18b0724602..8dd3b3d88c5 100644
--- a/misc/heyu/patches/patch-ad
+++ b/misc/heyu/patches/patch-ad
@@ -1,6 +1,6 @@
-$NetBSD: patch-ad,v 1.3 2003/11/11 10:17:39 wiz Exp $
+$NetBSD: patch-ad,v 1.4 2009/12/11 00:11:11 abs Exp $
 
---- xread.c.orig	Tue Mar 18 00:23:30 2003
+--- xread.c.orig	2003-03-17 23:23:30.000000000 +0000
 +++ xread.c
 @@ -24,7 +24,7 @@
  #include <stdio.h>
diff --git a/misc/heyu/patches/patch-af b/misc/heyu/patches/patch-af
index 83f9ca773cd..fd361593d06 100644
--- a/misc/heyu/patches/patch-af
+++ b/misc/heyu/patches/patch-af
@@ -1,6 +1,6 @@
-$NetBSD: patch-af,v 1.2 2003/11/11 10:17:39 wiz Exp $
+$NetBSD: patch-af,v 1.3 2009/12/11 00:11:11 abs Exp $
 
---- xwrite.c.orig	Sun Mar 30 22:30:31 2003
+--- xwrite.c.orig	2003-03-30 20:30:31.000000000 +0000
 +++ xwrite.c
 @@ -48,7 +48,7 @@
  #include <sys/ioctl.h>
diff --git a/misc/heyu/patches/patch-ag b/misc/heyu/patches/patch-ag
index 06498487881..88fd39cd272 100644
--- a/misc/heyu/patches/patch-ag
+++ b/misc/heyu/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.5 2004/07/10 23:45:59 salo Exp $
+$NetBSD: patch-ag,v 1.6 2009/12/11 00:11:11 abs Exp $
 
---- install.sh.orig	2003-12-16 17:54:55.000000000 +0100
-+++ install.sh	2004-07-11 01:44:38.000000000 +0200
-@@ -17,7 +17,7 @@
+--- install.sh.orig	2003-12-16 16:54:55.000000000 +0000
++++ install.sh
+@@ -17,7 +17,7 @@ fi
  # Files:  x10config x10sched.conf
  FOUND=
  for FL in $X10CONFIG $HOME/.x10config /etc/x10.conf ; do
@@ -11,16 +11,16 @@ $NetBSD: patch-ag,v 1.5 2004/07/10 23:45:59 salo Exp $
      FOUND=$FL
      echo "An X10 Configuration file was found at $FL"
      break
-@@ -28,7 +28,7 @@
+@@ -28,7 +28,7 @@ if [ "$FOUND" = "" ] ; then
      while : ; do
  	echo "Where would you like the sample X10 configuration installed?"
  	echo "The default is $HOME/.x10config"
 -	read WHERE
-+	WHERE=${PREFIX}/share/examples/heyu/x10config
++	WHERE=${DESTDIR}${PREFIX}/share/examples/heyu/x10config
  	if [ "$WHERE" = "" ]  ; then
  	    FOUND=$HOME/.x10config
  	    break
-@@ -56,14 +56,9 @@
+@@ -56,14 +56,9 @@ if [ ! -f $FOUND ] ; then
  		    ;;
  	    esac
  	    echo "To which port is the CM11 attached?"
@@ -36,7 +36,7 @@ $NetBSD: patch-ag,v 1.5 2004/07/10 23:45:59 salo Exp $
  	done
  	sed "s;^TTY.*;TTY	$TTY;" x10config > $FOUND
  
-@@ -71,29 +66,22 @@
+@@ -71,29 +66,22 @@ fi
  
  echo "X10 configuration file at $FOUND will be used."
  
@@ -44,16 +44,16 @@ $NetBSD: patch-ag,v 1.5 2004/07/10 23:45:59 salo Exp $
 -if [ "$TTY" = "" ] ; then
 -    eval `sed -n "s/^OPTION[ 	]*TTY[ 	]*/TTY=/p" $FOUND `
 -fi
--
++if [ -c $TTY -o -h $TTY ]; then
++	eval `sed -n "s/^TTY[ 	]*/TTY=/p" $FOUND`
+ 
 -#Check TTY permisions
 -set `ls -l $TTY` none
 -if [ $1 = "none" ] ; then
 -    echo "fatal error:  The TTY device $TTY can not be located"
 -    exit
 -fi
-+if [ -c $TTY -o -h $TTY ]; then
-+	eval `sed -n "s/^TTY[ 	]*/TTY=/p" $FOUND`
- 
+-
 -if [ "$1" != crwxrwxrwx ] ; then
 -    if [ "$ME" != root ] ; then
 +	#Check TTY permisions