From 7bec7bb262c659f11061d91f740e0aa6c5920b72 Mon Sep 17 00:00:00 2001 From: Sergey Svishchev Date: Tue, 3 Sep 2013 17:40:00 +0000 Subject: [PATCH] Unbreak build (partially) --- autopsy/Makefile | 15 ++++++++------- zathura/DESCR | 10 +++++----- zathura/Makefile | 4 ++-- 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/autopsy/Makefile b/autopsy/Makefile index 4dfec199cd..3fa4af59ee 100644 --- a/autopsy/Makefile +++ b/autopsy/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2012/09/24 16:56:40 asau Exp $ +# $NetBSD: Makefile,v 1.5 2013/09/03 17:40:00 shattered Exp $ # VERSION=2.21 @@ -14,16 +14,17 @@ LICENSE= gnu-gpl-v2 USE_LANGUAGES= c c++ USE_TOOLS+= gmake perl INSTALLATION_DIRS+= share/autopsy/lib share/autopsy/pict +INSTALLATION_DIRS+= bin man/man1 do-build: - cd ${WRKSRC} && sh build ${PREFIX} + cd ${WRKSRC} && sh build ${DESTDIR}${PREFIX} do-install: - ${INSTALL_SCRIPT} ${WRKSRC}/autopsy ${PREFIX}/bin - ${INSTALL_DATA} ${WRKSRC}/lib/* ${PREFIX}/share/autopsy/lib - ${INSTALL_DATA} ${WRKSRC}/conf.pl ${WRKSRC}/global.css ${PREFIX}/share/autopsy/ - ${INSTALL_DATA} ${WRKSRC}/pict/* ${PREFIX}/share/autopsy/pict - ${INSTALL_MAN} ${WRKSRC}/man/man1/* ${PREFIX}/${PKGMANDIR}/man1/ + ${INSTALL_SCRIPT} ${WRKSRC}/autopsy ${DESTDIR}${PREFIX}/bin + ${INSTALL_DATA} ${WRKSRC}/lib/* ${DESTDIR}${PREFIX}/share/autopsy/lib + ${INSTALL_DATA} ${WRKSRC}/conf.pl ${WRKSRC}/global.css ${DESTDIR}${PREFIX}/share/autopsy/ + ${INSTALL_DATA} ${WRKSRC}/pict/* ${DESTDIR}${PREFIX}/share/autopsy/pict + ${INSTALL_MAN} ${WRKSRC}/man/man1/* ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/ .include "../../sysutils/file/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/zathura/DESCR b/zathura/DESCR index ffaa859e2a..bf504a5f1c 100644 --- a/zathura/DESCR +++ b/zathura/DESCR @@ -1,5 +1,5 @@ - zathura is a highly customizable and functional PDF viewer based - on the poppler rendering library and the gtk+ toolkit. The idea - behind zathura is an application that provides a minimalistic and - space saving interface as well as an easy usage that mainly focuses - on keyboard interaction. +zathura is a highly customizable and functional PDF viewer based +on the poppler rendering library and the gtk+ toolkit. The idea +behind zathura is an application that provides a minimalistic and +space saving interface as well as an easy usage that mainly focuses +on keyboard interaction. diff --git a/zathura/Makefile b/zathura/Makefile index d7a45f35da..1b511d17ee 100644 --- a/zathura/Makefile +++ b/zathura/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2013/06/26 18:41:00 zul_ Exp $ +# $NetBSD: Makefile,v 1.6 2013/09/03 17:40:00 shattered Exp $ # DISTNAME= zathura-0.2.3 @@ -12,7 +12,7 @@ COMMENT= PDF viewer with vi-like keybindings USE_TOOLS+= pkg-config gettext gmake groff USE_LIBTOOL= yes -DEPENDS+= py27-docutils-[0-9]*:../../textproc/py-docutils +DEPENDS+= ${PYPKGPREFIX}-docutils-[0-9]*:../../textproc/py-docutils .include "../../graphics/cairo/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk"