diff options
| -rw-r--r-- | mail/qmail-ldap/Makefile | 15 | ||||
| -rw-r--r-- | mail/qmail-ldap/files/patch-aa | 13 | ||||
| -rw-r--r-- | mail/qmail-ldap/pkg-plist | 5 | ||||
| -rw-r--r-- | mail/qmail/Makefile | 6 | ||||
| -rw-r--r-- | mail/qmail/distinfo | 2 |
5 files changed, 28 insertions, 13 deletions
diff --git a/mail/qmail-ldap/Makefile b/mail/qmail-ldap/Makefile index d7565bd98bd7..c80e054951e7 100644 --- a/mail/qmail-ldap/Makefile +++ b/mail/qmail-ldap/Makefile @@ -6,12 +6,12 @@ # PORTNAME= qmail -PORTVERSION= 1.03 +PORTVERSION= ${QMAIL_VERSION}.${LDAP_PATCH_DATE} CATEGORIES= mail PKGNAMESUFFIX= -ldap PATCH_SITES= http://www.nrg4u.com/qmail/ -PATCHFILES= qmail-ldap-1.03-20000501.patch.gz +PATCHFILES= qmail-ldap-1.03-${LDAP_PATCH_DATE}.patch.gz MAINTAINER= lioux@linf.unb.br @@ -21,10 +21,17 @@ LIB_DEPENDS+= ldap.1:${PORTSDIR}/net/openldap .include <bsd.port.pre.mk> .endif -DOCFILES+= ${WRKSRC}/QLDAPINSTALL ${WRKSRC}/ANTISPAM +#PREFIX= /var/qmail-ldap + +DOCFILES+= ${WRKSRC}/QLDAPINSTALL ${WRKSRC}/QLDAPNEWS \ + ${WRKSRC}/QLDAPTODO ${WRKSRC}/QLDAPPICTURE \ + ${WRKSRC}/ANTISPAM + +LDAP_PATCH_DATE= 20000701 # Local overrides -MASTERDIR= ${.CURDIR}/../qmail +MASTERDIR= ${PORTSDIR}/mail/qmail +#MASTERDIR= ${.CURDIR}/../qmail PATCHDIR= ${.CURDIR}/patches PKGDIR_LOCAL= ${.CURDIR}/pkg DESCR= ${PKGDIR_LOCAL}/DESCR diff --git a/mail/qmail-ldap/files/patch-aa b/mail/qmail-ldap/files/patch-aa index d006bdfbce68..2daa14f085ed 100644 --- a/mail/qmail-ldap/files/patch-aa +++ b/mail/qmail-ldap/files/patch-aa @@ -1,5 +1,5 @@ ---- hier.c.ORIG Sun May 21 12:19:27 2000 -+++ hier.c Sun May 21 12:26:01 2000 +--- hier.c.ORIG Tue Sep 26 12:39:49 2000 ++++ hier.c Tue Sep 26 12:41:07 2000 @@ -35,16 +35,6 @@ d(auto_qmail,"users",auto_uido,auto_gidq,0755); d(auto_qmail,"bin",auto_uido,auto_gidq,0755); @@ -17,7 +17,7 @@ d(auto_qmail,"alias",auto_uida,auto_gidq,02755); -@@ -64,43 +54,6 @@ +@@ -64,46 +54,6 @@ z(auto_qmail,"queue/lock/sendmutex",0,auto_uids,auto_gidq,0600); p(auto_qmail,"queue/lock/trigger",auto_uids,auto_gidq,0622); @@ -56,15 +56,18 @@ - c(auto_qmail,"doc","PIC.relaygood",auto_uido,auto_gidq,0644); - c(auto_qmail,"doc","PIC.rem2local",auto_uido,auto_gidq,0644); - c(auto_qmail,"doc","QLDAPINSTALL",auto_uido,auto_gidq,0644); +- c(auto_qmail,"doc","QLDAPNEWS",auto_uido,auto_gidq,0644); +- c(auto_qmail,"doc","QLDAPTODO",auto_uido,auto_gidq,0644); +- c(auto_qmail,"doc","QLDAPPICTURE",auto_uido,auto_gidq,0644); - c(auto_qmail,"doc","ANTISPAM",auto_uido,auto_gidq,0644); - c(auto_qmail,"bin","qmail-queue",auto_uidq,auto_gidq,04711); c(auto_qmail,"bin","qmail-lspawn",auto_uido,auto_gidq,0700); c(auto_qmail,"bin","qmail-start",auto_uido,auto_gidq,0700); -@@ -150,110 +103,4 @@ +@@ -153,110 +103,4 @@ c(auto_qmail,"bin","auth_pop",auto_uido,auto_gidq,0700); c(auto_qmail,"bin","auth_imap",auto_uido,auto_gidq,0700); - c(auto_qmail,"bin","qmail-ldaplookup",auto_uido,auto_gidq,0000); + c(auto_qmail,"bin","qmail-ldaplookup",auto_uido,auto_gidq,0700); - - c(auto_qmail,"man/man5","addresses.5",auto_uido,auto_gidq,0644); - c(auto_qmail,"man/cat5","addresses.0",auto_uido,auto_gidq,0644); diff --git a/mail/qmail-ldap/pkg-plist b/mail/qmail-ldap/pkg-plist index 2e9ae7e1aa74..1ecb6baf1405 100644 --- a/mail/qmail-ldap/pkg-plist +++ b/mail/qmail-ldap/pkg-plist @@ -22,6 +22,9 @@ %%DOCDIR%%/PIC.relaygood %%DOCDIR%%/PIC.rem2local %%DOCDIR%%/QLDAPINSTALL +%%DOCDIR%%/QLDAPNEWS +%%DOCDIR%%/QLDAPTODO +%%DOCDIR%%/QLDAPPICTURE %%DOCDIR%%/ANTISPAM boot/home boot/home+df @@ -134,7 +137,7 @@ bin/qmail-quotawarn bin/auth_pop @mode 0700 bin/auth_imap -@mode 0000 +@mode 0700 bin/qmail-ldaplookup @group diff --git a/mail/qmail/Makefile b/mail/qmail/Makefile index 7fc1cdf56bda..d75a0e5be7ca 100644 --- a/mail/qmail/Makefile +++ b/mail/qmail/Makefile @@ -6,7 +6,7 @@ # PORTNAME= qmail -PORTVERSION= 1.03 +PORTVERSION?= ${QMAIL_VERSION} CATEGORIES= mail MASTER_SITES= http://cr.yp.to/software/ \ ftp://ftp.ntnu.no/pub/unix/mail/qmail/ \ @@ -14,6 +14,7 @@ MASTER_SITES= http://cr.yp.to/software/ \ ftp://ftp.rifkin.technion.ac.il/pub/qmail/ \ ftp://ftp.net.ohio-state.edu/pub/networking/mail/qmail/ \ ftp://ftp.id.wustl.edu/pub/qmail/ +DISTNAME= ${PORTNAME}-${QMAIL_VERSION} # Patch necessary to cope with non-RFC >512 dns entries # Since AOL has been using those, the problem has skyrocketed from minor to @@ -27,7 +28,8 @@ MAINTAINER= lioux@linf.unb.br # A normal qmail installation puts everything into /var/qmail/. # If you want to install to /usr/local/, then "/usr/local/qmail" is # suggested instead of "/usr/local", but both will work. -PREFIX= /var/qmail +PREFIX?= /var/qmail +QMAIL_VERSION?= 1.03 ALL_TARGET= default dot-qmail.5 qmail-control.5 qmail-getpw.8 \ qmail-limits.7 qmail-newmrh.8 qmail-newu.8 qmail-pw2u.8 \ diff --git a/mail/qmail/distinfo b/mail/qmail/distinfo index 7945db8fc902..0b367edb94b8 100644 --- a/mail/qmail/distinfo +++ b/mail/qmail/distinfo @@ -1,3 +1,3 @@ MD5 (qmail-1.03.tar.gz) = 622f65f982e380dbe86e6574f3abcb7c +MD5 (qmail-ldap-1.03-20000701.patch.gz) = 15bc80f2180dbaacf4286dcd3d3014f6 MD5 (qmail-103.patch) = 9140ad2b03017145cd7963c84bb24f16 -MD5 (qmail-ldap-1.03-20000501.patch.gz) = 3bac26caf4fbbf9a9af1919c60dd9f94 |