CVS commit: pkgsrc/graphics

["Sevan Janiyan" <sevan%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   sevan
Date:           Tue Jan  7 20:25:14 UTC 2020

Modified Files:
        pkgsrc/graphics/giflib: Makefile Makefile.common PLIST buildlink3.mk
            distinfo
        pkgsrc/graphics/giflib-util: Makefile PLIST
Added Files:
        pkgsrc/graphics/giflib/patches: patch-Makefile

Log Message:
Update to giflib/giflib-util 5.2.1


To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 pkgsrc/graphics/giflib/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/graphics/giflib/Makefile.common
cvs rdiff -u -r1.6 -r1.7 pkgsrc/graphics/giflib/PLIST \
    pkgsrc/graphics/giflib/buildlink3.mk
cvs rdiff -u -r1.18 -r1.19 pkgsrc/graphics/giflib/distinfo
cvs rdiff -u -r1.10 -r1.11 pkgsrc/graphics/giflib-util/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/graphics/giflib-util/PLIST
cvs rdiff -u -r0 -r1.1 pkgsrc/graphics/giflib/patches/patch-Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/giflib/Makefile
diff -u pkgsrc/graphics/giflib/Makefile:1.48 pkgsrc/graphics/giflib/Makefile:1.49
--- pkgsrc/graphics/giflib/Makefile:1.48        Sat Aug 31 18:41:33 2013
+++ pkgsrc/graphics/giflib/Makefile     Tue Jan  7 20:25:14 2020
@@ -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"

Index: pkgsrc/graphics/giflib/Makefile.common
diff -u pkgsrc/graphics/giflib/Makefile.common:1.11 pkgsrc/graphics/giflib/Makefile.common:1.12
--- pkgsrc/graphics/giflib/Makefile.common:1.11 Sun May  1 20:28:44 2016
+++ pkgsrc/graphics/giflib/Makefile.common      Tue Jan  7 20:25:14 2020
@@ -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@localhost
 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

Index: pkgsrc/graphics/giflib/PLIST
diff -u pkgsrc/graphics/giflib/PLIST:1.6 pkgsrc/graphics/giflib/PLIST:1.7
--- pkgsrc/graphics/giflib/PLIST:1.6    Tue Sep  6 18:45:46 2011
+++ pkgsrc/graphics/giflib/PLIST        Tue Jan  7 20:25:14 2020
@@ -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
Index: pkgsrc/graphics/giflib/buildlink3.mk
diff -u pkgsrc/graphics/giflib/buildlink3.mk:1.6 pkgsrc/graphics/giflib/buildlink3.mk:1.7
--- pkgsrc/graphics/giflib/buildlink3.mk:1.6    Sat May 31 23:44:19 2014
+++ pkgsrc/graphics/giflib/buildlink3.mk        Tue Jan  7 20:25:14 2020
@@ -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
 

Index: pkgsrc/graphics/giflib/distinfo
diff -u pkgsrc/graphics/giflib/distinfo:1.18 pkgsrc/graphics/giflib/distinfo:1.19
--- pkgsrc/graphics/giflib/distinfo:1.18        Sun May  1 20:28:44 2016
+++ pkgsrc/graphics/giflib/distinfo     Tue Jan  7 20:25:14 2020
@@ -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

Index: pkgsrc/graphics/giflib-util/Makefile
diff -u pkgsrc/graphics/giflib-util/Makefile:1.10 pkgsrc/graphics/giflib-util/Makefile:1.11
--- pkgsrc/graphics/giflib-util/Makefile:1.10   Fri Jan 16 09:35:43 2015
+++ pkgsrc/graphics/giflib-util/Makefile        Tue Jan  7 20:25:14 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2015/01/16 09:35:43 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2020/01/07 20:25:14 sevan Exp $
 
 .include "../../graphics/giflib/Makefile.common"
 
@@ -10,13 +10,17 @@ CONFLICTS+= libungif-[0-9]*
 
 BUILD_DEPENDS+=        xmlto-[0-9]*:../../textproc/xmlto
 
-BUILD_DIRS+=           util doc
 HTMLDIR=               share/doc/giflib
-INSTALLATION_DIRS=     ${HTMLDIR} ${HTMLDIR}/whatsinagif
+INSTALLATION_DIRS=     ${HTMLDIR} ${HTMLDIR}/gifstandard \
+                       ${HTMLDIR}/whatsinagif
 
+INSTALL_TARGET=        install-bin
+INSTALL_TARGET+=       install-man
 post-install:
-       cd ${WRKSRC}/doc && ${INSTALL_DATA} *.html *.txt \
+       cd ${WRKSRC}/doc && ${INSTALL_DATA} *.html \
                ${DESTDIR}${PREFIX}/${HTMLDIR}
+       cd ${WRKSRC}/doc/gifstandard && ${INSTALL_DATA} *.txt \
+               ${DESTDIR}${PREFIX}/${HTMLDIR}/gifstandard
        cd ${WRKSRC}/doc/whatsinagif && ${INSTALL_DATA} *.html *.gif \
                ${DESTDIR}${PREFIX}/${HTMLDIR}/whatsinagif
 

Index: pkgsrc/graphics/giflib-util/PLIST
diff -u pkgsrc/graphics/giflib-util/PLIST:1.4 pkgsrc/graphics/giflib-util/PLIST:1.5
--- pkgsrc/graphics/giflib-util/PLIST:1.4       Thu May 15 14:16:11 2014
+++ pkgsrc/graphics/giflib-util/PLIST   Tue Jan  7 20:25:14 2020
@@ -1,24 +1,24 @@
-@comment $NetBSD: PLIST,v 1.4 2014/05/15 14:16:11 adam Exp $
+@comment $NetBSD: PLIST,v 1.5 2020/01/07 20:25:14 sevan Exp $
 bin/gif2rgb
 bin/gifbuild
 bin/gifclrmp
-bin/gifecho
 bin/giffix
-bin/gifinto
 bin/giftext
 bin/giftool
 man/man1/gif2rgb.1
+man/man1/gifbg.1
 man/man1/gifbuild.1
 man/man1/gifclrmp.1
+man/man1/gifcolor.1
 man/man1/gifecho.1
 man/man1/giffix.1
+man/man1/gifhisto.1
 man/man1/gifinto.1
 man/man1/giflib.1
 man/man1/giftext.1
 man/man1/giftool.1
+man/man1/gifwedge.1
 share/doc/giflib/gif2rgb.html
-share/doc/giflib/gif87.txt
-share/doc/giflib/gif89.txt
 share/doc/giflib/gif_lib.html
 share/doc/giflib/gifbg.html
 share/doc/giflib/gifbuild.html
@@ -29,11 +29,13 @@ share/doc/giflib/giffix.html
 share/doc/giflib/gifhisto.html
 share/doc/giflib/gifinto.html
 share/doc/giflib/giflib.html
+share/doc/giflib/gifstandard/gif87.txt
+share/doc/giflib/gifstandard/gif89.txt
 share/doc/giflib/giftext.html
 share/doc/giflib/giftool.html
 share/doc/giflib/gifwedge.html
+share/doc/giflib/index.html
 share/doc/giflib/intro.html
-share/doc/giflib/lzgif.txt
 share/doc/giflib/whatsinagif/animation_and_transparency.html
 share/doc/giflib/whatsinagif/bits_and_bytes.html
 share/doc/giflib/whatsinagif/comment_ext.gif

Added files:

Index: pkgsrc/graphics/giflib/patches/patch-Makefile
diff -u /dev/null pkgsrc/graphics/giflib/patches/patch-Makefile:1.1
--- /dev/null   Tue Jan  7 20:25:15 2020
+++ pkgsrc/graphics/giflib/patches/patch-Makefile       Tue Jan  7 20:25:14 2020
@@ -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
+