Sat Apr 15 19:16:33 2023 UTC ()
libpaper: Disable relocatable for Darwin

pkgsrc changes:
---------------
  * Fix build issue on Darwin when relocatable is enabled by disabling it.
  * Bump revision.


(triaxx)
diff -r1.15 -r1.16 pkgsrc/print/libpaper/Makefile
diff -r1.5 -r1.6 pkgsrc/print/libpaper/PLIST
cvs diff -r1.15 -r1.16 pkgsrc/print/libpaper/Makefile (expand / switch to unified diff)

--- pkgsrc/print/libpaper/Makefile 2023/04/13 14:12:13 1.15
+++ pkgsrc/print/libpaper/Makefile 2023/04/15 19:16:33 1.16
@@ -1,35 +1,44 @@ @@ -1,35 +1,44 @@
1# $NetBSD: Makefile,v 1.15 2023/04/13 14:12:13 wiz Exp $ 1# $NetBSD: Makefile,v 1.16 2023/04/15 19:16:33 triaxx Exp $
2 2
3DISTNAME= libpaper-2.1.0 3DISTNAME= libpaper-2.1.0
 4PKGREVISION= 1
4CATEGORIES= print 5CATEGORIES= print
5MASTER_SITES= ${MASTER_SITE_GITHUB:=rrthomas/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=rrthomas/}
6GITHUB_RELEASE= v${PKGVERSION_NOREV} 7GITHUB_RELEASE= v${PKGVERSION_NOREV}
7 8
8MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= https://github.com/rrthomas/libpaper 10HOMEPAGE= https://github.com/rrthomas/libpaper
10COMMENT= Paper size handling library 11COMMENT= Paper size handling library
11LICENSE= gnu-gpl-v3 AND gnu-lgpl-v2.1 12LICENSE= gnu-gpl-v3 AND gnu-lgpl-v2.1
12 13
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+= gmake
18 18
19TEST_TARGET= check 19TEST_TARGET= check
20 20
21EGDIR= ${PREFIX}/share/examples/libpaper 21EGDIR= ${PREFIX}/share/examples/libpaper
22CONF_FILES+= ${EGDIR}/papersize ${PKG_SYSCONFDIR}/papersize 22CONF_FILES+= ${EGDIR}/papersize ${PKG_SYSCONFDIR}/papersize
23CONF_FILES+= ${EGDIR}/paperspecs ${PKG_SYSCONFDIR}/paperspecs 23CONF_FILES+= ${EGDIR}/paperspecs ${PKG_SYSCONFDIR}/paperspecs
24INSTALLATION_DIRS= ${EGDIR} 24INSTALLATION_DIRS= ${EGDIR}
25 25
26BUILD_DEFS= PAPERSIZE 26BUILD_DEFS= PAPERSIZE
27 27
 28.include "../../mk/bsd.prefs.mk"
 29
 30PLIST_VARS= relo
 31
 32.if ${OPSYS} != "Darwin"
 33CONFIGURE_ARGS+= --enable-relocatable
 34PLIST.relo= yes
 35.endif
 36
28post-build: 37post-build:
29 ${ECHO} ${PAPERSIZE} > ${WRKDIR}/papersize 38 ${ECHO} ${PAPERSIZE} > ${WRKDIR}/papersize
30 39
31post-install: 40post-install:
32 ${MV} ${DESTDIR}${PKG_SYSCONFDIR}/paperspecs ${DESTDIR}${EGDIR} 41 ${MV} ${DESTDIR}${PKG_SYSCONFDIR}/paperspecs ${DESTDIR}${EGDIR}
33 ${INSTALL_DATA} ${WRKDIR}/papersize ${DESTDIR}${EGDIR}/papersize 42 ${INSTALL_DATA} ${WRKDIR}/papersize ${DESTDIR}${EGDIR}/papersize
34 43
35.include "../../mk/bsd.pkg.mk" 44.include "../../mk/bsd.pkg.mk"
cvs diff -r1.5 -r1.6 pkgsrc/print/libpaper/PLIST (expand / switch to unified diff)

--- pkgsrc/print/libpaper/PLIST 2023/04/13 14:12:13 1.5
+++ pkgsrc/print/libpaper/PLIST 2023/04/15 19:16:33 1.6
@@ -1,12 +1,12 @@ @@ -1,12 +1,12 @@
1@comment $NetBSD: PLIST,v 1.5 2023/04/13 14:12:13 wiz Exp $ 1@comment $NetBSD: PLIST,v 1.6 2023/04/15 19:16:33 triaxx Exp $
2bin/paper 2bin/paper
3bin/paper.bin 3${PLIST.relo}bin/paper.bin
4bin/paperconf 4bin/paperconf
5bin/paperconf.bin 5${PLIST.relo}bin/paperconf.bin
6include/paper.h 6include/paper.h
7lib/libpaper.la 7lib/libpaper.la
8man/man1/paper.1 8man/man1/paper.1
9man/man5/paperspecs.5 9man/man5/paperspecs.5
10share/doc/libpaper/README 10share/doc/libpaper/README
11share/examples/libpaper/papersize 11share/examples/libpaper/papersize
12share/examples/libpaper/paperspecs 12share/examples/libpaper/paperspecs