Index: head/graphics/ida/Makefile =================================================================== --- head/graphics/ida/Makefile (revision 451608) +++ head/graphics/ida/Makefile (revision 451609) @@ -1,67 +1,66 @@ # Created by: Andrey Slusar # $FreeBSD$ PORTNAME= ida -PORTVERSION= 2.13 -PORTREVISION= 1 +PORTVERSION= 2.14 CATEGORIES= graphics 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= desktop-file-utils gmake iconv jpeg motif perl5 pkgconfig USE_PERL5= build -USE_XORG= x11 +USE_XORG= pixman x11 xext xt MAKEFILE= GNUmakefile 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= HAVE_LIBGIF=yes PCD_DESC= PhotoCD support PCD_LIB_DEPENDS= libpcd.so:graphics/libpcd PCD_MAKE_ARGS= HAVE_LIBPCD=yes PNG_LIB_DEPENDS= libpng.so:graphics/png PNG_MAKE_ARGS= HAVE_LIBPNG=yes SANE_LIB_DEPENDS= libsane.so:graphics/sane-backends SANE_MAKE_ARGS= HAVE_LIBSANE=yes TIFF_LIB_DEPENDS= libtiff.so:graphics/tiff TIFF_MAKE_ARGS= HAVE_LIBTIFF=yes WEBP_LIB_DEPENDS= libwebp.so:graphics/webp 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 Index: head/graphics/ida/distinfo =================================================================== --- head/graphics/ida/distinfo (revision 451608) +++ head/graphics/ida/distinfo (revision 451609) @@ -1,3 +1,3 @@ -TIMESTAMP = 1488292685 -SHA256 (fbida-2.13.tar.gz) = a887195dcd189055ee9b787eb03c8b7954df3aec540a1f90d8e92f873126db07 -SIZE (fbida-2.13.tar.gz) = 296020 +TIMESTAMP = 1507540862 +SHA256 (fbida-2.14.tar.gz) = 95b7c01556cb6ef9819f358b314ddfeb8a4cbe862b521a3ed62f03d163154438 +SIZE (fbida-2.14.tar.gz) = 296826 Index: head/graphics/ida/files/patch-GNUmakefile =================================================================== --- head/graphics/ida/files/patch-GNUmakefile (revision 451608) +++ head/graphics/ida/files/patch-GNUmakefile (revision 451609) @@ -1,40 +1,40 @@ ---- GNUmakefile.orig 2016-04-05 09:59:50 UTC +--- GNUmakefile.orig 2017-08-30 10:48:03 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 # hard build deps PKG_CONFIG = pkg-config -@@ -73,7 +73,7 @@ HAVE_LIBWEBP := $(call ac_pkg_config,lib - 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) +@@ -71,7 +71,7 @@ HAVE_CAIRO_GL := $(call ac_pkg_config,ca + HAVE_LIBPCD := $(call ac_lib,pcd_open,pcd) + HAVE_LIBGIF := $(call ac_lib,DGifOpenFileName,gif) + HAVE_LIBWEBP := $(call ac_pkg_config,libwebp) -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 - -@@ -169,8 +169,8 @@ OBJS_IDA := \ + # deprecated + #HAVE_GLIBC := $(call ac_func,fopencookie) +@@ -170,8 +170,8 @@ 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 -@@ -179,7 +179,7 @@ ida : LDLIBS += $(shell $(PKG_CONFIG) -- +@@ -180,7 +180,7 @@ ida : LDLIBS += $(shell $(PKG_CONFIG) -- ida : LDLIBS += -ljpeg -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 451608) +++ head/graphics/ida/files/patch-desktop.c (revision 451609) @@ -1,11 +1,11 @@ ---- desktop.c.orig 2016-03-24 14:39:02 UTC +--- desktop.c.orig 2017-08-30 10:48:03 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 (revision 451608) +++ head/graphics/ida/files/patch-mk_Autoconf.mk (revision 451609) @@ -1,25 +1,25 @@ ---- mk/Autoconf.mk.orig 2016-03-24 14:39:02 UTC +--- mk/Autoconf.mk.orig 2017-08-30 10:48:03 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 Index: head/graphics/ida/files/patch-mk_Variables.mk =================================================================== --- head/graphics/ida/files/patch-mk_Variables.mk (revision 451608) +++ head/graphics/ida/files/patch-mk_Variables.mk (revision 451609) @@ -1,21 +1,21 @@ ---- mk/Variables.mk.orig 2016-03-24 14:39:02 UTC +--- mk/Variables.mk.orig 2017-08-30 10:48:03 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