ports/178189: [PATCH] www/w3m: make slave ports work as are before master port is OptionsNG-fied

[Yasuhiro KIMURA]

>Number:         178189
>Category:       ports
>Synopsis:       [PATCH] www/w3m: make slave ports work as are before master port is OptionsNG-fied
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Fri Apr 26 21:50:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     Yasuhiro KIMURA
>Release:        FreeBSD 9.1-RELEASE-p2 amd64
>Organization:
>Environment:
System: FreeBSD xxxx 9.1-RELEASE-p2 FreeBSD 9.1-RELEASE-p2 #0 r249030: Wed Apr 3 08:10:01 JST 2013 xxxx amd64


	
>Description:
	- Make slave ports work as are before master port is OptionsNG-fied.
	- Convert makefile header to new format.
	- Remove shlib version from LIB_DEPENDS.

	
>How-To-Repeat:
	
>Fix:

	

--- patch-w3m begins here ---
Index: www/w3m/Makefile
===================================================================
--- www/w3m/Makefile	(revision 316621)
+++ www/w3m/Makefile	(working copy)
@@ -11,7 +11,7 @@
 COMMENT?=	A pager/text-based WWW browser
 
 USE_OPENSSL=	yes
-LIB_DEPENDS=	gc.1:${PORTSDIR}/devel/boehm-gc
+LIB_DEPENDS=	gc:${PORTSDIR}/devel/boehm-gc
 
 MAKE_JOBS_UNSAFE=	yes
 
@@ -26,13 +26,11 @@
 		README.dict README.func STORY.html keymap.default \
 		keymap.lynx menu.default menu.submenu
 
-.if !defined(MASTERDIR)
 OPTIONS_DEFINE=	M17N JAPANESE INLINE_IMAGE KEY_LYNX DOCS
 M17N_DESC=		Multilingualization support
 JAPANESE_DESC=		Japanese messages and migemo support
 INLINE_IMAGE_DESC=	Inline image support
 KEY_LYNX_DESC=		Keymap like lynx browser
-.endif
 
 .include <bsd.port.options.mk>
 
Index: www/w3m-img/Makefile
===================================================================
--- www/w3m-img/Makefile	(revision 316621)
+++ www/w3m-img/Makefile	(working copy)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:   w3m-image
-# Date Created:                22 July 2001
-# Whom:                        MANTANI Nobutaka <nobutaka at nobutaka.com>
-#
+# Created by: MANTANI Nobutaka <nobutaka at nobutaka.com>
 # $FreeBSD$
-#
 
 PKGNAMESUFFIX=	-img
 
@@ -14,7 +10,8 @@
 PKGDIR=		${.CURDIR}
 PLIST=		${MASTERDIR}/pkg-plist
 
-WITH_INLINE_IMAGE=	yes
+OPTIONS_OVERRIDE=	DOCS INLINE_IMAGE
+NO_DIALOG=	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"
Index: www/w3m-m17n/Makefile
===================================================================
--- www/w3m-m17n/Makefile	(revision 316621)
+++ www/w3m-m17n/Makefile	(working copy)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:   w3m-m17n
-# Date Created:                08 October 2001
-# Whom:                        MANTANI Nobutaka <nobutaka at nobutaka.com>
-#
+# Created by: MANTANI Nobutaka <nobutaka at nobutaka.com>
 # $FreeBSD$
-#
 
 PKGNAMESUFFIX=	-m17n
 
@@ -14,7 +10,8 @@
 PKGDIR=		${.CURDIR}
 PLIST=		${MASTERDIR}/pkg-plist
 
-WITH_M17N=	yes
+OPTIONS_OVERRIDE=	DOCS M17N
+NO_DIALOG=	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"
Index: www/w3m-m17n-img/Makefile
===================================================================
--- www/w3m-m17n-img/Makefile	(revision 316621)
+++ www/w3m-m17n-img/Makefile	(working copy)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:   w3m-m17n
-# Date Created:                11 January 2004
-# Whom:                        MANTANI Nobutaka <nobutaka at FreeBSD.org>
-#
+# Created by: MANTANI Nobutaka <nobutaka at FreeBSD.org>
 # $FreeBSD$
-#
 
 PKGNAMESUFFIX=	-m17n-img
 
@@ -14,8 +10,8 @@
 PKGDIR=		${.CURDIR}
 PLIST=		${MASTERDIR}/pkg-plist
 
-WITH_M17N=		yes
-WITH_INLINE_IMAGE=	yes
+OPTIONS_OVERRIDE=	DOCS M17N INLINE_IMAGE
+NO_DIALOG=	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"
Index: japanese/w3m/Makefile
===================================================================
--- japanese/w3m/Makefile	(revision 316621)
+++ japanese/w3m/Makefile	(working copy)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	ja-w3m
-# Date Created:			8 Oct 1999
-# Whom:				SADA Kenji <sada at FreeBSD.org>
-#
+# Created by: SADA Kenji <sada at FreeBSD.org>
 # $FreeBSD$
-#
 
 CATEGORIES=	japanese
 
@@ -14,7 +10,8 @@
 PKGDIR=		${.CURDIR}
 PLIST=		${MASTERDIR}/pkg-plist
 
-WITH_JAPANESE=	Yes
+OPTIONS_OVERRIDE=	DOCS JAPANESE
+NO_DIALOG=	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"
Index: japanese/w3m-img/Makefile
===================================================================
--- japanese/w3m-img/Makefile	(revision 316621)
+++ japanese/w3m-img/Makefile	(working copy)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:   ja-w3m-image
-# Date Created:                22 July 2001
-# Whom:                        MANTANI Nobutaka <nobutaka at nobutaka.com>
-#
+# Created by: MANTANI Nobutaka <nobutaka at nobutaka.com>
 # $FreeBSD$
-#
 
 CATEGORIES=	japanese
 PKGNAMESUFFIX=	-img
@@ -15,8 +11,8 @@
 PKGDIR=		${.CURDIR}
 PLIST=		${MASTERDIR}/pkg-plist
 
-WITH_JAPANESE=	Yes
-WITH_INLINE_IMAGE=	yes
+OPTIONS_OVERRIDE=	DOCS JAPANESE INLINE_IMAGE
+NO_DIALOG=	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"
--- patch-w3m ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: