- Move from graphics/gimp-ufraw to graphics/ufraw

- Update to 0.8.1
- Enable full exif support by default
- Update COMMENT and pkg-descr

PR:		ports/96821
Submitted by:	sat
Approved by:	krion (then mentor)

9 files changed, 33 insertions, 93 deletions

diff --git a/MOVED b/MOVED
index af99e1a15c28..279b2a5b9dc5 100644
--- a/MOVED
+++ b/MOVED
@@ -2361,3 +2361,4 @@ korean/firefox-ko|www/firefox-i18n|2006-06-01|Single-locale firefox l10n ports a
 devel/p5-Class-Gomor-Hash|devel/p5-Class-Gomor|2006-06-01|p5-Class-Gomor-Hash is now packaged with p5-Class-Gomor
 x11-wm/libepplet||2006-06-03|Has expired
 x11/efancylauncher||2006-06-03|Has expired
+graphics/gimp-ufraw|graphics/ufraw|2006-06-04|UFRaw is a standalone app, GIMP plug-in is only a feature
diff --git a/graphics/Makefile b/graphics/Makefile
index 841246dfd272..d3899cd5336d 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -162,7 +162,6 @@
     SUBDIR += gimp-manual-html
     SUBDIR += gimp-manual-pdf
     SUBDIR += gimp-pmosaic
-    SUBDIR += gimp-ufraw
     SUBDIR += gimp1
     SUBDIR += gimpshop
     SUBDIR += giram
@@ -601,6 +600,7 @@
     SUBDIR += truevision
     SUBDIR += tulip
     SUBDIR += uDrawGraph
+    SUBDIR += ufraw
     SUBDIR += urt
     SUBDIR += vcg
     SUBDIR += vertex
diff --git a/graphics/gimp-ufraw/Makefile b/graphics/gimp-ufraw/Makefile
deleted file mode 100644
index a92050911f34..000000000000
--- a/graphics/gimp-ufraw/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-# New ports collection makefile for:    UFRaw gimp plugin
-# Date created:         		Sun 10 Apr 2005 14:44:15 BST
-# Whom:                 		markm@FreeBSD.org
-#
-# $FreeBSD$
-
-PORTNAME=		gimp-ufraw
-PORTVERSION=		0.6
-CATEGORIES=		graphics gnome
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	ufraw
-DISTNAME=		ufraw-${PORTVERSION}
-
-MAINTAINER=		markm@FreeBSD.org
-COMMENT=		GIMP plug-in for raw digital camera image importing
-
-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
-
-CONFIGURE_ENV=		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" \
-			CFLAGS="${CFLAGS} -I ${LOCALBASE}/include"
-
-MAN1=			ufraw.1
-
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 504105
-BROKEN=			"Needs memmem(3)"
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/graphics/gimp-ufraw/distinfo b/graphics/gimp-ufraw/distinfo
deleted file mode 100644
index 55aee03a934c..000000000000
--- a/graphics/gimp-ufraw/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (ufraw-0.6.tar.gz) = 2074676b9437738630eee72b9fc6c50c
-SHA256 (ufraw-0.6.tar.gz) = 0d9557316c999e80a164ea942e08fc458177f82897039134df250d868add9540
-SIZE (ufraw-0.6.tar.gz) = 295528
diff --git a/graphics/gimp-ufraw/pkg-descr b/graphics/gimp-ufraw/pkg-descr
deleted file mode 100644
index 1869e8392f95..000000000000
--- a/graphics/gimp-ufraw/pkg-descr
+++ /dev/null
@@ -1,17 +0,0 @@
-UFRaw - Unidentified Flying Raw
-Raw photo loader plugin for The GIMP
-by udi Fuchs,
-
-UFRaw is a utility to read and manipulate raw images from digital cameras.
-It can be used by itself or as a Gimp plug-in.
-It reads raw images using Dave Coffin's raw conversion utility DCRaw.
-And it supports basic color management using Little CMS, allowing
-the user to apply color profiles.
- 
-Ufraw was originally based on the gimp plug-in by Dave Coffin
-http://www.cybercom.net/~dcoffin/
-and on Pawel T. Jochym's (jochym at ifj edu pl) plug-in.
-
-UFRaw is licensed under the GNU General Public License.
-
-WWW: http://ufraw.sourceforge.net
diff --git a/graphics/gimp-ufraw/pkg-plist b/graphics/gimp-ufraw/pkg-plist
deleted file mode 100644
index 42c0d666fa69..000000000000
--- a/graphics/gimp-ufraw/pkg-plist
+++ /dev/null
@@ -1,6 +0,0 @@
-bin/ufraw
-bin/ufraw-batch
-libexec/gimp/2.2/plug-ins/ufraw-gimp
-share/applications/ufraw.desktop
-share/pixmaps/ufraw.png
-@dirrmtry share/applications
diff --git a/graphics/ufraw/Makefile b/graphics/ufraw/Makefile
index a92050911f34..43fe2b5bfbcf 100644
--- a/graphics/ufraw/Makefile
+++ b/graphics/ufraw/Makefile
@@ -1,22 +1,23 @@
-# New ports collection makefile for:    UFRaw gimp plugin
-# Date created:         		Sun 10 Apr 2005 14:44:15 BST
-# Whom:                 		markm@FreeBSD.org
+# New ports collection makefile for:	UFRaw
+# Date created:				Sun 10 Apr 2005 14:44:15 BST
+# Whom:					markm@FreeBSD.org
 #
 # $FreeBSD$
+#
 
-PORTNAME=		gimp-ufraw
-PORTVERSION=		0.6
+PORTNAME=		ufraw
+PORTVERSION=		0.8.1
 CATEGORIES=		graphics gnome
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	ufraw
-DISTNAME=		ufraw-${PORTVERSION}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=		markm@FreeBSD.org
-COMMENT=		GIMP plug-in for raw digital camera image importing
+COMMENT=		Read and manipulate raw images from digital cameras
 
 BUILD_DEPENDS=		gimp:${PORTSDIR}/graphics/gimp
 LIB_DEPENDS=		jpeg.9:${PORTSDIR}/graphics/jpeg \
 			tiff.4:${PORTSDIR}/graphics/tiff
+RUN_DEPENDS=		${BUILD_DEPENDS}
 
 GNU_CONFIGURE=		yes
 USE_X_PREFIX=		yes
@@ -27,12 +28,21 @@ WANT_GNOME=		yes
 CONFIGURE_ENV=		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" \
 			CFLAGS="${CFLAGS} -I ${LOCALBASE}/include"
 
+.ifndef WITHOUT_EXIF
+LIB_DEPENDS+=		exif:${PORTSDIR}/graphics/libexif
+CONFIGURE_ARGS+=	--with-libexif
+.ifndef WITHOUT_EXIV2
+LIB_DEPENDS+=		exiv2:${PORTSDIR}/graphics/exiv2
+CONFIGURE_ARGS+=	--with-exiv2
+.endif
+.endif
+
 MAN1=			ufraw.1
 
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 504105
-BROKEN=			"Needs memmem(3)"
+BROKEN=		Needs memmem(3)
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/graphics/ufraw/distinfo b/graphics/ufraw/distinfo
index 55aee03a934c..d777fdb70d03 100644
--- a/graphics/ufraw/distinfo
+++ b/graphics/ufraw/distinfo
@@ -1,3 +1,3 @@
-MD5 (ufraw-0.6.tar.gz) = 2074676b9437738630eee72b9fc6c50c
-SHA256 (ufraw-0.6.tar.gz) = 0d9557316c999e80a164ea942e08fc458177f82897039134df250d868add9540
-SIZE (ufraw-0.6.tar.gz) = 295528
+MD5 (ufraw-0.8.1.tar.gz) = d79a377a5bd194c10a6db566c9e50d5c
+SHA256 (ufraw-0.8.1.tar.gz) = 9dc13e33ac9146877c3dd761c44db0b1d2302f5ff8fc017f9b92d0281673f2c6
+SIZE (ufraw-0.8.1.tar.gz) = 317793
diff --git a/graphics/ufraw/pkg-descr b/graphics/ufraw/pkg-descr
index 1869e8392f95..0aa9fef4fe78 100644
--- a/graphics/ufraw/pkg-descr
+++ b/graphics/ufraw/pkg-descr
@@ -1,17 +1,10 @@
-UFRaw - Unidentified Flying Raw
-Raw photo loader plugin for The GIMP
-by udi Fuchs,
+The Unidentified Flying Raw (UFRaw) is a utility to read and manipulate
+raw images from digital cameras. It can be used on its own or as a Gimp
+plug-in. It reads raw images using Dave Coffin's raw conversion utility
+- DCRaw. UFRaw supports basic color management using Little CMS,
+allowing the user to apply color profiles. For Nikon users UFRaw has the
+advantage that it can read the camera's tone curves. Even if you don't
+own a Nikon, you can still apply a Nikon curve to your images.
 
-UFRaw is a utility to read and manipulate raw images from digital cameras.
-It can be used by itself or as a Gimp plug-in.
-It reads raw images using Dave Coffin's raw conversion utility DCRaw.
-And it supports basic color management using Little CMS, allowing
-the user to apply color profiles.
- 
-Ufraw was originally based on the gimp plug-in by Dave Coffin
-http://www.cybercom.net/~dcoffin/
-and on Pawel T. Jochym's (jochym at ifj edu pl) plug-in.
-
-UFRaw is licensed under the GNU General Public License.
-
-WWW: http://ufraw.sourceforge.net
+Author: Udi Fuchs
+WWW: http://ufraw.sourceforge.net/