cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use `correct' ports tree setup by default, look in both

Browse Source 
$LOCALBASE and $X11BASE.

Patch pkg-config to grab stuff from several system locations.
This commit is contained in:
espie 2005-04-09 13:07:43 +00:00
parent 84d7a482c5
commit 788553b77b
2 changed files with 34 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devel/pkgconfig/Makefile
View File

@ -1,9 +1,10 @@
# $OpenBSD: Makefile,v 1.16 2004/12/08 04:32:11 marcm Exp $
# $OpenBSD: Makefile,v 1.17 2005/04/09 13:07:43 espie Exp $
COMMENT= "tool for managing library compile/link flags"
VERSION= 0.15.0
DISTNAME= pkgconfig-${VERSION}
PKGNAME= ${DISTNAME}p0
CATEGORIES= devel
HOMEPAGE= http://www.freedesktop.org/software/pkgconfig/
@ -11,6 +12,7 @@ MASTER_SITES= ${HOMEPAGE}releases/ \
${MASTER_SITE_GNOME:=sources/pkgconfig/0.15/}
MAINTAINER= Marc Matteo <marcm@openbsd.org>
MAKE_FLAGS+= pkglibdir=${LOCALBASE}/lib/pkgconfig:${X11BASE}/lib/pkgconfig
# GPL
PERMIT_PACKAGE_CDROM= Yes

38
devel/pkgconfig/patches/patch-pkg_c
View File

@ -1,7 +1,30 @@
$OpenBSD: patch-pkg_c,v 1.4 2003/09/23 05:59:34 marcm Exp $
--- pkg.c.orig 2003-01-16 13:07:09.000000000 -0800
+++ pkg.c 2003-09-05 11:19:25.000000000 -0700
@@ -339,6 +339,54 @@ get_package (const char *name)
$OpenBSD: patch-pkg_c,v 1.5 2005/04/09 13:07:43 espie Exp $
--- pkg.c.orig Thu Jan 16 22:07:09 2003
+++ pkg.c Mon Apr 4 14:12:07 2005
@@ -202,7 +202,21 @@ package_init ()
path_positions = g_hash_table_new (g_str_hash, g_str_equal);
g_slist_foreach (search_dirs, (GFunc)scan_dir, NULL);
- scan_dir (pkglibdir);
+ {
+ char **config_dirs;
+ char **iter;
+
+ config_dirs = g_strsplit (pkglibdir, G_SEARCHPATH_SEPARATOR_S, -1);
+ iter = config_dirs;
+ while (*iter)
+ {
+ scan_dir (*iter);
+
+ ++iter;
+ }
+
+ g_strfreev (config_dirs);
+ }
}
}
@@ -339,7 +353,55 @@ get_package (const char *name)
return internal_get_package (name, TRUE, TRUE);
}
@ -9,7 +32,7 @@ $OpenBSD: patch-pkg_c,v 1.4 2003/09/23 05:59:34 marcm Exp $
+ If certain directories are present, move them to the end of the list
+ to avoid conflicts.
+*/
+static GSList*
static GSList*
+string_list_fix_local_I_dirs (GSList *list)
+{
+ GSList *iter;
@ -53,10 +76,11 @@ $OpenBSD: patch-pkg_c,v 1.4 2003/09/23 05:59:34 marcm Exp $
+ return list;
+}
+
static GSList*
+static GSList*
string_list_strip_duplicates (GSList *list)
{
@@ -929,6 +977,8 @@ get_multi_merged (GSList *pkgs, GetListF
GHashTable *table;
@@ -929,6 +991,8 @@ get_multi_merged (GSList *pkgs, GetListF
g_slist_free (dups_list);