Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 5 Feb 2014 21:58:30 +0000 (UTC)
From:      Matthias Andree <mandree@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r342870 - in head/graphics/ufraw: . files
Message-ID:  <201402052158.s15LwUi2064210@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mandree
Date: Wed Feb  5 21:58:29 2014
New Revision: 342870
URL: http://svnweb.freebsd.org/changeset/ports/342870
QAT: https://qat.redports.org/buildarchive/r342870/

Log:
  Modernize (LIB_DEPENDS, USES).
  Support staging.
  
  Add a patch that allows building with a strict-conformance C++11
  compiler.
  
  Approved by:	portmgr (implicit, under "just fix it" blanket approval)

Added:
  head/graphics/ufraw/files/
  head/graphics/ufraw/files/patch-dcraw.cc   (contents, props changed)
Modified:
  head/graphics/ufraw/Makefile
  head/graphics/ufraw/pkg-descr
  head/graphics/ufraw/pkg-plist

Modified: head/graphics/ufraw/Makefile
==============================================================================
--- head/graphics/ufraw/Makefile	Wed Feb  5 21:56:01 2014	(r342869)
+++ head/graphics/ufraw/Makefile	Wed Feb  5 21:58:29 2014	(r342870)
@@ -12,22 +12,19 @@ COMMENT=	Read and manipulate raw images 
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	jpeg:${PORTSDIR}/graphics/jpeg \
-		tiff:${PORTSDIR}/graphics/tiff \
-		png15:${PORTSDIR}/graphics/png \
-		lcms:${PORTSDIR}/graphics/lcms
+LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg \
+		libtiff.so:${PORTSDIR}/graphics/tiff \
+		libpng15.so:${PORTSDIR}/graphics/png \
+		liblcms.so:${PORTSDIR}/graphics/lcms
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-silent-rules --enable-extras
-USES=		gettext pkgconfig
-USE_GMAKE=	yes
+USES=		gettext pkgconfig gmake
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 PC_FALSE=	cinepaint
 
-MAN1=		ufraw.1
-
 OPTIONS_DEFINE=	CONTRAST DST EXIV2 LENSFUN FITS GIMP GTK2 GNOME
 OPTIONS_DEFAULT=CONTRAST EXIV2 LENSFUN GTK2
 
@@ -36,7 +33,6 @@ DST_DESC=	Use local time for timestamps
 FITS_DESC=	FITS output support
 GIMP_DESC=	Install GIMP plugin
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MCONTRAST}
@@ -84,7 +80,8 @@ CONFIGURE_ARGS+=--without-gtk
 
 .if ${PORT_OPTIONS:MGNOME}
 CATEGORIES+=	gnome
-USE_GNOME=	desktopfileutils gconf2
+USE_GNOME=	gconf2
+USES+=		desktop-file-utils
 CONFIGURE_ARGS+=	--enable-mime
 GCONF_SCHEMAS=	${PORTNAME}.schemas
 PLIST_SUB+=	GNOME=""
@@ -109,12 +106,4 @@ pre-build:
 	@${INSTALL_SCRIPT} ${LOCALBASE}/share/icu/50.1.2/mkinstalldirs \
 		${WRKSRC}
 
-post-install:
-.if ${PORT_OPTIONS:MGNOME}
-	@${SETENV} GCONF_CONFIG_SOURCE=${GCONF_CONFIG_SOURCE} \
-		gconftool-2 --makefile-install-rule \
-		${PREFIX}/etc/gconf/schemas/${PORTNAME}.schemas
-	@-update-desktop-database
-.endif
-
 .include <bsd.port.mk>

Added: head/graphics/ufraw/files/patch-dcraw.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/ufraw/files/patch-dcraw.cc	Wed Feb  5 21:58:29 2014	(r342870)
@@ -0,0 +1,11 @@
+--- ./dcraw.cc.orig	2013-03-20 03:31:38.000000000 +0100
++++ ./dcraw.cc	2014-02-05 22:11:28.000000000 +0100
+@@ -9269,7 +9269,7 @@
+   strncpy (th->desc, desc, 512);
+   strncpy (th->make, make, 64);
+   strncpy (th->model, model, 64);
+-  strcpy (th->soft, "dcraw v"DCRAW_VERSION);
++  strcpy (th->soft, "dcraw v" DCRAW_VERSION);
+   t = localtime (&timestamp);
+   sprintf (th->date, "%04d:%02d:%02d %02d:%02d:%02d",
+       t->tm_year+1900,t->tm_mon+1,t->tm_mday,t->tm_hour,t->tm_min,t->tm_sec);

Modified: head/graphics/ufraw/pkg-descr
==============================================================================
--- head/graphics/ufraw/pkg-descr	Wed Feb  5 21:56:01 2014	(r342869)
+++ head/graphics/ufraw/pkg-descr	Wed Feb  5 21:58:29 2014	(r342870)
@@ -6,4 +6,4 @@ apply color profiles.  For Nikon users U
 read the camera's tone curves.  Even if you don't own a Nikon, you can still
 apply a Nikon curve to your images.
 
-WWW:	http://ufraw.sourceforge.net/
+WWW: http://ufraw.sourceforge.net/

Modified: head/graphics/ufraw/pkg-plist
==============================================================================
--- head/graphics/ufraw/pkg-plist	Wed Feb  5 21:56:01 2014	(r342869)
+++ head/graphics/ufraw/pkg-plist	Wed Feb  5 21:58:29 2014	(r342870)
@@ -2,6 +2,7 @@ bin/nikon-curve
 bin/ufraw-batch
 bin/ufraw-dcraw
 %%GIMP%%libexec/gimp/2.2/plug-ins/ufraw-gimp
+man/man1/ufraw.1.gz
 share/applications/ufraw.desktop
 share/locale/ca/LC_MESSAGES/ufraw.mo
 share/locale/cs/LC_MESSAGES/ufraw.mo



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201402052158.s15LwUi2064210>