mirror of
https://git.FreeBSD.org/ports.git
synced 2024-12-25 04:43:33 +00:00
Remove support for a separate X11BASE.
Approved by: portmgr (implicit)
This commit is contained in:
parent
fd84d6227d
commit
90774037f4
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=191551
@ -8,7 +8,7 @@
|
||||
|
||||
PORTNAME= gnome-vfs
|
||||
PORTVERSION= 2.18.1
|
||||
PORTREVISION?= 1
|
||||
PORTREVISION?= 2
|
||||
CATEGORIES= devel gnome
|
||||
MASTER_SITES= ${MASTER_SITE_GNOME}
|
||||
MASTER_SITE_SUBDIR= sources/gnome-vfs/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
|
||||
@ -82,9 +82,7 @@ post-patch:
|
||||
@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
|
||||
${WRKSRC}/libgnomevfs/Makefile.in
|
||||
@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g ; \
|
||||
s|/usr/X11R6|${X11BASE}|g ; \
|
||||
s|%%LOCALBASE%%|${LOCALBASE}|g; \
|
||||
s|%%X11BASE%%|${X11BASE}|g' \
|
||||
${WRKSRC}/libgnomevfs/xdgmime.c \
|
||||
${WRKSRC}/libgnomevfs/gnome-vfs-hal-mounts.c
|
||||
@${REINPLACE_CMD} -e 's|-lacl||g' \
|
||||
|
@ -5,7 +5,7 @@
|
||||
xdg_data_dirs = getenv ("XDG_DATA_DIRS");
|
||||
if (xdg_data_dirs == NULL)
|
||||
- xdg_data_dirs = "/usr/local/share/:/usr/share/";
|
||||
+ xdg_data_dirs = "%%LOCALBASE%%/share/gnome/:%%X11BASE%%/share/gnome/:%%LOCALBASE%%/share/:%%X11BASE%%/share/:/usr/share/";
|
||||
+ xdg_data_dirs = "%%LOCALBASE%%/share/gnome/:%%LOCALBASE%%/share/:/usr/share/";
|
||||
|
||||
ptr = xdg_data_dirs;
|
||||
|
||||
|
@ -6,7 +6,7 @@
|
||||
|
||||
PORTNAME= shared-mime-info
|
||||
PORTVERSION= 0.21
|
||||
PORTREVISION= 2
|
||||
PORTREVISION= 3
|
||||
CATEGORIES= misc gnome
|
||||
MASTER_SITES= http://people.freedesktop.org/~hadess/
|
||||
|
||||
@ -26,9 +26,7 @@ MAN1= update-mime-database.1
|
||||
|
||||
PKGINSTALL= ${WRKDIR}/pkg-install
|
||||
|
||||
MIMEDIRS= ${X11BASE}/share/gnome/mime \
|
||||
${LOCALBASE}/share/gnome/mime \
|
||||
${X11BASE}/share/mime \
|
||||
MIMEDIRS= ${LOCALBASE}/share/gnome/mime \
|
||||
${LOCALBASE}/share/mime \
|
||||
${PREFIX}/share/mime \
|
||||
/usr/share/mime
|
||||
@ -38,15 +36,9 @@ MIMESUBDIRS= application audio image inode message model multipart \
|
||||
post-patch:
|
||||
@${REINPLACE_CMD} -e 's|%%MIMEDIRS%%|${MIMEDIRS}|g' \
|
||||
${WRKSRC}/Makefile.in
|
||||
@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g ; \
|
||||
s|%%X11BASE%%|${X11BASE}|g' \
|
||||
@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
|
||||
${WRKSRC}/update-mime-database.c
|
||||
|
||||
pre-su-install:
|
||||
.for subdir in ${MIMESUBDIRS}
|
||||
${MKDIR} ${X11BASE}/share/mime/${subdir}
|
||||
.endfor
|
||||
|
||||
post-install:
|
||||
@${SED} -e 's|%%PREFIX%%|${PREFIX}| ; \
|
||||
s|%%MIMEDIRS%%|${MIMEDIRS}|' \
|
||||
|
@ -15,7 +15,7 @@
|
||||
env = getenv("XDG_DATA_DIRS");
|
||||
if (!env)
|
||||
- env = "/usr/local/share/:/usr/share/";
|
||||
+ env = "%%X11BASE%%/share/gnome/:/usr/local/share/gnome/:%%X11BASE%%/share/:/usr/local/share/:/usr/share/";
|
||||
+ env = "/usr/local/share/gnome/:/usr/local/share/:/usr/share/";
|
||||
dirs = g_strsplit(env, ":", 0);
|
||||
g_return_if_fail(dirs != NULL);
|
||||
for (n = 0; dirs[n]; n++)
|
||||
|
@ -8,7 +8,7 @@
|
||||
|
||||
PORTNAME= gtk
|
||||
PORTVERSION= 2.10.12
|
||||
PORTREVISION?= 1
|
||||
PORTREVISION?= 2
|
||||
CATEGORIES= x11-toolkits
|
||||
MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/,} \
|
||||
ftp://ftp.gtk.org/pub/gtk/v2.10/ \
|
||||
@ -45,8 +45,8 @@ USE_GETTEXT= yes
|
||||
USE_XLIB= yes
|
||||
CONFIGURE_ARGS= --enable-static --with-xinput=yes
|
||||
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/freetype2 \
|
||||
-I${LOCALBASE}/include -I${X11BASE}/include" \
|
||||
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
|
||||
-I${LOCALBASE}/include" \
|
||||
LDFLAGS="-L${LOCALBASE}/lib"
|
||||
GTK_VERSION= 2.10.0
|
||||
PLIST_SUB= GTK_VERSION="${GTK_VERSION}"
|
||||
|
||||
@ -73,8 +73,7 @@ post-patch:
|
||||
${XARGS} ${REINPLACE_CMD} -e 's|-lgmodule|@GMODULE_LIBS@|g'
|
||||
@${REINPLACE_CMD} -e 's|[{]libdir[}]/locale|{datadir}/locale|g' \
|
||||
${WRKSRC}/configure
|
||||
@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g ; \
|
||||
s|%%X11BASE%%|${X11BASE}|g' \
|
||||
@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
|
||||
${WRKSRC}/gtk/xdgmime/xdgmime.c
|
||||
# GnomeVFS needs pthread; gtk-demo may use GnomeVFS (via GtkFileChooser)
|
||||
@${REINPLACE_CMD} -e 's|@CFLAGS@|& ${PTHREAD_CFLAGS}|; \
|
||||
|
@ -5,7 +5,7 @@
|
||||
xdg_data_dirs = getenv ("XDG_DATA_DIRS");
|
||||
if (xdg_data_dirs == NULL)
|
||||
- xdg_data_dirs = "/usr/local/share/:/usr/share/";
|
||||
+ xdg_data_dirs = "%%X11BASE%%/share/gnome/:/usr/local/share/gnome/:%%X11BASE%%/share/:/usr/local/share/:/usr/share/";
|
||||
+ xdg_data_dirs = "/usr/local/share/gnome/:/usr/local/share/:/usr/share/";
|
||||
|
||||
ptr = xdg_data_dirs;
|
||||
|
||||
|
@ -8,7 +8,7 @@
|
||||
|
||||
PORTNAME= gtk
|
||||
PORTVERSION= 2.10.12
|
||||
PORTREVISION?= 1
|
||||
PORTREVISION?= 2
|
||||
CATEGORIES= x11-toolkits
|
||||
MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/,} \
|
||||
ftp://ftp.gtk.org/pub/gtk/v2.10/ \
|
||||
@ -45,8 +45,8 @@ USE_GETTEXT= yes
|
||||
USE_XLIB= yes
|
||||
CONFIGURE_ARGS= --enable-static --with-xinput=yes
|
||||
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/freetype2 \
|
||||
-I${LOCALBASE}/include -I${X11BASE}/include" \
|
||||
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
|
||||
-I${LOCALBASE}/include" \
|
||||
LDFLAGS="-L${LOCALBASE}/lib"
|
||||
GTK_VERSION= 2.10.0
|
||||
PLIST_SUB= GTK_VERSION="${GTK_VERSION}"
|
||||
|
||||
@ -73,8 +73,7 @@ post-patch:
|
||||
${XARGS} ${REINPLACE_CMD} -e 's|-lgmodule|@GMODULE_LIBS@|g'
|
||||
@${REINPLACE_CMD} -e 's|[{]libdir[}]/locale|{datadir}/locale|g' \
|
||||
${WRKSRC}/configure
|
||||
@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g ; \
|
||||
s|%%X11BASE%%|${X11BASE}|g' \
|
||||
@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
|
||||
${WRKSRC}/gtk/xdgmime/xdgmime.c
|
||||
# GnomeVFS needs pthread; gtk-demo may use GnomeVFS (via GtkFileChooser)
|
||||
@${REINPLACE_CMD} -e 's|@CFLAGS@|& ${PTHREAD_CFLAGS}|; \
|
||||
|
@ -5,7 +5,7 @@
|
||||
xdg_data_dirs = getenv ("XDG_DATA_DIRS");
|
||||
if (xdg_data_dirs == NULL)
|
||||
- xdg_data_dirs = "/usr/local/share/:/usr/share/";
|
||||
+ xdg_data_dirs = "%%X11BASE%%/share/gnome/:/usr/local/share/gnome/:%%X11BASE%%/share/:/usr/local/share/:/usr/share/";
|
||||
+ xdg_data_dirs = "/usr/local/share/gnome/:/usr/local/share/:/usr/share/";
|
||||
|
||||
ptr = xdg_data_dirs;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user