diff options
author | markd <markd> | 2006-06-11 13:50:19 +0000 |
---|---|---|
committer | markd <markd> | 2006-06-11 13:50:19 +0000 |
commit | 517fe159d50cf83926766f6f9cbf370a55893964 (patch) | |
tree | b5301b41351e956082154ddb03d762bb5abf3c2f /misc/koffice | |
parent | ef0de491665ddff4796030736b6a0d7eebc689ee (diff) | |
download | pkgsrc-517fe159d50cf83926766f6f9cbf370a55893964.tar.gz |
Make msword and word perfect import support optional but on by default.
Patch from YOMURA Masanori, cleaned up by me. No PKGREVISON bump as no
change to default.
Diffstat (limited to 'misc/koffice')
-rw-r--r-- | misc/koffice/Makefile | 4 | ||||
-rw-r--r-- | misc/koffice/PLIST | 10 | ||||
-rw-r--r-- | misc/koffice/options.mk | 20 |
3 files changed, 24 insertions, 10 deletions
diff --git a/misc/koffice/Makefile b/misc/koffice/Makefile index de7a95e88f9..c40e201f0c1 100644 --- a/misc/koffice/Makefile +++ b/misc/koffice/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.82 2006/05/24 12:54:45 markd Exp $ +# $NetBSD: Makefile,v 1.83 2006/06/11 13:50:19 markd Exp $ DISTNAME= koffice-1.5.1 CATEGORIES= misc kde @@ -50,8 +50,6 @@ post-install: .include "../../lang/python/pyversion.mk" .include "../../meta-pkgs/kde3/kde3.mk" -.include "../../converters/libwpd/buildlink3.mk" -.include "../../converters/wv2/buildlink3.mk" .include "../../textproc/aspell/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" .include "../../textproc/libxslt/buildlink3.mk" diff --git a/misc/koffice/PLIST b/misc/koffice/PLIST index 4eda4281b4b..b0cd7771868 100644 --- a/misc/koffice/PLIST +++ b/misc/koffice/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.20 2006/05/24 12:54:45 markd Exp $ +@comment $NetBSD: PLIST,v 1.21 2006/06/11 13:50:19 markd Exp $ bin/karbon bin/kchart bin/kexi @@ -477,7 +477,7 @@ lib/kde3/libkugarpart.la lib/kde3/libkwordkword1dot3import.la lib/kde3/libkwordlatexexport.la lib/kde3/libkwordpart.la -lib/kde3/libmswordimport.la +${HAVE_WV2}lib/kde3/libmswordimport.la lib/kde3/libmswriteexport.la lib/kde3/libmswriteimport.la lib/kde3/liboodrawimport.la @@ -500,7 +500,7 @@ lib/kde3/libwmfimport.la lib/kde3/libwmlexport.la lib/kde3/libwmlimport.la lib/kde3/libwpexport.la -lib/kde3/libwpimport.la +${HAVE_WPD}lib/kde3/libwpimport.la lib/kde3/libxsltexport.la lib/kde3/libxsltimport.la lib/kde3/straight_connector.la @@ -4588,7 +4588,7 @@ share/kde/services/kword_html_export.desktop share/kde/services/kword_html_import.desktop share/kde/services/kword_kword1dot3_import.desktop share/kde/services/kword_latex_export.desktop -share/kde/services/kword_msword_import.desktop +${HAVE_WV2}share/kde/services/kword_msword_import.desktop share/kde/services/kword_mswrite_export.desktop share/kde/services/kword_mswrite_import.desktop share/kde/services/kword_oowriter_export.desktop @@ -4601,7 +4601,7 @@ share/kde/services/kword_rtf_import.desktop share/kde/services/kword_wml_export.desktop share/kde/services/kword_wml_import.desktop share/kde/services/kword_wp_export.desktop -share/kde/services/kword_wp_import.desktop +${HAVE_WPD}share/kde/services/kword_wp_import.desktop share/kde/services/kwordpart.desktop share/kde/services/kwserialletter_classic.desktop share/kde/services/kwserialletter_qtsqldb_power.desktop diff --git a/misc/koffice/options.mk b/misc/koffice/options.mk index 522283e2d84..55808f052fb 100644 --- a/misc/koffice/options.mk +++ b/misc/koffice/options.mk @@ -1,7 +1,8 @@ -# $NetBSD: options.mk,v 1.2 2006/04/12 12:37:35 markd Exp $ +# $NetBSD: options.mk,v 1.3 2006/06/11 13:50:19 markd Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.koffice -PKG_SUPPORTED_OPTIONS= mysql pgsql +PKG_SUPPORTED_OPTIONS= mysql pgsql koffice-wv2 koffice-libwpd +PKG_SUGGESTED_OPTIONS= koffice-wv2 koffice-libwpd .include "../../mk/bsd.options.mk" @@ -25,3 +26,18 @@ PLIST_SUBST+= HAVE_PGSQL= CONFIGURE_ARGS+= --disable-pgsql PLIST_SUBST+= HAVE_PGSQL="@comment " .endif + +.if !empty(PKG_OPTIONS:Mkoffice-wv2) +.include "../../converters/wv2/buildlink3.mk" +PLIST_SUBST+= HAVE_WV2= +.else +CONFIGURE_ARGS+= --without-libwv2 +PLIST_SUBST+= HAVE_WV2="@comment " +.endif + +.if !empty(PKG_OPTIONS:Mkoffice-libwpd) +.include "../../converters/libwpd/buildlink3.mk" +PLIST_SUBST+= HAVE_WPD= +.else +PLIST_SUBST+= HAVE_WPD="@comment " +.endif |