From 156a15db63da6345b15e8afb3d599452d0fa2452 Mon Sep 17 00:00:00 2001 From: Glen Barber Date: Tue, 8 Jan 2013 13:48:05 +0000 Subject: [PATCH] - 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 | 1 + sysutils/cfengine22/Makefile | 1 + sysutils/cfengine32/Makefile | 1 + sysutils/cfengine33/Makefile | 1 + sysutils/cfengine34/Makefile | 4 ++++ 5 files changed, 8 insertions(+) diff --git a/sysutils/Makefile b/sysutils/Makefile index 04e391b55eb3..4172c2e0226e 100644 --- a/sysutils/Makefile +++ b/sysutils/Makefile @@ -106,6 +106,7 @@ SUBDIR += cdrtools SUBDIR += cdrtools-devel SUBDIR += cfengine-devel + SUBDIR += cfengine SUBDIR += cfengine22 SUBDIR += cfengine32 SUBDIR += cfengine33 diff --git a/sysutils/cfengine22/Makefile b/sysutils/cfengine22/Makefile index 7dffbd42e7ae..2b8233cf034b 100644 --- a/sysutils/cfengine22/Makefile +++ b/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 diff --git a/sysutils/cfengine32/Makefile b/sysutils/cfengine32/Makefile index e89d9f2f1c68..892131932a86 100644 --- a/sysutils/cfengine32/Makefile +++ b/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 diff --git a/sysutils/cfengine33/Makefile b/sysutils/cfengine33/Makefile index 528f015bd6a0..df2ed4f8e637 100644 --- a/sysutils/cfengine33/Makefile +++ b/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 diff --git a/sysutils/cfengine34/Makefile b/sysutils/cfengine34/Makefile index 7d2fe61c556b..9395ff4fc334 100644 --- a/sysutils/cfengine34/Makefile +++ b/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-*