CVS commit: pkgsrc/devel/ncc

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Sat May 18 08:37:04 UTC 2024

Modified Files:
        pkgsrc/devel/ncc: Makefile distinfo
Added Files:
        pkgsrc/devel/ncc/patches: patch-nccnav_Makefile

Log Message:
ncc: Ensure curses library is properly found in the pkgsrc lib path.


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 pkgsrc/devel/ncc/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/devel/ncc/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/ncc/patches/patch-nccnav_Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/ncc/Makefile
diff -u pkgsrc/devel/ncc/Makefile:1.20 pkgsrc/devel/ncc/Makefile:1.21
--- pkgsrc/devel/ncc/Makefile:1.20      Wed May 15 09:56:07 2024
+++ pkgsrc/devel/ncc/Makefile   Sat May 18 08:37:04 2024
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2024/05/15 09:56:07 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2024/05/18 08:37:04 nia Exp $
 #
 
 DISTNAME=              ncc-2.8
-PKGREVISION=           12
+PKGREVISION=           13
 CATEGORIES=            devel
 MASTER_SITES=          http://students.ceid.upatras.gr/~sxanth/ncc/
 
@@ -13,6 +13,8 @@ COMMENT=              Compiler that produces program
 BUILD_TARGET=          tout
 CFLAGS+=               -DNOGNU='"${PREFIX}/share/ncc/nognu"'
 
+FAKE_NCURSES=          yes
+
 USE_LANGUAGES=         c c++
 
 # Fails with C++14 default language
@@ -45,6 +47,6 @@ do-install:
 
 FAKE_NCURSES=          yes
 
-.include "../../mk/curses.buildlink3.mk"
 .include "../../lang/python/application.mk"
+.include "../../mk/curses.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/ncc/distinfo
diff -u pkgsrc/devel/ncc/distinfo:1.6 pkgsrc/devel/ncc/distinfo:1.7
--- pkgsrc/devel/ncc/distinfo:1.6       Mon Jan 16 05:30:48 2023
+++ pkgsrc/devel/ncc/distinfo   Sat May 18 08:37:04 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2023/01/16 05:30:48 dholland Exp $
+$NetBSD: distinfo,v 1.7 2024/05/18 08:37:04 nia Exp $
 
 BLAKE2s (ncc-2.8.tar.gz) = 0be9e22d398c275b93ddde1b87624720149bdfbbbed5fba7f1fd701f132504de
 SHA512 (ncc-2.8.tar.gz) = 9fd41e37d5316848127ed4d3d8a5a4e88aa7a4545b62194e74bed9169e22c925ef8dbb612482cc29c16b3ceb0a7bcaa44ba04370aa8c898abfee136e96bbc429
@@ -8,3 +8,4 @@ SHA1 (patch-ab) = feff5d416428a10e9af235
 SHA1 (patch-ac) = 437150dbe18e5d2c8c175667f3fa6b1d419f452a
 SHA1 (patch-ad) = 0bc35544a5fe07112ee53ff5864d3a0d0f011e6e
 SHA1 (patch-ae) = 2397a601229a211c379450b83cad69fcfd6d9022
+SHA1 (patch-nccnav_Makefile) = 401ace5acb16664ba2f4a24e5de033bdfc6ae61b

Added files:

Index: pkgsrc/devel/ncc/patches/patch-nccnav_Makefile
diff -u /dev/null pkgsrc/devel/ncc/patches/patch-nccnav_Makefile:1.1
--- /dev/null   Sat May 18 08:37:04 2024
+++ pkgsrc/devel/ncc/patches/patch-nccnav_Makefile      Sat May 18 08:37:04 2024
@@ -0,0 +1,15 @@
+$NetBSD: patch-nccnav_Makefile,v 1.1 2024/05/18 08:37:04 nia Exp $
+
+Honour LDFLAGS when linking.
+
+--- nccnav/Makefile.orig       2024-05-18 08:34:32.260909906 +0000
++++ nccnav/Makefile
+@@ -6,7 +6,7 @@ CFLAGS = $(LCFLAGS) -c -g
+ OBJDIR = ../objdir
+ 
+ $(OBJDIR)/nccnav: nccnav.C $(OBJDIR)/dbstree.o $(OBJDIR)/inttree.o
+-      $(CC) -g nccnav.C -I.. -lncurses -o nccnav $(OBJDIR)/dbstree.o $(OBJDIR)/inttree.o
++      $(CC) $(LDFLAGS) -g nccnav.C -I.. -lcurses -o nccnav $(OBJDIR)/dbstree.o $(OBJDIR)/inttree.o
+ 
+ $(OBJDIR)/dbstree.o: ../dbstree.[Ch]
+       $(CC) $(CFLAGS) ../dbstree.C -c