Index: head/graphics/ida/Makefile =================================================================== --- head/graphics/ida/Makefile (revision 412741) +++ head/graphics/ida/Makefile (revision 412742) @@ -1,65 +1,65 @@ # Created by: Andrey Slusar # $FreeBSD$ PORTNAME= ida -PORTVERSION= 2.11 +PORTVERSION= 2.12 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 +USES= desktop-file-utils gmake iconv jpeg motif perl5 pkgconfig USE_PERL5= build 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 412741) +++ head/graphics/ida/distinfo (revision 412742) @@ -1,2 +1,2 @@ -SHA256 (fbida-2.11.tar.gz) = 7caa63d6d09aeeef6209556f3e2d05083a6a9ffc47636dee7e6019b3eea5a103 -SIZE (fbida-2.11.tar.gz) = 285691 +SHA256 (fbida-2.12.tar.gz) = d33193105cce77057c919761728cee9bbe8ec8ec4f12a770a600cab33611822f +SIZE (fbida-2.12.tar.gz) = 294842 Index: head/graphics/ida/files/patch-GNUmakefile =================================================================== --- head/graphics/ida/files/patch-GNUmakefile (revision 412741) +++ head/graphics/ida/files/patch-GNUmakefile (revision 412742) @@ -1,39 +1,40 @@ ---- GNUmakefile.orig 2016-03-24 14:39:02 UTC +--- GNUmakefile.orig 2016-04-05 09:59:50 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 + # 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) -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,15 +145,15 @@ OBJS_IDA := \ +@@ -169,8 +169,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 - ida : LDLIBS += -ljpeg -lexif -lm +@@ -179,7 +179,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)