125 files changed, 94 insertions, 72 deletions

diff --git a/MOVED b/MOVED
index 61a6c4470696..10cb09a0312a 100644
--- a/MOVED
+++ b/MOVED
@@ -3952,3 +3952,26 @@ java/linux-sun-jre15|java/linux-sun-jre16|2012-12-10|Has expired: EOLed upstream
 java/linux-sun-jdk15|java/linux-sun-jdk16|2012-12-10|Has expired: EOLed upstream since october 2009
 java/jdk15-doc|java/jdk16-doc|2012-12-10|Has expired: EOLed upstream since october 2009
 science/py-openbabel||2012-12-11|Merged to science/openbabel
+deskutils/horde-hermes|deskutils/horde3-hermes|2012-12-12|Rename of old horde apps
+deskutils/horde-klutz|deskutils/horde3-klutz|2012-12-12|Rename of old horde apps
+deskutils/horde-kronolith|deskutils/horde3-kronolith|2012-12-12|Rename of old horde apps
+deskutils/horde-mnemo|deskutils/horde3-mnemo|2012-12-12|Rename of old horde apps
+deskutils/horde-nag|deskutils/horde3-nag|2012-12-12|Rename of old horde apps
+devel/horde-chora|devel/horde3-chora|2012-12-12|Rename of old horde apps
+devel/horde-whups|devel/horde3-whups|2012-12-12|Rename of old horde apps
+ftp/horde-gollem|ftp/horde3-gollem|2012-12-12|Rename of old horde apps
+mail/horde-dimp|mail/horde3-dimp|2012-12-12|Rename of old horde apps
+mail/horde-forwards|mail/horde3-forwards|2012-12-12|Rename of old horde apps
+mail/horde-imp|mail/horde3-imp|2012-12-12|Rename of old horde apps
+mail/horde-ingo|mail/horde3-ingo|2012-12-12|Rename of old horde apps
+mail/horde-mimp|mail/horde3-mimp|2012-12-12|Rename of old horde apps
+mail/horde-turba|mail/horde3-turba|2012-12-12|Rename of old horde apps
+mail/horde-vacation|mail/horde3-vacation|2012-12-12|Rename of old horde apps
+net-mgmt/horde-nic|net-mgmt/horde3-nic|2012-12-12|Rename of old horde apps
+security/horde-jeta|security/horde3-jeta|2012-12-12|Rename of old horde apps
+www/horde-ansel|www/horde3-ansel|2012-12-12|Rename of old horde apps
+www/horde-base|www/horde3-base|2012-12-12|Rename of old horde apps
+www/horde-meta|www/horde3-meta|2012-12-12|Rename of old horde apps
+www/horde-passwd|www/horde3-passwd|2012-12-12|Rename of old horde apps
+www/horde-trean|www/horde3-trean|2012-12-12|Rename of old horde apps
+www/horde-wicked|www/horde3-wicked|2012-12-12|Rename of old horde apps
diff --git a/deskutils/Makefile b/deskutils/Makefile
index e7766f554682..69e8d2903d5d 100644
--- a/deskutils/Makefile
+++ b/deskutils/Makefile
@@ -96,11 +96,11 @@
     SUBDIR += hamster-applet
     SUBDIR += hebcal
     SUBDIR += helpviewer
-    SUBDIR += horde-hermes
-    SUBDIR += horde-klutz
-    SUBDIR += horde-kronolith
-    SUBDIR += horde-mnemo
-    SUBDIR += horde-nag
+    SUBDIR += horde3-hermes
+    SUBDIR += horde3-klutz
+    SUBDIR += horde3-kronolith
+    SUBDIR += horde3-mnemo
+    SUBDIR += horde3-nag
     SUBDIR += horde4-groupware
     SUBDIR += horde4-kronolith
     SUBDIR += horde4-mnemo
diff --git a/deskutils/horde-hermes/Makefile b/deskutils/horde3-hermes/Makefile
index 70ebeba7ea88..60e6f21556b6 100644
--- a/deskutils/horde-hermes/Makefile
+++ b/deskutils/horde3-hermes/Makefile
@@ -17,9 +17,9 @@ USE_HORDE=	base pkg-message
 USE_GETTEXT=	yes
 PORTDOCS=	README CHANGES CREDITS INSTALL TODO
 
-BUILD_DEPENDS+=	${HORBAS}/turba/minisearch.php:${PORTSDIR}/mail/horde-turba \
-		${HORBAS}/nag/data.php:${PORTSDIR}/deskutils/horde-nag \
-		${HORBAS}/whups/index.php:${PORTSDIR}/devel/horde-whups
+BUILD_DEPENDS+=	${HORBAS}/turba/minisearch.php:${PORTSDIR}/mail/horde3-turba \
+		${HORBAS}/nag/data.php:${PORTSDIR}/deskutils/horde3-nag \
+		${HORBAS}/whups/index.php:${PORTSDIR}/devel/horde3-whups
 
-.include "${.CURDIR}/../../www/horde-base/bsd.horde.mk"
+.include "${.CURDIR}/../../www/horde3-base/bsd.horde.mk"
 .include <bsd.port.mk>
diff --git a/deskutils/horde-hermes/distinfo b/deskutils/horde3-hermes/distinfo
index c3c7d1fdf2ce..c3c7d1fdf2ce 100644
--- a/deskutils/horde-hermes/distinfo
+++ b/deskutils/horde3-hermes/distinfo
diff --git a/deskutils/horde-hermes/pkg-descr b/deskutils/horde3-hermes/pkg-descr
index d12787078033..d12787078033 100644
--- a/deskutils/horde-hermes/pkg-descr
+++ b/deskutils/horde3-hermes/pkg-descr
diff --git a/deskutils/horde-hermes/pkg-plist b/deskutils/horde3-hermes/pkg-plist
index 3014b498bc40..3014b498bc40 100644
--- a/deskutils/horde-hermes/pkg-plist
+++ b/deskutils/horde3-hermes/pkg-plist
diff --git a/deskutils/horde-klutz/Makefile b/deskutils/horde3-klutz/Makefile
index 0596f78c5e57..66c79b35b433 100644
--- a/deskutils/horde-klutz/Makefile
+++ b/deskutils/horde3-klutz/Makefile
@@ -18,5 +18,5 @@ USE_HORDE=	base
 USE_GETTEXT=	yes
 PORTDOCS=	README CHANGES CREDITS INSTALL RELEASE_NOTES
 
-.include "${.CURDIR}/../../www/horde-base/bsd.horde.mk"
+.include "${.CURDIR}/../../www/horde3-base/bsd.horde.mk"
 .include <bsd.port.mk>
diff --git a/deskutils/horde-klutz/distinfo b/deskutils/horde3-klutz/distinfo
index 2c5669ec0e78..2c5669ec0e78 100644
--- a/deskutils/horde-klutz/distinfo
+++ b/deskutils/horde3-klutz/distinfo
diff --git a/deskutils/horde-klutz/files/pkg-message.in b/deskutils/horde3-klutz/files/pkg-message.in
index 9d721208ba63..9d721208ba63 100644
--- a/deskutils/horde-klutz/files/pkg-message.in
+++ b/deskutils/horde3-klutz/files/pkg-message.in
diff --git a/deskutils/horde-klutz/pkg-descr b/deskutils/horde3-klutz/pkg-descr
index d7f40118101a..d7f40118101a 100644
--- a/deskutils/horde-klutz/pkg-descr
+++ b/deskutils/horde3-klutz/pkg-descr
diff --git a/deskutils/horde-klutz/pkg-plist b/deskutils/horde3-klutz/pkg-plist
index e7d44ebe845d..e7d44ebe845d 100644
--- a/deskutils/horde-klutz/pkg-plist
+++ b/deskutils/horde3-klutz/pkg-plist
diff --git a/deskutils/horde-kronolith/Makefile b/deskutils/horde3-kronolith/Makefile
index e2b8d763e8ab..721cffe0ee00 100644
--- a/deskutils/horde-kronolith/Makefile
+++ b/deskutils/horde3-kronolith/Makefile
@@ -20,5 +20,5 @@ USE_HORDE=	base
 USE_GETTEXT=	yes
 PORTDOCS=	README CHANGES CREDITS INSTALL RELEASE_NOTES TODO UPGRADING
 
-.include "${.CURDIR}/../../www/horde-base/bsd.horde.mk"
+.include "${.CURDIR}/../../www/horde3-base/bsd.horde.mk"
 .include <bsd.port.mk>
diff --git a/deskutils/horde-kronolith/distinfo b/deskutils/horde3-kronolith/distinfo
index df6c5bbc34b5..df6c5bbc34b5 100644
--- a/deskutils/horde-kronolith/distinfo
+++ b/deskutils/horde3-kronolith/distinfo
diff --git a/deskutils/horde-kronolith/files/pkg-message.in b/deskutils/horde3-kronolith/files/pkg-message.in
index b622e3458902..b622e3458902 100644
--- a/deskutils/horde-kronolith/files/pkg-message.in
+++ b/deskutils/horde3-kronolith/files/pkg-message.in
diff --git a/deskutils/horde-kronolith/pkg-descr b/deskutils/horde3-kronolith/pkg-descr
index 43d8a72eee24..43d8a72eee24 100644
--- a/deskutils/horde-kronolith/pkg-descr
+++ b/deskutils/horde3-kronolith/pkg-descr
diff --git a/deskutils/horde-kronolith/pkg-plist b/deskutils/horde3-kronolith/pkg-plist
index c9b97e207140..c9b97e207140 100644
--- a/deskutils/horde-kronolith/pkg-plist
+++ b/deskutils/horde3-kronolith/pkg-plist
diff --git a/deskutils/horde-mnemo/Makefile b/deskutils/horde3-mnemo/Makefile
index e40425c270c4..bbe752d7571e 100644
--- a/deskutils/horde-mnemo/Makefile
+++ b/deskutils/horde3-mnemo/Makefile
@@ -18,5 +18,5 @@ USE_HORDE=	base
 USE_GETTEXT=	yes
 PORTDOCS=	README CHANGES CREDITS INSTALL RELEASE_NOTES TODO UPGRADING
 
-.include "${.CURDIR}/../../www/horde-base/bsd.horde.mk"
+.include "${.CURDIR}/../../www/horde3-base/bsd.horde.mk"
 .include <bsd.port.mk>
diff --git a/deskutils/horde-mnemo/distinfo b/deskutils/horde3-mnemo/distinfo
index 492bc9a6129e..492bc9a6129e 100644
--- a/deskutils/horde-mnemo/distinfo
+++ b/deskutils/horde3-mnemo/distinfo
diff --git a/deskutils/horde-mnemo/files/pkg-message.in b/deskutils/horde3-mnemo/files/pkg-message.in
index 07089e835ce8..07089e835ce8 100644
--- a/deskutils/horde-mnemo/files/pkg-message.in
+++ b/deskutils/horde3-mnemo/files/pkg-message.in
diff --git a/deskutils/horde-mnemo/pkg-descr b/deskutils/horde3-mnemo/pkg-descr
index fbe52997ba27..fbe52997ba27 100644
--- a/deskutils/horde-mnemo/pkg-descr
+++ b/deskutils/horde3-mnemo/pkg-descr
diff --git a/deskutils/horde-mnemo/pkg-plist b/deskutils/horde3-mnemo/pkg-plist
index ef8e216faa11..ef8e216faa11 100644
--- a/deskutils/horde-mnemo/pkg-plist
+++ b/deskutils/horde3-mnemo/pkg-plist
diff --git a/deskutils/horde-nag/Makefile b/deskutils/horde3-nag/Makefile
index fd2d2eb4dab6..1ed216988655 100644
--- a/deskutils/horde-nag/Makefile
+++ b/deskutils/horde3-nag/Makefile
@@ -18,5 +18,5 @@ USE_HORDE=	base
 USE_GETTEXT=	yes
 PORTDOCS=	README CHANGES CREDITS INSTALL RELEASE_NOTES TODO UPGRADING
 
-.include "${.CURDIR}/../../www/horde-base/bsd.horde.mk"
+.include "${.CURDIR}/../../www/horde3-base/bsd.horde.mk"
 .include <bsd.port.mk>
diff --git a/deskutils/horde-nag/distinfo b/deskutils/horde3-nag/distinfo
index 585f868d2e72..585f868d2e72 100644
--- a/deskutils/horde-nag/distinfo
+++ b/deskutils/horde3-nag/distinfo
diff --git a/deskutils/horde-nag/files/pkg-message.in b/deskutils/horde3-nag/files/pkg-message.in
index 2a7122633db6..2a7122633db6 100644
--- a/deskutils/horde-nag/files/pkg-message.in
+++ b/deskutils/horde3-nag/files/pkg-message.in
diff --git a/deskutils/horde-nag/pkg-descr b/deskutils/horde3-nag/pkg-descr
index 6eeeb953967c..6eeeb953967c 100644
--- a/deskutils/horde-nag/pkg-descr
+++ b/deskutils/horde3-nag/pkg-descr
diff --git a/deskutils/horde-nag/pkg-plist b/deskutils/horde3-nag/pkg-plist
index b33f9ba9ed60..b33f9ba9ed60 100644
--- a/deskutils/horde-nag/pkg-plist
+++ b/deskutils/horde3-nag/pkg-plist
diff --git a/devel/Makefile b/devel/Makefile
index a2997a556c35..df962ce5f8d1 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -621,8 +621,8 @@
     SUBDIR += hgsvn
     SUBDIR += hgview
     SUBDIR += highlighterkit
-    SUBDIR += horde-chora
-    SUBDIR += horde-whups
+    SUBDIR += horde3-chora
+    SUBDIR += horde3-whups
     SUBDIR += horde4-content
     SUBDIR += horde4-timeobjects
     SUBDIR += horde4-whups
diff --git a/devel/horde-chora/Makefile b/devel/horde3-chora/Makefile
index 90099753cd98..5082469b5695 100644
--- a/devel/horde-chora/Makefile
+++ b/devel/horde3-chora/Makefile
@@ -58,5 +58,5 @@ pre-configure:
 		-e "s|%%CONFDIR%%|${CONFDIR}|"				\
 		${WRKSRC}/config/sourceroots.php.dist
 
-.include "${.CURDIR}/../../www/horde-base/bsd.horde.mk"
+.include "${.CURDIR}/../../www/horde3-base/bsd.horde.mk"
 .include <bsd.port.mk>
diff --git a/devel/horde-chora/distinfo b/devel/horde3-chora/distinfo
index e70bb6d68cb9..e70bb6d68cb9 100644
--- a/devel/horde-chora/distinfo
+++ b/devel/horde3-chora/distinfo
diff --git a/devel/horde-chora/files/patch-config::sourceroots.php.dist b/devel/horde3-chora/files/patch-config::sourceroots.php.dist
index 1a75771ecaf1..1a75771ecaf1 100644
--- a/devel/horde-chora/files/patch-config::sourceroots.php.dist
+++ b/devel/horde3-chora/files/patch-config::sourceroots.php.dist
diff --git a/devel/horde-chora/pkg-descr b/devel/horde3-chora/pkg-descr
index 25cf61a374ef..25cf61a374ef 100644
--- a/devel/horde-chora/pkg-descr
+++ b/devel/horde3-chora/pkg-descr
diff --git a/devel/horde-chora/pkg-plist b/devel/horde3-chora/pkg-plist
index 2841803ce256..2841803ce256 100644
--- a/devel/horde-chora/pkg-plist
+++ b/devel/horde3-chora/pkg-plist
diff --git a/devel/horde-whups/Makefile b/devel/horde3-whups/Makefile
index 11eba61b0aef..81504da6ef69 100644
--- a/devel/horde-whups/Makefile
+++ b/devel/horde3-whups/Makefile
@@ -18,5 +18,5 @@ USE_GETTEXT=	yes
 PORTDOCS=	README CHANGES CREDITS INSTALL TODO lighttpd-whups.conf
 NO_BUILD=	yes
 
-.include "${.CURDIR}/../../www/horde-base/bsd.horde.mk"
+.include "${.CURDIR}/../../www/horde3-base/bsd.horde.mk"
 .include <bsd.port.mk>
diff --git a/devel/horde-whups/distinfo b/devel/horde3-whups/distinfo
index c40ec5637d3e..c40ec5637d3e 100644
--- a/devel/horde-whups/distinfo
+++ b/devel/horde3-whups/distinfo
diff --git a/devel/horde-whups/pkg-descr b/devel/horde3-whups/pkg-descr
index 84bcf36a9421..84bcf36a9421 100644
--- a/devel/horde-whups/pkg-descr
+++ b/devel/horde3-whups/pkg-descr
diff --git a/devel/horde-whups/pkg-plist b/devel/horde3-whups/pkg-plist
index 2104c8325100..2104c8325100 100644
--- a/devel/horde-whups/pkg-plist
+++ b/devel/horde3-whups/pkg-plist
diff --git a/ftp/Makefile b/ftp/Makefile
index 5be804763b41..4bf58f0b3957 100644
--- a/ftp/Makefile
+++ b/ftp/Makefile
@@ -36,7 +36,7 @@
     SUBDIR += gnusget
     SUBDIR += gnustep-ftp
     SUBDIR += gwget
-    SUBDIR += horde-gollem
+    SUBDIR += horde3-gollem
     SUBDIR += horde4-gollem
     SUBDIR += hs-curl
     SUBDIR += hsftp
diff --git a/ftp/horde-gollem/Makefile b/ftp/horde3-gollem/Makefile
index 47857cf57bb0..838b21362e80 100644
--- a/ftp/horde-gollem/Makefile
+++ b/ftp/horde3-gollem/Makefile
@@ -17,5 +17,5 @@ USE_HORDE=	base
 USE_GETTEXT=	yes
 PORTDOCS=	README CHANGES CREDITS INSTALL RELEASE_NOTES
 
-.include "${.CURDIR}/../../www/horde-base/bsd.horde.mk"
+.include "${.CURDIR}/../../www/horde3-base/bsd.horde.mk"
 .include <bsd.port.mk>
diff --git a/ftp/horde-gollem/distinfo b/ftp/horde3-gollem/distinfo
index 5540d3bf30e0..5540d3bf30e0 100644
--- a/ftp/horde-gollem/distinfo
+++ b/ftp/horde3-gollem/distinfo
diff --git a/ftp/horde-gollem/files/pkg-message.in b/ftp/horde3-gollem/files/pkg-message.in
index 0871bb817305..0871bb817305 100644
--- a/ftp/horde-gollem/files/pkg-message.in
+++ b/ftp/horde3-gollem/files/pkg-message.in
diff --git a/ftp/horde-gollem/pkg-descr b/ftp/horde3-gollem/pkg-descr
index 319955592a0d..319955592a0d 100644
--- a/ftp/horde-gollem/pkg-descr
+++ b/ftp/horde3-gollem/pkg-descr
diff --git a/ftp/horde-gollem/pkg-plist b/ftp/horde3-gollem/pkg-plist
index 0d55c8433456..0d55c8433456 100644
--- a/ftp/horde-gollem/pkg-plist
+++ b/ftp/horde3-gollem/pkg-plist
diff --git a/mail/Makefile b/mail/Makefile
index 7549f3abce6b..96fdd3dea298 100644
--- a/mail/Makefile
+++ b/mail/Makefile
@@ -177,13 +177,13 @@
     SUBDIR += hashcash
     SUBDIR += hbiff
     SUBDIR += heirloom-mailx
-    SUBDIR += horde-dimp
-    SUBDIR += horde-forwards
-    SUBDIR += horde-imp
-    SUBDIR += horde-ingo
-    SUBDIR += horde-mimp
-    SUBDIR += horde-turba
-    SUBDIR += horde-vacation
+    SUBDIR += horde3-dimp
+    SUBDIR += horde3-forwards
+    SUBDIR += horde3-imp
+    SUBDIR += horde3-ingo
+    SUBDIR += horde3-mimp
+    SUBDIR += horde3-turba
+    SUBDIR += horde3-vacation
     SUBDIR += horde4-imp
     SUBDIR += horde4-ingo
     SUBDIR += horde4-turba
diff --git a/mail/horde-dimp/Makefile b/mail/horde3-dimp/Makefile
index e16670f1ca49..75a7d74d0d46 100644
--- a/mail/horde-dimp/Makefile
+++ b/mail/horde3-dimp/Makefile
@@ -13,7 +13,7 @@ MAINTAINER=	horde@FreeBSD.org
 COMMENT=	Dynamic webmail system
 
 RUN_DEPENDS+=	${PEARDIR}/Auth/SASL.php:${PORTSDIR}/security/pear-Auth_SASL \
-		${HORBAS}/imp/index.php:${PORTSDIR}/mail/horde-imp
+		${HORBAS}/imp/index.php:${PORTSDIR}/mail/horde3-imp
 
 USE_PHP=	imap
 . if !defined(WITHOUT_LDAP)
@@ -48,5 +48,5 @@ pre-install:
 	fi
 .endif
 
-.include "${.CURDIR}/../../www/horde-base/bsd.horde.mk"
+.include "${.CURDIR}/../../www/horde3-base/bsd.horde.mk"
 .include <bsd.port.mk>
diff --git a/mail/horde-dimp/distinfo b/mail/horde3-dimp/distinfo
index 13b4d85de9fd..13b4d85de9fd 100644
--- a/mail/horde-dimp/distinfo
+++ b/mail/horde3-dimp/distinfo
diff --git a/mail/horde-dimp/files/pkg-message.in b/mail/horde3-dimp/files/pkg-message.in
index 764fa7a33a7f..764fa7a33a7f 100644
--- a/mail/horde-dimp/files/pkg-message.in
+++ b/mail/horde3-dimp/files/pkg-message.in
diff --git a/mail/horde-dimp/pkg-descr b/mail/horde3-dimp/pkg-descr
index d879017d22bc..d879017d22bc 100644
--- a/mail/horde-dimp/pkg-descr
+++ b/mail/horde3-dimp/pkg-descr
diff --git a/mail/horde-dimp/pkg-plist b/mail/horde3-dimp/pkg-plist
index db7e45f00826..db7e45f00826 100644
--- a/mail/horde-dimp/pkg-plist
+++ b/mail/horde3-dimp/pkg-plist
diff --git a/mail/horde-forwards/Makefile b/mail/horde3-forwards/Makefile
index 01aecaced655..d0f57377b922 100644
--- a/mail/horde-forwards/Makefile
+++ b/mail/horde3-forwards/Makefile
@@ -36,5 +36,5 @@ USE_HORDE=	base pkg-message
 USE_GETTEXT=	yes
 PORTDOCS=	README CHANGES CREDITS INSTALL RELEASE_NOTES TODO
 
-.include "${.CURDIR}/../../www/horde-base/bsd.horde.mk"
+.include "${.CURDIR}/../../www/horde3-base/bsd.horde.mk"
 .include <bsd.port.mk>
diff --git a/mail/horde-forwards/distinfo b/mail/horde3-forwards/distinfo
index 598eaacb48b2..598eaacb48b2 100644
--- a/mail/horde-forwards/distinfo
+++ b/mail/horde3-forwards/distinfo
diff --git a/mail/horde-forwards/pkg-descr b/mail/horde3-forwards/pkg-descr
index 766ee03b08d7..766ee03b08d7 100644
--- a/mail/horde-forwards/pkg-descr
+++ b/mail/horde3-forwards/pkg-descr
diff --git a/mail/horde-forwards/pkg-plist b/mail/horde3-forwards/pkg-plist
index b21b7da0285b..b21b7da0285b 100644
--- a/mail/horde-forwards/pkg-plist
+++ b/mail/horde3-forwards/pkg-plist
diff --git a/mail/horde-imp/Makefile b/mail/horde3-imp/Makefile
index 3a731800ed38..9f5088e2a7e2 100644
--- a/mail/horde-imp/Makefile
+++ b/mail/horde3-imp/Makefile
@@ -113,5 +113,5 @@ pre-install:
 	fi
 .endif
 
-.include "${.CURDIR}/../../www/horde-base/bsd.horde.mk"
+.include "${.CURDIR}/../../www/horde3-base/bsd.horde.mk"
 .include <bsd.port.mk>
diff --git a/mail/horde-imp/distinfo b/mail/horde3-imp/distinfo
index cdcc57e849dc..cdcc57e849dc 100644
--- a/mail/horde-imp/distinfo
+++ b/mail/horde3-imp/distinfo
diff --git a/mail/horde-imp/files/patch-ab b/mail/horde3-imp/files/patch-ab
index 70f53f65a58c..70f53f65a58c 100644
--- a/mail/horde-imp/files/patch-ab
+++ b/mail/horde3-imp/files/patch-ab
diff --git a/mail/horde-imp/files/patch-ac b/mail/horde3-imp/files/patch-ac
index 68730ef6fde4..68730ef6fde4 100644
--- a/mail/horde-imp/files/patch-ac
+++ b/mail/horde3-imp/files/patch-ac
diff --git a/mail/horde-imp/files/patch-config::conf.xml b/mail/horde3-imp/files/patch-config::conf.xml
index 09d8f92142cb..09d8f92142cb 100644
--- a/mail/horde-imp/files/patch-config::conf.xml
+++ b/mail/horde3-imp/files/patch-config::conf.xml
diff --git a/mail/horde-imp/files/pkg-message.in b/mail/horde3-imp/files/pkg-message.in
index 9a3de8c83b0c..9a3de8c83b0c 100644
--- a/mail/horde-imp/files/pkg-message.in
+++ b/mail/horde3-imp/files/pkg-message.in
diff --git a/mail/horde-imp/pkg-descr b/mail/horde3-imp/pkg-descr
index b085871c38de..b085871c38de 100644
--- a/mail/horde-imp/pkg-descr
+++ b/mail/horde3-imp/pkg-descr
diff --git a/mail/horde-imp/pkg-plist b/mail/horde3-imp/pkg-plist
index d8b58e1769a5..d8b58e1769a5 100644
--- a/mail/horde-imp/pkg-plist
+++ b/mail/horde3-imp/pkg-plist
diff --git a/mail/horde-ingo/Makefile b/mail/horde3-ingo/Makefile
index da3b308a279f..00a83744ac18 100644
--- a/mail/horde-ingo/Makefile
+++ b/mail/horde3-ingo/Makefile
@@ -30,5 +30,5 @@ USE_HORDE=	base pkg-message
 USE_GETTEXT=	yes
 PORTDOCS=	README CHANGES CREDITS INSTALL RELEASE_NOTES TODO
 
-.include "${.CURDIR}/../../www/horde-base/bsd.horde.mk"
+.include "${.CURDIR}/../../www/horde3-base/bsd.horde.mk"
 .include <bsd.port.mk>
diff --git a/mail/horde-ingo/distinfo b/mail/horde3-ingo/distinfo
index 6e77d668fb70..6e77d668fb70 100644
--- a/mail/horde-ingo/distinfo
+++ b/mail/horde3-ingo/distinfo
diff --git a/mail/horde-ingo/pkg-descr b/mail/horde3-ingo/pkg-descr
index 382bea7a8f2d..382bea7a8f2d 100644
--- a/mail/horde-ingo/pkg-descr
+++ b/mail/horde3-ingo/pkg-descr
diff --git a/mail/horde-ingo/pkg-plist b/mail/horde3-ingo/pkg-plist
index fe5455e49a4e..fe5455e49a4e 100644
--- a/mail/horde-ingo/pkg-plist
+++ b/mail/horde3-ingo/pkg-plist
diff --git a/mail/horde-mimp/Makefile b/mail/horde3-mimp/Makefile
index 8cfcb7c3b2d9..0cd9c8c97136 100644
--- a/mail/horde-mimp/Makefile
+++ b/mail/horde3-mimp/Makefile
@@ -28,7 +28,7 @@ COMMENT=	Mobile webmail system
 #-----------------------------------------------------------------------
 
 RUN_DEPENDS+=	${PEARDIR}/Auth/SASL.php:${PORTSDIR}/security/pear-Auth_SASL \
-		${HORBAS}/imp/index.php:${PORTSDIR}/mail/horde-imp
+		${HORBAS}/imp/index.php:${PORTSDIR}/mail/horde3-imp
 
 USE_PHP=	imap
 . if !defined(WITHOUT_LDAP)
@@ -63,5 +63,5 @@ pre-install:
 	fi
 .endif
 
-.include "${.CURDIR}/../../www/horde-base/bsd.horde.mk"
+.include "${.CURDIR}/../../www/horde3-base/bsd.horde.mk"
 .include <bsd.port.mk>
diff --git a/mail/horde-mimp/distinfo b/mail/horde3-mimp/distinfo
index 3fb72c9c7a40..3fb72c9c7a40 100644
--- a/mail/horde-mimp/distinfo
+++ b/mail/horde3-mimp/distinfo
diff --git a/mail/horde-mimp/files/pkg-message.in b/mail/horde3-mimp/files/pkg-message.in
index 87315b3e7e70..87315b3e7e70 100644
--- a/mail/horde-mimp/files/pkg-message.in
+++ b/mail/horde3-mimp/files/pkg-message.in
diff --git a/mail/horde-mimp/pkg-descr b/mail/horde3-mimp/pkg-descr
index eb98d5b91390..eb98d5b91390 100644
--- a/mail/horde-mimp/pkg-descr
+++ b/mail/horde3-mimp/pkg-descr
diff --git a/mail/horde-mimp/pkg-plist b/mail/horde3-mimp/pkg-plist
index 3441c242d38d..3441c242d38d 100644
--- a/mail/horde-mimp/pkg-plist
+++ b/mail/horde3-mimp/pkg-plist
diff --git a/mail/horde-turba/Makefile b/mail/horde3-turba/Makefile
index 9bbfba264812..26dddef78903 100644
--- a/mail/horde-turba/Makefile
+++ b/mail/horde3-turba/Makefile
@@ -23,5 +23,5 @@ pre-patch:
 	@${REINPLACE_CMD} -e "s:/usr/bin/ldapadd:${LOCALBASE}/bin/ldapadd:"	\
 		${WRKSRC}/scripts/ldap/addou.pl
 
-.include "${.CURDIR}/../../www/horde-base/bsd.horde.mk"
+.include "${.CURDIR}/../../www/horde3-base/bsd.horde.mk"
 .include <bsd.port.mk>
diff --git a/mail/horde-turba/distinfo b/mail/horde3-turba/distinfo
index e844649884bc..e844649884bc 100644
--- a/mail/horde-turba/distinfo
+++ b/mail/horde3-turba/distinfo
diff --git a/mail/horde-turba/files/patch-config::sources.php.dist b/mail/horde3-turba/files/patch-config::sources.php.dist
index aeb73b0e369d..aeb73b0e369d 100644
--- a/mail/horde-turba/files/patch-config::sources.php.dist
+++ b/mail/horde3-turba/files/patch-config::sources.php.dist
diff --git a/mail/horde-turba/files/pkg-message.in b/mail/horde3-turba/files/pkg-message.in
index fac46bfb9f28..fac46bfb9f28 100644
--- a/mail/horde-turba/files/pkg-message.in
+++ b/mail/horde3-turba/files/pkg-message.in
diff --git a/mail/horde-turba/pkg-descr b/mail/horde3-turba/pkg-descr
index 7ad5e825db08..7ad5e825db08 100644
--- a/mail/horde-turba/pkg-descr
+++ b/mail/horde3-turba/pkg-descr
diff --git a/mail/horde-turba/pkg-plist b/mail/horde3-turba/pkg-plist
index 3da8236be114..3da8236be114 100644
--- a/mail/horde-turba/pkg-plist
+++ b/mail/horde3-turba/pkg-plist
diff --git a/mail/horde-vacation/Makefile b/mail/horde3-vacation/Makefile
index 0d2b627e74eb..92ae3f85527c 100644
--- a/mail/horde-vacation/Makefile
+++ b/mail/horde3-vacation/Makefile
@@ -36,5 +36,5 @@ USE_HORDE=	base pkg-message
 USE_GETTEXT=	yes
 PORTDOCS=	CHANGES CREDITS INSTALL RELEASE_NOTES TODO
 
-.include "${.CURDIR}/../../www/horde-base/bsd.horde.mk"
+.include "${.CURDIR}/../../www/horde3-base/bsd.horde.mk"
 .include <bsd.port.mk>
diff --git a/mail/horde-vacation/distinfo b/mail/horde3-vacation/distinfo
index d6bd1520d6e1..d6bd1520d6e1 100644
--- a/mail/horde-vacation/distinfo
+++ b/mail/horde3-vacation/distinfo
diff --git a/mail/horde-vacation/pkg-descr b/mail/horde3-vacation/pkg-descr
index 91691808caec..91691808caec 100644
--- a/mail/horde-vacation/pkg-descr
+++ b/mail/horde3-vacation/pkg-descr
diff --git a/mail/horde-vacation/pkg-plist b/mail/horde3-vacation/pkg-plist
index 0f3832a904fe..0f3832a904fe 100644
--- a/mail/horde-vacation/pkg-plist
+++ b/mail/horde3-vacation/pkg-plist
diff --git a/net-mgmt/Makefile b/net-mgmt/Makefile
index 9897889abf9b..3fbbe821b95b 100644
--- a/net-mgmt/Makefile
+++ b/net-mgmt/Makefile
@@ -82,7 +82,7 @@
     SUBDIR += gsnmp
     SUBDIR += hastmon
     SUBDIR += hawk
-    SUBDIR += horde-nic
+    SUBDIR += horde3-nic
     SUBDIR += icinga
     SUBDIR += icmpmonitor
     SUBDIR += icmpquery
diff --git a/net-mgmt/horde-nic/Makefile b/net-mgmt/horde3-nic/Makefile
index 666c02f8b3d4..885eed90481e 100644
--- a/net-mgmt/horde-nic/Makefile
+++ b/net-mgmt/horde3-nic/Makefile
@@ -19,5 +19,5 @@ USE_HORDE=	base pkg-message
 USE_GETTEXT=	yes
 PORTDOCS=	CHANGES CREDITS INSTALL TODO README
 
-.include "${.CURDIR}/../../www/horde-base/bsd.horde.mk"
+.include "${.CURDIR}/../../www/horde3-base/bsd.horde.mk"
 .include <bsd.port.mk>
diff --git a/net-mgmt/horde-nic/distinfo b/net-mgmt/horde3-nic/distinfo
index 368e575b2c8d..368e575b2c8d 100644
--- a/net-mgmt/horde-nic/distinfo
+++ b/net-mgmt/horde3-nic/distinfo
diff --git a/net-mgmt/horde-nic/pkg-descr b/net-mgmt/horde3-nic/pkg-descr
index baefb8cfc253..baefb8cfc253 100644
--- a/net-mgmt/horde-nic/pkg-descr
+++ b/net-mgmt/horde3-nic/pkg-descr
diff --git a/net-mgmt/horde-nic/pkg-plist b/net-mgmt/horde3-nic/pkg-plist
index 6972df183113..6972df183113 100644
--- a/net-mgmt/horde-nic/pkg-plist
+++ b/net-mgmt/horde3-nic/pkg-plist
diff --git a/security/Makefile b/security/Makefile
index cf93043742b3..dc20f481a146 100644
--- a/security/Makefile
+++ b/security/Makefile
@@ -183,7 +183,7 @@
     SUBDIR += hlfl
     SUBDIR += hmap
     SUBDIR += honggfuzz
-    SUBDIR += horde-jeta
+    SUBDIR += horde3-jeta
     SUBDIR += hotssh
     SUBDIR += hs-Crypto
     SUBDIR += hs-HsOpenSSL
diff --git a/security/horde-jeta/Makefile b/security/horde3-jeta/Makefile
index b53a58c8162a..00350a5425e2 100644
--- a/security/horde-jeta/Makefile
+++ b/security/horde3-jeta/Makefile
@@ -17,5 +17,5 @@ USE_HORDE=	base pkg-message
 USE_GETTEXT=	yes
 PORTDOCS=	README CHANGES CREDITS INSTALL RELEASE_NOTES
 
-.include "${.CURDIR}/../../www/horde-base/bsd.horde.mk"
+.include "${.CURDIR}/../../www/horde3-base/bsd.horde.mk"
 .include <bsd.port.mk>
diff --git a/security/horde-jeta/distinfo b/security/horde3-jeta/distinfo
index 35935a0bd170..35935a0bd170 100644
--- a/security/horde-jeta/distinfo
+++ b/security/horde3-jeta/distinfo
diff --git a/security/horde-jeta/pkg-descr b/security/horde3-jeta/pkg-descr
index 45a408facd6e..45a408facd6e 100644
--- a/security/horde-jeta/pkg-descr
+++ b/security/horde3-jeta/pkg-descr
diff --git a/security/horde-jeta/pkg-plist b/security/horde3-jeta/pkg-plist
index 0c74f5f445d4..0c74f5f445d4 100644
--- a/security/horde-jeta/pkg-plist
+++ b/security/horde3-jeta/pkg-plist
diff --git a/www/Makefile b/www/Makefile
index af5c6db61f6e..0d66dd8222e9 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -268,12 +268,12 @@
     SUBDIR += helma
     SUBDIR += hiawatha
     SUBDIR += hinventory-client
-    SUBDIR += horde-ansel
-    SUBDIR += horde-base
-    SUBDIR += horde-meta
-    SUBDIR += horde-passwd
-    SUBDIR += horde-trean
-    SUBDIR += horde-wicked
+    SUBDIR += horde3-ansel
+    SUBDIR += horde3-base
+    SUBDIR += horde3-meta
+    SUBDIR += horde3-passwd
+    SUBDIR += horde3-trean
+    SUBDIR += horde3-wicked
     SUBDIR += horde4-ansel
     SUBDIR += horde4-base
     SUBDIR += horde4-passwd
diff --git a/www/horde-ansel/Makefile b/www/horde3-ansel/Makefile
index cde615cc1765..9c60f009b732 100644
--- a/www/horde-ansel/Makefile
+++ b/www/horde3-ansel/Makefile
@@ -18,5 +18,5 @@ USE_HORDE=	base pkg-message
 USE_GETTEXT=	yes
 PORTDOCS=	CHANGES CREDITS TODO README
 
-.include "${.CURDIR}/../../www/horde-base/bsd.horde.mk"
+.include "${.CURDIR}/../../www/horde3-base/bsd.horde.mk"
 .include <bsd.port.mk>
diff --git a/www/horde-ansel/distinfo b/www/horde3-ansel/distinfo
index 02b2ce67bd15..02b2ce67bd15 100644
--- a/www/horde-ansel/distinfo
+++ b/www/horde3-ansel/distinfo
diff --git a/www/horde-ansel/pkg-descr b/www/horde3-ansel/pkg-descr
index 9e41fc9c2869..9e41fc9c2869 100644
--- a/www/horde-ansel/pkg-descr
+++ b/www/horde3-ansel/pkg-descr
diff --git a/www/horde-ansel/pkg-plist b/www/horde3-ansel/pkg-plist
index a101c514353e..a101c514353e 100644
--- a/www/horde-ansel/pkg-plist
+++ b/www/horde3-ansel/pkg-plist
diff --git a/www/horde-base/Makefile b/www/horde3-base/Makefile
index dc56bd006a7e..75786c4d0e38 100644
--- a/www/horde-base/Makefile
+++ b/www/horde3-base/Makefile
@@ -262,5 +262,5 @@ pre-install:
 	${SETENV} ${SCRIPTS_ENV} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 .endif
 
-.include "${.CURDIR}/../../www/horde-base/bsd.horde.mk"
+.include "${.CURDIR}/../../www/horde3-base/bsd.horde.mk"
 .include <bsd.port.post.mk>
diff --git a/www/horde-base/bsd.horde.mk b/www/horde3-base/bsd.horde.mk
index 39e8c7eb16ed..ea6f0e8b512b 100644
--- a/www/horde-base/bsd.horde.mk
+++ b/www/horde3-base/bsd.horde.mk
@@ -10,7 +10,7 @@ DISTVERSIONPREFIX?=	h3-
 PKGNAMEPREFIX?=	horde-
 
 .if defined(USE_HORDE) && ${USE_HORDE:Mbase}
-RUN_DEPENDS+=	${HORBAS}/rpc.php:${PORTSDIR}/www/horde-base
+RUN_DEPENDS+=	${HORBAS}/rpc.php:${PORTSDIR}/www/horde3-base
 .endif
 
 #USE_BZIP2=	yes
diff --git a/www/horde-base/distinfo b/www/horde3-base/distinfo
index f2ae0a88ed95..f2ae0a88ed95 100644
--- a/www/horde-base/distinfo
+++ b/www/horde3-base/distinfo
diff --git a/www/horde-base/files/extra-patch-lib_Horde_NLS.php b/www/horde3-base/files/extra-patch-lib_Horde_NLS.php
index 96eff63ba486..96eff63ba486 100644
--- a/www/horde-base/files/extra-patch-lib_Horde_NLS.php
+++ b/www/horde3-base/files/extra-patch-lib_Horde_NLS.php
diff --git a/www/horde-base/files/patch-config_conf.xml b/www/horde3-base/files/patch-config_conf.xml
index e24d3d03928d..e24d3d03928d 100644
--- a/www/horde-base/files/patch-config_conf.xml
+++ b/www/horde3-base/files/patch-config_conf.xml
diff --git a/www/horde-base/files/patch-config_mime_drivers.php.dist b/www/horde3-base/files/patch-config_mime_drivers.php.dist
index 562a2e799bdf..562a2e799bdf 100644
--- a/www/horde-base/files/patch-config_mime_drivers.php.dist
+++ b/www/horde3-base/files/patch-config_mime_drivers.php.dist
diff --git a/www/horde-base/files/patch-config_registry.php.dist b/www/horde3-base/files/patch-config_registry.php.dist
index ae787a92685a..ae787a92685a 100644
--- a/www/horde-base/files/patch-config_registry.php.dist
+++ b/www/horde3-base/files/patch-config_registry.php.dist
diff --git a/www/horde-base/files/patch-po_translation.php b/www/horde3-base/files/patch-po_translation.php
index 045891903631..045891903631 100644
--- a/www/horde-base/files/patch-po_translation.php
+++ b/www/horde3-base/files/patch-po_translation.php
diff --git a/www/horde-base/files/patch-scripts_sql_README b/www/horde3-base/files/patch-scripts_sql_README
index 4e727f834c0a..4e727f834c0a 100644
--- a/www/horde-base/files/patch-scripts_sql_README
+++ b/www/horde3-base/files/patch-scripts_sql_README
diff --git a/www/horde-base/files/pkg-deinstall.in b/www/horde3-base/files/pkg-deinstall.in
index c9c309067789..c9c309067789 100644
--- a/www/horde-base/files/pkg-deinstall.in
+++ b/www/horde3-base/files/pkg-deinstall.in
diff --git a/www/horde-base/files/pkg-install.in b/www/horde3-base/files/pkg-install.in
index 2ecbe6d3f5ef..2ecbe6d3f5ef 100644
--- a/www/horde-base/files/pkg-install.in
+++ b/www/horde3-base/files/pkg-install.in
diff --git a/www/horde-base/files/pkg-message.common.in b/www/horde3-base/files/pkg-message.common.in
index 37de388ef932..37de388ef932 100644
--- a/www/horde-base/files/pkg-message.common.in
+++ b/www/horde3-base/files/pkg-message.common.in
diff --git a/www/horde-base/files/pkg-message.in b/www/horde3-base/files/pkg-message.in
index 0fe43be94709..0fe43be94709 100644
--- a/www/horde-base/files/pkg-message.in
+++ b/www/horde3-base/files/pkg-message.in
diff --git a/www/horde-base/pkg-descr b/www/horde3-base/pkg-descr
index 5a86429fa7e6..5a86429fa7e6 100644
--- a/www/horde-base/pkg-descr
+++ b/www/horde3-base/pkg-descr
diff --git a/www/horde-base/pkg-plist b/www/horde3-base/pkg-plist
index 9939a7178e24..9939a7178e24 100644
--- a/www/horde-base/pkg-plist
+++ b/www/horde3-base/pkg-plist
diff --git a/www/horde-meta/Makefile b/www/horde3-meta/Makefile
index 06b3d1de83e6..38f94ebec126 100644
--- a/www/horde-meta/Makefile
+++ b/www/horde3-meta/Makefile
@@ -40,83 +40,82 @@ OPTIONS=	ANSEL "Photo Gallery" off	\
 
 .include <bsd.port.pre.mk>
 
-RUN_DEPENDS+=	${LOCALBASE}/${LHORDEDIR}/rpc.php:${PORTSDIR}/www/horde-base
+RUN_DEPENDS+=	${LOCALBASE}/${LHORDEDIR}/rpc.php:${PORTSDIR}/www/horde3-base
 
 .if !defined(WITHOUT_IMP)
-RUN_DEPENDS+=	${LOCALBASE}/${LHORDEDIR}/imp/index.php:${PORTSDIR}/mail/horde-imp
+RUN_DEPENDS+=	${LOCALBASE}/${LHORDEDIR}/imp/index.php:${PORTSDIR}/mail/horde3-imp
 .endif
 
 .if defined(WITH_MIMP)
-RUN_DEPENDS+=	${LOCALBASE}/${LHORDEDIR}/mimp/index.php:${PORTSDIR}/mail/horde-mimp
+RUN_DEPENDS+=	${LOCALBASE}/${LHORDEDIR}/mimp/index.php:${PORTSDIR}/mail/horde3-mimp
 .endif
 
 .if defined(WITH_DIMP)
-RUN_DEPENDS+=
-${LOCALBASE}/${LHORDEDIR}/dimp/compose.php:${PORTSDIR}/mail/horde-dimp
+RUN_DEPENDS+= ${LOCALBASE}/${LHORDEDIR}/dimp/compose.php:${PORTSDIR}/mail/horde3-dimp
 .endif
 
 .if !defined(WITHOUT_INGO)
-RUN_DEPENDS+=	${LOCALBASE}/${LHORDEDIR}/ingo/filters.php:${PORTSDIR}/mail/horde-ingo
+RUN_DEPENDS+=	${LOCALBASE}/${LHORDEDIR}/ingo/filters.php:${PORTSDIR}/mail/horde3-ingo
 .endif
 
 .if !defined(WITHOUT_TURBA)
-RUN_DEPENDS+=	${LOCALBASE}/${LHORDEDIR}/turba/minisearch.php:${PORTSDIR}/mail/horde-turba
+RUN_DEPENDS+=	${LOCALBASE}/${LHORDEDIR}/turba/minisearch.php:${PORTSDIR}/mail/horde3-turba
 .endif
 
 .if defined(WITH_KRONOLITH)
-RUN_DEPENDS+=	${LOCALBASE}/${LHORDEDIR}/kronolith/index.php:${PORTSDIR}/deskutils/horde-kronolith
+RUN_DEPENDS+=	${LOCALBASE}/${LHORDEDIR}/kronolith/index.php:${PORTSDIR}/deskutils/horde3-kronolith
 .endif
 
 .if defined(WITH_MNEMO)
-RUN_DEPENDS+=	${LOCALBASE}/${LHORDEDIR}/mnemo/index.php:${PORTSDIR}/deskutils/horde-mnemo
+RUN_DEPENDS+=	${LOCALBASE}/${LHORDEDIR}/mnemo/index.php:${PORTSDIR}/deskutils/horde3-mnemo
 .endif
 
 .if !defined(WITHOUT_NAG)
-RUN_DEPENDS+=	${LOCALBASE}/${LHORDEDIR}/nag/data.php:${PORTSDIR}/deskutils/horde-nag
+RUN_DEPENDS+=	${LOCALBASE}/${LHORDEDIR}/nag/data.php:${PORTSDIR}/deskutils/horde3-nag
 .endif
 
 .if defined(WITH_CHORA)
-RUN_DEPENDS+=	${LOCALBASE}/${LHORDEDIR}/chora/index.php:${PORTSDIR}/devel/horde-chora
+RUN_DEPENDS+=	${LOCALBASE}/${LHORDEDIR}/chora/index.php:${PORTSDIR}/devel/horde3-chora
 .endif
 
 .if defined(WITH_GOLLEM)
-RUN_DEPENDS+=	${LOCALBASE}/${LHORDEDIR}/gollem/index.php:${PORTSDIR}/ftp/horde-gollem
+RUN_DEPENDS+=	${LOCALBASE}/${LHORDEDIR}/gollem/index.php:${PORTSDIR}/ftp/horde3-gollem
 .endif
 
 .if defined(WITH_JETA)
-RUN_DEPENDS+=	${LOCALBASE}/${LHORDEDIR}/jeta/index.php:${PORTSDIR}/security/horde-jeta
+RUN_DEPENDS+=	${LOCALBASE}/${LHORDEDIR}/jeta/index.php:${PORTSDIR}/security/horde3-jeta
 .endif
 
 .if defined(WITH_HPASSWD)
-RUN_DEPENDS+=	${LOCALBASE}/${LHORDEDIR}/passwd/index.php:${PORTSDIR}/www/horde-passwd
+RUN_DEPENDS+=	${LOCALBASE}/${LHORDEDIR}/passwd/index.php:${PORTSDIR}/www/horde3-passwd
 .endif
 
 .if defined(WITH_VACATION)
-RUN_DEPENDS+=	${LOCALBASE}/${LHORDEDIR}/vacation/main.php:${PORTSDIR}/mail/horde-vacation
+RUN_DEPENDS+=	${LOCALBASE}/${LHORDEDIR}/vacation/main.php:${PORTSDIR}/mail/horde3-vacation
 .endif
 
 .if defined(WITH_TREAN)
-RUN_DEPENDS+=	${LOCALBASE}/${LHORDEDIR}/trean/data.php:${PORTSDIR}/www/horde-trean
+RUN_DEPENDS+=	${LOCALBASE}/${LHORDEDIR}/trean/data.php:${PORTSDIR}/www/horde3-trean
 .endif
 
 .if defined(WITH_NIC)
-RUN_DEPENDS+=	${LOCALBASE}/${LHORDEDIR}/nic/status.php:${PORTSDIR}/net-mgmt/horde-nic
+RUN_DEPENDS+=	${LOCALBASE}/${LHORDEDIR}/nic/status.php:${PORTSDIR}/net-mgmt/horde3-nic
 .endif
 
 .if defined(WITH_ANSEL)
-RUN_DEPENDS+=	${LOCALBASE}/${LHORDEDIR}/ansel/gallery.php:${PORTSDIR}/www/horde-ansel
+RUN_DEPENDS+=	${LOCALBASE}/${LHORDEDIR}/ansel/gallery.php:${PORTSDIR}/www/horde3-ansel
 .endif
 
 .if defined(WITH_WHUPS)
-RUN_DEPENDS+=	${LOCALBASE}/${LHORDEDIR}/whups/index.php:${PORTSDIR}/devel/horde-whups
+RUN_DEPENDS+=	${LOCALBASE}/${LHORDEDIR}/whups/index.php:${PORTSDIR}/devel/horde3-whups
 .endif
 
 .if defined(WITH_HERMES)
-RUN_DEPENDS+=	${LOCALBASE}/${LHORDEDIR}/hermes/index.php:${PORTSDIR}/deskutils/horde-hermes
+RUN_DEPENDS+=	${LOCALBASE}/${LHORDEDIR}/hermes/index.php:${PORTSDIR}/deskutils/horde3-hermes
 .endif
 
 .if defined(WITH_KLUTZ)
-RUN_DEPENDS+=	${LOCALBASE}/${LHORDEDIR}/klutz/index.php:${PORTSDIR}/deskutils/horde-klutz
+RUN_DEPENDS+=	${LOCALBASE}/${LHORDEDIR}/klutz/index.php:${PORTSDIR}/deskutils/horde3-klutz
 .endif
 
 post-configure:
diff --git a/www/horde-meta/files/post-configure-message b/www/horde3-meta/files/post-configure-message
index ae87a0751fe8..ae87a0751fe8 100644
--- a/www/horde-meta/files/post-configure-message
+++ b/www/horde3-meta/files/post-configure-message
diff --git a/www/horde-meta/pkg-descr b/www/horde3-meta/pkg-descr
index 1790f5bc67cb..1790f5bc67cb 100644
--- a/www/horde-meta/pkg-descr
+++ b/www/horde3-meta/pkg-descr
diff --git a/www/horde-passwd/Makefile b/www/horde3-passwd/Makefile
index 5e82cabe15c9..195e04922f36 100644
--- a/www/horde-passwd/Makefile
+++ b/www/horde3-passwd/Makefile
@@ -18,5 +18,5 @@ USE_HORDE=	base
 USE_GETTEXT=	yes
 PORTDOCS=	README CHANGES CREDITS INSTALL RELEASE_NOTES TODO
 
-.include "${.CURDIR}/../../www/horde-base/bsd.horde.mk"
+.include "${.CURDIR}/../../www/horde3-base/bsd.horde.mk"
 .include <bsd.port.mk>
diff --git a/www/horde-passwd/distinfo b/www/horde3-passwd/distinfo
index 1e3c5ba7c15b..1e3c5ba7c15b 100644
--- a/www/horde-passwd/distinfo
+++ b/www/horde3-passwd/distinfo
diff --git a/www/horde-passwd/files/pkg-message.in b/www/horde3-passwd/files/pkg-message.in
index d315665a21e0..d315665a21e0 100644
--- a/www/horde-passwd/files/pkg-message.in
+++ b/www/horde3-passwd/files/pkg-message.in
diff --git a/www/horde-passwd/pkg-descr b/www/horde3-passwd/pkg-descr
index 878a0f3613ea..878a0f3613ea 100644
--- a/www/horde-passwd/pkg-descr
+++ b/www/horde3-passwd/pkg-descr
diff --git a/www/horde-passwd/pkg-plist b/www/horde3-passwd/pkg-plist
index f2b588a58cc2..f2b588a58cc2 100644
--- a/www/horde-passwd/pkg-plist
+++ b/www/horde3-passwd/pkg-plist
diff --git a/www/horde-trean/Makefile b/www/horde3-trean/Makefile
index 6e694ddf0377..b31ad0afc162 100644
--- a/www/horde-trean/Makefile
+++ b/www/horde3-trean/Makefile
@@ -20,5 +20,5 @@ USE_BZIP2=	yes
 USE_GETTEXT=	yes
 PORTDOCS=	CHANGES CREDITS INSTALL TODO README
 
-.include "${.CURDIR}/../../www/horde-base/bsd.horde.mk"
+.include "${.CURDIR}/../../www/horde3-base/bsd.horde.mk"
 .include <bsd.port.mk>
diff --git a/www/horde-trean/distinfo b/www/horde3-trean/distinfo
index 15bde55c9cbc..15bde55c9cbc 100644
--- a/www/horde-trean/distinfo
+++ b/www/horde3-trean/distinfo
diff --git a/www/horde-trean/pkg-descr b/www/horde3-trean/pkg-descr
index 2edce162d5bc..2edce162d5bc 100644
--- a/www/horde-trean/pkg-descr
+++ b/www/horde3-trean/pkg-descr
diff --git a/www/horde-trean/pkg-plist b/www/horde3-trean/pkg-plist
index 69fd25044e24..69fd25044e24 100644
--- a/www/horde-trean/pkg-plist
+++ b/www/horde3-trean/pkg-plist
diff --git a/www/horde-wicked/Makefile b/www/horde3-wicked/Makefile
index f9faacddf745..a393679a194f 100644
--- a/www/horde-wicked/Makefile
+++ b/www/horde3-wicked/Makefile
@@ -22,5 +22,5 @@ PORTDOCS=	README CHANGES CREDITS INSTALL TODO
 
 BUILD_DEPENDS+=	${PEARDIR}/Text/Wiki.php:${PORTSDIR}/www/pear-Text_Wiki
 
-.include "${.CURDIR}/../../www/horde-base/bsd.horde.mk"
+.include "${.CURDIR}/../../www/horde3-base/bsd.horde.mk"
 .include <bsd.port.mk>
diff --git a/www/horde-wicked/distinfo b/www/horde3-wicked/distinfo
index 7319d6b298c3..7319d6b298c3 100644
--- a/www/horde-wicked/distinfo
+++ b/www/horde3-wicked/distinfo
diff --git a/www/horde-wicked/pkg-descr b/www/horde3-wicked/pkg-descr
index b83b864e27cc..b83b864e27cc 100644
--- a/www/horde-wicked/pkg-descr
+++ b/www/horde3-wicked/pkg-descr
diff --git a/www/horde-wicked/pkg-plist b/www/horde3-wicked/pkg-plist
index d2e4700f48ac..d2e4700f48ac 100644
--- a/www/horde-wicked/pkg-plist
+++ b/www/horde3-wicked/pkg-plist