Attachment #54443 for bug #82395

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

Lines 28-37 Link Here

(-)opera/Makefile (-3 / +3 lines)
28	MAINTAINER= avleeuwen@piwebs.com	28	MAINTAINER= avleeuwen@piwebs.com
29	COMMENT= A blazingly fast, full-featured, standards-compliant browser	29	COMMENT= A blazingly fast, full-featured, standards-compliant browser
30		30
31	OPERA_VER= 8.0	31	OPERA_VER= 8.01
32	OPERA_MINVER= 0	32	OPERA_MINVER=
33	OPERA_REL= final	33	OPERA_REL= final
34	OPERA_DATE= 20050415	34	OPERA_DATE= 20050615
35		35
36	DATADIR= ${PREFIX}/share/${PORTNAME}	36	DATADIR= ${PREFIX}/share/${PORTNAME}
37	DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}	37	DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}

Lines 1-2 Link Here

(-)opera/distinfo (-2 / +2 lines)
1	MD5 (opera-8.0-20050415.1-static-qt.i386.freebsd-en.tar.bz2) = 1b4a940f03bad7af148a0418c8087b62	1	MD5 (opera-8.01-20050615.1-static-qt.i386.freebsd-en.tar.bz2) = e4f5f41596396b45a4bd50b33479e987
2	SIZE (opera-8.0-20050415.1-static-qt.i386.freebsd-en.tar.bz2) = 5099452	2	SIZE (opera-8.01-20050615.1-static-qt.i386.freebsd-en.tar.bz2) = 5593705




--- install.sh.orig	Fri Apr 15 21:21:52 2005
+++ install.sh	Sat Jun 18 01:45:48 2005
@@ -108,8 +108,8 @@
 
     if test ${os} = 'FreeBSD' -o ${os} = 'OpenBSD'; then
         wrapper_dir="${prefix}/bin"
-        doc_dir="${prefix}/share/doc/opera"
-        share_dir="${prefix}/share/opera"
+        doc_dir="${prefix}/share/doc/opera"
+        share_dir="${prefix}/share/opera"
         exec_dir="${share_dir}/bin"
         plugin_dir="${share_dir}/plugins"
     else
@@ -373,7 +373,7 @@
 	    mvv=''    # SunOS mv (no -v verbose option)
 	;;

 	    wrapper_ibmjava="
 	    IBMJava2-142/jre \\
 	    IBMJava2-141/jre \\
@@ -798,6 +798,12 @@
 		error 'os'
 	;;
     esac
-    wrapper_file="${wrapper_dir}/opera"
+    wrapper_file="${wrapper_dir}/opera"
     
     wrapper_contain="#!/bin/sh
 
+# Location of locale data
+if [ -f %%LOCALBASE%%/share/compat/locale/UTF-8/LC_CTYPE ]; then
+    PATH_LOCALE=%%LOCALBASE%%/share/compat/locale
+    export PATH_LOCALE
+fi
+
 # Location of the Opera binaries
 OPERA_BINARYDIR=${str_localdirexec}
 export OPERA_BINARYDIR
@@ -850,6 +856,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\`
@@ -873,53 +882,12 @@
 
 if test ! \"\${OPERA_JAVA_DIR}\"; then
 

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

     ; do
     if test -d \${BINDIR} ; then PATH=\${PATH}:\${BINDIR}; fi
 done
@@ -985,12 +950,13 @@
 LD_LIBRARY_PATH=\"\${OPERA_BINARYDIR}:\${LD_LIBRARY_PATH}\"
 export LD_LIBRARY_PATH
 

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

 
     # Executable
 	debug_msg 1 "Executable"
@@ -1115,7 +1081,7 @@
 
 	#cp $cpv $cpf wrapper.sh $wrapper_dir/opera
 	generate_wrapper

 
     # Documentation
 	debug_msg 1 "Documentation"
@@ -1293,36 +1259,13 @@
 
 	if test -z "${OPERADESTDIR}"; then
 

 
 	fi # OPERADESTDIR
 
@@ -1451,72 +1394,36 @@
 {
     # arg1 = location
 
-    wmconfig_file="${1}/opera"
+    wmconfig_file="${1}/opera"
 
-    wmconfig_contain='opera name "Opera"
+    wmconfig_contain='opera name "Opera"
 opera description "Opera Web Browser"
 opera icon "opera.xpm"
 opera mini-icon "opera.xpm"
-opera exec "opera &"
+opera exec "opera &"
 opera group "Internet"'
 
     echo "${wmconfig_contain}" > ${wmconfig_file}
@@ -1362,12 +1299,12 @@
 {
     # arg1 = location
 
-    desktop_file="${1}/opera.desktop"
+    desktop_file="${1}/opera.desktop"
 
     desktop_contain='[Desktop Entry]
-Name=Opera
+Name=Opera
 Comment=Web Browser
-Exec=opera
+Exec=opera
 Icon=opera.xpm
 Terminal=0
 Type=Application'
@@ -1446,72 +1383,36 @@
 
     debug_msg 1 "in gnome()"
 
-    if test -d /opt/gnome/; then
-
-      # /opt/gnome share
-      if test -d /opt/gnome/share; then
+    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/; then
-	  if test -w /opt/gnome/share; then

    fi
    # Add ximian here
 }
@@ -1527,39 +1434,31 @@
 
     debug_msg 1 "in kde()"
 

Lines 8-14 Link Here

(-)opera/pkg-plist (-1 lines)
8	%%DATADIR%%/chartables.bin	8	%%DATADIR%%/chartables.bin
9	%%DATADIR%%/config/opera6rc	9	%%DATADIR%%/config/opera6rc
10	%%DATADIR%%/config/opera6rc.fixed	10	%%DATADIR%%/config/opera6rc.fixed
11	%%DATADIR%%/hhd.ssr
12	%%DATADIR%%/html40_entities.dtd	11	%%DATADIR%%/html40_entities.dtd
13	%%DATADIR%%/images/blank.gif	12	%%DATADIR%%/images/blank.gif
14	%%DATADIR%%/images/drive.gif	13	%%DATADIR%%/images/drive.gif

Return to bug 82395

Lines 1-16 Link Here

(-)opera/files/patch-install.sh (-64 / +24 lines)
1	--- install.sh.orig Fri Feb 25 14:36:52 2005	1	--- install.sh.orig Fri Apr 15 21:21:52 2005
2	+++ install.sh Wed Mar 2 12:43:44 2005	2	+++ install.sh Sat Jun 18 01:45:48 2005
3	@@ -108,8 +108,8 @@
4
5	if test ${os} = 'FreeBSD' -o ${os} = 'OpenBSD'; then
6	wrapper_dir="${prefix}/bin"
7	- doc_dir="${prefix}/share/doc/opera"
8	- share_dir="${prefix}/share/opera"
9	+ doc_dir="${prefix}/share/doc/opera"
10	+ share_dir="${prefix}/share/opera"
11	exec_dir="${share_dir}/bin"
12	plugin_dir="${share_dir}/plugins"
13	else
14	@@ -373,7 +373,7 @@	3	@@ -373,7 +373,7 @@
15	mvv='' # SunOS mv (no -v verbose option)	4	mvv='' # SunOS mv (no -v verbose option)
16	;;	5	;;
Lines 29-44 Link Here
29	wrapper_ibmjava="	18	wrapper_ibmjava="
30	IBMJava2-142/jre \\	19	IBMJava2-142/jre \\
31	IBMJava2-141/jre \\	20	IBMJava2-141/jre \\
32	@@ -794,7 +794,7 @@	21	@@ -798,6 +798,12 @@
33	error 'os'
34	;;
35	esac
36	- wrapper_file="${wrapper_dir}/opera"
37	+ wrapper_file="${wrapper_dir}/opera"
38		22
39	wrapper_contain="#!/bin/sh	23	wrapper_contain="#!/bin/sh
40		24
41	@@ -850,6 +850,9 @@	25	+# Location of locale data
		26	+if [ -f %%LOCALBASE%%/share/compat/locale/UTF-8/LC_CTYPE ]; then
		27	+ PATH_LOCALE=%%LOCALBASE%%/share/compat/locale
		28	+ export PATH_LOCALE
		29	+fi
		30	+
		31	# Location of the Opera binaries
		32	OPERA_BINARYDIR=${str_localdirexec}
		33	export OPERA_BINARYDIR
		34	@@ -850,6 +856,9 @@
42	OPERA_LD_PRELOAD=\"\${LD_PRELOAD}\"	35	OPERA_LD_PRELOAD=\"\${LD_PRELOAD}\"
43	export OPERA_LD_PRELOAD	36	export OPERA_LD_PRELOAD
44		37
Lines 48-54 Link Here
48	# Native Java enviroment	41	# Native Java enviroment
49	if test -f \"\${OPERA_PERSONALDIR}/javapath.txt\"; then	42	if test -f \"\${OPERA_PERSONALDIR}/javapath.txt\"; then
50	INIJAVA=\`cat \${OPERA_PERSONALDIR}/javapath.txt\`	43	INIJAVA=\`cat \${OPERA_PERSONALDIR}/javapath.txt\`
51	@@ -873,53 +876,12 @@	44	@@ -873,53 +882,12 @@
52		45
53	if test ! \"\${OPERA_JAVA_DIR}\"; then	46	if test ! \"\${OPERA_JAVA_DIR}\"; then
54		47
Lines 105-111 Link Here
105	; do	98	; do
106	for PREFIX in \${PREFIXES}; do	99	for PREFIX in \${PREFIXES}; do
107	if test -f \"\${PREFIX}/\${SUNJAVA}/lib/${wrapper_sunjava_machine}/libjava.so\"; then OPERA_JAVA_DIR=\"\${PREFIX}/\${SUNJAVA}/lib/${wrapper_sunjava_machine}\" && break; fi	100	if test -f \"\${PREFIX}/\${SUNJAVA}/lib/${wrapper_sunjava_machine}/libjava.so\"; then OPERA_JAVA_DIR=\"\${PREFIX}/\${SUNJAVA}/lib/${wrapper_sunjava_machine}\" && break; fi
108	@@ -970,11 +932,8 @@	101	@@ -970,11 +938,8 @@
109		102
110	# Acrobat Reader	103	# Acrobat Reader
111	for BINDIR in \\	104	for BINDIR in \\
Lines 119-125 Link Here
119	; do	112	; do
120	if test -d \${BINDIR} ; then PATH=\${PATH}:\${BINDIR}; fi	113	if test -d \${BINDIR} ; then PATH=\${PATH}:\${BINDIR}; fi
121	done	114	done
122	@@ -985,12 +944,13 @@	115	@@ -985,12 +950,13 @@
123	LD_LIBRARY_PATH=\"\${OPERA_BINARYDIR}:\${LD_LIBRARY_PATH}\"	116	LD_LIBRARY_PATH=\"\${OPERA_BINARYDIR}:\${LD_LIBRARY_PATH}\"
124	export LD_LIBRARY_PATH	117	export LD_LIBRARY_PATH
125		118
Lines 135-141 Link Here
135	LD_LIBRARY_PATH=\"\${LD_LIBRARY_PATH}:\${LIBASPELL_DIR}\"	128	LD_LIBRARY_PATH=\"\${LD_LIBRARY_PATH}:\${LIBASPELL_DIR}\"
136	fi	129	fi
137	done	130	done
138	@@ -1080,7 +1040,7 @@	131	@@ -1080,7 +1046,7 @@
139	chop "${OPERADESTDIR}" "str_localdirshare"	132	chop "${OPERADESTDIR}" "str_localdirshare"
140	chop "${OPERADESTDIR}" "str_localdirplugin"	133	chop "${OPERADESTDIR}" "str_localdirplugin"
141		134
Lines 144-150 Link Here
144		137
145	# Executable	138	# Executable
146	debug_msg 1 "Executable"	139	debug_msg 1 "Executable"
147	@@ -1115,7 +1075,7 @@	140	@@ -1115,7 +1081,7 @@
148		141
149	#cp $cpv $cpf wrapper.sh $wrapper_dir/opera	142	#cp $cpv $cpf wrapper.sh $wrapper_dir/opera
150	generate_wrapper	143	generate_wrapper
Lines 153-159 Link Here
153		146
154	# Documentation	147	# Documentation
155	debug_msg 1 "Documentation"	148	debug_msg 1 "Documentation"
156	@@ -1288,36 +1248,13 @@	149	@@ -1293,36 +1259,13 @@
157		150
158	if test -z "${OPERADESTDIR}"; then	151	if test -z "${OPERADESTDIR}"; then
159		152
Lines 194-242 Link Here
194		187
195	fi # OPERADESTDIR	188	fi # OPERADESTDIR
196		189
197	@@ -1345,13 +1282,13 @@	190	@@ -1451,72 +1394,36 @@
198	{
199	# arg1 = location
200
201	- wmconfig_file="${1}/opera"
202	+ wmconfig_file="${1}/opera"
203
204	- wmconfig_contain='opera name "Opera"
205	+ wmconfig_contain='opera name "Opera"
206	opera description "Opera Web Browser"
207	opera icon "opera.xpm"
208	opera mini-icon "opera.xpm"
209	-opera exec "opera &"
210	+opera exec "opera &"
211	opera group "Internet"'
212
213	echo "${wmconfig_contain}" > ${wmconfig_file}
214	@@ -1362,12 +1299,12 @@
215	{
216	# arg1 = location
217
218	- desktop_file="${1}/opera.desktop"
219	+ desktop_file="${1}/opera.desktop"
220
221	desktop_contain='[Desktop Entry]
222	-Name=Opera
223	+Name=Opera
224	Comment=Web Browser
225	-Exec=opera
226	+Exec=opera
227	Icon=opera.xpm
228	Terminal=0
229	Type=Application'
230	@@ -1446,72 +1383,36 @@
231		191
232	debug_msg 1 "in gnome()"	192	debug_msg 1 "in gnome()"
233		193
234	- if test -d /opt/gnome/; then	194	- if test -d /opt/gnome/; then
235	-
236	- # /opt/gnome share
237	- if test -d /opt/gnome/share; then
238	+ if test -d %%X11BASE%%/share/gnome/; then	195	+ if test -d %%X11BASE%%/share/gnome/; then
239		196
		197	- # /opt/gnome share
		198	- if test -d /opt/gnome/share; then
		199	-
240	- # /opt/gnome icon	200	- # /opt/gnome icon
241	- if test ! -d /opt/gnome/share/pixmaps/; then	201	- if test ! -d /opt/gnome/share/pixmaps/; then
242	- if test -w /opt/gnome/share; then	202	- if test -w /opt/gnome/share; then
Lines 322-328 Link Here
322	fi	282	fi
323	# Add ximian here	283	# Add ximian here
324	}	284	}
325	@@ -1522,39 +1423,31 @@	285	@@ -1527,39 +1434,31 @@
326		286
327	debug_msg 1 "in kde()"	287	debug_msg 1 "in kde()"
328		288