Date: Thu, 15 Apr 2004 13:39:49 +0200 From: "Arjan van Leeuwen" <avleeuwen@piwebs.com> To: "FreeBSD gnats submit" <FreeBSD-gnats-submit@FreeBSD.org> Cc: sf@FreeBSD.org Subject: ports/65569: www/opera: Remove obsolete dependency and change install script Message-ID: <1082029189.0@vincent.piwebs.com> Resent-Message-ID: <200404151140.i3FBeO97056685@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 65569
>Category: ports
>Synopsis: www/opera: Remove obsolete dependency and change install script
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Thu Apr 15 04:40:24 PDT 2004
>Closed-Date:
>Last-Modified:
>Originator: Arjan van Leeuwen
>Release: FreeBSD 5.2-CURRENT i386
>Organization:
>Environment:
System: FreeBSD 5.2-CURRENT #0: Fri Apr 9 15:16:33 CEST 2004
root@vincent.piwebs.com:/usr/obj/usr/src/sys/AMD760
>Description:
This patch to www/opera removes the LIB_DEPENDS on
libpng, since that's now statically compiled in, and changes
the install script so that it doesn't install icons in weird
places.
>How-To-Repeat:
>Fix:
--- opera.diff begins here ---
diff -urN /usr/ports/www/opera/Makefile opera/Makefile
--- /usr/ports/www/opera/Makefile Sat Dec 13 00:20:36 2003
+++ opera/Makefile Thu Apr 15 13:35:10 2004
@@ -25,8 +25,6 @@
CONFLICTS= linux-opera-*
-LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png
-
USE_BZIP2= yes
USE_X_PREFIX= yes
USE_REINPLACE= yes
diff -urN /usr/ports/www/opera/files/patch-install.sh opera/files/patch-install.sh
--- /usr/ports/www/opera/files/patch-install.sh Thu Oct 9 19:13:27 2003
+++ opera/files/patch-install.sh Thu Apr 15 13:32:22 2004
@@ -1,5 +1,5 @@
---- install.sh.orig Mon Oct 6 15:01:39 2003
-+++ install.sh Wed Oct 8 22:36:31 2003
+--- install.sh.orig Fri Nov 21 13:52:17 2003
++++ install.sh Thu Apr 15 13:32:10 2004
@@ -760,9 +760,7 @@
wrapper_opera_plugin_paths=" \"\${HOME}/.opera/plugins\" \\
@@ -30,7 +30,7 @@
wrapper_file="${wrapper_dir}/opera"
-@@ -981,11 +974,8 @@
+@@ -983,11 +976,8 @@
# Acrobat Reader
for BINDIR in \\
@@ -44,7 +44,7 @@
; do
if test -d \${BINDIR} ; then PATH=\${PATH}:\${BINDIR}; fi
done
-@@ -1243,29 +1233,6 @@
+@@ -1245,31 +1235,8 @@
if test -z "${OPERADESTDIR}"; then
@@ -72,9 +72,12 @@
- fi
-
# Shorcuts and Icons
- icons
+- icons
++ #icons
gnome
-@@ -1356,22 +1323,22 @@
+ kde 3
+ kde 2
+@@ -1358,22 +1325,22 @@
debug_msg 0 "in icons()"
@@ -109,7 +112,7 @@
fi
if test ! -d /etc/X11/wmconfig/; then
-@@ -1437,33 +1404,33 @@
+@@ -1439,33 +1406,33 @@
fi
# end /opt/gnome share
@@ -164,7 +167,7 @@
fi
fi
# end /usr/share/gnome link
-@@ -1503,12 +1470,12 @@
+@@ -1505,12 +1472,12 @@
fi
@@ -182,7 +185,7 @@
fi
}
-@@ -1532,8 +1499,8 @@
+@@ -1534,8 +1501,8 @@
fi
if test -w /opt/kde/share/applnk/Internet; then generate_desktop /opt/kde/share/applnk/Internet; fi
diff -urN /usr/ports/www/opera/pkg-plist opera/pkg-plist
--- /usr/ports/www/opera/pkg-plist Sat Apr 10 20:44:16 2004
+++ opera/pkg-plist Thu Apr 15 13:32:40 2004
@@ -128,7 +128,4 @@
%%GNOMELNK:%%share/gnome/apps/Internet/opera.desktop
%%GNOME:%%share/gnome/pixmaps/opera.xpm
%%KDE2:%%@dirrm share/applnk/Networking/WWW
-
-@cwd /etc/X11
-wmconfig/opera
%%APPLNK:%%applnk/Internet/opera.desktop
--- opera.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1082029189.0>