From 0f080c706b5ba961c961034e6d8305dd49a410c8 Mon Sep 17 00:00:00 2001 From: sthen Date: Fri, 8 Mar 2013 11:28:56 +0000 Subject: [PATCH] update to ufraw 0.19.1 --- graphics/ufraw/Makefile | 27 ++++++++++++------------ graphics/ufraw/distinfo | 7 ++---- graphics/ufraw/patches/patch-Makefile_in | 12 ----------- graphics/ufraw/patches/patch-configure | 17 --------------- 4 files changed, 15 insertions(+), 48 deletions(-) delete mode 100644 graphics/ufraw/patches/patch-Makefile_in delete mode 100644 graphics/ufraw/patches/patch-configure diff --git a/graphics/ufraw/Makefile b/graphics/ufraw/Makefile index a6282ab1778..efbeb4e4fe6 100644 --- a/graphics/ufraw/Makefile +++ b/graphics/ufraw/Makefile @@ -1,9 +1,8 @@ -# $OpenBSD: Makefile,v 1.30 2011/11/02 09:57:22 jasper Exp $ +# $OpenBSD: Makefile,v 1.31 2013/03/08 11:28:56 sthen Exp $ COMMENT= read and manipulate raw images from digital cameras -DISTNAME= ufraw-0.18 -REVISION= 0 +DISTNAME= ufraw-0.19.1 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ufraw/} @@ -14,18 +13,16 @@ MAINTAINER= Stuart Henderson # GPLv2+ PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes -PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -WANTLIB += GL X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi -WANTLIB += Xinerama Xrandr Xrender atk-1.0 c cairo expat -WANTLIB += fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 -WANTLIB += gmodule-2.0 gobject-2.0 gthread-2.0 gtk-x11-2.0 -WANTLIB += jpeg m pango-1.0 pangocairo-1.0 pangoft2-1.0 pixman-1 -WANTLIB += png pthread pthread-stubs stdc++ tiff xcb xcb-render -WANTLIB += xcb-shm z lensfun lcms bz2 exiv2 gtkimageview -WANTLIB += gimp-2.0 gimpbase-2.0 gimpcolor-2.0 gimpconfig-2.0 -WANTLIB += gimpmath-2.0 gimpui-2.0 gimpwidgets-2.0 gimpmodule-2.0 +WANTLIB += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama +WANTLIB += Xrandr Xrender atk-1.0 bz2 c cairo cfitsio exiv2 expat +WANTLIB += fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0 gimp-2.0 +WANTLIB += gimpbase-2.0 gimpcolor-2.0 gimpconfig-2.0 gimpmath-2.0 +WANTLIB += gimpmodule-2.0 gimpui-2.0 gimpwidgets-2.0 gio-2.0 glib-2.0 +WANTLIB += gobject-2.0 gthread-2.0 gtk-x11-2.0 gtkimageview jasper +WANTLIB += jpeg lcms m pango-1.0 pangocairo-1.0 pangoft2-1.0 png +WANTLIB += pthread stdc++ tiff z LIB_DEPENDS= gimp->=2,<3:graphics/gimp/stable \ graphics/lcms \ @@ -42,7 +39,9 @@ USE_LIBTOOL= Yes USE_GROFF = Yes CONFIGURE_STYLE=gnu CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -pthread" + LDFLAGS="-L${LOCALBASE}/lib -pthread" \ + CFITSIO_CFLAGS="-I${LOCALBASE}/include" \ + CFITSIO_LIBS="-lcfitsio" CONFIGURE_ARGS= --enable-extras .include diff --git a/graphics/ufraw/distinfo b/graphics/ufraw/distinfo index 7b1d638757d..770e650ace9 100644 --- a/graphics/ufraw/distinfo +++ b/graphics/ufraw/distinfo @@ -1,5 +1,2 @@ -MD5 (ufraw-0.18.tar.gz) = RU9ApAKSiZioLiZF2SZdlg== -RMD160 (ufraw-0.18.tar.gz) = +usgpcXuuiupHVc376oBnF8iPI4= -SHA1 (ufraw-0.18.tar.gz) = Qcmteqfxy7Y6awszCzWZsYp+jNI= -SHA256 (ufraw-0.18.tar.gz) = JP5znGHp4U3hkAAIR3yGYlU+k0J1acHVlVVtRA5rkgU= -SIZE (ufraw-0.18.tar.gz) = 1219440 +SHA256 (ufraw-0.19.1.tar.gz) = yfxRaGKEge/6QugC/c7USisWa/Lvp/aR7TfQpOAzJXM= +SIZE (ufraw-0.19.1.tar.gz) = 1249766 diff --git a/graphics/ufraw/patches/patch-Makefile_in b/graphics/ufraw/patches/patch-Makefile_in deleted file mode 100644 index f2c6bd689f1..00000000000 --- a/graphics/ufraw/patches/patch-Makefile_in +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-Makefile_in,v 1.4 2010/09/16 10:18:38 sthen Exp $ ---- Makefile.in.orig Thu Apr 1 00:19:33 2010 -+++ Makefile.in Wed Apr 7 03:42:17 2010 -@@ -127,7 +127,7 @@ am__nikon_curve_SOURCES_DIST = nikon_curve.c - nikon_curve_OBJECTS = $(am_nikon_curve_OBJECTS) - @MAKE_EXTRAS_TRUE@nikon_curve_DEPENDENCIES = $(am__DEPENDENCIES_1) - nikon_curve_LINK = $(CCLD) $(nikon_curve_CFLAGS) $(CFLAGS) \ -- $(nikon_curve_LDFLAGS) $(LDFLAGS) -o $@ -+ $(nikon_curve_LDFLAGS) $(LDFLAGS) -lstdc++ -o $@ - ufraw_SOURCES = ufraw.c - ufraw_OBJECTS = ufraw.$(OBJEXT) - ufraw_LDADD = $(LDADD) diff --git a/graphics/ufraw/patches/patch-configure b/graphics/ufraw/patches/patch-configure deleted file mode 100644 index b5103c0339a..00000000000 --- a/graphics/ufraw/patches/patch-configure +++ /dev/null @@ -1,17 +0,0 @@ -$OpenBSD: patch-configure,v 1.5 2011/03/06 11:43:38 sthen Exp $ - -XXX make it compile with gtk+2 2.22 (*_DISABLE_DEPRECATED) -graphics/ufraw to fix : ufraw_preview.c:4026: error: expected declaration specifiers or '...' before 'GtkNotebookPage' - ---- configure.orig Sat Feb 19 05:51:44 2011 -+++ configure Mon Feb 21 09:51:02 2011 -@@ -5592,9 +5592,6 @@ $as_echo "#define G_DISABLE_DEPRECATED /**/" >>confdef - $as_echo "#define GDK_DISABLE_DEPRECATED /**/" >>confdefs.h - - --$as_echo "#define GTK_DISABLE_DEPRECATED /**/" >>confdefs.h -- -- - $as_echo "#define GTK_DISABLE_SINGLE_INCLUDES /**/" >>confdefs.h - -