sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 17:59:20 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Upgrade to version 1.7.1.

Browse source 
1) Fix mysql build
2) Fix unwanted changes to /etc/pam.d
3) Allow openldap 2.0 and 2.1 options
4) Use libfam for IDLE command

PR:		49956 (1), 46960 (2), 48622 (3), 46924 (4)
Submitted by:	Erwin Lansing <erwin@lansing.dk> (1)
Submitted by:	Philip Paeps <philip@paeps.cx> (2)
Submitted by:	Christian Kratzer <ck@cksoft.de> (3)
Submitted by:	Tod McQuillin <devin@distalzou.net> (4)
This commit is contained in:
Neil Blakey-Milner 2003-03-24 15:34:32 +00:00
parent bd4a0795ea
commit cf47d271a1
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=77398
3 changed files with 35 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
mail/courier-imap/Makefile
View file

@ -6,8 +6,8 @@
#
PORTNAME= courier-imap
PORTVERSION= 1.6.1
PORTREVISION= 1
PORTVERSION= 1.7.1
PORTREVISION= 0
CATEGORIES= mail ipv6
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= courier
@ -30,8 +30,11 @@ USE_GMAKE= YES
# WITH_VPOPMAIL: Build in vpopmail support
# WITH_MYSQL: Build in mysql support
# WITH_POSTGRESQL: Build in postgresql support
# WITH_LDAP: Build in ldap support with openldap 2.x
# WITH_LDAP: Build in ldap support with openldap 2.1
# WITH_LDAP21: Build in ldap support with openldap 2.1
# WITH_LDAP20: Build in ldap support with openldap 2.0
# WITH_LDAP1: Build in ldap support with openldap 1.x
# WITH_FAM: Build in fam support for IDLE command
#
CONFDIR?= ${PREFIX}/etc/${PORTNAME}
@ -65,14 +68,21 @@ CONFIGURE_ARGS+= --with-authvchkpw
BUILD_DEPENDS+= ${VPOPMAILDIR}/lib/libvpopmail.a:${PORTSDIR}/mail/vpopmail
.endif
.if !defined(WITH_LDAP) && !defined(WITH_LDAP1)
.if defined(WITH_LDAP)
WITH_LDAP21= yes
.endif
.if !defined(WITH_LDAP1) && !defined(WITH_LDAP20) && !defined(WITH_LDAP21)
CONFIGURE_ARGS+= --without-authldap
PLIST_SUB+= LDAPFLAG="@comment "
.else
CONFIGURE_ARGS+= --with-authldap
PLIST_SUB+= LDAPFLAG=""
.if defined(WITH_LDAP)
.if defined(WITH_LDAP21)
LIB_DEPENDS= ldap.2:${PORTSDIR}/net/openldap21 \
lber.2:${PORTSDIR}/net/openldap21
.elseif defined(WITH_LDAP20)
LIB_DEPENDS= ldap.2:${PORTSDIR}/net/openldap20 \
lber.2:${PORTSDIR}/net/openldap20
.else
@ -85,6 +95,9 @@ LIB_DEPENDS= ldap.1:${PORTSDIR}/net/openldap12 \
CONFIGURE_ARGS+= --without-authmysql
PLIST_SUB+= MYSQLFLAG="@comment "
.else
CONFIGURE_ARGS+=--with-authmysql \
--with-mysql-libs=${LOCALBASE}/lib/mysql \
--with-mysql-includes=${LOCALBASE}/include/mysql
LIB_DEPENDS+= mysqlclient.10:${PORTSDIR}/databases/mysql323-client
PLIST_SUB+= MYSQLFLAG=""
.endif
@ -110,6 +123,12 @@ CONFIGURE_ARGS+= --without-authcram
CONFIGURE_ARGS+= --with-authcram
.endif
.if defined(WITH_FAM)
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
LIB_DEPENDS+= fam.0:${PORTSDIR}/devel/fam
.endif
MAN1= couriertcpd.1 maildirmake.1
MAN7= authlib.7
MAN8= makeuserdb.8 userdb.8 userdbpw.8 \

2
mail/courier-imap/distinfo
View file

@ -1 +1 @@
MD5 (courier-imap-1.6.1.tar.bz2) = 313a1b1c7a6813c81f543b524f4f2a3d
MD5 (courier-imap-1.7.1.tar.bz2) = ce3a78cabd3d69e4982907de69ecac96

10
mail/courier-imap/files/patch-Makefile.in Normal file
View file

@ -0,0 +1,10 @@
--- Makefile.in.orig Mon Mar 24 16:31:17 2003
+++ Makefile.in Mon Mar 24 16:32:01 2003
@@ -872,6 +872,7 @@
install-data-local: install-man
for f in `cat authlib/modulelist ; . authlib/authdaemonrc ; echo $$authmodulelist ` ; do \
+ continue ; \
test "$$f" = "authpam" || continue ; \
test -d $(DESTDIR)/etc/pam.d || continue ; \
test -w $(DESTDIR)/etc/pam.d || continue ; \