Attachment 169103 Details for Bug 208614 – graphics_ida.diff

[patch] graphics_ida.diff

graphics_ida.diff (text/plain), 6.85 KB, created by tkato432 on 2016-04-08 12:30:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2016-04-08 12:30:35 UTC

Size: 6.85 KB

patch

obsolete

>diff -urN /usr/ports/graphics/ida/Makefile graphics/ida/Makefile
>--- /usr/ports/graphics/ida/Makefile	2016-04-01 23:21:47.092885000 +0900
>+++ graphics/ida/Makefile	2016-04-08 21:00:00.000000000 +0900
>@@ -2,10 +2,9 @@
> # $FreeBSD: head/graphics/ida/Makefile 412346 2016-04-01 14:00:51Z mat $
> 
> PORTNAME=	ida
>-PORTVERSION=	2.10
>-PORTREVISION=	1
>+PORTVERSION=	2.12
> 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 @@
> 
> 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 pkgconfig
> 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,24 +30,38 @@
> 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
>+
>+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:
>-	${INSTALL_DATA} ${WRKSRC}/desktop/ida.desktop ${STAGEDIR}${DESKTOPDIR}
>+	(cd ${WRKSRC}/desktop && ${INSTALL_DATA} ida.desktop \
>+		${STAGEDIR}${PREFIX}/share/applications)
> 
> post-install-DOCS-on:
> 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
>-	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
>+	(cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} \
>+		${STAGEDIR}${DOCSDIR})
> 
> .include <bsd.port.mk>
>diff -urN /usr/ports/graphics/ida/distinfo graphics/ida/distinfo
>--- /usr/ports/graphics/ida/distinfo	2016-01-15 20:56:49.563259000 +0900
>+++ graphics/ida/distinfo	2016-04-08 21:00:00.000000000 +0900
>@@ -1,2 +1,2 @@
>-SHA256 (fbida-2.10.tar.gz) = 7a5a3aac61b40a6a2bbf716d270a46e2f8e8d5c97e314e927d41398a4d0b6cb6
>-SIZE (fbida-2.10.tar.gz) = 283490
>+SHA256 (fbida-2.12.tar.gz) = d33193105cce77057c919761728cee9bbe8ec8ec4f12a770a600cab33611822f
>+SIZE (fbida-2.12.tar.gz) = 294842
>diff -urN /usr/ports/graphics/ida/files/patch-GNUmakefile graphics/ida/files/patch-GNUmakefile
>--- /usr/ports/graphics/ida/files/patch-GNUmakefile	2016-01-15 20:56:49.574673000 +0900
>+++ graphics/ida/files/patch-GNUmakefile	2016-04-08 21:00:00.000000000 +0900
>@@ -1,4 +1,4 @@
>---- GNUmakefile.orig	2015-03-31 14:07:23 UTC
>+--- GNUmakefile.orig	2016-04-05 09:59:50 UTC
> +++ GNUmakefile
> @@ -8,7 +8,7 @@ resdir	=  $(DESTDIR)$(RESDIR)
>  
>@@ -7,9 +7,9 @@
> -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)
>@@ -18,7 +18,7 @@
>  JPEG_VER        := $(call ac_jpeg_ver)
>  endef
>  
>-@@ -145,8 +145,8 @@ OBJS_IDA := \
>+@@ -169,8 +169,8 @@ OBJS_IDA := \
>  OBJS_IDA += $(call ac_lib_mkvar,$(ida_libs),OBJS)
>  
>  # for X11 + Motif
>@@ -29,3 +29,12 @@
>  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)
>+ 
>diff -urN /usr/ports/graphics/ida/files/patch-desktop.c graphics/ida/files/patch-desktop.c
>--- /usr/ports/graphics/ida/files/patch-desktop.c	2015-08-24 03:53:39.660340000 +0900
>+++ graphics/ida/files/patch-desktop.c	2016-04-08 21:00:00.000000000 +0900
>@@ -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-04-05 09:59:50 UTC
>++++ desktop.c
>+@@ -27,7 +27,7 @@ extern int debug;
>  /* desktop files are in utf-8                                                */
>  
>  static int iconv_string(char *to, char *from,
>diff -urN /usr/ports/graphics/ida/files/patch-mk__Autoconf.mk graphics/ida/files/patch-mk__Autoconf.mk
>--- /usr/ports/graphics/ida/files/patch-mk__Autoconf.mk	2015-08-24 03:53:39.661134000 +0900
>+++ graphics/ida/files/patch-mk__Autoconf.mk	2016-04-08 21:00:00.000000000 +0900
>@@ -1,6 +1,6 @@
>---- mk/Autoconf.mk.orig	2012-02-22 17:13:36 UTC
>+--- mk/Autoconf.mk.orig	2016-04-05 09:59:50 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);\
>diff -urN /usr/ports/graphics/ida/files/patch-mk__Variables.mk graphics/ida/files/patch-mk__Variables.mk
>--- /usr/ports/graphics/ida/files/patch-mk__Variables.mk	2015-08-24 03:53:39.635394000 +0900
>+++ graphics/ida/files/patch-mk__Variables.mk	2016-04-08 21:00:00.000000000 +0900
>@@ -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-04-05 09:59:50 UTC
>++++ mk/Variables.mk
> @@ -4,12 +4,12 @@
>  # directories
>  DESTDIR	=
>diff -urN /usr/ports/graphics/ida/pkg-descr graphics/ida/pkg-descr
>--- /usr/ports/graphics/ida/pkg-descr	2015-08-24 03:53:39.626239000 +0900
>+++ graphics/ida/pkg-descr	2016-04-08 21:00:00.000000000 +0900
>@@ -1,4 +1,5 @@
>-Ida is a small and fast image viewer, motif-based.  For people who don't want
>-the KDE/GNOME overhead.  Some basic editing functions are available too.
>+Ida is a small and fast image viewer, motif-based. For people who don't
>+want the KDE/GNOME overhead. Some basic editing functions are available
>+too.
> 
> WWW: http://www.kraxel.org/blog/linux/fbida/

Actions: View | Diff

Attachments on bug 208614: 169086 | 169103