diff options
| author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2007-05-21 06:03:10 +0800 |
|---|---|---|
| committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2007-05-21 06:03:10 +0800 |
| commit | 57727e912ce3a82fa5f8ba9438237937cffea880 (patch) | |
| tree | 6750339edc1ff447fbd010f140bac2b0739d1c78 /devel/glib20 | |
| parent | 3e34caa392ce0dfb72dd4d117c6efe6050df6186 (diff) | |
| download | marcuscom-ports-57727e912ce3a82fa5f8ba9438237937cffea880.tar marcuscom-ports-57727e912ce3a82fa5f8ba9438237937cffea880.tar.gz marcuscom-ports-57727e912ce3a82fa5f8ba9438237937cffea880.tar.bz2 marcuscom-ports-57727e912ce3a82fa5f8ba9438237937cffea880.tar.lz marcuscom-ports-57727e912ce3a82fa5f8ba9438237937cffea880.tar.xz marcuscom-ports-57727e912ce3a82fa5f8ba9438237937cffea880.tar.zst marcuscom-ports-57727e912ce3a82fa5f8ba9438237937cffea880.zip | |
Remove support for a separate X11BASE.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@8891 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'devel/glib20')
| -rw-r--r-- | devel/glib20/Makefile | 7 | ||||
| -rw-r--r-- | devel/glib20/files/patch-glib_gutils.c | 4 |
2 files changed, 5 insertions, 6 deletions
diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile index 6594c6a4b..fc5cf76d7 100644 --- a/devel/glib20/Makefile +++ b/devel/glib20/Makefile @@ -3,12 +3,12 @@ # Whom: Vanilla I. Shu <vanilla@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/glib20/Makefile,v 1.93 2007/03/19 14:02:17 ahze Exp $ +# $MCom: ports/devel/glib20/Makefile,v 1.94 2007/05/03 19:24:10 marcus Exp $ # PORTNAME= glib PORTVERSION= 2.13.1 -PORTREVISION?= 0 +PORTREVISION?= 1 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 ad4210c25..95a02e475 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/"; 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 |