CVS commit: pkgsrc/devel/py-newt

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu Jan 27 08:10:07 UTC 2022

Modified Files:
        pkgsrc/devel/py-newt: distinfo
        pkgsrc/devel/py-newt/patches: patch-Makefile.in

Log Message:
py-newt: use CC instead of (undefined) CPP

Fixes build


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/py-newt/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/py-newt/patches/patch-Makefile.in

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

Modified files:

Index: pkgsrc/devel/py-newt/distinfo
diff -u pkgsrc/devel/py-newt/distinfo:1.5 pkgsrc/devel/py-newt/distinfo:1.6
--- pkgsrc/devel/py-newt/distinfo:1.5   Tue Oct 26 10:18:42 2021
+++ pkgsrc/devel/py-newt/distinfo       Thu Jan 27 08:10:07 2022
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.5 2021/10/26 10:18:42 nia Exp $
+$NetBSD: distinfo,v 1.6 2022/01/27 08:10:07 wiz Exp $
 
 BLAKE2s (newt-0.52.16.tar.gz) = ef3dd1dab5ec4695901d21493661e5ff338a1267fdcdfb9b1eb479b324823e23
 SHA512 (newt-0.52.16.tar.gz) = 38cf5aa6660a3ee0409ed0767c02d777a4a2c28a000a359bb735da5abf8ee38f375ef333d10865a1eb3828497b6c58d2f3f6011c7b7e7c2360612b985dcf3d25
 Size (newt-0.52.16.tar.gz) = 183487 bytes
-SHA1 (patch-Makefile.in) = cae82773fcb94dc9b9aa4349b52308e3136843f2
+SHA1 (patch-Makefile.in) = 6c029323ba411aff1f137149ee21cffb7decdb4a
 SHA1 (patch-configure.ac) = 8c685e25e89503cb5e62362c8b8132931d4c6184
 SHA1 (patch-po_Makefile) = dfa6352d1f10246bd7d2f9cd4f256394dc1a674a

Index: pkgsrc/devel/py-newt/patches/patch-Makefile.in
diff -u pkgsrc/devel/py-newt/patches/patch-Makefile.in:1.1 pkgsrc/devel/py-newt/patches/patch-Makefile.in:1.2
--- pkgsrc/devel/py-newt/patches/patch-Makefile.in:1.1  Wed Jan  1 06:55:23 2014
+++ pkgsrc/devel/py-newt/patches/patch-Makefile.in      Thu Jan 27 08:10:07 2022
@@ -1,11 +1,19 @@
-$NetBSD: patch-Makefile.in,v 1.1 2014/01/01 06:55:23 ryoon Exp $
+$NetBSD: patch-Makefile.in,v 1.2 2022/01/27 08:10:07 wiz Exp $
 
 * Libtoolized
 * Use configure.ac's Python version
 
 --- Makefile.in.orig   2013-08-06 15:46:42.000000000 +0000
 +++ Makefile.in
-@@ -16,7 +16,7 @@ SOEXT = so
+@@ -2,7 +2,6 @@ LIBS = -lslang @LIBS@
+ LIBTCL = @TCL_LIB_FLAG@
+ 
+ CC = @CC@
+-CPP = @CPP@
+ CFLAGS = @CFLAGS@
+ LDFLAGS = @LDFLAGS@
+ CPPFLAGS = -D_GNU_SOURCE -I/usr/include/slang @CPPFLAGS@ 
+@@ -16,7 +15,7 @@ SOEXT = so
  PYTHONVERS = @PYTHONVERS@
  WHIPTCLLIB = @WHIPTCLLIB@
  ifneq ($(WHIPTCLLIB),)
@@ -14,7 +22,7 @@ $NetBSD: patch-Makefile.in,v 1.1 2014/01
  else
  WHIPTCLSO =
  endif
-@@ -25,18 +25,12 @@ PROGS = test whiptail $(WHIPTCLSO) testg
+@@ -25,18 +24,12 @@ PROGS = test whiptail $(WHIPTCLSO) testg
  TESTOBJS = test.o testgrid.o testtree.o showchars.o showkey.o
  NDIALOGOBJS = whiptail.o dialogboxes.o
  WHIPTCLOBJS = shared/whiptcl.o shared/dialogboxes.o
@@ -35,7 +43,7 @@ $NetBSD: patch-Makefile.in,v 1.1 2014/01
  
  SHCFLAGS = -fPIC
  
-@@ -56,6 +50,10 @@ instroot ?= $(DESTDIR)
+@@ -56,6 +49,10 @@ instroot ?= $(DESTDIR)
  
  SOURCES = $(subst .o,.c,$(TESTOBJS) $(NDIALOGOBJS) $(LIBOBJS))
  
@@ -46,7 +54,7 @@ $NetBSD: patch-Makefile.in,v 1.1 2014/01
  SHAREDDIR = shared
  SHAREDOBJS = $(patsubst %,$(SHAREDDIR)/%, $(LIBOBJS))
  
-@@ -65,59 +63,61 @@ else
+@@ -65,76 +62,76 @@ else
  TARGET=depend $(PROGS)
  endif
  
@@ -129,7 +137,9 @@ $NetBSD: patch-Makefile.in,v 1.1 2014/01
                $(SHAREDDIR)/*.o *.$(SOEXT)*
  
  depend:
-@@ -126,15 +126,13 @@ depend:
+-      $(CPP) $(CFLAGS) $(CPPFLAGS) -M $(SOURCES) > .depend
++      $(CC) $(CFLAGS) $(CPPFLAGS) -M $(SOURCES) > .depend
+ 
  $(SHAREDDIR):
        mkdir -p $(SHAREDDIR)
  
@@ -150,7 +160,7 @@ $NetBSD: patch-Makefile.in,v 1.1 2014/01
  
  install: $(LIBNEWT) install-sh whiptail
        [ -d $(instroot)/$(bindir) ] || install -m 755 -d $(instroot)/$(bindir)
-@@ -143,22 +141,19 @@ install: $(LIBNEWT) install-sh whiptail
+@@ -143,22 +140,19 @@ install: $(LIBNEWT) install-sh whiptail
        [ -d $(instroot)/$(man1dir) ] || install -m 755 -d $(instroot)/$(man1dir)
        [ -d $(instroot)/$(pkgconfigdir) ] || install -m 755 -d $(instroot)/$(pkgconfigdir)
        install -m 644 newt.h $(instroot)/$(includedir)