dillo-devel: Use FLTK 1.4 for glyph substitution on X11.

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: dillo-devel: Use FLTK 1.4 for glyph substitution on X11.
From: Michael Baeuerle <michael.baeuerle%stz-e.de@localhost>
Date: Fri, 12 Oct 2018 14:46:27 +0000
Module Name:	pkgsrc-wip
Committed By:	Michael Baeuerle <michael.baeuerle%stz-e.de@localhost>
Pushed By:	micha
Date:		Fri Oct 12 16:46:27 2018 +0200
Changeset:	fb99900ec46ce762e3406ef504a55fb3135cdf96

Modified Files:
	Makefile
Added Files:
	dillo-devel/DESCR
	dillo-devel/Makefile
	dillo-devel/PLIST
	dillo-devel/distinfo
	dillo-devel/options.mk
	dillo-devel/patches/patch-configure
	dillo-devel/patches/patch-configure.ac
	dillo-devel/patches/patch-dpi_https.c

Log Message:
dillo-devel: Use FLTK 1.4 for glyph substitution on X11.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=fb99900ec46ce762e3406ef504a55fb3135cdf96

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 Makefile                               |  1 +
 dillo-devel/DESCR                      |  1 +
 dillo-devel/Makefile                   | 50 ++++++++++++++++++++++++++++++++++
 dillo-devel/PLIST                      | 33 ++++++++++++++++++++++
 dillo-devel/distinfo                   |  9 ++++++
 dillo-devel/options.mk                 | 19 +++++++++++++
 dillo-devel/patches/patch-configure    | 20 ++++++++++++++
 dillo-devel/patches/patch-configure.ac | 25 +++++++++++++++++
 dillo-devel/patches/patch-dpi_https.c  | 18 ++++++++++++
 9 files changed, 176 insertions(+)

diffs:
diff --git a/Makefile b/Makefile
index d6c43ae946..f117d56a62 100644
--- a/Makefile
+++ b/Makefile
@@ -574,6 +574,7 @@ SUBDIR+=	dict-est-rus
 SUBDIR+=	dict-freedict-eng-ara
 SUBDIR+=	dict-freedict-eng-fra
 SUBDIR+=	digitemp
+SUBDIR+=	dillo-devel
 SUBDIR+=	din
 SUBDIR+=	ding
 SUBDIR+=	dionysus
diff --git a/dillo-devel/DESCR b/dillo-devel/DESCR
new file mode 100644
index 0000000000..9e30964ba2
--- /dev/null
+++ b/dillo-devel/DESCR
@@ -0,0 +1 @@
+A very small and fast graphical web browser using FLTK-1.3.
diff --git a/dillo-devel/Makefile b/dillo-devel/Makefile
new file mode 100644
index 0000000000..c6314d192a
--- /dev/null
+++ b/dillo-devel/Makefile
@@ -0,0 +1,50 @@
+# $NetBSD: Makefile,v 1.75 2018/08/22 09:47:24 wiz Exp $
+
+DISTNAME=	dillo-3.0.5
+PKGREVISION=	4
+CATEGORIES=	www
+MASTER_SITES=	https://www.dillo.org/download/
+EXTRACT_SUFX=	.tar.bz2
+
+MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=	https://www.dillo.org/
+COMMENT=	Very small and fast graphical web-browser
+LICENSE=	gnu-gpl-v3
+
+USE_LANGUAGES=		c c++
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFBASEDIR}
+
+REPLACE_PERL+=	dpid/dpidc dillo-install-hyphenation
+USE_TOOLS+=	autoconf perl:run wget:run
+
+PKG_SYSCONFSUBDIR=	dillo
+EGDIR=		${PREFIX}/share/examples/dillo
+CONF_FILES=	${EGDIR}/dillorc ${PKG_SYSCONFDIR}/dillorc
+CONF_FILES+=	${EGDIR}/dpidrc ${PKG_SYSCONFDIR}/dpidrc
+CONF_FILES+=	${EGDIR}/keysrc ${PKG_SYSCONFDIR}/keysrc
+CONF_FILES+=	${EGDIR}/domainrc ${PKG_SYSCONFDIR}/domainrc
+
+INSTALLATION_DIRS=	share/doc/dillo ${EGDIR}
+
+INSTALL_MAKE_FLAGS+=	sysconfdir=${EGDIR}
+
+LIBS.SunOS+=	-liconv
+
+.include "options.mk"
+
+pre-configure:
+	cd ${WRKSRC} && autoconf
+
+post-install:
+	${INSTALL_DATA} ${WRKSRC}/doc/*.txt ${DESTDIR}${PREFIX}/share/doc/dillo
+	${INSTALL_DATA} ${WRKSRC}/doc/README ${DESTDIR}${PREFIX}/share/doc/dillo
+
+.include "../../converters/libiconv/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../wip/fltk14-devel/buildlink3.mk"
+
+.include "../../mk/pthread.buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/dillo-devel/PLIST b/dillo-devel/PLIST
new file mode 100644
index 0000000000..29e710ea52
--- /dev/null
+++ b/dillo-devel/PLIST
@@ -0,0 +1,33 @@
+@comment $NetBSD: PLIST,v 1.19 2014/04/12 02:24:19 obache Exp $
+bin/dillo
+bin/dillo-install-hyphenation
+bin/dpid
+bin/dpidc
+lib/dillo/dpi/bookmarks/bookmarks.dpi
+lib/dillo/dpi/cookies/cookies.dpi
+lib/dillo/dpi/datauri/datauri.filter.dpi
+lib/dillo/dpi/downloads/downloads.dpi
+lib/dillo/dpi/file/file.dpi
+lib/dillo/dpi/ftp/ftp.filter.dpi
+lib/dillo/dpi/hello/hello.filter.dpi
+lib/dillo/dpi/https/https.filter.dpi
+lib/dillo/dpi/vsource/vsource.filter.dpi
+man/man1/dillo.1
+share/doc/dillo/CCCwork.txt
+share/doc/dillo/Cache.txt
+share/doc/dillo/Cookies.txt
+share/doc/dillo/Dillo.txt
+share/doc/dillo/Dpid.txt
+share/doc/dillo/Dw.txt
+share/doc/dillo/HtmlParser.txt
+share/doc/dillo/IO.txt
+share/doc/dillo/Images.txt
+share/doc/dillo/Imgbuf.txt
+share/doc/dillo/NC_design.txt
+share/doc/dillo/README
+share/doc/dillo/Selection.txt
+share/doc/dillo/user_help.html
+share/examples/dillo/dillorc
+share/examples/dillo/domainrc
+share/examples/dillo/dpidrc
+share/examples/dillo/keysrc
diff --git a/dillo-devel/distinfo b/dillo-devel/distinfo
new file mode 100644
index 0000000000..32942f9409
--- /dev/null
+++ b/dillo-devel/distinfo
@@ -0,0 +1,9 @@
+$NetBSD: distinfo,v 1.40 2018/03/24 15:40:07 ryoon Exp $
+
+SHA1 (dillo-3.0.5.tar.bz2) = 1f6646f03e3c99f03a4e4abeeb5110bf7f7b3e6a
+RMD160 (dillo-3.0.5.tar.bz2) = 404d7b1a0e60526a53a02d4d49ed5b747f4e43fb
+SHA512 (dillo-3.0.5.tar.bz2) = d0e86f57e50da762debf592b6deb94de5ee58f84e0cae1159890262540a463aea8143d2b99c634021c1f273f91c2fe0918f30d72c3eaf91fdb541e741469b155
+Size (dillo-3.0.5.tar.bz2) = 734472 bytes
+SHA1 (patch-configure) = 18dc67f0fe302ee030cb7be2a5fa5ef5976fcece
+SHA1 (patch-configure.ac) = 1a3fdec27de5d8b49bbd2fb6159811b71553ecfb
+SHA1 (patch-dpi_https.c) = 1f95a8dfdc44a9ad6aa666cb880198708c6a5f1d
diff --git a/dillo-devel/options.mk b/dillo-devel/options.mk
new file mode 100644
index 0000000000..98156696f6
--- /dev/null
+++ b/dillo-devel/options.mk
@@ -0,0 +1,19 @@
+# $NetBSD: options.mk,v 1.5 2018/03/24 15:40:07 ryoon Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.dillo
+PKG_SUPPORTED_OPTIONS=	inet6 ssl
+PKG_SUGGESTED_OPTIONS=	inet6 ssl
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Minet6)
+CONFIGURE_ARGS+=	--enable-ipv6
+.endif
+
+.if !empty(PKG_OPTIONS:Mssl)
+CONFIGURE_ARGS+=	--enable-ssl
+LIBS+=			-lssl
+.include "../../security/openssl/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--disable-ssl
+.endif
diff --git a/dillo-devel/patches/patch-configure b/dillo-devel/patches/patch-configure
new file mode 100644
index 0000000000..3585fcd980
--- /dev/null
+++ b/dillo-devel/patches/patch-configure
@@ -0,0 +1,20 @@
+$NetBSD: patch-configure,v 1.1 2018/03/24 15:40:07 ryoon Exp $
+
+* Detect OpenSSL 1.1.0
+
+--- configure.orig	2015-06-30 14:07:22.000000000 +0000
++++ configure
+@@ -6018,11 +6018,11 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-char SSL_library_init ();
++void OPENSSL_config ();
+ int
+ main ()
+ {
+-return SSL_library_init ();
++OPENSSL_config ();
+   ;
+   return 0;
+ }
diff --git a/dillo-devel/patches/patch-configure.ac b/dillo-devel/patches/patch-configure.ac
new file mode 100644
index 0000000000..9461718236
--- /dev/null
+++ b/dillo-devel/patches/patch-configure.ac
@@ -0,0 +1,25 @@
+$NetBSD$
+
+Use FLTK 1.4 for glyph substitution on X11 platform.
+
+--- configure.ac.orig	2015-06-30 14:07:06.000000000 +0000
++++ configure.ac
+@@ -107,15 +107,15 @@ fi
+ 
+ 
+ dnl -------------------------
+-dnl Test for FLTK 1.3 library
++dnl Test for FLTK 1.4 library
+ dnl -------------------------
+ dnl
+ dnl For debugging and to be user friendly
+-AC_MSG_CHECKING([FLTK 1.3])
++AC_MSG_CHECKING([FLTK 1.4])
+ AC_PATH_PROG(FLTK_CONFIG,fltk-config)
+ fltk_version="`$FLTK_CONFIG --version 2>/dev/null`"
+ case $fltk_version in
+-  1.3.*) AC_MSG_RESULT(yes)
++  1.4.*) AC_MSG_RESULT(yes)
+          LIBFLTK_CXXFLAGS=`$FLTK_CONFIG --cxxflags`
+          LIBFLTK_CFLAGS=`$FLTK_CONFIG --cflags`
+          LIBFLTK_LIBS=`$FLTK_CONFIG --ldflags`;;
diff --git a/dillo-devel/patches/patch-dpi_https.c b/dillo-devel/patches/patch-dpi_https.c
new file mode 100644
index 0000000000..cdb3a41f82
--- /dev/null
+++ b/dillo-devel/patches/patch-dpi_https.c
@@ -0,0 +1,18 @@
+$NetBSD: patch-dpi_https.c,v 1.1 2018/03/24 15:40:07 ryoon Exp $
+
+* Support OpenSSL 1.1.0
+
+--- dpi/https.c.orig	2015-06-30 14:06:08.000000000 +0000
++++ dpi/https.c
+@@ -476,7 +476,11 @@ static int handle_certificate_problem(SS
+       case X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT:
+          /*Either self signed and untrusted*/
+          /*Extract CN from certificate name information*/
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+          if ((cn = strstr(remote_cert->name, "/CN=")) == NULL) {
++#else
++         if ((cn = strstr(X509_get_subject_name(remote_cert), "/CN=")) == NULL) {
++#endif
+             strcpy(buf, "(no CN given)");
+          } else {
+             char *cn_end;
Prev by Date: fltk14-devel: Updated Makefile
Next by Date: dillo-devel: Documentation updated.
Previous by Thread: fltk14-devel: Updated Makefile
Next by Thread: dillo-devel: Documentation updated.
Indexes:
Home | Main Index | Thread Index | Old Index