pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/mail/evolution Ignore the smime stuff in the PLIST whe...
details: https://anonhg.NetBSD.org/pkgsrc/rev/b17b4bcd5564
branches: trunk
changeset: 492478:b17b4bcd5564
user: jmmv <jmmv%pkgsrc.org@localhost>
date: Wed Apr 13 17:16:25 2005 +0000
description:
Ignore the smime stuff in the PLIST when ssl is disabled. Fixes problem
reported by Leonard Schmidt in tech-pkg@, thread "``make package'' fails
on evolution and gnumeric".
diffstat:
mail/evolution/Makefile | 5 ++++-
mail/evolution/PLIST | 8 ++++----
2 files changed, 8 insertions(+), 5 deletions(-)
diffs (62 lines):
diff -r 5da6e127e8e7 -r b17b4bcd5564 mail/evolution/Makefile
--- a/mail/evolution/Makefile Wed Apr 13 17:14:01 2005 +0000
+++ b/mail/evolution/Makefile Wed Apr 13 17:16:25 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.78 2005/04/11 21:46:18 tv Exp $
+# $NetBSD: Makefile,v 1.79 2005/04/13 17:16:25 jmmv Exp $
DISTNAME= evolution-2.2.1.1
CATEGORIES= mail time gnome
@@ -72,6 +72,8 @@
.if !empty(PKG_OPTIONS:Mssl)
CONFIGURE_ARGS+= --enable-nss=yes
+PLIST_SUBST+= HAVE_SMIME=
+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
# parts of the program use this .la archive, they get the right -L flags
@@ -83,6 +85,7 @@
. include "../../www/mozilla-gtk2/buildlink3.mk"
.else
CONFIGURE_ARGS+= --disable-nss
+PLIST_SUBST+= HAVE_SMIME="@comment "
.endif
PKGCONFIG_OVERRIDE= camel.pc.in
diff -r 5da6e127e8e7 -r b17b4bcd5564 mail/evolution/PLIST
--- a/mail/evolution/PLIST Wed Apr 13 17:14:01 2005 +0000
+++ b/mail/evolution/PLIST Wed Apr 13 17:16:25 2005 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.22 2005/03/26 16:21:12 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.23 2005/04/13 17:16:25 jmmv Exp $
bin/evolution-2.2
include/evolution-2.2/calendar/gui/e-cal-config.h
include/evolution-2.2/e-conduit/e-pilot-map.h
@@ -93,7 +93,7 @@
lib/evolution/2.2/libefilterbar.la
lib/evolution/2.2/libemiscwidgets.la
lib/evolution/2.2/libeshell.la
-lib/evolution/2.2/libessmime.la
+${HAVE_SMIME}lib/evolution/2.2/libessmime.la
lib/evolution/2.2/libetimezonedialog.la
lib/evolution/2.2/libeutil.la
lib/evolution/2.2/libevolution-a11y.la
@@ -101,7 +101,7 @@
lib/evolution/2.2/libevolution-calendar-a11y.la
lib/evolution/2.2/libevolution-importer.la
lib/evolution/2.2/libevolution-mail-importers.la
-lib/evolution/2.2/libevolution-smime.la
+${HAVE_SMIME}lib/evolution/2.2/libevolution-smime.la
lib/evolution/2.2/libevolution-widgets-a11y.la
lib/evolution/2.2/libfilter.la
lib/evolution/2.2/libmenus.la
@@ -231,7 +231,7 @@
share/evolution/2.2/glade/properties.glade
share/evolution/2.2/glade/recurrence-page.glade
share/evolution/2.2/glade/schedule-page.glade
-share/evolution/2.2/glade/smime-ui.glade
+${HAVE_SMIME}share/evolution/2.2/glade/smime-ui.glade
share/evolution/2.2/glade/task-details-page.glade
share/evolution/2.2/glade/task-page.glade
share/evolution/2.2/glade/url-editor-dialog.glade
Home |
Main Index |
Thread Index |
Old Index