CVS commit: pkgsrc/print/libpaper

[Frédéric Fauberteau <triaxx%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   triaxx
Date:           Sat Apr 15 19:16:33 UTC 2023

Modified Files:
        pkgsrc/print/libpaper: Makefile PLIST

Log Message:
libpaper: Disable relocatable for Darwin

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


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 pkgsrc/print/libpaper/Makefile
cvs rdiff -u -r1.5 -r1.6 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.15 pkgsrc/print/libpaper/Makefile:1.16
--- pkgsrc/print/libpaper/Makefile:1.15 Thu Apr 13 14:12:13 2023
+++ pkgsrc/print/libpaper/Makefile      Sat Apr 15 19:16:33 2023
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2023/04/13 14:12:13 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2023/04/15 19:16:33 triaxx Exp $
 
 DISTNAME=      libpaper-2.1.0
+PKGREVISION=   1
 CATEGORIES=    print
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=rrthomas/}
 GITHUB_RELEASE=        v${PKGVERSION_NOREV}
@@ -12,7 +13,6 @@ LICENSE=      gnu-gpl-v3 AND gnu-lgpl-v2.1
 
 GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}
-CONFIGURE_ARGS+=       --enable-relocatable
 USE_LIBTOOL=           yes
 USE_TOOLS+=            gmake
 
@@ -25,6 +25,15 @@ INSTALLATION_DIRS=   ${EGDIR}
 
 BUILD_DEFS=            PAPERSIZE
 
+.include "../../mk/bsd.prefs.mk"
+
+PLIST_VARS=    relo
+
+.if ${OPSYS} != "Darwin"
+CONFIGURE_ARGS+=       --enable-relocatable
+PLIST.relo=            yes
+.endif
+
 post-build:
        ${ECHO} ${PAPERSIZE} > ${WRKDIR}/papersize
 

Index: pkgsrc/print/libpaper/PLIST
diff -u pkgsrc/print/libpaper/PLIST:1.5 pkgsrc/print/libpaper/PLIST:1.6
--- pkgsrc/print/libpaper/PLIST:1.5     Thu Apr 13 14:12:13 2023
+++ pkgsrc/print/libpaper/PLIST Sat Apr 15 19:16:33 2023
@@ -1,8 +1,8 @@
-@comment $NetBSD: PLIST,v 1.5 2023/04/13 14:12:13 wiz Exp $
+@comment $NetBSD: PLIST,v 1.6 2023/04/15 19:16:33 triaxx Exp $
 bin/paper
-bin/paper.bin
+${PLIST.relo}bin/paper.bin
 bin/paperconf
-bin/paperconf.bin
+${PLIST.relo}bin/paperconf.bin
 include/paper.h
 lib/libpaper.la
 man/man1/paper.1