summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Eßer <se@FreeBSD.org>2022-01-03 11:37:54 +0100
committerStefan Eßer <se@FreeBSD.org>2022-01-03 11:37:54 +0100
commit4141e008d68c788f6ac215d4a2299559a74dc686 (patch)
treed3a0c51e3bd4c693e5c10fd3fdbae3ebfde17879
parentbenchmarks/stress-ng: fix build on -CURRENT (diff)
www/larbin: fix build on FreeBSD-13 and 14
-rw-r--r--www/larbin/Makefile5
-rw-r--r--www/larbin/files/patch-adns_internal.h22
2 files changed, 22 insertions, 5 deletions
diff --git a/www/larbin/Makefile b/www/larbin/Makefile
index 782111cbff0f..941d6ffbe1ad 100644
--- a/www/larbin/Makefile
+++ b/www/larbin/Makefile
@@ -2,7 +2,7 @@
PORTNAME= larbin
PORTVERSION= 2.6.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= www
MASTER_SITES= SF
@@ -12,9 +12,6 @@ COMMENT= HTTP crawler with an easy interface
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-BROKEN_FreeBSD_13= ld: error: duplicate symbol: data
-BROKEN_FreeBSD_14= ld: error: duplicate symbol: data
-
BUILD_DEPENDS= bash:shells/bash \
makedepend:devel/makedepend
diff --git a/www/larbin/files/patch-adns_internal.h b/www/larbin/files/patch-adns_internal.h
index 41b65d5074b4..a8d7cf8f7525 100644
--- a/www/larbin/files/patch-adns_internal.h
+++ b/www/larbin/files/patch-adns_internal.h
@@ -1,6 +1,26 @@
--- adns/internal.h.orig 2002-01-02 10:44:52 UTC
+++ adns/internal.h
-@@ -567,7 +567,7 @@ typedef enum {
+@@ -151,15 +151,17 @@ typedef struct allocnode {
+ struct allocnode *next, *back;
+ } allocnode;
+
+-union maxalign {
++typedef union maxalign {
+ byte d[1];
+ struct in_addr ia;
+ long l;
+ void *p;
+ void (*fp)(void);
+ union maxalign *up;
+-} data;
++} data_t;
+
++extern data_t data;
++
+ typedef struct {
+ void *ext;
+ void (*callback)(adns_query parent, adns_query child);
+@@ -567,7 +569,7 @@ typedef enum {
} parsedomain_flags;
adns_status adns__parse_domain(adns_state ads, int serv, adns_query qu,