42 files changed, 28 insertions, 16 deletions

diff --git a/MOVED b/MOVED
index e586ee42cf35..278391489a85 100644
--- a/MOVED
+++ b/MOVED
@@ -3983,3 +3983,15 @@ www/horde4-ansel|www/horde-ansel|2012-12-18|Move horde4-* apps to horde-*
 www/horde4-base|www/horde-base|2012-12-18|Move horde4-* apps to horde-*
 www/horde4-passwd|www/horde-passwd|2012-12-18|Move horde4-* apps to horde-*
 www/horde4-wicked|www/horde-wicked|2012-12-18|Move horde4-* apps to horde-*
+deskutils/horde4-groupware|deskutils/horde-groupware|2012-12-18|Move horde4-* apps to horde-*
+deskutils/horde4-kronolith|deskutils/horde-kronolith|2012-12-18|Move horde4-* apps to horde-*
+deskutils/horde4-mnemo|deskutils/horde-mnemo|2012-12-18|Move horde4-* apps to horde-*
+deskutils/horde4-nag|deskutils/horde-nag|2012-12-18|Move horde4-* apps to horde-*
+devel/horde4-content|devel/horde-content|2012-12-18|Move horde4-* apps to horde-*
+devel/horde4-timeobjects|devel/horde-timeobjects|2012-12-18|Move horde4-* apps to horde-*
+devel/horde4-whups|devel/horde-whups|2012-12-18|Move horde4-* apps to horde-*
+ftp/horde4-gollem|ftp/horde-gollem|2012-12-18|Move horde4-* apps to horde-*
+mail/horde4-imp|mail/horde-imp|2012-12-18|Move horde4-* apps to horde-*
+mail/horde4-ingo|mail/horde-ingo|2012-12-18|Move horde4-* apps to horde-*
+mail/horde4-turba|mail/horde-turba|2012-12-18|Move horde4-* apps to horde-*
+mail/horde4-webmail|mail/horde-webmail|2012-12-18|Move horde4-* apps to horde-*
diff --git a/deskutils/horde4-groupware/Makefile b/deskutils/horde-groupware/Makefile
index 8dd92f207428..8dd92f207428 100644
--- a/deskutils/horde4-groupware/Makefile
+++ b/deskutils/horde-groupware/Makefile
diff --git a/deskutils/horde4-groupware/distinfo b/deskutils/horde-groupware/distinfo
index 88e258bfe02b..88e258bfe02b 100644
--- a/deskutils/horde4-groupware/distinfo
+++ b/deskutils/horde-groupware/distinfo
diff --git a/deskutils/horde4-groupware/pkg-descr b/deskutils/horde-groupware/pkg-descr
index 66ee3cbbda6a..66ee3cbbda6a 100644
--- a/deskutils/horde4-groupware/pkg-descr
+++ b/deskutils/horde-groupware/pkg-descr
diff --git a/deskutils/horde4-kronolith/Makefile b/deskutils/horde-kronolith/Makefile
index ab5959e7a627..ab5959e7a627 100644
--- a/deskutils/horde4-kronolith/Makefile
+++ b/deskutils/horde-kronolith/Makefile
diff --git a/deskutils/horde4-kronolith/distinfo b/deskutils/horde-kronolith/distinfo
index e6ab1853295f..e6ab1853295f 100644
--- a/deskutils/horde4-kronolith/distinfo
+++ b/deskutils/horde-kronolith/distinfo
diff --git a/deskutils/horde4-kronolith/pkg-descr b/deskutils/horde-kronolith/pkg-descr
index 2444bcc0ed0c..2444bcc0ed0c 100644
--- a/deskutils/horde4-kronolith/pkg-descr
+++ b/deskutils/horde-kronolith/pkg-descr
diff --git a/deskutils/horde4-mnemo/Makefile b/deskutils/horde-mnemo/Makefile
index 7ad3e4d62f7a..7ad3e4d62f7a 100644
--- a/deskutils/horde4-mnemo/Makefile
+++ b/deskutils/horde-mnemo/Makefile
diff --git a/deskutils/horde4-mnemo/distinfo b/deskutils/horde-mnemo/distinfo
index 8bb0b49ca82a..8bb0b49ca82a 100644
--- a/deskutils/horde4-mnemo/distinfo
+++ b/deskutils/horde-mnemo/distinfo
diff --git a/deskutils/horde4-mnemo/pkg-descr b/deskutils/horde-mnemo/pkg-descr
index 603ae3107876..603ae3107876 100644
--- a/deskutils/horde4-mnemo/pkg-descr
+++ b/deskutils/horde-mnemo/pkg-descr
diff --git a/deskutils/horde4-nag/Makefile b/deskutils/horde-nag/Makefile
index 4d735108c0f3..4d735108c0f3 100644
--- a/deskutils/horde4-nag/Makefile
+++ b/deskutils/horde-nag/Makefile
diff --git a/deskutils/horde4-nag/distinfo b/deskutils/horde-nag/distinfo
index 3696224157bd..3696224157bd 100644
--- a/deskutils/horde4-nag/distinfo
+++ b/deskutils/horde-nag/distinfo
diff --git a/deskutils/horde4-nag/pkg-descr b/deskutils/horde-nag/pkg-descr
index 92d684b7cc27..92d684b7cc27 100644
--- a/deskutils/horde4-nag/pkg-descr
+++ b/deskutils/horde-nag/pkg-descr
diff --git a/devel/Makefile b/devel/Makefile
index ac91cebae029..692ca75398b0 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -623,11 +623,11 @@
     SUBDIR += hgsvn
     SUBDIR += hgview
     SUBDIR += highlighterkit
+    SUBDIR += horde-content
+    SUBDIR += horde-timeobjects
+    SUBDIR += horde-whups
     SUBDIR += horde3-chora
     SUBDIR += horde3-whups
-    SUBDIR += horde4-content
-    SUBDIR += horde4-timeobjects
-    SUBDIR += horde4-whups
     SUBDIR += hp48cc
     SUBDIR += hp48xgcc
     SUBDIR += hs-BNFC
diff --git a/devel/horde4-content/Makefile b/devel/horde-content/Makefile
index d44f1b018941..d44f1b018941 100644
--- a/devel/horde4-content/Makefile
+++ b/devel/horde-content/Makefile
diff --git a/devel/horde4-content/distinfo b/devel/horde-content/distinfo
index 63961f86f5b8..63961f86f5b8 100644
--- a/devel/horde4-content/distinfo
+++ b/devel/horde-content/distinfo
diff --git a/devel/horde4-content/pkg-descr b/devel/horde-content/pkg-descr
index bd7b3c142a83..bd7b3c142a83 100644
--- a/devel/horde4-content/pkg-descr
+++ b/devel/horde-content/pkg-descr
diff --git a/devel/horde4-timeobjects/Makefile b/devel/horde-timeobjects/Makefile
index 6b6bba19fd34..6b6bba19fd34 100644
--- a/devel/horde4-timeobjects/Makefile
+++ b/devel/horde-timeobjects/Makefile
diff --git a/devel/horde4-timeobjects/distinfo b/devel/horde-timeobjects/distinfo
index c5838110467a..c5838110467a 100644
--- a/devel/horde4-timeobjects/distinfo
+++ b/devel/horde-timeobjects/distinfo
diff --git a/devel/horde4-timeobjects/pkg-descr b/devel/horde-timeobjects/pkg-descr
index 5b5f9de2deec..5b5f9de2deec 100644
--- a/devel/horde4-timeobjects/pkg-descr
+++ b/devel/horde-timeobjects/pkg-descr
diff --git a/devel/horde4-whups/Makefile b/devel/horde-whups/Makefile
index 973c759a442e..973c759a442e 100644
--- a/devel/horde4-whups/Makefile
+++ b/devel/horde-whups/Makefile
diff --git a/devel/horde4-whups/distinfo b/devel/horde-whups/distinfo
index 521f15f45b6f..521f15f45b6f 100644
--- a/devel/horde4-whups/distinfo
+++ b/devel/horde-whups/distinfo
diff --git a/devel/horde4-whups/pkg-descr b/devel/horde-whups/pkg-descr
index 51531d428ef6..51531d428ef6 100644
--- a/devel/horde4-whups/pkg-descr
+++ b/devel/horde-whups/pkg-descr
diff --git a/devel/pear-channel-horde/bsd.horde.mk b/devel/pear-channel-horde/bsd.horde.mk
index baa92d98d47e..1e6b6efd0a0b 100644
--- a/devel/pear-channel-horde/bsd.horde.mk
+++ b/devel/pear-channel-horde/bsd.horde.mk
@@ -104,15 +104,15 @@ horde-Horde_Vfs-DEPEND=		${PEARDIR}/Horde/Vfs.php:${PORTSDIR}/sysutils/pear-Hord
 horde-Horde_View-DEPEND=	${PEARDIR}/Horde/View.php:${PORTSDIR}/devel/pear-Horde_View
 horde-Horde_Xml_Element-DEPEND=	${PEARDIR}/Horde/Xml/Element.php:${PORTSDIR}/textproc/pear-Horde_Xml_Element
 horde-Horde_Xml_Wbxml-DEPEND=	${PEARDIR}/Horde/Xml/Wbxml.php:${PORTSDIR}/textproc/pear-Horde_Xml_Wbxml
-horde-content-DEPEND=		${LOCALBASE}/${HORDE_DIR}/content/lib/Tagger.php:${PORTSDIR}/devel/horde4-content
+horde-content-DEPEND=		${LOCALBASE}/${HORDE_DIR}/content/lib/Tagger.php:${PORTSDIR}/devel/horde-content
 horde-horde-DEPEND=		${LOCALBASE}/${HORDE_DIR}/index.php:${PORTSDIR}/www/horde-base
-horde-imp-DEPEND=		${LOCALBASE}/${HORDE_DIR}/imp/index.php:${PORTSDIR}/mail/horde4-imp
-horde-ingo-DEPEND=		${LOCALBASE}/${HORDE_DIR}/ingo/index.php:${PORTSDIR}/mail/horde4-ingo
-horde-kronolith-DEPEND=		${LOCALBASE}/${HORDE_DIR}/kronolith/index.php:${PORTSDIR}/deskutils/horde4-kronolith
-horde-mnemo-DEPEND=		${LOCALBASE}/${HORDE_DIR}/mnemo/index.php:${PORTSDIR}/deskutils/horde4-mnemo
-horde-nag-DEPEND=		${LOCALBASE}/${HORDE_DIR}/nag/index.php:${PORTSDIR}/deskutils/horde4-nag
-horde-timeobjects-DEPEND=	${LOCALBASE}/${HORDE_DIR}/timeobjects/lib/Driver.php:${PORTSDIR}/devel/horde4-timeobjects
-horde-turba-DEPEND=		${LOCALBASE}/${HORDE_DIR}/turba/index.php:${PORTSDIR}/mail/horde4-turba
+horde-imp-DEPEND=		${LOCALBASE}/${HORDE_DIR}/imp/index.php:${PORTSDIR}/mail/horde-imp
+horde-ingo-DEPEND=		${LOCALBASE}/${HORDE_DIR}/ingo/index.php:${PORTSDIR}/mail/horde-ingo
+horde-kronolith-DEPEND=		${LOCALBASE}/${HORDE_DIR}/kronolith/index.php:${PORTSDIR}/deskutils/horde-kronolith
+horde-mnemo-DEPEND=		${LOCALBASE}/${HORDE_DIR}/mnemo/index.php:${PORTSDIR}/deskutils/horde-mnemo
+horde-nag-DEPEND=		${LOCALBASE}/${HORDE_DIR}/nag/index.php:${PORTSDIR}/deskutils/horde-nag
+horde-timeobjects-DEPEND=	${LOCALBASE}/${HORDE_DIR}/timeobjects/lib/Driver.php:${PORTSDIR}/devel/horde-timeobjects
+horde-turba-DEPEND=		${LOCALBASE}/${HORDE_DIR}/turba/index.php:${PORTSDIR}/mail/horde-turba
 
 .if defined(USE_HORDE_RUN)
 . for DEP in ${USE_HORDE_RUN}
diff --git a/ftp/Makefile b/ftp/Makefile
index 4bf58f0b3957..bbc7f350831a 100644
--- a/ftp/Makefile
+++ b/ftp/Makefile
@@ -36,8 +36,8 @@
     SUBDIR += gnusget
     SUBDIR += gnustep-ftp
     SUBDIR += gwget
+    SUBDIR += horde-gollem
     SUBDIR += horde3-gollem
-    SUBDIR += horde4-gollem
     SUBDIR += hs-curl
     SUBDIR += hsftp
     SUBDIR += jftp
diff --git a/ftp/horde4-gollem/Makefile b/ftp/horde-gollem/Makefile
index 059071ba5aad..059071ba5aad 100644
--- a/ftp/horde4-gollem/Makefile
+++ b/ftp/horde-gollem/Makefile
diff --git a/ftp/horde4-gollem/distinfo b/ftp/horde-gollem/distinfo
index 7c7a9289ca72..7c7a9289ca72 100644
--- a/ftp/horde4-gollem/distinfo
+++ b/ftp/horde-gollem/distinfo
diff --git a/ftp/horde4-gollem/pkg-descr b/ftp/horde-gollem/pkg-descr
index da1a582762a8..da1a582762a8 100644
--- a/ftp/horde4-gollem/pkg-descr
+++ b/ftp/horde-gollem/pkg-descr
diff --git a/mail/Makefile b/mail/Makefile
index bd8a72d7975d..034497cb15b2 100644
--- a/mail/Makefile
+++ b/mail/Makefile
@@ -177,6 +177,10 @@
     SUBDIR += hashcash
     SUBDIR += hbiff
     SUBDIR += heirloom-mailx
+    SUBDIR += horde-imp
+    SUBDIR += horde-ingo
+    SUBDIR += horde-turba
+    SUBDIR += horde-webmail
     SUBDIR += horde3-dimp
     SUBDIR += horde3-forwards
     SUBDIR += horde3-imp
@@ -184,10 +188,6 @@
     SUBDIR += horde3-mimp
     SUBDIR += horde3-turba
     SUBDIR += horde3-vacation
-    SUBDIR += horde4-imp
-    SUBDIR += horde4-ingo
-    SUBDIR += horde4-turba
-    SUBDIR += horde4-webmail
     SUBDIR += hotwayd
     SUBDIR += hs-email-validate
     SUBDIR += hs-mime
diff --git a/mail/horde4-imp/Makefile b/mail/horde-imp/Makefile
index 1aa5bc003ab9..1aa5bc003ab9 100644
--- a/mail/horde4-imp/Makefile
+++ b/mail/horde-imp/Makefile
diff --git a/mail/horde4-imp/distinfo b/mail/horde-imp/distinfo
index d17e5234e991..d17e5234e991 100644
--- a/mail/horde4-imp/distinfo
+++ b/mail/horde-imp/distinfo
diff --git a/mail/horde4-imp/files/patch-config_prefs.php b/mail/horde-imp/files/patch-config_prefs.php
index de8a319f1870..de8a319f1870 100644
--- a/mail/horde4-imp/files/patch-config_prefs.php
+++ b/mail/horde-imp/files/patch-config_prefs.php
diff --git a/mail/horde4-imp/pkg-descr b/mail/horde-imp/pkg-descr
index 7c1d94aa1c2d..7c1d94aa1c2d 100644
--- a/mail/horde4-imp/pkg-descr
+++ b/mail/horde-imp/pkg-descr
diff --git a/mail/horde4-ingo/Makefile b/mail/horde-ingo/Makefile
index 2812e0ca2a0c..2812e0ca2a0c 100644
--- a/mail/horde4-ingo/Makefile
+++ b/mail/horde-ingo/Makefile
diff --git a/mail/horde4-ingo/distinfo b/mail/horde-ingo/distinfo
index bbe9f9bd43a0..bbe9f9bd43a0 100644
--- a/mail/horde4-ingo/distinfo
+++ b/mail/horde-ingo/distinfo
diff --git a/mail/horde4-ingo/pkg-descr b/mail/horde-ingo/pkg-descr
index cbfaa2d979d9..cbfaa2d979d9 100644
--- a/mail/horde4-ingo/pkg-descr
+++ b/mail/horde-ingo/pkg-descr
diff --git a/mail/horde4-turba/Makefile b/mail/horde-turba/Makefile
index 0d1e014b007a..0d1e014b007a 100644
--- a/mail/horde4-turba/Makefile
+++ b/mail/horde-turba/Makefile
diff --git a/mail/horde4-turba/distinfo b/mail/horde-turba/distinfo
index de7a2e4fdf0a..de7a2e4fdf0a 100644
--- a/mail/horde4-turba/distinfo
+++ b/mail/horde-turba/distinfo
diff --git a/mail/horde4-turba/pkg-descr b/mail/horde-turba/pkg-descr
index bad8d402f189..bad8d402f189 100644
--- a/mail/horde4-turba/pkg-descr
+++ b/mail/horde-turba/pkg-descr
diff --git a/mail/horde4-webmail/Makefile b/mail/horde-webmail/Makefile
index 22f0dc1e4152..22f0dc1e4152 100644
--- a/mail/horde4-webmail/Makefile
+++ b/mail/horde-webmail/Makefile
diff --git a/mail/horde4-webmail/distinfo b/mail/horde-webmail/distinfo
index b712314970e7..b712314970e7 100644
--- a/mail/horde4-webmail/distinfo
+++ b/mail/horde-webmail/distinfo
diff --git a/mail/horde4-webmail/pkg-descr b/mail/horde-webmail/pkg-descr
index 0f0843df766b..0f0843df766b 100644
--- a/mail/horde4-webmail/pkg-descr
+++ b/mail/horde-webmail/pkg-descr