Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 15 Aug 2012 17:28:44 +0000 (UTC)
From:      Cy Schubert <cy@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r302588 - in head/sysutils: . cfengine-devel cfengine22 cfengine32 cfengine33
Message-ID:  <201208151728.q7FHSijM086204@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: cy
Date: Wed Aug 15 17:28:43 2012
New Revision: 302588
URL: http://svn.freebsd.org/changeset/ports/302588

Log:
  dd new cfengine-devel port.
  
  Update CONFLICTS in cfengine2, cfengine32, and cfengine33 ports.
  
  Update LATEST_LINK in cfengine32 and cfengine33 ports.
  
  Add $FreeBSD$ to pkg-plist.

Added:
  head/sysutils/cfengine-devel/
     - copied from r302533, head/sysutils/cfengine33/
Modified:
  head/sysutils/Makefile
  head/sysutils/cfengine-devel/Makefile
  head/sysutils/cfengine-devel/pkg-plist
  head/sysutils/cfengine22/Makefile
  head/sysutils/cfengine32/Makefile
  head/sysutils/cfengine32/pkg-plist
  head/sysutils/cfengine33/Makefile
  head/sysutils/cfengine33/pkg-plist

Modified: head/sysutils/Makefile
==============================================================================
--- head/sysutils/Makefile	Wed Aug 15 16:47:35 2012	(r302587)
+++ head/sysutils/Makefile	Wed Aug 15 17:28:43 2012	(r302588)
@@ -106,6 +106,7 @@
     SUBDIR += cdroot
     SUBDIR += cdrtools
     SUBDIR += cdrtools-devel
+    SUBDIR += cfengine-devel
     SUBDIR += cfengine22
     SUBDIR += cfengine32
     SUBDIR += cfengine33

Modified: head/sysutils/cfengine-devel/Makefile
==============================================================================
--- head/sysutils/cfengine33/Makefile	Tue Aug 14 20:50:56 2012	(r302533)
+++ head/sysutils/cfengine-devel/Makefile	Wed Aug 15 17:28:43 2012	(r302588)
@@ -6,17 +6,18 @@
 #
 
 PORTNAME=	cfengine
-PORTVERSION=	3.3.5
+PORTVERSION=	3.4.0b1
 CATEGORIES=	sysutils
+PKGNAMESUFFIX=	-devel
 MASTER_SITES=	http://cfengine.com/source-code/download?file=
 
 MAINTAINER=	cy@FreeBSD.org
 #		gjb@FreeBSD.org is also committer for this port
 COMMENT=	A systems administration tool for networks
-LATEST_LINK=	cfengine3
+LATEST_LINK=	cfengine-devel
 FETCH_BEFORE_ARGS=	-o ${DISTDIR}/${DISTFILES}
 
-CONFLICTS=	cfengine-2*
+CONFLICTS=	cfengine-[23]*
 
 USE_RC_SUBR=	cf-execd cf-serverd
 

Modified: head/sysutils/cfengine-devel/pkg-plist
==============================================================================
--- head/sysutils/cfengine33/pkg-plist	Tue Aug 14 20:50:56 2012	(r302533)
+++ head/sysutils/cfengine-devel/pkg-plist	Wed Aug 15 17:28:43 2012	(r302588)
@@ -1,3 +1,4 @@
+@comment $FreeBSD$
 libexec/cfengine/libpromises.la
 libexec/cfengine/libpromises.so
 libexec/cfengine/libpromises.so.1
@@ -15,17 +16,16 @@ share/cfengine/CoreBase/cfengine_stdlib.
 share/cfengine/CoreBase/promises.cf
 %%DOCSDIR%%/ChangeLog
 %%DOCSDIR%%/README
-%%DOCSDIR%%/example_config/cfengine_stdlib.cf
-%%DOCSDIR%%/example_config/failsafe.cf
-%%DOCSDIR%%/example_config/promises.cf
-%%DOCSDIR%%/example_config/site.cf
-%%DOCSDIR%%/example_config/update.cf
 %%DOCSDIR%%/examples/active_directory.cf
 %%DOCSDIR%%/examples/app_baseline.cf
 %%DOCSDIR%%/examples/guest_environment_kvm.cf
 %%DOCSDIR%%/examples/hostswithclass.cf
+%%DOCSDIR%%/examples/motd.cf
 %%DOCSDIR%%/examples/package_windows_feature.cf
 %%DOCSDIR%%/examples/promise_knowledge.cf
+%%DOCSDIR%%/examples/service_catalogue.cf
+%%DOCSDIR%%/examples/service_catalogue_separate.cf
+%%DOCSDIR%%/examples/sql_table_structure.cf
 %%DOCSDIR%%/examples/unit_abort.cf
 %%DOCSDIR%%/examples/unit_accessed_before.cf
 %%DOCSDIR%%/examples/unit_accumulated_time.cf
@@ -63,6 +63,7 @@ share/cfengine/CoreBase/promises.cf
 %%DOCSDIR%%/examples/unit_create_filedir.cf
 %%DOCSDIR%%/examples/unit_createdb.cf
 %%DOCSDIR%%/examples/unit_customize_by_named_list.cf
+%%DOCSDIR%%/examples/unit_defaults.cf
 %%DOCSDIR%%/examples/unit_definitions.cf
 %%DOCSDIR%%/examples/unit_deletelines.cf
 %%DOCSDIR%%/examples/unit_disable.cf
@@ -123,6 +124,7 @@ share/cfengine/CoreBase/promises.cf
 %%DOCSDIR%%/examples/unit_hostsseen.cf
 %%DOCSDIR%%/examples/unit_hub.cf
 %%DOCSDIR%%/examples/unit_id.cf
+%%DOCSDIR%%/examples/unit_inherit.cf
 %%DOCSDIR%%/examples/unit_insert_users.cf
 %%DOCSDIR%%/examples/unit_intarray.cf
 %%DOCSDIR%%/examples/unit_inventory_cpu.cf
@@ -149,6 +151,7 @@ share/cfengine/CoreBase/promises.cf
 %%DOCSDIR%%/examples/unit_measure_log.cf
 %%DOCSDIR%%/examples/unit_measurements.cf
 %%DOCSDIR%%/examples/unit_menu.cf
+%%DOCSDIR%%/examples/unit_meta.cf
 %%DOCSDIR%%/examples/unit_method.cf
 %%DOCSDIR%%/examples/unit_method_polymorph.cf
 %%DOCSDIR%%/examples/unit_method_validate.cf
@@ -159,9 +162,20 @@ share/cfengine/CoreBase/promises.cf
 %%DOCSDIR%%/examples/unit_monitord.cf
 %%DOCSDIR%%/examples/unit_mount_fs.cf
 %%DOCSDIR%%/examples/unit_multipassvars.cf
+%%DOCSDIR%%/examples/unit_namespace.cf
+%%DOCSDIR%%/examples/unit_namespace1.cf
+%%DOCSDIR%%/examples/unit_namespace2.cf
+%%DOCSDIR%%/examples/unit_namespace3.cf
 %%DOCSDIR%%/examples/unit_neighbourhood_watch.cf
 %%DOCSDIR%%/examples/unit_null_config.cf
 %%DOCSDIR%%/examples/unit_occurrences.cf
+%%DOCSDIR%%/examples/unit_orchestrate_chain1.cf
+%%DOCSDIR%%/examples/unit_orchestrate_chain2.cf
+%%DOCSDIR%%/examples/unit_orchestrate_dominoes1.cf
+%%DOCSDIR%%/examples/unit_orchestrate_dominoes2.cf
+%%DOCSDIR%%/examples/unit_orchestrate_dragon.cf
+%%DOCSDIR%%/examples/unit_orchestrate_dragon_load_balancer.cf
+%%DOCSDIR%%/examples/unit_orchestrate_n_of_m.cf
 %%DOCSDIR%%/examples/unit_orchestration_hostlist.cf
 %%DOCSDIR%%/examples/unit_ordering.cf
 %%DOCSDIR%%/examples/unit_package_apt.cf
@@ -199,6 +213,8 @@ share/cfengine/CoreBase/promises.cf
 %%DOCSDIR%%/examples/unit_regline.cf
 %%DOCSDIR%%/examples/unit_reglist.cf
 %%DOCSDIR%%/examples/unit_remoteclasses.cf
+%%DOCSDIR%%/examples/unit_remoteclasses2.cf
+%%DOCSDIR%%/examples/unit_remotescalar.cf
 %%DOCSDIR%%/examples/unit_remove_deadlinks.cf
 %%DOCSDIR%%/examples/unit_rename.cf
 %%DOCSDIR%%/examples/unit_repairedcommand.cf
@@ -228,7 +244,6 @@ share/cfengine/CoreBase/promises.cf
 %%DOCSDIR%%/examples/unit_software_dist.cf
 %%DOCSDIR%%/examples/unit_software_update_version_yum.cf
 %%DOCSDIR%%/examples/unit_splitstring.cf
-%%DOCSDIR%%/examples/unit_sql.cf
 %%DOCSDIR%%/examples/unit_storage.cf
 %%DOCSDIR%%/examples/unit_strcmp.cf
 %%DOCSDIR%%/examples/unit_stringarray.cf
@@ -256,7 +271,6 @@ share/cfengine/CoreBase/promises.cf
 %%DOCSDIR%%/examples/win_registry.cf
 %%DOCSDIR%%/examples/win_schedule.cf
 @dirrm %%DOCSDIR%%/examples
-@dirrm %%DOCSDIR%%/example_config
 @dirrm %%DOCSDIR%%
 @dirrm share/cfengine/CoreBase
 @dirrm share/cfengine

Modified: head/sysutils/cfengine22/Makefile
==============================================================================
--- head/sysutils/cfengine22/Makefile	Wed Aug 15 16:47:35 2012	(r302587)
+++ head/sysutils/cfengine22/Makefile	Wed Aug 15 17:28:43 2012	(r302588)
@@ -14,7 +14,7 @@ MAINTAINER=	cy@FreeBSD.org
 #		gjb@FreeBSD.org is also committer for this port
 COMMENT=	A systems administration tool for networks
 
-CONFLICTS=	cfengine-3*
+CONFLICTS=	cfengine-3* cfengine-devel-*
 
 USE_RC_SUBR=	cfexecd cfservd
 

Modified: head/sysutils/cfengine32/Makefile
==============================================================================
--- head/sysutils/cfengine32/Makefile	Wed Aug 15 16:47:35 2012	(r302587)
+++ head/sysutils/cfengine32/Makefile	Wed Aug 15 17:28:43 2012	(r302588)
@@ -15,10 +15,10 @@ PKGNAMESUFFIX=	-legacy
 
 MAINTAINER=	cy@FreeBSD.org
 COMMENT=	A systems administration tool for networks
-LATEST_LINK=	cfengine3-legacy
+LATEST_LINK=	cfengine32
 FETCH_BEFORE_ARGS=   -o ${DISTDIR}/${DISTFILES}
 
-CONFLICTS=      cfengine-[23]*
+CONFLICTS=      cfengine-[2]* cfengine-3.[34]* cfengine-devel-*
 
 USE_RC_SUBR=	cf-execd cf-serverd
 

Modified: head/sysutils/cfengine32/pkg-plist
==============================================================================
--- head/sysutils/cfengine32/pkg-plist	Wed Aug 15 16:47:35 2012	(r302587)
+++ head/sysutils/cfengine32/pkg-plist	Wed Aug 15 17:28:43 2012	(r302588)
@@ -1,3 +1,4 @@
+@comment $FreeBSD$
 lib/libpromises.la
 lib/libpromises.so
 lib/libpromises.so.1

Modified: head/sysutils/cfengine33/Makefile
==============================================================================
--- head/sysutils/cfengine33/Makefile	Wed Aug 15 16:47:35 2012	(r302587)
+++ head/sysutils/cfengine33/Makefile	Wed Aug 15 17:28:43 2012	(r302588)
@@ -13,10 +13,10 @@ MASTER_SITES=	http://cfengine.com/source
 MAINTAINER=	cy@FreeBSD.org
 #		gjb@FreeBSD.org is also committer for this port
 COMMENT=	A systems administration tool for networks
-LATEST_LINK=	cfengine3
+LATEST_LINK=	cfengine33
 FETCH_BEFORE_ARGS=	-o ${DISTDIR}/${DISTFILES}
 
-CONFLICTS=	cfengine-2*
+CONFLICTS=	cfengine-2* cfengine-3.[24]* cfengine-devel-*
 
 USE_RC_SUBR=	cf-execd cf-serverd
 

Modified: head/sysutils/cfengine33/pkg-plist
==============================================================================
--- head/sysutils/cfengine33/pkg-plist	Wed Aug 15 16:47:35 2012	(r302587)
+++ head/sysutils/cfengine33/pkg-plist	Wed Aug 15 17:28:43 2012	(r302588)
@@ -1,3 +1,4 @@
+@comment $FreeBSD$
 libexec/cfengine/libpromises.la
 libexec/cfengine/libpromises.so
 libexec/cfengine/libpromises.so.1



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201208151728.q7FHSijM086204>