1 files changed, 7 insertions, 20 deletions

diff --git a/www/linux-opera-devel/Makefile b/www/linux-opera-devel/Makefile
index 384f2e457ace..c4c983e9f4e3 100644
--- a/www/linux-opera-devel/Makefile
+++ b/www/linux-opera-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	opera
 PORTVERSION=	${OPERA_VER}.${OPERA_DATE}
+PORTREVISION=	1
 CATEGORIES=	www linux
 MASTER_SITES=	ftp://ftp.opera.com/pub/opera/linux/${OPERA_VER:S/.//}u1/final/en/i386/static/ \
 		ftp://ftp.sunet.se/pub/www/clients/Opera/linux/${OPERA_VER:S/.//}u1/final/en/i386/static/ \
@@ -24,12 +25,17 @@ DISTNAME=	${PORTNAME}-${OPERA_VER}-${OPERA_DATE}.1-static-qt.i386-en
 MAINTAINER=	mezz@FreeBSD.org
 COMMENT=	A blazingly fast, full-featured, standards-compliant browser
 
+RUN_DEPENDS=	${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs \
+		${LINUXBASE}/usr/lib/libaspell.so.15:${PORTSDIR}/textproc/linux-aspell \
+		${LINUXBASE}/usr/X11R6/lib/libXm.so.3.0.3:${PORTSDIR}/x11-toolkits/linux-openmotif
+
 RESTRICTED=	"not redistributable; commercial software"
 
 USE_BZIP2=	yes
 WANT_GNOME=	yes
-USE_X_PREFIX=	yes
+PREFIX?=	${X11BASE}
 USE_REINPLACE=	yes
+WITH_LINUX=	yes
 ONLY_FOR_ARCHS=	i386
 
 NO_BUILD=	yes
@@ -42,18 +48,6 @@ DOCSDIR=	${PREFIX}/share/doc/${UNIQUENAME}
 
 .include <bsd.port.pre.mk>
 
-.if exists(${LINUXBASE}/lib/libc-2.3.2.so) || defined(WITH_LINUX8)
-RUN_DEPENDS+=	${LINUXBASE}/usr/X11R6/lib/libXrandr.so.2:${PORTSDIR}/x11/linux-XFree86-libs \
-		${LINUXBASE}/usr/lib/libfontconfig.so.1:${PORTSDIR}/x11-fonts/linux-fontconfig \
-		${LINUXBASE}/usr/lib/libexpat.so.0:${PORTSDIR}/textproc/linux-expat \
-		${LINUXBASE}/usr/lib/libaspell.so.15:${PORTSDIR}/textproc/linux-aspell \
-		${LINUXBASE}/usr/X11R6/lib/libXm.so.3:${PORTSDIR}/x11-toolkits/linux-openmotif
-WITH_LINUX8=	yes
-.else
-RUN_DEPENDS+=	${LINUXBASE}/usr/X11R6/lib/libXm.so.3:${PORTSDIR}/x11-toolkits/linux-openmotif
-USE_LINUX=	yes
-.endif
-
 .if ${HAVE_GNOME:Mgnomehier}!=""
 PLIST_SUB+=	GNOME:=""
 .else
@@ -66,13 +60,6 @@ PLIST_SUB+=	KDE:=""
 PLIST_SUB+=	KDE:="@comment "
 .endif
 
-pre-everything::
-.if !defined(WITH_LINUX8)
-	@${ECHO_MSG} "You may specify the following on the command line:"
-	@${ECHO_MSG} " "
-	@${ECHO_MSG} "WITH_LINUX8=yes to use Xft2 and enable spell checker (requires linux_base-8)."
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g ; \
 		s|%%LOCALBASE%%|${LOCALBASE}|g ; s|%%X11BASE%%|${X11BASE}|g' \