Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 6 Aug 2019 14:59:47 +0000 (UTC)
From:      Mateusz Piotrowski <0mp@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r508255 - in head/sysutils/mtm: . files
Message-ID:  <201908061459.x76Exlhm058138@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: 0mp
Date: Tue Aug  6 14:59:47 2019
New Revision: 508255
URL: https://svnweb.freebsd.org/changeset/ports/508255

Log:
  sysutils/mtm: Update to 1.0.1
  
  Reported by:	Repology

Deleted:
  head/sysutils/mtm/files/patch-config.def.h
Modified:
  head/sysutils/mtm/Makefile
  head/sysutils/mtm/distinfo
  head/sysutils/mtm/files/patch-Makefile

Modified: head/sysutils/mtm/Makefile
==============================================================================
--- head/sysutils/mtm/Makefile	Tue Aug  6 14:23:39 2019	(r508254)
+++ head/sysutils/mtm/Makefile	Tue Aug  6 14:59:47 2019	(r508255)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	mtm
-DISTVERSION=	g20180507
+DISTVERSION=	1.0.1
 CATEGORIES=	sysutils
 
 MAINTAINER=	0mp@FreeBSD.org
@@ -10,21 +10,25 @@ COMMENT=	Terminal multiplexer focued on simplicity, co
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/README.rst
 
-USES=		ncurses
-
+# NB: ncurses 6.1 is required.
+USES=		localbase:ldflags ncurses:port
 USE_CSTD=	gnu99
 USE_GITHUB=	yes
 GH_ACCOUNT=	deadpixi
-GH_TAGNAME=	b861104
 
 PLIST_FILES=	bin/mtm \
 		man/man1/mtm.1.gz
 
-MAKE_ARGS+=	LIBS='-lutil -lncursesw'
+CFLAGS+=	-I${NCURSESINC}
+LDFLAGS+=	-L${NCURSESLIB}
 
 PORTDATA=	mtm.ti
 
-post-install:
+do-install:
+	@${MKDIR} ${STAGEDIR}${MAN1PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/mtm.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/mtm.1
+	@${MKDIR} ${STAGEDIR}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/mtm ${STAGEDIR}${PREFIX}/bin/mtm
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/mtm.ti ${STAGEDIR}${DATADIR}/mtm.ti
 

Modified: head/sysutils/mtm/distinfo
==============================================================================
--- head/sysutils/mtm/distinfo	Tue Aug  6 14:23:39 2019	(r508254)
+++ head/sysutils/mtm/distinfo	Tue Aug  6 14:59:47 2019	(r508255)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1526029385
-SHA256 (deadpixi-mtm-g20180507-b861104_GH0.tar.gz) = f6685a9d309760f044c8de041d848fa97aafbc43e28127da63ef9fcd31fc9bd5
-SIZE (deadpixi-mtm-g20180507-b861104_GH0.tar.gz) = 281687
+TIMESTAMP = 1565084499
+SHA256 (deadpixi-mtm-1.0.1_GH0.tar.gz) = cb1758d810860d25c7dc6d6d5440ad79055a22935f521be7d7d9fae40124add8
+SIZE (deadpixi-mtm-1.0.1_GH0.tar.gz) = 284660

Modified: head/sysutils/mtm/files/patch-Makefile
==============================================================================
--- head/sysutils/mtm/files/patch-Makefile	Tue Aug  6 14:23:39 2019	(r508254)
+++ head/sysutils/mtm/files/patch-Makefile	Tue Aug  6 14:59:47 2019	(r508255)
@@ -1,13 +1,27 @@
---- Makefile.orig	2018-05-07 14:54:13 UTC
+--- Makefile.orig	2019-08-06 13:35:52 UTC
 +++ Makefile
-@@ -16,8 +16,8 @@ config.h: config.def.h
- 	cp -i config.def.h config.h
+@@ -1,17 +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
  
- install: mtm
--	cp mtm $(DESTDIR)/bin
--	cp mtm.1 $(DESTDIR)/share/man/man1
-+	${BSD_INSTALL_PROGRAM} mtm $(DESTDIR)$(PREFIX)/bin
-+	${BSD_INSTALL_MAN} mtm.1 $(DESTDIR)$(PREFIX)/man/man1
++CPPFLAGS  += $(FEATURES)
++LDFLAGS   += $(LIBRARIES)
++
+ all: mtm
  
- install-terminfo: mtm.ti
- 	tic -s -x mtm.ti
+ mtm: vtparser.c mtm.c config.h
+-	$(CC) $(CFLAGS) $(FEATURES) -o $@ $(HEADERS) vtparser.c mtm.c $(LIBPATH) $(LIBS)
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ vtparser.c mtm.c
+ 
+ config.h: config.def.h
+ 	cp -i config.def.h config.h



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201908061459.x76Exlhm058138>