diff --git a/www/w3m/Makefile b/www/w3m/Makefile index b5207675e74a..bc2798bf0eb0 100644 --- a/www/w3m/Makefile +++ b/www/w3m/Makefile @@ -1,103 +1,101 @@ 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=/ MAINTAINER?= nobutaka@FreeBSD.org COMMENT?= Pager/text-based WWW browser WWW= https://git.sr.ht/~rkta/w3m LICENSE= w3m LICENSE_NAME= w3m LICENSE_FILE= ${WRKSRC}/doc/README LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept BROKEN_mips64= fails to build: qemu: uncaught target signal 11 (Segmentation fault) - core dumped LIB_DEPENDS= libgc.so:devel/boehm-gc 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.* GNU_CONFIGURE= yes GNU_CONFIGURE_MANPREFIX=${PREFIX}/share 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 JAPANESE_DESC= Japanese messages and migemo support KEY_LYNX_DESC= Keymap like lynx browser OPTIONS_SUB= yes INLINE_IMAGE_USES= xorg INLINE_IMAGE_USE= xorg=x11 INLINE_IMAGE_LIB_DEPENDS= libImlib2.so:graphics/imlib2 INLINE_IMAGE_CONFIGURE_ON= --with-imagelib=imlib2 --enable-image=fb,x11 INLINE_IMAGE_CONFIGURE_OFF= --enable-image=fb JAPANESE_CONFIGURE_ON= --enable-japanese=U --with-migemo=yes KEY_LYNX_CONFIGURE_ON= --with-keymap=lynx NLS_USES= gettext NLS_CONFIGURE_ON= --enable-nls NLS_CONFIGURE_OFF= --disable-nls .include .if ${PORT_OPTIONS:MINLINE_IMAGE} PKGMESSAGE= ${MASTERDIR}/pkg-message CONFIGURE_ENV += LDFLAGS="-L${LOCALBASE}/lib" LIBS="-lX11" .else # Don't use pkg-message PKGMESSAGE= ${NONEXISTENT} .endif post-patch: @${REINPLACE_CMD} -e \ 's|`\(expr\) \(.*\) : \(.*\)`|`\1 \\( \2 : \3 \\)`|' \ -e 's|/usr/local|${LOCALBASE}|g' \ ${WRKSRC}/configure @${FIND} ${WRKSRC}/doc* -type f \! -name HISTORY \ -exec ${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|g' {} + post-install: @${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/ja/w3m @cd ${WRKSRC}/doc-jp; \ for i in ${DOCS_JP} ; do \ ${INSTALL_DATA} $$i ${STAGEDIR}${PREFIX}/share/doc/ja/w3m/ ; \ done @${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/de/w3m @cd ${WRKSRC}/doc-de; \ for i in ${DOCS_DE} ; do \ ${INSTALL_DATA} $$i ${STAGEDIR}${PREFIX}/share/doc/de/w3m/ ; \ 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 ${INSTALL_MAN} ${WRKSRC}/scripts/w3mman/w3mman.1 ${STAGEDIR}${PREFIX}/share/man/ja/man1 .include 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 @@ -1,79 +1,81 @@ bin/w3m bin/w3mman libexec/w3m/cgi-bin/dirlist.cgi libexec/w3m/cgi-bin/multipart.cgi libexec/w3m/cgi-bin/w3mbookmark libexec/w3m/cgi-bin/w3mdict.cgi libexec/w3m/cgi-bin/w3mhelp.cgi libexec/w3m/cgi-bin/w3mmail.cgi libexec/w3m/cgi-bin/w3mman2html.cgi libexec/w3m/cgi-bin/w3mhelperpanel libexec/w3m/inflate libexec/w3m/xface2xpm %%INLINE_IMAGE%%libexec/w3m/w3mimgdisplay share/man/ja/man1/w3m.1.gz share/man/ja/man1/w3mman.1.gz share/man/de/man1/w3m.1.gz share/man/de/man1/w3mman.1.gz share/man/man1/w3m.1.gz share/man/man1/w3mman.1.gz %%PORTDOCS%%share/doc/de/w3m/FAQ.html %%PORTDOCS%%share/doc/de/w3m/MANUAL.html %%PORTDOCS%%share/doc/de/w3m/README.func %%PORTDOCS%%share/doc/ja/w3m/FAQ.html %%PORTDOCS%%share/doc/ja/w3m/HISTORY %%PORTDOCS%%share/doc/ja/w3m/MANUAL.html %%PORTDOCS%%share/doc/ja/w3m/README %%PORTDOCS%%share/doc/ja/w3m/README.SSL %%PORTDOCS%%share/doc/ja/w3m/README.cookie %%PORTDOCS%%share/doc/ja/w3m/README.cygwin %%PORTDOCS%%share/doc/ja/w3m/README.dict %%PORTDOCS%%share/doc/ja/w3m/README.func %%PORTDOCS%%share/doc/ja/w3m/README.img %%PORTDOCS%%share/doc/ja/w3m/README.keymap %%PORTDOCS%%share/doc/ja/w3m/README.m17n %%PORTDOCS%%share/doc/ja/w3m/README.mailcap %%PORTDOCS%%share/doc/ja/w3m/README.menu %%PORTDOCS%%share/doc/ja/w3m/README.migemo %%PORTDOCS%%share/doc/ja/w3m/README.mouse %%PORTDOCS%%share/doc/ja/w3m/README.passwd %%PORTDOCS%%share/doc/ja/w3m/README.pre_form %%PORTDOCS%%share/doc/ja/w3m/README.siteconf %%PORTDOCS%%share/doc/ja/w3m/README.tab %%PORTDOCS%%share/doc/ja/w3m/STORY.html %%PORTDOCS%%share/doc/ja/w3m/keymap.default %%PORTDOCS%%share/doc/ja/w3m/keymap.lynx %%PORTDOCS%%share/doc/ja/w3m/menu.default %%PORTDOCS%%share/doc/ja/w3m/menu.submenu %%PORTDOCS%%%%DOCSDIR%%/FAQ.html %%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 %%PORTDOCS%%%%DOCSDIR%%/keymap.lynx %%PORTDOCS%%%%DOCSDIR%%/menu.default %%PORTDOCS%%%%DOCSDIR%%/menu.submenu %%NLS%%share/locale/de/LC_MESSAGES/w3m.mo %%NLS%%share/locale/it/LC_MESSAGES/w3m.mo %%NLS%%share/locale/ja/LC_MESSAGES/w3m.mo %%NLS%%share/locale/sv_SE/LC_MESSAGES/w3m.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/w3m.mo %%NLS%%share/locale/zh_TW/LC_MESSAGES/w3m.mo %%DATADIR%%/w3mhelp-funcdesc.de.pl %%DATADIR%%/w3mhelp-funcdesc.en.pl %%DATADIR%%/w3mhelp-funcdesc.ja.pl %%DATADIR%%/w3mhelp-funcname.pl %%DATADIR%%/w3mhelp.html