Attachment #43510 for bug #67539

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




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

OPERA_VER=	7.51
OPERA_REL=	final
OPERA_DATE=	20040602

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

USE_BZIP2=	yes
WANT_GNOME=	yes
USE_X_PREFIX=	yes
USE_REINPLACE=	yes
ONLY_FOR_ARCHS=	i386

LIB_DEPENDS+=	c_r.4:${PORTSDIR}/misc/compat4x
.endif

.if ${HAVE_GNOME:Mgnomehier}!=""
PLIST_SUB+=	APPLNK=""
.else
PLIST_SUB+=	APPLNK="@comment "
.endif

.if exists(${X11BASE}/share/gnome)
PLIST_SUB+=	GNOME=""
.else
PLIST_SUB+=	GNOME="@comment "
.endif

.if exists(${LOCALBASE}/bin/kde-config)
PLIST_SUB+=	KDE=""
.else
PLIST_SUB+=	KDE="@comment "
.endif

.if exists(${X11BASE}/share/applnk/Networking)
PLIST_SUB+=	KDE2=""
.else
PLIST_SUB+=	KDE2="@comment "
.endif

.if exists(${X11BASE}/share/gnome/apps)
PLIST_SUB+=	GNOMELNK=""
.else
PLIST_SUB+=	GNOMELNK="@comment "
.endif

post-patch:
	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g ; \
		s|%%LOCALBASE%%|${LOCALBASE}|g ; s|%%X11BASE%%|${X11BASE}|g' \
			${WRKSRC}/install.sh \
			${WRKSRC}/ini/spellcheck.ini
	@${RM} ${WRKSRC}/ini/spellcheck.ini.*

do-install:
	(cd ${WRKSRC} && ./install.sh --prefix=${PREFIX})

Lines 1-2 Link Here

(-)opera/distinfo (-2 / +2 lines)
1	MD5 (opera-7.50-20040511.1-static-qt.i386.freebsd-en.tar.bz2) = 1438a8708cfc8cda9ae9e14c1fc72dd9	1	MD5 (opera-7.51-20040602.1-static-qt.i386.freebsd-en.tar.bz2) = a5ceba358ddf1f034f69805ae919b6ec
2	SIZE (opera-7.50-20040511.1-static-qt.i386.freebsd-en.tar.bz2) = 4754897	2	SIZE (opera-7.51-20040602.1-static-qt.i386.freebsd-en.tar.bz2) = 4757901

Line 0 Link Here

(-)opera/files/patch-ini::spellcheck.ini (+9 lines)
	1	--- ini/spellcheck.ini.orig Thu May 13 13:51:43 2004
	2	+++ ini/spellcheck.ini Thu May 13 13:52:00 2004
	3	@@ -3,5 +3,6 @@
	4	; This file is stored in UTF-8 encoding
	5
	6	[Spell Check]
	7	+Spell Check Engine=%%PREFIX%%/share/opera/bin/spellcheck.so
	8	Default Language=en
	9	Default Encoding=iso8859-1




--- install.sh.orig	Tue Jun  1 12:35:02 2004
+++ install.sh	Tue Jun  1 19:40:04 2004
@@ -760,9 +760,7 @@
 
     wrapper_opera_plugin_paths="    \"\${HOME}/.opera/plugins\" \\

+    /usr/local/share/opera/plugins \\"
 
     case "${machine}:${os}" in
 	i[3456]86:Linux|x86_64:Linux|i[3456]86:FreeBSD|i[3456]86:NetBSD|i[3456]86:OpenBSD)
@@ -817,15 +815,10 @@
 	;;
     esac

     ; do
     if test -d \${BINDIR} ; then PATH=\${PATH}:\${BINDIR}; fi
 done
@@ -1254,36 +1244,13 @@
 
 	if test -z "${OPERADESTDIR}"; then
 

+	#icons
 	gnome
 	kde 3
-	kde 2
-	kde1
-	mandrake
+	#kde 2
+	#kde1
+	#mandrake
 
 	fi # OPERADESTDIR
 
@@ -1367,22 +1334,22 @@
 
     debug_msg 0 "in icons()"
 

     fi
   
     if test ! -d /etc/X11/wmconfig/; then
@@ -1412,72 +1379,36 @@
 
     debug_msg 1 "in gnome()"
 
-    if test -d /opt/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
-	    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
-	  fi
-	elif test -w /opt/gnome/share/pixmaps; then cp $cpv $share_dir/images/opera.xpm /opt/gnome/share/pixmaps/opera.xpm
-	fi
-	# end /opt/gnome icon
-
-	# /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
-	    fi
-          elif test -d /opt/gnome/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
-	    fi
-	  elif test -w /opt/gnome/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
-          fi
-	fi
-	# end /opt/gnome link
-      fi
-      # end /opt/gnome share
-
-    elif test -d /usr/share/gnome/; then
+    if test -d %%X11PREFIX%%/share/gnome/; then
 
-        # /usr/share/gnome icon
-        if test ! -d /usr/share/gnome/pixmaps/; 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
+        # %%X11PREFIX%%/share/gnome icon
+        if test ! -d %%X11BASE%%/share/gnome/pixmaps/; then
+	  if test -w %%X11BASE%%/share/gnome; then
+	    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 /usr/share/gnome/pixmaps; then cp $cpv $share_dir/images/opera.xpm /usr/share/gnome/pixmaps/opera.xpm
+	elif test -w %%X11BASE%%/share/gnome/pixmaps; then cp $cpv $share_dir/images/opera.xpm %%X11BASE%%/share/gnome/pixmaps/opera.xpm
 	fi
-	# end /usr/share/gnome icon
+	# end %%X11PREFIX%%/share/gnome icon
 
-	# /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
+	# %%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
-          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
+           elif test -d %%X11BASE%%/share/gnome/apps/Networking/WWW/; then
+             if test -w %%X11BASE%%/share/gnome/apps/Networking/WWW; then
+             generate_desktop %%X11BASE%%/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
+          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 /usr/share/gnome link
+	# end %%X11BASE%%/share/gnome link
    fi
    # Add ximian here
 }
@@ -1488,39 +1419,31 @@
 
     debug_msg 1 "in kde()"
 
-    if test -d /opt/kde${1}/share; then
+    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; 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; 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; 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; 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 ! -d /usr/X11R6/share/applnk/Networking/WWW/ -a -w /usr/X11R6/share/applnk/Networking; then
+	    mkdir $mkdirv $mkdirp /usr/X11R6/share/applnk/Networking/WWW/
+	    chmod $chmodv 755 /usr/X11R6/share/applnk/Networking/WWW
       fi
-      if test -w /usr/share/applnk/Networking/WWW; then generate_desktop /usr/share/applnk/Networking/WWW ${1}; fi
-    fi
     fi
 }
 
 kde1()
@@ -1543,8 +1466,8 @@
       fi
       if test -w /opt/kde/share/applnk/Internet; then generate_desktop /opt/kde/share/applnk/Internet; fi
 

Lines 114-119 Link Here

(-)opera/pkg-plist (-5 / +11 lines)
114	%%DATADIR%%/styles/user/textonly.css	114	%%DATADIR%%/styles/user/textonly.css
115	%%DATADIR%%/styles/user/userstyle.ini	115	%%DATADIR%%/styles/user/userstyle.ini
116	%%DATADIR%%/styles/wml.css	116	%%DATADIR%%/styles/wml.css
		117	%%GNOME%%share/gnome/apps/Internet/linux-opera.desktop
		118	%%GNOME%%share/gnome/pixmaps/linux-opera.xpm
117	@dirrm %%DATADIR%%/styles/user	119	@dirrm %%DATADIR%%/styles/user
118	@dirrm %%DATADIR%%/styles	120	@dirrm %%DATADIR%%/styles
119	@dirrm %%DATADIR%%/skin	121	@dirrm %%DATADIR%%/skin
Lines 128-136 Link Here
128	@dirrm %%DATADIR%%/bin	130	@dirrm %%DATADIR%%/bin
129	@dirrm %%DATADIR%%	131	@dirrm %%DATADIR%%
130	@dirrm %%DOCSDIR%%	132	@dirrm %%DOCSDIR%%
		133
		134	%%KDE%%@cwd %%LOCALBASE%%
131	%%KDE%%share/applnk/Internet/opera.desktop	135	%%KDE%%share/applnk/Internet/opera.desktop
132	%%KDE2%%share/applnk/Networking/WWW/opera.desktop	136	%%KDE%%share/icons/hicolor/22x22/apps/opera.png
133	%%GNOMELNK%%share/gnome/apps/Internet/opera.desktop	137	%%KDE%%share/icons/hicolor/32x32/apps/opera.png
134	%%GNOME%%share/gnome/pixmaps/opera.xpm	138	%%KDE%%share/icons/hicolor/48x48/apps/opera.png
135	%%KDE2%%@dirrm share/applnk/Networking/WWW	139	%%KDE%%share/icons/locolor/16x16/apps/opera.png
136	%%APPLNK%%applnk/Internet/opera.desktop	140	%%KDE%%share/icons/locolor/22x22/apps/opera.png
		141	%%KDE%%share/icons/locolor/32x32/apps/opera.png
		142

Return to bug 67539

Lines 28-41 Link Here

(-)opera/Makefile (-24 / +10 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= 7.50	31	OPERA_VER= 7.51
32	OPERA_REL= final	32	OPERA_REL= final
33	OPERA_DATE= 20040511	33	OPERA_DATE= 20040602
34		34
35	DATADIR= ${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX}	35	DATADIR= ${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX}
36	DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}	36	DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}
37		37
38	USE_BZIP2= yes	38	USE_BZIP2= yes
		39	WANT_GNOME= yes
39	USE_X_PREFIX= yes	40	USE_X_PREFIX= yes
40	USE_REINPLACE= yes	41	USE_REINPLACE= yes
41	ONLY_FOR_ARCHS= i386	42	ONLY_FOR_ARCHS= i386
Lines 49-87 Link Here
49	LIB_DEPENDS+= c_r.4:${PORTSDIR}/misc/compat4x	50	LIB_DEPENDS+= c_r.4:${PORTSDIR}/misc/compat4x
50	.endif	51	.endif
51		52
52	.if exists(/etc/X11/applnk)	53	.if ${HAVE_GNOME:Mgnomehier}!=""
53	PLIST_SUB+= APPLNK=""
54	.else
55	PLIST_SUB+= APPLNK="@comment "
56	.endif
57
58	.if exists(${X11BASE}/share/gnome)
59	PLIST_SUB+= GNOME=""	54	PLIST_SUB+= GNOME=""
60	.else	55	.else
61	PLIST_SUB+= GNOME="@comment "	56	PLIST_SUB+= GNOME="@comment "
62	.endif	57	.endif
63		58
64	.if exists(${X11BASE}/share/applnk/Internet)	59	.if exists(${LOCALBASE}/bin/kde-config)
65	PLIST_SUB+= KDE=""	60	PLIST_SUB+= KDE=""
66	.else	61	.else
67	PLIST_SUB+= KDE="@comment "	62	PLIST_SUB+= KDE="@comment "
68	.endif	63	.endif
69		64
70	.if exists(${X11BASE}/share/applnk/Networking)
71	PLIST_SUB+= KDE2=""
72	.else
73	PLIST_SUB+= KDE2="@comment "
74	.endif
75
76	.if exists(${X11BASE}/share/gnome/apps)
77	PLIST_SUB+= GNOMELNK=""
78	.else
79	PLIST_SUB+= GNOMELNK="@comment "
80	.endif
81
82	post-patch:	65	post-patch:
83	@${REINPLACE_CMD} -e 's\|%%X11PREFIX%%\|${X11BASE}\|g ; \	66	@${REINPLACE_CMD} -e 's\|%%PREFIX%%\|${PREFIX}\|g ; \
84	s\|%%LOCALBASE%%\|${LOCALBASE}\|g' ${WRKSRC}/install.sh	67	s\|%%LOCALBASE%%\|${LOCALBASE}\|g ; s\|%%X11BASE%%\|${X11BASE}\|g' \
		68	${WRKSRC}/install.sh \
		69	${WRKSRC}/ini/spellcheck.ini
		70	@${RM} ${WRKSRC}/ini/spellcheck.ini.*
85		71
86	do-install:	72	do-install:
87	(cd ${WRKSRC} && ./install.sh --prefix=${PREFIX})	73	(cd ${WRKSRC} && ./install.sh --prefix=${PREFIX})

Lines 1-5 Link Here

(-)opera/files/patch-install.sh (-41 / +119 lines)
1	--- install.sh.orig Fri Nov 21 13:52:17 2003	1	--- install.sh.orig Tue Jun 1 12:35:02 2004
2	+++ install.sh Thu Apr 15 13:32:10 2004	2	+++ install.sh Tue Jun 1 19:40:04 2004
3	@@ -760,9 +760,7 @@	3	@@ -760,9 +760,7 @@
4		4
5	wrapper_opera_plugin_paths=" \"\${HOME}/.opera/plugins\" \\	5	wrapper_opera_plugin_paths=" \"\${HOME}/.opera/plugins\" \\
Lines 10-16 Link Here
10	+ /usr/local/share/opera/plugins \\"	10	+ /usr/local/share/opera/plugins \\"
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\|x86_64:Linux\|i[3456]86:FreeBSD\|i[3456]86:NetBSD\|i[3456]86:OpenBSD)
14	@@ -817,15 +815,10 @@	14	@@ -817,15 +815,10 @@
15	;;	15	;;
16	esac	16	esac
Lines 44-50 Link Here
44	; do	44	; do
45	if test -d \${BINDIR} ; then PATH=\${PATH}:\${BINDIR}; fi	45	if test -d \${BINDIR} ; then PATH=\${PATH}:\${BINDIR}; fi
46	done	46	done
47	@@ -1245,31 +1235,8 @@	47	@@ -1254,36 +1244,13 @@
48		48
49	if test -z "${OPERADESTDIR}"; then	49	if test -z "${OPERADESTDIR}"; then
50		50
Lines 76-83 Link Here
76	+ #icons	76	+ #icons
77	gnome	77	gnome
78	kde 3	78	kde 3
79	kde 2	79	- kde 2
80	@@ -1358,22 +1325,22 @@	80	- kde1
		81	- mandrake
		82	+ #kde 2
		83	+ #kde1
		84	+ #mandrake
		85
		86	fi # OPERADESTDIR
		87
		88	@@ -1367,22 +1334,22 @@
81		89
82	debug_msg 0 "in icons()"	90	debug_msg 0 "in icons()"
83		91
Lines 112-123 Link Here
112	fi	120	fi
113		121
114	if test ! -d /etc/X11/wmconfig/; then	122	if test ! -d /etc/X11/wmconfig/; then
115	@@ -1439,33 +1406,33 @@	123	@@ -1412,72 +1379,36 @@
116	fi	124
117	# end /opt/gnome share	125	debug_msg 1 "in gnome()"
118		126
		127	- if test -d /opt/gnome/; then
		128	-
		129	- # /opt/gnome share
		130	- if test -d /opt/gnome/share; then
		131	-
		132	- # /opt/gnome icon
		133	- if test ! -d /opt/gnome/share/pixmaps/; then
		134	- if test -w /opt/gnome/share; then
		135	- mkdir $mkdirv $mkdirp /opt/gnome/share/pixmaps/
		136	- chmod $chmodv 755 /opt/gnome/share/pixmaps
		137	- cp $cpv $share_dir/images/opera.xpm /opt/gnome/share/pixmaps/opera.xpm
		138	- fi
		139	- elif test -w /opt/gnome/share/pixmaps; then cp $cpv $share_dir/images/opera.xpm /opt/gnome/share/pixmaps/opera.xpm
		140	- fi
		141	- # end /opt/gnome icon
		142	-
		143	- # /opt/gnome link
		144	- if test -d /opt/gnome/share/gnome/apps/; then
		145	- if test -d /opt/gnome/share/gnome/apps/Internet/; then
		146	- if test -w /opt/gnome/share/gnome/apps/Internet; then
		147	- generate_desktop /opt/gnome/share/gnome/apps/Internet
		148	- fi
		149	- elif test -d /opt/gnome/share/gnome/apps/Networking/WWW/; then
		150	- if test -w /opt/gnome/share/gnome/apps/Networking/WWW; then
		151	- generate_desktop /opt/gnome/share/gnome/apps/Networking/WWW
		152	- fi
		153	- elif test -w /opt/gnome/share/gnome/apps; then
		154	- mkdir $mkdirv $mkdirp /opt/gnome/share/gnome/apps/Internet/
		155	- chmod $chmodv 755 /opt/gnome/share/gnome/apps/Internet
		156	- generate_desktop /opt/gnome/share/gnome/apps/Internet
		157	- fi
		158	- fi
		159	- # end /opt/gnome link
		160	- fi
		161	- # end /opt/gnome share
		162	-
119	- elif test -d /usr/share/gnome/; then	163	- elif test -d /usr/share/gnome/; then
120	+ elif test -d /usr/X11R6/share/gnome/; then	164	+ if test -d %%X11PREFIX%%/share/gnome/; then
121		165
122	- # /usr/share/gnome icon	166	- # /usr/share/gnome icon
123	- if test ! -d /usr/share/gnome/pixmaps/; then	167	- if test ! -d /usr/share/gnome/pixmaps/; then
Lines 125-191 Link Here
125	- mkdir $mkdirv $mkdirp /usr/share/gnome/pixmaps/	169	- mkdir $mkdirv $mkdirp /usr/share/gnome/pixmaps/
126	- chmod $chmodv 755 /usr/share/gnome/pixmaps	170	- chmod $chmodv 755 /usr/share/gnome/pixmaps
127	- cp $cpv $share_dir/images/opera.xpm /usr/share/gnome/pixmaps/opera.xpm	171	- cp $cpv $share_dir/images/opera.xpm /usr/share/gnome/pixmaps/opera.xpm
128	+ # /usr/X11R6/share/gnome icon	172	+ # %%X11PREFIX%%/share/gnome icon
129	+ if test ! -d /usr/X11R6/share/gnome/pixmaps/; then	173	+ if test ! -d %%X11BASE%%/share/gnome/pixmaps/; then
130	+ if test -w /usr/X11R6/share/gnome; then	174	+ if test -w %%X11BASE%%/share/gnome; then
131	+ mkdir $mkdirv $mkdirp /usr/X11R6/share/gnome/pixmaps/	175	+ mkdir $mkdirv $mkdirp %%X11BASE%%/share/gnome/pixmaps/
132	+ chmod $chmodv 755 /usr/X11R6/share/gnome/pixmaps	176	+ chmod $chmodv 755 %%X11BASE%%/share/gnome/pixmaps
133	+ cp $cpv $share_dir/images/opera.xpm /usr/X11R6/share/gnome/pixmaps/opera.xpm	177	+ cp $cpv $share_dir/images/opera.xpm %%X11BASE%%/share/gnome/pixmaps/opera.xpm
134	fi	178	fi
135	- elif test -w /usr/share/gnome/pixmaps; then cp $cpv $share_dir/images/opera.xpm /usr/share/gnome/pixmaps/opera.xpm	179	- elif test -w /usr/share/gnome/pixmaps; then cp $cpv $share_dir/images/opera.xpm /usr/share/gnome/pixmaps/opera.xpm
136	+ elif test -w /usr/X11R6/share/gnome/pixmaps; then cp $cpv $share_dir/images/opera.xpm /usr/X11R6/share/gnome/pixmaps/opera.xpm	180	+ elif test -w %%X11BASE%%/share/gnome/pixmaps; then cp $cpv $share_dir/images/opera.xpm %%X11BASE%%/share/gnome/pixmaps/opera.xpm
137	fi	181	fi
138	- # end /usr/share/gnome icon	182	- # end /usr/share/gnome icon
139	+ # end /usr/X11R6/share/gnome icon	183	+ # end %%X11PREFIX%%/share/gnome icon
140		184
141	- # /usr/share/gnome link	185	- # /usr/share/gnome link
142	- if test -d /usr/share/gnome/apps/; then	186	- if test -d /usr/share/gnome/apps/; then
143	- if test -d /usr/share/gnome/apps/Internet/; then	187	- if test -d /usr/share/gnome/apps/Internet/; then
144	- if test -w /usr/share/gnome/apps/Internet; then	188	- if test -w /usr/share/gnome/apps/Internet; then
145	- generate_desktop /usr/share/gnome/apps/Internet	189	- generate_desktop /usr/share/gnome/apps/Internet
146	+ # /usr/X11R6/share/gnome link	190	+ # %%X11BASE%%/share/gnome link
147	+ if test -d /usr/X11R6/share/gnome/apps/; then	191	+ if test -d %%X11BASE%%/share/gnome/apps/; then
148	+ if test -d /usr/X11R6/share/gnome/apps/Internet/; then	192	+ if test -d %%X11BASE%%/share/gnome/apps/Internet/; then
149	+ if test -w /usr/X11R6/share/gnome/apps/Internet; then	193	+ if test -w %%X11BASE%%/share/gnome/apps/Internet; then
150	+ generate_desktop /usr/X11R6/share/gnome/apps/Internet	194	+ generate_desktop %%X11BASE%%/share/gnome/apps/Internet
151	fi	195	fi
152	- elif test -d /usr/share/gnome/apps/Networking/WWW/; then	196	- elif test -d /usr/share/gnome/apps/Networking/WWW/; then
153	- if test -w /usr/share/gnome/apps/Networking/WWW; then	197	- if test -w /usr/share/gnome/apps/Networking/WWW; then
154	- generate_desktop /usr/share/gnome/apps/Networking/WWW	198	- generate_desktop /usr/share/gnome/apps/Networking/WWW
155	+ elif test -d /usr/X11R6/share/gnome/apps/Networking/WWW/; then	199	+ elif test -d %%X11BASE%%/share/gnome/apps/Networking/WWW/; then
156	+ if test -w /usr/X11R6/share/gnome/apps/Networking/WWW; then	200	+ if test -w %%X11BASE%%/share/gnome/apps/Networking/WWW; then
157	+ generate_desktop /usr/X11R6/share/gnome/apps/Networking/WWW	201	+ generate_desktop %%X11BASE%%/share/gnome/apps/Networking/WWW
158	fi	202	fi
159	- elif test -w /usr/share/gnome/apps; then	203	- elif test -w /usr/share/gnome/apps; then
160	- mkdir $mkdirv $mkdirp /usr/share/gnome/apps/Internet/	204	- mkdir $mkdirv $mkdirp /usr/share/gnome/apps/Internet/
161	- chmod $chmodv 755 /usr/share/gnome/apps/Internet	205	- chmod $chmodv 755 /usr/share/gnome/apps/Internet
162	- generate_desktop /usr/share/gnome/apps/Internet	206	- generate_desktop /usr/share/gnome/apps/Internet
163	+ elif test -w /usr/X11R6/share/gnome/apps; then	207	+ elif test -w %%X11BASE%%/share/gnome/apps; then
164	+ mkdir $mkdirv $mkdirp /usr/X11R6/share/gnome/apps/Internet/	208	+ mkdir $mkdirv $mkdirp %%X11BASE%%/share/gnome/apps/Internet/
165	+ chmod $chmodv 755 /usr/X11R6/share/gnome/apps/Internet	209	+ chmod $chmodv 755 %%X11BASE%%/share/gnome/apps/Internet
166	+ generate_desktop /usr/X11R6/share/gnome/apps/Internet	210	+ generate_desktop %%X11BASE%%/share/gnome/apps/Internet
167	fi	211	fi
168	fi	212	fi
169	# end /usr/share/gnome link	213	- # end /usr/share/gnome link
170	@@ -1505,12 +1472,12 @@	214	+ # end %%X11BASE%%/share/gnome link
		215	fi
		216	# Add ximian here
		217	}
		218	@@ -1488,39 +1419,31 @@
		219
		220	debug_msg 1 "in kde()"
		221
		222	- if test -d /opt/kde${1}/share; then
		223	+ if test -d %%LOCALBASE%%/share; then
		224
		225	- DIR_HI=/opt/kde${1}/share/icons/hicolor
		226	+ DIR_HI=%%LOCALBASE%%/share/icons/hicolor
		227	if test -d "$DIR_HI" -a -w "$DIR_HI"; then
		228	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
		229	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
		230	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
		231	fi
		232
		233	- DIR_LO=/opt/kde${1}/share/icons/locolor
		234	+ DIR_LO=%%LOCALBASE%%/share/icons/locolor
		235	if test -d $DIR_LO -a -w $DIR_LO; then
		236	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
		237	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
		238	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
		239	fi
		240
		241	- if test -d /opt/kde${1}/share/applnk/; then
		242	- if test ! -d /opt/kde${1}/share/applnk/Internet/ -a -w /opt/kde${1}/share/applnk; then
		243	- mkdir $mkdirv $mkdirp /opt/kde${1}/share/applnk/Internet/
		244	- chmod $chmodv 755 /opt/kde${1}/share/applnk/Internet
		245	+ if test -d %%LOCALBASE%%/share/applnk/; then
		246	+ if test ! -d %%LOCALBASE%%/share/applnk/Internet/ -a -w %%LOCALBASE%%/share/applnk; then
		247	+ mkdir $mkdirv $mkdirp %%LOCALBASE%%/share/applnk/Internet/
		248	+ chmod $chmodv 755 %%LOCALBASE%%/share/applnk/Internet
		249	fi
		250	- if test -w /opt/kde${1}/share/applnk/Internet; then generate_desktop /opt/kde${1}/share/applnk/Internet ${1}; fi
		251	+ if test -w %%LOCALBASE%%/share/applnk/Internet; then generate_desktop %%LOCALBASE%%/share/applnk/Internet ${1}; fi
		252	fi
171		253
172	fi	254	fi
173		255	-
174	- if test -d /usr/share/applnk/Networking; then	256	- if test -d /usr/share/applnk/Networking; then
175	- if test ! -d /usr/share/applnk/Networking/WWW/ -a -w /usr/share/applnk/Networking; then	257	- if test ! -d /usr/share/applnk/Networking/WWW/ -a -w /usr/share/applnk/Networking; then
176	- mkdir $mkdirv $mkdirp /usr/share/applnk/Networking/WWW/	258	- mkdir $mkdirv $mkdirp /usr/share/applnk/Networking/WWW/
177	- chmod $chmodv 755 /usr/share/applnk/Networking/WWW	259	- chmod $chmodv 755 /usr/share/applnk/Networking/WWW
178	+ if test -d /usr/X11R6/share/applnk/Networking; then	260	- fi
179	+ if test ! -d /usr/X11R6/share/applnk/Networking/WWW/ -a -w /usr/X11R6/share/applnk/Networking; then
180	+ mkdir $mkdirv $mkdirp /usr/X11R6/share/applnk/Networking/WWW/
181	+ chmod $chmodv 755 /usr/X11R6/share/applnk/Networking/WWW
182	fi
183	- if test -w /usr/share/applnk/Networking/WWW; then generate_desktop /usr/share/applnk/Networking/WWW ${1}; fi	261	- if test -w /usr/share/applnk/Networking/WWW; then generate_desktop /usr/share/applnk/Networking/WWW ${1}; fi
184	+ if test -w /usr/X11R6/share/applnk/Networking/WWW; then generate_desktop /usr/X11R6/share/applnk/Networking/WWW ${1}; fi	262	- fi
185	fi
186	}	263	}
187		264
188	@@ -1534,8 +1501,8 @@	265	kde1()
		266	@@ -1543,8 +1466,8 @@
189	fi	267	fi
190	if test -w /opt/kde/share/applnk/Internet; then generate_desktop /opt/kde/share/applnk/Internet; fi	268	if test -w /opt/kde/share/applnk/Internet; then generate_desktop /opt/kde/share/applnk/Internet; fi
191		269