Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 20 Oct 2012 08:49:11 +0000 (UTC)
From:      Guido Falsi <madpilot@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r306171 - head/mail/maildrop
Message-ID:  <201210200849.q9K8nBpL090226@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: madpilot
Date: Sat Oct 20 08:49:11 2012
New Revision: 306171
URL: http://svn.freebsd.org/changeset/ports/306171

Log:
  - Fix paths to html documentation in man pages [1]
  - Bump PORTREVISION
  - While here perform a whitespace fix and move MAN* variables where
    they belong.
  
  Reported by:	Bjoern Voigt <bjoernv@arcor.de> [1]
  Feature safe:	yes

Modified:
  head/mail/maildrop/Makefile

Modified: head/mail/maildrop/Makefile
==============================================================================
--- head/mail/maildrop/Makefile	Sat Oct 20 08:39:39 2012	(r306170)
+++ head/mail/maildrop/Makefile	Sat Oct 20 08:49:11 2012	(r306171)
@@ -17,6 +17,7 @@
 
 PORTNAME=	maildrop
 PORTVERSION=	2.6.0
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	SF/courier/${PORTNAME}/${PORTVERSION}
 
@@ -37,12 +38,30 @@ CONFIGURE_ARGS=	--enable-syslog=1 \
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-CONFLICTS=      courier-0.65*
+CONFLICTS=	courier-0.65*
 
 LIB_DEPENDS+=	pcre:${PORTSDIR}/devel/pcre
 
 MAILDROP_LOG_COLUMNS?=	72	# lenght of 'File:' line in log
 
+FIXDOCPATH=	liblock/lockmail.1 maildir/deliverquota.8.in \
+		maildir/maildir.5 maildir/maildiracl.1.in \
+		maildir/maildirkw.1 maildir/maildirmake.1.in \
+		maildir/maildirquota.7 maildrop/mailbot.1 \
+		maildrop/maildrop.1.in maildrop/maildropex.7 \
+		maildrop/maildropfilter.7.in maildrop/maildropgdbm.7 \
+		maildrop/makedat.1 maildrop/reformail.1 \
+		rfc2045/makemime.1 rfc2045/reformime.1 \
+		rfc2045/rfc2045.3 rfc822/rfc822.3
+
+MAN1+=	lockmail.1 mailbot.1 maildrop-maildirmake.1 maildrop.1 makemime.1 \
+	reformail.1 reformime.1
+MAN5=	maildir.5
+MAN7=	maildirquota.7 maildropex.7 maildropfilter.7 maildropgdbm.7
+MAN8+=	maildrop-deliverquota.8
+DOCS=	AUTHORS INSTALL INSTALL.html README README.html README.postfix \
+	UPGRADE UPGRADE.html maildroptips.txt maildir/README.*
+
 .if defined(WITH_AUTHLIB)
 .if exists(${.CURDIR}/../../security/courier-authlib/Makefile.opt)
 .include "${.CURDIR}/../../security/courier-authlib/Makefile.opt"
@@ -90,6 +109,11 @@ PLIST_SUB+=	DOVECOTAUTH="@comment "
 post-patch:
 	@${REINPLACE_CMD} -e "s/l= 72 - szbuf.Length();/l= ${MAILDROP_LOG_COLUMNS} - szbuf.Length();/" \
 		${WRKSRC}/maildrop/log.C
+.for f in ${FIXDOCPATH}
+	@${REINPLACE_CMD} -e "s|\\\%\[set \$$man\.base\.url\.for\.relative\.links\]|${DOCSDIR}|" \
+		-e "s/\(maildirmake.html\)/maildrop-\1/" \
+		-e "s/\(deliverquota.html\)/maildrop-\1/" ${WRKSRC}/${f}
+.endfor
 .if defined(WITH_AUTHLIB)
 	@${REINPLACE_CMD} -e 's|@LIBS@|@LIBS@ -rpath=:${LOCALBASE}/lib/courier-authlib|' \
 		${WRKSRC}/maildrop/Makefile.in
@@ -110,14 +134,6 @@ INSTALL_TARGET=	install-maildrop install
 INSTALL_TARGET=	install-strip
 .endif
 
-MAN1+=	lockmail.1 mailbot.1 maildrop-maildirmake.1 maildrop.1 makemime.1 \
-	reformail.1 reformime.1
-MAN5=	maildir.5
-MAN7=	maildirquota.7 maildropex.7 maildropfilter.7 maildropgdbm.7
-MAN8+=	maildrop-deliverquota.8
-DOCS=	AUTHORS INSTALL INSTALL.html README README.html README.postfix \
-	UPGRADE UPGRADE.html maildroptips.txt maildir/README.*
-
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/maildir/quotawarnmsg \
 		${PREFIX}/etc/quotawarnmsg.sample



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201210200849.q9K8nBpL090226>