From 2008be82352a11a3c856fcb104d54ecc7482a9c7 Mon Sep 17 00:00:00 2001
From: ajacoutot <ajacoutot@openbsd.org>
Date: Thu, 5 Apr 2012 12:58:14 +0000
Subject: [PATCH] Update to stable libgexiv2-0.4.1.

---
 graphics/libgexiv2/Makefile               |  6 +++---
 graphics/libgexiv2/distinfo               | 10 +++++-----
 graphics/libgexiv2/patches/patch-Makefile | 14 +++++++-------
 graphics/libgexiv2/pkg/PLIST              |  3 ++-
 4 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/graphics/libgexiv2/Makefile b/graphics/libgexiv2/Makefile
index 154d058c7db..8b0840ad618 100644
--- a/graphics/libgexiv2/Makefile
+++ b/graphics/libgexiv2/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.7 2012/02/26 15:08:36 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.8 2012/04/05 12:58:14 ajacoutot Exp $
 
 COMMENT=	GObject wrapper around exiv2
 CATEGORIES=	graphics
-DISTNAME=	libgexiv2-0.3.91
+DISTNAME=	libgexiv2-0.4.1
 
 SHARED_LIBS +=	gexiv2	1.0 # .0.0
 
@@ -14,7 +14,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 
-MASTER_SITES=	http://yorba.org/download/gexiv2/0.3/
+MASTER_SITES=	http://yorba.org/download/gexiv2/0.4/
 EXTRACT_SUFX=	.tar.bz2
 
 USE_LIBTOOL=	Yes
diff --git a/graphics/libgexiv2/distinfo b/graphics/libgexiv2/distinfo
index 35c60c512f3..02a229da351 100644
--- a/graphics/libgexiv2/distinfo
+++ b/graphics/libgexiv2/distinfo
@@ -1,5 +1,5 @@
-MD5 (libgexiv2-0.3.91.tar.bz2) = T+mR/NDwYSM5HiDtknlHKw==
-RMD160 (libgexiv2-0.3.91.tar.bz2) = bFxi5wGhvpHMQiV4KZbVCytkJ0c=
-SHA1 (libgexiv2-0.3.91.tar.bz2) = 1kZlQYJ1hlJgO5MzhUQFiKw1h/4=
-SHA256 (libgexiv2-0.3.91.tar.bz2) = BdMg7oAh5OQFE/YzEJGKPkj6uilHqEYVdWZIYzDRGhU=
-SIZE (libgexiv2-0.3.91.tar.bz2) = 25097
+MD5 (libgexiv2-0.4.1.tar.bz2) = BV7/5whlLwx0QKPe8GBH2g==
+RMD160 (libgexiv2-0.4.1.tar.bz2) = WhPvFkaZam5YlWvjTh7Is0tjkME=
+SHA1 (libgexiv2-0.4.1.tar.bz2) = t0zRmkz0pKMqk47LJnl0wp5jDcI=
+SHA256 (libgexiv2-0.4.1.tar.bz2) = xR6Lrn5ThmtHS1Hk7vGbmDhfvq8u2sKu/X0k7T99nW4=
+SIZE (libgexiv2-0.4.1.tar.bz2) = 25484
diff --git a/graphics/libgexiv2/patches/patch-Makefile b/graphics/libgexiv2/patches/patch-Makefile
index 9654eaed3ba..5f109ad11d1 100644
--- a/graphics/libgexiv2/patches/patch-Makefile
+++ b/graphics/libgexiv2/patches/patch-Makefile
@@ -1,7 +1,7 @@
-$OpenBSD: patch-Makefile,v 1.4 2012/02/26 15:08:36 ajacoutot Exp $
---- Makefile.orig	Mon Feb 13 22:09:13 2012
-+++ Makefile	Sun Feb 26 15:12:31 2012
-@@ -123,7 +123,7 @@ vapi: $(VAPI_FILE)
+$OpenBSD: patch-Makefile,v 1.5 2012/04/05 12:58:14 ajacoutot Exp $
+--- Makefile.orig	Thu Mar 29 00:41:52 2012
++++ Makefile	Thu Apr  5 14:36:16 2012
+@@ -137,7 +137,7 @@ vapi: $(VAPI_FILE)
  .PHONY: install
  install:
  	@mkdir -p $(DESTDIR)$(PREFIX)/$(LIB)
@@ -10,7 +10,7 @@ $OpenBSD: patch-Makefile,v 1.4 2012/02/26 15:08:36 ajacoutot Exp $
  	@mkdir -p $(DESTDIR)$(PREFIX)/include/$(PKGNAME)
  	$(INSTALL_DATA) $(EXPANDED_INSTALLED_HEADER_FILES) $(DESTDIR)$(PREFIX)/include/$(PKGNAME)
  	@mkdir -p $(DESTDIR)$(PREFIX)/$(LIB)/pkgconfig
-@@ -136,7 +136,7 @@ install-vapi:
+@@ -150,7 +150,7 @@ install-vapi:
  	$(INSTALL_DATA) $(VAPI_FILE) $(DESTDIR)$(PREFIX)/share/vala/vapi
  
  uninstall:
@@ -19,7 +19,7 @@ $OpenBSD: patch-Makefile,v 1.4 2012/02/26 15:08:36 ajacoutot Exp $
  	rm -rf $(DESTDIR)$(PREFIX)/include/$(PKGNAME)
  	rm -f $(DESTDIR)$(PREFIX)/$(LIB)/pkgconfig/$(PKGNAME).pc
  	rm -f $(DESTDIR)$(PREFIX)/share/vala/vapi/$(PKGNAME).vapi
-@@ -148,13 +148,13 @@ $(VAPI_FILE): $(EXPANDED_VAPI_INPUT) $(DESTDIR_HEADER_
+@@ -162,13 +162,13 @@ $(VAPI_FILE): $(EXPANDED_VAPI_INPUT) $(DESTDIR_HEADER_
  	vapigen --library=$(PKGNAME) --metadatadir=vapi vapi/$(PKGNAME).gi
  
  $(PC_FILE): $(PC_INPUT) Makefile $(CONFIG_IN)
@@ -33,6 +33,6 @@ $OpenBSD: patch-Makefile,v 1.4 2012/02/26 15:08:36 ajacoutot Exp $
 +	${LIBTOOL} --mode=compile --tag=CC $(CXX) -c $(EXT_PKGS_CFLAGS) $(CFLAGS) -I. -o $@ $<
  
  $(LIBRARY_BIN): $(EXPANDED_OBJ_FILES)
--	libtool --mode=link --tag=CC $(CXX) -rpath $(PREFIX)/$(LIB) $(EXPANDED_LO_FILES) $(EXT_PKGS_LDFLAGS) $(CFLAGS) $(LDFLAGS) -o $(LIBRARY_BIN)
+-	libtool --mode=link --tag=CC $(CXX) -rpath $(PREFIX)/$(LIB) $(EXPANDED_LO_FILES) $(EXT_PKGS_LDFLAGS) $(CFLAGS) $(LDFLAGS) -version-info $(VERSION_INFO) -o $(LIBRARY_BIN)
 +	${LIBTOOL} --mode=link --tag=CC $(CXX) -rpath $(PREFIX)/$(LIB) $(EXPANDED_LO_FILES) $(EXT_PKGS_LDFLAGS) $(CFLAGS) $(LDFLAGS) -o $(LIBRARY_BIN)
  
diff --git a/graphics/libgexiv2/pkg/PLIST b/graphics/libgexiv2/pkg/PLIST
index 976f45f0416..fd446086a14 100644
--- a/graphics/libgexiv2/pkg/PLIST
+++ b/graphics/libgexiv2/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.2 2011/10/28 21:58:48 jasper Exp $
+@comment $OpenBSD: PLIST,v 1.3 2012/04/05 12:58:14 ajacoutot Exp $
 %%SHARED%%
 include/gexiv2/
 include/gexiv2/gexiv2-log.h
@@ -6,6 +6,7 @@ include/gexiv2/gexiv2-managed-stream.h
 include/gexiv2/gexiv2-metadata.h
 include/gexiv2/gexiv2-preview-image.h
 include/gexiv2/gexiv2-preview-properties.h
+include/gexiv2/gexiv2-startup.h
 include/gexiv2/gexiv2.h
 lib/libgexiv2.a
 lib/libgexiv2.la