diff options
Diffstat (limited to 'misc/heyu')
-rw-r--r-- | misc/heyu/Makefile | 9 | ||||
-rw-r--r-- | misc/heyu/PLIST | 6 | ||||
-rw-r--r-- | misc/heyu/distinfo | 21 | ||||
-rw-r--r-- | misc/heyu/patches/patch-aa | 16 | ||||
-rw-r--r-- | misc/heyu/patches/patch-ab | 6 | ||||
-rw-r--r-- | misc/heyu/patches/patch-ac | 6 | ||||
-rw-r--r-- | misc/heyu/patches/patch-ad | 14 | ||||
-rw-r--r-- | misc/heyu/patches/patch-ae | 10 | ||||
-rw-r--r-- | misc/heyu/patches/patch-af | 8 | ||||
-rw-r--r-- | misc/heyu/patches/patch-ag | 22 | ||||
-rw-r--r-- | misc/heyu/patches/patch-ah | 13 |
11 files changed, 68 insertions, 63 deletions
diff --git a/misc/heyu/Makefile b/misc/heyu/Makefile index 4f74ac5c37f..96933245b72 100644 --- a/misc/heyu/Makefile +++ b/misc/heyu/Makefile @@ -1,19 +1,18 @@ -# $NetBSD: Makefile,v 1.7 2003/10/25 16:58:31 kristerw Exp $ +# $NetBSD: Makefile,v 1.8 2003/11/11 10:17:39 wiz Exp $ # DISTNAME= x10_heyu -PKGNAME= x10_heyu-1.33 +PKGNAME= x10_heyu-1.35 WRKSRC= ${WRKDIR}/heyu.dir CATEGORIES= misc -MASTER_SITES= ${MASTER_SITE_BACKUP:=x10_heyu-1.33/} -# MASTER_SITES= http://heyu.tanj.com/ +MASTER_SITES= http://heyu.tanj.com/ EXTRACT_SUFX= .tgz MAINTAINER= damon@brodiefamily.org HOMEPAGE= http://heyu.tanj.com/ COMMENT= Home Automation Software for the X10 CM11A -DIST_SUBDIR= ${PKGNAME} +DIST_SUBDIR= ${PKGNAME_NOREV} CONFIGURE_SCRIPT= ./Configure MAKE_ENV+= DEFAULT_SERIAL_DEVICE=${DEFAULT_SERIAL_DEVICE} diff --git a/misc/heyu/PLIST b/misc/heyu/PLIST index 510d8662e0a..738af04b1e0 100644 --- a/misc/heyu/PLIST +++ b/misc/heyu/PLIST @@ -1,6 +1,10 @@ -@comment $NetBSD: PLIST,v 1.2 2002/07/02 14:03:49 wiz Exp $ +@comment $NetBSD: PLIST,v 1.3 2003/11/11 10:17:39 wiz Exp $ +bin/dawndusk bin/heyu +bin/heyuhelper +bin/makesched man/man1/heyu.1 +man/man1/heyuhelper.1 man/man5/x10config.5 man/man5/x10sched.5 share/examples/heyu/x10config diff --git a/misc/heyu/distinfo b/misc/heyu/distinfo index cc8ef889bcc..e1885015c78 100644 --- a/misc/heyu/distinfo +++ b/misc/heyu/distinfo @@ -1,12 +1,11 @@ -$NetBSD: distinfo,v 1.4 2002/08/12 12:06:35 dmcmahill Exp $ +$NetBSD: distinfo,v 1.5 2003/11/11 10:17:39 wiz Exp $ -SHA1 (x10_heyu-1.33/x10_heyu.tgz) = 73e588ca76c6402a911452bb68717c8c0ba8dbe7 -Size (x10_heyu-1.33/x10_heyu.tgz) = 75670 bytes -SHA1 (patch-aa) = a0430f7d74c2e87017b8146447d913365ae45f0a -SHA1 (patch-ab) = 42e9cb8480b1526124dd286b37a1eb7eb819eb4c -SHA1 (patch-ac) = 502fc98e81fdda9f5269ab3b2d1a6338f3745b9c -SHA1 (patch-ad) = 2efc8ff608a5d5761e0a0e96244510756e0ad27a -SHA1 (patch-ae) = 13ea9fa5d879794e91fe27f5c81726cced9f3ba3 -SHA1 (patch-af) = f35f99727d31764d8c3445193f4b0469dc6308df -SHA1 (patch-ag) = bfbd15a56c65fb55de030812c7834db5bad8a7e4 -SHA1 (patch-ah) = 6c84d5b842f726c733452a985605b74fb9628bdb +SHA1 (x10_heyu-1.35/x10_heyu.tgz) = 065273694fa8f94687203d476abfa8683f882b46 +Size (x10_heyu-1.35/x10_heyu.tgz) = 83935 bytes +SHA1 (patch-aa) = 26c4304ee18f0bb2d585eb1ff0338576aee88668 +SHA1 (patch-ab) = 091615c3e1c9d927294512cd557fc6a87b1e5f99 +SHA1 (patch-ac) = 345bf95e4ee0df554bbc635e0f8913ca0f66b987 +SHA1 (patch-ad) = 5f52f30820f5ed8da10fbc650980137a738c1c78 +SHA1 (patch-ae) = a40e699a3f02a71cecc7539e34393b5d617bb20d +SHA1 (patch-af) = 3cf25e4abac4e0dd52398381a1c304e2d0ebfc94 +SHA1 (patch-ag) = 40a7dc3a07e5b1cc47ae8ab89d66a8b1a9e53ce5 diff --git a/misc/heyu/patches/patch-aa b/misc/heyu/patches/patch-aa index b4c6cc04af3..97462c20ad0 100644 --- a/misc/heyu/patches/patch-aa +++ b/misc/heyu/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.5 2002/08/08 13:11:32 wiz Exp $ +$NetBSD: patch-aa,v 1.6 2003/11/11 10:17:39 wiz Exp $ ---- stop.c.orig Thu Dec 7 06:42:20 2000 +--- stop.c.orig Sun Mar 30 22:05:53 2003 +++ stop.c -@@ -33,9 +33,11 @@ +@@ -35,17 +35,21 @@ int argc; char *argv[]; { unsigned long pid; @@ -12,5 +12,15 @@ $NetBSD: patch-aa,v 1.5 2002/08/08 13:11:32 wiz Exp $ char procname[80]; +#endif extern unsigned long lockpid(); + extern char *make_lock_name(); extern void quit(); + pid = lockpid(make_lock_name(monfile)); ++#ifdef __linux__ + procname[0] = 0; + buf[0] = 0; + pidfile = (FILE *) NULL; ++#endif + + if( pid == 0 ) + { diff --git a/misc/heyu/patches/patch-ab b/misc/heyu/patches/patch-ab index cee30d890e9..4dc621852cd 100644 --- a/misc/heyu/patches/patch-ab +++ b/misc/heyu/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.2 2002/07/02 14:03:51 wiz Exp $ +$NetBSD: patch-ab,v 1.3 2003/11/11 10:17:39 wiz Exp $ ---- heyu.1.orig Sun May 28 20:26:25 2000 +--- heyu.1.orig Sun Jul 20 00:38:08 2003 +++ heyu.1 -@@ -242,7 +242,7 @@ +@@ -267,7 +267,7 @@ See \fix10sched(5)\fR for more informati .br .x10sched.conf - CM11A schedule information for timers and macros. .br diff --git a/misc/heyu/patches/patch-ac b/misc/heyu/patches/patch-ac index dabca84e1b0..c07437b9dd6 100644 --- a/misc/heyu/patches/patch-ac +++ b/misc/heyu/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.2 2002/07/02 14:03:52 wiz Exp $ +$NetBSD: patch-ac,v 1.3 2003/11/11 10:17:39 wiz Exp $ ---- tty.c.orig Sat Feb 10 21:45:49 2001 +--- tty.c.orig Sun Mar 30 22:57:59 2003 +++ tty.c -@@ -92,7 +92,12 @@ +@@ -93,7 +93,12 @@ struct sgttyb oldsb, newsb; #endif struct termio oldsb, newsb; #else diff --git a/misc/heyu/patches/patch-ad b/misc/heyu/patches/patch-ad index 51efd1de67a..c18b0724602 100644 --- a/misc/heyu/patches/patch-ad +++ b/misc/heyu/patches/patch-ad @@ -1,8 +1,8 @@ -$NetBSD: patch-ad,v 1.2 2002/07/02 14:03:52 wiz Exp $ +$NetBSD: patch-ad,v 1.3 2003/11/11 10:17:39 wiz Exp $ ---- xread.c.orig Wed Apr 11 06:49:48 2001 +--- xread.c.orig Tue Mar 18 00:23:30 2003 +++ xread.c -@@ -28,7 +28,7 @@ +@@ -24,7 +24,7 @@ #include <stdio.h> #include <signal.h> #include <setjmp.h> @@ -11,7 +11,7 @@ $NetBSD: patch-ad,v 1.2 2002/07/02 14:03:52 wiz Exp $ #include <errno.h> #else #include <sys/errno.h> -@@ -36,7 +36,7 @@ +@@ -32,7 +32,7 @@ #include <syslog.h> #include <unistd.h> #include "x10.h" @@ -20,10 +20,10 @@ $NetBSD: patch-ad,v 1.2 2002/07/02 14:03:52 wiz Exp $ #include <string.h> /* char *strerror(); */ #endif -@@ -128,7 +128,7 @@ - if( (i < 0) && (i_am_relay != 1) ) +@@ -130,7 +130,7 @@ unsigned char *buf; + if( (i < 0) && (i_am_relay == 1) ) { - syslog(LOG_ERR,"Xread read error"); + syslog(LOG_ERR,"Relay Xread read error"); - syslog(LOG_ERR, strerror(errno)); + syslog(LOG_ERR, "%s", strerror(errno)); } diff --git a/misc/heyu/patches/patch-ae b/misc/heyu/patches/patch-ae index 133ac86f70d..bc46ee2dc94 100644 --- a/misc/heyu/patches/patch-ae +++ b/misc/heyu/patches/patch-ae @@ -1,8 +1,8 @@ -$NetBSD: patch-ae,v 1.2 2002/08/12 12:06:35 dmcmahill Exp $ +$NetBSD: patch-ae,v 1.3 2003/11/11 10:17:39 wiz Exp $ ---- Configure.orig Mon Apr 16 07:24:14 2001 +--- Configure.orig Mon Mar 31 08:58:14 2003 +++ Configure -@@ -15,9 +15,9 @@ +@@ -15,9 +15,9 @@ EoF # paths: cat >> Makefile <<EoF @@ -13,9 +13,9 @@ $NetBSD: patch-ae,v 1.2 2002/08/12 12:06:35 dmcmahill Exp $ +MAN = ${PREFIX}/man/man1 +MAN5 = ${PREFIX}/man/man5 GROUP = sys - OWNER = bin + OWNER = root -@@ -111,7 +111,7 @@ +@@ -117,7 +117,7 @@ EoF ;; netbsd) cat >> Makefile <<-EoF diff --git a/misc/heyu/patches/patch-af b/misc/heyu/patches/patch-af index 27f3cc20e80..83f9ca773cd 100644 --- a/misc/heyu/patches/patch-af +++ b/misc/heyu/patches/patch-af @@ -1,9 +1,9 @@ -$NetBSD: patch-af,v 1.1 2002/07/02 14:03:54 wiz Exp $ +$NetBSD: patch-af,v 1.2 2003/11/11 10:17:39 wiz Exp $ ---- xwrite.c.orig Wed Apr 11 06:46:26 2001 +--- xwrite.c.orig Sun Mar 30 22:30:31 2003 +++ xwrite.c -@@ -47,7 +47,7 @@ - # endif +@@ -48,7 +48,7 @@ + #include <sys/ioctl.h> #endif -#ifdef OSF diff --git a/misc/heyu/patches/patch-ag b/misc/heyu/patches/patch-ag index 2635768e4e9..f87ca439eda 100644 --- a/misc/heyu/patches/patch-ag +++ b/misc/heyu/patches/patch-ag @@ -1,8 +1,8 @@ -$NetBSD: patch-ag,v 1.2 2002/08/12 12:06:36 dmcmahill Exp $ +$NetBSD: patch-ag,v 1.3 2003/11/11 10:17:39 wiz Exp $ ---- install.sh.orig Sat Jan 27 16:55:57 2001 +--- install.sh.orig Tue Sep 4 05:11:45 2001 +++ install.sh -@@ -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" @@ -11,7 +11,7 @@ $NetBSD: patch-ag,v 1.2 2002/08/12 12:06:36 dmcmahill Exp $ if [ "$WHERE" = "" ] ; then FOUND=$HOME/.x10config break -@@ -56,38 +56,30 @@ +@@ -56,14 +56,9 @@ if [ ! -f $FOUND ] ; then ;; esac echo "To which port is the CM11 attached?" @@ -27,12 +27,16 @@ $NetBSD: patch-ag,v 1.2 2002/08/12 12:06:36 dmcmahill Exp $ + TTY=$WHERE + break done - sed "s;^TTY.*;TTY $TTY;" x10config > $FOUND - fi + sed "s;^TTY.*;OPTION TTY $TTY;" x10config > $FOUND + +@@ -71,29 +66,22 @@ fi echo "X10 configuration file at $FOUND will be used." --eval `sed -n "s/^TTY[ ]*/TTY=/p" $FOUND` +-eval `sed -n "s/^TTY[ ]*/TTY=/p" $FOUND ` +-if [ "$TTY" = "" ] ; then +- eval `sed -n "s/^OPTION[ ]*TTY[ ]*/TTY=/p" $FOUND ` +-fi - -#Check TTY permisions -set `ls -l $TTY` none @@ -65,5 +69,7 @@ $NetBSD: patch-ag,v 1.2 2002/08/12 12:06:36 dmcmahill Exp $ + fi + fi fi - +- # Directories: spool and lock + # get the lockdir and spooldir compile options by using the hidden option 'list' + eval `./heyu list` diff --git a/misc/heyu/patches/patch-ah b/misc/heyu/patches/patch-ah deleted file mode 100644 index 6546bda2ea2..00000000000 --- a/misc/heyu/patches/patch-ah +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ah,v 1.1 2002/08/12 12:06:36 dmcmahill Exp $ - ---- sunrise.c.orig Wed Apr 11 00:31:55 2001 -+++ sunrise.c -@@ -41,7 +41,7 @@ - { - - struct tm *tp; -- long now; -+ time_t now; - - if(time_to_set == 0 ) - time(&now); |