diff options
Diffstat (limited to 'x11')
-rw-r--r-- | x11/gdm/Makefile | 8 | ||||
-rw-r--r-- | x11/gdm/files/patch-daemon_gdm-session-worker.c | 2 | ||||
-rw-r--r-- | x11/gnome-desktop/Makefile | 8 | ||||
-rw-r--r-- | x11/gnome-menus/Makefile | 6 | ||||
-rw-r--r-- | x11/gnome-panel/Makefile | 8 | ||||
-rw-r--r-- | x11/gnome-screensaver/Makefile | 8 | ||||
-rw-r--r-- | x11/gnome-session/Makefile | 8 | ||||
-rw-r--r-- | x11/gnome-terminal/Makefile | 7 | ||||
-rw-r--r-- | x11/gnome-terminal/files/patch-src-terminal.c | 11 | ||||
-rw-r--r-- | x11/gnome2/Makefile | 4 | ||||
-rw-r--r-- | x11/libgnomekbd/Makefile | 7 | ||||
-rw-r--r-- | x11/libxklavier/Makefile | 6 | ||||
-rw-r--r-- | x11/yelp/Makefile | 8 |
13 files changed, 52 insertions, 39 deletions
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile index 76aa4d176..f52032aa3 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.190 2011/06/25 14:53:53 mezz Exp $ +# $MCom: ports/x11/gdm/Makefile,v 1.191 2012/08/16 14:25:44 kwm Exp $ # PORTNAME= gdm @@ -48,10 +48,10 @@ GCONF_SCHEMAS= gdm-simple-greeter.schemas GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-working-directory=${PREFIX}/etc/gdm/home \ --with-at-spi-registryd-directory=${LOCALBASE}/libexec -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -DHAS_SA_LEN" \ - LDFLAGS="-L${LOCALBASE}/lib" \ - LIBS="-lm" \ +CONFIGURE_ENV= LIBS="-lm" \ GTKDOC="false" +CPPFLAGS+= -I${LOCALBASE}/include -DHAS_SA_LEN +LDFLAGS+= -L${LOCALBASE}/lib SUB_FILES+= gdm.pam diff --git a/x11/gdm/files/patch-daemon_gdm-session-worker.c b/x11/gdm/files/patch-daemon_gdm-session-worker.c index 2305cd439..a15c91658 100644 --- a/x11/gdm/files/patch-daemon_gdm-session-worker.c +++ b/x11/gdm/files/patch-daemon_gdm-session-worker.c @@ -15,7 +15,7 @@ */ - path = "/bin:/usr/bin:."; -+ path = "/bin:/usr/bin:/usr/local/bin:."; ++ path = "/bin:/usr/bin:%%LOCALBASE%%/bin:."; } len = strlen (file) + 1; diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile index 48ef0b74d..89ce71ee4 100644 --- a/x11/gnome-desktop/Makefile +++ b/x11/gnome-desktop/Makefile @@ -3,12 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom$ +# $MCom: ports/x11/gnome-desktop/Makefile,v 1.192 2011/04/09 02:44:27 mezz Exp $ # PORTNAME= gnome-desktop PORTVERSION= 2.32.1 -PORTREVISION?= 2 +PORTREVISION?= 3 CATEGORIES= x11 gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -33,8 +33,8 @@ USE_LDCONFIG= yes USE_AUTOTOOLS= libtool CONFIGURE_ARGS= --with-gnome-distributor="FreeBSD GNOME Project" \ --disable-desktop-docs -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib MAN1= gnome-about.1 diff --git a/x11/gnome-menus/Makefile b/x11/gnome-menus/Makefile index 5d4f9acd4..a29eb650b 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.117 2011/06/10 21:14:05 mezz Exp $ +# $MCom: ports/x11/gnome-menus/Makefile,v 1.118 2011/10/23 10:23:05 kwm Exp $ # PORTNAME= gnome-menus @@ -27,8 +27,8 @@ USE_GNOME= gnomehier gnomeprefix gnomehack intlhack glib20 ltverhack USE_AUTOTOOLS= libtool USE_PYTHON= yes USE_LDCONFIG= yes -CPPFLAGS= -I${LOCALBASE}/include -LDFLAGS= -L${LOCALBASE}/lib +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib post-patch: @${REINPLACE_CMD} -e 's|applications.menu||' \ diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile index 40d261367..0b92615cc 100644 --- a/x11/gnome-panel/Makefile +++ b/x11/gnome-panel/Makefile @@ -3,12 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/gnome-panel/Makefile,v 1.234 2011/06/03 21:27:51 mezz Exp $ +# $MCom: ports/x11/gnome-panel/Makefile,v 1.235 2011/06/04 22:51:28 mezz Exp $ # PORTNAME= gnome-panel PORTVERSION= 2.32.1 -PORTREVISION?= 0 +PORTREVISION?= 2 CATEGORIES= x11 gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -38,8 +38,8 @@ WANT_GNOME= yes USE_GMAKE= yes USE_AUTOTOOLS= libtool CONFIGURE_ARGS= --disable-network-manager -CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" -CPPFLAGS="-I${LOCALBASE}/include" +LDFLAGS+= -L${LOCALBASE}/lib +CPPFLAGS+= -I${LOCALBASE}/include MAN1= gnome-panel.1 GCONF_SCHEMAS= clock.schemas fish.schemas \ diff --git a/x11/gnome-screensaver/Makefile b/x11/gnome-screensaver/Makefile index f923cb55d..a8b9299d5 100644 --- a/x11/gnome-screensaver/Makefile +++ b/x11/gnome-screensaver/Makefile @@ -3,12 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/gnome-screensaver/Makefile,v 1.123 2011/03/06 20:29:27 kwm Exp $ +# $MCom: ports/x11/gnome-screensaver/Makefile,v 1.124 2011/04/09 16:54:20 mezz Exp $ # PORTNAME= gnome-screensaver PORTVERSION= 2.30.2 -PORTREVISION= 2 +PORTREVISION= 4 CATEGORIES= x11 gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -31,8 +31,8 @@ USE_GNOME= gnomeprefix gnomehack intlhack gnomemenus libgnomekbd \ 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" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib GCONF_SCHEMAS= gnome-screensaver.schemas MAN1= gnome-screensaver-command.1 gnome-screensaver-preferences.1 \ diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile index a1e40e971..936f3b440 100644 --- a/x11/gnome-session/Makefile +++ b/x11/gnome-session/Makefile @@ -3,12 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/gnome-session/Makefile,v 1.190 2011/04/10 19:41:38 mezz Exp $ +# $MCom: ports/x11/gnome-session/Makefile,v 1.191 2011/04/25 22:02:03 mezz Exp $ # PORTNAME= gnome-session PORTVERSION= 2.32.1 -PORTREVISION= 1 +PORTREVISION= 3 CATEGORIES= x11 gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -36,8 +36,8 @@ USE_GNOME= gnomeprefix gnomehack intlhack gconf2 USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-docbook-docs -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib MAN1= gnome-session.1 gnome-wm.1 gnome-session-properties.1 \ gnome-session-save.1 diff --git a/x11/gnome-terminal/Makefile b/x11/gnome-terminal/Makefile index c4a76a5b0..3e597a2f3 100644 --- a/x11/gnome-terminal/Makefile +++ b/x11/gnome-terminal/Makefile @@ -3,11 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/gnome-terminal/Makefile,v 1.139 2011/04/25 22:05:10 mezz Exp $ +# $MCom: ports/x11/gnome-terminal/Makefile,v 1.140 2011/04/30 20:43:30 mezz Exp $ # PORTNAME= gnome-terminal PORTVERSION= 2.32.1 +PORTREVISION= 3 CATEGORIES= x11 gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -27,8 +28,8 @@ USE_XORG= sm USE_GNOME= gnomeprefix gnomehack intlhack gconf2 vte gnomedocutils \ libgnome GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib GCONF_SCHEMAS= gnome-terminal.schemas diff --git a/x11/gnome-terminal/files/patch-src-terminal.c b/x11/gnome-terminal/files/patch-src-terminal.c new file mode 100644 index 000000000..a434ca7ab --- /dev/null +++ b/x11/gnome-terminal/files/patch-src-terminal.c @@ -0,0 +1,11 @@ +--- src/terminal.c.orig 2010-11-10 10:47:14.000000000 -0800 ++++ src/terminal.c 2012-03-23 21:10:08.520503912 -0700 +@@ -579,7 +579,7 @@ + data = g_new (OwnData, 1); + data->factory_name = get_factory_name_for_display (display_name); + data->options = options; +- data->exit_code = -1; ++ data->exit_code = EXIT_SUCCESS; + data->argv = argv_copy; + data->argc = argc_copy; + diff --git a/x11/gnome2/Makefile b/x11/gnome2/Makefile index e9f7ac3ea..482e11b5a 100644 --- a/x11/gnome2/Makefile +++ b/x11/gnome2/Makefile @@ -3,12 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/gnome2/Makefile,v 1.306 2011/04/30 20:43:30 mezz Exp $ +# $MCom: ports/x11/gnome2/Makefile,v 1.307 2011/10/20 21:24:53 kwm Exp $ # PORTNAME= gnome2 PORTVERSION= 2.32.1 -PORTREVISION?= 3 +PORTREVISION?= 5 CATEGORIES?= x11 gnome MASTER_SITES= # empty DISTFILES= # empty diff --git a/x11/libgnomekbd/Makefile b/x11/libgnomekbd/Makefile index c290ec0d8..224892b11 100644 --- a/x11/libgnomekbd/Makefile +++ b/x11/libgnomekbd/Makefile @@ -3,11 +3,12 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/libgnomekbd/Makefile,v 1.53 2011/04/10 15:14:12 mezz Exp $ +# $MCom: ports/x11/libgnomekbd/Makefile,v 1.54 2011/04/30 20:43:31 mezz Exp $ # PORTNAME= libgnomekbd PORTVERSION= 2.32.0 +PORTREVISION= 2 CATEGORIES= x11 gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -26,8 +27,8 @@ INSTALLS_ICONS= yes USE_GETTEXT= yes USE_LDCONFIG= yes USE_GMAKE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib GCONF_SCHEMAS= desktop_gnome_peripherals_keyboard_xkb.schemas diff --git a/x11/libxklavier/Makefile b/x11/libxklavier/Makefile index 72a38240e..bd26f1694 100644 --- a/x11/libxklavier/Makefile +++ b/x11/libxklavier/Makefile @@ -3,7 +3,7 @@ # Whom: Maxim Sobolev <sobomax@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/libxklavier/Makefile,v 1.56 2012/06/14 04:17:30 mezz Exp $ +# $MCom: ports/x11/libxklavier/Makefile,v 1.57 2012/06/14 12:27:01 kwm Exp $ # PORTNAME= libxklavier @@ -33,8 +33,8 @@ CONFIGURE_ARGS= --disable-doxygen \ --with-xmodmap-base=${LOCALBASE}/share/xmodmap \ --disable-gtk-doc \ --with-html-dir=${GNOME_HTML_DIR} -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" \ - LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib PLIST_SUB= VERSION=${PORTVERSION} diff --git a/x11/yelp/Makefile b/x11/yelp/Makefile index 8bac04a7a..df6019439 100644 --- a/x11/yelp/Makefile +++ b/x11/yelp/Makefile @@ -3,12 +3,12 @@ # Whom: Maxim Sobolev <sobomax@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/yelp/Makefile,v 1.166 2011/04/11 07:29:02 kwm Exp $ +# $MCom: ports/x11/yelp/Makefile,v 1.167 2011/04/30 20:43:31 mezz Exp $ # PORTNAME= yelp PORTVERSION= 2.30.2 -PORTREVISION= 1 +PORTREVISION= 4 CATEGORIES= x11 gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -30,8 +30,8 @@ USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack intlhack gconf2 gnomedocutils GNU_CONFIGURE= yes INSTALLS_ICONS= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --with-gecko=${GECKO} \ --with-gecko-home=${LOCALBASE}/lib/${GECKO} MAKE_ENV= G_CHARSET_ALIAS="${LOCALBASE}/libdata/charset.alias" |