diff options
| author | Sheldon Hearn <sheldonh@FreeBSD.org> | 2003-09-02 14:40:30 +0000 |
|---|---|---|
| committer | Sheldon Hearn <sheldonh@FreeBSD.org> | 2003-09-02 14:40:30 +0000 |
| commit | f1fb133bb603bf51f412647e30c04a684f8285fb (patch) | |
| tree | b69725bb0db4c7bf12b14ed1518ab2914f77e8be /mail/exim | |
| parent | Add p5-Module-Reload 1.07, (diff) | |
Exim updates:
1) Update to exiscan-acl patch revision 11.
2) Spin info files off into their own port, exim-doc-info.
3) Pet portlint.
PR: ports/56291
Submitted by: Oliver Eikemeier <eikemeier@fillmore-labs.com>
Notes
Notes:
svn path=/head/; revision=88360
Diffstat (limited to 'mail/exim')
| -rw-r--r-- | mail/exim/Makefile | 30 | ||||
| -rw-r--r-- | mail/exim/distinfo | 3 |
2 files changed, 11 insertions, 22 deletions
diff --git a/mail/exim/Makefile b/mail/exim/Makefile index 8ffd621aab16..e6230d4c9e1a 100644 --- a/mail/exim/Makefile +++ b/mail/exim/Makefile @@ -6,19 +6,18 @@ # PORTNAME= exim -PORTVERSION= ${EXIM_VERSION} -PORTREVISION= 1 +PORTVERSION= 4.22 +PORTREVISION= 2 CATEGORIES= mail MASTER_SITES= ${MASTER_SITE_EXIM} MASTER_SITE_SUBDIR= exim4 -DISTFILES= exim-${EXIM_VERSION}${EXTRACT_SUFX} \ - exim-texinfo-${EXIM_DOCVERSION}${EXTRACT_SUFX} DIST_SUBDIR= exim .if !defined(WITHOUT_EXISCAN) PATCH_SITES= http://duncanthrax.net/%SUBDIR%/ PATCH_SITE_SUBDIR= exiscan-acl PATCHFILES= exiscan-acl-${EXISCAN_ACL_VERSION}.patch.bz2 +PATCH_DIST_STRIP= -p1 .endif MAINTAINER= sheldonh@FreeBSD.org @@ -29,20 +28,15 @@ LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv USE_BZIP2= yes USE_PERL5= yes MAN8= exim.8 -INFO= exim exim_filter -EXIM_VERSION= 4.22 -EXIM_DOCVERSION= 4.20 -EXISCAN_ACL_VERSION= ${EXIM_VERSION}-10 +EXISCAN_ACL_VERSION= ${PORTVERSION}-11 -PLIST_SUB+= EXIM_VERSION="${EXIM_VERSION}" +PLIST_SUB+= EXIM_VERSION="${PORTVERSION}" .if defined(NOPORTDOCS) PKGMESSAGE= ${WRKDIR}/POST-INSTALL-NOTES .endif -PATCH_DIST_STRIP= -p1 - MAKE_ENV+= OSTYPE=${OPSYS} ARCHTYPE=${MACHINE_ARCH} LOCALBASE=${LOCALBASE} POSTGRESQL_PORT?= databases/postgresql7 @@ -244,7 +238,7 @@ SEDLIST+= -e 's,XX_MYSQL_[^ ]*_XX,,' .if defined(WITH_SASLAUTHD) RUN_DEPENDS+= ${LOCALBASE}/sbin/saslauthd:${PORTSDIR}/security/cyrus-sasl2-saslauthd -SEDLIST+= -e 's,^\# CYRUS_SASLAUTHD_SOCKET=,CYRUS_SASLAUTHD_SOCKET=,' +SEDLIST+= -e 's,^\# CYRUS_SASLAUTHD_SOCKET=,CYRUS_SASLAUTHD_SOCKET=,' .endif .if defined(WITH_PWCHECK) @@ -343,10 +337,6 @@ post-patch: do-configure: ${MKDIR} ${WRKSRC}/Local ${SED} ${SEDLIST} < ${WRKSRC}/src/EDITME > ${WRKSRC}/Local/Makefile - cd ${WRKSRC}/doc && \ - for i in ../../exim-texinfo-${EXIM_DOCVERSION}/doc/* ; do \ - ${LN} -sf $$i ; \ - done pre-install: @PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL @@ -359,11 +349,11 @@ post-install: .if !defined(WITHOUT_EXISCAN) ${INSTALL_DATA} ${FILESDIR}/POST-INSTALL-NOTES.clamd ${DOCSDIR} .endif -.for file in ${PORTDOC_FILES} - ${INSTALL_DATA} ${WRKSRC}/doc/${file} ${DOCSDIR} +.for docfile in ${PORTDOC_FILES} + ${INSTALL_DATA} ${WRKSRC}/doc/${docfile} ${DOCSDIR} .endfor -.for file in ${MAN8} - ${INSTALL_MAN} ${WRKSRC}/doc/${file} ${MAN8PREFIX}/man/man8 +.for manfile in ${MAN8} + ${INSTALL_MAN} ${WRKSRC}/doc/${manfile} ${MAN8PREFIX}/man/man8 .endfor .endif @${CAT} ${PKGMESSAGE} diff --git a/mail/exim/distinfo b/mail/exim/distinfo index 2708870419b8..60814094f693 100644 --- a/mail/exim/distinfo +++ b/mail/exim/distinfo @@ -1,3 +1,2 @@ MD5 (exim/exim-4.22.tar.bz2) = 938ae799c08ed1899dd27fd50d48f4e5 -MD5 (exim/exim-texinfo-4.20.tar.bz2) = debc6d3fdd88fd6d9c646ca0495fa92d -MD5 (exim/exiscan-acl-4.22-10.patch.bz2) = 239fb3db3eeb5da7c816ce2765b5db2a +MD5 (exim/exiscan-acl-4.22-11.patch.bz2) = 44cea47c192b6f5825023d83b9e1d47b |