summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--accessibility/accerciser/Makefile4
-rw-r--r--accessibility/at-spi/Makefile8
-rw-r--r--accessibility/atkmm/Makefile6
-rw-r--r--accessibility/mousetweaks/Makefile6
-rw-r--r--accessibility/orca/Makefile4
-rw-r--r--archivers/file-roller/Makefile4
-rw-r--r--archivers/file-roller/pkg-descr2
-rw-r--r--audio/gnome-media/Makefile4
-rw-r--r--audio/libcanberra-gtk3/Makefile4
-rw-r--r--databases/evolution-data-server/Makefile8
-rw-r--r--databases/glom/Makefile6
-rw-r--r--databases/libgda4-reference/Makefile12
-rw-r--r--databases/libgda4-reference/pkg-descr3
-rw-r--r--databases/libgda4/Makefile6
-rw-r--r--deskutils/gnome-utils/Makefile4
-rw-r--r--deskutils/gucharmap/Makefile3
-rw-r--r--devel/anjuta/Makefile4
-rw-r--r--devel/devhelp/Makefile4
-rw-r--r--devel/json-glib/Makefile6
-rw-r--r--editors/gedit-plugins/Makefile4
-rw-r--r--editors/gedit/Makefile4
-rw-r--r--editors/ghex/Makefile4
-rw-r--r--games/gnome-games/Makefile8
-rw-r--r--graphics/eog-plugins/Makefile4
-rw-r--r--graphics/eog/Makefile4
-rw-r--r--graphics/evince/Makefile7
-rw-r--r--graphics/evince/files/patch-backend_pdf_ev-poppler.cc28
-rw-r--r--graphics/gegl/Makefile38
-rw-r--r--mail/evolution-exchange/Makefile10
-rw-r--r--mail/evolution-exchange/pkg-descr3
-rw-r--r--mail/evolution-mapi/Makefile10
-rw-r--r--mail/evolution-mapi/distinfo4
-rw-r--r--mail/evolution/Makefile4
-rw-r--r--math/gcalctool/Makefile3
-rw-r--r--misc/gnome-devel-docs/Makefile3
-rw-r--r--multimedia/cheese/Makefile4
-rw-r--r--net/avahi-app/Makefile8
-rw-r--r--net/ekiga/Makefile2
-rw-r--r--net/ekiga3/Makefile2
-rw-r--r--net/gnome-nettool/Makefile4
-rw-r--r--net/gtk-vnc/Makefile2
-rw-r--r--net/gtk-vnc/files/patch-src_gvnc.c11
-rw-r--r--net/libgweather/Makefile4
-rw-r--r--net/libproxy/files/patch-libproxy_url.cpp10
-rw-r--r--net/libproxy/files/patch-utils-CMakeLists.txt8
-rw-r--r--net/vinagre/Makefile4
-rw-r--r--net/vino/Makefile4
-rw-r--r--print/cups-pk-helper/Makefile6
-rw-r--r--print/libgnomecups/Makefile2
-rw-r--r--security/gnome-keyring/Makefile4
-rw-r--r--security/seahorse/Makefile4
-rw-r--r--sysutils/brasero/Makefile7
-rw-r--r--sysutils/brasero/files/patch-libbrasero-media_scsi-cam.c13
-rw-r--r--sysutils/gconf-editor/Makefile4
-rw-r--r--sysutils/gnome-control-center/Makefile4
-rw-r--r--sysutils/gnome-settings-daemon/Makefile61
-rw-r--r--sysutils/gnome-settings-daemon/distinfo2
-rw-r--r--sysutils/gnome-settings-daemon/files/patch-libnotify58
-rw-r--r--sysutils/gnome-settings-daemon/pkg-descr3
-rw-r--r--sysutils/gnome-settings-daemon/pkg-plist246
-rw-r--r--sysutils/gnome-system-monitor/Makefile4
-rw-r--r--sysutils/polkit-gnome/Makefile4
-rw-r--r--sysutils/polkit/Makefile3
-rw-r--r--sysutils/system-tools-backends/Makefile6
-rw-r--r--sysutils/system-tools-backends/files/patch-Utils_Platform.pm10
-rw-r--r--sysutils/zeitgeist/Makefile3
-rw-r--r--textproc/intltool/Makefile6
-rw-r--r--www/epiphany-extensions/Makefile4
68 files changed, 230 insertions, 523 deletions
diff --git a/accessibility/accerciser/Makefile b/accessibility/accerciser/Makefile
index 7145cb0f1..9fcf84c5a 100644
--- a/accessibility/accerciser/Makefile
+++ b/accessibility/accerciser/Makefile
@@ -3,12 +3,12 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/accessibility/accerciser/Makefile,v 1.36 2010/04/27 21:38:19 kwm Exp $
+# $MCom: ports/accessibility/accerciser/Makefile,v 1.38 2011/10/19 23:33:01 kwm Exp $
#
PORTNAME= accerciser
PORTVERSION= 1.12.1
-PORTREVISION= 1
+PORTREVISION= 3
CATEGORIES= accessibility gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/accessibility/at-spi/Makefile b/accessibility/at-spi/Makefile
index 5e3a64fa0..46f34e891 100644
--- a/accessibility/at-spi/Makefile
+++ b/accessibility/at-spi/Makefile
@@ -3,12 +3,12 @@
# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/accessibility/at-spi/Makefile,v 1.107 2011/04/30 20:43:11 mezz Exp $
+# $MCom: ports/accessibility/at-spi/Makefile,v 1.108 2011/06/11 18:55:54 mezz Exp $
#
PORTNAME= at-spi
PORTVERSION= 1.32.0
-PORTREVISION?= 0
+PORTREVISION?= 2
CATEGORIES= accessibility x11-toolkits
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -30,8 +30,8 @@ USE_PYTHON= yes
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-static
-CPPFLAGS= -I${LOCALBASE}/include
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
GCONF_SCHEMAS= at-spi.schemas
diff --git a/accessibility/atkmm/Makefile b/accessibility/atkmm/Makefile
index a4e5a53a4..827794429 100644
--- a/accessibility/atkmm/Makefile
+++ b/accessibility/atkmm/Makefile
@@ -3,7 +3,7 @@
# Whom: Koop Mast <kwm@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/accessibility/atkmm/Makefile,v 1.10 2011/06/11 18:55:54 mezz Exp $
+# $MCom: ports/accessibility/atkmm/Makefile,v 1.11 2011/10/26 12:56:04 kwm Exp $
#
PORTNAME= atkmm
@@ -22,8 +22,8 @@ USE_GMAKE= yes
MAKE_JOBS_SAFE= yes
USE_GNOME= gnomehack atk
GNU_CONFIGURE= yes
-CPPFLAGS= -I${LOCALBASE}/include
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --disable-documentation
.include <bsd.port.mk>
diff --git a/accessibility/mousetweaks/Makefile b/accessibility/mousetweaks/Makefile
index 50bb3de1f..6de130e9f 100644
--- a/accessibility/mousetweaks/Makefile
+++ b/accessibility/mousetweaks/Makefile
@@ -3,7 +3,7 @@
# Whom: Koop Mast <kwm@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/accessibility/mousetweaks/Makefile,v 1.56 2011/04/30 20:43:12 mezz Exp $
+# $MCom: ports/accessibility/mousetweaks/Makefile,v 1.57 2011/06/11 18:55:55 mezz Exp $
#
PORTNAME= mousetweaks
@@ -24,8 +24,8 @@ USE_GMAKE= yes
USE_GETTEXT= yes
INSTALLS_OMF= yes
GNU_CONFIGURE= yes
-CPPFLAGS= -I${LOCALBASE}/include
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
GCONF_SCHEMAS= mousetweaks.schemas pointer-capture-applet.schemas
MAN1= dwell-click-applet.1 mousetweaks.1 pointer-capture-applet.1
diff --git a/accessibility/orca/Makefile b/accessibility/orca/Makefile
index 5259a8c37..e8bb7fd1f 100644
--- a/accessibility/orca/Makefile
+++ b/accessibility/orca/Makefile
@@ -3,12 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/accessibility/orca/Makefile,v 1.94 2011/06/11 18:55:55 mezz Exp $
+# $MCom: ports/accessibility/orca/Makefile,v 1.95 2012/06/27 12:53:05 kwm Exp $
#
PORTNAME= orca
PORTVERSION= 2.32.1
-PORTREVISION= 1
+PORTREVISION= 3
CATEGORIES= accessibility gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/archivers/file-roller/Makefile b/archivers/file-roller/Makefile
index 0f89d91fd..24373743c 100644
--- a/archivers/file-roller/Makefile
+++ b/archivers/file-roller/Makefile
@@ -3,12 +3,12 @@
# Whom: Anders Nordby <anders@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/archivers/file-roller/Makefile,v 1.188 2011/06/11 18:55:56 mezz Exp $
+# $MCom: ports/archivers/file-roller/Makefile,v 1.189 2012/08/17 19:06:42 kwm Exp $
#
PORTNAME= file-roller
PORTVERSION= 2.32.1
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= archivers gnome
MASTER_SITES= GNOME
diff --git a/archivers/file-roller/pkg-descr b/archivers/file-roller/pkg-descr
index 703a89829..75feec94b 100644
--- a/archivers/file-roller/pkg-descr
+++ b/archivers/file-roller/pkg-descr
@@ -17,5 +17,3 @@ of any type for which you have a viewer.
Former WinZip users may find this program useful. It serves the same purpose.
WWW: http://fileroller.sourceforge.net/
-
-- Anders Nordby <anders@FreeBSD.org>
diff --git a/audio/gnome-media/Makefile b/audio/gnome-media/Makefile
index 595160d8b..8d626d8be 100644
--- a/audio/gnome-media/Makefile
+++ b/audio/gnome-media/Makefile
@@ -3,12 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/audio/gnome-media/Makefile,v 1.162 2011/10/22 22:30:14 kwm Exp $
+# $MCom: ports/audio/gnome-media/Makefile,v 1.163 2012/08/17 19:06:42 kwm Exp $
#
PORTNAME= gnome-media
PORTVERSION= 2.32.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= audio gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/audio/libcanberra-gtk3/Makefile b/audio/libcanberra-gtk3/Makefile
index 006cce152..fc1a9e6bd 100644
--- a/audio/libcanberra-gtk3/Makefile
+++ b/audio/libcanberra-gtk3/Makefile
@@ -3,10 +3,10 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/audio/libcanberra-gtk3/Makefile,v 1.7 2011/03/03 10:38:09 kwm Exp $
+# $MCom: ports/audio/libcanberra-gtk3/Makefile,v 1.8 2011/03/16 10:24:48 kwm Exp $
#
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= audio devel
PKGNAMESUFFIX= -gtk3
diff --git a/databases/evolution-data-server/Makefile b/databases/evolution-data-server/Makefile
index 7a4fda7ad..431b4090d 100644
--- a/databases/evolution-data-server/Makefile
+++ b/databases/evolution-data-server/Makefile
@@ -3,12 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/databases/evolution-data-server/Makefile,v 1.213 2011/10/24 08:12:27 kwm Exp $
+# $MCom: ports/databases/evolution-data-server/Makefile,v 1.214 2012/08/08 16:56:39 kwm Exp $
#
PORTNAME= evolution-data-server
PORTVERSION= 2.32.1
-PORTREVISION= 1
+PORTREVISION= 3
CATEGORIES= databases gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -39,8 +39,8 @@ CONFIGURE_ARGS= --enable-static \
--enable-gnome-keyring=yes \
--with-openldap=yes \
--with-libdb=${LOCALBASE}
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${BDB_INCLUDE_DIR} ${PTHREAD_CFLAGS}" \
- LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+= -I${LOCALBASE}/include -I${BDB_INCLUDE_DIR} ${PTHREAD_CFLAGS}
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
PLIST_SUB= VERSION="2.32" EVO_VERSION="1.2"
diff --git a/databases/glom/Makefile b/databases/glom/Makefile
index cfb239909..0e7b9cc06 100644
--- a/databases/glom/Makefile
+++ b/databases/glom/Makefile
@@ -3,7 +3,7 @@
# Whom: Adam Weinberger <adamw@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/databases/glom/Makefile,v 1.35 2012/01/05 20:05:08 kwm Exp $
+# $MCom: ports/databases/glom/Makefile,v 1.36 2012/01/16 22:40:46 kwm Exp $
#
PORTNAME= glom
@@ -35,8 +35,8 @@ USE_GNOME= gnomedocutils gnomehack gnomeprefix intltool pygobject3 libxml2
USE_LDCONFIG= yes
USE_PGSQL= yes
INSTALLS_OMF= yes
-CPPFLAGS= -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --with-postgres-utils=${LOCALBASE}/bin \
--disable-documentation
INSTALLS_ICONS= yes
diff --git a/databases/libgda4-reference/Makefile b/databases/libgda4-reference/Makefile
deleted file mode 100644
index bf3894e64..000000000
--- a/databases/libgda4-reference/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-# New ports collection makefile for: libgda3-reference
-# Date created: 09 May 2006
-# Whom: Jean-Yves Lefort <jylefort@FreeBSD.org>
-#
-# $FreeBSD$
-# $MCOM$
-
-PORTREVISION= 0
-
-REFERENCE_SRC= ${WRKSRC}/doc/C
-
-.include "${.CURDIR}/../../devel/glib20-reference/bsd.gnome-reference.mk"
diff --git a/databases/libgda4-reference/pkg-descr b/databases/libgda4-reference/pkg-descr
deleted file mode 100644
index 6fcfe64af..000000000
--- a/databases/libgda4-reference/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-This port contains the programming reference for databases/libgda4.
-
-WWW: http://www.gnome-db.org/
diff --git a/databases/libgda4/Makefile b/databases/libgda4/Makefile
index 08bc03f5c..89b61a681 100644
--- a/databases/libgda4/Makefile
+++ b/databases/libgda4/Makefile
@@ -3,7 +3,7 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/databases/libgda4/Makefile,v 1.25 2011/10/15 15:18:35 kwm Exp $
+# $MCom: ports/databases/libgda4/Makefile,v 1.26 2011/12/17 17:59:32 kwm Exp $
#
PORTNAME= libgda
@@ -40,8 +40,8 @@ MAKE_JOBS_UNSAFE=yes
CONFIGURE_ARGS= --without-oracle \
--disable-crypto \
--enable-introspection
-CPPFLAGS= -I${LOCALBASE}/include
-LDDFLAGS= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include
+LDDFLAGS+= -L${LOCALBASE}/lib
.if ${LIBGDA4_SLAVE}=="no"
OPTIONS= UI "Build UI tools" on
diff --git a/deskutils/gnome-utils/Makefile b/deskutils/gnome-utils/Makefile
index bb3d9515c..bed3b9733 100644
--- a/deskutils/gnome-utils/Makefile
+++ b/deskutils/gnome-utils/Makefile
@@ -3,12 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/deskutils/gnome-utils/Makefile,v 1.157 2012/05/31 15:11:23 kwm Exp $
+# $MCom: ports/deskutils/gnome-utils/Makefile,v 1.158 2012/08/17 19:06:42 kwm Exp $
#
PORTNAME= gnome-utils
PORTVERSION= 2.32.0
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= deskutils gnome
MASTER_SITES= GNOME
diff --git a/deskutils/gucharmap/Makefile b/deskutils/gucharmap/Makefile
index 0217585cd..1d5981a5c 100644
--- a/deskutils/gucharmap/Makefile
+++ b/deskutils/gucharmap/Makefile
@@ -3,11 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/deskutils/gucharmap/Makefile,v 1.79 2011/06/11 19:51:12 mezz Exp $
+# $MCom: ports/deskutils/gucharmap/Makefile,v 1.80 2012/08/17 19:06:42 kwm Exp $
#
PORTNAME= gucharmap
PORTVERSION= 2.32.1
+PORTREVISION= 2
CATEGORIES= deskutils gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/devel/anjuta/Makefile b/devel/anjuta/Makefile
index dfa8c9cee..36f6fff56 100644
--- a/devel/anjuta/Makefile
+++ b/devel/anjuta/Makefile
@@ -3,12 +3,12 @@
# Whom: Dmitry Sivachenko <demon@FreeBSD.org>
#
# $FreeBSD: ports/devel/anjuta/Makefile,v 1.102 2012/06/01 05:17:19 dinoex Exp $
-# $MCom: ports/devel/anjuta/Makefile,v 1.67 2010/11/13 08:07:29 kwm Exp $
+# $MCom: ports/devel/anjuta/Makefile,v 1.69 2012/06/16 21:09:40 kwm Exp $
#
PORTNAME= anjuta
PORTVERSION= 2.32.1.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= devel gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/devel/devhelp/Makefile b/devel/devhelp/Makefile
index 1f5221a69..2897ff105 100644
--- a/devel/devhelp/Makefile
+++ b/devel/devhelp/Makefile
@@ -3,11 +3,11 @@
# Whom: Adam Weinberger <adamw@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/devhelp/Makefile,v 1.43 2011/06/11 19:51:13 mezz Exp $
+# $MCom: ports/devel/devhelp/Makefile,v 1.44 2012/08/17 19:06:43 kwm Exp $
PORTNAME= devhelp
PORTVERSION= 2.32.0
-PORTREVISION= 2
+PORTREVISION= 3
PORTEPOCH= 1
CATEGORIES= devel gnome
MASTER_SITES= GNOME
diff --git a/devel/json-glib/Makefile b/devel/json-glib/Makefile
index 7722fc78f..0c9be472d 100644
--- a/devel/json-glib/Makefile
+++ b/devel/json-glib/Makefile
@@ -3,7 +3,7 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/json-glib/Makefile,v 1.20 2011/10/26 13:14:50 kwm Exp $
+# $MCom: ports/devel/json-glib/Makefile,v 1.21 2012/08/17 19:06:43 kwm Exp $
#
PORTNAME= json-glib
@@ -23,7 +23,7 @@ USE_GNOME= glib20 gnomehack gnomeprefix ltverhack
USE_PKGCONFIG= build
USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
-CPPFLAGS= -I${LOCALBASE}/include
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
.include <bsd.port.mk>
diff --git a/editors/gedit-plugins/Makefile b/editors/gedit-plugins/Makefile
index 9bb7bf0c6..4db3f73c5 100644
--- a/editors/gedit-plugins/Makefile
+++ b/editors/gedit-plugins/Makefile
@@ -3,12 +3,12 @@
# Whom: Adam Weinberger <adamw@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/editors/gedit-plugins/Makefile,v 1.52 2011/06/30 04:23:55 mezz Exp $
+# $MCom: ports/editors/gedit-plugins/Makefile,v 1.53 2012/08/17 19:06:43 kwm Exp $
#
PORTNAME= gedit-plugins
PORTVERSION= 2.32.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= editors gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/editors/gedit/Makefile b/editors/gedit/Makefile
index 3842ff154..94ca7731d 100644
--- a/editors/gedit/Makefile
+++ b/editors/gedit/Makefile
@@ -3,12 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/editors/gedit/Makefile,v 1.130 2011/06/30 04:23:55 mezz Exp $
+# $MCom: ports/editors/gedit/Makefile,v 1.131 2012/08/17 19:06:43 kwm Exp $
#
PORTNAME= gedit
PORTVERSION= 2.30.4
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= editors gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/editors/ghex/Makefile b/editors/ghex/Makefile
index 09cfafcac..eea0c1688 100644
--- a/editors/ghex/Makefile
+++ b/editors/ghex/Makefile
@@ -3,12 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/editors/ghex/Makefile,v 1.15 2011/10/15 16:35:30 kwm Exp $
+# $MCom: ports/editors/ghex/Makefile,v 1.16 2012/08/17 19:06:44 kwm Exp $
#
PORTNAME= ghex
PORTVERSION= 2.24.0
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= editors gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/games/gnome-games/Makefile b/games/gnome-games/Makefile
index 6d5454149..a7d99eb4c 100644
--- a/games/gnome-games/Makefile
+++ b/games/gnome-games/Makefile
@@ -3,12 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/games/gnome-games/Makefile,v 1.238 2011/08/17 20:09:35 kwm Exp $
+# $MCom: ports/games/gnome-games/Makefile,v 1.239 2012/04/27 13:26:22 kwm Exp $
#
PORTNAME= gnome-games
PORTVERSION= 2.32.1
-PORTREVISION= 2
+PORTREVISION= 4
CATEGORIES= games gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -36,8 +36,8 @@ USE_GSTREAMER= vorbis ogg
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-sound=gstreamer \
--disable-tests
-CPPFLAGS= -I${LOCALBASE}/include
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
GCONF_SCHEMAS= aisleriot.schemas glchess.schemas glines.schemas \
gnect.schemas gnibbles.schemas gnobots2.schemas \
diff --git a/graphics/eog-plugins/Makefile b/graphics/eog-plugins/Makefile
index d17998ba4..b1408ed59 100644
--- a/graphics/eog-plugins/Makefile
+++ b/graphics/eog-plugins/Makefile
@@ -3,12 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/graphics/eog-plugins/Makefile,v 1.19 2011/08/24 16:05:56 kwm Exp $
+# $MCom: ports/graphics/eog-plugins/Makefile,v 1.20 2012/08/17 19:06:44 kwm Exp $
#
PORTNAME= eog-plugins
PORTVERSION= 2.30.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= graphics gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/graphics/eog/Makefile b/graphics/eog/Makefile
index d5de8992e..5042d78ba 100644
--- a/graphics/eog/Makefile
+++ b/graphics/eog/Makefile
@@ -3,12 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/graphics/eog/Makefile,v 1.127 2011/06/03 21:27:50 mezz Exp $
+# $MCom: ports/graphics/eog/Makefile,v 1.128 2012/08/17 19:06:44 kwm Exp $
#
PORTNAME= eog
PORTVERSION= 2.32.1
-PORTREVISION= 2
+PORTREVISION= 4
CATEGORIES= graphics gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/graphics/evince/Makefile b/graphics/evince/Makefile
index 71cee1542..d77e221f2 100644
--- a/graphics/evince/Makefile
+++ b/graphics/evince/Makefile
@@ -3,12 +3,12 @@
# Whom: Adam Weinberger <adamw@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/graphics/evince/Makefile,v 1.157 2012/06/13 12:31:10 kwm Exp $
+# $MCom: ports/graphics/evince/Makefile,v 1.158 2012/08/17 19:06:44 kwm Exp $
#
PORTNAME= evince
PORTVERSION= 2.32.0
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= graphics print gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -19,7 +19,8 @@ COMMENT= GNOME 2 multi-format document viewer
BUILD_DEPENDS= ${LOCALBASE}/share/icons/gnome/index.theme:${PORTSDIR}/misc/gnome-icon-theme
LIB_DEPENDS= poppler-glib.8:${PORTSDIR}/graphics/poppler-glib \
spectre.1:${PORTSDIR}/print/libspectre
-RUN_DEPENDS= ${LOCALBASE}/share/icons/gnome/index.theme:${PORTSDIR}/misc/gnome-icon-theme
+RUN_DEPENDS= ${LOCALBASE}/share/icons/gnome/index.theme:${PORTSDIR}/misc/gnome-icon-theme \
+ yelp:${PORTSDIR}/x11/yelp
CONFLICTS= evince-3.[0-9]*
diff --git a/graphics/evince/files/patch-backend_pdf_ev-poppler.cc b/graphics/evince/files/patch-backend_pdf_ev-poppler.cc
new file mode 100644
index 000000000..144950986
--- /dev/null
+++ b/graphics/evince/files/patch-backend_pdf_ev-poppler.cc
@@ -0,0 +1,28 @@
+--- ./backend/pdf/ev-poppler.cc.orig 2010-09-28 01:54:34.000000000 +0900
++++ ./backend/pdf/ev-poppler.cc 2011-11-22 20:11:28.000000000 +0900
+@@ -640,6 +640,7 @@
+ PopplerPermissions permissions;
+ EvPage *page;
+ char *metadata;
++ gboolean linearized;
+
+ info = g_new0 (EvDocumentInfo, 1);
+
+@@ -676,7 +677,7 @@
+ "producer", &(info->producer),
+ "creation-date", &(info->creation_date),
+ "mod-date", &(info->modified_date),
+- "linearized", &(info->linearized),
++ "linearized", &linearized,
+ "metadata", &metadata,
+ NULL);
+
+@@ -782,6 +783,8 @@
+ info->security = g_strdup (_("No"));
+ }
+
++ info->linearized = linearized ? g_strdup (_("Yes")) : g_strdup (_("No"));
++
+ return info;
+ }
+
diff --git a/graphics/gegl/Makefile b/graphics/gegl/Makefile
index d786d8ff2..f279c90a4 100644
--- a/graphics/gegl/Makefile
+++ b/graphics/gegl/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gegl
PORTVERSION= 0.2.0
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= ftp://ftp.gimp.org/pub/gegl/0.2/
@@ -20,7 +21,9 @@ LIB_DEPENDS= babl-0:${PORTSDIR}/x11/babl \
OPTIONS= CAIRO "Enable Cairo" on \
ENSCRIPT "Enable Enscript" on \
FFMPEG "Enable videos through ffmpeg (BROKEN)" off \
+ GDK "Enable gdk-pixbuf2 formats support" on \
GRAPHVIZ "Enable Graphviz" on \
+ JP2 "Enable JPEG2000 format support" on \
JPEG "Enable JPEG format support" on \
LUA "Enable LUA" on \
OPENEXR "Enable High Dynamic Range (HDR) format support" on \
@@ -36,7 +39,7 @@ OPTIONS= CAIRO "Enable Cairo" on \
# Disable docs until I fix the problem with graphviz's dot
NOPORTDOCS= yes
-USE_GNOME= gtk20 glib20 pkgconfig gnomehack
+USE_GNOME= glib20 pkgconfig gnomehack
USE_BZIP2= yes
USE_GMAKE= yes
USE_GETTEXT= yes
@@ -56,6 +59,14 @@ EXAMPLES= 2geglbuffer csugar float-lookup \
.include <bsd.port.options.mk>
+.if !defined(WITHOUT_GDK)
+USE_GNOME+= gdkpixbuf2
+PLIST_SUB+= GDK=""
+.else
+CONFIGURE_ARGS+=--without-gdk-pixbuf
+PLIST_SUB+= GDK="@comment "
+.endif
+
.if !defined(WITHOUT_CAIRO)
LIB_DEPENDS+= cairo:${PORTSDIR}/graphics/cairo
PLIST_SUB+= CAIRO=""
@@ -84,7 +95,6 @@ BUILD_DEPENDS+= enscript:${PORTSDIR}/print/enscript-a4
.endif
.if !defined(WITHOUT_FFMPEG)
-#BROKEN= ffmpeg support is currently broken
LIB_DEPENDS+= avformat:${PORTSDIR}/multimedia/ffmpeg
PLIST_SUB+= FFMPEG=""
.else
@@ -98,6 +108,14 @@ LIB_DEPENDS+= graph:${PORTSDIR}/graphics/graphviz
CONFIGURE_ARGS+=--without-graphviz
.endif
+.if !defined(WITHOUT_JP2)
+LIB_DEPENDS+= jasper:${PORTSDIR}/graphics/jasper
+PLIST_SUB+= JP2=""
+.else
+CONFIGURE_ARGS+=--without-jasper
+PLIST_SUB+= JP2="@comment "
+.endif
+
.if !defined(WITHOUT_JPEG)
LIB_DEPENDS+= jpeg:${PORTSDIR}/graphics/jpeg
PLIST_SUB+= JPEG=""
@@ -174,16 +192,20 @@ PLIST_SUB+= V4L="@comment "
.if !defined(NOPORTDOCS)
BUILD_DEPENDS+= a2x:${PORTSDIR}/textproc/asciidoc
.else
-CONFIGURE_ARGS+= --disable-docs
+CONFIGURE_ARGS+=--disable-docs
.endif
post-patch:
.if defined(NOPORTDOCS)
- ${REINPLACE_CMD} -e '10s|\\||; 11,13d' ${WRKSRC}/Makefile.am
-.endif
- ${REINPLACE_CMD} -e 's|-T||' ${WRKSRC}/docs/Makefile.am ${WRKSRC}/docs/Makefile.in
- ${REINPLACE_CMD} -e 's|\(lua\)\(5\.1\)|\1-\2|g' ${WRKSRC}/configure
- ${REINPLACE_CMD} -e 's|/usr/bin/ruby|/usr/bin/env ruby|' ${WRKSRC}/tools/gobj2dot.rb
+ ${REINPLACE_CMD} -e '10s|\\||; 11,13d' \
+ ${WRKSRC}/Makefile.am
+.endif
+ ${REINPLACE_CMD} -e 's|-T||' ${WRKSRC}/docs/Makefile.am \
+ ${WRKSRC}/docs/Makefile.in
+ ${REINPLACE_CMD} -e 's|\(lua\)\(5\.1\)|\1-\2|g ; s|x86_64|amd64|g' \
+ ${WRKSRC}/configure
+ ${REINPLACE_CMD} -e 's|/usr/bin/ruby|/usr/bin/env ruby|' \
+ ${WRKSRC}/tools/gobj2dot.rb
post-build:
.if !defined(NOPORTDOCS)
diff --git a/mail/evolution-exchange/Makefile b/mail/evolution-exchange/Makefile
index a9cfa9f5e..7263db8c1 100644
--- a/mail/evolution-exchange/Makefile
+++ b/mail/evolution-exchange/Makefile
@@ -3,12 +3,12 @@
# Whom: Adam Weinberger, based off kiesel's ximian-exchange port
#
# $FreeBSD$
-# $MCom: ports/mail/evolution-exchange/Makefile,v 1.169 2011/04/10 19:53:00 mezz Exp $
+# $MCom: ports/mail/evolution-exchange/Makefile,v 1.170 2011/04/30 20:43:20 mezz Exp $
#
PORTNAME= evolution-exchange
PORTVERSION= 2.32.1
-PORTREVISION= 1
+PORTREVISION= 3
CATEGORIES= mail gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -29,8 +29,8 @@ USE_GMAKE= yes
USE_BDB= 41
USE_OPENLDAP= yes
USE_GNOME= gnomeprefix intlhack gnomehack ltasneededhack
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${BDB_INCLUDE_DIR}" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include -I${BDB_INCLUDE_DIR}
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --with-openldap=${LOCALBASE} \
--with-static-ldap=no \
--with-libdb=${LOCALBASE}
@@ -56,7 +56,7 @@ KRB5_LIB= `/usr/bin/krb5-config gssapi --libs`
.endif
.if ${ARCH} == "amd64"
-CONFIGURE_ENV+= CFLAGS="${CFLAGS} -fPIC"
+CFLAGS+= -fPIC
.endif
.if exists(${LOCALBASE}/include/mapi.h)
diff --git a/mail/evolution-exchange/pkg-descr b/mail/evolution-exchange/pkg-descr
index 03dc3b673..fe50e0d40 100644
--- a/mail/evolution-exchange/pkg-descr
+++ b/mail/evolution-exchange/pkg-descr
@@ -6,6 +6,3 @@ Exchange client, enabling users to become full participants in company-wide
group scheduling and other collaborative tasks. Linux, Solaris and FreeBSD
users can access public folders, Global Address Lists, email, calendar,
task lists, and group scheduling information.
-
-- Alex Kiesel
-kiesel@schlund.de
diff --git a/mail/evolution-mapi/Makefile b/mail/evolution-mapi/Makefile
index 9deb2835b..f7577998a 100644
--- a/mail/evolution-mapi/Makefile
+++ b/mail/evolution-mapi/Makefile
@@ -3,12 +3,12 @@
# Whom: Koop Mast <kwm@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/mail/evolution-mapi/Makefile,v 1.25 2011/04/22 16:17:21 mezz Exp $
+# $MCom: ports/mail/evolution-mapi/Makefile,v 1.26 2011/04/30 20:43:20 mezz Exp $
#
PORTNAME= evolution-mapi
-PORTVERSION= 0.32.1
-PORTREVISION= 1
+PORTVERSION= 0.32.2
+PORTREVISION= 2
CATEGORIES= mail gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -30,8 +30,8 @@ USE_GMAKE= yes
USE_GNOME= evolutiondataserver
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
EVO_VERSION= 2.32
EDS_VERSION= 1.2
diff --git a/mail/evolution-mapi/distinfo b/mail/evolution-mapi/distinfo
index bcc486d5c..0edfdd74d 100644
--- a/mail/evolution-mapi/distinfo
+++ b/mail/evolution-mapi/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome2/evolution-mapi-0.32.1.tar.bz2) = 4ff34dbde1cef67615c4cbc76e259d076a315d70fb80bbf4c107e48b214b9cd8
-SIZE (gnome2/evolution-mapi-0.32.1.tar.bz2) = 560064
+SHA256 (gnome2/evolution-mapi-0.32.2.tar.bz2) = 0a955a60cbdbe210b6cb7363a7c9a8b8916b4808bc53671e0444d32399871625
+SIZE (gnome2/evolution-mapi-0.32.2.tar.bz2) = 557850
diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index 3ccf5df52..64b8add30 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -3,12 +3,12 @@
# Whom: Ade Lovett <ade@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/mail/evolution/Makefile,v 1.239 2011/12/07 12:22:51 kwm Exp $
+# $MCom: ports/mail/evolution/Makefile,v 1.240 2012/04/27 02:54:37 mezz Exp $
#
PORTNAME= evolution
PORTVERSION= 2.32.1
-PORTREVISION= 2
+PORTREVISION= 4
CATEGORIES= mail gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/math/gcalctool/Makefile b/math/gcalctool/Makefile
index 13437c875..34835af5f 100644
--- a/math/gcalctool/Makefile
+++ b/math/gcalctool/Makefile
@@ -3,11 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/math/gcalctool/Makefile,v 1.143 2011/04/30 20:43:21 mezz Exp $
+# $MCom: ports/math/gcalctool/Makefile,v 1.144 2012/08/17 19:06:44 kwm Exp $
#
PORTNAME= gcalctool
PORTVERSION= 5.32.2
+PORTREVISION= 1
PORTEPOCH= 2
CATEGORIES= math gnome
MASTER_SITES= GNOME
diff --git a/misc/gnome-devel-docs/Makefile b/misc/gnome-devel-docs/Makefile
index 7eb16deea..305924251 100644
--- a/misc/gnome-devel-docs/Makefile
+++ b/misc/gnome-devel-docs/Makefile
@@ -3,11 +3,12 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/misc/gnome-devel-docs/Makefile,v 1.25 2011/04/25 19:19:35 mezz Exp $
+# $MCom: ports/misc/gnome-devel-docs/Makefile,v 1.26 2011/04/30 20:43:21 mezz Exp $
#
PORTNAME= gnome-devel-docs
PORTVERSION= 2.32.0
+PORTREVISION= 1
CATEGORIES= misc gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/multimedia/cheese/Makefile b/multimedia/cheese/Makefile
index 98e3492c3..6d2c618ea 100644
--- a/multimedia/cheese/Makefile
+++ b/multimedia/cheese/Makefile
@@ -3,12 +3,12 @@
# Whom: FreeBSD GNOME Team <gnome@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/multimedia/cheese/Makefile,v 1.66 2011/04/30 20:43:21 mezz Exp $
+# $MCom: ports/multimedia/cheese/Makefile,v 1.67 2012/07/13 10:31:45 kwm Exp $
#
PORTNAME= cheese
PORTVERSION= 2.32.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= multimedia gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/net/avahi-app/Makefile b/net/avahi-app/Makefile
index 29ad92db1..e8c520242 100644
--- a/net/avahi-app/Makefile
+++ b/net/avahi-app/Makefile
@@ -3,7 +3,7 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/net/avahi-app/Makefile,v 1.23 2012/07/09 18:22:18 kwm Exp $
+# $MCom: ports/net/avahi-app/Makefile,v 1.24 2012/08/17 19:06:44 kwm Exp $
#
PORTNAME= avahi
@@ -26,6 +26,9 @@ LIB_DEPENDS?= expat.6:${PORTSDIR}/textproc/expat2 \
gdbm.4:${PORTSDIR}/databases/gdbm
RUN_DEPENDS?= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
+USERS?= ${PORTNAME}
+GROUPS?= ${USERS}
+
USE_GNOME?= gnomehack ltverhack glib20 intltool
USE_GETTEXT= yes
USE_GNOME_SUBR= yes
@@ -174,8 +177,5 @@ avahi-post-install:
${INSTALL_DATA} ${FILESDIR}/org.freedesktop.Avahi.service \
${LOCALBASE}/share/dbus-1/system-services
.endif
-.if !defined(PACKAGE_BUILDING) && (${AVAHI_SLAVE}=="no" || ${AVAHI_SLAVE}=="autoipd")
- @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-.endif
.endif # avahi-header
.include <bsd.port.post.mk>
diff --git a/net/ekiga/Makefile b/net/ekiga/Makefile
index 6690c3899..c452f9d98 100644
--- a/net/ekiga/Makefile
+++ b/net/ekiga/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ekiga
PORTVERSION= 2.0.11
-PORTREVISION= 13
+PORTREVISION= 14
CATEGORIES= net gnome
MASTER_SITES= GNOME
diff --git a/net/ekiga3/Makefile b/net/ekiga3/Makefile
index b4ba8d382..7b201f523 100644
--- a/net/ekiga3/Makefile
+++ b/net/ekiga3/Makefile
@@ -18,7 +18,7 @@ COMMENT= VoIP and video conferencing application
LIB_DEPENDS= sigc-2:${PORTSDIR}/devel/libsigc++20 \
opal-3.6.[6-9]:${PORTSDIR}/net/opal3
BUILD_DEPENDS= intltoolize:${PORTSDIR}/textproc/intltool \
- ${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser \
+ p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser \
${LOCALBASE}/bin/scrollkeeper-config:${PORTSDIR}/textproc/rarian
CONFLICTS= ekiga-2.*
diff --git a/net/gnome-nettool/Makefile b/net/gnome-nettool/Makefile
index 41b994181..bcde84c43 100644
--- a/net/gnome-nettool/Makefile
+++ b/net/gnome-nettool/Makefile
@@ -3,12 +3,12 @@
# Whom: Adam Weinberger <adamw@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/net/gnome-nettool/Makefile,v 1.60 2011/05/01 23:42:25 mezz Exp $
+# $MCom: ports/net/gnome-nettool/Makefile,v 1.61 2012/08/17 19:06:45 kwm Exp $
#
PORTNAME= gnome-nettool
PORTVERSION= 2.32.0
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= net gnome
MASTER_SITES= GNOME
diff --git a/net/gtk-vnc/Makefile b/net/gtk-vnc/Makefile
index 4afc463df..5dcf97735 100644
--- a/net/gtk-vnc/Makefile
+++ b/net/gtk-vnc/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gtk-vnc
PORTVERSION= 0.3.10
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= net gnome
MASTER_SITES= GNOME
diff --git a/net/gtk-vnc/files/patch-src_gvnc.c b/net/gtk-vnc/files/patch-src_gvnc.c
new file mode 100644
index 000000000..dcf479f23
--- /dev/null
+++ b/net/gtk-vnc/files/patch-src_gvnc.c
@@ -0,0 +1,11 @@
+--- src/gvnc.c.orig 2012-03-17 12:30:12.000000000 -0500
++++ src/gvnc.c 2012-03-17 12:31:37.000000000 -0500
+@@ -3543,7 +3543,7 @@
+ gvnc->minor = 8;
+ }
+
+- snprintf(version, 12, "RFB %03d.%03d\n", gvnc->major, gvnc->minor);
++ snprintf(version, 13, "RFB %03d.%03d\n", gvnc->major, gvnc->minor);
+ gvnc_write(gvnc, version, 12);
+ gvnc_flush(gvnc);
+ GVNC_DEBUG("Using version: %d.%d", gvnc->major, gvnc->minor);
diff --git a/net/libgweather/Makefile b/net/libgweather/Makefile
index f312c5c54..231917a26 100644
--- a/net/libgweather/Makefile
+++ b/net/libgweather/Makefile
@@ -3,12 +3,12 @@
# Whom: Koop Mast <kwm@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/net/libgweather/Makefile,v 1.45 2011/04/30 20:43:23 mezz Exp $
+# $MCom: ports/net/libgweather/Makefile,v 1.46 2012/08/17 19:06:45 kwm Exp $
#
PORTNAME= libgweather
PORTVERSION= 2.30.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net gnome
MASTER_SITES= GNOME
diff --git a/net/libproxy/files/patch-libproxy_url.cpp b/net/libproxy/files/patch-libproxy_url.cpp
new file mode 100644
index 000000000..b185b2bd5
--- /dev/null
+++ b/net/libproxy/files/patch-libproxy_url.cpp
@@ -0,0 +1,10 @@
+--- libproxy/url.cpp~
++++ libproxy/url.cpp
+@@ -27,6 +27,7 @@
+ #define close _close
+ #endif
+ #include <fcntl.h> // For ::open()
++#include <unistd.h> // For close()
+ #include <cstring> // For memcpy()
+ #include <sstream> // For int/string conversion (using stringstream)
+ #include <cstdio> // For sscanf()
diff --git a/net/libproxy/files/patch-utils-CMakeLists.txt b/net/libproxy/files/patch-utils-CMakeLists.txt
new file mode 100644
index 000000000..014f04d42
--- /dev/null
+++ b/net/libproxy/files/patch-utils-CMakeLists.txt
@@ -0,0 +1,8 @@
+--- utils/CMakeLists.txt~
++++ utils/CMakeLists.txt
+@@ -3,4 +3,5 @@ link_directories(${LIBPROXY_LIBRARY_DIRS
+
+ add_executable(proxy proxy.c)
+ target_link_libraries(proxy libproxy)
++set(CMAKE_C_COMPILER ${CMAKE_CXX_COMPILER})
+ install(TARGETS proxy RUNTIME DESTINATION ${BIN_INSTALL_DIR}) \ No newline at end of file
diff --git a/net/vinagre/Makefile b/net/vinagre/Makefile
index 1921e36ea..5eea9890b 100644
--- a/net/vinagre/Makefile
+++ b/net/vinagre/Makefile
@@ -3,12 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/net/vinagre/Makefile,v 1.46 2011/09/17 16:26:44 kwm Exp $
+# $MCom: ports/net/vinagre/Makefile,v 1.47 2012/08/17 19:06:45 kwm Exp $
#
PORTNAME= vinagre
PORTVERSION= 2.30.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= net gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/net/vino/Makefile b/net/vino/Makefile
index 850065024..a5879d43f 100644
--- a/net/vino/Makefile
+++ b/net/vino/Makefile
@@ -3,12 +3,12 @@
# Whom: Tom McLaughlin <tmclaugh@sdf.lonestar.org>
#
# $FreeBSD$
-# $MCom: ports/net/vino/Makefile,v 1.87 2011/06/06 17:54:24 kwm Exp $
+# $MCom: ports/net/vino/Makefile,v 1.88 2012/08/17 19:06:45 kwm Exp $
#
PORTNAME= vino
PORTVERSION= 2.32.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= net gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/print/cups-pk-helper/Makefile b/print/cups-pk-helper/Makefile
index b3896fd1e..4271e8b74 100644
--- a/print/cups-pk-helper/Makefile
+++ b/print/cups-pk-helper/Makefile
@@ -3,7 +3,7 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/print/cups-pk-helper/Makefile,v 1.6 2011/09/13 18:10:27 kwm Exp $
+# $MCom: ports/print/cups-pk-helper/Makefile,v 1.7 2011/09/17 20:51:04 kwm Exp $
PORTNAME= cups-pk-helper
PORTVERSION= 0.2.0
@@ -22,7 +22,7 @@ USE_GMAKE= yes
USE_GNOME= gnomehack intlhack glib20
USE_GETTEXT= yes
GNU_CONFIGURE= yes
-CPPFLAGS= -I${LOCALBASE}/include
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/libs"
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/libs
.include <bsd.port.mk>
diff --git a/print/libgnomecups/Makefile b/print/libgnomecups/Makefile
index bdd1852b7..048c9660f 100644
--- a/print/libgnomecups/Makefile
+++ b/print/libgnomecups/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
-COMMENT= Support library for gnome cups admistration
+COMMENT= Support library for gnome cups administration
LIB_DEPENDS= cups.2:${PORTSDIR}/print/cups-client
diff --git a/security/gnome-keyring/Makefile b/security/gnome-keyring/Makefile
index 9efa7fd9e..22a113298 100644
--- a/security/gnome-keyring/Makefile
+++ b/security/gnome-keyring/Makefile
@@ -3,12 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/security/gnome-keyring/Makefile,v 1.103 2012/08/04 09:42:52 kwm Exp $
+# $MCom: ports/security/gnome-keyring/Makefile,v 1.104 2012/08/17 19:06:46 kwm Exp $
#
PORTNAME= gnome-keyring
PORTVERSION= 2.32.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= security gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/security/seahorse/Makefile b/security/seahorse/Makefile
index f124a47de..0489ac00b 100644
--- a/security/seahorse/Makefile
+++ b/security/seahorse/Makefile
@@ -3,12 +3,12 @@
# Whom: Dave McKay <dave@mu.org>
#
# $FreeBSD$
-# $MCom: ports/security/seahorse/Makefile,v 1.107 2011/09/18 11:50:10 kwm Exp $
+# $MCom: ports/security/seahorse/Makefile,v 1.108 2012/08/17 19:06:46 kwm Exp $
#
PORTNAME= seahorse
PORTVERSION= 2.32.0
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= security gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/sysutils/brasero/Makefile b/sysutils/brasero/Makefile
index 85a1272f1..9bb2e8a53 100644
--- a/sysutils/brasero/Makefile
+++ b/sysutils/brasero/Makefile
@@ -3,11 +3,11 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/sysutils/brasero/Makefile,v 1.89 2011/08/24 10:40:41 kwm Exp $
+# $MCom: ports/sysutils/brasero/Makefile,v 1.90 2012/08/17 19:06:46 kwm Exp $
PORTNAME= brasero
PORTVERSION= 2.32.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= sysutils audio multimedia gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -20,7 +20,8 @@ LIB_DEPENDS= notify.4:${PORTSDIR}/devel/libnotify \
totem-plparser.17:${PORTSDIR}/multimedia/totem-pl-parser \
canberra-gtk.0:${PORTSDIR}/audio/libcanberra
RUN_DEPENDS= growisofs:${PORTSDIR}/sysutils/dvd+rw-tools \
- cdrdao:${PORTSDIR}/sysutils/cdrdao
+ cdrdao:${PORTSDIR}/sysutils/cdrdao \
+ yelp:${PORTSDIR}/x11/yelp
CONFLICTS= brasero-3.[0-9]*
diff --git a/sysutils/brasero/files/patch-libbrasero-media_scsi-cam.c b/sysutils/brasero/files/patch-libbrasero-media_scsi-cam.c
new file mode 100644
index 000000000..74f10adc0
--- /dev/null
+++ b/sysutils/brasero/files/patch-libbrasero-media_scsi-cam.c
@@ -0,0 +1,13 @@
+--- libbrasero-media/scsi-cam.c.orig 2012-02-11 21:16:20.000000000 -0500
++++ libbrasero-media/scsi-cam.c 2012-02-11 21:17:13.000000000 -0500
+@@ -103,6 +103,10 @@ brasero_scsi_command_issue_sync (gpointe
+ else if (cmd->info->direction & BRASERO_SCSI_WRITE)
+ direction = CAM_DIR_OUT;
+
++ if (size == 0)
++ direction = CAM_DIR_NONE;
++ direction |= CAM_DEV_QFRZDIS;
++
+ g_assert (direction > -1);
+
+ cam_fill_csio(&cam_ccb.csio,
diff --git a/sysutils/gconf-editor/Makefile b/sysutils/gconf-editor/Makefile
index a82e82f6f..6b83bbe3f 100644
--- a/sysutils/gconf-editor/Makefile
+++ b/sysutils/gconf-editor/Makefile
@@ -3,12 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/sysutils/gconf-editor/Makefile,v 1.88 2011/04/30 20:43:25 mezz Exp $
+# $MCom: ports/sysutils/gconf-editor/Makefile,v 1.89 2012/08/17 19:06:46 kwm Exp $
#
PORTNAME= gconf-editor
PORTVERSION= 2.32.0
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= sysutils gnome
MASTER_SITES= GNOME
diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile
index fdb58759f..c1505fdbb 100644
--- a/sysutils/gnome-control-center/Makefile
+++ b/sysutils/gnome-control-center/Makefile
@@ -3,12 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/sysutils/gnome-control-center/Makefile,v 1.218 2011/06/03 21:27:50 mezz Exp $
+# $MCom: ports/sysutils/gnome-control-center/Makefile,v 1.219 2012/08/17 19:06:47 kwm Exp $
#
PORTNAME= gnome-control-center
PORTVERSION= 2.32.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= sysutils gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/sysutils/gnome-settings-daemon/Makefile b/sysutils/gnome-settings-daemon/Makefile
deleted file mode 100644
index d27d2c61e..000000000
--- a/sysutils/gnome-settings-daemon/Makefile
+++ /dev/null
@@ -1,61 +0,0 @@
-# New ports collection makefile for: gnome-settings-daemon
-# Date created: 14 Jan 2008
-# Whom: Koop Mast <kwm@FreeBSD.org>
-#
-# $FreeBSD$
-# $MCom$
-#
-
-PORTNAME= gnome-settings-daemon
-PORTVERSION= 2.32.1
-PORTREVISION= 4
-CATEGORIES= sysutils gnome
-MASTER_SITES= GNOME
-DIST_SUBDIR= gnome2
-
-MAINTAINER= gnome@FreeBSD.org
-COMMENT= GNOME 2 settings daemon
-
-LIB_DEPENDS= canberra-gtk.0:${PORTSDIR}/audio/libcanberra \
- notify.4:${PORTSDIR}/devel/libnotify \
- gdbm.4:${PORTSDIR}/databases/gdbm \
- nss3.1:${PORTSDIR}/security/nss
-RUN_DEPENDS= xrdb:${PORTSDIR}/x11/xrdb
-
-CONFLICTS= gnome-settings-daemon-3.[0-9]*
-
-USE_XORG= xxf86misc
-USE_BZIP2= yes
-USE_GMAKE= yes
-USE_GNOME= gnomeprefix intlhack gnomehack gnomedesktop libgnomekbd
-USE_GETTEXT= yes
-USE_GSTREAMER= good
-USE_LDCONFIG= yes
-GNU_CONFIGURE= yes
-INSTALLS_ICONS= yes
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
-
-OPTIONS= PULSEAUDIO "Enable Pulseaudio support" On
-
-GCONF_SCHEMAS= apps_gnome_settings_daemon_housekeeping.schemas \
- apps_gnome_settings_daemon_keybindings.schemas \
- apps_gnome_settings_daemon_xrandr.schemas \
- desktop_gnome_font_rendering.schemas \
- desktop_gnome_keybindings.schemas \
- desktop_gnome_peripherals_smartcard.schemas \
- desktop_gnome_peripherals_touchpad.schemas \
- gnome-settings-daemon.schemas
-
-.include <bsd.port.pre.mk>
-
-.if defined(WITHOUT_PULSEAUDIO)
-CONFIGURE_ARGS+=--disable-pulse
-PLIST_SUB+= PULSEAUDIO="@comment "
-.else
-LIB_DEPENDS+= pulse.0:${PORTSDIR}/audio/pulseaudio
-CONFIGURE_ARGS+=--enable-pulse
-PLIST_SUB+= PULSEAUDIO=""
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/sysutils/gnome-settings-daemon/distinfo b/sysutils/gnome-settings-daemon/distinfo
deleted file mode 100644
index 4720b385e..000000000
--- a/sysutils/gnome-settings-daemon/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (gnome2/gnome-settings-daemon-2.32.1.tar.bz2) = 0074b3fec3ad6e3ab91a05dc20906b06101ea8bca0cd2caf394a5cc141b05e86
-SIZE (gnome2/gnome-settings-daemon-2.32.1.tar.bz2) = 1331850
diff --git a/sysutils/gnome-settings-daemon/files/patch-libnotify b/sysutils/gnome-settings-daemon/files/patch-libnotify
deleted file mode 100644
index 1166875bf..000000000
--- a/sysutils/gnome-settings-daemon/files/patch-libnotify
+++ /dev/null
@@ -1,58 +0,0 @@
-From e1ab570b0dce479ba235e5542ea07d1b5bafc4c9 Mon Sep 17 00:00:00 2001
-From: William Jon McCann <jmccann@redhat.com>
-Date: Tue, 12 Oct 2010 03:35:45 +0000
-Subject: Require libnotify 0.6.0
-
----
-diff --git a/plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c b/plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c
-index 9ca820a..f5964b9 100644
---- plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c
-+++ plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c
-@@ -608,9 +608,7 @@ ax_slowkeys_warning_post_bubble (GsdA11yKeyboardManager *manager,
- gsd_a11y_keyboard_manager_ensure_status_icon (manager);
- manager->priv->notification = notify_notification_new (title,
- message,
-- "preferences-desktop-accessibility",
-- NULL);
-- notify_notification_attach_to_status_icon (manager->priv->notification, manager->priv->status_icon);
-+ "preferences-desktop-accessibility");
- notify_notification_set_timeout (manager->priv->notification, NOTIFICATION_TIMEOUT * 1000);
-
- notify_notification_add_action (manager->priv->notification,
-@@ -747,9 +745,7 @@ ax_stickykeys_warning_post_bubble (GsdA11yKeyboardManager *manager,
- gsd_a11y_keyboard_manager_ensure_status_icon (manager);
- manager->priv->notification = notify_notification_new (title,
- message,
-- "preferences-desktop-accessibility",
-- NULL);
-- notify_notification_attach_to_status_icon (manager->priv->notification, manager->priv->status_icon);
-+ "preferences-desktop-accessibility");
- notify_notification_set_timeout (manager->priv->notification, NOTIFICATION_TIMEOUT * 1000);
-
- notify_notification_add_action (manager->priv->notification,
-diff --git a/plugins/xrandr/gsd-xrandr-manager.c b/plugins/xrandr/gsd-xrandr-manager.c
-index 02536a3..ef57d5b 100644
---- plugins/xrandr/gsd-xrandr-manager.c
-+++ plugins/xrandr/gsd-xrandr-manager.c
-@@ -1084,16 +1084,9 @@ error_message (GsdXrandrManager *mgr, const char *primary_text, GError *error_to
-
- g_assert (error_to_display == NULL || secondary_text == NULL);
-
-- if (priv->status_icon)
-- notification = notify_notification_new_with_status_icon (primary_text,
-- error_to_display ? error_to_display->message : secondary_text,
-- GSD_XRANDR_ICON_NAME,
-- priv->status_icon);
-- else
-- notification = notify_notification_new (primary_text,
-- error_to_display ? error_to_display->message : secondary_text,
-- GSD_XRANDR_ICON_NAME,
-- NULL);
-+ notification = notify_notification_new (primary_text,
-+ error_to_display ? error_to_display->message : secondary_text,
-+ GSD_XRANDR_ICON_NAME);
-
- notify_notification_show (notification, NULL); /* NULL-GError */
- #else
---
-cgit v0.8.3.4
diff --git a/sysutils/gnome-settings-daemon/pkg-descr b/sysutils/gnome-settings-daemon/pkg-descr
deleted file mode 100644
index 9ce205e84..000000000
--- a/sysutils/gnome-settings-daemon/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-GNOME 2 settings daemon.
-
-WWW: http://www.gnome.org
diff --git a/sysutils/gnome-settings-daemon/pkg-plist b/sysutils/gnome-settings-daemon/pkg-plist
deleted file mode 100644
index 054cf6ea3..000000000
--- a/sysutils/gnome-settings-daemon/pkg-plist
+++ /dev/null
@@ -1,246 +0,0 @@
-etc/dbus-1/system.d/org.gnome.SettingsDaemon.DateTimeMechanism.conf
-etc/xdg/autostart/gnome-settings-daemon.desktop
-include/gnome-settings-daemon-2.0/gnome-settings-daemon/gnome-settings-client.h
-include/gnome-settings-daemon-2.0/gnome-settings-daemon/gnome-settings-plugin.h
-lib/gnome-settings-daemon-2.0/a11y-keyboard.gnome-settings-plugin
-lib/gnome-settings-daemon-2.0/background.gnome-settings-plugin
-lib/gnome-settings-daemon-2.0/clipboard.gnome-settings-plugin
-lib/gnome-settings-daemon-2.0/font.gnome-settings-plugin
-lib/gnome-settings-daemon-2.0/housekeeping.gnome-settings-plugin
-lib/gnome-settings-daemon-2.0/keybindings.gnome-settings-plugin
-lib/gnome-settings-daemon-2.0/keyboard.gnome-settings-plugin
-lib/gnome-settings-daemon-2.0/liba11y-keyboard.a
-lib/gnome-settings-daemon-2.0/liba11y-keyboard.la
-lib/gnome-settings-daemon-2.0/liba11y-keyboard.so
-lib/gnome-settings-daemon-2.0/libbackground.a
-lib/gnome-settings-daemon-2.0/libbackground.la
-lib/gnome-settings-daemon-2.0/libbackground.so
-lib/gnome-settings-daemon-2.0/libclipboard.a
-lib/gnome-settings-daemon-2.0/libclipboard.la
-lib/gnome-settings-daemon-2.0/libclipboard.so
-lib/gnome-settings-daemon-2.0/libfont.a
-lib/gnome-settings-daemon-2.0/libfont.la
-lib/gnome-settings-daemon-2.0/libfont.so
-lib/gnome-settings-daemon-2.0/libhousekeeping.a
-lib/gnome-settings-daemon-2.0/libhousekeeping.la
-lib/gnome-settings-daemon-2.0/libhousekeeping.so
-lib/gnome-settings-daemon-2.0/libkeybindings.a
-lib/gnome-settings-daemon-2.0/libkeybindings.la
-lib/gnome-settings-daemon-2.0/libkeybindings.so
-lib/gnome-settings-daemon-2.0/libkeyboard.a
-lib/gnome-settings-daemon-2.0/libkeyboard.la
-lib/gnome-settings-daemon-2.0/libkeyboard.so
-%%PULSEAUDIO%%lib/gnome-settings-daemon-2.0/libmedia-keys.a
-%%PULSEAUDIO%%lib/gnome-settings-daemon-2.0/libmedia-keys.la
-%%PULSEAUDIO%%lib/gnome-settings-daemon-2.0/libmedia-keys.so
-lib/gnome-settings-daemon-2.0/libmouse.a
-lib/gnome-settings-daemon-2.0/libmouse.la
-lib/gnome-settings-daemon-2.0/libmouse.so
-lib/gnome-settings-daemon-2.0/libsmartcard.a
-lib/gnome-settings-daemon-2.0/libsmartcard.la
-lib/gnome-settings-daemon-2.0/libsmartcard.so
-lib/gnome-settings-daemon-2.0/libsound.a
-lib/gnome-settings-daemon-2.0/libsound.la
-lib/gnome-settings-daemon-2.0/libsound.so
-lib/gnome-settings-daemon-2.0/libtyping-break.a
-lib/gnome-settings-daemon-2.0/libtyping-break.la
-lib/gnome-settings-daemon-2.0/libtyping-break.so
-lib/gnome-settings-daemon-2.0/libxrandr.a
-lib/gnome-settings-daemon-2.0/libxrandr.la
-lib/gnome-settings-daemon-2.0/libxrandr.so
-lib/gnome-settings-daemon-2.0/libxrdb.a
-lib/gnome-settings-daemon-2.0/libxrdb.la
-lib/gnome-settings-daemon-2.0/libxrdb.so
-lib/gnome-settings-daemon-2.0/libxsettings.a
-lib/gnome-settings-daemon-2.0/libxsettings.la
-lib/gnome-settings-daemon-2.0/libxsettings.so
-%%PULSEAUDIO%%lib/gnome-settings-daemon-2.0/media-keys.gnome-settings-plugin
-lib/gnome-settings-daemon-2.0/mouse.gnome-settings-plugin
-lib/gnome-settings-daemon-2.0/smartcard.gnome-settings-plugin
-lib/gnome-settings-daemon-2.0/sound.gnome-settings-plugin
-lib/gnome-settings-daemon-2.0/typing-break.gnome-settings-plugin
-lib/gnome-settings-daemon-2.0/xrandr.gnome-settings-plugin
-lib/gnome-settings-daemon-2.0/xrdb.gnome-settings-plugin
-lib/gnome-settings-daemon-2.0/xsettings.gnome-settings-plugin
-libdata/pkgconfig/gnome-settings-daemon.pc
-libexec/gnome-settings-daemon
-libexec/gsd-datetime-mechanism
-libexec/gsd-locate-pointer
-share/dbus-1/services/org.gnome.SettingsDaemon.service
-share/dbus-1/system-services/org.gnome.SettingsDaemon.DateTimeMechanism.service
-share/gnome-control-center/keybindings/50-accessibility.xml
-%%DATADIR%%/acme.ui
-%%DATADIR%%/gsd-a11y-preferences-dialog.ui
-%%DATADIR%%/icons/hicolor/64x64/devices/kbd-capslock-off.png
-%%DATADIR%%/icons/hicolor/64x64/devices/kbd-capslock-on.png
-%%DATADIR%%/icons/hicolor/64x64/devices/kbd-numlock-off.png
-%%DATADIR%%/icons/hicolor/64x64/devices/kbd-numlock-on.png
-%%DATADIR%%/icons/hicolor/64x64/devices/kbd-scrolllock-off.png
-%%DATADIR%%/icons/hicolor/64x64/devices/kbd-scrolllock-on.png
-%%DATADIR%%/modmap-dialog.ui
-%%DATADIR%%/xrdb/Editres.ad
-%%DATADIR%%/xrdb/Emacs.ad
-%%DATADIR%%/xrdb/General.ad
-%%DATADIR%%/xrdb/Motif.ad
-%%DATADIR%%/xrdb/Tk.ad
-%%DATADIR%%/xrdb/Xaw.ad
-share/icons/hicolor/16x16/actions/touchpad-disabled.png
-share/icons/hicolor/16x16/actions/touchpad-enabled.png
-share/icons/hicolor/16x16/apps/gsd-xrandr.png
-share/icons/hicolor/22x22/actions/touchpad-disabled.png
-share/icons/hicolor/22x22/actions/touchpad-enabled.png
-share/icons/hicolor/22x22/apps/gsd-xrandr.png
-share/icons/hicolor/24x24/actions/touchpad-disabled.png
-share/icons/hicolor/24x24/actions/touchpad-enabled.png
-share/icons/hicolor/24x24/apps/gsd-xrandr.png
-share/icons/hicolor/32x32/actions/touchpad-disabled.png
-share/icons/hicolor/32x32/actions/touchpad-enabled.png
-share/icons/hicolor/32x32/apps/gsd-xrandr.png
-share/icons/hicolor/scalable/actions/touchpad-disabled.svg
-share/icons/hicolor/scalable/actions/touchpad-enabled.svg
-share/icons/hicolor/scalable/apps/gsd-xrandr.svg
-share/locale/af/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/am/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/ar/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/as/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/ast/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/az/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/be/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/be@latin/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/bg/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/bn/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/bn_IN/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/br/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/bs/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/ca/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/ca@valencia/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/crh/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/cs/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/cy/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/da/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/de/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/dz/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/el/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/en@shaw/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/en_CA/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/en_GB/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/es/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/et/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/eu/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/fa/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/fi/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/fr/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/ga/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/gl/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/gu/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/he/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/hi/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/hr/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/hu/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/id/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/is/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/it/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/ja/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/ka/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/kn/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/ko/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/ku/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/lt/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/lv/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/mai/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/mg/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/mk/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/ml/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/mn/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/mr/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/ms/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/nb/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/nds/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/ne/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/nl/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/nn/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/nso/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/oc/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/or/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/pa/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/pl/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/pt/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/pt_BR/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/ro/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/ru/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/rw/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/si/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/sk/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/sl/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/sq/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/sr/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/sr@latin/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/sv/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/ta/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/te/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/th/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/tr/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/uk/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/vi/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/wa/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/xh/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/zh_CN/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/zh_HK/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/zh_TW/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/zu/LC_MESSAGES/gnome-settings-daemon.mo
-share/polkit-1/actions/org.gnome.settingsdaemon.datetimemechanism.policy
-@dirrm %%DATADIR%%/xrdb
-@dirrm %%DATADIR%%/icons/hicolor/64x64/devices
-@dirrm %%DATADIR%%/icons/hicolor/64x64
-@dirrm %%DATADIR%%/icons/hicolor
-@dirrm %%DATADIR%%/icons
-@dirrm %%DATADIR%%
-@dirrm lib/gnome-settings-daemon-2.0
-@dirrm include/gnome-settings-daemon-2.0/gnome-settings-daemon
-@dirrm include/gnome-settings-daemon-2.0
-@dirrmtry etc/gnome-settings-daemon/xrandr
-@dirrmtry etc/gnome-settings-daemon
-@dirrmtry share/locale/zu/LC_MESSAGES
-@dirrmtry share/locale/zu
-@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
-@dirrmtry share/locale/xh/LC_MESSAGES
-@dirrmtry share/locale/xh
-@dirrmtry share/locale/te/LC_MESSAGES
-@dirrmtry share/locale/te
-@dirrmtry share/locale/sr@latin/LC_MESSAGES
-@dirrmtry share/locale/sr@latin
-@dirrmtry share/locale/si/LC_MESSAGES
-@dirrmtry share/locale/si
-@dirrmtry share/locale/rw/LC_MESSAGES
-@dirrmtry share/locale/rw
-@dirrmtry share/locale/oc/LC_MESSAGES
-@dirrmtry share/locale/oc
-@dirrmtry share/locale/nso/LC_MESSAGES
-@dirrmtry share/locale/nso
-@dirrmtry share/locale/nds/LC_MESSAGES
-@dirrmtry share/locale/nds
-@dirrmtry share/locale/mr/LC_MESSAGES
-@dirrmtry share/locale/mr
-@dirrmtry share/locale/mg/LC_MESSAGES
-@dirrmtry share/locale/mg
-@dirrmtry share/locale/mai/LC_MESSAGES
-@dirrmtry share/locale/mai
-@dirrmtry share/locale/ku/LC_MESSAGES
-@dirrmtry share/locale/ku
-@dirrmtry share/locale/en@shaw/LC_MESSAGES
-@dirrmtry share/locale/en@shaw
-@dirrmtry share/locale/dz/LC_MESSAGES
-@dirrmtry share/locale/dz
-@dirrmtry share/locale/crh/LC_MESSAGES
-@dirrmtry share/locale/crh
-@dirrmtry share/locale/ca@valencia/LC_MESSAGES
-@dirrmtry share/locale/ca@valencia
-@dirrmtry share/locale/bn_IN/LC_MESSAGES
-@dirrmtry share/locale/bn_IN
-@dirrmtry share/locale/be@latin/LC_MESSAGES
-@dirrmtry share/locale/be@latin
-@dirrmtry share/locale/ast/LC_MESSAGES
-@dirrmtry share/locale/ast
-@dirrmtry share/locale/as/LC_MESSAGES
-@dirrmtry share/locale/as
diff --git a/sysutils/gnome-system-monitor/Makefile b/sysutils/gnome-system-monitor/Makefile
index 3daad3951..f9a8e7270 100644
--- a/sysutils/gnome-system-monitor/Makefile
+++ b/sysutils/gnome-system-monitor/Makefile
@@ -3,12 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/sysutils/gnome-system-monitor/Makefile,v 1.144 2011/04/30 20:43:26 mezz Exp $
+# $MCom: ports/sysutils/gnome-system-monitor/Makefile,v 1.145 2012/08/17 19:06:47 kwm Exp $
#
PORTNAME= gnome-system-monitor
PORTVERSION= 2.28.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= sysutils gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/sysutils/polkit-gnome/Makefile b/sysutils/polkit-gnome/Makefile
index 0409920cd..1697b1717 100644
--- a/sysutils/polkit-gnome/Makefile
+++ b/sysutils/polkit-gnome/Makefile
@@ -3,7 +3,7 @@
# Whom: Koop Mast<kwm@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/sysutils/polkit-gnome/Makefile,v 1.17 2011/03/04 12:35:48 kwm Exp $
+# $MCom: ports/sysutils/polkit-gnome/Makefile,v 1.18 2011/10/07 14:50:51 kwm Exp $
#
PORTNAME= polkit-gnome
@@ -12,7 +12,7 @@ CATEGORIES= sysutils gnome
MASTER_SITES= GNOME
MAINTAINER= gnome@FreeBSD.org
-COMMENT= GNOME frontend to the PolicKit framework
+COMMENT= GNOME frontend to the PolicyKit framework
LIB_DEPENDS= polkit-gobject-1.0:${PORTSDIR}/sysutils/polkit
diff --git a/sysutils/polkit/Makefile b/sysutils/polkit/Makefile
index a372ca6b8..bada92017 100644
--- a/sysutils/polkit/Makefile
+++ b/sysutils/polkit/Makefile
@@ -3,7 +3,7 @@
# Whom: Koop Mast<kwm@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/sysutils/polkit/Makefile,v 1.19 2012/08/04 21:04:25 kwm Exp $
+# $MCom: ports/sysutils/polkit/Makefile,v 1.20 2012/08/17 19:06:47 kwm Exp $
#
PORTNAME= polkit
@@ -21,7 +21,6 @@ RUN_DEPENDS= ${LOCALBASE}/share/gir-1.0/GLib-2.0.gir:${PORTSDIR}/devel/gobject-i
dbus-launch:${PORTSDIR}/devel/dbus
USE_GNOME= gnomehack glib20 intlhack
-USE_PKGCONFIG= build
USE_GMAKE= yes
USE_GETTEXT= yes
GNU_CONFIGURE= yes
diff --git a/sysutils/system-tools-backends/Makefile b/sysutils/system-tools-backends/Makefile
index 9f48df195..16154d858 100644
--- a/sysutils/system-tools-backends/Makefile
+++ b/sysutils/system-tools-backends/Makefile
@@ -3,7 +3,7 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/sysutils/system-tools-backends/Makefile,v 1.62 2011/04/04 09:06:08 kwm Exp $
+# $MCom: ports/sysutils/system-tools-backends/Makefile,v 1.63 2012/08/17 19:06:47 kwm Exp $
#
PORTNAME= system-tools-backends
@@ -15,10 +15,10 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= Backend system admin scripts for gnome-system-tools
-BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Net/DBus.pm:${PORTSDIR}/devel/p5-Net-DBus
+BUILD_DEPENDS= p5-Net-DBus>=0:${PORTSDIR}/devel/p5-Net-DBus
LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
polkit-gobject-1.0:${PORTSDIR}/sysutils/polkit
-RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Net/DBus.pm:${PORTSDIR}/devel/p5-Net-DBus
+RUN_DEPENDS= p5-Net-DBus>=0:${PORTSDIR}/devel/p5-Net-DBus
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/sysutils/system-tools-backends/files/patch-Utils_Platform.pm b/sysutils/system-tools-backends/files/patch-Utils_Platform.pm
index c22ec910f..7b98580f1 100644
--- a/sysutils/system-tools-backends/files/patch-Utils_Platform.pm
+++ b/sysutils/system-tools-backends/files/patch-Utils_Platform.pm
@@ -1,18 +1,20 @@
---- Utils/Platform.pm.orig 2010-04-02 00:17:39.000000000 +0200
-+++ Utils/Platform.pm 2010-04-02 00:18:30.000000000 +0200
-@@ -73,6 +73,7 @@ my $PLATFORM_INFO = {
+--- Utils/Platform.pm.orig 2010-03-31 12:55:43.000000000 +0400
++++ Utils/Platform.pm 2012-03-15 18:24:46.000000000 +0400
+@@ -73,6 +73,8 @@
"freebsd-6" => [ "FreeBSD", "6", "" ],
"freebsd-7" => [ "FreeBSD", "7", "" ],
"freebsd-8" => [ "FreeBSD", "8", "" ],
+ "freebsd-9" => [ "FreeBSD", "9", "" ],
++ "freebsd-10" => [ "FreeBSD", "10", "" ],
"gentoo" => [ "Gentoo Linux", "", "" ],
"vlos-1.2" => [ "Vida Linux OS", "1.2" ],
"archlinux" => [ "Arch Linux", "", "" ],
-@@ -126,6 +127,7 @@ sub ensure_distro_map
+@@ -126,6 +128,8 @@
"freebsd-6" => "freebsd-5",
"freebsd-7" => "freebsd-5",
"freebsd-8" => "freebsd-5",
+ "freebsd-9" => "freebsd-5",
++ "freebsd-10" => "freebsd-5",
"openna-1.0" => "redhat-6.2",
"pld-1.1" => "pld-1.0",
"pld-1.99" => "pld-1.0",
diff --git a/sysutils/zeitgeist/Makefile b/sysutils/zeitgeist/Makefile
index 83cb19604..2c2d4d76c 100644
--- a/sysutils/zeitgeist/Makefile
+++ b/sysutils/zeitgeist/Makefile
@@ -3,7 +3,7 @@
# Whom: Koop Mast <kwm@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/sysutils/zeitgeist/Makefile,v 1.5 2012/02/10 10:53:16 kwm Exp $
+# $MCom: ports/sysutils/zeitgeist/Makefile,v 1.6 2012/08/17 19:06:47 kwm Exp $
#
PORTNAME= zeitgeist
@@ -16,7 +16,6 @@ COMMENT= Event logging framework - engine
BUILD_DEPENDS= rapper:${PORTSDIR}/textproc/raptor2 \
${PYTHON_SITELIBDIR}/rdflib/__init__.py:${PORTSDIR}/textproc/py-rdflib
-
RUN_DEPENDS= ${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3 \
${PYTHON_SITELIBDIR}/xdg/__init__.py:${PORTSDIR}/devel/py-xdg \
${PYTHON_SITELIBDIR}/dbus/__init__.py:${PORTSDIR}/devel/py-dbus
diff --git a/textproc/intltool/Makefile b/textproc/intltool/Makefile
index 8f5db01f6..892706524 100644
--- a/textproc/intltool/Makefile
+++ b/textproc/intltool/Makefile
@@ -3,7 +3,7 @@
# Whom: Ade Lovett <ade@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/textproc/intltool/Makefile,v 1.13 2010/05/29 19:19:26 kwm Exp $
+# $MCom: ports/textproc/intltool/Makefile,v 1.15 2012/05/17 21:35:09 kwm Exp $
PORTNAME= intltool
PORTVERSION= 0.50.2
@@ -14,8 +14,8 @@ DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
COMMENT= Tools to internationalize various kinds of data files
-BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser
-RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser
+BUILD_DEPENDS= p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser
+RUN_DEPENDS= p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser
USE_GMAKE= yes
USE_ICONV= yes
diff --git a/www/epiphany-extensions/Makefile b/www/epiphany-extensions/Makefile
index b369dfd1a..2d82a0b3f 100644
--- a/www/epiphany-extensions/Makefile
+++ b/www/epiphany-extensions/Makefile
@@ -3,12 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/www/epiphany-extensions/Makefile,v 1.137 2012/02/14 19:34:00 kwm Exp $
+# $MCom: ports/www/epiphany-extensions/Makefile,v 1.138 2012/08/17 19:06:47 kwm Exp $
#
PORTNAME= epiphany-extensions
PORTVERSION= 2.30.2
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= www gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2