From nobody@FreeBSD.org  Mon Dec 25 13:01:21 2006
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id B573F16A403
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 25 Dec 2006 13:01:21 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [69.147.83.33])
	by mx1.freebsd.org (Postfix) with ESMTP id A312D13C479
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 25 Dec 2006 13:01:21 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.13.1/8.13.1) with ESMTP id kBPD1L9D092232
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 25 Dec 2006 13:01:21 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.13.1/8.13.1/Submit) id kBPD1LFF092231;
	Mon, 25 Dec 2006 13:01:21 GMT
	(envelope-from nobody)
Message-Id: <200612251301.kBPD1LFF092231@www.freebsd.org>
Date: Mon, 25 Dec 2006 13:01:21 GMT
From: Pavel Plesov<frewq28@gmail.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: devel/glib20 (glib-2.12.6) fails to compile: patch error
X-Send-Pr-Version: www-3.0

>Number:         107190
>Category:       ports
>Synopsis:       devel/glib20 (glib-2.12.6) fails to compile: patch error
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    gnome
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Mon Dec 25 13:10:18 GMT 2006
>Closed-Date:    Mon Dec 25 15:31:27 GMT 2006
>Last-Modified:  Mon Dec 25 15:31:27 GMT 2006
>Originator:     Pavel Plesov
>Release:        6-STABLE
>Organization:
>Environment:
>Description:
Unable to compile lastest glib20 port (e.g. glib-2.12.6).

Compilation fails on the following patches:
files/extra-patch-glib_Makefile.in -- required to be updated
files/patch-glib_gtimer.c -- required to be removed (those changes already present in the target file)
>How-To-Repeat:
portupgrade glib
OR
cd /usr/ports/devel/glib20 && make

>Fix:
Please file corrected files/extra-patch-glib_Makefile.in in the attachments.

Patch attached with submission follows:

--- files/extra-patch-glib_Makefile.in-orig	Mon Dec 25 15:43:07 2006
+++ files/extra-patch-glib_Makefile.in	Mon Dec 25 15:47:17 2006
@@ -1,6 +1,6 @@
---- glib/Makefile.in.orig	Wed Jul 19 01:08:13 2006
-+++ glib/Makefile.in	Wed Jul 19 01:09:10 2006
-@@ -130,7 +130,7 @@
+--- glib/Makefile.in-orig	Mon Dec 25 15:43:54 2006
++++ glib/Makefile.in	Mon Dec 25 15:43:54 2006
+@@ -131,7 +131,7 @@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  INSTOBJEXT = @INSTOBJEXT@
  INTLLIBS = @INTLLIBS@

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->gnome 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Mon Dec 25 13:10:28 UTC 2006 
Responsible-Changed-Why:  
Over to maintainer 

http://www.freebsd.org/cgi/query-pr.cgi?pr=107190 
State-Changed-From-To: open->closed 
State-Changed-By: mezz 
State-Changed-When: Mon Dec 25 15:29:10 UTC 2006 
State-Changed-Why:  
I can't reproduce it, you have some stale files in your ports tree. You need 
to try to 'rm -rf /usr/ports/devel/glib20 and change the CVSup mirror, then 
try it again. The files/patch-glib_gtimer.c does not exits in our ports tree, 
you can see: 

http://www.freebsd.org/cgi/cvsweb.cgi/ports/devel/glib20/files/ 

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