diff options
| author | Mateusz Piotrowski <0mp@FreeBSD.org> | 2019-08-06 14:59:47 +0000 |
|---|---|---|
| committer | Mateusz Piotrowski <0mp@FreeBSD.org> | 2019-08-06 14:59:47 +0000 |
| commit | 83c42f3e262967a21e38c95d943f212745ee212d (patch) | |
| tree | 9d70c806b22d75873a71dfe2f619a218cd79fbf6 /sysutils/mtm/files | |
| parent | Update to 2.4.48. (diff) | |
sysutils/mtm: Update to 1.0.1
Reported by: Repology
Diffstat (limited to 'sysutils/mtm/files')
| -rw-r--r-- | sysutils/mtm/files/patch-Makefile | 34 | ||||
| -rw-r--r-- | sysutils/mtm/files/patch-config.def.h | 20 |
2 files changed, 24 insertions, 30 deletions
diff --git a/sysutils/mtm/files/patch-Makefile b/sysutils/mtm/files/patch-Makefile index 9256f5e0895d..4fb045188037 100644 --- a/sysutils/mtm/files/patch-Makefile +++ b/sysutils/mtm/files/patch-Makefile @@ -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 + ++CPPFLAGS += $(FEATURES) ++LDFLAGS += $(LIBRARIES) ++ + all: mtm - 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 + 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 - install-terminfo: mtm.ti - tic -s -x mtm.ti + config.h: config.def.h + cp -i config.def.h config.h diff --git a/sysutils/mtm/files/patch-config.def.h b/sysutils/mtm/files/patch-config.def.h deleted file mode 100644 index 08d476f569d8..000000000000 --- a/sysutils/mtm/files/patch-config.def.h +++ /dev/null @@ -1,20 +0,0 @@ ---- config.def.h.orig 2018-05-07 14:54:13 UTC -+++ config.def.h -@@ -38,7 +38,7 @@ - - /* The path for the wide-character curses library. */ - #ifndef NCURSESW_INCLUDE_H -- #if defined(__APPLE__) || (defined(BSD) && !defined(__linux__)) -+ #if defined(__APPLE__) || (defined(BSD) && !defined(__linux__)) || defined(__FreeBSD__) - #define NCURSESW_INCLUDE_H <curses.h> - #else - #define NCURSESW_INCLUDE_H <ncursesw/curses.h> -@@ -50,6 +50,8 @@ - #ifndef FORKPTY_INCLUDE_H - #if defined(__APPLE__) || (defined(BSD) && !defined(__linux__)) - #define FORKPTY_INCLUDE_H <util.h> -+ #elif defined(__FreeBSD__) -+ #define FORKPTY_INCLUDE_H <libutil.h> - #else - #define FORKPTY_INCLUDE_H <pty.h> - #endif |