Date: Mon, 29 Oct 2012 20:55:15 +0000 (UTC) From: Pawel Pekala <pawel@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r306637 - in head/graphics/ida: . files Message-ID: <201210292055.q9TKtFZB042567@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pawel Date: Mon Oct 29 20:55:14 2012 New Revision: 306637 URL: http://svn.freebsd.org/changeset/ports/306637 Log: - Fix build [1] - Install desktop entry file PR: ports/172016 [1] Submitted by: KATO Tsuguru <tkato432@yahoo.com> [1] Feature safe: yes Added: head/graphics/ida/files/patch-rd__read-gif.c (contents, props changed) Modified: head/graphics/ida/Makefile Modified: head/graphics/ida/Makefile ============================================================================== --- head/graphics/ida/Makefile Mon Oct 29 20:51:08 2012 (r306636) +++ head/graphics/ida/Makefile Mon Oct 29 20:55:14 2012 (r306637) @@ -1,13 +1,9 @@ -# New ports collection makefile for: ida -# Date created: Thu Aug 19 21:13:58 UTC 2004 -# Whom: Andrey Slusar <anray@FreeBSD.org> -# +# Created by: Andrey Slusar <anray@FreeBSD.org> # $FreeBSD$ -# PORTNAME= ida PORTVERSION= 2.09 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= http://www.kraxel.org/releases/fbida/ DISTNAME= fbida-${PORTVERSION} @@ -16,12 +12,9 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Small and fast motif-based image viewer and editor LICENSE= GPLv2 -LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \ - exif.12:${PORTSDIR}/graphics/libexif - -BROKEN= does not compile +LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg \ + exif:${PORTSDIR}/graphics/libexif OPTIONS_DEFINE= GIF PCF PNG SANE TIFF WEBP DOCS OPTIONS_DEFAULT= GIF PNG TIFF @@ -40,7 +33,9 @@ LDFLAGS+= -liconv MAN1= exiftran.1 ida.1 PORTDOCS= README TODO INSTALL -PLIST_FILES= bin/exiftran bin/ida lib/X11/app-defaults/Ida +PLIST_FILES= bin/exiftran bin/ida lib/X11/app-defaults/Ida \ + ${DESKTOPDIR:S/${PREFIX}\///}/ida.desktop +PLIST_DIRSTRY= ${DESKTOPDIR:S/${PREFIX}\///} .include <bsd.port.options.mk> @@ -69,7 +64,7 @@ MAKE_ARGS+= HAVE_LIBSANE=no .endif .if ${PORT_OPTIONS:MTIFF} -LIB_DEPENDS+= tiff.4:${PORTSDIR}/graphics/tiff +LIB_DEPENDS+= tiff:${PORTSDIR}/graphics/tiff .else MAKE_ARGS+= HAVE_LIBTIFF=no .endif @@ -81,6 +76,8 @@ MAKE_ARGS+= HAVE_LIBWEBP=no .endif post-install: + ${MKDIR} ${DESKTOPDIR} + ${INSTALL_DATA} ${WRKSRC}/desktop/ida.desktop ${DESKTOPDIR} .if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} .for a in ${PORTDOCS} Added: head/graphics/ida/files/patch-rd__read-gif.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/ida/files/patch-rd__read-gif.c Mon Oct 29 20:55:14 2012 (r306637) @@ -0,0 +1,47 @@ +--- rd/read-gif.c.orig 2012-02-23 02:13:36.000000000 +0900 ++++ rd/read-gif.c 2012-09-10 18:52:32.000000000 +0900 +@@ -13,6 +13,17 @@ + int w,h; + }; + ++static void ++localPrintGifError(void) ++{ ++ char *Err = GifErrorString(); ++ ++ if (Err != NULL) ++ fprintf(stderr, "\nGIF-LIB error: %s.\n", Err); ++ else ++ fprintf(stderr, "\nGIF-LIB undefined error %d.\n", GifError()); ++} ++ + static GifRecordType + gif_fileread(struct gif_state *h) + { +@@ -25,7 +36,7 @@ + if (GIF_ERROR == DGifGetRecordType(h->gif,&RecordType)) { + if (debug) + fprintf(stderr,"gif: DGifGetRecordType failed\n"); +- PrintGifError(); ++ localPrintGifError(); + return -1; + } + switch (RecordType) { +@@ -42,7 +53,7 @@ + if (rc == GIF_ERROR) { + if (debug) + fprintf(stderr,"gif: DGifGetExtension failed\n"); +- PrintGifError(); ++ localPrintGifError(); + return -1; + } + if (debug) { +@@ -108,7 +119,7 @@ + if (GIF_ERROR == DGifGetImageDesc(h->gif)) { + if (debug) + fprintf(stderr,"gif: DGifGetImageDesc failed\n"); +- PrintGifError(); ++ localPrintGifError(); + } + if (NULL == h->gif->SColorMap && + NULL == h->gif->Image.ColorMap) { \ No newline at end of file
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201210292055.q9TKtFZB042567>