From 22b845015df6acb2f643a2b200d74d5a67be3e08 Mon Sep 17 00:00:00 2001 From: marcus Date: Sat, 19 May 2007 22:03:28 +0000 Subject: Remove support for a separate X11BASE. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@8888 df743ca5-7f9a-e211-a948-0013205c9059 --- devel/gnome-vfs/Makefile | 6 ++-- devel/gnome-vfs/files/patch-libgnomevfs_xdgmime.c | 2 +- devel/gnome-vfs/pkg-plist | 38 -------------------- x11-toolkits/gtk20/Makefile | 9 +++-- .../gtk20/files/patch-gtk_xdgmime_xdgmime.c | 2 +- x11-toolkits/gtk20/pkg-plist | 40 ---------------------- 6 files changed, 8 insertions(+), 89 deletions(-) diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile index 8cfa9a064..51ed544b6 100644 --- a/devel/gnome-vfs/Makefile +++ b/devel/gnome-vfs/Makefile @@ -3,12 +3,12 @@ # Whom: Ade Lovett # # $FreeBSD$ -# $MCom: ports/devel/gnome-vfs/Makefile,v 1.170 2007/05/15 00:38:01 marcus Exp $ +# $MCom: ports/devel/gnome-vfs/Makefile,v 1.171 2007/05/19 21:36:05 marcus Exp $ # PORTNAME= gnome-vfs PORTVERSION= 2.19.2 -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' \ diff --git a/devel/gnome-vfs/files/patch-libgnomevfs_xdgmime.c b/devel/gnome-vfs/files/patch-libgnomevfs_xdgmime.c index 621282a5e..a9879578a 100644 --- a/devel/gnome-vfs/files/patch-libgnomevfs_xdgmime.c +++ b/devel/gnome-vfs/files/patch-libgnomevfs_xdgmime.c @@ -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/:%%X11BASE%%/share/"; ++ xdg_data_dirs = "%%LOCALBASE%%/share/"; ptr = xdg_data_dirs; diff --git a/devel/gnome-vfs/pkg-plist b/devel/gnome-vfs/pkg-plist index b85e303ee..6eac5947b 100644 --- a/devel/gnome-vfs/pkg-plist +++ b/devel/gnome-vfs/pkg-plist @@ -195,63 +195,25 @@ share/locale/zu/LC_MESSAGES/gnome-vfs-2.0.mo @dirrm include/gnome-vfs-2.0 @dirrmtry share/locale/zu/LC_MESSAGES @dirrmtry share/locale/zu -@dirrmtry share/locale/zh_TW/LC_MESSAGES -@dirrmtry share/locale/zh_TW @dirrmtry share/locale/zh_HK/LC_MESSAGES @dirrmtry share/locale/zh_HK -@dirrmtry share/locale/zh_CN/LC_MESSAGES -@dirrmtry share/locale/zh_CN @dirrmtry share/locale/yi/LC_MESSAGES @dirrmtry share/locale/yi @dirrmtry share/locale/xh/LC_MESSAGES @dirrmtry share/locale/xh -@dirrmtry share/locale/uk/LC_MESSAGES -@dirrmtry share/locale/uk @dirrmtry share/locale/sr@ije/LC_MESSAGES @dirrmtry share/locale/sr@ije -@dirrmtry share/locale/sr/LC_MESSAGES -@dirrmtry share/locale/sr -@dirrmtry share/locale/sl/LC_MESSAGES -@dirrmtry share/locale/sl -@dirrmtry share/locale/sk/LC_MESSAGES -@dirrmtry share/locale/sk @dirrmtry share/locale/rw/LC_MESSAGES @dirrmtry share/locale/rw -@dirrmtry share/locale/ro/LC_MESSAGES -@dirrmtry share/locale/ro -@dirrmtry share/locale/pt/LC_MESSAGES -@dirrmtry share/locale/pt -@dirrmtry share/locale/pl/LC_MESSAGES -@dirrmtry share/locale/pl @dirrmtry share/locale/oc/LC_MESSAGES @dirrmtry share/locale/oc @dirrmtry share/locale/nso/LC_MESSAGES @dirrmtry share/locale/nso -@dirrmtry share/locale/nn/LC_MESSAGES -@dirrmtry share/locale/nn -@dirrmtry share/locale/ne/LC_MESSAGES -@dirrmtry share/locale/ne @dirrmtry share/locale/mr/LC_MESSAGES @dirrmtry share/locale/mr @dirrmtry share/locale/mg/LC_MESSAGES @dirrmtry share/locale/mg -@dirrmtry share/locale/li/LC_MESSAGES -@dirrmtry share/locale/li @dirrmtry share/locale/ku/LC_MESSAGES @dirrmtry share/locale/ku -@dirrmtry share/locale/ko/LC_MESSAGES -@dirrmtry share/locale/ko -@dirrmtry share/locale/gl/LC_MESSAGES -@dirrmtry share/locale/gl -@dirrmtry share/locale/fi/LC_MESSAGES -@dirrmtry share/locale/fi -@dirrmtry share/locale/el/LC_MESSAGES -@dirrmtry share/locale/el -@dirrmtry share/locale/cs/LC_MESSAGES -@dirrmtry share/locale/cs -@dirrmtry share/locale/ca/LC_MESSAGES -@dirrmtry share/locale/ca @dirrmtry share/locale/bn_IN/LC_MESSAGES @dirrmtry share/locale/bn_IN -@dirrmtry share/locale/be/LC_MESSAGES -@dirrmtry share/locale/be diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile index dc12c396f..6cdfc00c2 100644 --- a/x11-toolkits/gtk20/Makefile +++ b/x11-toolkits/gtk20/Makefile @@ -3,7 +3,7 @@ # Whom: Vanilla I. Shu # # $FreeBSD$ -# $MCom: ports/x11-toolkits/gtk20/Makefile,v 1.104 2007/05/03 02:31:33 marcus Exp $ +# $MCom: ports/x11-toolkits/gtk20/Makefile,v 1.105 2007/05/19 21:36:32 marcus Exp $ # PORTNAME= gtk @@ -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}|; \ diff --git a/x11-toolkits/gtk20/files/patch-gtk_xdgmime_xdgmime.c b/x11-toolkits/gtk20/files/patch-gtk_xdgmime_xdgmime.c index 1dbbaf471..e0fd02d4f 100644 --- a/x11-toolkits/gtk20/files/patch-gtk_xdgmime_xdgmime.c +++ b/x11-toolkits/gtk20/files/patch-gtk_xdgmime_xdgmime.c @@ -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 = "/usr/local/share/:%%X11BASE%%/share/"; ++ xdg_data_dirs = "/usr/local/share/"; ptr = xdg_data_dirs; diff --git a/x11-toolkits/gtk20/pkg-plist b/x11-toolkits/gtk20/pkg-plist index a7009f228..654ff4d68 100644 --- a/x11-toolkits/gtk20/pkg-plist +++ b/x11-toolkits/gtk20/pkg-plist @@ -618,86 +618,46 @@ share/themes/Raleigh/gtk-2.0/gtkrc @dirrmtry lib/gtk-2.0/%%GTK_VERSION%%/engines @dirrmtry lib/gtk-2.0/%%GTK_VERSION%% @dirrmtry lib/gtk-2.0 -@dirrmtry share/locale/zh_TW/LC_MESSAGES -@dirrmtry share/locale/zh_TW @dirrmtry share/locale/zh_HK/LC_MESSAGES @dirrmtry share/locale/zh_HK -@dirrmtry share/locale/zh_CN/LC_MESSAGES -@dirrmtry share/locale/zh_CN @dirrmtry share/locale/yi/LC_MESSAGES @dirrmtry share/locale/yi @dirrmtry share/locale/xh/LC_MESSAGES @dirrmtry share/locale/xh @dirrmtry share/locale/uz@Latn/LC_MESSAGES @dirrmtry share/locale/uz@Latn -@dirrmtry share/locale/uz/LC_MESSAGES -@dirrmtry share/locale/uz @dirrmtry share/locale/ur/LC_MESSAGES @dirrmtry share/locale/ur -@dirrmtry share/locale/uk/LC_MESSAGES -@dirrmtry share/locale/uk @dirrmtry share/locale/tt/LC_MESSAGES @dirrmtry share/locale/tt -@dirrmtry share/locale/tk/LC_MESSAGES -@dirrmtry share/locale/tk @dirrmtry share/locale/te/LC_MESSAGES @dirrmtry share/locale/te @dirrmtry share/locale/sr@ije/LC_MESSAGES @dirrmtry share/locale/sr@ije -@dirrmtry share/locale/sr/LC_MESSAGES -@dirrmtry share/locale/sr -@dirrmtry share/locale/sl/LC_MESSAGES -@dirrmtry share/locale/sl @dirrmtry share/locale/sk/LC_MESSAGES @dirrmtry share/locale/sk @dirrmtry share/locale/si/LC_MESSAGES @dirrmtry share/locale/si @dirrmtry share/locale/rw/LC_MESSAGES @dirrmtry share/locale/rw -@dirrmtry share/locale/ro/LC_MESSAGES -@dirrmtry share/locale/ro -@dirrmtry share/locale/pt/LC_MESSAGES -@dirrmtry share/locale/pt -@dirrmtry share/locale/pl/LC_MESSAGES -@dirrmtry share/locale/pl @dirrmtry share/locale/nso/LC_MESSAGES @dirrmtry share/locale/nso -@dirrmtry share/locale/nn/LC_MESSAGES -@dirrmtry share/locale/nn -@dirrmtry share/locale/ne/LC_MESSAGES -@dirrmtry share/locale/ne @dirrmtry share/locale/mr/LC_MESSAGES @dirrmtry share/locale/mr @dirrmtry share/locale/mi/LC_MESSAGES @dirrmtry share/locale/mi -@dirrmtry share/locale/li/LC_MESSAGES -@dirrmtry share/locale/li @dirrmtry share/locale/ku/LC_MESSAGES @dirrmtry share/locale/ku -@dirrmtry share/locale/ko/LC_MESSAGES -@dirrmtry share/locale/ko @dirrmtry share/locale/ia/LC_MESSAGES @dirrmtry share/locale/ia @dirrmtry share/locale/hy/LC_MESSAGES @dirrmtry share/locale/hy -@dirrmtry share/locale/gl/LC_MESSAGES -@dirrmtry share/locale/gl -@dirrmtry share/locale/fi/LC_MESSAGES -@dirrmtry share/locale/fi -@dirrmtry share/locale/el/LC_MESSAGES -@dirrmtry share/locale/el @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz -@dirrmtry share/locale/cs/LC_MESSAGES -@dirrmtry share/locale/cs -@dirrmtry share/locale/ca/LC_MESSAGES -@dirrmtry share/locale/ca @dirrmtry share/locale/bn_IN/LC_MESSAGES @dirrmtry share/locale/bn_IN @dirrmtry share/locale/be@latin/LC_MESSAGES @dirrmtry share/locale/be@latin -@dirrmtry share/locale/be/LC_MESSAGES -@dirrmtry share/locale/be @dirrmtry share/locale/az_IR/LC_MESSAGES @dirrmtry share/locale/az_IR @dirrmtry share/locale/as/LC_MESSAGES -- cgit v1.2.3