pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/archivers/arqiver arqiver: first pass at correcting de...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/e16e80e1dfe4
branches:  trunk
changeset: 411504:e16e80e1dfe4
user:      gutteridge <gutteridge%pkgsrc.org@localhost>
date:      Fri Feb 14 04:58:54 2020 +0000

description:
arqiver: first pass at correcting dependency issues

This software has a lot of hard-coded references to external binaries,
with sometimes incorrect assumptions. Deal with these through the SUBST
framework for now. (Any mistakes here are solely mine.)

diffstat:

 archivers/arqiver/Makefile |  21 +++++++++++++++++++--
 1 files changed, 19 insertions(+), 2 deletions(-)

diffs (46 lines):

diff -r eec37a3763ca -r e16e80e1dfe4 archivers/arqiver/Makefile
--- a/archivers/arqiver/Makefile        Fri Feb 14 00:50:51 2020 +0000
+++ b/archivers/arqiver/Makefile        Fri Feb 14 04:58:54 2020 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1 2020/02/13 03:00:16 gutteridge Exp $
+# $NetBSD: Makefile,v 1.2 2020/02/14 04:58:54 gutteridge Exp $
 
 DISTNAME=      Arqiver-V0.3.2
 PKGNAME=       arqiver-0.3.2
+PKGREVISION=   1
 CATEGORIES=    archivers
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=tsujan/}
 GITHUB_TAG=    V${PKGVERSION_NOREV}
@@ -13,15 +14,31 @@
 
 WRKSRC=                ${WRKDIR}/Arqiver-0.3.2
 USE_LANGUAGES= c++
-USE_TOOLS+=    pkg-config
+USE_TOOLS+=    pkg-config bsdtar:run gzip:run 7za:run
 
 INSTALL_MAKE_FLAGS+=   INSTALL_ROOT=${DESTDIR}
 
+SUBST_CLASSES+=                prefix
+SUBST_MESSAGE.prefix=  Fixing paths.
+SUBST_STAGE.prefix=    pre-configure
+SUBST_FILES.prefix=    backends.cpp
+SUBST_SED.prefix=      -e 's,"tar","${TOOLS_PATH.bsdtar}",g'
+SUBST_SED.prefix+=     -e 's,"bsdtar","${TOOLS_PATH.bsdtar}",g'
+SUBST_SED.prefix+=     -e 's,"gzip","${TOOLS_PATH.gzip}",g'
+SUBST_SED.prefix+=     -e 's,"7z","${TOOLS_PATH.7za}",g'
+# (Can't include closing double-quotes below, as there are varying
+# character sequences following the command references.)
+SUBST_SED.prefix+=     -e 's,"xdg-open,"${PREFIX}/bin/xdg-open,g'
+
 do-configure:
        cd ${WRKSRC} && \
        ${SETENV} ${CONFIGURE_ENV} \
        ${QTDIR}/bin/qmake -o Makefile PREFIX=${PREFIX}
 
+# Either needs misc/xdg-utils for xdg-open or devel/glib2 for gio.
+# Upstream prefers glib2, but xdg-utils is a lot smaller, so use
+# that for now.
+DEPENDS+=      xdg-utils-[0-9]*:../../misc/xdg-utils
 TOOL_DEPENDS+= qt5-qttools-[0-9]*:../../x11/qt5-qttools
 
 .include "../../x11/qt5-qtbase/buildlink3.mk"



Home | Main Index | Thread Index | Old Index