From 9ede0b103227741ba7363a2e62bfa0e7d957a14f Mon Sep 17 00:00:00 2001 From: jasper Date: Tue, 28 Sep 2010 11:41:22 +0000 Subject: [PATCH] - update to 0.25 - switch to new depends - set license version --- devel/pkgconfig/Makefile | 17 +++++++++-------- devel/pkgconfig/distinfo | 10 +++++----- devel/pkgconfig/patches/patch-Makefile_in | 16 ++++++++-------- devel/pkgconfig/patches/patch-pkg_c | 10 +++++----- devel/pkgconfig/pkg/PLIST | 5 +++-- 5 files changed, 30 insertions(+), 28 deletions(-) diff --git a/devel/pkgconfig/Makefile b/devel/pkgconfig/Makefile index ed1004e241b..3f1b167ffa4 100644 --- a/devel/pkgconfig/Makefile +++ b/devel/pkgconfig/Makefile @@ -1,34 +1,35 @@ -# $OpenBSD: Makefile,v 1.25 2008/10/25 16:44:56 jasper Exp $ +# $OpenBSD: Makefile,v 1.26 2010/09/28 11:41:22 jasper Exp $ COMMENT= tool for managing library compile/link flags IGNORE= Replaced with BSD clone in OpenBSD 4.1 -VERSION= 0.23 +VERSION= 0.25 DISTNAME= pkg-config-${VERSION} PKGNAME= pkgconfig-${VERSION} CATEGORIES= devel HOMEPAGE= http://www.freedesktop.org/software/pkgconfig/ MASTER_SITES= ${HOMEPAGE}/releases/ \ - ${MASTER_SITE_GNOME:=sources/pkg-config/0.23/} + ${MASTER_SITE_GNOME:=sources/pkg-config/${VERSION}/} CONFIGURE_ARGS+= --with-pc_path=${LOCALBASE}/lib/pkgconfig:${X11BASE}/lib/pkgconfig -# GPL +# GPLv2+ PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -WANTLIB= c pcre +WANTLIB= c pcre glib-2.0 pthread USE_LIBTOOL= Yes MODULES= devel/gettext -LIB_DEPENDS= glib-2.0::devel/glib2 +LIB_DEPENDS= ::devel/glib2 CONFIGURE_STYLE= gnu -# This pkg-config has just become a reference application. So it's safe to depend -# on glib2 (which does depend on pkg-config. But that's the version from base.) +# This pkg-config has just become a reference application. So it's safe to +# depend on glib2 (which does depend on pkg-config. But that's the version +# from base.) CONFIGURE_ARGS+= --with-installed-glib .include diff --git a/devel/pkgconfig/distinfo b/devel/pkgconfig/distinfo index e90bbec8492..349f6bac9fa 100644 --- a/devel/pkgconfig/distinfo +++ b/devel/pkgconfig/distinfo @@ -1,5 +1,5 @@ -MD5 (pkg-config-0.23.tar.gz) = 2SKoh4K2REHQZUdjL9hXRA== -RMD160 (pkg-config-0.23.tar.gz) = CqVWVDDWCTGZF6wsj/6qXkpQlIk= -SHA1 (pkg-config-0.23.tar.gz) = tZ3d1rUyC9dMD3SzM5YYoycJayo= -SHA256 (pkg-config-0.23.tar.gz) = CKDgctagVBmlgSTbhk8GheaslucbKHW/FawScU6YO1M= -SIZE (pkg-config-0.23.tar.gz) = 1032839 +MD5 (pkg-config-0.25.tar.gz) = oycLqz9Labfcbb2svK6XRQ== +RMD160 (pkg-config-0.25.tar.gz) = g1UJ0B9oxFgj7onHGHdutm9hMWs= +SHA1 (pkg-config-0.25.tar.gz) = iSKutO3v9+1VTMGWnLtK1aTmsm4= +SHA256 (pkg-config-0.25.tar.gz) = O6aR7iQx8yzLjvoTHlm/I+N/Ei3GZ5EwkCPKbc780Q4= +SIZE (pkg-config-0.25.tar.gz) = 988899 diff --git a/devel/pkgconfig/patches/patch-Makefile_in b/devel/pkgconfig/patches/patch-Makefile_in index 044747d99e4..22dd2fe661e 100644 --- a/devel/pkgconfig/patches/patch-Makefile_in +++ b/devel/pkgconfig/patches/patch-Makefile_in @@ -1,12 +1,12 @@ -$OpenBSD: patch-Makefile_in,v 1.4 2005/10/05 08:50:21 espie Exp $ ---- Makefile.in.orig Tue Sep 20 23:50:12 2005 -+++ Makefile.in Tue Sep 20 23:50:55 2005 -@@ -56,7 +56,7 @@ CXXCPP = @CXXCPP@ - CXXDEPMODE = @CXXDEPMODE@ - CXXFLAGS = @CXXFLAGS@ +$OpenBSD: patch-Makefile_in,v 1.5 2010/09/28 11:41:22 jasper Exp $ +--- Makefile.in.orig Fri May 28 17:55:55 2010 ++++ Makefile.in Tue Sep 28 13:23:56 2010 +@@ -172,7 +172,7 @@ CFLAGS = @CFLAGS@ + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ +DEFS = @DEFS@ -DLOCALBASE="\"${LOCALBASE}\"" -DX11BASE="\"${X11BASE}\"" DEPDIR = @DEPDIR@ - ECHO = @ECHO@ - ECHO_C = @ECHO_C@ + DSYMUTIL = @DSYMUTIL@ + DUMPBIN = @DUMPBIN@ diff --git a/devel/pkgconfig/patches/patch-pkg_c b/devel/pkgconfig/patches/patch-pkg_c index 7930ffd0060..8ef07563324 100644 --- a/devel/pkgconfig/patches/patch-pkg_c +++ b/devel/pkgconfig/patches/patch-pkg_c @@ -1,7 +1,7 @@ -$OpenBSD: patch-pkg_c,v 1.7 2008/10/25 16:44:56 jasper Exp $ ---- pkg.c.orig Wed Jan 16 22:59:49 2008 -+++ pkg.c Sat Oct 25 16:53:23 2008 -@@ -393,7 +393,55 @@ get_package_quiet (const char *name) +$OpenBSD: patch-pkg_c,v 1.8 2010/09/28 11:41:22 jasper Exp $ +--- pkg.c.orig Sat May 8 22:14:17 2010 ++++ pkg.c Tue Sep 28 13:23:56 2010 +@@ -403,7 +403,55 @@ get_package_quiet (const char *name) return internal_get_package (name, FALSE, TRUE); } @@ -57,7 +57,7 @@ $OpenBSD: patch-pkg_c,v 1.7 2008/10/25 16:44:56 jasper Exp $ string_list_strip_duplicates (GSList *list) { GHashTable *table; -@@ -979,6 +1027,8 @@ get_merged (Package *pkg, GetListFunc func, gboolean i +@@ -983,6 +1031,8 @@ get_merged (Package *pkg, GetListFunc func, gboolean i g_slist_free (dups_list); diff --git a/devel/pkgconfig/pkg/PLIST b/devel/pkgconfig/pkg/PLIST index 8a04968db64..e4b846bede5 100644 --- a/devel/pkgconfig/pkg/PLIST +++ b/devel/pkgconfig/pkg/PLIST @@ -1,5 +1,6 @@ -@comment $OpenBSD: PLIST,v 1.6 2008/10/25 16:44:56 jasper Exp $ +@comment $OpenBSD: PLIST,v 1.7 2010/09/28 11:41:22 jasper Exp $ @bin bin/pkg-config @man man/man1/pkg-config.1 -@comment share/aclocal/ @comment share/aclocal/pkg.m4 +share/doc/pkg-config/ +share/doc/pkg-config/pkg-config-guide.html