diff options
| author | obache <obache> | 2008-05-01 13:51:56 +0000 |
|---|---|---|
| committer | obache <obache> | 2008-05-01 13:51:56 +0000 |
| commit | cdfddc0c449871372733a3beae8fd506e2624fce (patch) | |
| tree | a3fc14d0709c1d90f30e1f57aee25b4830456ee6 | |
| parent | 3c9821bf74b12262ff9c0b7d0bcda7568acac992 (diff) | |
| download | pkgsrc-cdfddc0c449871372733a3beae8fd506e2624fce.tar.gz | |
Add destdir support to catdoc and catdoc-tk.
Fixes PR 38545.
| -rw-r--r-- | textproc/catdoc-tk/Makefile | 8 | ||||
| -rw-r--r-- | textproc/catdoc/Makefile | 4 | ||||
| -rw-r--r-- | textproc/catdoc/Makefile.common | 3 |
3 files changed, 10 insertions, 5 deletions
diff --git a/textproc/catdoc-tk/Makefile b/textproc/catdoc-tk/Makefile index affb1c51cb6..e4393898fe9 100644 --- a/textproc/catdoc-tk/Makefile +++ b/textproc/catdoc-tk/Makefile @@ -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 @@ do-build: 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 --git a/textproc/catdoc/Makefile b/textproc/catdoc/Makefile index 1fab2c3fd14..416d79c4257 100644 --- a/textproc/catdoc/Makefile +++ b/textproc/catdoc/Makefile @@ -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 --git a/textproc/catdoc/Makefile.common b/textproc/catdoc/Makefile.common index ae8e2d752a2..0c59513978f 100644 --- a/textproc/catdoc/Makefile.common +++ b/textproc/catdoc/Makefile.common @@ -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 @@ USE_FEATURES= glob GNU_CONFIGURE= yes CONFIGURE_ARGS+= --libdir=${PREFIX}/share +CONFIGURE_ARGS+= --with-install-root=${DESTDIR} CPPFLAGS+= -Dunix -D__unix |