MAke libfpx link with c++ to fix unresolved symbols.

[Niclas Rosenvik <nros%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Niclas Rosenvik <nros%NetBSD.org@localhost>
Pushed By:	nros
Date:		Thu Dec 17 14:28:01 2015 +0100
Changeset:	78e2ced5e65fb10f88ecec7eed3fdd505d0b1e51

Modified Files:
	libfpx/Makefile
	libfpx/distinfo
Added Files:
	libfpx/patches/patch-Makefile.am
Removed Files:
	libfpx/patches/patch-Makefile.in
	libfpx/patches/patch-fpxlib-config.h.in

Log Message:
MAke libfpx link with c++ to fix unresolved symbols.

libfpx is written in c++ so it must be linked using c++, with this
graphicsmagick passes all it's self tests.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=78e2ced5e65fb10f88ecec7eed3fdd505d0b1e51

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

diffstat:
 libfpx/Makefile                         |  5 +++--
 libfpx/distinfo                         |  3 +--
 libfpx/patches/patch-Makefile.am        | 22 ++++++++++++++++++++++
 libfpx/patches/patch-Makefile.in        | 13 -------------
 libfpx/patches/patch-fpxlib-config.h.in | 10 ----------
 5 files changed, 26 insertions(+), 27 deletions(-)

diffs:
diff --git a/libfpx/Makefile b/libfpx/Makefile
index d868a2a..4750692 100644
--- a/libfpx/Makefile
+++ b/libfpx/Makefile
@@ -13,12 +13,13 @@ HOMEPAGE=	http://www.imagemagick.org/
 COMMENT=	Library for reading FlashPix images
 #LICENSE=	# TODO: (see mk/license.mk)
 
-USE_TOOLS+=	autoconf
+USE_TOOLS+=	autoconf automake
 GNU_CONFIGURE=	yes
 USE_LANGUAGES=	c c++
 USE_LIBTOOL=	yes
 
 pre-configure:
-	cd ${WRKSRC} && autoconf
+	cd ${WRKSRC}; aclocal; autoheader; \
+	automake -a --foreign -i; autoconf
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/libfpx/distinfo b/libfpx/distinfo
index f4475a2..b243efd 100644
--- a/libfpx/distinfo
+++ b/libfpx/distinfo
@@ -4,11 +4,10 @@ SHA1 (libfpx-1.3.1-4.tar.xz) = ade847a583aff644d7f0441cf0404aa14bc049fd
 RMD160 (libfpx-1.3.1-4.tar.xz) = 808ec80b0127c62877685c2575779babe5af6c96
 SHA512 (libfpx-1.3.1-4.tar.xz) = 3f4510b6896d76a4f3d0aa1c6060b93e5e2783c8d7c801488f1593b20d8081fb5aa1b19475f863922a1f5c5aa22255aa70e435a2a7bace443efcae7c3e32ae3b
 Size (libfpx-1.3.1-4.tar.xz) = 1896560 bytes
-SHA1 (patch-Makefile.in) = 21c1f1b0ca1b92c8148956a321a32e812865efb0
+SHA1 (patch-Makefile.am) = 9be0f0c5dae161b3c42ebafa771b63bc5f2dcfad
 SHA1 (patch-basics_filename.cpp) = 705bb933b051437d0628809cfb1d76c66f0f2f43
 SHA1 (patch-configure.ac) = 1ca2374d5ec76ae5c351d3641926d419d5d55855
 SHA1 (patch-fpx_fpxutils.h) = 87890fdb96035808bca140b835c8c4b70346ecd5
-SHA1 (patch-fpxlib-config.h.in) = 49c4d9517cc5cafebd3cb8f9144614056fed936e
 SHA1 (patch-fpxlib.h) = 3ee9dde1db3eee5b901c8da752f5a4c19d2d95d4
 SHA1 (patch-jpeg_dllmain.c) = 31e33814feda2e78845e4a248f31d1f8196e0c58
 SHA1 (patch-ole_gen__guid.cpp) = 1a6f78f609038c5238e9d4c2fc26f5a93d655d1c
diff --git a/libfpx/patches/patch-Makefile.am b/libfpx/patches/patch-Makefile.am
new file mode 100644
index 0000000..0247a92
--- /dev/null
+++ b/libfpx/patches/patch-Makefile.am
@@ -0,0 +1,22 @@
+$NetBSD$
+* Don't install autoconf config file.
+* link using c++
+--- Makefile.am.orig	2015-12-17 12:32:11.000000000 +0000
++++ Makefile.am
+@@ -11,7 +11,7 @@ SUBDIRS = oless jpeg basics ole ri_image
+ AM_CPPFLAGS = -I$(top_srcdir)
+ 
+ # Headers which are installed
+-include_HEADERS = fpxlib.h fpxlib-config.h
++include_HEADERS = fpxlib.h
+ 
+ # Shared libraries built in this directory
+ lib_LTLIBRARIES = libfpx.la
+@@ -21,6 +21,7 @@ libfpx_la_LDFLAGS = -version-info $(MAJO
+ 
+ # Sources
+ libfpx_la_SOURCES =
++nodist_EXTRA_libfpx_la_SOURCES = dummy.cpp
+ 
+ # Convenience libraries
+ libfpx_la_LIBADD = \
diff --git a/libfpx/patches/patch-Makefile.in b/libfpx/patches/patch-Makefile.in
deleted file mode 100644
index 90976d2..0000000
--- a/libfpx/patches/patch-Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD$
-* Don't install autoconf config file.
---- Makefile.in.orig	2014-02-12 13:14:38.000000000 +0000
-+++ Makefile.in
-@@ -407,7 +407,7 @@ SUBDIRS = oless jpeg basics ole ri_image
- AM_CPPFLAGS = -I$(top_srcdir)
- 
- # Headers which are installed
--include_HEADERS = fpxlib.h fpxlib-config.h
-+include_HEADERS = fpxlib.h
- 
- # Shared libraries built in this directory
- lib_LTLIBRARIES = libfpx.la
diff --git a/libfpx/patches/patch-fpxlib-config.h.in b/libfpx/patches/patch-fpxlib-config.h.in
deleted file mode 100644
index 1649e9a..0000000
--- a/libfpx/patches/patch-fpxlib-config.h.in
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD$
-* add statvfs support, see patch-basics_filename.cpp
---- fpxlib-config.h.in.orig	2014-02-12 13:14:38.000000000 +0000
-+++ fpxlib-config.h.in
-@@ -131,3 +131,5 @@
- #ifndef __cplusplus
- #undef inline
- #endif
-+
-+#undef HAVE_SYS_STATVFS_H