1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-30 01:15:52 +00:00

- build with giflib

- add dependecy to iconv as source used iconv directly
This commit is contained in:
Dirk Meyer 2012-02-18 11:40:38 +00:00
parent 5b4d408145
commit 70f8a04567
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=291673
2 changed files with 24 additions and 4 deletions

View File

@ -24,9 +24,11 @@ OPTIONS= GIF "Enable GIF support" on \
TIFF "Enable TIFF support" on \
WEBP "Enable WebP suport" off
USE_ICONV= yes
USE_MOTIF= yes
USE_PERL5_BUILD=yes
USE_GMAKE= yes
LDFLAGS+= -liconv
MAKEFILE= ${WRKSRC}/GNUmakefile
MAKE_ARGS= JPEG_VER=80 verbose=yes
@ -39,7 +41,7 @@ PLIST_FILES= bin/exiftran bin/ida lib/X11/app-defaults/Ida
.if defined(WITHOUT_GIF)
MAKE_ARGS+= HAVE_LIBUNGIF=no
.else
LIB_DEPENDS+= ungif.5:${PORTSDIR}/graphics/libungif
LIB_DEPENDS+= gif.5:${PORTSDIR}/graphics/giflib
.endif
.if defined(WITH_PCD)

View File

@ -1,5 +1,5 @@
--- GNUmakefile.orig 2006-06-13 16:35:48.000000000 +0300
+++ GNUmakefile 2009-05-31 12:06:34.000000000 +0300
--- GNUmakefile.orig 2011-06-01 09:31:59.000000000 +0200
+++ GNUmakefile 2012-02-18 12:33:58.000000000 +0100
@@ -8,7 +8,6 @@
# fixup flags
@ -8,7 +8,25 @@
# default target
all: build
@@ -130,8 +129,8 @@
@@ -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 @@
OBJS_IDA += $(call ac_lib_mkvar,$(ida_libs),OBJS)
# for X11 + Motif