The exim texinfo documentation is incorrectly installed if exim is installed from a package (my error: changes in PR 55701) After playing around, I thought that the exim Makefile would be much simpler without a hack for the texinfo files, and they should be in a seperate port anyway. Also included: make portlint a little happier... Fix: a patch for mail/exim and mail/exim-doc-html and a new slave port mail/exim-doc-texinfo as a shar file: --- exim-doc-texinfo.shar ends here -----YRL6ldmAFgBPjB45DRpN4gsLaWgO2E0dDx05v579ijV72ZFf Content-Type: text/plain; name="exim-doc-texinfo.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="exim-doc-texinfo.patch" diff -Nur mail/exim/Makefile.orig mail/exim/Makefile --- mail/exim/Makefile.orig Sat Aug 30 02:06:41 2003 +++ mail/exim/Makefile Mon Sep 1 21:41:11 2003 @@ -6,19 +6,18 @@ # PORTNAME= exim -PORTVERSION= ${EXIM_VERSION} +PORTVERSION= 4.22 PORTREVISION= 1 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 @@ 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}-10 -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 @@ .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 @@ 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 @@ .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 -Nur mail/exim/distinfo.orig mail/exim/distinfo --- mail/exim/distinfo.orig Mon Aug 18 16:52:13 2003 +++ mail/exim/distinfo Mon Sep 1 21:33:05 2003 @@ -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 diff -Nur mail/exim-doc-html/Makefile.orig mail/exim-doc-html/Makefile --- mail/exim-doc-html/Makefile.orig Mon Jul 7 15:04:47 2003 +++ mail/exim-doc-html/Makefile Mon Sep 1 21:48:28 2003 @@ -5,11 +5,12 @@ # $FreeBSD: ports/mail/exim-doc-html/Makefile,v 1.7 2003/07/07 11:32:28 sheldonh Exp $ # -PORTNAME= exim-doc-${DOCFORMAT} +PORTNAME= exim PORTVERSION= 4.20 CATEGORIES= mail MASTER_SITES= ${MASTER_SITE_EXIM} MASTER_SITE_SUBDIR= exim4 +PKGNAMESUFFIX= -doc-${DOCFORMAT} DISTNAME= exim-${DOCFORMAT}-${PORTVERSION} DIST_SUBDIR= exim @@ -17,20 +18,24 @@ COMMENT= Documentation for the Exim MTA in multiple formats USE_BZIP2= yes -NO_BUILD= yes -DOCSDIR= ${PREFIX}/share/doc/exim -PLIST= ${WRKDIR}/pkg-plist +PLIST= ${PKGDIR}/pkg-plist_${DOCFORMAT} DOCFORMAT?= html -.if ${DOCFORMAT} != "html" && ${DOCFORMAT} != "pdf" && ${DOCFORMAT} != "postscript" +.if ${DOCFORMAT} != "html" && ${DOCFORMAT} != "pdf" && ${DOCFORMAT} != "postscript" && ${DOCFORMAT} != "texinfo" .BEGIN: @ ${ECHO} 'ERROR: invalid value for DOCFORMAT: "${DOCFORMAT}"' - @ ${ECHO} 'Possible values are "html", "pdf" and "postscript".' + @ ${ECHO} 'Possible values are "html", "pdf", "postscript" and "texinfo".' @ ${FALSE} .endif -pre-install: - @ ${CP} ${PKGDIR}/pkg-plist_${DOCFORMAT} ${PLIST} +do-build: +.if ${DOCFORMAT} == "texinfo" + @ cd ${WRKSRC}/doc; \ + makeinfo --no-split --output exim.info spec.texinfo; \ + makeinfo --no-split --output exim_filter.info filter.texinfo +.else + @ ${DO_NADA} +.endif do-install: .if !defined(NOPORTDOCS) @@ -43,6 +48,15 @@ @ ${INSTALL_DATA} ${WRKSRC}/doc/*.pdf ${DOCSDIR} .elif ${DOCFORMAT} == "postscript" @ ${INSTALL_DATA} ${WRKSRC}/doc/*.ps ${DOCSDIR} +.elif ${DOCFORMAT} == "texinfo" + @ ${INSTALL_DATA} ${WRKSRC}/doc/exim.info ${PREFIX}/info + @ install-info --section="Exim" \ + --entry "* User guide: (exim). Exim manual" \ + ${PREFIX}/info/exim.info ${PREFIX}/info/dir + @ ${INSTALL_DATA} ${WRKSRC}/doc/exim_filter.info ${PREFIX}/info + @ install-info --section="Exim" \ + --entry "* Filtering: (exim_filter). Filtering mail with Exim" \ + ${PREFIX}/info/exim_filter.info ${PREFIX}/info/dir .endif .endif diff -Nur mail/exim-doc-html/distinfo.orig mail/exim-doc-html/distinfo --- mail/exim-doc-html/distinfo.orig Wed May 21 14:39:29 2003 +++ mail/exim-doc-html/distinfo Mon Sep 1 19:13:05 2003 @@ -1,3 +1,4 @@ MD5 (exim/exim-html-4.20.tar.bz2) = 75541910675660bf3203bc16080f4365 MD5 (exim/exim-pdf-4.20.tar.bz2) = f17a521b58372a016ada5745fa64cc8f MD5 (exim/exim-postscript-4.20.tar.bz2) = fb00d8ceae45779f4524f6f84f7f64ea +MD5 (exim/exim-texinfo-4.20.tar.bz2) = debc6d3fdd88fd6d9c646ca0495fa92d diff -Nur mail/exim-doc-html/pkg-plist_texinfo.orig mail/exim-doc-html/pkg-plist_texinfo --- mail/exim-doc-html/pkg-plist_texinfo.orig Thu Jan 1 01:00:00 1970 +++ mail/exim-doc-html/pkg-plist_texinfo Mon Sep 1 21:04:14 2003 @@ -0,0 +1,6 @@ +%%PORTDOCS%%@unexec install-info --delete %D/info/exim.info %D/info/dir +%%PORTDOCS%%info/exim.info +%%PORTDOCS%%@exec install-info --section="Exim" --entry "* User guide: (exim). Exim manual" %D/%F %B/dir +%%PORTDOCS%%@unexec install-info --delete %D/info/exim_filter.info %D/info/dir +%%PORTDOCS%%info/exim_filter.info +%%PORTDOCS%%@exec install-info --section="Exim" --entry "* Filtering: (exim_filter). Filtering mail with Exim" %D/%F %B/dir
Responsible Changed From-To: freebsd-ports-bugs->sheldonh Over to maintainer.
On (2003/09/01 22:07), Oliver Eikemeier wrote: > a patch for mail/exim and mail/exim-doc-html and a new > slave port mail/exim-doc-texinfo as a shar file: I don't understand this part of the change: > --- mail/exim-doc-html/Makefile.orig Mon Jul 7 15:04:47 2003 > +++ mail/exim-doc-html/Makefile Mon Sep 1 21:48:28 2003 > @@ -5,11 +5,12 @@ > # $FreeBSD: ports/mail/exim-doc-html/Makefile,v 1.7 2003/07/07 11:32:28 > sheldonh Exp $ > # > > -PORTNAME= exim-doc-${DOCFORMAT} > +PORTNAME= exim This will cause "make install" in ports/mail/exim-doc-html to register the package as exim-4.20, won't it? Ciao, Sheldon.
Sheldon Hearn wrote: >>--- mail/exim-doc-html/Makefile.orig Mon Jul 7 15:04:47 2003 >>+++ mail/exim-doc-html/Makefile Mon Sep 1 21:48:28 2003 >>@@ -5,11 +5,12 @@ >># $FreeBSD: ports/mail/exim-doc-html/Makefile,v 1.7 2003/07/07 11:32:28 >>sheldonh Exp $ >># >> >>-PORTNAME= exim-doc-${DOCFORMAT} >>+PORTNAME= exim > > This will cause "make install" in ports/mail/exim-doc-html to register > the package as exim-4.20, won't it? No, the change is: -PORTNAME= exim-doc-${DOCFORMAT} +PORTNAME= exim ... +PKGNAMESUFFIX= -doc-${DOCFORMAT} so ${PKGNAME} (${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}) stays the same, you can do -DOCSDIR= ${PREFIX}/share/doc/exim because the default is right, and portlint is happy ;-P That reminds me: mail/exim-old is missing NO_LATEST_LINK=yes Regards Oliver
On (2003/09/02 14:54), Oliver Eikemeier wrote: > No, the change is: > -PORTNAME= exim-doc-${DOCFORMAT} > +PORTNAME= exim > ... > +PKGNAMESUFFIX= -doc-${DOCFORMAT} Hmmm, okay. In that case, I'm happy with one tiny exception. I'd like to call the new port exim-doc-info instead, since it installs info files; texinfo is the source language. Are you happy with that? You don't need to submit new patches. Ciao, Sheldon.
Sheldon Hearn wrote: > In that case, I'm happy with one tiny exception. I'd like to call the > new port exim-doc-info instead, since it installs info files; texinfo is > the source language. > > Are you happy with that? You don't need to submit new patches. Actually I wanted to simplify the exim Makefile (because I'm working on a rc.subr start/stop script), and submitted the patch to get rid of the info files, to be honest. So I am happy with everything you come up with, the problem is that mail/exim-doc-html has PORTNAME= exim-doc-${DOCFORMAT} ... DISTNAME= exim-${DOCFORMAT}-${PORTVERSION} so that change is not trivial...
State Changed From-To: open->closed Committed, thanks!