From f8a70bc4e2bdc3fdc12cf0ad8918de3f04610969 Mon Sep 17 00:00:00 2001
From: Martin Matuska <mm@FreeBSD.org>
Date: Tue, 18 Dec 2012 13:24:49 +0000
Subject: Horde port fixes:
- unify LATEST_LINK
- remove CONFLICTS
- fix comments
---
deskutils/horde-groupware/Makefile | 4 ++--
deskutils/horde-kronolith/Makefile | 4 ++--
deskutils/horde-mnemo/Makefile | 4 ++--
deskutils/horde-nag/Makefile | 8 ++++----
devel/horde-content/Makefile | 4 ++--
devel/horde-timeobjects/Makefile | 6 ++----
devel/horde-whups/Makefile | 4 ++--
ftp/horde-gollem/Makefile | 4 ++--
mail/horde-imp/Makefile | 4 ++--
mail/horde-ingo/Makefile | 4 ++--
mail/horde-turba/Makefile | 4 ++--
mail/horde-webmail/Makefile | 4 ++--
www/horde-ansel/Makefile | 4 ++--
www/horde-base/Makefile | 4 +---
www/horde-passwd/Makefile | 4 ++--
www/horde-wicked/Makefile | 4 ++--
16 files changed, 33 insertions(+), 37 deletions(-)
diff --git a/deskutils/horde-groupware/Makefile b/deskutils/horde-groupware/Makefile
index 8dd92f207428..02ed4451340d 100644
--- a/deskutils/horde-groupware/Makefile
+++ b/deskutils/horde-groupware/Makefile
@@ -1,4 +1,4 @@
-# Ports collection makefile for: horde4-mnemo
+# Ports collection makefile for: horde-groupware
# Date created: 6 July 2011
# Whom: Martin Matuska <mm@FreeBSD.org>
#
@@ -14,7 +14,7 @@ COMMENT= Horde Groupware
CONFLICTS= horde-webmail-[456]*
-LATEST_LINK= horde4-${PORTNAME}
+LATEST_LINK= horde-${PORTNAME}
USE_HORDE_BUILD= Horde_Role
USE_HORDE_RUN= Horde_Role \
diff --git a/deskutils/horde-kronolith/Makefile b/deskutils/horde-kronolith/Makefile
index ab5959e7a627..018dd27ca96d 100644
--- a/deskutils/horde-kronolith/Makefile
+++ b/deskutils/horde-kronolith/Makefile
@@ -1,4 +1,4 @@
-# Ports collection makefile for: Kronolith
+# Ports collection makefile for: horde-kronolith
# Date created: Sun Dec 02, 2001
# Whom: Thierry Thomas (<thierry@thomas.as>)
#
@@ -16,7 +16,7 @@ COMMENT= Horde web based calendar
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-LATEST_LINK= horde4-${PORTNAME}
+LATEST_LINK= horde-${PORTNAME}
OPTIONS_DEFAULT= DATE_HOLIDAYS TIMEOBJECTS
OPTIONS_DEFINE= DATE_HOLIDAYS TIMEOBJECTS XMLWRITER
diff --git a/deskutils/horde-mnemo/Makefile b/deskutils/horde-mnemo/Makefile
index 7ad3e4d62f7a..ce3d51e837f5 100644
--- a/deskutils/horde-mnemo/Makefile
+++ b/deskutils/horde-mnemo/Makefile
@@ -1,4 +1,4 @@
-# Ports collection makefile for: Mnemo
+# Ports collection makefile for: horde-mnemo
# Date created: Sun May 19, 2002
# Whom: Thierry Thomas (<thierry@pompo.net>)
#
@@ -16,7 +16,7 @@ COMMENT= Horde web based notes manager
LICENSE= AL2
LICENSE_FILE= ${WRKSRC}/LICENSE
-LATEST_LINK= horde4-${PORTNAME}
+LATEST_LINK= horde-${PORTNAME}
USE_PHP= gettext
USE_HORDE_BUILD= Horde_Role
diff --git a/deskutils/horde-nag/Makefile b/deskutils/horde-nag/Makefile
index 4d735108c0f3..3c872871b03c 100644
--- a/deskutils/horde-nag/Makefile
+++ b/deskutils/horde-nag/Makefile
@@ -1,6 +1,6 @@
-# Ports collection makefile for: nag
-# Date created: Sun Dec 14, 2001
-# Whom: Thierry Thomas (<thierry@pompo.net>)
+# Ports collection makefile for: horde-nag
+# Date created: Sun Dec 14, 2001
+# Whom: Thierry Thomas (<thierry@pompo.net>)
#
# $FreeBSD$
#
@@ -16,7 +16,7 @@ COMMENT= Horde web based task list manager
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-LATEST_LINK= horde4-${PORTNAME}
+LATEST_LINK= horde-${PORTNAME}
USE_PHP= gettext
USE_HORDE_BUILD= Horde_Role
diff --git a/devel/horde-content/Makefile b/devel/horde-content/Makefile
index d44f1b018941..7f3271ba7706 100644
--- a/devel/horde-content/Makefile
+++ b/devel/horde-content/Makefile
@@ -1,4 +1,4 @@
-# Ports collection makefile for: horde4-content
+# Ports collection makefile for: horde-content
# Date created: 7 July 2011
# Whom: Martin Matuska <mm@FreeBSD.org>
#
@@ -13,7 +13,7 @@ PKGNAMEPREFIX= horde-
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde tagging application
-LATEST_LINK= horde4-${PORTNAME}
+LATEST_LINK= horde-${PORTNAME}
USE_PHP= gettext json
USE_HORDE_BUILD= Horde_Role
diff --git a/devel/horde-timeobjects/Makefile b/devel/horde-timeobjects/Makefile
index 6b6bba19fd34..27d0e670d695 100644
--- a/devel/horde-timeobjects/Makefile
+++ b/devel/horde-timeobjects/Makefile
@@ -1,4 +1,4 @@
-# Ports collection makefile for: horde4-timeobjects
+# Ports collection makefile for: horde-timeobjects
# Date created: 7 July 2011
# Whom: Martin Matuska <mm@FreeBSD.org>
#
@@ -13,9 +13,7 @@ PKGNAMEPREFIX= horde-
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde timeobjects application
-CONFLICTS= horde-3*
-
-LATEST_LINK= horde4-${PORTNAME}
+LATEST_LINK= horde-${PORTNAME}
USE_PHP= gettext
USE_HORDE_BUILD= Horde_Role
diff --git a/devel/horde-whups/Makefile b/devel/horde-whups/Makefile
index 973c759a442e..9a99478c3352 100644
--- a/devel/horde-whups/Makefile
+++ b/devel/horde-whups/Makefile
@@ -1,4 +1,4 @@
-# Ports collection makefile for: horde4-whups
+# Ports collection makefile for: horde-whups
# Date created: Oct 11, 2011
# Whom: Martin Matuska (mm@FreeBSD.org)
#
@@ -16,7 +16,7 @@ COMMENT= Horde bug tracking/ticketing system
LICENSE= BSD
LICENSE_FILE= ${WRKSRC}/LICENSE
-LATEST_LINK= horde4-${PORTNAME}
+LATEST_LINK= horde-${PORTNAME}
USE_PHP= gettext
USE_HORDE_BUILD= Horde_Role
diff --git a/ftp/horde-gollem/Makefile b/ftp/horde-gollem/Makefile
index 059071ba5aad..f1fb02d925fd 100644
--- a/ftp/horde-gollem/Makefile
+++ b/ftp/horde-gollem/Makefile
@@ -1,4 +1,4 @@
-# Ports collection makefile for: horde4-gollem
+# Ports collection makefile for: horde-gollem
# Date created: Oct 11, 2011
# Whom: Martin Matuska (mm@FreeBSD.org)
#
@@ -16,7 +16,7 @@ COMMENT= Horde Web-based File Manager
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-LATEST_LINK= horde5-${PORTNAME}
+LATEST_LINK= horde-${PORTNAME}
USE_PHP= gettext json
USE_HORDE_BUILD= Horde_Role
diff --git a/mail/horde-imp/Makefile b/mail/horde-imp/Makefile
index 1aa5bc003ab9..283dbad4cb2f 100644
--- a/mail/horde-imp/Makefile
+++ b/mail/horde-imp/Makefile
@@ -1,4 +1,4 @@
-# Ports collection makefile for: imp3
+# Ports collection makefile for: horde-imp
# Date created: Mon Oct 08, 2001
# Whom: Thierry Thomas (<thierry@thomas.as>)
#
@@ -16,7 +16,7 @@ COMMENT= Horde web based webmail system
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-LATEST_LINK= horde4-${PORTNAME}
+LATEST_LINK= horde-${PORTNAME}
USE_HORDE_BUILD= Horde_Role
USE_HORDE_RUN= Horde_Role \
diff --git a/mail/horde-ingo/Makefile b/mail/horde-ingo/Makefile
index 2812e0ca2a0c..aa1f599a1a4e 100644
--- a/mail/horde-ingo/Makefile
+++ b/mail/horde-ingo/Makefile
@@ -1,4 +1,4 @@
-# Ports collection makefile for: Ingo
+# Ports collection makefile for: horde-ingo
# Date created: Dec 3, 2004
# Whom: Thierry Thomas (<thierry@pompo.net>)
#
@@ -16,7 +16,7 @@ COMMENT= Horde email filter rules manager
LICENSE= AL2
LICENSE_FILE= ${WRKSRC}/LICENSE
-LATEST_LINK= horde4-${PORTNAME}
+LATEST_LINK= horde-${PORTNAME}
USE_PHP= gettext
USE_HORDE_BUILD= Horde_Role
diff --git a/mail/horde-turba/Makefile b/mail/horde-turba/Makefile
index 0d1e014b007a..0c4a21756746 100644
--- a/mail/horde-turba/Makefile
+++ b/mail/horde-turba/Makefile
@@ -1,4 +1,4 @@
-# Ports collection makefile for: turba
+# Ports collection makefile for: horde-turba
# Date created: Sat Nov 16, 2001
# Whom: Thierry Thomas (<thierry@thomas.as>)
#
@@ -16,7 +16,7 @@ COMMENT= Horde web based address book
LICENSE= AL2
LICENSE_FILE= ${WRKSRC}/LICENSE
-LATEST_LINK= horde4-${PORTNAME}
+LATEST_LINK= horde-${PORTNAME}
OPTIONS_DEFINE= FACEBOOK IMSP LDAP
FACEBOOK_DESC= Support connections with Facebook
diff --git a/mail/horde-webmail/Makefile b/mail/horde-webmail/Makefile
index 22f0dc1e4152..ab03d2b35313 100644
--- a/mail/horde-webmail/Makefile
+++ b/mail/horde-webmail/Makefile
@@ -1,4 +1,4 @@
-# Ports collection makefile for: horde4-webmail
+# Ports collection makefile for: horde-webmail
# Date created: 7 July 2011
# Whom: Martin Matuska <mm@FreeBSD.org>
#
@@ -15,7 +15,7 @@ COMMENT= Horde Groupware Webmail Edition
CONFLICTS= horde-groupware-[456]*
-LATEST_LINK= horde4-${PORTNAME}
+LATEST_LINK= horde-${PORTNAME}
USE_HORDE_BUILD= Horde_Role
USE_HORDE_RUN= Horde_Role \
diff --git a/www/horde-ansel/Makefile b/www/horde-ansel/Makefile
index 97b161a448c7..459626d308bb 100644
--- a/www/horde-ansel/Makefile
+++ b/www/horde-ansel/Makefile
@@ -1,4 +1,4 @@
-# Ports collection makefile for: horde4-ansel
+# Ports collection makefile for: horde-ansel
# Date created: Oct 19, 2011
# Whom: Martin Matuska (mm@FreeBSD.org)
#
@@ -16,7 +16,7 @@ COMMENT= Horde Photo Management and Web Gallery
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-LATEST_LINK= horde4-${PORTNAME}
+LATEST_LINK= horde-${PORTNAME}
USE_PHP= gettext
USE_HORDE_BUILD= Horde_Role
diff --git a/www/horde-base/Makefile b/www/horde-base/Makefile
index 89e17da0fb36..854c11b20927 100644
--- a/www/horde-base/Makefile
+++ b/www/horde-base/Makefile
@@ -1,4 +1,4 @@
-# Ports collection makefile for: horde3
+# Ports collection makefile for: horde-base
# Date created: Sun Oct 07, 2001
# Whom: Thierry Thomas (<thierry@thomas.as>)
#
@@ -13,8 +13,6 @@ PKGNAMEPREFIX=
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde Application Framework
-CONFLICTS= horde-3*
-
RUN_DEPENDS= ${PEARDIR}/Net/DNS2.php:${PORTSDIR}/dns/pear-Net_DNS2
OPTIONS_DEFAULT= ICONV
diff --git a/www/horde-passwd/Makefile b/www/horde-passwd/Makefile
index b0eb54610c11..1b1d4818aa78 100644
--- a/www/horde-passwd/Makefile
+++ b/www/horde-passwd/Makefile
@@ -1,4 +1,4 @@
-# Ports collection makefile for: horde4-passwd
+# Ports collection makefile for: horde-passwd
# Date created: Oct 28, 2011
# Whom: Martin Matuska (mm@FreeBSD.org)
#
@@ -18,7 +18,7 @@ COMMENT= Horde password changing application
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-LATEST_LINK= horde4-${PORTNAME}
+LATEST_LINK= horde-${PORTNAME}
USE_PHP= gettext
USE_HORDE_BUILD= Horde_Role
diff --git a/www/horde-wicked/Makefile b/www/horde-wicked/Makefile
index bf399fbb27cd..50cff8a9c394 100644
--- a/www/horde-wicked/Makefile
+++ b/www/horde-wicked/Makefile
@@ -1,4 +1,4 @@
-# Ports collection makefile for: horde4-wicked
+# Ports collection makefile for: horde-wicked
# Date created: Oct 11, 2011
# Whom: Martin Matuska (mm@FreeBSD.org)
#
@@ -16,7 +16,7 @@ COMMENT= Horde Wiki Application
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-LATEST_LINK= horde4-${PORTNAME}
+LATEST_LINK= horde-${PORTNAME}
RUN_DEPENDS+= ${PEARDIR}/Text/Wiki.php:${PORTSDIR}/www/pear-Text_Wiki
--
cgit debian/1.2.3+git2.25.1-1-2-gaceb0