Update to 2004-01-11 snapshot of w3m 0.4.2.

Make portlint happy.

9 files changed, 76 insertions, 113 deletions

diff --git a/japanese/w3m-img/Makefile b/japanese/w3m-img/Makefile
index 20f084b547fd..c84b27ebdc99 100644
--- a/japanese/w3m-img/Makefile
+++ b/japanese/w3m-img/Makefile
@@ -5,8 +5,10 @@
 # $FreeBSD$
 #
 
-PKGNAMESUFFIX=	-img
 CATEGORIES=	japanese
+PKGNAMESUFFIX=	-img
+
+MAINTAINER=	nobutaka@FreeBSD.org
 COMMENT=	A pager/text-based WWW browser with Japanese and inline image support
 
 MASTERDIR=	${.CURDIR}/../../www/w3m
diff --git a/japanese/w3m/Makefile b/japanese/w3m/Makefile
index 06838c335afc..b90db9d60c15 100644
--- a/japanese/w3m/Makefile
+++ b/japanese/w3m/Makefile
@@ -6,6 +6,8 @@
 #
 
 CATEGORIES=	japanese
+
+MAINTAINER=	nobutaka@FreeBSD.org
 COMMENT=	A pager/text-based WWW browser with Japanese support
 
 MASTERDIR=	${.CURDIR}/../../www/w3m
diff --git a/www/w3m-img/Makefile b/www/w3m-img/Makefile
index af3e946bde22..b36b7a7a1491 100644
--- a/www/w3m-img/Makefile
+++ b/www/w3m-img/Makefile
@@ -6,6 +6,8 @@
 #
 
 PKGNAMESUFFIX=	-img
+
+MAINTAINER=	nobutaka@FreeBSD.org
 COMMENT=	A pager/text-based WWW browser with inline image support
 
 MASTERDIR=	${.CURDIR}/../../www/w3m
diff --git a/www/w3m-m17n/Makefile b/www/w3m-m17n/Makefile
index 80698a9be81c..46917cf72c9d 100644
--- a/www/w3m-m17n/Makefile
+++ b/www/w3m-m17n/Makefile
@@ -5,6 +5,9 @@
 # $FreeBSD$
 #
 
+PKGNAMESUFFIX=	-m17n
+
+MAINTAINER=	nobutaka@FreeBSD.org
 COMMENT=	A pager/text-based WWW browser with multilingualization support
 
 MASTERDIR=	${.CURDIR}/../w3m
diff --git a/www/w3m/Makefile b/www/w3m/Makefile
index 89d46cf96bb4..5c08d104df0f 100644
--- a/www/w3m/Makefile
+++ b/www/w3m/Makefile
@@ -8,32 +8,26 @@
 PORTNAME=	w3m
 PORTVERSION=	${W3M_VERSION}
 CATEGORIES+=	www ipv6
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR=	nobutaka
+#MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+#MASTER_SITE_SUBDIR=	${PORTNAME}
+DISTNAME=	w3m-${W3M_VERSION}.${SNAPDATE}
 
 MAINTAINER?=	nobutaka@FreeBSD.org
 COMMENT?=	A pager/text-based WWW browser
 
-LIB_DEPENDS=	gc.1:${PORTSDIR}/devel/boehm-gc
+LIB_DEPENDS=	gc.1:${PORTSDIR}/devel/boehm-gc \
+		intl.5:${PORTSDIR}/devel/gettext
 
-W3M_VERSION=			0.4.1
-M17N_VERSION=			20030308
-M17N_BASE_W3M_VERSION=		0.4.1
+W3M_VERSION=	0.4.2
+SNAPDATE=	20040111
 
-HAS_CONFIGURE=	yes
+GNU_CONFIGURE=	yes
 USE_REINPLACE=	yes
-CONFIGURE_ARGS=	-nonstop --prefix=${PREFIX} \
-			--libdir=${PREFIX}/libexec/w3m \
-			--helpdir=${PREFIX}/share/doc/w3m \
-			--gc-includedir=${LOCALBASE}/include \
-			--gc-libdir=${LOCALBASE}/lib \
-			-cflags="${CFLAGS}"
-HOSTNAME!=	/bin/hostname
-SCRIPTS_ENV=	HOSTNAME=${HOSTNAME} WRKSRC=${WRKSRC} PREFIX=${PREFIX} \
-		CC=${CC} 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}
+
+CONFIGURE_ENV=	DEFS="-I${LOCALBASE}/include"
+WRKSRC=		${WRKDIR}/w3m
 
 MAN1=		w3m.1 w3mman.1
 MANLANG=	"" ja
@@ -44,42 +38,33 @@ DOCS=		FAQ.html HISTORY MANUAL.html README \
 
 .if !defined(WITHOUT_SSL) && exists(/usr/lib/libcrypto.so)
 USE_OPENSSL=	yes
+.else
+CONFIGURE_ARGS+=	--without-ssl
 .endif
 
 .if defined(M17N)
-PORTVERSION:=	${M17N_BASE_W3M_VERSION}+${M17N_VERSION}
-PKGNAMESUFFIX=	-m17n
-
-MASTER_SITES=	http://www2u.biglobe.ne.jp/~hsaka/w3m/patch/
-DISTNAME=	${PORTNAME}-${M17N_BASE_W3M_VERSION}-m17n-${M17N_VERSION}
-CONFIGURE_ARGS+=	--suffix=""
-
-PLIST_SUB+=	M17N="" NO_M17N="@comment "
+CONFIGURE_ARGS+=	--enable-m17n
+PLIST_SUB+=	M17N=""
 .else
-PLIST_SUB+=	M17N="@comment " NO_M17N=""
+.if !defined(JAPANESE)
+CONFIGURE_ARGS+=	--disable-m17n
+PLIST_SUB+=	M17N="@comment "
+.endif
 .endif
 
 .if defined(JAPANESE)
+CONFIGURE_ARGS+=	--enable-m17n --enable-japanese=E --with-migemo=yes
 DOCS_JP=	${DOCS} README.SSL README.cookie README.keymap README.mailcap \
 		README.menu README.migemo
 
-PLIST_SUB+=	JAPANESE=""
+PLIST_SUB+=	JAPANESE="" M17N=""
 .else
 PLIST_SUB+=	JAPANESE="@comment "
 .endif
 
-.if defined(USE_OPENSSL)
-SSL_CFLAGS=	-I${OPENSSLINC}/openssl -I${OPENSSLINC} ${OPENSSL_CFLAGS}
-SSL_LIBS=	-L${OPENSSLLIB} -lssl -lcrypto
-
-MAKE_FLAGS+=	DEFS="${SSL_CFLAGS} -I${LOCALBASE}/include" \
-		LIBS="${SSL_LIBS} ${EXTRA_SSL_LIBS} -L${LOCALBASE}/lib"
-.else
-MAKE_FLAGS+=	DEFS="-I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib"
-.endif
-
 .if defined(INLINE_IMAGE)
 USE_GNOME=	gdkpixbuf
+CONFIGURE_ARGS+=	--with-imagelib=gdk-pixbuf
 
 DOCS+=		README.img
 DOCS_JP+=	README.img
@@ -87,16 +72,13 @@ PLIST_SUB+=	INLINE_IMAGE=""
 
 PKGMESSAGE=	${MASTERDIR}/pkg-message
 .else
+CONFIGURE_ARGS+=	--enable-image=no
 PLIST_SUB+=	INLINE_IMAGE="@comment "
 
 # Don't use pkg-message
 PKGMESSAGE=	${NONEXISTENT}
 .endif
 
-.if defined(M17N)
-.undef EXTRA_PATCHES
-.endif
-
 pre-everything::
 .if defined(M17N)
 	@${ECHO_MSG} "===>"
@@ -139,7 +121,7 @@ post-install:
 	for i in ${DOCS} ; do \
 		${INSTALL_DATA} $$i ${PREFIX}/share/doc/w3m/ ; \
 	done
-.if defined(M17N)
+.if defined(M17N) || defined(JAPANESE)
 	@${INSTALL_DATA} ${WRKSRC}/doc/README.m17n ${PREFIX}/share/doc/w3m
 .endif
 .endif
diff --git a/www/w3m/distinfo b/www/w3m/distinfo
index f95c3a00fa97..a6609f53d7e6 100644
--- a/www/w3m/distinfo
+++ b/www/w3m/distinfo
@@ -1,2 +1 @@
-MD5 (w3m-0.4.1.tar.gz) = b496ec119dc9734059035e70988dd470
-MD5 (w3m-0.4.1-m17n-20030308.tar.gz) = 4b14040c2370ebe482226dc2061b9f18
+MD5 (w3m-0.4.2.20040111.tar.gz) = d9d13e4713cc20983428e9fa76f45b64
diff --git a/www/w3m/files/patch-configure b/www/w3m/files/patch-configure
new file mode 100644
index 000000000000..6d742b165f14
--- /dev/null
+++ b/www/w3m/files/patch-configure
@@ -0,0 +1,11 @@
+--- configure.orig	Fri Dec 12 22:49:07 2003
++++ configure	Fri Dec 12 22:49:50 2003
+@@ -9451,7 +9451,7 @@
+ }'
+ fi
+ 
+-DEFS=-DHAVE_CONFIG_H
++DEFS="$DEFS -DHAVE_CONFIG_H"
+ 
+ ac_libobjs=
+ ac_ltlibobjs=
diff --git a/www/w3m/pkg-plist b/www/w3m/pkg-plist
index 3c4511892b74..7fc70e48fd5e 100644
--- a/www/w3m/pkg-plist
+++ b/www/w3m/pkg-plist
@@ -1,13 +1,13 @@
 bin/w3m
 bin/w3mman
-libexec/w3m/dirlist.cgi
+libexec/w3m/cgi-bin/dirlist.cgi
+libexec/w3m/cgi-bin/multipart.cgi
+libexec/w3m/cgi-bin/w3mbookmark
+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/multipart.cgi
-libexec/w3m/w3mbookmark
-libexec/w3m/w3mhelp.cgi
-libexec/w3m/w3mmail.cgi
-libexec/w3m/w3mman2html.cgi
-libexec/w3m/w3mhelperpanel
 libexec/w3m/xface2xpm
 %%INLINE_IMAGE%%libexec/w3m/w3mimgdisplay
 %%PORTDOCS%%%%JAPANESE%%share/doc/ja/w3m/FAQ.html
@@ -28,23 +28,26 @@ libexec/w3m/xface2xpm
 %%PORTDOCS%%%%JAPANESE%%share/doc/ja/w3m/keymap.lynx
 %%PORTDOCS%%%%JAPANESE%%share/doc/ja/w3m/menu.default
 %%PORTDOCS%%%%JAPANESE%%share/doc/ja/w3m/menu.submenu
-%%PORTDOCS%%share/doc/w3m/FAQ.html
-%%PORTDOCS%%share/doc/w3m/HISTORY
-%%PORTDOCS%%share/doc/w3m/MANUAL.html
-%%PORTDOCS%%share/doc/w3m/README
-%%PORTDOCS%%share/doc/w3m/README.dict
-%%PORTDOCS%%share/doc/w3m/README.func
-%%PORTDOCS%%%%INLINE_IMAGE%%share/doc/w3m/README.img
-%%PORTDOCS%%%%M17N%%share/doc/w3m/README.m17n
-%%PORTDOCS%%share/doc/w3m/STORY.html
-%%PORTDOCS%%share/doc/w3m/keymap.default
-%%PORTDOCS%%share/doc/w3m/keymap.lynx
-%%PORTDOCS%%share/doc/w3m/menu.default
-%%PORTDOCS%%share/doc/w3m/menu.submenu
-share/doc/w3m/w3mhelp.html
-share/doc/w3m/w3mhelp-funcdesc.en.pl
-share/doc/w3m/w3mhelp-funcdesc.ja.pl
-share/doc/w3m/w3mhelp-funcname.pl
+%%PORTDOCS%%%%DOCSDIR%%/FAQ.html
+%%PORTDOCS%%%%DOCSDIR%%/HISTORY
+%%PORTDOCS%%%%DOCSDIR%%/MANUAL.html
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/README.dict
+%%PORTDOCS%%%%DOCSDIR%%/README.func
+%%PORTDOCS%%%%INLINE_IMAGE%%%%DOCSDIR%%/README.img
+%%PORTDOCS%%%%M17N%%%%DOCSDIR%%/README.m17n
+%%PORTDOCS%%%%DOCSDIR%%/STORY.html
+%%PORTDOCS%%%%DOCSDIR%%/keymap.default
+%%PORTDOCS%%%%DOCSDIR%%/keymap.lynx
+%%PORTDOCS%%%%DOCSDIR%%/menu.default
+%%PORTDOCS%%%%DOCSDIR%%/menu.submenu
+%%M17N%%share/locale/ja/LC_MESSAGES/w3m.mo
+share/w3m/w3mhelp-funcdesc.en.pl
+share/w3m/w3mhelp-funcdesc.ja.pl
+share/w3m/w3mhelp-funcname.pl
+share/w3m/w3mhelp.html
+@dirrm libexec/w3m/cgi-bin
 @dirrm libexec/w3m
-@dirrm share/doc/w3m
+@dirrm %%DOCSDIR%%
+@dirrm share/w3m
 %%PORTDOCS%%%%JAPANESE%%@dirrm share/doc/ja/w3m
diff --git a/www/w3m/scripts/pre-configure b/www/w3m/scripts/pre-configure
deleted file mode 100644
index 14fffb794a22..000000000000
--- a/www/w3m/scripts/pre-configure
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-
-echo "# Configuration at ${HOSTNAME}" > ${WRKSRC}/config.param
-echo ftppass_hostnamegen=y >> ${WRKSRC}/config.param
-echo use_nntp=y >> ${WRKSRC}/config.param
-echo use_ansi_color=y >> ${WRKSRC}/config.param
-echo dmodel=5 >> ${WRKSRC}/config.param
-echo use_ssl_verify=y >> ${WRKSRC}/config.param
-echo ded=/usr/bin/vi >> ${WRKSRC}/config.param
-echo dmail=/usr/bin/mail >> ${WRKSRC}/config.param
-echo dbrowser=${LOCALBASE}/bin/netscape >> ${WRKSRC}/config.param
-echo dcc=${CC} >> ${WRKSRC}/config.param
-echo emacs_like_lineedit=y >> ${WRKSRC}/config.param
-echo use_bundled_gclib=n >> ${WRKSRC}/config.param
-
-if [ -n "${USE_OPENSSL}" ] ; then
-    echo dcflags="\"${SSL_CFLAGS} -I${LOCALBASE}/include\"" >> ${WRKSRC}/config.param
-    echo dldflags="\"${SSL_LIBS} ${EXTRA_SSL_LIBS} -L${LOCALBASE}/lib\"" >> ${WRKSRC}/config.param
-else
-    echo dcflags=-I${LOCALBASE}/include >> ${WRKSRC}/config.param
-    echo dldflags=-L${LOCALBASE}/lib >> ${WRKSRC}/config.param
-fi
-
-if [ -n "${JAPANESE}" ] ; then
-    echo lang=JA >> ${WRKSRC}/config.param
-    echo use_migemo=y >> ${WRKSRC}/config.param
-else
-    echo lang=EN >> ${WRKSRC}/config.param
-    echo use_migemo=n >> ${WRKSRC}/config.param
-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
-    echo charset=UTF-8 >> ${WRKSRC}/config.param
-else
-    echo display_code=E >> ${WRKSRC}/config.param
-fi