ports/107190: devel/glib20 (glib-2.12.6) fails to compile: patch error

[Pavel Plesov]

>Number:         107190
>Category:       ports
>Synopsis:       devel/glib20 (glib-2.12.6) fails to compile: patch error
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Mon Dec 25 13:10:18 GMT 2006
>Closed-Date:
>Last-Modified:
>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:
>Unformatted: