From 0539aa7075ca94d89eab4064c4acdbb77602ab48 Mon Sep 17 00:00:00 2001
From: mezz <mezz@df743ca5-7f9a-e211-a948-0013205c9059>
Date: Sat, 4 Jun 2011 22:51:28 +0000
Subject: Sync w/ FreeBSD ports tree that what I just committed recently.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@16029 df743ca5-7f9a-e211-a948-0013205c9059
---
databases/evolution-data-server/Makefile | 13 ++++---------
databases/evolution-data-server3/Makefile | 13 ++++---------
devel/gvfs/Makefile | 22 +++++++++++++++-------
devel/gvfs/pkg-plist | 6 +++---
x11/gnome-panel/Makefile | 12 +++++++-----
5 files changed, 33 insertions(+), 33 deletions(-)
diff --git a/databases/evolution-data-server/Makefile b/databases/evolution-data-server/Makefile
index 7bda45dda..c3f6ccf53 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.207 2011/04/10 19:28:35 mezz Exp $
+# $MCom: ports/databases/evolution-data-server/Makefile,v 1.208 2011/04/30 20:43:13 mezz Exp $
#
PORTNAME= evolution-data-server
@@ -47,17 +47,12 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${BDB_INCLUDE_DIR} ${PTHREAD_C
PLIST_SUB= VERSION="2.32" EVO_VERSION="1.2"
#OPTIONS= IMAP4 "Enable experimental IMAP4 backend" off
-OPTIONS= WEATHER "Enable weather calendar backend" on
+OPTIONS= WEATHER "Enable weather calendar backend" on \
+ KERBEROS "Adds Kerberos support" on
.include <bsd.port.pre.mk>
-.if defined(HEIMDAL_HOME) || defined(WITH_HEIMDAL) || defined(NO_KERBEROS)
-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)
+.if !defined(WITHOUT_KERBEROS)
CONFIGURE_ARGS+= --with-krb5=/usr
KRB5_LIB= `/usr/bin/krb5-config gssapi --libs`
.endif
diff --git a/databases/evolution-data-server3/Makefile b/databases/evolution-data-server3/Makefile
index e85779c6b..7c190c915 100644
--- a/databases/evolution-data-server3/Makefile
+++ b/databases/evolution-data-server3/Makefile
@@ -3,7 +3,7 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/databases/evolution-data-server3/Makefile,v 1.13 2011/04/25 08:12:05 kwm Exp $
+# $MCom: ports/databases/evolution-data-server3/Makefile,v 1.14 2011/05/24 11:21:08 kwm Exp $
#
PORTNAME= evolution-data-server
@@ -48,17 +48,12 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${BDB_INCLUDE_DIR} ${PTHREAD_C
PLIST_SUB= VERSION="3.0" EVO_VERSION="1.2"
#OPTIONS= IMAP4 "Enable experimental IMAP4 backend" off
-OPTIONS+= WEATHER "Enable weather calendar backend" on
+OPTIONS+= WEATHER "Enable weather calendar backend" on \
+ KERBEROS "Adds Kerberos support" on
.include <bsd.port.pre.mk>
-.if defined(HEIMDAL_HOME) || defined(WITH_HEIMDAL) || defined(NO_KERBEROS)
-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)
+.if !defined(WITHOUT_KERBEROS)
CONFIGURE_ARGS+= --with-krb5=/usr
KRB5_LIB= `/usr/bin/krb5-config gssapi --libs`
.endif
diff --git a/devel/gvfs/Makefile b/devel/gvfs/Makefile
index 32464a7c8..5fb49e129 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.73 2011/04/27 19:33:06 kwm Exp $
+# $MCom: ports/devel/gvfs/Makefile,v 1.74 2011/05/24 19:46:39 kwm Exp $
#
PORTNAME= gvfs
@@ -16,10 +16,8 @@ MAINTAINER= gnome@FreeBSD.org
COMMENT= GNOME virtual file system
LIB_DEPENDS= dbus-1.3:${PORTSDIR}/devel/dbus \
- hal.1:${PORTSDIR}/sysutils/hal \
soup-gnome-2.4.1:${PORTSDIR}/devel/libsoup-gnome \
gnome-keyring:${PORTSDIR}/security/libgnome-keyring
-RUN_DEPENDS= gnome-mount:${PORTSDIR}/sysutils/gnome-mount
USE_BZIP2= yes
USE_GNOME= glib20 gnomehack gnomeprefix intlhack intltool
@@ -33,8 +31,9 @@ CONFIGURE_ARGS= --disable-obexftp
OPTIONS= FUSE "Enable fuse" off \
AVAHI "Enable AVAHI" on \
SAMBA "Enable Samba" on \
- GPHOTO2 "Enable Gphoto 2 camera support" on \
- CDDA "Enable CDDA" on
+ GPHOTO2 "Enable Gphoto 2 camera support (required HAL)" on \
+ CDDA "Enable CDDA (required HAL)" on \
+ HAL "Enable HAL" on
GLIB_SCHEMAS= org.gnome.system.gvfs.enums.xml
@@ -58,7 +57,7 @@ CONFIGURE_ARGS+= --disable-samba
PLIST_SUB+= SMB="@comment "
.endif
-.if defined(WITH_CDDA)
+.if defined(WITH_CDDA) && !defined(WITHOUT_HAL)
LIB_DEPENDS+= cdio_paranoia.0:${PORTSDIR}/sysutils/libcdio
PLIST_SUB+= CDDA=""
.else
@@ -66,7 +65,7 @@ CONFIGURE_ARGS+= --disable-cdda
PLIST_SUB+= CDDA="@comment "
.endif
-.if defined(WITH_GPHOTO2)
+.if defined(WITH_GPHOTO2) && !defined(WITHOUT_HAL)
LIB_DEPENDS+= gphoto2.2:${PORTSDIR}/graphics/libgphoto2
PLIST_SUB+= GPHOTO2=""
.else
@@ -83,4 +82,13 @@ CONFIGURE_ARGS+=--disable-avahi
PLIST_SUB+= AVAHI="@comment "
.endif
+.if defined(WITH_HAL)
+LIB_DEPENDS+= hal.1:${PORTSDIR}/sysutils/hal
+RUN_DEPENDS+= gnome-mount:${PORTSDIR}/sysutils/gnome-mount
+PLIST_SUB+= HAL=""
+.else
+CONFIGURE_ARGS+=--disable-hal
+PLIST_SUB+= HAL="@comment "
+.endif
+
.include <bsd.port.mk>
diff --git a/devel/gvfs/pkg-plist b/devel/gvfs/pkg-plist
index ce1612eab..07d6946fb 100644
--- a/devel/gvfs/pkg-plist
+++ b/devel/gvfs/pkg-plist
@@ -30,7 +30,7 @@ lib/libgvfscommon.so
lib/libgvfscommon.so.0
%%FUSE%%libexec/gvfs-fuse-daemon
%%GPHOTO2%%libexec/gvfs-gphoto2-volume-monitor
-libexec/gvfs-hal-volume-monitor
+%%HAL%%libexec/gvfs-hal-volume-monitor
libexec/gvfsd
libexec/gvfsd-archive
libexec/gvfsd-burn
@@ -53,7 +53,7 @@ libexec/gvfsd-trash
share/dbus-1/services/gvfs-daemon.service
share/dbus-1/services/gvfs-metadata.service
%%GPHOTO2%%share/dbus-1/services/org.gtk.Private.GPhoto2VolumeMonitor.service
-share/dbus-1/services/org.gtk.Private.HalVolumeMonitor.service
+%%HAL%%share/dbus-1/services/org.gtk.Private.HalVolumeMonitor.service
%%DATADIR%%/mounts/archive.mount
%%DATADIR%%/mounts/burn.mount
%%CDDA%%%%DATADIR%%/mounts/cdda.mount
@@ -71,7 +71,7 @@ share/dbus-1/services/org.gtk.Private.HalVolumeMonitor.service
%%SMB%%%%DATADIR%%/mounts/smb.mount
%%DATADIR%%/mounts/trash.mount
%%GPHOTO2%%%%DATADIR%%/remote-volume-monitors/gphoto2.monitor
-%%DATADIR%%/remote-volume-monitors/hal.monitor
+%%HAL%%%%DATADIR%%/remote-volume-monitors/hal.monitor
share/locale/af/LC_MESSAGES/gvfs.mo
share/locale/ar/LC_MESSAGES/gvfs.mo
share/locale/as/LC_MESSAGES/gvfs.mo
diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile
index 3ba424519..40d261367 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.233 2011/04/30 20:43:30 mezz Exp $
+# $MCom: ports/x11/gnome-panel/Makefile,v 1.234 2011/06/03 21:27:51 mezz Exp $
#
PORTNAME= gnome-panel
@@ -28,6 +28,7 @@ CONFLICTS= gnome-panel-3.[0-9]*
USE_GETTEXT= yes
USE_XORG= ice sm x11 xau xrandr
+USE_PYTHON= yes
INSTALLS_OMF= yes
USE_LDCONFIG= yes
INSTALLS_ICONS= yes
@@ -36,10 +37,9 @@ USE_GNOME= gnomeprefix gnomehack intlhack gnomedesktop libwnck gnomemenus \
WANT_GNOME= yes
USE_GMAKE= yes
USE_AUTOTOOLS= libtool
-CONFIGURE_ARGS= --disable-network-manager \
- --enable-polkit
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ARGS= --disable-network-manager
+CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS="-I${LOCALBASE}/include"
MAN1= gnome-panel.1
GCONF_SCHEMAS= clock.schemas fish.schemas \
@@ -81,6 +81,8 @@ post-patch:
@${REINPLACE_CMD} -e 's|xsltproc -o| xsltproc --nonet -o|g' \
${WRKSRC}/help/clock/Makefile.in \
${WRKSRC}/help/fish/Makefile.in
+ @${REINPLACE_CMD} -e 's|python.* python2\.0|${PYTHON_VERSION}|g' \
+ ${WRKSRC}/configure
post-install:
@${MKDIR} ${PREFIX}/lib/gnome-panel/modules
--
cgit v1.2.3