diff -urN /usr/ports/www/opera-devel/Makefile opera-devel/Makefile
--- /usr/ports/www/opera-devel/Makefile	Sat Feb 11 07:22:48 2006
+++ opera-devel/Makefile	Mon Feb 13 22:45:27 2006
@@ -31,22 +31,27 @@
 NO_BUILD=	yes
 NO_FILTER_SHLIBS=yes
 
-.ifndef(WITHOUT_ASPELL)
+OPTIONS=	SHARED	"Use a shared Qt library (instead of static)"	${QT_PRESENT} \
+		ASPELL	"Use the aspell library for spell checking"	on
+
+.ifdef(WITH_ASPELL)
 LIB_DEPENDS+=	aspell.16:${PORTSDIR}/textproc/aspell
 .endif
 
+.if exists(${X11BASE}/lib/libqt-mt.prl)
+QT_PRESENT=     on
+.else
+QT_PRESENT=     off
+.endif
+
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} >= 600000
 OPERA_TYPE=	4
-WITH_SHARED=	yes
 .elif ${OSVERSION} >= 500000
 OPERA_TYPE=	3
-WITH_SHARED=	yes
-.elifdef WITH_SHARED
-OPERA_TYPE=	2
 .else
-OPERA_TYPE=	1
+OPERA_TYPE=	2
 .endif
 
 .if defined(WITH_SHARED)
@@ -54,6 +59,14 @@
 LIB_DEPENDS+=	qt-mt:${PORTSDIR}/x11-toolkits/qt33
 .else
 OPERA_LIB=	static
+OPERA_TYPE=	1
+.endif
+
+.if ${OPERA_TYPE} == 1 && ${OSVERSION} >= 500000
+LIB_DEPENDS+=	c_r.4:${PORTSDIR}/misc/compat4x
+.if ${OSVERSION} >= 600000
+LIB_DEPENDS+=	z.2:${PORTSDIR}/misc/compat5x
+.endif
 .endif
 
 .if ${HAVE_GNOME:Mgnomehier}!=""
@@ -66,18 +79,6 @@
 PLIST_SUB+=	KDE=""
 .else
 PLIST_SUB+=	KDE="@comment "
-.endif
-
-pre-everything::
-.if !defined(WITHOUT_ASPELL) || !defined(WITH_SHARED)
-	@${ECHO_CMD} '===> The following options are available for this port:'
-	@${ECHO_CMD} '===>'
-.if !defined(WITHOUT_ASPELL)
-	@${ECHO_CMD} '===> Define WITHOUT_ASPELL to not install aspell.'
-.endif
-.if !defined(WITH_SHARED)
-	@${ECHO_CMD} '===> Define WITH_SHARED to use a shared Qt library.'
-.endif
 .endif
 
 post-patch: