Update to latest version

Tarball doesn't have version so remake distinfo
modify patches to work with new version

PR:		27850
Approved by:	maintainer

8 files changed, 58 insertions, 82 deletions

diff --git a/misc/heyu/Makefile b/misc/heyu/Makefile
index 7bdffffa0671..dd2b75d46e0a 100644
--- a/misc/heyu/Makefile
+++ b/misc/heyu/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	heyu
-PORTVERSION=	1.31.3
+PORTVERSION=	1.33
 CATEGORIES=	misc
 MASTER_SITES=	http://heyu.tanj.com/
 DISTNAME=	x10_heyu
@@ -14,8 +14,6 @@ EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	plambert@plambert.net
 
-BROKEN=		"Patches need to be upgraded."
-
 ALL_TARGET=	heyu
 WRKSRC=		${WRKDIR}/heyu.dir
 
@@ -26,6 +24,9 @@ MAN5=		x10config.5 \
 do-configure:
 	${PERL} -pi.orig -e 's|/usr/local|${PREFIX}|' ${WRKSRC}/Makefile
 
+pre-patch:
+	(cd ${WRKSRC} && ./Configure)
+
 post-install:
 	strip ${PREFIX}/bin/heyu
 .if !defined(NOPORTDOCS)
diff --git a/misc/heyu/distinfo b/misc/heyu/distinfo
index f7c84ef7479b..5be7a22a1c68 100644
--- a/misc/heyu/distinfo
+++ b/misc/heyu/distinfo
@@ -1 +1 @@
-MD5 (x10_heyu.tgz) = 3658c75cbcb32e9f924cf5cfa031fde4
+MD5 (x10_heyu.tgz) = a942f8ad37189317e6b119b1949de7c0
diff --git a/misc/heyu/files/patch-aa b/misc/heyu/files/patch-aa
index 05d5cb310c29..f43b34251723 100644
--- a/misc/heyu/files/patch-aa
+++ b/misc/heyu/files/patch-aa
@@ -1,42 +1,28 @@
---- Makefile.orig	Tue May 23 22:57:17 2000
-+++ Makefile	Sat May 27 17:06:28 2000
-@@ -4,7 +4,7 @@
+--- Makefile.orig	Sun Jun  3 01:19:23 2001
++++ Makefile	Sun Jun  3 01:20:28 2001
+@@ -5,7 +5,7 @@
  MAN = /usr/local/man/man1
  MAN5 = /usr/local/man/man5
  GROUP = sys
 -OWNER = bin
 +OWNER = root
  
+ #       set DFLAGS equal to:
+ #          -DSYSV       if using SYSTEM V
+@@ -13,9 +13,9 @@
  
- #	set DFLAGS equal to:
-@@ -16,14 +16,14 @@
- #LDFLAGS = -z -i
- #LIBS = -lm -lc_s		# uncomment if using shared libraries
+ #This makefile is built for freebsd
  CC = gcc
 -CFLAGS = -g -O $(DFLAGS) -Wall
 +#CFLAGS = -g -O $(DFLAGS) -Wall
  LIBS = -lm -lc
+-DFLAGS= -DHASSELECT -DNEEDGTIME -DFREEBSD
++DFLAGS= -DHASSELECT -DNEEDGTIME -DFREEBSD -DLOCKDIR=\"/var/tmp\"
+ # # The rest of the makefile should need no changes
  
- ##  For LINUX, use the following
- #DFLAGS = -DSYSV -DPOSIX -DHAS_ITIMER -DLINUX 
- CC = gcc
- CFLAGS = -g -O $(DFLAGS) -Wall
--DFLAGS = -DSYSV -DPOSIX -DHAS_ITIMER -DLINUX -DHASSELECT
-+#DFLAGS = -DSYSV -DPOSIX -DHAS_ITIMER -DLINUX -DHASSELECT
- #LIBS = -lm -lc_s		# uncomment if using shared libraries
- LIBS = -lm -lc			# uncoment if not using shared libraries
- 
-@@ -39,7 +39,7 @@
- # CC = gcc
- # CFLAGS = -g -O $(DFLAGS) -Wall
- # LIBS = -lm -lc
--# DFLAGS= -DHASSELECT
-+DFLAGS= -DHASSELECT -DLOCKDIR=\"/var/tmp\"
- 
- ## for Alpha, OSF1 v4.0 , Use this
- # GROUP = uucp
-@@ -80,9 +80,10 @@
- EVERYTHING = $(OTHERSRC) $(SRCS)
+ ## Makefile template for Heyu, a program to control an X10 CM11A computer
+@@ -42,9 +42,10 @@
+ all:	heyu dawndusk
  
  heyu:	$(OBJS) version.h
 -	$(CC) $(LDFLAGS) -o heyu $(OBJS) $(LIBS)
diff --git a/misc/heyu/files/patch-ab b/misc/heyu/files/patch-ab
index 8e934f962f74..a5c23b130d4c 100644
--- a/misc/heyu/files/patch-ab
+++ b/misc/heyu/files/patch-ab
@@ -1,11 +1,12 @@
---- xwrite.c.orig	Sat May 27 17:07:40 2000
-+++ xwrite.c	Sat May 27 17:08:09 2000
-@@ -30,7 +30,7 @@
- #include <unistd.h>
- #include <syslog.h>
- #else
--# ifndef POSIX
-+# if !defined(POSIX) && !defined(__FreeBSD__)
+--- xwrite.c.orig	Sun Jun  3 01:13:55 2001
++++ xwrite.c	Sun Jun  3 01:16:43 2001
+@@ -42,7 +42,9 @@
+ #         ifdef SCO
+ #include <sys/termio.h>
+ #         else
++#		if !defined(POSIX) && !defined(__FreeBSD__)
  #include <termio.h>
- # else
- #include <sys/termios.h>
++#		endif
+ #         endif
+ #    endif
+ #endif
diff --git a/misc/heyu2/Makefile b/misc/heyu2/Makefile
index 7bdffffa0671..dd2b75d46e0a 100644
--- a/misc/heyu2/Makefile
+++ b/misc/heyu2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	heyu
-PORTVERSION=	1.31.3
+PORTVERSION=	1.33
 CATEGORIES=	misc
 MASTER_SITES=	http://heyu.tanj.com/
 DISTNAME=	x10_heyu
@@ -14,8 +14,6 @@ EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	plambert@plambert.net
 
-BROKEN=		"Patches need to be upgraded."
-
 ALL_TARGET=	heyu
 WRKSRC=		${WRKDIR}/heyu.dir
 
@@ -26,6 +24,9 @@ MAN5=		x10config.5 \
 do-configure:
 	${PERL} -pi.orig -e 's|/usr/local|${PREFIX}|' ${WRKSRC}/Makefile
 
+pre-patch:
+	(cd ${WRKSRC} && ./Configure)
+
 post-install:
 	strip ${PREFIX}/bin/heyu
 .if !defined(NOPORTDOCS)
diff --git a/misc/heyu2/distinfo b/misc/heyu2/distinfo
index f7c84ef7479b..5be7a22a1c68 100644
--- a/misc/heyu2/distinfo
+++ b/misc/heyu2/distinfo
@@ -1 +1 @@
-MD5 (x10_heyu.tgz) = 3658c75cbcb32e9f924cf5cfa031fde4
+MD5 (x10_heyu.tgz) = a942f8ad37189317e6b119b1949de7c0
diff --git a/misc/heyu2/files/patch-aa b/misc/heyu2/files/patch-aa
index 05d5cb310c29..f43b34251723 100644
--- a/misc/heyu2/files/patch-aa
+++ b/misc/heyu2/files/patch-aa
@@ -1,42 +1,28 @@
---- Makefile.orig	Tue May 23 22:57:17 2000
-+++ Makefile	Sat May 27 17:06:28 2000
-@@ -4,7 +4,7 @@
+--- Makefile.orig	Sun Jun  3 01:19:23 2001
++++ Makefile	Sun Jun  3 01:20:28 2001
+@@ -5,7 +5,7 @@
  MAN = /usr/local/man/man1
  MAN5 = /usr/local/man/man5
  GROUP = sys
 -OWNER = bin
 +OWNER = root
  
+ #       set DFLAGS equal to:
+ #          -DSYSV       if using SYSTEM V
+@@ -13,9 +13,9 @@
  
- #	set DFLAGS equal to:
-@@ -16,14 +16,14 @@
- #LDFLAGS = -z -i
- #LIBS = -lm -lc_s		# uncomment if using shared libraries
+ #This makefile is built for freebsd
  CC = gcc
 -CFLAGS = -g -O $(DFLAGS) -Wall
 +#CFLAGS = -g -O $(DFLAGS) -Wall
  LIBS = -lm -lc
+-DFLAGS= -DHASSELECT -DNEEDGTIME -DFREEBSD
++DFLAGS= -DHASSELECT -DNEEDGTIME -DFREEBSD -DLOCKDIR=\"/var/tmp\"
+ # # The rest of the makefile should need no changes
  
- ##  For LINUX, use the following
- #DFLAGS = -DSYSV -DPOSIX -DHAS_ITIMER -DLINUX 
- CC = gcc
- CFLAGS = -g -O $(DFLAGS) -Wall
--DFLAGS = -DSYSV -DPOSIX -DHAS_ITIMER -DLINUX -DHASSELECT
-+#DFLAGS = -DSYSV -DPOSIX -DHAS_ITIMER -DLINUX -DHASSELECT
- #LIBS = -lm -lc_s		# uncomment if using shared libraries
- LIBS = -lm -lc			# uncoment if not using shared libraries
- 
-@@ -39,7 +39,7 @@
- # CC = gcc
- # CFLAGS = -g -O $(DFLAGS) -Wall
- # LIBS = -lm -lc
--# DFLAGS= -DHASSELECT
-+DFLAGS= -DHASSELECT -DLOCKDIR=\"/var/tmp\"
- 
- ## for Alpha, OSF1 v4.0 , Use this
- # GROUP = uucp
-@@ -80,9 +80,10 @@
- EVERYTHING = $(OTHERSRC) $(SRCS)
+ ## Makefile template for Heyu, a program to control an X10 CM11A computer
+@@ -42,9 +42,10 @@
+ all:	heyu dawndusk
  
  heyu:	$(OBJS) version.h
 -	$(CC) $(LDFLAGS) -o heyu $(OBJS) $(LIBS)
diff --git a/misc/heyu2/files/patch-ab b/misc/heyu2/files/patch-ab
index 8e934f962f74..a5c23b130d4c 100644
--- a/misc/heyu2/files/patch-ab
+++ b/misc/heyu2/files/patch-ab
@@ -1,11 +1,12 @@
---- xwrite.c.orig	Sat May 27 17:07:40 2000
-+++ xwrite.c	Sat May 27 17:08:09 2000
-@@ -30,7 +30,7 @@
- #include <unistd.h>
- #include <syslog.h>
- #else
--# ifndef POSIX
-+# if !defined(POSIX) && !defined(__FreeBSD__)
+--- xwrite.c.orig	Sun Jun  3 01:13:55 2001
++++ xwrite.c	Sun Jun  3 01:16:43 2001
+@@ -42,7 +42,9 @@
+ #         ifdef SCO
+ #include <sys/termio.h>
+ #         else
++#		if !defined(POSIX) && !defined(__FreeBSD__)
  #include <termio.h>
- # else
- #include <sys/termios.h>
++#		endif
+ #         endif
+ #    endif
+ #endif