Hi, Trivial update to edbrowse. Lets us remove a patch (but adds a new one :P)!
diff --git a/www/edbrowse/Makefile b/www/edbrowse/Makefile index cbd90f185b6..bbfcb7d0536 100644 --- a/www/edbrowse/Makefile +++ b/www/edbrowse/Makefile @@ -2,7 +2,7 @@ COMMENT = command-line editor and web browser -DISTNAME = edbrowse-3.7.4 +DISTNAME = edbrowse-3.7.6 CATEGORIES = www @@ -13,7 +13,7 @@ HOMEPAGE = http://edbrowse.org/ # GPL PERMIT_PACKAGE = Yes -WANTLIB += c curl duktape m pcre readline tidy +WANTLIB += c curl duktape m pcre pthread readline tidy MASTER_SITES = https://deftly.net/dist/ diff --git a/www/edbrowse/distinfo b/www/edbrowse/distinfo index 9c18ff0b9b0..9ad4a396dbe 100644 --- a/www/edbrowse/distinfo +++ b/www/edbrowse/distinfo @@ -1,2 +1,2 @@ -SHA256 (edbrowse-3.7.4.tar.gz) = t55kF8EXDJbvaJaMM9WFcl8PLSeFnj/oB8mAqcM+pxk= -SIZE (edbrowse-3.7.4.tar.gz) = 765794 +SHA256 (edbrowse-3.7.6.tar.gz) = pHp7o2OnLTELCO3umEf7z+C30b9Tx7XPTaEKriN7Crs= +SIZE (edbrowse-3.7.6.tar.gz) = 810783 diff --git a/www/edbrowse/patches/patch-CMakeLists_txt b/www/edbrowse/patches/patch-CMakeLists_txt index 4376ce3e3ed..6a89fb61094 100644 --- a/www/edbrowse/patches/patch-CMakeLists_txt +++ b/www/edbrowse/patches/patch-CMakeLists_txt @@ -3,7 +3,7 @@ $OpenBSD: patch-CMakeLists_txt,v 1.1.1.1 2019/05/13 22:11:20 abieber Exp $ Index: CMakeLists.txt --- CMakeLists.txt.orig +++ CMakeLists.txt -@@ -238,16 +238,16 @@ if (UNIX) +@@ -244,16 +244,16 @@ if (UNIX) FILE (GLOB UnixManFile "doc/man-edbrowse-debian.1") set (UnixManDir "/usr/share/man/man1") set (UnixDocDir "/usr/share/doc/edbrowse") @@ -24,7 +24,7 @@ Index: CMakeLists.txt # gzip it in place execute_process(COMMAND ${GZIP_EXE} -f "edbrowse.1" WORKING_DIRECTORY ${CMAKE_BINARY_DIR} -@@ -257,6 +257,7 @@ if (UNIX) +@@ -263,6 +263,7 @@ if (UNIX) install(FILES ${CMAKE_BINARY_DIR}/edbrowse.1.gz DESTINATION ${UnixManDir}) else () message(WARNING "Unable to locate 'gzip'! No man page...") diff --git a/www/edbrowse/patches/patch-src_html_c b/www/edbrowse/patches/patch-src_html_c new file mode 100644 index 00000000000..460add8f142 --- /dev/null +++ b/www/edbrowse/patches/patch-src_html_c @@ -0,0 +1,14 @@ +$OpenBSD$ + +Index: src/html.c +--- src/html.c.orig ++++ src/html.c +@@ -14,7 +14,7 @@ extern int gettimeofday(struct timeval *tp, void *tzp) + + // OSX has no pthread_tryjoin_np, so we can't do our + // asynchronous timers under OSX, which is really no great loss. +-#ifdef __APPLE__ ++#if defined(__APPLE__) || defined(__OpenBSD__) + #define pthread_tryjoin_np pthread_join + #endif + diff --git a/www/edbrowse/patches/patch-src_http_c b/www/edbrowse/patches/patch-src_http_c deleted file mode 100644 index d5a85c37b2a..00000000000 --- a/www/edbrowse/patches/patch-src_http_c +++ /dev/null @@ -1,13 +0,0 @@ -$OpenBSD: patch-src_http_c,v 1.1.1.1 2019/05/13 22:11:20 abieber Exp $ - -Index: src/http.c ---- src/http.c.orig -+++ src/http.c -@@ -1554,7 +1554,6 @@ void ebcurl_setError(CURLcode curlret, const char *url - (*fn) (MSG_Timeout); - break; - -- case CURLE_PEER_FAILED_VERIFICATION: - case CURLE_SSL_CACERT: - (*fn) (MSG_NoCertify, host); - break; -- PGP: 0x1F81112D62A9ADCE / 3586 3350 BFEA C101 DB1A 4AF0 1F81 112D 62A9 ADCE