Switch to Makefile.common and fix for -ldl

2 files changed, 42 insertions, 0 deletions

diff --git a/graphics/exiv2/patches/patch-configure b/graphics/exiv2/patches/patch-configure
new file mode 100644
index 00000000000..e57f16dd4db
--- /dev/null
+++ b/graphics/exiv2/patches/patch-configure
@@ -0,0 +1,15 @@
+$NetBSD: patch-configure,v 1.1 2014/06/05 07:12:53 adam Exp $
+
+Don't add -ldl for all OS; this gets auto-detected somewhere else.
+
+--- configure.orig	2014-06-05 06:53:10.000000000 +0000
++++ configure
+@@ -17069,8 +17069,6 @@ fi
+ case "$host_os" in
+ *mingw* | *cygwin*)
+     LDFLAGS="$LDFLAGS -no-undefined -lpsapi" ;;
+-*)
+-    LDFLAGS="$LDFLAGS -ldl" ;;
+ esac
+ 
+ # ---------------------------------------------------------------------------
diff --git a/graphics/exiv2/patches/patch-contrib_organize_Makefile b/graphics/exiv2/patches/patch-contrib_organize_Makefile
new file mode 100644
index 00000000000..ebee808df95
--- /dev/null
+++ b/graphics/exiv2/patches/patch-contrib_organize_Makefile
@@ -0,0 +1,27 @@
+$NetBSD: patch-contrib_organize_Makefile,v 1.1 2014/06/05 07:12:53 adam Exp $
+
+--- contrib/organize/Makefile.orig	2011-02-28 20:05:59.000000000 +0000
++++ contrib/organize/Makefile
+@@ -50,7 +50,6 @@ all: ozbin
+ # Include system configuration
+ top_srcdir = ../..
+ include $(top_srcdir)/config/config.mk
+-include boost.mk
+ 
+ # ******************************************************************************
+ # Source files
+@@ -68,12 +67,12 @@ SHELL = /bin/sh
+ 
+ .PRECIOUS: %.cpp
+ 
+-CPPFLAGS := -I$(BOOST_INC_DIR) `pkg-config exiv2 --cflags`
++CPPFLAGS += -DBOOST_FILESYSTEM_DEPRECATED -I${PREFIX}/include/boost `pkg-config exiv2 --cflags`
+ ifdef HAVE_STDINT
+ 	CPPFLAGS += -DEXV_HAVE_STDINT_H=1
+ endif
+ 
+-LDFLAGS := $(BOOST_LIBS) `pkg-config exiv2 --libs`
++LDFLAGS += -L${PREFIX}/lib -Wl,-rpath,${PREFIX}/lib -lboost_system -lboost_filesystem -lboost_regex -lboost_program_options `pkg-config exiv2 --libs`
+ 
+ OZOBJ = $(OZSRC:.cpp=.o) $(OZMAIN:.cpp=.o)
+ OZBIN = $(OZMAIN:.cpp=)