From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Oct 28 13:10:14 2004 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BFC2816A4CE for ; Thu, 28 Oct 2004 13:10:14 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 99A5343D54 for ; Thu, 28 Oct 2004 13:10:14 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) i9SDAEbx057073 for ; Thu, 28 Oct 2004 13:10:14 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.11/8.12.11/Submit) id i9SDAEGx057072; Thu, 28 Oct 2004 13:10:14 GMT (envelope-from gnats) Resent-Date: Thu, 28 Oct 2004 13:10:14 GMT Resent-Message-Id: <200410281310.i9SDAEGx057072@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Thomas-Martin Seck Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B769F16A4CE for ; Thu, 28 Oct 2004 13:02:01 +0000 (GMT) Received: from smtp2.netcologne.de (smtp2.netcologne.de [194.8.194.218]) by mx1.FreeBSD.org (Postfix) with ESMTP id 44EC343D53 for ; Thu, 28 Oct 2004 13:02:01 +0000 (GMT) (envelope-from tmseck@netcologne.de) Received: from laurel.tmseck.homedns.org (xdsl-213-196-248-5.netcologne.de [213.196.248.5]) by smtp2.netcologne.de (Postfix) with SMTP id C1EC14401 for ; Thu, 28 Oct 2004 15:01:58 +0200 (MEST) Received: (qmail 16121 invoked by uid 1001); 28 Oct 2004 13:02:20 -0000 Message-Id: <20041028130220.16120.qmail@laurel.tmseck.homedns.org> Date: 28 Oct 2004 13:02:20 -0000 From: Thomas-Martin Seck To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/73242: [Maintainer] www/dillo: update to 0.8.3 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Thomas-Martin Seck List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Oct 2004 13:10:14 -0000 >Number: 73242 >Category: ports >Synopsis: [Maintainer] www/dillo: update to 0.8.3 >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 Oct 28 13:10:14 GMT 2004 >Closed-Date: >Last-Modified: >Originator: Thomas-Martin Seck >Release: FreeBSD 4.10-STABLE i386 >Organization: a private site in Germany >Environment: FreeBSD ports collection as of Oct 28, 2004. >Description: - Update to 0.8.3 - Supply a knob (WITH_DILLO_SSL) to turn on experimental SSL support - Move helper programs from $PREFIX/lib to $PREFIX/libexec - Reduce the blurbs in pkg-descr to the necessary minimum Note to committer: please 'cvs add' files/patch-dpi-https.c >How-To-Repeat: >Fix: Apply this patch: Index: distinfo =================================================================== --- distinfo (.../www/dillo) (revision 273) +++ distinfo (.../local/dillo) (revision 273) @@ -1,2 +1,2 @@ -MD5 (dillo-0.8.2.tar.bz2) = 4322f339aa4a4a2a4ba9a11444df9c67 -SIZE (dillo-0.8.2.tar.bz2) = 409961 +MD5 (dillo-0.8.3.tar.bz2) = be772ec9361bcc01515ae0da61de9bda +SIZE (dillo-0.8.3.tar.bz2) = 418714 Index: pkg-descr =================================================================== --- pkg-descr (.../www/dillo) (revision 273) +++ pkg-descr (.../local/dillo) (revision 273) @@ -1,14 +1,4 @@ -Dillo is a web browser project completely written in C (currently the code -is based on gzilla-0.2.2's widget, and a new improved network engine -written from scratch). - -Dillo is small; source is less than 360 kB and binary is less than 270 Kb. - Dillo aims to be a multiplatform browser alternative that's small, stable, developer-friendly, usable, fast, and extensible. -Dillo is mainly based on GTK+ (GNOME is NOT required!) - -Dillo is very fast! - WWW: http://www.dillo.org/ Index: files/patch-dpi-https.c =================================================================== --- files/patch-dpi-https.c (revision 0) +++ files/patch-dpi-https.c (revision 273) @@ -0,0 +1,26 @@ +--- dpi/https.c.orig Sun Oct 3 17:16:15 2004 ++++ dpi/https.c Sun Oct 3 17:17:47 2004 +@@ -53,7 +53,6 @@ + #include + #include "dpiutil.h" + +-#undef ENABLE_SSL + #ifdef ENABLE_SSL + + #include +@@ -605,13 +616,8 @@ static void no_ssl_support(void) + "}\n\n" + " *** Dillo's prototype plugin for https support" + " is disabled now ***\n\n" +- " If you want to test this alpha support code, just remove\n" +- " line 56 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" +- " www.openssl.org\n\n" ++ " If you want to test this alpha support code, define\n" ++ " WITH_DILLO_SSL in your make environment and rebuild the port.\n\n" + " --\n" + "\n", + http_query Index: pkg-plist =================================================================== --- pkg-plist (.../www/dillo) (revision 273) +++ pkg-plist (.../local/dillo) (revision 273) @@ -4,15 +4,17 @@ bin/dpidc etc/dillorc.sample etc/dpidrc -lib/dillo/dpi/bookmarks/bookmarks.dpi -lib/dillo/dpi/downloads/downloads.dpi -lib/dillo/dpi/ftp/ftp.filter.dpi -lib/dillo/dpi/hello/hello.filter.dpi -lib/dillo/dpi/https/https.filter.dpi -@dirrm lib/dillo/dpi/https -@dirrm lib/dillo/dpi/hello -@dirrm lib/dillo/dpi/ftp -@dirrm lib/dillo/dpi/downloads -@dirrm lib/dillo/dpi/bookmarks -@dirrm lib/dillo/dpi -@dirrm lib/dillo +libexec/dillo/dpi/bookmarks/bookmarks.dpi +libexec/dillo/dpi/downloads/downloads.dpi +libexec/dillo/dpi/file/file.dpi +libexec/dillo/dpi/ftp/ftp.filter.dpi +libexec/dillo/dpi/hello/hello.filter.dpi +libexec/dillo/dpi/https/https.filter.dpi +@dirrm libexec/dillo/dpi/https +@dirrm libexec/dillo/dpi/hello +@dirrm libexec/dillo/dpi/ftp +@dirrm libexec/dillo/dpi/file +@dirrm libexec/dillo/dpi/downloads +@dirrm libexec/dillo/dpi/bookmarks +@dirrm libexec/dillo/dpi +@dirrm libexec/dillo Index: Makefile =================================================================== --- Makefile (.../www/dillo) (revision 273) +++ Makefile (.../local/dillo) (revision 273) @@ -4,9 +4,12 @@ # # $FreeBSD$ # +# Tunables: +# WITH_DILLO_SSL: enable experimental SSL support +# PORTNAME= dillo -PORTVERSION= 0.8.2 +PORTVERSION= 0.8.3 CATEGORIES= www MASTER_SITES= http://www.dillo.org/download/ @@ -24,12 +27,28 @@ GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -CONFIGURE_ARGS= --enable-ipv6 +CONFIGURE_ARGS= --enable-ipv6 --libdir=${PREFIX}/libexec +.if defined(WITH_DILLO_SSL) +CONFIGURE_ARGS+= --enable-ssl +USE_OPENSSL= yes +.else +CONFIGURE_ARGS+= --disable-ssl +.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} " You can enable dillo's experimental SSL support by specifing" + @${ECHO_CMD} " WITH_DILLO_SSL=yes in your make environment or on the" + @${ECHO_CMD} " commandline." + @${ECHO_CMD} "" +.endif + .include >Release-Note: >Audit-Trail: >Unformatted: