summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMANTANI Nobutaka <nobutaka@FreeBSD.org>2025-03-09 02:14:14 +0900
committerMANTANI Nobutaka <nobutaka@FreeBSD.org>2025-03-09 02:18:55 +0900
commit3d7c4d357c84a9e7f3872405ecc200e9a7911967 (patch)
tree332354bf3b4ba11e470e60c7dceb519464a4e166
parentwww/nextcloud-calendar: Update to 5.1.3 (diff)
www/w3m: Update to the snapshot on 2025-03-05
Fix build error on arm64 Reported by: Herbert J. Skuhra <herbert@gojira.at>
-rw-r--r--www/w3m/Makefile18
-rw-r--r--www/w3m/distinfo6
-rw-r--r--www/w3m/files/patch-w3mimg_fb_fb.c11
-rw-r--r--www/w3m/pkg-plist4
4 files changed, 25 insertions, 14 deletions
diff --git a/www/w3m/Makefile b/www/w3m/Makefile
index b5207675e74a..bc2798bf0eb0 100644
--- a/www/w3m/Makefile
+++ b/www/w3m/Makefile
@@ -1,6 +1,5 @@
PORTNAME= w3m
PORTVERSION= 0.5.3.${SNAPDATE}
-PORTREVISION= 1
CATEGORIES+= www
MASTER_SITES= https://git.sr.ht/~rkta/${PORTNAME}/archive/${COMMIT_HASH}${EXTRACT_SUFX}?dummy=/
@@ -22,8 +21,8 @@ USES= cpe iconv pkgconfig perl5 ssl
CPE_VENDOR= w3m_project
MAKE_JOBS_UNSAFE= yes
-SNAPDATE= 20240916
-COMMIT_HASH= 3601d308b98006da4240f1fd39282a9245e70264
+SNAPDATE= 20250305
+COMMIT_HASH= 32193d61e3938518c0d454022d165b236f26f153
WRKSRC= ${WRKDIR}/${PORTNAME}-${COMMIT_HASH}
CONFLICTS?= ja-w3m-0.5.* ja-w3m-img-0.5.* w3m-img-0.5.*
@@ -33,15 +32,14 @@ CONFIGURE_ARGS= --with-gc=${LOCALBASE} \
ac_cv_path_PERL=${PERL}
CONFIGURE_ENV= DEFS="-I${LOCALBASE}/include"
-DOCS_COMMON= FAQ.html HISTORY MANUAL.html README README.cookie \
- README.cygwin README.dict README.func README.img \
- README.m17n README.mouse README.passwd README.pre_form \
+DOCS_COMMON= FAQ.html HISTORY MANUAL.html README README.SSL \
+ README.cookie README.cygwin README.dict README.func \
+ README.img README.keymap README.menu README.m17n \
+ README.mouse README.passwd README.pre_form \
README.siteconf README.tab STORY.html \
keymap.default keymap.lynx menu.default menu.submenu
DOCS_DE= FAQ.html MANUAL.html README.func
-DOCS_EN= README.sixel
-DOCS_JP= ${DOCS_COMMON} README.SSL README.keymap \
- README.mailcap README.menu README.migemo
+DOCS_JP= ${DOCS_COMMON} README.mailcap README.menu README.migemo
OPTIONS_DEFINE= INLINE_IMAGE JAPANESE KEY_LYNX DOCS NLS
INLINE_IMAGE_DESC= Inline image support
@@ -94,7 +92,7 @@ post-install:
done
@cd ${WRKSRC}/doc; \
${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/w3m/; \
- for i in ${DOCS_COMMON} ${DOCS_EN} ; do \
+ for i in ${DOCS_COMMON} ; do \
${INSTALL_DATA} $$i ${STAGEDIR}${PREFIX}/share/doc/w3m/ ; \
done
${MKDIR} ${STAGEDIR}${PREFIX}/share/man/ja/man1
diff --git a/www/w3m/distinfo b/www/w3m/distinfo
index ea15409d53c3..6bd4b771044e 100644
--- a/www/w3m/distinfo
+++ b/www/w3m/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1726483379
-SHA256 (w3m-0.5.3.20240916.tar.gz) = 5a2603c572ed816b90f91b6e94c4d24b55a37e073f22d0b6e34c23c635434aff
-SIZE (w3m-0.5.3.20240916.tar.gz) = 2328814
+TIMESTAMP = 1741250071
+SHA256 (w3m-0.5.3.20250305.tar.gz) = ef69a46d3acd231de1ab815d8230db2d0b3b1f2b37ba5905e479ae4478524510
+SIZE (w3m-0.5.3.20250305.tar.gz) = 2324317
diff --git a/www/w3m/files/patch-w3mimg_fb_fb.c b/www/w3m/files/patch-w3mimg_fb_fb.c
new file mode 100644
index 000000000000..8e055898a929
--- /dev/null
+++ b/www/w3m/files/patch-w3mimg_fb_fb.c
@@ -0,0 +1,11 @@
+--- w3mimg/fb/fb.c.orig 2025-03-05 08:43:34.000000000 +0100
++++ w3mimg/fb/fb.c 2025-03-06 11:05:52.577162000 +0100
+@@ -1020,7 +1020,7 @@
+ mmap_offset = (size_t)(video_adapter_info->va_window) & (PAGE_MASK);
+ mmap_length = (size_t)(video_adapter_info->va_window_size +
+ mmap_offset + PAGE_MASK) & (~PAGE_MASK);
+- return munmap(((u_long)buf & (~PAGE_MASK)), mmap_length);
++ return munmap((void *)((u_long)buf & (~PAGE_MASK)), mmap_length);
+ #endif
+ }
+
diff --git a/www/w3m/pkg-plist b/www/w3m/pkg-plist
index 2650643202e6..3adcaa02f3c3 100644
--- a/www/w3m/pkg-plist
+++ b/www/w3m/pkg-plist
@@ -49,17 +49,19 @@ share/man/man1/w3mman.1.gz
%%PORTDOCS%%%%DOCSDIR%%/HISTORY
%%PORTDOCS%%%%DOCSDIR%%/MANUAL.html
%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/README.SSL
%%PORTDOCS%%%%DOCSDIR%%/README.cookie
%%PORTDOCS%%%%DOCSDIR%%/README.cygwin
%%PORTDOCS%%%%DOCSDIR%%/README.dict
%%PORTDOCS%%%%DOCSDIR%%/README.func
%%PORTDOCS%%%%DOCSDIR%%/README.img
+%%PORTDOCS%%%%DOCSDIR%%/README.keymap
%%PORTDOCS%%%%DOCSDIR%%/README.m17n
+%%PORTDOCS%%%%DOCSDIR%%/README.menu
%%PORTDOCS%%%%DOCSDIR%%/README.mouse
%%PORTDOCS%%%%DOCSDIR%%/README.passwd
%%PORTDOCS%%%%DOCSDIR%%/README.pre_form
%%PORTDOCS%%%%DOCSDIR%%/README.siteconf
-%%PORTDOCS%%%%DOCSDIR%%/README.sixel
%%PORTDOCS%%%%DOCSDIR%%/README.tab
%%PORTDOCS%%%%DOCSDIR%%/STORY.html
%%PORTDOCS%%%%DOCSDIR%%/keymap.default