update to 0.5.1: integrates M17N support

2004-06-26 04:57:35 +00:00 · 2004-06-26 04:57:35 +00:00 · 9e0e52d515
commit 9e0e52d515
parent 07080fce30
8 changed files with 51 additions and 59 deletions
--- a/www/w3m/Makefile
+++ b/www/w3m/Makefile
@ -1,13 +1,8 @@
-# $OpenBSD: Makefile,v 1.55 2003/10/18 19:45:00 sturm Exp $
+# $OpenBSD: Makefile,v 1.56 2004/06/26 04:57:35 naddy Exp $

 COMMENT=	"pager/text-based web browser"

-VERSION=	0.4.1
-M17N_VERSION=	20030308
-REVISION=
-
-DISTNAME=	w3m-${VERSION}
-PKGNAME=	${DISTNAME}${REVISION}
+DISTNAME=	w3m-0.5.1
 CATEGORIES=	www
 HOMEPAGE=	http://w3m.sourceforge.net/

@ -22,58 +17,44 @@ PERMIT_DISTFILES_FTP=	Yes
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=w3m/}
 MASTER_SITES0=	http://www2u.biglobe.ne.jp/~hsaka/w3m/patch/

-SUPDISTFILES=	w3m-${VERSION}${EXTRACT_SUFX} \
-		w3m-${VERSION}-stable-m17n-${M17N_VERSION}${EXTRACT_SUFX}:0
-
+MODULES=	gettext
 LIB_DEPENDS=	gc.1::devel/boehm-gc

-FLAVORS=	image japanese m17n
+FLAVORS=	image japanese
 FLAVOR?=

-CONFIGURE_STYLE= simple
-CONFIGURE_ARGS=	--nonstop \
-		--prefix="${PREFIX}" \
-		--gc-includedir="${LOCALBASE}/include" \
-		--gc-libdir="${LOCALBASE}/lib" \
-		--sysconfdir="${SYSCONFDIR}/w3m" \
-		--model=monster \
-		--mimetypes=/var/www/conf/mime.types
-CONFIGURE_ENV=	use_ssl_verify=y \
-		dmail=mail ded=vi dbrowser=lynx \
-		use_bundled_gclib=n
+CONFIGURE_STYLE=gnu
+CONFIGURE_ARGS=	--disable-xface \
+		--with-browser=/usr/bin/lynx \
+		--with-termlib=curses \
+		--with-gc=${LOCALBASE}

 NO_REGRESS=	Yes

 DOCS=	FAQ.html HISTORY MANUAL.html README README.dict README.func \
-	README.mouse README.pre_form README.tab STORY.html \
+	README.m17n README.mouse README.pre_form README.tab STORY.html \
 	keymap.default keymap.lynx menu.default menu.submenu

 .if ${FLAVOR:L:Mimage}
 LIB_DEPENDS+=	gdk_pixbuf.2,gdk_pixbuf_xlib.2::graphics/gdk-pixbuf
-CONFIGURE_ENV+=	use_image=y
+CONFIGURE_ARGS+=--with-imagelib=gdk-pixbuf
 DOCS+=		README.img
+.else
+CONFIGURE_ARGS+=--enable-image=no
 .endif

 .if ${FLAVOR:L:Mjapanese}
 FULLPKGNAME=	ja-${PKGNAME}${FLAVOR_EXT:S/-japanese//}
 CATEGORIES+=	japanese
-CONFIGURE_ARGS+= --lang=ja --code=n
+CONFIGURE_ARGS+=--enable-japanese=E
 DOCS+=		README.SSL README.cookie README.keymap \
 		README.mailcap README.menu
 DOCSRC=		${WRKSRC}/doc-jp
 .else
-CONFIGURE_ARGS+= --lang=en
+CONFIGURE_ARGS+=--enable-m17n=ISO-8859-1
 DOCSRC=		${WRKSRC}/doc
 .endif

-.if ${FLAVOR:L:Mm17n}
-DISTNAME=	w3m-${VERSION}-stable-m17n-${M17N_VERSION}
-PKGNAME=	w3m-${VERSION}.${M17N_VERSION}${REVISION}
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:0
-CONFIGURE_ARGS+= --suffix="" --charset=UTF-8
-DOCS+=		README.m17n
-.endif
-
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/w3m
 	cd ${DOCSRC}; ${INSTALL_DATA} ${DOCS} ${PREFIX}/share/doc/w3m
--- a/www/w3m/distinfo
+++ b/www/w3m/distinfo
@ -1,6 +1,3 @@
-MD5 (w3m-0.4.1-stable-m17n-20030308.tar.gz) = 5a7f2b205d64d97688e2d83d6c91571f
-MD5 (w3m-0.4.1.tar.gz) = b496ec119dc9734059035e70988dd470
-RMD160 (w3m-0.4.1-stable-m17n-20030308.tar.gz) = 4275dec9d4e3a3861aec4603d700b57e4e2392b5
-RMD160 (w3m-0.4.1.tar.gz) = 1575bb89dc465954de597760da31da2d0c645318
-SHA1 (w3m-0.4.1-stable-m17n-20030308.tar.gz) = 21f031d173b0cabced6e664373b5c8cb4a08133a
-SHA1 (w3m-0.4.1.tar.gz) = 16a4afbff7060a0556e3e72989ff2381e511791d
+MD5 (w3m-0.5.1.tar.gz) = 0678b72e07e69c41709d71ef0fe5da13
+RMD160 (w3m-0.5.1.tar.gz) = a5ffd3a8d44ed55109a1ab4a34d51ae236902654
+SHA1 (w3m-0.5.1.tar.gz) = 7da299648c236772bcde9b0e92e23346c8af0aca
--- a/www/w3m/patches/patch-Makefile_in
+++ b/www/w3m/patches/patch-Makefile_in
@ -0,0 +1,17 @@
+$OpenBSD: patch-Makefile_in,v 1.1 2004/06/26 04:57:36 naddy Exp $
+--- Makefile.in.orig	2004-05-01 20:34:09.000000000 +0200
+++ Makefile.in	2004-05-01 20:34:35.000000000 +0200
+@@ -208,11 +208,11 @@ install-core: $(TARGETS)
+ 	-$(MKDIR) $(DESTDIR)$(CGIBIN_DIR)
+ 	-$(MKDIR) $(DESTDIR)$(HELP_DIR)
+ 	-$(MKDIR) $(DESTDIR)$(mandir)/man1
+-	-$(MKDIR) $(DESTDIR)$(mandir)/ja/man1
+	-$(MKDIR) $(DESTDIR)$(mandir)/ja_JP.EUC/man1
+ 	$(INSTALL_PROGRAM) $(TARGET) $(DESTDIR)$(bindir)/$(TARGET)
+ 	$(INSTALL_DATA) $(HELP_FILE) $(DESTDIR)$(HELP_DIR)/$(HELP_TARGET)
+ 	$(INSTALL_DATA) $(MAN1) $(DESTDIR)$(mandir)/man1/$(MAN1_TARGET)
+-	$(INSTALL_DATA) $(MAN1_JA) $(DESTDIR)$(mandir)/ja/man1/$(MAN1_TARGET)
+	$(INSTALL_DATA) $(MAN1_JA) $(DESTDIR)$(mandir)/ja_JP.EUC/man1/$(MAN1_TARGET)
+ 	targets="$(AUXBIN_TARGETS)"; for file in $$targets; \
+ 	do \
+ 		case $$file in \
--- a/www/w3m/patches/patch-configure
+++ b/www/w3m/patches/patch-configure
@ -1,12 +0,0 @@
-$OpenBSD: patch-configure,v 1.11 2002/11/07 14:19:23 naddy Exp $
--- configure.orig	Tue Nov  5 01:59:58 2002
-+++ configure	Tue Nov  5 02:00:23 2002
-@@ -2289,7 +2289,7 @@ LIB_DIR = $libdir
- HELP_DIR = $helpdir
- MAN_DIR = $mandir
- MAN1_DIR = \$(MAN_DIR)/man1
-MAN1_JA_DIR = \$(MAN_DIR)/ja/man1
-+MAN1_JA_DIR = \$(MAN_DIR)/ja_JP.EUC/man1
- ETC_DIR = $sysconfdir
- RC_DIR = ~/.w3m
- HELP_FILE = $helpfile
--- a/www/w3m/patches/patch-libwc_Makefile_in
+++ b/www/w3m/patches/patch-libwc_Makefile_in
@ -0,0 +1,12 @@
+$OpenBSD: patch-libwc_Makefile_in,v 1.1 2004/06/26 04:57:36 naddy Exp $
+--- libwc/Makefile.in.orig	2004-05-01 21:36:22.000000000 +0200
+++ libwc/Makefile.in	2004-05-01 21:36:52.000000000 +0200
+@@ -6,7 +6,7 @@ top_srcdir=@top_srcdir@
+ VPATH=$(srcdir):.
+ LIBRARY = libwc.a
+ CC=@CC@
+-CFLAGS = $(OPTS) -I.. -I$(top_srcdir) -I$(srcdir) @CFLAGS@ @WCCFLAGS@ @DEFS@
+CFLAGS = $(OPTS) -I.. -I$(top_srcdir) -I$(srcdir) @CFLAGS@ @CPPFLAGS@ @WCCFLAGS@ @DEFS@
+ AR=ar
+ RANLIB=@RANLIB@
+ RM=rm
--- a/www/w3m/pkg/DESCR
+++ b/www/w3m/pkg/DESCR
@ -11,5 +11,3 @@ Available flavors:
              terminal emulator.
  japanese  - Provide Japanese menus and documentation, and properly
              display Japanese characters in kterm.
-  m17n      - Multilingualization extension to handle a plethora of
-              document and terminal character sets, including UTF-8.
--- a/www/w3m/pkg/PFRAG.m17n
+++ b/www/w3m/pkg/PFRAG.m17n
@ -1,2 +0,0 @@
-@comment $OpenBSD: PFRAG.m17n,v 1.5 2002/12/12 01:10:53 naddy Exp $
-share/doc/w3m/README.m17n
--- a/www/w3m/pkg/PLIST
+++ b/www/w3m/pkg/PLIST
@ -1,8 +1,7 @@
-@comment $OpenBSD: PLIST,v 1.17 2003/03/29 00:32:46 naddy Exp $
+@comment $OpenBSD: PLIST,v 1.18 2004/06/26 04:57:36 naddy Exp $
 %%japanese%%
 !%%japanese%%
 %%image%%
-%%m17n%%
 bin/w3m
 bin/w3mman
 libexec/w3m/cgi-bin/dirlist.cgi
@ -13,7 +12,7 @@ libexec/w3m/cgi-bin/w3mhelperpanel
 libexec/w3m/cgi-bin/w3mmail.cgi
 libexec/w3m/cgi-bin/w3mman2html.cgi
 libexec/w3m/inflate
-libexec/w3m/xface2xpm
+@comment libexec/w3m/xface2xpm
 man/man1/w3m.1
 man/man1/w3mman.1
 share/doc/w3m/FAQ.html
@ -22,6 +21,7 @@ share/doc/w3m/MANUAL.html
 share/doc/w3m/README
 share/doc/w3m/README.dict
 share/doc/w3m/README.func
+share/doc/w3m/README.m17n
 share/doc/w3m/README.mouse
 share/doc/w3m/README.pre_form
 share/doc/w3m/README.tab
@ -30,6 +30,7 @@ share/doc/w3m/keymap.default
 share/doc/w3m/keymap.lynx
 share/doc/w3m/menu.default
 share/doc/w3m/menu.submenu
+share/locale/ja/LC_MESSAGES/w3m.mo
 share/w3m/w3mhelp-funcdesc.en.pl
 share/w3m/w3mhelp-funcdesc.ja.pl
 share/w3m/w3mhelp-funcname.pl