git: 5aebc0240cee - main - sysutils/mtm: Update to 1.2.1
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 10 Oct 2021 19:30:32 UTC
The branch main has been updated by 0mp:
URL: https://cgit.FreeBSD.org/ports/commit/?id=5aebc0240ceef43d188705c7d11602f8d8da4f14
commit 5aebc0240ceef43d188705c7d11602f8d8da4f14
Author: Mateusz Piotrowski <0mp@FreeBSD.org>
AuthorDate: 2021-10-10 18:54:02 +0000
Commit: Mateusz Piotrowski <0mp@FreeBSD.org>
CommitDate: 2021-10-10 19:30:17 +0000
sysutils/mtm: Update to 1.2.1
Changes: https://github.com/deadpixi/mtm/releases/tag/1.2.1
---
sysutils/mtm/Makefile | 19 ++++++++++++-------
sysutils/mtm/distinfo | 6 +++---
sysutils/mtm/files/patch-Makefile | 28 ----------------------------
3 files changed, 15 insertions(+), 38 deletions(-)
diff --git a/sysutils/mtm/Makefile b/sysutils/mtm/Makefile
index d26296fee426..ceabfdf3d2cd 100644
--- a/sysutils/mtm/Makefile
+++ b/sysutils/mtm/Makefile
@@ -1,6 +1,5 @@
PORTNAME= mtm
-DISTVERSION= 1.2.0
-PORTREVISION= 1
+DISTVERSION= 1.2.1
CATEGORIES= sysutils
MAINTAINER= 0mp@FreeBSD.org
@@ -10,18 +9,21 @@ LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/README.rst
# NB: ncurses 6.1 is required.
-USES= localbase:ldflags
+USES= localbase
USE_CSTD= gnu99
USE_GITHUB= yes
GH_ACCOUNT= deadpixi
-PLIST_FILES= bin/mtm \
- share/man/man1/mtm.1.gz
+MAKE_ENV= DESTDIR="${DESTDIR}${PREFIX}"
-CFLAGS+= -I${NCURSESINC}
-LDFLAGS+= -L${NCURSESLIB} -ltinfow
+CFLAGS+= -I${NCURSESINC} ${CPPFLAGS}
+LIBS+= -L${NCURSESLIB} -ltinfow -lutil
+BINARY_ALIAS= strip=true
+
+PLIST_FILES= bin/mtm \
+ share/man/man1/mtm.1.gz
PORTDATA= mtm.ti
do-install:
@@ -34,10 +36,13 @@ do-install:
.include <bsd.port.options.mk>
+.if make(makesum) || make(fetch) && "${NO_CHECKSUM}" == yes
+.else
.if ${OPSYS} == "FreeBSD" && ${OSVERSION} >= 1300079
USES+= ncurses:base
.else
USES+= ncurses:port
.endif
+.endif
.include <bsd.port.mk>
diff --git a/sysutils/mtm/distinfo b/sysutils/mtm/distinfo
index a82128eb0673..944ac514b457 100644
--- a/sysutils/mtm/distinfo
+++ b/sysutils/mtm/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1572263257
-SHA256 (deadpixi-mtm-1.2.0_GH0.tar.gz) = 68f753f743fcd3d87f269011d4bbd3fed59cfcad710d7c7db98844e3e675c196
-SIZE (deadpixi-mtm-1.2.0_GH0.tar.gz) = 382469
+TIMESTAMP = 1633890760
+SHA256 (deadpixi-mtm-1.2.1_GH0.tar.gz) = 2ae05466ef44efa7ddb4bce58efc425617583d9196b72e80ec1090bd77df598c
+SIZE (deadpixi-mtm-1.2.1_GH0.tar.gz) = 383409
diff --git a/sysutils/mtm/files/patch-Makefile b/sysutils/mtm/files/patch-Makefile
deleted file mode 100644
index 3465ad3404e0..000000000000
--- a/sysutils/mtm/files/patch-Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
---- Makefile.orig 2019-08-06 13:35:52 UTC
-+++ Makefile
-@@ -1,18 +1,20 @@
- CC ?= gcc
- CFLAGS ?= -std=c99 -Wall -Wextra -pedantic -Os
-+CPPFLAGS ?=
-+LDFLAGS ?=
- FEATURES ?= -D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=600 -D_XOPEN_SOURCE_EXTENDED
--HEADERS ?=
--LIBPATH ?=
- DESTDIR ?= /usr/local
- MANDIR ?= $(DESTDIR)/man/man1
- CURSESLIB ?= ncursesw
--LIBS ?= -l$(CURSESLIB) -lutil
-+LIBRARIES ?= -l$(CURSESLIB) -lutil
-
-+CPPFLAGS += $(FEATURES)
-+LDFLAGS += $(LIBRARIES)
-+
- all: mtm
-
- mtm: vtparser.c mtm.c config.h
-- $(CC) $(CFLAGS) $(FEATURES) -o $@ $(HEADERS) vtparser.c mtm.c $(LIBPATH) $(LIBS)
-- strip -s mtm
-+ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ vtparser.c mtm.c
-
- config.h: config.def.h
- cp -i config.def.h config.h