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

fix wrong and hardcoded paths.

Browse Source 
from Mikolaj Kucharski <mikolaj.kucharski@gmail.com>

ok martynas@ naddy@
This commit is contained in:
jasper 2007-04-24 18:21:14 +00:00
parent 2fd896db02
commit cb81475a81
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
devel/glib2/Makefile
View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.30 2007/04/23 16:22:07 jasper Exp $
# $OpenBSD: Makefile,v 1.31 2007/04/24 18:21:14 jasper Exp $
COMMENT-main= "general-purpose utility library"
COMMENT-docs= "glib2 documentation"
VERSION= 2.12.11
DISTNAME= glib-${VERSION}
PKGNAME-main= glib2-${VERSION}
PKGNAME-main= glib2-${VERSION}p0
PKGNAME-docs= glib2-docs-${VERSION}
CATEGORIES= devel
@ -46,6 +46,10 @@ CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
# Port has "/usr/local" hardcoded, we prefer ${LOCALBASE}
pre-build:
perl -pi -e "s,/usr/local,${LOCALBASE},g" ${WRKSRC}/glib/gutils.c
# Work around an issue in our libtool where -pthread is not listed as a
# dependency
post-install:

12
devel/glib2/patches/patch-glib_gutils_c Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-glib_gutils_c,v 1.1 2007/04/24 18:21:14 jasper Exp $
--- glib/gutils.c.orig Thu Jul 6 14:30:16 2006
+++ glib/gutils.c Thu Dec 21 14:07:45 2006
@@ -2489,7 +2489,7 @@ g_get_system_data_dirs (void)
gchar *data_dirs = (gchar *) g_getenv ("XDG_DATA_DIRS");
if (!data_dirs || !data_dirs[0])
- data_dirs = "/usr/local/share/:/usr/share/";
+ data_dirs = "/var/db/gnome/:/usr/local/share/";
data_dir_vector = g_strsplit (data_dirs, G_SEARCHPATH_SEPARATOR_S, 0);
#endif