3 files changed, 7 insertions, 43 deletions

diff --git a/x11/gnome2-lite/Makefile b/x11/gnome2-lite/Makefile
index 924d5e1957b7..dab054657c59 100644
--- a/x11/gnome2-lite/Makefile
+++ b/x11/gnome2-lite/Makefile
@@ -3,17 +3,13 @@
 # Whom:			Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
+#   $MCom: ports/x11/gnome2-lite/Makefile,v 1.43 2005/09/25 23:58:48 marcus Exp $
 #
 
-PORTNAME=	gnome2
-PORTVERSION=	2.10.2
+PORTREVISION=	0
 CATEGORIES=	x11 gnome
-MASTER_SITES=	# empty
 PKGNAMESUFFIX=	-lite
-DISTFILES=	# empty
-EXTRACT_ONLY=	# empty
 
-MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	The "meta-port" of the GNOME desktop slimmed down for FreeBSD releases
 
 RUN_DEPENDS=	${X11BASE}/libexec/gweather-applet-2:${PORTSDIR}/x11/gnomeapplets2 \
@@ -26,12 +22,11 @@ RUN_DEPENDS=	${X11BASE}/libexec/gweather-applet-2:${PORTSDIR}/x11/gnomeapplets2
 		gnome-system-monitor:${PORTSDIR}/sysutils/gnomesystemmonitor \
 		nautilus:${PORTSDIR}/x11-fm/nautilus2 \
 		yelp:${PORTSDIR}/x11/yelp \
-		${X11BASE}/share/gnome/applications/gnome-screensaver-properties.desktop:${PORTSDIR}/x11/xscreensaver-gnome \
 		${X11BASE}/share/gnome/help/user-guide/C/user-guide.xml:${PORTSDIR}/misc/gnomeuserdocs2 \
 		${X11BASE}/share/gnome/sounds/question.wav:${PORTSDIR}/audio/gnomeaudio2 \
 		file-roller:${PORTSDIR}/archivers/fileroller \
 		${X11BASE}/share/themes/HighContrast/gtk-2.0/gtkrc:${PORTSDIR}/x11-themes/gnome-themes \
-		ggv:${PORTSDIR}/print/ggv \
+		evince:${PORTSDIR}/graphics/evince \
 		gcalctool:${PORTSDIR}/math/gcalctool \
 		gucharmap:${PORTSDIR}/deskutils/gucharmap \
 		${X11BASE}/lib/X11/fonts/bitstream-vera/Vera.ttf:${PORTSDIR}/x11-fonts/bitstream-vera \
@@ -39,23 +34,10 @@ RUN_DEPENDS=	${X11BASE}/libexec/gweather-applet-2:${PORTSDIR}/x11/gnomeapplets2
 		gnome-control-center:${PORTSDIR}/sysutils/gnomecontrolcenter2 \
 		totem:${PORTSDIR}/multimedia/totem-gstreamer
 
-NO_BUILD=	yes
-
-USE_PYTHON=	yes
-
+MASTERDIR=	${.CURDIR}/../gnome2
 CONFLICTS=	gnome2-[0-9]*
 
-.if !defined(BATCH) && !defined(PACKAGE_BUILDING)
-pre-configure:
-	@${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
-.endif
-
-do-install:	# empty
-
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "i386" || ${OSVERSION} > 500035
-RUN_DEPENDS+=	epiphany:${PORTSDIR}/www/epiphany
-.endif
+DESCR=		${.CURDIR}/pkg-descr
+PKGMESSAGE=	${.CURDIR}/pkg-message
 
-.include <bsd.port.post.mk>
+.include "${MASTERDIR}/Makefile"
diff --git a/x11/gnome2-lite/pkg-install b/x11/gnome2-lite/pkg-install
deleted file mode 100644
index 3040e98bde7b..000000000000
--- a/x11/gnome2-lite/pkg-install
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-
-PATH=/bin:/usr/bin:/sbin:/usr/sbin:${PATH}
-export PATH
-
-if [ "$2" = "PRE-INSTALL" ]; then
-     GNOME_ONE_DESKTOP="gnomecore gnomeapplets gnomemedia gnomeutils gtop libgtop sawfish nautilus xalf gnomegames gnomeaudio"
-     for package in ${GNOME_ONE_DESKTOP}; do
-	 if pkg_info | grep "^${package}-[0-9]" >/dev/null 2>&1; then
-	     echo "${package} was detected on the system.  This package is part of the GNOME 1.x"
-	     echo "desktop, and cannot coexist with the GNOME 2 desktop."
-	     echo ""
-	     echo "Please deinstall the GNOME 1.x desktop before installing this package."
-	     false
-	 fi
-    done
-fi
diff --git a/x11/gnome2-lite/pkg-plist b/x11/gnome2-lite/pkg-plist
deleted file mode 100644
index 549a621fec0c..000000000000
--- a/x11/gnome2-lite/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-@comment this plist intentionally left empty