From owner-freebsd-ports Sat Apr 3 13:22: 2 1999 Delivered-To: freebsd-ports@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by hub.freebsd.org (Postfix) with ESMTP id 2A87214DCF for ; Sat, 3 Apr 1999 13:21:56 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.9.2/8.9.2) id NAA02852; Sat, 3 Apr 1999 13:20:01 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from norn.ca.eu.org (cr965240-b.abtsfd1.bc.wave.home.com [24.113.19.137]) by hub.freebsd.org (Postfix) with ESMTP id 377AA14BD6; Sat, 3 Apr 1999 13:20:05 -0800 (PST) (envelope-from norn@norn.ca.eu.org) Received: by norn.ca.eu.org (Postfix, from userid 1000) id 6D6811694; Sat, 3 Apr 1999 13:18:06 -0800 (PST) Message-Id: <19990403211806.6D6811694@norn.ca.eu.org> Date: Sat, 3 Apr 1999 13:18:06 -0800 (PST) From: cpiazza@home.net Reply-To: cpiazza@home.net To: FreeBSD-gnats-submit@freebsd.org, torstenb@FreeBSD.org X-Send-Pr-Version: 3.2 Subject: ports/10934: Fixes for postfix port Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 10934 >Category: ports >Synopsis: Fixes for postfix port >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sat Apr 3 13:20:01 PST 1999 >Closed-Date: >Last-Modified: >Originator: Chris Piazza >Release: FreeBSD 4.0-CURRENT i386 >Organization: n/a >Environment: FreeBSD norn.ca.eu.org 4.0-CURRENT FreeBSD 4.0-CURRENT #0: Tue Mar 30 13:53:01 PST 1999 norn@norn.ca.eu.org:/usr/src/sys/compile/NORN.ata i386 >Description: Changed a few things: * Now respects CFLAGS * Strips binaries on install * install... -> ${INSTALL_*} * echo -> ${ECHO_MSG} * missing @dirrm's in pkg/PLIST * ${PREFIX}/etc/postfix/main.cf had a problem, namely !!PREFIX!! was left in it. >How-To-Repeat: >Fix: Index: postfix//Makefile =================================================================== RCS file: /cvs/FreeBSD/ports/mail/postfix/Makefile,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 Makefile --- Makefile 1999/03/29 20:15:08 1.1.1.1 +++ Makefile 1999/04/03 20:55:57 @@ -19,7 +19,7 @@ MAINTAINER= torstenb@FreeBSD.ORG -ALL_TARGET= default +ALL_TARGET= default "OPT=${CFLAGS}" SCRIPTS_ENV+= MAN1="${MAN1}" MAN5="${MAN5}" MAN8="${MAN8}" @@ -29,15 +29,15 @@ MAN5= access.5 aliases.5 canonical.5 relocated.5 transport.5 virtual.5 MAN8= bounce.8 cleanup.8 defer.8 local.8 master.8 pickup.8 pipe.8 qmgr.8 \ showq.8 smtp.8 smtpd.8 trivial-rewrite.8 - +SHAREMODE= 0644 do-install: - @mkdir -p -m 755 ${PREFIX}/etc/postfix + @${MKDIR} -m 755 ${PREFIX}/etc/postfix @chown root:wheel ${PREFIX}/etc/postfix - @install -C -o root -g wheel -m 0644 ${WRKSRC}/conf/LICENSE \ + @${INSTALL_DATA} ${WRKSRC}/conf/LICENSE \ ${PREFIX}/etc/postfix/LICENSE @for f in access main.cf master.cf ; do \ - install -C -o root -g wheel -m 0644 ${WRKSRC}/conf/$$f \ - ${PREFIX}/etc/postfix/sample-$$f ; \ + ${INSTALL_DATA} ${WRKSRC}/conf/$$f \ + ${PREFIX}/etc/postfix/sample-$$f ; \ done @exit @for f in sample-aliases.cf sample-canonical.cf sample-debug.cf \ @@ -45,38 +45,38 @@ sample-rate.cf sample-relocated.cf sample-resource.cf \ sample-rewrite.cf sample-smtp.cf sample-smtpd.cf \ sample-transport.cf sample-virtual.cf ; do \ - install -C -o root -g wheel -m 0644 ${WRKSRC}/conf/$$f \ - ${PREFIX}/etc/postfix/$$f ;\ + ${INSTALL_DATA} ${WRKSRC}/conf/$$f \ + ${PREFIX}/etc/postfix/$$f ; \ done - @install -C -o root -g wheel -m 755 ${WRKSRC}/conf/postfix-script-sgid \ - ${PREFIX}/etc/postfix/postfix-script - @mkdir -p -m 0755 ${PREFIX}/libexec/postfix + @${INSTALL_SCRIPT} ${WRKSRC}/conf/postfix-script-sgid \ + ${PREFIX}/etc/postfix/postfix-script; + @${MKDIR} -m 0755 ${PREFIX}/libexec/postfix @for f in bounce cleanup fsstone local master pickup pipe \ qmgr showq smtp smtp-sink smtp-source smtpd \ trivial-rewrite ; do \ - install -C -o root -g wheel -m 0755 ${WRKSRC}/bin/$$f \ + ${INSTALL_PROGRAM} ${WRKSRC}/bin/$$f \ ${PREFIX}/libexec/postfix/$$f ;\ done @for f in sendmail postalias postcat postconf postfix \ postkick postlock postlog postmap postsuper ; do \ - install -C -o root -g wheel -m 0755 ${WRKSRC}/bin/$$f \ + ${INSTALL_PROGRAM} ${WRKSRC}/bin/$$f \ ${PREFIX}/sbin/$$f ;\ done - @install -C -o root -g wheel -m 0555 ${WRKSRC}/bin/postdrop \ + @${INSTALL_PROGRAM} ${WRKSRC}/bin/postdrop \ ${PREFIX}/sbin/postdrop @for f in ${MAN1} ; do \ - install -C -o root -g wheel -m 0755 ${WRKSRC}/man/man1/$$f \ + ${INSTALL_MAN} ${WRKSRC}/man/man1/$$f \ ${PREFIX}/man/man1/$$f ;\ done @for f in ${MAN5} ; do \ - install -C -o root -g wheel -m 0755 ${WRKSRC}/man/man5/$$f \ + ${INSTALL_MAN} ${WRKSRC}/man/man5/$$f \ ${PREFIX}/man/man5/$$f ;\ done @for f in ${MAN8} ; do \ - install -C -o root -g wheel -m 0755 ${WRKSRC}/man/man8/$$f \ + ${INSTALL_MAN} ${WRKSRC}/man/man8/$$f \ ${PREFIX}/man/man8/$$f ;\ done - @mkdir -p -m 0755 /var/spool/postfix + @${MKDIR} -m 0755 /var/spool/postfix @if [ ! -e ${PREFIX}/etc/postfix/main.cf ]; then \ ${CP} -p ${PREFIX}/etc/postfix/sample-main.cf \ ${PREFIX}/etc/postfix/main.cf; \ @@ -85,38 +85,38 @@ ${CP} -p ${PREFIX}/etc/postfix/sample-master.cf \ ${PREFIX}/etc/postfix/master.cf; \ fi - @echo "--------------------------------------------------" - @echo "- To replace your existing sendmail with postfix -" - @echo "- type \"make replace\" " - @echo "--------------------------------------------------" + @${ECHO_MSG} "--------------------------------------------------" + @${ECHO_MSG} "- To replace your existing sendmail with postfix -" + @${ECHO_MSG} "- type \"make replace\" " + @${ECHO_MSG} "--------------------------------------------------" post-install: @PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL replace: - @echo "===> Replacing sendmail" + @${ECHO_MSG} "===> Replacing sendmail" @if [ -e /usr/sbin/sendmail ]; then \ ${MV} -f /usr/sbin/sendmail /usr/sbin/sendmail.OFF; \ chmod 0 /usr/sbin/sendmail.OFF; \ fi @if [ -e ${PREFIX}/sbin/sendmail ]; then \ - ln -s ${PREFIX}/sbin/sendmail /usr/sbin/sendmail; \ + ${LN} -s ${PREFIX}/sbin/sendmail /usr/sbin/sendmail; \ fi - @echo "===> Replacing mailq" + @${ECHO_MSG} "===> Replacing mailq" @if [ -e /usr/bin/mailq ]; then \ ${MV} -f /usr/bin/mailq /usr/bin/mailq.OFF; \ chmod 0 /usr/bin/mailq.OFF; \ fi @if [ -e ${PREFIX}/sbin/sendmail ]; then \ - ln -s ${PREFIX}/sbin/sendmail /usr/bin/mailq; \ + ${LN} -s ${PREFIX}/sbin/sendmail /usr/bin/mailq; \ fi - @echo "===> Replacing newaliases" + @${ECHO_MSG} "===> Replacing newaliases" @if [ -e /usr/bin/newaliases ]; then \ ${MV} -f /usr/bin/newaliases /usr/bin/newaliases.OFF; \ chmod 0 /usr/bin/newaliases.OFF; \ fi @if [ -e ${PREFIX}/sbin/sendmail ]; then \ - ln -s ${PREFIX}/sbin/sendmail /usr/bin/newaliases; \ + ${LN} -s ${PREFIX}/sbin/sendmail /usr/bin/newaliases; \ fi .include Index: postfix//pkg/PLIST =================================================================== RCS file: /cvs/FreeBSD/ports/mail/postfix/pkg/PLIST,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 PLIST --- PLIST 1999/03/29 20:15:08 1.1.1.1 +++ PLIST 1999/04/03 21:02:11 @@ -47,3 +47,5 @@ sbin/postdrop @exec mkdir -p -m 0755 /var/spool/postfix @exec chown root:wheel /var/spool/postfix +@dirrm etc/postfix +@dirrm libexec/postfix Index: postfix//scripts/configure =================================================================== RCS file: /cvs/FreeBSD/ports/mail/postfix/scripts/configure,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 configure --- configure 1999/03/29 20:15:08 1.1.1.1 +++ configure 1999/04/03 20:57:04 @@ -6,7 +6,7 @@ sed <${WRKSRC}/global/mail_params.h.bak >${WRKSRC}/global/mail_params.h s+!!PREFIX!!+$PREFIX+g mv ${WRKSRC}/conf/main.cf ${WRKSRC}/conf/main.cf.bak -sed <${WRKSRC}/conf/main.cf.bak >${WRKSRC}/conf/main.cf +sed s+!!PREFIX!!+$PREFIX+g <${WRKSRC}/conf/main.cf.bak >${WRKSRC}/conf/main.cf cd ${WRKSRC}/man -Chris >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message