Update to 0.2.1-inu-1.4 and www/w3m-img port to 0.2.1-inu-1.4-img-1.11

PR:		31124
Submitted by:	MAINTAINER

1 files changed, 43 insertions, 34 deletions

diff --git a/www/w3m/Makefile b/www/w3m/Makefile
index 5ff41f84d275..b9c033f83a5a 100644
--- a/www/w3m/Makefile
+++ b/www/w3m/Makefile
@@ -8,28 +8,31 @@
 PORTNAME=	w3m
 PORTVERSION=	${W3M_VERSION}
 CATEGORIES+=	www ipv6
-MASTER_SITES=	ftp://ei5nazha.yz.yamagata-u.ac.jp/w3m/ \
-		http://mi.med.tohoku.ac.jp/~satodai/w3m/src/ \
-		ftp://ftp.firedrake.org/w3m/ \
-		ftp://ftp.umlauf.de/pub/w3m/ \
-		http://www.instinct.org/w3m/ \
-		http://grilli.net/mirrors/w3m/download/
-DISTNAME=	${PORTNAME}-${W3M_VERSION}
+MASTER_SITES=	http://mi.med.tohoku.ac.jp/~satodai/w3m/inusrc/200109/
+DISTNAME=	${PORTNAME}-${W3M_VERSION}-inu-${INU_VERSION}
 
 MAINTAINER?=	nobutaka@nobutaka.com
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libgc.a:${PORTSDIR}/devel/boehm-gc
+LIB_DEPENDS=	gc.1:${PORTSDIR}/devel/boehm-gc
 
 W3M_VERSION=	0.2.1
-IMG_VERSION=	1.10
-PORTREVISION?=	1
+INU_VERSION=	1.4
+IMG_VERSION=	1.11
+M17N_VERSION=	0.19
 
-.if defined(INLINE_IMAGE)
-PORTVERSION:=	${PORTVERSION}+${IMG_VERSION}
-.else
-PORTREVISION=	1
+.if !defined(M17N)
+PORTREVISION?=	2
 .endif
 
+HAS_CONFIGURE=	yes
+CONFIGURE_ARGS=	-nonstop
+HOSTNAME!=	/bin/hostname
+SCRIPTS_ENV=	HOSTNAME=${HOSTNAME} WRKSRC=${WRKSRC} PREFIX=${PREFIX} \
+		LOCALBASE=${LOCALBASE} JAPANESE=${JAPANESE} \
+		USE_OPENSSL="${USE_OPENSSL}" SSL_CFLAGS="${SSL_CFLAGS}" \
+		SSL_LIBS="${SSL_LIBS}" EXTRA_SSL_LIBS="${EXTRA_SSL_LIBS}" \
+		INLINE_IMAGE=${INLINE_IMAGE} M17N=${M17N}
+
 MAN1=		w3m.1
 MANLANG=	""
 CFLAGS+=	-pipe
@@ -45,29 +48,40 @@ SED_CMD=	-e "s,%%PREFIX%%,${PREFIX},g" \
 USE_OPENSSL=	yes
 .endif
 
-.include <bsd.port.pre.mk>
+.if defined(M17N)
+PORTVERSION:=	${PORTVERSION}+${M17N_VERSION}
+
+MASTER_SITES=	http://www2u.biglobe.ne.jp/~hsaka/w3m/patch/
+DISTNAME=	${PORTNAME}-m17n-${M17N_VERSION}
+
+PATCH_SITES=	http://www.nobutaka.com/FreeBSD/ports/20011009/
+PATCHFILES=	${PORTNAME}-m17n-${M17N_VERSION}-security-fix.diff
+PATCH_DIST_STRIP=	-p0 -F3
 
-.if ${OSVERSION} >= 400014
-SED_CMD+=	-e "s,undef INET6,define INET6,g"
+EXTRA_PATCHES=	${PATCHDIR}/extra-patch-XMakefile.m17n
+PLIST_SUB+=	M17N_ONLY="" NO_M17N="@comment "
+
+# Disable inline image support for w3m-m17n.
+.undef INLINE_IMAGE
+.else
+EXTRA_PATCHES=	${PATCHDIR}/extra-patch-XMakefile
+PLIST_SUB+=	M17N_ONLY="@comment " NO_M17N=""
 .endif
 
 .if defined(JAPANESE)
-SED_CMD+=	-e "s,undef JAPANESE,define JAPANESE,g"
 MANLANG+=	ja
-DOCS_JP=	${DOCS} HISTORY.kokb README.SSL README.cookie \
+DOCS_JP=	${DOCS} README.SSL README.cookie \
 		README.keymap README.mailcap README.menu
 
-PLIST_SUB=	JAPANESE_ONLY=""
+PLIST_SUB+=	JAPANESE_ONLY=""
 .else
-PLIST_SUB=	JAPANESE_ONLY="@comment "
+PLIST_SUB+=	JAPANESE_ONLY="@comment "
 .endif
 
 .if defined(USE_OPENSSL)
 SSL_CFLAGS=	-I${OPENSSLINC}/openssl -I${OPENSSLINC} ${OPENSSL_CFLAGS}
 SSL_LIBS=	-L${OPENSSLLIB} -lssl -lcrypto
 
-SED_CMD+=	-e "s,undef USE_SSL,define USE_SSL,g" \
-		-e "s,undef USE_SSL_VERIFY, define USE_SSL_VERIFY,g"
 MAKE_FLAGS+=	DEFS="${SSL_CFLAGS} -I${LOCALBASE}/include" \
 		LIBS="${SSL_LIBS} ${EXTRA_SSL_LIBS} -L${LOCALBASE}/lib"
 .else
@@ -75,10 +89,10 @@ MAKE_FLAGS+=	DEFS="-I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib"
 .endif
 
 .if defined(INLINE_IMAGE)
+PORTVERSION:=	${PORTVERSION}+${IMG_VERSION}
 PATCH_SITES=	http://www2u.biglobe.ne.jp/~hsaka/w3m/patch/
-PATCHFILES=	${DISTNAME}-img-${IMG_VERSION}.patch
+PATCHFILES=	${PORTNAME}-${W3M_VERSION}-inu-${INU_VERSION}-img-${IMG_VERSION}.patch
 PATCH_DIST_STRIP=	-p1
-EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-XMakefile
 
 USE_IMLIB=	yes
 
@@ -88,7 +102,6 @@ PLIST_SUB+=	INLINE_IMAGE_ONLY=""
 
 PKGMESSAGE=	${MASTERDIR}/pkg-message
 .else
-EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-XMakefile.noimg
 PLIST_SUB+=	INLINE_IMAGE_ONLY="@comment "
 
 # Don't use pkg-message
@@ -100,13 +113,6 @@ pre-extract:
 	@${ECHO_MSG} "You can disable support for SSL by defining WITHOUT_SSL."
 .endif
 
-post-configure:
-	@${CP} ${CONFIG_H} ${CONFIG_H}.in
-	@${SED} ${SED_CMD} < ${CONFIG_H}.in > ${CONFIG_H}
-	@${SED} -e "s,@PERL@,${PERL},g" \
-		-e "s,@CYGWIN@,0,g" \
-		< ${WRKSRC}/scripts/dirlist.in > ${WRKSRC}/scripts/dirlist.cgi
-
 post-install:
 .if !defined(NOPORTDOCS)
 .if defined(JAPANESE)
@@ -120,6 +126,9 @@ post-install:
 	for i in ${DOCS} ; do \
 		${INSTALL_DATA} $$i ${PREFIX}/share/doc/w3m/ ; \
 	done
+.if defined(M17N)
+	@${INSTALL_DATA} ${WRKSRC}/doc/README.m17n ${PREFIX}/share/doc/w3m
+.endif
 .endif
 	@${INSTALL_MAN} ${WRKSRC}/doc/w3m.1 ${PREFIX}/man/man1
 .if defined(JAPANESE)
@@ -129,4 +138,4 @@ post-install:
 	@${CAT} ${PKGMESSAGE}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>