[pkgsrc/trunk]: pkgsrc/converters/dsk2rom Don't try to build header files. Fi...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/602bd65920f0
branches:  trunk
changeset: 419553:602bd65920f0
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Sat Dec 21 23:30:21 2019 +0000

description:
Don't try to build header files. Fix C/C++ interaction.

diffstat:

 converters/dsk2rom/distinfo                          |   6 +++---
 converters/dsk2rom/patches/patch-Makefile            |  11 +++++++----
 converters/dsk2rom/patches/patch-pletter_pletter.cpp |  12 +++++++++++-
 3 files changed, 21 insertions(+), 8 deletions(-)

diffs (74 lines):

diff -r 2989b55d75bd -r 602bd65920f0 converters/dsk2rom/distinfo
--- a/converters/dsk2rom/distinfo       Sat Dec 21 23:29:04 2019 +0000
+++ b/converters/dsk2rom/distinfo       Sat Dec 21 23:30:21 2019 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.1 2018/08/13 15:53:49 nia Exp $
+$NetBSD: distinfo,v 1.2 2019/12/21 23:30:21 joerg Exp $
 
 SHA1 (dsk2rom-0.80.tar.gz) = ed1ff7e18f9698cc1141197cb188de326a38b7b0
 RMD160 (dsk2rom-0.80.tar.gz) = 0d32fe2519013a77e6b28e0c4e833afc101fd6d8
 SHA512 (dsk2rom-0.80.tar.gz) = 846736ee6a552eaef48bfae76a123ec1dda4304f7e5ab09a5c70c939a1586c29b976e6cb55de0f75ed61e98be323f4be540ee5c4c172f5d5822c351406874fc2
 Size (dsk2rom-0.80.tar.gz) = 28727 bytes
-SHA1 (patch-Makefile) = e81bc8fbfe9dc02d82d216ccc57e3a36883eb7b4
-SHA1 (patch-pletter_pletter.cpp) = f478b46342b598af14e09a2cde8bcb762d9589e8
+SHA1 (patch-Makefile) = b3e27f2343af67b7bf3aa1f1488389e40887c9ad
+SHA1 (patch-pletter_pletter.cpp) = 2dd14d10119c1e5311db258de403ec653208ca42
diff -r 2989b55d75bd -r 602bd65920f0 converters/dsk2rom/patches/patch-Makefile
--- a/converters/dsk2rom/patches/patch-Makefile Sat Dec 21 23:29:04 2019 +0000
+++ b/converters/dsk2rom/patches/patch-Makefile Sat Dec 21 23:30:21 2019 +0000
@@ -1,11 +1,11 @@
-$NetBSD: patch-Makefile,v 1.1 2018/08/13 15:53:49 nia Exp $
+$NetBSD: patch-Makefile,v 1.2 2019/12/21 23:30:21 joerg Exp $
 
 Use native compiler for producing build executable, and
 CFLAGS from pkgsrc.
 
 --- Makefile.orig      2007-05-27 11:45:09.000000000 +0000
 +++ Makefile
-@@ -8,13 +8,10 @@ dsk2rom_e = dsk2rom
+@@ -8,21 +8,20 @@ dsk2rom_e = dsk2rom
  bin2h_e   = bin2h
  endif
  
@@ -20,11 +20,14 @@
  
  pletter/pletter.o: pletter/pletter.cpp pletter/pletter.h
  
-@@ -22,7 +19,7 @@ dsk2rom.h: bin2h
+ dsk2rom.h: bin2h
        $(shell ./${bin2h_e} dsk2rom dsk2rom.rom dsk2rom.h)
  
- dsk2rom: dsk2rom.c dsk2rom.h pletter/pletter.o
+-dsk2rom: dsk2rom.c dsk2rom.h pletter/pletter.o
 -      $(CC) $(CFLAGS) $^ -o $(dsk2rom_e)
++dsk2rom.o: dsk2rom.c dsk2rom.h
++
++dsk2rom: dsk2rom.o pletter/pletter.o
 +      $(CXX) $(CFLAGS) $(LDFLAGS) $^ -o $(dsk2rom_e)
  
  clean:
diff -r 2989b55d75bd -r 602bd65920f0 converters/dsk2rom/patches/patch-pletter_pletter.cpp
--- a/converters/dsk2rom/patches/patch-pletter_pletter.cpp      Sat Dec 21 23:29:04 2019 +0000
+++ b/converters/dsk2rom/patches/patch-pletter_pletter.cpp      Sat Dec 21 23:30:21 2019 +0000
@@ -1,6 +1,7 @@
-$NetBSD: patch-pletter_pletter.cpp,v 1.1 2018/08/13 15:53:49 nia Exp $
+$NetBSD: patch-pletter_pletter.cpp,v 1.2 2019/12/21 23:30:21 joerg Exp $
 
 Add missing includes.
+pletter is called from C code.
 
 --- pletter/pletter.cpp.orig   2007-05-27 11:18:42.000000000 +0000
 +++ pletter/pletter.cpp
@@ -14,3 +15,12 @@
  #include <string>
  using namespace std;
  
+@@ -306,7 +309,7 @@ int main(int argc, char *argv[]) {
+ 
+ //-----------------------------------------------------------------------------
+ 
+-void pletter( unsigned char*  input,  int  input_length,
++extern "C" void pletter( unsigned char*  input,  int  input_length,
+             unsigned char** output, int* output_length,
+             int pletmode  )
+ {