summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoradam <adam>2007-12-15 16:04:41 +0000
committeradam <adam>2007-12-15 16:04:41 +0000
commite8d166464be9caa69f4b0c8e866170b3f76fa80f (patch)
tree1c02fce573d3c6ce3d7c03f815ce816a3f7d246a
parent189494211299bee6a5153ed6c2107611c5fe9c28 (diff)
downloadpkgsrc-e8d166464be9caa69f4b0c8e866170b3f76fa80f.tar.gz
Added 'readline' option, and MAKE_JOBS_SAFE=no
-rw-r--r--mail/exim/Makefile5
-rw-r--r--mail/exim/options.mk34
2 files changed, 24 insertions, 15 deletions
diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index 0d0b1b03aa4..e1be7c0ea22 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.87 2007/10/14 19:14:57 adam Exp $
+# $NetBSD: Makefile,v 1.88 2007/12/15 16:04:41 adam Exp $
DISTNAME= exim-4.68
CATEGORIES= mail net
@@ -19,6 +19,7 @@ INSTALLATION_DIRS+= ${PKGMANDIR}/man8
MAKE_ENV+= SSLBASE=${SSLBASE:Q}
MAKE_ENV+= INST_CHOWN=${CHOWN:Q}
MAKE_FLAGS+= FULLECHO=''
+MAKE_JOBS_SAFE= no
.include "../../mk/bsd.prefs.mk"
@@ -39,7 +40,7 @@ EXAMPLESDIR= ${PREFIX}/share/examples/exim
CONF_FILES= ${EXAMPLESDIR}/aliases ${PKG_SYSCONFDIR}/aliases
CONF_FILES+= ${EXAMPLESDIR}/configure ${PKG_SYSCONFDIR}/configure
MESSAGE_SUBST+= EXAMPLESDIR="${EXAMPLESDIR}"
-PLIST_SUBST+= DISTNAME=${DISTNAME:Q}
+PLIST_SUBST+= DISTNAME=${DISTNAME}
RCD_SCRIPTS= exim
diff --git a/mail/exim/options.mk b/mail/exim/options.mk
index 77c1feaeebd..cce6b7bef1a 100644
--- a/mail/exim/options.mk
+++ b/mail/exim/options.mk
@@ -1,18 +1,19 @@
-# $NetBSD: options.mk,v 1.14 2007/09/11 18:16:01 abs Exp $
+# $NetBSD: options.mk,v 1.15 2007/12/15 16:04:41 adam Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.exim
-PKG_SUPPORTED_OPTIONS= exim-appendfile-maildir exim-appendfile-mailstore
-PKG_SUPPORTED_OPTIONS+= exim-appendfile-mbx exim-auth-dovecot exim-build-eximon
-PKG_SUPPORTED_OPTIONS+= exim-content-scan exim-lookup-cdb exim-lookup-dnsdb
-PKG_SUPPORTED_OPTIONS+= exim-lookup-dsearch exim-lookup-ldap exim-lookup-mysql
-PKG_SUPPORTED_OPTIONS+= exim-lookup-pgsql exim-lookup-sqlite exim-lookup-whoson
-PKG_SUPPORTED_OPTIONS+= exim-old-demime exim-router-iplookup exim-tcp-wrappers
-PKG_SUPPORTED_OPTIONS+= exim-tls exim-transport-lmtp gdbm inet6 saslauthd
-
-PKG_SUGGESTED_OPTIONS= exim-appendfile-maildir exim-appendfile-mailstore
-PKG_SUGGESTED_OPTIONS+= exim-appendfile-mbx exim-content-scan
-PKG_SUGGESTED_OPTIONS+= exim-lookup-dsearch exim-old-demime exim-tcp-wrappers
-PKG_SUGGESTED_OPTIONS+= exim-tls
+PKG_SUPPORTED_OPTIONS= exim-appendfile-maildir exim-appendfile-mailstore
+PKG_SUPPORTED_OPTIONS+= exim-appendfile-mbx exim-auth-dovecot exim-build-eximon
+PKG_SUPPORTED_OPTIONS+= exim-content-scan exim-lookup-cdb exim-lookup-dnsdb
+PKG_SUPPORTED_OPTIONS+= exim-lookup-dsearch exim-lookup-ldap exim-lookup-mysql
+PKG_SUPPORTED_OPTIONS+= exim-lookup-pgsql exim-lookup-sqlite exim-lookup-whoson
+PKG_SUPPORTED_OPTIONS+= exim-old-demime exim-router-iplookup exim-tcp-wrappers
+PKG_SUPPORTED_OPTIONS+= exim-tls exim-transport-lmtp gdbm inet6 saslauthd
+PKG_SUPPORTED_OPTIONS+= readline
+
+PKG_SUGGESTED_OPTIONS= exim-appendfile-maildir exim-appendfile-mailstore
+PKG_SUGGESTED_OPTIONS+= exim-appendfile-mbx exim-content-scan
+PKG_SUGGESTED_OPTIONS+= exim-lookup-dsearch exim-old-demime exim-tcp-wrappers
+PKG_SUGGESTED_OPTIONS+= exim-tls
.include "../../mk/bsd.options.mk"
@@ -149,3 +150,10 @@ LOCAL_MAKEFILE_OPTIONS+=CYRUS_SASLAUTHD_SOCKET=/var/state/saslauthd/mux
LOOKUP_LIBS+=${COMPILER_RPATH_FLAG}${LOCALBASE}/${BUILDLINK_LIBDIRS.cyrus-sasl} -L${LOCALBASE}/${BUILDLINK_LIBDIRS.cyrus-sasl} -lsasl2
. include "../../security/cyrus-sasl/buildlink3.mk"
.endif
+
+.if !empty(PKG_OPTIONS:Mreadline)
+LOCAL_MAKEFILE_OPTIONS+=USE_READLINE=yes
+LOOKUP_LIBS+= -lreadline
+USE_GNU_READLINE= yes
+. include "../../devel/readline/buildlink3.mk"
+.endif