mirror of
https://git.freebsd.org/ports.git
synced 2025-07-18 17:59:20 -04:00
Fix find libaspell.so* in LD_LIBRARY_PATH, bump the PORTREVISION.
PR: ports/125193 Reported by: Henry Hu <henry.hu.sh@gmail.com>
This commit is contained in:
parent
db61eb1da2
commit
238be61e7f
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=216203
4 changed files with 46 additions and 22 deletions
|
@ -7,6 +7,7 @@
|
|||
|
||||
PORTNAME= opera
|
||||
PORTVERSION= ${OPERA_VER}
|
||||
PORTREVISION= 1
|
||||
CATEGORIES= www linux
|
||||
MASTER_SITES= ftp://ftp.opera.com/pub/opera/linux/${OPERA_VER:S/.//}/final/en/i386/static/ \
|
||||
ftp://ftp.sunet.se/pub/www/clients/Opera/linux/${OPERA_VER:S/.//}/final/en/i386/static/ \
|
||||
|
@ -47,7 +48,8 @@ post-extract:
|
|||
|
||||
post-patch:
|
||||
@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g ; \
|
||||
s|%%LOCALBASE%%|${LOCALBASE}|g' \
|
||||
s|%%LOCALBASE%%|${LOCALBASE}|g ; \
|
||||
s|%%LINUXBASE%%|${LINUXBASE}|g' \
|
||||
${WRKSRC}/install.sh \
|
||||
${WRKSRC}/usr/share/opera/ini/pluginpath.ini
|
||||
@${REINPLACE_CMD} -e 's|man1/opera.1|man1/${UNIQUENAME}.1|g' \
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
--- install.sh.orig 2008-06-11 15:33:00.000000000 -0500
|
||||
+++ install.sh 2008-06-12 21:04:22.000000000 -0500
|
||||
+++ install.sh 2008-07-02 22:49:18.000000000 -0500
|
||||
@@ -832,10 +832,9 @@
|
||||
case "${machine}:${os}" in
|
||||
x86:Linux|x86_64:Linux|x86:AnyBSD|x86_64:AnyBSD|x86:OpenBSD|x86:QNX)
|
||||
|
@ -157,7 +157,17 @@
|
|||
; do
|
||||
if test -d \${BINDIR} ; then PATH=\${PATH}:\${BINDIR}; fi
|
||||
done
|
||||
@@ -1108,13 +1048,6 @@
|
||||
@@ -1099,8 +1039,7 @@
|
||||
|
||||
# Spellchecker needs to find libaspell.so.15
|
||||
for LIBASPELL_DIR in \\
|
||||
- /usr/local/lib \\
|
||||
- /opkg/lib \\
|
||||
+ %%LINUXBASE%%/usr/lib \\
|
||||
; do
|
||||
if ls \$LIBASPELL_DIR/libaspell.so.1[5-9] >/dev/null 2>&1
|
||||
then LD_LIBRARY_PATH=\"\${LD_LIBRARY_PATH}:\${LIBASPELL_DIR}\"
|
||||
@@ -1108,13 +1047,6 @@
|
||||
done"
|
||||
|
||||
case "${os}" in
|
||||
|
@ -171,7 +181,7 @@
|
|||
SunOS)
|
||||
wrapper_contain="${wrapper_contain}
|
||||
|
||||
@@ -1143,7 +1076,7 @@
|
||||
@@ -1143,7 +1075,7 @@
|
||||
};
|
||||
|
||||
// Opera package classes get all permissions
|
||||
|
@ -180,7 +190,7 @@
|
|||
permission java.security.AllPermission;
|
||||
};
|
||||
|
||||
@@ -1260,12 +1193,12 @@
|
||||
@@ -1260,12 +1192,12 @@
|
||||
chop "${OPERADESTDIR}" "str_localdirshare"
|
||||
chop "${OPERADESTDIR}" "str_localdirplugin"
|
||||
|
||||
|
@ -195,7 +205,7 @@
|
|||
|
||||
share_src="`manifest_path 'html40_entities\.dtd'`"
|
||||
part_install "$share_src" "$share_dir" "Shared resources"
|
||||
@@ -1274,76 +1207,20 @@
|
||||
@@ -1274,76 +1206,20 @@
|
||||
mkdir $mkdirv $mkdirp $plugin_dir/
|
||||
|
||||
# Wrapper
|
||||
|
@ -275,7 +285,7 @@
|
|||
fi
|
||||
|
||||
fi # OPERADESTDIR
|
||||
@@ -1392,21 +1269,21 @@
|
||||
@@ -1392,21 +1268,21 @@
|
||||
echo '[Desktop Entry]'
|
||||
if test -z "$1"
|
||||
then cat <<EOF
|
||||
|
@ -302,7 +312,7 @@
|
|||
Name[af]=opera
|
||||
Name[eo]=Opero
|
||||
Name[zu]=I Opera
|
||||
@@ -1430,7 +1307,7 @@
|
||||
@@ -1430,7 +1306,7 @@
|
||||
GenericName[ven]=Buronza ya Webu
|
||||
GenericName[xh]=Umkhangeli Zincwadi Zokubhaliweyo
|
||||
GenericName[zu]=Umkhangeli zincwadi we Web
|
||||
|
@ -311,7 +321,7 @@
|
|||
Terminal=false
|
||||
EOF
|
||||
|
||||
@@ -1446,15 +1323,16 @@
|
||||
@@ -1446,15 +1322,16 @@
|
||||
if test "$1" = "xdg"
|
||||
then cat <<EOF
|
||||
Categories=Application;Qt;Network;WebBrowser;X-Ximian-Main;X-Ximian-Toplevel
|
||||
|
@ -330,7 +340,7 @@
|
|||
EOF
|
||||
}
|
||||
|
||||
@@ -1462,7 +1340,7 @@
|
||||
@@ -1462,7 +1339,7 @@
|
||||
{
|
||||
# arg1 = location
|
||||
# arg2 = type
|
||||
|
@ -339,7 +349,7 @@
|
|||
}
|
||||
|
||||
generate_mdk_menu()
|
||||
@@ -1487,51 +1365,26 @@
|
||||
@@ -1487,51 +1364,26 @@
|
||||
|
||||
debug_msg 0 "in icons()"
|
||||
|
||||
|
|
|
@ -7,6 +7,7 @@
|
|||
|
||||
PORTNAME= opera
|
||||
PORTVERSION= ${OPERA_VER}
|
||||
PORTREVISION= 1
|
||||
CATEGORIES= www linux
|
||||
MASTER_SITES= ftp://ftp.opera.com/pub/opera/linux/${OPERA_VER:S/.//}/final/en/i386/static/ \
|
||||
ftp://ftp.sunet.se/pub/www/clients/Opera/linux/${OPERA_VER:S/.//}/final/en/i386/static/ \
|
||||
|
@ -47,7 +48,8 @@ post-extract:
|
|||
|
||||
post-patch:
|
||||
@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g ; \
|
||||
s|%%LOCALBASE%%|${LOCALBASE}|g' \
|
||||
s|%%LOCALBASE%%|${LOCALBASE}|g ; \
|
||||
s|%%LINUXBASE%%|${LINUXBASE}|g' \
|
||||
${WRKSRC}/install.sh \
|
||||
${WRKSRC}/usr/share/opera/ini/pluginpath.ini
|
||||
@${REINPLACE_CMD} -e 's|man1/opera.1|man1/${UNIQUENAME}.1|g' \
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
--- install.sh.orig 2008-06-11 15:33:00.000000000 -0500
|
||||
+++ install.sh 2008-06-12 21:04:22.000000000 -0500
|
||||
+++ install.sh 2008-07-02 22:49:18.000000000 -0500
|
||||
@@ -832,10 +832,9 @@
|
||||
case "${machine}:${os}" in
|
||||
x86:Linux|x86_64:Linux|x86:AnyBSD|x86_64:AnyBSD|x86:OpenBSD|x86:QNX)
|
||||
|
@ -157,7 +157,17 @@
|
|||
; do
|
||||
if test -d \${BINDIR} ; then PATH=\${PATH}:\${BINDIR}; fi
|
||||
done
|
||||
@@ -1108,13 +1048,6 @@
|
||||
@@ -1099,8 +1039,7 @@
|
||||
|
||||
# Spellchecker needs to find libaspell.so.15
|
||||
for LIBASPELL_DIR in \\
|
||||
- /usr/local/lib \\
|
||||
- /opkg/lib \\
|
||||
+ %%LINUXBASE%%/usr/lib \\
|
||||
; do
|
||||
if ls \$LIBASPELL_DIR/libaspell.so.1[5-9] >/dev/null 2>&1
|
||||
then LD_LIBRARY_PATH=\"\${LD_LIBRARY_PATH}:\${LIBASPELL_DIR}\"
|
||||
@@ -1108,13 +1047,6 @@
|
||||
done"
|
||||
|
||||
case "${os}" in
|
||||
|
@ -171,7 +181,7 @@
|
|||
SunOS)
|
||||
wrapper_contain="${wrapper_contain}
|
||||
|
||||
@@ -1143,7 +1076,7 @@
|
||||
@@ -1143,7 +1075,7 @@
|
||||
};
|
||||
|
||||
// Opera package classes get all permissions
|
||||
|
@ -180,7 +190,7 @@
|
|||
permission java.security.AllPermission;
|
||||
};
|
||||
|
||||
@@ -1260,12 +1193,12 @@
|
||||
@@ -1260,12 +1192,12 @@
|
||||
chop "${OPERADESTDIR}" "str_localdirshare"
|
||||
chop "${OPERADESTDIR}" "str_localdirplugin"
|
||||
|
||||
|
@ -195,7 +205,7 @@
|
|||
|
||||
share_src="`manifest_path 'html40_entities\.dtd'`"
|
||||
part_install "$share_src" "$share_dir" "Shared resources"
|
||||
@@ -1274,76 +1207,20 @@
|
||||
@@ -1274,76 +1206,20 @@
|
||||
mkdir $mkdirv $mkdirp $plugin_dir/
|
||||
|
||||
# Wrapper
|
||||
|
@ -275,7 +285,7 @@
|
|||
fi
|
||||
|
||||
fi # OPERADESTDIR
|
||||
@@ -1392,21 +1269,21 @@
|
||||
@@ -1392,21 +1268,21 @@
|
||||
echo '[Desktop Entry]'
|
||||
if test -z "$1"
|
||||
then cat <<EOF
|
||||
|
@ -302,7 +312,7 @@
|
|||
Name[af]=opera
|
||||
Name[eo]=Opero
|
||||
Name[zu]=I Opera
|
||||
@@ -1430,7 +1307,7 @@
|
||||
@@ -1430,7 +1306,7 @@
|
||||
GenericName[ven]=Buronza ya Webu
|
||||
GenericName[xh]=Umkhangeli Zincwadi Zokubhaliweyo
|
||||
GenericName[zu]=Umkhangeli zincwadi we Web
|
||||
|
@ -311,7 +321,7 @@
|
|||
Terminal=false
|
||||
EOF
|
||||
|
||||
@@ -1446,15 +1323,16 @@
|
||||
@@ -1446,15 +1322,16 @@
|
||||
if test "$1" = "xdg"
|
||||
then cat <<EOF
|
||||
Categories=Application;Qt;Network;WebBrowser;X-Ximian-Main;X-Ximian-Toplevel
|
||||
|
@ -330,7 +340,7 @@
|
|||
EOF
|
||||
}
|
||||
|
||||
@@ -1462,7 +1340,7 @@
|
||||
@@ -1462,7 +1339,7 @@
|
||||
{
|
||||
# arg1 = location
|
||||
# arg2 = type
|
||||
|
@ -339,7 +349,7 @@
|
|||
}
|
||||
|
||||
generate_mdk_menu()
|
||||
@@ -1487,51 +1365,26 @@
|
||||
@@ -1487,51 +1364,26 @@
|
||||
|
||||
debug_msg 0 "in icons()"
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue