Sync w/ FreeBSD ports.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@11363 df743ca5-7f9a-e211-a948-0013205c9059

18 files changed, 68 insertions, 48 deletions

diff --git a/accessibility/mousetweaks/pkg-descr b/accessibility/mousetweaks/pkg-descr
index f5b3b2a9e..9290a7414 100644
--- a/accessibility/mousetweaks/pkg-descr
+++ b/accessibility/mousetweaks/pkg-descr
@@ -7,7 +7,7 @@ These enhancements are:
 hardware button.
 
 2. It allows users to perform a right click by doing a click&hold of the 
-left mousebutton. (For a left-handed mouse user, the termes left and right 
+left mouse button. (For a left-handed mouse user, the terms left and right 
 have to be inverted.) 
 
 3. It provides an applet that the user can install on a panel. This applet 
diff --git a/accessibility/orca/Makefile b/accessibility/orca/Makefile
index f2057b665..8a4c44092 100644
--- a/accessibility/orca/Makefile
+++ b/accessibility/orca/Makefile
@@ -3,11 +3,12 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/accessibility/orca/Makefile,v 1.51 2008/08/05 19:00:01 marcus Exp $
+#   $MCom: ports/accessibility/orca/Makefile,v 1.52 2008/08/19 02:12:19 kwm Exp $
 #
 
 PORTNAME=	orca
 PORTVERSION=	2.23.90
+PORTREVISION=	1
 CATEGORIES=	accessibility gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -17,8 +18,7 @@ COMMENT=	Scriptable screen reader
 
 BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/_dbus_bindings.so:${PORTSDIR}/devel/py-dbus
 LIB_DEPENDS=	gnome-mag.2:${PORTSDIR}/accessibility/gnome-mag
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash \
-		${PYTHON_SITELIBDIR}/_dbus_bindings.so:${PORTSDIR}/devel/py-dbus
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/_dbus_bindings.so:${PORTSDIR}/devel/py-dbus
 
 LATEST_LINK=	gnome-orca
 
diff --git a/accessibility/orca/files/patch-src_orca_orca.in b/accessibility/orca/files/patch-src_orca_orca.in
index 1aa834d5d..ec31af2bc 100644
--- a/accessibility/orca/files/patch-src_orca_orca.in
+++ b/accessibility/orca/files/patch-src_orca_orca.in
@@ -1,8 +1,8 @@
---- src/orca/orca.in.orig	2007-11-08 11:02:26.000000000 -0500
-+++ src/orca/orca.in	2007-11-15 15:43:24.000000000 -0500
+--- src/orca/orca.in.orig	2008-05-26 16:22:08.000000000 -0500
++++ src/orca/orca.in	2008-05-26 16:25:53.000000000 -0500
 @@ -1,4 +1,4 @@
 -#!/bin/bash
-+#!/usr/local/bin/bash
++#!/bin/sh
  #
  # Orca
  #
@@ -11,11 +11,20 @@
  # Set the user's $PATH for this script.
  #
 -export PATH="${PATH}:/usr/ccs/bin:/usr/bin:/usr/sbin:/bin:/usr/sfw/bin:/usr/openwin/bin:/usr/X11R6/bin"
-+export PATH="${PATH}:/usr/ccs/bin:/usr/bin:/usr/sbin:/bin:/usr/sfw/bin:/usr/openwin/bin:/usr/local/bin:/usr/X11R6/bin"
++export PATH="${PATH}:/usr/bin:/usr/sbin:/bin:/usr/local/bin"
  
  # If you set RUNONCE to "true", then this will just run Orca once and quit.
  #
-@@ -145,7 +145,7 @@ watchdog()
+@@ -74,7 +74,7 @@
+ cleanup()
+ {
+     USERID=`id | cut -f2 -d= | cut -f1 -d\(`
+-    PIDS=`ps -eo pid,ruid,args | grep $USERID | egrep "orca[.]orca|synthesis-driver|festival [-][-]server" | grep -v grep | awk '{ print $1 }'`
++    PIDS=`ps -exo pid,ruid,args | grep $USERID | egrep "orca[.]orca|synthesis-driver|festival [-][-]server" | grep -v grep | awk '{ print $1 }'`
+ 
+     IFS='
+     '
+@@ -145,7 +145,7 @@
          do
              sleep 5
              USERID=`id | cut -f2 -d= | cut -f1 -d\(`
@@ -24,3 +33,24 @@
  
              if [ "x$PID" = "x" ]
              then
+@@ -258,7 +258,7 @@
+ then
+     main
+ else
+-    if [ `grep -c "\-q" <<< $ARGS` -gt 0 ]
++    if [ `echo $ARGS | grep -c "\-q"` -gt 0 ]
+     then
+         cleanup
+     else
+@@ -270,9 +270,9 @@
+         # erroneously types an illegal command line argument, the
+         # help text is emitted and the other orca is not killed.
+         #
+-        if [ `egrep -c "\-s|\-g|\-n|\-u|\-e|\-d" <<< $ARGS` -eq 0 ]
++        if [ `echo $ARGS | egrep -c "\-s|\-g|\-n|\-u|\-e|\-d"` -eq 0 ]
+         then
+-            if [ `egrep -c "\-t" <<< $ARGS` -eq 0 ]
++            if [ `echo $ARGS | egrep -c "\-t"` -eq 0 ]
+             then
+                 runOrca "NO_CLEANUP"
+             else
diff --git a/databases/evolution-data-server/Makefile b/databases/evolution-data-server/Makefile
index c5dd14b16..4e325a933 100644
--- a/databases/evolution-data-server/Makefile
+++ b/databases/evolution-data-server/Makefile
@@ -3,7 +3,7 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/databases/evolution-data-server/Makefile,v 1.153 2008/08/18 18:56:27 marcus Exp $
+#   $MCom: ports/databases/evolution-data-server/Makefile,v 1.154 2008/08/19 17:13:11 kwm Exp $
 #
 
 PORTNAME=	evolution-data-server
@@ -69,12 +69,12 @@ EDS_BDB_MSG=	"!!!WARNING!!!: Berkeley Database version is ${BDB_VER}.  If this i
 
 pre-everything::
 	@if [ x"${BDB_VER}" != x"41" ]; then \
-	    	${ECHO_MSG} ${EDS_BDB_MSG} | ${FMT} 75 79 ; \
+		${ECHO_MSG} ${EDS_BDB_MSG} | ${FMT} 75 79 ; \
 	fi
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-ldb|-l${BDB_LIB_NAME}|g ; \
-	    	s|heimlibs=".*"|heimlibs="${KRB5_LIB}"|g' \
+		s|heimlibs=".*"|heimlibs="${KRB5_LIB}"|g' \
 			${WRKSRC}/configure
 
 .include <bsd.port.post.mk>
diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile
index d2041b0d1..feaedea01 100644
--- a/devel/glib20/Makefile
+++ b/devel/glib20/Makefile
@@ -3,7 +3,7 @@
 # Whom:				Vanilla I. Shu <vanilla@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/glib20/Makefile,v 1.125 2008/08/05 04:57:43 marcus Exp $
+#   $MCom: ports/devel/glib20/Makefile,v 1.126 2008/08/18 16:52:39 mezz Exp $
 #
 # !! DON'T FORGET ABOUT devel/gio-fam-backend !!
 
@@ -60,7 +60,6 @@ GLIB_ARCH=	x86_64
 .else
 GLIB_ARCH=	${ARCH}
 .endif
-CONFIGURE_TARGET=	--build=${GLIB_ARCH}-portbld-freebsd${OSREL}
 
 .if defined(WITH_COLLATION_FIX)
 LIB_DEPENDS+=	icui18n:${PORTSDIR}/devel/icu
diff --git a/devel/glibmm/Makefile b/devel/glibmm/Makefile
index 22569fe7e..44b8376af 100644
--- a/devel/glibmm/Makefile
+++ b/devel/glibmm/Makefile
@@ -3,7 +3,7 @@
 # Whom:                 		Adam Weinberger <adamw@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/glibmm/Makefile,v 1.62 2008/08/06 04:22:49 mezz Exp $
+#   $MCom: ports/devel/glibmm/Makefile,v 1.63 2008/08/06 18:31:59 marcus Exp $
 #
 
 PORTNAME=	glibmm
@@ -28,7 +28,6 @@ LIB_DEPENDS=	sigc-2.0.0:${PORTSDIR}/devel/libsigc++20
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
 USE_GMAKE=	yes
-USE_GCC=	3.4+
 USE_GNOME=	gnomehack gnometarget glib20 ltverhack
 USE_PERL5=	yes
 USE_AUTOTOOLS=	libtool:15
diff --git a/mail/evolution-exchange/Makefile b/mail/evolution-exchange/Makefile
index 04e5e18b6..c1ebeb3df 100644
--- a/mail/evolution-exchange/Makefile
+++ b/mail/evolution-exchange/Makefile
@@ -3,14 +3,13 @@
 # Whom:					Adam Weinberger, based off kiesel's ximian-exchange port
 #
 # $FreeBSD$
-#   $MCom: ports/mail/evolution-exchange/Makefile,v 1.119 2008/08/05 18:00:25 marcus Exp $
+#   $MCom: ports/mail/evolution-exchange/Makefile,v 1.120 2008/08/18 22:21:25 marcus Exp $
 #
 
 PORTNAME=	evolution-exchange
 PORTVERSION=	2.23.90
 CATEGORIES=	mail gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}${PKGNAMESUFFIX}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index cff0dfdac..ddf240383 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -3,14 +3,13 @@
 # Whom:					Ade Lovett <ade@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/mail/evolution/Makefile,v 1.176 2008/08/05 08:13:07 marcus Exp $
+#   $MCom: ports/mail/evolution/Makefile,v 1.177 2008/08/18 20:30:35 marcus Exp $
 #
 
 PORTNAME=	evolution
 PORTVERSION=	2.23.90
 CATEGORIES=	mail gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/sysutils/gnome-system-monitor/Makefile b/sysutils/gnome-system-monitor/Makefile
index 149ce0a76..e206bd60d 100644
--- a/sysutils/gnome-system-monitor/Makefile
+++ b/sysutils/gnome-system-monitor/Makefile
@@ -3,14 +3,13 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/sysutils/gnome-system-monitor/Makefile,v 1.123 2008/08/05 21:00:33 marcus Exp $
+#   $MCom: ports/sysutils/gnome-system-monitor/Makefile,v 1.124 2008/08/19 02:02:06 kwm Exp $
 #
 
 PORTNAME=	gnome-system-monitor
 PORTVERSION=	2.23.90
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	GNOME
-DISTNAME=	gnome-system-monitor-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/textproc/libxml++26/Makefile b/textproc/libxml++26/Makefile
index 7073f8277..d57404454 100644
--- a/textproc/libxml++26/Makefile
+++ b/textproc/libxml++26/Makefile
@@ -4,7 +4,7 @@
 # Whom:				Ying-Chieh Liao <ijliao@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/textproc/libxml++26/Makefile,v 1.27 2008/06/14 23:00:22 marcus Exp $
+#   $MCom: ports/textproc/libxml++26/Makefile,v 1.28 2008/08/18 15:32:17 mezz Exp $
 #
 
 PORTNAME=	libxml++
@@ -22,7 +22,6 @@ BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 LATEST_LINK=	libxml++26
 
 USE_GMAKE=	yes
-USE_GCC=	3.4+
 USE_GNOME=	gnomehack gnometarget libxml2 pkgconfig
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile
index 513c30be5..476db6f64 100644
--- a/x11-toolkits/gtk20/Makefile
+++ b/x11-toolkits/gtk20/Makefile
@@ -3,7 +3,7 @@
 # Whom:				Vanilla I. Shu <vanilla@MinJe.com.TW>
 #
 # $FreeBSD$
-#   $MCom: ports/x11-toolkits/gtk20/Makefile,v 1.136 2008/08/06 03:47:24 mezz Exp $
+#   $MCom: ports/x11-toolkits/gtk20/Makefile,v 1.137 2008/08/19 02:08:49 marcus Exp $
 #
 
 PORTNAME=	gtk
@@ -61,13 +61,14 @@ CONFIGURE_ARGS+=	--enable-debug=yes
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_CUPS) || exists(${LOCALBASE}/lib/libcups.so)
+.if (defined(WITH_CUPS) || exists(${LOCALBASE}/lib/libcups.so)) && \
+	!defined(WITHOUT_CUPS)
 LIB_DEPENDS+=	cups.2:${PORTSDIR}/print/cups-base
-PLIST_SUB+=	CUPS:=""
 CONFIGURE_ARGS+=--enable-cups=auto
+PLIST_SUB+=	CUPS:=""
 .else
-PLIST_SUB+=	CUPS:="@comment "
 CONFIGURE_ARGS+=--disable-cups
+PLIST_SUB+=	CUPS:="@comment "
 .endif
 
 post-patch:
diff --git a/x11-toolkits/pango/Makefile b/x11-toolkits/pango/Makefile
index cf8fe5652..bddd62903 100644
--- a/x11-toolkits/pango/Makefile
+++ b/x11-toolkits/pango/Makefile
@@ -3,14 +3,14 @@
 # Whom:				Maxim Sobolev <sobomax@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11-toolkits/pango/Makefile,v 1.124 2008/06/17 04:36:16 marcus Exp $
+#   $MCom: ports/x11-toolkits/pango/Makefile,v 1.125 2008/08/12 05:24:53 marcus Exp $
 #
 
 PORTNAME=	pango
 PORTVERSION=	1.21.4
 PORTREVISION?=	0
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,sources/pango/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/},} \
+MASTER_SITES=	GNOME \
 		ftp://ftp.gtk.org/pub/pango/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/
 DIST_SUBDIR=	gnome2
 
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index de484438d..9e8e6be19 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -3,15 +3,14 @@
 # Whom:                Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/gdm/Makefile,v 1.128 2008/08/17 17:31:43 marcus Exp $
+#   $MCom: ports/x11/gdm/Makefile,v 1.129 2008/08/20 18:42:39 marcus Exp $
 #
 
 PORTNAME=	gdm
 PORTVERSION=	2.23.2
 PORTREVISION=	2
 CATEGORIES=	x11 gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile
index 9e7464de9..dd4dbcc88 100644
--- a/x11/gnome-desktop/Makefile
+++ b/x11/gnome-desktop/Makefile
@@ -3,15 +3,14 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/gnome-desktop/Makefile,v 1.147 2008/08/05 23:26:13 marcus Exp $
+#   $MCom: ports/x11/gnome-desktop/Makefile,v 1.148 2008/08/19 01:24:21 kwm Exp $
 #
 
 PORTNAME=	gnome-desktop
 PORTVERSION=	2.23.90
 PORTREVISION?=	0
 CATEGORIES=	x11 gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-desktop/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/x11/gnome-menus/Makefile b/x11/gnome-menus/Makefile
index 991c0e159..3c63d30d1 100644
--- a/x11/gnome-menus/Makefile
+++ b/x11/gnome-menus/Makefile
@@ -3,14 +3,13 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/gnome-menus/Makefile,v 1.81 2008/07/23 04:42:52 marcus Exp $
+#   $MCom: ports/x11/gnome-menus/Makefile,v 1.82 2008/08/05 23:04:04 marcus Exp $
 #
 
 PORTNAME=	gnome-menus
 PORTVERSION=	2.23.6
 CATEGORIES=	x11 gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile
index 212aa372b..344826967 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.186 2008/08/19 02:42:57 marcus Exp $
+#   $MCom: ports/x11/gnome-panel/Makefile,v 1.187 2008/08/21 18:43:55 mezz Exp $
 #
 
 PORTNAME=	gnome-panel
@@ -11,7 +11,6 @@ PORTVERSION=	2.23.90.1
 PORTREVISION?=	0
 CATEGORIES=	x11 gnome
 MASTER_SITES=	GNOME
-MASTER_SITE_SUBDIR=	sources/gnome-panel/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/x11/gnome-screensaver/Makefile b/x11/gnome-screensaver/Makefile
index 7e242a7d1..a81fb8317 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.93 2008/08/09 07:57:28 marcus Exp $
+#   $MCom: ports/x11/gnome-screensaver/Makefile,v 1.94 2008/08/15 06:36:34 marcus Exp $
 #
 
 PORTNAME=	gnome-screensaver
@@ -73,7 +73,7 @@ pre-everything::
 post-patch:
 .if defined(WITH_PAM)
 	@${REINPLACE_CMD} -e 's|/etc/pam.d|${PREFIX}/etc/pam.d|g' \
-	    	${WRKSRC}/src/gs-auth-pam.c
+		${WRKSRC}/src/gs-auth-pam.c
 .endif
 
 pre-install:
diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile
index 82e3ca62c..a01ad6391 100644
--- a/x11/gnome-session/Makefile
+++ b/x11/gnome-session/Makefile
@@ -3,15 +3,14 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/gnome-session/Makefile,v 1.156 2008/08/11 05:12:17 adamw Exp $
+#   $MCom: ports/x11/gnome-session/Makefile,v 1.157 2008/08/20 18:34:03 marcus Exp $
 #
 
 PORTNAME=	gnome-session
 PORTVERSION=	2.23.90
 CATEGORIES=	x11 gnome
-MASTER_SITES=	${MASTER_SITE_GNOME} \
+MASTER_SITES=	GNOME \
 		http://www.marcuscom.com/downloads/:local
-MASTER_SITE_SUBDIR=	sources/gnome-session/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		${SPLASHES}:local
 DIST_SUBDIR=	gnome2