From nobody Wed Jul 27 14:27:28 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4LtGMN6JF1z4XhPF; Wed, 27 Jul 2022 14:27:28 +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 4LtGMN3HLrz3jXb; Wed, 27 Jul 2022 14:27:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658932048; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dgWt8X8IYw9u4WbvFOrihH/hsvDU7qXfsP9ut0XOwqA=; b=SgeiCjrijho97tvFYOKFyRB58JIsPD7W/uYlgYOiZOKByDOFsJWver1xMFfLSj6b9o7TwK dv7uke32kW+HJpC9UkjufbOmbZiBeoGt572XpyvNCz3Hy+yUDg25qWk9TvQV2C7ZOFMScr W7gwW6I28jG5qAHU1V+gWKWm6sKEbFs8DqtRcRaaKwbG2ZakFnVZ+GkP05wZa4/rfCiMja I/5ALK+hDc/mjcmvB7c6Ntll9tBMeLivZmn9UmmMF9d+f/Lu8uzoSDjod2861R4YvDCvhy YI336vMTniW/aRkEXPvePl2jxps9AU+P37haBeYXT4OGiOTflJkpn7rDkQ6/Wg== 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 4LtGMN2Kx5zKlb; Wed, 27 Jul 2022 14:27:28 +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 26RERSrJ066342; Wed, 27 Jul 2022 14:27:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26RERSim066341; Wed, 27 Jul 2022 14:27:28 GMT (envelope-from git) Date: Wed, 27 Jul 2022 14:27:28 GMT Message-Id: <202207271427.26RERSim066341@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 536675537f23 - main - www/piwigo: use pkg-message to show message on remove List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 536675537f23aee4d51bac4e5c85ba34f3023605 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658932048; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dgWt8X8IYw9u4WbvFOrihH/hsvDU7qXfsP9ut0XOwqA=; b=cYPs5qCFioJWrYs93TM4+Rxq7djAy6TDXB2RzLnu0MXBgH7932B+r/1v+SQpw/meipWAl5 bsrYNFvGMRL3CLv7E9ZKTCpsM2Xty2Cpo+mbcJpWQGPzlrfq2vJgxyYfWwCW12DBWnmwj0 atLeamauDSYDTX8UYIZsFQmVnzbL8dLxuW6WB3ITLttrh4nM5Cl6D20BIvkl6HhZwqlk37 h+A5Rn62sVp1H0c7q17QdwK1VCmiBQ0YQ3jtzv7CAPTFxRJm5gsowIMtCXclOYkXmWKUjO b3kspkSEOowHz2r/8ql4MCYTK3a1GO5o4SsurNiwX6gmHpTi3GJhXdw0jlx5VA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658932048; a=rsa-sha256; cv=none; b=qlzd30ShKMrkrjI23UL6bJgSMI3lKfGADK1kY3w9ZTOe4Z+Mc8K9WGZ2Mq3lUQGusqZFr4 kDdWg83I7i1HIweoaDjnxyHmNkOat/XQ4uOjP2NDDkonib7zYPjcbomLbm/9DhZQzODoLY g12/LPhhpnCLEJr9IbuAM4LBDU3e4JGIjod2KJq4BkNPYdHsJULEO7JDDDYPyZ9pQ5TG4u kRWafHIrGLhippHKy8YXWOsIos4DV/MEsgxAzkMTonHy/JKV3fvTP25DFPt7BC1B0Tq76F +cvA1ebgEFZLN1nEwOU+oHtvDpuv4qbQjyiTjIF3ooc5P5jtYy8czRe8IG/+pg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/ports/commit/?id=536675537f23aee4d51bac4e5c85ba34f3023605 commit 536675537f23aee4d51bac4e5c85ba34f3023605 Author: Baptiste Daroussin AuthorDate: 2022-07-27 14:26:01 +0000 Commit: Baptiste Daroussin CommitDate: 2022-07-27 14:27:14 +0000 www/piwigo: use pkg-message to show message on remove --- www/piwigo/Makefile | 3 ++- www/piwigo/files/pkg-deinstall.in | 20 -------------------- www/piwigo/files/pkg-message.in | 8 ++++++++ 3 files changed, 10 insertions(+), 21 deletions(-) diff --git a/www/piwigo/Makefile b/www/piwigo/Makefile index 768416713f50..770bd3136939 100644 --- a/www/piwigo/Makefile +++ b/www/piwigo/Makefile @@ -1,5 +1,6 @@ PORTNAME= piwigo DISTVERSION= 12.3.0 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= https://piwigo.org/download/dlcounter.php?code=${PORTVERSION}&/ @@ -17,7 +18,7 @@ USE_PHP= ctype dom exif filter gd hash iconv json mbstring mysqli \ NO_ARCH= yes NO_BUILD= yes -SUB_FILES= pkg-deinstall pkg-message +SUB_FILES= pkg-message SUB_LIST+= CHOWN="${CHOWN}" \ CP="${CP}" \ MKDIR="${MKDIR}" \ diff --git a/www/piwigo/files/pkg-deinstall.in b/www/piwigo/files/pkg-deinstall.in deleted file mode 100644 index ca60490f25f8..000000000000 --- a/www/piwigo/files/pkg-deinstall.in +++ /dev/null @@ -1,20 +0,0 @@ -#! /bin/sh - -PATH=/bin:/usr/sbin:/usr/bin:/usr/sbin - -WEBAPP_DIR="%%WWWDIR%%" -ECHO_CMD="echo" - -post-deinstall() { - ${ECHO_CMD} "WARNING: If you intend *NOT* use this package anymore," - ${ECHO_CMD} " you may need to remove the following directory manually:" - ${ECHO_CMD} " ${WEBAPP_DIR}" - ${ECHO_CMD} " and delete the application database." - ${ECHO_CMD} -} - -case $2 in - POST-DEINSTALL) - post-deinstall - ;; -esac diff --git a/www/piwigo/files/pkg-message.in b/www/piwigo/files/pkg-message.in index d8c414397746..49a5d823d382 100644 --- a/www/piwigo/files/pkg-message.in +++ b/www/piwigo/files/pkg-message.in @@ -38,5 +38,13 @@ A typical configuration would be: For installation and upgrade information, check the readme file. EOM +}, +{ type: remove + message: <