Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 11 Sep 2011 20:52:37 -0500 (CDT)
From:      "Conrad J. Sabatier" <conrads@cox.net>
To:        FreeBSD-gnats-submit@FreeBSD.org
Cc:        gnome@FreeBSD.org
Subject:   ports/160670: [patch] devel/pkg-config: upgrade to version 0.26
Message-ID:  <201109120152.p8C1qbHJ002556@serene.no-ip.org>
Resent-Message-ID: <201109120200.p8C20NP3065756@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         160670
>Category:       ports
>Synopsis:       [patch] devel/pkg-config: upgrade to version 0.26
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Sep 12 02:00:23 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Conrad J. Sabatier
>Release:        FreeBSD 9.0-BETA2 amd64
>Organization:
>Environment:
System: FreeBSD serene.no-ip.org 9.0-BETA2 FreeBSD 9.0-BETA2 #1: Sun Sep 11 17:50:08 CDT 2011 conrads@serene.no-ip.org:/usr/obj/usr/src/sys/CUSTOM amd64


>Description:
	Upgrade devel/pkg-config from 0.25_1 to 0.26
>How-To-Repeat:
	New version recently announced in pkg-config@lists.freedesktop.org
>Fix:
	Patch included below.  Remove no longer needed patch files 
	patch-glib-1.2.10_Makefile.in and patch-pkg.m4-new-autoconf,
	modify patch-parse.c (glib-config is no longer referenced by 
	parse.c), remove no longer recognized configure option
	--disable-threads from Makefile.

--- pkg-config.diff begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/pkg-config/Makefile,v
retrieving revision 1.57
diff -u -r1.57 Makefile
--- Makefile	11 Aug 2011 19:19:18 -0000	1.57
+++ Makefile	12 Sep 2011 01:38:29 -0000
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	pkg-config
-PORTVERSION=	0.25
-PORTREVISION=	1
+PORTVERSION=	0.26
 CATEGORIES=	devel
 MASTER_SITES=	http://pkgconfig.freedesktop.org/releases/
 DIST_SUBDIR=	gnome2
@@ -31,7 +30,6 @@
 PC_PATH:=	${PC_PATH}:${LOCALBASE}/lib/pkgconfig
 .endif
 
-CONFIGURE_ARGS=	--disable-threads \
-		--with-pc-path="${PC_PATH}"
+CONFIGURE_ARGS=	--with-pc-path="${PC_PATH}"
 
 .include <bsd.port.post.mk>
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/devel/pkg-config/distinfo,v
retrieving revision 1.22
diff -u -r1.22 distinfo
--- distinfo	3 Jul 2011 14:58:30 -0000	1.22
+++ distinfo	12 Sep 2011 01:15:50 -0000
@@ -1,2 +1,2 @@
-SHA256 (gnome2/pkg-config-0.25.tar.gz) = 3ba691ee2431f32ccb8efa131e59bf23e37f122dc66791309023ca6dcefcd10e
-SIZE (gnome2/pkg-config-0.25.tar.gz) = 988899
+SHA256 (gnome2/pkg-config-0.26.tar.gz) = 94c1936a797c930fb3e4e5a154165b6268caba22b32d24083dd4c492a533c8af
+SIZE (gnome2/pkg-config-0.26.tar.gz) = 396399
Index: files/patch-glib-1.2.10_Makefile.in
===================================================================
RCS file: files/patch-glib-1.2.10_Makefile.in
diff -N files/patch-glib-1.2.10_Makefile.in
--- files/patch-glib-1.2.10_Makefile.in	24 Mar 2008 03:49:42 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,10 +0,0 @@
---- glib-1.2.10/Makefile.in.orig	Tue Apr 12 13:51:56 2005
-+++ glib-1.2.10/Makefile.in	Tue Apr 12 13:52:41 2005
-@@ -727,7 +727,6 @@
- installdirs-am:
- 
- install: $(BUILT_SOURCES)
--	$(MAKE) $(AM_MAKEFLAGS) install-recursive
- install-exec: install-exec-recursive
- install-data: install-data-recursive
- uninstall: uninstall-recursive
Index: files/patch-parse.c
===================================================================
RCS file: /home/ncvs/ports/devel/pkg-config/files/patch-parse.c,v
retrieving revision 1.3
diff -u -r1.3 patch-parse.c
--- files/patch-parse.c	2 Sep 2006 18:18:31 -0000	1.3
+++ files/patch-parse.c	12 Sep 2011 01:28:48 -0000
@@ -17,32 +17,3 @@
        else
          {
            if (*arg != '\0')
-@@ -1190,9 +1200,9 @@ get_compat_package (const char *name)
-     {
-       char *output;
- 
--      debug_spew ("Calling glib-config\n");
-+      debug_spew ("Calling glib12-config\n");
-       
--      pkg->version = backticks ("glib-config --version");
-+      pkg->version = backticks ("glib12-config --version");
-       if (pkg->version == NULL)
-         {
-           g_free (pkg);
-@@ -1203,12 +1213,12 @@ get_compat_package (const char *name)
-       pkg->key = g_strdup ("glib");
-       pkg->description = g_strdup ("C Utility Library");
- 
--      output = backticks ("glib-config --libs");
--      parse_libs (pkg, output, "glib-config");
-+      output = backticks ("glib12-config --libs");
-+      parse_libs (pkg, output, "glib12-config");
-       g_free (output);
- 
--      output = backticks ("glib-config --cflags");
--      parse_cflags (pkg, output, "glib-config");
-+      output = backticks ("glib12-config --cflags");
-+      parse_cflags (pkg, output, "glib12-config");
-       g_free (output);
- 
-       return pkg;
Index: files/patch-pkg.m4-new-autoconf
===================================================================
RCS file: files/patch-pkg.m4-new-autoconf
diff -N files/patch-pkg.m4-new-autoconf
--- files/patch-pkg.m4-new-autoconf	15 Sep 2010 18:34:14 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,7 +0,0 @@
---- pkg.m4.orig	2009-12-06 20:39:02.000000000 +0000
-+++ pkg.m4	2010-08-25 16:59:38.000000000 +0000
-@@ -137,3 +137,3 @@
- 
--_PKG_TEXT])dnl
-+_PKG_TEXT])[]dnl
-         ])
--- pkg-config.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted:



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