summaryrefslogtreecommitdiff
path: root/mail/courier-imap
diff options
context:
space:
mode:
authorOliver Lehmann <oliver@FreeBSD.org>2008-01-21 16:06:46 +0000
committerOliver Lehmann <oliver@FreeBSD.org>2008-01-21 16:06:46 +0000
commit21d45d4174dcebdd725680eb82eea11050e3895f (patch)
treeba4eebaf50c399401f6fd2e0b7274f82a98518bc /mail/courier-imap
parent- Update to 1.3.8 (diff)
remove the openssl configure option - there is none any more
Notes
Notes: svn path=/head/; revision=205986
Diffstat (limited to 'mail/courier-imap')
-rw-r--r--mail/courier-imap/Makefile17
-rw-r--r--mail/courier-imap/pkg-plist2
2 files changed, 4 insertions, 15 deletions
diff --git a/mail/courier-imap/Makefile b/mail/courier-imap/Makefile
index f65d800fdc35..70c986e5feac 100644
--- a/mail/courier-imap/Makefile
+++ b/mail/courier-imap/Makefile
@@ -7,7 +7,7 @@
PORTNAME= courier-imap
PORTVERSION= 4.3.0
-PORTEPOCH= 1
+PORTEPOCH= 2
CATEGORIES= mail ipv6
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= courier
@@ -38,8 +38,7 @@ MAKE_ENV:= ${CONFIGURE_ENV}
# WITH_SYSLOG_FACILITY: The syslogfacility to use
#
-OPTIONS= OPENSSL "Build with OpenSSL support" on \
- FAM "Build in fam support for IDLE command" off \
+OPTIONS= FAM "Build in fam support for IDLE command" off \
DRAC "Build in DRAC support" off \
TRASHQUOTA "Include deleted mails in the quota" off \
GDBM "Use gdbm db instead of system bdb" off \
@@ -53,7 +52,7 @@ CONFDIR?= ${PREFIX}/etc/${PORTNAME}
RCDIR?= ${PREFIX}/etc/rc.d
USERDB?= ${PREFIX}/etc/userdb
LIBEXECDIR?= ${PREFIX}/libexec/${PORTNAME}
-
+USE_OPENSSL= yes
PLIST_SUB= CONFDIR=${CONFDIR:S,^${PREFIX}/,,} \
RCDIR=${RCDIR:S,^${PREFIX}/,,} \
LIBEXECDIR=${LIBEXECDIR:S,^${PREFIX}/,,}
@@ -81,16 +80,6 @@ BUILD_DEPENDS+= ${LOCALBASE}/lib/libdrac.a:${PORTSDIR}/mail/drac
.include "${.CURDIR}/../../security/courier-authlib/Makefile.dep"
.endif
-.if !defined(WITHOUT_SSL)
-# we can't use USE_OPENSSL=yes after including bsd.port.pre.mk
-.include "${PORTSDIR}/Mk/bsd.openssl.mk"
-PLIST_SUB+= OPENSSLFLAG=
-CONFIGURE_ARGS+=--enable-ssl
-.else
-PLIST_SUB+= OPENSSLFLAG="@comment "
-BROKEN= "Incomplete pkg-plist"
-.endif
-
.if defined(WITH_SYSLOG_FACILITY)
CONFIGURE_ARGS+=--with-syslog=${WITH_SYSLOG_FACILITY}
.endif
diff --git a/mail/courier-imap/pkg-plist b/mail/courier-imap/pkg-plist
index e025ec79f2bb..b264012a60db 100644
--- a/mail/courier-imap/pkg-plist
+++ b/mail/courier-imap/pkg-plist
@@ -1,4 +1,4 @@
-%%OPENSSLFLAG%%bin/couriertls
+bin/couriertls
bin/deliverquota
bin/imapd
bin/maildiracl