diff options
| author | mezz <mezz@df743ca5-7f9a-e211-a948-0013205c9059> | 2006-07-23 10:13:41 +0800 |
|---|---|---|
| committer | mezz <mezz@df743ca5-7f9a-e211-a948-0013205c9059> | 2006-07-23 10:13:41 +0800 |
| commit | 62aee17d1df015f8e81cb8280b8aa68eebcbafd0 (patch) | |
| tree | 24fb6eb41bbf6e5b03ef20fdd58f9d24e3edf4cc /x11 | |
| parent | 87e441c1848e8061d98e4a1152d3d346383aba8b (diff) | |
| download | marcuscom-ports-62aee17d1df015f8e81cb8280b8aa68eebcbafd0.tar marcuscom-ports-62aee17d1df015f8e81cb8280b8aa68eebcbafd0.tar.gz marcuscom-ports-62aee17d1df015f8e81cb8280b8aa68eebcbafd0.tar.bz2 marcuscom-ports-62aee17d1df015f8e81cb8280b8aa68eebcbafd0.tar.lz marcuscom-ports-62aee17d1df015f8e81cb8280b8aa68eebcbafd0.tar.xz marcuscom-ports-62aee17d1df015f8e81cb8280b8aa68eebcbafd0.tar.zst marcuscom-ports-62aee17d1df015f8e81cb8280b8aa68eebcbafd0.zip | |
-USE_X_PREFIX -> USE_XLIB.
-Fix a few of X11BASE -> LOCALBASE.
-Bump the PORTREVISION.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@6707 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/gnome-menus/Makefile | 10 | ||||
| -rw-r--r-- | x11/gnome-menus/files/patch-simple-editor_GMenuSimpleEditor_menutreemodel.py | 4 |
2 files changed, 8 insertions, 6 deletions
diff --git a/x11/gnome-menus/Makefile b/x11/gnome-menus/Makefile index d6e4d040a..facdb8207 100644 --- a/x11/gnome-menus/Makefile +++ b/x11/gnome-menus/Makefile @@ -3,11 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/gnome-menus/Makefile,v 1.29 2006/04/13 13:04:49 ahze Exp $ +# $MCom$ # PORTNAME= gnome-menus PORTVERSION= 2.15.4.1 +PORTREVISION= 1 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -18,7 +19,7 @@ COMMENT= Implementation of the FreeDesktop Desktop Menu Spec USE_GETTEXT= yes USE_BZIP2= yes -USE_X_PREFIX= yes +USE_XLIB= yes USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack intlhack gnomevfs2 ltverhack USE_AUTOTOOLS= libtool:15 @@ -34,12 +35,13 @@ USE_FAM= yes .endif post-patch: - @${REINPLACE_CMD} -e 's|/usr/share/gnome|${X11BASE}/share/gnome|g' \ + @${REINPLACE_CMD} -e 's|/usr/share/gnome|${LOCALBASE}/share/gnome|g' \ ${WRKSRC}/layout/applications.menu \ ${WRKSRC}/layout/settings.menu @${SED} -e 's|/usr/local|${LOCALBASE}|g' \ < ${FILESDIR}/KDE.directory > ${WRKSRC}/KDE.directory - @${REINPLACE_CMD} -e s'|%%X11BASE%%|${X11BASE}|g' \ + @${REINPLACE_CMD} -e 's|%%X11BASE%%|${X11BASE}|g ; \ + s|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/simple-editor/GMenuSimpleEditor/menutreemodel.py post-install: diff --git a/x11/gnome-menus/files/patch-simple-editor_GMenuSimpleEditor_menutreemodel.py b/x11/gnome-menus/files/patch-simple-editor_GMenuSimpleEditor_menutreemodel.py index 2306f0609..562011969 100644 --- a/x11/gnome-menus/files/patch-simple-editor_GMenuSimpleEditor_menutreemodel.py +++ b/x11/gnome-menus/files/patch-simple-editor_GMenuSimpleEditor_menutreemodel.py @@ -5,7 +5,7 @@ conf_dirs = os.environ["XDG_CONFIG_DIRS"] if not conf_dirs: - conf_dirs = "/etc/xdg" -+ conf_dirs = "%%X11BASE%%/etc/xdg" ++ conf_dirs = "%%LOCALBASE%%/etc/xdg" for conf_dir in conf_dirs.split (":"): menu_file_path = os.path.join (conf_dir, "menus", menu_file) @@ -14,7 +14,7 @@ data_dirs = os.environ["XDG_DATA_DIRS"] if not data_dirs: - 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 = "%%X11BASE%%/share/gnome/:%%LOCALBASE%%/share/gnome/:%%X11BASE%%/share/:%%LOCALBASE%%/share/:/usr/share/" for data_dir in data_dirs.split (":"): retval = load_icon_from_path (os.path.join (data_dir, "pixmaps", icon_value)) |