Date: Fri, 15 Jan 2016 09:30:58 +0000 (UTC) From: Martin Wilke <miwi@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r406149 - in head/graphics/ida: . files Message-ID: <201601150930.u0F9UwYN068179@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: miwi Date: Fri Jan 15 09:30:58 2016 New Revision: 406149 URL: https://svnweb.freebsd.org/changeset/ports/406149 Log: - Update to 2.10 PR: 206249 Submitted by: ports fury Deleted: head/graphics/ida/files/patch-rd__read-gif.c Modified: head/graphics/ida/Makefile head/graphics/ida/distinfo head/graphics/ida/files/patch-GNUmakefile Modified: head/graphics/ida/Makefile ============================================================================== --- head/graphics/ida/Makefile Fri Jan 15 09:28:53 2016 (r406148) +++ head/graphics/ida/Makefile Fri Jan 15 09:30:58 2016 (r406149) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= ida -PORTVERSION= 2.09 -PORTREVISION= 8 +PORTVERSION= 2.10 CATEGORIES= graphics MASTER_SITES= http://www.kraxel.org/releases/fbida/ DISTNAME= fbida-${PORTVERSION} @@ -15,43 +14,39 @@ LICENSE= GPLv2 LIB_DEPENDS= libexif.so:${PORTSDIR}/graphics/libexif -OPTIONS_DEFINE= GIF PCF PNG SANE TIFF WEBP DOCS -OPTIONS_DEFAULT= GIF PNG TIFF -PCD_DESC= Enable PhotoCD support -SANE_DESC= Enable SANE support - +USES= compiler:c11 desktop-file-utils gmake iconv jpeg motif perl5 USE_PERL5= build -USES= desktop-file-utils gmake iconv jpeg motif perl5 MAKEFILE= GNUmakefile -MAKE_ARGS= JPEG_VER=80 verbose=yes +MAKE_ARGS= HAVE_LINUX_FB_H=no HAVE_GLIBC=no JPEG_VER=80 verbose=yes LDFLAGS+= ${ICONV_LIB} PORTDOCS= README TODO INSTALL PLIST_FILES= bin/exiftran bin/ida lib/X11/app-defaults/Ida \ man/man1/exiftran.1.gz man/man1/ida.1.gz \ - ${DESKTOPDIR:S/${PREFIX}\///}/ida.desktop + share/applications/ida.desktop -GIB_LIB_DEPENDS= libgif.so:${PORTSDIR}/graphics/giflib -GIF_MAKE_ARGS_OFF= HAVE_LIBUNGIF=no +OPTIONS_DEFINE= DOCS GIF PCD PNG SANE TIFF WEBP +OPTIONS_DEFAULT= GIF PNG TIFF +GIF_LIB_DEPENDS= libgif.so:${PORTSDIR}/graphics/giflib +GIF_MAKE_ARGS_OFF= HAVE_LIBGIF=no +PCD_DESC= PhotoCD support PCD_LIB_DEPENDS= libpcd.so:${PORTSDIR}/graphics/libpcd PCD_MAKE_ARGS_OFF= HAVE_LIBPCD=no - PNG_LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png PNG_MAKE_ARGS_OFF= HAVE_LIBPNG=no - SANE_LIB_DEPENDS= libsane.so:${PORTSDIR}/graphics/sane-backends SANE_MAKE_ARGS_OFF= HAVE_LIBSANE=no - TIFF_LIB_DEPENDS= libtiff.so:${PORTSDIR}/graphics/tiff TIFF_MAKE_ARGS= HAVE_LIBTIFF=no - WEBP_LIB_DEPENDS= libwebp.so:${PORTSDIR}/graphics/webp WEBP_MAKE_ARGS_OFF= HAVE_LIBWEBP=no post-install: ${INSTALL_DATA} ${WRKSRC}/desktop/ida.desktop ${STAGEDIR}${DESKTOPDIR} + +post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} Modified: head/graphics/ida/distinfo ============================================================================== --- head/graphics/ida/distinfo Fri Jan 15 09:28:53 2016 (r406148) +++ head/graphics/ida/distinfo Fri Jan 15 09:30:58 2016 (r406149) @@ -1,2 +1,2 @@ -SHA256 (fbida-2.09.tar.gz) = dd40b3572f79c6524480ac652c9b32e3867cb53e6c53db51415ddbb20f5231e6 -SIZE (fbida-2.09.tar.gz) = 248086 +SHA256 (fbida-2.10.tar.gz) = 7a5a3aac61b40a6a2bbf716d270a46e2f8e8d5c97e314e927d41398a4d0b6cb6 +SIZE (fbida-2.10.tar.gz) = 283490 Modified: head/graphics/ida/files/patch-GNUmakefile ============================================================================== --- head/graphics/ida/files/patch-GNUmakefile Fri Jan 15 09:28:53 2016 (r406148) +++ head/graphics/ida/files/patch-GNUmakefile Fri Jan 15 09:30:58 2016 (r406149) @@ -1,32 +1,24 @@ ---- GNUmakefile.orig 2011-06-01 09:31:59.000000000 +0200 -+++ GNUmakefile 2012-02-18 12:33:58.000000000 +0100 -@@ -8,7 +8,6 @@ +--- GNUmakefile.orig 2015-03-31 14:07:23 UTC ++++ GNUmakefile +@@ -8,7 +8,7 @@ resdir = $(DESTDIR)$(RESDIR) # fixup flags CFLAGS += -DVERSION='"$(VERSION)"' -I$(srcdir) -CFLAGS += -Wno-pointer-sign ++CFLAGS += -idirafter /usr/include/sys # default target all: build -@@ -43,7 +42,7 @@ - HAVE_GLIBC := $(call ac_func,fopencookie) - HAVE_STRCASESTR := $(call ac_func,strcasestr) - HAVE_LIBPCD := $(call ac_lib,pcd_open,pcd) --HAVE_LIBUNGIF := $(call ac_lib,DGifOpenFileName,ungif) -+HAVE_LIBUNGIF := $(call ac_lib,DGifOpenFileName,gif) - HAVE_LIBPNG := $(call ac_lib,png_read_info,png,-lz) - HAVE_LIBTIFF := $(call ac_lib,TIFFOpen,tiff) - HAVE_LIBWEBP := $(call ac_lib,WebPDecodeRGBA,webp) -@@ -87,7 +86,7 @@ - TIFF_LDLIBS := -ltiff - WEBP_LDLIBS := -lwebp - PCD_LDLIBS := -lpcd --UNGIF_LDLIBS := -lungif -+UNGIF_LDLIBS := -lgif - SANE_LDLIBS := -lsane - CURL_LDLIBS := -lcurl - LIRC_LDLIBS := -llirc_client -@@ -144,8 +143,8 @@ +@@ -51,7 +51,7 @@ HAVE_LIBWEBP := $(call ac_lib,WebPDecode + HAVE_LIBSANE := $(call ac_lib,sane_init,sane) + HAVE_LIBCURL := $(call ac_lib,curl_easy_init,curl) + HAVE_LIBLIRC := $(call ac_lib,lirc_init,lirc_client) +-HAVE_MOTIF := $(call ac_lib,XmStringGenerate,Xm,-L/usr/X11R6/$(LIB) -lXpm -lXt -lXext -lX11) ++HAVE_MOTIF := $(call ac_lib,XmStringGenerate,Xm,-lXpm -lXt -lXext -lX11) + JPEG_VER := $(call ac_jpeg_ver) + endef + +@@ -145,8 +145,8 @@ OBJS_IDA := \ OBJS_IDA += $(call ac_lib_mkvar,$(ida_libs),OBJS) # for X11 + Motif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201601150930.u0F9UwYN068179>