summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
Diffstat (limited to 'www')
-rw-r--r--www/links-gui/Makefile6
-rw-r--r--www/links/Makefile4
-rw-r--r--www/links/Makefile.common4
-rw-r--r--www/links/distinfo7
-rw-r--r--www/links/patches/patch-ac91
5 files changed, 102 insertions, 10 deletions
diff --git a/www/links-gui/Makefile b/www/links-gui/Makefile
index 5cf07858086..7e69de0ca73 100644
--- a/www/links-gui/Makefile
+++ b/www/links-gui/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.31 2004/12/28 23:18:17 reed Exp $
+# $NetBSD: Makefile,v 1.32 2005/02/22 00:19:55 wiz Exp $
#
-PKGNAME= links-gui-2.1.0.15
-PKGREVISION= 2
+PKGNAME= links-gui-2.1.0.16
COMMENT= Lynx-like text and graphics WWW browser
@@ -11,6 +10,7 @@ CONFLICTS+= links-[0-9]* elinks-0.3*
USE_X11= YES
CONFIGURE_ARGS+= --enable-graphics
+CONFIGURE_ARGS+= --without-sdl
.include "../../www/links/Makefile.common"
.include "../../graphics/png/buildlink3.mk"
diff --git a/www/links/Makefile b/www/links/Makefile
index 20bb65fd52f..d54aefd963a 100644
--- a/www/links/Makefile
+++ b/www/links/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.31 2004/04/29 09:28:21 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2005/02/22 00:19:55 wiz Exp $
#
-PKGNAME= links-2.1.0.15
+PKGNAME= links-2.1.0.16
COMMENT= Lynx-like text WWW browser
CONFLICTS+= links-gui-[0-9]* elinks-0.3*
diff --git a/www/links/Makefile.common b/www/links/Makefile.common
index cd0f2f595fa..1dbf2677608 100644
--- a/www/links/Makefile.common
+++ b/www/links/Makefile.common
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.common,v 1.20 2004/04/29 09:28:21 wiz Exp $
+# $NetBSD: Makefile.common,v 1.21 2005/02/22 00:19:55 wiz Exp $
-DISTNAME= links-2.1pre15
+DISTNAME= links-2.1pre16
CATEGORIES= www
MASTER_SITES= \
http://atrey.karlin.mff.cuni.cz/~clock/twibright/links/download/ \
diff --git a/www/links/distinfo b/www/links/distinfo
index d2e9861d2c6..f51af7e1116 100644
--- a/www/links/distinfo
+++ b/www/links/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.26 2004/04/29 09:28:21 wiz Exp $
+$NetBSD: distinfo,v 1.27 2005/02/22 00:19:55 wiz Exp $
-SHA1 (links-2.1pre15.tar.bz2) = 207ec64c2732c51552a93f702a239bf2c970167f
-Size (links-2.1pre15.tar.bz2) = 3789080 bytes
+SHA1 (links-2.1pre16.tar.bz2) = bd28dba3431269323b8e2fbf5f958bce43312524
+Size (links-2.1pre16.tar.bz2) = 3825255 bytes
SHA1 (patch-aa) = 47fab20748fc660517ebc2d2ef8a6b9c7c0dd1e4
SHA1 (patch-ab) = a2d461c9d8b6300469ab6195886830fdd63be837
+SHA1 (patch-ac) = ffd6255980ccc6a887806ac1af140750f2c6aebb
diff --git a/www/links/patches/patch-ac b/www/links/patches/patch-ac
new file mode 100644
index 00000000000..5280b94a39c
--- /dev/null
+++ b/www/links/patches/patch-ac
@@ -0,0 +1,91 @@
+$NetBSD: patch-ac,v 1.3 2005/02/22 00:19:55 wiz Exp $
+
+--- html_tbl.c.orig 2005-01-02 21:17:25.000000000 +0100
++++ html_tbl.c
+@@ -41,42 +41,6 @@
+ #define R_ALL 3
+ #define R_GROUPS 4
+
+-/* prototype */
+-void get_align(char *, int *);
+-void get_valign(char *, int *);
+-void get_c_width(char *, int *, int);
+-void free_table(struct table *);
+-void expand_cells(struct table *, int, int);
+-struct table_cell *new_cell(struct table *, int, int);
+-void new_columns(struct table *, int, int, int, int, int);
+-void set_td_width(struct table *, int, int, int);
+-unsigned char *skip_element(unsigned char *, unsigned char *, unsigned char *, int);
+-void get_cell_widths(struct table *);
+-void dst_width(int *, int, int, int *);
+-int get_vline_width(struct table *, int);
+-int get_hline_width(struct table *, int);
+-int g_get_vline_pad(struct table *, int, int *, int *);
+-int g_get_hline_pad(struct table *, int, int *, int *);
+-int get_column_widths(struct table *);
+-void get_table_width(struct table *);
+-void distribute_widths(struct table *, int);
+-void check_table_widths(struct table *);
+-void get_table_heights(struct table *);
+-void display_complicated_table(struct table *, int, int, int *);
+-void get_table_frame(struct table *, signed char *, signed char *);
+-void display_table_frames(struct table *, int, int);
+-void add_to_rect_sets(struct rect_set ***, int *, struct rect *);
+-void add_to_cell_sets(struct table_cell ****, int **, int *, struct rect *, struct table_cell *);
+-void table_mouse_event(struct f_data_c *, struct g_object_table *, int, int, int);
+-void draw_rect_set(struct graphics_device *, struct background *, struct rect_set *, int, int);
+-void draw_rect_sets(struct graphics_device *, struct background *, struct rect_set **, int, int, int);
+-void table_draw(struct f_data_c *, struct g_object_table *, int, int);
+-void table_destruct(struct g_object_table *);
+-void table_get_list(struct g_object_table *, void (*)(struct g_object *, struct g_object *));
+-struct table *new_table(void);
+-
+-void get_cell_width(char *, char *, int, int, int, int *, int *, int, int *, unsigned char *);
+-
+
+ void get_align(char *attr, int *a)
+ {
+@@ -197,6 +161,43 @@ struct table {
+ #endif
+ };
+
++/* prototype */
++void get_align(char *, int *);
++void get_valign(char *, int *);
++void get_c_width(char *, int *, int);
++void free_table(struct table *);
++void expand_cells(struct table *, int, int);
++struct table_cell *new_cell(struct table *, int, int);
++void new_columns(struct table *, int, int, int, int, int);
++void set_td_width(struct table *, int, int, int);
++unsigned char *skip_element(unsigned char *, unsigned char *, unsigned char *, int);
++void get_cell_widths(struct table *);
++void dst_width(int *, int, int, int *);
++int get_vline_width(struct table *, int);
++int get_hline_width(struct table *, int);
++int g_get_vline_pad(struct table *, int, int *, int *);
++int g_get_hline_pad(struct table *, int, int *, int *);
++int get_column_widths(struct table *);
++void get_table_width(struct table *);
++void distribute_widths(struct table *, int);
++void check_table_widths(struct table *);
++void get_table_heights(struct table *);
++void display_complicated_table(struct table *, int, int, int *);
++void get_table_frame(struct table *, signed char *, signed char *);
++void display_table_frames(struct table *, int, int);
++void add_to_rect_sets(struct rect_set ***, int *, struct rect *);
++void add_to_cell_sets(struct table_cell ****, int **, int *, struct rect *, struct table_cell *);
++void table_mouse_event(struct f_data_c *, struct g_object_table *, int, int, int);
++void draw_rect_set(struct graphics_device *, struct background *, struct rect_set *, int, int);
++void draw_rect_sets(struct graphics_device *, struct background *, struct rect_set **, int, int, int);
++void table_draw(struct f_data_c *, struct g_object_table *, int, int);
++void table_destruct(struct g_object_table *);
++void table_get_list(struct g_object_table *, void (*)(struct g_object *, struct g_object *));
++struct table *new_table(void);
++
++void get_cell_width(char *, char *, int, int, int, int *, int *, int, int *, unsigned char *);
++
++
+ #ifdef DEBUG
+ #define CELL(t, x, y) (((x) < 0 || (x) >= (t)->rx || (y) < 0 || (y) >= (t)->ry) ? (internal("accessing cell out of table (%d,%d) - limit (%d,%d)", (x), (y), (t)->rx, (t)->ry), (t)->cells) : &(t)->cells[(y) * (t)->rx + (x)])
+ #else
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-04 15:12:24 +0000