summaryrefslogtreecommitdiff
path: root/mail/evolution
diff options
context:
space:
mode:
authorjlam <jlam>2008-04-12 22:42:57 +0000
committerjlam <jlam>2008-04-12 22:42:57 +0000
commit84db467ec7c8386066718011f8d47775d5608811 (patch)
treefdd67c81079412bf94013749a954125434a9baca /mail/evolution
parent7082f8c2044621c8641f3c82a2da95c2d442048c (diff)
downloadpkgsrc-84db467ec7c8386066718011f8d47775d5608811.tar.gz
Convert to use PLIST_VARS instead of manually passing "@comment "
through PLIST_SUBST to the plist module.
Diffstat (limited to 'mail/evolution')
-rw-r--r--mail/evolution/Makefile6
-rw-r--r--mail/evolution/PLIST8
2 files changed, 7 insertions, 7 deletions
diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index 2d9803d9b7f..07c6c7d8b48 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.128 2008/03/05 19:08:05 drochner Exp $
+# $NetBSD: Makefile,v 1.129 2008/04/12 22:43:03 jlam Exp $
DISTNAME= evolution-2.12.3
PKGREVISION= 2
@@ -67,9 +67,10 @@ CONFIGURE_ARGS+= --with-krb5
CONFIGURE_ARGS+= --without-krb5
.endif
+PLIST_VARS+= smime
.if !empty(PKG_OPTIONS:Mssl)
CONFIGURE_ARGS+= --enable-nss=yes
-PLIST_SUBST+= HAVE_SMIME=
+PLIST.smime= yes
PRINT_PLIST_AWK+= /smime/ { print "$${HAVE_SMIME}" $$0; next; }
# XXX Workaround for the following problem: addressbook/util/libeabutil.la
# is compiled as a static library only which uses the NSS stuff. When other
@@ -89,7 +90,6 @@ post-wrapper:
cd ${BUILDLINK_DIR}/lib/pkgconfig && ${LN} -s nss.pc mozilla-nss.pc
.else
CONFIGURE_ARGS+= --disable-nss
-PLIST_SUBST+= HAVE_SMIME="@comment "
.endif
PKGCONFIG_OVERRIDE= evolution-plugin.pc.in
diff --git a/mail/evolution/PLIST b/mail/evolution/PLIST
index 196b44ae3d4..744c579325b 100644
--- a/mail/evolution/PLIST
+++ b/mail/evolution/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.32 2007/11/03 21:55:00 drochner Exp $
+@comment $NetBSD: PLIST,v 1.33 2008/04/12 22:43:03 jlam Exp $
bin/evolution
include/evolution-2.12/addressbook/gui/widgets/eab-config.h
include/evolution-2.12/addressbook/gui/widgets/eab-menu.h
@@ -226,7 +226,7 @@ lib/evolution/2.12/libecontactlisteditor.la
lib/evolution/2.12/libefilterbar.la
lib/evolution/2.12/libemiscwidgets.la
lib/evolution/2.12/libeshell.la
-${HAVE_SMIME}lib/evolution/2.12/libessmime.la
+${PLIST.smime}lib/evolution/2.12/libessmime.la
lib/evolution/2.12/libetable.la
lib/evolution/2.12/libetext.la
lib/evolution/2.12/libetimezonedialog.la
@@ -237,7 +237,7 @@ lib/evolution/2.12/libevolution-addressbook-importers.la
lib/evolution/2.12/libevolution-calendar-a11y.la
lib/evolution/2.12/libevolution-calendar-importers.la
lib/evolution/2.12/libevolution-mail-importers.la
-${HAVE_SMIME}lib/evolution/2.12/libevolution-smime.la
+${PLIST.smime}lib/evolution/2.12/libevolution-smime.la
lib/evolution/2.12/libevolution-widgets-a11y.la
lib/evolution/2.12/libfilter.la
lib/evolution/2.12/libmenus.la
@@ -431,7 +431,7 @@ share/evolution/2.12/glade/proxy-login-dialog.glade
share/evolution/2.12/glade/publish-calendar.glade
share/evolution/2.12/glade/recurrence-page.glade
share/evolution/2.12/glade/schedule-page.glade
-${HAVE_SMIME}share/evolution/2.12/glade/smime-ui.glade
+${PLIST.smime}share/evolution/2.12/glade/smime-ui.glade
share/evolution/2.12/glade/task-details-page.glade
share/evolution/2.12/glade/task-page.glade
share/evolution/2.12/help/quickref/C/quickref.pdf