Date: Thu, 18 Aug 2022 21:01:05 GMT From: Daniel Engberg <diizzy@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 26adba26316b - main - sysutils/apachetop: Clean up port Message-ID: <202208182101.27IL15Id028406@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=26adba26316b0fede5f395e5746583860e5aa27c commit 26adba26316b0fede5f395e5746583860e5aa27c Author: Daniel Engberg <diizzy@FreeBSD.org> AuthorDate: 2022-08-18 20:52:17 +0000 Commit: Daniel Engberg <diizzy@FreeBSD.org> 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], - [
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202208182101.27IL15Id028406>