From owner-dev-commits-ports-all@freebsd.org Sat Aug 21 19:06:01 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 2725267712B; Sat, 21 Aug 2021 19:06:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4GsSdj0bVKz4nsl; Sat, 21 Aug 2021 19:06:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E393B12826; Sat, 21 Aug 2021 19:06:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 17LJ60Ew002063; Sat, 21 Aug 2021 19:06:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 17LJ60nD002062; Sat, 21 Aug 2021 19:06:00 GMT (envelope-from git) Date: Sat, 21 Aug 2021 19:06:00 GMT Message-Id: <202108211906.17LJ60nD002062@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dima Panov Subject: git: 87d71875d934 - main - www/moodle*: drop ugly xmlrpc dependency hack MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fluffy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 87d71875d934c0b5c9a5819ebd47c056a2489c93 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 21 Aug 2021 19:06:01 -0000 The branch main has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=87d71875d934c0b5c9a5819ebd47c056a2489c93 commit 87d71875d934c0b5c9a5819ebd47c056a2489c93 Author: Dima Panov AuthorDate: 2021-08-21 19:00:30 +0000 Commit: Dima Panov CommitDate: 2021-08-21 19:05:52 +0000 www/moodle*: drop ugly xmlrpc dependency hack It no more needed since Mk/Uses/php.mk have a check for every supported php version and able to select a right dependency. With hat: ports-secteam --- www/moodle310/Makefile | 8 +------- www/moodle311/Makefile | 8 +------- www/moodle39/Makefile | 8 +------- 3 files changed, 3 insertions(+), 21 deletions(-) diff --git a/www/moodle310/Makefile b/www/moodle310/Makefile index dbb0e81a805b..1a1f11f3a583 100644 --- a/www/moodle310/Makefile +++ b/www/moodle310/Makefile @@ -16,7 +16,7 @@ CONFLICTS= moodle39-3.9.[0-9]* moodle311-3.11.[0-9]* USES= cpe php:flavors tar:tgz USE_PHP= ctype curl dom fileinfo filter gd hash iconv intl json mbstring \ opcache openssl pcre session simplexml soap spl tokenizer \ - xml xmlreader zip zlib + xml xmlreader xmlrpc zip zlib WRKSRC= ${WRKDIR}/moodle IGNORE_WITH_PHP= 80 @@ -41,12 +41,6 @@ SUB_LIST= MOODLEDIR=${MOODLEDIR} \ MOODLEDIR?= www/moodle MOODLEDATADIR?= moodledata -.include - -.if ${FLAVOR} != php80 -USE_PHP+= xmlrpc -.endif - pre-install: @${ECHO_CMD} "@owner ${WWWOWN}" >> ${PLIST} @${ECHO_CMD} "@group ${WWWGRP}" >> ${PLIST} diff --git a/www/moodle311/Makefile b/www/moodle311/Makefile index 734365754cc6..0107636fd2a0 100644 --- a/www/moodle311/Makefile +++ b/www/moodle311/Makefile @@ -16,7 +16,7 @@ CONFLICTS= moodle39-3.9.[0-9]* moodle310-3.10.[0-9]* USES= cpe php:flavors tar:tgz USE_PHP= ctype curl dom fileinfo filter gd hash iconv intl json mbstring \ opcache openssl pcre session simplexml soap sodium spl tokenizer \ - xml xmlreader zip zlib + xml xmlreader xmlrpc zip zlib WRKSRC= ${WRKDIR}/moodle IGNORE_WITH_PHP= 80 @@ -41,12 +41,6 @@ SUB_LIST= MOODLEDIR=${MOODLEDIR} \ MOODLEDIR?= www/moodle MOODLEDATADIR?= moodledata -.include - -.if ${FLAVOR} != php80 -USE_PHP+= xmlrpc -.endif - pre-install: @${ECHO_CMD} "@owner ${WWWOWN}" >> ${PLIST} @${ECHO_CMD} "@group ${WWWGRP}" >> ${PLIST} diff --git a/www/moodle39/Makefile b/www/moodle39/Makefile index bd24192e522e..8f50a16b79da 100644 --- a/www/moodle39/Makefile +++ b/www/moodle39/Makefile @@ -16,7 +16,7 @@ CONFLICTS= moodle310-3.10.[0-9]* moodle311-3.11.[0-9]* USES= cpe php:flavors tar:tgz USE_PHP= ctype curl dom fileinfo filter gd hash iconv intl json mbstring \ opcache openssl pcre session simplexml soap spl tokenizer \ - xml xmlreader zip zlib + xml xmlreader xmlrpc zip zlib WRKSRC= ${WRKDIR}/moodle IGNORE_WITH_PHP= 80 @@ -41,12 +41,6 @@ SUB_LIST= MOODLEDIR=${MOODLEDIR} \ MOODLEDIR?= www/moodle MOODLEDATADIR?= moodledata -.include - -.if ${FLAVOR} != php80 -USE_PHP+= xmlrpc -.endif - pre-install: @${ECHO_CMD} "@owner ${WWWOWN}" >> ${PLIST} @${ECHO_CMD} "@group ${WWWGRP}" >> ${PLIST}