Sat Mar 16 22:25:06 2024 UTC (71d)
mdp: Honour LDFLAGS when linking


(nia)
diff -r1.3 -r1.4 pkgsrc/misc/mdp/Makefile
diff -r1.5 -r1.6 pkgsrc/misc/mdp/distinfo
diff -r1.2 -r1.3 pkgsrc/misc/mdp/patches/patch-Makefile
cvs diff -r1.3 -r1.4 pkgsrc/misc/mdp/Makefile (expand / switch to unified diff)

--- pkgsrc/misc/mdp/Makefile 2020/01/03 11:47:19 1.3
+++ pkgsrc/misc/mdp/Makefile 2024/03/16 22:25:05 1.4
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1# $NetBSD: Makefile,v 1.3 2020/01/03 11:47:19 nia Exp $ 1# $NetBSD: Makefile,v 1.4 2024/03/16 22:25:05 nia Exp $
2 2
3DISTNAME= mdp-1.0.15 3DISTNAME= mdp-1.0.15
 4PKGREVISION= 1
4CATEGORIES= misc 5CATEGORIES= misc
5MASTER_SITES= ${MASTER_SITE_GITHUB:=visit1985/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=visit1985/}
6GITHUB_PROJECT= mdp 7GITHUB_PROJECT= mdp
7GITHUB_TAG= ${PKGVERSION_NOREV} 8GITHUB_TAG= ${PKGVERSION_NOREV}
8 9
9MAINTAINER= ryoon@NetBSD.org 10MAINTAINER= ryoon@NetBSD.org
10HOMEPAGE= https://github.com/visit1985/mdp/ 11HOMEPAGE= https://github.com/visit1985/mdp/
11COMMENT= Command-line based markdown presentation tool 12COMMENT= Command-line based markdown presentation tool
12LICENSE= gnu-gpl-v3 13LICENSE= gnu-gpl-v3
13 14
14USE_TOOLS+= gmake 15USE_TOOLS+= gmake
15USE_CURSES= wide 16USE_CURSES= wide
16FAKE_NCURSES= yes 17FAKE_NCURSES= yes
cvs diff -r1.5 -r1.6 pkgsrc/misc/mdp/distinfo (expand / switch to unified diff)

--- pkgsrc/misc/mdp/distinfo 2021/10/26 10:59:15 1.5
+++ pkgsrc/misc/mdp/distinfo 2024/03/16 22:25:05 1.6
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.5 2021/10/26 10:59:15 nia Exp $ 1$NetBSD: distinfo,v 1.6 2024/03/16 22:25:05 nia Exp $
2 2
3BLAKE2s (mdp-1.0.15.tar.gz) = e0543e973984a55d59560894a513c96ecb98d2ec350df8104d907212e344745a 3BLAKE2s (mdp-1.0.15.tar.gz) = e0543e973984a55d59560894a513c96ecb98d2ec350df8104d907212e344745a
4SHA512 (mdp-1.0.15.tar.gz) = 88337224dc7b58bc82f68861083e31ac429ff97e6dfcf7a66042c302205ca01947df35445e0b4683c5c5a998c493db882d3aaff462673b5a387865c33752bb0e 4SHA512 (mdp-1.0.15.tar.gz) = 88337224dc7b58bc82f68861083e31ac429ff97e6dfcf7a66042c302205ca01947df35445e0b4683c5c5a998c493db882d3aaff462673b5a387865c33752bb0e
5Size (mdp-1.0.15.tar.gz) = 37728 bytes 5Size (mdp-1.0.15.tar.gz) = 37728 bytes
6SHA1 (patch-Makefile) = 39d409d26b6be6bb0f3c4bda9d1e92ecebe905bd 6SHA1 (patch-Makefile) = e74cedb4f50d0d1fd96c7d7301ef7b510f2139f2
cvs diff -r1.2 -r1.3 pkgsrc/misc/mdp/patches/patch-Makefile (expand / switch to unified diff)

--- pkgsrc/misc/mdp/patches/patch-Makefile 2018/02/06 10:14:29 1.2
+++ pkgsrc/misc/mdp/patches/patch-Makefile 2024/03/16 22:25:06 1.3
@@ -1,27 +1,45 @@ @@ -1,27 +1,45 @@
1$NetBSD: patch-Makefile,v 1.2 2018/02/06 10:14:29 jperkin Exp $ 1$NetBSD: patch-Makefile,v 1.3 2024/03/16 22:25:06 nia Exp $
2 2
 3* Honour LDFLAGS
3* Let pkgsrc pull in the correct curses library 4* Let pkgsrc pull in the correct curses library
4* Honor pkgsrc man directory 5* Honor pkgsrc man directory
5 6
6--- Makefile.orig 2016-11-03 07:34:00.000000000 +0000 7--- Makefile.orig 2018-10-03 22:04:48.000000000 +0000
7+++ Makefile 8+++ Makefile
8@@ -44,7 +44,7 @@ ifeq ($(DEBUG),1) 9@@ -27,7 +27,6 @@ DESTDIR =
9 LDFLAGS := 10 PREFIX ?= /usr/local
 11
 12 CURSES = ncursesw
 13-LDFLAGS ?= -s
 14
 15 ifeq (Windows_NT,$(OS))
 16 ifeq (,$(findstring CYGWIN,$(UNAME_S)))
 17@@ -35,16 +34,7 @@ ifeq (Windows_NT,$(OS))
 18 endif
10 endif 19 endif
11  20
 21-ifeq ($(UNAME_S),Darwin)
 22- CURSES := ncurses
 23- LDFLAGS :=
 24-endif
 25-
 26-ifeq ($(DEBUG),1)
 27- LDFLAGS :=
 28-endif
 29-
12-LDLIBS = -l$(CURSES) 30-LDLIBS = -l$(CURSES)
13+LDLIBS = -lcurses 31+LDLIBS = -lcurses
14  32
15 all: $(TARGET) 33 all: $(TARGET)
16  34
17@@ -61,8 +61,8 @@ clean: 35@@ -61,8 +51,8 @@ clean:
18 install: 36 install:
19 install -d $(DESTDIR)$(PREFIX)/bin 37 install -d $(DESTDIR)$(PREFIX)/bin
20 install -m 755 $(TARGET) $(DESTDIR)$(PREFIX)/bin/$(TARGET) 38 install -m 755 $(TARGET) $(DESTDIR)$(PREFIX)/bin/$(TARGET)
21- install -d $(DESTDIR)$(PREFIX)/share/man/man1 39- install -d $(DESTDIR)$(PREFIX)/share/man/man1
22- install -m 644 mdp.1 $(DESTDIR)$(PREFIX)/share/man/man1/$(TARGET).1 40- install -m 644 mdp.1 $(DESTDIR)$(PREFIX)/share/man/man1/$(TARGET).1
23+ install -d $(DESTDIR)$(PREFIX)/${PKGMANDIR}/man1 41+ install -d $(DESTDIR)$(PREFIX)/${PKGMANDIR}/man1
24+ install -m 644 mdp.1 $(DESTDIR)$(PREFIX)/${PKGMANDIR}/man1/$(TARGET).1 42+ install -m 644 mdp.1 $(DESTDIR)$(PREFIX)/${PKGMANDIR}/man1/$(TARGET).1
25  43
26 uninstall: 44 uninstall:
27 $(RM) $(DESTDIR)$(PREFIX)/$(TARGET) 45 $(RM) $(DESTDIR)$(PREFIX)/$(TARGET)