Sync w/ FreeBSD ports.

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

9 files changed, 23 insertions, 46 deletions

diff --git a/audio/rhythmbox/Makefile b/audio/rhythmbox/Makefile
index adaa8c82d..4a78787f8 100644
--- a/audio/rhythmbox/Makefile
+++ b/audio/rhythmbox/Makefile
@@ -3,12 +3,12 @@
 # Whom:			Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/audio/rhythmbox/Makefile,v 1.91 2008/06/06 21:38:45 marcus Exp $
+#   $MCom: ports/audio/rhythmbox/Makefile,v 1.92 2008/07/13 17:48:09 marcus Exp $
 #
 
 PORTNAME=	rhythmbox
 PORTVERSION=	0.10.1
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	audio gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.10
diff --git a/databases/evolution-data-server/Makefile b/databases/evolution-data-server/Makefile
index 0e77d278a..35b5bf6a4 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.162 2008/11/07 20:51:29 mezz Exp $
+#   $MCom: ports/databases/evolution-data-server/Makefile,v 1.163 2008/11/25 02:02:29 marcus Exp $
 #
 
 PORTNAME=	evolution-data-server
@@ -45,14 +45,11 @@ PLIST_SUB=	VERSION="2.24" EVO_VERSION="1.2"
 
 .include <bsd.port.pre.mk>
 
-.if ( ( ${OSVERSION} < 504101 ) || ( ${OSVERSION} >= 600000 && ${OSVERSION} < 600012 ) )
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-libedataserver_e-msgport.c
-.endif
-
 .if defined(HEIMDAL_HOME) || defined(WITH_HEIMDAL)
 HEIMDAL_HOME?=	${LOCALBASE}
 LIB_DEPENDS+=		krb5:${PORTSDIR}/security/heimdal
 CONFIGURE_ARGS+=	--with-krb5=${HEIMDAL_HOME} --with-krb5-includes=${HEIMDAL_HOME}/include
+KRB5_LIB=		`${HEIMDAL_HOME}/bin/krb5-config gssapi --libs`
 .elif !defined(NO_KERBEROS)
 CONFIGURE_ARGS+=        --with-krb5=/usr
 KRB5_LIB=		`/usr/bin/krb5-config gssapi --libs`
diff --git a/devel/gvfs/Makefile b/devel/gvfs/Makefile
index 3555680f2..e1e5da9e1 100644
--- a/devel/gvfs/Makefile
+++ b/devel/gvfs/Makefile
@@ -3,7 +3,7 @@
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/gvfs/Makefile,v 1.35 2008/10/20 21:30:27 mezz Exp $
+#   $MCom: ports/devel/gvfs/Makefile,v 1.36 2008/11/24 20:11:35 mezz Exp $
 #
 
 PORTNAME=	gvfs
@@ -38,7 +38,7 @@ OPTIONS=	FUSE "Enable fuse" on \
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_FUSE) && ${OSVERSION} >= 600000
+.if defined(WITH_FUSE)
 LIB_DEPENDS+=	fuse.2:${PORTSDIR}/sysutils/fusefs-libs
 RUN_DEPENDS+=	mount_fusefs:${PORTSDIR}/sysutils/fusefs-kmod
 PLIST_SUB+=	FUSE=""
diff --git a/devel/libgtop/Makefile b/devel/libgtop/Makefile
index 5abe2ca86..5687b6298 100644
--- a/devel/libgtop/Makefile
+++ b/devel/libgtop/Makefile
@@ -3,7 +3,7 @@
 # Whom:				Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/libgtop/Makefile,v 1.43 2008/11/28 07:33:31 marcus Exp $
+#   $MCom: ports/devel/libgtop/Makefile,v 1.44 2008/12/07 05:29:10 marcus Exp $
 #
 
 PORTNAME=	libgtop
@@ -30,6 +30,8 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 
 INFO=		libgtop2
 
+PKGMESSAGE=	${FILESDIR}/pkg-message
+
 .include <bsd.port.pre.mk>
 
 .if ( ${OSVERSION} >= 800000 && ${OSVERSION} < 800019 ) || \
@@ -37,18 +39,12 @@ INFO=		libgtop2
 RUN_DEPENDS+=	lsof:${PORTSDIR}/sysutils/lsof
 .endif
 
-.if ${OSVERSION} >= 600000
-PKGMESSAGE=	${FILESDIR}/pkg-message
-.endif
-
 post-patch:
 	@${FIND} ${WRKSRC} -type f | ${XARGS} ${TOUCH} -f
 
 post-install:
 	@${CHGRP} kmem ${PREFIX}/bin/libgtop_server2
 	@${CHMOD} 2555 ${PREFIX}/bin/libgtop_server2
-.if ${OSVERSION} >= 600000
 	@${CAT} ${PKGMESSAGE}
-.endif
 
 .include <bsd.port.post.mk>
diff --git a/security/gnome-keyring/Makefile b/security/gnome-keyring/Makefile
index c26f3e84b..06d995f56 100644
--- a/security/gnome-keyring/Makefile
+++ b/security/gnome-keyring/Makefile
@@ -3,11 +3,12 @@
 # Whom:				Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/security/gnome-keyring/Makefile,v 1.69 2008/10/07 16:40:48 marcus Exp $
+#   $MCom: ports/security/gnome-keyring/Makefile,v 1.70 2008/10/20 02:44:20 mezz Exp $
 #
 
 PORTNAME=	gnome-keyring
 PORTVERSION=	2.24.1
+PORTREVISION=	1
 CATEGORIES=	security gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -16,7 +17,7 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A program that keeps passwords and other secrets
 
 LIB_DEPENDS=	tasn1.3:${PORTSDIR}/security/libtasn1 \
-    		gcrypt.15:${PORTSDIR}/security/libgcrypt
+    		gcrypt.16:${PORTSDIR}/security/libgcrypt
 
 USE_BZIP2=	yes
 USE_GNOME=	gnomehack gnomeprefix gtk20 ltverhack intlhack gconf2
diff --git a/x11-fm/py-nautilus/Makefile b/x11-fm/py-nautilus/Makefile
index 937d862a6..da4c2914c 100644
--- a/x11-fm/py-nautilus/Makefile
+++ b/x11-fm/py-nautilus/Makefile
@@ -3,12 +3,12 @@
 # Whom:					Adam Weinberger <adamw@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/x11-fm/py-nautilus/Makefile,v 1.8 2008/09/22 09:18:18 kwm Exp $
 #
 
 PORTNAME=	nautilus
 PORTVERSION=	0.5.1
-CATEGORIES=	x11-fm gnome
+CATEGORIES=	x11-fm gnome python
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/nautilus-python/${PORTVERSION:R}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/x11-themes/gtk-engines2/Makefile b/x11-themes/gtk-engines2/Makefile
index eb94a6a7f..304b213a9 100644
--- a/x11-themes/gtk-engines2/Makefile
+++ b/x11-themes/gtk-engines2/Makefile
@@ -3,7 +3,7 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11-themes/gtk-engines2/Makefile,v 1.67 2008/09/23 05:04:31 marcus Exp $
+#   $MCom: ports/x11-themes/gtk-engines2/Makefile,v 1.68 2008/10/20 22:54:55 kwm Exp $
 #
 
 PORTNAME=	gtk-engines2
@@ -15,7 +15,7 @@ DISTNAME=	${PORTNAME:S/2$//}-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	Theme engine for the gtk+-2.0 toolkit
+COMMENT=	Theme engine for the GTK+-2.0 toolkit
 
 CONFLICTS=	gtk-smooth-engine-[0-9]* clearlooks-[0-9]*
 
@@ -27,20 +27,15 @@ USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
 
+OPTIONS=	ANIMATION "Enable experimental animated progressbars" off
+
+.include <bsd.port.pre.mk>
+
 .if defined(WITH_ANIMATION)
 CONFIGURE_ARGS+=	--enable-animation
 .endif
 
-pre-everything::
-.if !defined(WITH_ANIMATION)
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} " You can enable experimental animated progressbars"
-	@${ECHO_MSG} " with the clearlooks engine by defining"
-	@${ECHO_MSG} " WITH_ANIMATION"
-	@${ECHO_MSG} ""
-.endif
-
 post-install:
 	@(cd ${WRKSRC}/po && ${GMAKE} install)
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index 410b261e7..e1d8aba96 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.140 2008/12/26 22:23:12 marcus Exp $
+#   $MCom: ports/x11/gdm/Makefile,v 1.141 2008/12/26 23:27:53 marcus Exp $
 #
 
 PORTNAME=	gdm
@@ -65,12 +65,6 @@ CONFIGURE_ARGS+=	--disable-ipv6
 .endif
 
 post-patch:
-.if ( ${OSVERSION} > 600000 && ${OSVERSION} < 600006 ) || \
-	( ${OSVERSION} < 503101 )
-.for po in zh_CN.po
-	@${REINPLACE_CMD} -e 's|%-|%|g' ${WRKSRC}/po/${po}
-.endfor
-.endif
 	@${REINPLACE_CMD} -e 's|root:root|root:wheel|g' \
 		${WRKSRC}/data/Makefile.in
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile
index 63feacc83..fb41a4e70 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.193 2008/10/23 03:29:21 marcus Exp $
+#   $MCom: ports/x11/gnome-panel/Makefile,v 1.194 2008/11/25 17:17:31 mezz Exp $
 #
 
 PORTNAME=	gnome-panel
@@ -67,12 +67,6 @@ post-patch:
 	@${FIND} ${WRKSRC} -type f | \
 		${XARGS} -n 10 ${REINPLACE_CMD} -e \
 		's|"applications.menu"|"gnome-applications.menu"|'
-.if ( ${OSVERSION} > 600000 && ${OSVERSION} < 600006 ) || \
-	( ${OSVERSION} < 503101 )
-.for po in da.po it.po zh_CN.po zh_TW.po
-	@${REINPLACE_CMD} -e 's|%-|%|g' ${WRKSRC}/po/${po}
-.endfor
-.endif
 
 .include <bsd.port.post.mk>