Attachment #59428 for bug #89435

View | Details | Raw Unified | Return to bug 89435
Collapse All | Expand All




PORTNAME=	opera
PORTVERSION=	${OPERA_VER}.${OPERA_DATE}
CATEGORIES=	www ipv6
MASTER_SITES=	http://ftp.scarlet.be/pub/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/ \
		ftp://ftp.planetmirror.com/pub/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/ \
		http://www.mehok.uni-miskolc.hu/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/ \
		ftp://ftp.heanet.ie/pub/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/ \
		http://opera.nsc.no/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/ \
		http://ftp.task.gda.pl/pub/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/ \
		ftp://ftp.idilis.ro/mirrors/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/ \
		http://www.fastmirrors.org/pub/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/ \
		http://ftp.sunet.se/pub/www/clients/Opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/ \
		ftp://mirror.switch.ch/mirror/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/ \
		ftp://ftp.tiscali.nl/pub/mirrors/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/ \
		http://ftp.ankara.edu.tr/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/ \
		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/www/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/&,} \
		ftp://ftp.opera.com/pub/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/
DISTNAME=	${PORTNAME}-${OPERA_VER}-${OPERA_DATE}.1-static-qt.i386.freebsd-en

MAINTAINER=	avleeuwen@piwebs.com
COMMENT=	A blazingly fast, full-featured, standards-compliant browser

OPERA_VER=	8.51
OPERA_MINVER=	
OPERA_REL=	final
OPERA_DATE=	20051114

DATADIR=	${PREFIX}/share/${PORTNAME}
DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}

Lines 1-2 Link Here

(-)opera/distinfo (-2 / +3 lines)
1	MD5 (opera-8.50-20050916.1-static-qt.i386.freebsd-en.tar.bz2) = bdc19e7748345180b8dd42638e743ef3	1	MD5 (opera-8.51-20051114.1-static-qt.i386.freebsd-en.tar.bz2) = 28fb74b43b24f0a29b3e4a9ddb79d9b6
2	SIZE (opera-8.50-20050916.1-static-qt.i386.freebsd-en.tar.bz2) = 5567344	2	SHA256 (opera-8.51-20051114.1-static-qt.i386.freebsd-en.tar.bz2) = 0631248764d5bb039bc9d1b6d098adb6f6ad1e991ac7a82863201f755145ff30
		3	SIZE (opera-8.51-20051114.1-static-qt.i386.freebsd-en.tar.bz2) = 5572512




--- install.sh.orig	Mon Nov 14 14:51:18 2005
+++ install.sh	Tue Nov 22 21:53:58 2005
@@ -381,7 +381,7 @@
 	    mvv=''    # SunOS mv (no -v verbose option)
 	;;
 
-	i[3456]86:FreeBSD|i[3456]86:NetBSD)
+	i[3456]86:FreeBSD|amd64:FreeBSD|i[3456]86:NetBSD)
 		cpf='-f'
 		if test "$verbose" -gt '1'
 		then
@@ -757,7 +757,7 @@
     debug_msg 0 "in generate_wrapper()"
 
     case "${machine}:${os}" in

 	    wrapper_ibmjava="
 	    IBMJava2-142/jre \\
 	    IBMJava2-141/jre \\
@@ -796,6 +796,12 @@
 
     wrapper_contain="#!/bin/sh
 
+# Location of locale data

 # Location of the Opera binaries
 OPERA_BINARYDIR=${str_localdirexec}
 export OPERA_BINARYDIR
@@ -844,6 +850,9 @@
 OPERA_LD_PRELOAD=\"\${LD_PRELOAD}\"
 export OPERA_LD_PRELOAD
 

 # Native Java enviroment
 if test -f \"\${OPERA_PERSONALDIR}/javapath.txt\"; then
     INIJAVA=\`cat \${OPERA_PERSONALDIR}/javapath.txt\`
@@ -867,65 +876,12 @@
 
 if test ! \"\${OPERA_JAVA_DIR}\"; then
 

+    PREFIXES=\"%%LOCALBASE%%\"
 
     for SUNJAVA in \\
-	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_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 \\

 	; 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
@@ -976,11 +932,8 @@
 
 # Acrobat Reader
 for BINDIR in \\

     ; do
     if test -d \${BINDIR} ; then PATH=\${PATH}:\${BINDIR}; fi
 done
@@ -991,12 +944,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 \\

         LD_LIBRARY_PATH=\"\${LD_LIBRARY_PATH}:\${LIBASPELL_DIR}\"
     fi
 done
@@ -1086,7 +1040,7 @@
     chop "${OPERADESTDIR}" "str_localdirshare"
     chop "${OPERADESTDIR}" "str_localdirplugin"
 

+    #backup ${wrapper_dir}/opera opera
 
     # Executable
     debug_msg 1 "Executable"
@@ -1300,49 +1254,13 @@
 
 	#cp $cpv $cpf wrapper.sh $wrapper_dir/opera
 	generate_wrapper
-        chmod $chmodv 755 $wrapper_dir/opera
+        chmod $chmodv 755 $wrapper_file
 
     # Documentation
 	debug_msg 1 "Documentation"
@@ -1293,47 +1259,16 @@
 
 	if test -z "${OPERADESTDIR}"; then
 
     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

-	    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
-		bool_icons=0
-	    fi
-	fi
-
 	if test "${bool_icons}" -ne 0
 	then
-	    icons
+	    #icons
 	    gnome
 	    kde 3
-	    kde 2
-	    kde1
-	    mandrake
+	    #kde 2
+	    #kde1
+	    #mandrake
 	fi
 
     fi # OPERADESTDIR
@@ -1487,48 +1405,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.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.xpm
-	# /opt/gnome link
-	if test -d /opt/gnome/share/gnome/apps/; then
-          if test -d /opt/gnome/share/gnome/apps/Internet/; then
-            if test -w /opt/gnome/share/gnome/apps/Internet; then
-              generate_desktop /opt/gnome/share/gnome/apps/Internet
+	# %%X11BASE%%/share/gnome link
+	if test -d %%X11BASE%%/share/gnome/apps/; then
+          if test -d %%X11BASE%%/share/gnome/apps/Internet/; then
+            if test -w %%X11BASE%%/share/gnome/apps/Internet; then
+              generate_desktop %%X11BASE%%/share/gnome/apps/Internet
 	    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
-	    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
+	  elif test -w %%X11BASE%%/share/gnome/apps; then
+	    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
-
-    elif test -d /usr/share/gnome/; then
-
-        # /usr/share/gnome icon
-        if test ! -d /usr/share/gnome/pixmaps/; then
-	  if test -w /usr/share/gnome; 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
-	  fi
-	elif test -w /usr/share/gnome/pixmaps; then cp $cpv $share_dir/images/opera.xpm /usr/share/gnome/pixmaps/opera.xpm
-	fi
-	# end /opt/gnome share
+	    # end %%X11BASE%%/share/gnome link
-	# /usr/share/gnome link
-	if test -d /usr/share/gnome/apps/; then
-          if test -d /usr/share/gnome/apps/Internet/; then
-            if test -w /usr/share/gnome/apps/Internet; then
-              generate_desktop /usr/share/gnome/apps/Internet
-	    fi
-          elif test -d /usr/share/gnome/apps/Networking/WWW/; then
-            if test -w /usr/share/gnome/apps/Networking/WWW; then
-	     generate_desktop /usr/share/gnome/apps/Networking/WWW
-	    fi
-	  elif test -w /usr/share/gnome/apps; then
-	    mkdir $mkdirv $mkdirp /usr/share/gnome/apps/Internet/
-	    chmod $chmodv 755 /usr/share/gnome/apps/Internet
-            generate_desktop /usr/share/gnome/apps/Internet
-          fi
-	fi
-	# end /usr/share/gnome link
+	# end %%X11BASE%%/share/gnome link
    fi
    # Add ximian here
 }
@@ -1539,39 +1438,31 @@
 
     elif test -d /usr/share/gnome/
     then
@@ -1576,9 +1489,9 @@
     # 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
@@ -1592,7 +1505,7 @@
 	    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
@@ -1606,15 +1519,15 @@
 	    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; 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; 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; fi
       fi
 
-      if test -d /opt/kde${1}/share/applnk/; then
-        if test ! -d /opt/kde${1}/share/applnk/Internet/ -a -w /opt/kde${1}/share/applnk; then
-	    mkdir $mkdirv $mkdirp /opt/kde${1}/share/applnk/Internet/
-	    chmod $chmodv 755 /opt/kde${1}/share/applnk/Internet
+      if test -d %%LOCALBASE%%/share/applnk/; then
+        if test ! -d %%LOCALBASE%%/share/applnk/Internet/ -a -w %%LOCALBASE%%/share/applnk; then
+	    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}; fi
+	if test -w %%LOCALBASE%%/share/applnk/Internet; then generate_desktop %%LOCALBASE%%/share/applnk/Internet ${1}; fi
       fi
 
     fi  
-    
-    if test -d /usr/share/applnk/Networking; then
-      if test ! -d /usr/share/applnk/Networking/WWW/ -a -w /usr/share/applnk/Networking; then
-	    mkdir $mkdirv $mkdirp /usr/share/applnk/Networking/WWW/
-	    chmod $chmodv 755 /usr/share/applnk/Networking/WWW
-      fi
-      if test -w /usr/share/applnk/Networking/WWW; then generate_desktop /usr/share/applnk/Networking/WWW ${1}; 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




--- search.ini.orig	Mon Nov 14 14:51:18 2005
+++ search.ini	Tue Nov 22 21:50:07 2005
@@ -435,8 +435,8 @@
 Nameid=0
 
 [Search Engine 34]
-Name=Google Linu&x
-URL=http://www.google.com/linux?q=%s&sourceid=opera&num=%i&ie=utf-8&oe=utf-8
+Name=FreeBSD &PRs
+URL=http://www.freebsd.org/cgi/query-pr.cgi?pr=%s
 Query=
 Key=x
 Is post=0
@@ -445,4 +445,30 @@
 Search Type=0
 Verbtext=17063
 Position=-1
-Nameid=0
\ No newline at end of file
+Nameid=0
+
+[Search Engine 35]
+Name=FreshP&orts
+URL=http://www.freshports.org/search.php?query=%s
+Query=
+Key=x
+Is post=0

+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

+Verbtext=17063
+Position=-1
+Nameid=0
+

Return to bug 89435

Lines 8-36 Link Here

(-)opera/Makefile (-16 / +16 lines)
8	PORTNAME= opera	8	PORTNAME= opera
9	PORTVERSION= ${OPERA_VER}.${OPERA_DATE}	9	PORTVERSION= ${OPERA_VER}.${OPERA_DATE}
10	CATEGORIES= www ipv6	10	CATEGORIES= www ipv6
11	MASTER_SITES= http://ftp.scarlet.be/pub/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/static/ \	11	MASTER_SITES= http://ftp.scarlet.be/pub/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/ \
12	ftp://ftp.planetmirror.com/pub/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/static/ \	12	ftp://ftp.planetmirror.com/pub/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/ \
13	http://www.mehok.uni-miskolc.hu/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/static/ \	13	http://www.mehok.uni-miskolc.hu/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/ \
14	ftp://ftp.heanet.ie/pub/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/static/ \	14	ftp://ftp.heanet.ie/pub/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/ \
15	http://opera.nsc.no/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/static/ \	15	http://opera.nsc.no/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/ \
16	http://ftp.task.gda.pl/pub/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/static/ \	16	http://ftp.task.gda.pl/pub/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/ \
17	ftp://ftp.idilis.ro/mirrors/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/static/ \	17	ftp://ftp.idilis.ro/mirrors/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/ \
18	http://www.fastmirrors.org/pub/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/static/ \	18	http://www.fastmirrors.org/pub/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/ \
19	http://ftp.sunet.se/pub/www/clients/Opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/static/ \	19	http://ftp.sunet.se/pub/www/clients/Opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/ \
20	ftp://mirror.switch.ch/mirror/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/static/ \	20	ftp://mirror.switch.ch/mirror/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/ \
21	ftp://ftp.tiscali.nl/pub/mirrors/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/static/ \	21	ftp://ftp.tiscali.nl/pub/mirrors/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/ \
22	http://ftp.ankara.edu.tr/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/static/ \	22	http://ftp.ankara.edu.tr/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/ \
23	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/www/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/static/&,} \	23	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/www/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/&,} \
24	ftp://ftp.opera.com/pub/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/static/	24	ftp://ftp.opera.com/pub/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/
25	DISTNAME= ${PORTNAME}-${OPERA_VER}-${OPERA_DATE}.1-static-qt.i386.freebsd-en	25	DISTNAME= ${PORTNAME}-${OPERA_VER}-${OPERA_DATE}.1-static-qt.i386.freebsd-en
26		26
27	MAINTAINER= avleeuwen@piwebs.com	27	MAINTAINER= avleeuwen@piwebs.com
28	COMMENT= A blazingly fast, full-featured, standards-compliant browser	28	COMMENT= A blazingly fast, full-featured, standards-compliant browser
29		29
30	OPERA_VER= 8.50	30	OPERA_VER= 8.51
31	OPERA_MINVER=	31	OPERA_MINVER=
32	OPERA_REL= final	32	OPERA_REL= final
33	OPERA_DATE= 20050916	33	OPERA_DATE= 20051114
34		34
35	DATADIR= ${PREFIX}/share/${PORTNAME}	35	DATADIR= ${PREFIX}/share/${PORTNAME}
36	DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}	36	DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}

Lines 1-15 Link Here

(-)opera/files/patch-install.sh (-176 / +149 lines)
1	--- install.sh.orig Fri Sep 16 19:19:04 2005	1	--- install.sh.orig Mon Nov 14 14:51:18 2005
2	+++ install.sh Tue Sep 20 22:49:54 2005	2	+++ install.sh Tue Nov 22 21:53:58 2005
3	@@ -373,7 +373,7 @@	3	@@ -381,7 +381,7 @@
4	mvv='' # SunOS mv (no -v verbose option)	4	mvv='' # SunOS mv (no -v verbose option)
5	;;	5	;;
6		6
7	- i[3456]86:FreeBSD\|i[3456]86:NetBSD)	7	- i[3456]86:FreeBSD\|i[3456]86:NetBSD)
8	+ i[3456]86:FreeBSD\|amd64:FreeBSD\|i[3456]86:NetBSD)	8	+ i[3456]86:FreeBSD\|amd64:FreeBSD\|i[3456]86:NetBSD)
9	cpf='-f'	9	cpf='-f'
10	if test "$verbose" -gt '1'; then	10	if test "$verbose" -gt '1'
11	chmodv='-v'	11	then
12	@@ -759,7 +759,7 @@	12	@@ -757,7 +757,7 @@
13	debug_msg 0 "in generate_wrapper()"	13	debug_msg 0 "in generate_wrapper()"
14		14
15	case "${machine}:${os}" in	15	case "${machine}:${os}" in
Lines 18-25 Link Here
18	wrapper_ibmjava="	18	wrapper_ibmjava="
19	IBMJava2-142/jre \\	19	IBMJava2-142/jre \\
20	IBMJava2-141/jre \\	20	IBMJava2-141/jre \\
21	@@ -798,6 +798,12 @@	21	@@ -796,6 +796,12 @@
22		22
23	wrapper_contain="#!/bin/sh	23	wrapper_contain="#!/bin/sh
24		24
25	+# Location of locale data	25	+# Location of locale data
Lines 31-37 Link Here
31	# Location of the Opera binaries	31	# Location of the Opera binaries
32	OPERA_BINARYDIR=${str_localdirexec}	32	OPERA_BINARYDIR=${str_localdirexec}
33	export OPERA_BINARYDIR	33	export OPERA_BINARYDIR
34	@@ -850,6 +856,9 @@	34	@@ -844,6 +850,9 @@
35	OPERA_LD_PRELOAD=\"\${LD_PRELOAD}\"	35	OPERA_LD_PRELOAD=\"\${LD_PRELOAD}\"
36	export OPERA_LD_PRELOAD	36	export OPERA_LD_PRELOAD
37		37
Lines 41-47 Link Here
41	# Native Java enviroment	41	# Native Java enviroment
42	if test -f \"\${OPERA_PERSONALDIR}/javapath.txt\"; then	42	if test -f \"\${OPERA_PERSONALDIR}/javapath.txt\"; then
43	INIJAVA=\`cat \${OPERA_PERSONALDIR}/javapath.txt\`	43	INIJAVA=\`cat \${OPERA_PERSONALDIR}/javapath.txt\`
44	@@ -873,53 +882,12 @@	44	@@ -867,65 +876,12 @@
45		45
46	if test ! \"\${OPERA_JAVA_DIR}\"; then	46	if test ! \"\${OPERA_JAVA_DIR}\"; then
47		47
Lines 54-59 Link Here
54	+ PREFIXES=\"%%LOCALBASE%%\"	54	+ PREFIXES=\"%%LOCALBASE%%\"
55		55
56	for SUNJAVA in \\	56	for SUNJAVA in \\
		57	- java-1.5.0-sun-1.5.0.05 \\
		58	- java-1.5.0-sun-1.5.0.05/jre \\
		59	- java-1.5.0-sun-1.5.0.04 \\
		60	- java-1.5.0-sun-1.5.0.04/jre \\
		61	- jre1.5.0_05 \\
		62	- jdk1.5.0_05/jre \\
		63	- jre1.5.0_04 \\
		64	- jdk1.5.0_04/jre \\
		65	- jre1.5.0_03 \\
		66	- jdk1.5.0_03/jre \\
		67	- jre1.5.0_02 \\
		68	- jdk1.5.0_02/jre \\
57	- jre1.5.0_01 \\	69	- jre1.5.0_01 \\
58	- jdk1.5.0_01/jre \\	70	- jdk1.5.0_01/jre \\
59	- j2re1.4.2_06 \\	71	- j2re1.4.2_06 \\
Lines 98-104 Link Here
98	; do	110	; do
99	for PREFIX in \${PREFIXES}; do	111	for PREFIX in \${PREFIXES}; do
100	if test -f \"\${PREFIX}/\${SUNJAVA}/lib/${wrapper_sunjava_machine}/libjava.so\"; then OPERA_JAVA_DIR=\"\${PREFIX}/\${SUNJAVA}/lib/${wrapper_sunjava_machine}\" && break; fi	112	if test -f \"\${PREFIX}/\${SUNJAVA}/lib/${wrapper_sunjava_machine}/libjava.so\"; then OPERA_JAVA_DIR=\"\${PREFIX}/\${SUNJAVA}/lib/${wrapper_sunjava_machine}\" && break; fi
101	@@ -970,11 +938,8 @@	113	@@ -976,11 +932,8 @@
102		114
103	# Acrobat Reader	115	# Acrobat Reader
104	for BINDIR in \\	116	for BINDIR in \\
Lines 112-123 Link Here
112	; do	124	; do
113	if test -d \${BINDIR} ; then PATH=\${PATH}:\${BINDIR}; fi	125	if test -d \${BINDIR} ; then PATH=\${PATH}:\${BINDIR}; fi
114	done	126	done
115	@@ -985,12 +950,13 @@	127	@@ -991,12 +944,13 @@
116	LD_LIBRARY_PATH=\"\${OPERA_BINARYDIR}:\${LD_LIBRARY_PATH}\"	128	LD_LIBRARY_PATH=\"\${OPERA_BINARYDIR}\${LD_LIBRARY_PATH:+:}\${LD_LIBRARY_PATH}\"
117	export LD_LIBRARY_PATH	129	export LD_LIBRARY_PATH
118		130
119	-# Spellchecker needs to find libaspell.so.15	131	-# Spellchecker needs to find libaspell.so.15
120	+# Spellchecker needs to find libaspell.so.16	132	+# Spellchecker needs to find libaspell.so.16
121	for LIBASPELL_DIR in \\	133	for LIBASPELL_DIR in \\
122	+ %%LOCALBASE%%/lib \\	134	+ %%LOCALBASE%%/lib \\
123	/usr/local/lib \\	135	/usr/local/lib \\
Lines 128-134 Link Here
128	LD_LIBRARY_PATH=\"\${LD_LIBRARY_PATH}:\${LIBASPELL_DIR}\"	140	LD_LIBRARY_PATH=\"\${LD_LIBRARY_PATH}:\${LIBASPELL_DIR}\"
129	fi	141	fi
130	done	142	done
131	@@ -1080,7 +1046,7 @@	143	@@ -1086,7 +1040,7 @@
132	chop "${OPERADESTDIR}" "str_localdirshare"	144	chop "${OPERADESTDIR}" "str_localdirshare"
133	chop "${OPERADESTDIR}" "str_localdirplugin"	145	chop "${OPERADESTDIR}" "str_localdirplugin"
134		146
Lines 136-164 Link Here
136	+ #backup ${wrapper_dir}/opera opera	148	+ #backup ${wrapper_dir}/opera opera
137		149
138	# Executable	150	# Executable
139	debug_msg 1 "Executable"	151	debug_msg 1 "Executable"
140	@@ -1115,7 +1081,7 @@	152	@@ -1300,49 +1254,13 @@
141
142	#cp $cpv $cpf wrapper.sh $wrapper_dir/opera
143	generate_wrapper
144	- chmod $chmodv 755 $wrapper_dir/opera
145	+ chmod $chmodv 755 $wrapper_file
146
147	# Documentation
148	debug_msg 1 "Documentation"
149	@@ -1293,47 +1259,16 @@
150
151	if test -z "${OPERADESTDIR}"; then
152		153
		154	if test -z "${OPERADESTDIR}"
		155	then
153	- # System wide configuration files	156	- # System wide configuration files
154	- config_dir='/usr/local/etc'	157	- config_dir='/usr/local/etc'
155	- if can_write_to "$config_dir"; then	158	- if can_write_to "$config_dir"
		159	- then
156	- echo	160	- echo
157	- echo "System wide configuration files:"	161	- echo "System wide configuration files:"
158	- echo " $config_dir/opera6rc"	162	- echo " $config_dir/opera6rc"
159	- echo " $config_dir/opera6rc.fixed"	163	- echo " $config_dir/opera6rc.fixed"
160	- echo " cannot be installed with the prefix \"$prefix\"."	164	- echo " would be ignored if installed with the prefix \"$prefix\"."
161	- if con_firm "Do you want to install them"; then	165	- if con_firm "Do you want to install them in $config_dir"
		166	- then
162	- backup $config_dir/opera6rc opera6rc config	167	- backup $config_dir/opera6rc opera6rc config
163	- backup $config_dir/opera6rc.fixed opera6rc.fixed config	168	- backup $config_dir/opera6rc.fixed opera6rc.fixed config
164	- cp $cpv $cpf config/opera6rc $config_dir	169	- cp $cpv $cpf config/opera6rc $config_dir
Lines 173-343 Link Here
173	- echo " were not installed."	178	- echo " were not installed."
174	- fi	179	- fi
175	-	180	-
176	# Shorcuts and Icons	181	# Shorcuts and Icons
177	bool_icons=1 # install icons by default	182	bool_icons=1 # install icons by default
178		183
179	- if test "$flag_mode" = "--force" -o "$flag_mode" = "--prefix="; then	184	- if test "${flag_mode}" = "--force" -o "${flag_mode}" = "--prefix="
		185	- then
180	- echo	186	- echo
181	- echo "Shortcut icons cannot be installed with the prefix \"$prefix\"."	187	- echo "Shortcut icons will be ignored if installed with the prefix \"$prefix\"."
182	- if not con_firm "Do you still want to install them"; then	188	- con_firm "Do you want to (try to) install them in default locations" \|\| bool_icons=0
183	- bool_icons=0
184	- fi
185	- fi	189	- fi
186	-	190	-
187	if test "${bool_icons}" -ne 0; then	191	if test "${bool_icons}" -ne 0
		192	then
188	- icons	193	- icons
189	+ #icons
190	gnome	194	gnome
191	kde 3	195	kde 3
192	- kde 2	196	- kde 2
193	- kde1	197	- kde1
194	- mandrake	198	- mandrake
195	+ #kde 2
196	+ #kde1
197	+ #mandrake
198	fi	199	fi
199		200
200	fi # OPERADESTDIR	201	fi # OPERADESTDIR
201	@@ -1463,72 +1398,36 @@	202	@@ -1487,48 +1405,43 @@
202		203	# This function searches for common gnome icon paths.
203	debug_msg 1 "in gnome()"	204	debug_msg 1 "in gnome()"
204		205
205	- if test -d /opt/gnome/; then	206	- if test -d /opt/gnome/
206	-	207	+ if test -d %%X11BASE%%/share/gnome/;
207	- # /opt/gnome share	208	then
208	- if test -d /opt/gnome/share; then	209	- # /opt/gnome share
209	+ if test -d %%X11BASE%%/share/gnome/; then	210	- if test -d /opt/gnome/share
210		211	- then
211	- # /opt/gnome icon	212	- # /opt/gnome icon
212	- if test ! -d /opt/gnome/share/pixmaps/; then	213	- if test ! -d /opt/gnome/share/pixmaps/
213	- if test -w /opt/gnome/share; then	214	+ # %%X11BASE%%/share/gnome icon
214	- mkdir $mkdirv $mkdirp /opt/gnome/share/pixmaps/	215	+ if test ! -d %%X11BASE%%/share/gnome/pixmaps/;
215	- chmod $chmodv 755 /opt/gnome/share/pixmaps	216	then
216	- cp $cpv $share_dir/images/opera.xpm /opt/gnome/share/pixmaps/opera.xpm	217	- if test -w /opt/gnome/share
217	+ # %%X11BASE%%/share/gnome icon	218	+ if test -w %%X11BASE%%/share/gnome;
218	+ if test ! -d %%X11BASE%%/share/gnome/pixmaps/; then	219	then
219	+ if test -w %%X11BASE%%/share/gnome; then	220	- mkdir $mkdirv $mkdirp /opt/gnome/share/pixmaps/
220	+ mkdir $mkdirv $mkdirp %%X11BASE%%/share/gnome/pixmaps/	221	- chmod $chmodv 755 /opt/gnome/share/pixmaps
221	+ chmod $chmodv 755 %%X11BASE%%/share/gnome/pixmaps	222	- cp $cpv $share_dir/images/opera.xpm /opt/gnome/share/pixmaps/opera.xpm
222	+ cp $cpv $share_dir/images/opera.xpm %%X11BASE%%/share/gnome/pixmaps/opera.xpm	223	+ mkdir $mkdirv $mkdirp %%X11BASE%%/share/gnome/pixmaps/
223	fi	224	+ chmod $chmodv 755 %%X11BASE%%/share/gnome/pixmaps
224	- elif test -w /opt/gnome/share/pixmaps; then cp $cpv $share_dir/images/opera.xpm /opt/gnome/share/pixmaps/opera.xpm	225	+ cp $cpv $share_dir/images/opera.xpm %%X11BASE%%/share/gnome/pixmaps/opera.xpm
225	+ elif test -w %%X11BASE%%/share/gnome/pixmaps; then cp $cpv $share_dir/images/opera.xpm %%X11BASE%%/share/gnome/pixmaps/opera.xpm	226	fi
226	fi	227	- elif test -w /opt/gnome/share/pixmaps
227	- # end /opt/gnome icon	228	- then cp $cpv $share_dir/images/opera.xpm /opt/gnome/share/pixmaps/opera.xpm
228	+ # end %%X11BASE%%/share/gnome icon	229	+ elif test -w %%X11BASE%%/share/gnome/pixmaps
229		230	+ then cp $cpv $share_dir/images/opera.xpm %%X11BASE%%/share/gnome/pixmaps/opera.xpm
230	- # /opt/gnome link
231	- if test -d /opt/gnome/share/gnome/apps/; then
232	- if test -d /opt/gnome/share/gnome/apps/Internet/; then
233	- if test -w /opt/gnome/share/gnome/apps/Internet; then
234	- generate_desktop /opt/gnome/share/gnome/apps/Internet
235	+ # %%X11BASE%%/share/gnome link
236	+ if test -d %%X11BASE%%/share/gnome/apps/; then
237	+ if test -d %%X11BASE%%/share/gnome/apps/Internet/; then
238	+ if test -w %%X11BASE%%/share/gnome/apps/Internet; then
239	+ generate_desktop %%X11BASE%%/share/gnome/apps/Internet
240	fi	231	fi
241	- elif test -d /opt/gnome/share/gnome/apps/Networking/WWW/; then	232	- # end /opt/gnome icon
242	- if test -w /opt/gnome/share/gnome/apps/Networking/WWW; then	233	+ # end %%X11BASE%%/share/gnome icon
243	- generate_desktop /opt/gnome/share/gnome/apps/Networking/WWW	234
244	+ elif test -d %%X11BASE%%/share/gnome/apps/Networking/WWW/; then	235	- # /opt/gnome link
245	+ if test -w %%X11BASE%%/share/gnome/apps/Networking/WWW; then	236	- if test -d /opt/gnome/share/gnome/apps/
246	+ generate_desktop %%X11BASE%%/share/gnome/apps/Networking/WWW	237	+ # %%X11BASE%%/share/gnome link
		238	+ if test -d %%X11BASE%%/share/gnome/apps/
		239	then
		240	- if test -d /opt/gnome/share/gnome/apps/Internet/
		241	+ if test -d %%X11BASE%%/share/gnome/apps/Internet/
		242	then
		243	- if test -w /opt/gnome/share/gnome/apps/Internet
		244	- then generate_desktop /opt/gnome/share/gnome/apps/Internet
		245	+ if test -w %%X11BASE%%/share/gnome/apps/Internet
		246	+ then generate_desktop %%X11BASE%%/share/gnome/apps/Internet
		247	fi
		248	- elif test -d /opt/gnome/share/gnome/apps/Networking/WWW/
		249	+ elif test -d %%X11BASE%%/share/gnome/apps/Networking/WWW/
		250	then
		251	- if test -w /opt/gnome/share/gnome/apps/Networking/WWW
		252	- then generate_desktop /opt/gnome/share/gnome/apps/Networking/WWW
		253	+ if test -w %%X11BASE%%/share/gnome/apps/Networking/WWW
		254	+ then generate_desktop %%X11BASE%%/share/gnome/apps/Networking/WWW
		255	fi
		256	- elif test -w /opt/gnome/share/gnome/apps
		257	+ elif test -w %%X11BASE%%/share/gnome/apps
		258	then
		259	- mkdir $mkdirv $mkdirp /opt/gnome/share/gnome/apps/Internet/
		260	- chmod $chmodv 755 /opt/gnome/share/gnome/apps/Internet
		261	- generate_desktop /opt/gnome/share/gnome/apps/Internet
		262	+ mkdir $mkdirv $mkdirp %%X11BASE%%/share/gnome/apps/Internet/
		263	+ chmod $chmodv 755 %%X11BASE%%/share/gnome/apps/Internet
		264	+ generate_desktop %%X11BASE%%/share/gnome/apps/Internet
		265	fi
247	fi	266	fi
248	- elif test -w /opt/gnome/share/gnome/apps; then	267	- # end /opt/gnome link
249	- mkdir $mkdirv $mkdirp /opt/gnome/share/gnome/apps/Internet/
250	- chmod $chmodv 755 /opt/gnome/share/gnome/apps/Internet
251	- generate_desktop /opt/gnome/share/gnome/apps/Internet
252	+ elif test -w %%X11BASE%%/share/gnome/apps; then
253	+ mkdir $mkdirv $mkdirp %%X11BASE%%/share/gnome/apps/Internet/
254	+ chmod $chmodv 755 %%X11BASE%%/share/gnome/apps/Internet
255	+ generate_desktop %%X11BASE%%/share/gnome/apps/Internet
256	fi
257	fi
258	- # end /opt/gnome link
259	- fi
260	- # end /opt/gnome share
261	-
262	- elif test -d /usr/share/gnome/; then
263	-
264	- # /usr/share/gnome icon
265	- if test ! -d /usr/share/gnome/pixmaps/; then
266	- if test -w /usr/share/gnome; then
267	- mkdir $mkdirv $mkdirp /usr/share/gnome/pixmaps/
268	- chmod $chmodv 755 /usr/share/gnome/pixmaps
269	- cp $cpv $share_dir/images/opera.xpm /usr/share/gnome/pixmaps/opera.xpm
270	- fi
271	- elif test -w /usr/share/gnome/pixmaps; then cp $cpv $share_dir/images/opera.xpm /usr/share/gnome/pixmaps/opera.xpm
272	- fi	268	- fi
273	- # end /usr/share/gnome icon	269	- # end /opt/gnome share
274	-	270	+ # end %%X11BASE%%/share/gnome link
275	- # /usr/share/gnome link
276	- if test -d /usr/share/gnome/apps/; then
277	- if test -d /usr/share/gnome/apps/Internet/; then
278	- if test -w /usr/share/gnome/apps/Internet; then
279	- generate_desktop /usr/share/gnome/apps/Internet
280	- fi
281	- elif test -d /usr/share/gnome/apps/Networking/WWW/; then
282	- if test -w /usr/share/gnome/apps/Networking/WWW; then
283	- generate_desktop /usr/share/gnome/apps/Networking/WWW
284	- fi
285	- elif test -w /usr/share/gnome/apps; then
286	- mkdir $mkdirv $mkdirp /usr/share/gnome/apps/Internet/
287	- chmod $chmodv 755 /usr/share/gnome/apps/Internet
288	- generate_desktop /usr/share/gnome/apps/Internet
289	- fi
290	- fi
291	- # end /usr/share/gnome link
292	+ # end %%X11BASE%%/share/gnome link
293	fi
294	# Add ximian here
295	}
296	@@ -1539,39 +1438,31 @@
297		271
		272	elif test -d /usr/share/gnome/
		273	then
		274	@@ -1576,9 +1489,9 @@
		275	# This function searches for common kde2 and kde 3 icon paths.
298	debug_msg 1 "in kde()"	276	debug_msg 1 "in kde()"
299		277
300	- if test -d /opt/kde${1}/share; then	278	- if test -d /opt/kde$1/share
301	+ if test -d %%LOCALBASE%%/share; then	279	+ if test -d %%LOCALBASE%%/share;
		280	then
		281	- DIR_HI=/opt/kde$1/share/icons/hicolor
		282	+ DIR_HI=%%LOCALBASE%%/share/icons/hicolor
		283	if test -d "$DIR_HI" -a -w "$DIR_HI"
		284	then
		285	if test -d "$DIR_HI"/48x48/apps -a -w "$DIR_HI"/48x48/apps
		286	@@ -1592,7 +1505,7 @@
		287	fi
		288	fi
302		289
303	- DIR_HI=/opt/kde${1}/share/icons/hicolor	290	- DIR_LO=/opt/kde$1/share/icons/locolor
304	+ DIR_HI=%%LOCALBASE%%/share/icons/hicolor	291	+ DIR_LO=%%LOCALBASE%%/share/icons/locolor
305	if test -d "$DIR_HI" -a -w "$DIR_HI"; then	292	if test -d $DIR_LO -a -w $DIR_LO
306	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; fi	293	then
307	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; fi	294	if test -d $DIR_LO/32x32/apps -a -w $DIR_LO/32x32/apps
308	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; fi	295	@@ -1606,15 +1519,15 @@
309	fi	296	fi
310
311	- DIR_LO=/opt/kde${1}/share/icons/locolor
312	+ DIR_LO=%%LOCALBASE%%/share/icons/locolor
313	if test -d $DIR_LO -a -w $DIR_LO; then
314	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; fi
315	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; fi
316	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; fi
317	fi
318
319	- if test -d /opt/kde${1}/share/applnk/; then
320	- if test ! -d /opt/kde${1}/share/applnk/Internet/ -a -w /opt/kde${1}/share/applnk; then
321	- mkdir $mkdirv $mkdirp /opt/kde${1}/share/applnk/Internet/
322	- chmod $chmodv 755 /opt/kde${1}/share/applnk/Internet
323	+ if test -d %%LOCALBASE%%/share/applnk/; then
324	+ if test ! -d %%LOCALBASE%%/share/applnk/Internet/ -a -w %%LOCALBASE%%/share/applnk; then
325	+ mkdir $mkdirv $mkdirp %%LOCALBASE%%/share/applnk/Internet/
326	+ chmod $chmodv 755 %%LOCALBASE%%/share/applnk/Internet
327	fi	297	fi
328	- if test -w /opt/kde${1}/share/applnk/Internet; then generate_desktop /opt/kde${1}/share/applnk/Internet ${1}; fi
329	+ if test -w %%LOCALBASE%%/share/applnk/Internet; then generate_desktop %%LOCALBASE%%/share/applnk/Internet ${1}; fi
330	fi
331
332	fi
333	-
334	- if test -d /usr/share/applnk/Networking; then
335	- if test ! -d /usr/share/applnk/Networking/WWW/ -a -w /usr/share/applnk/Networking; then
336	- mkdir $mkdirv $mkdirp /usr/share/applnk/Networking/WWW/
337	- chmod $chmodv 755 /usr/share/applnk/Networking/WWW
338	- fi
339	- if test -w /usr/share/applnk/Networking/WWW; then generate_desktop /usr/share/applnk/Networking/WWW ${1}; fi
340	- fi
341	}
342		298
343	kde1()	299	- if test -d /opt/kde$1/share/applnk/
		300	+ if test -d %%LOCALBASE%%/share/applnk/
		301	then
		302	- if test ! -d /opt/kde$1/share/applnk/Internet/ -a -w /opt/kde$1/share/applnk
		303	+ if test ! -d %%LOCALBASE%%/share/applnk/Internet/ -a -w %%LOCALBASE%%/share/applnk
		304	then
		305	- mkdir $mkdirv $mkdirp /opt/kde$1/share/applnk/Internet/
		306	- chmod $chmodv 755 /opt/kde$1/share/applnk/Internet
		307	+ mkdir $mkdirv $mkdirp %%LOCALBASE%%/share/applnk/Internet/
		308	+ chmod $chmodv 755 %%LOCALBASE%%/share/applnk/Internet
		309	fi
		310	- if test -w /opt/kde$1/share/applnk/Internet
		311	- then generate_desktop /opt/kde$1/share/applnk/Internet $1
		312	+ if test -w %%LOCALBASE%%/share/applnk/Internet
		313	+ then generate_desktop %%LOCALBASE%%/share/applnk/Internet $1
		314	fi
		315	fi
		316	fi

Lines 1-24 Link Here

(-)opera/files/patch-search.ini (-15 / +17 lines)
1	--- search.ini.orig Fri Apr 15 14:21:52 2005	1	--- search.ini.orig Mon Nov 14 14:51:18 2005
2	+++ search.ini Wed Apr 20 13:23:33 2005	2	+++ search.ini Tue Nov 22 21:50:07 2005
3	@@ -422,8 +422,8 @@	3	@@ -435,8 +435,8 @@
4	Nameid=0	4	Nameid=0
5		5
6	[Search Engine 33]	6	[Search Engine 34]
7	-Name=Google Linu&x	7	-Name=Google Linu&x
8	-URL=http://www.google.com/linux?q=%s&sourceid=opera&num=%i&ie=utf-8&oe=utf-8	8	-URL=http://www.google.com/linux?q=%s&sourceid=opera&num=%i&ie=utf-8&oe=utf-8
9	+Name=Google &BSD	9	+Name=FreeBSD &PRs
10	+URL=http://www.google.com/bsd?q=%s&sourceid=opera&num=%i&ie=utf-8&oe=utf-8	10	+URL=http://www.freebsd.org/cgi/query-pr.cgi?pr=%s
11	Query=	11	Query=
12	Key=x	12	Key=x
13	Is post=0	13	Is post=0
14	@@ -433,3 +433,30 @@	14	@@ -445,4 +445,30 @@
		15	Search Type=0
15	Verbtext=17063	16	Verbtext=17063
16	Position=-1	17	Position=-1
17	Nameid=0	18	-Nameid=0
		19	\ No newline at end of file
		20	+Nameid=0
18	+	21	+
19	+[Search Engine 34]	22	+[Search Engine 35]
20	+Name=FreeBSD &PRs	23	+Name=FreshP&orts
21	+URL=http://www.freebsd.org/cgi/query-pr.cgi?pr=%s	24	+URL=http://www.freshports.org/search.php?query=%s
22	+Query=	25	+Query=
23	+Key=x	26	+Key=x
24	+Is post=0	27	+Is post=0
Lines 29-37 Link Here
29	+Position=-1	32	+Position=-1
30	+Nameid=0	33	+Nameid=0
31	+	34	+
32	+[Search Engine 35]	35	+[Search Engine 36]
33	+Name=FreshP&orts	36	+Name=Google &BSD
34	+URL=http://www.freshports.org/search.php?query=%s	37	+URL=http://www.google.com/bsd?q=%s&sourceid=opera&num=%i&ie=utf-8&oe=utf-8
35	+Query=	38	+Query=
36	+Key=x	39	+Key=x
37	+Is post=0	40	+Is post=0
Lines 41-44 Link Here
41	+Verbtext=17063	44	+Verbtext=17063
42	+Position=-1	45	+Position=-1
43	+Nameid=0	46	+Nameid=0
44	+