Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/converters/unoconv Obtain system-dependant pkg_info fu...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/1a309f1700e6
branches:  trunk
changeset: 430264:1a309f1700e6
user:      manu <manu%pkgsrc.org@localhost>
date:      Wed Apr 29 13:56:10 2020 +0000

description:
Obtain system-dependant pkg_info full path

diffstat:

 converters/unoconv/Makefile         |  8 ++++----
 converters/unoconv/files/unoconv.sh |  4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diffs (37 lines):

diff -r 67741012cc10 -r 1a309f1700e6 converters/unoconv/Makefile
--- a/converters/unoconv/Makefile       Wed Apr 29 13:53:31 2020 +0000
+++ b/converters/unoconv/Makefile       Wed Apr 29 13:56:10 2020 +0000
@@ -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 @@
 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
diff -r 67741012cc10 -r 1a309f1700e6 converters/unoconv/files/unoconv.sh
--- a/converters/unoconv/files/unoconv.sh       Wed Apr 29 13:53:31 2020 +0000
+++ b/converters/unoconv/files/unoconv.sh       Wed Apr 29 13:56:10 2020 +0000
@@ -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



Home | Main Index | Thread Index | Old Index