From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Jan 14 06:40:00 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 977E989D for ; Mon, 14 Jan 2013 06:40:00 +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 7E1AD697 for ; Mon, 14 Jan 2013 06:40:00 +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 r0E6e0FO032768 for ; Mon, 14 Jan 2013 06:40:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.6/8.14.6/Submit) id r0E6e0Rv032767; Mon, 14 Jan 2013 06:40:00 GMT (envelope-from gnats) Resent-Date: Mon, 14 Jan 2013 06:40:00 GMT Resent-Message-Id: <201301140640.r0E6e0Rv032767@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 [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 6FDAC869 for ; Mon, 14 Jan 2013 06:35:15 +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 3B04267A for ; Mon, 14 Jan 2013 06:35:14 +0000 (UTC) Received: from eastasia.home.utahime.org (eastasia.home.utahime.org [192.168.174.1]) by gate.utahime.jp (Postfix) with ESMTP id 0261C61F9D; Mon, 14 Jan 2013 15:35:13 +0900 (JST) Received: from eastasia.home.utahime.org (localhost [127.0.0.1]) by localhost-backdoor.home.utahime.org (Postfix) with ESMTP id CA91C4E62F; Mon, 14 Jan 2013 15:35:13 +0900 (JST) Received: by eastasia.home.utahime.org (Postfix, from userid 1000) id 9E3C14E62E; Mon, 14 Jan 2013 15:35:13 +0900 (JST) Message-Id: <20130114063513.9E3C14E62E@eastasia.home.utahime.org> Date: Mon, 14 Jan 2013 15:35:13 +0900 (JST) From: Yasuhiro KIMURA To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.113 Subject: ports/175279: [PATCH] www/emacs-w3m: Adopt OptionsNG and etc. 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: Mon, 14 Jan 2013 06:40:00 -0000 >Number: 175279 >Category: ports >Synopsis: [PATCH] www/emacs-w3m: Adopt OptionsNG and etc. >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: Mon Jan 14 06:40:00 UTC 2013 >Closed-Date: >Last-Modified: >Originator: Yasuhiro KIMURA >Release: FreeBSD 9.1-RELEASE amd64 >Organization: >Environment: System: FreeBSD xxxx 9.1-RELEASE FreeBSD 9.1-RELEASE #0 r245243: Fri Jan 11 10:39:45 JST 2013 xxxx amd64 >Description: - Adopt OptionsNG. - Trim makefile header. - Pet portlint. >How-To-Repeat: >Fix: --- patch-emacs-w3m begins here --- Index: Makefile =================================================================== --- Makefile (revision 310295) +++ Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: emacs-w3m -# Date Created: 24 Mar 2001 -# Whom: MANTANI Nobutaka -# +# Created by: MANTANI Nobutaka # $FreeBSD$ -# PORTNAME= emacs-w3m PORTVERSION= 1.4.471.b.${SNAPDATE} @@ -48,10 +44,17 @@ DOCSDIR= ${PREFIX}/share/doc/${PORTNAME} DOCSDIR_JA= ${PREFIX}/share/doc/ja/${PORTNAME} -.if defined(WITHOUT_SHIMBUN) +OPTIONS_DEFINE= DOCS OCTET_VIEWER SHIMBUN +OPTIONS_DEFAULT= DOCS OCTET_VIEWER SHIMBUN + +OCTET_VIEWER_DESC= Octet stream viewer support +SHIMBUN_DESC= Build and/or install Shimbun + +.include + +.if !${PORT_OPTIONS:MSHIMBUN} EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-Makefile.in SHIMBUN= "@comment " -WITHOUT_OCTET_VIEWER= yes .else SHIMBUN= "" .endif @@ -61,19 +64,19 @@ .if ${EMACS_NAME} == "emacs" && ${EMACS_VER:C/\..*//} >= 23 FLIM_PORT= ${PORTSDIR}/editors/flim SEMI_PORT= ${PORTSDIR}/editors/semi -INSTALL_TARGET= install install-icons +INSTALL_TARGET= install install-icons PLIST_SUB+= EMACS23="" .else -PLIST_SUB+= EMACS23="@comment " +PLIST_SUB+= EMACS23="@comment " .endif .if ${EMACS_PORT_NAME} == "emacs22" -INSTALL_TARGET= install install-icons +INSTALL_TARGET= install install-icons .endif .if ${EMACS_NAME} == "emacs" && ${EMACS_VER:C/\..*//} < 22 MULE_UCS_PORT= ${PORTSDIR}/converters/mule-ucs -INSTALL_TARGET= install install-icons +INSTALL_TARGET= install install-icons .endif FLIM_TRUNK= 1.14 @@ -89,11 +92,11 @@ BUILD_DEPENDS+= w3m:${PORTSDIR}/www/w3m-m17n RUN_DEPENDS+= w3m:${PORTSDIR}/www/w3m-m17n -.if !defined(WITHOUT_SHIMBUN) +.if ${PORT_OPTIONS:MSHIMBUN} BUILD_DEPENDS+= ${FLIM_COOKIE}:${FLIM_PORT} RUN_DEPENDS+= ${FLIM_COOKIE}:${FLIM_PORT} .endif -.if !defined(WITHOUT_OCTET_VIEWER) +.if ${PORT_OPTIONS:MOCTET_VIEWER} RUN_DEPENDS+= ${SEMI_COOKIE}:${SEMI_PORT} \ wvHtml:${PORTSDIR}/textproc/wv \ xlhtml:${PORTSDIR}/textproc/xlhtml @@ -121,7 +124,7 @@ .endif post-install: -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR} ${MKDIR} ${DOCSDIR_JA} .for i in ${DOCS} --- patch-emacs-w3m ends here --- >Release-Note: >Audit-Trail: >Unformatted: