Date: Mon, 14 Jan 2013 15:35:13 +0900 (JST) From: Yasuhiro KIMURA <yasu@utahime.org> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/175279: [PATCH] www/emacs-w3m: Adopt OptionsNG and etc. Message-ID: <20130114063513.9E3C14E62E@eastasia.home.utahime.org> Resent-Message-ID: <201301140640.r0E6e0Rv032767@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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 <nobutaka@nobutaka.com>
-#
+# Created by: MANTANI Nobutaka <nobutaka@nobutaka.com>
# $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 <bsd.port.options.mk>
+
+.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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20130114063513.9E3C14E62E>