Attachment #169103 for bug #208614




# $FreeBSD: head/graphics/ida/Makefile 412346 2016-04-01 14:00:51Z mat $

PORTNAME=	ida
PORTVERSION=	2.12
PORTREVISION=	1
CATEGORIES=	graphics
MASTER_SITES=	https://www.kraxel.org/releases/fbida/
DISTNAME=	fbida-${PORTVERSION}

MAINTAINER=	ports@FreeBSD.org


LIB_DEPENDS=	libexif.so:graphics/libexif

USES=		desktop-file-utils gmake iconv jpeg motif perl5 pkgconfig
USE_PERL5=	build
MAKEFILE=	GNUmakefile
MAKE_ARGS=	verbose=yes

LDFLAGS+=	${ICONV_LIB}


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

do-configure:
	@${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:
	(cd ${WRKSRC}/desktop && ${INSTALL_DATA} ida.desktop \
		${STAGEDIR}${PREFIX}/share/applications)

post-install-DOCS-on:
	@${MKDIR} ${STAGEDIR}${DOCSDIR}
	(cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} \
		${STAGEDIR}${DOCSDIR})

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)graphics/ida/distinfo (-2 / +2 lines)
1	SHA256 (fbida-2.10.tar.gz) = 7a5a3aac61b40a6a2bbf716d270a46e2f8e8d5c97e314e927d41398a4d0b6cb6	1	SHA256 (fbida-2.12.tar.gz) = d33193105cce77057c919761728cee9bbe8ec8ec4f12a770a600cab33611822f
2	SIZE (fbida-2.10.tar.gz) = 283490	2	SIZE (fbida-2.12.tar.gz) = 294842




--- GNUmakefile.orig	2016-04-05 09:59:50 UTC
+++ GNUmakefile
@@ -8,7 +8,7 @@ resdir	=  $(DESTDIR)$(RESDIR)
 

-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)

 JPEG_VER        := $(call ac_jpeg_ver)
 endef
 
@@ -169,8 +169,8 @@ OBJS_IDA := \
 OBJS_IDA += $(call ac_lib_mkvar,$(ida_libs),OBJS)
 
 # for X11 + Motif

 ida : LDLIBS	+= -lXm -lXpm -lXt -lXext -lX11
 
 # jpeg/exif libs
@@ -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)
 

Lines 1-6 Link Here

(-)graphics/ida/files/patch-desktop.c (-3 / +3 lines)
1	--- desktop.c.orig 2009-05-24 18:56:39.000000000 +0300	1	--- desktop.c.orig 2016-04-05 09:59:50 UTC
2	+++ desktop.c 2009-05-24 18:56:44.000000000 +0300	2	+++ desktop.c
3	@@ -26,7 +26,7 @@	3	@@ -27,7 +27,7 @@ extern int debug;
4	/* desktop files are in utf-8 */	4	/* desktop files are in utf-8 */
5		5
6	static int iconv_string(char to, char from,	6	static int iconv_string(char to, char from,

Lines 1-6 Link Here

(-)graphics/ida/files/patch-mk__Autoconf.mk (-2 / +2 lines)
1	--- mk/Autoconf.mk.orig 2012-02-22 17:13:36 UTC	1	--- mk/Autoconf.mk.orig 2016-04-05 09:59:50 UTC
2	+++ mk/Autoconf.mk	2	+++ mk/Autoconf.mk
3	@@ -110,20 +110,14 @@	3	@@ -110,20 +110,14 @@ ac_binary = $(shell \
4	# $(call ac_fini))	4	# $(call ac_fini))
5	ac_lib64 = $(shell \	5	ac_lib64 = $(shell \
6	$(call ac_init,for libdir name);\	6	$(call ac_init,for libdir name);\

Lines 1-5 Link Here

(-)graphics/ida/files/patch-mk__Variables.mk (-2 / +2 lines)
1	--- mk/Variables.mk.orig 2008-06-09 17:56:36.000000000 +0300	1	--- mk/Variables.mk.orig 2016-04-05 09:59:50 UTC
2	+++ mk/Variables.mk 2009-05-24 19:03:04.000000000 +0300	2	+++ mk/Variables.mk
3	@@ -4,12 +4,12 @@	3	@@ -4,12 +4,12 @@
4	# directories	4	# directories
5	DESTDIR =	5	DESTDIR =

Lines 1-4 Link Here

(-)graphics/ida/pkg-descr (-2 / +3 lines)
1	Ida is a small and fast image viewer, motif-based. For people who don't want	1	Ida is a small and fast image viewer, motif-based. For people who don't
2	the KDE/GNOME overhead. Some basic editing functions are available too.	2	want the KDE/GNOME overhead. Some basic editing functions are available
		3	too.
3		4
4	WWW: http://www.kraxel.org/blog/linux/fbida/	5	WWW: http://www.kraxel.org/blog/linux/fbida/

Return to bug 208614

Lines 2-11 Link Here

(-)graphics/ida/Makefile (-13 / +26 lines)
2	# $FreeBSD: head/graphics/ida/Makefile 412346 2016-04-01 14:00:51Z mat $	2	# $FreeBSD: head/graphics/ida/Makefile 412346 2016-04-01 14:00:51Z mat $
3		3
4	PORTNAME= ida	4	PORTNAME= ida
5	PORTVERSION= 2.10	5	PORTVERSION= 2.12
6	PORTREVISION= 1
7	CATEGORIES= graphics	6	CATEGORIES= graphics
8	MASTER_SITES= http://www.kraxel.org/releases/fbida/	7	MASTER_SITES= https://www.kraxel.org/releases/fbida/
9	DISTNAME= fbida-${PORTVERSION}	8	DISTNAME= fbida-${PORTVERSION}
10		9
11	MAINTAINER= ports@FreeBSD.org	10	MAINTAINER= ports@FreeBSD.org
Lines 15-24 Link Here
15		14
16	LIB_DEPENDS= libexif.so:graphics/libexif	15	LIB_DEPENDS= libexif.so:graphics/libexif
17		16
18	USES= compiler:c11 desktop-file-utils gmake iconv jpeg motif perl5	17	USES= desktop-file-utils gmake iconv jpeg motif perl5 pkgconfig
19	USE_PERL5= build	18	USE_PERL5= build
20	MAKEFILE= GNUmakefile	19	MAKEFILE= GNUmakefile
21	MAKE_ARGS= HAVE_LINUX_FB_H=no HAVE_GLIBC=no JPEG_VER=80 verbose=yes	20	MAKE_ARGS= verbose=yes
22		21
23	LDFLAGS+= ${ICONV_LIB}	22	LDFLAGS+= ${ICONV_LIB}
24		23
Lines 31-54 Link Here
31	OPTIONS_DEFAULT= GIF PNG TIFF	30	OPTIONS_DEFAULT= GIF PNG TIFF
32		31
33	GIF_LIB_DEPENDS= libgif.so:graphics/giflib	32	GIF_LIB_DEPENDS= libgif.so:graphics/giflib
34	GIF_MAKE_ARGS_OFF= HAVE_LIBGIF=no	33	GIF_MAKE_ARGS= HAVE_LIBGIF=yes
35	PCD_DESC= PhotoCD support	34	PCD_DESC= PhotoCD support
36	PCD_LIB_DEPENDS= libpcd.so:graphics/libpcd	35	PCD_LIB_DEPENDS= libpcd.so:graphics/libpcd
37	PCD_MAKE_ARGS_OFF= HAVE_LIBPCD=no	36	PCD_MAKE_ARGS= HAVE_LIBPCD=yes
38	PNG_LIB_DEPENDS= libpng.so:graphics/png	37	PNG_LIB_DEPENDS= libpng.so:graphics/png
39	PNG_MAKE_ARGS_OFF= HAVE_LIBPNG=no	38	PNG_MAKE_ARGS= HAVE_LIBPNG=yes
40	SANE_LIB_DEPENDS= libsane.so:graphics/sane-backends	39	SANE_LIB_DEPENDS= libsane.so:graphics/sane-backends
41	SANE_MAKE_ARGS_OFF= HAVE_LIBSANE=no	40	SANE_MAKE_ARGS= HAVE_LIBSANE=yes
42	TIFF_LIB_DEPENDS= libtiff.so:graphics/tiff	41	TIFF_LIB_DEPENDS= libtiff.so:graphics/tiff
43	TIFF_MAKE_ARGS= HAVE_LIBTIFF=no	42	TIFF_MAKE_ARGS= HAVE_LIBTIFF=yes
44	WEBP_LIB_DEPENDS= libwebp.so:graphics/webp	43	WEBP_LIB_DEPENDS= libwebp.so:graphics/webp
45	WEBP_MAKE_ARGS_OFF= HAVE_LIBWEBP=no	44	WEBP_MAKE_ARGS= HAVE_LIBWEBP=yes
		45
		46	do-configure:
		47	@${ECHO_CMD} -n > ${WRKSRC}/Make.config
		48	@${ECHO_CMD} "LIB:=lib" >> ${WRKSRC}/Make.config
		49	@${ECHO_CMD} "RESDIR:=${PREFIX}/lib/X11" >> ${WRKSRC}/Make.config
		50	@${ECHO_CMD} "HAVE_ENDIAN_H:=yes" >> ${WRKSRC}/Make.config
		51	@${ECHO_CMD} "HAVE_LINUX_FB_H:=no" >> ${WRKSRC}/Make.config
		52	@${ECHO_CMD} "HAVE_NEW_EXIF:=yes" >> ${WRKSRC}/Make.config
		53	@${ECHO_CMD} "HAVE_GLIBC:=no" >> ${WRKSRC}/Make.config
		54	@${ECHO_CMD} "HAVE_STRSIGNAL:=yes" >> ${WRKSRC}/Make.config
		55	@${ECHO_CMD} "HAVE_MOTIF:=yes" >> ${WRKSRC}/Make.config
		56	@${ECHO_CMD} "JPEG_VER:=80" >> ${WRKSRC}/Make.config
46		57
47	post-install:	58	post-install:
48	${INSTALL_DATA} ${WRKSRC}/desktop/ida.desktop ${STAGEDIR}${DESKTOPDIR}	59	(cd ${WRKSRC}/desktop && ${INSTALL_DATA} ida.desktop \
		60	${STAGEDIR}${PREFIX}/share/applications)
49		61
50	post-install-DOCS-on:	62	post-install-DOCS-on:
51	@${MKDIR} ${STAGEDIR}${DOCSDIR}	63	@${MKDIR} ${STAGEDIR}${DOCSDIR}
52	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}	64	(cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} \
		65	${STAGEDIR}${DOCSDIR})
53		66
54	.include <bsd.port.mk>	67	.include <bsd.port.mk>

Lines 1-4 Link Here

(-)graphics/ida/files/patch-GNUmakefile (-5 / +14 lines)
1	--- GNUmakefile.orig 2015-03-31 14:07:23 UTC	1	--- GNUmakefile.orig 2016-04-05 09:59:50 UTC
2	+++ GNUmakefile	2	+++ GNUmakefile
3	@@ -8,7 +8,7 @@ resdir = $(DESTDIR)$(RESDIR)	3	@@ -8,7 +8,7 @@ resdir = $(DESTDIR)$(RESDIR)
4		4
Lines 7-15 Link Here
7	-CFLAGS += -Wno-pointer-sign	7	-CFLAGS += -Wno-pointer-sign
8	+CFLAGS += -idirafter /usr/include/sys	8	+CFLAGS += -idirafter /usr/include/sys
9		9
10	# default target	10	# hard build deps
11	all: build	11	PKG_CONFIG = pkg-config
12	@@ -51,7 +51,7 @@ HAVE_LIBWEBP := $(call ac_lib,WebPDecode	12	@@ -73,7 +73,7 @@ HAVE_LIBWEBP := $(call ac_pkg_config,lib
13	HAVE_LIBSANE := $(call ac_lib,sane_init,sane)	13	HAVE_LIBSANE := $(call ac_lib,sane_init,sane)
14	HAVE_LIBCURL := $(call ac_lib,curl_easy_init,curl)	14	HAVE_LIBCURL := $(call ac_lib,curl_easy_init,curl)
15	HAVE_LIBLIRC := $(call ac_lib,lirc_init,lirc_client)	15	HAVE_LIBLIRC := $(call ac_lib,lirc_init,lirc_client)
Lines 18-24 Link Here
18	JPEG_VER := $(call ac_jpeg_ver)	18	JPEG_VER := $(call ac_jpeg_ver)
19	endef	19	endef
20		20
21	@@ -145,8 +145,8 @@ OBJS_IDA := \	21	@@ -169,8 +169,8 @@ OBJS_IDA := \
22	OBJS_IDA += $(call ac_lib_mkvar,$(ida_libs),OBJS)	22	OBJS_IDA += $(call ac_lib_mkvar,$(ida_libs),OBJS)
23		23
24	# for X11 + Motif	24	# for X11 + Motif
Lines 29-31 Link Here
29	ida : LDLIBS += -lXm -lXpm -lXt -lXext -lX11	29	ida : LDLIBS += -lXm -lXpm -lXt -lXext -lX11
30		30
31	# jpeg/exif libs	31	# jpeg/exif libs
		32	@@ -179,7 +179,7 @@ ida : LDLIBS += $(shell $(PKG_CONFIG) --
		33	ida : LDLIBS += -ljpeg -lm
		34
		35	# RegEdit.c is good old K&R ...
		36	-RegEdit.o : CFLAGS += -Wno-missing-prototypes -Wno-strict-prototypes -Wno-maybe-uninitialized
		37	+RegEdit.o : CFLAGS += -Wno-missing-prototypes -Wno-strict-prototypes -Wno-uninitialized
		38
		39	ida: $(OBJS_IDA) $(OBJS_READER) $(OBJS_WRITER)
		40