Date: Wed, 24 Jan 2001 03:53:27 -0500 (EST) From: yds@dppl.com To: FreeBSD-gnats-submit@freebsd.org Cc: dwcjr@inethouston.net, kuriyama@imgsrc.co.jp Subject: ports/24595: FIX: mail/postfix-current: make NOPORTDOCS work as intended Message-ID: <20010124085327.E08F67441B@sapas.dppl.com>
next in thread | raw e-mail | index | archive | help
>Number: 24595 >Category: ports >Synopsis: FIX: mail/postfix-current: make NOPORTDOCS work as intended >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: Wed Jan 24 01:00:01 PST 2001 >Closed-Date: >Last-Modified: >Originator: Yarema >Release: FreeBSD 4.2-STABLE i386 >Organization: Digital Page Publishers, Ltd. >Environment: FreeBSD 4.2-STABLE i386 >Description: Jun Kuriyama wrote: > > At Tue, 23 Jan 2001 19:47:50 -0600, > David W. Chapman Jr. <dwcjr@inethouston.net> wrote: > > > seems basically OK, but HTML documents are still exist atfer > > > pkg_delete without NOPORTDOCS. Can you take care of this? If it is > > I'll pass that along to Yarema since that's what the original pr was > > supposed to fix :) > > OK. I'll commit today as checkpoint to make diffs easily. At this > point, ".if !defined(NOPORTDOCS)" sequence is commented out. I hope > someone fixes this... Well here's the fix. The patch should be self explanatory. Actually http://www.freebsd.org/cgi/query-pr.cgi?pr=24429 only fixed where the docs were being installed. I hadn't realized they were not being uninstalled. >How-To-Repeat: cd /usr/ports/mail/postfix-current make -DNOPORTDOCS install make deinstall make reinstall make deinstall ... and watch what happens with ${PREFIX}/share/doc/postfix >Fix: diff -ruN postfix-current.orig/Makefile postfix-current/Makefile --- postfix-current.orig/Makefile Tue Jan 23 21:01:24 2001 +++ postfix-current/Makefile Wed Jan 24 03:30:25 2001 @@ -1,4 +1,4 @@ -# New ports collection makefile for: postfix +# New ports collection makefile for: postfix-current # Date created: 18 Mar 1999 # Whom: torstenb # @@ -45,7 +45,12 @@ BIN2= postalias postcat postconf postdrop postfix \ postkick postlock postlog postmap postsuper sendmail -DOCDIR= ${PREFIX}/share/doc/postfix +.if defined(NOPORTDOCS) +PLIST_SUB+= SUB_DOCS="@comment " +.else +PLIST_SUB+= SUB_DOCS="" +DOCDIR= ${PREFIX}/share/doc/postfix +.endif .if !defined(DEBUG) MAKEFILEFLAGS+= DEBUG= @@ -132,11 +137,11 @@ ${PREFIX}/man/man8 .endfor -#.if !defined(NOPORTDOCS) -# @${INSTALL} -d -o ${DOCOWN} -g ${DOCGRP} -m 555 ${DOCDIR} -# @cd ${WRKSRC}/html && ${INSTALL_DATA} *.html *.gif ${DOCDIR} && \ -# ${ECHO_MSG} "Installed HTML documentation in ${DOCDIR}" -#.endif +.if !defined(NOPORTDOCS) + @${INSTALL} -d -o ${DOCOWN} -g ${DOCGRP} -m 555 ${DOCDIR} + @cd ${WRKSRC}/html && ${INSTALL_DATA} *.html *.gif ${DOCDIR} && \ + ${ECHO_MSG} "Installed HTML documentation in ${DOCDIR}" +.endif @${ECHO_MSG} '--------------------------------------------------' @${ECHO_MSG} '- To replace your existing sendmail with postfix -' diff -ruN postfix-current.orig/pkg-plist postfix-current/pkg-plist --- postfix-current.orig/pkg-plist Tue Jan 23 21:01:24 2001 +++ postfix-current/pkg-plist Wed Jan 24 03:17:22 2001 @@ -62,5 +62,65 @@ sbin/sendmail %%SUB_TEST%%sbin/smtp-sink %%SUB_TEST%%sbin/smtp-source -@dirrm etc/postfix +%%SUB_DOCS%%share/doc/postfix/access.5.html +%%SUB_DOCS%%share/doc/postfix/aliases.5.html +%%SUB_DOCS%%share/doc/postfix/architecture.html +%%SUB_DOCS%%share/doc/postfix/backstage.html +%%SUB_DOCS%%share/doc/postfix/basic.html +%%SUB_DOCS%%share/doc/postfix/big-picture.gif +%%SUB_DOCS%%share/doc/postfix/big-picture.html +%%SUB_DOCS%%share/doc/postfix/bounce.8.html +%%SUB_DOCS%%share/doc/postfix/canonical.5.html +%%SUB_DOCS%%share/doc/postfix/cleanup.8.html +%%SUB_DOCS%%share/doc/postfix/commands.html +%%SUB_DOCS%%share/doc/postfix/defer.8.html +%%SUB_DOCS%%share/doc/postfix/delivering.html +%%SUB_DOCS%%share/doc/postfix/error.8.html +%%SUB_DOCS%%share/doc/postfix/faq.html +%%SUB_DOCS%%share/doc/postfix/flush.8.html +%%SUB_DOCS%%share/doc/postfix/goals.html +%%SUB_DOCS%%share/doc/postfix/inbound.gif +%%SUB_DOCS%%share/doc/postfix/index.html +%%SUB_DOCS%%share/doc/postfix/lmtp.8.html +%%SUB_DOCS%%share/doc/postfix/local.8.html +%%SUB_DOCS%%share/doc/postfix/mailq.1.html +%%SUB_DOCS%%share/doc/postfix/master.8.html +%%SUB_DOCS%%share/doc/postfix/motivation.html +%%SUB_DOCS%%share/doc/postfix/newaliases.1.html +%%SUB_DOCS%%share/doc/postfix/nqmgr.8.html +%%SUB_DOCS%%share/doc/postfix/outbound.gif +%%SUB_DOCS%%share/doc/postfix/pcre_table.5.html +%%SUB_DOCS%%share/doc/postfix/pickup.8.html +%%SUB_DOCS%%share/doc/postfix/pipe.8.html +%%SUB_DOCS%%share/doc/postfix/postalias.1.html +%%SUB_DOCS%%share/doc/postfix/postcat.1.html +%%SUB_DOCS%%share/doc/postfix/postconf.1.html +%%SUB_DOCS%%share/doc/postfix/postdrop.1.html +%%SUB_DOCS%%share/doc/postfix/postfix.1.html +%%SUB_DOCS%%share/doc/postfix/postkick.1.html +%%SUB_DOCS%%share/doc/postfix/postlock.1.html +%%SUB_DOCS%%share/doc/postfix/postlog.1.html +%%SUB_DOCS%%share/doc/postfix/postmap.1.html +%%SUB_DOCS%%share/doc/postfix/postsuper.1.html +%%SUB_DOCS%%share/doc/postfix/qmgr.8.html +%%SUB_DOCS%%share/doc/postfix/queuing.html +%%SUB_DOCS%%share/doc/postfix/rate.html +%%SUB_DOCS%%share/doc/postfix/receiving.html +%%SUB_DOCS%%share/doc/postfix/regexp_table.5.html +%%SUB_DOCS%%share/doc/postfix/relocated.5.html +%%SUB_DOCS%%share/doc/postfix/resource.html +%%SUB_DOCS%%share/doc/postfix/rewrite.html +%%SUB_DOCS%%share/doc/postfix/security.html +%%SUB_DOCS%%share/doc/postfix/sendmail.1.html +%%SUB_DOCS%%share/doc/postfix/showq.8.html +%%SUB_DOCS%%share/doc/postfix/small-picture.gif +%%SUB_DOCS%%share/doc/postfix/smtp.8.html +%%SUB_DOCS%%share/doc/postfix/smtpd.8.html +%%SUB_DOCS%%share/doc/postfix/spawn.8.html +%%SUB_DOCS%%share/doc/postfix/transport.5.html +%%SUB_DOCS%%share/doc/postfix/trivial-rewrite.8.html +%%SUB_DOCS%%share/doc/postfix/uce.html +%%SUB_DOCS%%share/doc/postfix/virtual.5.html +%%SUB_DOCS%%@dirrm share/doc/postfix @dirrm libexec/postfix +@dirrm etc/postfix diff -ruN postfix-current.orig/scripts/configure.postfix postfix-current/scripts/configure.postfix --- postfix-current.orig/scripts/configure.postfix Tue Jan 23 21:01:25 2001 +++ postfix-current/scripts/configure.postfix Wed Jan 24 03:17:22 2001 @@ -112,4 +112,8 @@ shift done -echo "PLIST_SUB= SUB_PCRE=\"${SUB_PCRE}\" SUB_SASL=\"${SUB_SASL}\" SUB_TLS=\"${SUB_TLS}\" SUB_LDAP=\"${SUB_LDAP}\" SUB_TEST=\"${SUB_TEST}\"" +echo "PLIST_SUB+= SUB_PCRE=\"${SUB_PCRE}\"" +echo "PLIST_SUB+= SUB_SASL=\"${SUB_SASL}\"" +echo "PLIST_SUB+= SUB_TLS=\"${SUB_TLS}\"" +echo "PLIST_SUB+= SUB_LDAP=\"${SUB_LDAP}\"" +echo "PLIST_SUB+= SUB_TEST=\"${SUB_TEST}\"" >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20010124085327.E08F67441B>