mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-19 19:59:43 +00:00
Code Issues Releases Activity

- Fix build [1]

Browse Source 
- Install desktop entry file

PR:		ports/172016 [1]
Submitted by:	KATO Tsuguru <tkato432@yahoo.com> [1]
Feature safe:	yes
This commit is contained in:
Pawel Pekala 2012-10-29 20:55:14 +00:00
parent 60d41af280
commit e24458a1f8
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=306637
2 changed files with 57 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
graphics/ida/Makefile
View File

@ -1,13 +1,9 @@
# New ports collection makefile for: ida # Created by: Andrey Slusar <anray@FreeBSD.org>
# Date created: Thu Aug 19 21:13:58 UTC 2004
# Whom: Andrey Slusar <anray@FreeBSD.org>
#
# $FreeBSD$ # $FreeBSD$
#
PORTNAME= ida PORTNAME= ida
PORTVERSION= 2.09 PORTVERSION= 2.09
PORTREVISION= 1 PORTREVISION= 2
CATEGORIES= graphics CATEGORIES= graphics
MASTER_SITES= http://www.kraxel.org/releases/fbida/ MASTER_SITES= http://www.kraxel.org/releases/fbida/
DISTNAME= fbida-${PORTVERSION} DISTNAME= fbida-${PORTVERSION}
@ -16,12 +12,9 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Small and fast motif-based image viewer and editor COMMENT= Small and fast motif-based image viewer and editor
LICENSE= GPLv2 LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \ LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg \
exif.12:${PORTSDIR}/graphics/libexif exif:${PORTSDIR}/graphics/libexif
BROKEN= does not compile
OPTIONS_DEFINE= GIF PCF PNG SANE TIFF WEBP DOCS OPTIONS_DEFINE= GIF PCF PNG SANE TIFF WEBP DOCS
OPTIONS_DEFAULT= GIF PNG TIFF OPTIONS_DEFAULT= GIF PNG TIFF
@ -40,7 +33,9 @@ LDFLAGS+= -liconv
MAN1= exiftran.1 ida.1 MAN1= exiftran.1 ida.1
PORTDOCS= README TODO INSTALL 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> .include <bsd.port.options.mk>
@ -69,7 +64,7 @@ MAKE_ARGS+= HAVE_LIBSANE=no
.endif .endif
.if ${PORT_OPTIONS:MTIFF} .if ${PORT_OPTIONS:MTIFF}
LIB_DEPENDS+= tiff.4:${PORTSDIR}/graphics/tiff LIB_DEPENDS+= tiff:${PORTSDIR}/graphics/tiff
.else .else
MAKE_ARGS+= HAVE_LIBTIFF=no MAKE_ARGS+= HAVE_LIBTIFF=no
.endif .endif
@ -81,6 +76,8 @@ MAKE_ARGS+= HAVE_LIBWEBP=no
.endif .endif
post-install: post-install:
${MKDIR} ${DESKTOPDIR}
${INSTALL_DATA} ${WRKSRC}/desktop/ida.desktop ${DESKTOPDIR}
.if ${PORT_OPTIONS:MDOCS} .if ${PORT_OPTIONS:MDOCS}
@${MKDIR} ${DOCSDIR} @${MKDIR} ${DOCSDIR}
.for a in ${PORTDOCS} .for a in ${PORTDOCS}

47
graphics/ida/files/patch-rd__read-gif.c Normal file
View File

@ -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) {