- Conditionalize PKGNAMESUFFIX and LATEST_LINK for sysutils/cfengine34

if MASTERDIR is not set.[1]

- Add sysutils/cfengine back to INDEX.

- While here, add PKGNAMESUFFIX for other cfengine ports for consistency.

Submitted by:	bapt [1]
Approved by:	cy (maintainer, implicit)

sysutils/Makefile

@@ -106,6 +106,7 @@
     SUBDIR += cdrtools
     SUBDIR += cdrtools-devel
     SUBDIR += cfengine-devel
+    SUBDIR += cfengine
     SUBDIR += cfengine22
     SUBDIR += cfengine32
     SUBDIR += cfengine33

sysutils/cfengine22/Makefile

@@ -9,6 +9,7 @@ PORTNAME=	cfengine
 PORTVERSION=	2.2.10
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.cfengine.org/tarballs/
+PKGNAMESUFFIX=	22
 
 MAINTAINER=	cy@FreeBSD.org
 #		gjb@FreeBSD.org is also committer for this port

sysutils/cfengine32/Makefile

@@ -11,6 +11,7 @@ PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://cfengine.com/source-code/download?file=
+PKGNAMESUFFIX=	32
 
 MAINTAINER=	cy@FreeBSD.org
 #		gjb@FreeBSD.org is an alternate committer for this port

sysutils/cfengine33/Makefile

@@ -7,6 +7,7 @@ PORTVERSION=	3.3.8
 PORTREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://cfengine.com/source-code/download?file=
+PKGNAMESUFFIX=	33
 
 MAINTAINER=	cy@FreeBSD.org
 #		gjb@FreeBSD.org is also committer for this port

sysutils/cfengine34/Makefile

@@ -10,7 +10,11 @@ MAINTAINER=	cy@FreeBSD.org
 #		gjb@FreeBSD.org is also committer for this port
 COMMENT=	A systems administration tool for networks
 
+.if !defined(MASTERDIR)
+PKGNAMESUFFIX=	34
 LATEST_LINK=	cfengine34
+.endif
+
 FETCH_BEFORE_ARGS=	-o ${DISTDIR}/${DISTFILES}
 
 CONFLICTS=	cfengine-2* cfengine-3.[23]* cfengine-devel-*