* Don't reference yyrcsid[], which yacc doesn't include any longer.

* A hyphen in a package version is illegal.

ok ajacoutot@

sysutils/heartbeat/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2009/04/26 11:01:05 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.8 2009/10/31 20:27:51 naddy Exp $
 
 SHARED_ONLY=	Yes
 
@@ -6,11 +6,11 @@ COMMENT-main=	Linux HA cluster suite
 COMMENT-gui=	GUI management tool for heartbeat
 COMMENT-snmp=	snmp agent for heartbeat
 
-VERSION=	2.1.2-15
-DISTNAME=	obs-${VERSION}
+DISTNAME=	obs-2.1.2-15
+VERSION=	2.1.2.15
 PKGNAME=	heartbeat-${VERSION}
-PKGNAME-main=	heartbeat-${VERSION}p1
-PKGNAME-gui=	heartbeat-gui-${VERSION}p0
+PKGNAME-main=	heartbeat-${VERSION}
+PKGNAME-gui=	heartbeat-gui-${VERSION}
 PKGNAME-snmp=	heartbeat-snmp-${VERSION}
 
 EXTRACT_SUFX=   .tar.bz2

sysutils/heartbeat/patches/patch-telecom_recoverymgrd_conf_yacc_y

@@ -0,0 +1,33 @@
+$OpenBSD: patch-telecom_recoverymgrd_conf_yacc_y,v 1.1 2009/10/31 20:27:51 naddy Exp $
+
+Our yacc does not include a predefined variable yyrcsid[] any longer.
+It also does not throw a warning.
+
+--- telecom/recoverymgrd/conf_yacc.y.orig	Fri Oct 30 11:07:38 2009
++++ telecom/recoverymgrd/conf_yacc.y	Fri Oct 30 11:09:17 2009
+@@ -37,16 +37,6 @@
+ extern int yylex(void);
+ /* #define DEBUG */
+ 
+-/* This conditional may not be a truly adequate test */
+-
+-#ifdef YYBYACC
+-#	define	MAKE_WARNINGS_GO_AWAY	{			\
+-						(void)yyrcsid;	\
+-					}
+-#else
+-#	define	MAKE_WARNINGS_GO_AWAY	/* Nothing */
+-#endif
+-
+ int yyget_lineno(void);
+ 
+ 
+@@ -62,7 +52,7 @@ int yyget_lineno(void);
+ commands: command commands 
+ 	| command
+ 	{
+-		MAKE_WARNINGS_GO_AWAY
++		/* Nothing */
+ 	};
+ 
+ command: userinfo FILENAME OPEN_CURLY events