Attachment 96437 Details for Bug 135051 – postfix.txt

postfix.txt

postfix.txt (text/plain; charset=us-ascii), 3.63 KB, created by Sahil Tandon on 2009-06-06 18:20:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Sahil Tandon

Created: 2009-06-06 18:20:18 UTC

Size: 3.63 KB

patch

obsolete

>Index: Makefile
>===================================================================
>RCS file: /home/ncvs/ports/mail/postfix/Makefile,v
>retrieving revision 1.147
>diff -u -r1.147 Makefile
>--- Makefile	5 Jun 2009 07:02:43 -0000	1.147
>+++ Makefile	6 Jun 2009 17:16:51 -0000
>@@ -7,6 +7,7 @@
> 
> PORTNAME=	postfix
> PORTVERSION=	2.6.2
>+PORTREVISION=	1
> PORTEPOCH=	1
> CATEGORIES=	mail ipv6
> MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
>@@ -77,6 +78,9 @@
> 	bounce.8 trace.8 \
> 	smtp.8 lmtp.8
> 
>+HTML1=	SOHO_README.html body_checks.5.html bounce.5.html postfix-power.png \
>+	scache.8.html tlsmgr.8.html
>+
> .if !defined(DEBUG)
> MAKEFILEFLAGS+=	DEBUG=
> .endif
>@@ -211,9 +215,9 @@
> .endif
> 
> .if defined(NOPORTDOCS)
>-READMEDIR=no
>+READMEDIR=	no
> .else
>-READMEDIR=${DOCSDIR}
>+READMEDIR=	${DOCSDIR}
> .endif
> 
> SUB_LIST+=	REQUIRE="${_REQUIRE}" READMEDIR="${READMEDIR}"
>@@ -274,6 +278,12 @@
> 		${REINPLACE_CMD} -E -e '${REINPLACE}'
> 
> post-patch:
>+	@${ECHO} '$$readme_directory/SOHO_README:f:root:-:644' \
>+		>> ${WRKSRC}/conf/postfix-files
>+.for f in ${HTML1}
>+	@${ECHO} '$$html_directory/$f:f:root:-:644' \
>+		>> ${WRKSRC}/conf/postfix-files
>+.endfor
> .if defined(WITH_VDA)
> 	@${ECHO} '$$readme_directory/VDA_README:f:root:-:644' \
> 		>> ${WRKSRC}/conf/postfix-files
>@@ -290,7 +300,10 @@
> 	@${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
> 
> do-install:
>-	@cd ${WRKSRC} && ${SH} postfix-install -non-interactive install_root=/ tempdir=/tmp
>+	@cd ${WRKSRC} && ${SH} postfix-install -non-interactive install_root=/ tempdir=/tmp \
>+		daemon_directory=${PREFIX}/libexec/postfix \
>+		html_directory=${READMEDIR} \
>+		readme_directory=${READMEDIR}
> 	${INSTALL_SCRIPT} ${WRKSRC}/auxiliary/rmail/rmail ${PREFIX}/bin/rmail
> 	${INSTALL_SCRIPT} ${WRKSRC}/auxiliary/qshape/qshape.pl ${PREFIX}/bin/qshape
> 	${INSTALL_MAN} ${WRKSRC}/man/man1/qshape.1 ${MANPREFIX}/man/man1
>@@ -300,11 +313,6 @@
> .for f in ${MANTEST}
> 	${INSTALL_MAN} ${WRKSRC}/man/man1/${f} ${MANPREFIX}/man/man1
> .endfor
>-.if !defined(NOPORTDOCS)
>-	${INSTALL} -o ${DOCOWN} -g ${DOCGRP} -m 555 -d ${DOCSDIR}
>-	@cd ${WRKSRC}/html && ${INSTALL_DATA} *.html *.jpg *.png ${DOCSDIR} && \
>-		${ECHO_MSG} "Installed HTML documentation in ${DOCSDIR}"
>-.endif
> 
> post-install:
> 	@${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
>Index: pkg-plist
>===================================================================
>RCS file: /home/ncvs/ports/mail/postfix/pkg-plist,v
>retrieving revision 1.29
>diff -u -r1.29 pkg-plist
>--- pkg-plist	4 Jun 2009 07:45:27 -0000	1.29
>+++ pkg-plist	6 Jun 2009 17:16:51 -0000
>@@ -136,6 +136,7 @@
> %%PORTDOCS%%%%DOCSDIR%%/SMTPD_POLICY_README.html
> %%PORTDOCS%%%%DOCSDIR%%/SMTPD_PROXY_README
> %%PORTDOCS%%%%DOCSDIR%%/SMTPD_PROXY_README.html
>+%%PORTDOCS%%%%DOCSDIR%%/SOHO_README
> %%PORTDOCS%%%%DOCSDIR%%/SOHO_README.html
> %%PORTDOCS%%%%DOCSDIR%%/STANDARD_CONFIGURATION_README
> %%PORTDOCS%%%%DOCSDIR%%/STANDARD_CONFIGURATION_README.html
>Index: files/pkg-install.in
>===================================================================
>RCS file: /home/ncvs/ports/mail/postfix/files/pkg-install.in,v
>retrieving revision 1.2
>diff -u -r1.2 pkg-install.in
>--- files/pkg-install.in	4 Jun 2009 07:45:27 -0000	1.2
>+++ files/pkg-install.in	6 Jun 2009 17:16:51 -0000
>@@ -114,8 +114,18 @@
> fi
> 
> if [ "$2" = "POST-INSTALL" ]; then
>+	SAMPLES="main.cf master.cf" 
>+	for file in $SAMPLES
>+	do
>+		if [ ! -f ${ETCDIR}/$file ]; then
>+                	cp ${DAEMONDIR}/$file ${ETCDIR}/
>+		fi
>+	done
>+
>       /bin/sh ${DAEMONDIR}/post-install tempdir=/tmp \
> 	daemon_directory=${DAEMONDIR} \
>+	html_directory=${READMEDIR} \
>+	readme_directory=${READMEDIR} \
> 	upgrade-package
> fi
>

Actions: View

Attachments on bug 135051: 96435 | 96436 | 96437