Update to version 1.35.

6 files changed, 8 insertions, 80 deletions

diff --git a/misc/heyu/Makefile b/misc/heyu/Makefile
index 662fb6eb4a76..d48106bdc139 100644
--- a/misc/heyu/Makefile
+++ b/misc/heyu/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	heyu
-PORTVERSION=	1.33
+PORTVERSION=	1.35
 CATEGORIES=	misc
 MASTER_SITES=	http://heyu.tanj.com/
 DISTNAME=	x10_heyu
@@ -15,18 +15,17 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	plambert@plambert.net
 COMMENT=	Control a CM11A interface from the command line
 
-BROKEN=		"Checksum fails"
-
 IS_INTERACTIVE=	yes
 ALL_TARGET=	heyu
 WRKSRC=		${WRKDIR}/heyu.dir
+USE_REINPLACE=	yes
 
 MAN1=		heyu.1
 MAN5=		x10config.5 \
 		x10sched.5
 
 do-configure:
-	${PERL} -pi.orig -e 's|/usr/local|${PREFIX}|' ${WRKSRC}/Makefile
+	${REINPLACE_CMD} 's|/usr/local|${PREFIX}|' ${WRKSRC}/Makefile
 
 pre-patch:
 	(cd ${WRKSRC} && ./Configure)
diff --git a/misc/heyu/distinfo b/misc/heyu/distinfo
index 5be7a22a1c68..d3939a9ea8db 100644
--- a/misc/heyu/distinfo
+++ b/misc/heyu/distinfo
@@ -1 +1 @@
-MD5 (x10_heyu.tgz) = a942f8ad37189317e6b119b1949de7c0
+MD5 (x10_heyu.tgz) = 4622d3f9a85341f209656dff893c967e
diff --git a/misc/heyu/files/patch-aa b/misc/heyu/files/patch-aa
deleted file mode 100644
index f43b34251723..000000000000
--- a/misc/heyu/files/patch-aa
+++ /dev/null
@@ -1,35 +0,0 @@
---- 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 @@
- 
- #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
- 
- ## 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)
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(DFLAGS) -o heyu $(OBJS) $(LIBS)
- 
- $(OBJS): x10.h
-+	$(CC) $(CFLAGS) $(DFLAGS) -c $<
- 
- eeprom.o:	eeprom.h
- 
diff --git a/misc/heyu2/Makefile b/misc/heyu2/Makefile
index 662fb6eb4a76..d48106bdc139 100644
--- a/misc/heyu2/Makefile
+++ b/misc/heyu2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	heyu
-PORTVERSION=	1.33
+PORTVERSION=	1.35
 CATEGORIES=	misc
 MASTER_SITES=	http://heyu.tanj.com/
 DISTNAME=	x10_heyu
@@ -15,18 +15,17 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	plambert@plambert.net
 COMMENT=	Control a CM11A interface from the command line
 
-BROKEN=		"Checksum fails"
-
 IS_INTERACTIVE=	yes
 ALL_TARGET=	heyu
 WRKSRC=		${WRKDIR}/heyu.dir
+USE_REINPLACE=	yes
 
 MAN1=		heyu.1
 MAN5=		x10config.5 \
 		x10sched.5
 
 do-configure:
-	${PERL} -pi.orig -e 's|/usr/local|${PREFIX}|' ${WRKSRC}/Makefile
+	${REINPLACE_CMD} 's|/usr/local|${PREFIX}|' ${WRKSRC}/Makefile
 
 pre-patch:
 	(cd ${WRKSRC} && ./Configure)
diff --git a/misc/heyu2/distinfo b/misc/heyu2/distinfo
index 5be7a22a1c68..d3939a9ea8db 100644
--- a/misc/heyu2/distinfo
+++ b/misc/heyu2/distinfo
@@ -1 +1 @@
-MD5 (x10_heyu.tgz) = a942f8ad37189317e6b119b1949de7c0
+MD5 (x10_heyu.tgz) = 4622d3f9a85341f209656dff893c967e
diff --git a/misc/heyu2/files/patch-aa b/misc/heyu2/files/patch-aa
deleted file mode 100644
index f43b34251723..000000000000
--- a/misc/heyu2/files/patch-aa
+++ /dev/null
@@ -1,35 +0,0 @@
---- 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 @@
- 
- #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
- 
- ## 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)
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(DFLAGS) -o heyu $(OBJS) $(LIBS)
- 
- $(OBJS): x10.h
-+	$(CC) $(CFLAGS) $(DFLAGS) -c $<
- 
- eeprom.o:	eeprom.h
-