Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 24 Sep 2012 11:18:45 -0500
From:      Bryan Drewery <bdrewery@freebsd.org>
To:        TAKATSU Tomonari <tota@freebsd.org>
Cc:        svn-ports-head@freebsd.org, svn-ports-all@freebsd.org, ports-committers@freebsd.org
Subject:   Re: svn commit: r304774 - in head/devel/newfile: . files
Message-ID:  <506087E5.2010205@FreeBSD.org>
In-Reply-To: <201209241143.q8OBhjYF011702@svn.freebsd.org>
References:  <201209241143.q8OBhjYF011702@svn.freebsd.org>

next in thread | previous in thread | raw e-mail | index | archive | help
On 9/24/2012 6:43 AM, TAKATSU Tomonari wrote:
> Author: tota
> Date: Mon Sep 24 11:43:45 2012
> New Revision: 304774
> URL: http://svn.freebsd.org/changeset/ports/304774
> 
> Log:
>   - Apply the latest styles to Makefile and pkg-descr which are generated by
>     being executed "port create" command
>     * "Change to the header in ports Makefiles, take two" [1]
>     * Replace tab with space after WWW: in pkg-descr [2]
>   - Bump PORTREVISION


This is causing a build failure:

building for: 7.4-RELEASE i386
maintained by: ports@FreeBSD.org
Makefile ident:      $FreeBSD: ports/devel/newfile/Makefile,v 1.20
2012/09/24 11:43:45 tota Exp $

..

=======================<phase: patch    >==========================
===>  Patching for newfile-1.0.14_3
===>   newfile-1.0.14_3 depends on file: /usr/local/bin/ruby19 - found
===>  Applying FreeBSD patches for newfile-1.0.14_3
1 out of 2 hunks failed--saving rejects to data/projects/port@Makefile.rej
=> Patch patch-data_projects_port_Makefile failed to apply cleanly.
*** Error code 1

Stop in /usr/ports/devel/newfile.
===>  Cleaning for newfile-1.0.14_3
build of /usr/ports/devel/newfile ended at Mon Sep 24 10:19:43 CDT 2012



>   
>   http://docs.freebsd.org/cgi/mid.cgi?20120917162245.GA55973 [1]
>   http://www.freebsd.org/doc/en/books/porters-handbook/book.html#AEN95 [2]
>   
>   PR:		ports/171345
>   Submitted by:	tota (myself)
>   Approved by:	tabthorpe
> 
> Modified:
>   head/devel/newfile/Makefile
>   head/devel/newfile/files/patch-data_projects_port_Makefile
>   head/devel/newfile/files/patch-data_projects_port_pkg-descr
> 
> Modified: head/devel/newfile/Makefile
> ==============================================================================
> --- head/devel/newfile/Makefile	Mon Sep 24 09:15:59 2012	(r304773)
> +++ head/devel/newfile/Makefile	Mon Sep 24 11:43:45 2012	(r304774)
> @@ -7,7 +7,7 @@
>  
>  PORTNAME=	newfile
>  PORTVERSION=	1.0.14
> -PORTREVISION=	2
> +PORTREVISION=	3
>  CATEGORIES=	devel
>  MASTER_SITES=	SF
>  
> 
> Modified: head/devel/newfile/files/patch-data_projects_port_Makefile
> ==============================================================================
> --- head/devel/newfile/files/patch-data_projects_port_Makefile	Mon Sep 24 09:15:59 2012	(r304773)
> +++ head/devel/newfile/files/patch-data_projects_port_Makefile	Mon Sep 24 11:43:45 2012	(r304774)
> @@ -1,7 +1,24 @@
> -diff -ruN data/projects/port@Makefile.orig data/projects/port@Makefile
>  --- data/projects/port@Makefile.orig	2003-11-03 21:34:51.000000000 +0900
> -+++ data/projects/port@Makefile	2005-08-07 01:31:43.486085664 +0900
> -@@ -31,6 +31,7 @@
> ++++ data/projects/port@Makefile	2012-09-23 17:12:06.000000000 +0900
> +@@ -1,15 +1,11 @@
> + %# -*-mode: makefile-*-
> + %define c "# "
> +-# New ports collection makefile for:	<:PROJECT>
> +-# Date created:		<:DATE>
> + %if !defined("BSDMAIL")
> +-# Whom:			<:AUTHOR> <<:EMAIL>>
> ++# Created by: <:AUTHOR> <<:EMAIL>>
> + %else
> +-# Whom:			<:AUTHOR> <<:BSDMAIL>>
> ++# Created by: <:AUTHOR> <<:BSDMAIL>>
> + %endif # !defined("BSDMAIL")
> +-#
> + # $FreeBSD$
> +-#
> + 
> + PORTNAME=	<:PROJECT>
> + PORTVERSION=
> +@@ -31,6 +27,7 @@
>   %else
>   MAINTAINER=	<:BSDMAIL>
>   %endif # !defined("BSDMAIL")
> 
> Modified: head/devel/newfile/files/patch-data_projects_port_pkg-descr
> ==============================================================================
> --- head/devel/newfile/files/patch-data_projects_port_pkg-descr	Mon Sep 24 09:15:59 2012	(r304773)
> +++ head/devel/newfile/files/patch-data_projects_port_pkg-descr	Mon Sep 24 11:43:45 2012	(r304774)
> @@ -1,7 +1,8 @@
> ---- data/projects/port@pkg-descr.orig	Fri Jul 14 15:03:26 2006
> -+++ data/projects/port@pkg-descr	Fri Jul 14 15:03:44 2006
> +--- data/projects/port@pkg-descr.orig	2003-11-03 21:33:36.000000000 +0900
> ++++ data/projects/port@pkg-descr	2012-09-05 20:56:03.000000000 +0900
>  @@ -1,4 +1,3 @@
>   [description of the port]
>   
>  -Author:	Author's name and e-mail address
> - WWW:	http://port.home.page/
> +-WWW:	http://port.home.page/
> ++WWW: http://port.home.page/
> 


-- 
Regards,
Bryan Drewery
bdrewery@freenode/EFNet



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?506087E5.2010205>