5 files changed, 27 insertions, 24 deletions

diff --git a/graphics/libexif/Makefile b/graphics/libexif/Makefile
index faf78256dcc9..65861e8d40fb 100644
--- a/graphics/libexif/Makefile
+++ b/graphics/libexif/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	libexif
-PORTVERSION=	0.5.0
-PORTREVISION=	1
+PORTVERSION=	0.5.4
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,14 +14,20 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	pschmied@qwest.net
 
 BUILD_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig
+LIB_DEPENDS=	intl.4:${PORTSDIR}/devel/gettext
 RUN_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig
 
-GNU_CONFIGURE=	yes
+USE_BZIP2=	yes
+USE_REINPLACE=	yes
+USE_LIBTOOL=	yes
+CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib -lintl"
 INSTALLS_SHLIB=	yes
 
 post-patch:
-	@${PERL} -pi -e 's|-g -Wall||g' ${WRKSRC}/configure
-	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${PERL} -pi -e \
-		's|\$$\(libdir\)/pkgconfig|\$$\(prefix\)/libdata/pkgconfig|g'
+	@${REINPLACE_CMD} -e 's|-g -Wall||g' ${WRKSRC}/configure
+	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
+		's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g'
 
 .include <bsd.port.mk>
diff --git a/graphics/libexif/distinfo b/graphics/libexif/distinfo
index 090c192629c2..9fd9b01b49b0 100644
--- a/graphics/libexif/distinfo
+++ b/graphics/libexif/distinfo
@@ -1 +1 @@
-MD5 (libexif-0.5.0.tar.gz) = 76dd5547de0f0e707d5049fe751c4679
+MD5 (libexif-0.5.4.tar.bz2) = 4586969c00a73de2b4ab399ec0c34a67
diff --git a/graphics/libexif/files/patch-configure b/graphics/libexif/files/patch-configure
new file mode 100644
index 000000000000..3b8000006bd1
--- /dev/null
+++ b/graphics/libexif/files/patch-configure
@@ -0,0 +1,10 @@
+--- configure.orig	Tue Jun 11 15:28:52 2002
++++ configure	Thu Jul 18 04:21:09 2002
+@@ -7097,6 +7097,7 @@
+ 
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+ 
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/graphics/libexif/files/patch-ltmain.sh b/graphics/libexif/files/patch-ltmain.sh
deleted file mode 100644
index e1ab2f328470..000000000000
--- a/graphics/libexif/files/patch-ltmain.sh
+++ /dev/null
@@ -1,15 +0,0 @@
---- ltmain.sh.orig	Thu Jan 10 04:26:41 2002
-+++ ltmain.sh	Sun Mar 31 04:02:01 2002
-@@ -4247,10 +4247,12 @@
- 	fi
- 
- 	# Install the pseudo-library for information purposes.
-+	if /usr/bin/false; then
- 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
- 	instname="$dir/$name"i
- 	$show "$install_prog $instname $destdir/$name"
- 	$run eval "$install_prog $instname $destdir/$name" || exit $?
-+	fi
- 
- 	# Maybe install the static library, too.
- 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/graphics/libexif/pkg-plist b/graphics/libexif/pkg-plist
index 035bc84a5ce1..00fa16ae041d 100644
--- a/graphics/libexif/pkg-plist
+++ b/graphics/libexif/pkg-plist
@@ -3,11 +3,14 @@ include/libexif/exif-content.h
 include/libexif/exif-data.h
 include/libexif/exif-entry.h
 include/libexif/exif-format.h
+include/libexif/exif-ifd.h
+include/libexif/exif-note.h
 include/libexif/exif-result.h
 include/libexif/exif-tag.h
 include/libexif/exif-utils.h
 lib/libexif.a
 lib/libexif.so
-lib/libexif.so.5
+lib/libexif.so.7
 libdata/pkgconfig/libexif.pc
-@dirrm include/libexif 
+share/locale/de/LC_MESSAGES/libexif.mo
+@dirrm include/libexif