From 96e0fac11aa04d5ded3c76dda819356be385fdcc Mon Sep 17 00:00:00 2001
From: antoine <antoine@FreeBSD.org>
Date: Fri, 21 Feb 2014 18:55:46 +0000
Subject: Stage support

---
 www/w3m-img/Makefile |  3 +--
 www/w3m/Makefile     | 21 +++++++--------------
 www/w3m/pkg-plist    |  4 ++++
 3 files changed, 12 insertions(+), 16 deletions(-)

(limited to 'www')

diff --git a/www/w3m-img/Makefile b/www/w3m-img/Makefile
index 3363a9a0e2c9..e038cca34914 100644
--- a/www/w3m-img/Makefile
+++ b/www/w3m-img/Makefile
@@ -4,7 +4,7 @@
 PKGNAMESUFFIX=	-img
 
 MAINTAINER=	nobutaka@FreeBSD.org
-COMMENT=	A pager/text-based WWW browser with inline image support
+COMMENT=	Pager/text-based WWW browser with inline image support
 
 MASTERDIR=	${.CURDIR}/../../www/w3m
 PKGDIR=		${.CURDIR}
@@ -14,5 +14,4 @@ OPTIONS_SLAVE=	DOCS INLINE_IMAGE
 NO_DIALOG=	yes
 CONFLICTS=	ja-w3m-0.5.* ja-w3m-img-0.5.* w3m-0.5.*0
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"
diff --git a/www/w3m/Makefile b/www/w3m/Makefile
index 3cf977a747ca..5cc45a8fd1d6 100644
--- a/www/w3m/Makefile
+++ b/www/w3m/Makefile
@@ -8,10 +8,10 @@ CATEGORIES+=	www ipv6
 MASTER_SITES=	SF/w3m/w3m/w3m-${PORTVERSION}
 
 MAINTAINER?=	nobutaka@FreeBSD.org
-COMMENT?=	A pager/text-based WWW browser
+COMMENT?=	Pager/text-based WWW browser
 
 USE_OPENSSL=	yes
-LIB_DEPENDS=	gc:${PORTSDIR}/devel/boehm-gc
+LIB_DEPENDS=	libgc.so:${PORTSDIR}/devel/boehm-gc
 
 MAKE_JOBS_UNSAFE=	yes
 
@@ -19,9 +19,6 @@ CONFLICTS?=	ja-w3m-0.5.* ja-w3m-img-0.5.* w3m-img-0.5.*
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-gc=${LOCALBASE}
 
-MAN1=		w3m.1 w3mman.1
-MANLANG=	"" ja
-
 DOCS=		FAQ.html HISTORY MANUAL.html README \
 		README.dict README.func README.m17n STORY.html keymap.default \
 		keymap.lynx menu.default menu.submenu
@@ -31,7 +28,6 @@ JAPANESE_DESC=		Japanese messages and migemo support
 INLINE_IMAGE_DESC=	Inline image support
 KEY_LYNX_DESC=		Keymap like lynx browser
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MJAPANESE}
@@ -80,21 +76,18 @@ post-patch:
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
 .if ${PORT_OPTIONS:MJAPANESE}
-	@${MKDIR} ${PREFIX}/share/doc/ja/w3m
+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/ja/w3m
 	@cd ${WRKSRC}/doc-jp; \
 	for i in ${DOCS_JP} ; do \
-		${INSTALL_DATA} $$i ${PREFIX}/share/doc/ja/w3m/ ; \
+		${INSTALL_DATA} $$i ${STAGEDIR}${PREFIX}/share/doc/ja/w3m/ ; \
 	done
 .endif
 	@cd ${WRKSRC}/doc; \
-	${MKDIR} ${PREFIX}/share/doc/w3m/; \
+	${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/w3m/; \
 	for i in ${DOCS} ; do \
-		${INSTALL_DATA} $$i ${PREFIX}/share/doc/w3m/ ; \
+		${INSTALL_DATA} $$i ${STAGEDIR}${PREFIX}/share/doc/w3m/ ; \
 	done
 .endif
-	@${INSTALL_MAN} ${WRKSRC}/scripts/w3mman/w3mman.1 ${PREFIX}/man/ja/man1
-.if ${PORT_OPTIONS:MINLINE_IMAGE}
-	@${CAT} ${PKGMESSAGE}
-.endif
+	@${INSTALL_MAN} ${WRKSRC}/scripts/w3mman/w3mman.1 ${STAGEDIR}${PREFIX}/man/ja/man1
 
 .include <bsd.port.mk>
diff --git a/www/w3m/pkg-plist b/www/w3m/pkg-plist
index 1b7d9647ed95..9c9840c40eaa 100644
--- a/www/w3m/pkg-plist
+++ b/www/w3m/pkg-plist
@@ -10,6 +10,10 @@ libexec/w3m/cgi-bin/w3mhelperpanel
 libexec/w3m/inflate
 libexec/w3m/xface2xpm
 %%INLINE_IMAGE%%libexec/w3m/w3mimgdisplay
+man/ja/man1/w3m.1.gz
+man/ja/man1/w3mman.1.gz
+man/man1/w3m.1.gz
+man/man1/w3mman.1.gz
 %%PORTDOCS%%%%JAPANESE%%share/doc/ja/w3m/FAQ.html
 %%PORTDOCS%%%%JAPANESE%%share/doc/ja/w3m/HISTORY
 %%PORTDOCS%%%%JAPANESE%%share/doc/ja/w3m/MANUAL.html
-- 
cgit