Attachment #34603 for bug #56181

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




# Date created:					November 5th 2000
# Whom:						des
#
# $FreeBSD: ports/www/opera/Makefile,v 1.10 2003/07/23 21:07:47 naddy Exp $
#

PORTNAME=	opera
PORTVERSION=	7.20.20030827
CATEGORIES=	www
MASTER_SITES=	http://mirrors.pmmf.hu/mirror/opera/unix/freebsd/720/beta7/en/static/ \
		ftp://ftp.planetmirror.com/pub/opera/unix/freebsd/720/beta7/en/static/ \
		http://public.planetmirror.com/pub/opera/unix/freebsd/720/beta7/en/static/ \
		http://gd.tuwien.ac.at/infosys/browsers/opera/unix/freebsd/720/beta7/en/static/ \
		ftp://ftp.opera.com/pub/opera/unix/freebsd/720/beta7/en/static/ \
		ftp://ftp.uit.no/pub/www/opera/unix/freebsd/720/beta7/en/static/ \
		ftp://ftp.task.gda.pl/pub/opera/unix/freebsd/720/beta7/en/static/ \
		http://ftp.task.gda.pl/pub/opera/unix/freebsd/720/beta7/en/static/ \
		ftp://ftp.sunet.se/pub/www/clients/Opera/unix/freebsd/720/beta7/en/static/ \
		http://ftp.sunet.se/pub/www/clients/Opera/unix/freebsd/720/beta7/en/static/ \
		http://sunsite.cnlab-switch.ch/ftp/mirror/opera/unix/freebsd/720/beta7/en/static/
DISTNAME=	${PORTNAME}-${PORTVERSION:S/0./0-/}.1-static-qt.i386.freebsd

MAINTAINER=	avleeuwen@piwebs.com

Line 1 Link Here

(-)opera/distinfo (-1 / +1 lines)
1	MD5 (opera-7.20-20030821.1-static-qt.i386.freebsd.tar.bz2) = 1e0cdbae0e21eaa6b68708873718db11	1	MD5 (opera-7.20-20030827.1-static-qt.i386.freebsd.tar.bz2) = 4693c3f3559f8cc089b1f02f1cc9965f




--- install.sh.orig	Wed Aug 27 18:18:06 2003
+++ install.sh	Sat Aug 30 13:24:01 2003
@@ -711,9 +711,7 @@
 
     wrapper_opera_plugin_paths="    \"\${HOME}/.opera/plugins\" \\
     ${plugin_dir} \\

 
     case "${machine}:${os}" in
 	i[3456]86:Linux|i[3456]86:FreeBSD|i[3456]86:NetBSD|i[3456]86:OpenBSD)
@@ -727,7 +725,6 @@
     /usr/java/jre1.4.0/plugin/i386/ns4 \\
     /usr/java/jre1.3.1/plugin/i386/ns4 \\
     /usr/lib/j2re1.3/plugin/i386/netscape4 \\
-    /opt/Acrobat[45]/Browsers/intellinux \\
-    /usr/Acrobat[45]/Browsers/intellinux \\
-    /usr/j2se/jre/plugin/i386/ns4 \\
-    /usr/java/jre1.4.0/plugin/i386/ns4 \\
-    /usr/java/jre1.3.1/plugin/i386/ns4 \\
-    /usr/lib/j2re1.3/plugin/i386/netscape4 \\
-    /usr/local/jdk1.3.1/jre/plugin/i386/ns4 \\
     /usr/local/linux-jdk1.3.1/jre/plugin/i386/ns4 \\"
+    /usr/local/linux-sun-jdk1.[34].1/jre/plugin/i386/ns4 \\
+    /usr/local/linux-blackdown-jdk1.[34].1/jre/plugin/i386/netscape4 \\"
 	    wrapper_ibmjava="
 	    IBMJava2-141/jre \\
@@ -779,15 +776,10 @@
+	    linux-ibm-jdk1.3.1/jre \\
+	    linux-ibm-jdk1.4.0/jre \\"
 	    wrapper_sunjava_machine="i386"
 	;;
 
@@ -779,15 +769,9 @@
 	;;
     esac
     wrapper_netscape_plugin_paths="

-    /usr/lib/RealPlayer8 \\
-    /usr/lib/realplay \\
+    /usr/local/lib/RealPlayer8/Plugins \\
+    /usr/X11R6/lib/browser_plugins \\
     \"\${HOME}/.netscape/plugins\" \\
-    /opt/netscape/plugins \\
-    /usr/lib/netscape/plugins \\

 
     wrapper_file="${wrapper_dir}/opera"
     
@@ -909,7 +901,7 @@
 
 if test ! \"\${OPERA_JAVA_DIR}\"; then
 
     # Workaround for the \"preloaded libXt\" problem.
     # To disable the first workaround, comment the next line.
-    JAVA_WORKAROUND=`LD_PRELOAD=\"\${OPERA_JAVA_DIR}/libawt.so\" /bin/echo works 2>/dev/null`
+    #JAVA_WORKAROUND=`LD_PRELOAD=\"\${OPERA_JAVA_DIR}/libawt.so\" /bin/echo works 2>/dev/null`
 
     if test \"\${JAVA_WORKAROUND}\" = 'works'; then
         LD_PRELOAD=\"\${OPERA_JAVA_DIR}/libawt.so\"
@@ -918,7 +910,7 @@
     fi
 else
     # To disable the second workaround, comment the next line.
-    JAVA_WORKAROUND2=`LD_PRELOAD=\"libawt.so\" /bin/echo works 2>/dev/null`
+    #JAVA_WORKAROUND2=`LD_PRELOAD=\"libawt.so\" /bin/echo works 2>/dev/null`
     if test \"\${JAVA_WORKAROUND2}\" = 'works'; then
         LD_PRELOAD=\"libawt.so\"
         OPERA_FORCE_JAVA_ENABLED=\"1\"
@@ -943,11 +935,8 @@
-	j2se/jre \\
-	jre1.3.1_02 \\
-	jre1.3.1_01 \\
-	j2re1.3.1 \\
-	jre1.3.1 \\
-	j2re1.3 \\
+	linux-blackdown-jdk1.3.1/jre \\
+	linux-blackdown-jdk1.4.1/jre \\
+	linux-sun-jdk1.3.1/jre \\
+	linux-sun-jdk1.4.1/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
@@ -912,11 +881,8 @@
 
 # Acrobat Reader
 for BINDIR in \\

     ; do
     if test -d \${BINDIR} ; then PATH=\${PATH}:\${BINDIR}; fi
 done
@@ -1178,44 +1167,6 @@
 	    echo "This package does not contain support for Netscape Plug-ins.\n"
 	fi
 
-     # System wide configuration files
-	config_dir='/usr/local/etc'

      # Shorcuts and Icons
 	icons
 	gnome
@@ -1311,22 +1262,22 @@
 
     debug_msg 0 "in icons()"
 

     fi
   
     if test ! -d /etc/X11/wmconfig/; then
@@ -1392,36 +1343,36 @@
       fi
       # end /opt/gnome share
 

    fi
    # Add ximian here
 }
@@ -1458,12 +1409,12 @@
 
     fi  
     

     fi
 }
 
@@ -1487,8 +1438,8 @@
       fi
       if test -w /opt/kde/share/applnk/Internet; then generate_desktop /opt/kde/share/applnk/Internet; fi
 

Lines 2-6 Link Here

(-)opera/pkg-message (-1 / +3 lines)
2	If you are upgrading from version 6, it is recommended to backup your personal	2	If you are upgrading from version 6, it is recommended to backup your personal
3	"~/.opera" directory and remove it before starting the upgraded Opera for the	3	"~/.opera" directory and remove it before starting the upgraded Opera for the
4	first time. This can be done from the command line using	4	first time. This can be done from the command line using
5	"cp -Rp ~/.opera ~/.opera-mybackup" and "rm -rf ~/.opera".	5	"mv ~/.opera ~/.opera-mybackup".
6		6
		7	If you are running FreeBSD 5.x and are experiencing a core dump when starting
		8	Opera, try updating the compat4x port.

Return to bug 56181

Lines 2-14 Link Here

(-)opera/Makefile (-3 / +13 lines)
2	# Date created: November 5th 2000	2	# Date created: November 5th 2000
3	# Whom: des	3	# Whom: des
4	#	4	#
5	# $FreeBSD: ports/www/opera/Makefile,v 1.12 2003/08/22 04:39:17 daichi Exp $	5	# $FreeBSD: ports/www/opera/Makefile,v 1.10 2003/07/23 21:07:47 naddy Exp $
6	#	6	#
7		7
8	PORTNAME= opera	8	PORTNAME= opera
9	PORTVERSION= 7.20.20030821	9	PORTVERSION= 7.20.20030827
10	CATEGORIES= www	10	CATEGORIES= www
11	MASTER_SITES= http://snapshot.opera.com/unix/intel-freebsd/445-20030821-7.20-B4/	11	MASTER_SITES= http://mirrors.pmmf.hu/mirror/opera/unix/freebsd/720/beta7/en/static/ \
		12	ftp://ftp.planetmirror.com/pub/opera/unix/freebsd/720/beta7/en/static/ \
		13	http://public.planetmirror.com/pub/opera/unix/freebsd/720/beta7/en/static/ \
		14	http://gd.tuwien.ac.at/infosys/browsers/opera/unix/freebsd/720/beta7/en/static/ \
		15	ftp://ftp.opera.com/pub/opera/unix/freebsd/720/beta7/en/static/ \
		16	ftp://ftp.uit.no/pub/www/opera/unix/freebsd/720/beta7/en/static/ \
		17	ftp://ftp.task.gda.pl/pub/opera/unix/freebsd/720/beta7/en/static/ \
		18	http://ftp.task.gda.pl/pub/opera/unix/freebsd/720/beta7/en/static/ \
		19	ftp://ftp.sunet.se/pub/www/clients/Opera/unix/freebsd/720/beta7/en/static/ \
		20	http://ftp.sunet.se/pub/www/clients/Opera/unix/freebsd/720/beta7/en/static/ \
		21	http://sunsite.cnlab-switch.ch/ftp/mirror/opera/unix/freebsd/720/beta7/en/static/
12	DISTNAME= ${PORTNAME}-${PORTVERSION:S/0./0-/}.1-static-qt.i386.freebsd	22	DISTNAME= ${PORTNAME}-${PORTVERSION:S/0./0-/}.1-static-qt.i386.freebsd
13		23
14	MAINTAINER= avleeuwen@piwebs.com	24	MAINTAINER= avleeuwen@piwebs.com

Lines 1-6 Link Here

(-)opera/files/patch-install.sh (-65 / +36 lines)
1	--- install.sh.orig Mon Aug 11 16:27:15 2003	1	--- install.sh.orig Wed Aug 27 18:18:06 2003
2	+++ install.sh Tue Aug 12 22:44:18 2003	2	+++ install.sh Sat Aug 30 13:24:01 2003
3	@@ -712,27 +712,17 @@	3	@@ -711,9 +711,7 @@
4		4
5	wrapper_opera_plugin_paths=" \"\${HOME}/.opera/plugins\" \\	5	wrapper_opera_plugin_paths=" \"\${HOME}/.opera/plugins\" \\
6	${plugin_dir} \\	6	${plugin_dir} \\
Lines 11-39 Link Here
11		11
12	case "${machine}:${os}" in	12	case "${machine}:${os}" in
13	i[3456]86:Linux\|i[3456]86:FreeBSD\|i[3456]86:NetBSD\|i[3456]86:OpenBSD)	13	i[3456]86:Linux\|i[3456]86:FreeBSD\|i[3456]86:NetBSD\|i[3456]86:OpenBSD)
14	wrapper_plugin_paths="	14	@@ -727,7 +725,6 @@
15	/usr/local/Acrobat[45]/Browsers/intellinux \\	15	/usr/java/jre1.4.0/plugin/i386/ns4 \\
16	- /usr/lib/Acrobat[45]/Browsers/intellinux \\	16	/usr/java/jre1.3.1/plugin/i386/ns4 \\
17	- /usr/X11R6/lib/Acrobat[45]/Browsers/intellinux \\	17	/usr/lib/j2re1.3/plugin/i386/netscape4 \\
18	- /opt/Acrobat[45]/Browsers/intellinux \\
19	- /usr/Acrobat[45]/Browsers/intellinux \\
20	- /usr/j2se/jre/plugin/i386/ns4 \\
21	- /usr/java/jre1.4.0/plugin/i386/ns4 \\
22	- /usr/java/jre1.3.1/plugin/i386/ns4 \\
23	- /usr/lib/j2re1.3/plugin/i386/netscape4 \\
24	- /usr/local/jdk1.3.1/jre/plugin/i386/ns4 \\	18	- /usr/local/jdk1.3.1/jre/plugin/i386/ns4 \\
25	- /usr/local/linux-jdk1.3.1/jre/plugin/i386/ns4 \\"	19	/usr/local/linux-jdk1.3.1/jre/plugin/i386/ns4 \\"
26	+ /usr/local/linux-sun-jdk1.[34].1/jre/plugin/i386/ns4 \\
27	+ /usr/local/linux-blackdown-jdk1.[34].1/jre/plugin/i386/netscape4 \\"
28	wrapper_ibmjava="	20	wrapper_ibmjava="
29	- IBMJava2-14/jre \\	21	IBMJava2-141/jre \\
30	- IBMJava2-131/jre \\"	22	@@ -779,15 +776,10 @@
31	+ linux-ibm-jdk1.3.1/jre \\
32	+ linux-ibm-jdk1.4.0/jre \\"
33	wrapper_sunjava_machine="i386"
34	;;
35
36	@@ -779,15 +769,9 @@
37	;;	23	;;
38	esac	24	esac
39	wrapper_netscape_plugin_paths="	25	wrapper_netscape_plugin_paths="
Lines 42-47 Link Here
42	- /usr/lib/RealPlayer8 \\	28	- /usr/lib/RealPlayer8 \\
43	- /usr/lib/realplay \\	29	- /usr/lib/realplay \\
44	+ /usr/local/lib/RealPlayer8/Plugins \\	30	+ /usr/local/lib/RealPlayer8/Plugins \\
		31	+ /usr/X11R6/lib/browser_plugins \\
45	\"\${HOME}/.netscape/plugins\" \\	32	\"\${HOME}/.netscape/plugins\" \\
46	- /opt/netscape/plugins \\	33	- /opt/netscape/plugins \\
47	- /usr/lib/netscape/plugins \\	34	- /usr/lib/netscape/plugins \\
Lines 51-91 Link Here
51		38
52	wrapper_file="${wrapper_dir}/opera"	39	wrapper_file="${wrapper_dir}/opera"
53		40
54	@@ -846,28 +830,13 @@	41	@@ -909,7 +901,7 @@
55
56	if test ! \"\${OPERA_JAVA_DIR}\"; then
57		42
58	- PREFIXES=\"	43	# Workaround for the \"preloaded libXt\" problem.
59	- /usr	44	# To disable the first workaround, comment the next line.
60	- /usr/java	45	- JAVA_WORKAROUND=`LD_PRELOAD=\"\${OPERA_JAVA_DIR}/libawt.so\" /bin/echo works 2>/dev/null`
61	- /usr/lib	46	+ #JAVA_WORKAROUND=`LD_PRELOAD=\"\${OPERA_JAVA_DIR}/libawt.so\" /bin/echo works 2>/dev/null`
62	- /usr/local	47
63	- /opt\"	48	if test \"\${JAVA_WORKAROUND}\" = 'works'; then
64	+ PREFIXES=\"/usr/local\"	49	LD_PRELOAD=\"\${OPERA_JAVA_DIR}/libawt.so\"
65		50	@@ -918,7 +910,7 @@
66	for SUNJAVA in \\	51	fi
67	- j2re1.4.1_01 \\	52	else
68	- j2re1.4.1 \\	53	# To disable the second workaround, comment the next line.
69	- j2re1.4.0_01 \\	54	- JAVA_WORKAROUND2=`LD_PRELOAD=\"libawt.so\" /bin/echo works 2>/dev/null`
70	- j2sdk1.4.0_01/jre \\	55	+ #JAVA_WORKAROUND2=`LD_PRELOAD=\"libawt.so\" /bin/echo works 2>/dev/null`
71	- j2re1.4.0 \\	56	if test \"\${JAVA_WORKAROUND2}\" = 'works'; then
72	- jre1.4.0 \\	57	LD_PRELOAD=\"libawt.so\"
73	- j2se/1.4/jre \\	58	OPERA_FORCE_JAVA_ENABLED=\"1\"
74	- j2se/1.3/jre \\	59	@@ -943,11 +935,8 @@
75	- j2se/jre \\
76	- jre1.3.1_02 \\
77	- jre1.3.1_01 \\
78	- j2re1.3.1 \\
79	- jre1.3.1 \\
80	- j2re1.3 \\
81	+ linux-blackdown-jdk1.3.1/jre \\
82	+ linux-blackdown-jdk1.4.1/jre \\
83	+ linux-sun-jdk1.3.1/jre \\
84	+ linux-sun-jdk1.4.1/jre \\
85	; do
86	for PREFIX in \${PREFIXES}; do
87	if test -f \"\${PREFIX}/\${SUNJAVA}/lib/${wrapper_sunjava_machine}/libjava.so\"; then OPERA_JAVA_DIR=\"\${PREFIX}/\${SUNJAVA}/lib/${wrapper_sunjava_machine}\" && break; fi
88	@@ -912,11 +881,8 @@
89		60
90	# Acrobat Reader	61	# Acrobat Reader
91	for BINDIR in \\	62	for BINDIR in \\
Lines 99-107 Link Here
99	; do	70	; do
100	if test -d \${BINDIR} ; then PATH=\${PATH}:\${BINDIR}; fi	71	if test -d \${BINDIR} ; then PATH=\${PATH}:\${BINDIR}; fi
101	done	72	done
102	@@ -1116,44 +1082,6 @@	73	@@ -1178,44 +1167,6 @@
103	cp $cpv $cpf plugins/operamotifwrapper plugins/operaplugincleaner plugins/libnpp.so $plugin_dir/	74	echo "This package does not contain support for Netscape Plug-ins.\n"
104	chmod $chmodv 755 $plugin_dir/operamotifwrapper $plugin_dir/operaplugincleaner $plugin_dir/libnpp.so	75	fi
105		76
106	- # System wide configuration files	77	- # System wide configuration files
107	- config_dir='/usr/local/etc'	78	- config_dir='/usr/local/etc'
Lines 144-150 Link Here
144	# Shorcuts and Icons	115	# Shorcuts and Icons
145	icons	116	icons
146	gnome	117	gnome
147	@@ -1249,22 +1177,22 @@	118	@@ -1311,22 +1262,22 @@
148		119
149	debug_msg 0 "in icons()"	120	debug_msg 0 "in icons()"
150		121
Lines 179-185 Link Here
179	fi	150	fi
180		151
181	if test ! -d /etc/X11/wmconfig/; then	152	if test ! -d /etc/X11/wmconfig/; then
182	@@ -1330,36 +1258,36 @@	153	@@ -1392,36 +1343,36 @@
183	fi	154	fi
184	# end /opt/gnome share	155	# end /opt/gnome share
185		156
Lines 238-244 Link Here
238	fi	209	fi
239	# Add ximian here	210	# Add ximian here
240	}	211	}
241	@@ -1396,12 +1324,12 @@	212	@@ -1458,12 +1409,12 @@
242		213
243	fi	214	fi
244		215
Lines 256-262 Link Here
256	fi	227	fi
257	}	228	}
258		229
259	@@ -1425,8 +1353,8 @@	230	@@ -1487,8 +1438,8 @@
260	fi	231	fi
261	if test -w /opt/kde/share/applnk/Internet; then generate_desktop /opt/kde/share/applnk/Internet; fi	232	if test -w /opt/kde/share/applnk/Internet; then generate_desktop /opt/kde/share/applnk/Internet; fi
262		233