Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 14 Nov 2020 15:19:53 +0000 (UTC)
From:      Bernard Spil <brnrd@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r555116 - head/www/nextcloud
Message-ID:  <202011141519.0AEFJrQe097773@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: brnrd
Date: Sat Nov 14 15:19:52 2020
New Revision: 555116
URL: https://svnweb.freebsd.org/changeset/ports/555116

Log:
  www/nextcloud: Revert r553794
  
   * This does NOT mean Nextcloud is PHP 8 compatible!
   * Change APCu depend while here
   * json fixed in r553087
  
  Reported by:	fluffy

Modified:
  head/www/nextcloud/Makefile

Modified: head/www/nextcloud/Makefile
==============================================================================
--- head/www/nextcloud/Makefile	Sat Nov 14 15:08:00 2020	(r555115)
+++ head/www/nextcloud/Makefile	Sat Nov 14 15:19:52 2020	(r555116)
@@ -13,8 +13,8 @@ LICENSE=	AGPLv3
 
 USES=		cpe gettext-runtime php:flavors,web tar:bzip2
 USE_PHP=	bcmath bz2 ctype curl dom fileinfo filter gd gmp hash iconv \
-		mbstring pdo posix session simplexml xml xmlreader xmlwriter \
-		xsl zip zlib
+		json mbstring pdo posix session simplexml xml xmlreader \
+		xmlwriter xsl zip zlib
 
 NEXTCLOUD_USERNAME?=	${WWWOWN}
 NEXTCLOUD_GROUPNAME?=	${WWWGRP}
@@ -44,6 +44,7 @@ OPCACHE_DESC=	Enable OPcode caching (recommended)
 PCNTL_DESC=	Long-running process control (recommended)
 REDIS_DESC=	Distributed data caching using Redis
 
+APCU_RUN_DEPENDS=	${PECL_PKGNAMEPREFIX}APCu>0:devel/pecl-APCu@${PHP_FLAVOR}
 EXIF_USE=	PHP=exif
 IMAGICK_RUN_DEPENDS=	${PECL_PKGNAMEPREFIX}imagick>=2.2.2:graphics/pecl-imagick@${PHP_FLAVOR}
 INTL_USE=	PHP=intl
@@ -57,16 +58,6 @@ SMB_RUN_DEPENDS=	${PECL_PKGNAMEPREFIX}smbclient>=0.9.0
 SQLITE_USE=	PHP=pdo_sqlite,sqlite3
 SSL_USE=	PHP=openssl
 
-.include <bsd.port.pre.mk>
-
-.if ${PORT_OPTIONS:MAPCU}
-RUN_DEPENDS+=	${PHPBASE}/lib/php/${PHP_EXT_DIR}/apcu.so:devel/pecl-APCu@${PHP_FLAVOR}
-.endif
-
-.if ${FLAVOR} != php80
-USE_PHP+=       json
-.endif
-
 post-extract:
 	@${MV} ${WRKSRC}/config/config.sample.php ${WRKSRC}/config/config.documented.php
 
@@ -84,4 +75,4 @@ do-install:
 	@${MKDIR} ${STAGEDIR}${WWWDIR}/apps
 	@${MKDIR} ${STAGEDIR}/var/log/${PORTNAME}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202011141519.0AEFJrQe097773>