22 files changed, 28 insertions, 20 deletions

diff --git a/deskutils/horde3-hermes/Makefile b/deskutils/horde3-hermes/Makefile
index 60e6f21556b6..ad56e2a04fb4 100644
--- a/deskutils/horde3-hermes/Makefile
+++ b/deskutils/horde3-hermes/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	hermes
 PORTVERSION=	1.0.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	deskutils www
 
 MAINTAINER=	horde@FreeBSD.org
diff --git a/deskutils/horde3-klutz/Makefile b/deskutils/horde3-klutz/Makefile
index 66c79b35b433..bf3e2924b9ac 100644
--- a/deskutils/horde3-klutz/Makefile
+++ b/deskutils/horde3-klutz/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	klutz
 PORTVERSION=	1.0
 DISTVERSIONSUFFIX=
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	deskutils www
 
 MAINTAINER=	horde@FreeBSD.org
diff --git a/deskutils/horde3-kronolith/Makefile b/deskutils/horde3-kronolith/Makefile
index 721cffe0ee00..187b2015011c 100644
--- a/deskutils/horde3-kronolith/Makefile
+++ b/deskutils/horde3-kronolith/Makefile
@@ -8,6 +8,7 @@
 PORTNAME=	kronolith
 PORTVERSION=	2.3.6
 DISTVERSIONSUFFIX=
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	deskutils www
 
diff --git a/deskutils/horde3-mnemo/Makefile b/deskutils/horde3-mnemo/Makefile
index bbe752d7571e..ec371c472d21 100644
--- a/deskutils/horde3-mnemo/Makefile
+++ b/deskutils/horde3-mnemo/Makefile
@@ -8,6 +8,7 @@
 PORTNAME=	mnemo
 PORTVERSION=	2.2.5
 DISTVERSIONSUFFIX=
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	deskutils www
 
diff --git a/deskutils/horde3-nag/Makefile b/deskutils/horde3-nag/Makefile
index 1ed216988655..d74354d2fc37 100644
--- a/deskutils/horde3-nag/Makefile
+++ b/deskutils/horde3-nag/Makefile
@@ -8,6 +8,7 @@
 PORTNAME=	nag
 PORTVERSION=	2.3.7
 DISTVERSIONSUFFIX=
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	deskutils www
 
diff --git a/devel/horde3-whups/Makefile b/devel/horde3-whups/Makefile
index 81504da6ef69..cb4d18ed957e 100644
--- a/devel/horde3-whups/Makefile
+++ b/devel/horde3-whups/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	whups
 PORTVERSION=	1.0.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	devel www
 
 MAINTAINER=	horde@FreeBSD.org
diff --git a/ftp/horde3-gollem/Makefile b/ftp/horde3-gollem/Makefile
index 838b21362e80..5216c7246f8c 100644
--- a/ftp/horde3-gollem/Makefile
+++ b/ftp/horde3-gollem/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gollem
 PORTVERSION=	1.1.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	ftp www
 
 MAINTAINER=	horde@FreeBSD.org
diff --git a/mail/horde3-dimp/Makefile b/mail/horde3-dimp/Makefile
index 75a7d74d0d46..8d6c7dea559a 100644
--- a/mail/horde3-dimp/Makefile
+++ b/mail/horde3-dimp/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	dimp
 PORTVERSION=	1.1.8
+PORTREVISION=	1
 CATEGORIES=	mail www
 
 MAINTAINER=	horde@FreeBSD.org
diff --git a/mail/horde3-forwards/Makefile b/mail/horde3-forwards/Makefile
index d0f57377b922..f1cf7f6d6671 100644
--- a/mail/horde3-forwards/Makefile
+++ b/mail/horde3-forwards/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	forwards
 PORTVERSION=	3.2.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail www
 DIST_SUBDIR=	horde
 
diff --git a/mail/horde3-imp/Makefile b/mail/horde3-imp/Makefile
index 9f5088e2a7e2..d12510e988e5 100644
--- a/mail/horde3-imp/Makefile
+++ b/mail/horde3-imp/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	imp
 PORTVERSION=	4.3.11
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	mail www
 DISTFILES=	${PORTNAME}-h3-${PORTVERSION}${EXTRACT_SUFX}
diff --git a/mail/horde3-ingo/Makefile b/mail/horde3-ingo/Makefile
index 00a83744ac18..8f1f644ba42f 100644
--- a/mail/horde3-ingo/Makefile
+++ b/mail/horde3-ingo/Makefile
@@ -8,6 +8,7 @@
 PORTNAME=	ingo
 PORTVERSION=	1.2.6
 DISTVERSIONSUFFIX=
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	mail www
 
diff --git a/mail/horde3-mimp/Makefile b/mail/horde3-mimp/Makefile
index 0cd9c8c97136..2321e5c7102c 100644
--- a/mail/horde3-mimp/Makefile
+++ b/mail/horde3-mimp/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mimp
 PORTVERSION=	1.1.4
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	mail www
 
diff --git a/mail/horde3-turba/Makefile b/mail/horde3-turba/Makefile
index 26dddef78903..f276824d402b 100644
--- a/mail/horde3-turba/Makefile
+++ b/mail/horde3-turba/Makefile
@@ -8,6 +8,7 @@
 PORTNAME=	turba
 PORTVERSION=	2.3.6
 DISTVERSIONSUFFIX=
+PORTREVISION=	1
 CATEGORIES=	mail www
 
 MAINTAINER=	horde@FreeBSD.org
diff --git a/mail/horde3-vacation/Makefile b/mail/horde3-vacation/Makefile
index 92ae3f85527c..4def9de9b5e0 100644
--- a/mail/horde3-vacation/Makefile
+++ b/mail/horde3-vacation/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	vacation
 PORTVERSION=	3.2.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail www
 DIST_SUBDIR=	horde
 
diff --git a/net-mgmt/horde3-nic/Makefile b/net-mgmt/horde3-nic/Makefile
index 885eed90481e..f9c4dbd40d53 100644
--- a/net-mgmt/horde3-nic/Makefile
+++ b/net-mgmt/horde3-nic/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	nic
 DISTVERSIONPREFIX=
 DISTVERSION=	0.1.beta20070316
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	net-mgmt
 MASTER_SITES=	CENKES http://freebsd.alaskaparadise.com/source/
 
diff --git a/security/horde3-jeta/Makefile b/security/horde3-jeta/Makefile
index 00350a5425e2..6dabe1d6c9ac 100644
--- a/security/horde3-jeta/Makefile
+++ b/security/horde3-jeta/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	jeta
 PORTVERSION=	1.0
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	security www
 
 MAINTAINER=	horde@FreeBSD.org
diff --git a/www/horde3-ansel/Makefile b/www/horde3-ansel/Makefile
index 9c60f009b732..bfe73227d9ae 100644
--- a/www/horde3-ansel/Makefile
+++ b/www/horde3-ansel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ansel
 DISTVERSION=	1.1.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 DIST_SUBDIR=	horde
 
diff --git a/www/horde3-base/Makefile b/www/horde3-base/Makefile
index 75786c4d0e38..183fd064696e 100644
--- a/www/horde3-base/Makefile
+++ b/www/horde3-base/Makefile
@@ -5,12 +5,13 @@
 # $FreeBSD$
 #
 
-PORTNAME=	horde
+PORTNAME=	base
 PORTVERSION=	3.3.13
 DISTVERSIONPREFIX=
+PORTREVISION=	1
 CATEGORIES=	www
-PKGNAMEPREFIX=
-PKGNAMESUFFIX=	-base
+MASTER_SITE_SUBDIR=	horde
+DISTNAME=	horde-${PORTVERSION}
 
 MAINTAINER=	horde@FreeBSD.org
 COMMENT=	Common code-base used by Horde applications
@@ -78,8 +79,6 @@ RUN_DEPENDS+=	${PEARDIR}/Date.php:${PORTSDIR}/devel/pear-Date			\
 		${PEARDIR}/Net/SMTP.php:${PORTSDIR}/net/pear-Net_SMTP   \
 		${PEARDIR}/MDB2/Schema/Validate.php:${PORTSDIR}/databases/pear-MDB2_Schema
 
-CONFLICTS=	horde-4*
-
 USE_GETTEXT=	yes
 USE_PHP=	ctype gettext session
 
diff --git a/www/horde3-base/bsd.horde.mk b/www/horde3-base/bsd.horde.mk
index 1c8ec09b8bd7..87c54646b32b 100644
--- a/www/horde3-base/bsd.horde.mk
+++ b/www/horde3-base/bsd.horde.mk
@@ -6,10 +6,11 @@
 #
 
 LATEST_LINK?=		horde3-${PORTNAME}
+CONFLICTS?=		horde-*.[0-9]*
 
 MASTER_SITES?=		HORDE
 DISTVERSIONPREFIX?=	h3-
-PKGNAMEPREFIX?=	horde-
+PKGNAMEPREFIX?=	horde3-
 
 .if defined(USE_HORDE) && ${USE_HORDE:Mbase}
 RUN_DEPENDS+=	${HORBAS}/rpc.php:${PORTSDIR}/www/horde3-base
@@ -56,10 +57,10 @@ post-extract:
 .if !target(post-patch)
 post-patch:
 .	for file in pkg-deinstall pkg-install
-	@${SED} ${_SUB_LIST_TEMP} -e '/^@comment /d' ${.CURDIR}/../../www/horde-base/files/${file}.in > ${WRKDIR}/${file}
+	@${SED} ${_SUB_LIST_TEMP} -e '/^@comment /d' ${.CURDIR}/../../www/horde3-base/files/${file}.in > ${WRKDIR}/${file}
 .	endfor
 .	if defined(USE_HORDE) && ${USE_HORDE:Mpkg-message}
-	@${SED} ${_SUB_LIST_TEMP} -e '/^@comment /d' ${.CURDIR}/../../www/horde-base/files/pkg-message.common.in >\
+	@${SED} ${_SUB_LIST_TEMP} -e '/^@comment /d' ${.CURDIR}/../../www/horde3-base/files/pkg-message.common.in >\
 		${WRKDIR}/pkg-message
 .	endif
 	@${EGREP} -lr '(/usr/local|%%LOCALBASE%%|/tmp/horde.log)' ${WRKSRC}/config/ |\
diff --git a/www/horde3-meta/Makefile b/www/horde3-meta/Makefile
index 38f94ebec126..3c177262aaf2 100644
--- a/www/horde3-meta/Makefile
+++ b/www/horde3-meta/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	meta
 PORTVERSION=	1.0
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	www
 MASTER_SITES=	# Empty
 DISTFILES=	# None
diff --git a/www/horde3-passwd/Makefile b/www/horde3-passwd/Makefile
index 195e04922f36..afd85398253a 100644
--- a/www/horde3-passwd/Makefile
+++ b/www/horde3-passwd/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	passwd
 PORTVERSION=	3.1.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www mail
 DIST_SUBDIR=	horde
 
diff --git a/www/horde3-trean/Makefile b/www/horde3-trean/Makefile
index b31ad0afc162..233902a52cf0 100644
--- a/www/horde3-trean/Makefile
+++ b/www/horde3-trean/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	trean
 DISTVERSIONPREFIX=
 DISTVERSION=	0.1.beta20070316
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	www
 MASTER_SITES=	CENKES