- Add header in these *-reference ports.

- Fix a few of pkg-descr by chase the rename.
- Move all PORTREVISION and PORTEPOCH to top with ?=.
- Put USE_X_PREFIX back in, but under REFERENCE_PORT, and remove PREFIX? and
  USE_XLIB. This fix ports to use the correct mtree when you change the prefix,
  for example:

  	Incorrect: (Without USE_X_PREFIX)
	================================
	# cd /usr/ports/x11-toolkits/gtk20
	# make -V MTREE_FILE
	/etc/mtree/BSD.x11-4.dist
	# make PREFIX=/tmp/foo -V MTREE_FILE
	/etc/mtree/BSD.local.dist <-- Here...
	================================

  	Correct: (With USE_X_PREFIX)
	================================
	# cd /usr/ports/x11-toolkits/gtk20
	# make -V MTREE_FILE
	/etc/mtree/BSD.x11-4.dist
	# make PREFIX=/tmp/foo -V MTREE_FILE
	/etc/mtree/BSD.x11-4.dist <-- Here...
	================================

- Change a several of *-reference ports to install in LOCALBASE instead
  X11BASE, but only two gtkmm*-reference couldn't be change at the moment.
  Bump the PORTREVISION for change prefix.

Discussed with:	marcus

77 files changed, 329 insertions, 114 deletions

diff --git a/accessibility/at-spi-reference/Makefile b/accessibility/at-spi-reference/Makefile
index 464535ff50df..3735d61ba2ba 100644
--- a/accessibility/at-spi-reference/Makefile
+++ b/accessibility/at-spi-reference/Makefile
@@ -1,4 +1,11 @@
+# New ports collection makefile for:	at-spi-reference
+# Date created:				09 May 2006
+# Whom:					Jean-Yves Lefort <jylefort@FreeBSD.org>
+#
 # $FreeBSD$
+#
+
+PORTREVISION=	1
 
 BOOKS=		cspi idl
 
diff --git a/accessibility/at-spi/Makefile b/accessibility/at-spi/Makefile
index fd586745b6df..50d9f0a468e6 100644
--- a/accessibility/at-spi/Makefile
+++ b/accessibility/at-spi/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	at-spi
 PORTVERSION=	1.7.7
+PORTREVISION?=	1
 CATEGORIES=	accessibility x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -17,17 +18,14 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	An Assistive Technology Service Provider Interface
 
 USE_BZIP2=	yes
-PREFIX?=	${X11BASE}
 
 .if !defined(REFERENCE_PORT)
 
-PORTREVISION=	1
-
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack gnomehier intltool gail libbonobo \
 		intlhack
-USE_XLIB=	yes
+USE_X_PREFIX=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-static
diff --git a/accessibility/atk-reference/Makefile b/accessibility/atk-reference/Makefile
index fe0035ece1de..986485209517 100644
--- a/accessibility/atk-reference/Makefile
+++ b/accessibility/atk-reference/Makefile
@@ -1,4 +1,11 @@
+# New ports collection makefile for:	atk-reference
+# Date created:				09 May 2006
+# Whom:					Jean-Yves Lefort <jylefort@FreeBSD.org>
+#
 # $FreeBSD$
+#
+
+PORTREVISION=	0
 
 REFERENCE_SRC=	${WRKSRC}/docs
 
diff --git a/accessibility/atk/Makefile b/accessibility/atk/Makefile
index ca5c5c1bd404..66fe20e6d1ad 100644
--- a/accessibility/atk/Makefile
+++ b/accessibility/atk/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	atk
 PORTVERSION=	1.11.4
+PORTREVISION?=	1
 CATEGORIES=	accessibility devel
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -20,7 +21,6 @@ USE_BZIP2=	yes
 
 .if !defined(REFERENCE_PORT)
 
-PORTREVISION=	1
 USE_GETTEXT=	yes
 INSTALLS_SHLIB=	yes
 USE_AUTOTOOLS=	libtool:15
diff --git a/accessibility/gail-reference/Makefile b/accessibility/gail-reference/Makefile
index 99581ea39e7d..39d2197639a0 100644
--- a/accessibility/gail-reference/Makefile
+++ b/accessibility/gail-reference/Makefile
@@ -1,4 +1,11 @@
+# New ports collection makefile for:	gail-reference
+# Date created:				09 May 2006
+# Whom:					Jean-Yves Lefort <jylefort@FreeBSD.org>
+#
 # $FreeBSD$
+#
+
+PORTREVISION=	1
 
 REFERENCE_SRC=	${WRKSRC}/docs/reference/libgail-util
 
diff --git a/accessibility/gail/Makefile b/accessibility/gail/Makefile
index 7c58d670d751..b4991f9cf43f 100644
--- a/accessibility/gail/Makefile
+++ b/accessibility/gail/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	gail
 PORTVERSION=	1.8.11
+PORTREVISION?=	1
 CATEGORIES=	accessibility x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -17,13 +18,11 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	An implementation of the ATK interfaces for GTK+ widgets
 
 USE_BZIP2=	yes
-PREFIX?=	${X11BASE}
 
 .if !defined(REFERENCE_PORT)
 
-PORTREVISION=	1
-
 USE_GETTEXT=	yes
+USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
diff --git a/databases/libgda2-reference/Makefile b/databases/libgda2-reference/Makefile
index 1f3dd3542a1c..1c780ccc8429 100644
--- a/databases/libgda2-reference/Makefile
+++ b/databases/libgda2-reference/Makefile
@@ -1,4 +1,12 @@
+# New ports collection makefile for:	libgda2-reference
+# Date created:				09 May 2006
+# Whom:					Jean-Yves Lefort <jylefort@FreeBSD.org>
+#
 # $FreeBSD$
+#
+
+PORTREVISION=	1
+PORTEPOCH=	0
 
 REFERENCE_SRC=	${WRKSRC}/doc/C
 
diff --git a/databases/libgda2/Makefile b/databases/libgda2/Makefile
index 828ec6132156..757e15f510f8 100644
--- a/databases/libgda2/Makefile
+++ b/databases/libgda2/Makefile
@@ -7,6 +7,8 @@
 
 PORTNAME=	libgda2
 PORTVERSION=	1.2.3
+PORTREVISION?=	1
+PORTEPOCH?=	1
 CATEGORIES=	databases gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/1.2
@@ -17,21 +19,17 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Provides uniform access to different kinds of data sources
 
 USE_BZIP2=	yes
-PREFIX?=	${X11BASE}
 
 .if !defined(REFERENCE_PORT)
 
-PORTREVISION=	1
-PORTEPOCH=	1
-
 BUILD_DEPENDS=	scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper
 LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt
 RUN_DEPENDS=	scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper
 
-USE_XLIB=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack glib20 libxslt referencehack
 USE_GETTEXT=	yes
+USE_X_PREFIX=	yes
 INSTALLS_OMF=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
diff --git a/databases/libgda3-reference/Makefile b/databases/libgda3-reference/Makefile
index 1f3dd3542a1c..c8a1a83577a4 100644
--- a/databases/libgda3-reference/Makefile
+++ b/databases/libgda3-reference/Makefile
@@ -1,4 +1,11 @@
+# New ports collection makefile for:	libgda3-reference
+# Date created:				09 May 2006
+# Whom:					Jean-Yves Lefort <jylefort@FreeBSD.org>
+#
 # $FreeBSD$
+#
+
+PORTREVISION=	1
 
 REFERENCE_SRC=	${WRKSRC}/doc/C
 
diff --git a/databases/libgda3/Makefile b/databases/libgda3/Makefile
index d45573475ee2..090173194e07 100644
--- a/databases/libgda3/Makefile
+++ b/databases/libgda3/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	libgda3
 PORTVERSION=	1.9.102
+PORTREVISION?=	1
 CATEGORIES=	databases gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/3$//}/${PORTVERSION:R}
@@ -18,16 +19,13 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Provides uniform access to different kinds of data sources
 
 USE_BZIP2=	yes
-PREFIX?=	${X11BASE}
 
 .if !defined(REFERENCE_PORT)
 
-PORTREVISION=	1
-
 LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt
 
 USE_GETTEXT=	yes
-USE_XLIB=	yes
+USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack glib20 libxslt intlhack referencehack
 INSTALLS_SHLIB=	yes
diff --git a/databases/libgnomedb-reference/Makefile b/databases/libgnomedb-reference/Makefile
index 1f3dd3542a1c..08099c7e7884 100644
--- a/databases/libgnomedb-reference/Makefile
+++ b/databases/libgnomedb-reference/Makefile
@@ -1,4 +1,11 @@
+# New ports collection makefile for:	libgnomedb-reference
+# Date created:				09 May 2006
+# Whom:					Jean-Yves Lefort <jylefort@FreeBSD.org>
+#
 # $FreeBSD$
+#
+
+PORTREVISION=	1
 
 REFERENCE_SRC=	${WRKSRC}/doc/C
 
diff --git a/databases/libgnomedb/Makefile b/databases/libgnomedb/Makefile
index 9fb4ff7bbb63..db1eca3f4cbc 100644
--- a/databases/libgnomedb/Makefile
+++ b/databases/libgnomedb/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	libgnomedb
 PORTVERSION=	1.9.102
+PORTREVISION?=	2
 CATEGORIES=	databases gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:R}
@@ -17,16 +18,13 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Library components for the GNOME database frontend
 
 USE_BZIP2=	yes
-PREFIX?=	${X11BASE}
 
 .if !defined(REFERENCE_PORT)
 
-PORTREVISION=	2
-
-USE_XLIB=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack libgnomeui libgda3 gtksourceview \
 		intlhack referencehack
+USE_X_PREFIX=	yes
 USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
 INSTALLS_OMF=	yes
diff --git a/devel/ORBit2-reference/Makefile b/devel/ORBit2-reference/Makefile
index 087c720a04aa..8227a9839144 100644
--- a/devel/ORBit2-reference/Makefile
+++ b/devel/ORBit2-reference/Makefile
@@ -1,4 +1,11 @@
+# New ports collection makefile for:	ORBit2-reference
+# Date created:				09 May 2006
+# Whom:					Jean-Yves Lefort <jylefort@FreeBSD.org>
+#
 # $FreeBSD$
+#
+
+PORTREVISION=	0
 
 REFERENCE_SRC=	${WRKSRC}/docs/api
 
diff --git a/devel/ORBit2/Makefile b/devel/ORBit2/Makefile
index b0a0d871e0f5..c950ffbea026 100644
--- a/devel/ORBit2/Makefile
+++ b/devel/ORBit2/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	ORBit2
 PORTVERSION=	2.14.0
+PORTREVISION?=	1
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -20,8 +21,6 @@ USE_BZIP2=	yes
 
 .if !defined(REFERENCE_PORT)
 
-PORTREVISION=	1
-
 LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt
 
 USE_GMAKE=	yes
diff --git a/devel/gconf2-reference/Makefile b/devel/gconf2-reference/Makefile
index 59ed1e5e2754..e8e154120e9e 100644
--- a/devel/gconf2-reference/Makefile
+++ b/devel/gconf2-reference/Makefile
@@ -1,4 +1,11 @@
+# New ports collection makefile for:	gconf2-reference
+# Date created:				09 May 2006
+# Whom:					Jean-Yves Lefort <jylefort@FreeBSD.org>
+#
 # $FreeBSD$
+#
+
+PORTREVISION=	1
 
 REFERENCE_SRC=	${WRKSRC}/doc/gconf
 
diff --git a/devel/gconf2/Makefile b/devel/gconf2/Makefile
index bab9ca3fe245..4e1a7b6f432d 100644
--- a/devel/gconf2/Makefile
+++ b/devel/gconf2/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	gconf2
 PORTVERSION=	2.14.0
+PORTREVISION?=	2
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/GConf/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -18,15 +19,12 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A configuration database system for GNOME
 
 USE_BZIP2=	yes
-PREFIX?=	${X11BASE}
 
 .if !defined(REFERENCE_PORT)
 
-PORTREVISION=	2
-
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
-USE_XLIB=	yes
+USE_X_PREFIX=	yes
 USE_GNOME=	gnomehier gnomehack orbit2 gtk20 libxml2 linc ltverhack referencehack
 INSTALLS_SHLIB=	yes
 USE_AUTOTOOLS=	libtool:15
diff --git a/devel/glib20-reference/Makefile b/devel/glib20-reference/Makefile
index e941dedbb348..94743ee69b03 100644
--- a/devel/glib20-reference/Makefile
+++ b/devel/glib20-reference/Makefile
@@ -1,4 +1,11 @@
+# New ports collection makefile for:	glib20-reference
+# Date created:				09 May 2006
+# Whom:					Jean-Yves Lefort <jylefort@FreeBSD.org>
+#
 # $FreeBSD$
+#
+
+PORTREVISION=	0
 
 BOOKS=		glib gobject
 
diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile
index 5791c036b930..6042cb345639 100644
--- a/devel/glib20/Makefile
+++ b/devel/glib20/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	glib
 PORTVERSION=	2.10.3
+PORTREVISION?=	0
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,sources/${PORTNAME}/2.10,} \
 		ftp://ftp.gtk.org/pub/gtk/v${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/ \
diff --git a/devel/glibmm-reference/Makefile b/devel/glibmm-reference/Makefile
index ec9529abf28f..8f5c9e84dd51 100644
--- a/devel/glibmm-reference/Makefile
+++ b/devel/glibmm-reference/Makefile
@@ -1,4 +1,9 @@
+# New ports collection makefile for:	glibmm-reference
+# Date created:				09 May 2006
+# Whom:					Jean-Yves Lefort <jylefort@FreeBSD.org>
+#
 # $FreeBSD$
+#
 
 PORTREVISION=	1
 
diff --git a/devel/glibmm/Makefile b/devel/glibmm/Makefile
index 463c5ff978db..50c10f265794 100644
--- a/devel/glibmm/Makefile
+++ b/devel/glibmm/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	glibmm
 PORTVERSION=	2.10.3
+PORTREVISION?=	0
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/devel/gnome-vfs-reference/Makefile b/devel/gnome-vfs-reference/Makefile
index 655901b3c8cf..2569ea0d449e 100644
--- a/devel/gnome-vfs-reference/Makefile
+++ b/devel/gnome-vfs-reference/Makefile
@@ -1,4 +1,11 @@
+# New ports collection makefile for:	gnome-vfs-reference
+# Date created:				09 May 2006
+# Whom:					Jean-Yves Lefort <jylefort@FreeBSD.org>
+#
 # $FreeBSD$
+#
+
+PORTREVISION=	1
 
 REFERENCE_SRC=	${WRKSRC}/doc
 
diff --git a/devel/gnome-vfs-reference/pkg-descr b/devel/gnome-vfs-reference/pkg-descr
index 365eb0c1b43a..68035ab739de 100644
--- a/devel/gnome-vfs-reference/pkg-descr
+++ b/devel/gnome-vfs-reference/pkg-descr
@@ -1,3 +1,3 @@
-This port contains the programming reference for devel/gnomevfs2.
+This port contains the programming reference for devel/gnome-vfs.
 
 WWW: http://www.gnome.org/
diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile
index 8519861b473f..dd49c88511eb 100644
--- a/devel/gnome-vfs/Makefile
+++ b/devel/gnome-vfs/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gnome-vfs
 PORTVERSION=	2.14.2
+PORTREVISION?=	3
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-vfs/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -17,17 +18,14 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME Virtual File System
 
 USE_BZIP2=	yes
-PREFIX?=	${X11BASE}
 
 .if !defined(REFERENCE_PORT)
 
-PORTREVISION=	3
-
 RUN_DEPENDS=	${LOCALBASE}/share/mime/magic:${PORTSDIR}/misc/shared-mime-info
 
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
-USE_XLIB=	yes
+USE_X_PREFIX=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack gnomemimedata gconf2 \
 		libbonobo ltverhack referencehack
 USE_AUTOTOOLS=	libtool:15
diff --git a/devel/libbonobo-reference/Makefile b/devel/libbonobo-reference/Makefile
index 8c441e4c0c06..0cf14bc4729b 100644
--- a/devel/libbonobo-reference/Makefile
+++ b/devel/libbonobo-reference/Makefile
@@ -1,4 +1,11 @@
+# New ports collection makefile for:	libbonobo-reference
+# Date created:				09 May 2006
+# Whom:					Jean-Yves Lefort <jylefort@FreeBSD.org>
+#
 # $FreeBSD$
+#
+
+PORTREVISION=	0
 
 REFERENCE_SRC=	${WRKSRC}/doc
 BOOKS=		activation-api api
diff --git a/devel/libbonobo/Makefile b/devel/libbonobo/Makefile
index 05e39dabd6bf..cd6dff5609d1 100644
--- a/devel/libbonobo/Makefile
+++ b/devel/libbonobo/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	libbonobo
 PORTVERSION=	2.14.0
+PORTREVISION?=	2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -20,8 +21,6 @@ USE_BZIP2=	yes
 
 .if !defined(REFERENCE_PORT)
 
-PORTREVISION=	2
-
 USE_GMAKE=	yes
 USE_BISON=	yes
 USE_GETTEXT=	yes
diff --git a/devel/libglade2-reference/Makefile b/devel/libglade2-reference/Makefile
index 655901b3c8cf..522ed6c4e159 100644
--- a/devel/libglade2-reference/Makefile
+++ b/devel/libglade2-reference/Makefile
@@ -1,4 +1,11 @@
+# New ports collection makefile for:	libglade2-reference
+# Date created:				09 May 2006
+# Whom:					Jean-Yves Lefort <jylefort@FreeBSD.org>
+#
 # $FreeBSD$
+#
+
+PORTREVISION=	1
 
 REFERENCE_SRC=	${WRKSRC}/doc
 
diff --git a/devel/libglade2/Makefile b/devel/libglade2/Makefile
index ceaca8a8d4b9..c5f12bf2d059 100644
--- a/devel/libglade2/Makefile
+++ b/devel/libglade2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	libglade2
 PORTVERSION=	2.5.1
+PORTREVISION?=	5
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.5
@@ -17,16 +18,13 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME glade library
 
 USE_BZIP2=	yes
-PREFIX?=	${X11BASE}
 
 .if !defined(REFERENCE_PORT)
 
-PORTREVISION=	5
-
 RUN_DEPENDS=	xmlcatmgr:${PORTSDIR}/textproc/xmlcatmgr
 
-USE_XLIB=	yes
 USE_GMAKE=	yes
+USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 USE_GNOME=	gnomehack libxml2 gtk20 referencehack
 INSTALLS_SHLIB=	yes
diff --git a/devel/libsoup-reference/Makefile b/devel/libsoup-reference/Makefile
index e757abc87105..b30806982868 100644
--- a/devel/libsoup-reference/Makefile
+++ b/devel/libsoup-reference/Makefile
@@ -1,3 +1,10 @@
+# New ports collection makefile for:	libsoup-reference
+# Date created:				09 May 2006
+# Whom:					Jean-Yves Lefort <jylefort@FreeBSD.org>
+#
 # $FreeBSD$
+#
+
+PORTREVISION=	0
 
 .include "${.CURDIR}/../../devel/glib20-reference/bsd.gnome-reference.mk"
diff --git a/devel/libsoup/Makefile b/devel/libsoup/Makefile
index 5198a672f44c..5257adfa0427 100644
--- a/devel/libsoup/Makefile
+++ b/devel/libsoup/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	libsoup
 PORTVERSION=	2.2.93
+PORTREVISION?=	0
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/devel/libsoup22/Makefile b/devel/libsoup22/Makefile
index 5198a672f44c..5257adfa0427 100644
--- a/devel/libsoup22/Makefile
+++ b/devel/libsoup22/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	libsoup
 PORTVERSION=	2.2.93
+PORTREVISION?=	0
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/graphics/cairo-reference/Makefile b/graphics/cairo-reference/Makefile
index a31558e31e28..db5270d9c9dd 100644
--- a/graphics/cairo-reference/Makefile
+++ b/graphics/cairo-reference/Makefile
@@ -1,4 +1,11 @@
+# New ports collection makefile for:	cairo-reference
+# Date created:				09 May 2006
+# Whom:					Jean-Yves Lefort <jylefort@FreeBSD.org>
+#
 # $FreeBSD$
+#
+
+PORTREVISION=	0
 
 REFERENCE_SRC=	${WRKSRC}/doc/public
 
diff --git a/graphics/cairo/Makefile b/graphics/cairo/Makefile
index a5c5ea925eb2..9dfd56f5cec5 100644
--- a/graphics/cairo/Makefile
+++ b/graphics/cairo/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	cairo
 PORTVERSION=	1.0.4
+PORTREVISION?=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://cairographics.org/releases/ \
 		${MASTER_SITE_LOCAL}
@@ -18,8 +19,6 @@ COMMENT=	Vector graphics library with cross-device output support
 
 .if !defined(REFERENCE_PORT)
 
-PORTREVISION=	1
-
 LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2 \
 		png.5:${PORTSDIR}/graphics/png \
 		fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig
diff --git a/graphics/libgnomecanvas-reference/Makefile b/graphics/libgnomecanvas-reference/Makefile
index e757abc87105..2d9d6e33e315 100644
--- a/graphics/libgnomecanvas-reference/Makefile
+++ b/graphics/libgnomecanvas-reference/Makefile
@@ -1,3 +1,10 @@
+# New ports collection makefile for:	libgnomecanvas-reference
+# Date created:				09 May 2006
+# Whom:					Jean-Yves Lefort <jylefort@FreeBSD.org>
+#
 # $FreeBSD$
+#
+
+PORTREVISION=	1
 
 .include "${.CURDIR}/../../devel/glib20-reference/bsd.gnome-reference.mk"
diff --git a/graphics/libgnomecanvas/Makefile b/graphics/libgnomecanvas/Makefile
index 72d929dfdb2a..33cf472f7f8a 100644
--- a/graphics/libgnomecanvas/Makefile
+++ b/graphics/libgnomecanvas/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	libgnomecanvas
 PORTVERSION=	2.14.0
+PORTREVISION?=	1
 CATEGORIES=	graphics gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -17,15 +18,12 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A graphics library for GNOME
 
 USE_BZIP2=	yes
-PREFIX?=	${X11BASE}
 
 .if !defined(REFERENCE_PORT)
 
-PORTREVISION=	1
-
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
-USE_XLIB=	yes
+USE_X_PREFIX=	yes
 INSTALLS_SHLIB=	yes
 USE_AUTOTOOLS=	libtool:15
 USE_GNOME=	gnomehack libglade2 libartlgpl2 ltverhack referencehack
diff --git a/net/linc-reference/Makefile b/net/linc-reference/Makefile
index fe0035ece1de..fce95920e4b5 100644
--- a/net/linc-reference/Makefile
+++ b/net/linc-reference/Makefile
@@ -1,4 +1,11 @@
+# New ports collection makefile for:	linc-reference
+# Date created:				09 May 2006
+# Whom:					Jean-Yves Lefort <jylefort@FreeBSD.org>
+#
 # $FreeBSD$
+#
+
+PORTREVISION=	0
 
 REFERENCE_SRC=	${WRKSRC}/docs
 
diff --git a/net/linc/Makefile b/net/linc/Makefile
index 1c97fa4f2031..138a420e5085 100644
--- a/net/linc/Makefile
+++ b/net/linc/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	linc
 PORTVERSION=	1.0.3
+PORTREVISION?=	6
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/1.0
@@ -19,8 +20,6 @@ USE_BZIP2=	yes
 
 .if !defined(REFERENCE_PORT)
 
-PORTREVISION=	6
-
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack glib20
 INSTALLS_SHLIB=	yes
diff --git a/print/libgnomeprint-reference/Makefile b/print/libgnomeprint-reference/Makefile
index c1f89f7b59bd..71b657e80917 100644
--- a/print/libgnomeprint-reference/Makefile
+++ b/print/libgnomeprint-reference/Makefile
@@ -1,4 +1,11 @@
+# New ports collection makefile for:	libgnomeprint-reference
+# Date created:				09 May 2006
+# Whom:					Jean-Yves Lefort <jylefort@FreeBSD.org>
+#
 # $FreeBSD$
+#
+
+PORTREVISION=	1
 
 REFERENCE_SRC=	${WRKSRC}/doc/reference
 
diff --git a/print/libgnomeprint/Makefile b/print/libgnomeprint/Makefile
index 3a4fe6507104..8c0614d8d86d 100644
--- a/print/libgnomeprint/Makefile
+++ b/print/libgnomeprint/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	libgnomeprint
 PORTVERSION=	2.12.1
+PORTREVISION?=	2
 CATEGORIES=	print gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.12
@@ -17,21 +18,18 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Gnome print support library
 
 USE_BZIP2=	yes
-PREFIX?=	${X11BASE}
 
 .if !defined(REFERENCE_PORT)
 
-PORTREVISION=	2
-
 LIB_DEPENDS=	fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig \
 		popt.0:${PORTSDIR}/devel/popt
 
 USE_BISON=	yes
-USE_XLIB=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix intlhack gnomehack gnomehier glib20 pango libxml2 \
 		libartlgpl2 ltverhack
 USE_GETTEXT=	yes
+USE_X_PREFIX=	yes
 INSTALLS_SHLIB=	yes
 USE_AUTOTOOLS=  libtool:15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/textproc/gtkspell-reference/Makefile b/textproc/gtkspell-reference/Makefile
index fe0035ece1de..049668551cc6 100644
--- a/textproc/gtkspell-reference/Makefile
+++ b/textproc/gtkspell-reference/Makefile
@@ -1,4 +1,11 @@
+# New ports collection makefile for:	gtkspell-reference
+# Date created:				09 May 2006
+# Whom:					Jean-Yves Lefort <jylefort@FreeBSD.org>
+#
 # $FreeBSD$
+#
+
+PORTREVISION=	1
 
 REFERENCE_SRC=	${WRKSRC}/docs
 
diff --git a/textproc/gtkspell-reference/pkg-descr b/textproc/gtkspell-reference/pkg-descr
index 133f9771f36e..07fc69cd7bca 100644
--- a/textproc/gtkspell-reference/pkg-descr
+++ b/textproc/gtkspell-reference/pkg-descr
@@ -1,3 +1,3 @@
-This port contains the programming reference for textproc/gtkspell2.
+This port contains the programming reference for textproc/gtkspell.
 
 WWW: http://gtkspell.sourceforge.net/
diff --git a/textproc/gtkspell/Makefile b/textproc/gtkspell/Makefile
index 1f0f637b367d..93d6e135ec47 100644
--- a/textproc/gtkspell/Makefile
+++ b/textproc/gtkspell/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gtkspell
 PORTVERSION=	2.0.11
+PORTREVISION?=	3
 CATEGORIES=	textproc gnome
 MASTER_SITES=	http://gtkspell.sourceforge.net/download/
 DISTNAME=	${PORTNAME:S/2$//}-${PORTVERSION}
@@ -14,20 +15,16 @@ DISTNAME=	${PORTNAME:S/2$//}-${PORTVERSION}
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A GTK+ 2 spell checking component
 
-PREFIX?=	${X11BASE}
-
 .if !defined(REFERENCE_PORT)
 
-PORTREVISION=	3
-
 LIB_DEPENDS=	pspell.16:${PORTSDIR}/textproc/aspell
 
-USE_XLIB=	yes
 USE_PERL5=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack gtk20
 GNU_CONFIGURE=	yes
 USE_GETTEXT=	yes
+USE_X_PREFIX=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/textproc/libxml2-reference/Makefile b/textproc/libxml2-reference/Makefile
index 2d3f11258a0e..97152ce6a86b 100644
--- a/textproc/libxml2-reference/Makefile
+++ b/textproc/libxml2-reference/Makefile
@@ -1,4 +1,11 @@
+# New ports collection makefile for:	libxml2-reference
+# Date created:				09 May 2006
+# Whom:					Jean-Yves Lefort <jylefort@FreeBSD.org>
+#
 # $FreeBSD$
+#
+
+PORTREVISION=	0
 
 BUILD_DEPENDS=	${NONEXISTENT}:${.CURDIR}/../libxml2:configure
 
diff --git a/textproc/libxml2/Makefile b/textproc/libxml2/Makefile
index 7c7a63642b40..c93be4ee06eb 100644
--- a/textproc/libxml2/Makefile
+++ b/textproc/libxml2/Makefile
@@ -13,6 +13,7 @@
 
 PORTNAME=	libxml2
 PORTVERSION=	2.6.24
+PORTREVISION?=	1
 CATEGORIES?=	textproc gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.6
@@ -25,8 +26,6 @@ USE_BZIP2=	yes
 
 .if !defined(REFERENCE_PORT)
 
-PORTREVISION?=	1
-
 USE_GMAKE=	yes
 USE_ICONV=	yes
 GNU_CONFIGURE=	yes
diff --git a/textproc/libxslt-reference/Makefile b/textproc/libxslt-reference/Makefile
index a06482576a49..fddf67bce106 100644
--- a/textproc/libxslt-reference/Makefile
+++ b/textproc/libxslt-reference/Makefile
@@ -1,4 +1,11 @@
+# New ports collection makefile for:	libxslt-reference
+# Date created:				09 May 2006
+# Whom:					Jean-Yves Lefort <jylefort@FreeBSD.org>
+#
 # $FreeBSD$
+#
+
+PORTREVISION=	0
 
 BUILD_DEPENDS=	${NONEXISTENT}:${.CURDIR}/../libxslt:configure
 
diff --git a/textproc/libxslt/Makefile b/textproc/libxslt/Makefile
index 0987cc173ad7..ad275bd84814 100644
--- a/textproc/libxslt/Makefile
+++ b/textproc/libxslt/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	libxslt
 PORTVERSION=	1.1.16
+PORTREVISION?=	2
 CATEGORIES?=	textproc gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/1.1
@@ -19,8 +20,6 @@ USE_BZIP2=	yes
 
 .if !defined(REFERENCE_PORT)
 
-PORTREVISION?=	2
-
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
diff --git a/x11-fonts/fontconfig-reference/Makefile b/x11-fonts/fontconfig-reference/Makefile
index 6788b58df938..fc1099b817a8 100644
--- a/x11-fonts/fontconfig-reference/Makefile
+++ b/x11-fonts/fontconfig-reference/Makefile
@@ -1,4 +1,12 @@
+# New ports collection makefile for:	fontconfig-reference
+# Date created:				09 May 2006
+# Whom:					Jean-Yves Lefort <jylefort@FreeBSD.org>
+#
 # $FreeBSD$
+#
+
+PORTREVISION=	1
+PORTEPOCH=	0
 
 DOCSDIR=	${PREFIX}/share/doc/fontconfig-devel
 
diff --git a/x11-fonts/fontconfig/Makefile b/x11-fonts/fontconfig/Makefile
index d735f54b8452..6c3d8d3a7241 100644
--- a/x11-fonts/fontconfig/Makefile
+++ b/x11-fonts/fontconfig/Makefile
@@ -8,23 +8,21 @@
 
 PORTNAME=	fontconfig
 PORTVERSION=	2.3.2
+PORTREVISION?=	5
+PORTEPOCH?=	1
 CATEGORIES=	x11-fonts
 MASTER_SITES=	http://fontconfig.org/release/
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	An XML-based font configuration API for X Windows
 
-PREFIX?=	${X11BASE}
-
 .if !defined(REFERENCE_PORT)
 
-PORTREVISION=	5
-PORTEPOCH=	1
-
 LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2 \
 		expat.6:${PORTSDIR}/textproc/expat2
 
 USE_GMAKE=	yes
+USE_X_PREFIX=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 USE_GNOME=	gnomehack gnometarget pkgconfig
diff --git a/x11-toolkits/gal2-reference/Makefile b/x11-toolkits/gal2-reference/Makefile
index fe0035ece1de..75f7211274c3 100644
--- a/x11-toolkits/gal2-reference/Makefile
+++ b/x11-toolkits/gal2-reference/Makefile
@@ -1,4 +1,11 @@
+# New ports collection makefile for:	gal2-reference
+# Date created:				09 May 2006
+# Whom:					Jean-Yves Lefort <jylefort@FreeBSD.org>
+#
 # $FreeBSD$
+#
+
+PORTREVISION=	1
 
 REFERENCE_SRC=	${WRKSRC}/docs
 
diff --git a/x11-toolkits/gal2/Makefile b/x11-toolkits/gal2/Makefile
index 64c5a1b4091c..541ff27982e3 100644
--- a/x11-toolkits/gal2/Makefile
+++ b/x11-toolkits/gal2/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	gal2
 PORTVERSION=	2.5.3
+PORTREVISION?=	2
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.5
@@ -18,18 +19,15 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A collection of widgets taken from GNOME 2 gnumeric
 
 USE_BZIP2=	yes
-PREFIX?=	${X11BASE}
 
 .if !defined(REFERENCE_PORT)
 
-PORTREVISION=	2
-
-USE_XLIB=	yes
 USE_PERL5=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack gnomeprefix intlhack libgnomeui libgnomeprintui \
 		ltverhack
 USE_GETTEXT=	yes
+USE_X_PREFIX=	yes
 INSTALLS_SHLIB=	yes
 USE_AUTOTOOLS=  libtool:15
 CONFIGURE_ARGS=	--enable-static --with-libiconv
diff --git a/x11-toolkits/gtk20-reference/Makefile b/x11-toolkits/gtk20-reference/Makefile
index 36c5ca6ccdd5..b1ecb1860630 100644
--- a/x11-toolkits/gtk20-reference/Makefile
+++ b/x11-toolkits/gtk20-reference/Makefile
@@ -1,4 +1,11 @@
+# New ports collection makefile for:	gtk20-reference
+# Date created:				09 May 2006
+# Whom:					Jean-Yves Lefort <jylefort@FreeBSD.org>
+#
 # $FreeBSD$
+#
+
+PORTREVISION=	1
 
 BOOKS=		gdk gdk-pixbuf gtk
 
diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile
index f491d0a42292..e72863e81e40 100644
--- a/x11-toolkits/gtk20/Makefile
+++ b/x11-toolkits/gtk20/Makefile
@@ -26,7 +26,6 @@ COMMENT=	Gimp Toolkit for X11 GUI (current stable version)
 
 USE_BZIP2=	yes
 LATEST_LINK=	gtk20
-PREFIX?=	${X11BASE}
 
 .if !defined(REFERENCE_PORT)
 
@@ -36,13 +35,13 @@ LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
 RUN_DEPENDS=	${LOCALBASE}/share/mime/magic:${PORTSDIR}/misc/shared-mime-info \
 		${X11BASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme
 
-USE_XLIB=	yes
 USE_XPM=	yes
 USE_PERL5=	yes
 INSTALLS_SHLIB=	yes
 USE_AUTOTOOLS=	libtool:15
 USE_GNOME=	gnomehack atk pango ltverhack
 USE_GETTEXT=	yes
+USE_X_PREFIX=	yes
 CONFIGURE_ARGS=	--enable-static --with-xinput=yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include/freetype2 \
 			  -I${LOCALBASE}/include -I${X11BASE}/include" \
diff --git a/x11-toolkits/gtk30-reference/Makefile b/x11-toolkits/gtk30-reference/Makefile
index 36c5ca6ccdd5..b1ecb1860630 100644
--- a/x11-toolkits/gtk30-reference/Makefile
+++ b/x11-toolkits/gtk30-reference/Makefile
@@ -1,4 +1,11 @@
+# New ports collection makefile for:	gtk20-reference
+# Date created:				09 May 2006
+# Whom:					Jean-Yves Lefort <jylefort@FreeBSD.org>
+#
 # $FreeBSD$
+#
+
+PORTREVISION=	1
 
 BOOKS=		gdk gdk-pixbuf gtk
 
diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile
index f491d0a42292..e72863e81e40 100644
--- a/x11-toolkits/gtk30/Makefile
+++ b/x11-toolkits/gtk30/Makefile
@@ -26,7 +26,6 @@ COMMENT=	Gimp Toolkit for X11 GUI (current stable version)
 
 USE_BZIP2=	yes
 LATEST_LINK=	gtk20
-PREFIX?=	${X11BASE}
 
 .if !defined(REFERENCE_PORT)
 
@@ -36,13 +35,13 @@ LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
 RUN_DEPENDS=	${LOCALBASE}/share/mime/magic:${PORTSDIR}/misc/shared-mime-info \
 		${X11BASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme
 
-USE_XLIB=	yes
 USE_XPM=	yes
 USE_PERL5=	yes
 INSTALLS_SHLIB=	yes
 USE_AUTOTOOLS=	libtool:15
 USE_GNOME=	gnomehack atk pango ltverhack
 USE_GETTEXT=	yes
+USE_X_PREFIX=	yes
 CONFIGURE_ARGS=	--enable-static --with-xinput=yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include/freetype2 \
 			  -I${LOCALBASE}/include -I${X11BASE}/include" \
diff --git a/x11-toolkits/gtkmm20-reference/Makefile b/x11-toolkits/gtkmm20-reference/Makefile
index 94323cc07275..479cabbe6338 100644
--- a/x11-toolkits/gtkmm20-reference/Makefile
+++ b/x11-toolkits/gtkmm20-reference/Makefile
@@ -1,4 +1,11 @@
+# New ports collection makefile for:	gtkmm20-reference
+# Date created:				09 May 2006
+# Whom:					Jean-Yves Lefort <jylefort@FreeBSD.org>
+#
 # $FreeBSD$
+#
+
+PORTREVISION=	0
 
 PATCH_DEPENDS=	${NONEXISTENT}:${.CURDIR}/../gtkmm20:patch
 BUILD_DEPENDS=	${NONEXISTENT}:${.CURDIR}/../gtkmm20:configure
@@ -6,6 +13,7 @@ BUILD_DEPENDS=	${NONEXISTENT}:${.CURDIR}/../gtkmm20:configure
 PARENT_WRKSRC!=	cd ${.CURDIR}/../gtkmm20 && ${MAKE} -V WRKSRC
 EXTRACT_ONLY=
 USE_GMAKE=	yes
+PREFIX=		${X11BASE}
 
 DOCSDIR=	${PREFIX}/share/doc/gtkmm-2.0
 
diff --git a/x11-toolkits/gtkmm20/Makefile b/x11-toolkits/gtkmm20/Makefile
index 120c3be5e187..ab5a09757626 100644
--- a/x11-toolkits/gtkmm20/Makefile
+++ b/x11-toolkits/gtkmm20/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gtkmm
 PORTVERSION=	2.2.12
+PORTREVISION?=	6
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME} \
 		${MASTER_SITE_SOURCEFORGE}
@@ -18,18 +19,15 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	C++ wrapper for Gtk+, Pango, Atk, and Glib
 
 USE_BZIP2=	yes
-PREFIX?=	${X11BASE}
 LATEST_LINK=	gtkmm2
 
 .if !defined(REFERENCE_PORT)
 
-PORTREVISION=	6
-
 LIB_DEPENDS=	sigc-1.2.5:${PORTSDIR}/devel/libsigc++12
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
-USE_XLIB=	yes
 USE_GMAKE=	yes
+USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 USE_GNOME=	gnomehack lthack gtk20
diff --git a/x11-toolkits/gtkmm24-reference/Makefile b/x11-toolkits/gtkmm24-reference/Makefile
index 4744eccb028a..945f7dd663d7 100644
--- a/x11-toolkits/gtkmm24-reference/Makefile
+++ b/x11-toolkits/gtkmm24-reference/Makefile
@@ -1,4 +1,11 @@
+# New ports collection makefile for:	gtkmm24-reference
+# Date created:				09 May 2006
+# Whom:					Jean-Yves Lefort <jylefort@FreeBSD.org>
+#
 # $FreeBSD$
+#
+
+PORTREVISION=	0
 
 PATCH_DEPENDS=	${NONEXISTENT}:${.CURDIR}/../gtkmm24:patch
 BUILD_DEPENDS=	${NONEXISTENT}:${.CURDIR}/../gtkmm24:configure
@@ -6,6 +13,7 @@ BUILD_DEPENDS=	${NONEXISTENT}:${.CURDIR}/../gtkmm24:configure
 PARENT_WRKSRC!=	cd ${.CURDIR}/../gtkmm24 && ${MAKE} -V WRKSRC
 EXTRACT_ONLY=
 USE_GMAKE=	yes
+PREFIX=		${X11BASE}
 
 DOCSDIR=	${PREFIX}/share/doc/gtkmm-2.4
 
diff --git a/x11-toolkits/gtkmm24/Makefile b/x11-toolkits/gtkmm24/Makefile
index 6811cf225a99..fdd2b8f73eb6 100644
--- a/x11-toolkits/gtkmm24/Makefile
+++ b/x11-toolkits/gtkmm24/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	gtkmm
 PORTVERSION=	2.8.8
+PORTREVISION?=	0
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:R}
@@ -17,7 +18,6 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	C++ wrapper for Gtk+, Pango, Atk
 
 USE_BZIP2=	yes
-PREFIX?=	${X11BASE}
 LATEST_LINK=	gtkmm24
 
 .if !defined(REFERENCE_PORT)
@@ -25,9 +25,9 @@ LATEST_LINK=	gtkmm24
 LIB_DEPENDS=	glibmm-2.4.1:${PORTSDIR}/devel/glibmm
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
-USE_XLIB=	yes
 USE_GMAKE=	yes
 USE_GCC=	3.4
+USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 USE_GNOME=	gnomehack gtk20
diff --git a/x11-toolkits/gtkmm30-reference/Makefile b/x11-toolkits/gtkmm30-reference/Makefile
index 94323cc07275..479cabbe6338 100644
--- a/x11-toolkits/gtkmm30-reference/Makefile
+++ b/x11-toolkits/gtkmm30-reference/Makefile
@@ -1,4 +1,11 @@
+# New ports collection makefile for:	gtkmm20-reference
+# Date created:				09 May 2006
+# Whom:					Jean-Yves Lefort <jylefort@FreeBSD.org>
+#
 # $FreeBSD$
+#
+
+PORTREVISION=	0
 
 PATCH_DEPENDS=	${NONEXISTENT}:${.CURDIR}/../gtkmm20:patch
 BUILD_DEPENDS=	${NONEXISTENT}:${.CURDIR}/../gtkmm20:configure
@@ -6,6 +13,7 @@ BUILD_DEPENDS=	${NONEXISTENT}:${.CURDIR}/../gtkmm20:configure
 PARENT_WRKSRC!=	cd ${.CURDIR}/../gtkmm20 && ${MAKE} -V WRKSRC
 EXTRACT_ONLY=
 USE_GMAKE=	yes
+PREFIX=		${X11BASE}
 
 DOCSDIR=	${PREFIX}/share/doc/gtkmm-2.0
 
diff --git a/x11-toolkits/gtkmm30/Makefile b/x11-toolkits/gtkmm30/Makefile
index 120c3be5e187..ab5a09757626 100644
--- a/x11-toolkits/gtkmm30/Makefile
+++ b/x11-toolkits/gtkmm30/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gtkmm
 PORTVERSION=	2.2.12
+PORTREVISION?=	6
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME} \
 		${MASTER_SITE_SOURCEFORGE}
@@ -18,18 +19,15 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	C++ wrapper for Gtk+, Pango, Atk, and Glib
 
 USE_BZIP2=	yes
-PREFIX?=	${X11BASE}
 LATEST_LINK=	gtkmm2
 
 .if !defined(REFERENCE_PORT)
 
-PORTREVISION=	6
-
 LIB_DEPENDS=	sigc-1.2.5:${PORTSDIR}/devel/libsigc++12
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
-USE_XLIB=	yes
 USE_GMAKE=	yes
+USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 USE_GNOME=	gnomehack lthack gtk20
diff --git a/x11-toolkits/gtksourceview-reference/Makefile b/x11-toolkits/gtksourceview-reference/Makefile
index e757abc87105..0e370cd9f41f 100644
--- a/x11-toolkits/gtksourceview-reference/Makefile
+++ b/x11-toolkits/gtksourceview-reference/Makefile
@@ -1,3 +1,10 @@
+# New ports collection makefile for:	gtksourceview-reference
+# Date created:				09 May 2006
+# Whom:					Jean-Yves Lefort <jylefort@FreeBSD.org>
+#
 # $FreeBSD$
+#
+
+PORTREVISION=	1
 
 .include "${.CURDIR}/../../devel/glib20-reference/bsd.gnome-reference.mk"
diff --git a/x11-toolkits/gtksourceview/Makefile b/x11-toolkits/gtksourceview/Makefile
index 576f55c18cbf..459da230c0aa 100644
--- a/x11-toolkits/gtksourceview/Makefile
+++ b/x11-toolkits/gtksourceview/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	gtksourceview
 PORTVERSION=	1.6.1
+PORTREVISION?=	1
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -17,14 +18,11 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A text widget that adds syntax highlighting to the GtkTextView widget
 
 USE_BZIP2=	yes
-PREFIX?=	${X11BASE}
 
 .if !defined(REFERENCE_PORT)
 
-PORTREVISION=	1
-
 USE_GETTEXT=	yes
-USE_XLIB=	yes
+USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool:15
 INSTALLS_SHLIB=	yes
diff --git a/x11-toolkits/libbonoboui-reference/Makefile b/x11-toolkits/libbonoboui-reference/Makefile
index a06189070d55..e3e11977b072 100644
--- a/x11-toolkits/libbonoboui-reference/Makefile
+++ b/x11-toolkits/libbonoboui-reference/Makefile
@@ -1,4 +1,11 @@
+# New ports collection makefile for:	libbonoboui-reference
+# Date created:				09 May 2006
+# Whom:					Jean-Yves Lefort <jylefort@FreeBSD.org>
+#
 # $FreeBSD$
+#
+
+PORTREVISION=	1
 
 REFERENCE_SRC=	${WRKSRC}/doc/api
 
diff --git a/x11-toolkits/libbonoboui/Makefile b/x11-toolkits/libbonoboui/Makefile
index 1f3dab876df5..4f4b184f2700 100644
--- a/x11-toolkits/libbonoboui/Makefile
+++ b/x11-toolkits/libbonoboui/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	libbonoboui
 PORTVERSION=	2.14.0
+PORTREVISION?=	1
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -17,14 +18,11 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GUI frontend to the libbonobo component of GNOME 2
 
 USE_BZIP2=	yes
-PREFIX?=	${X11BASE}
 
 .if !defined(REFERENCE_PORT)
 
-PORTREVISION=	1
-
 USE_GETTEXT=	yes
-USE_XLIB=	yes
+USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_GNOME=	gnomeprefix gnomehack gnomehier intlhack \
diff --git a/x11-toolkits/libgnomeui-reference/Makefile b/x11-toolkits/libgnomeui-reference/Makefile
index c1f89f7b59bd..4af3e600bd8f 100644
--- a/x11-toolkits/libgnomeui-reference/Makefile
+++ b/x11-toolkits/libgnomeui-reference/Makefile
@@ -1,4 +1,11 @@
+# New ports collection makefile for:	libgnomeui-reference
+# Date created:				09 May 2006
+# Whom:					Jean-Yves Lefort <jylefort@FreeBSD.org>
+#
 # $FreeBSD$
+#
+
+PORTREVISION=	1
 
 REFERENCE_SRC=	${WRKSRC}/doc/reference
 
diff --git a/x11-toolkits/libgnomeui/Makefile b/x11-toolkits/libgnomeui/Makefile
index b61ad52b36b8..acea669aae0f 100644
--- a/x11-toolkits/libgnomeui/Makefile
+++ b/x11-toolkits/libgnomeui/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	libgnomeui
 PORTVERSION=	2.14.1
+PORTREVISION?=	1
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -16,18 +17,15 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Libraries for the GNOME GUI, a GNU desktop environment
 
 USE_BZIP2=	yes
-PREFIX?=	${X11BASE}
 
 .if !defined(REFERENCE_PORT)
 
-PORTREVISION=	1
-
 LIB_DEPENDS+=	gnome-keyring.0:${PORTSDIR}/security/gnome-keyring \
 		startup-notification-1.0:${PORTSDIR}/x11/startup-notification
 RUN_DEPENDS=	${X11BASE}/share/icons/gnome/index.theme:${PORTSDIR}/misc/gnome-icon-theme
 
 USE_GETTEXT=	yes
-USE_XLIB=	yes
+USE_X_PREFIX=	yes
 USE_XPM=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack gnomehier libbonoboui ltverhack referencehack
diff --git a/x11-toolkits/libwnck-reference/Makefile b/x11-toolkits/libwnck-reference/Makefile
index 655901b3c8cf..e18d4e343996 100644
--- a/x11-toolkits/libwnck-reference/Makefile
+++ b/x11-toolkits/libwnck-reference/Makefile
@@ -1,4 +1,11 @@
+# New ports collection makefile for:	libwnck-reference
+# Date created:				09 May 2006
+# Whom:					Jean-Yves Lefort <jylefort@FreeBSD.org>
+#
 # $FreeBSD$
+#
+
+PORTREVISION=	1
 
 REFERENCE_SRC=	${WRKSRC}/doc
 
diff --git a/x11-toolkits/libwnck/Makefile b/x11-toolkits/libwnck/Makefile
index fda699fe9e42..48df977766ce 100644
--- a/x11-toolkits/libwnck/Makefile
+++ b/x11-toolkits/libwnck/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	libwnck
 PORTVERSION=	2.14.2
+PORTREVISION?=	1
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -17,19 +18,16 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Library used for writing pagers and taskslists
 
 USE_BZIP2=	yes
-PREFIX?=	${X11BASE}
 
 .if !defined(REFERENCE_PORT)
 
-PORTREVISION=	1
-
 LIB_DEPENDS=	startup-notification-1.0:${PORTSDIR}/x11/startup-notification
 
 USE_GETTEXT=	yes
-USE_XLIB=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack gtk20 ltverhack referencehack
 USE_BISON=	yes
+USE_X_PREFIX=	yes
 INSTALLS_SHLIB=	yes
 USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc
diff --git a/x11-toolkits/pango-reference/Makefile b/x11-toolkits/pango-reference/Makefile
index fe0035ece1de..1a859b288991 100644
--- a/x11-toolkits/pango-reference/Makefile
+++ b/x11-toolkits/pango-reference/Makefile
@@ -1,4 +1,11 @@
+# New ports collection makefile for:	pango-reference
+# Date created:				09 May 2006
+# Whom:					Jean-Yves Lefort <jylefort@FreeBSD.org>
+#
 # $FreeBSD$
+#
+
+PORTREVISION=	1
 
 REFERENCE_SRC=	${WRKSRC}/docs
 
diff --git a/x11-toolkits/pango/Makefile b/x11-toolkits/pango/Makefile
index b14684064a65..44da9d7cb16b 100644
--- a/x11-toolkits/pango/Makefile
+++ b/x11-toolkits/pango/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	pango
 PORTVERSION=	1.12.3
+PORTREVISION?=	0
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,sources/pango/1.12,} \
 		ftp://ftp.gtk.org/pub/gtk/v2.10/
@@ -17,7 +18,6 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	An open-source framework for the layout and rendering of i18n text
 
 USE_BZIP2=	yes
-PREFIX?=	${X11BASE}
 
 .if !defined(REFERENCE_PORT)
 
@@ -28,6 +28,7 @@ RUN_DEPENDS=	${FONTSCALE}:${X_FONTS_TTF_PORT} \
 
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
+USE_X_PREFIX=	yes
 INSTALLS_SHLIB=	yes
 USE_AUTOTOOLS=	libtool:15
 USE_GNOME=	gnomehack glib20 ltverhack referencehack
diff --git a/x11-toolkits/vte-reference/Makefile b/x11-toolkits/vte-reference/Makefile
index c1f89f7b59bd..0af18e7ced90 100644
--- a/x11-toolkits/vte-reference/Makefile
+++ b/x11-toolkits/vte-reference/Makefile
@@ -1,4 +1,11 @@
+# New ports collection makefile for:	vte-reference
+# Date created:				09 May 2006
+# Whom:					Jean-Yves Lefort <jylefort@FreeBSD.org>
+#
 # $FreeBSD$
+#
+
+PORTREVISION=	1
 
 REFERENCE_SRC=	${WRKSRC}/doc/reference
 
diff --git a/x11-toolkits/vte/Makefile b/x11-toolkits/vte/Makefile
index 41dc62fdfd44..664b8ae86d5c 100644
--- a/x11-toolkits/vte/Makefile
+++ b/x11-toolkits/vte/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	vte
 PORTVERSION=	0.12.2
+PORTREVISION?=	0
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -17,13 +18,12 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Terminal widget with improved accessibility and I18N support
 
 USE_BZIP2=	yes
-PREFIX?=	${X11BASE}
 
 .if !defined(REFERENCE_PORT)
 
-USE_XLIB=	yes
 USE_GMAKE=	yes
 USE_BISON=	yes
+USE_X_PREFIX=	yes
 INSTALLS_SHLIB=	yes
 USE_AUTOTOOLS=	libtool:15
 USE_GETTEXT=	yes
diff --git a/x11/gnome-desktop-reference/Makefile b/x11/gnome-desktop-reference/Makefile
index b3c18d5b7f53..a3064718dfb3 100644
--- a/x11/gnome-desktop-reference/Makefile
+++ b/x11/gnome-desktop-reference/Makefile
@@ -1,4 +1,11 @@
+# New ports collection makefile for:	gnome-desktop-reference
+# Date created:				09 May 2006
+# Whom:					Jean-Yves Lefort <jylefort@FreeBSD.org>
+#
 # $FreeBSD$
+#
+
+PORTREVISION=	1
 
 REFERENCE_SRC=	${WRKSRC}/docs/reference/gnome-desktop
 
diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile
index ef87c639a57e..79cf3206509c 100644
--- a/x11/gnome-desktop/Makefile
+++ b/x11/gnome-desktop/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	gnome-desktop
 PORTVERSION=	2.14.2
+PORTREVISION?=	1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -17,13 +18,9 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Additional UI API for GNOME 2
 
 USE_BZIP2=	yes
-PREFIX?=	${X11BASE}
 
 .if !defined(REFERENCE_PORT)
 
-PORTREVISION=	1
-
-USE_XLIB=	yes
 USE_XPM=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack libgnomeui gnomedocutils \
 		ltverhack referencehack
@@ -31,6 +28,7 @@ GNOME_DESKTOP_VERSION=2
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_BISON=	yes
+USE_X_PREFIX=	yes
 INSTALLS_OMF=	yes
 INSTALLS_SHLIB=	yes
 USE_AUTOTOOLS=	libtool:15
diff --git a/x11/gnome-panel-reference/Makefile b/x11/gnome-panel-reference/Makefile
index cca07fdf20c1..f4a45f279686 100644
--- a/x11/gnome-panel-reference/Makefile
+++ b/x11/gnome-panel-reference/Makefile
@@ -1,4 +1,11 @@
+# New ports collection makefile for:	gnome-panel-reference
+# Date created:				09 May 2006
+# Whom:					Jean-Yves Lefort <jylefort@FreeBSD.org>
+#
 # $FreeBSD$
+#
+
+PORTREVISION=	1
 
 REFERENCE_SRC=	${WRKSRC}/doc/reference/panel-applet
 
diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile
index 97fa7d4e8390..cc78630cf67e 100644
--- a/x11/gnome-panel/Makefile
+++ b/x11/gnome-panel/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	gnome-panel
 PORTVERSION=	2.14.2
+PORTREVISION?=	2
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-panel/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -17,19 +18,16 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Panel component for the GNOME 2 Desktop
 
 USE_BZIP2=	yes
-PREFIX?=	${X11BASE}
 
 .if !defined(REFERENCE_PORT)
 
-PORTREVISION=	2
-
 RUN_DEPENDS=	gnome-menu-editor:${PORTSDIR}/deskutils/gnome-menu-editor
 
 USE_GETTEXT=	yes
+USE_X_PREFIX=	yes
 INSTALLS_OMF=	yes
 INSTALLS_SHLIB=	yes
 INSTALLS_ICONS=	yes
-USE_XLIB=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack gnomedesktop \
 		libwnck gnomemenus gnomedocutils ltverhack referencehack
 WANT_GNOME=	yes
diff --git a/x11/libgnome-reference/Makefile b/x11/libgnome-reference/Makefile
index c1f89f7b59bd..c1bd8af9747a 100644
--- a/x11/libgnome-reference/Makefile
+++ b/x11/libgnome-reference/Makefile
@@ -1,4 +1,11 @@
+# New ports collection makefile for:	libgnome-reference
+# Date created:				09 May 2006
+# Whom:					Jean-Yves Lefort <jylefort@FreeBSD.org>
+#
 # $FreeBSD$
+#
+
+PORTREVISION=	1
 
 REFERENCE_SRC=	${WRKSRC}/doc/reference
 
diff --git a/x11/libgnome/Makefile b/x11/libgnome/Makefile
index ecc70c77de87..7f7d6cd64bae 100644
--- a/x11/libgnome/Makefile
+++ b/x11/libgnome/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	libgnome
 PORTVERSION=	2.14.1
+PORTREVISION?=	1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -17,22 +18,19 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Libraries for GNOME, a GNU desktop environment
 
 USE_BZIP2=	yes
-PREFIX?=	${X11BASE}
 
 .if !defined(REFERENCE_PORT)
 
-PORTREVISION=	1
-
 BUILD_DEPENDS=	scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper
 RUN_DEPENDS=	scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper
 
 USE_GETTEXT=	yes
-USE_XLIB=	yes
 USE_XPM=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack esound \
 		gnomevfs2 libxslt ltverhack referencehack
 USE_BISON=	yes
+USE_X_PREFIX=	yes
 INSTALLS_SHLIB=	yes
 USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \