diff options
| author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2007-05-19 22:01:13 +0000 |
|---|---|---|
| committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2007-05-19 22:01:13 +0000 |
| commit | 90774037f4cc76516784395d95af396005e33103 (patch) | |
| tree | 35fc1b521c191fcaee97cff250a56a76e3e958a6 /x11-toolkits | |
| parent | Add missing mtree file. (diff) | |
Remove support for a separate X11BASE.
Approved by: portmgr (implicit)
Notes
Notes:
svn path=/head/; revision=191551
Diffstat (limited to 'x11-toolkits')
| -rw-r--r-- | x11-toolkits/gtk20/Makefile | 9 | ||||
| -rw-r--r-- | x11-toolkits/gtk20/files/patch-gtk_xdgmime_xdgmime.c | 2 | ||||
| -rw-r--r-- | x11-toolkits/gtk30/Makefile | 9 | ||||
| -rw-r--r-- | x11-toolkits/gtk30/files/patch-gtk_xdgmime_xdgmime.c | 2 |
4 files changed, 10 insertions, 12 deletions
diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile index 8b79e24cc61a..eedaf1abd334 100644 --- a/x11-toolkits/gtk20/Makefile +++ b/x11-toolkits/gtk20/Makefile @@ -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}|; \ diff --git a/x11-toolkits/gtk20/files/patch-gtk_xdgmime_xdgmime.c b/x11-toolkits/gtk20/files/patch-gtk_xdgmime_xdgmime.c index b39aaedd07b5..c33fc40e8264 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 = "%%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; diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile index 8b79e24cc61a..eedaf1abd334 100644 --- a/x11-toolkits/gtk30/Makefile +++ b/x11-toolkits/gtk30/Makefile @@ -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}|; \ diff --git a/x11-toolkits/gtk30/files/patch-gtk_xdgmime_xdgmime.c b/x11-toolkits/gtk30/files/patch-gtk_xdgmime_xdgmime.c index b39aaedd07b5..c33fc40e8264 100644 --- a/x11-toolkits/gtk30/files/patch-gtk_xdgmime_xdgmime.c +++ b/x11-toolkits/gtk30/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 = "%%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; |