[pkgsrc/trunk]: pkgsrc/graphics Switch to Makefile.common and fix for -ldl

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6d7eec3d01f2
branches:  trunk
changeset: 635407:6d7eec3d01f2
user:      adam <adam%pkgsrc.org@localhost>
date:      Thu Jun 05 07:12:53 2014 +0000

description:
Switch to Makefile.common and fix for -ldl

diffstat:

 graphics/exiv2-organize/Makefile                                |  22 +------
 graphics/exiv2-organize/distinfo                                |   6 --
 graphics/exiv2-organize/patches/patch-contrib_organize_Makefile |  27 ----------
 graphics/exiv2/Makefile                                         |  22 +-------
 graphics/exiv2/Makefile.common                                  |  26 +++++++++
 graphics/exiv2/distinfo                                         |   4 +-
 graphics/exiv2/patches/patch-configure                          |  15 +++++
 graphics/exiv2/patches/patch-contrib_organize_Makefile          |  27 ++++++++++
 8 files changed, 78 insertions(+), 71 deletions(-)

diffs (197 lines):

diff -r 355899a6d5a0 -r 6d7eec3d01f2 graphics/exiv2-organize/Makefile
--- a/graphics/exiv2-organize/Makefile  Thu Jun 05 06:43:53 2014 +0000
+++ b/graphics/exiv2-organize/Makefile  Thu Jun 05 07:12:53 2014 +0000
@@ -1,24 +1,10 @@
-# $NetBSD: Makefile,v 1.24 2014/06/05 06:43:54 adam Exp $
+# $NetBSD: Makefile,v 1.25 2014/06/05 07:12:53 adam Exp $
 
-DISTNAME=      exiv2-0.24
-PKGNAME=       ${DISTNAME:S/exiv2/exiv2-organize/}
-CATEGORIES=    graphics
-MASTER_SITES=  http://www.exiv2.org/
+.include "../../graphics/exiv2/Makefile.common"
 
-MAINTAINER=    gdt%NetBSD.org@localhost
-HOMEPAGE=      http://www.exiv2.org/
-COMMENT=       Image metadata manipulation
-LICENSE=       gnu-gpl-v2
+PKGNAME=       ${DISTNAME:S/exiv2/exiv2-organize/}
 
-USE_LANGUAGES=         c c++
-USE_LIBTOOL=           yes
-USE_TOOLS+=            gmake pkg-config
-GNU_CONFIGURE=         yes
-# The visibility feature seems complicated and causes problems on DragonFly
-# (reported by Matt Madden) and on Gentoo (http://bugs.gentoo.org/185907).
-CONFIGURE_ARGS+=       --disable-visibility
-
-GCC_REQD+=             3.3
+USE_TOOLS+=            pkg-config
 BUILD_DIRS=            contrib/organize
 INSTALLATION_DIRS=     bin
 
diff -r 355899a6d5a0 -r 6d7eec3d01f2 graphics/exiv2-organize/distinfo
--- a/graphics/exiv2-organize/distinfo  Thu Jun 05 06:43:53 2014 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.10 2014/06/05 06:43:54 adam Exp $
-
-SHA1 (exiv2-0.24.tar.gz) = 2f19538e54f8c21c180fa96d17677b7cff7dc1bb
-RMD160 (exiv2-0.24.tar.gz) = 453247926e8626bf888578afd5a0dde42c6f6962
-Size (exiv2-0.24.tar.gz) = 4635028 bytes
-SHA1 (patch-contrib_organize_Makefile) = de74227211b79e49126178f27391831507c2948f
diff -r 355899a6d5a0 -r 6d7eec3d01f2 graphics/exiv2-organize/patches/patch-contrib_organize_Makefile
--- a/graphics/exiv2-organize/patches/patch-contrib_organize_Makefile   Thu Jun 05 06:43:53 2014 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-$NetBSD: patch-contrib_organize_Makefile,v 1.1 2011/02/28 20:37:56 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=)
diff -r 355899a6d5a0 -r 6d7eec3d01f2 graphics/exiv2/Makefile
--- a/graphics/exiv2/Makefile   Thu Jun 05 06:43:53 2014 +0000
+++ b/graphics/exiv2/Makefile   Thu Jun 05 07:12:53 2014 +0000
@@ -1,24 +1,8 @@
-# $NetBSD: Makefile,v 1.34 2014/06/05 06:43:53 adam Exp $
-
-DISTNAME=      exiv2-0.24
-CATEGORIES=    graphics
-MASTER_SITES=  http://www.exiv2.org/
-
-MAINTAINER=    gdt%NetBSD.org@localhost
-HOMEPAGE=      http://www.exiv2.org/
-COMMENT=       Image metadata manipulation
-LICENSE=       gnu-gpl-v2
+# $NetBSD: Makefile,v 1.35 2014/06/05 07:12:53 adam Exp $
 
-GCC_REQD+=             3.3
-USE_LANGUAGES=         c c++
-USE_LIBTOOL=           yes
+.include "Makefile.common"
+
 USE_PKGLOCALEDIR=      yes
-USE_TOOLS+=            gmake
-GNU_CONFIGURE=         yes
-# The visibility feature seems complicated and causes problems on DragonFly
-# (reported by Matt Madden) and on Gentoo (http://bugs.gentoo.org/185907).
-CONFIGURE_ARGS+=       --disable-visibility
-
 PKGCONFIG_OVERRIDE=    config/exiv2.pc.in
 
 .include "../../converters/libiconv/buildlink3.mk"
diff -r 355899a6d5a0 -r 6d7eec3d01f2 graphics/exiv2/Makefile.common
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/exiv2/Makefile.common    Thu Jun 05 07:12:53 2014 +0000
@@ -0,0 +1,26 @@
+# $NetBSD: Makefile.common,v 1.1 2014/06/05 07:12:53 adam Exp $
+# used by graphics/exiv2
+# used by graphics/exiv2-organizer
+
+DISTNAME=      exiv2-0.24
+CATEGORIES=    graphics
+MASTER_SITES=  http://www.exiv2.org/
+
+MAINTAINER=    gdt%NetBSD.org@localhost
+HOMEPAGE=      http://www.exiv2.org/
+COMMENT=       Image metadata manipulation
+LICENSE=       gnu-gpl-v2
+
+DISTINFO_FILE= ${.CURDIR}/../../graphics/exiv2/distinfo
+PATCHDIR=      ${.CURDIR}/../../graphics/exiv2/patches
+
+GCC_REQD+=             3.3
+USE_LANGUAGES=         c c++
+USE_LIBTOOL=           yes
+USE_TOOLS+=            gmake
+GNU_CONFIGURE=         yes
+# The visibility feature seems complicated and causes problems on DragonFly
+# (reported by Matt Madden) and on Gentoo (http://bugs.gentoo.org/185907).
+CONFIGURE_ARGS+=       --disable-visibility
+
+.include "../../textproc/expat/buildlink3.mk"
diff -r 355899a6d5a0 -r 6d7eec3d01f2 graphics/exiv2/distinfo
--- a/graphics/exiv2/distinfo   Thu Jun 05 06:43:53 2014 +0000
+++ b/graphics/exiv2/distinfo   Thu Jun 05 07:12:53 2014 +0000
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.23 2014/06/05 06:43:53 adam Exp $
+$NetBSD: distinfo,v 1.24 2014/06/05 07:12:53 adam Exp $
 
 SHA1 (exiv2-0.24.tar.gz) = 2f19538e54f8c21c180fa96d17677b7cff7dc1bb
 RMD160 (exiv2-0.24.tar.gz) = 453247926e8626bf888578afd5a0dde42c6f6962
 Size (exiv2-0.24.tar.gz) = 4635028 bytes
 SHA1 (patch-aa) = e98a4f1ae3ff2ad5ce0cd0d107ae21752a4edb45
+SHA1 (patch-configure) = 11b8d348f94eda4b84c61f34ffced54316d70a70
+SHA1 (patch-contrib_organize_Makefile) = de74227211b79e49126178f27391831507c2948f
diff -r 355899a6d5a0 -r 6d7eec3d01f2 graphics/exiv2/patches/patch-configure
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/exiv2/patches/patch-configure    Thu Jun 05 07:12:53 2014 +0000
@@ -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 -r 355899a6d5a0 -r 6d7eec3d01f2 graphics/exiv2/patches/patch-contrib_organize_Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/exiv2/patches/patch-contrib_organize_Makefile    Thu Jun 05 07:12:53 2014 +0000
@@ -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=)