Upgrade to version 0.5. This is autoconfiged, so builds easier, and

has slightly better Nikon support.

6 files changed, 30 insertions, 43 deletions

diff --git a/graphics/ufraw/Makefile b/graphics/ufraw/Makefile
index add65a9e5255..615199ce404d 100644
--- a/graphics/ufraw/Makefile
+++ b/graphics/ufraw/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=		gimp-ufraw
-PORTVERSION=		0.4
+PORTVERSION=		0.5
 CATEGORIES=		graphics gnome
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	ufraw
@@ -18,11 +18,21 @@ BUILD_DEPENDS=		gimp:${PORTSDIR}/graphics/gimp
 LIB_DEPENDS=		jpeg.9:${PORTSDIR}/graphics/jpeg \
 			tiff.4:${PORTSDIR}/graphics/tiff
 
+GNU_CONFIGURE=		yes
 USE_X_PREFIX=		yes
 USE_GMAKE=		yes
 USE_GNOME=		glib20 gnomehack intltool intlhack gtk20 libartlgpl2
 WANT_GNOME=		yes
-ALL_TARGET=		build
-INSTALL_TARGET=		install-admin
 
-.include <bsd.port.mk>
+CONFIGURE_ENV=		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" \
+			CFLAGS="${CFLAGS} -I ${LOCALBASE}/include"
+
+MAN1=			ufraw.1
+
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} <= 600000
+BROKEN=			"Needs memmem(3)"
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/graphics/ufraw/distinfo b/graphics/ufraw/distinfo
index 03205c5cf177..65c9e0b69e75 100644
--- a/graphics/ufraw/distinfo
+++ b/graphics/ufraw/distinfo
@@ -1,2 +1,2 @@
-MD5 (ufraw-0.4.tar.gz) = c66a2498b3fb74eef6f3b7ce5477d44a
-SIZE (ufraw-0.4.tar.gz) = 101409
+MD5 (ufraw-0.5.tar.gz) = ffb0ac06e226b8412afcbfa7f242d87b
+SIZE (ufraw-0.5.tar.gz) = 284234
diff --git a/graphics/ufraw/files/patch-Makefile b/graphics/ufraw/files/patch-Makefile
deleted file mode 100644
index 9a5f5a0deadc..000000000000
--- a/graphics/ufraw/files/patch-Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
---- ./Makefile.orig	Tue Apr 19 23:53:14 2005
-+++ ./Makefile	Tue Apr 19 23:56:49 2005
-@@ -17,7 +17,7 @@
- 	OBJECTS := $(filter-out dcraw.o,$(OBJECTS))
- endif
- CC = gcc
--CFLAGS += -std=gnu99 -DUFRAW_VERSION='"$(VER)"'
-+CFLAGS += -std=gnu99 -DUFRAW_VERSION='"$(VER)"' -I/usr/local/include
- # To check that deprecated features are not used:
- #CFLAGS += -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED
- LDFLAGS += -llcms
-@@ -91,12 +91,12 @@
- ifdef UFRAW_NO_JPEG
- 	CFLAGS += -DNO_JPEG
- else
--	LDFLAGS += -ljpeg
-+	LDFLAGS += -L/usr/local/lib -ljpeg
- endif
- ifdef UFRAW_NO_TIFF
- 	CFLAGS += -DNO_TIFF
- else
--	LDFLAGS += -ltiff
-+	LDFLAGS += -L/usr/local/lib -ltiff
- endif
- ifdef UFRAW_NO_ZLIB
- 	CFLAGS += -DNO_ZLIB
diff --git a/graphics/ufraw/files/patch-dcraw.c b/graphics/ufraw/files/patch-dcraw.c
new file mode 100644
index 000000000000..8d15431aca02
--- /dev/null
+++ b/graphics/ufraw/files/patch-dcraw.c
@@ -0,0 +1,11 @@
+--- dcraw.c.orig	Thu Sep 15 19:24:38 2005
++++ dcraw.c	Thu Oct 27 21:16:01 2005
+@@ -188,7 +188,7 @@
+ 	3 G R G R G R	3 B G B G B G	3 R G R G R G	3 G B G B G B
+  */
+ 
+-#ifndef __GLIBC__
++#if !defined(__GLIBC__) && !defined(__FreeBSD__)
+ char *memmem (char *haystack, size_t haystacklen,
+ 	      char *needle, size_t needlelen)
+ {
diff --git a/graphics/ufraw/files/patch-ufraw__ufraw.c b/graphics/ufraw/files/patch-ufraw__ufraw.c
deleted file mode 100644
index a5e6eb1b13f7..000000000000
--- a/graphics/ufraw/files/patch-ufraw__ufraw.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./ufraw_ufraw.c.orig	Sun Apr 10 15:19:43 2005
-+++ ./ufraw_ufraw.c	Sun Apr 10 15:20:06 2005
-@@ -123,7 +123,7 @@
-         for (i=0; i<cfg->curveCount; i++)
-             cfg->curve[i].black = cfg_default.curve[0].black;
-     }
--    if (cfg->exposureLoad==load_auto) cfg->exposure = nan("");
-+    if (cfg->exposureLoad==load_auto) cfg->exposure = __builtin_nanf("");
- 
-     if (image==NULL) return UFRAW_SUCCESS;
- 
diff --git a/graphics/ufraw/pkg-plist b/graphics/ufraw/pkg-plist
index d442c57bee0d..0eaa10f5d10b 100644
--- a/graphics/ufraw/pkg-plist
+++ b/graphics/ufraw/pkg-plist
@@ -1,2 +1,5 @@
 bin/ufraw
+bin/ufraw-batch
 libexec/gimp/2.2/plug-ins/ufraw-gimp
+share/applications/ufraw.desktop
+share/pixmaps/ufraw.png