Index: head/graphics/ida/Makefile
===================================================================
--- head/graphics/ida/Makefile	(revision 412737)
+++ head/graphics/ida/Makefile	(revision 412738)
@@ -1,54 +1,65 @@
 # Created by: Andrey Slusar <anray@FreeBSD.org>
 # $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
 COMMENT=	Small and fast motif-based image viewer and editor
 
 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}
 
 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 \
 		share/applications/ida.desktop
 
 OPTIONS_DEFINE=		DOCS GIF PCD PNG SANE TIFF WEBP
 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}
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/graphics/ida/distinfo
===================================================================
--- head/graphics/ida/distinfo	(revision 412737)
+++ head/graphics/ida/distinfo	(revision 412738)
@@ -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
Index: head/graphics/ida/files/patch-mk__Variables.mk
===================================================================
--- head/graphics/ida/files/patch-mk__Variables.mk	(revision 412737)
+++ head/graphics/ida/files/patch-mk__Variables.mk	(nonexistent)
@@ -1,21 +0,0 @@
---- mk/Variables.mk.orig	2008-06-09 17:56:36.000000000 +0300
-+++ mk/Variables.mk	2009-05-24 19:03:04.000000000 +0300
-@@ -4,12 +4,12 @@
- # directories
- DESTDIR	=
- srcdir	?= .
--prefix	?= /usr/local
--bindir	=  $(DESTDIR)$(prefix)/bin
--sbindir	=  $(DESTDIR)$(prefix)/sbin
--libdir  =  $(DESTDIR)$(prefix)/$(LIB)
--shrdir  =  $(DESTDIR)$(prefix)/share
--mandir	=  $(shrdir)/man
-+prefix	?= $(PREFIX)
-+bindir	=  $(DESTDIR)$(PREFIX)/bin
-+sbindir	=  $(DESTDIR)$(PREFIX)/sbin
-+libdir  =  $(DESTDIR)$(PREFIX)/$(LIB)
-+shrdir  =  $(DESTDIR)$(PREFIX)/share
-+mandir	=  $(DESTDIR)$(PREFIX)/man
- locdir  =  $(shrdir)/locale
- appdir  =  $(shrdir)/applications
- 

Property changes on: head/graphics/ida/files/patch-mk__Variables.mk
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/graphics/ida/files/patch-mk__Autoconf.mk
===================================================================
--- head/graphics/ida/files/patch-mk__Autoconf.mk	(revision 412737)
+++ head/graphics/ida/files/patch-mk__Autoconf.mk	(nonexistent)
@@ -1,25 +0,0 @@
---- mk/Autoconf.mk.orig	2012-02-22 17:13:36 UTC
-+++ mk/Autoconf.mk
-@@ -110,20 +110,14 @@
- #	$(call ac_fini))
- ac_lib64 = $(shell \
- 	$(call ac_init,for libdir name);\
--	$(call ac_s_cmd,/sbin/ldconfig -p | grep -q lib64 &&\
-+	$(call ac_s_cmd,$(CC) -print-search-dirs | grep -q lib64 &&\
- 		echo "lib64" || echo "lib");\
- 	$(call ac_fini))
- 
- # check for x11 ressource dir prefix
- ac_resdir = $(shell \
- 	$(call ac_init,for X11 app-defaults prefix);\
--	$(call ac_s_cmd, for dir in \
--		/etc/X11/app-defaults \
--		/usr/X11R6/lib/X11/app-defaults \
--		/usr/share/X11/app-defaults \
--		/usr/lib/X11/app-defaults \
--		; do test -d "$$dir" || continue;\
--		dirname "$$dir"; break; done);\
-+	$(call ac_s_cmd, dirname "${PREFIX}/lib/X11/app-defaults");\
- 	$(call ac_fini))
- 
- # check if package is installed, via pkg-config

Property changes on: head/graphics/ida/files/patch-mk__Autoconf.mk
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/graphics/ida/files/patch-GNUmakefile
===================================================================
--- head/graphics/ida/files/patch-GNUmakefile	(revision 412737)
+++ head/graphics/ida/files/patch-GNUmakefile	(revision 412738)
@@ -1,31 +1,39 @@
---- 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)
  
  # fixup flags
  CFLAGS	+= -DVERSION='"$(VERSION)"' -I$(srcdir)
 -CFLAGS	+= -Wno-pointer-sign
 +CFLAGS	+= -idirafter /usr/include/sys
  
  # default target
  all: build
 @@ -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 := \
+@@ -145,15 +145,15 @@ OBJS_IDA := \
  OBJS_IDA += $(call ac_lib_mkvar,$(ida_libs),OBJS)
  
  # for X11 + Motif
 -ida : CFLAGS	+= -I/usr/X11R6/include
 -ida : LDFLAGS	+= -L/usr/X11R6/$(LIB)
 +ida : CFLAGS	+= -I$(LOCALBASE)/include
 +ida : LDFLAGS	+= -L$(LOCALBASE)/$(LIB)
  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)
+ 
Index: head/graphics/ida/files/patch-desktop.c
===================================================================
--- head/graphics/ida/files/patch-desktop.c	(revision 412737)
+++ head/graphics/ida/files/patch-desktop.c	(revision 412738)
@@ -1,11 +1,11 @@
---- 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,
 -			char *src, char *dst, size_t max)
 +			const char *src, char *dst, size_t max)
  {
      size_t ilen = strlen(src);
      size_t olen = max-1;
Index: head/graphics/ida/files/patch-mk_Autoconf.mk
===================================================================
--- head/graphics/ida/files/patch-mk_Autoconf.mk	(nonexistent)
+++ head/graphics/ida/files/patch-mk_Autoconf.mk	(revision 412738)
@@ -0,0 +1,25 @@
+--- mk/Autoconf.mk.orig	2016-03-24 14:39:02 UTC
++++ mk/Autoconf.mk
+@@ -110,20 +110,14 @@ ac_binary = $(shell \
+ #	$(call ac_fini))
+ ac_lib64 = $(shell \
+ 	$(call ac_init,for libdir name);\
+-	$(call ac_s_cmd,/sbin/ldconfig -p | grep -q lib64 &&\
++	$(call ac_s_cmd,$(CC) -print-search-dirs | grep -q lib64 &&\
+ 		echo "lib64" || echo "lib");\
+ 	$(call ac_fini))
+ 
+ # check for x11 ressource dir prefix
+ ac_resdir = $(shell \
+ 	$(call ac_init,for X11 app-defaults prefix);\
+-	$(call ac_s_cmd, for dir in \
+-		/etc/X11/app-defaults \
+-		/usr/X11R6/lib/X11/app-defaults \
+-		/usr/share/X11/app-defaults \
+-		/usr/lib/X11/app-defaults \
+-		; do test -d "$$dir" || continue;\
+-		dirname "$$dir"; break; done);\
++	$(call ac_s_cmd, dirname "${PREFIX}/lib/X11/app-defaults");\
+ 	$(call ac_fini))
+ 
+ # check if package is installed, via pkg-config

Property changes on: head/graphics/ida/files/patch-mk_Autoconf.mk
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/graphics/ida/files/patch-mk_Variables.mk
===================================================================
--- head/graphics/ida/files/patch-mk_Variables.mk	(nonexistent)
+++ head/graphics/ida/files/patch-mk_Variables.mk	(revision 412738)
@@ -0,0 +1,21 @@
+--- mk/Variables.mk.orig	2016-03-24 14:39:02 UTC
++++ mk/Variables.mk
+@@ -4,12 +4,12 @@
+ # directories
+ DESTDIR	=
+ srcdir	?= .
+-prefix	?= /usr/local
+-bindir	=  $(DESTDIR)$(prefix)/bin
+-sbindir	=  $(DESTDIR)$(prefix)/sbin
+-libdir  =  $(DESTDIR)$(prefix)/$(LIB)
+-shrdir  =  $(DESTDIR)$(prefix)/share
+-mandir	=  $(shrdir)/man
++prefix	?= $(PREFIX)
++bindir	=  $(DESTDIR)$(PREFIX)/bin
++sbindir	=  $(DESTDIR)$(PREFIX)/sbin
++libdir  =  $(DESTDIR)$(PREFIX)/$(LIB)
++shrdir  =  $(DESTDIR)$(PREFIX)/share
++mandir	=  $(DESTDIR)$(PREFIX)/man
+ locdir  =  $(shrdir)/locale
+ appdir  =  $(shrdir)/applications
+ 

Property changes on: head/graphics/ida/files/patch-mk_Variables.mk
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property