diff options
| -rw-r--r-- | deskutils/deskbar-applet/Makefile | 6 | ||||
| -rw-r--r-- | deskutils/deskbar-applet/files/patch-deskbar_Utils.py | 2 | ||||
| -rw-r--r-- | devel/glib20/Makefile | 7 | ||||
| -rw-r--r-- | devel/glib20/files/patch-glib_gutils.c | 4 |
4 files changed, 9 insertions, 10 deletions
diff --git a/deskutils/deskbar-applet/Makefile b/deskutils/deskbar-applet/Makefile index 78b94e939..120ff2de4 100644 --- a/deskutils/deskbar-applet/Makefile +++ b/deskutils/deskbar-applet/Makefile @@ -3,12 +3,12 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/deskutils/deskbar-applet/Makefile,v 1.56 2007/04/28 05:39:15 marcus Exp $ +# $MCom: ports/deskutils/deskbar-applet/Makefile,v 1.57 2007/05/19 21:36:01 marcus Exp $ # PORTNAME= deskbar-applet PORTVERSION= 2.18.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= deskutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -57,7 +57,7 @@ CONFIGURE_ENV+= DISPLAY="localhost:1001" post-patch: @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g ; \ - s|%%X11BASE%%|${X11BASE}|g ; s|%%LOCALBASE%%|${LOCALBASE}|g' \ + s|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/deskbar/handlers/mozilla.py \ ${WRKSRC}/deskbar/Utils.py diff --git a/deskutils/deskbar-applet/files/patch-deskbar_Utils.py b/deskutils/deskbar-applet/files/patch-deskbar_Utils.py index 9f896130e..5fffd29d7 100644 --- a/deskutils/deskbar-applet/files/patch-deskbar_Utils.py +++ b/deskutils/deskbar-applet/files/patch-deskbar_Utils.py @@ -5,7 +5,7 @@ sysdirs = os.getenv("XDG_DATA_DIRS") if sysdirs == None: - sysdirs = "/usr/local/share:/usr/share" -+ sysdirs = "/usr/local/share/:%%X11BASE%%/share/" ++ sysdirs = "/usr/local/share" dirs = "%s:%s" % (dirs, sysdirs) return [dir for dir in dirs.split(":") if dir.strip() != "" and exists(dir)] 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 |