diff options
| author | jlam <jlam@pkgsrc.org> | 2007-09-11 17:50:14 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2007-09-11 17:50:14 +0000 |
| commit | c25401b78f670918653cb7433128a06feb3bdc91 (patch) | |
| tree | 9023ff16923f3cdac726434c0081e24299200c0f /mail | |
| parent | 3435c1b1df8712ca8e9f6d51d910a1fc37120141 (diff) | |
| download | pkgsrc-c25401b78f670918653cb7433128a06feb3bdc91.tar.gz | |
A long, long time ago, sqwebmail's "ldapsearch" changed from a script
that called openldap's ldapsearch binary into a standalone binary. We
no longer need to copy "ldapsearch" into ${PKG_SYSCONFDIR} so that the
user can edit it.
Bump the PKGREVISION to 2.
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/sqwebmail/Makefile | 7 | ||||
| -rw-r--r-- | mail/sqwebmail/distinfo | 4 | ||||
| -rw-r--r-- | mail/sqwebmail/patches/patch-ad | 11 |
3 files changed, 6 insertions, 16 deletions
diff --git a/mail/sqwebmail/Makefile b/mail/sqwebmail/Makefile index 5c3a572defb..6ae07d001ea 100644 --- a/mail/sqwebmail/Makefile +++ b/mail/sqwebmail/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.56 2007/09/11 04:44:18 jlam Exp $ +# $NetBSD: Makefile,v 1.57 2007/09/11 17:50:14 jlam Exp $ DISTNAME= sqwebmail-5.1.6 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= mail www MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=courier/} EXTRACT_SUFX= .tar.bz2 @@ -70,7 +70,6 @@ CONFIGURE_ARGS+= --with-piddir=${VARBASE:Q}/run CONFIGURE_ENV+= GZIP=${TOOLS_PATH.gzip:Q} CONFIGURE_ENV+= GPG=${PREFIX:Q}/bin/gpg -CONFIGURE_ENV+= ldapsearch=${PREFIX:Q}/bin/ldapsearch REQD_DIRS+= ${DATADIR} ${DOCDIR} ${EGDIR} ${LIBEXECDIR} REQD_DIRS_PERMS+= ${LIBEXECDIR}/webmail \ @@ -92,7 +91,7 @@ CONF_FILES_PERMS+= ${EGDIR}/${_file_} \ ${PKG_SYSCONFDIR}/${_file_:S/.dist$//} \ ${COURIER_FILE_PERMS} .endfor -.for _file_ in cleancache.pl ldapsearch sendit.sh +.for _file_ in cleancache.pl sendit.sh CONF_FILES_PERMS+= ${PREFIX}/share/courier/sqwebmail/${_file_} \ ${PKG_SYSCONFDIR}/${_file_} \ ${COURIER_SCRIPT_PERMS} diff --git a/mail/sqwebmail/distinfo b/mail/sqwebmail/distinfo index a2d0b347b1d..896a46fab9d 100644 --- a/mail/sqwebmail/distinfo +++ b/mail/sqwebmail/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.18 2007/09/07 14:52:27 jlam Exp $ +$NetBSD: distinfo,v 1.19 2007/09/11 17:50:14 jlam Exp $ SHA1 (sqwebmail-5.1.6.tar.bz2) = 04ecff69dfcd01fc947adfafe39d8f2bd80254e6 RMD160 (sqwebmail-5.1.6.tar.bz2) = 231c0f972a7423c231ff7db8bacc6417aae5354a Size (sqwebmail-5.1.6.tar.bz2) = 3809004 bytes SHA1 (patch-aa) = 85ce29b1be7335d547740783eb726d25cc4f0765 -SHA1 (patch-ad) = 813bab377ad047599af8846631e16a240f2fd7ec +SHA1 (patch-ad) = c76190e8c7184ca5699f07dcf02656bc63dc1e39 SHA1 (patch-ah) = 5f88760e7d69fbad6894557283c069e0c9592044 SHA1 (patch-ai) = def2f4d30bf5f15ea78f401f3c4ca2f2ec8c0ad2 SHA1 (patch-aj) = 510c91faf9d0cd584b5ec9da07a034a7d89d62f3 diff --git a/mail/sqwebmail/patches/patch-ad b/mail/sqwebmail/patches/patch-ad index ec97d090976..8b3f051d027 100644 --- a/mail/sqwebmail/patches/patch-ad +++ b/mail/sqwebmail/patches/patch-ad @@ -1,4 +1,4 @@ -$NetBSD: patch-ad,v 1.8 2007/08/10 17:57:14 jlam Exp $ +$NetBSD: patch-ad,v 1.9 2007/09/11 17:50:14 jlam Exp $ --- sqwebmail/Makefile.in.orig 2007-04-22 14:18:04.000000000 -0400 +++ sqwebmail/Makefile.in @@ -20,15 +20,6 @@ $NetBSD: patch-ad,v 1.8 2007/08/10 17:57:14 jlam Exp $ ; then \ echo '#define HOSTNAMEFILE "$(sysconfdir)/defaultdomain"' >>htmllibdir.h \ ; echo '#define MAKEMIME "$(bindir)/makemime"' >>htmllibdir.h \ -@@ -1008,7 +1008,7 @@ htmllibdir.h: config.status - ; echo '#define MAKEMIME "$(pkglibexecdir)/makemime"' >>htmllibdir.h \ - ; fi - echo '#define LDAPADDRESSBOOK "$(sysconfdir)/ldapaddressbook"' >>htmllibdir.h -- echo '#define LDAPSEARCH "$(scriptdir)/ldapsearch"' >>htmllibdir.h -+ echo '#define LDAPSEARCH "$(sysconfdir)/ldapsearch"' >>htmllibdir.h - echo '#define AUTHCHARSET "$(sysconfdir)/authcharset"' >>htmllibdir.h - - ldapsearch: ../ldapaddressbook/ldapsearch @@ -1036,9 +1036,6 @@ install-perms-cache: @echo "@cachedir@ 700 @cacheowner@ bin" >>permissions.dat |