Index: head/misc/heyu2/Makefile
===================================================================
--- head/misc/heyu2/Makefile	(revision 156700)
+++ head/misc/heyu2/Makefile	(revision 156701)
@@ -1,47 +1,61 @@
 # New ports collection makefile for:	heyu2
 # Date created:		29 March 2004
 # Whom:			mstowe@chicago.us.mensa.org
 #
 # $FreeBSD$
 #
 
 PORTNAME=	heyu2
-PORTVERSION=	2.0.b.2
-PORTREVISION=	1
+PORTVERSION=	2.0.b.4
+PORTREVISION=	0
 CATEGORIES=	misc
-MASTER_SITES=	http://heyu.tanj.com/heyu2/
-DISTNAME=	heyu-2.0beta.2
+MASTER_SITES=	http://www.heyu.org/download/
+DISTNAME=	heyu-2.0beta.4
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	mstowe@chicago.us.mensa.org
 COMMENT=	Control a CM11A interface from the command line
 
-CONFLICTS=	heyu-*
+CONFLICTS=	heyu-[0-9]*
 
 #IS_INTERACTIVE=	yes
 ALL_TARGET=	all
-WRKSRC=		${WRKDIR}/heyu-2.0beta.2
-USE_REINPLACE=	yes
+WRKSRC=		${WRKDIR}/heyu-2.0beta.4
 HAS_CONFIGURE=	yes
 CONFIGURE_SCRIPT=	Configure
 CONFIGURE_ARGS=	freebsd
 
 MAN1=		heyu.1
 MAN5=		x10config.5 \
 		x10sched.5 \
 		x10scripts.5
 
+.include <bsd.port.pre.mk>
+
 post-patch:
-	${REINPLACE_CMD} 's|/usr/local|${PREFIX}|' ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -E 's|/usr/local|${PREFIX}|g; \
+			     s,(CC|CFLAGS) =,\1 ?=,g' \
+		${WRKSRC}/Configure
+.if ${OSVERSION} >= 500000
+	@${REINPLACE_CMD} -e 's|<.*termio[s]*.h|<sys/ttycom.h|g' \
+		${WRKSRC}/cm17a.c \
+		${WRKSRC}/xsync.c \
+		${WRKSRC}/xwrite.c
+.else
+	@${REINPLACE_CMD} -e 's|<.*termio[s]*.h|<sys/termios.h|g' \
+		${WRKSRC}/cm17a.c \
+		${WRKSRC}/xsync.c \
+		${WRKSRC}/xwrite.c
+.endif
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/heyu ${PREFIX}/bin
 	${MKDIR} ${EXAMPLESDIR}
 	${INSTALL_MAN} ${WRKSRC}/heyu.1 ${MAN1PREFIX}/man/man1
 	${INSTALL_MAN} ${WRKSRC}/x10config.5 ${MAN5PREFIX}/man/man5
 	${INSTALL_MAN} ${WRKSRC}/x10sched.5 ${MAN5PREFIX}/man/man5
 	${INSTALL_MAN} ${WRKSRC}/x10scripts.5 ${MAN5PREFIX}/man/man5
 	${INSTALL_DATA} ${WRKSRC}/x10config.sample ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/x10.sched.sample ${EXAMPLESDIR}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>

Property changes on: head/misc/heyu2/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.18
\ No newline at end of property
+1.19
\ No newline at end of property
Index: head/misc/heyu2/distinfo
===================================================================
--- head/misc/heyu2/distinfo	(revision 156700)
+++ head/misc/heyu2/distinfo	(revision 156701)
@@ -1,3 +1,3 @@
-MD5 (heyu-2.0beta.2.tgz) = b7bd60580f74998ae7733e4711942c74
-SHA256 (heyu-2.0beta.2.tgz) = ea52ff50e68dd03b8c3dda683aeea72f6a4438f06a15322f49fbe801658bee1f
-SIZE (heyu-2.0beta.2.tgz) = 261948
+MD5 (heyu-2.0beta.4.tgz) = f9b1dfa3aea57254e8a76a558cb0be96
+SHA256 (heyu-2.0beta.4.tgz) = c37072e3379a8dc35787c6cb2c6f27844d210c70de2636158eeda0c3c59480a9
+SIZE (heyu-2.0beta.4.tgz) = 296904

Property changes on: head/misc/heyu2/distinfo
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.13
\ No newline at end of property
+1.14
\ No newline at end of property
Index: head/misc/heyu2/files/patch-Configure
===================================================================
--- head/misc/heyu2/files/patch-Configure	(revision 156700)
+++ head/misc/heyu2/files/patch-Configure	(revision 156701)
@@ -1,11 +1,11 @@
---- Configure.orig	Sun Jul 17 00:07:33 2005
-+++ Configure	Sun Jul 17 00:07:50 2005
-@@ -84,7 +84,7 @@
+--- Configure.orig	Sun Jan 15 18:38:43 2006
++++ Configure	Wed Feb 22 18:10:48 2006
+@@ -89,7 +89,7 @@
  		CC = gcc
  		CFLAGS = -g -O \$(DFLAGS) -Wall
  		LIBS = -lm -lc
--		DFLAGS= -DHASSELECT -DNEEDGTIME -DFREEBSD
-+		DFLAGS= -DHASSELECT -DNEEDGTIME -DFREEBSD -DLOCKDIR=\"/var/spool/lock\"
+-		DFLAGS= -DHASSELECT -DNEEDGTIME -DFREEBSD $CM17AFLAG
++		DFLAGS= -DHASSELECT -DNEEDGTIME -DFREEBSD -DLOCKDIR=\"/var/spool/lock\" $CM17AFLAG
  EoF
  	;;
      sco*)

Property changes on: head/misc/heyu2/files/patch-Configure
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1
\ No newline at end of property
+1.2
\ No newline at end of property