Remove www/opera-devel now that it's the same as www/opera

PR:			99204
Submitted by:		maintainer

13 files changed, 1 insertions, 941 deletions

diff --git a/CVSROOT/modules b/CVSROOT/modules
index bada448826e6..9eadfdb1d649 100644
--- a/CVSROOT/modules
+++ b/CVSROOT/modules
@@ -7610,7 +7610,6 @@ openwebmail	ports/mail/openwebmail
 openxmldir	ports/www/openxmldir
 openzz		ports/devel/openzz
 opera		ports/www/opera
-opera-devel	ports/www/opera-devel
 ophoto		ports/graphics/ophoto
 opieprint	ports/security/opieprint
 opmixer		ports/audio/opmixer
diff --git a/MOVED b/MOVED
index 2c00ae69205f..bcdb708e0326 100644
--- a/MOVED
+++ b/MOVED
@@ -2382,3 +2382,4 @@ www/linux-flashplugin6||2006-06-14|Has expired: "This port has known security fl
 lang/glibstdc++28||2006-06-18|Has expired: Use any variant of lang/gcc that is less than six years old instead
 graphics/magickwand|graphics/php-magickwand|2006-06-18|Already in the tree with the name graphics/php-magickwand
 devel/p5-Filesys-Statvfs_Df|sysutils/p5-Filesys-Statvfs|2006-06-19|Vendor split port into 2 separate modules: sysutils/p5-Filesys-Statvfs and sysutils/p5-Filesys-Df
+www/opera-devel||2006-06-20|Has expired
diff --git a/www/Makefile b/www/Makefile
index 7233ef563721..ca45592c97f5 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -418,7 +418,6 @@
     SUBDIR += openvrml
     SUBDIR += openxmldir
     SUBDIR += opera
-    SUBDIR += opera-devel
     SUBDIR += osb-browser
     SUBDIR += osb-nrcit
     SUBDIR += osb-nrcore
diff --git a/www/opera-devel/Makefile b/www/opera-devel/Makefile
deleted file mode 100644
index 201484976a0d..000000000000
--- a/www/opera-devel/Makefile
+++ /dev/null
@@ -1,116 +0,0 @@
-# New ports collection makefile for:		opera
-# Date created:					November 5th 2000
-# Whom:						des
-#
-# $FreeBSD$
-#
-
-PORTNAME=	opera
-PORTVERSION=	${OPERA_VER}.${OPERA_DATE}
-CATEGORIES=	www ipv6
-MASTER_SITES=	ftp://opera.inode.at/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/${OPERA_LIB}/ \
-		http://gd.tuwien.ac.at/infosys/browsers/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/${OPERA_LIB}/ \
-		http://ftp.ucr.ac.cr/WWW/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/${OPERA_LIB}/ \
-		http://www.microrpm.ca/pub/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/${OPERA_LIB}/ \
-		http://www.opera.mirroarrr.de/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/${OPERA_LIB}/ \
-		http://opera.eurenet.net/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/${OPERA_LIB}/ \
-		ftp://opera.ftp.fu-berlin.de/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/${OPERA_LIB}/ \
-		http://ftp.ntua.gr/pub/www/Opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/${OPERA_LIB}/ \
-		ftp://ftp.wayne.edu/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/${OPERA_LIB}/ \
-		http://mirrors.dedipower.com/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/${OPERA_LIB}/ \
-		ftp://ftp.mirror.ac.uk/sites/ftp.opera.com/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/${OPERA_LIB}/ \
-		http://opera.nedmirror.nl/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/${OPERA_LIB}/ \
-		ftp://ftp.tiscali.nl/pub/mirrors/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/${OPERA_LIB}/ \
-		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/www/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/${OPERA_LIB}/&,} \
-		ftp://ftp.opera.com/pub/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/${OPERA_LIB}/
-PKGNAMESUFFIX=	-devel
-DISTNAME=	${PORTNAME}-${OPERA_VER}-${OPERA_DATE}.${OPERA_TYPE}-${OPERA_LIB}-qt.i386.freebsd-en-${OPERA_BUILD}
-
-MAINTAINER=	avleeuwen@piwebs.com
-COMMENT=	A blazingly fast, full-featured, standards-compliant browser
-
-OPERA_VER=	9.0
-OPERA_MINVER=	0
-OPERA_REL=	beta2
-OPERA_DATE=	20060518
-OPERA_BUILD=	284
-
-DATADIR=	${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX}
-DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}
-
-USE_BZIP2=	yes
-WANT_GNOME=	yes
-USE_X_PREFIX=	yes
-ONLY_FOR_ARCHS=	i386
-
-MAN1=		opera-devel.1
-
-NO_BUILD=	yes
-NO_FILTER_SHLIBS=yes
-
-OPTIONS=	ASPELL	"Use the aspell library for spell checking"	on \
-		SHARED	"Use a shared Qt library (instead of static)"	${QT_PRESENT}
-
-.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
-.elif ${OSVERSION} >= 500000
-OPERA_TYPE=	3
-.else
-OPERA_TYPE=	1
-.endif
-
-.if defined(WITH_ASPELL)
-LIB_DEPENDS+=	aspell.16:${PORTSDIR}/textproc/aspell
-.endif
-
-.if defined(WITH_SHARED) && ${OPERA_TYPE} > 1
-OPERA_LIB=	shared
-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}!=""
-PLIST_SUB+=	GNOME=""
-.else
-PLIST_SUB+=	GNOME="@comment "
-.endif
-
-.if exists(${LOCALBASE}/bin/kde-config)
-PLIST_SUB+=	KDE=""
-.else
-PLIST_SUB+=	KDE="@comment "
-.endif
-
-post-patch:
-	@${CP} ${WRKSRC}/search.ini ${WRKSRC}/locale/en
-	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g ; \
-		s|%%LOCALBASE%%|${LOCALBASE}|g ; s|%%X11BASE%%|${X11BASE}|g' \
-			${WRKSRC}/install.sh ${WRKSRC}/ini/pluginpath.ini \
-			${WRKSRC}/config/opera6rc
-	@${FIND} ${WRKSRC} -name '*.orig' -delete
-	@${FIND} ${WRKSRC} -name '*.bak' -delete
-
-do-install:
-	@(cd ${WRKSRC} && ./install.sh --prefix=${PREFIX})
-
-post-install:
-	@${CAT} ${PKGMESSAGE}
-
-.include <bsd.port.post.mk>
diff --git a/www/opera-devel/distinfo b/www/opera-devel/distinfo
deleted file mode 100644
index 95ca67c5de1b..000000000000
--- a/www/opera-devel/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 (opera-9.0-20060518.1-static-qt.i386.freebsd-en-284.tar.bz2) = 3538842170b05e1ccbb08896e8488fce
-SHA256 (opera-9.0-20060518.1-static-qt.i386.freebsd-en-284.tar.bz2) = dbcc0062cc5cc25d2d2e4f55da49e3abaaee602cb0b1d8276e20f4ed98ed76d3
-SIZE (opera-9.0-20060518.1-static-qt.i386.freebsd-en-284.tar.bz2) = 6367323
-MD5 (opera-9.0-20060518.3-shared-qt.i386.freebsd-en-284.tar.bz2) = 14170285c7f16bffa643abb86b07667b
-SHA256 (opera-9.0-20060518.3-shared-qt.i386.freebsd-en-284.tar.bz2) = 3715f412432a6a22075da9382e915e6d775c72638390b6359a34306589c97852
-SIZE (opera-9.0-20060518.3-shared-qt.i386.freebsd-en-284.tar.bz2) = 4969558
-MD5 (opera-9.0-20060518.4-shared-qt.i386.freebsd-en-284.tar.bz2) = 8f0c364f8c8f736e00e038bf25113b74
-SHA256 (opera-9.0-20060518.4-shared-qt.i386.freebsd-en-284.tar.bz2) = a454750e8db9d86eecc2af12b33eed30d5086fbaa06ae878213898210b7ccc9d
-SIZE (opera-9.0-20060518.4-shared-qt.i386.freebsd-en-284.tar.bz2) = 4970865
diff --git a/www/opera-devel/files/patch-config_opera6rc b/www/opera-devel/files/patch-config_opera6rc
deleted file mode 100644
index 420f1fa0bbfa..000000000000
--- a/www/opera-devel/files/patch-config_opera6rc
+++ /dev/null
@@ -1,9 +0,0 @@
---- config/opera6rc.orig	Mon Jul 19 23:00:06 2004
-+++ config/opera6rc	Mon Jul 19 23:00:16 2004
-@@ -1,5 +1,5 @@
- ; Put any default settings here that are overridable by users
- 
- [User Prefs]
--Language Files Directory=/usr/share/opera/locale/
-+Language Files Directory=%%PREFIX%%/share/opera/locale/
- 
diff --git a/www/opera-devel/files/patch-ini_pluginpath.ini b/www/opera-devel/files/patch-ini_pluginpath.ini
deleted file mode 100644
index a3fed160132d..000000000000
--- a/www/opera-devel/files/patch-ini_pluginpath.ini
+++ /dev/null
@@ -1,61 +0,0 @@
---- ini/pluginpath.ini.orig	Fri Sep 16 19:19:04 2005
-+++ ini/pluginpath.ini	Tue Sep 20 22:35:57 2005
-@@ -3,50 +3,16 @@
- ; This file is stored in UTF-8 encoding
- 
- [Paths]
--$PWD/plugins=1
- $HOME/.opera/plugins=1
--/usr/lib/opera/plugins=1
--/usr/lib/opera/plugins=1
--/usr/local/lib/opera/plugins=1
--/opt/lib/opera/plugins=1
-+%%PREFIX%%/share/opera/plugins=1
-+%%LOCALBASE%%/share/opera/plugins=1
- 
--; Adobe Acrobat
--/usr/local/Acrobat7.0/Browsers/intellinux=1
--/usr/local/Acrobat7/Browsers/intellinux=1
--/usr/local/Acrobat5/Browsers/intellinux=1
--/usr/local/Acrobat4/Browsers/intellinux=1
--/usr/lib/Acrobat7.0/Browsers/intellinux=1
--/usr/lib/Acrobat7/Browsers/intellinux=1
--/usr/lib/Acrobat5/Browsers/intellinux=1
--/usr/lib/Acrobat4/Browsers/intellinux=1
--/usr/X11R6/lib/Acrobat7.0/Browsers/intellinux=1
--/usr/X11R6/lib/Acrobat7/Browsers/intellinux=1
--/usr/X11R6/lib/Acrobat5/Browsers/intellinux=1
--/usr/X11R6/lib/Acrobat4/Browsers/intellinux=1
--/opt/Acrobat7.0/Browsers/intellinux=1
--/opt/Acrobat7/Browsers/intellinux=1
--/opt/Acrobat5/Browsers/intellinux=1
--/opt/Acrobat4/Browsers/intellinux=1
--/usr/Acrobat7.0/Browsers/intellinux=1
--/usr/Acrobat7/Browsers/intellinux=1
--/usr/Acrobat5/Browsers/intellinux=1
--/usr/Acrobat4/Browsers/intellinux=1
-+%%X11BASE%%/Acrobat7/Browser/intellinux=1
-+%%LOCALBASE%%/Acrobat5/Browsers/intellinux=1
-+%%LOCALBASE%%/Acrobat4/Browsers/intellinux=1
- 
--; Realplayer
--/usr/lib/RealPlayer8/Plugins=1
--/usr/lib/realplay/plugins=1
--/usr/lib/RealPlayer8=1
--/usr/lib/realplay=1
--
--; Netscape Plug-in Paths
--$HOME/.netscape6/plugins=1
-+%%LOCALBASE%%/lib/RealPlayer8/Plugins=1
-+%%X11BASE%%/lib/browser_plugins=1
- $HOME/.netscape/plugins=1
--/opt/netscape/plugins=1
--/usr/lib/netscape/plugins=1
--/usr/local/netscape/plugins=1
--/usr/local/lib/netscape/plugins=1
--$HOME/.kde/.konqueror/nsplugins=1
--
--[KDE]
--plugins=$HOME/.kde/share/config/kcmnspluginrc
-+%%LOCALBASE%%/lib/netscape-linux/plugins=1
- 
diff --git a/www/opera-devel/files/patch-install.sh b/www/opera-devel/files/patch-install.sh
deleted file mode 100644
index b887c358cf4d..000000000000
--- a/www/opera-devel/files/patch-install.sh
+++ /dev/null
@@ -1,483 +0,0 @@
---- install.sh.orig	Thu May 18 12:33:54 2006
-+++ install.sh	Tue May 23 11:21:36 2006
-@@ -111,7 +111,7 @@
- 
-     test "${prefix}" || prefix="${str_defaultprefix}"
- 
--    share_dir="${prefix}/share/opera"
-+    share_dir="${prefix}/share/opera-devel"
-     case "$os" in
- 	AnyBSD|OpenBSD)
- 	    exec_dir="${share_dir}/bin"
-@@ -124,7 +124,7 @@
- 	    man_dir="$prefix/share/man"
- 	    ;;
-     esac
--    doc_dir="${prefix}/share/doc/opera"
-+    doc_dir="${prefix}/share/doc/opera-devel"
-     wrapper_dir="${prefix}/bin"
- }
- 
-@@ -830,7 +830,7 @@
- 		error 'os'
- 	;;
-     esac
--    wrapper_file="${wrapper_dir}/opera"
-+    wrapper_file="${wrapper_dir}/opera-devel"
- 
-     wrapper_contain="#!/bin/sh
- 
-@@ -893,6 +893,9 @@
- OPERA_LD_PRELOAD=\"\${LD_PRELOAD}\"
- export OPERA_LD_PRELOAD
- 
-+OPERA_PERSONALDIR=\${HOME}/.opera-devel
-+export OPERA_PERSONALDIR
-+
- # Native Java enviroment
- if test -f \"\${OPERA_PERSONALDIR}/javapath.txt\"; then
-     INIJAVA=\`cat \${OPERA_PERSONALDIR}/javapath.txt\`
-@@ -916,69 +919,12 @@
- 
- if test ! \"\${OPERA_JAVA_DIR}\"; then
- 
--    PREFIXES=\"
--	/usr
--	/usr/java
--	/usr/lib
--	/usr/local
--	/opt\"
-+    PREFIXES=\"%%LOCALBASE%%\"
- 
-     for SUNJAVA in \\
--	java-1.5.0-sun-1.5.0.06 \\
--	java-1.5.0-sun-1.5.0.06/jre \\
--	java-1.5.0-sun-1.5.0.05 \\
--	java-1.5.0-sun-1.5.0.05/jre \\
--	java-1.5.0-sun-1.5.0.04 \\
--	java-1.5.0-sun-1.5.0.04/jre \\
--	jre1.5.0_06 \\
--	jdk1.5.0_06/jre \\
--	jre1.5.0_05 \\
--	jdk1.5.0_05/jre \\
--	jre1.5.0_04 \\
--	jdk1.5.0_04/jre \\
--	jre1.5.0_03 \\
--	jdk1.5.0_03/jre \\
--	jre1.5.0_02 \\
--	jdk1.5.0_02/jre \\
--	jre1.5.0_01 \\
--	jdk1.5.0_01/jre \\
--	j2re1.4.2_06 \\
--	j2sdk1.4.2_06/jre \\
--	j2re1.4.2_04 \\
--	j2sdk1.4.2_04/jre \\
--	j2re1.4.2_03 \\
--	j2sdk1.4.2_03/jre \\
--	j2re1.4.2_02 \\
--	j2sdk1.4.2_02/jre \\
--	j2re1.4.2_01 \\
--	j2sdk1.4.2_01/jre \\
--	j2re1.4.2 \\
--	j2sdk1.4.2/jre \\
--	j2re1.4.1_01 \\
--	j2re1.4.1 \\
--	SUNJava2-1.4.1 \\
--	BlackdownJava2-1.4.1/jre \\
--	j2re1.4.0_01 \\
--	j2sdk1.4.0_01/jre \\
--	j2re1.4.0 \\
--	jre1.4.0 \\
--	j2se/1.4/jre \\
--	j2se/1.3/jre \\
--	j2se/jre \\
--	jre1.3.1_15 \\
--	jre1.3.1_04 \\
--	jre1.3.1_02 \\
--	jre1.3.1_01 \\
--	j2re1.3.1 \\
--	jre1.3.1 \\
--	j2re1.3 \\
--	j2se/1.3/jre \\
--	SunJava2-1.3/jre \\
--	java2re \\
--	jdk1.2.2/jre \\
--	jdk1.2/jre \\
--	jre \\
--	java \\
-+	jdk1.3.1/jre \\
-+	jdk1.4.2/jre \\
-+	jdk1.5.0/jre \\
- 	; do
- 	for PREFIX in \${PREFIXES}; do
- 	    if test -f \"\${PREFIX}/\${SUNJAVA}/lib/${wrapper_sunjava_machine}/libjava.so\"; then OPERA_JAVA_DIR=\"\${PREFIX}/\${SUNJAVA}/lib/${wrapper_sunjava_machine}\" && break; fi
-@@ -1029,11 +975,8 @@
- 
- # Acrobat Reader
- for BINDIR in \\
--    /usr/local/Acrobat[45]/bin \\
--    /usr/lib/Acrobat[45]/bin \\
--    /usr/X11R6/lib/Acrobat[45]/bin \\
--    /opt/Acrobat[45]/bin \\
--    /usr/Acrobat[45]/bin \\
-+    %%LOCALBASE%%/Acrobat4/bin \\
-+    %%LOCALBASE%%/Acrobat5/bin \\
-     ; do
-     if test -d \${BINDIR} ; then PATH=\${PATH}:\${BINDIR}; fi
- done
-@@ -1044,12 +987,13 @@
- LD_LIBRARY_PATH=\"\${OPERA_BINARYDIR}\${LD_LIBRARY_PATH:+:}\${LD_LIBRARY_PATH}\"
- export LD_LIBRARY_PATH
- 
--# Spellchecker needs to find libaspell.so.15
-+# Spellchecker needs to find libaspell.so.16
- for LIBASPELL_DIR in \\
-+    %%LOCALBASE%%/lib \\
-     /usr/local/lib \\
-     /opkg/lib \\
- ; do
--    if test -f \"\${LIBASPELL_DIR}/libaspell.so.15\"; then
-+    if test -f \"\${LIBASPELL_DIR}/libaspell.so.16\"; then
-         LD_LIBRARY_PATH=\"\${LD_LIBRARY_PATH}:\${LIBASPELL_DIR}\"
-     fi
- done"
-@@ -1159,7 +1103,7 @@
-     chop "${OPERADESTDIR}" "str_localdirshare"
-     chop "${OPERADESTDIR}" "str_localdirplugin"
- 
--    backup ${wrapper_dir}/opera opera
-+    #backup ${wrapper_dir}/opera opera
- 
-     # Executable
-     debug_msg 1 "Executable"
-@@ -1197,7 +1141,7 @@
- 
-     #cp $cpv $cpf wrapper.sh $wrapper_dir/opera
-     generate_wrapper
--    chmod $chmodv 755 $wrapper_dir/opera
-+    chmod $chmodv 755 $wrapper_dir/opera-devel
- 
-     # Manual page
-     debug_msg 1 "Manual page"
-@@ -1206,7 +1150,7 @@
-     chmod $chmodv 755 ${man_dir}
-     mkdir $mkdirv $mkdirp ${man_dir}/man1
-     chmod $chmodv 755 ${man_dir}/man1
--    cp $cpv $cpf man/opera.1 ${man_dir}/man1
-+    cp $cpv $cpf man/opera.1 ${man_dir}/man1/opera-devel.1
- 
-     # Documentation
-     debug_msg 1 "Documentation"
-@@ -1383,41 +1327,9 @@
- 
-     if test -z "${OPERADESTDIR}"
-     then
--	# System wide configuration files
--	config_dir='/usr/local/etc'
--	if can_write_to "$config_dir"
--	then
--	    echo
--	    echo "System wide configuration files:"
--	    echo "  $config_dir/opera6rc"
--	    echo "  $config_dir/opera6rc.fixed"
--	    echo " would be ignored if installed with the prefix \"$prefix\"."
--	    if con_firm "Do you want to install them in $config_dir"
--	    then
--		backup $config_dir/opera6rc opera6rc config
--		backup $config_dir/opera6rc.fixed opera6rc.fixed config
--		cp $cpv $cpf config/opera6rc $config_dir
--		cp $cpv $cpf config/opera6rc.fixed $config_dir
--	    fi
--	else
--	    echo
--	    echo "User \"${USERNAME}\" does not have write access to $config_dir"
--	    echo " System wide configuration files:"
--	    echo "  $config_dir/opera6rc"
--	    echo "  $config_dir/opera6rc.fixed"
--	    echo " were not installed."
--	fi
--
- 	# Shorcuts and Icons
- 	bool_icons=1 # install icons by default
- 
--	if test "${flag_mode}" = "--force" -o "${flag_mode}" = "--prefix="
--	then
--	    echo
--	    echo "Shortcut icons will be ignored if installed with the prefix \"$prefix\"."
--	    con_firm "Do you want to (try to) install them in default locations" || bool_icons=0
--	fi
--
- 	if test "${bool_icons}" -ne 0
- 	then
- 	    xdg
-@@ -1454,13 +1366,13 @@
- {
-     # arg1 = location
- 
--    wmconfig_file="$1/opera"
-+    wmconfig_file="$1/opera-devel"
- 
--    wmconfig_contain='opera name "Opera"
-+    wmconfig_contain='opera name "Opera Beta"
- opera description "Opera Web Browser"
--opera icon "opera.xpm"
--opera mini-icon "opera.xpm"
--opera exec "opera &"
-+opera icon "opera-devel.xpm"
-+opera mini-icon "opera-devel.xpm"
-+opera exec "opera-devel &"
- opera group "Internet"'
- 
-     echo "${wmconfig_contain}" > ${wmconfig_file}
-@@ -1472,19 +1384,19 @@
-     # arg1 = location
-     # arg2 = type
- 
--    desktop_file="${1}/opera.desktop"
-+    desktop_file="${1}/opera-devel.desktop"
-     desktop_contain='[Desktop Entry]'
- 
-     if test ${2}; then
- 	if test "${2}" = "xdg"; then
- 	    desktop_contain="${desktop_contain}
- Version=1.0
--TryExec=opera"
-+TryExec=opera-devel"
- 	fi
- 
- 	desktop_contain="${desktop_contain}
- Encoding=UTF-8
--Name=Opera
-+Name=Opera Beta
- Name[af]=opera
- Name[eo]=Opero
- Name[zu]=I Opera
-@@ -1508,7 +1420,7 @@
- GenericName[ven]=Buronza ya Webu
- GenericName[xh]=Umkhangeli Zincwadi Zokubhaliweyo
- GenericName[zu]=Umkhangeli zincwadi we Web
--Exec=opera %u
-+Exec=opera-devel %u
- Terminal=false"
- 
- # Application is not a category, according to
-@@ -1523,19 +1435,19 @@
- 	if test "${2}" = "xdg"; then
- 	    desktop_contain="${desktop_contain}
- Categories=Application;Qt;Network;WebBrowser;X-Ximian-Main;X-Ximian-Toplevel
--Icon=opera.png"
-+Icon=opera-devel.png"
- 	else
- 	    desktop_contain="${desktop_contain}
--Icon=opera"
-+Icon=opera-devel"
- 	fi
- 
- 	desktop_contain="${desktop_contain}
- MimeType=text/html;text/xml;application/xhtml+xml"
-     else
- 	desktop_contain="${desktop_contain}
--Name=Opera
--Exec=opera
--Icon=opera.xpm
-+Name=Opera Beta
-+Exec=opera-devel
-+Icon=opera-devel.xpm
- Terminal=0"
-     fi
- 
-@@ -1629,48 +1541,43 @@
-     # This function searches for common gnome icon paths.
-     debug_msg 1 "in gnome()"
- 
--    if test -d /opt/gnome/
-+    if test -d %%X11BASE%%/share/gnome/;
-     then
--	# /opt/gnome share
--	if test -d /opt/gnome/share
--	then
--	    # /opt/gnome icon
--	    if test ! -d /opt/gnome/share/pixmaps/
-+	    # %%X11BASE%%/share/gnome icon
-+	    if test ! -d %%X11BASE%%/share/gnome/pixmaps/;
- 	    then
--		if test -w /opt/gnome/share
-+		if test -w %%X11BASE%%/share/gnome;
- 		then
--		    mkdir $mkdirv $mkdirp /opt/gnome/share/pixmaps/
--		    chmod $chmodv 755 /opt/gnome/share/pixmaps
--		    cp $cpv $share_dir/images/opera.xpm /opt/gnome/share/pixmaps/opera.xpm
-+		    mkdir $mkdirv $mkdirp %%X11BASE%%/share/gnome/pixmaps/
-+		    chmod $chmodv 755 %%X11BASE%%/share/gnome/pixmaps
-+		    cp $cpv $share_dir/images/opera.xpm %%X11BASE%%/share/gnome/pixmaps/opera-devel.xpm
- 		fi
--	    elif test -w /opt/gnome/share/pixmaps
--	    then cp $cpv $share_dir/images/opera.xpm /opt/gnome/share/pixmaps/opera.xpm
-+	    elif test -w %%X11BASE%%/share/gnome/pixmaps
-+	    then cp $cpv $share_dir/images/opera.xpm %%X11BASE%%/share/gnome/pixmaps/opera-devel.xpm
- 	    fi
--	    # end /opt/gnome icon
-+	    # end %%X11BASE%%/share/gnome icon
- 
--	    # /opt/gnome link
--	    if test -d /opt/gnome/share/gnome/apps/
-+	    # %%X11BASE%%/share/gnome link
-+	    if test -d %%X11BASE%%/share/gnome/apps/
- 	    then
--		if test -d /opt/gnome/share/gnome/apps/Internet/
-+		if test -d %%X11BASE%%/share/gnome/apps/Internet/
- 		then
--		    if test -w /opt/gnome/share/gnome/apps/Internet
--		    then generate_desktop /opt/gnome/share/gnome/apps/Internet
-+		    if test -w %%X11BASE%%/share/gnome/apps/Internet
-+		    then generate_desktop %%X11BASE%%/share/gnome/apps/Internet
- 		    fi
--		elif test -d /opt/gnome/share/gnome/apps/Networking/WWW/
-+		elif test -d %%X11BASE%%/share/gnome/apps/Networking/WWW/
- 		then
--		    if test -w /opt/gnome/share/gnome/apps/Networking/WWW
--		    then generate_desktop /opt/gnome/share/gnome/apps/Networking/WWW
-+		    if test -w %%X11BASE%%/share/gnome/apps/Networking/WWW
-+		    then generate_desktop %%X11BASE%%/share/gnome/apps/Networking/WWW
- 		    fi
--		elif test -w /opt/gnome/share/gnome/apps
-+		elif test -w %%X11BASE%%/share/gnome/apps
- 		then
--		    mkdir $mkdirv $mkdirp /opt/gnome/share/gnome/apps/Internet/
--		    chmod $chmodv 755 /opt/gnome/share/gnome/apps/Internet
--		    generate_desktop /opt/gnome/share/gnome/apps/Internet
-+		    mkdir $mkdirv $mkdirp %%X11BASE%%/share/gnome/apps/Internet/
-+		    chmod $chmodv 755 %%X11BASE%%/share/gnome/apps/Internet
-+		    generate_desktop %%X11BASE%%/share/gnome/apps/Internet
- 		fi
- 	    fi
--	    # end /opt/gnome link
--	fi
--	# end /opt/gnome share
-+	    # end %%X11BASE%%/share/gnome link
- 
-     elif test -d /usr/share/gnome/
-     then
-@@ -1681,10 +1588,10 @@
- 	    then
- 		mkdir $mkdirv $mkdirp /usr/share/gnome/pixmaps/
- 		chmod $chmodv 755 /usr/share/gnome/pixmaps
--		cp $cpv $share_dir/images/opera.xpm /usr/share/gnome/pixmaps/opera.xpm
-+		cp $cpv $share_dir/images/opera.xpm /usr/share/gnome/pixmaps/opera-devel.xpm
- 	    fi
- 	elif test -w /usr/share/gnome/pixmaps
--	then cp $cpv $share_dir/images/opera.xpm /usr/share/gnome/pixmaps/opera.xpm
-+	then cp $cpv $share_dir/images/opera.xpm /usr/share/gnome/pixmaps/opera-devel.xpm
- 	fi
- 	# end /usr/share/gnome icon
- 
-@@ -1718,45 +1625,45 @@
-     # This function searches for common kde2 and kde 3 icon paths.
-     debug_msg 1 "in kde()"
- 
--    if test -d /opt/kde$1/share
-+    if test -d %%LOCALBASE%%/share;
-     then
--	DIR_HI=/opt/kde$1/share/icons/hicolor
-+	DIR_HI=%%LOCALBASE%%/share/icons/hicolor
- 	if test -d "$DIR_HI" -a -w "$DIR_HI"
- 	then
- 	    if test -d "$DIR_HI"/48x48/apps -a -w "$DIR_HI"/48x48/apps
--	    then cp $cpv $share_dir/images/opera_48x48.png $DIR_HI/48x48/apps/opera.png
-+	    then cp $cpv $share_dir/images/opera_48x48.png $DIR_HI/48x48/apps/opera-devel.png
- 	    fi
- 	    if test -d "$DIR_HI"/32x32/apps -a -w "$DIR_HI"/32x32/apps
--	    then cp $cpv $share_dir/images/opera_32x32.png $DIR_HI/32x32/apps/opera.png
-+	    then cp $cpv $share_dir/images/opera_32x32.png $DIR_HI/32x32/apps/opera-devel.png
- 	    fi
- 	    if test -d "$DIR_HI"/22x22/apps -a -w "$DIR_HI"/22x22/apps
--	    then cp $cpv $share_dir/images/opera_22x22.png $DIR_HI/22x22/apps/opera.png
-+	    then cp $cpv $share_dir/images/opera_22x22.png $DIR_HI/22x22/apps/opera-devel.png
- 	    fi
- 	fi
- 
--	DIR_LO=/opt/kde$1/share/icons/locolor
-+	DIR_LO=%%LOCALBASE%%/share/icons/locolor
- 	if test -d $DIR_LO -a -w $DIR_LO
- 	then
- 	    if test -d $DIR_LO/32x32/apps -a -w $DIR_LO/32x32/apps
--	    then cp $cpv $share_dir/images/opera_32x32.png $DIR_LO/32x32/apps/opera.png
-+	    then cp $cpv $share_dir/images/opera_32x32.png $DIR_LO/32x32/apps/opera-devel.png
- 	    fi
- 	    if test -d $DIR_LO/22x22/apps -a -w $DIR_LO/22x22/apps
--	    then cp $cpv $share_dir/images/opera_22x22.png $DIR_LO/22x22/apps/opera.png
-+	    then cp $cpv $share_dir/images/opera_22x22.png $DIR_LO/22x22/apps/opera-devel.png
- 	    fi
- 	    if test -d $DIR_LO/16x16/apps -a -w $DIR_LO/16x16/apps
--	    then cp $cpv $share_dir/images/opera_16x16.png $DIR_LO/16x16/apps/opera.png
-+	    then cp $cpv $share_dir/images/opera_16x16.png $DIR_LO/16x16/apps/opera-devel.png
- 	    fi
- 	fi
- 
--	if test -d /opt/kde$1/share/applnk/
-+	if test -d %%LOCALBASE%%/share/applnk/
- 	then
--	    if test ! -d /opt/kde$1/share/applnk/Internet/ -a -w /opt/kde$1/share/applnk
-+	    if test ! -d %%LOCALBASE%%/share/applnk/Internet/ -a -w %%LOCALBASE%%/share/applnk
- 	    then
--		mkdir $mkdirv $mkdirp /opt/kde$1/share/applnk/Internet/
--		chmod $chmodv 755 /opt/kde$1/share/applnk/Internet
-+		mkdir $mkdirv $mkdirp %%LOCALBASE%%/share/applnk/Internet/
-+		chmod $chmodv 755 %%LOCALBASE%%/share/applnk/Internet
- 	    fi
--	    if test -w /opt/kde$1/share/applnk/Internet
--	    then generate_desktop /opt/kde$1/share/applnk/Internet $1
-+	    if test -w %%LOCALBASE%%/share/applnk/Internet
-+	    then generate_desktop %%LOCALBASE%%/share/applnk/Internet $1
- 	    fi
- 	fi
-     fi
-@@ -1840,45 +1747,9 @@
- }
- 
- xdg()
--{   # http://standards.freedesktop.org
--    UDD=''
--    for BIN_DIR in `pathdirs`; do
--	test -x ${BIN_DIR}/update-desktop-database || continue
--	UDD=${BIN_DIR}/update-desktop-database; break
--    done
--    
--    # http://standards.freedesktop.org/icon-theme-spec/icon-theme-spec-latest.html
--    if test "$UDD"; then
--	for ICON_DIR in `echo ${XDG_DATA_DIRS}:/usr/local/share:/usr/share|tr : '\012'|sed -e '/^$/d;s:$:/icons/hicolor:'` /usr/share/pixmaps/hicolor; do
--	    test -d ${ICON_DIR} && break
--	done
--
--	if   test ! -d ${ICON_DIR}; then echo "Could not find icon installation directory, icons not installed." >&2
--	elif test ! -w ${ICON_DIR}; then echo "Directory \"${ICON_DIR}\" not writable by user \"${USER}\", icons not installed." >&2
--	else
--	    for RESOLUTION in 48x48 32x32 22x22; do
--		TO_DIR=${ICON_DIR}/${RESOLUTION}/apps
--		test -d ${TO_DIR} && test -w ${TO_DIR} && cp $cpv $share_dir/images/opera_${RESOLUTION}.png ${TO_DIR}/opera.png
--	    done
--	fi
--	
--	for SHORTCUT_DIR in ${XDG_DATA_HOME}/applications /usr/local/share/applications /usr/share/applications; do
--	    test -d ${SHORTCUT_DIR} && break;
--	done
--	
--	if   test ! -d ${SHORTCUT_DIR}; then echo "Could not find shortcut installation directory, desktop entry not installed." >&2; return
--	elif test ! -w ${SHORTCUT_DIR}; then echo "Directory \"${SHORTCUT_DIR}\" not writable by user \"${USER}\", desktop entry not installed." >&2; return
--	fi
--	generate_desktop ${SHORTCUT_DIR} xdg
--	${UDD}
--    else
--	icons
--	gnome
--	kde 3
--	kde 2
--	kde1
--	mandrake
--    fi
-+{   
-+    gnome
-+    kde 3
- }
- 
- # These are the only variables the needs to be changed
diff --git a/www/opera-devel/files/patch-opera6.adr b/www/opera-devel/files/patch-opera6.adr
deleted file mode 100644
index ad68b0baceca..000000000000
--- a/www/opera-devel/files/patch-opera6.adr
+++ /dev/null
@@ -1,74 +0,0 @@
---- opera6.adr.orig	Thu May 18 12:33:54 2006
-+++ opera6.adr	Tue May 23 11:26:33 2006
-@@ -25,14 +25,14 @@
- 	URL=http://my.opera.com/
- 	ICONFILE=my.opera.com.ico
- 	ON PERSONALBAR=YES
--	PERSONALBAR_POS=1
-+	PERSONALBAR_POS=2
- 
- #URL
- 	ID=16
- 	NAME=Opera Web Mail
- 	URL=http://www.operamail.com/
- 	ON PERSONALBAR=YES
--	PERSONALBAR_POS=2
-+	PERSONALBAR_POS=3
- 
- #URL
- 	ID=17
-@@ -41,23 +41,51 @@
- 
- -
- 
-+#FOLDER
-+	ID=18
-+	NAME=BSD
-+	ON PERSONALBAR=YES
-+	PERSONALBAR_POS=1
-+
-+#URL
-+	ID=19
-+	NAME=The FreeBSD Project
-+	URL=http://www.freebsd.org/
-+
-+#URL
-+	ID=20
-+	NAME=BSD News
-+	URL=http://bsdnews.com/
-+
- #URL
- 	ID=21
-+	NAME=Daemon News
-+	URL=http://www.daemonnews.org/
-+
-+#URL
-+	ID=22
-+	NAME=BSDForums.org
-+	URL=http://bsdforums.org/
-+
-+-
-+
-+#URL
-+	ID=23
- 	NAME=Download.com
- 	URL=http://www.download.com/
- 
- #URL
--	ID=22
-+	ID=24
- 	NAME=Amazon.com
- 	URL=http://www.amazon.com/exec/obidos/redirect-home/opera-20
- 
- #URL
--	ID=23
-+	ID=25
- 	NAME=PriceRunner
- 	URL=http://www.pricerunner.com/ref-site=opera
- 
- #URL
--	ID=24
-+	ID=26
- 	NAME=eBay
- 	URL=http://www.ebay.com/
- 
diff --git a/www/opera-devel/files/patch-search.ini b/www/opera-devel/files/patch-search.ini
deleted file mode 100644
index 722cfc877c79..000000000000
--- a/www/opera-devel/files/patch-search.ini
+++ /dev/null
@@ -1,66 +0,0 @@
---- search.ini.orig	Tue Apr 11 12:23:52 2006
-+++ search.ini	Thu Apr 20 11:51:10 2006
-@@ -55,7 +55,7 @@
- Search Type=40
- Verbtext=0
- Nameid=69678
--Position=3
-+Position=4
- 
- [Search Engine 5]
- Name=
-@@ -68,7 +68,7 @@
- Search Type=41
- Verbtext=0
- Nameid=17174
--Position=4
-+Position=5
- 
- [Search Engine 6]
- Name=
-@@ -445,4 +445,44 @@
- Search Type=119
- Verbtext=0
- Position=-1
--Nameid=291960
-+Nameid=0
-+
-+[Search Engine 35]
-+Name=FreshP&orts
-+URL=http://www.freshports.org/search.php?query=%s
-+Query=
-+Key=x
-+Is post=0
-+Has endseparator=0
-+Encoding=utf-8
-+Search Type=0
-+Verbtext=17063
-+Position=-1
-+Nameid=0
-+
-+[Search Engine 36]
-+Name=Google &BSD
-+URL=http://www.google.com/bsd?q=%s&sourceid=opera&num=%i&ie=utf-8&oe=utf-8
-+Query=
-+Key=x
-+Is post=0
-+Has endseparator=0
-+Encoding=utf-8
-+Search Type=0
-+Verbtext=17063
-+Position=-1
-+Nameid=0
-+
-+[Search Engine 37]
-+Name=FreeBSD &PRs
-+URL=http://www.freebsd.org/cgi/query-pr.cgi?pr=%s
-+Query=
-+Key=x
-+Is post=0
-+Has endseparator=0
-+Encoding=utf-8
-+Search Type=0
-+Verbtext=17063
-+Position=-1
-+Nameid=0
-+
diff --git a/www/opera-devel/pkg-descr b/www/opera-devel/pkg-descr
deleted file mode 100644
index b33bdf73eac4..000000000000
--- a/www/opera-devel/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-The most full-featured Internet power tool on the market, Opera includes
-pop-up blocking, tabbed browsing, integrated searches, and advanced functions
-like Opera's groundbreaking E-mail program, RSS Newsfeeds and IRC chat. And
-because we know that our users have different needs, you can customize 
-the look and content of your Opera browser with a few clicks of the mouse.
-
-WWW: http://www.opera.com/
diff --git a/www/opera-devel/pkg-message b/www/opera-devel/pkg-message
deleted file mode 100644
index c433433e7bba..000000000000
--- a/www/opera-devel/pkg-message
+++ /dev/null
@@ -1,8 +0,0 @@
-***
-This port will use the ~/.opera-devel directory to save its personal settings.
-
-***      THIS IS A BETA VERSION OF OPERA. PLEASE REPORT BUGS TO:       ***
-***                                                                    ***
-***                       http://bugs.opera.com/                       ***
-***             or http://my.opera.com/community/forums/               ***
-***
diff --git a/www/opera-devel/pkg-plist b/www/opera-devel/pkg-plist
deleted file mode 100644
index 89b810bfd83f..000000000000
--- a/www/opera-devel/pkg-plist
+++ /dev/null
@@ -1,106 +0,0 @@
-@comment $FreeBSD$
-bin/opera-devel
-%%DOCSDIR%%/LICENSE
-%%DATADIR%%/bin/missingsyms.so
-%%DATADIR%%/bin/opera
-%%DATADIR%%/bin/spellcheck.so
-%%DATADIR%%/bin/works
-%%DATADIR%%/chartables.bin
-%%DATADIR%%/config/opera6rc
-%%DATADIR%%/config/opera6rc.fixed
-%%DATADIR%%/html40_entities.dtd
-%%DATADIR%%/images/opera.xpm
-%%DATADIR%%/images/opera_16x16.png
-%%DATADIR%%/images/opera_22x22.png
-%%DATADIR%%/images/opera_32x32.png
-%%DATADIR%%/images/opera_48x48.png
-%%DATADIR%%/ini/dialog.ini
-%%DATADIR%%/ini/fastforward.ini
-%%DATADIR%%/ini/filehandler.ini
-%%DATADIR%%/ini/pluginpath.ini
-%%DATADIR%%/ini/standard_keyboard.ini
-%%DATADIR%%/ini/standard_menu.ini
-%%DATADIR%%/ini/standard_mouse.ini
-%%DATADIR%%/ini/standard_toolbar.ini
-%%DATADIR%%/ini/unix_keyboard.ini
-%%DATADIR%%/ini/xmlentities.ini
-%%DATADIR%%/java/opera.jar
-%%DATADIR%%/java/opera.policy
-%%DATADIR%%/lngcode.txt
-%%DATADIR%%/locale/en/default.adr
-%%DATADIR%%/locale/en/lngcode.txt
-%%DATADIR%%/locale/en/license.txt
-%%DATADIR%%/locale/en/search.ini
-%%DATADIR%%/locale/english.lng
-%%DATADIR%%/opera6.adr
-%%DATADIR%%/plugins/libnpp.so
-%%DATADIR%%/plugins/operapluginwrapper
-%%DATADIR%%/plugins/operaplugincleaner
-%%DATADIR%%/search.ini
-%%DATADIR%%/skin/standard_skin.zip
-%%DATADIR%%/skin/windows_skin.zip
-%%DATADIR%%/styles/OPF.css
-%%DATADIR%%/styles/about.css
-%%DATADIR%%/styles/cache.css
-%%DATADIR%%/styles/certinfo.css
-%%DATADIR%%/styles/config.css
-%%DATADIR%%/styles/contentblock.css
-%%DATADIR%%/styles/dir.css
-%%DATADIR%%/styles/drives.css
-%%DATADIR%%/styles/error.css
-%%DATADIR%%/styles/history.css
-%%DATADIR%%/styles/im.css
-%%DATADIR%%/styles/image.css
-%%DATADIR%%/styles/images/bar.png
-%%DATADIR%%/styles/images/center.png
-%%DATADIR%%/styles/images/opera.png
-%%DATADIR%%/styles/images/root.png
-%%DATADIR%%/styles/images/top.png
-%%DATADIR%%/styles/info.css
-%%DATADIR%%/styles/mime.css
-%%DATADIR%%/styles/plugins.css
-%%DATADIR%%/styles/user/accessibility.css
-%%DATADIR%%/styles/user/contrastbw.css
-%%DATADIR%%/styles/user/contrastwb.css
-%%DATADIR%%/styles/user/debugwithoutline.css
-%%DATADIR%%/styles/user/disabletables.css
-%%DATADIR%%/styles/user/hidecertainsizes.css
-%%DATADIR%%/styles/user/hidenonlinkimages.css
-%%DATADIR%%/styles/user/imageandlinkonly.css
-%%DATADIR%%/styles/user/nostalgia.css
-%%DATADIR%%/styles/user/showstructure.css
-%%DATADIR%%/styles/user/textonly.css
-%%DATADIR%%/styles/user/userstyle.ini
-%%DATADIR%%/styles/wml.css
-%%DATADIR%%/svg-sebd.dat
-%%DATADIR%%/svg-se.dat
-%%DATADIR%%/svg-sabd.dat
-%%DATADIR%%/svg-sa.dat
-%%DATADIR%%/svg-mobd.dat
-%%DATADIR%%/svg-mo.dat
-
-%%GNOME%%share/gnome/apps/Internet/opera-devel.desktop
-%%GNOME%%share/gnome/pixmaps/opera-devel.xpm
-@dirrm %%DATADIR%%/styles/user
-@dirrm %%DATADIR%%/styles/images
-@dirrm %%DATADIR%%/styles
-@dirrm %%DATADIR%%/skin
-@dirrm %%DATADIR%%/plugins
-@dirrm %%DATADIR%%/locale/en
-@dirrm %%DATADIR%%/locale
-@dirrm %%DATADIR%%/java
-@dirrm %%DATADIR%%/ini
-@dirrm %%DATADIR%%/images
-@dirrm %%DATADIR%%/config
-@dirrm %%DATADIR%%/bin
-@dirrm %%DATADIR%%
-@dirrm %%DOCSDIR%%
-
-%%KDE%%@cwd %%LOCALBASE%%
-%%KDE%%share/applnk/Internet/opera-devel.desktop
-%%KDE%%share/icons/hicolor/22x22/apps/opera-devel.png
-%%KDE%%share/icons/hicolor/32x32/apps/opera-devel.png
-%%KDE%%share/icons/hicolor/48x48/apps/opera-devel.png
-%%KDE%%share/icons/locolor/16x16/apps/opera-devel.png
-%%KDE%%share/icons/locolor/22x22/apps/opera-devel.png
-%%KDE%%share/icons/locolor/32x32/apps/opera-devel.png