kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update to 2.0, which is a major overhaul. Change dillo-ssl option to

Browse source 
ssl, as there is no reason for it to be package-specific.

Most visible changes:
- Switch from GTK1 to FLTK2
- Tabbed browsing
- Downloads and FTP now work (at the expense of a wget dependency)
This commit is contained in:
snj 2008-10-31 02:02:44 +00:00
parent 8570071c31
commit 249e3912b3
8 changed files with 50 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
www/dillo/DESCR
View file

@ -1,5 +1 @@
A very small and fast graphical web browser using GTK+.
It is still in early development, so many features are still missing: most
notably ftp, https, and frames. Table support is incomplete. Cookies are
supported.
A very small and fast graphical web browser using FLTK2.

16
www/dillo/Makefile
View file

@ -1,7 +1,6 @@
# $NetBSD: Makefile,v 1.41 2007/07/24 13:46:45 joerg Exp $
# $NetBSD: Makefile,v 1.42 2008/10/31 02:02:44 snj Exp $
DISTNAME= dillo-0.8.6
PKGREVISION= 2
DISTNAME= dillo-2.0
CATEGORIES= www
MASTER_SITES= http://www.dillo.org/download/
EXTRACT_SUFX= .tar.bz2
@ -12,14 +11,15 @@ COMMENT= Very small and fast graphical web-browser
USE_LANGUAGES= c c++
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --disable-dlgui
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
REPLACE_PERL+= dpid/dpidc
USE_TOOLS+= perl:run
DEPENDS+= wget-[0-9]*:../../net/wget
EGDIR= ${PREFIX}/share/examples/dillo
CONF_FILES= ${EGDIR}/dillorc.default ${PKG_SYSCONFDIR}/dillorc
CONF_FILES= ${EGDIR}/dillorc ${PKG_SYSCONFDIR}/dillorc
CONF_FILES+= ${EGDIR}/dpidrc ${PKG_SYSCONFDIR}/dpidrc
.include "options.mk"
@ -29,11 +29,13 @@ post-install:
${INSTALL_DATA} ${WRKSRC}/doc/*.txt ${PREFIX}/share/doc/dillo
${INSTALL_DATA} ${WRKSRC}/doc/README ${PREFIX}/share/doc/dillo
${INSTALL_DATA_DIR} ${EGDIR}
${INSTALL_DATA} ${WRKSRC}/dillorc ${EGDIR}/dillorc.default
${INSTALL_DATA} ${WRKSRC}/dillorc ${EGDIR}
.include "../../converters/libiconv/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../graphics/jpeg/buildlink3.mk"
.include "../../graphics/png/buildlink3.mk"
.include "../../x11/gtk/buildlink3.mk"
.include "../../x11/fltk2/buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"

10
www/dillo/PLIST
View file

@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.12 2006/05/10 21:03:41 adam Exp $
@comment $NetBSD: PLIST,v 1.13 2008/10/31 02:02:44 snj Exp $
bin/dillo
bin/dpid
bin/dpidc
@ -15,18 +15,14 @@ share/doc/dillo/Cookies.txt
share/doc/dillo/Dillo.txt
share/doc/dillo/Dpid.txt
share/doc/dillo/Dw.txt
share/doc/dillo/DwImage.txt
share/doc/dillo/DwPage.txt
share/doc/dillo/DwStyle.txt
share/doc/dillo/DwTable.txt
share/doc/dillo/DwWidget.txt
share/doc/dillo/HtmlParser.txt
share/doc/dillo/IO.txt
share/doc/dillo/Imgbuf.txt
share/doc/dillo/Images.txt
share/doc/dillo/NC_design.txt
share/doc/dillo/README
share/doc/dillo/Selection.txt
share/examples/dillo/dillorc.default
share/examples/dillo/dillorc
share/examples/dillo/dpidrc
@dirrm share/examples/dillo
@dirrm share/doc/dillo

14
www/dillo/distinfo
View file

@ -1,8 +1,8 @@
$NetBSD: distinfo,v 1.27 2006/05/27 03:22:32 reed Exp $
$NetBSD: distinfo,v 1.28 2008/10/31 02:02:44 snj Exp $
SHA1 (dillo-0.8.6.tar.bz2) = ee03b11ba6b75d3180ca906d8275bd35e8765995
RMD160 (dillo-0.8.6.tar.bz2) = 062cff85b330a5b443ddc81a356e81f930677cbb
Size (dillo-0.8.6.tar.bz2) = 441739 bytes
SHA1 (patch-aa) = 1307be194c84a6baad25b4272844b804114d5c3b
SHA1 (patch-ab) = d057a931cea3d368000ee3d24ff49402ba25edfb
SHA1 (patch-ac) = 3eacaa1711d1bda01508290c8acf58f035892b78
SHA1 (dillo-2.0.tar.bz2) = 9bde7eab5c835e13508d63a190a8bcec4e94553a
RMD160 (dillo-2.0.tar.bz2) = f457e5a031d8a0e682be50ee16cbfba3fea34eaa
Size (dillo-2.0.tar.bz2) = 551569 bytes
SHA1 (patch-aa) = ea8a2b930eefed4f6384dc57623d1993d4cd7247
SHA1 (patch-ab) = 8090c554c52dc0133bf725bacc172f7d08071929
SHA1 (patch-ac) = ede656975ae077568a432245a9705c70e40a74fc

6
www/dillo/options.mk
View file

@ -1,7 +1,7 @@
# $NetBSD: options.mk,v 1.1 2006/05/27 03:22:32 reed Exp $
# $NetBSD: options.mk,v 1.2 2008/10/31 02:02:44 snj Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.dillo
PKG_SUPPORTED_OPTIONS= inet6 dillo-ssl
PKG_SUPPORTED_OPTIONS= inet6 ssl
.include "../../mk/bsd.options.mk"
@ -9,7 +9,7 @@ PKG_SUPPORTED_OPTIONS= inet6 dillo-ssl
CONFIGURE_ARGS+= --enable-ipv6
.endif
.if !empty(PKG_OPTIONS:Mdillo-ssl)
.if !empty(PKG_OPTIONS:Mssl)
CONFIGURE_ARGS+= --enable-ssl
.include "../../security/openssl/buildlink3.mk"
.else

18
www/dillo/patches/patch-aa
View file

@ -1,15 +1,25 @@
$NetBSD: patch-aa,v 1.6 2006/05/10 21:03:41 adam Exp $
$NetBSD: patch-aa,v 1.7 2008/10/31 02:02:44 snj Exp $
--- dpid/Makefile.in.orig 2006-04-26 18:07:18.000000000 +0200
+++ dpid/Makefile.in
@@ -481,8 +481,8 @@ uninstall-am: uninstall-binPROGRAMS unin
--- ./dpid/Makefile.in.orig 2008-10-30 07:40:38.000000000 -0700
+++ dpid/Makefile.in 2008-10-30 07:46:09.000000000 -0700
@@ -485,13 +485,13 @@
install-data-local :
- $(mkinstalldirs) $(DESTDIR)$(sysconfdir)
- echo dpi_dir=$(libdir)/dillo/dpi > $(DESTDIR)$(sysconfdir)/dpidrc
- echo >> $(DESTDIR)$(sysconfdir)/dpidrc
- echo "proto.file=file/file.dpi" >> $(DESTDIR)$(sysconfdir)/dpidrc
- echo "proto.ftp=ftp/ftp.filter.dpi" >> $(DESTDIR)$(sysconfdir)/dpidrc
- echo "proto.https=https/https.filter.dpi" >> $(DESTDIR)$(sysconfdir)/dpidrc
- echo "proto.data=datauri/datauri.filter.dpi" >> $(DESTDIR)$(sysconfdir)/dpidrc
+ $(mkinstalldirs) $(DESTDIR)$(datadir)/examples/$(PACKAGE)
+ echo dpi_dir=$(libdir)/dillo/dpi > $(DESTDIR)$(datadir)/examples/$(PACKAGE)/dpidrc
+ echo >> $(DESTDIR)$(datadir)/examples/$(PACKAGE)/dpidrc
+ echo "proto.file=file/file.dpi" >> $(DESTDIR)$(datadir)/examples/$(PACKAGE)/dpidrc
+ echo "proto.ftp=ftp/ftp.filter.dpi" >> $(DESTDIR)$(datadir)/examples/$(PACKAGE)/dpidrc
+ echo "proto.https=https/https.filter.dpi" >> $(DESTDIR)$(datadir)/examples/$(PACKAGE)/dpidrc
+ echo "proto.data=datauri/datauri.filter.dpi" >> $(DESTDIR)$(datadir)/examples/$(PACKAGE)/dpidrc
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:

14
www/dillo/patches/patch-ab
View file

@ -1,11 +1,11 @@
$NetBSD: patch-ab,v 1.13 2006/05/10 21:03:41 adam Exp $
$NetBSD: patch-ab,v 1.14 2008/10/31 02:02:44 snj Exp $
--- Makefile.in.orig 2006-04-26 18:07:27.000000000 +0200
+++ Makefile.in
@@ -194,7 +194,7 @@ target_os = @target_os@
target_vendor = @target_vendor@
SUBDIRS = doc dpip src dpid dpi
EXTRA_DIST = ChangeLog.old dillorc install-dpi-local
--- ./Makefile.in.orig 2008-10-30 07:47:58.000000000 -0700
+++ ./Makefile.in 2008-10-30 07:48:05.000000000 -0700
@@ -197,7 +197,7 @@
top_srcdir = @top_srcdir@
SUBDIRS = lout dw dlib dpip src doc dpid dpi test
EXTRA_DIST = Doxyfile dillorc install-dpi-local
-sysconf_DATA = dillorc
+sysconf_DATA =
all: config.h

12
www/dillo/patches/patch-ac
View file

@ -1,10 +1,10 @@
$NetBSD: patch-ac,v 1.10 2006/05/27 03:22:32 reed Exp $
$NetBSD: patch-ac,v 1.11 2008/10/31 02:02:44 snj Exp $
--- dpi/https.c.orig 2006-03-24 07:52:23.000000000 -0800
+++ dpi/https.c 2006-05-26 18:18:34.000000000 -0700
@@ -61,8 +61,6 @@
#include "../dpip/dpip.h"
#include "dpiutil.h"
--- dpi/https.c.orig 2008-10-13 07:49:46.000000000 -0700
+++ dpi/https.c 2008-10-30 07:52:45.000000000 -0700
@@ -68,8 +68,6 @@
#define MSG(...) printf("[https dpi]: " __VA_ARGS__)
-#define ENABLE_SSL
-#undef ENABLE_SSL