Date: Fri, 8 Apr 2016 12:38:03 +0000 (UTC) From: Mathieu Arnold <mat@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r412738 - in head/graphics/ida: . files Message-ID: <201604081238.u38Cc34k010549@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Fri Apr 8 12:38:03 2016 New Revision: 412738 URL: https://svnweb.freebsd.org/changeset/ports/412738 Log: Update to 2.11. PR: 208614 Submitted by: tkato432 yahoo com Sponsored by: Absolight Added: head/graphics/ida/files/patch-mk_Autoconf.mk (contents, props changed) - copied, changed from r412737, head/graphics/ida/files/patch-mk__Autoconf.mk head/graphics/ida/files/patch-mk_Variables.mk (contents, props changed) - copied, changed from r412737, head/graphics/ida/files/patch-mk__Variables.mk Deleted: head/graphics/ida/files/patch-mk__Autoconf.mk head/graphics/ida/files/patch-mk__Variables.mk Modified: head/graphics/ida/Makefile (contents, props changed) head/graphics/ida/distinfo (contents, props changed) head/graphics/ida/files/patch-GNUmakefile (contents, props changed) head/graphics/ida/files/patch-desktop.c (contents, props changed) Modified: head/graphics/ida/Makefile ============================================================================== --- head/graphics/ida/Makefile Fri Apr 8 12:37:55 2016 (r412737) +++ head/graphics/ida/Makefile Fri Apr 8 12:38:03 2016 (r412738) @@ -2,10 +2,9 @@ # $FreeBSD$ PORTNAME= ida -PORTVERSION= 2.10 -PORTREVISION= 1 +PORTVERSION= 2.11 CATEGORIES= graphics -MASTER_SITES= http://www.kraxel.org/releases/fbida/ +MASTER_SITES= https://www.kraxel.org/releases/fbida/ DISTNAME= fbida-${PORTVERSION} MAINTAINER= ports@FreeBSD.org @@ -15,10 +14,10 @@ LICENSE= GPLv2 LIB_DEPENDS= libexif.so:graphics/libexif -USES= compiler:c11 desktop-file-utils gmake iconv jpeg motif perl5 +USES= desktop-file-utils gmake iconv jpeg motif perl5 USE_PERL5= build MAKEFILE= GNUmakefile -MAKE_ARGS= HAVE_LINUX_FB_H=no HAVE_GLIBC=no JPEG_VER=80 verbose=yes +MAKE_ARGS= verbose=yes LDFLAGS+= ${ICONV_LIB} @@ -31,18 +30,30 @@ OPTIONS_DEFINE= DOCS GIF PCD PNG SANE T OPTIONS_DEFAULT= GIF PNG TIFF GIF_LIB_DEPENDS= libgif.so:graphics/giflib -GIF_MAKE_ARGS_OFF= HAVE_LIBGIF=no +GIF_MAKE_ARGS= HAVE_LIBGIF=yes PCD_DESC= PhotoCD support PCD_LIB_DEPENDS= libpcd.so:graphics/libpcd -PCD_MAKE_ARGS_OFF= HAVE_LIBPCD=no +PCD_MAKE_ARGS= HAVE_LIBPCD=yes PNG_LIB_DEPENDS= libpng.so:graphics/png -PNG_MAKE_ARGS_OFF= HAVE_LIBPNG=no +PNG_MAKE_ARGS= HAVE_LIBPNG=yes SANE_LIB_DEPENDS= libsane.so:graphics/sane-backends -SANE_MAKE_ARGS_OFF= HAVE_LIBSANE=no +SANE_MAKE_ARGS= HAVE_LIBSANE=yes TIFF_LIB_DEPENDS= libtiff.so:graphics/tiff -TIFF_MAKE_ARGS= HAVE_LIBTIFF=no +TIFF_MAKE_ARGS= HAVE_LIBTIFF=yes WEBP_LIB_DEPENDS= libwebp.so:graphics/webp -WEBP_MAKE_ARGS_OFF= HAVE_LIBWEBP=no +WEBP_MAKE_ARGS= HAVE_LIBWEBP=yes + +pre-build: + @${ECHO_CMD} -n > ${WRKSRC}/Make.config + @${ECHO_CMD} "LIB:=lib" >> ${WRKSRC}/Make.config + @${ECHO_CMD} "RESDIR:=${PREFIX}/lib/X11" >> ${WRKSRC}/Make.config + @${ECHO_CMD} "HAVE_ENDIAN_H:=yes" >> ${WRKSRC}/Make.config + @${ECHO_CMD} "HAVE_LINUX_FB_H:=no" >> ${WRKSRC}/Make.config + @${ECHO_CMD} "HAVE_NEW_EXIF:=yes" >> ${WRKSRC}/Make.config + @${ECHO_CMD} "HAVE_GLIBC:=no" >> ${WRKSRC}/Make.config + @${ECHO_CMD} "HAVE_STRSIGNAL:=yes" >> ${WRKSRC}/Make.config + @${ECHO_CMD} "HAVE_MOTIF:=yes" >> ${WRKSRC}/Make.config + @${ECHO_CMD} "JPEG_VER:=80" >> ${WRKSRC}/Make.config post-install: ${INSTALL_DATA} ${WRKSRC}/desktop/ida.desktop ${STAGEDIR}${DESKTOPDIR} Modified: head/graphics/ida/distinfo ============================================================================== --- head/graphics/ida/distinfo Fri Apr 8 12:37:55 2016 (r412737) +++ head/graphics/ida/distinfo Fri Apr 8 12:38:03 2016 (r412738) @@ -1,2 +1,2 @@ -SHA256 (fbida-2.10.tar.gz) = 7a5a3aac61b40a6a2bbf716d270a46e2f8e8d5c97e314e927d41398a4d0b6cb6 -SIZE (fbida-2.10.tar.gz) = 283490 +SHA256 (fbida-2.11.tar.gz) = 7caa63d6d09aeeef6209556f3e2d05083a6a9ffc47636dee7e6019b3eea5a103 +SIZE (fbida-2.11.tar.gz) = 285691 Modified: head/graphics/ida/files/patch-GNUmakefile ============================================================================== --- head/graphics/ida/files/patch-GNUmakefile Fri Apr 8 12:37:55 2016 (r412737) +++ head/graphics/ida/files/patch-GNUmakefile Fri Apr 8 12:38:03 2016 (r412738) @@ -1,4 +1,4 @@ ---- GNUmakefile.orig 2015-03-31 14:07:23 UTC +--- GNUmakefile.orig 2016-03-24 14:39:02 UTC +++ GNUmakefile @@ -8,7 +8,7 @@ resdir = $(DESTDIR)$(RESDIR) @@ -18,7 +18,7 @@ JPEG_VER := $(call ac_jpeg_ver) endef -@@ -145,8 +145,8 @@ OBJS_IDA := \ +@@ -145,15 +145,15 @@ OBJS_IDA := \ OBJS_IDA += $(call ac_lib_mkvar,$(ida_libs),OBJS) # for X11 + Motif @@ -29,3 +29,11 @@ ida : LDLIBS += -lXm -lXpm -lXt -lXext -lX11 # jpeg/exif libs + ida : LDLIBS += -ljpeg -lexif -lm + + # RegEdit.c is good old K&R ... +-RegEdit.o : CFLAGS += -Wno-missing-prototypes -Wno-strict-prototypes -Wno-maybe-uninitialized ++RegEdit.o : CFLAGS += -Wno-missing-prototypes -Wno-strict-prototypes -Wno-uninitialized + + ida: $(OBJS_IDA) $(OBJS_READER) $(OBJS_WRITER) + Modified: head/graphics/ida/files/patch-desktop.c ============================================================================== --- head/graphics/ida/files/patch-desktop.c Fri Apr 8 12:37:55 2016 (r412737) +++ head/graphics/ida/files/patch-desktop.c Fri Apr 8 12:38:03 2016 (r412738) @@ -1,6 +1,6 @@ ---- desktop.c.orig 2009-05-24 18:56:39.000000000 +0300 -+++ desktop.c 2009-05-24 18:56:44.000000000 +0300 -@@ -26,7 +26,7 @@ +--- desktop.c.orig 2016-03-24 14:39:02 UTC ++++ desktop.c +@@ -27,7 +27,7 @@ extern int debug; /* desktop files are in utf-8 */ static int iconv_string(char *to, char *from, Copied and modified: head/graphics/ida/files/patch-mk_Autoconf.mk (from r412737, head/graphics/ida/files/patch-mk__Autoconf.mk) ============================================================================== --- head/graphics/ida/files/patch-mk__Autoconf.mk Fri Apr 8 12:37:55 2016 (r412737, copy source) +++ head/graphics/ida/files/patch-mk_Autoconf.mk Fri Apr 8 12:38:03 2016 (r412738) @@ -1,6 +1,6 @@ ---- mk/Autoconf.mk.orig 2012-02-22 17:13:36 UTC +--- mk/Autoconf.mk.orig 2016-03-24 14:39:02 UTC +++ mk/Autoconf.mk -@@ -110,20 +110,14 @@ +@@ -110,20 +110,14 @@ ac_binary = $(shell \ # $(call ac_fini)) ac_lib64 = $(shell \ $(call ac_init,for libdir name);\ Copied and modified: head/graphics/ida/files/patch-mk_Variables.mk (from r412737, head/graphics/ida/files/patch-mk__Variables.mk) ============================================================================== --- head/graphics/ida/files/patch-mk__Variables.mk Fri Apr 8 12:37:55 2016 (r412737, copy source) +++ head/graphics/ida/files/patch-mk_Variables.mk Fri Apr 8 12:38:03 2016 (r412738) @@ -1,5 +1,5 @@ ---- mk/Variables.mk.orig 2008-06-09 17:56:36.000000000 +0300 -+++ mk/Variables.mk 2009-05-24 19:03:04.000000000 +0300 +--- mk/Variables.mk.orig 2016-03-24 14:39:02 UTC ++++ mk/Variables.mk @@ -4,12 +4,12 @@ # directories DESTDIR =
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201604081238.u38Cc34k010549>