From crees@bayofrum.net  Fri Jan 18 16:23:30 2013
Return-Path: <crees@bayofrum.net>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1])
	by hub.freebsd.org (Postfix) with ESMTP id D13931B1
	for <freebsd-gnats-submit@freebsd.org>; Fri, 18 Jan 2013 16:23:30 +0000 (UTC)
	(envelope-from crees@bayofrum.net)
Received: from mk-outboundfilter-1.mail.uk.tiscali.com (mk-outboundfilter-1.mail.uk.tiscali.com [212.74.114.37])
	by mx1.freebsd.org (Postfix) with ESMTP id 721B536A
	for <freebsd-gnats-submit@freebsd.org>; Fri, 18 Jan 2013 16:23:29 +0000 (UTC)
Received: from 79-75-90-131.dynamic.dsl.as9105.com (HELO pegasus.bayofrum.net) ([79.75.90.131])
  by smtp.pipex.tiscali.co.uk with ESMTP; 18 Jan 2013 16:23:17 +0000
Received: by pegasus.bayofrum.net (Postfix, from userid 1001)
	id 318A81C67B; Fri, 18 Jan 2013 16:21:57 +0000 (GMT)
Message-Id: <20130118162157.318A81C67B@pegasus.bayofrum.net>
Date: Fri, 18 Jan 2013 16:21:57 +0000 (GMT)
From: Chris Rees <crees@FreeBSD.org>
Reply-To: Chris Rees <crees@FreeBSD.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [PATCH] mail/elm Stop being interactive
X-Send-Pr-Version: 3.113
X-GNATS-Notify: toasty@dragondata.com

>Number:         175412
>Category:       ports
>Synopsis:       [PATCH] mail/elm Stop being interactive
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    crees
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Jan 18 16:30:00 UTC 2013
>Closed-Date:    Sun Mar 03 10:59:27 UTC 2013
>Last-Modified:  Sun Mar 03 10:59:27 UTC 2013
>Originator:     Chris Rees
>Release:        FreeBSD 9.0-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD pegasus.bayofrum.net 9.0-RELEASE FreeBSD 9.0-RELEASE #0: Sun Apr 29 12:29:02 BST 2012 root@pegasus.bayofrum.net:/usr/obj/usr/src/sys/PEGASUS amd64


	
>Description:
	Small patch to Configure, and make use of the -d option to Configure
	means that we don't need to have an interactive port.

	While here, rename patch-aa to correct name.
>How-To-Repeat:
	
>Fix:

	

--- patch.txt begins here ---
Index: Makefile
===================================================================
--- Makefile	(revision 310609)
+++ Makefile	(working copy)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    elm25
-# Date created:				04 Feb 2000
-# Whom:					dhagan@cs.vt.edu
-#
+# Created by: dhagan@cs.vt.edu
 # $FreeBSD$
-#
 
 PORTNAME=	elm
 PORTVERSION=	2.5.8
@@ -24,10 +20,10 @@
 WRKSRC=			${WRKDIR}/elm${PORTVERSION}
 NO_LATEST_LINK=		yes
 USE_GETTEXT=		yes
-IS_INTERACTIVE=		yes
 HAS_CONFIGURE=		yes
 CONFIGURE_SCRIPT=	Configure
 CONFIGURE_ENV=		PREFIX="${PREFIX}"
+CONFIGURE_ARGS=		-d
 MAN1=			answer.1 checkalias.1 elm.1 elmalias.1 fastmail.1 \
 			frm.1 listalias.1 messages.1 newalias.1 newmail.1 \
 			printmail.1 readmsg.1 mmencode.1
Index: files/patch-Configure

Renamed from files/patch-aa

===================================================================
--- files/patch-Configure	(working copy)
+++ files/patch-Configure	(working copy)
@@ -1,5 +1,5 @@
---- Configure.orig	Fri Dec 15 14:00:55 2000
-+++ Configure	Mon Jan 27 04:04:55 2003
+--- Configure.orig	2005-08-18 13:49:24.000000000 +0100
++++ Configure	2013-01-18 16:14:29.794050455 +0000
 @@ -18,11 +18,6 @@
  PATH=".:/bin:/usr/bin:/usr/local/bin:/usr/ucb:/usr/local:/usr/lbin:/etc:/usr/new:/usr/new/bin:/usr/nbin:$PATH"
  export PATH || (echo "OOPS, this isn't sh.  Desperation time.  I will feed myself to sh."; sh $0; kill $$)
@@ -12,7 +12,15 @@
  (alias) >/dev/null 2>&1 && \
      echo "(I see you are using the Korn shell.  Some ksh's blow up on Configure," && \
      echo "especially on exotic machines.  If yours does, try the Bourne shell instead.)"
-@@ -2055,6 +2050,7 @@
+@@ -491,7 +486,6 @@
+     c='\c'
+ fi
+ echo $n "Type carriage return to continue.  Your cursor should be here-->$c"
+-read ans
+ rm -f .echotmp
+ 
+ : now set up to do reads with possible shell escape and default assignment
+@@ -2058,6 +2052,7 @@
      libc=/usr/lib/libc.a
  else
  set /usr/ccs/lib/libc.so
@@ -20,7 +28,7 @@
  test -f $1 || set /usr/lib/libc.so
  test -f $1 || set /usr/lib/libc.so.[0-9]*
  test -f $1 || set /lib/libsys_s.a
-@@ -2108,7 +2104,7 @@
+@@ -2111,7 +2106,7 @@
  set `echo $libc $libnames | tr ' ' '\012' | sort | uniq`
  $echo $n "Extracting names from $* for later perusal...$c"
  nm $nm_opts $* 2>/dev/null >libc.tmp
@@ -29,7 +37,7 @@
  if $contains '^printf$' libc.list >/dev/null 2>&1; then
      echo done
  elif $sed -n -e 's/^__*//' -e 's/^\([a-zA-Z_0-9$]*\).*xtern.*/\1/p' \
-@@ -2496,7 +2492,10 @@
+@@ -2499,7 +2494,10 @@
  #
  : see if crypt exists
  echo " "
@@ -41,3 +49,11 @@
      echo 'crypt() found.'
      d_crypt="$define"
      cryptlib=''
+@@ -5499,7 +5497,6 @@
+ echo "If you didn't make any mistakes, then just type a carriage return here."
+ rp="If you need to edit config.sh, do it as a shell escape here:"
+ $echo $n "$rp $c"
+-. UU/myread
+ case "$ans" in
+ '') ;;
+ *) : in case they cannot read
--- patch.txt ends here ---



-- 
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.

>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Fri Jan 18 16:30:08 UTC 2013 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=175412 
Responsible-Changed-From-To: freebsd-ports-bugs->crees 
Responsible-Changed-By: crees 
Responsible-Changed-When: Fri Jan 18 16:34:21 UTC 2013 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=175412 

From: Edwin Groothuis <edwin@FreeBSD.org>
To: toasty@dragondata.com
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/175412: [PATCH] mail/elm Stop being interactive
Date: Fri, 18 Jan 2013 16:30:07 UT

 Maintainer of mail/elm,
 
 Please note that PR ports/175412 has just been submitted.
 
 If it contains a patch for an upgrade, an enhancement or a bug fix
 you agree on, reply to this email stating that you approve the patch
 and a committer will take care of it.
 
 The full text of the PR can be found at:
     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/175412
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/175412: commit references a PR
Date: Sun,  3 Mar 2013 10:44:35 +0000 (UTC)

 Author: crees
 Date: Sun Mar  3 10:44:26 2013
 New Revision: 313340
 URL: http://svnweb.freebsd.org/changeset/ports/313340
 
 Log:
   Stop being INTERACTIVE
   
   Correct name of patch-aa
   
   PR:		ports/175412
   Approved by:	maintainer timeout (toasty@dragondata.com, 6 weeks)
 
 Added:
   head/mail/elm/files/patch-Configure
      - copied, changed from r310609, head/mail/elm/files/patch-aa
 Deleted:
   head/mail/elm/files/patch-aa
 Modified:
   head/mail/elm/Makefile
 
 Modified: head/mail/elm/Makefile
 ==============================================================================
 --- head/mail/elm/Makefile	Sun Mar  3 10:41:41 2013	(r313339)
 +++ head/mail/elm/Makefile	Sun Mar  3 10:44:26 2013	(r313340)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:    elm25
 -# Date created:				04 Feb 2000
 -# Whom:					dhagan@cs.vt.edu
 -#
 +# Created by: dhagan@cs.vt.edu
  # $FreeBSD$
 -#
  
  PORTNAME=	elm
  PORTVERSION=	2.5.8
 @@ -24,10 +20,10 @@ CFLAGS+=	-D_SIZE_T
  WRKSRC=			${WRKDIR}/elm${PORTVERSION}
  NO_LATEST_LINK=		yes
  USE_GETTEXT=		yes
 -IS_INTERACTIVE=		yes
  HAS_CONFIGURE=		yes
  CONFIGURE_SCRIPT=	Configure
  CONFIGURE_ENV=		PREFIX="${PREFIX}"
 +CONFIGURE_ARGS=		-d
  MAN1=			answer.1 checkalias.1 elm.1 elmalias.1 fastmail.1 \
  			frm.1 listalias.1 messages.1 newalias.1 newmail.1 \
  			printmail.1 readmsg.1 mmencode.1
 
 Copied and modified: head/mail/elm/files/patch-Configure (from r310609, head/mail/elm/files/patch-aa)
 ==============================================================================
 --- head/mail/elm/files/patch-aa	Fri Jan 18 14:38:36 2013	(r310609, copy source)
 +++ head/mail/elm/files/patch-Configure	Sun Mar  3 10:44:26 2013	(r313340)
 @@ -1,5 +1,5 @@
 ---- Configure.orig	Fri Dec 15 14:00:55 2000
 -+++ Configure	Mon Jan 27 04:04:55 2003
 +--- Configure.orig	2005-08-18 13:49:24.000000000 +0100
 ++++ Configure	2013-01-18 16:14:29.794050455 +0000
  @@ -18,11 +18,6 @@
   PATH=".:/bin:/usr/bin:/usr/local/bin:/usr/ucb:/usr/local:/usr/lbin:/etc:/usr/new:/usr/new/bin:/usr/nbin:$PATH"
   export PATH || (echo "OOPS, this isn't sh.  Desperation time.  I will feed myself to sh."; sh $0; kill $$)
 @@ -12,7 +12,15 @@
   (alias) >/dev/null 2>&1 && \
       echo "(I see you are using the Korn shell.  Some ksh's blow up on Configure," && \
       echo "especially on exotic machines.  If yours does, try the Bourne shell instead.)"
 -@@ -2055,6 +2050,7 @@
 +@@ -491,7 +486,6 @@
 +     c='\c'
 + fi
 + echo $n "Type carriage return to continue.  Your cursor should be here-->$c"
 +-read ans
 + rm -f .echotmp
 + 
 + : now set up to do reads with possible shell escape and default assignment
 +@@ -2058,6 +2052,7 @@
       libc=/usr/lib/libc.a
   else
   set /usr/ccs/lib/libc.so
 @@ -20,7 +28,7 @@
   test -f $1 || set /usr/lib/libc.so
   test -f $1 || set /usr/lib/libc.so.[0-9]*
   test -f $1 || set /lib/libsys_s.a
 -@@ -2108,7 +2104,7 @@
 +@@ -2111,7 +2106,7 @@
   set `echo $libc $libnames | tr ' ' '\012' | sort | uniq`
   $echo $n "Extracting names from $* for later perusal...$c"
   nm $nm_opts $* 2>/dev/null >libc.tmp
 @@ -29,7 +37,7 @@
   if $contains '^printf$' libc.list >/dev/null 2>&1; then
       echo done
   elif $sed -n -e 's/^__*//' -e 's/^\([a-zA-Z_0-9$]*\).*xtern.*/\1/p' \
 -@@ -2496,7 +2492,10 @@
 +@@ -2499,7 +2494,10 @@
   #
   : see if crypt exists
   echo " "
 @@ -41,3 +49,11 @@
       echo 'crypt() found.'
       d_crypt="$define"
       cryptlib=''
 +@@ -5499,7 +5497,6 @@
 + echo "If you didn't make any mistakes, then just type a carriage return here."
 + rp="If you need to edit config.sh, do it as a shell escape here:"
 + $echo $n "$rp $c"
 +-. UU/myread
 + case "$ans" in
 + '') ;;
 + *) : in case they cannot read
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: feedback->closed 
State-Changed-By: crees 
State-Changed-When: Sun Mar 3 10:59:26 UTC 2013 
State-Changed-Why:  
Committed. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=175412 
>Unformatted:
