CVS commit: pkgsrc/print/libpaper

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Apr 12 15:52:46 UTC 2023

Modified Files:
        pkgsrc/print/libpaper: Makefile PLIST buildlink3.mk distinfo

Log Message:
libpaper: update to 2.0.11.

Fix tests on some systems.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 pkgsrc/print/libpaper/Makefile \
    pkgsrc/print/libpaper/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/print/libpaper/PLIST
cvs rdiff -u -r1.3 -r1.4 pkgsrc/print/libpaper/buildlink3.mk

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

Modified files:

Index: pkgsrc/print/libpaper/Makefile
diff -u pkgsrc/print/libpaper/Makefile:1.12 pkgsrc/print/libpaper/Makefile:1.13
--- pkgsrc/print/libpaper/Makefile:1.12 Sun Mar 19 06:58:40 2023
+++ pkgsrc/print/libpaper/Makefile      Wed Apr 12 15:52:46 2023
@@ -1,38 +1,36 @@
-# $NetBSD: Makefile,v 1.12 2023/03/19 06:58:40 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2023/04/12 15:52:46 wiz Exp $
 
-DISTNAME=      libpaper_1.1.29
-PKGNAME=       ${DISTNAME:S/_/-/}
+DISTNAME=      libpaper-2.0.11
 CATEGORIES=    print
-MASTER_SITES=  ${MASTER_SITE_DEBIAN:=pool/main/libp/libpaper/}
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=rrthomas/}
+GITHUB_RELEASE=        v${PKGVERSION_NOREV}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=      https://packages.qa.debian.org/libp/libpaper.html
+HOMEPAGE=      https://github.com/rrthomas/libpaper
 COMMENT=       Paper size handling library
-LICENSE=       gnu-gpl-v2
+LICENSE=       gnu-gpl-v3 AND gnu-lgpl-v2.1
 
-WRKSRC=                        ${WRKDIR}/${PKGNAME_NOREV}
 GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=       --enable-relocatable
 USE_LIBTOOL=           yes
-USE_TOOLS+=            autoconf automake gmake
+USE_TOOLS+=            gmake
+
+TEST_TARGET=           check
 
 EGDIR=                 ${PREFIX}/share/examples/libpaper
-CONF_FILES=            ${EGDIR}/papersize ${PKG_SYSCONFDIR}/papersize
+CONF_FILES+=           ${EGDIR}/papersize ${PKG_SYSCONFDIR}/papersize
+CONF_FILES+=           ${EGDIR}/paperspecs ${PKG_SYSCONFDIR}/paperspecs
+INSTALLATION_DIRS=     ${EGDIR}
 
 BUILD_DEFS=            PAPERSIZE
 
-.include "../../devel/libgetopt/buildlink3.mk"
-
-# missing generated files in 1.1.26 and newer tarballs
-pre-configure:
-       cd ${WRKSRC} && autoreconf -fiv
-
 post-build:
-       PAPERCONF=${WRKDIR}/papersize PATH=${WRKSRC}/src:$${PATH} ${SH} \
-           ${WRKSRC}/src/paperconfig -p ${PAPERSIZE}
+       ${ECHO} ${PAPERSIZE} > ${WRKDIR}/papersize
 
 post-install:
-       ${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}
+       ${MV} ${DESTDIR}${PKG_SYSCONFDIR}/paperspecs ${DESTDIR}${EGDIR}
        ${INSTALL_DATA} ${WRKDIR}/papersize ${DESTDIR}${EGDIR}/papersize
 
+.include "../../devel/libgetopt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
Index: pkgsrc/print/libpaper/distinfo
diff -u pkgsrc/print/libpaper/distinfo:1.12 pkgsrc/print/libpaper/distinfo:1.13
--- pkgsrc/print/libpaper/distinfo:1.12 Sun Mar 19 06:58:40 2023
+++ pkgsrc/print/libpaper/distinfo      Wed Apr 12 15:52:46 2023
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.12 2023/03/19 06:58:40 wiz Exp $
+$NetBSD: distinfo,v 1.13 2023/04/12 15:52:46 wiz Exp $
 
-BLAKE2s (libpaper_1.1.29.tar.gz) = 82f8ba37b0599ae571fb07bec4f5d7f302fc99557b80e4454fed843ddcd9cedf
-SHA512 (libpaper_1.1.29.tar.gz) = 7d40178baa551f89aec23f1db0b860e095686b5369f1064d053178c6561f694862019aa4f7037d991a1f06ed95f2887ba7daa7b3c6e752a9ae15980ff56bc0d1
-Size (libpaper_1.1.29.tar.gz) = 44942 bytes
+BLAKE2s (libpaper-2.0.11.tar.gz) = f920bd7469137eb0614c8bf78fb60d5d004e2b25852ab9f23b45572ce3b0bad2
+SHA512 (libpaper-2.0.11.tar.gz) = 129d18a91992d8ec85a2f20cf67e66458fdf6ca9acbe07e820cd34063a03b1bc9835f2d70ad9766e9e02e1ff693a595a8fd11776c0152f379e31da5506b5785c
+Size (libpaper-2.0.11.tar.gz) = 1304618 bytes

Index: pkgsrc/print/libpaper/PLIST
diff -u pkgsrc/print/libpaper/PLIST:1.2 pkgsrc/print/libpaper/PLIST:1.3
--- pkgsrc/print/libpaper/PLIST:1.2     Thu Apr 22 11:58:51 2010
+++ pkgsrc/print/libpaper/PLIST Wed Apr 12 15:52:46 2023
@@ -1,24 +1,10 @@
-@comment $NetBSD: PLIST,v 1.2 2010/04/22 11:58:51 jmmv Exp $
-bin/paperconf
+@comment $NetBSD: PLIST,v 1.3 2023/04/12 15:52:46 wiz Exp $
+bin/paper
+bin/paper.bin
 include/paper.h
 lib/libpaper.la
-man/man1/paperconf.1
-man/man3/defaultpapername.3
-man/man3/defaultpapersizefile.3
-man/man3/paperdone.3
-man/man3/paperfirst.3
-man/man3/paperinfo.3
-man/man3/paperinit.3
-man/man3/paperlast.3
-man/man3/papernext.3
-man/man3/paperprev.3
-man/man3/paperpsheight.3
-man/man3/paperpsname.3
-man/man3/paperpswidth.3
-man/man3/paperwithsize.3
-man/man3/systempapername.3
-man/man3/systempapersizefile.3
-man/man5/papersize.5
-man/man8/paperconfig.8
-sbin/paperconfig
+man/man1/paper.1
+man/man5/paperspecs.5
+share/doc/libpaper/README
 share/examples/libpaper/papersize
+share/examples/libpaper/paperspecs

Index: pkgsrc/print/libpaper/buildlink3.mk
diff -u pkgsrc/print/libpaper/buildlink3.mk:1.3 pkgsrc/print/libpaper/buildlink3.mk:1.4
--- pkgsrc/print/libpaper/buildlink3.mk:1.3     Sun Jan  7 13:04:28 2018
+++ pkgsrc/print/libpaper/buildlink3.mk Wed Apr 12 15:52:46 2023
@@ -1,12 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:28 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2023/04/12 15:52:46 wiz Exp $
 
 BUILDLINK_TREE+=       libpaper
 
 .if !defined(LIBPAPER_BUILDLINK3_MK)
 LIBPAPER_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.libpaper+=       libpaper>=1.1.22
-BUILDLINK_PKGSRCDIR.libpaper?=         ../../print/libpaper
-.endif # LIBPAPER_BUILDLINK3_MK
+BUILDLINK_API_DEPENDS.libpaper+=       libpaper>=2.0.10
+BUILDLINK_PKGSRCDIR.libpaper?=         ../../wip/libpaper2
+
+.endif # LIBPAPER_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -libpaper