Wed Apr 12 15:53:54 2023 UTC ()
libpaper: revert accidental commit


(wiz)
diff -r1.13 -r1.14 pkgsrc/print/libpaper/Makefile
diff -r1.13 -r1.14 pkgsrc/print/libpaper/distinfo
diff -r1.3 -r1.4 pkgsrc/print/libpaper/PLIST
cvs diff -r1.13 -r1.14 pkgsrc/print/libpaper/Makefile (expand / switch to unified diff)

--- pkgsrc/print/libpaper/Makefile 2023/04/12 15:52:46 1.13
+++ pkgsrc/print/libpaper/Makefile 2023/04/12 15:53:54 1.14
@@ -1,36 +1,38 @@ @@ -1,36 +1,38 @@
1# $NetBSD: Makefile,v 1.13 2023/04/12 15:52:46 wiz Exp $ 1# $NetBSD: Makefile,v 1.14 2023/04/12 15:53:54 wiz Exp $
2 2
3DISTNAME= libpaper-2.0.11 3DISTNAME= libpaper_1.1.29
 4PKGNAME= ${DISTNAME:S/_/-/}
4CATEGORIES= print 5CATEGORIES= print
5MASTER_SITES= ${MASTER_SITE_GITHUB:=rrthomas/} 6MASTER_SITES= ${MASTER_SITE_DEBIAN:=pool/main/libp/libpaper/}
6GITHUB_RELEASE= v${PKGVERSION_NOREV} 
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= https://github.com/rrthomas/libpaper 9HOMEPAGE= https://packages.qa.debian.org/libp/libpaper.html
10COMMENT= Paper size handling library 10COMMENT= Paper size handling library
11LICENSE= gnu-gpl-v3 AND gnu-lgpl-v2.1 11LICENSE= gnu-gpl-v2
12 12
 13WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
13GNU_CONFIGURE= yes 14GNU_CONFIGURE= yes
14CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} 15CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
15CONFIGURE_ARGS+= --enable-relocatable 
16USE_LIBTOOL= yes 16USE_LIBTOOL= yes
17USE_TOOLS+= gmake 17USE_TOOLS+= autoconf automake gmake
18 
19TEST_TARGET= check 
20 18
21EGDIR= ${PREFIX}/share/examples/libpaper 19EGDIR= ${PREFIX}/share/examples/libpaper
22CONF_FILES+= ${EGDIR}/papersize ${PKG_SYSCONFDIR}/papersize 20CONF_FILES= ${EGDIR}/papersize ${PKG_SYSCONFDIR}/papersize
23CONF_FILES+= ${EGDIR}/paperspecs ${PKG_SYSCONFDIR}/paperspecs 
24INSTALLATION_DIRS= ${EGDIR} 
25 21
26BUILD_DEFS= PAPERSIZE 22BUILD_DEFS= PAPERSIZE
27 23
 24.include "../../devel/libgetopt/buildlink3.mk"
 25
 26# missing generated files in 1.1.26 and newer tarballs
 27pre-configure:
 28 cd ${WRKSRC} && autoreconf -fiv
 29
28post-build: 30post-build:
29 ${ECHO} ${PAPERSIZE} > ${WRKDIR}/papersize 31 PAPERCONF=${WRKDIR}/papersize PATH=${WRKSRC}/src:$${PATH} ${SH} \
 32 ${WRKSRC}/src/paperconfig -p ${PAPERSIZE}
30 33
31post-install: 34post-install:
32 ${MV} ${DESTDIR}${PKG_SYSCONFDIR}/paperspecs ${DESTDIR}${EGDIR} 35 ${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}
33 ${INSTALL_DATA} ${WRKDIR}/papersize ${DESTDIR}${EGDIR}/papersize 36 ${INSTALL_DATA} ${WRKDIR}/papersize ${DESTDIR}${EGDIR}/papersize
34 37
35.include "../../devel/libgetopt/buildlink3.mk" 
36.include "../../mk/bsd.pkg.mk" 38.include "../../mk/bsd.pkg.mk"
cvs diff -r1.13 -r1.14 pkgsrc/print/libpaper/distinfo (expand / switch to unified diff)

--- pkgsrc/print/libpaper/distinfo 2023/04/12 15:52:46 1.13
+++ pkgsrc/print/libpaper/distinfo 2023/04/12 15:53:54 1.14
@@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
1$NetBSD: distinfo,v 1.13 2023/04/12 15:52:46 wiz Exp $ 1$NetBSD: distinfo,v 1.14 2023/04/12 15:53:54 wiz Exp $
2 2
3BLAKE2s (libpaper-2.0.11.tar.gz) = f920bd7469137eb0614c8bf78fb60d5d004e2b25852ab9f23b45572ce3b0bad2 3BLAKE2s (libpaper_1.1.29.tar.gz) = 82f8ba37b0599ae571fb07bec4f5d7f302fc99557b80e4454fed843ddcd9cedf
4SHA512 (libpaper-2.0.11.tar.gz) = 129d18a91992d8ec85a2f20cf67e66458fdf6ca9acbe07e820cd34063a03b1bc9835f2d70ad9766e9e02e1ff693a595a8fd11776c0152f379e31da5506b5785c 4SHA512 (libpaper_1.1.29.tar.gz) = 7d40178baa551f89aec23f1db0b860e095686b5369f1064d053178c6561f694862019aa4f7037d991a1f06ed95f2887ba7daa7b3c6e752a9ae15980ff56bc0d1
5Size (libpaper-2.0.11.tar.gz) = 1304618 bytes 5Size (libpaper_1.1.29.tar.gz) = 44942 bytes
cvs diff -r1.3 -r1.4 pkgsrc/print/libpaper/PLIST (expand / switch to unified diff)

--- pkgsrc/print/libpaper/PLIST 2023/04/12 15:52:46 1.3
+++ pkgsrc/print/libpaper/PLIST 2023/04/12 15:53:54 1.4
@@ -1,10 +1,24 @@ @@ -1,10 +1,24 @@
1@comment $NetBSD: PLIST,v 1.3 2023/04/12 15:52:46 wiz Exp $ 1@comment $NetBSD: PLIST,v 1.4 2023/04/12 15:53:54 wiz Exp $
2bin/paper 2bin/paperconf
3bin/paper.bin 
4include/paper.h 3include/paper.h
5lib/libpaper.la 4lib/libpaper.la
6man/man1/paper.1 5man/man1/paperconf.1
7man/man5/paperspecs.5 6man/man3/defaultpapername.3
8share/doc/libpaper/README 7man/man3/defaultpapersizefile.3
 8man/man3/paperdone.3
 9man/man3/paperfirst.3
 10man/man3/paperinfo.3
 11man/man3/paperinit.3
 12man/man3/paperlast.3
 13man/man3/papernext.3
 14man/man3/paperprev.3
 15man/man3/paperpsheight.3
 16man/man3/paperpsname.3
 17man/man3/paperpswidth.3
 18man/man3/paperwithsize.3
 19man/man3/systempapername.3
 20man/man3/systempapersizefile.3
 21man/man5/papersize.5
 22man/man8/paperconfig.8
 23sbin/paperconfig
9share/examples/libpaper/papersize 24share/examples/libpaper/papersize
10share/examples/libpaper/paperspecs