diff options
-rw-r--r-- | www/linux-opera-devel/Makefile | 12 | ||||
-rw-r--r-- | www/linux-opera-devel/distinfo | 2 | ||||
-rw-r--r-- | www/linux-opera-devel/files/patch-aa | 54 | ||||
-rw-r--r-- | www/linux-opera-devel/pkg-plist | 2 | ||||
-rw-r--r-- | www/linux-opera/Makefile | 12 | ||||
-rw-r--r-- | www/linux-opera/distinfo | 2 | ||||
-rw-r--r-- | www/linux-opera/files/patch-aa | 54 | ||||
-rw-r--r-- | www/linux-opera/pkg-plist | 2 | ||||
-rw-r--r-- | www/linux-opera7/Makefile | 12 | ||||
-rw-r--r-- | www/linux-opera7/distinfo | 2 | ||||
-rw-r--r-- | www/linux-opera7/files/patch-aa | 54 | ||||
-rw-r--r-- | www/linux-opera7/pkg-plist | 2 |
12 files changed, 180 insertions, 30 deletions
diff --git a/www/linux-opera-devel/Makefile b/www/linux-opera-devel/Makefile index 01d8b3ca2731..36ce460269c5 100644 --- a/www/linux-opera-devel/Makefile +++ b/www/linux-opera-devel/Makefile @@ -6,12 +6,12 @@ # PORTNAME= opera -PORTVERSION= 6.01.20020523 +PORTVERSION= 6.02.20020701 CATEGORIES= www linux -MASTER_SITES= http://opera.online.no/linux/601/final/en/qt_static/ \ - ftp://ftp.opera.com/pub/opera/linux/601/final/en/qt_static/ +MASTER_SITES= http://opera.online.no/linux/602/final/en/qt_static/ \ + ftp://ftp.opera.com/pub/opera/linux/602/final/en/qt_static/ PKGNAMEPREFIX= linux- -DISTNAME= ${PORTNAME}-${PORTVERSION:S/01./01-/}.1-static-qt.i386 +DISTNAME= ${PORTNAME}-${PORTVERSION:S/02./02-/}.1-static-qt.i386 MAINTAINER= des@FreeBSD.org @@ -20,13 +20,15 @@ RUN_DEPENDS= ${LINUXBASE}/usr/X11R6/lib/libXm.so.2:${PORTSDIR}/x11-toolkits/linu USE_BZIP2= yes USE_LINUX= yes +USE_REINPLACE= yes ONLY_FOR_ARCHS= i386 NO_BUILD= yes NO_FILTER_SHLIBS=yes do-configure: - ${PERL} -pi -e 's|%%PREFIX%%|${PREFIX}|g; s|%%DATADIR%%|${DATADIR}|g'\ + ${REINPLACE_CMD} -e \ + 's|%%PREFIX%%|${PREFIX}|g; s|%%DATADIR%%|${DATADIR}|g'\ ${WRKSRC}/install.sh do-install: diff --git a/www/linux-opera-devel/distinfo b/www/linux-opera-devel/distinfo index 7a05f1c0eba7..4c03007a2fe5 100644 --- a/www/linux-opera-devel/distinfo +++ b/www/linux-opera-devel/distinfo @@ -1 +1 @@ -MD5 (opera-6.01-20020523.1-static-qt.i386.tar.bz2) = df98bb498d7c6907fb340121d899d0fd +MD5 (opera-6.02-20020701.1-static-qt.i386.tar.bz2) = 3e2679ff4bbe6a17f5ab33db72020596 diff --git a/www/linux-opera-devel/files/patch-aa b/www/linux-opera-devel/files/patch-aa index ac0e3d9a46af..c488ec3e3586 100644 --- a/www/linux-opera-devel/files/patch-aa +++ b/www/linux-opera-devel/files/patch-aa @@ -1,6 +1,6 @@ ---- install.sh.orig Thu May 23 13:34:04 2002 -+++ install.sh Mon May 27 14:25:51 2002 -@@ -737,6 +737,16 @@ +--- install.sh.orig Wed Jul 3 18:05:43 2002 ++++ install.sh Wed Jul 3 18:06:06 2002 +@@ -751,6 +751,16 @@ /usr/lib/j2re1.3/plugin/i386/netscape4 \\" ;; @@ -17,7 +17,7 @@ mips*:Linux) wrapper_plugin_paths='' ;; -@@ -799,7 +809,7 @@ +@@ -813,7 +823,7 @@ # Acrobat Reader for BINDIR in \\ @@ -26,3 +26,49 @@ /usr/lib/Acrobat[45]/bin \\ /usr/X11R6/lib/Acrobat[45]/bin \\ /opt/Acrobat[45]/bin \\ +@@ -938,39 +948,15 @@ + ln $lns $lnf libnpp.so.$plugin_version_major.$plugin_version_minor.$plugin_version_release $plugin_dir/libnpp.so + + # System wide configuration files +- if can_write_to "/etc"; then +- echo +- echo "System wide configuration files:" +- echo " /etc/opera6rc" +- echo " /etc/opera6rc.fixed" +- echo " cannot be prefixed" +- echo "Do you want to install them [y,n | yes,no]?" +- while true; do +- read install_config +- case "${install_config}" in +- +- ''|y|Y|yes|YES) +- backup /etc/opera6rc opera6rc config +- backup /etc/opera6rc.fixed opera6rc.fixed config +- cp $cpv $cpf $cpp config/opera6rc /etc +- cp $cpv $cpf $cpp config/opera6rc.fixed /etc +- break +- ;; +- +- n|N|no|NO) +- break +- ;; +- *) +- echo 'Invalid answer, try again:' +- ;; +- esac +- done ++ if can_write_to "%%PREFIX%%/etc"; then ++ cp $cpv $cpf $cpp config/opera6rc %%PREFIX%%/etc ++ cp $cpv $cpf $cpp config/opera6rc.fixed %%PREFIX%%/etc + else + echo +- echo "User \"${USERNAME}\" does not have write access to /etc" ++ echo "User \"${USERNAME}\" does not have write access to %%PREFIX%%/etc" + echo " System wide configuration files:" +- echo " /etc/opera6rc" +- echo " /etc/opera6rc.fixed" ++ echo " %%PREFIX%%/etc/opera6rc" ++ echo " %%PREFIX%%/etc/opera6rc.fixed" + echo " were not installed" + fi + diff --git a/www/linux-opera-devel/pkg-plist b/www/linux-opera-devel/pkg-plist index 3d138a7aacad..8ed39c82e9c3 100644 --- a/www/linux-opera-devel/pkg-plist +++ b/www/linux-opera-devel/pkg-plist @@ -1,4 +1,6 @@ bin/opera +etc/opera6rc +etc/opera6rc.fixed share/doc/opera/LICENSE share/doc/opera/help share/opera/bin/opera diff --git a/www/linux-opera/Makefile b/www/linux-opera/Makefile index 01d8b3ca2731..36ce460269c5 100644 --- a/www/linux-opera/Makefile +++ b/www/linux-opera/Makefile @@ -6,12 +6,12 @@ # PORTNAME= opera -PORTVERSION= 6.01.20020523 +PORTVERSION= 6.02.20020701 CATEGORIES= www linux -MASTER_SITES= http://opera.online.no/linux/601/final/en/qt_static/ \ - ftp://ftp.opera.com/pub/opera/linux/601/final/en/qt_static/ +MASTER_SITES= http://opera.online.no/linux/602/final/en/qt_static/ \ + ftp://ftp.opera.com/pub/opera/linux/602/final/en/qt_static/ PKGNAMEPREFIX= linux- -DISTNAME= ${PORTNAME}-${PORTVERSION:S/01./01-/}.1-static-qt.i386 +DISTNAME= ${PORTNAME}-${PORTVERSION:S/02./02-/}.1-static-qt.i386 MAINTAINER= des@FreeBSD.org @@ -20,13 +20,15 @@ RUN_DEPENDS= ${LINUXBASE}/usr/X11R6/lib/libXm.so.2:${PORTSDIR}/x11-toolkits/linu USE_BZIP2= yes USE_LINUX= yes +USE_REINPLACE= yes ONLY_FOR_ARCHS= i386 NO_BUILD= yes NO_FILTER_SHLIBS=yes do-configure: - ${PERL} -pi -e 's|%%PREFIX%%|${PREFIX}|g; s|%%DATADIR%%|${DATADIR}|g'\ + ${REINPLACE_CMD} -e \ + 's|%%PREFIX%%|${PREFIX}|g; s|%%DATADIR%%|${DATADIR}|g'\ ${WRKSRC}/install.sh do-install: diff --git a/www/linux-opera/distinfo b/www/linux-opera/distinfo index 7a05f1c0eba7..4c03007a2fe5 100644 --- a/www/linux-opera/distinfo +++ b/www/linux-opera/distinfo @@ -1 +1 @@ -MD5 (opera-6.01-20020523.1-static-qt.i386.tar.bz2) = df98bb498d7c6907fb340121d899d0fd +MD5 (opera-6.02-20020701.1-static-qt.i386.tar.bz2) = 3e2679ff4bbe6a17f5ab33db72020596 diff --git a/www/linux-opera/files/patch-aa b/www/linux-opera/files/patch-aa index ac0e3d9a46af..c488ec3e3586 100644 --- a/www/linux-opera/files/patch-aa +++ b/www/linux-opera/files/patch-aa @@ -1,6 +1,6 @@ ---- install.sh.orig Thu May 23 13:34:04 2002 -+++ install.sh Mon May 27 14:25:51 2002 -@@ -737,6 +737,16 @@ +--- install.sh.orig Wed Jul 3 18:05:43 2002 ++++ install.sh Wed Jul 3 18:06:06 2002 +@@ -751,6 +751,16 @@ /usr/lib/j2re1.3/plugin/i386/netscape4 \\" ;; @@ -17,7 +17,7 @@ mips*:Linux) wrapper_plugin_paths='' ;; -@@ -799,7 +809,7 @@ +@@ -813,7 +823,7 @@ # Acrobat Reader for BINDIR in \\ @@ -26,3 +26,49 @@ /usr/lib/Acrobat[45]/bin \\ /usr/X11R6/lib/Acrobat[45]/bin \\ /opt/Acrobat[45]/bin \\ +@@ -938,39 +948,15 @@ + ln $lns $lnf libnpp.so.$plugin_version_major.$plugin_version_minor.$plugin_version_release $plugin_dir/libnpp.so + + # System wide configuration files +- if can_write_to "/etc"; then +- echo +- echo "System wide configuration files:" +- echo " /etc/opera6rc" +- echo " /etc/opera6rc.fixed" +- echo " cannot be prefixed" +- echo "Do you want to install them [y,n | yes,no]?" +- while true; do +- read install_config +- case "${install_config}" in +- +- ''|y|Y|yes|YES) +- backup /etc/opera6rc opera6rc config +- backup /etc/opera6rc.fixed opera6rc.fixed config +- cp $cpv $cpf $cpp config/opera6rc /etc +- cp $cpv $cpf $cpp config/opera6rc.fixed /etc +- break +- ;; +- +- n|N|no|NO) +- break +- ;; +- *) +- echo 'Invalid answer, try again:' +- ;; +- esac +- done ++ if can_write_to "%%PREFIX%%/etc"; then ++ cp $cpv $cpf $cpp config/opera6rc %%PREFIX%%/etc ++ cp $cpv $cpf $cpp config/opera6rc.fixed %%PREFIX%%/etc + else + echo +- echo "User \"${USERNAME}\" does not have write access to /etc" ++ echo "User \"${USERNAME}\" does not have write access to %%PREFIX%%/etc" + echo " System wide configuration files:" +- echo " /etc/opera6rc" +- echo " /etc/opera6rc.fixed" ++ echo " %%PREFIX%%/etc/opera6rc" ++ echo " %%PREFIX%%/etc/opera6rc.fixed" + echo " were not installed" + fi + diff --git a/www/linux-opera/pkg-plist b/www/linux-opera/pkg-plist index 3d138a7aacad..8ed39c82e9c3 100644 --- a/www/linux-opera/pkg-plist +++ b/www/linux-opera/pkg-plist @@ -1,4 +1,6 @@ bin/opera +etc/opera6rc +etc/opera6rc.fixed share/doc/opera/LICENSE share/doc/opera/help share/opera/bin/opera diff --git a/www/linux-opera7/Makefile b/www/linux-opera7/Makefile index 01d8b3ca2731..36ce460269c5 100644 --- a/www/linux-opera7/Makefile +++ b/www/linux-opera7/Makefile @@ -6,12 +6,12 @@ # PORTNAME= opera -PORTVERSION= 6.01.20020523 +PORTVERSION= 6.02.20020701 CATEGORIES= www linux -MASTER_SITES= http://opera.online.no/linux/601/final/en/qt_static/ \ - ftp://ftp.opera.com/pub/opera/linux/601/final/en/qt_static/ +MASTER_SITES= http://opera.online.no/linux/602/final/en/qt_static/ \ + ftp://ftp.opera.com/pub/opera/linux/602/final/en/qt_static/ PKGNAMEPREFIX= linux- -DISTNAME= ${PORTNAME}-${PORTVERSION:S/01./01-/}.1-static-qt.i386 +DISTNAME= ${PORTNAME}-${PORTVERSION:S/02./02-/}.1-static-qt.i386 MAINTAINER= des@FreeBSD.org @@ -20,13 +20,15 @@ RUN_DEPENDS= ${LINUXBASE}/usr/X11R6/lib/libXm.so.2:${PORTSDIR}/x11-toolkits/linu USE_BZIP2= yes USE_LINUX= yes +USE_REINPLACE= yes ONLY_FOR_ARCHS= i386 NO_BUILD= yes NO_FILTER_SHLIBS=yes do-configure: - ${PERL} -pi -e 's|%%PREFIX%%|${PREFIX}|g; s|%%DATADIR%%|${DATADIR}|g'\ + ${REINPLACE_CMD} -e \ + 's|%%PREFIX%%|${PREFIX}|g; s|%%DATADIR%%|${DATADIR}|g'\ ${WRKSRC}/install.sh do-install: diff --git a/www/linux-opera7/distinfo b/www/linux-opera7/distinfo index 7a05f1c0eba7..4c03007a2fe5 100644 --- a/www/linux-opera7/distinfo +++ b/www/linux-opera7/distinfo @@ -1 +1 @@ -MD5 (opera-6.01-20020523.1-static-qt.i386.tar.bz2) = df98bb498d7c6907fb340121d899d0fd +MD5 (opera-6.02-20020701.1-static-qt.i386.tar.bz2) = 3e2679ff4bbe6a17f5ab33db72020596 diff --git a/www/linux-opera7/files/patch-aa b/www/linux-opera7/files/patch-aa index ac0e3d9a46af..c488ec3e3586 100644 --- a/www/linux-opera7/files/patch-aa +++ b/www/linux-opera7/files/patch-aa @@ -1,6 +1,6 @@ ---- install.sh.orig Thu May 23 13:34:04 2002 -+++ install.sh Mon May 27 14:25:51 2002 -@@ -737,6 +737,16 @@ +--- install.sh.orig Wed Jul 3 18:05:43 2002 ++++ install.sh Wed Jul 3 18:06:06 2002 +@@ -751,6 +751,16 @@ /usr/lib/j2re1.3/plugin/i386/netscape4 \\" ;; @@ -17,7 +17,7 @@ mips*:Linux) wrapper_plugin_paths='' ;; -@@ -799,7 +809,7 @@ +@@ -813,7 +823,7 @@ # Acrobat Reader for BINDIR in \\ @@ -26,3 +26,49 @@ /usr/lib/Acrobat[45]/bin \\ /usr/X11R6/lib/Acrobat[45]/bin \\ /opt/Acrobat[45]/bin \\ +@@ -938,39 +948,15 @@ + ln $lns $lnf libnpp.so.$plugin_version_major.$plugin_version_minor.$plugin_version_release $plugin_dir/libnpp.so + + # System wide configuration files +- if can_write_to "/etc"; then +- echo +- echo "System wide configuration files:" +- echo " /etc/opera6rc" +- echo " /etc/opera6rc.fixed" +- echo " cannot be prefixed" +- echo "Do you want to install them [y,n | yes,no]?" +- while true; do +- read install_config +- case "${install_config}" in +- +- ''|y|Y|yes|YES) +- backup /etc/opera6rc opera6rc config +- backup /etc/opera6rc.fixed opera6rc.fixed config +- cp $cpv $cpf $cpp config/opera6rc /etc +- cp $cpv $cpf $cpp config/opera6rc.fixed /etc +- break +- ;; +- +- n|N|no|NO) +- break +- ;; +- *) +- echo 'Invalid answer, try again:' +- ;; +- esac +- done ++ if can_write_to "%%PREFIX%%/etc"; then ++ cp $cpv $cpf $cpp config/opera6rc %%PREFIX%%/etc ++ cp $cpv $cpf $cpp config/opera6rc.fixed %%PREFIX%%/etc + else + echo +- echo "User \"${USERNAME}\" does not have write access to /etc" ++ echo "User \"${USERNAME}\" does not have write access to %%PREFIX%%/etc" + echo " System wide configuration files:" +- echo " /etc/opera6rc" +- echo " /etc/opera6rc.fixed" ++ echo " %%PREFIX%%/etc/opera6rc" ++ echo " %%PREFIX%%/etc/opera6rc.fixed" + echo " were not installed" + fi + diff --git a/www/linux-opera7/pkg-plist b/www/linux-opera7/pkg-plist index 3d138a7aacad..8ed39c82e9c3 100644 --- a/www/linux-opera7/pkg-plist +++ b/www/linux-opera7/pkg-plist @@ -1,4 +1,6 @@ bin/opera +etc/opera6rc +etc/opera6rc.fixed share/doc/opera/LICENSE share/doc/opera/help share/opera/bin/opera |