Hi ports --
Attached is an update to www/links+.
Noticeable changes:
* Uses libevent (albeit with some deprecated macros)
* SVG support via librsvg
* Upstream now checks for libressl so the rand_egd patch goes away.
Works well here.
OK?
~Brian
Index: Makefile
===================================================================
RCS file: /cvs/ports/www/links+/Makefile,v
retrieving revision 1.54
diff -u -p -r1.54 Makefile
--- Makefile 21 Apr 2015 18:42:41 -0000 1.54
+++ Makefile 16 Jul 2015 14:23:22 -0000
@@ -1,8 +1,7 @@
# $OpenBSD: Makefile,v 1.54 2015/04/21 18:42:41 sthen Exp $
COMMENT= graphics and text browser
-VER= 2.9
-REVISION= 0
+VER= 2.10
DISTNAME= links-${VER}
PKGNAME= links+-${VER}
CATEGORIES= www
@@ -13,7 +12,7 @@ MAINTAINER= Brian Callahan <bcallah@open
# GPLv2+
PERMIT_PACKAGE_CDROM= Yes
-WANTLIB= bz2 c crypto lzma pthread ssl z
+WANTLIB += bz2 c crypto event lzma pthread ssl z
MASTER_SITES= http://links.twibright.com/download/
@@ -27,13 +26,18 @@ FLAVORS= no_x11
FLAVOR?=
.if !${FLAVOR:Mno_x11}
+MODULES+= devel/gettext
LIB_DEPENDS+= graphics/jpeg \
graphics/png \
- graphics/tiff
+ graphics/tiff \
+ x11/gnome/librsvg
CONFIGURE_ARGS+= --with-x --enable-graphics
-WANTLIB+= X11 jpeg>=62 m png>=2 tiff>=35
+WANTLIB += X11 cairo gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0
+WANTLIB += jpeg m png rsvg-2 tiff
MESSAGE= ${PKGDIR}/MESSAGE.x11
.endif
+
+MAKE_FLAGS= CFLAGS="${CFLAGS} -DEVENT_DEPRECATED"
NO_TEST= Yes
Index: distinfo
===================================================================
RCS file: /cvs/ports/www/links+/distinfo,v
retrieving revision 1.27
diff -u -p -r1.27 distinfo
--- distinfo 1 Jan 2015 15:19:49 -0000 1.27
+++ distinfo 16 Jul 2015 14:23:22 -0000
@@ -1,2 +1,2 @@
-SHA256 (links-2.9.tar.gz) = 4tThk+sxR/DXReKNN9UQ7bIml3B+Mpy+Nhu3kDe64zI=
-SIZE (links-2.9.tar.gz) = 4543241
+SHA256 (links-2.10.tar.gz) = KMhy3qCx9Z998/rSgs84CFHJIUMEVRMQcFp4YNTMd+g=
+SIZE (links-2.10.tar.gz) = 6859714
Index: patches/patch-html_c
===================================================================
RCS file: /cvs/ports/www/links+/patches/patch-html_c,v
retrieving revision 1.14
diff -u -p -r1.14 patch-html_c
--- patches/patch-html_c 1 Jan 2015 15:19:49 -0000 1.14
+++ patches/patch-html_c 16 Jul 2015 14:23:22 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-html_c,v 1.14 2015/01/01 15:19:49 bcallah Exp $
---- html.c.orig Sun Dec 7 13:39:00 2014
-+++ html.c Fri Dec 26 11:41:31 2014
-@@ -981,6 +981,7 @@ static void html_a(unsigned char *a)
+--- html.c.orig Thu May 28 08:12:02 2015
++++ html.c Thu Jul 16 09:07:46 2015
+@@ -970,6 +970,7 @@ static void html_a(unsigned char *a)
format_.target = stracpy(format_.target_base);
}
/*format_.attr ^= AT_BOLD;*/
Index: patches/patch-https_c
===================================================================
RCS file: patches/patch-https_c
diff -N patches/patch-https_c
--- patches/patch-https_c 19 Apr 2014 14:43:49 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,17 +0,0 @@
-$OpenBSD: patch-https_c,v 1.1 2014/04/19 14:43:49 bcallah Exp $
---- https.c.orig Sat Apr 19 10:12:04 2014
-+++ https.c Sat Apr 19 10:12:16 2014
-@@ -36,11 +36,8 @@ SSL *getSSL(void)
- unsigned os_pool_size;
-
- const unsigned char *f = (const unsigned char *)RAND_file_name(cast_char f_randfile, sizeof(f_randfile));
-- if (f && RAND_egd(cast_const_char f) < 0) {
-- /* Not an EGD, so read and write to it */
-- if (RAND_load_file(cast_const_char f_randfile, -1))
-- RAND_write_file(cast_const_char f_randfile);
-- }
-+ if (RAND_load_file(cast_const_char f_randfile, -1))
-+ RAND_write_file(cast_const_char f_randfile);
-
- os_seed_random(&os_pool, &os_pool_size);
- if (os_pool_size) RAND_add(os_pool, os_pool_size, os_pool_size);
