Make freeimage and freeimageplus use the c++ copiler for linking and remove

linking to stdc++.
This will make them use the right runtime library, not all compilers
use stdc++.

3 files changed, 22 insertions, 14 deletions

diff --git a/graphics/freeimage/distinfo b/graphics/freeimage/distinfo
index 370dde53306..8931cee9388 100644
--- a/graphics/freeimage/distinfo
+++ b/graphics/freeimage/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.4 2017/02/20 08:00:42 snj Exp $
+$NetBSD: distinfo,v 1.5 2017/07/08 08:08:25 nros Exp $
 
 SHA1 (FreeImage3170.zip) = 6752c83798c2f81dee71a2e8bb11657068672669
 RMD160 (FreeImage3170.zip) = c4e87846098327ee346c49ae81b6036f6d9ab36d
 SHA512 (FreeImage3170.zip) = 703c2626c0bcfe73eb40d720f45745208ca9650a7730759680a2b38ad3f6c719a43008477032bc70b76a95761f7d4b6f901b961359d36b54ace906dd78fb391b
 Size (FreeImage3170.zip) = 7020636 bytes
-SHA1 (patch-Makefile) = 719f3539d1e841761c8cf442634d71e792ea7231
-SHA1 (patch-Makefile.fip) = 3a8bdc29a2249b5cb9e30ccfcc25eb6be99755d9
+SHA1 (patch-Makefile) = 196331f954913d5b49ae1e2464fb356a26212168
+SHA1 (patch-Makefile.fip) = c12dd636f83f774a11c91c4e3373176fd27e562d
 SHA1 (patch-Source_FreeImage_PluginPCX.cpp) = 26853626d1dc6a52804f946fd0576269de380512
 SHA1 (patch-Source_FreeImage_PluginXPM.cpp) = eac7be24c3d64593feebdb548df8a404db66c113
 SHA1 (patch-Source_LibOpenJPEG_opj__malloc.h) = 4ba7924e5ce04b98c9c249bc31df600b7fbdcde3
diff --git a/graphics/freeimage/patches/patch-Makefile b/graphics/freeimage/patches/patch-Makefile
index 3753daaea1b..7d67771d43c 100644
--- a/graphics/freeimage/patches/patch-Makefile
+++ b/graphics/freeimage/patches/patch-Makefile
@@ -1,7 +1,7 @@
-$NetBSD: patch-Makefile,v 1.1 2015/02/12 22:40:05 snj Exp $
-
---- Makefile.gnu.orig	2014-03-16 00:02:08.000000000 -0700
-+++ Makefile.gnu	2015-02-12 02:12:58.000000000 -0800
+$NetBSD: patch-Makefile,v 1.2 2017/07/08 08:08:25 nros Exp $
+* use c++ for linking instead of linking with stdc++
+--- Makefile.gnu.orig	2015-03-08 17:04:00.000000000 +0000
++++ Makefile.gnu
 @@ -5,8 +5,8 @@ include Makefile.srcs
  
  # General configuration variables:
@@ -26,8 +26,12 @@ $NetBSD: patch-Makefile,v 1.1 2015/02/12 22:40:05 snj Exp $
  
  TARGET  = freeimage
  STATICLIB = lib$(TARGET).a
-@@ -69,10 +67,9 @@ $(SHAREDLIB): $(MODULES)
- 	$(CC) -s -shared -Wl,-soname,$(VERLIBNAME) $(LDFLAGS) -o $@ $(MODULES) $(LIBRARIES)
+@@ -67,13 +65,12 @@ $(STATICLIB): $(MODULES)
+ 	$(AR) r $@ $(MODULES)
+ 
+ $(SHAREDLIB): $(MODULES)
+-	$(CC) -s -shared -Wl,-soname,$(VERLIBNAME) $(LDFLAGS) -o $@ $(MODULES) $(LIBRARIES)
++	$(CXX) -s -shared -Wl,-soname,$(VERLIBNAME) $(LDFLAGS) -o $@ $(MODULES)
  
  install:
 -	install -d $(INCDIR) $(INSTALLDIR)
diff --git a/graphics/freeimage/patches/patch-Makefile.fip b/graphics/freeimage/patches/patch-Makefile.fip
index 23d89054d17..a1d8f0a24ae 100644
--- a/graphics/freeimage/patches/patch-Makefile.fip
+++ b/graphics/freeimage/patches/patch-Makefile.fip
@@ -1,6 +1,6 @@
-$NetBSD: patch-Makefile.fip,v 1.1 2015/05/27 21:59:26 markd Exp $
-
---- Makefile.fip.orig	2015-03-08 05:03:56.000000000 +0000
+$NetBSD: patch-Makefile.fip,v 1.2 2017/07/08 08:08:25 nros Exp $
+* use c++ for linking instead of linking with stdc++
+--- Makefile.fip.orig	2015-03-08 17:03:56.000000000 +0000
 +++ Makefile.fip
 @@ -5,8 +5,8 @@ include fipMakefile.srcs
  
@@ -26,8 +26,12 @@ $NetBSD: patch-Makefile.fip,v 1.1 2015/05/27 21:59:26 markd Exp $
  
  TARGET  = freeimageplus
  STATICLIB = lib$(TARGET).a
-@@ -71,11 +69,9 @@ $(SHAREDLIB): $(MODULES)
- 	$(CC) -s -shared -Wl,-soname,$(VERLIBNAME) $(LDFLAGS) -o $@ $(MODULES) $(LIBRARIES)
+@@ -68,14 +66,12 @@ $(STATICLIB): $(MODULES)
+ 	$(AR) r $@ $(MODULES)
+ 
+ $(SHAREDLIB): $(MODULES)
+-	$(CC) -s -shared -Wl,-soname,$(VERLIBNAME) $(LDFLAGS) -o $@ $(MODULES) $(LIBRARIES)
++	$(CXX) -s -shared -Wl,-soname,$(VERLIBNAME) $(LDFLAGS) -o $@ $(MODULES)
  
  install:
 -	install -d $(INCDIR) $(INSTALLDIR)