diff options
author | jmmv <jmmv> | 2003-09-17 14:57:25 +0000 |
---|---|---|
committer | jmmv <jmmv> | 2003-09-17 14:57:25 +0000 |
commit | 277eb82a1cd1508a6406f4c036a5bdfd16531116 (patch) | |
tree | a4f69c9c7b8c6c5f4bd81b5b2da72cbc8fa89498 | |
parent | 73770a0dc93d24ae7682eea4dbaa7a9afaf5ad41 (diff) | |
download | pkgsrc-277eb82a1cd1508a6406f4c036a5bdfd16531116.tar.gz |
Do not build nor install wordview to keep the package small (this needs Tk).
Bump PKGREVISION to 1 because of this. While here, split the Makefile in
two parts to help in the creation of the new catdoc-tk package.
Addresses PR pkg/18730.
-rw-r--r-- | textproc/catdoc/Makefile | 19 | ||||
-rw-r--r-- | textproc/catdoc/Makefile.common | 21 | ||||
-rw-r--r-- | textproc/catdoc/PLIST | 3 | ||||
-rw-r--r-- | textproc/catdoc/distinfo | 3 | ||||
-rw-r--r-- | textproc/catdoc/patches/patch-ad | 21 |
5 files changed, 50 insertions, 17 deletions
diff --git a/textproc/catdoc/Makefile b/textproc/catdoc/Makefile index 206b8e28ea4..c729df050bb 100644 --- a/textproc/catdoc/Makefile +++ b/textproc/catdoc/Makefile @@ -1,20 +1,11 @@ -# $NetBSD: Makefile,v 1.24 2003/07/21 17:27:27 martti Exp $ +# $NetBSD: Makefile,v 1.25 2003/09/17 14:57:25 jmmv Exp $ # -DISTNAME= catdoc-0.91.4 -WRKSRC= ${WRKDIR}/catdoc -CATEGORIES= textproc -MASTER_SITES= http://www.go.dlr.de/fresh/unix/src/misc/ +.include "Makefile.common" -MAINTAINER= tech-pkg@NetBSD.org -HOMEPAGE= http://www.fe.msk.ru/~vitus/catdoc/ -COMMENT= Reads MS-Word file and puts out its content as plain text +PKGREVISION= 1 -DEPENDS= tk>=8.3.2:../../x11/tk - -USE_X11= yes -GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --libdir=${PREFIX}/share -CPPFLAGS+= -Dunix -D__unix +CONFIGURE_ARGS+= --disable-wordview +CONFIGURE_ENV+= enable_wordview=no .include "../../mk/bsd.pkg.mk" diff --git a/textproc/catdoc/Makefile.common b/textproc/catdoc/Makefile.common new file mode 100644 index 00000000000..0f74260d4b7 --- /dev/null +++ b/textproc/catdoc/Makefile.common @@ -0,0 +1,21 @@ +# $NetBSD: Makefile.common,v 1.1 2003/09/17 14:57:26 jmmv Exp $ +# + +DISTNAME= catdoc-0.91.4 +WRKSRC= ${WRKDIR}/catdoc +CATEGORIES= textproc +MASTER_SITES= http://www.go.dlr.de/fresh/unix/src/misc/ + +MAINTAINER= tech-pkg@NetBSD.org +HOMEPAGE= http://www.fe.msk.ru/~vitus/catdoc/ +COMMENT= Reads MS-Word file and puts out its content as plain text + +DISTINFO_FILE= ${.CURDIR}/../../textproc/catdoc/distinfo +PATCHDIR= ${.CURDIR}/../../textproc/catdoc/patches + +USE_BUILDLINK2= yes +GNU_CONFIGURE= yes + +CONFIGURE_ARGS+= --libdir=${PREFIX}/share + +CPPFLAGS+= -Dunix -D__unix diff --git a/textproc/catdoc/PLIST b/textproc/catdoc/PLIST index 245f26f3a9d..7869669c61e 100644 --- a/textproc/catdoc/PLIST +++ b/textproc/catdoc/PLIST @@ -1,6 +1,5 @@ -@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:56:22 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2003/09/17 14:57:27 jmmv Exp $ bin/catdoc -bin/wordview bin/xls2csv bin/xlsview man/man1/catdoc.1 diff --git a/textproc/catdoc/distinfo b/textproc/catdoc/distinfo index f20d66a2edb..b4ff23c514c 100644 --- a/textproc/catdoc/distinfo +++ b/textproc/catdoc/distinfo @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.2 2001/05/08 16:12:07 agc Exp $ +$NetBSD: distinfo,v 1.3 2003/09/17 14:57:27 jmmv Exp $ SHA1 (catdoc-0.91.4.tar.gz) = f486345447993bc818093f84b505c2ebbb046954 Size (catdoc-0.91.4.tar.gz) = 128428 bytes SHA1 (patch-aa) = 3f232d00d2bc0f55397b76674d6136da81bc887e SHA1 (patch-ab) = 328c6d3f1613dff35760836bf051c48fba343576 SHA1 (patch-ac) = 4b008af59792a155421bc99d6daf31db0da50c63 +SHA1 (patch-ad) = 8c31913ccee50b7f1b26b7a2f0ab48ae9368cadd diff --git a/textproc/catdoc/patches/patch-ad b/textproc/catdoc/patches/patch-ad new file mode 100644 index 00000000000..578ac98a496 --- /dev/null +++ b/textproc/catdoc/patches/patch-ad @@ -0,0 +1,21 @@ +$NetBSD: patch-ad,v 1.4 2003/09/17 14:57:30 jmmv Exp $ + +--- configure.orig 1999-12-14 11:45:12.000000000 +0100 ++++ configure +@@ -983,7 +983,6 @@ test -z "$manext" && manext=.1 + test -z "$man1dir" && man1dir=\${prefix}/man/man1 + installtargets="install-catdoc install-wordview" + buildtargets="catdoc xls2csv wordview" +-if test -n "$WISH"; then + # Check whether --enable-wordview or --disable-wordview was given. + if test "${enable_wordview+set}" = set; then + enableval="$enable_wordview" +@@ -995,8 +994,6 @@ fi + + fi + +-fi +- + echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 + echo "configure:1002: checking how to run the C preprocessor" >&5 + # On Suns, sometimes $CPP names a directory. |