CVS commit: pkgsrc/graphics

["Niclas Rosenvik" <nros%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nros
Date:           Thu Dec 21 10:46:15 UTC 2023

Modified Files:
        pkgsrc/graphics/giflib: distinfo
        pkgsrc/graphics/giflib-util: Makefile
        pkgsrc/graphics/giflib/patches: patch-Makefile

Log Message:
giflib-util: Fix manpage installation when custom PKGMANDIR is set


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 pkgsrc/graphics/giflib/distinfo
cvs rdiff -u -r1.13 -r1.14 pkgsrc/graphics/giflib-util/Makefile
cvs rdiff -u -r1.6 -r1.7 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/distinfo
diff -u pkgsrc/graphics/giflib/distinfo:1.27 pkgsrc/graphics/giflib/distinfo:1.28
--- pkgsrc/graphics/giflib/distinfo:1.27        Thu Nov  9 20:31:00 2023
+++ pkgsrc/graphics/giflib/distinfo     Thu Dec 21 10:46:14 2023
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.27 2023/11/09 20:31:00 nia Exp $
+$NetBSD: distinfo,v 1.28 2023/12/21 10:46:14 nros Exp $
 
 BLAKE2s (giflib-5.2.1.tar.gz) = cac59c8c5042cb67b4dfef98e3344a79817e775409bc37839cabcdd184753ad0
 SHA512 (giflib-5.2.1.tar.gz) = 4550e53c21cb1191a4581e363fc9d0610da53f7898ca8320f0d3ef6711e76bdda2609c2df15dc94c45e28bff8de441f1227ec2da7ea827cb3c0405af4faa4736
 Size (giflib-5.2.1.tar.gz) = 444187 bytes
 SHA1 (patch-CVE-2022-28506) = 1c1819a656dfd5ee82ddc4b7981ab42548e76d6a
-SHA1 (patch-Makefile) = d5ab65b221def648b0721113d17014a0554b4e5b
+SHA1 (patch-Makefile) = d8c03a112ce913ce03f4afb128ccef3a42d639c9

Index: pkgsrc/graphics/giflib-util/Makefile
diff -u pkgsrc/graphics/giflib-util/Makefile:1.13 pkgsrc/graphics/giflib-util/Makefile:1.14
--- pkgsrc/graphics/giflib-util/Makefile:1.13   Tue Jun  6 12:41:31 2023
+++ pkgsrc/graphics/giflib-util/Makefile        Thu Dec 21 10:46:15 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2023/06/06 12:41:31 riastradh Exp $
+# $NetBSD: Makefile,v 1.14 2023/12/21 10:46:15 nros Exp $
 
 PKGREVISION= 1
 .include "../../graphics/giflib/Makefile.common"
@@ -11,6 +11,8 @@ CONFLICTS+=   libungif-[0-9]*
 
 TOOL_DEPENDS+= xmlto-[0-9]*:../../textproc/xmlto
 
+INSTALL_ENV+=          MANDIR=${PREFIX}/${PKGMANDIR}
+
 HTMLDIR=               share/doc/giflib
 INSTALLATION_DIRS=     ${HTMLDIR} ${HTMLDIR}/gifstandard \
                        ${HTMLDIR}/whatsinagif

Index: pkgsrc/graphics/giflib/patches/patch-Makefile
diff -u pkgsrc/graphics/giflib/patches/patch-Makefile:1.6 pkgsrc/graphics/giflib/patches/patch-Makefile:1.7
--- pkgsrc/graphics/giflib/patches/patch-Makefile:1.6   Thu Nov  9 20:31:00 2023
+++ pkgsrc/graphics/giflib/patches/patch-Makefile       Thu Dec 21 10:46:15 2023
@@ -1,7 +1,7 @@
-$NetBSD: patch-Makefile,v 1.6 2023/11/09 20:31:00 nia Exp $
+$NetBSD: patch-Makefile,v 1.7 2023/12/21 10:46:15 nros Exp $
 
 - Inherit the PREFIX rather than hard-coding it.
-- Adjust location where manuals are installed.
+- Allow override of MANDIR to install manpages correctly
 - Apply <https://sourceforge.net/p/giflib/bugs/_discuss/thread/4e811ad29b/>
   to fix Darwin build
 - Move quantize.c back into libgif.so to fix various library users.
@@ -25,7 +25,7 @@ $NetBSD: patch-Makefile,v 1.6 2023/11/09
  INCDIR = $(PREFIX)/include
  LIBDIR = $(PREFIX)/lib
 -MANDIR = $(PREFIX)/share/man
-+MANDIR = $(PREFIX)/man
++MANDIR?= $(PREFIX)/share/man
  
  # No user-serviceable parts below this line