CVS commit: pkgsrc/x11/libXpm

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Fri Dec 13 10:42:37 UTC 2019

Modified Files:
        pkgsrc/x11/libXpm: Makefile distinfo

Log Message:
libXpm: update to 3.5.13.

Lest we be accused that users have to wait many years to get fixes out,
let's quickly release the branch before the calendar turns over over again
so it's just some years. The actual fixes here are some found by static
analysers, and a build fix for Windows (which, curiously, is dated to 2012
so clearly we're at the top of the game here). Nothing overly exciting, but
covscan, parfait, etc. should be a bit happier now.

Alan Coopersmith (3):
      After fdopen(), use fclose() instead of close() in error path
      Update README for gitlab migration
      Update configure.ac bug URL for gitlab migration

Benjamin Tissoires (1):
      parse: simplify error paths in xpmParseColors()

Dave Bodenstab (1):
      Windows build fixes

Emil Velikov (1):
      autogen.sh: use quoted string variables

Fabrice Fontaine (1):
      Allow usage when fork() is not available

Mihail Konev (1):
      autogen: add default patch prefix

Peter Hutterer (3):
      autogen.sh: use exec instead of waiting for configure to finish
      parse: avoid memleak on error with STRLCAT/STRLCPY
      libXpm 3.5.13


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 pkgsrc/x11/libXpm/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/x11/libXpm/distinfo

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.18 pkgsrc/x11/libXpm/Makefile:1.19
--- pkgsrc/x11/libXpm/Makefile:1.18     Wed Mar  7 11:57:36 2018
+++ pkgsrc/x11/libXpm/Makefile  Fri Dec 13 10:42:36 2019
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.18 2018/03/07 11:57:36 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2019/12/13 10:42:36 wiz Exp $
 
-DISTNAME=              libXpm-3.5.12
-PKGREVISION=           1
+DISTNAME=              libXpm-3.5.13
 CATEGORIES=            graphics x11
 MASTER_SITES=          ${MASTER_SITE_XORG:=lib/}
 EXTRACT_SUFX=          .tar.bz2
@@ -30,10 +29,10 @@ MAKE_ENV+=          INTLLIBS=${BUILDLINK_LDADD.g
 
 .if ${X11_TYPE} == "native"
 XPM_CFLAGS=    -I${X11BASE}/include
-XPM_LIBS=      -Wl,-rpath,${X11BASE}/lib -L${X11BASE}/lib -lX11
+XPM_LIBS=      ${COMPILER_RPATH_FLAG}${X11BASE}/lib -L${X11BASE}/lib -lX11
 
 SXPM_CFLAGS=   -I${X11BASE}/include
-SXPM_LIBS=     -Wl,-rpath,${X11BASE}/lib -L${X11BASE}/lib -lXt -lXext
+SXPM_LIBS=     ${COMPILER_RPATH_FLAG}${X11BASE}/lib -L${X11BASE}/lib -lXt -lXext
 
 CONFIGURE_ARGS+=       XPM_CFLAGS=${XPM_CFLAGS:Q} \
                        XPM_LIBS=${XPM_LIBS:Q} \

Index: pkgsrc/x11/libXpm/distinfo
diff -u pkgsrc/x11/libXpm/distinfo:1.8 pkgsrc/x11/libXpm/distinfo:1.9
--- pkgsrc/x11/libXpm/distinfo:1.8      Thu Dec 15 23:02:51 2016
+++ pkgsrc/x11/libXpm/distinfo  Fri Dec 13 10:42:36 2019
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.8 2016/12/15 23:02:51 wiz Exp $
+$NetBSD: distinfo,v 1.9 2019/12/13 10:42:36 wiz Exp $
 
-SHA1 (libXpm-3.5.12.tar.bz2) = 4e22fefe61714209539b08051b5287bcd9ecfd04
-RMD160 (libXpm-3.5.12.tar.bz2) = 0b61fc21d24077c3afa72d1ec76512273cb116a9
-SHA512 (libXpm-3.5.12.tar.bz2) = a5707d5f758d577414101b0723af334fc8ac223e5b9f869994765735e1cbd8dafed48ea2851ebc479fecaf84381bfd5fbef842ec971a487f7fa9e77d54d3a17e
-Size (libXpm-3.5.12.tar.bz2) = 430736 bytes
+SHA1 (libXpm-3.5.13.tar.bz2) = 38b1a2728adb49f4e255aba1530f51789815ffc4
+RMD160 (libXpm-3.5.13.tar.bz2) = 6554f024ec432e163f5bc71fddf0fdfbbb85b5ab
+SHA512 (libXpm-3.5.13.tar.bz2) = 3b8f6e926272f39b1d95135c2274c00f5aaee1f9fb2ef79f71628df5edeb7ba20158819ef6a778101cc4092493a3b5b613c53634fdccadcc0fc85f0605e5e9a5
+Size (libXpm-3.5.13.tar.bz2) = 463251 bytes
 SHA1 (patch-aa) = c3def60e8162eb5d48056cd27154648eb6ba5e02
 SHA1 (patch-ab) = faaefb61693805272bd4cccc1301c6e3edd14919
 SHA1 (patch-ac) = 9226dce77b0a7d9c792d9465727423581db7f01e