pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/textproc Add destdir support to catdoc and catdoc-tk.
details: https://anonhg.NetBSD.org/pkgsrc/rev/4974b0a2add8
branches: trunk
changeset: 542086:4974b0a2add8
user: obache <obache%pkgsrc.org@localhost>
date: Thu May 01 13:51:56 2008 +0000
description:
Add destdir support to catdoc and catdoc-tk.
Fixes PR 38545.
diffstat:
textproc/catdoc-tk/Makefile | 8 +++++---
textproc/catdoc/Makefile | 4 +++-
textproc/catdoc/Makefile.common | 3 ++-
3 files changed, 10 insertions(+), 5 deletions(-)
diffs (60 lines):
diff -r 3b697535313f -r 4974b0a2add8 textproc/catdoc-tk/Makefile
--- a/textproc/catdoc-tk/Makefile Thu May 01 13:46:20 2008 +0000
+++ b/textproc/catdoc-tk/Makefile Thu May 01 13:51:56 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2007/01/24 17:07:00 reed Exp $
+# $NetBSD: Makefile,v 1.9 2008/05/01 13:51:56 obache Exp $
#
.include "../../textproc/catdoc/Makefile.common"
@@ -6,6 +6,8 @@
PKGNAME= ${DISTNAME:S/catdoc/catdoc-tk/}
COMMENT= Reads MS-Word file and puts out its content as plain text (Tk interface)
+PKG_DESTDIR_SUPPORT= user-destdir
+
DEPENDS+= catdoc>=0.91.4nb1:../../textproc/catdoc
CONFIGURE_ARGS+= --enable-wordview
@@ -18,8 +20,8 @@
cd ${WRKSRC}/src && ${MAKE} wordview
do-install:
- ${INSTALL_SCRIPT} ${WRKSRC}/src/wordview ${PREFIX}/bin/wordview
- ${INSTALL_MAN} ${WRKSRC}/doc/wordview.1 ${PREFIX}/${PKGMANDIR}/man1/
+ ${INSTALL_SCRIPT} ${WRKSRC}/src/wordview ${DESTDIR}${PREFIX}/bin/wordview
+ ${INSTALL_MAN} ${WRKSRC}/doc/wordview.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/
.include "../../x11/tk/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 3b697535313f -r 4974b0a2add8 textproc/catdoc/Makefile
--- a/textproc/catdoc/Makefile Thu May 01 13:46:20 2008 +0000
+++ b/textproc/catdoc/Makefile Thu May 01 13:51:56 2008 +0000
@@ -1,8 +1,10 @@
-# $NetBSD: Makefile,v 1.28 2007/01/24 17:07:00 reed Exp $
+# $NetBSD: Makefile,v 1.29 2008/05/01 13:51:56 obache Exp $
#
.include "Makefile.common"
+PKG_DESTDIR_SUPPORT= user-destdir
+
CONFIGURE_ARGS+= --disable-wordview
CONFIGURE_ENV+= enable_wordview=no
CONFIGURE_ENV+= man1dir=${PREFIX}/${PKGMANDIR}/man1
diff -r 3b697535313f -r 4974b0a2add8 textproc/catdoc/Makefile.common
--- a/textproc/catdoc/Makefile.common Thu May 01 13:46:20 2008 +0000
+++ b/textproc/catdoc/Makefile.common Thu May 01 13:51:56 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.13 2008/04/19 06:17:36 obache Exp $
+# $NetBSD: Makefile.common,v 1.14 2008/05/01 13:51:56 obache Exp $
#
DISTNAME= catdoc-0.94.2
@@ -16,5 +16,6 @@
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --libdir=${PREFIX}/share
+CONFIGURE_ARGS+= --with-install-root=${DESTDIR}
CPPFLAGS+= -Dunix -D__unix
Home |
Main Index |
Thread Index |
Old Index