CVS commit: pkgsrc/print/libpaper

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu Apr 13 14:12:13 UTC 2023

Modified Files:
        pkgsrc/print/libpaper: Makefile PLIST distinfo

Log Message:
libpaper: update to 2.1.0.

New major version from a new, active upstream.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 pkgsrc/print/libpaper/Makefile \
    pkgsrc/print/libpaper/distinfo
cvs rdiff -u -r1.4 -r1.5 pkgsrc/print/libpaper/PLIST

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.14 pkgsrc/print/libpaper/Makefile:1.15
--- pkgsrc/print/libpaper/Makefile:1.14 Wed Apr 12 15:53:54 2023
+++ pkgsrc/print/libpaper/Makefile      Thu Apr 13 14:12:13 2023
@@ -1,38 +1,35 @@
-# $NetBSD: Makefile,v 1.14 2023/04/12 15:53:54 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2023/04/13 14:12:13 wiz Exp $
 
-DISTNAME=      libpaper_1.1.29
-PKGNAME=       ${DISTNAME:S/_/-/}
+DISTNAME=      libpaper-2.1.0
 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 "../../mk/bsd.pkg.mk"
Index: pkgsrc/print/libpaper/distinfo
diff -u pkgsrc/print/libpaper/distinfo:1.14 pkgsrc/print/libpaper/distinfo:1.15
--- pkgsrc/print/libpaper/distinfo:1.14 Wed Apr 12 15:53:54 2023
+++ pkgsrc/print/libpaper/distinfo      Thu Apr 13 14:12:13 2023
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.14 2023/04/12 15:53:54 wiz Exp $
+$NetBSD: distinfo,v 1.15 2023/04/13 14:12:13 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.1.0.tar.gz) = 9fc62b12bf4cbc0c35e826495d7c1863d0dffa72de35185a6966a2c6e58bac41
+SHA512 (libpaper-2.1.0.tar.gz) = 0e54084ee4aada1eb87cb8e0423ff23039298b0135c7f1c7c92794ef9010ab0704e5fab94f2e34dfbee2f8c048e11b6acecc04a4f3ac7c772dec5be43f870392
+Size (libpaper-2.1.0.tar.gz) = 1306128 bytes

Index: pkgsrc/print/libpaper/PLIST
diff -u pkgsrc/print/libpaper/PLIST:1.4 pkgsrc/print/libpaper/PLIST:1.5
--- pkgsrc/print/libpaper/PLIST:1.4     Wed Apr 12 15:53:54 2023
+++ pkgsrc/print/libpaper/PLIST Thu Apr 13 14:12:13 2023
@@ -1,24 +1,12 @@
-@comment $NetBSD: PLIST,v 1.4 2023/04/12 15:53:54 wiz Exp $
+@comment $NetBSD: PLIST,v 1.5 2023/04/13 14:12:13 wiz Exp $
+bin/paper
+bin/paper.bin
 bin/paperconf
+bin/paperconf.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