- Update to 0.5.3. [*]

- Use OPTIONS in www/w3m.
- Enable SSL support by default.

PR:		ports/154545 [*]
Submitted by:	ARAI Toshihiko <arai.toshihiko@gmail.com> [*]

8 files changed, 27 insertions, 97 deletions

diff --git a/japanese/w3m-img/Makefile b/japanese/w3m-img/Makefile
index 007090066823..370ee19bd72b 100644
--- a/japanese/w3m-img/Makefile
+++ b/japanese/w3m-img/Makefile
@@ -15,8 +15,8 @@ MASTERDIR=	${.CURDIR}/../../www/w3m
 PKGDIR=		${.CURDIR}
 PLIST=		${MASTERDIR}/pkg-plist
 
-JAPANESE=	Yes
-INLINE_IMAGE=	yes
+WITH_JAPANESE=	Yes
+WITH_INLINE_IMAGE=	yes
 CONFLICTS=	ja-w3m-0.5.* w3m-0.5.* w3m-m17n-0.5.* w3m-img-0.5.* w3m-m17n-img-0.5.*
 
 .include "${MASTERDIR}/Makefile"
diff --git a/japanese/w3m/Makefile b/japanese/w3m/Makefile
index 87bae70fe1ac..929e14cb0d49 100644
--- a/japanese/w3m/Makefile
+++ b/japanese/w3m/Makefile
@@ -5,7 +5,6 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	1
 CATEGORIES=	japanese
 
 MAINTAINER=	nobutaka@FreeBSD.org
@@ -15,7 +14,7 @@ MASTERDIR=	${.CURDIR}/../../www/w3m
 PKGDIR=		${.CURDIR}
 PLIST=		${MASTERDIR}/pkg-plist
 
-JAPANESE=	Yes
+WITH_JAPANESE=	Yes
 CONFLICTS=	ja-w3m-img-0.5.* w3m-0.5.* w3m-m17n-0.5.* w3m-img-0.5.* w3m-m17n-img-0.5.*
 
 .include "${MASTERDIR}/Makefile"
diff --git a/www/w3m-img/Makefile b/www/w3m-img/Makefile
index 3cdde68ade23..86717bc80dcd 100644
--- a/www/w3m-img/Makefile
+++ b/www/w3m-img/Makefile
@@ -14,7 +14,7 @@ MASTERDIR=	${.CURDIR}/../../www/w3m
 PKGDIR=		${.CURDIR}
 PLIST=		${MASTERDIR}/pkg-plist
 
-INLINE_IMAGE=	yes
+WITH_INLINE_IMAGE=	yes
 CONFLICTS=	ja-w3m-0.5.* ja-w3m-img-0.5.* w3m-0.5.* w3m-m17n-0.5.* w3m-m17n-img-0.5.*
 
 .include "${MASTERDIR}/Makefile"
diff --git a/www/w3m-m17n-img/Makefile b/www/w3m-m17n-img/Makefile
index 230c0f0054e6..acd85a99b84f 100644
--- a/www/w3m-m17n-img/Makefile
+++ b/www/w3m-m17n-img/Makefile
@@ -14,8 +14,8 @@ MASTERDIR=	${.CURDIR}/../../www/w3m
 PKGDIR=		${.CURDIR}
 PLIST=		${MASTERDIR}/pkg-plist
 
-M17N=		yes
-INLINE_IMAGE=	yes
+WITH_M17N=		yes
+WITH_INLINE_IMAGE=	yes
 CONFLICTS=	ja-w3m-0.5.* ja-w3m-img-0.5.* w3m-0.5.* w3m-m17n-0.5.* w3m-img-0.5.*
 
 .include "${MASTERDIR}/Makefile"
diff --git a/www/w3m-m17n/Makefile b/www/w3m-m17n/Makefile
index 34fd7c96c569..eb3150c7f4e1 100644
--- a/www/w3m-m17n/Makefile
+++ b/www/w3m-m17n/Makefile
@@ -14,7 +14,7 @@ MASTERDIR=	${.CURDIR}/../w3m
 PKGDIR=		${.CURDIR}
 PLIST=		${MASTERDIR}/pkg-plist
 
-M17N=	yes
+WITH_M17N=	yes
 CONFLICTS=	ja-w3m-0.5.* ja-w3m-img-0.5.* w3m-0.5.* w3m-img-0.5.* w3m-m17n-img-0.5.*
 
 .include "${MASTERDIR}/Makefile"
diff --git a/www/w3m/Makefile b/www/w3m/Makefile
index 59e44689bbcd..a6e781906e1e 100644
--- a/www/w3m/Makefile
+++ b/www/w3m/Makefile
@@ -6,25 +6,18 @@
 #
 
 PORTNAME=	w3m
-PORTVERSION=	${W3M_VERSION}
-PORTREVISION=	4
+PORTVERSION=	0.5.3
 CATEGORIES+=	www ipv6
 MASTER_SITES=	SF/w3m/w3m/w3m-${PORTVERSION}
-DISTNAME=	w3m-${W3M_VERSION}
-
-PATCH_SITES=	http://www.alib.jp/files/
-PATCHFILES=	w3m-0.5-version-xhtml.patch
-PATCH_DIST_STRIP=	-p1
 
 MAINTAINER?=	nobutaka@FreeBSD.org
 COMMENT?=	A pager/text-based WWW browser
 
+USE_OPENSSL=	yes
 LIB_DEPENDS=	gc.1:${PORTSDIR}/devel/boehm-gc
 
 MAKE_JOBS_UNSAFE=	yes
 
-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}
@@ -36,23 +29,26 @@ DOCS=		FAQ.html HISTORY MANUAL.html README \
 		README.dict README.func STORY.html keymap.default \
 		keymap.lynx menu.default menu.submenu
 
-.if !defined(WITHOUT_SSL) && (exists(/usr/lib/libcrypto.so) || exists(${LOCALBASE}/lib/libcrypto.so))
-USE_OPENSSL=	yes
-.else
-CONFIGURE_ARGS+=	--without-ssl --disable-digest-auth
+.if !defined(MASTERDIR)
+OPTIONS=	M17N "Multilingualization support" off \
+		JAPANESE "Japanese messages and migemo support" off \
+		INLINE_IMAGE "Inline image support" off \
+		KEY_LYNX "Keymap like lynx browser" off
+
+.include <bsd.port.options.mk>
 .endif
 
-.if defined(M17N)
+.if defined(WITH_M17N)
 CONFIGURE_ARGS+=	--enable-m17n
 PLIST_SUB+=	M17N=""
 .else
-.if !defined(JAPANESE)
+.if !defined(WITH_JAPANESE)
 CONFIGURE_ARGS+=	--disable-m17n
 PLIST_SUB+=	M17N="@comment "
 .endif
 .endif
 
-.if defined(JAPANESE)
+.if defined(WITH_JAPANESE)
 USE_GETTEXT=		yes
 CONFIGURE_ARGS+=	--enable-m17n --enable-japanese=E --with-migemo=yes gt_cv_func_gnugettext1_libintl=yes
 DOCS_JP=	${DOCS} README.SSL README.cookie README.keymap README.mailcap \
@@ -64,7 +60,7 @@ CONFIGURE_ARGS+=	--disable-nls
 PLIST_SUB+=	JAPANESE="@comment "
 .endif
 
-.if defined(INLINE_IMAGE)
+.if defined(WITH_INLINE_IMAGE)
 USE_GNOME=	gtk20
 CONFIGURE_ARGS+=	--with-imagelib=gtk2 --enable-image=fb,x11
 
@@ -81,74 +77,23 @@ PLIST_SUB+=	INLINE_IMAGE="@comment "
 PKGMESSAGE=	${NONEXISTENT}
 .endif
 
-.if defined(KEY_LYNX)
+.if defined(WITH_KEY_LYNX)
 CONFIGURE_ARGS+=	--enable-keymap=lynx
 .endif
 
-.include <bsd.port.pre.mk>
-
-.if exists(${PORT_DBDIR}/boehm-gc/options)
-.include "${PORT_DBDIR}/boehm-gc/options"
-.endif
-
-.if defined(WITH_THREADING)
-# Use -lpthread instead of ${PTHREAD_LIBS} to link libpthread 
-# and libc before libgc.
-# This is necessary to avoid build error with boehm-gc with REDIRECT and
-# THREADING options.
-CONFIGURE_ENV=	DEFS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
-		LIBS="${LIBS} ${PTHREAD_LIBS:C/-pthread/-lpthread/} -lc"
-.else
 CONFIGURE_ENV=	DEFS="-I${LOCALBASE}/include"
-.endif
-
-pre-everything::
-	@${ECHO_MSG} "===>"
-	@${ECHO_MSG} "===> You can enable some features by defining following variables."
-	@${ECHO_MSG} "===>"
-.if defined(M17N)
-	@${ECHO_MSG} "===> M17N         (multilingualization, enabled)"
-.else
-	@${ECHO_MSG} "===> M17N         (multilingualization)"
-.endif
-.if defined(JAPANESE)
-	@${ECHO_MSG} "===> JAPANESE     (Japanese messages and migemo support, enabled)"
-.else
-	@${ECHO_MSG} "===> JAPANESE     (Japanese messages and migemo support)"
-.endif
-.if defined(INLINE_IMAGE)
-	@${ECHO_MSG} "===> INLINE_IMAGE (inline image support, enabled)"
-.else
-	@${ECHO_MSG} "===> INLINE_IMAGE (inline image support)"
-.endif
-.if defined(KEY_LYNX)
-	@${ECHO_MSG} "===> KEY_LYNX	(keymap like lynx browser, enabled)"
-.else
-	@${ECHO_MSG} "===> KEY_LYNX     (keymap like lynx browser)"
-.endif
-	@${ECHO_MSG} "===>"
-	@${ECHO_MSG} "===> You can disable some features by defining following variables."
-	@${ECHO_MSG} "===>"
-.if defined(WITHOUT_SSL)
-	@${ECHO_MSG} "===> WITHOUT_SSL (disabled)"
-.else
-	@${ECHO_MSG} "===> WITHOUT_SSL"
-.endif
-	@${ECHO_MSG} "===>"
 
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's|\`\(expr\) \(.*\) : \(.*\)`|`\1 \\( \2 : \3 \\)`|' \
 		-e 's|/usr/local|${LOCALBASE}|g' \
 		${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
-		${WRKSRC}/scripts/w3mman/w3mman2html.cgi.in
 	@${FIND} ${WRKSRC}/doc* -type f \! -name HISTORY \
 		-exec ${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|g' {} +
 
 post-install:
 .if !defined(NOPORTDOCS)
-.if defined(JAPANESE)
+.if defined(WITH_JAPANESE)
 	@${MKDIR} ${PREFIX}/share/doc/ja/w3m
 	@cd ${WRKSRC}/doc-jp; \
 	for i in ${DOCS_JP} ; do \
@@ -160,13 +105,13 @@ post-install:
 	for i in ${DOCS} ; do \
 		${INSTALL_DATA} $$i ${PREFIX}/share/doc/w3m/ ; \
 	done
-.if defined(M17N) || defined(JAPANESE)
+.if defined(WITH_M17N) || defined(WITH_JAPANESE)
 	@${INSTALL_DATA} ${WRKSRC}/doc/README.m17n ${PREFIX}/share/doc/w3m
 .endif
 .endif
 	@${INSTALL_MAN} ${WRKSRC}/scripts/w3mman/w3mman.1 ${PREFIX}/man/ja/man1
-.if defined(INLINE_IMAGE)
+.if defined(WITH_INLINE_IMAGE)
 	@${CAT} ${PKGMESSAGE}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/w3m/distinfo b/www/w3m/distinfo
index c0b53c6f4f7a..7818f42598d7 100644
--- a/www/w3m/distinfo
+++ b/www/w3m/distinfo
@@ -1,6 +1,4 @@
-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.3.tar.gz) = e994d263f2fd2c22febfbe45103526e00145a7674a0fda79c822b97c2770a9e3
+SIZE (w3m-0.5.3.tar.gz) = 2202328
 SHA256 (w3m-0.5-version-xhtml.patch) = 3cc144a233f566a4b718eec480f3008bb67b8155ecf10663bb98b0aa47a33796
 SIZE (w3m-0.5-version-xhtml.patch) = 8965
diff --git a/www/w3m/files/patch-file.c b/www/w3m/files/patch-file.c
deleted file mode 100644
index abc5bb03800d..000000000000
--- a/www/w3m/files/patch-file.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- 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' ||
- 	    strncasecmp(type, "text/", 5) == 0 ||
--	    strncasecmp(type, "message/", sizeof("message/") - 1) == 0);
-+	    strncasecmp(type, "message/", sizeof("message/") - 1) == 0 ||
-+	    IS_HTML(type));
- }
- 
- static int