From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Apr 26 21:50:01 2013 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 430815CD for ; Fri, 26 Apr 2013 21:50:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id 27D1D1022 for ; Fri, 26 Apr 2013 21:50:01 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.6/8.14.6) with ESMTP id r3QLo1JY088634 for ; Fri, 26 Apr 2013 21:50:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.6/8.14.6/Submit) id r3QLo1FW088622; Fri, 26 Apr 2013 21:50:01 GMT (envelope-from gnats) Resent-Date: Fri, 26 Apr 2013 21:50:01 GMT Resent-Message-Id: <201304262150.r3QLo1FW088622@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Yasuhiro KIMURA Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id A747533F for ; Fri, 26 Apr 2013 21:46:34 +0000 (UTC) (envelope-from yasu@home.utahime.org) Received: from gate.utahime.jp (gate.utahime.jp [183.180.29.210]) by mx1.freebsd.org (Postfix) with ESMTP id 390411003 for ; Fri, 26 Apr 2013 21:46:33 +0000 (UTC) Received: from eastasia.home.utahime.org (mail.home.utahime.org [192.168.174.1]) by gate.utahime.jp (Postfix) with ESMTP id 439B761F9D; Sat, 27 Apr 2013 06:46:25 +0900 (JST) Received: from eastasia.home.utahime.org (localhost [127.0.0.1]) by localhost-backdoor.home.utahime.org (Postfix) with ESMTP id 170494E636; Sat, 27 Apr 2013 06:46:25 +0900 (JST) Received: by eastasia.home.utahime.org (Postfix, from userid 1000) id DF60C4E632; Sat, 27 Apr 2013 06:46:24 +0900 (JST) Message-Id: <20130426214624.DF60C4E632@eastasia.home.utahime.org> Date: Sat, 27 Apr 2013 06:46:24 +0900 (JST) From: Yasuhiro KIMURA To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.113 Subject: ports/178189: [PATCH] www/w3m: make slave ports work as are before master port is OptionsNG-fied X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 26 Apr 2013 21:50:01 -0000 >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 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 -# +# Created by: MANTANI Nobutaka # $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 -# +# Created by: MANTANI Nobutaka # $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 -# +# Created by: MANTANI Nobutaka # $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 -# +# Created by: SADA Kenji # $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 -# +# Created by: MANTANI Nobutaka # $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: