6 files changed, 27 insertions, 12 deletions

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" \