ports/96595: [Maintainer] www/dillo-i18n: update to 0.8.6.20060427
Thomas-Martin Seck
tmseck at netcologne.de
Mon May 1 14:50:44 UTC 2006
>Number: 96595
>Category: ports
>Synopsis: [Maintainer] www/dillo-i18n: update to 0.8.6.20060427
>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: Mon May 01 14:50:22 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Thomas-Martin Seck
>Release: FreeBSD 6.0-STABLE i386
>Organization:
a private site in Germany
>Environment:
FreeBSD ports collection as of May 1, 2006.
>Description:
- update to the 20060427 patchset against dillo 0.8.6
- make the port standalone and use the patched tarball instead of a patch
against mainline sources
- include patchlevel in the port version number
- enable SSL support
- enable NLS support
- prepare support for a FLTK2 based download gui (unconditionally disabled
until x11-toolkits/fltk2 is available in the ports tree)
- minor cleanups and portlintification
Note to committer:
please 'cvs add' the following files:
- files/enable-ssl.patch
- files/patch-dpi-https.c
- files/patch-configure
>How-To-Repeat:
>Fix:
Apply this patch:
Index: distinfo
===================================================================
--- distinfo (.../www/dillo-i18n) (revision 803)
+++ distinfo (.../local/dillo-i18n) (revision 803)
@@ -1,6 +1,3 @@
-MD5 (dillo-0.8.5.tar.bz2) = d0ab7fa1d40b310deb891388604188f8
-SHA256 (dillo-0.8.5.tar.bz2) = 980ccd8e0c0a85e37478e33b5f4f59d2cfda5c16d30af3acad259626d387cd1a
-SIZE (dillo-0.8.5.tar.bz2) = 424795
-MD5 (dillo-0.8.5-i18n-misc-20060105.diff.bz2) = 6e0fa2bc2dbd665799ae7107a22083ab
-SHA256 (dillo-0.8.5-i18n-misc-20060105.diff.bz2) = f2afbec12c2c16284aedc42c9bc89a92455e6f949dfbc83d5f17609cc889be3e
-SIZE (dillo-0.8.5-i18n-misc-20060105.diff.bz2) = 248443
+MD5 (dillo-0.8.6-i18n-misc-20060427.tar.bz2) = 9086ca1c66fe09f26dc537feca3260ca
+SHA256 (dillo-0.8.6-i18n-misc-20060427.tar.bz2) = 8fac195bcaa1a0988b088311b3b4397edccce79c0a3f09900db79111a2bdd254
+SIZE (dillo-0.8.6-i18n-misc-20060427.tar.bz2) = 610905
Index: files/enable-ssl.patch
===================================================================
--- files/enable-ssl.patch (.../www/dillo-i18n) (revision 0)
+++ files/enable-ssl.patch (.../local/dillo-i18n) (revision 803)
@@ -0,0 +1,10 @@
+--- 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>
Index: files/patch-dpi-https.c
===================================================================
--- files/patch-dpi-https.c (.../www/dillo-i18n) (revision 0)
+++ files/patch-dpi-https.c (.../local/dillo-i18n) (revision 803)
@@ -0,0 +1,18 @@
+--- 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
Index: files/patch-configure
===================================================================
--- files/patch-configure (.../www/dillo-i18n) (revision 0)
+++ files/patch-configure (.../local/dillo-i18n) (revision 803)
@@ -0,0 +1,112 @@
+--- configure.orig Sun Mar 26 15:33:56 2006
++++ configure Sat Apr 29 22:18:47 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 USE_NLS MSGFMT GMSGFMT XGE
TTEXT MSGMERGE LIBICONV LTLIBICONV INTLLIBS LIBINTL LTLIBINTL POSUB localedir GLIB_CONFIG GLIB_CFLAGS GLIB_LIBS GTK_CONFIG GTK_CFLAGS GTK_LIBS 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_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 USE_NLS MSGFMT GMSGFMT XGE
TTEXT MSGMERGE 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"
+@@ -6941,11 +6933,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
+
Index: pkg-plist
===================================================================
--- pkg-plist (.../www/dillo-i18n) (revision 803)
+++ pkg-plist (.../local/dillo-i18n) (revision 803)
@@ -6,6 +6,8 @@
etc/dillorc.sample
etc/dpidrc
libexec/dillo/dpi/bookmarks/bookmarks.dpi
+libexec/dillo/dpi/cookies/cookies.dpi
+libexec/dillo/dpi/datauri/datauri.filter.dpi
libexec/dillo/dpi/downloads/downloads.dpi
libexec/dillo/dpi/file/file.dpi
libexec/dillo/dpi/ftp/ftp.filter.dpi
@@ -19,6 +21,8 @@
@dirrm libexec/dillo/dpi/ftp
@dirrm libexec/dillo/dpi/file
@dirrm libexec/dillo/dpi/downloads
+ at dirrm libexec/dillo/dpi/datauri
+ at dirrm libexec/dillo/dpi/cookies
@dirrm libexec/dillo/dpi/bookmarks
@dirrm libexec/dillo/dpi
@dirrm libexec/dillo
Index: Makefile
===================================================================
--- Makefile (.../www/dillo-i18n) (revision 803)
+++ Makefile (.../local/dillo-i18n) (revision 803)
@@ -5,50 +5,63 @@
# $FreeBSD: ports/www/dillo-i18n/Makefile,v 1.34 2006/03/07 08:27:45 ade Exp $
#
# Tunables:
+# WITH_DILLO_SSL: enable experimental SSL support
# WITH_DILLO_META-REFRESH: make dillo accept the meta-refresh tag
# WITHOUT_DILLO_TABS: disable support for tabbed browsing
# WITHOUT_DILLO_ANTIALIAS: disable support for antialiased display
#
-# Please see www/dillo for any general tunables not listed here.
-#
-# XXX:
-# SSL support is currently broken in this version of the i18n patchset:
-# On FreeBSD 4 with OpenSSL 0.9.7d, the configure script refuses to enable
-# ssl at all and on FreeBSD 5 and up, linking is broken.
+# TODO:
+# SSL support is currently partly broken in this version of the i18n dillo:
+# On FreeBSD 4 with OpenSSL 0.9.7d, the configure script uses checks that are
+# too strict. On FreeBSD 5 and 6 it seems to work OK.
-PORTREVISION= 2
+PORTNAME= dillo
+PORTVERSION= ${DILLOVERSION}.${I18NVERSION}
+CATEGORIES= www ipv6
+MASTER_SITES= http://teki.jpn.ph/pc/software/
PKGNAMESUFFIX= -i18n
+DISTNAME= ${PORTNAME}-${DILLOVERSION}-i18n-misc-${I18NVERSION}
-PATCH_SITES= http://teki.jpn.ph/pc/software/
-PATCHFILES= dillo-0.8.5-i18n-misc-20060105.diff.bz2
-PATCH_DIST_STRIP= -p1
-
MAINTAINER= tmseck at netcologne.de
COMMENT= A fast, small graphical Web browser with support for i18n
-MD5_FILE= ${.CURDIR}/distinfo
+RUN_DEPENDS= wget:${PORTSDIR}/ftp/wget
+LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
+ png.5:${PORTSDIR}/graphics/png
-MASTERDIR= ${.CURDIR}/../../www/dillo
-PKGDIR= ${.CURDIR}
-PLIST_SUB= NLS=""
+DILLOVERSION= 0.8.6
+I18NVERSION= 20060427
+USE_BZIP2= yes
+USE_GNOME= gnometarget gtk12
+USE_GMAKE= yes
+GNU_CONFIGURE= yes
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
+CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" \
+ LDFLAGS="${LDFLAGS}"
+CONFIGURE_ARGS= --enable-cookies --enable-ipv6 --enable-threaded-dns \
+ --disable-dlgui \
+ --libdir=${PREFIX}/libexec
+
CONFLICTS= dillo-[0-9].[0-9].[0-9]*
.if !defined(WITHOUT_NLS)
USE_GETTEXT= yes
PLIST_SUB= NLS=""
+CONFIGURE_ARGS+= --enable-nls
.else
-# Unfortunately, this option does not work yet; the dpi plugins do not
-# build without NLS support anymore.
-# I leave this option in in case anyone really wants to fix this in the
-# i18n patch.
PLIST_SUB= NLS="@comment "
CONFIGURE_ARGS+= --disable-nls
-IGNORE= does not build without NLS support
.endif
.if defined(WITH_DILLO_SSL)
-IGNORE= does not build with SSL support
+# Note: the configure script will deactivate SSL support on 4.x systems.
+# This might get fixed someday so I activate this option unconditionally.
+CONFIGURE_ARGS+= --enable-ssl
+USE_OPENSSL= yes
+.else
+CONFIGURE_ARGS+= --disable-ssl
.endif
.if defined(WITH_DILLO_META-REFRESH)
@@ -70,7 +83,18 @@
CONFIGURE_ARGS+= --disable-anti-alias
.endif
+post-patch:
+ @${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|g ; \
+ s|-D_THREAD_SAFE|${PTHREAD_CFLAGS}|g' ${WRKSRC}/configure
+ @${REINPLACE_CMD} -e 's|dillorc|dillorc.sample|g' ${WRKSRC}/Makefile.in
+ @${CP} ${WRKSRC}/dillorc ${WRKSRC}/dillorc.sample
+
pre-configure:
+.if !defined(WITH_DILLO_SSL)
+ @${ECHO_CMD} ""
+ @${ECHO_CMD} " Set WITH_DILLO_SSL=yes in your make environment or on the"
+ @${ECHO_CMD} " commandline to enable experimental SSL support."
+.endif
.if !defined(WITH_DILLO_META-REFRESH)
@${ECHO_CMD} ""
@${ECHO_CMD} " Set WITH_DILLO_META-REFRESH=yes in your make environment or on the"
@@ -88,4 +112,4 @@
.endif
@${ECHO_CMD} ""
-.include "${MASTERDIR}/Makefile"
+.include <bsd.port.mk>
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list