diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2009-06-04 07:45:27 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2009-06-04 07:45:27 +0000 |
| commit | 8e145e22eaf262832db0c3a64f2732971e49db72 (patch) | |
| tree | df6a4c629ed0914cb929bf226315fafdf9ae4839 /mail/postfix26/Makefile | |
| parent | Mark BROKEN on 8.x: does not build. (diff) | |
- Fix install with defined NOPORTEXAMPLES [1]
- Do not install clones of man pages [1]
- Add POSTFIX_DEFAULT_MTA to SCRIPTS_ENV [2]
- Bump PORTREVISION
PR: ports/135241 [1], ports/123812 [2]
Submitted by: Sahil Tandon <sahil@tandon.net> (maintainer) [1]
Reported by: Marco Walraven <m.walraven@terantula.com> [2]
Notes
Notes:
svn path=/head/; revision=235147
Diffstat (limited to 'mail/postfix26/Makefile')
| -rw-r--r-- | mail/postfix26/Makefile | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/mail/postfix26/Makefile b/mail/postfix26/Makefile index aa1888d89eb6..f39c41cf8c23 100644 --- a/mail/postfix26/Makefile +++ b/mail/postfix26/Makefile @@ -7,6 +7,7 @@ PORTNAME= postfix PORTVERSION= 2.6.1 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \ @@ -28,6 +29,7 @@ CONFLICTS= courier-0.* postfix-1.* postfix-2.[0-57-9].* postfix-current-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) @@ -76,9 +78,6 @@ MLINKS= sendmail.1 mailq.1 \ bounce.8 trace.8 \ smtp.8 lmtp.8 -PORTEXAMPLES= access aliases canonical generic header_checks \ - main.cf master.cf relocated transport virtual - .if !defined(DEBUG) MAKEFILEFLAGS+= DEBUG= .endif @@ -88,7 +87,6 @@ MAKEFILEFLAGS+= CC="${CC}" OPT="${CFLAGS}" .include <bsd.port.pre.mk> POSTFIX_CCARGS+= -DDEF_CONFIG_DIR=\\\"${ETCDIR}\\\" \ - -DDEF_SAMPLE_DIR=\\\"${EXAMPLESDIR}\\\" \ -DDEF_DAEMON_DIR=\\\"${PREFIX}/libexec/postfix\\\" \ -DDEF_COMMAND_DIR=\\\"${PREFIX}/sbin\\\" \ -DDEF_SENDMAIL_PATH=\\\"${PREFIX}/sbin/sendmail\\\" \ @@ -232,12 +230,13 @@ REINPLACE= s!^PATH=.*!PATH=/bin:/sbin:/usr/bin:/usr/sbin:${PREFIX}/bin:${PREFIX} s!^(mailq_path =)!\1 ${PREFIX}/bin/mailq!g;\ s!^(setgid_group =)!\1 maildrop!g;\ s!^(manpage_directory =)!\1 ${PREFIX}/man!g;\ - s!^(sample_directory =)!\1 ${EXAMPLESDIR}!g;\ s!^((html|readme)_directory =)!\1 ${READMEDIR}!g;\ \!^\#alias_database = dbm:/etc/mail/aliases$$!d;\ s!/etc/aliases!/etc/mail/aliases!g;\ s!(:|= )/etc/postfix!\1$$config_directory!g;\ - s!/etc/postfix!${ETCDIR}!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) @@ -308,13 +307,6 @@ do-install: @cd ${WRKSRC}/html && ${INSTALL_DATA} *.html *.jpg *.png ${DOCSDIR} && \ ${ECHO_MSG} "Installed HTML documentation in ${DOCSDIR}" .endif -.if !defined(NOPORTEXAMPLES) - ${INSTALL} -o ${SHAREOWN} -g ${SHAREGRP} -m 555 -d ${EXAMPLESDIR} -.for f in ${PORTEXAMPLES} - ${INSTALL_DATA} ${WRKSRC}/conf/${f} ${EXAMPLESDIR} -.endfor - @${ECHO_MSG} "Installed configuration examples in ${EXAMPLESDIR}" -.endif post-install: @${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL |