Attachment #66003 for bug #97683

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

Lines 31-39 Link Here

(-)opera-devel/Makefile (-3 / +3 lines)
31		31
32	OPERA_VER= 9.0	32	OPERA_VER= 9.0
33	OPERA_MINVER= 0	33	OPERA_MINVER= 0
34	OPERA_REL= beta1	34	OPERA_REL= beta2
35	OPERA_DATE= 20060411	35	OPERA_DATE= 20060518
36	OPERA_BUILD= 236	36	OPERA_BUILD= 284
37		37
38	DATADIR= ${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX}	38	DATADIR= ${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX}
39	DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}	39	DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}

Lines 1-9 Link Here

(-)opera-devel/distinfo (-9 / +9 lines)
1	MD5 (opera-9.0-20060411.1-static-qt.i386.freebsd-en-236.tar.bz2) = a37cee68d1243369b18d00ca7128fc4c	1	MD5 (opera-9.0-20060518.1-static-qt.i386.freebsd-en-284.tar.bz2) = 3538842170b05e1ccbb08896e8488fce
2	SHA256 (opera-9.0-20060411.1-static-qt.i386.freebsd-en-236.tar.bz2) = ce8d378c6ba392d9c90cd9b09a597983b867f8ba3e4e3b31a5d3f422b55604a4	2	SHA256 (opera-9.0-20060518.1-static-qt.i386.freebsd-en-284.tar.bz2) = dbcc0062cc5cc25d2d2e4f55da49e3abaaee602cb0b1d8276e20f4ed98ed76d3
3	SIZE (opera-9.0-20060411.1-static-qt.i386.freebsd-en-236.tar.bz2) = 6347441	3	SIZE (opera-9.0-20060518.1-static-qt.i386.freebsd-en-284.tar.bz2) = 6367323
4	MD5 (opera-9.0-20060411.3-shared-qt.i386.freebsd-en-236.tar.bz2) = 89ccd95fca178d21ce819ae6efc4c9d3	4	MD5 (opera-9.0-20060518.3-shared-qt.i386.freebsd-en-284.tar.bz2) = 14170285c7f16bffa643abb86b07667b
5	SHA256 (opera-9.0-20060411.3-shared-qt.i386.freebsd-en-236.tar.bz2) = e03aeeac5dfaef8869e6b30748d093742c394ce510e44ea161b69fd861df86d1	5	SHA256 (opera-9.0-20060518.3-shared-qt.i386.freebsd-en-284.tar.bz2) = 3715f412432a6a22075da9382e915e6d775c72638390b6359a34306589c97852
6	SIZE (opera-9.0-20060411.3-shared-qt.i386.freebsd-en-236.tar.bz2) = 4948067	6	SIZE (opera-9.0-20060518.3-shared-qt.i386.freebsd-en-284.tar.bz2) = 4969558
7	MD5 (opera-9.0-20060411.4-shared-qt.i386.freebsd-en-236.tar.bz2) = 4a00e2a1dcc107e5ad200e19dd0c3c0d	7	MD5 (opera-9.0-20060518.4-shared-qt.i386.freebsd-en-284.tar.bz2) = 8f0c364f8c8f736e00e038bf25113b74
8	SHA256 (opera-9.0-20060411.4-shared-qt.i386.freebsd-en-236.tar.bz2) = 460c8687c941787b45ac4d35bb06fdb322b1210f173ce74858d0dcbe9d5a4ac1	8	SHA256 (opera-9.0-20060518.4-shared-qt.i386.freebsd-en-284.tar.bz2) = a454750e8db9d86eecc2af12b33eed30d5086fbaa06ae878213898210b7ccc9d
9	SIZE (opera-9.0-20060411.4-shared-qt.i386.freebsd-en-236.tar.bz2) = 4949636	9	SIZE (opera-9.0-20060518.4-shared-qt.i386.freebsd-en-284.tar.bz2) = 4970865




--- 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
-    man_dir="${prefix}/share/man"
-    doc_dir="${prefix}/share/doc/opera"
+    man_dir="${prefix}/man"
+    doc_dir="${prefix}/share/doc/opera-devel"
     wrapper_dir="${prefix}/bin"
 }
 
@@ -830,7 +830,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
@@ -789,7 +789,7 @@
     debug_msg 0 "in generate_wrapper()"
 
     case "${machine}:${os}" in
-	i[3456]86:Linux|x86_64:Linux|i[3456]86:FreeBSD|i[3456]86:NetBSD|i[3456]86:OpenBSD)
+	i[3456]86:Linux|x86_64:Linux|i[3456]86:FreeBSD|amd64:FreeBSD|i[3456]86:NetBSD|i[3456]86:OpenBSD)
 	    wrapper_ibmjava="
 	    IBMJava2-142/jre \\
 	    IBMJava2-141/jre \\
@@ -824,7 +824,7 @@
 		error 'os'
 	;;
     esac

 
     wrapper_contain="#!/bin/sh
 
@@ -893,6 +893,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\`
@@ -916,69 +919,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
@@ -1029,11 +975,8 @@
 
 # Acrobat Reader
 for BINDIR in \\

     ; 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
 

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

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

 
     # 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

 
     # Documentation
     debug_msg 1 "Documentation"
@@ -1383,41 +1327,9 @@
 
     if test -z "${OPERADESTDIR}"
     then

 	if test "${bool_icons}" -ne 0
 	then
 	    xdg
@@ -1454,13 +1366,13 @@
 {
     # arg1 = location
 

 opera group "Internet"'
 
     echo "${wmconfig_contain}" > ${wmconfig_file}
@@ -1472,19 +1384,19 @@
     # arg1 = location
     # arg2 = type
 

 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

 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

 Terminal=0"
     fi
 
@@ -1629,48 +1541,43 @@
     # This function searches for common gnome icon paths.
     debug_msg 1 "in gnome()"
 

 
     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

 	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()"
 

 	    fi
 	fi
     fi
@@ -1840,45 +1747,9 @@
 }
 
 xdg()

Lines 1-5 Link Here

(-)opera-devel/files/patch-opera6.adr (-4 / +4 lines)
1	--- opera6.adr.orig Thu Apr 20 11:52:06 2006	1	--- opera6.adr.orig Thu May 18 12:33:54 2006
2	+++ opera6.adr Thu Apr 20 11:52:12 2006	2	+++ opera6.adr Tue May 23 11:26:33 2006
3	@@ -25,14 +25,14 @@	3	@@ -25,14 +25,14 @@
4	URL=http://my.opera.com/	4	URL=http://my.opera.com/
5	ICONFILE=my.opera.com.ico	5	ICONFILE=my.opera.com.ico
Lines 63-70 Link Here
63	#URL	63	#URL
64	- ID=23	64	- ID=23
65	+ ID=25	65	+ ID=25
66	NAME=Shopping.com	66	NAME=PriceRunner
67	URL=http://www.shopping.com/?linkin_id=3005960	67	URL=http://www.pricerunner.com/ref-site=opera
68		68
69	#URL	69	#URL
70	- ID=24	70	- ID=24

Return to bug 97683

Lines 1-44 Link Here

(-)opera-devel/files/patch-install.sh (-47 / +27 lines)
1	--- install.sh.orig Tue Apr 11 12:23:52 2006	1	--- install.sh.orig Thu May 18 12:33:54 2006
2	+++ install.sh Thu Apr 20 11:33:45 2006	2	+++ install.sh Tue May 23 11:21:36 2006
3	@@ -106,7 +106,7 @@	3	@@ -111,7 +111,7 @@
4		4
5	test "${prefix}" \|\| prefix="${str_defaultprefix}"	5	test "${prefix}" \|\| prefix="${str_defaultprefix}"
6		6
7	- share_dir="${prefix}/share/opera"	7	- share_dir="${prefix}/share/opera"
8	+ share_dir="${prefix}/share/opera-devel"	8	+ share_dir="${prefix}/share/opera-devel"
9	if test ${os} = 'FreeBSD' -o ${os} = 'OpenBSD'; then	9	case "$os" in
10	exec_dir="${share_dir}/bin"	10	AnyBSD\|OpenBSD)
11	plugin_dir="${share_dir}/plugins"	11	exec_dir="${share_dir}/bin"
12	@@ -114,8 +114,8 @@	12	@@ -124,7 +124,7 @@
13	exec_dir="${prefix}/lib/opera/$opera_version"	13	man_dir="$prefix/share/man"
14	plugin_dir="${prefix}/lib/opera/plugins"	14	;;
15	fi	15	esac
16	- man_dir="${prefix}/share/man"
17	- doc_dir="${prefix}/share/doc/opera"	16	- doc_dir="${prefix}/share/doc/opera"
18	+ man_dir="${prefix}/man"
19	+ doc_dir="${prefix}/share/doc/opera-devel"	17	+ doc_dir="${prefix}/share/doc/opera-devel"
20	wrapper_dir="${prefix}/bin"	18	wrapper_dir="${prefix}/bin"
21	}	19	}
22		20
23	@@ -397,7 +397,7 @@	21	@@ -830,7 +830,7 @@
24	mvv='' # SunOS mv (no -v verbose option)
25	;;
26
27	- i[3456]86:FreeBSD\|i[3456]86:NetBSD)
28	+ i[3456]86:FreeBSD\|amd64:FreeBSD\|i[3456]86:NetBSD)
29	cpf='-f'
30	if test "$verbose" -gt '1'
31	then
32	@@ -789,7 +789,7 @@
33	debug_msg 0 "in generate_wrapper()"
34
35	case "${machine}:${os}" in
36	- i[3456]86:Linux\|x86_64:Linux\|i[3456]86:FreeBSD\|i[3456]86:NetBSD\|i[3456]86:OpenBSD)
37	+ i[3456]86:Linux\|x86_64:Linux\|i[3456]86:FreeBSD\|amd64:FreeBSD\|i[3456]86:NetBSD\|i[3456]86:OpenBSD)
38	wrapper_ibmjava="
39	IBMJava2-142/jre \\
40	IBMJava2-141/jre \\
41	@@ -824,7 +824,7 @@
42	error 'os'	22	error 'os'
43	;;	23	;;
44	esac	24	esac
Lines 47-53 Link Here
47		27
48	wrapper_contain="#!/bin/sh	28	wrapper_contain="#!/bin/sh
49		29
50	@@ -887,6 +887,9 @@	30	@@ -893,6 +893,9 @@
51	OPERA_LD_PRELOAD=\"\${LD_PRELOAD}\"	31	OPERA_LD_PRELOAD=\"\${LD_PRELOAD}\"
52	export OPERA_LD_PRELOAD	32	export OPERA_LD_PRELOAD
53		33
Lines 57-63 Link Here
57	# Native Java enviroment	37	# Native Java enviroment
58	if test -f \"\${OPERA_PERSONALDIR}/javapath.txt\"; then	38	if test -f \"\${OPERA_PERSONALDIR}/javapath.txt\"; then
59	INIJAVA=\`cat \${OPERA_PERSONALDIR}/javapath.txt\`	39	INIJAVA=\`cat \${OPERA_PERSONALDIR}/javapath.txt\`
60	@@ -910,69 +913,12 @@	40	@@ -916,69 +919,12 @@
61		41
62	if test ! \"\${OPERA_JAVA_DIR}\"; then	42	if test ! \"\${OPERA_JAVA_DIR}\"; then
63		43
Lines 131-137 Link Here
131	; do	111	; do
132	for PREFIX in \${PREFIXES}; do	112	for PREFIX in \${PREFIXES}; do
133	if test -f \"\${PREFIX}/\${SUNJAVA}/lib/${wrapper_sunjava_machine}/libjava.so\"; then OPERA_JAVA_DIR=\"\${PREFIX}/\${SUNJAVA}/lib/${wrapper_sunjava_machine}\" && break; fi	113	if test -f \"\${PREFIX}/\${SUNJAVA}/lib/${wrapper_sunjava_machine}/libjava.so\"; then OPERA_JAVA_DIR=\"\${PREFIX}/\${SUNJAVA}/lib/${wrapper_sunjava_machine}\" && break; fi
134	@@ -1023,11 +969,8 @@	114	@@ -1029,11 +975,8 @@
135		115
136	# Acrobat Reader	116	# Acrobat Reader
137	for BINDIR in \\	117	for BINDIR in \\
Lines 145-151 Link Here
145	; do	125	; do
146	if test -d \${BINDIR} ; then PATH=\${PATH}:\${BINDIR}; fi	126	if test -d \${BINDIR} ; then PATH=\${PATH}:\${BINDIR}; fi
147	done	127	done
148	@@ -1038,12 +981,13 @@	128	@@ -1044,12 +987,13 @@
149	LD_LIBRARY_PATH=\"\${OPERA_BINARYDIR}\${LD_LIBRARY_PATH:+:}\${LD_LIBRARY_PATH}\"	129	LD_LIBRARY_PATH=\"\${OPERA_BINARYDIR}\${LD_LIBRARY_PATH:+:}\${LD_LIBRARY_PATH}\"
150	export LD_LIBRARY_PATH	130	export LD_LIBRARY_PATH
151		131
Lines 161-167 Link Here
161	LD_LIBRARY_PATH=\"\${LD_LIBRARY_PATH}:\${LIBASPELL_DIR}\"	141	LD_LIBRARY_PATH=\"\${LD_LIBRARY_PATH}:\${LIBASPELL_DIR}\"
162	fi	142	fi
163	done"	143	done"
164	@@ -1153,7 +1097,7 @@	144	@@ -1159,7 +1103,7 @@
165	chop "${OPERADESTDIR}" "str_localdirshare"	145	chop "${OPERADESTDIR}" "str_localdirshare"
166	chop "${OPERADESTDIR}" "str_localdirplugin"	146	chop "${OPERADESTDIR}" "str_localdirplugin"
167		147
Lines 170-176 Link Here
170		150
171	# Executable	151	# Executable
172	debug_msg 1 "Executable"	152	debug_msg 1 "Executable"
173	@@ -1191,7 +1135,7 @@	153	@@ -1197,7 +1141,7 @@
174		154
175	#cp $cpv $cpf wrapper.sh $wrapper_dir/opera	155	#cp $cpv $cpf wrapper.sh $wrapper_dir/opera
176	generate_wrapper	156	generate_wrapper
Lines 179-185 Link Here
179		159
180	# Manual page	160	# Manual page
181	debug_msg 1 "Manual page"	161	debug_msg 1 "Manual page"
182	@@ -1200,7 +1144,7 @@	162	@@ -1206,7 +1150,7 @@
183	chmod $chmodv 755 ${man_dir}	163	chmod $chmodv 755 ${man_dir}
184	mkdir $mkdirv $mkdirp ${man_dir}/man1	164	mkdir $mkdirv $mkdirp ${man_dir}/man1
185	chmod $chmodv 755 ${man_dir}/man1	165	chmod $chmodv 755 ${man_dir}/man1
Lines 188-194 Link Here
188		168
189	# Documentation	169	# Documentation
190	debug_msg 1 "Documentation"	170	debug_msg 1 "Documentation"
191	@@ -1377,41 +1321,9 @@	171	@@ -1383,41 +1327,9 @@
192		172
193	if test -z "${OPERADESTDIR}"	173	if test -z "${OPERADESTDIR}"
194	then	174	then
Lines 230-236 Link Here
230	if test "${bool_icons}" -ne 0	210	if test "${bool_icons}" -ne 0
231	then	211	then
232	xdg	212	xdg
233	@@ -1448,13 +1360,13 @@	213	@@ -1454,13 +1366,13 @@
234	{	214	{
235	# arg1 = location	215	# arg1 = location
236		216
Lines 249-255 Link Here
249	opera group "Internet"'	229	opera group "Internet"'
250		230
251	echo "${wmconfig_contain}" > ${wmconfig_file}	231	echo "${wmconfig_contain}" > ${wmconfig_file}
252	@@ -1466,19 +1378,19 @@	232	@@ -1472,19 +1384,19 @@
253	# arg1 = location	233	# arg1 = location
254	# arg2 = type	234	# arg2 = type
255		235
Lines 272-278 Link Here
272	Name[af]=opera	252	Name[af]=opera
273	Name[eo]=Opero	253	Name[eo]=Opero
274	Name[zu]=I Opera	254	Name[zu]=I Opera
275	@@ -1502,7 +1414,7 @@	255	@@ -1508,7 +1420,7 @@
276	GenericName[ven]=Buronza ya Webu	256	GenericName[ven]=Buronza ya Webu
277	GenericName[xh]=Umkhangeli Zincwadi Zokubhaliweyo	257	GenericName[xh]=Umkhangeli Zincwadi Zokubhaliweyo
278	GenericName[zu]=Umkhangeli zincwadi we Web	258	GenericName[zu]=Umkhangeli zincwadi we Web
Lines 281-287 Link Here
281	Terminal=false"	261	Terminal=false"
282		262
283	# Application is not a category, according to	263	# Application is not a category, according to
284	@@ -1517,19 +1429,19 @@	264	@@ -1523,19 +1435,19 @@
285	if test "${2}" = "xdg"; then	265	if test "${2}" = "xdg"; then
286	desktop_contain="${desktop_contain}	266	desktop_contain="${desktop_contain}
287	Categories=Application;Qt;Network;WebBrowser;X-Ximian-Main;X-Ximian-Toplevel	267	Categories=Application;Qt;Network;WebBrowser;X-Ximian-Main;X-Ximian-Toplevel
Lines 306-312 Link Here
306	Terminal=0"	286	Terminal=0"
307	fi	287	fi
308		288
309	@@ -1623,48 +1535,43 @@	289	@@ -1629,48 +1541,43 @@
310	# This function searches for common gnome icon paths.	290	# This function searches for common gnome icon paths.
311	debug_msg 1 "in gnome()"	291	debug_msg 1 "in gnome()"
312		292
Lines 378-384 Link Here
378		358
379	elif test -d /usr/share/gnome/	359	elif test -d /usr/share/gnome/
380	then	360	then
381	@@ -1675,10 +1582,10 @@	361	@@ -1681,10 +1588,10 @@
382	then	362	then
383	mkdir $mkdirv $mkdirp /usr/share/gnome/pixmaps/	363	mkdir $mkdirv $mkdirp /usr/share/gnome/pixmaps/
384	chmod $chmodv 755 /usr/share/gnome/pixmaps	364	chmod $chmodv 755 /usr/share/gnome/pixmaps
Lines 391-397 Link Here
391	fi	371	fi
392	# end /usr/share/gnome icon	372	# end /usr/share/gnome icon
393		373
394	@@ -1712,45 +1619,45 @@	374	@@ -1718,45 +1625,45 @@
395	# This function searches for common kde2 and kde 3 icon paths.	375	# This function searches for common kde2 and kde 3 icon paths.
396	debug_msg 1 "in kde()"	376	debug_msg 1 "in kde()"
397		377
Lines 452-458 Link Here
452	fi	432	fi
453	fi	433	fi
454	fi	434	fi
455	@@ -1834,45 +1741,9 @@	435	@@ -1840,45 +1747,9 @@
456	}	436	}
457		437
458	xdg()	438	xdg()