diff options
Diffstat (limited to 'misc/koffice')
| -rw-r--r-- | misc/koffice/PLIST | 26 | ||||
| -rw-r--r-- | misc/koffice/options.mk | 17 |
2 files changed, 20 insertions, 23 deletions
diff --git a/misc/koffice/PLIST b/misc/koffice/PLIST index 7dc20c1a7aa..faa09de37ae 100644 --- a/misc/koffice/PLIST +++ b/misc/koffice/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.26 2007/06/08 12:50:14 markd Exp $ +@comment $NetBSD: PLIST,v 1.27 2008/04/12 22:43:04 jlam Exp $ bin/karbon bin/kchart bin/kexi @@ -332,8 +332,8 @@ lib/kde3/karbon_whirlpinchplugin.la lib/kde3/karbon_zoomtoolplugin.la lib/kde3/kchart.la lib/kde3/kexi.la -${HAVE_MYSQL}lib/kde3/kexidb_mysqldriver.la -${HAVE_PGSQL}lib/kde3/kexidb_pqxxsqldriver.la +${PLIST.mysql}lib/kde3/kexidb_mysqldriver.la +${PLIST.pgsql}lib/kde3/kexidb_pqxxsqldriver.la lib/kde3/kexidb_sqlite2driver.la lib/kde3/kexidb_sqlite3driver.la lib/kde3/kexihandler_csv_importexport.la @@ -343,8 +343,8 @@ lib/kde3/kexihandler_query.la lib/kde3/kexihandler_relation.la lib/kde3/kexihandler_script.la lib/kde3/kexihandler_table.la -${HAVE_MYSQL}lib/kde3/keximigrate_mysql.la -${HAVE_PGSQL}lib/kde3/keximigrate_pqxx.la +${PLIST.mysql}lib/kde3/keximigrate_mysql.la +${PLIST.pgsql}lib/kde3/keximigrate_pqxx.la lib/kde3/kfile_abiword.la lib/kde3/kfile_gnumeric.la lib/kde3/kfile_koffice.la @@ -525,7 +525,7 @@ lib/kde3/libkugarpart.la lib/kde3/libkwordkword1dot3import.la lib/kde3/libkwordlatexexport.la lib/kde3/libkwordpart.la -${HAVE_WV2}lib/kde3/libmswordimport.la +${PLIST.wv2}lib/kde3/libmswordimport.la lib/kde3/libmswriteexport.la lib/kde3/libmswriteimport.la lib/kde3/libolefilter.la @@ -548,7 +548,7 @@ lib/kde3/libwmfimport.la lib/kde3/libwmlexport.la lib/kde3/libwmlimport.la lib/kde3/libwpexport.la -${HAVE_WPD}lib/kde3/libwpimport.la +${PLIST.libwpd}lib/kde3/libwpimport.la lib/kde3/libxsltexport.la lib/kde3/libxsltimport.la lib/kde3/straight_connector.la @@ -4628,12 +4628,12 @@ share/kde/services/kexi/kexiqueryhandler.desktop share/kde/services/kexi/kexirelationhandler.desktop share/kde/services/kexi/kexiscripthandler.desktop share/kde/services/kexi/kexitablehandler.desktop -${HAVE_MYSQL}share/kde/services/kexidb_mysqldriver.desktop -${HAVE_PGSQL}share/kde/services/kexidb_pqxxsqldriver.desktop +${PLIST.mysql}share/kde/services/kexidb_mysqldriver.desktop +${PLIST.pgsql}share/kde/services/kexidb_pqxxsqldriver.desktop share/kde/services/kexidb_sqlite2driver.desktop share/kde/services/kexidb_sqlite3driver.desktop -${HAVE_MYSQL}share/kde/services/keximigrate_mysql.desktop -${HAVE_PGSQL}share/kde/services/keximigrate_pqxx.desktop +${PLIST.mysql}share/kde/services/keximigrate_mysql.desktop +${PLIST.pgsql}share/kde/services/keximigrate_pqxx.desktop share/kde/services/kfile_abiword.desktop share/kde/services/kfile_gnumeric.desktop share/kde/services/kfile_koffice.desktop @@ -4777,7 +4777,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 -${HAVE_WV2}share/kde/services/kword_msword_import.desktop +${PLIST.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 @@ -4790,7 +4790,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 -${HAVE_WPD}share/kde/services/kword_wp_import.desktop +${PLIST.libwpd}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 65e1c518627..f0f692a26b3 100644 --- a/misc/koffice/options.mk +++ b/misc/koffice/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.4 2007/02/22 19:26:49 wiz Exp $ +# $NetBSD: options.mk,v 1.5 2008/04/12 22:43:04 jlam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.koffice PKG_SUPPORTED_OPTIONS= mysql pgsql koffice-wv2 koffice-libwpd @@ -6,12 +6,13 @@ PKG_SUGGESTED_OPTIONS= koffice-wv2 koffice-libwpd .include "../../mk/bsd.options.mk" +PLIST_VARS+= libwpd mysql pgsql wv2 + .if !empty(PKG_OPTIONS:Mmysql) .include "../../mk/mysql.buildlink3.mk" -PLIST_SUBST+= HAVE_MYSQL= +PLIST.mysql= yes .else CONFIGURE_ARGS+= --disable-mysql -PLIST_SUBST+= HAVE_MYSQL="@comment " .endif .if !empty(PKG_OPTIONS:Mpgsql) @@ -21,23 +22,19 @@ CONFIGURE_ARGS+= --with-pgsql-includes=${PGSQL_PREFIX}/include CONFIGURE_ARGS+= --with-pgsql-libraries=${PGSQL_PREFIX}/lib CONFIGURE_ARGS+= --with-pqxx-includes=${BUILDLINK_PREFIX.libpqxx}/include CONFIGURE_ARGS+= --with-pqxx-libraries=${BUILDLINK_PREFIX.libpqxx}/lib -PLIST_SUBST+= HAVE_PGSQL= +PLIST.pgsql= yes .else 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= +PLIST.wv2= yes .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 " +PLIST.libwpd= yes .endif |