diff options
| author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2007-05-20 22:08:23 +0000 |
|---|---|---|
| committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2007-05-20 22:08:23 +0000 |
| commit | ca0d7739437d8179095a364781dca0706918b154 (patch) | |
| tree | 9a5d11694e7c45a81dd017bafe7f4fd5a9d01202 /devel/glib20 | |
| parent | f4f4e577d0685d1aa2194593e31419c3e06c1e44 (diff) | |
| download | ports-ca0d7739437d8179095a364781dca0706918b154.tar.gz ports-ca0d7739437d8179095a364781dca0706918b154.zip | |
Notes
Diffstat (limited to 'devel/glib20')
| -rw-r--r-- | devel/glib20/Makefile | 5 | ||||
| -rw-r--r-- | devel/glib20/files/patch-glib_gutils.c | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile index f61838718059..0be59c4073fe 100644 --- a/devel/glib20/Makefile +++ b/devel/glib20/Makefile @@ -8,7 +8,7 @@ PORTNAME= glib PORTVERSION= 2.12.12 -PORTREVISION?= 1 +PORTREVISION?= 2 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/glib/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/},} \ ftp://ftp.gtk.org/pub/glib/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/ \ @@ -67,8 +67,7 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-patch-glib_Makefile.in \ .endif post-patch: - @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g ; \ - s|%%X11BASE%%|${X11BASE}|g' \ + @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \ ${WRKSRC}/glib/gutils.c .include <bsd.port.post.mk> diff --git a/devel/glib20/files/patch-glib_gutils.c b/devel/glib20/files/patch-glib_gutils.c index ad4210c2526f..8fd5f9ead041 100644 --- a/devel/glib20/files/patch-glib_gutils.c +++ b/devel/glib20/files/patch-glib_gutils.c @@ -5,7 +5,7 @@ if (!data_dirs || !data_dirs[0]) - data_dirs = "/usr/local/share/:/usr/share/"; -+ data_dirs = "%%X11BASE%%/share/gnome/:/usr/local/share/gnome/:%%X11BASE%%/share/:/usr/local/share/:/usr/share/"; ++ data_dirs = "/usr/local/share/gnome/:/usr/local/share/:/usr/share/"; data_dir_vector = g_strsplit (data_dirs, G_SEARCHPATH_SEPARATOR_S, 0); #endif @@ -14,7 +14,7 @@ if (!conf_dirs || !conf_dirs[0]) - conf_dirs = "/etc/xdg"; -+ conf_dirs = "%%X11BASE%%/etc/xdg:/usr/local/etc/xdg:/etc/xdg"; ++ conf_dirs = "/usr/local/etc/xdg:/etc/xdg"; conf_dir_vector = g_strsplit (conf_dirs, G_SEARCHPATH_SEPARATOR_S, 0); #endif |