From nobody@FreeBSD.org  Sun Apr 28 14:03:46 2013
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
	by hub.freebsd.org (Postfix) with ESMTP id D6903806
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 28 Apr 2013 14:03:46 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from red.freebsd.org (red.freebsd.org [69.147.83.34])
	by mx1.freebsd.org (Postfix) with ESMTP id C6CB516BE
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 28 Apr 2013 14:03:46 +0000 (UTC)
Received: from red.freebsd.org (localhost [127.0.0.1])
	by red.freebsd.org (8.14.5/8.14.5) with ESMTP id r3SE3kpu087091
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 28 Apr 2013 14:03:46 GMT
	(envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
	by red.freebsd.org (8.14.5/8.14.5/Submit) id r3SE3kIG087090;
	Sun, 28 Apr 2013 14:03:46 GMT
	(envelope-from nobody)
Message-Id: <201304281403.r3SE3kIG087090@red.freebsd.org>
Date: Sun, 28 Apr 2013 14:03:46 GMT
From: "O. Hartmann" <ohartman@zedat.fu-berlin.de>
To: freebsd-gnats-submit@FreeBSD.org
Subject: print/a2ps: ===>  Applying FreeBSD patches for a2ps-4.13b_5 2 out of 2 hunks failed--saving rejects to Makefile.in.rej
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         178220
>Category:       ports
>Synopsis:       print/a2ps: ===>  Applying FreeBSD patches for a2ps-4.13b_5 2 out of 2 hunks failed--saving rejects to Makefile.in.rej
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    dinoex
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sun Apr 28 14:10:00 UTC 2013
>Closed-Date:    Mon May 13 15:58:13 CEST 2013
>Last-Modified:  Mon May 13 15:58:13 CEST 2013
>Originator:     O. Hartmann
>Release:        FreeBSD 10..0-CURRENT/amd64 FreeBSD 9.1-STABLE/amd64
>Organization:
FU Berlin
>Environment:
>Description:
The update port print/a2ps fails due to the follwoing error message:

===>>> All >> print/a2ps (1/2)

===>  Cleaning for a2ps-4.13b_5
===>  License GPLv2 accepted by the user
===>  Found saved configuration for a2ps-4.13b_5
===>   a2ps-4.13b_5 depends on file: /usr/local/sbin/pkg - found
===> Fetching all distfiles required by a2ps-4.13b_5 for building
===>  Extracting for a2ps-4.13b_5
=> SHA256 Checksum OK for a2ps-4.13b.tar.gz.
=> SHA256 Checksum OK for i18n-fonts-0.1.tar.gz.
===>   a2ps-4.13b_5 depends on file: /usr/local/bin/perl5.16.2 - found
===>  Patching for a2ps-4.13b_5
===>   a2ps-4.13b_5 depends on file: /usr/local/bin/perl5.16.2 - found
===>  Applying FreeBSD patches for a2ps-4.13b_5
2 out of 2 hunks failed--saving rejects to Makefile.in.rej
=> Patch patch-contrib-emacs-Makefile.in failed to apply cleanly.
=> Patch(es) patch-ad patch-ae applied cleanly.
*** [do-patch] Error code 1

Stop in /usr/ports/print/a2ps.
*** [build] Error code 1

Stop in /usr/ports/print/a2ps.

===>>> make failed for print/a2ps
===>>> Aborting update

===>>> Update for print/a2ps failed
===>>> Aborting update

===>>> Killing background jobs
Terminated

>How-To-Repeat:

>Fix:


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->dinoex 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Sun Apr 28 14:10:08 UTC 2013 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=178220 
State-Changed-From-To: open->feedback 
State-Changed-By: dinoex 
State-Changed-When: Wed May 1 10:46:59 CEST 2013 
State-Changed-Why:  


I can not reproduce your error. 

builds fine on 8.3 and 9.1. 

I have no CURRENT to test on. 
Your ports tree might be inconsitent. 


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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/178220: commit references a PR
Date: Thu,  2 May 2013 19:34:58 +0000 (UTC)

 Author: dinoex
 Date: Thu May  2 19:34:48 2013
 New Revision: 317141
 URL: http://svnweb.freebsd.org/changeset/ports/317141
 
 Log:
   - make bsdpatch happy
   PR:     178220
   
   - merge and cleanup patches
 
 Added:
   head/print/a2ps/files/patch-localealias.c
      - copied unchanged from r316986, head/print/a2ps/files/patch-intl-localealias.c
   head/print/a2ps/files/patch-ogonkify-Makefile.in
      - copied unchanged from r316986, head/print/a2ps/files/patch-ad
   head/print/a2ps/files/patch-options.c
      - copied unchanged from r316986, head/print/a2ps/files/patch-ae
 Deleted:
   head/print/a2ps/files/patch-ad
   head/print/a2ps/files/patch-ae
   head/print/a2ps/files/patch-intl-localealias.c
   head/print/a2ps/files/patch-lib-xgethostname.c
 Modified:
   head/print/a2ps/files/patch-contrib-emacs-Makefile.in
   head/print/a2ps/files/patch-xgethostname.c
 
 Modified: head/print/a2ps/files/patch-contrib-emacs-Makefile.in
 ==============================================================================
 --- head/print/a2ps/files/patch-contrib-emacs-Makefile.in	Thu May  2 19:04:05 2013	(r317140)
 +++ head/print/a2ps/files/patch-contrib-emacs-Makefile.in	Thu May  2 19:34:48 2013	(r317141)
 @@ -1,6 +1,6 @@
  Index: contrib/emacs/Makefile.in
 ---- Makefile.in.orig	2011-09-27 15:17:26.000000000 +0900
 -+++ Makefile.in	2011-09-27 15:18:10.000000000 +0900
 +--- contrib/emacs/Makefile.in.orig	2011-09-27 15:17:26.000000000 +0900
 ++++ contrib/emacs/Makefile.in	2011-09-27 15:18:10.000000000 +0900
  @@ -159,8 +159,9 @@
   
   install-dist_lispLISP: $(dist_lisp_LISP) $(ELCFILES)
 
 Copied: head/print/a2ps/files/patch-localealias.c (from r316986, head/print/a2ps/files/patch-intl-localealias.c)
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/print/a2ps/files/patch-localealias.c	Thu May  2 19:34:48 2013	(r317141, copy of r316986, head/print/a2ps/files/patch-intl-localealias.c)
 @@ -0,0 +1,20 @@
 +--- intl/localealias.c.orig	Tue Aug 31 13:29:35 1999
 ++++ intl/localealias.c	Tue Aug 12 11:09:53 2003
 +@@ -329,6 +329,17 @@
 + 		      FREE_BLOCKS (block_list);
 + 		      return added;
 + 		    }
 ++		  if (string_space != new_pool)
 ++		    {
 ++		      size_t i;
 ++
 ++		      for (i = 0; i < nmap; i++)
 ++			{
 ++			  map[i].alias += new_pool - string_space;
 ++			  map[i].value += new_pool - string_space;
 ++			}
 ++		    }
 ++
 + 		  string_space = new_pool;
 + 		  string_space_max = new_size;
 + 		}
 
 Copied: head/print/a2ps/files/patch-ogonkify-Makefile.in (from r316986, head/print/a2ps/files/patch-ad)
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/print/a2ps/files/patch-ogonkify-Makefile.in	Thu May  2 19:34:48 2013	(r317141, copy of r316986, head/print/a2ps/files/patch-ad)
 @@ -0,0 +1,11 @@
 +--- ogonkify/Makefile.in.orig	Tue Apr 20 00:07:03 1999
 ++++ ogonkify/Makefile.in	Tue Apr 20 00:07:07 1999
 +@@ -37,7 +37,7 @@
 + 
 + DESTDIR =
 + 
 +-pkgdatadir = $(datadir)/@PACKAGE@
 ++pkgdatadir = $(datadir)/a2ps/@PACKAGE@
 + pkglibdir = $(libdir)/@PACKAGE@
 + pkgincludedir = $(includedir)/@PACKAGE@
 + 
 
 Copied: head/print/a2ps/files/patch-options.c (from r316986, head/print/a2ps/files/patch-ae)
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/print/a2ps/files/patch-options.c	Thu May  2 19:34:48 2013	(r317141, copy of r316986, head/print/a2ps/files/patch-ae)
 @@ -0,0 +1,18 @@
 +--- lib/options.c.orig	Thu Sep 21 23:22:36 2000
 ++++ lib/options.c	Thu Sep 21 23:22:42 2000
 +@@ -493,6 +493,15 @@
 + 	  /* A font size is given */
 + 	  job->fontsize = get_length ("--font-size", cp,
 + 				      0.0, 0.0, "pt", range_min_strict);
 ++	  if (job->fontsize == 0.0) 
 ++	  {
 ++	    error (0, 0, _("invalid argument %s for -f or --font-size option"),
 ++	      cp);
 ++	    fprintf (stderr,
 ++	      _("Valid arguments are floats with optonal units!\n"));
 ++	    fprintf (stderr, _("Try `a2ps --help' for more information.\n"));
 ++	    exit (EXIT_FAILURE);
 ++	  }
 + 	  job->columns_requested = 0;
 + 	  job->lines_requested = 0;
 + 	}
 
 Modified: head/print/a2ps/files/patch-xgethostname.c
 ==============================================================================
 --- head/print/a2ps/files/patch-xgethostname.c	Thu May  2 19:04:05 2013	(r317140)
 +++ head/print/a2ps/files/patch-xgethostname.c	Thu May  2 19:34:48 2013	(r317141)
 @@ -1,6 +1,23 @@
 ---- lib/xgethostname.c	Tue Sep  4 00:51:26 2001
 -+++ lib/xgethostname.c.new	Tue Sep  4 00:55:39 2001
 -@@ -63,7 +63,7 @@
 +--- lib/xgethostname.c.orig	Tue Sep  4 00:51:26 2001
 ++++ lib/xgethostname.c	Tue Sep  4 00:55:39 2001
 +@@ -21,6 +21,7 @@
 + # include <config.h>
 + #endif
 + 
 ++#include <sys/param.h>
 + #include <sys/types.h>
 + 
 + #include <errno.h>
 +@@ -38,7 +39,7 @@
 + int gethostname ();
 + 
 + #ifndef INITIAL_HOSTNAME_LENGTH
 +-# define INITIAL_HOSTNAME_LENGTH 34
 ++# define INITIAL_HOSTNAME_LENGTH MAXHOSTNAMELEN
 + #endif
 + 
 + char *
 +@@ -63,7 +64,7 @@
         if (err == 0 && hostname[k] == '\0')
   	break;
   #ifdef ENAMETOOLONG
 @@ -9,4 +26,3 @@
   	error (EXIT_FAILURE, errno, "gethostname");
   #endif
         size *= 2;
 -
 _______________________________________________
 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: dinoex 
State-Changed-When: Mon May 13 15:56:31 CEST 2013 
State-Changed-Why:  
- feedback was received. 
There is a regression in bsd-patch, it does not parse the path in the "Index:" line. 

A workaround was committed, thanks. 


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