CVS commit: pkgsrc/misc/sunwait

["Joerg Sonnenberger" <joerg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   joerg
Date:           Sat Dec 21 23:44:45 UTC 2019

Modified Files:
        pkgsrc/misc/sunwait: distinfo
        pkgsrc/misc/sunwait/patches: patch-Makefile

Log Message:
Don't build header files.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/misc/sunwait/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/misc/sunwait/patches/patch-Makefile

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

Modified files:

Index: pkgsrc/misc/sunwait/distinfo
diff -u pkgsrc/misc/sunwait/distinfo:1.1 pkgsrc/misc/sunwait/distinfo:1.2
--- pkgsrc/misc/sunwait/distinfo:1.1    Wed Jan 16 14:43:22 2019
+++ pkgsrc/misc/sunwait/distinfo        Sat Dec 21 23:44:45 2019
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.1 2019/01/16 14:43:22 martin Exp $
+$NetBSD: distinfo,v 1.2 2019/12/21 23:44:45 joerg Exp $
 
 SHA1 (sunwait-0.8.tar.gz) = eed1453e288d03d200d4f74634324a343434f426
 RMD160 (sunwait-0.8.tar.gz) = ffad86c063eac4952141016fde056056d44963b4
 SHA512 (sunwait-0.8.tar.gz) = 974aec925e08d42f6b9d617cd033ab21af314b04a0bab100f9b473e038df7eb65a86de2240ef2d5308af5385c929607d591c6f7b738925622e38040af6368166
 Size (sunwait-0.8.tar.gz) = 20302 bytes
-SHA1 (patch-Makefile) = 63276adb2587a251d9bb896ec82cd5ba6b3d6c07
+SHA1 (patch-Makefile) = a3ba723c2868ce7628f5bc4b93633a3abacd5c56
 SHA1 (patch-sunriset.cpp) = 759aa1f2c0301f8fab3a264167d25a077ed205ee
 SHA1 (patch-sunwait.cpp) = cf5b2251a4b0de5e95cdbd06a432824b623df42b

Index: pkgsrc/misc/sunwait/patches/patch-Makefile
diff -u pkgsrc/misc/sunwait/patches/patch-Makefile:1.1 pkgsrc/misc/sunwait/patches/patch-Makefile:1.2
--- pkgsrc/misc/sunwait/patches/patch-Makefile:1.1      Wed Jan 16 14:43:22 2019
+++ pkgsrc/misc/sunwait/patches/patch-Makefile  Sat Dec 21 23:44:45 2019
@@ -1,4 +1,4 @@
-$NetBSD: patch-Makefile,v 1.1 2019/01/16 14:43:22 martin Exp $
+$NetBSD: patch-Makefile,v 1.2 2019/12/21 23:44:45 joerg Exp $
 
 - Use CC instead of C to specify the C compiler and do not hardcode gcc
 - Honors user's {C,LD}FLAGS
@@ -6,17 +6,17 @@ $NetBSD: patch-Makefile,v 1.1 2019/01/16
 
 --- Makefile.orig      2015-09-20 14:07:55.000000000 +0000
 +++ Makefile
-@@ -5,23 +5,29 @@
+@@ -5,23 +5,28 @@
  #
  
  
 -C=gcc
 -CFLAGS=-c -Wall 
 -LDFLAGS= -lm -lstdc++
-+CC=c++
-+CFLAGS+=-c -Wall -D__linux__
-+LDFLAGS+= -lm -lstdc++
- SOURCES=sunwait.cpp sunriset.cpp print.cpp sunwait.h sunriset.h print.h
++CFLAGS+=-c -Wall
++LDFLAGS+= -lm
+-SOURCES=sunwait.cpp sunriset.cpp print.cpp sunwait.h sunriset.h print.h
++SOURCES=sunwait.cpp sunriset.cpp print.cpp
  OBJECTS=$(SOURCES:.cpp=.o)
  EXECUTABLE=sunwait
  
@@ -29,11 +29,11 @@ $NetBSD: patch-Makefile,v 1.1 2019/01/16
        
  $(EXECUTABLE): $(OBJECTS)
 -      $(C) $(OBJECTS) -o $@ $(LDFLAGS)
-+      $(CC) $(OBJECTS) -o $@ $(LDFLAGS)
++      $(CXX) $(OBJECTS) -o $@ $(LDFLAGS)
  
  .cpp.o:
 -      $(C) $(CFLAGS) $< -o $@
-+      $(CC) $(CFLAGS) $< -o $@
++      $(CXX) -c $(CFLAGS) $< -o $@
  
  clean:
        rm -f *.o sunwait