Index: head/mail/postfix/Makefile
===================================================================
--- head/mail/postfix/Makefile	(revision 235558)
+++ head/mail/postfix/Makefile	(revision 235559)
@@ -1,315 +1,325 @@
 # New ports collection makefile for:	postfix
 # Date created:				18 Mar 1999
 # Whom:					torstenb
 #
 # $FreeBSD$
 #
 
 PORTNAME=	postfix
 PORTVERSION=	2.6.2
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
 		ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/%SUBDIR%/ \
 		ftp://ftp.tux.org/pub/net/postfix/official/ \
 		ftp://ftp.utoronto.ca/mirror/packages/postfix/official/ \
 		ftp://ftp.samurai.com/pub/postfix/official/ \
 		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/mail/postfix/official/&,}
 MASTER_SITE_SUBDIR=	. old related/postfix
 DISTNAME=	postfix-${PORTVERSION}
 DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	sahil@tandon.net
 COMMENT=	A secure alternative to widely-used Sendmail
 
 CONFLICTS=	courier-0.* postfix-1.* postfix-2.[0-57-9].* postfix-current-2.* \
 		sendmail-8.* sendmail-*-8.* smail-3.* zmailer-2.*
 
 USE_SUBMAKE=	yes
 USE_PERL5_BUILD=yes
 USE_RC_SUBR=	postfix.sh
 SCRIPTS_ENV+=	POSTFIX_DEFAULT_MTA="${POSTFIX_DEFAULT_MTA}"
 
 # back compat pull in settings from POSTFIX_OPTIONS for convenience when
 # make config is run (happens first time port is built, too)
 .for o in SASL2 SASLKRB SASLKRB5 SASLKRB5MIT TLS BDB MySQL PgSQL OpenLDAP CDB NIS VDA Test
 STATUS_${o}=off
 .endfor
 .if defined(POSTFIX_OPTIONS)
 . for o in ${POSTFIX_OPTIONS}
 STATUS_${o}=on
 . endfor
 .endif
 
 OPTIONS=	PCRE		"Perl Compatible Regular Expressions"			on \
 		SASL2		"Cyrus SASLv2 (Simple Auth. and Sec. Layer)"		${STATUS_SASL2} \
 		DOVECOT		"Dovecot SASL authentication method"			off \
 		SASLKRB		"If your SASL req. Kerberos select this option"		${STATUS_SASLKRB} \
 		SASLKRB5	"If your SASL req. Kerberos5 select this option"	${STATUS_SASLKRB5} \
 		SASLKMIT	"If your SASL req. MIT Kerberos5 select this option"	${STATUS_SASLKRB5MIT} \
 		TLS		"Enable SSL and TLS support"				${STATUS_TLS} \
 		BDB		"Berkeley DB (choose version with WITH_BDB_VER)"	${STATUS_BDB} \
 		MYSQL		"MySQL maps (choose version with WITH_MYSQL_VER)"	${STATUS_MySQL} \
 		PGSQL		"PostgreSQL maps (choose with DEFAULT_PGSQL_VER)"	${STATUS_PgSQL} \
 		OPENLDAP	"OpenLDAP maps (choose ver. with WITH_OPENLDAP_VER)"	${STATUS_OpenLDAP} \
 		CDB		"CDB maps lookups"					${STATUS_CDB} \
 		NIS		"NIS maps lookups"					${STATUS_NIS} \
 		VDA		"VDA (Virtual Delivery Agent)"				${STATUS_VDA} \
 		TEST		"SMTP/LMTP test server and generator"			${STATUS_Test}
 
 MAN1=	postalias.1 postcat.1 postconf.1 postdrop.1 postfix.1 postkick.1 \
 	postlock.1 postlog.1 postmap.1 postmulti.1 postqueue.1 postsuper.1 \
 	sendmail.1 qshape.1
 
 MAN5=	access.5 aliases.5 bounce.5 canonical.5 cidr_table.5 generic.5 \
 	header_checks.5 ldap_table.5 master.5 mysql_table.5 nisplus_table.5 \
 	pcre_table.5 pgsql_table.5 postconf.5 postfix-wrapper.5 regexp_table.5 \
 	relocated.5 tcp_table.5 transport.5 virtual.5
 
 MAN8=	anvil.8 bounce.8 cleanup.8 discard.8 error.8 flush.8 local.8 master.8 \
 	oqmgr.8 pickup.8 pipe.8 proxymap.8 qmgr.8 qmqpd.8 scache.8 showq.8 \
 	smtp.8 smtpd.8 spawn.8 tlsmgr.8 trivial-rewrite.8 verify.8 virtual.8
 
 MLINKS=	sendmail.1 mailq.1 \
 	sendmail.1 newaliases.1 \
 	header_checks.5 body_checks.5 \
 	bounce.8 defer.8 \
 	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
 
 MAKEFILEFLAGS+=	CC="${CC}" OPT="${CFLAGS}"
 
 .include <bsd.port.pre.mk>
 
 POSTFIX_CCARGS+=	-DDEF_CONFIG_DIR=\\\"${ETCDIR}\\\" \
-			-DDEF_DAEMON_DIR=\\\"${PREFIX}/libexec/postfix\\\" \
+			-DDEF_DAEMON_DIR=\\\"${DAEMONDIR}\\\" \
 			-DDEF_COMMAND_DIR=\\\"${PREFIX}/sbin\\\" \
 			-DDEF_SENDMAIL_PATH=\\\"${PREFIX}/sbin/sendmail\\\" \
 			-DDEF_NEWALIAS_PATH=\\\"${PREFIX}/bin/newaliases\\\" \
 			-DDEF_MAILQ_PATH=\\\"${PREFIX}/bin/mailq\\\" \
 			-DDEF_MANPAGE_DIR=\\\"${MANPREFIX}/man\\\" \
 			-DDEF_README_DIR=\\\"${READMEDIR}\\\" \
 			-DDEF_HTML_DIR=\\\"${READMEDIR}\\\" \
 			-DDEF_QUEUE_DIR=\\\"/var/spool/postfix\\\" \
 			-DDEF_DATA_DIR=\\\"/var/db/postfix\\\" \
 			-DDEF_MAIL_OWNER=\\\"postfix\\\" \
 			-DDEF_SGID_GROUP=\\\"maildrop\\\" \
 
 # Default requirement for postfix rc script
 _REQUIRE=		LOGIN cleanvar
 
 .if defined(WITH_PCRE)
 LIB_DEPENDS+=		pcre.0:${PORTSDIR}/devel/pcre
 POSTFIX_CCARGS+=	-DHAS_PCRE -I${LOCALBASE}/include
 POSTFIX_AUXLIBS+=	-L${LOCALBASE}/lib -lpcre
 .else
 POSTFIX_CCARGS+=	-DNO_PCRE
 .endif
 
 .if defined(WITH_SASL2)
 LIB_DEPENDS+=		sasl2.2:${PORTSDIR}/security/cyrus-sasl2
 POSTFIX_CCARGS+=	-DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I${LOCALBASE}/include -I${LOCALBASE}/include/sasl
 POSTFIX_AUXLIBS+=	-L${LOCALBASE}/lib -lsasl2 -lpam -lcrypt
 .endif
 
 .if defined(WITH_DOVECOT)
 RUN_DEPENDS+=		dovecot:${PORTSDIR}/mail/dovecot
 POSTFIX_CCARGS+=	-DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\"
 _REQUIRE+=		dovecot
 .endif
 
 .if defined(WITH_SASLKRB)
 .if defined(WITH_SASLKRB5) || defined(WITH_SASLKMIT)
 BROKEN=			Select only one SASL Kerberos option
 .endif
 POSTFIX_AUXLIBS+=	-lkrb -lcrypto -lcom_err
 .endif
 
 .if defined(WITH_SASLKRB5)
 .if defined(WITH_SASLKRB) || defined(WITH_SASLKMIT)
 BROKEN=			Select only one SASL Kerberos option
 .endif
 POSTFIX_AUXLIBS+=	-lkrb5 -lcrypto -lcrypt -lcom_err -lasn1 -lroken
 .endif
 
 .if defined(WITH_SASLKMIT)
 .if defined(WITH_SASLKRB) || defined(WITH_SASLKRB5)
 BROKEN=			Select only one SASL Kerberos option
 .endif
 LIB_DEPENDS+=		krb5.3:${PORTSDIR}/security/krb5
 POSTFIX_AUXLIBS+=	-Wl,--rpath,$${KRB5_HOME:-${LOCALBASE}}/lib -lkrb5 -lcrypto -lcrypt -lcom_err
 .endif
 
 .if defined(WITH_TLS)
 .include "${PORTSDIR}/Mk/bsd.openssl.mk"
 POSTFIX_CCARGS+=	-DUSE_TLS -I${OPENSSLINC}
 POSTFIX_AUXLIBS+=	-L${OPENSSLLIB} ${LDFLAGS} -lssl -lcrypto
 .endif
 
 .if defined(WITH_BDB)
 USE_BDB=		yes
 POSTFIX_CCARGS+=	-I${BDB_INCLUDE_DIR}
 POSTFIX_AUXLIBS+=	-L${BDB_LIB_DIR} -l${BDB_LIB_NAME}
 .endif
 
 .if defined(WITH_MYSQL)
 USE_MYSQL=		yes
 POSTFIX_CCARGS+=	-DHAS_MYSQL -I${LOCALBASE}/include/mysql
 POSTFIX_AUXLIBS+=	-L${LOCALBASE}/lib/mysql -lmysqlclient -lz -lcrypt -lm
 _REQUIRE+=		mysql
 .endif
 
 .if defined(WITH_PGSQL)
 USE_PGSQL=		yes
 POSTFIX_CCARGS+=	-DHAS_PGSQL -I${LOCALBASE}/include -I${LOCALBASE}/pgsql/include
 POSTFIX_AUXLIBS+=	-L${LOCALBASE}/lib -L${LOCALBASE}/pgsql/lib -lpq -lcrypt
 _REQUIRE+=		postgresql
 .endif
 
 .if defined(WITH_OPENLDAP)
 USE_OPENLDAP=		yes
 .if defined(WITH_OPENLDAP_VER)
 WANT_OPENLDAP_VER=	${WITH_OPENLDAP_VER}
 .endif
 POSTFIX_CCARGS+=	-DHAS_LDAP -I${LOCALBASE}/include
 POSTFIX_AUXLIBS+=	-L${LOCALBASE}/lib -lldap -llber
 _REQUIRE+=		slapd
 .endif
 
 .if defined(WITH_CDB)
 BUILD_DEPENDS+=		${LOCALBASE}/lib/libcdb.a:${PORTSDIR}/databases/tinycdb
 POSTFIX_CCARGS+=	-DHAS_CDB -I${LOCALBASE}/include
 POSTFIX_AUXLIBS+=	-L${LOCALBASE}/lib -lcdb
 .endif
 
 .if defined(WITH_NIS)
 POSTFIX_CCARGS+=	-DHAS_NIS
 _REQUIRE+=		ypserv
 .endif
 
 .if defined(WITH_VDA)
 IGNORE=			wait for a new VDA patch that works with ${PORTVERSION}
 PATCH_SITES+=		http://vda.sourceforge.net/VDA/
 PATCHFILES+=		postfix-${PORTVERSION}-vda-ng.patch.gz
 PATCH_DIST_STRIP=	-p1
 PLIST_SUB+=	VDA=""
 .else
 PLIST_SUB+=	VDA="@comment "
 .endif
 
 .if defined(WITH_TEST)
 BINTEST=	qmqp-sink qmqp-source smtp-sink smtp-source
 MANTEST=	qmqp-sink.1 qmqp-source.1 smtp-sink.1 smtp-source.1
 MAN1+=		${MANTEST}
 PLIST_SUB+=	TEST=""
 .else
 PLIST_SUB+=	TEST="@comment "
 .endif
 
 .if defined(NOPORTDOCS)
-READMEDIR=no
+READMEDIR=	no
 .else
-READMEDIR=${DOCSDIR}
+READMEDIR=	${DOCSDIR}
 .endif
 
-SUB_LIST+=	REQUIRE="${_REQUIRE}" READMEDIR="${READMEDIR}"
+DAEMONDIR=	${PREFIX}/libexec/postfix
+
+SUB_LIST+=	REQUIRE="${_REQUIRE}" READMEDIR="${READMEDIR}" DAEMONDIR="${DAEMONDIR}"
 SUB_FILES+=	pkg-install pkg-message
 
 # sed script for files in ${WRKSRC}/README_FILES ${WRKSRC}/conf ${WRKSRC}/man
 REINPLACE=	s!^PATH=.*!PATH=/bin:/sbin:/usr/bin:/usr/sbin:${PREFIX}/bin:${PREFIX}/sbin!;\
 		s!(_directory = )/usr/!\1${PREFIX}/!g;\
 		s!^(data_directory = /var/)lib/!\1db/!g;\
 		s!^\#(mynetworks_style = host)!\1!g;\
 		s!^(sendmail_path =)!\1 ${PREFIX}/sbin/sendmail!g;\
 		s!^(newaliases_path =)!\1 ${PREFIX}/bin/newaliases!g;\
 		s!^(mailq_path =)!\1 ${PREFIX}/bin/mailq!g;\
 		s!^(setgid_group =)!\1 maildrop!g;\
 		s!^(manpage_directory =)!\1 ${PREFIX}/man!g;\
 		s!^((html|readme)_directory =)!\1 ${READMEDIR}!g;\
 		\!^\#alias_database = dbm:/etc/mail/aliases$$!d;\
 		s!(:|= )/etc/postfix!\1$$config_directory!g;\
 		s!/etc/postfix!${ETCDIR}!g;\
 		s!^(sample_directory =)!\1 ${ETCDIR}!g;\
 		s!($config_directory/(access|aliases|canonical|generic|header_checks|relocated|transport|virtual):f:root:-:644:)p1!\1o!;
 
 pre-patch:
 .if defined(POSTFIX_OPTIONS)
 	@${ECHO_MSG}
 	@${ECHO_MSG}
 	@${ECHO_MSG}
 	@${ECHO_MSG} "***** ALERT *****"
 	@${ECHO_MSG} "POSTFIX_OPTIONS is no longer supported,"
 	@${ECHO_MSG} "${PORTNAME} uses options, consider running"
 	@${ECHO_MSG} "# make config"
 	@${ECHO_MSG}
 	@${ECHO_MSG}
 	@${ECHO_MSG}
 	@sleep 10
 .endif
 
 .if defined(WITH_SASL2) && !defined(WITH_MYSQL) && exists(${LOCALBASE}/lib/libsasl2.a)
 	@if /usr/bin/nm ${LOCALBASE}/lib/libsasl2.a | ${GREP} -wq "mysql_init"; then \
 		${ECHO_MSG}; \
 		${ECHO_MSG} "Your SASL2 library it's compiled with MYSQL"; \
 		${ECHO_MSG} "If you use MYSQL in ${PORTNAME} consider CTRL+C and"; \
 		${ECHO_MSG} "select MYSQL OPTION in config menu."; \
 		${ECHO_MSG} "# make clean config"; \
 		${ECHO_MSG}; \
 		sleep 5; \
 	fi
 .endif
 
 	@${ECHO} '<HTML><BODY>See <A HREF="header_checks.5.html">header_checks.5.html</A></BODY></HTML>' \
 		> ${WRKSRC}/html/body_checks.5.html
 	@${REINPLACE_CMD} -E -e 's![[:<:]]perl[[:>:]]!${PERL}!' \
 		${WRKSRC}/src/bounce/Makefile.in
 	@${REINPLACE_CMD} -E -e 's!^(#define DEF_SGID_GROUP[^"]+)"postdrop"$$!\1"maildrop"!' \
 		${WRKSRC}/src/global/mail_params.h
 	@${FIND} -X ${WRKSRC}/README_FILES ${WRKSRC}/conf ${WRKSRC}/man \
 		-type f -a ! \( -name INSTALL -o -name aliases \) | ${XARGS} \
 		${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
 	@${REINPLACE_CMD} -E -e '${REINPLACE}' \
 		${WRKSRC}/README_FILES/VDA_README
 .endif
 
 do-configure:
 	(cd ${WRKSRC} && ${MAKE} -f Makefile.init makefiles ${MAKEFILEFLAGS} \
 	CCARGS="${POSTFIX_CCARGS}" AUXLIBS="${POSTFIX_AUXLIBS}" && \
 	${ECHO} "all: default" >> Makefile)
 
 pre-su-install:
 	@${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=${DAEMONDIR} \
+		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
 .for f in ${BINTEST}
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/${f} ${PREFIX}/bin
 .endfor
 .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
 	# Fix compressed man pages
-	@${REINPLACE_CMD} -i '' -E -e "s|(man[158]/.*.[158]):|\1.gz:|g" ${PREFIX}/libexec/postfix/postfix-files
+	@${REINPLACE_CMD} -i '' -E -e "s|(man[158]/.*.[158]):|\1.gz:|g" ${DAEMONDIR}/postfix-files
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>

Property changes on: head/mail/postfix/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.147
\ No newline at end of property
+1.148
\ No newline at end of property
Index: head/mail/postfix/files/pkg-install.in
===================================================================
--- head/mail/postfix/files/pkg-install.in	(revision 235558)
+++ head/mail/postfix/files/pkg-install.in	(revision 235559)
@@ -1,148 +1,158 @@
 #!/bin/sh
 #
-#	$FreeBSD: /tmp/pcvs/ports/mail/postfix/files/pkg-install.in,v 1.2 2009-06-04 07:45:27 mm Exp $
+#	$FreeBSD: /tmp/pcvs/ports/mail/postfix/files/pkg-install.in,v 1.3 2009-06-11 01:42:24 wxs Exp $
 #
 
 # If the POSTFIX_DEFAULT_MTA environment variable is set to YES, it
 # will make the port/package use defaults which make postfix replace
 # sendmail as much as possible.
 
 PREFIX=${PKG_PREFIX:=%%PREFIX%%}
 ETCDIR=${ETCDIR:=%%ETCDIR%%}
-DAEMONDIR=${DAEMONDIR:=${PREFIX}/libexec/postfix}
+DAEMONDIR=${DAEMONDIR:=%%DAEMONDIR%%}
 READMEDIR=${READMEDIR:=%%READMEDIR%%}
 BATCH=${BATCH:=no}
 POSTFIX_DEFAULT_MTA=${POSTFIX_DEFAULT_MTA:=no}
 
 if [ "${POSTFIX_DEFAULT_MTA}" = "no" ]; then
       DEFAULT_REPLACE_MAILERCONF=n
 else
       DEFAULT_REPLACE_MAILERCONF=y
 fi
 
 if [ -x /usr/sbin/nologin ]; then
       NOLOGIN=/usr/sbin/nologin
 else
       NOLOGIN=/sbin/nologin
 fi
 
 ask() {
       local question default answer
 
       question=$1
       default=$2
       if [ -z "${PACKAGE_BUILDING}" -a "${BATCH}" = "no" ]; then
 	      read -p "${question} [${default}]? " answer
       fi
       if [ -z "${answer}" ]; then
 	      answer=${default}
       fi
       echo ${answer}
 }
 
 yesno() {
       local question default answer
 
       question=$1
       default=$2
       while :; do
 	      answer=$(ask "${question}" "${default}")
 	      case "${answer}" in
 		      [Yy]*)	return 0;;
 		      [Nn]*)	return 1;;
 	      esac
 	      echo "Please answer yes or no."
       done
 }
 
 if [ "$2" = "PRE-INSTALL" ]; then
       USER=postfix
       UID=125
       GROUP=postfix
       GID=125
       GROUP2=maildrop
       GID2=126
 
       if /usr/sbin/pw groupshow "${GROUP}" 2>/dev/null; then
 	      echo "You already have a group \"${GROUP}\", so I will use it."
       else
 	      if /usr/sbin/pw groupadd ${GROUP} -g ${GID}; then
 		      echo "Added group \"${GROUP}\"."
 	      else
 		      echo "Adding group \"${GROUP}\" failed..."
 		      echo "Please create it, and try again."
 		      exit 1
 	      fi
       fi
 
       if /usr/sbin/pw groupshow "${GROUP2}" 2>/dev/null; then
 	      echo "You already have a group \"${GROUP2}\", so I will use it."
       else
 	      if /usr/sbin/pw groupadd ${GROUP2} -g ${GID2}; then
 		      echo "Added group \"${GROUP2}\"."
 	      else
 		      echo "Adding group \"${GROUP2}\" failed..."
 		      echo "Please create it, and try again."
 		      exit 1
 	      fi
       fi
 
       if /usr/sbin/pw user show "${USER}" 2>/dev/null; then
 	      echo "You already have a user \"${USER}\", so I will use it."
       else
 	      if /usr/sbin/pw useradd ${USER} -u ${UID} -g ${GROUP} -h - -d /var/spool/postfix -s ${NOLOGIN} -c "Postfix Mail System"; then
 		      echo "Added user \"${USER}\"."
 	      else
 		      echo "Adding user \"${USER}\" failed..."
 		      echo "Please create it, and try again."
 		      exit 1
 	      fi
       fi
 
       if /usr/sbin/pw show group mail | grep -q "${USER}" 2>/dev/null; then
 	      echo "You already have user \"${USER}\" in group \"mail\", so I will use it."
       else
 	      echo "You need user \"${USER}\" added to group \"mail\"."
 	      if yesno "Would you like me to add it" y; then
 		      /usr/sbin/pw groupmod mail -m ${USER} || exit
 		      echo "Done."
 	      else
 		      echo "Please create it, and try again."
 		      exit 1
 	      fi
       fi
 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
 
 replace() {
       local orig repl
 
 	orig=$1
 	repl=$2
 	if [ -e ${orig} ]; then
 		/bin/mv -f ${orig} ${orig}.OFF
 		/bin/chmod 0 ${orig}.OFF
 	fi
 	if [ -e ${repl} ]; then
 		/bin/ln -s ${repl} ${orig}
 	fi
 }
 
 if [ "$2" = "POST-INSTALL" -a -z "${PACKAGE_BUILDING}" ]; then
 	if yesno "Would you like to activate Postfix in /etc/mail/mailer.conf" ${DEFAULT_REPLACE_MAILERCONF}; then
 		/bin/mv -f /etc/mail/mailer.conf /etc/mail/mailer.conf.old
 		echo "#"						>	/etc/mail/mailer.conf
 		echo -n "# Execute the Postfix sendmail program"	>>	/etc/mail/mailer.conf
 		echo ", named ${PREFIX}/sbin/sendmail"		>>	/etc/mail/mailer.conf
 		echo "#"						>>	/etc/mail/mailer.conf
 		echo "sendmail	${PREFIX}/sbin/sendmail"	>>	/etc/mail/mailer.conf
 		echo "send-mail	${PREFIX}/sbin/sendmail"	>>	/etc/mail/mailer.conf
 		echo "mailq		${PREFIX}/sbin/sendmail"	>>	/etc/mail/mailer.conf
 		echo "newaliases	${PREFIX}/sbin/sendmail"	>>	/etc/mail/mailer.conf
 	fi
 fi

Property changes on: head/mail/postfix/files/pkg-install.in
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.2
\ No newline at end of property
+1.3
\ No newline at end of property
Index: head/mail/postfix/pkg-plist
===================================================================
--- head/mail/postfix/pkg-plist	(revision 235558)
+++ head/mail/postfix/pkg-plist	(revision 235559)
@@ -1,231 +1,232 @@
 @unexec if cmp -s %D/libexec/postfix/main.cf %D/%%ETCDIR%%/main.cf; then rm -f %D/%%ETCDIR%%/main.cf; fi
 @unexec if cmp -s %D/libexec/postfix/master.cf %D/%%ETCDIR%%/master.cf; then rm -f %D/%%ETCDIR%%/master.cf; fi
 %%ETCDIR%%/LICENSE
 %%ETCDIR%%/TLS_LICENSE
 %%ETCDIR%%/bounce.cf.default
 %%ETCDIR%%/main.cf.default
 %%ETCDIR%%/makedefs.out
 @dirrmtry %%ETCDIR%%
 libexec/postfix/anvil
 libexec/postfix/bounce
 libexec/postfix/cleanup
 libexec/postfix/discard
 libexec/postfix/error
 libexec/postfix/flush
 libexec/postfix/lmtp
 libexec/postfix/local
 libexec/postfix/main.cf
 libexec/postfix/master
 libexec/postfix/master.cf
 libexec/postfix/nqmgr
 libexec/postfix/oqmgr
 libexec/postfix/pickup
 libexec/postfix/pipe
 libexec/postfix/post-install
 libexec/postfix/postfix-files
 libexec/postfix/postfix-script
 libexec/postfix/postfix-wrapper
 libexec/postfix/postmulti-script
 libexec/postfix/proxymap
 libexec/postfix/qmgr
 libexec/postfix/qmqpd
 libexec/postfix/scache
 libexec/postfix/showq
 libexec/postfix/smtp
 libexec/postfix/smtpd
 libexec/postfix/spawn
 libexec/postfix/trivial-rewrite
 libexec/postfix/verify
 libexec/postfix/virtual
 libexec/postfix/tlsmgr
 @dirrm libexec/postfix
 bin/mailq
 bin/newaliases
 bin/qshape
 bin/rmail
 %%TEST%%bin/qmqp-sink
 %%TEST%%bin/qmqp-source
 %%TEST%%bin/smtp-sink
 %%TEST%%bin/smtp-source
 sbin/postalias
 sbin/postcat
 sbin/postconf
 sbin/postdrop
 sbin/postfix
 sbin/postkick
 sbin/postlock
 sbin/postlog
 sbin/postmap
 sbin/postmulti
 sbin/postqueue
 sbin/postsuper
 sbin/sendmail
 %%PORTDOCS%%%%DOCSDIR%%/AAAREADME
 %%PORTDOCS%%%%DOCSDIR%%/ADDRESS_CLASS_README
 %%PORTDOCS%%%%DOCSDIR%%/ADDRESS_CLASS_README.html
 %%PORTDOCS%%%%DOCSDIR%%/ADDRESS_REWRITING_README
 %%PORTDOCS%%%%DOCSDIR%%/ADDRESS_REWRITING_README.html
 %%PORTDOCS%%%%DOCSDIR%%/ADDRESS_VERIFICATION_README
 %%PORTDOCS%%%%DOCSDIR%%/ADDRESS_VERIFICATION_README.html
 %%PORTDOCS%%%%DOCSDIR%%/BACKSCATTER_README
 %%PORTDOCS%%%%DOCSDIR%%/BACKSCATTER_README.html
 %%PORTDOCS%%%%DOCSDIR%%/BASIC_CONFIGURATION_README
 %%PORTDOCS%%%%DOCSDIR%%/BASIC_CONFIGURATION_README.html
 %%PORTDOCS%%%%DOCSDIR%%/BUILTIN_FILTER_README
 %%PORTDOCS%%%%DOCSDIR%%/BUILTIN_FILTER_README.html
 %%PORTDOCS%%%%DOCSDIR%%/CDB_README
 %%PORTDOCS%%%%DOCSDIR%%/CDB_README.html
 %%PORTDOCS%%%%DOCSDIR%%/CONNECTION_CACHE_README
 %%PORTDOCS%%%%DOCSDIR%%/CONNECTION_CACHE_README.html
 %%PORTDOCS%%%%DOCSDIR%%/CONTENT_INSPECTION_README
 %%PORTDOCS%%%%DOCSDIR%%/CONTENT_INSPECTION_README.html
 %%PORTDOCS%%%%DOCSDIR%%/DATABASE_README
 %%PORTDOCS%%%%DOCSDIR%%/DATABASE_README.html
 %%PORTDOCS%%%%DOCSDIR%%/DB_README
 %%PORTDOCS%%%%DOCSDIR%%/DB_README.html
 %%PORTDOCS%%%%DOCSDIR%%/DEBUG_README
 %%PORTDOCS%%%%DOCSDIR%%/DEBUG_README.html
 %%PORTDOCS%%%%DOCSDIR%%/DSN_README
 %%PORTDOCS%%%%DOCSDIR%%/DSN_README.html
 %%PORTDOCS%%%%DOCSDIR%%/ETRN_README
 %%PORTDOCS%%%%DOCSDIR%%/ETRN_README.html
 %%PORTDOCS%%%%DOCSDIR%%/FILTER_README
 %%PORTDOCS%%%%DOCSDIR%%/FILTER_README.html
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL.html
 %%PORTDOCS%%%%DOCSDIR%%/IPV6_README
 %%PORTDOCS%%%%DOCSDIR%%/IPV6_README.html
 %%PORTDOCS%%%%DOCSDIR%%/TLS_README
 %%PORTDOCS%%%%DOCSDIR%%/TLS_README.html
 %%PORTDOCS%%%%DOCSDIR%%/LDAP_README
 %%PORTDOCS%%%%DOCSDIR%%/LDAP_README.html
 %%PORTDOCS%%%%DOCSDIR%%/LINUX_README
 %%PORTDOCS%%%%DOCSDIR%%/LINUX_README.html
 %%PORTDOCS%%%%DOCSDIR%%/LOCAL_RECIPIENT_README
 %%PORTDOCS%%%%DOCSDIR%%/LOCAL_RECIPIENT_README.html
 %%PORTDOCS%%%%DOCSDIR%%/MAILDROP_README
 %%PORTDOCS%%%%DOCSDIR%%/MAILDROP_README.html
 %%PORTDOCS%%%%DOCSDIR%%/MILTER_README
 %%PORTDOCS%%%%DOCSDIR%%/MILTER_README.html
 %%PORTDOCS%%%%DOCSDIR%%/MULTI_INSTANCE_README
 %%PORTDOCS%%%%DOCSDIR%%/MULTI_INSTANCE_README.html
 %%PORTDOCS%%%%DOCSDIR%%/MYSQL_README
 %%PORTDOCS%%%%DOCSDIR%%/MYSQL_README.html
 %%PORTDOCS%%%%DOCSDIR%%/NFS_README
 %%PORTDOCS%%%%DOCSDIR%%/NFS_README.html
 %%PORTDOCS%%%%DOCSDIR%%/OVERVIEW
 %%PORTDOCS%%%%DOCSDIR%%/OVERVIEW.html
 %%PORTDOCS%%%%DOCSDIR%%/PACKAGE_README
 %%PORTDOCS%%%%DOCSDIR%%/PACKAGE_README.html
 %%PORTDOCS%%%%DOCSDIR%%/PCRE_README
 %%PORTDOCS%%%%DOCSDIR%%/PCRE_README.html
 %%PORTDOCS%%%%DOCSDIR%%/PGSQL_README
 %%PORTDOCS%%%%DOCSDIR%%/PGSQL_README.html
 %%PORTDOCS%%%%DOCSDIR%%/QSHAPE_README
 %%PORTDOCS%%%%DOCSDIR%%/QSHAPE_README.html
 %%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES
 %%PORTDOCS%%%%DOCSDIR%%/RESTRICTION_CLASS_README
 %%PORTDOCS%%%%DOCSDIR%%/RESTRICTION_CLASS_README.html
 %%PORTDOCS%%%%DOCSDIR%%/SASL_README
 %%PORTDOCS%%%%DOCSDIR%%/SASL_README.html
 %%PORTDOCS%%%%DOCSDIR%%/SCHEDULER_README
 %%PORTDOCS%%%%DOCSDIR%%/SCHEDULER_README.html
 %%PORTDOCS%%%%DOCSDIR%%/SMTPD_ACCESS_README
 %%PORTDOCS%%%%DOCSDIR%%/SMTPD_ACCESS_README.html
 %%PORTDOCS%%%%DOCSDIR%%/SMTPD_POLICY_README
 %%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
 %%PORTDOCS%%%%DOCSDIR%%/STRESS_README
 %%PORTDOCS%%%%DOCSDIR%%/STRESS_README.html
 %%PORTDOCS%%%%DOCSDIR%%/TLS_LEGACY_README
 %%PORTDOCS%%%%DOCSDIR%%/TLS_LEGACY_README.html
 %%PORTDOCS%%%%DOCSDIR%%/TUNING_README
 %%PORTDOCS%%%%DOCSDIR%%/TUNING_README.html
 %%PORTDOCS%%%%DOCSDIR%%/ULTRIX_README
 %%PORTDOCS%%%%DOCSDIR%%/UUCP_README
 %%PORTDOCS%%%%DOCSDIR%%/UUCP_README.html
 %%VDA%%%%PORTDOCS%%%%DOCSDIR%%/VDA_README
 %%PORTDOCS%%%%DOCSDIR%%/VERP_README
 %%PORTDOCS%%%%DOCSDIR%%/VERP_README.html
 %%PORTDOCS%%%%DOCSDIR%%/VIRTUAL_README
 %%PORTDOCS%%%%DOCSDIR%%/VIRTUAL_README.html
 %%PORTDOCS%%%%DOCSDIR%%/XCLIENT_README
 %%PORTDOCS%%%%DOCSDIR%%/XCLIENT_README.html
 %%PORTDOCS%%%%DOCSDIR%%/XFORWARD_README
 %%PORTDOCS%%%%DOCSDIR%%/XFORWARD_README.html
 %%PORTDOCS%%%%DOCSDIR%%/access.5.html
 %%PORTDOCS%%%%DOCSDIR%%/aliases.5.html
 %%PORTDOCS%%%%DOCSDIR%%/anvil.8.html
 %%PORTDOCS%%%%DOCSDIR%%/body_checks.5.html
 %%PORTDOCS%%%%DOCSDIR%%/bounce.5.html
 %%PORTDOCS%%%%DOCSDIR%%/bounce.8.html
 %%PORTDOCS%%%%DOCSDIR%%/canonical.5.html
 %%PORTDOCS%%%%DOCSDIR%%/cidr_table.5.html
 %%PORTDOCS%%%%DOCSDIR%%/cleanup.8.html
 %%PORTDOCS%%%%DOCSDIR%%/defer.8.html
 %%PORTDOCS%%%%DOCSDIR%%/discard.8.html
 %%PORTDOCS%%%%DOCSDIR%%/error.8.html
 %%PORTDOCS%%%%DOCSDIR%%/flush.8.html
 %%PORTDOCS%%%%DOCSDIR%%/header_checks.5.html
 %%PORTDOCS%%%%DOCSDIR%%/index.html
 %%PORTDOCS%%%%DOCSDIR%%/ldap_table.5.html
 %%PORTDOCS%%%%DOCSDIR%%/lmtp.8.html
 %%PORTDOCS%%%%DOCSDIR%%/local.8.html
 %%PORTDOCS%%%%DOCSDIR%%/mailq.1.html
 %%PORTDOCS%%%%DOCSDIR%%/master.5.html
 %%PORTDOCS%%%%DOCSDIR%%/master.8.html
 %%PORTDOCS%%%%DOCSDIR%%/mysql_table.5.html
 %%PORTDOCS%%%%DOCSDIR%%/nisplus_table.5.html
 %%PORTDOCS%%%%DOCSDIR%%/newaliases.1.html
 %%PORTDOCS%%%%DOCSDIR%%/oqmgr.8.html
 %%PORTDOCS%%%%DOCSDIR%%/pcre_table.5.html
 %%PORTDOCS%%%%DOCSDIR%%/pgsql_table.5.html
 %%PORTDOCS%%%%DOCSDIR%%/pickup.8.html
 %%PORTDOCS%%%%DOCSDIR%%/pipe.8.html
 %%PORTDOCS%%%%DOCSDIR%%/postalias.1.html
 %%PORTDOCS%%%%DOCSDIR%%/postcat.1.html
 %%PORTDOCS%%%%DOCSDIR%%/postconf.1.html
 %%PORTDOCS%%%%DOCSDIR%%/postconf.5.html
 %%PORTDOCS%%%%DOCSDIR%%/postdrop.1.html
 %%PORTDOCS%%%%DOCSDIR%%/postfix-logo.jpg
 %%PORTDOCS%%%%DOCSDIR%%/postfix-manuals.html
 %%PORTDOCS%%%%DOCSDIR%%/postfix-power.png
 %%PORTDOCS%%%%DOCSDIR%%/postfix-wrapper.5.html
 %%PORTDOCS%%%%DOCSDIR%%/postfix.1.html
 %%PORTDOCS%%%%DOCSDIR%%/postkick.1.html
 %%PORTDOCS%%%%DOCSDIR%%/postlock.1.html
 %%PORTDOCS%%%%DOCSDIR%%/postlog.1.html
 %%PORTDOCS%%%%DOCSDIR%%/postmap.1.html
 %%PORTDOCS%%%%DOCSDIR%%/postmulti.1.html
 %%PORTDOCS%%%%DOCSDIR%%/postqueue.1.html
 %%PORTDOCS%%%%DOCSDIR%%/postsuper.1.html
 %%PORTDOCS%%%%DOCSDIR%%/proxymap.8.html
 %%PORTDOCS%%%%DOCSDIR%%/qmgr.8.html
 %%PORTDOCS%%%%DOCSDIR%%/qmqp-sink.1.html
 %%PORTDOCS%%%%DOCSDIR%%/qmqp-source.1.html
 %%PORTDOCS%%%%DOCSDIR%%/qmqpd.8.html
 %%PORTDOCS%%%%DOCSDIR%%/qshape.1.html
 %%PORTDOCS%%%%DOCSDIR%%/regexp_table.5.html
 %%PORTDOCS%%%%DOCSDIR%%/relocated.5.html
 %%PORTDOCS%%%%DOCSDIR%%/sendmail.1.html
 %%PORTDOCS%%%%DOCSDIR%%/scache.8.html
 %%PORTDOCS%%%%DOCSDIR%%/showq.8.html
 %%PORTDOCS%%%%DOCSDIR%%/smtp-sink.1.html
 %%PORTDOCS%%%%DOCSDIR%%/smtp-source.1.html
 %%PORTDOCS%%%%DOCSDIR%%/smtp.8.html
 %%PORTDOCS%%%%DOCSDIR%%/smtpd.8.html
 %%PORTDOCS%%%%DOCSDIR%%/spawn.8.html
 %%PORTDOCS%%%%DOCSDIR%%/tcp_table.5.html
 %%PORTDOCS%%%%DOCSDIR%%/trace.8.html
 %%PORTDOCS%%%%DOCSDIR%%/transport.5.html
 %%PORTDOCS%%%%DOCSDIR%%/trivial-rewrite.8.html
 %%PORTDOCS%%%%DOCSDIR%%/verify.8.html
 %%PORTDOCS%%%%DOCSDIR%%/virtual.5.html
 %%PORTDOCS%%%%DOCSDIR%%/virtual.8.html
 %%PORTDOCS%%%%DOCSDIR%%/tlsmgr.8.html
 %%PORTDOCS%%%%DOCSDIR%%/generic.5.html
 %%PORTDOCS%%@dirrm %%DOCSDIR%%

Property changes on: head/mail/postfix/pkg-plist
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.29
\ No newline at end of property
+1.30
\ No newline at end of property
Index: head/mail/postfix25/Makefile
===================================================================
--- head/mail/postfix25/Makefile	(revision 235558)
+++ head/mail/postfix25/Makefile	(revision 235559)
@@ -1,315 +1,325 @@
 # New ports collection makefile for:	postfix
 # Date created:				18 Mar 1999
 # Whom:					torstenb
 #
 # $FreeBSD$
 #
 
 PORTNAME=	postfix
 PORTVERSION=	2.6.2
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
 		ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/%SUBDIR%/ \
 		ftp://ftp.tux.org/pub/net/postfix/official/ \
 		ftp://ftp.utoronto.ca/mirror/packages/postfix/official/ \
 		ftp://ftp.samurai.com/pub/postfix/official/ \
 		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/mail/postfix/official/&,}
 MASTER_SITE_SUBDIR=	. old related/postfix
 DISTNAME=	postfix-${PORTVERSION}
 DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	sahil@tandon.net
 COMMENT=	A secure alternative to widely-used Sendmail
 
 CONFLICTS=	courier-0.* postfix-1.* postfix-2.[0-57-9].* postfix-current-2.* \
 		sendmail-8.* sendmail-*-8.* smail-3.* zmailer-2.*
 
 USE_SUBMAKE=	yes
 USE_PERL5_BUILD=yes
 USE_RC_SUBR=	postfix.sh
 SCRIPTS_ENV+=	POSTFIX_DEFAULT_MTA="${POSTFIX_DEFAULT_MTA}"
 
 # back compat pull in settings from POSTFIX_OPTIONS for convenience when
 # make config is run (happens first time port is built, too)
 .for o in SASL2 SASLKRB SASLKRB5 SASLKRB5MIT TLS BDB MySQL PgSQL OpenLDAP CDB NIS VDA Test
 STATUS_${o}=off
 .endfor
 .if defined(POSTFIX_OPTIONS)
 . for o in ${POSTFIX_OPTIONS}
 STATUS_${o}=on
 . endfor
 .endif
 
 OPTIONS=	PCRE		"Perl Compatible Regular Expressions"			on \
 		SASL2		"Cyrus SASLv2 (Simple Auth. and Sec. Layer)"		${STATUS_SASL2} \
 		DOVECOT		"Dovecot SASL authentication method"			off \
 		SASLKRB		"If your SASL req. Kerberos select this option"		${STATUS_SASLKRB} \
 		SASLKRB5	"If your SASL req. Kerberos5 select this option"	${STATUS_SASLKRB5} \
 		SASLKMIT	"If your SASL req. MIT Kerberos5 select this option"	${STATUS_SASLKRB5MIT} \
 		TLS		"Enable SSL and TLS support"				${STATUS_TLS} \
 		BDB		"Berkeley DB (choose version with WITH_BDB_VER)"	${STATUS_BDB} \
 		MYSQL		"MySQL maps (choose version with WITH_MYSQL_VER)"	${STATUS_MySQL} \
 		PGSQL		"PostgreSQL maps (choose with DEFAULT_PGSQL_VER)"	${STATUS_PgSQL} \
 		OPENLDAP	"OpenLDAP maps (choose ver. with WITH_OPENLDAP_VER)"	${STATUS_OpenLDAP} \
 		CDB		"CDB maps lookups"					${STATUS_CDB} \
 		NIS		"NIS maps lookups"					${STATUS_NIS} \
 		VDA		"VDA (Virtual Delivery Agent)"				${STATUS_VDA} \
 		TEST		"SMTP/LMTP test server and generator"			${STATUS_Test}
 
 MAN1=	postalias.1 postcat.1 postconf.1 postdrop.1 postfix.1 postkick.1 \
 	postlock.1 postlog.1 postmap.1 postmulti.1 postqueue.1 postsuper.1 \
 	sendmail.1 qshape.1
 
 MAN5=	access.5 aliases.5 bounce.5 canonical.5 cidr_table.5 generic.5 \
 	header_checks.5 ldap_table.5 master.5 mysql_table.5 nisplus_table.5 \
 	pcre_table.5 pgsql_table.5 postconf.5 postfix-wrapper.5 regexp_table.5 \
 	relocated.5 tcp_table.5 transport.5 virtual.5
 
 MAN8=	anvil.8 bounce.8 cleanup.8 discard.8 error.8 flush.8 local.8 master.8 \
 	oqmgr.8 pickup.8 pipe.8 proxymap.8 qmgr.8 qmqpd.8 scache.8 showq.8 \
 	smtp.8 smtpd.8 spawn.8 tlsmgr.8 trivial-rewrite.8 verify.8 virtual.8
 
 MLINKS=	sendmail.1 mailq.1 \
 	sendmail.1 newaliases.1 \
 	header_checks.5 body_checks.5 \
 	bounce.8 defer.8 \
 	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
 
 MAKEFILEFLAGS+=	CC="${CC}" OPT="${CFLAGS}"
 
 .include <bsd.port.pre.mk>
 
 POSTFIX_CCARGS+=	-DDEF_CONFIG_DIR=\\\"${ETCDIR}\\\" \
-			-DDEF_DAEMON_DIR=\\\"${PREFIX}/libexec/postfix\\\" \
+			-DDEF_DAEMON_DIR=\\\"${DAEMONDIR}\\\" \
 			-DDEF_COMMAND_DIR=\\\"${PREFIX}/sbin\\\" \
 			-DDEF_SENDMAIL_PATH=\\\"${PREFIX}/sbin/sendmail\\\" \
 			-DDEF_NEWALIAS_PATH=\\\"${PREFIX}/bin/newaliases\\\" \
 			-DDEF_MAILQ_PATH=\\\"${PREFIX}/bin/mailq\\\" \
 			-DDEF_MANPAGE_DIR=\\\"${MANPREFIX}/man\\\" \
 			-DDEF_README_DIR=\\\"${READMEDIR}\\\" \
 			-DDEF_HTML_DIR=\\\"${READMEDIR}\\\" \
 			-DDEF_QUEUE_DIR=\\\"/var/spool/postfix\\\" \
 			-DDEF_DATA_DIR=\\\"/var/db/postfix\\\" \
 			-DDEF_MAIL_OWNER=\\\"postfix\\\" \
 			-DDEF_SGID_GROUP=\\\"maildrop\\\" \
 
 # Default requirement for postfix rc script
 _REQUIRE=		LOGIN cleanvar
 
 .if defined(WITH_PCRE)
 LIB_DEPENDS+=		pcre.0:${PORTSDIR}/devel/pcre
 POSTFIX_CCARGS+=	-DHAS_PCRE -I${LOCALBASE}/include
 POSTFIX_AUXLIBS+=	-L${LOCALBASE}/lib -lpcre
 .else
 POSTFIX_CCARGS+=	-DNO_PCRE
 .endif
 
 .if defined(WITH_SASL2)
 LIB_DEPENDS+=		sasl2.2:${PORTSDIR}/security/cyrus-sasl2
 POSTFIX_CCARGS+=	-DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I${LOCALBASE}/include -I${LOCALBASE}/include/sasl
 POSTFIX_AUXLIBS+=	-L${LOCALBASE}/lib -lsasl2 -lpam -lcrypt
 .endif
 
 .if defined(WITH_DOVECOT)
 RUN_DEPENDS+=		dovecot:${PORTSDIR}/mail/dovecot
 POSTFIX_CCARGS+=	-DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\"
 _REQUIRE+=		dovecot
 .endif
 
 .if defined(WITH_SASLKRB)
 .if defined(WITH_SASLKRB5) || defined(WITH_SASLKMIT)
 BROKEN=			Select only one SASL Kerberos option
 .endif
 POSTFIX_AUXLIBS+=	-lkrb -lcrypto -lcom_err
 .endif
 
 .if defined(WITH_SASLKRB5)
 .if defined(WITH_SASLKRB) || defined(WITH_SASLKMIT)
 BROKEN=			Select only one SASL Kerberos option
 .endif
 POSTFIX_AUXLIBS+=	-lkrb5 -lcrypto -lcrypt -lcom_err -lasn1 -lroken
 .endif
 
 .if defined(WITH_SASLKMIT)
 .if defined(WITH_SASLKRB) || defined(WITH_SASLKRB5)
 BROKEN=			Select only one SASL Kerberos option
 .endif
 LIB_DEPENDS+=		krb5.3:${PORTSDIR}/security/krb5
 POSTFIX_AUXLIBS+=	-Wl,--rpath,$${KRB5_HOME:-${LOCALBASE}}/lib -lkrb5 -lcrypto -lcrypt -lcom_err
 .endif
 
 .if defined(WITH_TLS)
 .include "${PORTSDIR}/Mk/bsd.openssl.mk"
 POSTFIX_CCARGS+=	-DUSE_TLS -I${OPENSSLINC}
 POSTFIX_AUXLIBS+=	-L${OPENSSLLIB} ${LDFLAGS} -lssl -lcrypto
 .endif
 
 .if defined(WITH_BDB)
 USE_BDB=		yes
 POSTFIX_CCARGS+=	-I${BDB_INCLUDE_DIR}
 POSTFIX_AUXLIBS+=	-L${BDB_LIB_DIR} -l${BDB_LIB_NAME}
 .endif
 
 .if defined(WITH_MYSQL)
 USE_MYSQL=		yes
 POSTFIX_CCARGS+=	-DHAS_MYSQL -I${LOCALBASE}/include/mysql
 POSTFIX_AUXLIBS+=	-L${LOCALBASE}/lib/mysql -lmysqlclient -lz -lcrypt -lm
 _REQUIRE+=		mysql
 .endif
 
 .if defined(WITH_PGSQL)
 USE_PGSQL=		yes
 POSTFIX_CCARGS+=	-DHAS_PGSQL -I${LOCALBASE}/include -I${LOCALBASE}/pgsql/include
 POSTFIX_AUXLIBS+=	-L${LOCALBASE}/lib -L${LOCALBASE}/pgsql/lib -lpq -lcrypt
 _REQUIRE+=		postgresql
 .endif
 
 .if defined(WITH_OPENLDAP)
 USE_OPENLDAP=		yes
 .if defined(WITH_OPENLDAP_VER)
 WANT_OPENLDAP_VER=	${WITH_OPENLDAP_VER}
 .endif
 POSTFIX_CCARGS+=	-DHAS_LDAP -I${LOCALBASE}/include
 POSTFIX_AUXLIBS+=	-L${LOCALBASE}/lib -lldap -llber
 _REQUIRE+=		slapd
 .endif
 
 .if defined(WITH_CDB)
 BUILD_DEPENDS+=		${LOCALBASE}/lib/libcdb.a:${PORTSDIR}/databases/tinycdb
 POSTFIX_CCARGS+=	-DHAS_CDB -I${LOCALBASE}/include
 POSTFIX_AUXLIBS+=	-L${LOCALBASE}/lib -lcdb
 .endif
 
 .if defined(WITH_NIS)
 POSTFIX_CCARGS+=	-DHAS_NIS
 _REQUIRE+=		ypserv
 .endif
 
 .if defined(WITH_VDA)
 IGNORE=			wait for a new VDA patch that works with ${PORTVERSION}
 PATCH_SITES+=		http://vda.sourceforge.net/VDA/
 PATCHFILES+=		postfix-${PORTVERSION}-vda-ng.patch.gz
 PATCH_DIST_STRIP=	-p1
 PLIST_SUB+=	VDA=""
 .else
 PLIST_SUB+=	VDA="@comment "
 .endif
 
 .if defined(WITH_TEST)
 BINTEST=	qmqp-sink qmqp-source smtp-sink smtp-source
 MANTEST=	qmqp-sink.1 qmqp-source.1 smtp-sink.1 smtp-source.1
 MAN1+=		${MANTEST}
 PLIST_SUB+=	TEST=""
 .else
 PLIST_SUB+=	TEST="@comment "
 .endif
 
 .if defined(NOPORTDOCS)
-READMEDIR=no
+READMEDIR=	no
 .else
-READMEDIR=${DOCSDIR}
+READMEDIR=	${DOCSDIR}
 .endif
 
-SUB_LIST+=	REQUIRE="${_REQUIRE}" READMEDIR="${READMEDIR}"
+DAEMONDIR=	${PREFIX}/libexec/postfix
+
+SUB_LIST+=	REQUIRE="${_REQUIRE}" READMEDIR="${READMEDIR}" DAEMONDIR="${DAEMONDIR}"
 SUB_FILES+=	pkg-install pkg-message
 
 # sed script for files in ${WRKSRC}/README_FILES ${WRKSRC}/conf ${WRKSRC}/man
 REINPLACE=	s!^PATH=.*!PATH=/bin:/sbin:/usr/bin:/usr/sbin:${PREFIX}/bin:${PREFIX}/sbin!;\
 		s!(_directory = )/usr/!\1${PREFIX}/!g;\
 		s!^(data_directory = /var/)lib/!\1db/!g;\
 		s!^\#(mynetworks_style = host)!\1!g;\
 		s!^(sendmail_path =)!\1 ${PREFIX}/sbin/sendmail!g;\
 		s!^(newaliases_path =)!\1 ${PREFIX}/bin/newaliases!g;\
 		s!^(mailq_path =)!\1 ${PREFIX}/bin/mailq!g;\
 		s!^(setgid_group =)!\1 maildrop!g;\
 		s!^(manpage_directory =)!\1 ${PREFIX}/man!g;\
 		s!^((html|readme)_directory =)!\1 ${READMEDIR}!g;\
 		\!^\#alias_database = dbm:/etc/mail/aliases$$!d;\
 		s!(:|= )/etc/postfix!\1$$config_directory!g;\
 		s!/etc/postfix!${ETCDIR}!g;\
 		s!^(sample_directory =)!\1 ${ETCDIR}!g;\
 		s!($config_directory/(access|aliases|canonical|generic|header_checks|relocated|transport|virtual):f:root:-:644:)p1!\1o!;
 
 pre-patch:
 .if defined(POSTFIX_OPTIONS)
 	@${ECHO_MSG}
 	@${ECHO_MSG}
 	@${ECHO_MSG}
 	@${ECHO_MSG} "***** ALERT *****"
 	@${ECHO_MSG} "POSTFIX_OPTIONS is no longer supported,"
 	@${ECHO_MSG} "${PORTNAME} uses options, consider running"
 	@${ECHO_MSG} "# make config"
 	@${ECHO_MSG}
 	@${ECHO_MSG}
 	@${ECHO_MSG}
 	@sleep 10
 .endif
 
 .if defined(WITH_SASL2) && !defined(WITH_MYSQL) && exists(${LOCALBASE}/lib/libsasl2.a)
 	@if /usr/bin/nm ${LOCALBASE}/lib/libsasl2.a | ${GREP} -wq "mysql_init"; then \
 		${ECHO_MSG}; \
 		${ECHO_MSG} "Your SASL2 library it's compiled with MYSQL"; \
 		${ECHO_MSG} "If you use MYSQL in ${PORTNAME} consider CTRL+C and"; \
 		${ECHO_MSG} "select MYSQL OPTION in config menu."; \
 		${ECHO_MSG} "# make clean config"; \
 		${ECHO_MSG}; \
 		sleep 5; \
 	fi
 .endif
 
 	@${ECHO} '<HTML><BODY>See <A HREF="header_checks.5.html">header_checks.5.html</A></BODY></HTML>' \
 		> ${WRKSRC}/html/body_checks.5.html
 	@${REINPLACE_CMD} -E -e 's![[:<:]]perl[[:>:]]!${PERL}!' \
 		${WRKSRC}/src/bounce/Makefile.in
 	@${REINPLACE_CMD} -E -e 's!^(#define DEF_SGID_GROUP[^"]+)"postdrop"$$!\1"maildrop"!' \
 		${WRKSRC}/src/global/mail_params.h
 	@${FIND} -X ${WRKSRC}/README_FILES ${WRKSRC}/conf ${WRKSRC}/man \
 		-type f -a ! \( -name INSTALL -o -name aliases \) | ${XARGS} \
 		${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
 	@${REINPLACE_CMD} -E -e '${REINPLACE}' \
 		${WRKSRC}/README_FILES/VDA_README
 .endif
 
 do-configure:
 	(cd ${WRKSRC} && ${MAKE} -f Makefile.init makefiles ${MAKEFILEFLAGS} \
 	CCARGS="${POSTFIX_CCARGS}" AUXLIBS="${POSTFIX_AUXLIBS}" && \
 	${ECHO} "all: default" >> Makefile)
 
 pre-su-install:
 	@${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=${DAEMONDIR} \
+		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
 .for f in ${BINTEST}
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/${f} ${PREFIX}/bin
 .endfor
 .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
 	# Fix compressed man pages
-	@${REINPLACE_CMD} -i '' -E -e "s|(man[158]/.*.[158]):|\1.gz:|g" ${PREFIX}/libexec/postfix/postfix-files
+	@${REINPLACE_CMD} -i '' -E -e "s|(man[158]/.*.[158]):|\1.gz:|g" ${DAEMONDIR}/postfix-files
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>

Property changes on: head/mail/postfix25/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.147
\ No newline at end of property
+1.148
\ No newline at end of property
Index: head/mail/postfix25/files/pkg-install.in
===================================================================
--- head/mail/postfix25/files/pkg-install.in	(revision 235558)
+++ head/mail/postfix25/files/pkg-install.in	(revision 235559)
@@ -1,148 +1,158 @@
 #!/bin/sh
 #
-#	$FreeBSD: /tmp/pcvs/ports/mail/postfix25/files/Attic/pkg-install.in,v 1.2 2009-06-04 07:45:27 mm Exp $
+#	$FreeBSD: /tmp/pcvs/ports/mail/postfix25/files/Attic/pkg-install.in,v 1.3 2009-06-11 01:42:24 wxs Exp $
 #
 
 # If the POSTFIX_DEFAULT_MTA environment variable is set to YES, it
 # will make the port/package use defaults which make postfix replace
 # sendmail as much as possible.
 
 PREFIX=${PKG_PREFIX:=%%PREFIX%%}
 ETCDIR=${ETCDIR:=%%ETCDIR%%}
-DAEMONDIR=${DAEMONDIR:=${PREFIX}/libexec/postfix}
+DAEMONDIR=${DAEMONDIR:=%%DAEMONDIR%%}
 READMEDIR=${READMEDIR:=%%READMEDIR%%}
 BATCH=${BATCH:=no}
 POSTFIX_DEFAULT_MTA=${POSTFIX_DEFAULT_MTA:=no}
 
 if [ "${POSTFIX_DEFAULT_MTA}" = "no" ]; then
       DEFAULT_REPLACE_MAILERCONF=n
 else
       DEFAULT_REPLACE_MAILERCONF=y
 fi
 
 if [ -x /usr/sbin/nologin ]; then
       NOLOGIN=/usr/sbin/nologin
 else
       NOLOGIN=/sbin/nologin
 fi
 
 ask() {
       local question default answer
 
       question=$1
       default=$2
       if [ -z "${PACKAGE_BUILDING}" -a "${BATCH}" = "no" ]; then
 	      read -p "${question} [${default}]? " answer
       fi
       if [ -z "${answer}" ]; then
 	      answer=${default}
       fi
       echo ${answer}
 }
 
 yesno() {
       local question default answer
 
       question=$1
       default=$2
       while :; do
 	      answer=$(ask "${question}" "${default}")
 	      case "${answer}" in
 		      [Yy]*)	return 0;;
 		      [Nn]*)	return 1;;
 	      esac
 	      echo "Please answer yes or no."
       done
 }
 
 if [ "$2" = "PRE-INSTALL" ]; then
       USER=postfix
       UID=125
       GROUP=postfix
       GID=125
       GROUP2=maildrop
       GID2=126
 
       if /usr/sbin/pw groupshow "${GROUP}" 2>/dev/null; then
 	      echo "You already have a group \"${GROUP}\", so I will use it."
       else
 	      if /usr/sbin/pw groupadd ${GROUP} -g ${GID}; then
 		      echo "Added group \"${GROUP}\"."
 	      else
 		      echo "Adding group \"${GROUP}\" failed..."
 		      echo "Please create it, and try again."
 		      exit 1
 	      fi
       fi
 
       if /usr/sbin/pw groupshow "${GROUP2}" 2>/dev/null; then
 	      echo "You already have a group \"${GROUP2}\", so I will use it."
       else
 	      if /usr/sbin/pw groupadd ${GROUP2} -g ${GID2}; then
 		      echo "Added group \"${GROUP2}\"."
 	      else
 		      echo "Adding group \"${GROUP2}\" failed..."
 		      echo "Please create it, and try again."
 		      exit 1
 	      fi
       fi
 
       if /usr/sbin/pw user show "${USER}" 2>/dev/null; then
 	      echo "You already have a user \"${USER}\", so I will use it."
       else
 	      if /usr/sbin/pw useradd ${USER} -u ${UID} -g ${GROUP} -h - -d /var/spool/postfix -s ${NOLOGIN} -c "Postfix Mail System"; then
 		      echo "Added user \"${USER}\"."
 	      else
 		      echo "Adding user \"${USER}\" failed..."
 		      echo "Please create it, and try again."
 		      exit 1
 	      fi
       fi
 
       if /usr/sbin/pw show group mail | grep -q "${USER}" 2>/dev/null; then
 	      echo "You already have user \"${USER}\" in group \"mail\", so I will use it."
       else
 	      echo "You need user \"${USER}\" added to group \"mail\"."
 	      if yesno "Would you like me to add it" y; then
 		      /usr/sbin/pw groupmod mail -m ${USER} || exit
 		      echo "Done."
 	      else
 		      echo "Please create it, and try again."
 		      exit 1
 	      fi
       fi
 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
 
 replace() {
       local orig repl
 
 	orig=$1
 	repl=$2
 	if [ -e ${orig} ]; then
 		/bin/mv -f ${orig} ${orig}.OFF
 		/bin/chmod 0 ${orig}.OFF
 	fi
 	if [ -e ${repl} ]; then
 		/bin/ln -s ${repl} ${orig}
 	fi
 }
 
 if [ "$2" = "POST-INSTALL" -a -z "${PACKAGE_BUILDING}" ]; then
 	if yesno "Would you like to activate Postfix in /etc/mail/mailer.conf" ${DEFAULT_REPLACE_MAILERCONF}; then
 		/bin/mv -f /etc/mail/mailer.conf /etc/mail/mailer.conf.old
 		echo "#"						>	/etc/mail/mailer.conf
 		echo -n "# Execute the Postfix sendmail program"	>>	/etc/mail/mailer.conf
 		echo ", named ${PREFIX}/sbin/sendmail"		>>	/etc/mail/mailer.conf
 		echo "#"						>>	/etc/mail/mailer.conf
 		echo "sendmail	${PREFIX}/sbin/sendmail"	>>	/etc/mail/mailer.conf
 		echo "send-mail	${PREFIX}/sbin/sendmail"	>>	/etc/mail/mailer.conf
 		echo "mailq		${PREFIX}/sbin/sendmail"	>>	/etc/mail/mailer.conf
 		echo "newaliases	${PREFIX}/sbin/sendmail"	>>	/etc/mail/mailer.conf
 	fi
 fi

Property changes on: head/mail/postfix25/files/pkg-install.in
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.2
\ No newline at end of property
+1.3
\ No newline at end of property
Index: head/mail/postfix25/pkg-plist
===================================================================
--- head/mail/postfix25/pkg-plist	(revision 235558)
+++ head/mail/postfix25/pkg-plist	(revision 235559)
@@ -1,231 +1,232 @@
 @unexec if cmp -s %D/libexec/postfix/main.cf %D/%%ETCDIR%%/main.cf; then rm -f %D/%%ETCDIR%%/main.cf; fi
 @unexec if cmp -s %D/libexec/postfix/master.cf %D/%%ETCDIR%%/master.cf; then rm -f %D/%%ETCDIR%%/master.cf; fi
 %%ETCDIR%%/LICENSE
 %%ETCDIR%%/TLS_LICENSE
 %%ETCDIR%%/bounce.cf.default
 %%ETCDIR%%/main.cf.default
 %%ETCDIR%%/makedefs.out
 @dirrmtry %%ETCDIR%%
 libexec/postfix/anvil
 libexec/postfix/bounce
 libexec/postfix/cleanup
 libexec/postfix/discard
 libexec/postfix/error
 libexec/postfix/flush
 libexec/postfix/lmtp
 libexec/postfix/local
 libexec/postfix/main.cf
 libexec/postfix/master
 libexec/postfix/master.cf
 libexec/postfix/nqmgr
 libexec/postfix/oqmgr
 libexec/postfix/pickup
 libexec/postfix/pipe
 libexec/postfix/post-install
 libexec/postfix/postfix-files
 libexec/postfix/postfix-script
 libexec/postfix/postfix-wrapper
 libexec/postfix/postmulti-script
 libexec/postfix/proxymap
 libexec/postfix/qmgr
 libexec/postfix/qmqpd
 libexec/postfix/scache
 libexec/postfix/showq
 libexec/postfix/smtp
 libexec/postfix/smtpd
 libexec/postfix/spawn
 libexec/postfix/trivial-rewrite
 libexec/postfix/verify
 libexec/postfix/virtual
 libexec/postfix/tlsmgr
 @dirrm libexec/postfix
 bin/mailq
 bin/newaliases
 bin/qshape
 bin/rmail
 %%TEST%%bin/qmqp-sink
 %%TEST%%bin/qmqp-source
 %%TEST%%bin/smtp-sink
 %%TEST%%bin/smtp-source
 sbin/postalias
 sbin/postcat
 sbin/postconf
 sbin/postdrop
 sbin/postfix
 sbin/postkick
 sbin/postlock
 sbin/postlog
 sbin/postmap
 sbin/postmulti
 sbin/postqueue
 sbin/postsuper
 sbin/sendmail
 %%PORTDOCS%%%%DOCSDIR%%/AAAREADME
 %%PORTDOCS%%%%DOCSDIR%%/ADDRESS_CLASS_README
 %%PORTDOCS%%%%DOCSDIR%%/ADDRESS_CLASS_README.html
 %%PORTDOCS%%%%DOCSDIR%%/ADDRESS_REWRITING_README
 %%PORTDOCS%%%%DOCSDIR%%/ADDRESS_REWRITING_README.html
 %%PORTDOCS%%%%DOCSDIR%%/ADDRESS_VERIFICATION_README
 %%PORTDOCS%%%%DOCSDIR%%/ADDRESS_VERIFICATION_README.html
 %%PORTDOCS%%%%DOCSDIR%%/BACKSCATTER_README
 %%PORTDOCS%%%%DOCSDIR%%/BACKSCATTER_README.html
 %%PORTDOCS%%%%DOCSDIR%%/BASIC_CONFIGURATION_README
 %%PORTDOCS%%%%DOCSDIR%%/BASIC_CONFIGURATION_README.html
 %%PORTDOCS%%%%DOCSDIR%%/BUILTIN_FILTER_README
 %%PORTDOCS%%%%DOCSDIR%%/BUILTIN_FILTER_README.html
 %%PORTDOCS%%%%DOCSDIR%%/CDB_README
 %%PORTDOCS%%%%DOCSDIR%%/CDB_README.html
 %%PORTDOCS%%%%DOCSDIR%%/CONNECTION_CACHE_README
 %%PORTDOCS%%%%DOCSDIR%%/CONNECTION_CACHE_README.html
 %%PORTDOCS%%%%DOCSDIR%%/CONTENT_INSPECTION_README
 %%PORTDOCS%%%%DOCSDIR%%/CONTENT_INSPECTION_README.html
 %%PORTDOCS%%%%DOCSDIR%%/DATABASE_README
 %%PORTDOCS%%%%DOCSDIR%%/DATABASE_README.html
 %%PORTDOCS%%%%DOCSDIR%%/DB_README
 %%PORTDOCS%%%%DOCSDIR%%/DB_README.html
 %%PORTDOCS%%%%DOCSDIR%%/DEBUG_README
 %%PORTDOCS%%%%DOCSDIR%%/DEBUG_README.html
 %%PORTDOCS%%%%DOCSDIR%%/DSN_README
 %%PORTDOCS%%%%DOCSDIR%%/DSN_README.html
 %%PORTDOCS%%%%DOCSDIR%%/ETRN_README
 %%PORTDOCS%%%%DOCSDIR%%/ETRN_README.html
 %%PORTDOCS%%%%DOCSDIR%%/FILTER_README
 %%PORTDOCS%%%%DOCSDIR%%/FILTER_README.html
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL.html
 %%PORTDOCS%%%%DOCSDIR%%/IPV6_README
 %%PORTDOCS%%%%DOCSDIR%%/IPV6_README.html
 %%PORTDOCS%%%%DOCSDIR%%/TLS_README
 %%PORTDOCS%%%%DOCSDIR%%/TLS_README.html
 %%PORTDOCS%%%%DOCSDIR%%/LDAP_README
 %%PORTDOCS%%%%DOCSDIR%%/LDAP_README.html
 %%PORTDOCS%%%%DOCSDIR%%/LINUX_README
 %%PORTDOCS%%%%DOCSDIR%%/LINUX_README.html
 %%PORTDOCS%%%%DOCSDIR%%/LOCAL_RECIPIENT_README
 %%PORTDOCS%%%%DOCSDIR%%/LOCAL_RECIPIENT_README.html
 %%PORTDOCS%%%%DOCSDIR%%/MAILDROP_README
 %%PORTDOCS%%%%DOCSDIR%%/MAILDROP_README.html
 %%PORTDOCS%%%%DOCSDIR%%/MILTER_README
 %%PORTDOCS%%%%DOCSDIR%%/MILTER_README.html
 %%PORTDOCS%%%%DOCSDIR%%/MULTI_INSTANCE_README
 %%PORTDOCS%%%%DOCSDIR%%/MULTI_INSTANCE_README.html
 %%PORTDOCS%%%%DOCSDIR%%/MYSQL_README
 %%PORTDOCS%%%%DOCSDIR%%/MYSQL_README.html
 %%PORTDOCS%%%%DOCSDIR%%/NFS_README
 %%PORTDOCS%%%%DOCSDIR%%/NFS_README.html
 %%PORTDOCS%%%%DOCSDIR%%/OVERVIEW
 %%PORTDOCS%%%%DOCSDIR%%/OVERVIEW.html
 %%PORTDOCS%%%%DOCSDIR%%/PACKAGE_README
 %%PORTDOCS%%%%DOCSDIR%%/PACKAGE_README.html
 %%PORTDOCS%%%%DOCSDIR%%/PCRE_README
 %%PORTDOCS%%%%DOCSDIR%%/PCRE_README.html
 %%PORTDOCS%%%%DOCSDIR%%/PGSQL_README
 %%PORTDOCS%%%%DOCSDIR%%/PGSQL_README.html
 %%PORTDOCS%%%%DOCSDIR%%/QSHAPE_README
 %%PORTDOCS%%%%DOCSDIR%%/QSHAPE_README.html
 %%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES
 %%PORTDOCS%%%%DOCSDIR%%/RESTRICTION_CLASS_README
 %%PORTDOCS%%%%DOCSDIR%%/RESTRICTION_CLASS_README.html
 %%PORTDOCS%%%%DOCSDIR%%/SASL_README
 %%PORTDOCS%%%%DOCSDIR%%/SASL_README.html
 %%PORTDOCS%%%%DOCSDIR%%/SCHEDULER_README
 %%PORTDOCS%%%%DOCSDIR%%/SCHEDULER_README.html
 %%PORTDOCS%%%%DOCSDIR%%/SMTPD_ACCESS_README
 %%PORTDOCS%%%%DOCSDIR%%/SMTPD_ACCESS_README.html
 %%PORTDOCS%%%%DOCSDIR%%/SMTPD_POLICY_README
 %%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
 %%PORTDOCS%%%%DOCSDIR%%/STRESS_README
 %%PORTDOCS%%%%DOCSDIR%%/STRESS_README.html
 %%PORTDOCS%%%%DOCSDIR%%/TLS_LEGACY_README
 %%PORTDOCS%%%%DOCSDIR%%/TLS_LEGACY_README.html
 %%PORTDOCS%%%%DOCSDIR%%/TUNING_README
 %%PORTDOCS%%%%DOCSDIR%%/TUNING_README.html
 %%PORTDOCS%%%%DOCSDIR%%/ULTRIX_README
 %%PORTDOCS%%%%DOCSDIR%%/UUCP_README
 %%PORTDOCS%%%%DOCSDIR%%/UUCP_README.html
 %%VDA%%%%PORTDOCS%%%%DOCSDIR%%/VDA_README
 %%PORTDOCS%%%%DOCSDIR%%/VERP_README
 %%PORTDOCS%%%%DOCSDIR%%/VERP_README.html
 %%PORTDOCS%%%%DOCSDIR%%/VIRTUAL_README
 %%PORTDOCS%%%%DOCSDIR%%/VIRTUAL_README.html
 %%PORTDOCS%%%%DOCSDIR%%/XCLIENT_README
 %%PORTDOCS%%%%DOCSDIR%%/XCLIENT_README.html
 %%PORTDOCS%%%%DOCSDIR%%/XFORWARD_README
 %%PORTDOCS%%%%DOCSDIR%%/XFORWARD_README.html
 %%PORTDOCS%%%%DOCSDIR%%/access.5.html
 %%PORTDOCS%%%%DOCSDIR%%/aliases.5.html
 %%PORTDOCS%%%%DOCSDIR%%/anvil.8.html
 %%PORTDOCS%%%%DOCSDIR%%/body_checks.5.html
 %%PORTDOCS%%%%DOCSDIR%%/bounce.5.html
 %%PORTDOCS%%%%DOCSDIR%%/bounce.8.html
 %%PORTDOCS%%%%DOCSDIR%%/canonical.5.html
 %%PORTDOCS%%%%DOCSDIR%%/cidr_table.5.html
 %%PORTDOCS%%%%DOCSDIR%%/cleanup.8.html
 %%PORTDOCS%%%%DOCSDIR%%/defer.8.html
 %%PORTDOCS%%%%DOCSDIR%%/discard.8.html
 %%PORTDOCS%%%%DOCSDIR%%/error.8.html
 %%PORTDOCS%%%%DOCSDIR%%/flush.8.html
 %%PORTDOCS%%%%DOCSDIR%%/header_checks.5.html
 %%PORTDOCS%%%%DOCSDIR%%/index.html
 %%PORTDOCS%%%%DOCSDIR%%/ldap_table.5.html
 %%PORTDOCS%%%%DOCSDIR%%/lmtp.8.html
 %%PORTDOCS%%%%DOCSDIR%%/local.8.html
 %%PORTDOCS%%%%DOCSDIR%%/mailq.1.html
 %%PORTDOCS%%%%DOCSDIR%%/master.5.html
 %%PORTDOCS%%%%DOCSDIR%%/master.8.html
 %%PORTDOCS%%%%DOCSDIR%%/mysql_table.5.html
 %%PORTDOCS%%%%DOCSDIR%%/nisplus_table.5.html
 %%PORTDOCS%%%%DOCSDIR%%/newaliases.1.html
 %%PORTDOCS%%%%DOCSDIR%%/oqmgr.8.html
 %%PORTDOCS%%%%DOCSDIR%%/pcre_table.5.html
 %%PORTDOCS%%%%DOCSDIR%%/pgsql_table.5.html
 %%PORTDOCS%%%%DOCSDIR%%/pickup.8.html
 %%PORTDOCS%%%%DOCSDIR%%/pipe.8.html
 %%PORTDOCS%%%%DOCSDIR%%/postalias.1.html
 %%PORTDOCS%%%%DOCSDIR%%/postcat.1.html
 %%PORTDOCS%%%%DOCSDIR%%/postconf.1.html
 %%PORTDOCS%%%%DOCSDIR%%/postconf.5.html
 %%PORTDOCS%%%%DOCSDIR%%/postdrop.1.html
 %%PORTDOCS%%%%DOCSDIR%%/postfix-logo.jpg
 %%PORTDOCS%%%%DOCSDIR%%/postfix-manuals.html
 %%PORTDOCS%%%%DOCSDIR%%/postfix-power.png
 %%PORTDOCS%%%%DOCSDIR%%/postfix-wrapper.5.html
 %%PORTDOCS%%%%DOCSDIR%%/postfix.1.html
 %%PORTDOCS%%%%DOCSDIR%%/postkick.1.html
 %%PORTDOCS%%%%DOCSDIR%%/postlock.1.html
 %%PORTDOCS%%%%DOCSDIR%%/postlog.1.html
 %%PORTDOCS%%%%DOCSDIR%%/postmap.1.html
 %%PORTDOCS%%%%DOCSDIR%%/postmulti.1.html
 %%PORTDOCS%%%%DOCSDIR%%/postqueue.1.html
 %%PORTDOCS%%%%DOCSDIR%%/postsuper.1.html
 %%PORTDOCS%%%%DOCSDIR%%/proxymap.8.html
 %%PORTDOCS%%%%DOCSDIR%%/qmgr.8.html
 %%PORTDOCS%%%%DOCSDIR%%/qmqp-sink.1.html
 %%PORTDOCS%%%%DOCSDIR%%/qmqp-source.1.html
 %%PORTDOCS%%%%DOCSDIR%%/qmqpd.8.html
 %%PORTDOCS%%%%DOCSDIR%%/qshape.1.html
 %%PORTDOCS%%%%DOCSDIR%%/regexp_table.5.html
 %%PORTDOCS%%%%DOCSDIR%%/relocated.5.html
 %%PORTDOCS%%%%DOCSDIR%%/sendmail.1.html
 %%PORTDOCS%%%%DOCSDIR%%/scache.8.html
 %%PORTDOCS%%%%DOCSDIR%%/showq.8.html
 %%PORTDOCS%%%%DOCSDIR%%/smtp-sink.1.html
 %%PORTDOCS%%%%DOCSDIR%%/smtp-source.1.html
 %%PORTDOCS%%%%DOCSDIR%%/smtp.8.html
 %%PORTDOCS%%%%DOCSDIR%%/smtpd.8.html
 %%PORTDOCS%%%%DOCSDIR%%/spawn.8.html
 %%PORTDOCS%%%%DOCSDIR%%/tcp_table.5.html
 %%PORTDOCS%%%%DOCSDIR%%/trace.8.html
 %%PORTDOCS%%%%DOCSDIR%%/transport.5.html
 %%PORTDOCS%%%%DOCSDIR%%/trivial-rewrite.8.html
 %%PORTDOCS%%%%DOCSDIR%%/verify.8.html
 %%PORTDOCS%%%%DOCSDIR%%/virtual.5.html
 %%PORTDOCS%%%%DOCSDIR%%/virtual.8.html
 %%PORTDOCS%%%%DOCSDIR%%/tlsmgr.8.html
 %%PORTDOCS%%%%DOCSDIR%%/generic.5.html
 %%PORTDOCS%%@dirrm %%DOCSDIR%%

Property changes on: head/mail/postfix25/pkg-plist
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.29
\ No newline at end of property
+1.30
\ No newline at end of property
Index: head/mail/postfix26/Makefile
===================================================================
--- head/mail/postfix26/Makefile	(revision 235558)
+++ head/mail/postfix26/Makefile	(revision 235559)
@@ -1,315 +1,325 @@
 # New ports collection makefile for:	postfix
 # Date created:				18 Mar 1999
 # Whom:					torstenb
 #
 # $FreeBSD$
 #
 
 PORTNAME=	postfix
 PORTVERSION=	2.6.2
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
 		ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/%SUBDIR%/ \
 		ftp://ftp.tux.org/pub/net/postfix/official/ \
 		ftp://ftp.utoronto.ca/mirror/packages/postfix/official/ \
 		ftp://ftp.samurai.com/pub/postfix/official/ \
 		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/mail/postfix/official/&,}
 MASTER_SITE_SUBDIR=	. old related/postfix
 DISTNAME=	postfix-${PORTVERSION}
 DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	sahil@tandon.net
 COMMENT=	A secure alternative to widely-used Sendmail
 
 CONFLICTS=	courier-0.* postfix-1.* postfix-2.[0-57-9].* postfix-current-2.* \
 		sendmail-8.* sendmail-*-8.* smail-3.* zmailer-2.*
 
 USE_SUBMAKE=	yes
 USE_PERL5_BUILD=yes
 USE_RC_SUBR=	postfix.sh
 SCRIPTS_ENV+=	POSTFIX_DEFAULT_MTA="${POSTFIX_DEFAULT_MTA}"
 
 # back compat pull in settings from POSTFIX_OPTIONS for convenience when
 # make config is run (happens first time port is built, too)
 .for o in SASL2 SASLKRB SASLKRB5 SASLKRB5MIT TLS BDB MySQL PgSQL OpenLDAP CDB NIS VDA Test
 STATUS_${o}=off
 .endfor
 .if defined(POSTFIX_OPTIONS)
 . for o in ${POSTFIX_OPTIONS}
 STATUS_${o}=on
 . endfor
 .endif
 
 OPTIONS=	PCRE		"Perl Compatible Regular Expressions"			on \
 		SASL2		"Cyrus SASLv2 (Simple Auth. and Sec. Layer)"		${STATUS_SASL2} \
 		DOVECOT		"Dovecot SASL authentication method"			off \
 		SASLKRB		"If your SASL req. Kerberos select this option"		${STATUS_SASLKRB} \
 		SASLKRB5	"If your SASL req. Kerberos5 select this option"	${STATUS_SASLKRB5} \
 		SASLKMIT	"If your SASL req. MIT Kerberos5 select this option"	${STATUS_SASLKRB5MIT} \
 		TLS		"Enable SSL and TLS support"				${STATUS_TLS} \
 		BDB		"Berkeley DB (choose version with WITH_BDB_VER)"	${STATUS_BDB} \
 		MYSQL		"MySQL maps (choose version with WITH_MYSQL_VER)"	${STATUS_MySQL} \
 		PGSQL		"PostgreSQL maps (choose with DEFAULT_PGSQL_VER)"	${STATUS_PgSQL} \
 		OPENLDAP	"OpenLDAP maps (choose ver. with WITH_OPENLDAP_VER)"	${STATUS_OpenLDAP} \
 		CDB		"CDB maps lookups"					${STATUS_CDB} \
 		NIS		"NIS maps lookups"					${STATUS_NIS} \
 		VDA		"VDA (Virtual Delivery Agent)"				${STATUS_VDA} \
 		TEST		"SMTP/LMTP test server and generator"			${STATUS_Test}
 
 MAN1=	postalias.1 postcat.1 postconf.1 postdrop.1 postfix.1 postkick.1 \
 	postlock.1 postlog.1 postmap.1 postmulti.1 postqueue.1 postsuper.1 \
 	sendmail.1 qshape.1
 
 MAN5=	access.5 aliases.5 bounce.5 canonical.5 cidr_table.5 generic.5 \
 	header_checks.5 ldap_table.5 master.5 mysql_table.5 nisplus_table.5 \
 	pcre_table.5 pgsql_table.5 postconf.5 postfix-wrapper.5 regexp_table.5 \
 	relocated.5 tcp_table.5 transport.5 virtual.5
 
 MAN8=	anvil.8 bounce.8 cleanup.8 discard.8 error.8 flush.8 local.8 master.8 \
 	oqmgr.8 pickup.8 pipe.8 proxymap.8 qmgr.8 qmqpd.8 scache.8 showq.8 \
 	smtp.8 smtpd.8 spawn.8 tlsmgr.8 trivial-rewrite.8 verify.8 virtual.8
 
 MLINKS=	sendmail.1 mailq.1 \
 	sendmail.1 newaliases.1 \
 	header_checks.5 body_checks.5 \
 	bounce.8 defer.8 \
 	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
 
 MAKEFILEFLAGS+=	CC="${CC}" OPT="${CFLAGS}"
 
 .include <bsd.port.pre.mk>
 
 POSTFIX_CCARGS+=	-DDEF_CONFIG_DIR=\\\"${ETCDIR}\\\" \
-			-DDEF_DAEMON_DIR=\\\"${PREFIX}/libexec/postfix\\\" \
+			-DDEF_DAEMON_DIR=\\\"${DAEMONDIR}\\\" \
 			-DDEF_COMMAND_DIR=\\\"${PREFIX}/sbin\\\" \
 			-DDEF_SENDMAIL_PATH=\\\"${PREFIX}/sbin/sendmail\\\" \
 			-DDEF_NEWALIAS_PATH=\\\"${PREFIX}/bin/newaliases\\\" \
 			-DDEF_MAILQ_PATH=\\\"${PREFIX}/bin/mailq\\\" \
 			-DDEF_MANPAGE_DIR=\\\"${MANPREFIX}/man\\\" \
 			-DDEF_README_DIR=\\\"${READMEDIR}\\\" \
 			-DDEF_HTML_DIR=\\\"${READMEDIR}\\\" \
 			-DDEF_QUEUE_DIR=\\\"/var/spool/postfix\\\" \
 			-DDEF_DATA_DIR=\\\"/var/db/postfix\\\" \
 			-DDEF_MAIL_OWNER=\\\"postfix\\\" \
 			-DDEF_SGID_GROUP=\\\"maildrop\\\" \
 
 # Default requirement for postfix rc script
 _REQUIRE=		LOGIN cleanvar
 
 .if defined(WITH_PCRE)
 LIB_DEPENDS+=		pcre.0:${PORTSDIR}/devel/pcre
 POSTFIX_CCARGS+=	-DHAS_PCRE -I${LOCALBASE}/include
 POSTFIX_AUXLIBS+=	-L${LOCALBASE}/lib -lpcre
 .else
 POSTFIX_CCARGS+=	-DNO_PCRE
 .endif
 
 .if defined(WITH_SASL2)
 LIB_DEPENDS+=		sasl2.2:${PORTSDIR}/security/cyrus-sasl2
 POSTFIX_CCARGS+=	-DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I${LOCALBASE}/include -I${LOCALBASE}/include/sasl
 POSTFIX_AUXLIBS+=	-L${LOCALBASE}/lib -lsasl2 -lpam -lcrypt
 .endif
 
 .if defined(WITH_DOVECOT)
 RUN_DEPENDS+=		dovecot:${PORTSDIR}/mail/dovecot
 POSTFIX_CCARGS+=	-DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\"
 _REQUIRE+=		dovecot
 .endif
 
 .if defined(WITH_SASLKRB)
 .if defined(WITH_SASLKRB5) || defined(WITH_SASLKMIT)
 BROKEN=			Select only one SASL Kerberos option
 .endif
 POSTFIX_AUXLIBS+=	-lkrb -lcrypto -lcom_err
 .endif
 
 .if defined(WITH_SASLKRB5)
 .if defined(WITH_SASLKRB) || defined(WITH_SASLKMIT)
 BROKEN=			Select only one SASL Kerberos option
 .endif
 POSTFIX_AUXLIBS+=	-lkrb5 -lcrypto -lcrypt -lcom_err -lasn1 -lroken
 .endif
 
 .if defined(WITH_SASLKMIT)
 .if defined(WITH_SASLKRB) || defined(WITH_SASLKRB5)
 BROKEN=			Select only one SASL Kerberos option
 .endif
 LIB_DEPENDS+=		krb5.3:${PORTSDIR}/security/krb5
 POSTFIX_AUXLIBS+=	-Wl,--rpath,$${KRB5_HOME:-${LOCALBASE}}/lib -lkrb5 -lcrypto -lcrypt -lcom_err
 .endif
 
 .if defined(WITH_TLS)
 .include "${PORTSDIR}/Mk/bsd.openssl.mk"
 POSTFIX_CCARGS+=	-DUSE_TLS -I${OPENSSLINC}
 POSTFIX_AUXLIBS+=	-L${OPENSSLLIB} ${LDFLAGS} -lssl -lcrypto
 .endif
 
 .if defined(WITH_BDB)
 USE_BDB=		yes
 POSTFIX_CCARGS+=	-I${BDB_INCLUDE_DIR}
 POSTFIX_AUXLIBS+=	-L${BDB_LIB_DIR} -l${BDB_LIB_NAME}
 .endif
 
 .if defined(WITH_MYSQL)
 USE_MYSQL=		yes
 POSTFIX_CCARGS+=	-DHAS_MYSQL -I${LOCALBASE}/include/mysql
 POSTFIX_AUXLIBS+=	-L${LOCALBASE}/lib/mysql -lmysqlclient -lz -lcrypt -lm
 _REQUIRE+=		mysql
 .endif
 
 .if defined(WITH_PGSQL)
 USE_PGSQL=		yes
 POSTFIX_CCARGS+=	-DHAS_PGSQL -I${LOCALBASE}/include -I${LOCALBASE}/pgsql/include
 POSTFIX_AUXLIBS+=	-L${LOCALBASE}/lib -L${LOCALBASE}/pgsql/lib -lpq -lcrypt
 _REQUIRE+=		postgresql
 .endif
 
 .if defined(WITH_OPENLDAP)
 USE_OPENLDAP=		yes
 .if defined(WITH_OPENLDAP_VER)
 WANT_OPENLDAP_VER=	${WITH_OPENLDAP_VER}
 .endif
 POSTFIX_CCARGS+=	-DHAS_LDAP -I${LOCALBASE}/include
 POSTFIX_AUXLIBS+=	-L${LOCALBASE}/lib -lldap -llber
 _REQUIRE+=		slapd
 .endif
 
 .if defined(WITH_CDB)
 BUILD_DEPENDS+=		${LOCALBASE}/lib/libcdb.a:${PORTSDIR}/databases/tinycdb
 POSTFIX_CCARGS+=	-DHAS_CDB -I${LOCALBASE}/include
 POSTFIX_AUXLIBS+=	-L${LOCALBASE}/lib -lcdb
 .endif
 
 .if defined(WITH_NIS)
 POSTFIX_CCARGS+=	-DHAS_NIS
 _REQUIRE+=		ypserv
 .endif
 
 .if defined(WITH_VDA)
 IGNORE=			wait for a new VDA patch that works with ${PORTVERSION}
 PATCH_SITES+=		http://vda.sourceforge.net/VDA/
 PATCHFILES+=		postfix-${PORTVERSION}-vda-ng.patch.gz
 PATCH_DIST_STRIP=	-p1
 PLIST_SUB+=	VDA=""
 .else
 PLIST_SUB+=	VDA="@comment "
 .endif
 
 .if defined(WITH_TEST)
 BINTEST=	qmqp-sink qmqp-source smtp-sink smtp-source
 MANTEST=	qmqp-sink.1 qmqp-source.1 smtp-sink.1 smtp-source.1
 MAN1+=		${MANTEST}
 PLIST_SUB+=	TEST=""
 .else
 PLIST_SUB+=	TEST="@comment "
 .endif
 
 .if defined(NOPORTDOCS)
-READMEDIR=no
+READMEDIR=	no
 .else
-READMEDIR=${DOCSDIR}
+READMEDIR=	${DOCSDIR}
 .endif
 
-SUB_LIST+=	REQUIRE="${_REQUIRE}" READMEDIR="${READMEDIR}"
+DAEMONDIR=	${PREFIX}/libexec/postfix
+
+SUB_LIST+=	REQUIRE="${_REQUIRE}" READMEDIR="${READMEDIR}" DAEMONDIR="${DAEMONDIR}"
 SUB_FILES+=	pkg-install pkg-message
 
 # sed script for files in ${WRKSRC}/README_FILES ${WRKSRC}/conf ${WRKSRC}/man
 REINPLACE=	s!^PATH=.*!PATH=/bin:/sbin:/usr/bin:/usr/sbin:${PREFIX}/bin:${PREFIX}/sbin!;\
 		s!(_directory = )/usr/!\1${PREFIX}/!g;\
 		s!^(data_directory = /var/)lib/!\1db/!g;\
 		s!^\#(mynetworks_style = host)!\1!g;\
 		s!^(sendmail_path =)!\1 ${PREFIX}/sbin/sendmail!g;\
 		s!^(newaliases_path =)!\1 ${PREFIX}/bin/newaliases!g;\
 		s!^(mailq_path =)!\1 ${PREFIX}/bin/mailq!g;\
 		s!^(setgid_group =)!\1 maildrop!g;\
 		s!^(manpage_directory =)!\1 ${PREFIX}/man!g;\
 		s!^((html|readme)_directory =)!\1 ${READMEDIR}!g;\
 		\!^\#alias_database = dbm:/etc/mail/aliases$$!d;\
 		s!(:|= )/etc/postfix!\1$$config_directory!g;\
 		s!/etc/postfix!${ETCDIR}!g;\
 		s!^(sample_directory =)!\1 ${ETCDIR}!g;\
 		s!($config_directory/(access|aliases|canonical|generic|header_checks|relocated|transport|virtual):f:root:-:644:)p1!\1o!;
 
 pre-patch:
 .if defined(POSTFIX_OPTIONS)
 	@${ECHO_MSG}
 	@${ECHO_MSG}
 	@${ECHO_MSG}
 	@${ECHO_MSG} "***** ALERT *****"
 	@${ECHO_MSG} "POSTFIX_OPTIONS is no longer supported,"
 	@${ECHO_MSG} "${PORTNAME} uses options, consider running"
 	@${ECHO_MSG} "# make config"
 	@${ECHO_MSG}
 	@${ECHO_MSG}
 	@${ECHO_MSG}
 	@sleep 10
 .endif
 
 .if defined(WITH_SASL2) && !defined(WITH_MYSQL) && exists(${LOCALBASE}/lib/libsasl2.a)
 	@if /usr/bin/nm ${LOCALBASE}/lib/libsasl2.a | ${GREP} -wq "mysql_init"; then \
 		${ECHO_MSG}; \
 		${ECHO_MSG} "Your SASL2 library it's compiled with MYSQL"; \
 		${ECHO_MSG} "If you use MYSQL in ${PORTNAME} consider CTRL+C and"; \
 		${ECHO_MSG} "select MYSQL OPTION in config menu."; \
 		${ECHO_MSG} "# make clean config"; \
 		${ECHO_MSG}; \
 		sleep 5; \
 	fi
 .endif
 
 	@${ECHO} '<HTML><BODY>See <A HREF="header_checks.5.html">header_checks.5.html</A></BODY></HTML>' \
 		> ${WRKSRC}/html/body_checks.5.html
 	@${REINPLACE_CMD} -E -e 's![[:<:]]perl[[:>:]]!${PERL}!' \
 		${WRKSRC}/src/bounce/Makefile.in
 	@${REINPLACE_CMD} -E -e 's!^(#define DEF_SGID_GROUP[^"]+)"postdrop"$$!\1"maildrop"!' \
 		${WRKSRC}/src/global/mail_params.h
 	@${FIND} -X ${WRKSRC}/README_FILES ${WRKSRC}/conf ${WRKSRC}/man \
 		-type f -a ! \( -name INSTALL -o -name aliases \) | ${XARGS} \
 		${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
 	@${REINPLACE_CMD} -E -e '${REINPLACE}' \
 		${WRKSRC}/README_FILES/VDA_README
 .endif
 
 do-configure:
 	(cd ${WRKSRC} && ${MAKE} -f Makefile.init makefiles ${MAKEFILEFLAGS} \
 	CCARGS="${POSTFIX_CCARGS}" AUXLIBS="${POSTFIX_AUXLIBS}" && \
 	${ECHO} "all: default" >> Makefile)
 
 pre-su-install:
 	@${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=${DAEMONDIR} \
+		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
 .for f in ${BINTEST}
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/${f} ${PREFIX}/bin
 .endfor
 .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
 	# Fix compressed man pages
-	@${REINPLACE_CMD} -i '' -E -e "s|(man[158]/.*.[158]):|\1.gz:|g" ${PREFIX}/libexec/postfix/postfix-files
+	@${REINPLACE_CMD} -i '' -E -e "s|(man[158]/.*.[158]):|\1.gz:|g" ${DAEMONDIR}/postfix-files
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>

Property changes on: head/mail/postfix26/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.147
\ No newline at end of property
+1.148
\ No newline at end of property
Index: head/mail/postfix26/files/pkg-install.in
===================================================================
--- head/mail/postfix26/files/pkg-install.in	(revision 235558)
+++ head/mail/postfix26/files/pkg-install.in	(revision 235559)
@@ -1,148 +1,158 @@
 #!/bin/sh
 #
-#	$FreeBSD: /tmp/pcvs/ports/mail/postfix26/files/pkg-install.in,v 1.2 2009-06-04 07:45:27 mm Exp $
+#	$FreeBSD: /tmp/pcvs/ports/mail/postfix26/files/pkg-install.in,v 1.3 2009-06-11 01:42:24 wxs Exp $
 #
 
 # If the POSTFIX_DEFAULT_MTA environment variable is set to YES, it
 # will make the port/package use defaults which make postfix replace
 # sendmail as much as possible.
 
 PREFIX=${PKG_PREFIX:=%%PREFIX%%}
 ETCDIR=${ETCDIR:=%%ETCDIR%%}
-DAEMONDIR=${DAEMONDIR:=${PREFIX}/libexec/postfix}
+DAEMONDIR=${DAEMONDIR:=%%DAEMONDIR%%}
 READMEDIR=${READMEDIR:=%%READMEDIR%%}
 BATCH=${BATCH:=no}
 POSTFIX_DEFAULT_MTA=${POSTFIX_DEFAULT_MTA:=no}
 
 if [ "${POSTFIX_DEFAULT_MTA}" = "no" ]; then
       DEFAULT_REPLACE_MAILERCONF=n
 else
       DEFAULT_REPLACE_MAILERCONF=y
 fi
 
 if [ -x /usr/sbin/nologin ]; then
       NOLOGIN=/usr/sbin/nologin
 else
       NOLOGIN=/sbin/nologin
 fi
 
 ask() {
       local question default answer
 
       question=$1
       default=$2
       if [ -z "${PACKAGE_BUILDING}" -a "${BATCH}" = "no" ]; then
 	      read -p "${question} [${default}]? " answer
       fi
       if [ -z "${answer}" ]; then
 	      answer=${default}
       fi
       echo ${answer}
 }
 
 yesno() {
       local question default answer
 
       question=$1
       default=$2
       while :; do
 	      answer=$(ask "${question}" "${default}")
 	      case "${answer}" in
 		      [Yy]*)	return 0;;
 		      [Nn]*)	return 1;;
 	      esac
 	      echo "Please answer yes or no."
       done
 }
 
 if [ "$2" = "PRE-INSTALL" ]; then
       USER=postfix
       UID=125
       GROUP=postfix
       GID=125
       GROUP2=maildrop
       GID2=126
 
       if /usr/sbin/pw groupshow "${GROUP}" 2>/dev/null; then
 	      echo "You already have a group \"${GROUP}\", so I will use it."
       else
 	      if /usr/sbin/pw groupadd ${GROUP} -g ${GID}; then
 		      echo "Added group \"${GROUP}\"."
 	      else
 		      echo "Adding group \"${GROUP}\" failed..."
 		      echo "Please create it, and try again."
 		      exit 1
 	      fi
       fi
 
       if /usr/sbin/pw groupshow "${GROUP2}" 2>/dev/null; then
 	      echo "You already have a group \"${GROUP2}\", so I will use it."
       else
 	      if /usr/sbin/pw groupadd ${GROUP2} -g ${GID2}; then
 		      echo "Added group \"${GROUP2}\"."
 	      else
 		      echo "Adding group \"${GROUP2}\" failed..."
 		      echo "Please create it, and try again."
 		      exit 1
 	      fi
       fi
 
       if /usr/sbin/pw user show "${USER}" 2>/dev/null; then
 	      echo "You already have a user \"${USER}\", so I will use it."
       else
 	      if /usr/sbin/pw useradd ${USER} -u ${UID} -g ${GROUP} -h - -d /var/spool/postfix -s ${NOLOGIN} -c "Postfix Mail System"; then
 		      echo "Added user \"${USER}\"."
 	      else
 		      echo "Adding user \"${USER}\" failed..."
 		      echo "Please create it, and try again."
 		      exit 1
 	      fi
       fi
 
       if /usr/sbin/pw show group mail | grep -q "${USER}" 2>/dev/null; then
 	      echo "You already have user \"${USER}\" in group \"mail\", so I will use it."
       else
 	      echo "You need user \"${USER}\" added to group \"mail\"."
 	      if yesno "Would you like me to add it" y; then
 		      /usr/sbin/pw groupmod mail -m ${USER} || exit
 		      echo "Done."
 	      else
 		      echo "Please create it, and try again."
 		      exit 1
 	      fi
       fi
 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
 
 replace() {
       local orig repl
 
 	orig=$1
 	repl=$2
 	if [ -e ${orig} ]; then
 		/bin/mv -f ${orig} ${orig}.OFF
 		/bin/chmod 0 ${orig}.OFF
 	fi
 	if [ -e ${repl} ]; then
 		/bin/ln -s ${repl} ${orig}
 	fi
 }
 
 if [ "$2" = "POST-INSTALL" -a -z "${PACKAGE_BUILDING}" ]; then
 	if yesno "Would you like to activate Postfix in /etc/mail/mailer.conf" ${DEFAULT_REPLACE_MAILERCONF}; then
 		/bin/mv -f /etc/mail/mailer.conf /etc/mail/mailer.conf.old
 		echo "#"						>	/etc/mail/mailer.conf
 		echo -n "# Execute the Postfix sendmail program"	>>	/etc/mail/mailer.conf
 		echo ", named ${PREFIX}/sbin/sendmail"		>>	/etc/mail/mailer.conf
 		echo "#"						>>	/etc/mail/mailer.conf
 		echo "sendmail	${PREFIX}/sbin/sendmail"	>>	/etc/mail/mailer.conf
 		echo "send-mail	${PREFIX}/sbin/sendmail"	>>	/etc/mail/mailer.conf
 		echo "mailq		${PREFIX}/sbin/sendmail"	>>	/etc/mail/mailer.conf
 		echo "newaliases	${PREFIX}/sbin/sendmail"	>>	/etc/mail/mailer.conf
 	fi
 fi

Property changes on: head/mail/postfix26/files/pkg-install.in
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.2
\ No newline at end of property
+1.3
\ No newline at end of property
Index: head/mail/postfix26/pkg-plist
===================================================================
--- head/mail/postfix26/pkg-plist	(revision 235558)
+++ head/mail/postfix26/pkg-plist	(revision 235559)
@@ -1,231 +1,232 @@
 @unexec if cmp -s %D/libexec/postfix/main.cf %D/%%ETCDIR%%/main.cf; then rm -f %D/%%ETCDIR%%/main.cf; fi
 @unexec if cmp -s %D/libexec/postfix/master.cf %D/%%ETCDIR%%/master.cf; then rm -f %D/%%ETCDIR%%/master.cf; fi
 %%ETCDIR%%/LICENSE
 %%ETCDIR%%/TLS_LICENSE
 %%ETCDIR%%/bounce.cf.default
 %%ETCDIR%%/main.cf.default
 %%ETCDIR%%/makedefs.out
 @dirrmtry %%ETCDIR%%
 libexec/postfix/anvil
 libexec/postfix/bounce
 libexec/postfix/cleanup
 libexec/postfix/discard
 libexec/postfix/error
 libexec/postfix/flush
 libexec/postfix/lmtp
 libexec/postfix/local
 libexec/postfix/main.cf
 libexec/postfix/master
 libexec/postfix/master.cf
 libexec/postfix/nqmgr
 libexec/postfix/oqmgr
 libexec/postfix/pickup
 libexec/postfix/pipe
 libexec/postfix/post-install
 libexec/postfix/postfix-files
 libexec/postfix/postfix-script
 libexec/postfix/postfix-wrapper
 libexec/postfix/postmulti-script
 libexec/postfix/proxymap
 libexec/postfix/qmgr
 libexec/postfix/qmqpd
 libexec/postfix/scache
 libexec/postfix/showq
 libexec/postfix/smtp
 libexec/postfix/smtpd
 libexec/postfix/spawn
 libexec/postfix/trivial-rewrite
 libexec/postfix/verify
 libexec/postfix/virtual
 libexec/postfix/tlsmgr
 @dirrm libexec/postfix
 bin/mailq
 bin/newaliases
 bin/qshape
 bin/rmail
 %%TEST%%bin/qmqp-sink
 %%TEST%%bin/qmqp-source
 %%TEST%%bin/smtp-sink
 %%TEST%%bin/smtp-source
 sbin/postalias
 sbin/postcat
 sbin/postconf
 sbin/postdrop
 sbin/postfix
 sbin/postkick
 sbin/postlock
 sbin/postlog
 sbin/postmap
 sbin/postmulti
 sbin/postqueue
 sbin/postsuper
 sbin/sendmail
 %%PORTDOCS%%%%DOCSDIR%%/AAAREADME
 %%PORTDOCS%%%%DOCSDIR%%/ADDRESS_CLASS_README
 %%PORTDOCS%%%%DOCSDIR%%/ADDRESS_CLASS_README.html
 %%PORTDOCS%%%%DOCSDIR%%/ADDRESS_REWRITING_README
 %%PORTDOCS%%%%DOCSDIR%%/ADDRESS_REWRITING_README.html
 %%PORTDOCS%%%%DOCSDIR%%/ADDRESS_VERIFICATION_README
 %%PORTDOCS%%%%DOCSDIR%%/ADDRESS_VERIFICATION_README.html
 %%PORTDOCS%%%%DOCSDIR%%/BACKSCATTER_README
 %%PORTDOCS%%%%DOCSDIR%%/BACKSCATTER_README.html
 %%PORTDOCS%%%%DOCSDIR%%/BASIC_CONFIGURATION_README
 %%PORTDOCS%%%%DOCSDIR%%/BASIC_CONFIGURATION_README.html
 %%PORTDOCS%%%%DOCSDIR%%/BUILTIN_FILTER_README
 %%PORTDOCS%%%%DOCSDIR%%/BUILTIN_FILTER_README.html
 %%PORTDOCS%%%%DOCSDIR%%/CDB_README
 %%PORTDOCS%%%%DOCSDIR%%/CDB_README.html
 %%PORTDOCS%%%%DOCSDIR%%/CONNECTION_CACHE_README
 %%PORTDOCS%%%%DOCSDIR%%/CONNECTION_CACHE_README.html
 %%PORTDOCS%%%%DOCSDIR%%/CONTENT_INSPECTION_README
 %%PORTDOCS%%%%DOCSDIR%%/CONTENT_INSPECTION_README.html
 %%PORTDOCS%%%%DOCSDIR%%/DATABASE_README
 %%PORTDOCS%%%%DOCSDIR%%/DATABASE_README.html
 %%PORTDOCS%%%%DOCSDIR%%/DB_README
 %%PORTDOCS%%%%DOCSDIR%%/DB_README.html
 %%PORTDOCS%%%%DOCSDIR%%/DEBUG_README
 %%PORTDOCS%%%%DOCSDIR%%/DEBUG_README.html
 %%PORTDOCS%%%%DOCSDIR%%/DSN_README
 %%PORTDOCS%%%%DOCSDIR%%/DSN_README.html
 %%PORTDOCS%%%%DOCSDIR%%/ETRN_README
 %%PORTDOCS%%%%DOCSDIR%%/ETRN_README.html
 %%PORTDOCS%%%%DOCSDIR%%/FILTER_README
 %%PORTDOCS%%%%DOCSDIR%%/FILTER_README.html
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL.html
 %%PORTDOCS%%%%DOCSDIR%%/IPV6_README
 %%PORTDOCS%%%%DOCSDIR%%/IPV6_README.html
 %%PORTDOCS%%%%DOCSDIR%%/TLS_README
 %%PORTDOCS%%%%DOCSDIR%%/TLS_README.html
 %%PORTDOCS%%%%DOCSDIR%%/LDAP_README
 %%PORTDOCS%%%%DOCSDIR%%/LDAP_README.html
 %%PORTDOCS%%%%DOCSDIR%%/LINUX_README
 %%PORTDOCS%%%%DOCSDIR%%/LINUX_README.html
 %%PORTDOCS%%%%DOCSDIR%%/LOCAL_RECIPIENT_README
 %%PORTDOCS%%%%DOCSDIR%%/LOCAL_RECIPIENT_README.html
 %%PORTDOCS%%%%DOCSDIR%%/MAILDROP_README
 %%PORTDOCS%%%%DOCSDIR%%/MAILDROP_README.html
 %%PORTDOCS%%%%DOCSDIR%%/MILTER_README
 %%PORTDOCS%%%%DOCSDIR%%/MILTER_README.html
 %%PORTDOCS%%%%DOCSDIR%%/MULTI_INSTANCE_README
 %%PORTDOCS%%%%DOCSDIR%%/MULTI_INSTANCE_README.html
 %%PORTDOCS%%%%DOCSDIR%%/MYSQL_README
 %%PORTDOCS%%%%DOCSDIR%%/MYSQL_README.html
 %%PORTDOCS%%%%DOCSDIR%%/NFS_README
 %%PORTDOCS%%%%DOCSDIR%%/NFS_README.html
 %%PORTDOCS%%%%DOCSDIR%%/OVERVIEW
 %%PORTDOCS%%%%DOCSDIR%%/OVERVIEW.html
 %%PORTDOCS%%%%DOCSDIR%%/PACKAGE_README
 %%PORTDOCS%%%%DOCSDIR%%/PACKAGE_README.html
 %%PORTDOCS%%%%DOCSDIR%%/PCRE_README
 %%PORTDOCS%%%%DOCSDIR%%/PCRE_README.html
 %%PORTDOCS%%%%DOCSDIR%%/PGSQL_README
 %%PORTDOCS%%%%DOCSDIR%%/PGSQL_README.html
 %%PORTDOCS%%%%DOCSDIR%%/QSHAPE_README
 %%PORTDOCS%%%%DOCSDIR%%/QSHAPE_README.html
 %%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES
 %%PORTDOCS%%%%DOCSDIR%%/RESTRICTION_CLASS_README
 %%PORTDOCS%%%%DOCSDIR%%/RESTRICTION_CLASS_README.html
 %%PORTDOCS%%%%DOCSDIR%%/SASL_README
 %%PORTDOCS%%%%DOCSDIR%%/SASL_README.html
 %%PORTDOCS%%%%DOCSDIR%%/SCHEDULER_README
 %%PORTDOCS%%%%DOCSDIR%%/SCHEDULER_README.html
 %%PORTDOCS%%%%DOCSDIR%%/SMTPD_ACCESS_README
 %%PORTDOCS%%%%DOCSDIR%%/SMTPD_ACCESS_README.html
 %%PORTDOCS%%%%DOCSDIR%%/SMTPD_POLICY_README
 %%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
 %%PORTDOCS%%%%DOCSDIR%%/STRESS_README
 %%PORTDOCS%%%%DOCSDIR%%/STRESS_README.html
 %%PORTDOCS%%%%DOCSDIR%%/TLS_LEGACY_README
 %%PORTDOCS%%%%DOCSDIR%%/TLS_LEGACY_README.html
 %%PORTDOCS%%%%DOCSDIR%%/TUNING_README
 %%PORTDOCS%%%%DOCSDIR%%/TUNING_README.html
 %%PORTDOCS%%%%DOCSDIR%%/ULTRIX_README
 %%PORTDOCS%%%%DOCSDIR%%/UUCP_README
 %%PORTDOCS%%%%DOCSDIR%%/UUCP_README.html
 %%VDA%%%%PORTDOCS%%%%DOCSDIR%%/VDA_README
 %%PORTDOCS%%%%DOCSDIR%%/VERP_README
 %%PORTDOCS%%%%DOCSDIR%%/VERP_README.html
 %%PORTDOCS%%%%DOCSDIR%%/VIRTUAL_README
 %%PORTDOCS%%%%DOCSDIR%%/VIRTUAL_README.html
 %%PORTDOCS%%%%DOCSDIR%%/XCLIENT_README
 %%PORTDOCS%%%%DOCSDIR%%/XCLIENT_README.html
 %%PORTDOCS%%%%DOCSDIR%%/XFORWARD_README
 %%PORTDOCS%%%%DOCSDIR%%/XFORWARD_README.html
 %%PORTDOCS%%%%DOCSDIR%%/access.5.html
 %%PORTDOCS%%%%DOCSDIR%%/aliases.5.html
 %%PORTDOCS%%%%DOCSDIR%%/anvil.8.html
 %%PORTDOCS%%%%DOCSDIR%%/body_checks.5.html
 %%PORTDOCS%%%%DOCSDIR%%/bounce.5.html
 %%PORTDOCS%%%%DOCSDIR%%/bounce.8.html
 %%PORTDOCS%%%%DOCSDIR%%/canonical.5.html
 %%PORTDOCS%%%%DOCSDIR%%/cidr_table.5.html
 %%PORTDOCS%%%%DOCSDIR%%/cleanup.8.html
 %%PORTDOCS%%%%DOCSDIR%%/defer.8.html
 %%PORTDOCS%%%%DOCSDIR%%/discard.8.html
 %%PORTDOCS%%%%DOCSDIR%%/error.8.html
 %%PORTDOCS%%%%DOCSDIR%%/flush.8.html
 %%PORTDOCS%%%%DOCSDIR%%/header_checks.5.html
 %%PORTDOCS%%%%DOCSDIR%%/index.html
 %%PORTDOCS%%%%DOCSDIR%%/ldap_table.5.html
 %%PORTDOCS%%%%DOCSDIR%%/lmtp.8.html
 %%PORTDOCS%%%%DOCSDIR%%/local.8.html
 %%PORTDOCS%%%%DOCSDIR%%/mailq.1.html
 %%PORTDOCS%%%%DOCSDIR%%/master.5.html
 %%PORTDOCS%%%%DOCSDIR%%/master.8.html
 %%PORTDOCS%%%%DOCSDIR%%/mysql_table.5.html
 %%PORTDOCS%%%%DOCSDIR%%/nisplus_table.5.html
 %%PORTDOCS%%%%DOCSDIR%%/newaliases.1.html
 %%PORTDOCS%%%%DOCSDIR%%/oqmgr.8.html
 %%PORTDOCS%%%%DOCSDIR%%/pcre_table.5.html
 %%PORTDOCS%%%%DOCSDIR%%/pgsql_table.5.html
 %%PORTDOCS%%%%DOCSDIR%%/pickup.8.html
 %%PORTDOCS%%%%DOCSDIR%%/pipe.8.html
 %%PORTDOCS%%%%DOCSDIR%%/postalias.1.html
 %%PORTDOCS%%%%DOCSDIR%%/postcat.1.html
 %%PORTDOCS%%%%DOCSDIR%%/postconf.1.html
 %%PORTDOCS%%%%DOCSDIR%%/postconf.5.html
 %%PORTDOCS%%%%DOCSDIR%%/postdrop.1.html
 %%PORTDOCS%%%%DOCSDIR%%/postfix-logo.jpg
 %%PORTDOCS%%%%DOCSDIR%%/postfix-manuals.html
 %%PORTDOCS%%%%DOCSDIR%%/postfix-power.png
 %%PORTDOCS%%%%DOCSDIR%%/postfix-wrapper.5.html
 %%PORTDOCS%%%%DOCSDIR%%/postfix.1.html
 %%PORTDOCS%%%%DOCSDIR%%/postkick.1.html
 %%PORTDOCS%%%%DOCSDIR%%/postlock.1.html
 %%PORTDOCS%%%%DOCSDIR%%/postlog.1.html
 %%PORTDOCS%%%%DOCSDIR%%/postmap.1.html
 %%PORTDOCS%%%%DOCSDIR%%/postmulti.1.html
 %%PORTDOCS%%%%DOCSDIR%%/postqueue.1.html
 %%PORTDOCS%%%%DOCSDIR%%/postsuper.1.html
 %%PORTDOCS%%%%DOCSDIR%%/proxymap.8.html
 %%PORTDOCS%%%%DOCSDIR%%/qmgr.8.html
 %%PORTDOCS%%%%DOCSDIR%%/qmqp-sink.1.html
 %%PORTDOCS%%%%DOCSDIR%%/qmqp-source.1.html
 %%PORTDOCS%%%%DOCSDIR%%/qmqpd.8.html
 %%PORTDOCS%%%%DOCSDIR%%/qshape.1.html
 %%PORTDOCS%%%%DOCSDIR%%/regexp_table.5.html
 %%PORTDOCS%%%%DOCSDIR%%/relocated.5.html
 %%PORTDOCS%%%%DOCSDIR%%/sendmail.1.html
 %%PORTDOCS%%%%DOCSDIR%%/scache.8.html
 %%PORTDOCS%%%%DOCSDIR%%/showq.8.html
 %%PORTDOCS%%%%DOCSDIR%%/smtp-sink.1.html
 %%PORTDOCS%%%%DOCSDIR%%/smtp-source.1.html
 %%PORTDOCS%%%%DOCSDIR%%/smtp.8.html
 %%PORTDOCS%%%%DOCSDIR%%/smtpd.8.html
 %%PORTDOCS%%%%DOCSDIR%%/spawn.8.html
 %%PORTDOCS%%%%DOCSDIR%%/tcp_table.5.html
 %%PORTDOCS%%%%DOCSDIR%%/trace.8.html
 %%PORTDOCS%%%%DOCSDIR%%/transport.5.html
 %%PORTDOCS%%%%DOCSDIR%%/trivial-rewrite.8.html
 %%PORTDOCS%%%%DOCSDIR%%/verify.8.html
 %%PORTDOCS%%%%DOCSDIR%%/virtual.5.html
 %%PORTDOCS%%%%DOCSDIR%%/virtual.8.html
 %%PORTDOCS%%%%DOCSDIR%%/tlsmgr.8.html
 %%PORTDOCS%%%%DOCSDIR%%/generic.5.html
 %%PORTDOCS%%@dirrm %%DOCSDIR%%

Property changes on: head/mail/postfix26/pkg-plist
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.29
\ No newline at end of property
+1.30
\ No newline at end of property
Index: head/mail/postfix27/Makefile
===================================================================
--- head/mail/postfix27/Makefile	(revision 235558)
+++ head/mail/postfix27/Makefile	(revision 235559)
@@ -1,315 +1,325 @@
 # New ports collection makefile for:	postfix
 # Date created:				18 Mar 1999
 # Whom:					torstenb
 #
 # $FreeBSD$
 #
 
 PORTNAME=	postfix
 PORTVERSION=	2.6.2
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
 		ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/%SUBDIR%/ \
 		ftp://ftp.tux.org/pub/net/postfix/official/ \
 		ftp://ftp.utoronto.ca/mirror/packages/postfix/official/ \
 		ftp://ftp.samurai.com/pub/postfix/official/ \
 		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/mail/postfix/official/&,}
 MASTER_SITE_SUBDIR=	. old related/postfix
 DISTNAME=	postfix-${PORTVERSION}
 DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	sahil@tandon.net
 COMMENT=	A secure alternative to widely-used Sendmail
 
 CONFLICTS=	courier-0.* postfix-1.* postfix-2.[0-57-9].* postfix-current-2.* \
 		sendmail-8.* sendmail-*-8.* smail-3.* zmailer-2.*
 
 USE_SUBMAKE=	yes
 USE_PERL5_BUILD=yes
 USE_RC_SUBR=	postfix.sh
 SCRIPTS_ENV+=	POSTFIX_DEFAULT_MTA="${POSTFIX_DEFAULT_MTA}"
 
 # back compat pull in settings from POSTFIX_OPTIONS for convenience when
 # make config is run (happens first time port is built, too)
 .for o in SASL2 SASLKRB SASLKRB5 SASLKRB5MIT TLS BDB MySQL PgSQL OpenLDAP CDB NIS VDA Test
 STATUS_${o}=off
 .endfor
 .if defined(POSTFIX_OPTIONS)
 . for o in ${POSTFIX_OPTIONS}
 STATUS_${o}=on
 . endfor
 .endif
 
 OPTIONS=	PCRE		"Perl Compatible Regular Expressions"			on \
 		SASL2		"Cyrus SASLv2 (Simple Auth. and Sec. Layer)"		${STATUS_SASL2} \
 		DOVECOT		"Dovecot SASL authentication method"			off \
 		SASLKRB		"If your SASL req. Kerberos select this option"		${STATUS_SASLKRB} \
 		SASLKRB5	"If your SASL req. Kerberos5 select this option"	${STATUS_SASLKRB5} \
 		SASLKMIT	"If your SASL req. MIT Kerberos5 select this option"	${STATUS_SASLKRB5MIT} \
 		TLS		"Enable SSL and TLS support"				${STATUS_TLS} \
 		BDB		"Berkeley DB (choose version with WITH_BDB_VER)"	${STATUS_BDB} \
 		MYSQL		"MySQL maps (choose version with WITH_MYSQL_VER)"	${STATUS_MySQL} \
 		PGSQL		"PostgreSQL maps (choose with DEFAULT_PGSQL_VER)"	${STATUS_PgSQL} \
 		OPENLDAP	"OpenLDAP maps (choose ver. with WITH_OPENLDAP_VER)"	${STATUS_OpenLDAP} \
 		CDB		"CDB maps lookups"					${STATUS_CDB} \
 		NIS		"NIS maps lookups"					${STATUS_NIS} \
 		VDA		"VDA (Virtual Delivery Agent)"				${STATUS_VDA} \
 		TEST		"SMTP/LMTP test server and generator"			${STATUS_Test}
 
 MAN1=	postalias.1 postcat.1 postconf.1 postdrop.1 postfix.1 postkick.1 \
 	postlock.1 postlog.1 postmap.1 postmulti.1 postqueue.1 postsuper.1 \
 	sendmail.1 qshape.1
 
 MAN5=	access.5 aliases.5 bounce.5 canonical.5 cidr_table.5 generic.5 \
 	header_checks.5 ldap_table.5 master.5 mysql_table.5 nisplus_table.5 \
 	pcre_table.5 pgsql_table.5 postconf.5 postfix-wrapper.5 regexp_table.5 \
 	relocated.5 tcp_table.5 transport.5 virtual.5
 
 MAN8=	anvil.8 bounce.8 cleanup.8 discard.8 error.8 flush.8 local.8 master.8 \
 	oqmgr.8 pickup.8 pipe.8 proxymap.8 qmgr.8 qmqpd.8 scache.8 showq.8 \
 	smtp.8 smtpd.8 spawn.8 tlsmgr.8 trivial-rewrite.8 verify.8 virtual.8
 
 MLINKS=	sendmail.1 mailq.1 \
 	sendmail.1 newaliases.1 \
 	header_checks.5 body_checks.5 \
 	bounce.8 defer.8 \
 	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
 
 MAKEFILEFLAGS+=	CC="${CC}" OPT="${CFLAGS}"
 
 .include <bsd.port.pre.mk>
 
 POSTFIX_CCARGS+=	-DDEF_CONFIG_DIR=\\\"${ETCDIR}\\\" \
-			-DDEF_DAEMON_DIR=\\\"${PREFIX}/libexec/postfix\\\" \
+			-DDEF_DAEMON_DIR=\\\"${DAEMONDIR}\\\" \
 			-DDEF_COMMAND_DIR=\\\"${PREFIX}/sbin\\\" \
 			-DDEF_SENDMAIL_PATH=\\\"${PREFIX}/sbin/sendmail\\\" \
 			-DDEF_NEWALIAS_PATH=\\\"${PREFIX}/bin/newaliases\\\" \
 			-DDEF_MAILQ_PATH=\\\"${PREFIX}/bin/mailq\\\" \
 			-DDEF_MANPAGE_DIR=\\\"${MANPREFIX}/man\\\" \
 			-DDEF_README_DIR=\\\"${READMEDIR}\\\" \
 			-DDEF_HTML_DIR=\\\"${READMEDIR}\\\" \
 			-DDEF_QUEUE_DIR=\\\"/var/spool/postfix\\\" \
 			-DDEF_DATA_DIR=\\\"/var/db/postfix\\\" \
 			-DDEF_MAIL_OWNER=\\\"postfix\\\" \
 			-DDEF_SGID_GROUP=\\\"maildrop\\\" \
 
 # Default requirement for postfix rc script
 _REQUIRE=		LOGIN cleanvar
 
 .if defined(WITH_PCRE)
 LIB_DEPENDS+=		pcre.0:${PORTSDIR}/devel/pcre
 POSTFIX_CCARGS+=	-DHAS_PCRE -I${LOCALBASE}/include
 POSTFIX_AUXLIBS+=	-L${LOCALBASE}/lib -lpcre
 .else
 POSTFIX_CCARGS+=	-DNO_PCRE
 .endif
 
 .if defined(WITH_SASL2)
 LIB_DEPENDS+=		sasl2.2:${PORTSDIR}/security/cyrus-sasl2
 POSTFIX_CCARGS+=	-DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I${LOCALBASE}/include -I${LOCALBASE}/include/sasl
 POSTFIX_AUXLIBS+=	-L${LOCALBASE}/lib -lsasl2 -lpam -lcrypt
 .endif
 
 .if defined(WITH_DOVECOT)
 RUN_DEPENDS+=		dovecot:${PORTSDIR}/mail/dovecot
 POSTFIX_CCARGS+=	-DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\"
 _REQUIRE+=		dovecot
 .endif
 
 .if defined(WITH_SASLKRB)
 .if defined(WITH_SASLKRB5) || defined(WITH_SASLKMIT)
 BROKEN=			Select only one SASL Kerberos option
 .endif
 POSTFIX_AUXLIBS+=	-lkrb -lcrypto -lcom_err
 .endif
 
 .if defined(WITH_SASLKRB5)
 .if defined(WITH_SASLKRB) || defined(WITH_SASLKMIT)
 BROKEN=			Select only one SASL Kerberos option
 .endif
 POSTFIX_AUXLIBS+=	-lkrb5 -lcrypto -lcrypt -lcom_err -lasn1 -lroken
 .endif
 
 .if defined(WITH_SASLKMIT)
 .if defined(WITH_SASLKRB) || defined(WITH_SASLKRB5)
 BROKEN=			Select only one SASL Kerberos option
 .endif
 LIB_DEPENDS+=		krb5.3:${PORTSDIR}/security/krb5
 POSTFIX_AUXLIBS+=	-Wl,--rpath,$${KRB5_HOME:-${LOCALBASE}}/lib -lkrb5 -lcrypto -lcrypt -lcom_err
 .endif
 
 .if defined(WITH_TLS)
 .include "${PORTSDIR}/Mk/bsd.openssl.mk"
 POSTFIX_CCARGS+=	-DUSE_TLS -I${OPENSSLINC}
 POSTFIX_AUXLIBS+=	-L${OPENSSLLIB} ${LDFLAGS} -lssl -lcrypto
 .endif
 
 .if defined(WITH_BDB)
 USE_BDB=		yes
 POSTFIX_CCARGS+=	-I${BDB_INCLUDE_DIR}
 POSTFIX_AUXLIBS+=	-L${BDB_LIB_DIR} -l${BDB_LIB_NAME}
 .endif
 
 .if defined(WITH_MYSQL)
 USE_MYSQL=		yes
 POSTFIX_CCARGS+=	-DHAS_MYSQL -I${LOCALBASE}/include/mysql
 POSTFIX_AUXLIBS+=	-L${LOCALBASE}/lib/mysql -lmysqlclient -lz -lcrypt -lm
 _REQUIRE+=		mysql
 .endif
 
 .if defined(WITH_PGSQL)
 USE_PGSQL=		yes
 POSTFIX_CCARGS+=	-DHAS_PGSQL -I${LOCALBASE}/include -I${LOCALBASE}/pgsql/include
 POSTFIX_AUXLIBS+=	-L${LOCALBASE}/lib -L${LOCALBASE}/pgsql/lib -lpq -lcrypt
 _REQUIRE+=		postgresql
 .endif
 
 .if defined(WITH_OPENLDAP)
 USE_OPENLDAP=		yes
 .if defined(WITH_OPENLDAP_VER)
 WANT_OPENLDAP_VER=	${WITH_OPENLDAP_VER}
 .endif
 POSTFIX_CCARGS+=	-DHAS_LDAP -I${LOCALBASE}/include
 POSTFIX_AUXLIBS+=	-L${LOCALBASE}/lib -lldap -llber
 _REQUIRE+=		slapd
 .endif
 
 .if defined(WITH_CDB)
 BUILD_DEPENDS+=		${LOCALBASE}/lib/libcdb.a:${PORTSDIR}/databases/tinycdb
 POSTFIX_CCARGS+=	-DHAS_CDB -I${LOCALBASE}/include
 POSTFIX_AUXLIBS+=	-L${LOCALBASE}/lib -lcdb
 .endif
 
 .if defined(WITH_NIS)
 POSTFIX_CCARGS+=	-DHAS_NIS
 _REQUIRE+=		ypserv
 .endif
 
 .if defined(WITH_VDA)
 IGNORE=			wait for a new VDA patch that works with ${PORTVERSION}
 PATCH_SITES+=		http://vda.sourceforge.net/VDA/
 PATCHFILES+=		postfix-${PORTVERSION}-vda-ng.patch.gz
 PATCH_DIST_STRIP=	-p1
 PLIST_SUB+=	VDA=""
 .else
 PLIST_SUB+=	VDA="@comment "
 .endif
 
 .if defined(WITH_TEST)
 BINTEST=	qmqp-sink qmqp-source smtp-sink smtp-source
 MANTEST=	qmqp-sink.1 qmqp-source.1 smtp-sink.1 smtp-source.1
 MAN1+=		${MANTEST}
 PLIST_SUB+=	TEST=""
 .else
 PLIST_SUB+=	TEST="@comment "
 .endif
 
 .if defined(NOPORTDOCS)
-READMEDIR=no
+READMEDIR=	no
 .else
-READMEDIR=${DOCSDIR}
+READMEDIR=	${DOCSDIR}
 .endif
 
-SUB_LIST+=	REQUIRE="${_REQUIRE}" READMEDIR="${READMEDIR}"
+DAEMONDIR=	${PREFIX}/libexec/postfix
+
+SUB_LIST+=	REQUIRE="${_REQUIRE}" READMEDIR="${READMEDIR}" DAEMONDIR="${DAEMONDIR}"
 SUB_FILES+=	pkg-install pkg-message
 
 # sed script for files in ${WRKSRC}/README_FILES ${WRKSRC}/conf ${WRKSRC}/man
 REINPLACE=	s!^PATH=.*!PATH=/bin:/sbin:/usr/bin:/usr/sbin:${PREFIX}/bin:${PREFIX}/sbin!;\
 		s!(_directory = )/usr/!\1${PREFIX}/!g;\
 		s!^(data_directory = /var/)lib/!\1db/!g;\
 		s!^\#(mynetworks_style = host)!\1!g;\
 		s!^(sendmail_path =)!\1 ${PREFIX}/sbin/sendmail!g;\
 		s!^(newaliases_path =)!\1 ${PREFIX}/bin/newaliases!g;\
 		s!^(mailq_path =)!\1 ${PREFIX}/bin/mailq!g;\
 		s!^(setgid_group =)!\1 maildrop!g;\
 		s!^(manpage_directory =)!\1 ${PREFIX}/man!g;\
 		s!^((html|readme)_directory =)!\1 ${READMEDIR}!g;\
 		\!^\#alias_database = dbm:/etc/mail/aliases$$!d;\
 		s!(:|= )/etc/postfix!\1$$config_directory!g;\
 		s!/etc/postfix!${ETCDIR}!g;\
 		s!^(sample_directory =)!\1 ${ETCDIR}!g;\
 		s!($config_directory/(access|aliases|canonical|generic|header_checks|relocated|transport|virtual):f:root:-:644:)p1!\1o!;
 
 pre-patch:
 .if defined(POSTFIX_OPTIONS)
 	@${ECHO_MSG}
 	@${ECHO_MSG}
 	@${ECHO_MSG}
 	@${ECHO_MSG} "***** ALERT *****"
 	@${ECHO_MSG} "POSTFIX_OPTIONS is no longer supported,"
 	@${ECHO_MSG} "${PORTNAME} uses options, consider running"
 	@${ECHO_MSG} "# make config"
 	@${ECHO_MSG}
 	@${ECHO_MSG}
 	@${ECHO_MSG}
 	@sleep 10
 .endif
 
 .if defined(WITH_SASL2) && !defined(WITH_MYSQL) && exists(${LOCALBASE}/lib/libsasl2.a)
 	@if /usr/bin/nm ${LOCALBASE}/lib/libsasl2.a | ${GREP} -wq "mysql_init"; then \
 		${ECHO_MSG}; \
 		${ECHO_MSG} "Your SASL2 library it's compiled with MYSQL"; \
 		${ECHO_MSG} "If you use MYSQL in ${PORTNAME} consider CTRL+C and"; \
 		${ECHO_MSG} "select MYSQL OPTION in config menu."; \
 		${ECHO_MSG} "# make clean config"; \
 		${ECHO_MSG}; \
 		sleep 5; \
 	fi
 .endif
 
 	@${ECHO} '<HTML><BODY>See <A HREF="header_checks.5.html">header_checks.5.html</A></BODY></HTML>' \
 		> ${WRKSRC}/html/body_checks.5.html
 	@${REINPLACE_CMD} -E -e 's![[:<:]]perl[[:>:]]!${PERL}!' \
 		${WRKSRC}/src/bounce/Makefile.in
 	@${REINPLACE_CMD} -E -e 's!^(#define DEF_SGID_GROUP[^"]+)"postdrop"$$!\1"maildrop"!' \
 		${WRKSRC}/src/global/mail_params.h
 	@${FIND} -X ${WRKSRC}/README_FILES ${WRKSRC}/conf ${WRKSRC}/man \
 		-type f -a ! \( -name INSTALL -o -name aliases \) | ${XARGS} \
 		${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
 	@${REINPLACE_CMD} -E -e '${REINPLACE}' \
 		${WRKSRC}/README_FILES/VDA_README
 .endif
 
 do-configure:
 	(cd ${WRKSRC} && ${MAKE} -f Makefile.init makefiles ${MAKEFILEFLAGS} \
 	CCARGS="${POSTFIX_CCARGS}" AUXLIBS="${POSTFIX_AUXLIBS}" && \
 	${ECHO} "all: default" >> Makefile)
 
 pre-su-install:
 	@${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=${DAEMONDIR} \
+		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
 .for f in ${BINTEST}
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/${f} ${PREFIX}/bin
 .endfor
 .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
 	# Fix compressed man pages
-	@${REINPLACE_CMD} -i '' -E -e "s|(man[158]/.*.[158]):|\1.gz:|g" ${PREFIX}/libexec/postfix/postfix-files
+	@${REINPLACE_CMD} -i '' -E -e "s|(man[158]/.*.[158]):|\1.gz:|g" ${DAEMONDIR}/postfix-files
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>

Property changes on: head/mail/postfix27/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.147
\ No newline at end of property
+1.148
\ No newline at end of property
Index: head/mail/postfix27/files/pkg-install.in
===================================================================
--- head/mail/postfix27/files/pkg-install.in	(revision 235558)
+++ head/mail/postfix27/files/pkg-install.in	(revision 235559)
@@ -1,148 +1,158 @@
 #!/bin/sh
 #
-#	$FreeBSD: /tmp/pcvs/ports/mail/postfix27/files/pkg-install.in,v 1.2 2009-06-04 07:45:27 mm Exp $
+#	$FreeBSD: /tmp/pcvs/ports/mail/postfix27/files/pkg-install.in,v 1.3 2009-06-11 01:42:24 wxs Exp $
 #
 
 # If the POSTFIX_DEFAULT_MTA environment variable is set to YES, it
 # will make the port/package use defaults which make postfix replace
 # sendmail as much as possible.
 
 PREFIX=${PKG_PREFIX:=%%PREFIX%%}
 ETCDIR=${ETCDIR:=%%ETCDIR%%}
-DAEMONDIR=${DAEMONDIR:=${PREFIX}/libexec/postfix}
+DAEMONDIR=${DAEMONDIR:=%%DAEMONDIR%%}
 READMEDIR=${READMEDIR:=%%READMEDIR%%}
 BATCH=${BATCH:=no}
 POSTFIX_DEFAULT_MTA=${POSTFIX_DEFAULT_MTA:=no}
 
 if [ "${POSTFIX_DEFAULT_MTA}" = "no" ]; then
       DEFAULT_REPLACE_MAILERCONF=n
 else
       DEFAULT_REPLACE_MAILERCONF=y
 fi
 
 if [ -x /usr/sbin/nologin ]; then
       NOLOGIN=/usr/sbin/nologin
 else
       NOLOGIN=/sbin/nologin
 fi
 
 ask() {
       local question default answer
 
       question=$1
       default=$2
       if [ -z "${PACKAGE_BUILDING}" -a "${BATCH}" = "no" ]; then
 	      read -p "${question} [${default}]? " answer
       fi
       if [ -z "${answer}" ]; then
 	      answer=${default}
       fi
       echo ${answer}
 }
 
 yesno() {
       local question default answer
 
       question=$1
       default=$2
       while :; do
 	      answer=$(ask "${question}" "${default}")
 	      case "${answer}" in
 		      [Yy]*)	return 0;;
 		      [Nn]*)	return 1;;
 	      esac
 	      echo "Please answer yes or no."
       done
 }
 
 if [ "$2" = "PRE-INSTALL" ]; then
       USER=postfix
       UID=125
       GROUP=postfix
       GID=125
       GROUP2=maildrop
       GID2=126
 
       if /usr/sbin/pw groupshow "${GROUP}" 2>/dev/null; then
 	      echo "You already have a group \"${GROUP}\", so I will use it."
       else
 	      if /usr/sbin/pw groupadd ${GROUP} -g ${GID}; then
 		      echo "Added group \"${GROUP}\"."
 	      else
 		      echo "Adding group \"${GROUP}\" failed..."
 		      echo "Please create it, and try again."
 		      exit 1
 	      fi
       fi
 
       if /usr/sbin/pw groupshow "${GROUP2}" 2>/dev/null; then
 	      echo "You already have a group \"${GROUP2}\", so I will use it."
       else
 	      if /usr/sbin/pw groupadd ${GROUP2} -g ${GID2}; then
 		      echo "Added group \"${GROUP2}\"."
 	      else
 		      echo "Adding group \"${GROUP2}\" failed..."
 		      echo "Please create it, and try again."
 		      exit 1
 	      fi
       fi
 
       if /usr/sbin/pw user show "${USER}" 2>/dev/null; then
 	      echo "You already have a user \"${USER}\", so I will use it."
       else
 	      if /usr/sbin/pw useradd ${USER} -u ${UID} -g ${GROUP} -h - -d /var/spool/postfix -s ${NOLOGIN} -c "Postfix Mail System"; then
 		      echo "Added user \"${USER}\"."
 	      else
 		      echo "Adding user \"${USER}\" failed..."
 		      echo "Please create it, and try again."
 		      exit 1
 	      fi
       fi
 
       if /usr/sbin/pw show group mail | grep -q "${USER}" 2>/dev/null; then
 	      echo "You already have user \"${USER}\" in group \"mail\", so I will use it."
       else
 	      echo "You need user \"${USER}\" added to group \"mail\"."
 	      if yesno "Would you like me to add it" y; then
 		      /usr/sbin/pw groupmod mail -m ${USER} || exit
 		      echo "Done."
 	      else
 		      echo "Please create it, and try again."
 		      exit 1
 	      fi
       fi
 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
 
 replace() {
       local orig repl
 
 	orig=$1
 	repl=$2
 	if [ -e ${orig} ]; then
 		/bin/mv -f ${orig} ${orig}.OFF
 		/bin/chmod 0 ${orig}.OFF
 	fi
 	if [ -e ${repl} ]; then
 		/bin/ln -s ${repl} ${orig}
 	fi
 }
 
 if [ "$2" = "POST-INSTALL" -a -z "${PACKAGE_BUILDING}" ]; then
 	if yesno "Would you like to activate Postfix in /etc/mail/mailer.conf" ${DEFAULT_REPLACE_MAILERCONF}; then
 		/bin/mv -f /etc/mail/mailer.conf /etc/mail/mailer.conf.old
 		echo "#"						>	/etc/mail/mailer.conf
 		echo -n "# Execute the Postfix sendmail program"	>>	/etc/mail/mailer.conf
 		echo ", named ${PREFIX}/sbin/sendmail"		>>	/etc/mail/mailer.conf
 		echo "#"						>>	/etc/mail/mailer.conf
 		echo "sendmail	${PREFIX}/sbin/sendmail"	>>	/etc/mail/mailer.conf
 		echo "send-mail	${PREFIX}/sbin/sendmail"	>>	/etc/mail/mailer.conf
 		echo "mailq		${PREFIX}/sbin/sendmail"	>>	/etc/mail/mailer.conf
 		echo "newaliases	${PREFIX}/sbin/sendmail"	>>	/etc/mail/mailer.conf
 	fi
 fi

Property changes on: head/mail/postfix27/files/pkg-install.in
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.2
\ No newline at end of property
+1.3
\ No newline at end of property
Index: head/mail/postfix27/pkg-plist
===================================================================
--- head/mail/postfix27/pkg-plist	(revision 235558)
+++ head/mail/postfix27/pkg-plist	(revision 235559)
@@ -1,231 +1,232 @@
 @unexec if cmp -s %D/libexec/postfix/main.cf %D/%%ETCDIR%%/main.cf; then rm -f %D/%%ETCDIR%%/main.cf; fi
 @unexec if cmp -s %D/libexec/postfix/master.cf %D/%%ETCDIR%%/master.cf; then rm -f %D/%%ETCDIR%%/master.cf; fi
 %%ETCDIR%%/LICENSE
 %%ETCDIR%%/TLS_LICENSE
 %%ETCDIR%%/bounce.cf.default
 %%ETCDIR%%/main.cf.default
 %%ETCDIR%%/makedefs.out
 @dirrmtry %%ETCDIR%%
 libexec/postfix/anvil
 libexec/postfix/bounce
 libexec/postfix/cleanup
 libexec/postfix/discard
 libexec/postfix/error
 libexec/postfix/flush
 libexec/postfix/lmtp
 libexec/postfix/local
 libexec/postfix/main.cf
 libexec/postfix/master
 libexec/postfix/master.cf
 libexec/postfix/nqmgr
 libexec/postfix/oqmgr
 libexec/postfix/pickup
 libexec/postfix/pipe
 libexec/postfix/post-install
 libexec/postfix/postfix-files
 libexec/postfix/postfix-script
 libexec/postfix/postfix-wrapper
 libexec/postfix/postmulti-script
 libexec/postfix/proxymap
 libexec/postfix/qmgr
 libexec/postfix/qmqpd
 libexec/postfix/scache
 libexec/postfix/showq
 libexec/postfix/smtp
 libexec/postfix/smtpd
 libexec/postfix/spawn
 libexec/postfix/trivial-rewrite
 libexec/postfix/verify
 libexec/postfix/virtual
 libexec/postfix/tlsmgr
 @dirrm libexec/postfix
 bin/mailq
 bin/newaliases
 bin/qshape
 bin/rmail
 %%TEST%%bin/qmqp-sink
 %%TEST%%bin/qmqp-source
 %%TEST%%bin/smtp-sink
 %%TEST%%bin/smtp-source
 sbin/postalias
 sbin/postcat
 sbin/postconf
 sbin/postdrop
 sbin/postfix
 sbin/postkick
 sbin/postlock
 sbin/postlog
 sbin/postmap
 sbin/postmulti
 sbin/postqueue
 sbin/postsuper
 sbin/sendmail
 %%PORTDOCS%%%%DOCSDIR%%/AAAREADME
 %%PORTDOCS%%%%DOCSDIR%%/ADDRESS_CLASS_README
 %%PORTDOCS%%%%DOCSDIR%%/ADDRESS_CLASS_README.html
 %%PORTDOCS%%%%DOCSDIR%%/ADDRESS_REWRITING_README
 %%PORTDOCS%%%%DOCSDIR%%/ADDRESS_REWRITING_README.html
 %%PORTDOCS%%%%DOCSDIR%%/ADDRESS_VERIFICATION_README
 %%PORTDOCS%%%%DOCSDIR%%/ADDRESS_VERIFICATION_README.html
 %%PORTDOCS%%%%DOCSDIR%%/BACKSCATTER_README
 %%PORTDOCS%%%%DOCSDIR%%/BACKSCATTER_README.html
 %%PORTDOCS%%%%DOCSDIR%%/BASIC_CONFIGURATION_README
 %%PORTDOCS%%%%DOCSDIR%%/BASIC_CONFIGURATION_README.html
 %%PORTDOCS%%%%DOCSDIR%%/BUILTIN_FILTER_README
 %%PORTDOCS%%%%DOCSDIR%%/BUILTIN_FILTER_README.html
 %%PORTDOCS%%%%DOCSDIR%%/CDB_README
 %%PORTDOCS%%%%DOCSDIR%%/CDB_README.html
 %%PORTDOCS%%%%DOCSDIR%%/CONNECTION_CACHE_README
 %%PORTDOCS%%%%DOCSDIR%%/CONNECTION_CACHE_README.html
 %%PORTDOCS%%%%DOCSDIR%%/CONTENT_INSPECTION_README
 %%PORTDOCS%%%%DOCSDIR%%/CONTENT_INSPECTION_README.html
 %%PORTDOCS%%%%DOCSDIR%%/DATABASE_README
 %%PORTDOCS%%%%DOCSDIR%%/DATABASE_README.html
 %%PORTDOCS%%%%DOCSDIR%%/DB_README
 %%PORTDOCS%%%%DOCSDIR%%/DB_README.html
 %%PORTDOCS%%%%DOCSDIR%%/DEBUG_README
 %%PORTDOCS%%%%DOCSDIR%%/DEBUG_README.html
 %%PORTDOCS%%%%DOCSDIR%%/DSN_README
 %%PORTDOCS%%%%DOCSDIR%%/DSN_README.html
 %%PORTDOCS%%%%DOCSDIR%%/ETRN_README
 %%PORTDOCS%%%%DOCSDIR%%/ETRN_README.html
 %%PORTDOCS%%%%DOCSDIR%%/FILTER_README
 %%PORTDOCS%%%%DOCSDIR%%/FILTER_README.html
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL.html
 %%PORTDOCS%%%%DOCSDIR%%/IPV6_README
 %%PORTDOCS%%%%DOCSDIR%%/IPV6_README.html
 %%PORTDOCS%%%%DOCSDIR%%/TLS_README
 %%PORTDOCS%%%%DOCSDIR%%/TLS_README.html
 %%PORTDOCS%%%%DOCSDIR%%/LDAP_README
 %%PORTDOCS%%%%DOCSDIR%%/LDAP_README.html
 %%PORTDOCS%%%%DOCSDIR%%/LINUX_README
 %%PORTDOCS%%%%DOCSDIR%%/LINUX_README.html
 %%PORTDOCS%%%%DOCSDIR%%/LOCAL_RECIPIENT_README
 %%PORTDOCS%%%%DOCSDIR%%/LOCAL_RECIPIENT_README.html
 %%PORTDOCS%%%%DOCSDIR%%/MAILDROP_README
 %%PORTDOCS%%%%DOCSDIR%%/MAILDROP_README.html
 %%PORTDOCS%%%%DOCSDIR%%/MILTER_README
 %%PORTDOCS%%%%DOCSDIR%%/MILTER_README.html
 %%PORTDOCS%%%%DOCSDIR%%/MULTI_INSTANCE_README
 %%PORTDOCS%%%%DOCSDIR%%/MULTI_INSTANCE_README.html
 %%PORTDOCS%%%%DOCSDIR%%/MYSQL_README
 %%PORTDOCS%%%%DOCSDIR%%/MYSQL_README.html
 %%PORTDOCS%%%%DOCSDIR%%/NFS_README
 %%PORTDOCS%%%%DOCSDIR%%/NFS_README.html
 %%PORTDOCS%%%%DOCSDIR%%/OVERVIEW
 %%PORTDOCS%%%%DOCSDIR%%/OVERVIEW.html
 %%PORTDOCS%%%%DOCSDIR%%/PACKAGE_README
 %%PORTDOCS%%%%DOCSDIR%%/PACKAGE_README.html
 %%PORTDOCS%%%%DOCSDIR%%/PCRE_README
 %%PORTDOCS%%%%DOCSDIR%%/PCRE_README.html
 %%PORTDOCS%%%%DOCSDIR%%/PGSQL_README
 %%PORTDOCS%%%%DOCSDIR%%/PGSQL_README.html
 %%PORTDOCS%%%%DOCSDIR%%/QSHAPE_README
 %%PORTDOCS%%%%DOCSDIR%%/QSHAPE_README.html
 %%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES
 %%PORTDOCS%%%%DOCSDIR%%/RESTRICTION_CLASS_README
 %%PORTDOCS%%%%DOCSDIR%%/RESTRICTION_CLASS_README.html
 %%PORTDOCS%%%%DOCSDIR%%/SASL_README
 %%PORTDOCS%%%%DOCSDIR%%/SASL_README.html
 %%PORTDOCS%%%%DOCSDIR%%/SCHEDULER_README
 %%PORTDOCS%%%%DOCSDIR%%/SCHEDULER_README.html
 %%PORTDOCS%%%%DOCSDIR%%/SMTPD_ACCESS_README
 %%PORTDOCS%%%%DOCSDIR%%/SMTPD_ACCESS_README.html
 %%PORTDOCS%%%%DOCSDIR%%/SMTPD_POLICY_README
 %%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
 %%PORTDOCS%%%%DOCSDIR%%/STRESS_README
 %%PORTDOCS%%%%DOCSDIR%%/STRESS_README.html
 %%PORTDOCS%%%%DOCSDIR%%/TLS_LEGACY_README
 %%PORTDOCS%%%%DOCSDIR%%/TLS_LEGACY_README.html
 %%PORTDOCS%%%%DOCSDIR%%/TUNING_README
 %%PORTDOCS%%%%DOCSDIR%%/TUNING_README.html
 %%PORTDOCS%%%%DOCSDIR%%/ULTRIX_README
 %%PORTDOCS%%%%DOCSDIR%%/UUCP_README
 %%PORTDOCS%%%%DOCSDIR%%/UUCP_README.html
 %%VDA%%%%PORTDOCS%%%%DOCSDIR%%/VDA_README
 %%PORTDOCS%%%%DOCSDIR%%/VERP_README
 %%PORTDOCS%%%%DOCSDIR%%/VERP_README.html
 %%PORTDOCS%%%%DOCSDIR%%/VIRTUAL_README
 %%PORTDOCS%%%%DOCSDIR%%/VIRTUAL_README.html
 %%PORTDOCS%%%%DOCSDIR%%/XCLIENT_README
 %%PORTDOCS%%%%DOCSDIR%%/XCLIENT_README.html
 %%PORTDOCS%%%%DOCSDIR%%/XFORWARD_README
 %%PORTDOCS%%%%DOCSDIR%%/XFORWARD_README.html
 %%PORTDOCS%%%%DOCSDIR%%/access.5.html
 %%PORTDOCS%%%%DOCSDIR%%/aliases.5.html
 %%PORTDOCS%%%%DOCSDIR%%/anvil.8.html
 %%PORTDOCS%%%%DOCSDIR%%/body_checks.5.html
 %%PORTDOCS%%%%DOCSDIR%%/bounce.5.html
 %%PORTDOCS%%%%DOCSDIR%%/bounce.8.html
 %%PORTDOCS%%%%DOCSDIR%%/canonical.5.html
 %%PORTDOCS%%%%DOCSDIR%%/cidr_table.5.html
 %%PORTDOCS%%%%DOCSDIR%%/cleanup.8.html
 %%PORTDOCS%%%%DOCSDIR%%/defer.8.html
 %%PORTDOCS%%%%DOCSDIR%%/discard.8.html
 %%PORTDOCS%%%%DOCSDIR%%/error.8.html
 %%PORTDOCS%%%%DOCSDIR%%/flush.8.html
 %%PORTDOCS%%%%DOCSDIR%%/header_checks.5.html
 %%PORTDOCS%%%%DOCSDIR%%/index.html
 %%PORTDOCS%%%%DOCSDIR%%/ldap_table.5.html
 %%PORTDOCS%%%%DOCSDIR%%/lmtp.8.html
 %%PORTDOCS%%%%DOCSDIR%%/local.8.html
 %%PORTDOCS%%%%DOCSDIR%%/mailq.1.html
 %%PORTDOCS%%%%DOCSDIR%%/master.5.html
 %%PORTDOCS%%%%DOCSDIR%%/master.8.html
 %%PORTDOCS%%%%DOCSDIR%%/mysql_table.5.html
 %%PORTDOCS%%%%DOCSDIR%%/nisplus_table.5.html
 %%PORTDOCS%%%%DOCSDIR%%/newaliases.1.html
 %%PORTDOCS%%%%DOCSDIR%%/oqmgr.8.html
 %%PORTDOCS%%%%DOCSDIR%%/pcre_table.5.html
 %%PORTDOCS%%%%DOCSDIR%%/pgsql_table.5.html
 %%PORTDOCS%%%%DOCSDIR%%/pickup.8.html
 %%PORTDOCS%%%%DOCSDIR%%/pipe.8.html
 %%PORTDOCS%%%%DOCSDIR%%/postalias.1.html
 %%PORTDOCS%%%%DOCSDIR%%/postcat.1.html
 %%PORTDOCS%%%%DOCSDIR%%/postconf.1.html
 %%PORTDOCS%%%%DOCSDIR%%/postconf.5.html
 %%PORTDOCS%%%%DOCSDIR%%/postdrop.1.html
 %%PORTDOCS%%%%DOCSDIR%%/postfix-logo.jpg
 %%PORTDOCS%%%%DOCSDIR%%/postfix-manuals.html
 %%PORTDOCS%%%%DOCSDIR%%/postfix-power.png
 %%PORTDOCS%%%%DOCSDIR%%/postfix-wrapper.5.html
 %%PORTDOCS%%%%DOCSDIR%%/postfix.1.html
 %%PORTDOCS%%%%DOCSDIR%%/postkick.1.html
 %%PORTDOCS%%%%DOCSDIR%%/postlock.1.html
 %%PORTDOCS%%%%DOCSDIR%%/postlog.1.html
 %%PORTDOCS%%%%DOCSDIR%%/postmap.1.html
 %%PORTDOCS%%%%DOCSDIR%%/postmulti.1.html
 %%PORTDOCS%%%%DOCSDIR%%/postqueue.1.html
 %%PORTDOCS%%%%DOCSDIR%%/postsuper.1.html
 %%PORTDOCS%%%%DOCSDIR%%/proxymap.8.html
 %%PORTDOCS%%%%DOCSDIR%%/qmgr.8.html
 %%PORTDOCS%%%%DOCSDIR%%/qmqp-sink.1.html
 %%PORTDOCS%%%%DOCSDIR%%/qmqp-source.1.html
 %%PORTDOCS%%%%DOCSDIR%%/qmqpd.8.html
 %%PORTDOCS%%%%DOCSDIR%%/qshape.1.html
 %%PORTDOCS%%%%DOCSDIR%%/regexp_table.5.html
 %%PORTDOCS%%%%DOCSDIR%%/relocated.5.html
 %%PORTDOCS%%%%DOCSDIR%%/sendmail.1.html
 %%PORTDOCS%%%%DOCSDIR%%/scache.8.html
 %%PORTDOCS%%%%DOCSDIR%%/showq.8.html
 %%PORTDOCS%%%%DOCSDIR%%/smtp-sink.1.html
 %%PORTDOCS%%%%DOCSDIR%%/smtp-source.1.html
 %%PORTDOCS%%%%DOCSDIR%%/smtp.8.html
 %%PORTDOCS%%%%DOCSDIR%%/smtpd.8.html
 %%PORTDOCS%%%%DOCSDIR%%/spawn.8.html
 %%PORTDOCS%%%%DOCSDIR%%/tcp_table.5.html
 %%PORTDOCS%%%%DOCSDIR%%/trace.8.html
 %%PORTDOCS%%%%DOCSDIR%%/transport.5.html
 %%PORTDOCS%%%%DOCSDIR%%/trivial-rewrite.8.html
 %%PORTDOCS%%%%DOCSDIR%%/verify.8.html
 %%PORTDOCS%%%%DOCSDIR%%/virtual.5.html
 %%PORTDOCS%%%%DOCSDIR%%/virtual.8.html
 %%PORTDOCS%%%%DOCSDIR%%/tlsmgr.8.html
 %%PORTDOCS%%%%DOCSDIR%%/generic.5.html
 %%PORTDOCS%%@dirrm %%DOCSDIR%%

Property changes on: head/mail/postfix27/pkg-plist
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.29
\ No newline at end of property
+1.30
\ No newline at end of property
Index: head/mail/postfix28/Makefile
===================================================================
--- head/mail/postfix28/Makefile	(revision 235558)
+++ head/mail/postfix28/Makefile	(revision 235559)
@@ -1,315 +1,325 @@
 # New ports collection makefile for:	postfix
 # Date created:				18 Mar 1999
 # Whom:					torstenb
 #
 # $FreeBSD$
 #
 
 PORTNAME=	postfix
 PORTVERSION=	2.6.2
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
 		ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/%SUBDIR%/ \
 		ftp://ftp.tux.org/pub/net/postfix/official/ \
 		ftp://ftp.utoronto.ca/mirror/packages/postfix/official/ \
 		ftp://ftp.samurai.com/pub/postfix/official/ \
 		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/mail/postfix/official/&,}
 MASTER_SITE_SUBDIR=	. old related/postfix
 DISTNAME=	postfix-${PORTVERSION}
 DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	sahil@tandon.net
 COMMENT=	A secure alternative to widely-used Sendmail
 
 CONFLICTS=	courier-0.* postfix-1.* postfix-2.[0-57-9].* postfix-current-2.* \
 		sendmail-8.* sendmail-*-8.* smail-3.* zmailer-2.*
 
 USE_SUBMAKE=	yes
 USE_PERL5_BUILD=yes
 USE_RC_SUBR=	postfix.sh
 SCRIPTS_ENV+=	POSTFIX_DEFAULT_MTA="${POSTFIX_DEFAULT_MTA}"
 
 # back compat pull in settings from POSTFIX_OPTIONS for convenience when
 # make config is run (happens first time port is built, too)
 .for o in SASL2 SASLKRB SASLKRB5 SASLKRB5MIT TLS BDB MySQL PgSQL OpenLDAP CDB NIS VDA Test
 STATUS_${o}=off
 .endfor
 .if defined(POSTFIX_OPTIONS)
 . for o in ${POSTFIX_OPTIONS}
 STATUS_${o}=on
 . endfor
 .endif
 
 OPTIONS=	PCRE		"Perl Compatible Regular Expressions"			on \
 		SASL2		"Cyrus SASLv2 (Simple Auth. and Sec. Layer)"		${STATUS_SASL2} \
 		DOVECOT		"Dovecot SASL authentication method"			off \
 		SASLKRB		"If your SASL req. Kerberos select this option"		${STATUS_SASLKRB} \
 		SASLKRB5	"If your SASL req. Kerberos5 select this option"	${STATUS_SASLKRB5} \
 		SASLKMIT	"If your SASL req. MIT Kerberos5 select this option"	${STATUS_SASLKRB5MIT} \
 		TLS		"Enable SSL and TLS support"				${STATUS_TLS} \
 		BDB		"Berkeley DB (choose version with WITH_BDB_VER)"	${STATUS_BDB} \
 		MYSQL		"MySQL maps (choose version with WITH_MYSQL_VER)"	${STATUS_MySQL} \
 		PGSQL		"PostgreSQL maps (choose with DEFAULT_PGSQL_VER)"	${STATUS_PgSQL} \
 		OPENLDAP	"OpenLDAP maps (choose ver. with WITH_OPENLDAP_VER)"	${STATUS_OpenLDAP} \
 		CDB		"CDB maps lookups"					${STATUS_CDB} \
 		NIS		"NIS maps lookups"					${STATUS_NIS} \
 		VDA		"VDA (Virtual Delivery Agent)"				${STATUS_VDA} \
 		TEST		"SMTP/LMTP test server and generator"			${STATUS_Test}
 
 MAN1=	postalias.1 postcat.1 postconf.1 postdrop.1 postfix.1 postkick.1 \
 	postlock.1 postlog.1 postmap.1 postmulti.1 postqueue.1 postsuper.1 \
 	sendmail.1 qshape.1
 
 MAN5=	access.5 aliases.5 bounce.5 canonical.5 cidr_table.5 generic.5 \
 	header_checks.5 ldap_table.5 master.5 mysql_table.5 nisplus_table.5 \
 	pcre_table.5 pgsql_table.5 postconf.5 postfix-wrapper.5 regexp_table.5 \
 	relocated.5 tcp_table.5 transport.5 virtual.5
 
 MAN8=	anvil.8 bounce.8 cleanup.8 discard.8 error.8 flush.8 local.8 master.8 \
 	oqmgr.8 pickup.8 pipe.8 proxymap.8 qmgr.8 qmqpd.8 scache.8 showq.8 \
 	smtp.8 smtpd.8 spawn.8 tlsmgr.8 trivial-rewrite.8 verify.8 virtual.8
 
 MLINKS=	sendmail.1 mailq.1 \
 	sendmail.1 newaliases.1 \
 	header_checks.5 body_checks.5 \
 	bounce.8 defer.8 \
 	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
 
 MAKEFILEFLAGS+=	CC="${CC}" OPT="${CFLAGS}"
 
 .include <bsd.port.pre.mk>
 
 POSTFIX_CCARGS+=	-DDEF_CONFIG_DIR=\\\"${ETCDIR}\\\" \
-			-DDEF_DAEMON_DIR=\\\"${PREFIX}/libexec/postfix\\\" \
+			-DDEF_DAEMON_DIR=\\\"${DAEMONDIR}\\\" \
 			-DDEF_COMMAND_DIR=\\\"${PREFIX}/sbin\\\" \
 			-DDEF_SENDMAIL_PATH=\\\"${PREFIX}/sbin/sendmail\\\" \
 			-DDEF_NEWALIAS_PATH=\\\"${PREFIX}/bin/newaliases\\\" \
 			-DDEF_MAILQ_PATH=\\\"${PREFIX}/bin/mailq\\\" \
 			-DDEF_MANPAGE_DIR=\\\"${MANPREFIX}/man\\\" \
 			-DDEF_README_DIR=\\\"${READMEDIR}\\\" \
 			-DDEF_HTML_DIR=\\\"${READMEDIR}\\\" \
 			-DDEF_QUEUE_DIR=\\\"/var/spool/postfix\\\" \
 			-DDEF_DATA_DIR=\\\"/var/db/postfix\\\" \
 			-DDEF_MAIL_OWNER=\\\"postfix\\\" \
 			-DDEF_SGID_GROUP=\\\"maildrop\\\" \
 
 # Default requirement for postfix rc script
 _REQUIRE=		LOGIN cleanvar
 
 .if defined(WITH_PCRE)
 LIB_DEPENDS+=		pcre.0:${PORTSDIR}/devel/pcre
 POSTFIX_CCARGS+=	-DHAS_PCRE -I${LOCALBASE}/include
 POSTFIX_AUXLIBS+=	-L${LOCALBASE}/lib -lpcre
 .else
 POSTFIX_CCARGS+=	-DNO_PCRE
 .endif
 
 .if defined(WITH_SASL2)
 LIB_DEPENDS+=		sasl2.2:${PORTSDIR}/security/cyrus-sasl2
 POSTFIX_CCARGS+=	-DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I${LOCALBASE}/include -I${LOCALBASE}/include/sasl
 POSTFIX_AUXLIBS+=	-L${LOCALBASE}/lib -lsasl2 -lpam -lcrypt
 .endif
 
 .if defined(WITH_DOVECOT)
 RUN_DEPENDS+=		dovecot:${PORTSDIR}/mail/dovecot
 POSTFIX_CCARGS+=	-DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\"
 _REQUIRE+=		dovecot
 .endif
 
 .if defined(WITH_SASLKRB)
 .if defined(WITH_SASLKRB5) || defined(WITH_SASLKMIT)
 BROKEN=			Select only one SASL Kerberos option
 .endif
 POSTFIX_AUXLIBS+=	-lkrb -lcrypto -lcom_err
 .endif
 
 .if defined(WITH_SASLKRB5)
 .if defined(WITH_SASLKRB) || defined(WITH_SASLKMIT)
 BROKEN=			Select only one SASL Kerberos option
 .endif
 POSTFIX_AUXLIBS+=	-lkrb5 -lcrypto -lcrypt -lcom_err -lasn1 -lroken
 .endif
 
 .if defined(WITH_SASLKMIT)
 .if defined(WITH_SASLKRB) || defined(WITH_SASLKRB5)
 BROKEN=			Select only one SASL Kerberos option
 .endif
 LIB_DEPENDS+=		krb5.3:${PORTSDIR}/security/krb5
 POSTFIX_AUXLIBS+=	-Wl,--rpath,$${KRB5_HOME:-${LOCALBASE}}/lib -lkrb5 -lcrypto -lcrypt -lcom_err
 .endif
 
 .if defined(WITH_TLS)
 .include "${PORTSDIR}/Mk/bsd.openssl.mk"
 POSTFIX_CCARGS+=	-DUSE_TLS -I${OPENSSLINC}
 POSTFIX_AUXLIBS+=	-L${OPENSSLLIB} ${LDFLAGS} -lssl -lcrypto
 .endif
 
 .if defined(WITH_BDB)
 USE_BDB=		yes
 POSTFIX_CCARGS+=	-I${BDB_INCLUDE_DIR}
 POSTFIX_AUXLIBS+=	-L${BDB_LIB_DIR} -l${BDB_LIB_NAME}
 .endif
 
 .if defined(WITH_MYSQL)
 USE_MYSQL=		yes
 POSTFIX_CCARGS+=	-DHAS_MYSQL -I${LOCALBASE}/include/mysql
 POSTFIX_AUXLIBS+=	-L${LOCALBASE}/lib/mysql -lmysqlclient -lz -lcrypt -lm
 _REQUIRE+=		mysql
 .endif
 
 .if defined(WITH_PGSQL)
 USE_PGSQL=		yes
 POSTFIX_CCARGS+=	-DHAS_PGSQL -I${LOCALBASE}/include -I${LOCALBASE}/pgsql/include
 POSTFIX_AUXLIBS+=	-L${LOCALBASE}/lib -L${LOCALBASE}/pgsql/lib -lpq -lcrypt
 _REQUIRE+=		postgresql
 .endif
 
 .if defined(WITH_OPENLDAP)
 USE_OPENLDAP=		yes
 .if defined(WITH_OPENLDAP_VER)
 WANT_OPENLDAP_VER=	${WITH_OPENLDAP_VER}
 .endif
 POSTFIX_CCARGS+=	-DHAS_LDAP -I${LOCALBASE}/include
 POSTFIX_AUXLIBS+=	-L${LOCALBASE}/lib -lldap -llber
 _REQUIRE+=		slapd
 .endif
 
 .if defined(WITH_CDB)
 BUILD_DEPENDS+=		${LOCALBASE}/lib/libcdb.a:${PORTSDIR}/databases/tinycdb
 POSTFIX_CCARGS+=	-DHAS_CDB -I${LOCALBASE}/include
 POSTFIX_AUXLIBS+=	-L${LOCALBASE}/lib -lcdb
 .endif
 
 .if defined(WITH_NIS)
 POSTFIX_CCARGS+=	-DHAS_NIS
 _REQUIRE+=		ypserv
 .endif
 
 .if defined(WITH_VDA)
 IGNORE=			wait for a new VDA patch that works with ${PORTVERSION}
 PATCH_SITES+=		http://vda.sourceforge.net/VDA/
 PATCHFILES+=		postfix-${PORTVERSION}-vda-ng.patch.gz
 PATCH_DIST_STRIP=	-p1
 PLIST_SUB+=	VDA=""
 .else
 PLIST_SUB+=	VDA="@comment "
 .endif
 
 .if defined(WITH_TEST)
 BINTEST=	qmqp-sink qmqp-source smtp-sink smtp-source
 MANTEST=	qmqp-sink.1 qmqp-source.1 smtp-sink.1 smtp-source.1
 MAN1+=		${MANTEST}
 PLIST_SUB+=	TEST=""
 .else
 PLIST_SUB+=	TEST="@comment "
 .endif
 
 .if defined(NOPORTDOCS)
-READMEDIR=no
+READMEDIR=	no
 .else
-READMEDIR=${DOCSDIR}
+READMEDIR=	${DOCSDIR}
 .endif
 
-SUB_LIST+=	REQUIRE="${_REQUIRE}" READMEDIR="${READMEDIR}"
+DAEMONDIR=	${PREFIX}/libexec/postfix
+
+SUB_LIST+=	REQUIRE="${_REQUIRE}" READMEDIR="${READMEDIR}" DAEMONDIR="${DAEMONDIR}"
 SUB_FILES+=	pkg-install pkg-message
 
 # sed script for files in ${WRKSRC}/README_FILES ${WRKSRC}/conf ${WRKSRC}/man
 REINPLACE=	s!^PATH=.*!PATH=/bin:/sbin:/usr/bin:/usr/sbin:${PREFIX}/bin:${PREFIX}/sbin!;\
 		s!(_directory = )/usr/!\1${PREFIX}/!g;\
 		s!^(data_directory = /var/)lib/!\1db/!g;\
 		s!^\#(mynetworks_style = host)!\1!g;\
 		s!^(sendmail_path =)!\1 ${PREFIX}/sbin/sendmail!g;\
 		s!^(newaliases_path =)!\1 ${PREFIX}/bin/newaliases!g;\
 		s!^(mailq_path =)!\1 ${PREFIX}/bin/mailq!g;\
 		s!^(setgid_group =)!\1 maildrop!g;\
 		s!^(manpage_directory =)!\1 ${PREFIX}/man!g;\
 		s!^((html|readme)_directory =)!\1 ${READMEDIR}!g;\
 		\!^\#alias_database = dbm:/etc/mail/aliases$$!d;\
 		s!(:|= )/etc/postfix!\1$$config_directory!g;\
 		s!/etc/postfix!${ETCDIR}!g;\
 		s!^(sample_directory =)!\1 ${ETCDIR}!g;\
 		s!($config_directory/(access|aliases|canonical|generic|header_checks|relocated|transport|virtual):f:root:-:644:)p1!\1o!;
 
 pre-patch:
 .if defined(POSTFIX_OPTIONS)
 	@${ECHO_MSG}
 	@${ECHO_MSG}
 	@${ECHO_MSG}
 	@${ECHO_MSG} "***** ALERT *****"
 	@${ECHO_MSG} "POSTFIX_OPTIONS is no longer supported,"
 	@${ECHO_MSG} "${PORTNAME} uses options, consider running"
 	@${ECHO_MSG} "# make config"
 	@${ECHO_MSG}
 	@${ECHO_MSG}
 	@${ECHO_MSG}
 	@sleep 10
 .endif
 
 .if defined(WITH_SASL2) && !defined(WITH_MYSQL) && exists(${LOCALBASE}/lib/libsasl2.a)
 	@if /usr/bin/nm ${LOCALBASE}/lib/libsasl2.a | ${GREP} -wq "mysql_init"; then \
 		${ECHO_MSG}; \
 		${ECHO_MSG} "Your SASL2 library it's compiled with MYSQL"; \
 		${ECHO_MSG} "If you use MYSQL in ${PORTNAME} consider CTRL+C and"; \
 		${ECHO_MSG} "select MYSQL OPTION in config menu."; \
 		${ECHO_MSG} "# make clean config"; \
 		${ECHO_MSG}; \
 		sleep 5; \
 	fi
 .endif
 
 	@${ECHO} '<HTML><BODY>See <A HREF="header_checks.5.html">header_checks.5.html</A></BODY></HTML>' \
 		> ${WRKSRC}/html/body_checks.5.html
 	@${REINPLACE_CMD} -E -e 's![[:<:]]perl[[:>:]]!${PERL}!' \
 		${WRKSRC}/src/bounce/Makefile.in
 	@${REINPLACE_CMD} -E -e 's!^(#define DEF_SGID_GROUP[^"]+)"postdrop"$$!\1"maildrop"!' \
 		${WRKSRC}/src/global/mail_params.h
 	@${FIND} -X ${WRKSRC}/README_FILES ${WRKSRC}/conf ${WRKSRC}/man \
 		-type f -a ! \( -name INSTALL -o -name aliases \) | ${XARGS} \
 		${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
 	@${REINPLACE_CMD} -E -e '${REINPLACE}' \
 		${WRKSRC}/README_FILES/VDA_README
 .endif
 
 do-configure:
 	(cd ${WRKSRC} && ${MAKE} -f Makefile.init makefiles ${MAKEFILEFLAGS} \
 	CCARGS="${POSTFIX_CCARGS}" AUXLIBS="${POSTFIX_AUXLIBS}" && \
 	${ECHO} "all: default" >> Makefile)
 
 pre-su-install:
 	@${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=${DAEMONDIR} \
+		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
 .for f in ${BINTEST}
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/${f} ${PREFIX}/bin
 .endfor
 .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
 	# Fix compressed man pages
-	@${REINPLACE_CMD} -i '' -E -e "s|(man[158]/.*.[158]):|\1.gz:|g" ${PREFIX}/libexec/postfix/postfix-files
+	@${REINPLACE_CMD} -i '' -E -e "s|(man[158]/.*.[158]):|\1.gz:|g" ${DAEMONDIR}/postfix-files
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>

Property changes on: head/mail/postfix28/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.147
\ No newline at end of property
+1.148
\ No newline at end of property
Index: head/mail/postfix28/files/pkg-install.in
===================================================================
--- head/mail/postfix28/files/pkg-install.in	(revision 235558)
+++ head/mail/postfix28/files/pkg-install.in	(revision 235559)
@@ -1,148 +1,158 @@
 #!/bin/sh
 #
-#	$FreeBSD: /tmp/pcvs/ports/mail/postfix28/files/pkg-install.in,v 1.2 2009-06-04 07:45:27 mm Exp $
+#	$FreeBSD: /tmp/pcvs/ports/mail/postfix28/files/pkg-install.in,v 1.3 2009-06-11 01:42:24 wxs Exp $
 #
 
 # If the POSTFIX_DEFAULT_MTA environment variable is set to YES, it
 # will make the port/package use defaults which make postfix replace
 # sendmail as much as possible.
 
 PREFIX=${PKG_PREFIX:=%%PREFIX%%}
 ETCDIR=${ETCDIR:=%%ETCDIR%%}
-DAEMONDIR=${DAEMONDIR:=${PREFIX}/libexec/postfix}
+DAEMONDIR=${DAEMONDIR:=%%DAEMONDIR%%}
 READMEDIR=${READMEDIR:=%%READMEDIR%%}
 BATCH=${BATCH:=no}
 POSTFIX_DEFAULT_MTA=${POSTFIX_DEFAULT_MTA:=no}
 
 if [ "${POSTFIX_DEFAULT_MTA}" = "no" ]; then
       DEFAULT_REPLACE_MAILERCONF=n
 else
       DEFAULT_REPLACE_MAILERCONF=y
 fi
 
 if [ -x /usr/sbin/nologin ]; then
       NOLOGIN=/usr/sbin/nologin
 else
       NOLOGIN=/sbin/nologin
 fi
 
 ask() {
       local question default answer
 
       question=$1
       default=$2
       if [ -z "${PACKAGE_BUILDING}" -a "${BATCH}" = "no" ]; then
 	      read -p "${question} [${default}]? " answer
       fi
       if [ -z "${answer}" ]; then
 	      answer=${default}
       fi
       echo ${answer}
 }
 
 yesno() {
       local question default answer
 
       question=$1
       default=$2
       while :; do
 	      answer=$(ask "${question}" "${default}")
 	      case "${answer}" in
 		      [Yy]*)	return 0;;
 		      [Nn]*)	return 1;;
 	      esac
 	      echo "Please answer yes or no."
       done
 }
 
 if [ "$2" = "PRE-INSTALL" ]; then
       USER=postfix
       UID=125
       GROUP=postfix
       GID=125
       GROUP2=maildrop
       GID2=126
 
       if /usr/sbin/pw groupshow "${GROUP}" 2>/dev/null; then
 	      echo "You already have a group \"${GROUP}\", so I will use it."
       else
 	      if /usr/sbin/pw groupadd ${GROUP} -g ${GID}; then
 		      echo "Added group \"${GROUP}\"."
 	      else
 		      echo "Adding group \"${GROUP}\" failed..."
 		      echo "Please create it, and try again."
 		      exit 1
 	      fi
       fi
 
       if /usr/sbin/pw groupshow "${GROUP2}" 2>/dev/null; then
 	      echo "You already have a group \"${GROUP2}\", so I will use it."
       else
 	      if /usr/sbin/pw groupadd ${GROUP2} -g ${GID2}; then
 		      echo "Added group \"${GROUP2}\"."
 	      else
 		      echo "Adding group \"${GROUP2}\" failed..."
 		      echo "Please create it, and try again."
 		      exit 1
 	      fi
       fi
 
       if /usr/sbin/pw user show "${USER}" 2>/dev/null; then
 	      echo "You already have a user \"${USER}\", so I will use it."
       else
 	      if /usr/sbin/pw useradd ${USER} -u ${UID} -g ${GROUP} -h - -d /var/spool/postfix -s ${NOLOGIN} -c "Postfix Mail System"; then
 		      echo "Added user \"${USER}\"."
 	      else
 		      echo "Adding user \"${USER}\" failed..."
 		      echo "Please create it, and try again."
 		      exit 1
 	      fi
       fi
 
       if /usr/sbin/pw show group mail | grep -q "${USER}" 2>/dev/null; then
 	      echo "You already have user \"${USER}\" in group \"mail\", so I will use it."
       else
 	      echo "You need user \"${USER}\" added to group \"mail\"."
 	      if yesno "Would you like me to add it" y; then
 		      /usr/sbin/pw groupmod mail -m ${USER} || exit
 		      echo "Done."
 	      else
 		      echo "Please create it, and try again."
 		      exit 1
 	      fi
       fi
 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
 
 replace() {
       local orig repl
 
 	orig=$1
 	repl=$2
 	if [ -e ${orig} ]; then
 		/bin/mv -f ${orig} ${orig}.OFF
 		/bin/chmod 0 ${orig}.OFF
 	fi
 	if [ -e ${repl} ]; then
 		/bin/ln -s ${repl} ${orig}
 	fi
 }
 
 if [ "$2" = "POST-INSTALL" -a -z "${PACKAGE_BUILDING}" ]; then
 	if yesno "Would you like to activate Postfix in /etc/mail/mailer.conf" ${DEFAULT_REPLACE_MAILERCONF}; then
 		/bin/mv -f /etc/mail/mailer.conf /etc/mail/mailer.conf.old
 		echo "#"						>	/etc/mail/mailer.conf
 		echo -n "# Execute the Postfix sendmail program"	>>	/etc/mail/mailer.conf
 		echo ", named ${PREFIX}/sbin/sendmail"		>>	/etc/mail/mailer.conf
 		echo "#"						>>	/etc/mail/mailer.conf
 		echo "sendmail	${PREFIX}/sbin/sendmail"	>>	/etc/mail/mailer.conf
 		echo "send-mail	${PREFIX}/sbin/sendmail"	>>	/etc/mail/mailer.conf
 		echo "mailq		${PREFIX}/sbin/sendmail"	>>	/etc/mail/mailer.conf
 		echo "newaliases	${PREFIX}/sbin/sendmail"	>>	/etc/mail/mailer.conf
 	fi
 fi

Property changes on: head/mail/postfix28/files/pkg-install.in
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.2
\ No newline at end of property
+1.3
\ No newline at end of property
Index: head/mail/postfix28/pkg-plist
===================================================================
--- head/mail/postfix28/pkg-plist	(revision 235558)
+++ head/mail/postfix28/pkg-plist	(revision 235559)
@@ -1,231 +1,232 @@
 @unexec if cmp -s %D/libexec/postfix/main.cf %D/%%ETCDIR%%/main.cf; then rm -f %D/%%ETCDIR%%/main.cf; fi
 @unexec if cmp -s %D/libexec/postfix/master.cf %D/%%ETCDIR%%/master.cf; then rm -f %D/%%ETCDIR%%/master.cf; fi
 %%ETCDIR%%/LICENSE
 %%ETCDIR%%/TLS_LICENSE
 %%ETCDIR%%/bounce.cf.default
 %%ETCDIR%%/main.cf.default
 %%ETCDIR%%/makedefs.out
 @dirrmtry %%ETCDIR%%
 libexec/postfix/anvil
 libexec/postfix/bounce
 libexec/postfix/cleanup
 libexec/postfix/discard
 libexec/postfix/error
 libexec/postfix/flush
 libexec/postfix/lmtp
 libexec/postfix/local
 libexec/postfix/main.cf
 libexec/postfix/master
 libexec/postfix/master.cf
 libexec/postfix/nqmgr
 libexec/postfix/oqmgr
 libexec/postfix/pickup
 libexec/postfix/pipe
 libexec/postfix/post-install
 libexec/postfix/postfix-files
 libexec/postfix/postfix-script
 libexec/postfix/postfix-wrapper
 libexec/postfix/postmulti-script
 libexec/postfix/proxymap
 libexec/postfix/qmgr
 libexec/postfix/qmqpd
 libexec/postfix/scache
 libexec/postfix/showq
 libexec/postfix/smtp
 libexec/postfix/smtpd
 libexec/postfix/spawn
 libexec/postfix/trivial-rewrite
 libexec/postfix/verify
 libexec/postfix/virtual
 libexec/postfix/tlsmgr
 @dirrm libexec/postfix
 bin/mailq
 bin/newaliases
 bin/qshape
 bin/rmail
 %%TEST%%bin/qmqp-sink
 %%TEST%%bin/qmqp-source
 %%TEST%%bin/smtp-sink
 %%TEST%%bin/smtp-source
 sbin/postalias
 sbin/postcat
 sbin/postconf
 sbin/postdrop
 sbin/postfix
 sbin/postkick
 sbin/postlock
 sbin/postlog
 sbin/postmap
 sbin/postmulti
 sbin/postqueue
 sbin/postsuper
 sbin/sendmail
 %%PORTDOCS%%%%DOCSDIR%%/AAAREADME
 %%PORTDOCS%%%%DOCSDIR%%/ADDRESS_CLASS_README
 %%PORTDOCS%%%%DOCSDIR%%/ADDRESS_CLASS_README.html
 %%PORTDOCS%%%%DOCSDIR%%/ADDRESS_REWRITING_README
 %%PORTDOCS%%%%DOCSDIR%%/ADDRESS_REWRITING_README.html
 %%PORTDOCS%%%%DOCSDIR%%/ADDRESS_VERIFICATION_README
 %%PORTDOCS%%%%DOCSDIR%%/ADDRESS_VERIFICATION_README.html
 %%PORTDOCS%%%%DOCSDIR%%/BACKSCATTER_README
 %%PORTDOCS%%%%DOCSDIR%%/BACKSCATTER_README.html
 %%PORTDOCS%%%%DOCSDIR%%/BASIC_CONFIGURATION_README
 %%PORTDOCS%%%%DOCSDIR%%/BASIC_CONFIGURATION_README.html
 %%PORTDOCS%%%%DOCSDIR%%/BUILTIN_FILTER_README
 %%PORTDOCS%%%%DOCSDIR%%/BUILTIN_FILTER_README.html
 %%PORTDOCS%%%%DOCSDIR%%/CDB_README
 %%PORTDOCS%%%%DOCSDIR%%/CDB_README.html
 %%PORTDOCS%%%%DOCSDIR%%/CONNECTION_CACHE_README
 %%PORTDOCS%%%%DOCSDIR%%/CONNECTION_CACHE_README.html
 %%PORTDOCS%%%%DOCSDIR%%/CONTENT_INSPECTION_README
 %%PORTDOCS%%%%DOCSDIR%%/CONTENT_INSPECTION_README.html
 %%PORTDOCS%%%%DOCSDIR%%/DATABASE_README
 %%PORTDOCS%%%%DOCSDIR%%/DATABASE_README.html
 %%PORTDOCS%%%%DOCSDIR%%/DB_README
 %%PORTDOCS%%%%DOCSDIR%%/DB_README.html
 %%PORTDOCS%%%%DOCSDIR%%/DEBUG_README
 %%PORTDOCS%%%%DOCSDIR%%/DEBUG_README.html
 %%PORTDOCS%%%%DOCSDIR%%/DSN_README
 %%PORTDOCS%%%%DOCSDIR%%/DSN_README.html
 %%PORTDOCS%%%%DOCSDIR%%/ETRN_README
 %%PORTDOCS%%%%DOCSDIR%%/ETRN_README.html
 %%PORTDOCS%%%%DOCSDIR%%/FILTER_README
 %%PORTDOCS%%%%DOCSDIR%%/FILTER_README.html
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL.html
 %%PORTDOCS%%%%DOCSDIR%%/IPV6_README
 %%PORTDOCS%%%%DOCSDIR%%/IPV6_README.html
 %%PORTDOCS%%%%DOCSDIR%%/TLS_README
 %%PORTDOCS%%%%DOCSDIR%%/TLS_README.html
 %%PORTDOCS%%%%DOCSDIR%%/LDAP_README
 %%PORTDOCS%%%%DOCSDIR%%/LDAP_README.html
 %%PORTDOCS%%%%DOCSDIR%%/LINUX_README
 %%PORTDOCS%%%%DOCSDIR%%/LINUX_README.html
 %%PORTDOCS%%%%DOCSDIR%%/LOCAL_RECIPIENT_README
 %%PORTDOCS%%%%DOCSDIR%%/LOCAL_RECIPIENT_README.html
 %%PORTDOCS%%%%DOCSDIR%%/MAILDROP_README
 %%PORTDOCS%%%%DOCSDIR%%/MAILDROP_README.html
 %%PORTDOCS%%%%DOCSDIR%%/MILTER_README
 %%PORTDOCS%%%%DOCSDIR%%/MILTER_README.html
 %%PORTDOCS%%%%DOCSDIR%%/MULTI_INSTANCE_README
 %%PORTDOCS%%%%DOCSDIR%%/MULTI_INSTANCE_README.html
 %%PORTDOCS%%%%DOCSDIR%%/MYSQL_README
 %%PORTDOCS%%%%DOCSDIR%%/MYSQL_README.html
 %%PORTDOCS%%%%DOCSDIR%%/NFS_README
 %%PORTDOCS%%%%DOCSDIR%%/NFS_README.html
 %%PORTDOCS%%%%DOCSDIR%%/OVERVIEW
 %%PORTDOCS%%%%DOCSDIR%%/OVERVIEW.html
 %%PORTDOCS%%%%DOCSDIR%%/PACKAGE_README
 %%PORTDOCS%%%%DOCSDIR%%/PACKAGE_README.html
 %%PORTDOCS%%%%DOCSDIR%%/PCRE_README
 %%PORTDOCS%%%%DOCSDIR%%/PCRE_README.html
 %%PORTDOCS%%%%DOCSDIR%%/PGSQL_README
 %%PORTDOCS%%%%DOCSDIR%%/PGSQL_README.html
 %%PORTDOCS%%%%DOCSDIR%%/QSHAPE_README
 %%PORTDOCS%%%%DOCSDIR%%/QSHAPE_README.html
 %%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES
 %%PORTDOCS%%%%DOCSDIR%%/RESTRICTION_CLASS_README
 %%PORTDOCS%%%%DOCSDIR%%/RESTRICTION_CLASS_README.html
 %%PORTDOCS%%%%DOCSDIR%%/SASL_README
 %%PORTDOCS%%%%DOCSDIR%%/SASL_README.html
 %%PORTDOCS%%%%DOCSDIR%%/SCHEDULER_README
 %%PORTDOCS%%%%DOCSDIR%%/SCHEDULER_README.html
 %%PORTDOCS%%%%DOCSDIR%%/SMTPD_ACCESS_README
 %%PORTDOCS%%%%DOCSDIR%%/SMTPD_ACCESS_README.html
 %%PORTDOCS%%%%DOCSDIR%%/SMTPD_POLICY_README
 %%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
 %%PORTDOCS%%%%DOCSDIR%%/STRESS_README
 %%PORTDOCS%%%%DOCSDIR%%/STRESS_README.html
 %%PORTDOCS%%%%DOCSDIR%%/TLS_LEGACY_README
 %%PORTDOCS%%%%DOCSDIR%%/TLS_LEGACY_README.html
 %%PORTDOCS%%%%DOCSDIR%%/TUNING_README
 %%PORTDOCS%%%%DOCSDIR%%/TUNING_README.html
 %%PORTDOCS%%%%DOCSDIR%%/ULTRIX_README
 %%PORTDOCS%%%%DOCSDIR%%/UUCP_README
 %%PORTDOCS%%%%DOCSDIR%%/UUCP_README.html
 %%VDA%%%%PORTDOCS%%%%DOCSDIR%%/VDA_README
 %%PORTDOCS%%%%DOCSDIR%%/VERP_README
 %%PORTDOCS%%%%DOCSDIR%%/VERP_README.html
 %%PORTDOCS%%%%DOCSDIR%%/VIRTUAL_README
 %%PORTDOCS%%%%DOCSDIR%%/VIRTUAL_README.html
 %%PORTDOCS%%%%DOCSDIR%%/XCLIENT_README
 %%PORTDOCS%%%%DOCSDIR%%/XCLIENT_README.html
 %%PORTDOCS%%%%DOCSDIR%%/XFORWARD_README
 %%PORTDOCS%%%%DOCSDIR%%/XFORWARD_README.html
 %%PORTDOCS%%%%DOCSDIR%%/access.5.html
 %%PORTDOCS%%%%DOCSDIR%%/aliases.5.html
 %%PORTDOCS%%%%DOCSDIR%%/anvil.8.html
 %%PORTDOCS%%%%DOCSDIR%%/body_checks.5.html
 %%PORTDOCS%%%%DOCSDIR%%/bounce.5.html
 %%PORTDOCS%%%%DOCSDIR%%/bounce.8.html
 %%PORTDOCS%%%%DOCSDIR%%/canonical.5.html
 %%PORTDOCS%%%%DOCSDIR%%/cidr_table.5.html
 %%PORTDOCS%%%%DOCSDIR%%/cleanup.8.html
 %%PORTDOCS%%%%DOCSDIR%%/defer.8.html
 %%PORTDOCS%%%%DOCSDIR%%/discard.8.html
 %%PORTDOCS%%%%DOCSDIR%%/error.8.html
 %%PORTDOCS%%%%DOCSDIR%%/flush.8.html
 %%PORTDOCS%%%%DOCSDIR%%/header_checks.5.html
 %%PORTDOCS%%%%DOCSDIR%%/index.html
 %%PORTDOCS%%%%DOCSDIR%%/ldap_table.5.html
 %%PORTDOCS%%%%DOCSDIR%%/lmtp.8.html
 %%PORTDOCS%%%%DOCSDIR%%/local.8.html
 %%PORTDOCS%%%%DOCSDIR%%/mailq.1.html
 %%PORTDOCS%%%%DOCSDIR%%/master.5.html
 %%PORTDOCS%%%%DOCSDIR%%/master.8.html
 %%PORTDOCS%%%%DOCSDIR%%/mysql_table.5.html
 %%PORTDOCS%%%%DOCSDIR%%/nisplus_table.5.html
 %%PORTDOCS%%%%DOCSDIR%%/newaliases.1.html
 %%PORTDOCS%%%%DOCSDIR%%/oqmgr.8.html
 %%PORTDOCS%%%%DOCSDIR%%/pcre_table.5.html
 %%PORTDOCS%%%%DOCSDIR%%/pgsql_table.5.html
 %%PORTDOCS%%%%DOCSDIR%%/pickup.8.html
 %%PORTDOCS%%%%DOCSDIR%%/pipe.8.html
 %%PORTDOCS%%%%DOCSDIR%%/postalias.1.html
 %%PORTDOCS%%%%DOCSDIR%%/postcat.1.html
 %%PORTDOCS%%%%DOCSDIR%%/postconf.1.html
 %%PORTDOCS%%%%DOCSDIR%%/postconf.5.html
 %%PORTDOCS%%%%DOCSDIR%%/postdrop.1.html
 %%PORTDOCS%%%%DOCSDIR%%/postfix-logo.jpg
 %%PORTDOCS%%%%DOCSDIR%%/postfix-manuals.html
 %%PORTDOCS%%%%DOCSDIR%%/postfix-power.png
 %%PORTDOCS%%%%DOCSDIR%%/postfix-wrapper.5.html
 %%PORTDOCS%%%%DOCSDIR%%/postfix.1.html
 %%PORTDOCS%%%%DOCSDIR%%/postkick.1.html
 %%PORTDOCS%%%%DOCSDIR%%/postlock.1.html
 %%PORTDOCS%%%%DOCSDIR%%/postlog.1.html
 %%PORTDOCS%%%%DOCSDIR%%/postmap.1.html
 %%PORTDOCS%%%%DOCSDIR%%/postmulti.1.html
 %%PORTDOCS%%%%DOCSDIR%%/postqueue.1.html
 %%PORTDOCS%%%%DOCSDIR%%/postsuper.1.html
 %%PORTDOCS%%%%DOCSDIR%%/proxymap.8.html
 %%PORTDOCS%%%%DOCSDIR%%/qmgr.8.html
 %%PORTDOCS%%%%DOCSDIR%%/qmqp-sink.1.html
 %%PORTDOCS%%%%DOCSDIR%%/qmqp-source.1.html
 %%PORTDOCS%%%%DOCSDIR%%/qmqpd.8.html
 %%PORTDOCS%%%%DOCSDIR%%/qshape.1.html
 %%PORTDOCS%%%%DOCSDIR%%/regexp_table.5.html
 %%PORTDOCS%%%%DOCSDIR%%/relocated.5.html
 %%PORTDOCS%%%%DOCSDIR%%/sendmail.1.html
 %%PORTDOCS%%%%DOCSDIR%%/scache.8.html
 %%PORTDOCS%%%%DOCSDIR%%/showq.8.html
 %%PORTDOCS%%%%DOCSDIR%%/smtp-sink.1.html
 %%PORTDOCS%%%%DOCSDIR%%/smtp-source.1.html
 %%PORTDOCS%%%%DOCSDIR%%/smtp.8.html
 %%PORTDOCS%%%%DOCSDIR%%/smtpd.8.html
 %%PORTDOCS%%%%DOCSDIR%%/spawn.8.html
 %%PORTDOCS%%%%DOCSDIR%%/tcp_table.5.html
 %%PORTDOCS%%%%DOCSDIR%%/trace.8.html
 %%PORTDOCS%%%%DOCSDIR%%/transport.5.html
 %%PORTDOCS%%%%DOCSDIR%%/trivial-rewrite.8.html
 %%PORTDOCS%%%%DOCSDIR%%/verify.8.html
 %%PORTDOCS%%%%DOCSDIR%%/virtual.5.html
 %%PORTDOCS%%%%DOCSDIR%%/virtual.8.html
 %%PORTDOCS%%%%DOCSDIR%%/tlsmgr.8.html
 %%PORTDOCS%%%%DOCSDIR%%/generic.5.html
 %%PORTDOCS%%@dirrm %%DOCSDIR%%

Property changes on: head/mail/postfix28/pkg-plist
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.29
\ No newline at end of property
+1.30
\ No newline at end of property