summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordmcmahill <dmcmahill>2002-08-12 12:06:35 +0000
committerdmcmahill <dmcmahill>2002-08-12 12:06:35 +0000
commitaf8e2f50d250db8c449f0c2b1246391dfceb2ad7 (patch)
treedeed3f63f6aa758b3f18da7f0081670f0411c83d
parentfb9f3cccf9a4f43040827149335678a80147d37e (diff)
downloadpkgsrc-af8e2f50d250db8c449f0c2b1246391dfceb2ad7.tar.gz
- use time_t for the time functions (needed on alpha)
- fix other time related bugs which prevent compilation - use DEFAULT_SERIAL_DEVICE for the example config file and don't enter an infinite loop if the device doesn't exist. - don't arbitrarily change device permissions.
-rw-r--r--misc/heyu/Makefile3
-rw-r--r--misc/heyu/distinfo7
-rw-r--r--misc/heyu/patches/patch-ae4
-rw-r--r--misc/heyu/patches/patch-ag61
-rw-r--r--misc/heyu/patches/patch-ah13
5 files changed, 75 insertions, 13 deletions
diff --git a/misc/heyu/Makefile b/misc/heyu/Makefile
index eff4a5a7285..19de4e2780b 100644
--- a/misc/heyu/Makefile
+++ b/misc/heyu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2002/07/02 14:03:48 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2002/08/12 12:06:35 dmcmahill Exp $
#
DISTNAME= x10_heyu
@@ -15,6 +15,7 @@ DIST_SUBDIR= ${PKGNAME}
CONFIGURE_SCRIPT= ./Configure
WRKSRC= ${WRKDIR}/heyu.dir
+MAKE_ENV+= DEFAULT_SERIAL_DEVICE=${DEFAULT_SERIAL_DEVICE}
pre-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/heyu
diff --git a/misc/heyu/distinfo b/misc/heyu/distinfo
index 5fb24f19309..cc8ef889bcc 100644
--- a/misc/heyu/distinfo
+++ b/misc/heyu/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2002/07/02 14:03:50 wiz Exp $
+$NetBSD: distinfo,v 1.4 2002/08/12 12:06:35 dmcmahill Exp $
SHA1 (x10_heyu-1.33/x10_heyu.tgz) = 73e588ca76c6402a911452bb68717c8c0ba8dbe7
Size (x10_heyu-1.33/x10_heyu.tgz) = 75670 bytes
@@ -6,6 +6,7 @@ SHA1 (patch-aa) = a0430f7d74c2e87017b8146447d913365ae45f0a
SHA1 (patch-ab) = 42e9cb8480b1526124dd286b37a1eb7eb819eb4c
SHA1 (patch-ac) = 502fc98e81fdda9f5269ab3b2d1a6338f3745b9c
SHA1 (patch-ad) = 2efc8ff608a5d5761e0a0e96244510756e0ad27a
-SHA1 (patch-ae) = d1c8aba7aadc28347c8fa180e8c3cf2d15aea5b6
+SHA1 (patch-ae) = 13ea9fa5d879794e91fe27f5c81726cced9f3ba3
SHA1 (patch-af) = f35f99727d31764d8c3445193f4b0469dc6308df
-SHA1 (patch-ag) = 053a71f18936ee326cc826bffcacf254a1d6cf76
+SHA1 (patch-ag) = bfbd15a56c65fb55de030812c7834db5bad8a7e4
+SHA1 (patch-ah) = 6c84d5b842f726c733452a985605b74fb9628bdb
diff --git a/misc/heyu/patches/patch-ae b/misc/heyu/patches/patch-ae
index ec4360103e8..133ac86f70d 100644
--- a/misc/heyu/patches/patch-ae
+++ b/misc/heyu/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.1 2002/07/02 14:03:53 wiz Exp $
+$NetBSD: patch-ae,v 1.2 2002/08/12 12:06:35 dmcmahill Exp $
--- Configure.orig Mon Apr 16 07:24:14 2001
+++ Configure
@@ -20,7 +20,7 @@ $NetBSD: patch-ae,v 1.1 2002/07/02 14:03:53 wiz Exp $
netbsd)
cat >> Makefile <<-EoF
- DFLAGS = -DPOSIX -DLOCKDIR=\"/var/spool/lock\"
-+ DFLAGS = -DPOSIX -DLOCKDIR=\"/var/spool/lock\" -DNETBSD
++ DFLAGS = -DPOSIX -DLOCKDIR=\"/var/spool/lock\" -DNETBSD -DNEEDGTIME
CC = gcc
CFLAGS = -g -O \$(DFLAGS) -Wall
LIBS = -lm -lc
diff --git a/misc/heyu/patches/patch-ag b/misc/heyu/patches/patch-ag
index 2a124bbcd56..2635768e4e9 100644
--- a/misc/heyu/patches/patch-ag
+++ b/misc/heyu/patches/patch-ag
@@ -1,6 +1,6 @@
-$NetBSD: patch-ag,v 1.1 2002/07/02 14:03:54 wiz Exp $
+$NetBSD: patch-ag,v 1.2 2002/08/12 12:06:36 dmcmahill Exp $
---- install.sh.orig Sat Jan 27 22:55:57 2001
+--- install.sh.orig Sat Jan 27 16:55:57 2001
+++ install.sh
@@ -28,7 +28,7 @@
while : ; do
@@ -11,12 +11,59 @@ $NetBSD: patch-ag,v 1.1 2002/07/02 14:03:54 wiz Exp $
if [ "$WHERE" = "" ] ; then
FOUND=$HOME/.x10config
break
-@@ -56,7 +56,7 @@
+@@ -56,38 +56,30 @@
;;
esac
echo "To which port is the CM11 attached?"
- read WHERE
-+ WHERE=/dev/tty01
- if [ "$WHERE" != "" ] ; then
- if [ -e $WHERE ] ; then
- TTY=$WHERE
+- if [ "$WHERE" != "" ] ; then
+- if [ -e $WHERE ] ; then
+- TTY=$WHERE
+- break
+- fi
+- echo "I could not find the device you specified. Please try again."
+- fi
++ WHERE=$DEFAULT_SERIAL_DEVICE
++ TTY=$WHERE
++ break
+ done
+ sed "s;^TTY.*;TTY $TTY;" x10config > $FOUND
+ fi
+
+ echo "X10 configuration file at $FOUND will be used."
+
+-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 [ -e $TTY ]; then
++ eval `sed -n "s/^TTY[ ]*/TTY=/p" $FOUND`
+
+-if [ "$1" != crwxrwxrwx ] ; then
+- if [ "$ME" != root ] ; then
+- echo "If you want users other than root to be able to run HEYU, "
+- echo "you'll have to log in as root and run the command \"chmod 777 $TTY\""
+- else
+- chmod 777 $TTY
+- fi
+-else
+- echo "The TTY permissions were OK."
++ #Check TTY permisions
++ set `ls -l $TTY` none
++ if [ $1 = "none" ] ; then
++ echo "WARNING: The TTY device $TTY can not be located"
++ else
++ if [ "$1" != crwxrwxrwx ] ; then
++ echo "If you want users other than root to be able to run HEYU, "
++ echo "you'll have to log in as root and run the command \"chmod 777 $TTY\""
++ else
++ echo "The TTY permissions were OK."
++ fi
++ fi
+ fi
+
+ # Directories: spool and lock
diff --git a/misc/heyu/patches/patch-ah b/misc/heyu/patches/patch-ah
new file mode 100644
index 00000000000..6546bda2ea2
--- /dev/null
+++ b/misc/heyu/patches/patch-ah
@@ -0,0 +1,13 @@
+$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);