Index: branches/2015Q2/graphics/ufraw/Makefile =================================================================== --- branches/2015Q2/graphics/ufraw/Makefile (revision 386388) +++ branches/2015Q2/graphics/ufraw/Makefile (revision 386389) @@ -1,101 +1,100 @@ # Created by: Mark Murray # $FreeBSD$ PORTNAME= ufraw -PORTVERSION= 0.19.2 -PORTREVISION= 6 +PORTVERSION= 0.21 CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} MAINTAINER= rodrigo@FreeBSD.org COMMENT= Read and manipulate raw images from various digital cameras LICENSE= GPLv2 LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \ libtiff.so:${PORTSDIR}/graphics/tiff \ libpng.so:${PORTSDIR}/graphics/png \ liblcms.so:${PORTSDIR}/graphics/lcms GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-silent-rules --enable-extras USES= gettext pkgconfig gmake desktop-file-utils CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -lpthread -L${LOCALBASE}/lib PC_FALSE= cinepaint OPTIONS_DEFINE= CONTRAST DST EXIV2 LENSFUN FITS GIMP GTK2 GNOME OPTIONS_DEFAULT=CONTRAST EXIV2 LENSFUN GTK2 CONTRAST_DESC= Enable contrast setting option DST_DESC= Use local time for timestamps FITS_DESC= FITS output support GIMP_DESC= Install GIMP plugin .include .if ${PORT_OPTIONS:MCONTRAST} CONFIGURE_ARGS+= --enable-contrast .endif .if ${PORT_OPTIONS:MDST} CONFIGURE_ARGS+= --enable-dst-correction .endif .if ${PORT_OPTIONS:MEXIV2} LIB_DEPENDS+= libexiv2.so:${PORTSDIR}/graphics/exiv2 .else PC_FALSE+= exiv2 .endif .if ${PORT_OPTIONS:MLENSFUN} LIB_DEPENDS+= liblensfun.so:${PORTSDIR}/graphics/lensfun .else PC_FALSE+= lensfun .endif .if ${PORT_OPTIONS:MFITS} LIB_DEPENDS+= libcfitsio.so:${PORTSDIR}/astro/cfitsio .else PC_FALSE+= cfitsio .endif .if ${PORT_OPTIONS:MGIMP} LIB_DEPENDS+= libgimp-2.0.so:${PORTSDIR}/graphics/gimp-app PLIST_SUB+= GIMP="" .else CONFIGURE_ARGS+=--without-gimp PC_FALSE+= gimp PLIST_SUB+= GIMP="@comment " .endif .if ${PORT_OPTIONS:MGTK2} LIB_DEPENDS+= libgtkimageview.so:${PORTSDIR}/x11-toolkits/gtkimageview PLIST_SUB+= MGTK2="" .else PLIST_SUB+= MGTK2="@comment " CONFIGURE_ARGS+=--without-gtk .endif .if ${PORT_OPTIONS:MGNOME} CATEGORIES+= gnome USE_GNOME= gconf2 CONFIGURE_ARGS+= --enable-mime GCONF_SCHEMAS= ${PORTNAME}.schemas .endif post-patch: @${REINPLACE_CMD} -e '18s|^$$|#include |' \ ${WRKSRC}/dcraw.h # Fix GConf2 schemas installation path; unconditionalize installation of # .desktop file; avoid conflict with `graphics/dcraw' (rename the binary) @${REINPLACE_CMD} -e '/@schemasdir/s|datadir|sysconfdir| ; \ /@app/s|@INSTALL_MIME_TRUE@|| ; \ s|dcraw\$$(EXEEXT)|${PORTNAME}-&|' ${WRKSRC}/Makefile.in .for i in ${PC_FALSE} @${REINPLACE_CMD} -e '/PKG_CONFIG.*${i}/s|$$PKG_CONFIG|${FALSE}|' \ ${WRKSRC}/configure .endfor .include Index: branches/2015Q2/graphics/ufraw/distinfo =================================================================== --- branches/2015Q2/graphics/ufraw/distinfo (revision 386388) +++ branches/2015Q2/graphics/ufraw/distinfo (revision 386389) @@ -1,2 +1,2 @@ -SHA256 (ufraw-0.19.2.tar.gz) = 73befe9f16f015a8c0f26cef3bb2e17cac9ae64aef2ade48c29aedb1ee51abd3 -SIZE (ufraw-0.19.2.tar.gz) = 980934 +SHA256 (ufraw-0.21.tar.gz) = 2a6a1bcc633bdc8e15615cf726befcd7f27ab00e7c2a518469a24e1a96964d87 +SIZE (ufraw-0.21.tar.gz) = 1016298 Index: branches/2015Q2/graphics/ufraw/files/patch-ufraw.h =================================================================== --- branches/2015Q2/graphics/ufraw/files/patch-ufraw.h (revision 386388) +++ branches/2015Q2/graphics/ufraw/files/patch-ufraw.h (nonexistent) @@ -1,24 +0,0 @@ ---- ufraw.h.orig 2014-01-11 11:04:08.000000000 -0800 -+++ ufraw.h 2014-01-11 11:04:54.000000000 -0800 -@@ -41,6 +41,10 @@ - /* An impossible value for conf float values */ - #define NULLF -10000.0 - -+#ifdef __cplusplus -+extern "C" { -+#endif // __cplusplus -+ - /* Options, like auto-adjust buttons can be in 3 states. Enabled and disabled - * are obvious. Apply means that the option was selected and some function - * has to act accourdingly, before changing to one of the first two states */ -@@ -78,10 +82,6 @@ extern UFName ufRawImage; - extern UFName ufRawResources; - extern UFName ufCommandLine; - --#ifdef __cplusplus --extern "C" { --#endif // __cplusplus -- - UFObject *ufraw_image_new(); - #ifdef HAVE_LENSFUN - UFObject *ufraw_lensfun_new(); Property changes on: branches/2015Q2/graphics/ufraw/files/patch-ufraw.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2015Q2/graphics/ufraw/files/patch-dcraw.cc =================================================================== --- branches/2015Q2/graphics/ufraw/files/patch-dcraw.cc (revision 386388) +++ branches/2015Q2/graphics/ufraw/files/patch-dcraw.cc (revision 386389) @@ -1,11 +1,21 @@ ---- ./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 @@ +--- dcraw.cc.orig 2015-01-30 15:15:16.000000000 +0000 ++++ dcraw.cc 2015-05-14 19:29:47.000000000 +0000 +@@ -934,7 +934,8 @@ + + int CLASS ljpeg_start (struct jhead *jh, int info_only) + { +- int c, tag, len; ++ int c, tag; ++ ushort len; + uchar data[0x10000]; + const uchar *dp; + +@@ -9715,7 +9716,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 (×tamp); 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); Index: branches/2015Q2 =================================================================== --- branches/2015Q2 (revision 386388) +++ branches/2015Q2 (revision 386389) Property changes on: branches/2015Q2 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r386364