3 files changed, 59 insertions, 28 deletions

diff --git a/mail/qmail-ldap/Makefile b/mail/qmail-ldap/Makefile
index d9514fd4d6d7..7afd2670d852 100644
--- a/mail/qmail-ldap/Makefile
+++ b/mail/qmail-ldap/Makefile
@@ -7,28 +7,21 @@
 
 PORTNAME=	qmail
 PORTVERSION=	${QMAIL_VERSION}.${LDAP_PATCH_DATE}
-PORTREVISION=	3
+PORTREVISION=	0
 CATEGORIES=	mail
 PKGNAMESUFFIX=	-ldap
 
 MAINTAINER=	freebsd@galle.com.br
 COMMENT=	A SECURE, reliable, and FAST MTA for UNIX systems WITH LDAP support
 
-EXTRA_PATCHES+=	${MASTERDIR}/files/patch-install.c
-PATCH_DIST_STRIP+=	-p1
+RUN_DEPENDS=	${LOCALBASE}/bin/svscan:${PORTSDIR}/sysutils/daemontools
 
 CONFLICTS=	nss-[0-9]* emboss-[0-9]* digest-[0-9]*
 
 USE_OPENLDAP=	yes
 SLAVE_LDAP=	yes
-PKGNAMESUFFIX:=	${PKGNAMESUFFIX}2
 
-.if !defined(WITHOUT_TLS)
-PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-with_tls
-USE_OPENSSL=	yes
-.endif
-
-LDAP_PATCH_DATE=	20020901
+LDAP_PATCH_DATE=	20050401a
 
 MASTERDIR=	${.CURDIR}/../qmail
 DESCR=		${.CURDIR}/pkg-descr
diff --git a/mail/qmail-ldap/files/patch-install.c b/mail/qmail-ldap/files/patch-install.c
new file mode 100644
index 000000000000..7c2c97f96fb4
--- /dev/null
+++ b/mail/qmail-ldap/files/patch-install.c
@@ -0,0 +1,37 @@
+--- install.c.orig	Wed Jun  1 14:36:46 2005
++++ install.c	Wed Jun  1 14:38:17 2005
+@@ -14,6 +14,7 @@
+ #define FATAL "install: fatal: "
+ 
+ int fdsourcedir = -1;
++noc;  /* hack for bin package install -- see port pkg/INSTALL */
+ 
+ void h(home,uid,gid,mode)
+ const char *home;
+@@ -79,6 +80,7 @@
+ int gid;
+ int mode;
+ {
++ if (!noc) {
+   int fdin;
+   int fdout;
+ 
+@@ -119,6 +121,7 @@
+     strerr_die6sys(111,FATAL,"unable to chown .../",subdir,"/",file,": ");
+   if (chmod(file,mode) == -1)
+     strerr_die6sys(111,FATAL,"unable to chmod .../",subdir,"/",file,": ");
++ }
+ }
+ 
+ void C(home,subdir,file,source,uid,gid,mode)
+@@ -270,8 +273,9 @@
+     strerr_die6sys(111,FATAL,"unable to chmod ",home,"/",file,": ");
+ }
+ 
+-int main()
++void main(argc, argv)
+ {
++  noc=--argc;
+   fdsourcedir = open_read(".");
+   if (fdsourcedir == -1)
+     strerr_die2sys(111,FATAL,"unable to open current directory: ");
diff --git a/mail/qmail-ldap/pkg-descr b/mail/qmail-ldap/pkg-descr
index f4c18343f824..4b1fecbd5219 100644
--- a/mail/qmail-ldap/pkg-descr
+++ b/mail/qmail-ldap/pkg-descr
@@ -1,23 +1,24 @@
-What is is:
-
- A patch to stock qmail-1.03 to get all user account information
- from an LDAP database. It primary target are POP toaster with
- huge numbers of users (from thousands up to millions).
+A patch to stock qmail-1.03 to get all user account information
+from an LDAP database. It primary target are POP toaster with
+huge numbers of users (from thousands up to millions).
 
 Some of it's greatest features:
 
- - Users and virtual domains in an LDAP database
- - No local accounts needed
- - Perfect for ISP's to build POP toasters
- - Native mail server clustering
- - Supports size quotas on user maildirs and mbox
- - Automatic creation of home- and maildir's
- - Handles replies with new qmail-reply
- - Extensive logging in qmail-smtpd and qmail-pop3d
- - Supports tarpitting (based on a patch by Chris Johnson)
- - Supports OpenLDAP 1.2.X and Mozilla Directory SDK
- - Includes Antispam-Features (based on a patch by Lindsay Haisley,
-   Rask Lambertsen and Lionel Widdifield)
- [snip]
+    * Users and virtual domains in an LDAP database
+    * No local accounts needed
+    * Perfect for ISP's to build POP toasters
+    * Native mail server clustering
+    * Supports size quotas on user maildirs
+    * Automatic creation of home- and maildir's
+    * Handles replies with new qmail-reply
+    * Extensive logging in qmail-smtpd and qmail-pop3d
+    * Supports tarpitting (based on a patch by Chris Johnson)
+    * Supports OpenLDAP 2.x, Novell NDS
+    * Includes extensive Antispam-Features
+    * Supports automatic maildir creation when the first mail arrives
+    * Support for SHA, SSHA, MD5, SMD5, MD4 and RIPE-MD160
+    * Support for NS-MTA-MD5 encrypted passwords used by Netscape Mailserver
+    * It also supports the password format used by Software.com's Post.Office
+    * Support TLS (SSL) encrytion of SMTP mail transport (by Frederik Vermeulen)
 
 WWW: http://www.nrg4u.com/