Received: by mail.netbsd.org (Postfix, from userid 605) id 3FA7B84EB9; Wed, 12 Apr 2023 15:53:56 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 709DB84E7E for ; Wed, 12 Apr 2023 15:53:55 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id riwZVOGXiFFB for ; Wed, 12 Apr 2023 15:53:54 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id BDD0084D05 for ; Wed, 12 Apr 2023 15:53:54 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id B5609FA84; Wed, 12 Apr 2023 15:53:54 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1681314834292540" MIME-Version: 1.0 Date: Wed, 12 Apr 2023 15:53:54 +0000 From: "Thomas Klausner" Subject: CVS commit: pkgsrc/print/libpaper To: pkgsrc-changes@NetBSD.org Reply-To: wiz@netbsd.org X-Mailer: log_accum Message-Id: <20230412155354.B5609FA84@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1681314834292540 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: wiz Date: Wed Apr 12 15:53:54 UTC 2023 Modified Files: pkgsrc/print/libpaper: Makefile PLIST distinfo Log Message: libpaper: revert accidental commit To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 pkgsrc/print/libpaper/Makefile \ pkgsrc/print/libpaper/distinfo cvs rdiff -u -r1.3 -r1.4 pkgsrc/print/libpaper/PLIST Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1681314834292540 Content-Disposition: inline Content-Length: 4077 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/print/libpaper/Makefile diff -u pkgsrc/print/libpaper/Makefile:1.13 pkgsrc/print/libpaper/Makefile:1.14 --- pkgsrc/print/libpaper/Makefile:1.13 Wed Apr 12 15:52:46 2023 +++ pkgsrc/print/libpaper/Makefile Wed Apr 12 15:53:54 2023 @@ -1,36 +1,38 @@ -# $NetBSD: Makefile,v 1.13 2023/04/12 15:52:46 wiz Exp $ +# $NetBSD: Makefile,v 1.14 2023/04/12 15:53:54 wiz Exp $ -DISTNAME= libpaper-2.0.11 +DISTNAME= libpaper_1.1.29 +PKGNAME= ${DISTNAME:S/_/-/} CATEGORIES= print -MASTER_SITES= ${MASTER_SITE_GITHUB:=rrthomas/} -GITHUB_RELEASE= v${PKGVERSION_NOREV} +MASTER_SITES= ${MASTER_SITE_DEBIAN:=pool/main/libp/libpaper/} MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= https://github.com/rrthomas/libpaper +HOMEPAGE= https://packages.qa.debian.org/libp/libpaper.html COMMENT= Paper size handling library -LICENSE= gnu-gpl-v3 AND gnu-lgpl-v2.1 +LICENSE= gnu-gpl-v2 +WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} GNU_CONFIGURE= yes CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} -CONFIGURE_ARGS+= --enable-relocatable USE_LIBTOOL= yes -USE_TOOLS+= gmake - -TEST_TARGET= check +USE_TOOLS+= autoconf automake gmake EGDIR= ${PREFIX}/share/examples/libpaper -CONF_FILES+= ${EGDIR}/papersize ${PKG_SYSCONFDIR}/papersize -CONF_FILES+= ${EGDIR}/paperspecs ${PKG_SYSCONFDIR}/paperspecs -INSTALLATION_DIRS= ${EGDIR} +CONF_FILES= ${EGDIR}/papersize ${PKG_SYSCONFDIR}/papersize 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: - ${ECHO} ${PAPERSIZE} > ${WRKDIR}/papersize + PAPERCONF=${WRKDIR}/papersize PATH=${WRKSRC}/src:$${PATH} ${SH} \ + ${WRKSRC}/src/paperconfig -p ${PAPERSIZE} post-install: - ${MV} ${DESTDIR}${PKG_SYSCONFDIR}/paperspecs ${DESTDIR}${EGDIR} + ${INSTALL_DATA_DIR} ${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.13 pkgsrc/print/libpaper/distinfo:1.14 --- pkgsrc/print/libpaper/distinfo:1.13 Wed Apr 12 15:52:46 2023 +++ pkgsrc/print/libpaper/distinfo Wed Apr 12 15:53:54 2023 @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.13 2023/04/12 15:52:46 wiz Exp $ +$NetBSD: distinfo,v 1.14 2023/04/12 15:53:54 wiz Exp $ -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 +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 Index: pkgsrc/print/libpaper/PLIST diff -u pkgsrc/print/libpaper/PLIST:1.3 pkgsrc/print/libpaper/PLIST:1.4 --- pkgsrc/print/libpaper/PLIST:1.3 Wed Apr 12 15:52:46 2023 +++ pkgsrc/print/libpaper/PLIST Wed Apr 12 15:53:54 2023 @@ -1,10 +1,24 @@ -@comment $NetBSD: PLIST,v 1.3 2023/04/12 15:52:46 wiz Exp $ -bin/paper -bin/paper.bin +@comment $NetBSD: PLIST,v 1.4 2023/04/12 15:53:54 wiz Exp $ +bin/paperconf include/paper.h lib/libpaper.la -man/man1/paper.1 -man/man5/paperspecs.5 -share/doc/libpaper/README +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 share/examples/libpaper/papersize -share/examples/libpaper/paperspecs --_----------=_1681314834292540--