diff options
| author | MANTANI Nobutaka <nobutaka@FreeBSD.org> | 2007-06-09 05:16:15 +0000 |
|---|---|---|
| committer | MANTANI Nobutaka <nobutaka@FreeBSD.org> | 2007-06-09 05:16:15 +0000 |
| commit | 0ea7a2c7bc58f7f97865c1cde8a15c9340a3b78e (patch) | |
| tree | babea312b2c75f73fe039055d367611852365739 /www | |
| parent | . Update to patchset 5, based on the 1.5.0_11 JRL source code. (diff) | |
Update to 0.5.2.
Notes
Notes:
svn path=/head/; revision=193077
Diffstat (limited to 'www')
| -rw-r--r-- | www/w3m/Makefile | 9 | ||||
| -rw-r--r-- | www/w3m/distinfo | 6 | ||||
| -rw-r--r-- | www/w3m/files/patch-configure | 20 | ||||
| -rw-r--r-- | www/w3m/files/patch-file.c | 22 |
4 files changed, 9 insertions, 48 deletions
diff --git a/www/w3m/Makefile b/www/w3m/Makefile index ab7a9f9fae31..56c5d9c95102 100644 --- a/www/w3m/Makefile +++ b/www/w3m/Makefile @@ -7,7 +7,6 @@ PORTNAME= w3m PORTVERSION= ${W3M_VERSION} -PORTREVISION= 6 CATEGORIES+= www ipv6 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -22,11 +21,11 @@ COMMENT?= A pager/text-based WWW browser LIB_DEPENDS= gc.1:${PORTSDIR}/devel/boehm-gc -W3M_VERSION= 0.5.1 +W3M_VERSION= 0.5.2 CONFLICTS?= ja-w3m-0.5.* ja-w3m-img-0.5.* w3m-m17n-0.5.* w3m-img-0.5.* w3m-m17n-img-0.5.* GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-gc=${LOCALBASE} +CONFIGURE_ARGS= --with-gc=${LOCALBASE} --mandir=${PREFIX}/man MAN1= w3m.1 w3mman.1 MANLANG= "" ja @@ -64,8 +63,8 @@ PLIST_SUB+= JAPANESE="@comment " .endif .if defined(INLINE_IMAGE) -USE_GNOME= gdkpixbuf -CONFIGURE_ARGS+= --with-imagelib=gdk-pixbuf +USE_GNOME= gtk20 +CONFIGURE_ARGS+= --with-imagelib=gtk2 DOCS+= README.img DOCS_JP+= README.img diff --git a/www/w3m/distinfo b/www/w3m/distinfo index e0019418ae4c..c0b53c6f4f7a 100644 --- a/www/w3m/distinfo +++ b/www/w3m/distinfo @@ -1,6 +1,6 @@ -MD5 (w3m-0.5.1.tar.gz) = 0678b72e07e69c41709d71ef0fe5da13 -SHA256 (w3m-0.5.1.tar.gz) = e40c7e3a2c2d5fdc7d92369e77d69256f061493f38c91d699e4436e949802c1d -SIZE (w3m-0.5.1.tar.gz) = 1892121 +MD5 (w3m-0.5.2.tar.gz) = ba06992d3207666ed1bf2dcf7c72bf58 +SHA256 (w3m-0.5.2.tar.gz) = 5ff3e5a1f50a4a8e6ddbfdeefbe13d3a7f63538595a8e29f5da504ea46eda646 +SIZE (w3m-0.5.2.tar.gz) = 1906812 MD5 (w3m-0.5-version-xhtml.patch) = 16211698ec5d7f7258b70f0baf2d9c81 SHA256 (w3m-0.5-version-xhtml.patch) = 3cc144a233f566a4b718eec480f3008bb67b8155ecf10663bb98b0aa47a33796 SIZE (w3m-0.5-version-xhtml.patch) = 8965 diff --git a/www/w3m/files/patch-configure b/www/w3m/files/patch-configure deleted file mode 100644 index e07dbf866b54..000000000000 --- a/www/w3m/files/patch-configure +++ /dev/null @@ -1,20 +0,0 @@ ---- configure.orig Sat Jul 16 01:39:30 2005 -+++ configure Sat Jul 16 01:39:38 2005 -@@ -6443,7 +6443,7 @@ - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ --#include <machine/console.h> -+#include <sys/consio.h> - MOUSE_GETINFO - _ACEOF - if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -@@ -10223,7 +10223,7 @@ - }' - fi - --DEFS=-DHAVE_CONFIG_H -+DEFS="$DEFS -DHAVE_CONFIG_H" - - ac_libobjs= - ac_ltlibobjs= diff --git a/www/w3m/files/patch-file.c b/www/w3m/files/patch-file.c index 1fbe9228c75b..abc5bb03800d 100644 --- a/www/w3m/files/patch-file.c +++ b/www/w3m/files/patch-file.c @@ -1,5 +1,5 @@ ---- file.c.orig Tue Jan 2 22:11:50 2007 -+++ file.c Tue Jan 2 22:14:11 2007 +--- file.c.orig Thu May 24 00:06:05 2007 ++++ file.c Sat Jun 9 12:44:09 2007 @@ -262,7 +262,8 @@ { return (type == NULL || type[0] == '\0' || @@ -10,21 +10,3 @@ } static int -@@ -7799,7 +7800,7 @@ - ans = inputChar(prompt); - } - else { -- printf(prompt); -+ printf("%s", prompt); - fflush(stdout); - ans = Strfgets(stdin)->ptr; - } -@@ -7891,7 +7892,7 @@ - uf->scheme = SCM_LOCAL; - } - UFhalfclose(uf); -- uf->stream = newFileStream(f1, (void (*)())pclose); -+ uf->stream = newFileStream(f1, (void (*)())fclose); - } - - static FILE * |