From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Feb 2 17:40:00 2014 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D84AA904 for ; Sun, 2 Feb 2014 17:40:00 +0000 (UTC) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id B39E71EAF for ; Sun, 2 Feb 2014 17:40:00 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id s12He0vd064483 for ; Sun, 2 Feb 2014 17:40:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.7/8.14.7/Submit) id s12He0X8064482; Sun, 2 Feb 2014 17:40:00 GMT (envelope-from gnats) Resent-Date: Sun, 2 Feb 2014 17:40:00 GMT Resent-Message-Id: <201402021740.s12He0X8064482@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Mikhail Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4D6CE806 for ; Sun, 2 Feb 2014 17:34:40 +0000 (UTC) Received: from oldred.freebsd.org (oldred.freebsd.org [IPv6:2001:1900:2254:206a::50:4]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 2BD6C1E97 for ; Sun, 2 Feb 2014 17:34:40 +0000 (UTC) Received: from oldred.freebsd.org ([127.0.1.6]) by oldred.freebsd.org (8.14.5/8.14.7) with ESMTP id s12HYdre079374 for ; Sun, 2 Feb 2014 17:34:39 GMT (envelope-from nobody@oldred.freebsd.org) Received: (from nobody@localhost) by oldred.freebsd.org (8.14.5/8.14.5/Submit) id s12HYdvB079368; Sun, 2 Feb 2014 17:34:39 GMT (envelope-from nobody) Message-Id: <201402021734.s12HYdvB079368@oldred.freebsd.org> Date: Sun, 2 Feb 2014 17:34:39 GMT From: Mikhail To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Subject: ports/186380: [patch] update mail/nmh X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 02 Feb 2014 17:40:01 -0000 >Number: 186380 >Category: ports >Synopsis: [patch] update mail/nmh >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sun Feb 02 17:40:00 UTC 2014 >Closed-Date: >Last-Modified: >Originator: Mikhail >Release: FreeBSD 10.0-RELEASE >Organization: >Environment: FreeBSD edge 10.0-RELEASE FreeBSD 10.0-RELEASE #0 r260789: Thu Jan 16 22:34:59 UTC 2014 root@snap.freebsd.org:/usr/obj/usr/src/sys/GENERIC amd64 >Description: Attached patch brings the following: - Convert to USES - Stage support - Convert more options to OptionsNG - Add TLS option - Update to use pkg-message instead of pkg-install for final message - Add WITH_DEBUG support - Add LICENSE directive >How-To-Repeat: >Fix: Patch attached with submission follows: diff -ruN nmh.orig/Makefile nmh/Makefile --- nmh.orig/Makefile 2014-01-31 23:25:38.000000000 +0400 +++ nmh/Makefile 2014-02-02 21:27:27.000000000 +0400 @@ -10,30 +10,23 @@ MAINTAINER= cy@FreeBSD.org COMMENT= A cleaned up MH mailer suite -USE_GMAKE= yes +LICENSE= BSD3CLAUSE + +USES= gmake GNU_CONFIGURE= yes CONFIGURE_ARGS= --libdir=${PREFIX}/libexec/nmh \ - --sysconfdir=${PREFIX}/etc/nmh + --sysconfdir=${PREFIX}/etc/nmh \ + --docdir=${DOCSDIR} + .ifdef NMH_EDITOR CONFIGURE_ARGS+= --with-editor=${NMH_EDITOR} .endif .ifdef NMH_MASQUERADE CONFIGURE_ARGS+= --enable-masquerade="${NMH_MASQUERADE}" .endif -.ifndef NMH_LOCKING -NMH_LOCKING=FLOCK_LOCKING -.endif -.ifdef NMH_MTS -CONFIGURE_ARGS+= --with-mts=${NMH_MTS} -.endif .ifdef NMH_PAGER CONFIGURE_ARGS+= --with-pager=${NMH_PAGER} .endif -.ifdef NMH_POP -CONFIGURE_ARGS+= --${NMH_POP}-pop -.else -CONFIGURE_ARGS+= --enable-pop -.endif .ifdef NMH_SMTPSERVERS CONFIGURE_ARGS+= --with-smtpservers="${NMH_SMTPSERVERS}" .endif @@ -43,43 +36,55 @@ .endif MAKE_JOBS_UNSAFE= yes -CFLAGS+= -D${NMH_LOCKING} -O +OPTIONS_DEFINE= DOCS HASH_BKP SASL2 TLS REPLYFILTER +OPTIONS_SINGLE= MTS LOCKING +OPTIONS_SINGLE_MTS= SMTP SENDMAIL +OPTIONS_SINGLE_LOCKING= DOT FCNTL FLOCK LOCKF + +SASL2_DESC= SASL2 support +SASL2_CONFIGURE_ON= --with-cyrus-sasl +SASL2_LIB_DEPENDS= libsasl2.so:${PORTSDIR}/security/cyrus-sasl2 +SASL2_LDFLAGS=-L${LOCALBASE}/lib +SASL2_CPPFLAGS=-I${LOCALBASE}/include +HASH_BKP_DESC= Use hash as backup prefix (default is a comma) +HASH_BKP_CONFIGURE_ON= --with-hash-backup +REPLYFILTER_DESC= Install dependencies for contrib/replyfilter +REPLYFILTER_RUN_DEPENDS= p5-MIME-Tools>=0:${PORTSDIR}/mail/p5-MIME-Tools \ + p5-Mail-Tools>=0:${PORTSDIR}/mail/p5-Mail-Tools + +SMTP_DESC= Use remote SMTP +SMTP_CONFIGURE_ON= --with-mts=smtp +SENDMAIL_DESC= Use local sendmail +SENDMAIL_CONFIGURE_ON= --with-mts=sendmail + +DOT_DESC= Dot file locking +DOT_CONFIGURE_ON= --with-locking=dot +FCNTL_DESC= fcntl() file locking +FCNTL_CONFIGURE_ON= --with-locking=fcntl +FLOCK_DESC= flock() file locking +FLOCK_CONFIGURE_ON= --with-locking=flock +LOCKF_DESC= lockf file locking +LOCKF_CONFIGURE_ON= --with-locking=lockf -CONFIGURE_ARGS+= --docdir=${DOCSDIR} +OPTIONS_DEFAULT= SMTP DOT -OPTIONS_DEFINE= SASL2 -SASL2_DESC= Cyrus SASL2 support -NO_STAGE= yes .include -.if ${PORT_OPTIONS:MSASL2} -LIB_DEPENDS+= sasl2:${PORTSDIR}/security/cyrus-sasl2 -CONFIGURE_ARGS+= --with-cyrus-sasl -CONFIGURE_ENV+= LDFLAGS=-L"${PREFIX}"/lib CPPFLAGS=" -I${PREFIX}/include" -.endif - -MAN1= ali.1 anno.1 burst.1 comp.1 dist.1 flist.1 flists.1 fnext.1 \ - folder.1 folders.1 forw.1 fprev.1 inc.1 install-mh.1 mark.1 \ - mh-chart.1 mhbuild.1 mhl.1 mhlist.1 mhmail.1 mhn.1 \ - mhparam.1 mhpath.1 mhshow.1 mhstore.1 msgchk.1 msh.1 \ - next.1 new.1 nmh.1 packf.1 pick.1 prev.1 prompter.1 rcvdist.1 \ - rcvpack.1 rcvstore.1 rcvtty.1 refile.1 repl.1 rmf.1 rmm.1 \ - scan.1 send.1 sendfiles.1 show.1 slocal.1 \ - sortm.1 unseen.1 whatnow.1 whom.1 - -MAN5= mh-alias.5 mh-draft.5 mh-format.5 mh-mail.5 mh-profile.5 \ - mh-sequence.5 mh-tailor.5 mts.conf.5 +.if ${PORT_OPTIONS:MTLS} +CONFIGURE_ARGS+= --with-tls +USE_OPENSSL= yes +.endif -MLINKS= mh-profile.5 mh_profile.5 +.if defined(WITH_DEBUG) +CONFIGURE_ARGS+= --enable-debug +LDFLAGS+= -g +DEBUG_FLAGS+= -O0 -Wall -Wextra -g +.endif -MAN8= ap.8 conflict.8 dp.8 fmtdump.8 post.8 CONFLICTS= ja-mh-[0-9]* post-patch: @${REINPLACE_CMD} -e "s|autoconf|${AUTOCONF}|;\ s|autoheader|${AUTOHEADER}|" ${WRKSRC}/Makefile.in -post-install: - @PKG_PREFIX='${PREFIX}' ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL - .include diff -ruN nmh.orig/pkg-install nmh/pkg-install --- nmh.orig/pkg-install 2014-01-31 23:25:38.000000000 +0400 +++ nmh/pkg-install 1970-01-01 03:00:00.000000000 +0300 @@ -1,35 +0,0 @@ -#!/bin/sh - -case "$2" in - ""|POST-INSTALL) - echo "Changing ${PKG_PREFIX}/bin/inc to group 'mail'" - chgrp mail ${PKG_PREFIX}/bin/inc - - echo "Enabling setgid for ${PKG_PREFIX}/bin/inc" - chmod g+s ${PKG_PREFIX}/bin/inc - - for file in ${PKG_PREFIX}/etc/nmh/*-dist ; do - b=`basename $file -dist` - if [ \! -f ${PKG_PREFIX}/etc/nmh/$b ] ; then - cp $file ${PKG_PREFIX}/etc/nmh/$b - chmod u+w ${PKG_PREFIX}/etc/nmh/$b - fi - done - - cat <&2; fi etc/nmh/replgroupcomps-dist @exec [ -f %D/etc/nmh/replgroupcomps ] || cp %D/etc/nmh/replgroupcomps-dist %D/etc/nmh/replgroupcomps -@unexec if cmp -s %D/etc/nmh/scan.MMDDYY %D/etc/nmh/scan-dist; then rm -f %D/etc/nmh/scan; else echo 'Local changes: %D/etc/nmh/scan (not removed)' >&2; fi @unexec if cmp -s %D/etc/nmh/scan.MMDDYY %D/etc/nmh/scan.MMDDYY-dist; then rm -f %D/etc/nmh/scan.MMDDYY; else echo 'Local changes: %D/etc/nmh/scan.MMDDYY (not removed)' >&2; fi etc/nmh/scan.MMDDYY-dist @exec [ -f %D/etc/nmh/scan.MMDDYY ] || cp %D/etc/nmh/scan.MMDDYY-dist %D/etc/nmh/scan.MMDDYY @@ -134,30 +137,95 @@ libexec/nmh/slocal libexec/nmh/spost libexec/nmh/viamail -%%DOCSDIR%%/README.about -%%DOCSDIR%%/MAILING-LISTS -%%DOCSDIR%%/README.SASL -%%DOCSDIR%%/COPYRIGHT -%%DOCSDIR%%/README.manpages -%%DOCSDIR%%/MAIL.FILTERING -%%DOCSDIR%%/NEWS -%%DOCSDIR%%/README-components -%%DOCSDIR%%/README-ATTACHMENTS -%%DOCSDIR%%/COMPLETION-ZSH -%%DOCSDIR%%/README -%%DOCSDIR%%/README-HOOKS -%%DOCSDIR%%/FAQ -%%DOCSDIR%%/contrib/build_nmh -%%DOCSDIR%%/contrib/nmh.spec -%%DOCSDIR%%/contrib/replyfilter -%%DOCSDIR%%/DIFFERENCES -%%DOCSDIR%%/COMPLETION-BASH -%%DOCSDIR%%/README.developers -%%DOCSDIR%%/COMPLETION-TCSH -%%DOCSDIR%%/INSTALL -%%DOCSDIR%%/TODO -%%DOCSDIR%%/VERSION +man/man1/ali.1.gz +man/man1/anno.1.gz +man/man1/burst.1.gz +man/man1/comp.1.gz +man/man1/dist.1.gz +man/man1/flist.1.gz +man/man1/flists.1.gz +man/man1/fnext.1.gz +man/man1/folder.1.gz +man/man1/folders.1.gz +man/man1/forw.1.gz +man/man1/fprev.1.gz +man/man1/inc.1.gz +man/man1/install-mh.1.gz +man/man1/mark.1.gz +man/man1/mh-chart.1.gz +man/man1/mhbuild.1.gz +man/man1/mhl.1.gz +man/man1/mhlist.1.gz +man/man1/mhmail.1.gz +man/man1/mhn.1.gz +man/man1/mhparam.1.gz +man/man1/mhpath.1.gz +man/man1/mhshow.1.gz +man/man1/mhstore.1.gz +man/man1/msgchk.1.gz +man/man1/msh.1.gz +man/man1/new.1.gz +man/man1/next.1.gz +man/man1/nmh.1.gz +man/man1/packf.1.gz +man/man1/pick.1.gz +man/man1/prev.1.gz +man/man1/prompter.1.gz +man/man1/rcvdist.1.gz +man/man1/rcvpack.1.gz +man/man1/rcvstore.1.gz +man/man1/rcvtty.1.gz +man/man1/refile.1.gz +man/man1/repl.1.gz +man/man1/rmf.1.gz +man/man1/rmm.1.gz +man/man1/scan.1.gz +man/man1/send.1.gz +man/man1/sendfiles.1.gz +man/man1/show.1.gz +man/man1/slocal.1.gz +man/man1/sortm.1.gz +man/man1/unseen.1.gz +man/man1/whatnow.1.gz +man/man1/whom.1.gz +man/man5/mh-alias.5.gz +man/man5/mh-draft.5.gz +man/man5/mh-format.5.gz +man/man5/mh-mail.5.gz +man/man5/mh-profile.5.gz +man/man5/mh-sequence.5.gz +man/man5/mh-tailor.5.gz +man/man5/mh_profile.5.gz +man/man5/mts.conf.5.gz +man/man8/ap.8.gz +man/man8/conflict.8.gz +man/man8/dp.8.gz +man/man8/fmtdump.8.gz +man/man8/post.8.gz +%%PORTDOCS%%%%DOCSDIR%%/README.about +%%PORTDOCS%%%%DOCSDIR%%/MAILING-LISTS +%%PORTDOCS%%%%DOCSDIR%%/README.SASL +%%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT +%%PORTDOCS%%%%DOCSDIR%%/README.manpages +%%PORTDOCS%%%%DOCSDIR%%/MAIL.FILTERING +%%PORTDOCS%%%%DOCSDIR%%/NEWS +%%PORTDOCS%%%%DOCSDIR%%/README-components +%%PORTDOCS%%%%DOCSDIR%%/README-ATTACHMENTS +%%PORTDOCS%%%%DOCSDIR%%/COMPLETION-ZSH +%%PORTDOCS%%%%DOCSDIR%%/README +%%PORTDOCS%%%%DOCSDIR%%/README-HOOKS +%%PORTDOCS%%%%DOCSDIR%%/FAQ +%%PORTDOCS%%%%DOCSDIR%%/contrib/build_nmh +%%PORTDOCS%%%%DOCSDIR%%/contrib/nmh.spec +%%PORTDOCS%%%%DOCSDIR%%/contrib/replyfilter +%%PORTDOCS%%%%DOCSDIR%%/DIFFERENCES +%%PORTDOCS%%%%DOCSDIR%%/COMPLETION-BASH +%%PORTDOCS%%%%DOCSDIR%%/README.developers +%%PORTDOCS%%%%DOCSDIR%%/COMPLETION-TCSH +%%PORTDOCS%%%%DOCSDIR%%/INSTALL +%%PORTDOCS%%%%DOCSDIR%%/TODO +%%PORTDOCS%%%%DOCSDIR%%/VERSION @dirrmtry etc/nmh @dirrm libexec/nmh -@dirrm %%DOCSDIR%%/contrib -@dirrm %%DOCSDIR%% +%%PORTDOCS%%@dirrm %%DOCSDIR%%/contrib +%%PORTDOCS%%@dirrm %%DOCSDIR%% >Release-Note: >Audit-Trail: >Unformatted: