Be sensitive about repo bloat

Since this is a slave port of the qmail port, use the
patches we have in common as EXTRA_PATCHES. It is
unfortunate that we need local patches; otherwise,
all patches could be used from the master port

Fix some typo: tls- -> ldap-

3 files changed, 10 insertions, 23 deletions

diff --git a/mail/qmail-ldap/Makefile b/mail/qmail-ldap/Makefile
index 7340ef91eab6..e6fba0b02bf7 100644
--- a/mail/qmail-ldap/Makefile
+++ b/mail/qmail-ldap/Makefile
@@ -14,6 +14,8 @@ PATCH_SITES=	http://www.nrg4u.com/qmail/
 PATCHFILES=	qmail-ldap-1.03-${LDAP_PATCH_DATE}.patch.gz
 PATCH_DIST_STRIP+=	-p1
 
+EXTRA_PATCHES+=	${QMAILPORT_PATCHDIR}/patch-ab ${QMAILPORT_PATCHDIR}/patch-ac
+
 MAINTAINER=	lioux@FreeBSD.org
 
 LIB_DEPENDS+=	ldap.1:${PORTSDIR}/net/openldap
@@ -29,13 +31,16 @@ LDAP_PATCH_DATE=	20010201
 
 #PREFIX=		/var/qmail-ldap
 
+QMAILPORT=	${PORTSDIR}/mail/qmail
+QMAILPORT_PATCHDIR!=	cd ${QMAILPORT} && ${MAKE} -V PATCHDIR
+
 DOCFILES+=	${WRKSRC}/QLDAPINSTALL ${WRKSRC}/QLDAPNEWS \
 		${WRKSRC}/QLDAPTODO ${WRKSRC}/QLDAPPICTURE \
 		${WRKSRC}/ANTISPAM
 
-yetanotherone-pre-fetch: tls-pre-fetch
+yetanotherone-pre-fetch: ldap-pre-fetch
 
-tls-pre-fetch:
+ldap-pre-fetch:
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "You may use the following build options:"
 	@${ECHO_MSG} ""
@@ -46,9 +51,9 @@ tls-pre-fetch:
 	@${ECHO_MSG} "WITH_CLEARTEXTPASSWD=yes	use cleartext passwords"
 	@${ECHO_MSG} ""
 
-yetanotherone-post-patch: tls-post-patch
+yetanotherone-post-patch: ldap-post-patch
 
-tls-post-patch:
+ldap-post-patch:
 .if defined(WITH_LDAP_CLUSTER)
 	@${PERL} -pi -ne "s|#LDAPFLAGS=-DQLDAP_CLUSTER|LDAPFLAGS\+=-DQLDAP_CLUSTER|" ${WRKSRC}/Makefile
 .endif # WITH_LDAP_CLUSTER
@@ -67,7 +72,7 @@ tls-post-patch:
 .endif # WITH_CLEARTEXTPASSWD
 
 # Local overrides
-MASTERDIR=	${PORTSDIR}/mail/qmail
+MASTERDIR=	${QMAILPORT}
 #MASTERDIR=	${.CURDIR}/../qmail
 PATCHDIR=	${.CURDIR}/files
 PKGDIR_LOCAL=	${.CURDIR}
diff --git a/mail/qmail-ldap/files/patch-ab b/mail/qmail-ldap/files/patch-ab
deleted file mode 100644
index 43a507a3444e..000000000000
--- a/mail/qmail-ldap/files/patch-ab
+++ /dev/null
@@ -1,5 +0,0 @@
-+++ conf-groups
-2c2
-< nofiles
----
-> qnofiles
diff --git a/mail/qmail-ldap/files/patch-ac b/mail/qmail-ldap/files/patch-ac
deleted file mode 100644
index ded116611683..000000000000
--- a/mail/qmail-ldap/files/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-+++ install.c
-12a13
-> noc;  /* hack for bin package install -- see port pkg/INSTALL */
-77a79
->  if (!noc) {
-117a120
->  }
-155c158
-< void main()
----
-> void main(argc, argv)
-156a160
->   noc=--argc;