Presenting GNOME 2.20.1 and all related works for FreeBSD. The official

GNOME 2.20 release notes can be found at
http://www.gnome.org/start/2.20/notes/en/ .  Beyond that, this update
includes the new GIMP 2.4 (courtesy of ahze).

The GNOME 2.20 update also includes a huge change in the FreeBSD GNOME
hierarchy.  We are now using the more standard DATADIR of ${PREFIX}/share
rather than ${PREFIX}/share/gnome. The result is that fewer patches and
hacks are needed to port GNOME components to FreeBSD.  This will mean some
user changes may be required, so be sure to read /usr/ports/UPDATING for
more details.

This release and the things we accomplished in it would not have been
possible without mezz's crazy idea to collapse DATADIR, and his persistence
to make it happen successfully.  Ahze and pav also deserve thanks for
their work on porting modules and testing the whole ball of wax on
pointyhat (respectively).

The FreeBSD GNOME team would also like to thank our various testers and
contributors:

Yasuda Keisuke
Frank Jahnke
Pawel Worach
Brian Gruber
Franz Klammer
Yuri Pankov
Nick Barkas
Cristian KLEIN
Tony Maher
Scot Hetzel
Martin Matuska (mm)
Benoit Dejean
Martin Wilke (miwi)
(And anyone else I may have missed)

PRs fixed in this release:

111272, 113470, 115995, 116338

13 files changed, 57 insertions, 80 deletions

diff --git a/comms/gfax/Makefile b/comms/gfax/Makefile
index 76e116455d2d..300c4193d391 100644
--- a/comms/gfax/Makefile
+++ b/comms/gfax/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gfax
 PORTVERSION=	0.7.6
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	comms print gnome
 MASTER_SITES=	http://gfax.cowlug.org/
 
diff --git a/comms/gfax/files/patch-scripts_printer-setup.sh b/comms/gfax/files/patch-scripts_printer-setup.sh
deleted file mode 100644
index c379692b764a..000000000000
--- a/comms/gfax/files/patch-scripts_printer-setup.sh
+++ /dev/null
@@ -1,39 +0,0 @@
---- scripts/printer-setup.sh.orig	Thu Jul  8 23:54:42 2004
-+++ scripts/printer-setup.sh	Fri Jul  9 00:05:00 2004
-@@ -7,15 +7,15 @@
- # Install all the printer profiles
- if [ $1 == "--install" ]; then
- 	# Install GNOME-1.x printer files.
--	if [ -d /usr/share/gnome-print ]; then
--		cp -f /usr/share/gfax/fax-g3.profile /usr/share/gnome-print/profiles
-+	if [ -d /usr/share/gnome/gnome-print ]; then
-+		cp -f /usr/share/gnome/gfax/fax-g3.profile /usr/share/gnome/gnome-print/profiles
- 	fi
- 
- 	# Install GNOME-2.x printer files.
--	for i in /usr/share/libgnomeprint/*
-+	for i in /usr/share/gnome/libgnomeprint/*
- 	do
--		cp -f /usr/share/gfax/GFAX.xml $i/printers
--		cp -f /usr/share/gfax/GNOME-GFAX-PS.xml $i/models
-+		cp -f /usr/share/gnome/gfax/GFAX.xml $i/printers
-+		cp -f /usr/share/gnome/gfax/GNOME-GFAX-PS.xml $i/models
- 	done
- fi
- 
-@@ -23,12 +23,12 @@
- # Remove all the printer profiles
- if [ $1 == "--remove" ]; then
- 	# Remove GNOME-1.x printer files.
--	if [ -d /usr/share/gnome-print ]; then
--		rm -f /usr/share/gnome-print/profiles/fax-g3.profile
-+	if [ -d /usr/share/gnome/gnome-print ]; then
-+		rm -f /usr/share/gnome/gnome-print/profiles/fax-g3.profile
- 	fi
- 
- 	# Remove GNOME-2.x printer files.
--	for i in /usr/share/libgnomeprint/*
-+	for i in /usr/share/gnome/libgnomeprint/*
- 	do
- 		rm -f $i/printers/GFAX.xml
- 		rm -f $i/models/GNOME-GFAX-PS.xml
diff --git a/comms/gfax/pkg-plist b/comms/gfax/pkg-plist
index 17442ab7c41a..d8f2f63a8315 100644
--- a/comms/gfax/pkg-plist
+++ b/comms/gfax/pkg-plist
@@ -1,9 +1,10 @@
 bin/gfax
 bin/gfaxlpr
 lib/gfax/gfax.exe
-share/gnome/applications/gfax.desktop
-share/gnome/libgnomeprint/2.18.1/models/GNOME-GFAX-PS.xml
-share/gnome/libgnomeprint/2.18.1/printers/GFAX.xml
-share/gnome/pixmaps/gfax.png
-share/gnome/pixmaps/send.png
+share/applications/gfax.desktop
+share/libgnomeprint/2.18.2/models/GNOME-GFAX-PS.xml
+share/libgnomeprint/2.18.2/printers/GFAX.xml
+share/pixmaps/gfax.png
+share/pixmaps/send.png
 @dirrm lib/gfax
+@dirrmtry share/applications
diff --git a/comms/ghfaxviewer/Makefile b/comms/ghfaxviewer/Makefile
index 12bab946f56b..57cc5ef1d28c 100644
--- a/comms/ghfaxviewer/Makefile
+++ b/comms/ghfaxviewer/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ghfaxviewer
 PORTVERSION=	0.22.0
-PORTREVISION=	4
+PORTREVISION=	6
 CATEGORIES=	comms
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	halifax
@@ -31,8 +31,5 @@ MAN1=	halifax.1 ghfaxviewer.1
 pre-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-	@${FIND} ${WRKSRC} -name "Makefile.in*" | ${XARGS} ${REINPLACE_CMD} -e \
-		's|\(\$$(datadir)/\)gnome/|\1|g ; \
-		 s|\$$(datadir)/locale|$$(prefix)/share/locale|g'
 
 .include <bsd.port.mk>
diff --git a/comms/ghfaxviewer/files/patch-configure b/comms/ghfaxviewer/files/patch-configure
deleted file mode 100644
index 94a34523fb58..000000000000
--- a/comms/ghfaxviewer/files/patch-configure
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- configure	2002/05/13 12:02:06	1.1
-+++ configure	2002/05/13 12:02:24
-@@ -4759,7 +4759,7 @@
-       CFLAGS="$CFLAGS `gnome-config --cflags gnomeui`"
-       LDFLAGS="$LDFLAGS `gnome-config --libs gnomeui`"
-       PIXMAPS_DIR="`gnome-config --datadir`/pixmaps/ghfaxviewer"
--      GNOME_GRAPH_APP_DIR="`gnome-config --datadir`/gnome/apps/Graphics"
-+      GNOME_GRAPH_APP_DIR="`gnome-config --datadir`/apps/Graphics"
- 
-       # Check whether --with-gnome-print-prefix or --without-gnome-print-prefix was given.
- if test "${with_gnome_print_prefix+set}" = set; then
diff --git a/comms/ghfaxviewer/pkg-plist b/comms/ghfaxviewer/pkg-plist
index 757180c7666c..accaee2cdb04 100644
--- a/comms/ghfaxviewer/pkg-plist
+++ b/comms/ghfaxviewer/pkg-plist
@@ -1,10 +1,10 @@
 bin/ghfaxviewer
 share/gnome/apps/Graphics/ghfaxviewer.desktop
-share/gnome/pixmaps/ghfaxviewer/ghfaxviewer-icon.xpm
-share/gnome/pixmaps/ghfaxviewer/ghfaxviewer-logo.xpm
-share/gnome/pixmaps/ghfaxviewer/info.xpm
+share/pixmaps/ghfaxviewer/ghfaxviewer-icon.xpm
+share/pixmaps/ghfaxviewer/ghfaxviewer-logo.xpm
+share/pixmaps/ghfaxviewer/info.xpm
 share/locale/de/LC_MESSAGES/ghfaxviewer.mo
 share/locale/fr/LC_MESSAGES/ghfaxviewer.mo
 share/locale/pl/LC_MESSAGES/ghfaxviewer.mo
 share/locale/zh_TW.Big5/LC_MESSAGES/ghfaxviewer.mo
-@dirrm share/gnome/pixmaps/ghfaxviewer
+@dirrm share/pixmaps/ghfaxviewer
diff --git a/comms/gmfsk/Makefile b/comms/gmfsk/Makefile
index b1907d631c2f..4abdbd7b8555 100644
--- a/comms/gmfsk/Makefile
+++ b/comms/gmfsk/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gmfsk
 PORTVERSION=	0.6
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	comms audio hamradio
 MASTER_SITES=	http://gmfsk.connect.fi/
 
diff --git a/comms/gmfsk/pkg-plist b/comms/gmfsk/pkg-plist
index 4a171ebbe364..aae645061cee 100644
--- a/comms/gmfsk/pkg-plist
+++ b/comms/gmfsk/pkg-plist
@@ -6,15 +6,15 @@ share/gnome/help/gmfsk/C/figures/tip.png
 share/gnome/help/gmfsk/C/figures/warning.png
 share/gnome/help/gmfsk/C/gmfsk.xml
 share/gnome/help/gmfsk/C/legal.xml
-share/gnome/omf/gmfsk/gmfsk-C.omf
-share/gnome/pixmaps/gmfsk/gnome-screenshot.png
-share/gnome/pixmaps/gmfsk/mfsk.png
-share/gnome/pixmaps/gmfsk/pause.xpm
-share/gnome/pixmaps/gmfsk/rx.xpm
-share/gnome/pixmaps/gmfsk/tune.xpm
-share/gnome/pixmaps/gmfsk/tx.xpm
-@dirrm share/gnome/pixmaps/gmfsk
-@dirrm share/gnome/omf/gmfsk
+share/omf/gmfsk/gmfsk-C.omf
+share/pixmaps/gmfsk/gnome-screenshot.png
+share/pixmaps/gmfsk/mfsk.png
+share/pixmaps/gmfsk/pause.xpm
+share/pixmaps/gmfsk/rx.xpm
+share/pixmaps/gmfsk/tune.xpm
+share/pixmaps/gmfsk/tx.xpm
+@dirrm share/pixmaps/gmfsk
+@dirrm share/omf/gmfsk
 @dirrm share/gnome/help/gmfsk/C/figures
 @dirrm share/gnome/help/gmfsk/C
 @dirrm share/gnome/help/gmfsk
diff --git a/comms/grig/Makefile b/comms/grig/Makefile
index 3f4cae434ad4..85e7128e14f7 100644
--- a/comms/grig/Makefile
+++ b/comms/grig/Makefile
@@ -3,6 +3,7 @@
 # Whom:					Matt Dawson <matt@mattsnetwork.co.uk>
 #
 # $FreeBSD$
+#
 
 PORTNAME=	grig
 PORTVERSION=	0.7.2
@@ -22,4 +23,8 @@ USE_GMAKE=	yes
 
 MAN1=		grig.1
 
+post-patch:
+	@${FIND} ${WRKSRC} -name Makefile.* | ${XARGS} ${REINPLACE_CMD} -e \
+		's|-D.*_DISABLE_DEPRECATED||g'
+
 .include <bsd.port.mk>
diff --git a/comms/tilp2/Makefile b/comms/tilp2/Makefile
index 31b1e9ed9100..654dff01dc2d 100644
--- a/comms/tilp2/Makefile
+++ b/comms/tilp2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	tilp2
 PORTVERSION=	1.07
+PORTREVISION=	1
 CATEGORIES=	comms
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	tilp
@@ -34,9 +35,15 @@ PLIST_SUB=	NLS="@comment "
 .endif
 
 CONFIGURE_ARGS+=	--without-kde
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -UGTK_DISABLE_DEPRECATED" \
 		LDFLAGS="-L${LOCALBASE}/lib -export-dynamic"
 
 MAN1=	tilp.1
 
+post-patch:
+	@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \
+		's|-D.*_DISABLE_DEPRECATED||g'
+	@${REINPLACE_CMD} -e 's|#define .*_DISABLE_DEPRECATED||g' \
+		${WRKSRC}/src/device.c ${WRKSRC}/src/toolbar.c
+
 .include <bsd.port.mk>
diff --git a/comms/tilp2/files/patch-src_filesel.c b/comms/tilp2/files/patch-src_filesel.c
new file mode 100644
index 000000000000..e2875849ded0
--- /dev/null
+++ b/comms/tilp2/files/patch-src_filesel.c
@@ -0,0 +1,10 @@
+--- src/filesel.c.orig	2007-10-24 09:06:41.542878494 -0400
++++ src/filesel.c	2007-10-24 09:06:56.125704803 -0400
+@@ -36,6 +36,7 @@
+ #  include <config.h>
+ #endif				/*  */
+ 
++#undef GTK_DISABLE_DEPRECATED
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <gtk/gtk.h>
diff --git a/comms/xdx/Makefile b/comms/xdx/Makefile
index 882671bd148d..ca9b14d0d4c8 100644
--- a/comms/xdx/Makefile
+++ b/comms/xdx/Makefile
@@ -3,6 +3,7 @@
 # Whom:					Matt Dawson <matt@mattsnetwork.co.uk>
 #
 # $FreeBSD$
+#
 
 PORTNAME=	xdx
 PORTVERSION=	2.2
@@ -20,4 +21,8 @@ USE_GMAKE=	yes
 
 MAN1=		xdx.1
 
+post-patch:
+	@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \
+		's|-D.*_DISABLE_DEPRECATED||g'
+
 .include <bsd.port.mk>
diff --git a/comms/xlog/Makefile b/comms/xlog/Makefile
index 11207f4e9e36..e9f3dcfcea07 100644
--- a/comms/xlog/Makefile
+++ b/comms/xlog/Makefile
@@ -3,10 +3,11 @@
 # Whom:			Patrick Gardella <patrick@FreeBSD.org>
 #
 # $FreeBSD$
+#
 
 PORTNAME=	xlog
 PORTVERSION=	1.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	comms hamradio
 MASTER_SITES=	http://pg4i.chronos.org.uk/download/ \
 		http://www.qsl.net/pg4i/download/
@@ -15,7 +16,7 @@ MAINTAINER=	matt@chronos.org.uk
 COMMENT=	Amateur Radio logging application
 
 USE_GETTEXT=	yes
-USE_GNOME=	libgnomeprint gnomelibs gtk20
+USE_GNOME=	libgnomeprint gtk20
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-mime-update
 
@@ -32,4 +33,8 @@ WITHNLS=	""
 
 PLIST_SUB+=	WITHNLS=${WITHNLS}
 
+post-patch:
+	@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \
+		's|-D.*_DISABLE_DEPRECATED||g'
+
 .include <bsd.port.mk>