summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMANTANI Nobutaka <nobutaka@FreeBSD.org>2002-11-17 14:31:34 +0000
committerMANTANI Nobutaka <nobutaka@FreeBSD.org>2002-11-17 14:31:34 +0000
commitd0a032548e0599200c6068fb62a3c68bc3793f1a (patch)
tree2d15edfa2bbd88eb9136c853edd65e009ba5f1e7
parentUpdate to 6.1. (diff)
Update www/w3m to 0.3.2 and www/w3m-m17n to 0.3.2+20021116.
Notes
Notes: svn path=/head/; revision=70309
-rw-r--r--www/w3m/Makefile9
-rw-r--r--www/w3m/distinfo4
-rw-r--r--www/w3m/files/patch-main.c20
-rw-r--r--www/w3m/pkg-plist1
-rw-r--r--www/w3m/scripts/pre-configure1
5 files changed, 7 insertions, 28 deletions
diff --git a/www/w3m/Makefile b/www/w3m/Makefile
index 7a48b790292b..aac587a047bd 100644
--- a/www/w3m/Makefile
+++ b/www/w3m/Makefile
@@ -7,7 +7,6 @@
PORTNAME= w3m
PORTVERSION= ${W3M_VERSION}
-PORTREVISION= 1
CATEGORIES+= www ipv6
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -17,9 +16,9 @@ MAINTAINER?= nobutaka@FreeBSD.org
LIB_DEPENDS= gc.1:${PORTSDIR}/devel/boehm-gc
-W3M_VERSION= 0.3.1
-M17N_VERSION= 20020717
-M17N_BASE_W3M_VERSION= 0.3.1
+W3M_VERSION= 0.3.2
+M17N_VERSION= 20021116
+M17N_BASE_W3M_VERSION= ${W3M_VERSION}
HAS_CONFIGURE= yes
USE_REINPLACE= yes
@@ -83,7 +82,7 @@ MAKE_FLAGS+= DEFS="-I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib"
.if defined(INLINE_IMAGE)
USE_GNOMENG= yes
-USE_GNOME= imlib
+USE_GNOME= gdkpixbuf
DOCS+= README.img
DOCS_JP+= README.img
diff --git a/www/w3m/distinfo b/www/w3m/distinfo
index 03bc693b8a94..b75b4c47dae5 100644
--- a/www/w3m/distinfo
+++ b/www/w3m/distinfo
@@ -1,2 +1,2 @@
-MD5 (w3m-0.3.1-m17n-20020717.tar.gz) = b93d1f8caa780b7128e0a9b10e9fcae0
-MD5 (w3m-0.3.1.tar.gz) = 825f792dfda9416ffa24e3ac30bdd268
+MD5 (w3m-0.3.2.tar.gz) = 0daabd1f1931cc306a67f6d4c93c20af
+MD5 (w3m-0.3.2-m17n-20021116.tar.gz) = f6bc88fcfbd855102e990b0fb2bebfc2
diff --git a/www/w3m/files/patch-main.c b/www/w3m/files/patch-main.c
deleted file mode 100644
index 955c05f54b6f..000000000000
--- a/www/w3m/files/patch-main.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- main.c.orig Wed Jul 17 21:54:51 2002
-+++ main.c Wed Jul 17 21:57:26 2002
-@@ -3307,7 +3307,7 @@
- HmarkerList *hl = Currentbuf->hmarklist;
- BufferPoint *po;
- Anchor *an;
-- int hseq = hl->nmark - 1;
-+ int hseq;
-
- if (Currentbuf->firstLine == NULL)
- return;
-@@ -3318,6 +3318,8 @@
- hseq = 0;
- else if (prec_num > 0)
- hseq = hl->nmark - prec_num;
-+ else
-+ hseq = hl->nmark - 1;
- do {
- if (hseq < 0)
- return;
diff --git a/www/w3m/pkg-plist b/www/w3m/pkg-plist
index 96dcca0260d3..3c4511892b74 100644
--- a/www/w3m/pkg-plist
+++ b/www/w3m/pkg-plist
@@ -10,7 +10,6 @@ libexec/w3m/w3mman2html.cgi
libexec/w3m/w3mhelperpanel
libexec/w3m/xface2xpm
%%INLINE_IMAGE%%libexec/w3m/w3mimgdisplay
-%%INLINE_IMAGE%%libexec/w3m/w3mimgsize
%%PORTDOCS%%%%JAPANESE%%share/doc/ja/w3m/FAQ.html
%%PORTDOCS%%%%JAPANESE%%share/doc/ja/w3m/HISTORY
%%PORTDOCS%%%%JAPANESE%%share/doc/ja/w3m/MANUAL.html
diff --git a/www/w3m/scripts/pre-configure b/www/w3m/scripts/pre-configure
index 7c0d7f03e450..14fffb794a22 100644
--- a/www/w3m/scripts/pre-configure
+++ b/www/w3m/scripts/pre-configure
@@ -31,6 +31,7 @@ fi
if [ -n "${INLINE_IMAGE}" ] ; then
echo use_image=y >> ${WRKSRC}/config.param
+ echo use_w3mimg_x11=y >> ${WRKSRC}/config.param
fi
if [ -n "${M17N}" ] ; then