From nobody Thu Aug 18 21:01:05 2022 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 4M7y3P5X1cz4ZJX4; Thu, 18 Aug 2022 21:01:05 +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 4M7y3P4x37z3jDG; Thu, 18 Aug 2022 21:01:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660856465; 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=+KZQaaErgQuPq+8TZJHmxU5tbdyU1H5vDErHpykbNdY=; b=WoT+7Njc/8D3OjiuOvG8cGy178044tMl7wuG+gJPfzegmubz1RoHtypviGpfOYtQevb/ZU ZS/BHCHhIT/1FcODMwun0APQS5P7yBkGHqr7uSn0tszrzIQuNaKt1d85xe5jyqTl7AhdJd l3ynmKBHhTuSGB+MneC56WHMIsZyH9IOI88KQDhAkmbnMvy6/5/zAXptM/JhRK/OOSurL7 lhB7s0+Qgj0FzLF4JOMvTr0SvpifnYWr63HCo6rkbkcdUx0FPHnErVIWUGkzkMaqAxxwn6 iy3m8KNwlAgi4hgcxupHlejKOFzYafQmjyEzKeis9opmVvEO20Z479ZgT098Nw== 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 4M7y3P3khVzSBc; Thu, 18 Aug 2022 21:01:05 +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 27IL150o028407; Thu, 18 Aug 2022 21:01:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27IL15Id028406; Thu, 18 Aug 2022 21:01:05 GMT (envelope-from git) Date: Thu, 18 Aug 2022 21:01:05 GMT Message-Id: <202208182101.27IL15Id028406@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Daniel Engberg Subject: git: 26adba26316b - main - sysutils/apachetop: Clean up port 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: diizzy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 26adba26316b0fede5f395e5746583860e5aa27c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660856465; 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=+KZQaaErgQuPq+8TZJHmxU5tbdyU1H5vDErHpykbNdY=; b=t7mcKEAfgMM+iqpZv/0glvSlM6PlnJCMos36ZzSEZqCNIxowcWKW401pBNifroqRnknP+S 3CeuQxAr5mTILrDTT+Wg+9+A4yskhc72AoS/ayZlH8988Ugs+1DVbuTFdPMi/NO3nVmZHZ 7YYpSUB4VbzsJ1eTmtCesZeHo2eeYTbnCuKPGCXP3iIY3DfnYsIz/zqPDqEC5mHzEHuGmO fmifIjN/DfZXIkU2/BBZehJN03olfubwiI/Ld9vahKBToKVx6uhgpmTyndSt8s5SNaa39/ HCkFNNfBvHbYuEVBcfol8aRH1D0gEcghwH3MD6tJFRdr9tVOKQt3h8chNXPqGQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1660856465; a=rsa-sha256; cv=none; b=r/KiMPCxHt93GJyDg2Iql9wbF287I5/YFhJK0fvC91U0kNE1Bv+D/E0lBJ6tDhDfh4d0Av H978AyV2QTXPKFvaKcU69jlQTr9Oom4bp37XNizskcnli5EnHonN4YLigobEdd0IjZ6iGw wQFaFPkw2otQ0ocZVta39SpBiFWgDUoKvXijP0T4eLDIl2vJw4BPVSFP4itovlO2jOxtx8 gBMutohalKbpmrRWw3IaMHUSyxiLDM6Y4gWaCxEw57ccG2Jc9hxZeRxKyT2GqX7Dz5kyR5 ydhRzsuQorSgBNO4eXBs9k+Er8KJs1VIBmm+OvHJpy/QppRPwvFuHlxnZv0iCg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=26adba26316b0fede5f395e5746583860e5aa27c commit 26adba26316b0fede5f395e5746583860e5aa27c Author: Daniel Engberg AuthorDate: 2022-08-18 20:52:17 +0000 Commit: Daniel Engberg CommitDate: 2022-08-18 21:00:19 +0000 sysutils/apachetop: Clean up port * Use DISTVERSION instead of PORTVERSION * Use upstream release archive as recommended by Porters Handbook, this also removes the need to run USES= autoreconf * Use GNU_CONFIGURE instead of HAS_CONFIGURE as this configure script uses GNU Autotools * Use CONFIGURE_ENV to tell configure script where ncurses is located which makes patching unnecessary. PR: 265932 Reviewed by: lukasz@wasikowski.net (maintainer) --- sysutils/apachetop/Makefile | 12 ++++----- sysutils/apachetop/distinfo | 6 ++--- sysutils/apachetop/files/patch-configure.ac | 42 ----------------------------- 3 files changed, 9 insertions(+), 51 deletions(-) diff --git a/sysutils/apachetop/Makefile b/sysutils/apachetop/Makefile index 73250d2a7a48..70c45e76fb90 100644 --- a/sysutils/apachetop/Makefile +++ b/sysutils/apachetop/Makefile @@ -1,6 +1,7 @@ PORTNAME= apachetop -PORTVERSION= 0.19.7 +DISTVERSION= 0.19.7 CATEGORIES= sysutils +MASTER_SITES= https://github.com/tessus/${PORTNAME}/releases/download/${DISTVERSION}/ MAINTAINER= lukasz@wasikowski.net COMMENT= Apache realtime log stats @@ -8,12 +9,11 @@ COMMENT= Apache realtime log stats LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -USES= autoreconf cpe ncurses readline -USE_GITHUB= yes -GH_ACCOUNT= tessus +USES= cpe ncurses readline -HAS_CONFIGURE= yes -CONFIGURE_ARGS= --mandir=${PREFIX}/man +GNU_CONFIGURE= yes + +CONFIGURE_ENV+= NCURSES_CFLAGS="-I${NCURSESINC}" NCURSES_LIBS="-lncursesw" PLIST_FILES= bin/${PORTNAME} man/man1/${PORTNAME}.1.gz diff --git a/sysutils/apachetop/distinfo b/sysutils/apachetop/distinfo index 2b2bdbec8fcc..00b68e76ab2c 100644 --- a/sysutils/apachetop/distinfo +++ b/sysutils/apachetop/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1660754845 -SHA256 (tessus-apachetop-0.19.7_GH0.tar.gz) = 88abf58ee5d7882e4cc3fa2462865ebbf0e8f872fdcec5186abe16e7bff3d4a5 -SIZE (tessus-apachetop-0.19.7_GH0.tar.gz) = 43388 +TIMESTAMP = 1660844272 +SHA256 (apachetop-0.19.7.tar.gz) = 7f0ad1cd11cd1f86052bbfd63f27ecb6cb74012a17321354af70abf05998c4eb +SIZE (apachetop-0.19.7.tar.gz) = 132665 diff --git a/sysutils/apachetop/files/patch-configure.ac b/sysutils/apachetop/files/patch-configure.ac deleted file mode 100644 index 72333d188a62..000000000000 --- a/sysutils/apachetop/files/patch-configure.ac +++ /dev/null @@ -1,42 +0,0 @@ ---- configure.ac.orig 2019-07-20 16:29:06.000000000 +0800 -+++ configure.ac 2022-08-18 01:36:23.768371000 +0800 -@@ -36,8 +36,6 @@ - AM_CONFIG_HEADER(config.h) - AM_INIT_AUTOMAKE - --PKG_PROG_PKG_CONFIG -- - # Add non-standard directories to the include path - AC_ARG_WITH(libraries, - [ -@@ -135,22 +133,14 @@ - AC_SEARCH_LIBS([socket], [socket]) - AC_SEARCH_LIBS([inet_addr], [nsl]) - --NCURSES_FOUND=no --PKG_CHECK_MODULES(NCURSES, ncurses, [ -- LIBS="$LIBS $NCURSES_LIBS" -- NCURSES_FOUND=yes -- ]) -- --AS_IF([test "x$NCURSES_FOUND" != "xyes"], [ -- AC_SEARCH_LIBS([attron], [ncurses]) -- AC_SEARCH_LIBS([tgetstr], [termcap]) -- AC_SEARCH_LIBS([mvprintw], [curses ncurses] , -- [] , -- [ -- AC_MSG_ERROR([No useful curses library found!]) -- ] -- ) --]) -+AC_SEARCH_LIBS([attron], [ncurses]) -+AC_SEARCH_LIBS([tgetstr], [termcap]) -+AC_SEARCH_LIBS([mvprintw], [curses ncurses] , -+ [] , -+ [ -+ AC_MSG_ERROR([No useful curses library found!]) -+ ] -+ ) - - AC_SEARCH_LIBS([readline], [readline], - [