diff options
41 files changed, 103 insertions, 109 deletions
diff --git a/Mk/bsd.gnome.mk b/Mk/bsd.gnome.mk index 3f318ed5a..c9d6df5bf 100644 --- a/Mk/bsd.gnome.mk +++ b/Mk/bsd.gnome.mk @@ -3,7 +3,7 @@ # # $FreeBSD$ # $NetBSD: $ -# $MCom: ports/Mk/bsd.gnome.mk,v 1.414 2007/03/13 01:24:54 marcus Exp $ +# $MCom: ports/Mk/bsd.gnome.mk,v 1.415 2007/04/26 00:37:33 mezz Exp $ # # Please view me with 4 column tabs! @@ -40,9 +40,9 @@ Gnome_Pre_Include= bsd.gnome.mk # each .omf file found to track OMF registration database. # # INSTALLS_ICONS - If your port installs Freedesktop-style icons to -# ${LOCALBASE}/share/icons or ${X11BASE}/share/icons, then -# you should use this macro. If the icons are not cached, -# they will not be displayed. +# ${LOCALBASE}/share/icons, then you should use this +# macro. If the icons are not cached, they will not be +# displayed. # # non-version specific components diff --git a/accessibility/at-spi/Makefile b/accessibility/at-spi/Makefile index 495fccdfd..343e81bf6 100644 --- a/accessibility/at-spi/Makefile +++ b/accessibility/at-spi/Makefile @@ -3,7 +3,7 @@ # Whom: Maxim Sobolev <sobomax@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/accessibility/at-spi/Makefile,v 1.59 2007/04/26 14:48:54 ahze Exp $ +# $MCom: ports/accessibility/at-spi/Makefile,v 1.60 2007/05/19 21:35:52 marcus Exp $ # PORTNAME= at-spi @@ -29,8 +29,8 @@ USE_XLIB= yes USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-static -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" post-extract: @${RM} -f ${WRKSRC}/registryd/Accessibility_Registry.server diff --git a/accessibility/gnome-mag/Makefile b/accessibility/gnome-mag/Makefile index 879707cee..60f232b4f 100644 --- a/accessibility/gnome-mag/Makefile +++ b/accessibility/gnome-mag/Makefile @@ -3,7 +3,7 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/accessibility/gnome-mag/Makefile,v 1.29 2007/04/28 17:28:01 marcus Exp $ +# $MCom: ports/accessibility/gnome-mag/Makefile,v 1.30 2007/05/19 21:35:53 marcus Exp $ # PORTNAME= gnome-mag @@ -24,8 +24,8 @@ USE_GMAKE= yes USE_GETTEXT= yes USE_AUTOTOOLS= libtool:15 USE_LDCONFIG= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" DOCSDIR= ${PREFIX}/share/doc/gnome-mag-${PORTVERSION} diff --git a/accessibility/gok/Makefile b/accessibility/gok/Makefile index 6a01e36b5..b039d0116 100644 --- a/accessibility/gok/Makefile +++ b/accessibility/gok/Makefile @@ -3,7 +3,7 @@ # Whom: Adam Weinberger <adamw@freebsd.org> # # $FreeBSD$ -# $MCom: ports/accessibility/gok/Makefile,v 1.74 2007/04/26 16:27:42 ahze Exp $ +# $MCom: ports/accessibility/gok/Makefile,v 1.75 2007/05/19 21:35:53 marcus Exp $ # PORTNAME= gok @@ -26,8 +26,8 @@ USE_GNOME= gnomehack gnomeprefix intlhack libgnomeui atspi libwnck \ gnomespeech USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" GCONF_SCHEMAS= gok.schemas diff --git a/accessibility/orca/Makefile b/accessibility/orca/Makefile index a8b61fb15..25e1a515a 100644 --- a/accessibility/orca/Makefile +++ b/accessibility/orca/Makefile @@ -3,7 +3,7 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/accessibility/orca/Makefile,v 1.20 2007/05/14 04:33:48 marcus Exp $ +# $MCom: ports/accessibility/orca/Makefile,v 1.21 2007/05/19 21:35:53 marcus Exp $ # PORTNAME= orca @@ -36,8 +36,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ MAN1= orca.1 post-patch: - @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g ; \ - s|/usr/X11R6|${X11BASE}|g' \ + @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \ ${WRKSRC}/src/orca/orca.in @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \ ${WRKSRC}/src/orca/orca_i18n.py diff --git a/audio/goobox/Makefile b/audio/goobox/Makefile index 03e7f4216..ee96bc680 100644 --- a/audio/goobox/Makefile +++ b/audio/goobox/Makefile @@ -3,7 +3,7 @@ # Whom: Alexander Nedotsukov <bland@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/audio/goobox/Makefile,v 1.19 2007/04/30 17:56:22 ahze Exp $ +# $MCom: ports/audio/goobox/Makefile,v 1.20 2007/05/19 21:35:56 marcus Exp $ # PORTNAME= goobox @@ -28,7 +28,7 @@ USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui libglade2 libbonobo \ USE_GSTREAMER80= cdparanoia gconf GNU_CONFIGURE= yes INSTALLS_OMF= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" GCONF_SCHEMAS= goobox.schemas diff --git a/audio/jamboree/Makefile b/audio/jamboree/Makefile index b22fb6c5b..6fe35a9d9 100644 --- a/audio/jamboree/Makefile +++ b/audio/jamboree/Makefile @@ -3,7 +3,7 @@ # Whom: Jean-Yves Lefort <jylefort@brutele.be> # # $FreeBSD$ -# $MCom: ports/audio/jamboree/Makefile,v 1.12 2007/04/30 18:11:19 ahze Exp $ +# $MCom: ports/audio/jamboree/Makefile,v 1.13 2007/05/19 21:35:57 marcus Exp $ PORTNAME= jamboree PORTVERSION= 0.5 @@ -23,8 +23,8 @@ USE_GNOME= gnomeprefix intlhack gnomehack libgnomeui libglade2 USE_GSTREAMER80= vorbis mad gconf GNU_CONFIGURE= yes USE_GMAKE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \ +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" \ GST_INSPECT="${LOCALBASE}/bin/gst-inspect-0.8" GCONF_SCHEMAS= jamboree.schemas diff --git a/audio/rhythmbox-devel/Makefile b/audio/rhythmbox-devel/Makefile index 03de3969a..0a39b0fff 100644 --- a/audio/rhythmbox-devel/Makefile +++ b/audio/rhythmbox-devel/Makefile @@ -3,7 +3,7 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/audio/rhythmbox/Makefile,v 1.75 2007/05/19 21:35:59 marcus Exp $ +# $MCom: ports/audio/rhythmbox/Makefile,v 1.76 2007/05/29 02:52:31 marcus Exp $ # PORTNAME= rhythmbox @@ -38,8 +38,8 @@ CONFIGURE_ARGS= --enable-nautilus-menu --with-playback=gstreamer-0-10 INSTALLS_ICONS= yes USE_LDCONFIG= yes CONFIGURE_ENV= LIBS="-lm" \ - LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \ - CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" + LDFLAGS="-L${LOCALBASE}/lib" \ + CPPFLAGS="-I${LOCALBASE}/include" GCONF_SCHEMAS= rhythmbox.schemas diff --git a/audio/rhythmbox/Makefile b/audio/rhythmbox/Makefile index 03de3969a..0a39b0fff 100644 --- a/audio/rhythmbox/Makefile +++ b/audio/rhythmbox/Makefile @@ -3,7 +3,7 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/audio/rhythmbox/Makefile,v 1.75 2007/05/19 21:35:59 marcus Exp $ +# $MCom: ports/audio/rhythmbox/Makefile,v 1.76 2007/05/29 02:52:31 marcus Exp $ # PORTNAME= rhythmbox @@ -38,8 +38,8 @@ CONFIGURE_ARGS= --enable-nautilus-menu --with-playback=gstreamer-0-10 INSTALLS_ICONS= yes USE_LDCONFIG= yes CONFIGURE_ENV= LIBS="-lm" \ - LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \ - CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" + LDFLAGS="-L${LOCALBASE}/lib" \ + CPPFLAGS="-I${LOCALBASE}/include" GCONF_SCHEMAS= rhythmbox.schemas diff --git a/deskutils/deskbar-applet/Makefile b/deskutils/deskbar-applet/Makefile index 120ff2de4..fce3600a6 100644 --- a/deskutils/deskbar-applet/Makefile +++ b/deskutils/deskbar-applet/Makefile @@ -3,7 +3,7 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/deskutils/deskbar-applet/Makefile,v 1.57 2007/05/19 21:36:01 marcus Exp $ +# $MCom: ports/deskutils/deskbar-applet/Makefile,v 1.58 2007/05/20 22:03:10 marcus Exp $ # PORTNAME= deskbar-applet @@ -49,7 +49,7 @@ PLIST_SUB+= EVO="@comment " .if !defined(DISPLAY) BUILD_DEPENDS+= Xvfb:${X_VFBSERVER_PORT} \ - ${X11BASE}/lib/X11/fonts/misc/8x13O.pcf.gz:${X_FONTS_MISC_PORT} + ${LOCALBASE}/lib/X11/fonts/misc/8x13O.pcf.gz:${X_FONTS_MISC_PORT} .if !defined(PACKAGE_BUILDING) CONFIGURE_ENV+= DISPLAY="localhost:1001" .endif @@ -67,7 +67,7 @@ pre-configure: ${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill || ${TRUE} ; \ ${RM} -f ${WRKDIR}/.Xvfb.pid ; \ fi - ${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid + ${LOCALBASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid @sleep 5 post-configure: diff --git a/finance/gnucash/Makefile b/finance/gnucash/Makefile index a33829aa7..fd332003b 100644 --- a/finance/gnucash/Makefile +++ b/finance/gnucash/Makefile @@ -3,7 +3,7 @@ # Whom: David O'Brien (obrien@NUXI.com) # # $FreeBSD$ -# $MCom: ports/finance/gnucash/Makefile,v 1.17 2007/05/19 21:36:09 marcus Exp $ +# $MCom: ports/finance/gnucash/Makefile,v 1.18 2007/05/25 00:54:34 marcus Exp $ # PORTNAME= gnucash @@ -46,8 +46,8 @@ USE_LDCONFIG= yes CONFIGURE_ARGS=--with-glib-config=${GLIB_CONFIG} \ --enable-ofx \ --disable-error-on-warning -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lintl" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="-L${LOCALBASE}/lib -lintl" MAN1= gnc-prices.1 gnucash.1 INFO= gnucash-design diff --git a/graphics/eog/Makefile b/graphics/eog/Makefile index ddf214e52..9fa2a9ef3 100644 --- a/graphics/eog/Makefile +++ b/graphics/eog/Makefile @@ -3,7 +3,7 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/graphics/eog/Makefile,v 1.57 2007/05/25 20:57:05 mezz Exp $ +# $MCom: ports/graphics/eog/Makefile,v 1.58 2007/05/27 17:07:24 mezz Exp $ # PORTNAME= eog @@ -27,8 +27,8 @@ USE_XLIB= yes INSTALLS_OMF= yes GNU_CONFIGURE= yes GNOME_DESKTOP_VERSION=2 -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" GCONF_SCHEMAS= eog.schemas diff --git a/graphics/evince/Makefile b/graphics/evince/Makefile index 11b2c798d..2967aeb1e 100644 --- a/graphics/evince/Makefile +++ b/graphics/evince/Makefile @@ -3,7 +3,7 @@ # Whom: Adam Weinberger <adamw@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/graphics/evince/Makefile,v 1.68 2007/05/18 05:22:01 marcus Exp $ +# $MCom: ports/graphics/evince/Makefile,v 1.69 2007/05/19 21:36:11 marcus Exp $ # PORTNAME= evince @@ -29,8 +29,8 @@ USE_GHOSTSCRIPT=yes INSTALLS_OMF= yes USE_GNOME= gnomehack intlhack gnomeprefix libgnomeui libgnomeprintui \ desktopfileutils gnomedocutils -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" GCONF_SCHEMAS= evince.schemas evince-thumbnailer.schemas \ evince-thumbnailer-ps.schemas @@ -80,7 +80,7 @@ PLIST_SUB+= NAUTILUS="@comment " CONFIGURE_ARGS+= --disable-impress #.endif -#.if exists(${X11BASE}/bin/djview) +#.if exists(${LOCALBASE}/bin/djview) #DJVU_DIR?= # empty #.else #DJVU_DIR?= -nox11 diff --git a/graphics/sodipodi/Makefile b/graphics/sodipodi/Makefile index 39fb55e3a..f132255c8 100644 --- a/graphics/sodipodi/Makefile +++ b/graphics/sodipodi/Makefile @@ -3,7 +3,7 @@ # Whom: Yukihiro Nakai <nakai@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/graphics/sodipodi/Makefile,v 1.1 2007/04/30 18:27:51 ahze Exp $ +# $MCom: ports/graphics/sodipodi/Makefile,v 1.2 2007/05/19 21:36:12 marcus Exp $ PORTNAME= sodipodi PORTVERSION= 0.34 @@ -24,8 +24,8 @@ USE_GETTEXT= yes USE_AUTOTOOLS= libtool:15 CONFIGURE_ARGS= --without-gnome-print \ --with-popt -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2 -I${X11BASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2" \ + LDFLAGS="-L${LOCALBASE}/lib" MAN1= sodipodi.1 diff --git a/net-im/gaim/Makefile b/net-im/gaim/Makefile index 668c27d8e..f9e674589 100644 --- a/net-im/gaim/Makefile +++ b/net-im/gaim/Makefile @@ -32,8 +32,8 @@ USE_BZIP2= yes USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-static=yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \ - LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}" \ +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ + LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \ PTHREAD_LIB="${PTHREAD_LIBS}" MAN1= gaim.1 gaim-remote.1 diff --git a/net-im/libpurple/Makefile b/net-im/libpurple/Makefile index d0ac9c631..6a15ee95f 100644 --- a/net-im/libpurple/Makefile +++ b/net-im/libpurple/Makefile @@ -3,7 +3,7 @@ # Whom: Jim Mock <jim@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/net-im/libpurple/Makefile,v 1.17 2007/05/25 00:24:49 marcus Exp $ +# $MCom: ports/net-im/libpurple/Makefile,v 1.18 2007/05/28 18:56:33 marcus Exp $ # PORTNAME?= libpurple @@ -26,8 +26,8 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS?=--disable-gtkui \ --disable-consoleui \ --with-dynamic_prpls=${PRPL_MODULES} -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \ - LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}" \ +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ + LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \ PTHREAD_LIB="${PTHREAD_LIBS}" .if !defined(PIDGIN_SLAVE) diff --git a/net/vino/Makefile b/net/vino/Makefile index 943025b89..276be2da3 100644 --- a/net/vino/Makefile +++ b/net/vino/Makefile @@ -3,7 +3,7 @@ # Whom: Tom McLaughlin <tmclaugh@sdf.lonestar.org> # # $FreeBSD$ -# $MCom: ports/net/vino/Makefile,v 1.39 2007/04/28 18:58:27 marcus Exp $ +# $MCom: ports/net/vino/Makefile,v 1.40 2007/05/19 21:36:18 marcus Exp $ # PORTNAME= vino @@ -27,7 +27,7 @@ GNOME_DESKTOP_VERSION=2 GNU_CONFIGURE= yes INSTALLS_ICONS= yes CONFIGURE_ARGS= --enable-session-support -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" GCONF_SCHEMAS= vino-server.schemas diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile index cbf72cf20..00cfb4d9e 100644 --- a/sysutils/gnome-control-center/Makefile +++ b/sysutils/gnome-control-center/Makefile @@ -3,7 +3,7 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/sysutils/gnome-control-center/Makefile,v 1.136 2007/05/06 04:04:45 marcus Exp $ +# $MCom: ports/sysutils/gnome-control-center/Makefile,v 1.137 2007/05/19 21:36:22 marcus Exp $ # PORTNAME= gnome-control-center @@ -33,8 +33,8 @@ INSTALLS_OMF= yes INSTALLS_ICONS= yes USE_LDCONFIG= yes CONFIGURE_ARGS= --enable-gstreamer=0.10 -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" GCONF_SCHEMAS= apps_gnome_settings_daemon_default_editor.schemas \ apps_gnome_settings_daemon_keybindings.schemas \ diff --git a/sysutils/gnome-pkgview/Makefile b/sysutils/gnome-pkgview/Makefile index 1bb84cf90..a96b6412e 100644 --- a/sysutils/gnome-pkgview/Makefile +++ b/sysutils/gnome-pkgview/Makefile @@ -3,7 +3,7 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/sysutils/gnome-pkgview/Makefile,v 1.4 2007/05/01 16:47:34 ahze Exp $ +# $MCom: ports/sysutils/gnome-pkgview/Makefile,v 1.5 2007/05/19 21:36:23 marcus Exp $ PORTNAME= gnome-pkgview PORTVERSION= 1.0.6 @@ -26,7 +26,6 @@ GCONF_SCHEMAS= gnome-pkgview.schemas post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ - -e 's|%%X11BASE%%|${X11BASE}|g' \ - ${WRKSRC}/src/config-path.c + ${WRKSRC}/src/config-path.c .include <bsd.port.mk> diff --git a/sysutils/gnome-pkgview/files/patch-src_config-path.c b/sysutils/gnome-pkgview/files/patch-src_config-path.c index 2eed9821d..b61d1cedc 100644 --- a/sysutils/gnome-pkgview/files/patch-src_config-path.c +++ b/sysutils/gnome-pkgview/files/patch-src_config-path.c @@ -7,7 +7,7 @@ - if ( getenv ("PKG_CONFIG_PATH") ) { - path = g_strconcat(getenv("PKG_CONFIG_PATH"),":DIRS_DONE",NULL); - } -+ path = "%%LOCALBASE%%/libdata/pkgconfig:%%X11BASE%%/libdata/pkgconfig:DIRS_DONE"; ++ path = "%%LOCALBASE%%/libdata/pkgconfig:DIRS_DONE"; /* walk the PKG_CONFIG_PATH for other files */ if ( path ) { diff --git a/www/epiphany-extensions/Makefile b/www/epiphany-extensions/Makefile index b40e9df21..d1c044b5a 100644 --- a/www/epiphany-extensions/Makefile +++ b/www/epiphany-extensions/Makefile @@ -3,7 +3,7 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/www/epiphany-extensions/Makefile,v 1.91 2007/05/14 04:58:38 marcus Exp $ +# $MCom: ports/www/epiphany-extensions/Makefile,v 1.92 2007/05/19 21:36:25 marcus Exp $ # PORTNAME= epiphany @@ -30,7 +30,7 @@ USE_GNOME= gnomeprefix gnomehack intlhack gnometarget INSTALLS_OMF= yes GNU_CONFIGURE= yes USE_GMAKE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \ +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" CONFIGURE_ARGS= --with-mozilla=${GECKO} diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile index 961d8a08c..39d8aa33f 100644 --- a/www/epiphany/Makefile +++ b/www/epiphany/Makefile @@ -3,7 +3,7 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/www/epiphany/Makefile,v 1.144 2007/05/14 04:42:44 marcus Exp $ +# $MCom: ports/www/epiphany/Makefile,v 1.145 2007/05/19 21:36:25 marcus Exp $ # PORTNAME= epiphany @@ -34,7 +34,7 @@ GNU_CONFIGURE= yes USE_GMAKE= yes INSTALLS_OMF= yes CONFIGURE_ARGS= --with-mozilla=${GECKO} --mandir=${PREFIX}/man -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \ +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" GCONF_SCHEMAS= epiphany-lockdown.schemas epiphany.schemas \ diff --git a/www/galeon/Makefile b/www/galeon/Makefile index 509b81f63..3c81eaf0c 100644 --- a/www/galeon/Makefile +++ b/www/galeon/Makefile @@ -3,7 +3,7 @@ # Whom: Maxim Sobolev <sobomax@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/www/galeon/Makefile,v 1.11 2007/04/30 17:24:57 ahze Exp $ +# $MCom: ports/www/galeon/Makefile,v 1.12 2007/05/19 21:36:25 marcus Exp $ # PORTNAME= galeon @@ -29,7 +29,7 @@ USE_GMAKE= yes USE_GETTEXT= yes CONFIGURE_ARGS= --enable-nautilus-view=no \ --with-mozilla=${GECKO} -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \ +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" MAN1= galeon.1 @@ -55,7 +55,7 @@ post-patch: 's|malloc\.h|stdlib.h|g' @${REINPLACE_CMD} -e 's|@prefix@/@DATADIRNAME@|@datadir@|g' \ ${WRKSRC}/ui/galeon-bookmarks-editor-ui.xml.in - @${REINPLACE_CMD} -e 's|/usr/lib/mozilla/plugins|${LOCALBASE}/lib/browser_plugins:${X11BASE}/lib/browser_plugins:${LOCALBASE}/lib/browser_linux_plugins:${X11BASE}/lib/browser_linux_plugins|' \ + @${REINPLACE_CMD} -e 's|/usr/lib/mozilla/plugins|${LOCALBASE}/lib/browser_plugins:${LOCALBASE}/lib/browser_linux_plugins|' \ ${WRKSRC}/mozilla/mozilla-embed-shell.cpp .include <bsd.port.post.mk> diff --git a/www/gtkhtml/Makefile b/www/gtkhtml/Makefile index 224601455..14f2f22ad 100644 --- a/www/gtkhtml/Makefile +++ b/www/gtkhtml/Makefile @@ -40,7 +40,6 @@ LIB_DEPENDS+= soup.6:${PORTSDIR}/devel/soup post-configure: @${SED} -e 's|%%PREFIX%%|${PREFIX}|g ; \ s|%%LOCALBASE%%|${LOCALBASE}|g ; \ - s|%%X11BASE%%|${X11BASE}|g ; \ s|%%VERSION%%|${VERSION}|g' ${FILESDIR}/gtkhtmlConf.sh \ > ${WRKSRC}/gtkhtmlConf.sh diff --git a/www/gtkhtml/files/gtkhtmlConf.sh b/www/gtkhtml/files/gtkhtmlConf.sh index 6d89587f3..12cee8fa1 100644 --- a/www/gtkhtml/files/gtkhtmlConf.sh +++ b/www/gtkhtml/files/gtkhtmlConf.sh @@ -1,5 +1,5 @@ GTKHTML_LIBDIR="-L%%PREFIX%%/lib" -GTKHTML_LIBS=" -L%%PREFIX%%/lib -lgtkhtml-1.1 -Wl,-E -L%%X11BASE%%/lib -L%%LOCALBASE%%/lib -lgal -lgnomeprint -lfreetype -lglade-gnome -lglade -lxml -lXpm -ljpeg -lgnomeui -lart_lgpl -lgdk_imlib -ltiff -lungif -lpng -lz -lSM -lICE -lgnome -lgnomesupport -lesd -laudiofile -lgdk_pixbuf -lgtk-12 -lgdk-12 -lgmodule-12 -lglib-12 -lintl -lXi -lXext -lX11 -lm -lgnomecanvaspixbuf -liconv -Wl,-E -L%%X11BASE%%/lib -L%%LOCALBASE%%/lib -lgconf-gtk-1 -lgconf-1 -loaf -lORBitCosNaming -lORBit -lIIOP -lORBitutil -lwrap -lgtk-12 -lgdk-12 -lgmodule-12 -lglib-12 -lintl -lXi -lXext -lX11 -lm" -GTKHTML_INCLUDEDIR="-I%%PREFIX%%/include -I%%PREFIX%%/include/gtkhtml-1.1 -I%%LOCALBASE%%/include/gdk-pixbuf-1.0 -I%%LOCALBASE%%/include/gtk12 -I%%LOCALBASE%%/include/glib12 -I%%LOCALBASE%%/include -I%%X11BASE%%/include -I%%LOCALBASE%%/include/gnome-1.0 -I%%LOCALBASE%%/include/freetype2 -DNEED_GNOMESUPPORT_H -I%%LOCALBASE%%/lib/gnome-libs/include -I%%LOCALBASE%%/include/gnome-xml -I%%LOCALBASE%%/include/libglade-1.0 -I%%LOCALBASE%%/include/gconf/1 -I%%X11BASE%%/include -I%%LOCALBASE%%/include/glib12 -I%%LOCALBASE%%/include/orbit-1.0 -I%%LOCALBASE%%/include -I%%LOCALBASE%%/include/gtk12 -DGTKHTML_HAVE_GCONF" +GTKHTML_LIBS=" -L%%PREFIX%%/lib -lgtkhtml-1.1 -Wl,-E -L%%LOCALBASE%%/lib -lgal -lgnomeprint -lfreetype -lglade-gnome -lglade -lxml -lXpm -ljpeg -lgnomeui -lart_lgpl -lgdk_imlib -ltiff -lungif -lpng -lz -lSM -lICE -lgnome -lgnomesupport -lesd -laudiofile -lgdk_pixbuf -lgtk-12 -lgdk-12 -lgmodule-12 -lglib-12 -lintl -lXi -lXext -lX11 -lm -lgnomecanvaspixbuf -liconv -Wl,-E -L%%LOCALBASE%%/lib -lgconf-gtk-1 -lgconf-1 -loaf -lORBitCosNaming -lORBit -lIIOP -lORBitutil -lwrap -lgtk-12 -lgdk-12 -lgmodule-12 -lglib-12 -lintl -lXi -lXext -lX11 -lm" +GTKHTML_INCLUDEDIR="-I%%PREFIX%%/include -I%%PREFIX%%/include/gtkhtml-1.1 -I%%LOCALBASE%%/include/gdk-pixbuf-1.0 -I%%LOCALBASE%%/include/gtk12 -I%%LOCALBASE%%/include/glib12 -I%%LOCALBASE%%/include -I%%LOCALBASE%%/include/gnome-1.0 -I%%LOCALBASE%%/include/freetype2 -DNEED_GNOMESUPPORT_H -I%%LOCALBASE%%/lib/gnome-libs/include -I%%LOCALBASE%%/include/gnome-xml -I%%LOCALBASE%%/include/libglade-1.0 -I%%LOCALBASE%%/include/gconf/1 -I%%LOCALBASE%%/include/glib12 -I%%LOCALBASE%%/include/orbit-1.0 -I%%LOCALBASE%%/include -I%%LOCALBASE%%/include/gtk12 -DGTKHTML_HAVE_GCONF" GTKHTML_DATADIR="%%PREFIX%%/share" MODULE_VERSION="%%VERSION%%" diff --git a/x11-fm/gnome-commander/Makefile b/x11-fm/gnome-commander/Makefile index bf863c93a..c80cb654b 100644 --- a/x11-fm/gnome-commander/Makefile +++ b/x11-fm/gnome-commander/Makefile @@ -28,8 +28,8 @@ USE_GMAKE= yes USE_BZIP2= yes USE_GNOME= gnomeprefix gnomehack gnometarget gnomevfs gnomelibs gdkpixbuf GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lintl" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="-L${LOCALBASE}/lib -lintl" pre-everything:: .if !defined(WITH_FAM) diff --git a/x11-fm/nautilus/Makefile b/x11-fm/nautilus/Makefile index bc01e16ab..c3dc57e5a 100644 --- a/x11-fm/nautilus/Makefile +++ b/x11-fm/nautilus/Makefile @@ -3,7 +3,7 @@ # Whom: ade, archie # # $FreeBSD$ -# $MCom: ports/x11-fm/nautilus/Makefile,v 1.132 2007/05/25 20:57:05 mezz Exp $ +# $MCom: ports/x11-fm/nautilus/Makefile,v 1.133 2007/05/27 17:07:25 mezz Exp $ # PORTNAME= nautilus @@ -29,8 +29,8 @@ USE_GNOME= gnomeprefix gnomehack intlhack gnomedesktop eel2 \ GNOME_DESKTOP_VERSION=2 USE_LDCONFIG= yes USE_AUTOTOOLS= libtool:15 -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LIBS="${PTHREAD_LIBS} -L${LOCALBASE}/lib -L${X11BASE}/lib -liconv" \ +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="${PTHREAD_LIBS} -L${LOCALBASE}/lib -liconv" \ LIBPNG="-L${LOCALBASE}/lib -lpng -lz" CONFIGURE_ARGS= --with-freetype2-lib-place=${LOCALBASE}/lib \ --with-freetype2-include-place=${LOCALBASE}/include/freetype2 \ diff --git a/x11-toolkits/pango/Makefile b/x11-toolkits/pango/Makefile index a9ed0d2d6..97e9697c4 100644 --- a/x11-toolkits/pango/Makefile +++ b/x11-toolkits/pango/Makefile @@ -3,7 +3,7 @@ # Whom: Maxim Sobolev <sobomax@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11-toolkits/pango/Makefile,v 1.98 2007/05/20 21:57:27 marcus Exp $ +# $MCom: ports/x11-toolkits/pango/Makefile,v 1.99 2007/05/29 04:05:20 marcus Exp $ # PORTNAME= pango @@ -41,8 +41,8 @@ CONFIGURE_ARGS= --with-qt=no \ GLIB2_CFLAGS= `pkg-config glib-2.0 --cflags` PLIST_SUB= VERSION="1.6.0" -FONTSCALE= ${X11BASE}/lib/X11/fonts/TTF/luximb.ttf -FONTENCOD= ${X11BASE}/lib/X11/fonts/encodings/encodings.dir +FONTSCALE= ${LOCALBASE}/lib/X11/fonts/TTF/luximb.ttf +FONTENCOD= ${LOCALBASE}/lib/X11/fonts/encodings/encodings.dir MAN1= pango-querymodules.1 @@ -56,9 +56,8 @@ PLIST_SUB+= X11="@comment " USE_XLIB+= yes LIB_DEPENDS+= Xft.2:${PORTSDIR}/x11-fonts/libXft CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/freetype2 \ - ${GLIB2_CFLAGS} -I${LOCALBASE}/include \ - -I${X11BASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" + ${GLIB2_CFLAGS} -I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" PLIST_SUB+= X11="" .endif diff --git a/x11-toolkits/vte/Makefile b/x11-toolkits/vte/Makefile index 8f06d45de..843fd15c7 100644 --- a/x11-toolkits/vte/Makefile +++ b/x11-toolkits/vte/Makefile @@ -3,7 +3,7 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11-toolkits/vte/Makefile,v 1.75 2007/04/29 21:51:54 marcus Exp $ +# $MCom: ports/x11-toolkits/vte/Makefile,v 1.76 2007/05/19 21:36:34 marcus Exp $ # PORTNAME= vte @@ -28,8 +28,8 @@ USE_LDCONFIG= yes USE_AUTOTOOLS= libtool:15 USE_GETTEXT= yes USE_GNOME?= gnomeprefix gnomehack gtk20 ltverhack referencehack -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \ +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" \ BSD_PTHREAD_LIBS="${PTHREAD_LIBS}" CONFIGURE_ARGS?=--disable-python \ --disable-freetypetest diff --git a/x11-wm/metacity/Makefile b/x11-wm/metacity/Makefile index 3c7b27244..2035c59f6 100644 --- a/x11-wm/metacity/Makefile +++ b/x11-wm/metacity/Makefile @@ -3,7 +3,7 @@ # Whom: Garrett Rooney <rooneg@electricjellyfish.net> # # $FreeBSD$ -# $MCom: ports/x11-wm/metacity/Makefile,v 1.107 2007/05/06 04:15:15 marcus Exp $ +# $MCom: ports/x11-wm/metacity/Makefile,v 1.108 2007/05/19 21:36:34 marcus Exp $ # PORTNAME= metacity @@ -28,7 +28,7 @@ USE_AUTOTOOLS= libtool:15 USE_GNOME= gnomeprefix intlhack gnomehack gconf2 ltverhack USE_LDCONFIG= yes CONFIGURE_ARGS= --enable-render -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" MAKE_ENV= G_CHARSET_ALIAS="${LOCALBASE}/libdata/charset.alias" diff --git a/x11/gdkxft/Makefile b/x11/gdkxft/Makefile index b38145c02..0d80cff74 100644 --- a/x11/gdkxft/Makefile +++ b/x11/gdkxft/Makefile @@ -24,7 +24,7 @@ WANT_GNOME= yes USE_ICONV= yes GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lgnuregex -liconv" \ +CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib -lgnuregex -liconv" \ CFLAGS="${CFLAGS} `pkg-config xft --cflags`" CONFIGURE_ARGS= --sbindir=${PREFIX}/bin USE_LDCONFIG= yes diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile index 4cf3a068f..12fd718cf 100644 --- a/x11/gdm/Makefile +++ b/x11/gdm/Makefile @@ -3,7 +3,7 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/gdm/Makefile,v 1.62 2007/05/14 05:22:06 marcus Exp $ +# $MCom: ports/x11/gdm/Makefile,v 1.63 2007/05/19 21:36:27 marcus Exp $ # PORTNAME= gdm @@ -34,7 +34,7 @@ USE_GNOME= gnomehack intlhack gnomehier libgnomeui librsvg2 gnomedocutils \ GNU_CONFIGURE= yes CONFIGURE_ARGS= --mandir=${PREFIX}/man \ --with-console-kit=no -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" \ GTKDOC="false" diff --git a/x11/gnome-menus/Makefile b/x11/gnome-menus/Makefile index 9762d6e16..494f5bcf8 100644 --- a/x11/gnome-menus/Makefile +++ b/x11/gnome-menus/Makefile @@ -3,7 +3,7 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/gnome-menus/Makefile,v 1.53 2007/05/13 21:06:26 marcus Exp $ +# $MCom: ports/x11/gnome-menus/Makefile,v 1.54 2007/05/19 21:36:28 marcus Exp $ # PORTNAME= gnome-menus @@ -44,8 +44,7 @@ post-patch: ${WRKSRC}/layout/settings.menu @${SED} -e 's|/usr/local|${LOCALBASE}|g' \ < ${FILESDIR}/KDE.directory > ${WRKSRC}/KDE.directory - @${REINPLACE_CMD} -e 's|%%X11BASE%%|${X11BASE}|g ; \ - s|%%LOCALBASE%%|${LOCALBASE}|g' \ + @${REINPLACE_CMD} -e '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 de35a4839..b134a5817 100644 --- a/x11/gnome-menus/files/patch-simple-editor_GMenuSimpleEditor_menutreemodel.py +++ b/x11/gnome-menus/files/patch-simple-editor_GMenuSimpleEditor_menutreemodel.py @@ -14,7 +14,7 @@ data_dirs = os.environ["XDG_DATA_DIRS"] if not data_dirs: - data_dirs = "/usr/local/share/:/usr/share/" -+ data_dirs = "%%LOCALBASE%%/share/:%%X11BASE%%/share/" ++ data_dirs = "%%LOCALBASE%%/share/" for data_dir in data_dirs.split (":"): retval = load_icon_from_path (os.path.join (data_dir, "pixmaps", icon_value)) diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile index 68e6b8fc6..b1ad0ca93 100644 --- a/x11/gnome-panel/Makefile +++ b/x11/gnome-panel/Makefile @@ -3,7 +3,7 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/gnome-panel/Makefile,v 1.150 2007/05/15 22:07:03 marcus Exp $ +# $MCom: ports/x11/gnome-panel/Makefile,v 1.151 2007/05/19 21:36:28 marcus Exp $ # PORTNAME= gnome-panel @@ -34,7 +34,7 @@ USE_GMAKE= yes USE_AUTOTOOLS= libtool:15 CONFIGURE_ARGS= --with-kde-datadir=${LOCALBASE}/share \ --with-kde-docdir=${LOCALBASE}/share/doc -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" MAN1= gnome-panel.1 diff --git a/x11/gnome-screensaver/Makefile b/x11/gnome-screensaver/Makefile index 07b472301..ef9ee2efa 100644 --- a/x11/gnome-screensaver/Makefile +++ b/x11/gnome-screensaver/Makefile @@ -3,7 +3,7 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/gnome-screensaver/Makefile,v 1.75 2007/05/05 18:54:50 marcus Exp $ +# $MCom: ports/x11/gnome-screensaver/Makefile,v 1.76 2007/05/19 21:36:28 marcus Exp $ # PORTNAME= gnome-screensaver @@ -29,7 +29,7 @@ USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui gnomemenus \ CONFIGURE_ARGS= --with-gdm-config=${LOCALBASE}/etc/gdm/custom.conf \ --with-xscreensaverdir=${XSCREENSAVER_DIR} \ --with-xscreensaverhackdir=${LOCALBASE}/bin/xscreensaver-hacks -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" GCONF_SCHEMAS= gnome-screensaver.schemas diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile index 68af31a52..8df3ef0e3 100644 --- a/x11/gnome-session/Makefile +++ b/x11/gnome-session/Makefile @@ -3,7 +3,7 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/gnome-session/Makefile,v 1.114 2007/05/13 21:25:12 marcus Exp $ +# $MCom: ports/x11/gnome-session/Makefile,v 1.115 2007/05/19 21:36:28 marcus Exp $ # PORTNAME= gnome-session @@ -35,8 +35,8 @@ GNOME_DESKTOP_VERSION=2 USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --mandir=${PREFIX}/man -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" MAN1= gnome-session.1 gnome-wm.1 session-properties.1 \ gnome-session-save.1 diff --git a/x11/gnome2-lite/Makefile b/x11/gnome2-lite/Makefile index b01322388..b09dda495 100644 --- a/x11/gnome2-lite/Makefile +++ b/x11/gnome2-lite/Makefile @@ -3,7 +3,7 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD: ports/x11/gnome2-lite/Makefile,v 1.43 2007/03/19 05:13:54 marcus Exp $ -# $MCom: ports/x11/gnome2-lite/Makefile,v 1.56 2007/04/28 19:18:53 marcus Exp $ +# $MCom: ports/x11/gnome2-lite/Makefile,v 1.57 2007/05/19 21:36:29 marcus Exp $ # PORTREVISION= 1 @@ -28,7 +28,7 @@ RUN_DEPENDS= ${LOCALBASE}/libexec/gweather-applet-2:${PORTSDIR}/x11/gnome-applet evince:${PORTSDIR}/graphics/evince \ gcalctool:${PORTSDIR}/math/gcalctool \ gucharmap:${PORTSDIR}/deskutils/gucharmap \ - ${X11BASE}/lib/X11/fonts/bitstream-vera/Vera.ttf:${PORTSDIR}/x11-fonts/bitstream-vera \ + ${LOCALBASE}/lib/X11/fonts/bitstream-vera/Vera.ttf:${PORTSDIR}/x11-fonts/bitstream-vera \ gconf-editor:${PORTSDIR}/sysutils/gconf-editor \ gnome-control-center:${PORTSDIR}/sysutils/gnome-control-center \ gnome-mount:${PORTSDIR}/sysutils/gnome-mount \ diff --git a/x11/gnome2/Makefile b/x11/gnome2/Makefile index 07aa507d8..88bc3cd24 100644 --- a/x11/gnome2/Makefile +++ b/x11/gnome2/Makefile @@ -3,7 +3,7 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/gnome2/Makefile,v 1.206 2007/05/17 05:12:14 marcus Exp $ +# $MCom: ports/x11/gnome2/Makefile,v 1.207 2007/05/19 21:36:29 marcus Exp $ # PORTNAME= gnome2 @@ -40,7 +40,7 @@ RUN_DEPENDS?= ${LOCALBASE}/libexec/gweather-applet-2:${PORTSDIR}/x11/gnome-apple gcalctool:${PORTSDIR}/math/gcalctool \ gucharmap:${PORTSDIR}/deskutils/gucharmap \ zenity:${PORTSDIR}/x11/zenity \ - ${X11BASE}/lib/X11/fonts/bitstream-vera/Vera.ttf:${PORTSDIR}/x11-fonts/bitstream-vera \ + ${LOCALBASE}/lib/X11/fonts/bitstream-vera/Vera.ttf:${PORTSDIR}/x11-fonts/bitstream-vera \ ${LOCALBASE}/libexec/gnome-netstatus-applet:${PORTSDIR}/net/gnome-netstatus \ dasher:${PORTSDIR}/accessibility/dasher \ evolution-2.12:${PORTSDIR}/mail/evolution \ diff --git a/x11/libgnome/files/patch-libgnome::Makefile.in b/x11/libgnome/files/patch-libgnome::Makefile.in index 5a240a06a..efac650ba 100644 --- a/x11/libgnome/files/patch-libgnome::Makefile.in +++ b/x11/libgnome/files/patch-libgnome::Makefile.in @@ -1,12 +1,11 @@ ---- libgnome/Makefile.in.orig Mon May 31 16:33:14 2004 -+++ libgnome/Makefile.in Mon May 31 16:33:45 2004 -@@ -211,6 +211,9 @@ +--- libgnome/Makefile.in.orig Tue May 29 22:16:13 2007 ++++ libgnome/Makefile.in Tue May 29 22:16:58 2007 +@@ -280,6 +280,8 @@ + LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ libgnomeincludedir = $(includedir)/libgnome-2.0/libgnome - INCLUDES = \ + -DPREFIX=\""$(PREFIX)"\" \ + -DLOCALBASE=\""$(LOCALBASE)"\" \ -+ -DX11BASE=\""$(X11BASE)"\" \ -I.. \ -I$(srcdir)/.. \ $(WARN_CFLAGS) \ diff --git a/x11/libgnomekbd/Makefile b/x11/libgnomekbd/Makefile index c0cbbe371..80b49cf51 100644 --- a/x11/libgnomekbd/Makefile +++ b/x11/libgnomekbd/Makefile @@ -3,7 +3,7 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/libgnomekbd/Makefile,v 1.7 2007/04/26 17:35:23 ahze Exp $ +# $MCom: ports/x11/libgnomekbd/Makefile,v 1.8 2007/05/19 21:36:30 marcus Exp $ # PORTNAME= libgnomekbd @@ -26,8 +26,8 @@ INSTALLS_ICONS= yes USE_GETTEXT= yes USE_LDCONFIG= yes USE_GMAKE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" GCONF_SCHEMAS= desktop_gnome_peripherals_keyboard_xkb.schemas |