Fix building with Clang and/or Boost 1.46.0

5 files changed, 69 insertions, 22 deletions

diff --git a/graphics/exiv2-organize/Makefile b/graphics/exiv2-organize/Makefile
index bbc17720156..646e9c954ba 100644
--- a/graphics/exiv2-organize/Makefile
+++ b/graphics/exiv2-organize/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2011/02/15 19:50:53 drochner Exp $
+# $NetBSD: Makefile,v 1.8 2011/02/28 20:37:55 adam Exp $
 
 DISTNAME=	exiv2-0.21.1
 PKGNAME=	exiv2-organize-0.21.1
@@ -8,29 +8,25 @@ MASTER_SITES=	http://www.exiv2.org/
 MAINTAINER=	gdt@NetBSD.org
 HOMEPAGE=	http://www.exiv2.org/
 COMMENT=	Image metadata manipulation
-
 LICENSE=	gnu-gpl-v2
 
 PKG_DESTDIR_SUPPORT=	user-destdir
-INSTALLATION_DIRS=	bin
 
 USE_LANGUAGES=		c c++
-GCC_REQD+=		3.3
-
+USE_LIBTOOL=		yes
 USE_TOOLS+=		gmake pkg-config
 GNU_CONFIGURE=		yes
-USE_LIBTOOL=		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
 
-do-build:
-	(cd ${WRKSRC}/contrib/organize && ${MAKE_ENV} ${GMAKE})
+GCC_REQD+=		3.3
+BUILD_DIRS=		contrib/organize
+INSTALLATION_DIRS=	bin
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/contrib/organize/organize \
-	 ${DESTDIR}${PREFIX}/bin/exiv2-organize
+		${DESTDIR}${PREFIX}/bin/exiv2-organize
 
 .include "../../graphics/exiv2/buildlink3.mk"
 .include "../../devel/boost-headers/buildlink3.mk"
diff --git a/graphics/exiv2-organize/distinfo b/graphics/exiv2-organize/distinfo
index ae8f227d39a..eb7ae3b0c9b 100644
--- a/graphics/exiv2-organize/distinfo
+++ b/graphics/exiv2-organize/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.6 2011/02/15 19:50:53 drochner Exp $
+$NetBSD: distinfo,v 1.7 2011/02/28 20:37:55 adam Exp $
 
 SHA1 (exiv2-0.21.1.tar.gz) = d33e0efbad5d6a7af7f2e6d1d0beb6e7c941cfca
 RMD160 (exiv2-0.21.1.tar.gz) = 8eaddf863500c391d2d779747b24d6eb004b1d9f
 Size (exiv2-0.21.1.tar.gz) = 3004521 bytes
-SHA1 (patch-aa) = 92155f24ec6d3961c86d00ec95b90278489a0d09
+SHA1 (patch-contrib_organize_Makefile) = de74227211b79e49126178f27391831507c2948f
+SHA1 (patch-contrib_organize_organize.cpp) = ba7803e5ead1ac37003c668b0cc5a15be743a1f9
diff --git a/graphics/exiv2-organize/patches/patch-aa b/graphics/exiv2-organize/patches/patch-aa
deleted file mode 100644
index 3f72ed75b4a..00000000000
--- a/graphics/exiv2-organize/patches/patch-aa
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2009/11/30 16:47:11 joerg Exp $
-
---- contrib/organize/boost.mk.orig	2009-06-24 22:01:01.000000000 +0200
-+++ contrib/organize/boost.mk
-@@ -1,3 +1,3 @@
- # Boost configuration for organize - change paths and library names as needed
--BOOST_INC_DIR = /usr/local/include/boost-1_37
--BOOST_LIBS = /usr/local/lib/libboost_system-gcc43-mt-1_37.a /usr/local/lib/libboost_filesystem-gcc43-mt-1_37.a /usr/local/lib/libboost_regex-gcc43-mt-1_37.a /usr/local/lib/libboost_program_options-gcc43-mt-1_37.a
-+BOOST_INC_DIR = ${PREFIX}/include/boost
-+BOOST_LIBS = -L${PREFIX}/lib -Wl,-rpath,${PREFIX}/lib -lboost_system -lboost_filesystem -lboost_regex -lboost_program_options
diff --git a/graphics/exiv2-organize/patches/patch-contrib_organize_Makefile b/graphics/exiv2-organize/patches/patch-contrib_organize_Makefile
new file mode 100644
index 00000000000..a1831977ab8
--- /dev/null
+++ b/graphics/exiv2-organize/patches/patch-contrib_organize_Makefile
@@ -0,0 +1,27 @@
+$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 --git a/graphics/exiv2-organize/patches/patch-contrib_organize_organize.cpp b/graphics/exiv2-organize/patches/patch-contrib_organize_organize.cpp
new file mode 100644
index 00000000000..2b5627d1b66
--- /dev/null
+++ b/graphics/exiv2-organize/patches/patch-contrib_organize_organize.cpp
@@ -0,0 +1,33 @@
+$NetBSD: patch-contrib_organize_organize.cpp,v 1.1 2011/02/28 20:37:56 adam Exp $
+
+--- contrib/organize/organize.cpp.orig	2011-02-28 19:45:54.000000000 +0000
++++ contrib/organize/organize.cpp
+@@ -568,8 +568,8 @@ boost::regex uregex("(.*?)\\(([[:digit:]
+ 
+ fs::path uniquify(const fs::path &dest)
+ {
+-    std::string ext = dest.extension();
+-    std::string fname = dest.stem();
++    std::string ext = dest.extension().file_string();
++    std::string fname = dest.stem().file_string();
+     fs::path parent = dest.parent_path();
+ 
+     unsigned number = 1;
+@@ -658,7 +658,7 @@ void process_directory(const fs::path &d
+                         ++params.unsorted_count;
+                     }
+             
+-                    dest_file /= p_iter->filename();
++                    dest_file /= p_iter->path();
+                 
+                     if(fs::exists(dest_file)) {
+                         if(params.ignore_dups) {
+@@ -682,7 +682,7 @@ void process_directory(const fs::path &d
+                             else {
+                                 info(std::string("duplicate file: ") + p_iter->path().file_string() +
+                                     " of: " +  dest_file.file_string());
+-                                dest_file = params.dups_dir / dest_subdir / p_iter->filename();
++                                dest_file = params.dups_dir / dest_subdir / p_iter->path();
+                                 // Ugh, more dup possibilities
+                                 if(fs::exists(dest_file)) {
+                                     info(std::string("renaming: ") + p_iter->path().file_string() +