CVS commit: pkgsrc/x11/libXpm

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sat Nov 19 21:34:31 UTC 2022

Modified Files:
        pkgsrc/x11/libXpm: Makefile PLIST builtin.mk distinfo
        pkgsrc/x11/libXpm/patches: patch-aa

Log Message:
libXpm: update to 3.5.14.

The only changes to the code in this release are typo fixes in the
comments, but the big change is the addition of man pages, thanks
to the work Walter Harms did to convert the API docs from the old
Postscript file into man page format.

Alan Coopersmith (11):
      Build xz tarballs instead of bzip2
      Fix spelling/wording issues
      man: strip trailing whitespace
      gitlab CI: add a basic build test
      man pages: Make file names consistent with their displayed names
      man pages: Fix shadow man pages
      man pages: Make function synopses more consistent with other pages
      man pages: Add missing word 'function' where needed
      man pages: Fix typos
      man pages: Correct Copyright/License notices
      libXpm 3.5.14

Walter Harms (2):
      add man pages based on doc/xpm.PS
      update man pages


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 pkgsrc/x11/libXpm/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 pkgsrc/x11/libXpm/PLIST
cvs rdiff -u -r1.2 -r1.3 pkgsrc/x11/libXpm/builtin.mk
cvs rdiff -u -r1.11 -r1.12 pkgsrc/x11/libXpm/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/x11/libXpm/patches/patch-aa

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

Modified files:

Index: pkgsrc/x11/libXpm/Makefile
diff -u pkgsrc/x11/libXpm/Makefile:1.25 pkgsrc/x11/libXpm/Makefile:1.26
--- pkgsrc/x11/libXpm/Makefile:1.25     Wed Nov  9 13:14:22 2022
+++ pkgsrc/x11/libXpm/Makefile  Sat Nov 19 21:34:31 2022
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.25 2022/11/09 13:14:22 joerg Exp $
+# $NetBSD: Makefile,v 1.26 2022/11/19 21:34:31 wiz Exp $
 
-DISTNAME=              libXpm-3.5.13
-CATEGORIES=            graphics x11
+DISTNAME=              libXpm-3.5.14
+CATEGORIES=            x11 graphics
 MASTER_SITES=          ${MASTER_SITE_XORG:=lib/}
-EXTRACT_SUFX=          .tar.bz2
+EXTRACT_SUFX=          .tar.xz
 
 MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=              https://xorg.freedesktop.org/

Index: pkgsrc/x11/libXpm/PLIST
diff -u pkgsrc/x11/libXpm/PLIST:1.1.1.1 pkgsrc/x11/libXpm/PLIST:1.2
--- pkgsrc/x11/libXpm/PLIST:1.1.1.1     Fri Nov  3 21:06:54 2006
+++ pkgsrc/x11/libXpm/PLIST     Sat Nov 19 21:34:31 2022
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/11/03 21:06:54 joerg Exp $
+@comment $NetBSD: PLIST,v 1.2 2022/11/19 21:34:31 wiz Exp $
 bin/cxpm
 bin/sxpm
 include/X11/xpm.h
@@ -6,3 +6,44 @@ lib/libXpm.la
 lib/pkgconfig/xpm.pc
 man/man1/cxpm.1
 man/man1/sxpm.1
+man/man3/XpmAttributesSize.3
+man/man3/XpmCreateBuffer.3
+man/man3/XpmCreateBufferFromImage.3
+man/man3/XpmCreateBufferFromPixmap.3
+man/man3/XpmCreateBufferFromXpmImage.3
+man/man3/XpmCreateData.3
+man/man3/XpmCreateDataFromImage.3
+man/man3/XpmCreateDataFromPixmap.3
+man/man3/XpmCreateDataFromXpmImage.3
+man/man3/XpmCreateImage.3
+man/man3/XpmCreateImageFromBuffer.3
+man/man3/XpmCreateImageFromData.3
+man/man3/XpmCreateImageFromXpmImage.3
+man/man3/XpmCreatePixmap.3
+man/man3/XpmCreatePixmapFromBuffer.3
+man/man3/XpmCreatePixmapFromData.3
+man/man3/XpmCreatePixmapFromXpmImage.3
+man/man3/XpmCreateXpmImage.3
+man/man3/XpmCreateXpmImageFromBuffer.3
+man/man3/XpmCreateXpmImageFromData.3
+man/man3/XpmCreateXpmImageFromImage.3
+man/man3/XpmCreateXpmImageFromPixmap.3
+man/man3/XpmFree.3
+man/man3/XpmFreeAttributes.3
+man/man3/XpmFreeExtensions.3
+man/man3/XpmFreeXpmImage.3
+man/man3/XpmFreeXpmInfo.3
+man/man3/XpmGetErrorString.3
+man/man3/XpmLibraryVersion.3
+man/man3/XpmMisc.3
+man/man3/XpmRead.3
+man/man3/XpmReadFileToBuffer.3
+man/man3/XpmReadFileToData.3
+man/man3/XpmReadFileToImage.3
+man/man3/XpmReadFileToPixmap.3
+man/man3/XpmReadFileToXpmImage.3
+man/man3/XpmWrite.3
+man/man3/XpmWriteFileFromBuffer.3
+man/man3/XpmWriteFileFromImage.3
+man/man3/XpmWriteFileFromPixmap.3
+man/man3/XpmWriteFileFromXpmImage.3

Index: pkgsrc/x11/libXpm/builtin.mk
diff -u pkgsrc/x11/libXpm/builtin.mk:1.2 pkgsrc/x11/libXpm/builtin.mk:1.3
--- pkgsrc/x11/libXpm/builtin.mk:1.2    Sun Nov  3 09:14:12 2019
+++ pkgsrc/x11/libXpm/builtin.mk        Sat Nov 19 21:34:31 2022
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.2 2019/11/03 09:14:12 rillig Exp $
+# $NetBSD: builtin.mk,v 1.3 2022/11/19 21:34:31 wiz Exp $
 
 BUILTIN_PKG:=  libXpm
 
@@ -31,7 +31,7 @@ USE_BUILTIN.libXpm=   no
 .  else
 USE_BUILTIN.libXpm=    ${IS_BUILTIN.libXpm}
 .    if defined(BUILTIN_PKG.libXpm) && \
-        !empty(IS_BUILTIN.libXpm:M[yY][eE][sS])
+        ${IS_BUILTIN.libXpm:tl} == yes
 USE_BUILTIN.libX11=    yes
 .    endif
 .  endif  # PREFER.libXpm

Index: pkgsrc/x11/libXpm/distinfo
diff -u pkgsrc/x11/libXpm/distinfo:1.11 pkgsrc/x11/libXpm/distinfo:1.12
--- pkgsrc/x11/libXpm/distinfo:1.11     Tue Oct 26 11:34:06 2021
+++ pkgsrc/x11/libXpm/distinfo  Sat Nov 19 21:34:31 2022
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.11 2021/10/26 11:34:06 nia Exp $
+$NetBSD: distinfo,v 1.12 2022/11/19 21:34:31 wiz Exp $
 
-BLAKE2s (libXpm-3.5.13.tar.bz2) = 4e3e9db8a60d4f223019beea0edbf32dbd4987fbcd9112db2613af3ef4cf06ef
-SHA512 (libXpm-3.5.13.tar.bz2) = 3b8f6e926272f39b1d95135c2274c00f5aaee1f9fb2ef79f71628df5edeb7ba20158819ef6a778101cc4092493a3b5b613c53634fdccadcc0fc85f0605e5e9a5
-Size (libXpm-3.5.13.tar.bz2) = 463251 bytes
-SHA1 (patch-aa) = c3def60e8162eb5d48056cd27154648eb6ba5e02
+BLAKE2s (libXpm-3.5.14.tar.xz) = aa73cc80d219e008d51f3dcbabd6e83df2ccfecdd73154ab6b9833df95776d24
+SHA512 (libXpm-3.5.14.tar.xz) = c3fe554453068a6b188d3cad2cb3648e84b7f1909aea8f213daadce3d444b34361c3b2edce14a4fd481f97e4dc45c3125e2483ff4f44b3390a75829ed2782e4b
+Size (libXpm-3.5.14.tar.xz) = 392624 bytes
+SHA1 (patch-aa) = 4472bd7d5f80ba2fa0b8779b40df26ace2434f2c
 SHA1 (patch-ab) = faaefb61693805272bd4cccc1301c6e3edd14919
 SHA1 (patch-ac) = 9226dce77b0a7d9c792d9465727423581db7f01e

Index: pkgsrc/x11/libXpm/patches/patch-aa
diff -u pkgsrc/x11/libXpm/patches/patch-aa:1.3 pkgsrc/x11/libXpm/patches/patch-aa:1.4
--- pkgsrc/x11/libXpm/patches/patch-aa:1.3      Sun Jun  3 17:35:38 2012
+++ pkgsrc/x11/libXpm/patches/patch-aa  Sat Nov 19 21:34:31 2022
@@ -1,9 +1,9 @@
-$NetBSD: patch-aa,v 1.3 2012/06/03 17:35:38 wiz Exp $
+$NetBSD: patch-aa,v 1.4 2022/11/19 21:34:31 wiz Exp $
 
---- configure.orig     2012-03-08 04:40:17.000000000 +0000
+--- configure.orig     2022-11-19 20:39:11.000000000 +0000
 +++ configure
-@@ -17654,6 +17654,10 @@ else
- $as_echo "$LOCALEDIR" >&6; }
+@@ -19501,6 +19501,10 @@ else
+ printf "%s\n" "$LOCALEDIR" >&6; }
  fi
  
 +# For pkgsrc, always set USE_GETTEXT=yes because it is used by [cs]xpm.
@@ -12,4 +12,4 @@ $NetBSD: patch-aa,v 1.3 2012/06/03 17:35
 +USE_GETTEXT=yes
  if test "x$USE_GETTEXT" = "xyes" ; then
  
- $as_echo "#define USE_GETTEXT 1" >>confdefs.h
+ printf "%s\n" "#define USE_GETTEXT 1" >>confdefs.h