From nobody Mon Sep 04 09:10:15 2023 X-Original-To: dev-commits-ports-main@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 4RfNBw1kxCz4sRtD; Mon, 4 Sep 2023 09:10:16 +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 4RfNBv62t3z4Wwd; Mon, 4 Sep 2023 09:10:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693818615; 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=DJjdNcxi+MRWekP7byasft8E7M8ww3GLVQYTiRYLeiY=; b=ycZoJZYKWPVMwZaem17dWI09+9FzphpHss6JZDzP64HMDtkNpePm1x9Ak2VPCiEY6ffFXs aXEpjTfVv3sS6vdmCL67g8qiJBkS1zTVMllpgC8uWBqqNu/vu/4QPbIiDsayGPRigvETSu yvp6mxWi156IGHfEeDUIy7VDpa+XaMdNGZmcqexztlnRcKJT3hpdEFZWNTcDuhvHe0y3vI imq01qYmLvytg99maiDp7WKliCHFtuqLF5Q56MZLEV0P4qIEsQ9uFD00iyJQFkVwt1cMgF 9qiZYw2pnhqTeoysGtCOxK+r5kUGRfIvlcksKWLq4ogdFAUwLQ4l7Z+Svppuow== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693818615; a=rsa-sha256; cv=none; b=Bj2Fn2mjXfj9jpTiC3vGW74ywzvwMKd4vlfzeCHAQ6zIUpFr8IFOKBXPYLQrkavRGBteZJ Um7dj45VxXe82Nj6IphFFkm3k4fz09ZEKwtcVSKKqV+el+tBLsVjscMUDod3TX9CcR0pDm 64OVkhjAQUOkWfdnXODo06Oo81HKYxN6O1DACK4KFm/ih8UX3aprsocg9qgM2pvZ0IDr+t E4sknFLt7l9FDuzogsYsHP8mZjuIWkcChDW8o44vb2CWNbfSlpnFp/UckmHhAqzBD12a2F bCsLOddTWFardsslLK/HtDqfWpES0Bh/jwMGKUfHhXjgNgciGlarlmqbjPI7XQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693818615; 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=DJjdNcxi+MRWekP7byasft8E7M8ww3GLVQYTiRYLeiY=; b=TY8Nw58TUMd3yjoF7gXhs0uhZ8u1q6zq2V93Uc3Yy96Ece+JTSo76guQiXJ2UJON1kUdGf nlbaJM5wkQAuBkDlpnL6iaWGw8QYeflwgPOFyT3VPsf2t9CMd72A/4WCyMwZW4xGGd6cZy 26X5uuGK2V9pt5jNhpzxFTo7rwzz5mmOb7SixGWKSEzLMvDsBStYC1Y2DNchuqw+qaNz6Y 52ctzXwxOmXALK5UzalwqRX5O8QhjUl9bnc/PN722NsPrjJvjdyYTx531Bm5YPlIY3oGC0 qGjQrBoKHa+ZkDBTfnFgpF3JLSXKlLj+iQwRnfo0WlUm3X2LPOoPHrBqmFsiYA== 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 4RfNBv58WKz11Hd; Mon, 4 Sep 2023 09:10:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3849AFTv059314; Mon, 4 Sep 2023 09:10:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3849AFtR059309; Mon, 4 Sep 2023 09:10:15 GMT (envelope-from git) Date: Mon, 4 Sep 2023 09:10:15 GMT Message-Id: <202309040910.3849AFtR059309@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 0d2be8be7756 - main - net/vnstat: Clean up Makefile List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0d2be8be7756ac12b3994caad320f1e11e7a231b Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=0d2be8be7756ac12b3994caad320f1e11e7a231b commit 0d2be8be7756ac12b3994caad320f1e11e7a231b Author: Po-Chuan Hsieh AuthorDate: 2023-09-04 09:06:21 +0000 Commit: Po-Chuan Hsieh CommitDate: 2023-09-04 09:06:21 +0000 net/vnstat: Clean up Makefile - Use INSTALL_TARGET=install-exec to install the binary executables - Use GNU_CONFIGURE_MANPREFIX and INSTALL_TARGET=install-man to install the manpages - Use USES=localbase and CONFIGURE_ARGS=--disable-extra-paths to support non-default LOCALBASE - Add CONFIGURE_ARGS=--disable-image-output when GUI option is disabled - Bump PORTREVISION for package change PR: 273231 --- net/vnstat/Makefile | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/net/vnstat/Makefile b/net/vnstat/Makefile index 40efe7d77022..eaac4e5db61c 100644 --- a/net/vnstat/Makefile +++ b/net/vnstat/Makefile @@ -1,5 +1,6 @@ PORTNAME= vnstat PORTVERSION= 2.11 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= https://github.com/vergoh/vnstat/releases/download/v${PORTVERSION}/ \ https://humdi.net/vnstat/ @@ -11,9 +12,12 @@ WWW= https://humdi.net/vnstat/ \ LICENSE= GPLv2 -USES= sqlite +USES= localbase sqlite +CONFIGURE_ARGS= --disable-extra-paths GNU_CONFIGURE= yes +GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share +INSTALL_TARGET= install-exec install-man USE_RC_SUBR= vnstat USERS= vnstat @@ -29,19 +33,11 @@ OPTIONS_DEFAULT=GUI OPTIONS_SUB= yes GUI_DESC= Build with graphics/gd dependency +GUI_CONFIGURE_OFF= --disable-image-output GUI_LIB_DEPENDS= libgd.so:graphics/gd -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/vnstat ${STAGEDIR}${PREFIX}/bin/vnstat +post-install: ${INSTALL_DATA} ${WRKSRC}/cfg/vnstat.conf ${STAGEDIR}${PREFIX}/etc/vnstat.conf.sample - ${INSTALL_PROGRAM} ${WRKSRC}/vnstatd ${STAGEDIR}${PREFIX}/sbin/vnstatd - ${INSTALL_MAN} ${WRKSRC}/man/vnstat.1 ${STAGEDIR}${PREFIX}/share/man/man1/vnstat.1 - ${INSTALL_MAN} ${WRKSRC}/man/vnstat.conf.5 ${STAGEDIR}${PREFIX}/share/man/man5/vnstat.conf.5 - ${INSTALL_MAN} ${WRKSRC}/man/vnstatd.8 ${STAGEDIR}${PREFIX}/share/man/man8/vnstatd.8 - -do-install-GUI-on: - ${INSTALL_PROGRAM} ${WRKSRC}/vnstati ${STAGEDIR}${PREFIX}/bin/vnstati - ${INSTALL_MAN} ${WRKSRC}/man/vnstati.1 ${STAGEDIR}${PREFIX}/share/man/man1/vnstati.1 do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR}