CVS commit: pkgsrc/converters/unoconv

["Emmanuel Dreyfus" <manu%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   manu
Date:           Wed Apr 29 13:56:10 UTC 2020

Modified Files:
        pkgsrc/converters/unoconv: Makefile
        pkgsrc/converters/unoconv/files: unoconv.sh

Log Message:
Obtain system-dependant pkg_info full path


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/converters/unoconv/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/converters/unoconv/files/unoconv.sh

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/converters/unoconv/Makefile
diff -u pkgsrc/converters/unoconv/Makefile:1.5 pkgsrc/converters/unoconv/Makefile:1.6
--- pkgsrc/converters/unoconv/Makefile:1.5      Tue Apr 28 15:18:44 2020
+++ pkgsrc/converters/unoconv/Makefile  Wed Apr 29 13:56:10 2020
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2020/04/28 15:18:44 manu Exp $
+# $NetBSD: Makefile,v 1.6 2020/04/29 13:56:10 manu Exp $
 
 DISTNAME=      unoconv-0.7
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    converters
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=dagwieers/}
 
@@ -18,8 +18,8 @@ BUILD_DEPENDS+=       asciidoc-[0-9]*:../../te
 DEPENDS+=      libreoffice>=5.3.4.2nb1:../../misc/libreoffice
 
 pre-build:
-       sed "s|@PREFIX@|${PREFIX}|" ${FILESDIR}/unoconv.sh > \
-           ${WRKDIR}/unoconv.sh
+       ${SED} -e "s|@PREFIX@|${PREFIX}|; s|@PKG_INFO_CMD@|${PKG_INFO_CMD}|;" \
+            ${FILESDIR}/unoconv.sh > ${WRKDIR}/unoconv.sh
 
 do-install:
        ${INSTALL_PROGRAM_DIR} ${DESTDIR}/${PREFIX}/bin

Index: pkgsrc/converters/unoconv/files/unoconv.sh
diff -u pkgsrc/converters/unoconv/files/unoconv.sh:1.3 pkgsrc/converters/unoconv/files/unoconv.sh:1.4
--- pkgsrc/converters/unoconv/files/unoconv.sh:1.3      Wed Apr 29 01:54:56 2020
+++ pkgsrc/converters/unoconv/files/unoconv.sh  Wed Apr 29 13:56:10 2020
@@ -1,7 +1,7 @@
 #!/bin/sh
 
-PYTHONBIN=`/usr/sbin/pkg_info -Q PYTHONBIN libreoffice`
-UNO_PATH=`/usr/sbin/pkg_info -Q UNO_PATH libreoffice`
+PYTHONBIN=`@PKG_INFO_CMD@ -Q PYTHONBIN libreoffice`
+UNO_PATH=`@PKG_INFO_CMD@ -Q UNO_PATH libreoffice`
 LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${UNO_PATH}
 
 export UNO_PATH