diff options
| author | jmmv <jmmv@pkgsrc.org> | 2005-04-13 17:16:25 +0000 |
|---|---|---|
| committer | jmmv <jmmv@pkgsrc.org> | 2005-04-13 17:16:25 +0000 |
| commit | d24b2e6bb5994994e2d162efc62c2da91e93e368 (patch) | |
| tree | 0e3e6b7baee20b8cf794224b421bd53c94f5ccbf /mail/evolution | |
| parent | 632b869611d00e69ead6c79ed1cd43bbfc639561 (diff) | |
| download | pkgsrc-d24b2e6bb5994994e2d162efc62c2da91e93e368.tar.gz | |
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 (limited to 'mail/evolution')
| -rw-r--r-- | mail/evolution/Makefile | 5 | ||||
| -rw-r--r-- | mail/evolution/PLIST | 8 |
2 files changed, 8 insertions, 5 deletions
diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile index 56bc5060ec0..7c3da564457 100644 --- a/mail/evolution/Makefile +++ b/mail/evolution/Makefile @@ -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 @@ CONFIGURE_ARGS+= --without-krb5 .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 @@ LDFLAGS+= ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.nss}/lib/nss . include "../../www/mozilla-gtk2/buildlink3.mk" .else CONFIGURE_ARGS+= --disable-nss +PLIST_SUBST+= HAVE_SMIME="@comment " .endif PKGCONFIG_OVERRIDE= camel.pc.in diff --git a/mail/evolution/PLIST b/mail/evolution/PLIST index 0037c69cd55..3db5dfbf37f 100644 --- a/mail/evolution/PLIST +++ b/mail/evolution/PLIST @@ -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/libecontactlisteditor.la 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-addressbook-a11y.la 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/meeting-page.glade 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 |