24 files changed, 6 insertions, 3 deletions

diff --git a/MOVED b/MOVED
index c7965262ac17..f2b690cc95bb 100644
--- a/MOVED
+++ b/MOVED
@@ -3635,3 +3635,6 @@ deskutils/preferences.app|deskutils/preferences|2012-08-07|Project renamed
 www/trac-ctxtnavadd||2012-08-09|Functionality of this plugin merged into Trac itself - see trac.web.chrome.add_ctxtnav function
 net-p2p/qbittorrent-29|net-p2p/qbittorrent|2012-08-11|Moved to match port name
 net-p2p/qbittorrent-29-nox11|net-p2p/qbittorrent-nox11|2012-08-11|Moved to match port name
+sysutils/cfengine|sysutils/cfengine22|2012-08-14|Standardize port naming
+sysutils/cfengine-legacy|sysutils/cfengine32|2012-08-14|Standardize port naming
+sysutils/cfengine3|sysutils/cfengine33|2012-08-14|Standardize port naming
diff --git a/sysutils/Makefile b/sysutils/Makefile
index 9dc74bc183d4..e8dae2b913ec 100644
--- a/sysutils/Makefile
+++ b/sysutils/Makefile
@@ -106,9 +106,9 @@
     SUBDIR += cdroot
     SUBDIR += cdrtools
     SUBDIR += cdrtools-devel
-    SUBDIR += cfengine
-    SUBDIR += cfengine3
-    SUBDIR += cfengine3-legacy
+    SUBDIR += cfengine22
+    SUBDIR += cfengine32
+    SUBDIR += cfengine33
     SUBDIR += chgrep
     SUBDIR += ciso
     SUBDIR += ck4up
diff --git a/sysutils/cfengine/Makefile b/sysutils/cfengine22/Makefile
index 65c8cc1d73b3..65c8cc1d73b3 100644
--- a/sysutils/cfengine/Makefile
+++ b/sysutils/cfengine22/Makefile
diff --git a/sysutils/cfengine/distinfo b/sysutils/cfengine22/distinfo
index 26ed8c1ec4db..26ed8c1ec4db 100644
--- a/sysutils/cfengine/distinfo
+++ b/sysutils/cfengine22/distinfo
diff --git a/sysutils/cfengine/files/cfexecd.in b/sysutils/cfengine22/files/cfexecd.in
index 0edae9657b98..0edae9657b98 100644
--- a/sysutils/cfengine/files/cfexecd.in
+++ b/sysutils/cfengine22/files/cfexecd.in
diff --git a/sysutils/cfengine/files/cfservd.in b/sysutils/cfengine22/files/cfservd.in
index 068c43a32437..068c43a32437 100644
--- a/sysutils/cfengine/files/cfservd.in
+++ b/sysutils/cfengine22/files/cfservd.in
diff --git a/sysutils/cfengine/files/patch-Makefile.in b/sysutils/cfengine22/files/patch-Makefile.in
index 558288e16305..558288e16305 100644
--- a/sysutils/cfengine/files/patch-Makefile.in
+++ b/sysutils/cfengine22/files/patch-Makefile.in
diff --git a/sysutils/cfengine/files/patch-contrib_Makefile.in b/sysutils/cfengine22/files/patch-contrib_Makefile.in
index 5dac09930b39..5dac09930b39 100644
--- a/sysutils/cfengine/files/patch-contrib_Makefile.in
+++ b/sysutils/cfengine22/files/patch-contrib_Makefile.in
diff --git a/sysutils/cfengine/files/patch-doc_Makefile.in b/sysutils/cfengine22/files/patch-doc_Makefile.in
index ccb1cd36d3f5..ccb1cd36d3f5 100644
--- a/sysutils/cfengine/files/patch-doc_Makefile.in
+++ b/sysutils/cfengine22/files/patch-doc_Makefile.in
diff --git a/sysutils/cfengine/files/patch-inputs_Makefile.in b/sysutils/cfengine22/files/patch-inputs_Makefile.in
index bac3996a6dc6..bac3996a6dc6 100644
--- a/sysutils/cfengine/files/patch-inputs_Makefile.in
+++ b/sysutils/cfengine22/files/patch-inputs_Makefile.in
diff --git a/sysutils/cfengine/pkg-descr b/sysutils/cfengine22/pkg-descr
index b1a53d4609d2..b1a53d4609d2 100644
--- a/sysutils/cfengine/pkg-descr
+++ b/sysutils/cfengine22/pkg-descr
diff --git a/sysutils/cfengine/pkg-plist b/sysutils/cfengine22/pkg-plist
index 59ee35803ad5..59ee35803ad5 100644
--- a/sysutils/cfengine/pkg-plist
+++ b/sysutils/cfengine22/pkg-plist
diff --git a/sysutils/cfengine3-legacy/Makefile b/sysutils/cfengine32/Makefile
index f8d5edf21cb3..f8d5edf21cb3 100644
--- a/sysutils/cfengine3-legacy/Makefile
+++ b/sysutils/cfengine32/Makefile
diff --git a/sysutils/cfengine3-legacy/distinfo b/sysutils/cfengine32/distinfo
index 273366103b79..273366103b79 100644
--- a/sysutils/cfengine3-legacy/distinfo
+++ b/sysutils/cfengine32/distinfo
diff --git a/sysutils/cfengine3-legacy/files/cf-execd.in b/sysutils/cfengine32/files/cf-execd.in
index 1ee33104e76e..1ee33104e76e 100644
--- a/sysutils/cfengine3-legacy/files/cf-execd.in
+++ b/sysutils/cfengine32/files/cf-execd.in
diff --git a/sysutils/cfengine3-legacy/files/cf-serverd.in b/sysutils/cfengine32/files/cf-serverd.in
index 9fbd07cc148a..9fbd07cc148a 100644
--- a/sysutils/cfengine3-legacy/files/cf-serverd.in
+++ b/sysutils/cfengine32/files/cf-serverd.in
diff --git a/sysutils/cfengine3-legacy/pkg-descr b/sysutils/cfengine32/pkg-descr
index 7c0c7eb39135..7c0c7eb39135 100644
--- a/sysutils/cfengine3-legacy/pkg-descr
+++ b/sysutils/cfengine32/pkg-descr
diff --git a/sysutils/cfengine3-legacy/pkg-plist b/sysutils/cfengine32/pkg-plist
index a42b443c43bc..a42b443c43bc 100644
--- a/sysutils/cfengine3-legacy/pkg-plist
+++ b/sysutils/cfengine32/pkg-plist
diff --git a/sysutils/cfengine3/Makefile b/sysutils/cfengine33/Makefile
index 9f050a21fe9a..9f050a21fe9a 100644
--- a/sysutils/cfengine3/Makefile
+++ b/sysutils/cfengine33/Makefile
diff --git a/sysutils/cfengine3/distinfo b/sysutils/cfengine33/distinfo
index aaa3aa59e0de..aaa3aa59e0de 100644
--- a/sysutils/cfengine3/distinfo
+++ b/sysutils/cfengine33/distinfo
diff --git a/sysutils/cfengine3/files/cf-execd.in b/sysutils/cfengine33/files/cf-execd.in
index 1ee33104e76e..1ee33104e76e 100644
--- a/sysutils/cfengine3/files/cf-execd.in
+++ b/sysutils/cfengine33/files/cf-execd.in
diff --git a/sysutils/cfengine3/files/cf-serverd.in b/sysutils/cfengine33/files/cf-serverd.in
index 9fbd07cc148a..9fbd07cc148a 100644
--- a/sysutils/cfengine3/files/cf-serverd.in
+++ b/sysutils/cfengine33/files/cf-serverd.in
diff --git a/sysutils/cfengine3/pkg-descr b/sysutils/cfengine33/pkg-descr
index 7c0c7eb39135..7c0c7eb39135 100644
--- a/sysutils/cfengine3/pkg-descr
+++ b/sysutils/cfengine33/pkg-descr
diff --git a/sysutils/cfengine3/pkg-plist b/sysutils/cfengine33/pkg-plist
index c6a3a7173a04..c6a3a7173a04 100644
--- a/sysutils/cfengine3/pkg-plist
+++ b/sysutils/cfengine33/pkg-plist