git: 42c12704a4c9 - main - */horde*: Remove blanket IGNORE_WITH_PHP
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 11 Dec 2022 19:35:56 UTC
The branch main has been updated by bofh:
URL: https://cgit.FreeBSD.org/ports/commit/?id=42c12704a4c9c1e1da8a43c8d5671808aa897246
commit 42c12704a4c9c1e1da8a43c8d5671808aa897246
Author: Muhammad Moinur Rahman <bofh@FreeBSD.org>
AuthorDate: 2022-12-11 19:33:09 +0000
Commit: Muhammad Moinur Rahman <bofh@FreeBSD.org>
CommitDate: 2022-12-11 19:35:47 +0000
*/horde*: Remove blanket IGNORE_WITH_PHP
- Remove blanket IGNORE_WITH_PHP and add IGNORE_WITH_PHP to only the web
applications. This will massively reduce the number of ports to be
removed in case there is no timely support for php8.
- Pet portlint/portclippy
- Add missing LICENSE
PR: 266552
Reported by: michael.osipov@siemens.com
Sponsored by: Bounce Experts
---
Mk/Uses/horde.mk | 1 -
deskutils/horde-groupware/Makefile | 6 ++++--
deskutils/horde-kronolith/Makefile | 17 +++++++++--------
deskutils/horde-mnemo/Makefile | 6 ++++--
deskutils/horde-nag/Makefile | 4 +++-
devel/horde-content/Makefile | 4 +++-
devel/horde-timeobjects/Makefile | 6 +++++-
devel/horde-whups/Makefile | 2 ++
ftp/horde-gollem/Makefile | 5 +++--
mail/horde-imp/Makefile | 4 +++-
mail/horde-imp/pkg-descr | 2 +-
mail/horde-ingo/Makefile | 12 +++++++-----
mail/horde-turba/Makefile | 13 ++++++++-----
mail/horde-webmail/Makefile | 6 ++++--
www/horde-ansel/Makefile | 2 ++
www/horde-base/Makefile | 27 ++++++++++++++-------------
www/horde-passwd/Makefile | 2 ++
www/horde-trean/Makefile | 4 +++-
www/horde-wicked/Makefile | 4 +++-
19 files changed, 80 insertions(+), 47 deletions(-)
diff --git a/Mk/Uses/horde.mk b/Mk/Uses/horde.mk
index 69fd249b4660..f5d04b3a91b1 100644
--- a/Mk/Uses/horde.mk
+++ b/Mk/Uses/horde.mk
@@ -12,7 +12,6 @@ MASTER_SITES?= https://pear.horde.org/get/
HORDE_DIR?= www/horde
CPE_VENDOR?= horde
-IGNORE_WITH_PHP=80 81 82
DIST_SUBDIR= Horde
PEAR_CHANNEL= horde
diff --git a/deskutils/horde-groupware/Makefile b/deskutils/horde-groupware/Makefile
index 69e6a3b11ab0..b31f1073c009 100644
--- a/deskutils/horde-groupware/Makefile
+++ b/deskutils/horde-groupware/Makefile
@@ -7,9 +7,9 @@ MAINTAINER= horde@FreeBSD.org
COMMENT= Horde Groupware
WWW= https://www.horde.org/apps/groupware/
-CONFLICTS= horde-webmail-[456]*
+IGNORE_WITH_PHP=80 81 82
-USES= horde cpe
+USES= horde cpe php
USE_HORDE_BUILD= Horde_Role
USE_HORDE_RUN= Horde_Role \
content \
@@ -22,4 +22,6 @@ USE_HORDE_RUN= Horde_Role \
trean \
turba
+CONFLICTS= horde-webmail-[456]*
+
.include <bsd.port.mk>
diff --git a/deskutils/horde-kronolith/Makefile b/deskutils/horde-kronolith/Makefile
index 6f1acd3f0cee..e33a624afd58 100644
--- a/deskutils/horde-kronolith/Makefile
+++ b/deskutils/horde-kronolith/Makefile
@@ -10,14 +10,11 @@ WWW= https://www.horde.org/apps/kronolith/
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-OPTIONS_DEFAULT= DATE_HOLIDAYS TIMEOBJECTS
-OPTIONS_DEFINE= DATE_HOLIDAYS TIMEOBJECTS XMLWRITER
-DATE_HOLIDAYS_DESC= Depend on PEAR Date_Holidays
-TIMEOBJECTS_DESC= Depenbd on Horde timeobjects
-XMLWRITER_DESC= Depend on PHP xmlwriter extension
+IGNORE_WITH_PHP=80 81 82
+
+RUN_DEPENDS+= ${PEARDIR}/Date.php:devel/pear-Date@${PHP_FLAVOR}
USES= horde php cpe
-USE_PHP= gettext json simplexml
USE_HORDE_BUILD= Horde_Role
USE_HORDE_RUN= Horde_Role \
content \
@@ -51,11 +48,15 @@ USE_HORDE_RUN= Horde_Role \
Horde_Url \
Horde_Util \
Horde_View
+USE_PHP= gettext json simplexml
-RUN_DEPENDS+= ${PEARDIR}/Date.php:devel/pear-Date@${PHP_FLAVOR}
+OPTIONS_DEFINE= DATE_HOLIDAYS TIMEOBJECTS XMLWRITER
+OPTIONS_DEFAULT= DATE_HOLIDAYS TIMEOBJECTS
+DATE_HOLIDAYS_DESC= Depend on PEAR Date_Holidays
+TIMEOBJECTS_DESC= Depenbd on Horde timeobjects
+XMLWRITER_DESC= Depend on PHP xmlwriter extension
DATE_HOLIDAYS_RUN_DEPENDS= ${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays@${PHP_FLAVOR}
-
TIMEOBJECTS_USE= HORDE_RUN=timeobjects
XMLWRITER_USE= PHP=xmlwriter
diff --git a/deskutils/horde-mnemo/Makefile b/deskutils/horde-mnemo/Makefile
index d60656780737..a941d0180619 100644
--- a/deskutils/horde-mnemo/Makefile
+++ b/deskutils/horde-mnemo/Makefile
@@ -11,8 +11,9 @@ WWW= https://www.horde.org/apps/mnemo/
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
+IGNORE_WITH_PHP=80 81 82
+
USES= horde php cpe
-USE_PHP= gettext
USE_HORDE_BUILD= Horde_Role
USE_HORDE_RUN= Horde_Role \
horde \
@@ -32,9 +33,10 @@ USE_HORDE_RUN= Horde_Role \
Horde_Support \
Horde_Text_Filter \
Horde_Util
+USE_PHP= gettext
-OPTIONS_DEFAULT= PDF
OPTIONS_DEFINE= PDF
+OPTIONS_DEFAULT= PDF
PDF_DESC= Support PDF generation
PDF_USE= HORDE_RUN=Horde_Pdf
diff --git a/deskutils/horde-nag/Makefile b/deskutils/horde-nag/Makefile
index ceaa2c2648cf..4f8c3d00fb71 100644
--- a/deskutils/horde-nag/Makefile
+++ b/deskutils/horde-nag/Makefile
@@ -10,8 +10,9 @@ WWW= https://www.horde.org/apps/nag/
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
+IGNORE_WITH_PHP=80 81 82
+
USES= horde php cpe
-USE_PHP= gettext
USE_HORDE_BUILD= Horde_Role
USE_HORDE_RUN= Horde_Role \
content \
@@ -37,5 +38,6 @@ USE_HORDE_RUN= Horde_Role \
Horde_Url \
Horde_Util \
Horde_View
+USE_PHP= gettext
.include <bsd.port.mk>
diff --git a/devel/horde-content/Makefile b/devel/horde-content/Makefile
index 40d9b3785d56..ff6b243a6c48 100644
--- a/devel/horde-content/Makefile
+++ b/devel/horde-content/Makefile
@@ -7,8 +7,9 @@ MAINTAINER= horde@FreeBSD.org
COMMENT= Horde tagging application
WWW= https://pear.horde.org
+IGNORE_WITH_PHP=80 81 82
+
USES= horde php cpe
-USE_PHP= gettext json
USE_HORDE_BUILD= Horde_Role
USE_HORDE_RUN= Horde_Role \
Horde_Core \
@@ -18,6 +19,7 @@ USE_HORDE_RUN= Horde_Role \
Horde_Injector \
Horde_Rdo \
Horde_Util
+USE_PHP= gettext json
CONFLICTS_INSTALL= php*-horde-content
diff --git a/devel/horde-timeobjects/Makefile b/devel/horde-timeobjects/Makefile
index 82d8744652a3..5f5d2371516b 100644
--- a/devel/horde-timeobjects/Makefile
+++ b/devel/horde-timeobjects/Makefile
@@ -7,9 +7,12 @@ MAINTAINER= horde@FreeBSD.org
COMMENT= Horde timeobjects application
WWW= https://www.horde.org/
+LICENSE= BSD2CLAUSE
+
+IGNORE_WITH_PHP=80 81 82
+
USES= cpe horde php
CPE_VENDOR= horde
-USE_PHP= gettext
USE_HORDE_BUILD= Horde_Role
USE_HORDE_RUN= Horde_Role \
Horde_Core \
@@ -17,5 +20,6 @@ USE_HORDE_RUN= Horde_Role \
Horde_Exception \
Horde_Url \
Horde_Util
+USE_PHP= gettext
.include <bsd.port.mk>
diff --git a/devel/horde-whups/Makefile b/devel/horde-whups/Makefile
index 4def531c77ae..a367dba9510b 100644
--- a/devel/horde-whups/Makefile
+++ b/devel/horde-whups/Makefile
@@ -10,6 +10,8 @@ WWW= https://www.horde.org/apps/whups/
LICENSE= BSD2CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
+IGNORE_WITH_PHP=80 81 82
+
USES= horde php cpe
USE_PHP= gettext json
USE_HORDE_BUILD= Horde_Role
diff --git a/ftp/horde-gollem/Makefile b/ftp/horde-gollem/Makefile
index 11f1f5cf4802..02d3efcd8178 100644
--- a/ftp/horde-gollem/Makefile
+++ b/ftp/horde-gollem/Makefile
@@ -10,8 +10,9 @@ WWW= https://www.horde.org/apps/gollem/
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
+IGNORE_WITH_PHP=80 81 82
+
USES= horde php cpe
-USE_PHP= gettext json
USE_HORDE_BUILD= Horde_Role
USE_HORDE_RUN= Horde_Role \
horde \
@@ -30,9 +31,9 @@ USE_HORDE_RUN= Horde_Role \
Horde_Util \
Horde_Vfs \
Horde_View
-
# Optional but we want it
USE_HORDE_RUN+= Horde_Db \
Horde_Share
+USE_PHP= gettext json
.include <bsd.port.mk>
diff --git a/mail/horde-imp/Makefile b/mail/horde-imp/Makefile
index 897a035c0b65..2284229e40b3 100644
--- a/mail/horde-imp/Makefile
+++ b/mail/horde-imp/Makefile
@@ -11,7 +11,9 @@ WWW= https://www.horde.org/apps/imp/
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-USES= horde cpe
+IGNORE_WITH_PHP=80 81 82
+
+USES= horde cpe php
USE_HORDE_BUILD= Horde_Role
USE_HORDE_RUN= Horde_Role \
horde \
diff --git a/mail/horde-imp/pkg-descr b/mail/horde-imp/pkg-descr
index fa3852bef293..978ca0e164a8 100644
--- a/mail/horde-imp/pkg-descr
+++ b/mail/horde-imp/pkg-descr
@@ -2,4 +2,4 @@ IMP, the Internet Mail Program, is one of the most popular and widely deployed
open source webmail applications in the world. It allows universal, web-based
access to IMAP and POP3 mail servers and provides Ajax, mobile and traditional
interfaces with a rich range of features normally found only in desktop email
-clients. For more information on IMP, visit http://www.horde.org/apps/imp.
+clients.
diff --git a/mail/horde-ingo/Makefile b/mail/horde-ingo/Makefile
index 470d452bbb7e..b2a23ab11f83 100644
--- a/mail/horde-ingo/Makefile
+++ b/mail/horde-ingo/Makefile
@@ -10,8 +10,13 @@ WWW= https://www.horde.org/apps/ingo/
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
+IGNORE_WITH_PHP=80 81 82
+
+# Optional but we want it
+RUN_DEPENDS+= ${PEARDIR}/Net/Sieve.php:net/pear-Net_Sieve@${PHP_FLAVOR} \
+ ${PEARDIR}/Net/Socket.php:net/pear-Net_Socket@${PHP_FLAVOR}
+
USES= horde php cpe
-USE_PHP= gettext
USE_HORDE_BUILD= Horde_Role
USE_HORDE_RUN= Horde_Role \
horde \
@@ -26,10 +31,7 @@ USE_HORDE_RUN= Horde_Role \
Horde_Perms \
Horde_Share \
Horde_Util
-
-# Optional but we want it
-RUN_DEPENDS+= ${PEARDIR}/Net/Sieve.php:net/pear-Net_Sieve@${PHP_FLAVOR} \
- ${PEARDIR}/Net/Socket.php:net/pear-Net_Socket@${PHP_FLAVOR}
+USE_PHP= gettext
CONFLICTS_INSTALL= php*-horde-ingo
diff --git a/mail/horde-turba/Makefile b/mail/horde-turba/Makefile
index 437fc1d8c781..b200431dc1a2 100644
--- a/mail/horde-turba/Makefile
+++ b/mail/horde-turba/Makefile
@@ -10,13 +10,9 @@ WWW= https://www.horde.org/apps/turba/
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
-OPTIONS_DEFINE= FACEBOOK IMSP LDAP
-FACEBOOK_DESC= Support connections with Facebook
-IMSP_DSC= Support IMSP addressbooks
-LDAP_DESC= Support LDAP Addressbooks
+IGNORE_WITH_PHP=80 81 82
USES= horde php cpe
-USE_PHP= gettext hash json
USE_HORDE_BUILD= Horde_Role
USE_HORDE_RUN= Horde_Role \
horde \
@@ -41,9 +37,16 @@ USE_HORDE_RUN= Horde_Role \
Horde_Url \
Horde_Util \
Horde_View
+USE_PHP= gettext hash json
NO_ARCH= yes
+OPTIONS_DEFINE= FACEBOOK IMSP LDAP
+
+FACEBOOK_DESC= Support connections with Facebook
+IMSP_DESC= Support IMSP addressbooks
+LDAP_DESC= Support LDAP Addressbooks
+
FACEBOOK_USE= HORDE_RUN=Horde_Service_Facebook
IMSP_USE= HORDE_RUN=Horde_Imsp
LDAP_USE= HORDE_RUN=Horde_Ldap
diff --git a/mail/horde-webmail/Makefile b/mail/horde-webmail/Makefile
index 426bcdd6b085..a40b17059ee8 100644
--- a/mail/horde-webmail/Makefile
+++ b/mail/horde-webmail/Makefile
@@ -7,9 +7,9 @@ MAINTAINER= horde@FreeBSD.org
COMMENT= Horde Groupware Webmail Edition
WWW= https://www.horde.org/apps/webmail/
-CONFLICTS= horde-groupware-[456]*
+IGNORE_WITH_PHP=80 81 82
-USES= horde cpe
+USES= horde cpe php
CPE_PRODUCT= groupware
CPE_EDITION= webmail
USE_HORDE_BUILD= Horde_Role
@@ -26,4 +26,6 @@ USE_HORDE_RUN= Horde_Role \
trean \
turba
+CONFLICTS= horde-groupware-[456]*
+
.include <bsd.port.mk>
diff --git a/www/horde-ansel/Makefile b/www/horde-ansel/Makefile
index 7af846c02dc3..6f3657367c08 100644
--- a/www/horde-ansel/Makefile
+++ b/www/horde-ansel/Makefile
@@ -10,6 +10,8 @@ WWW= https://www.horde.org/apps/ansel/
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
+IGNORE_WITH_PHP=80 81 82
+
USES= horde cpe php
USE_PHP= gettext hash
USE_HORDE_BUILD= Horde_Role
diff --git a/www/horde-base/Makefile b/www/horde-base/Makefile
index 5ebe433a93ed..02bc93c821dd 100644
--- a/www/horde-base/Makefile
+++ b/www/horde-base/Makefile
@@ -7,22 +7,13 @@ MAINTAINER= horde@FreeBSD.org
COMMENT= Horde Application Framework
WWW= https://www.horde.org/apps/horde/
-RUN_DEPENDS= ${PEARDIR}/Net/DNS2.php:dns/pear-Net_DNS2@${PHP_FLAVOR}
-
-OPTIONS_DEFAULT= ICONV
-OPTIONS_DEFINE= FACEBOOK ICONV TWITTER WEATHER
-
-FACEBOOK_DESC= Support connections to Facebook
-ICONV_DESC= Depend on PHP iconv extension
-TWITTER_DESC= Support connections to Twitter
-WEATHER_DESC= Support weather forecast display
+LICENSE= GPLv2
-USES= horde cpe php
-USE_PHP= filter gettext hash
IGNORE_WITH_PHP=80 81 82
-CONFLICTS_INSTALL= php*-horde
+RUN_DEPENDS= ${PEARDIR}/Net/DNS2.php:dns/pear-Net_DNS2@${PHP_FLAVOR}
+USES= horde cpe php:flavors
USE_HORDE_BUILD= Horde_Role
USE_HORDE_RUN= Horde_Role \
Horde_Alarm \
@@ -55,9 +46,19 @@ USE_HORDE_RUN= Horde_Role \
Horde_Util \
Horde_View \
Horde_Vfs
-
# Optional in package but we want them in
USE_HORDE_RUN+= Horde_Feed
+USE_PHP= filter gettext hash
+
+CONFLICTS_INSTALL= php*-horde
+
+OPTIONS_DEFINE= FACEBOOK ICONV TWITTER WEATHER
+OPTIONS_DEFAULT= ICONV
+
+FACEBOOK_DESC= Support connections to Facebook
+ICONV_DESC= Depend on PHP iconv extension
+TWITTER_DESC= Support connections to Twitter
+WEATHER_DESC= Support weather forecast display
FACEBOOK_USE= HORDE_RUN=Horde_Service_Facebook
ICONV_USE= PHP=iconv
diff --git a/www/horde-passwd/Makefile b/www/horde-passwd/Makefile
index f6421714fe4c..2f2a0c2404ce 100644
--- a/www/horde-passwd/Makefile
+++ b/www/horde-passwd/Makefile
@@ -10,6 +10,8 @@ WWW= https://www.horde.org/apps/passwd/
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
+IGNORE_WITH_PHP=80 81 82
+
USES= horde cpe php
USE_PHP= gettext
USE_HORDE_BUILD= Horde_Role
diff --git a/www/horde-trean/Makefile b/www/horde-trean/Makefile
index 8f65a820af3c..c73727c9a672 100644
--- a/www/horde-trean/Makefile
+++ b/www/horde-trean/Makefile
@@ -10,8 +10,9 @@ WWW= https://www.horde.org/apps/trean/
LICENSE= BSD2CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
+IGNORE_WITH_PHP=80 81 82
+
USES= horde cpe php
-USE_PHP= gettext json
USE_HORDE_BUILD= Horde_Role
USE_HORDE_RUN= Horde_Role \
horde \
@@ -30,5 +31,6 @@ USE_HORDE_RUN= Horde_Role \
Horde_Util \
Horde_Vfs \
Horde_View
+USE_PHP= gettext json
.include <bsd.port.mk>
diff --git a/www/horde-wicked/Makefile b/www/horde-wicked/Makefile
index aa4c1f6d5c88..e72886470f17 100644
--- a/www/horde-wicked/Makefile
+++ b/www/horde-wicked/Makefile
@@ -10,10 +10,11 @@ WWW= https://www.horde.org/apps/wicked/
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
+IGNORE_WITH_PHP=80 81 82
+
RUN_DEPENDS+= ${PEARDIR}/Text/Wiki.php:www/pear-Text_Wiki@${PHP_FLAVOR}
USES= horde cpe php
-USE_PHP= gettext
USE_HORDE_BUILD= Horde_Role
USE_HORDE_RUN= Horde_Role \
horde \
@@ -35,5 +36,6 @@ USE_HORDE_RUN= Horde_Role \
Horde_Url \
Horde_Util \
Horde_Vfs
+USE_PHP= gettext
.include <bsd.port.mk>