Update to giflib/giflib-util 5.2.1

6 files changed, 40 insertions, 17 deletions

diff --git a/graphics/giflib/Makefile b/graphics/giflib/Makefile
index 175f035d12d..f6655429aa9 100644
--- a/graphics/giflib/Makefile
+++ b/graphics/giflib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2013/08/31 18:41:33 adam Exp $
+# $NetBSD: Makefile,v 1.49 2020/01/07 20:25:14 sevan Exp $
 
 .include "Makefile.common"
 
@@ -6,7 +6,7 @@ COMMENT=	GIF image format library
 
 CONFLICTS+=	libungif-[0-9]*
 
-BUILD_DIRS=	lib
-INSTALL_DIRS=	lib
+INSTALL_TARGET= 	install-include
+INSTALL_TARGET+= 	install-lib
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/giflib/Makefile.common b/graphics/giflib/Makefile.common
index 4cdc3e729c6..5c94cf88087 100644
--- a/graphics/giflib/Makefile.common
+++ b/graphics/giflib/Makefile.common
@@ -1,22 +1,21 @@
-# $NetBSD: Makefile.common,v 1.11 2016/05/01 20:28:44 leot Exp $
+# $NetBSD: Makefile.common,v 1.12 2020/01/07 20:25:14 sevan Exp $
 # used by graphics/giflib/Makefile
 # used by graphics/giflib-util/Makefile
 
-DISTNAME=	giflib-5.1.4
+DISTNAME=	giflib-5.2.1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=giflib/}
-EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://giflib.sourceforge.net/
 LICENSE=	mit
 
-#PATCHDIR=	${.CURDIR}/../../graphics/giflib/patches
+PATCHDIR=	${.CURDIR}/../../graphics/giflib/patches
 DISTINFO_FILE=	${.CURDIR}/../../graphics/giflib/distinfo
 
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
-GNU_CONFIGURE=		yes
+USE_TOOLS+= 		gmake
 
 SUBST_CLASSES+=		split
 SUBST_FILES.split+=	util/Makefile.in
diff --git a/graphics/giflib/PLIST b/graphics/giflib/PLIST
index 790e23c6e22..487589b8121 100644
--- a/graphics/giflib/PLIST
+++ b/graphics/giflib/PLIST
@@ -1,3 +1,6 @@
-@comment $NetBSD: PLIST,v 1.6 2011/09/06 18:45:46 drochner Exp $
+@comment $NetBSD: PLIST,v 1.7 2020/01/07 20:25:14 sevan Exp $
 include/gif_lib.h
-lib/libgif.la
+lib/libgif.a
+lib/libgif.so
+lib/libgif.so.7
+lib/libgif.so.7.2.0
diff --git a/graphics/giflib/buildlink3.mk b/graphics/giflib/buildlink3.mk
index df1390d9a1f..04f387e3bd9 100644
--- a/graphics/giflib/buildlink3.mk
+++ b/graphics/giflib/buildlink3.mk
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.6 2014/05/31 23:44:19 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2020/01/07 20:25:14 sevan Exp $
 
 BUILDLINK_TREE+=	giflib
 
 .if !defined(GIFLIB_BUILDLINK3_MK)
 GIFLIB_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.giflib+=	giflib>=5.1.0
+BUILDLINK_API_DEPENDS.giflib+=	giflib>=5.2.1
 BUILDLINK_PKGSRCDIR.giflib?=	../../graphics/giflib
 .endif	# GIFLIB_BUILDLINK3_MK
 
diff --git a/graphics/giflib/distinfo b/graphics/giflib/distinfo
index ace1b3bea24..2e107cf0f86 100644
--- a/graphics/giflib/distinfo
+++ b/graphics/giflib/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.18 2016/05/01 20:28:44 leot Exp $
+$NetBSD: distinfo,v 1.19 2020/01/07 20:25:14 sevan Exp $
 
-SHA1 (giflib-5.1.4.tar.bz2) = 5f1157cfc377916280849e247b8e34fa0446513f
-RMD160 (giflib-5.1.4.tar.bz2) = 0a970b30afb113036183a35bf55b7edcfbcc46c8
-SHA512 (giflib-5.1.4.tar.bz2) = 32b5e342056c210e6478e9cb3b6ceec9594dcfaf34feea1eb4dad633a081ed4465bceee578c19165907cb47cb83912ac359ceea666a8e07dbbb5420f9928f96d
-Size (giflib-5.1.4.tar.bz2) = 639703 bytes
+SHA1 (giflib-5.2.1.tar.gz) = c3f774dcbdf26afded7788979c8081d33c6426dc
+RMD160 (giflib-5.2.1.tar.gz) = bc4be3ddaef877e4fd546b1240fe94dec8ef3e27
+SHA512 (giflib-5.2.1.tar.gz) = 4550e53c21cb1191a4581e363fc9d0610da53f7898ca8320f0d3ef6711e76bdda2609c2df15dc94c45e28bff8de441f1227ec2da7ea827cb3c0405af4faa4736
+Size (giflib-5.2.1.tar.gz) = 444187 bytes
+SHA1 (patch-Makefile) = 72f3d0727d2092697feea6483cd1b1e4648f3bb0
diff --git a/graphics/giflib/patches/patch-Makefile b/graphics/giflib/patches/patch-Makefile
new file mode 100644
index 00000000000..3d13e29b907
--- /dev/null
+++ b/graphics/giflib/patches/patch-Makefile
@@ -0,0 +1,20 @@
+$NetBSD: patch-Makefile,v 1.1 2020/01/07 20:25:14 sevan Exp $
+
+- Inherit the PREFIX rather than hard-coding it.
+- Adjust location where manuals are installed.
+
+--- Makefile.orig	2019-06-24 16:08:57.000000000 +0000
++++ Makefile
+@@ -14,11 +14,10 @@ SHELL = /bin/sh
+ TAR = tar
+ INSTALL = install
+ 
+-PREFIX = /usr/local
+ BINDIR = $(PREFIX)/bin
+ INCDIR = $(PREFIX)/include
+ LIBDIR = $(PREFIX)/lib
+-MANDIR = $(PREFIX)/share/man
++MANDIR = $(PREFIX)/man
+ 
+ # No user-serviceable parts below this line
+