diff options
author | Rene Ladan <rene@FreeBSD.org> | 2013-06-30 16:26:32 +0000 |
---|---|---|
committer | Rene Ladan <rene@FreeBSD.org> | 2013-06-30 16:26:32 +0000 |
commit | 7732c2f8c91c3fd76727210bd1e4de2476e91d02 (patch) | |
tree | e2b60e26b266c933e295c37175d11fca0b7e0463 /www/dillo-i18n/files | |
parent | 18e5ae480d2d145117303f5dd04b173da1078f66 (diff) |
Notes
Diffstat (limited to 'www/dillo-i18n/files')
-rw-r--r-- | www/dillo-i18n/files/enable-ssl.patch | 10 | ||||
-rw-r--r-- | www/dillo-i18n/files/patch-bm-update | 22 | ||||
-rw-r--r-- | www/dillo-i18n/files/patch-configure | 112 | ||||
-rw-r--r-- | www/dillo-i18n/files/patch-dpi-https.c | 18 | ||||
-rw-r--r-- | www/dillo-i18n/files/patch-src-png.c | 11 |
5 files changed, 0 insertions, 173 deletions
diff --git a/www/dillo-i18n/files/enable-ssl.patch b/www/dillo-i18n/files/enable-ssl.patch deleted file mode 100644 index c20ccebf7659..000000000000 --- a/www/dillo-i18n/files/enable-ssl.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- dpi/https.c.orig Sat Mar 25 16:46:48 2006 -+++ dpi/https.c Sat Mar 25 16:47:38 2006 -@@ -62,7 +62,6 @@ - #include "dpiutil.h" - - #define ENABLE_SSL --#undef ENABLE_SSL - #ifdef ENABLE_SSL - - #include <openssl/ssl.h> diff --git a/www/dillo-i18n/files/patch-bm-update b/www/dillo-i18n/files/patch-bm-update deleted file mode 100644 index d95cd3c77e14..000000000000 --- a/www/dillo-i18n/files/patch-bm-update +++ /dev/null @@ -1,22 +0,0 @@ ---- bm-update.orig Sat Jul 8 17:32:51 2006 -+++ bm-update Sun Jul 23 11:39:38 2006 -@@ -10,9 +10,8 @@ - exit - fi - --CONVTEST=`LANG=C iconv -f UTF-8 -t UTF-8 ~/.dillo/bm.txt -o ~/.dillo/bm.txt.update 2>&1| sed -e "s/.*illegal.*/illegal/g"` -+CONVTEST=`LANG=C iconv -f UTF-8 -t UTF-8 ~/.dillo/bm.txt 2>&1| sed -e "s/.*illegal.*/illegal/g"` - --rm -f ~/.dillo/bm.txt.update - if test "x$CONVTEST" = "xillegal"; then - echo "bookmark needs update." - else -@@ -22,7 +21,7 @@ - - CHARSET=`locale | grep "LC_CTYPE.*\." | sed -e "s/^.*\.//g" -e "s/\"//g"` - if test "x$CHARSET" = "x"; then -- CHARSET="iso88591" -+ CHARSET="iso-8859-1" - fi - - case $CHARSET in diff --git a/www/dillo-i18n/files/patch-configure b/www/dillo-i18n/files/patch-configure deleted file mode 100644 index 1e81803f0eab..000000000000 --- a/www/dillo-i18n/files/patch-configure +++ /dev/null @@ -1,112 +0,0 @@ ---- configure.orig Sun May 14 16:44:32 2006 -+++ configure Mon May 15 19:32:07 2006 -@@ -309,7 +309,7 @@ - # include <unistd.h> - #endif" - --ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot DLGUI_TRUE DLGUI_FALSE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE MKINSTALLDIRS MSGFMT GMSGFMT XGETTEXT MSGMERGE USE_NLS LIBICONV LTLIBICONV INTLLIBS LIBINTL LTLIBINTL POSUB localedir GLIB_CONFIG GLIB_CFLAGS GLIB_LIBS GTK_CONFIG GTK_CFLAGS GTK_LIBS EGREP XFT_CONFIG PKG_CONFIG LIBJPEG_LIBS LIBJPEG_LDFLAGS LIBJPEG_CPPFLAGS LIBPNG_LIBS LIBPNG_CFLAGS LIBZ_LIBS LIBSSL_LIBS LIBPTHREAD_LIBS LIBPTHREAD_LDFLAGS LIBFLTK_CXXFLAGS LIBFLTK_LIBS src doc bin util lib LIBOBJS LTLIBOBJS' -+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot DLGUI_TRUE DLGUI_FALSE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE MKINSTALLDIRS MSGFMT GMSGFMT XGETTEXT MSGMERGE USE_NLS LIBICONV LTLIBICONV INTLLIBS LIBINTL LTLIBINTL POSUB localedir GLIB_CONFIG GLIB_CFLAGS GLIB_LIBS GTK_CONFIG GTK_CFLAGS GTK_LIBS FLTK2_CONFIG EGREP XFT_CONFIG LIBJPEG_LIBS LIBJPEG_LDFLAGS LIBJPEG_CPPFLAGS LIBPNG_LIBS LIBPNG_CFLAGS LIBZ_LIBS LIBSSL_LIBS LIBPTHREAD_LIBS LIBPTHREAD_LDFLAGS LIBFLTK_CXXFLAGS LIBFLTK_LIBS src doc bin util lib LIBOBJS LTLIBOBJS' - ac_subst_files='' - - # Initialize some variables set by options. -@@ -1952,14 +1952,6 @@ - fi; - - --if test x$enable_dlgui = xyes; then -- DLGUI_TRUE= -- DLGUI_FALSE='#' --else -- DLGUI_TRUE='#' -- DLGUI_FALSE= --fi -- - # Check whether --enable-meta_refresh or --disable-meta_refresh was given. - if test "${enable_meta_refresh+set}" = set; then - enableval="$enable_meta_refresh" -@@ -6792,11 +6784,81 @@ - rm -f conf.gtktest - - -- echo "$as_me:$LINENO: checking Hackish check for FLTK" >&5 --echo $ECHO_N "checking Hackish check for FLTK... $ECHO_C" >&6 -- LIBFLTK_CXXFLAGS=`fltk-config --cxxflags` -- LIBFLTK_LIBS=`fltk-config --ldflags` -+if test "x$enable_dlgui" = "xyes"; then -+ for ac_prog in fltk2-config fltk-config -+do -+ # Extract the first word of "$ac_prog", so it can be a program name with args. -+set dummy $ac_prog; ac_word=$2 -+echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -+if test "${ac_cv_path_FLTK2_CONFIG+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ case $FLTK2_CONFIG in -+ [\\/]* | ?:[\\/]*) -+ ac_cv_path_FLTK2_CONFIG="$FLTK2_CONFIG" # Let the user override the test with a path. -+ ;; -+ *) -+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_path_FLTK2_CONFIG="$as_dir/$ac_word$ac_exec_ext" -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+ -+ ;; -+esac -+fi -+FLTK2_CONFIG=$ac_cv_path_FLTK2_CONFIG -+ -+if test -n "$FLTK2_CONFIG"; then -+ echo "$as_me:$LINENO: result: $FLTK2_CONFIG" >&5 -+echo "${ECHO_T}$FLTK2_CONFIG" >&6 -+else -+ echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6 -+fi -+ -+ test -n "$FLTK2_CONFIG" && break -+done -+test -n "$FLTK2_CONFIG" || FLTK2_CONFIG="NOTFOUND" - -+ if test "x$FLTK2_CONFIG" != "xNOTFOUND" && test -x "$FLTK2_CONFIG"; then -+ fltk_version=`$FLTK2_CONFIG --version` -+ case "$fltk_version" in -+ 2.*) -+ LIBFLTK_CXXFLAGS=`$FLTK2_CONFIG --cxxflags` -+ LIBFLTK_LIBS=`$FLTK2_CONFIG --ldflags` -+ fltk2_ok="yes" -+ ;; -+ *) -+ echo "$as_me:$LINENO: result: need fltk2 -- disabling fltk support" >&5 -+echo "${ECHO_T}need fltk2 -- disabling fltk support" >&6 -+ fltk2_ok="no" -+ ;; -+ esac -+ else -+ fltk2_ok="no" -+ fi -+else -+ fltk2_ok="no" -+fi -+ -+ -+if test x$fltk2_ok = xyes; then -+ DLGUI_TRUE= -+ DLGUI_FALSE='#' -+else -+ DLGUI_TRUE='#' -+ DLGUI_FALSE= -+fi - - if test "x$enable_jpeg" = "xyes"; then - diff --git a/www/dillo-i18n/files/patch-dpi-https.c b/www/dillo-i18n/files/patch-dpi-https.c deleted file mode 100644 index 4fd698b0f55b..000000000000 --- a/www/dillo-i18n/files/patch-dpi-https.c +++ /dev/null @@ -1,18 +0,0 @@ ---- dpi/https.c.orig Sat Mar 25 16:49:59 2006 -+++ dpi/https.c Sat Mar 25 16:55:35 2006 -@@ -655,13 +655,8 @@ - "<b>}</b>\n\n" - " <b>*** Dillo's prototype plugin for https support" - " is disabled now ***</b>\n\n" -- " If you want to test this <b>alpha</b> support code, just remove\n" -- " line 65 from https.c, recompile and reinstall.\n\n" -- " (beware that this https support is very limited now)\n\n" -- " To use https and SSL, you must have \n" -- " the OpenSSL development libraries installed. Check your\n" -- " O/S distribution provider, or check out\n" -- " <a href=\"http://www.openssl.org\">www.openssl.org</a>\n\n" -+ " If you want to test this <b>alpha</b> support code, define\n" -+ " WITH_DILLO_SSL in your make environment and rebuild the port.\n\n" - " --\n" - "</pre></body></html>\n", - http_query diff --git a/www/dillo-i18n/files/patch-src-png.c b/www/dillo-i18n/files/patch-src-png.c deleted file mode 100644 index f63b35aeb52f..000000000000 --- a/www/dillo-i18n/files/patch-src-png.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/png.c.orig 2005-10-27 18:20:14.000000000 +0200 -+++ src/png.c 2010-03-29 21:23:10.000000000 +0200 -@@ -355,7 +355,7 @@ - return; /* need MORE data */ - } - /* check the image signature - DON'T update ipbufstart! */ -- if (!png_check_sig(png->ipbuf, DATASIZE)) { -+ if (png_sig_cmp(png->ipbuf, 0, DATASIZE)) { - /* you lied to me about it being a PNG image */ - png->state = IS_finished; - break; |