Date: Sun, 26 May 2013 00:33:54 +0000 (UTC) From: Jason Helfman <jgh@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r319081 - in head/japanese: jd skkinput skkinput3 trac xdtp xyaku Message-ID: <201305260033.r4Q0Xsmg070665@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jgh Date: Sun May 26 00:33:54 2013 New Revision: 319081 URL: http://svnweb.freebsd.org/changeset/ports/319081 Log: - adoption of optionsNG framework - trim COMMENTS and historical headers Approved by: portmgr (bapt) Modified: head/japanese/jd/Makefile head/japanese/skkinput/Makefile head/japanese/skkinput3/Makefile head/japanese/trac/Makefile head/japanese/xdtp/Makefile head/japanese/xyaku/Makefile Modified: head/japanese/jd/Makefile ============================================================================== --- head/japanese/jd/Makefile Sun May 26 00:17:24 2013 (r319080) +++ head/japanese/jd/Makefile Sun May 26 00:33:54 2013 (r319081) @@ -11,7 +11,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-120 EXTRACT_SUFX= .tgz MAINTAINER= townwear@gmail.com -COMMENT= A 2ch browser +COMMENT= 2ch browser LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING @@ -28,17 +28,19 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-sessionlib=gnomeui -OPTIONS= ONIGURUMA "Build with oniguruma regular expressions lib" off \ - PANGOLAYOUT "Use PANGOLayout instead of PangoGlyphString" off +OPTIONS_DEFINE= ONIGURUMA PANGOLAYOUT +ONIGURUMA_DESC= Use oniguruma regular expressions library +PANGOLAYOUT_DESC= Use PANGOLayout instead of PangoGlyphString +.include <bsd.port.options.mk> .include <bsd.port.pre.mk> -.if defined(WITH_ONIGURUMA) +.if ${PORT_OPTIONS:MONIGURUMA} CONFIGURE_ARGS+= --with-oniguruma LIB_DEPENDS+= onig:${PORTSDIR}/devel/oniguruma5 .endif -.if defined(WITH_PANGOLAYOUT) +.if ${PORT_OPTIONS:MPANGOLAYOUT} CONFIGURE_ARGS+= --with-pangolayout .endif Modified: head/japanese/skkinput/Makefile ============================================================================== --- head/japanese/skkinput/Makefile Sun May 26 00:17:24 2013 (r319080) +++ head/japanese/skkinput/Makefile Sun May 26 00:33:54 2013 (r319081) @@ -1,9 +1,5 @@ -# New ports collection makefile for: skkinput -# Date created: 28 Jan 1998 -# Whom: Murata Shuuichirou <mrt@mickey.ai.kyutech.ac.jp> -# +# Created by: Murata Shuuichirou <mrt@mickey.ai.kyutech.ac.jp> # $FreeBSD$ -# PORTNAME= skkinput PORTVERSION= 2.06.4 @@ -13,24 +9,22 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_ MASTER_SITE_SUBDIR= skkinput2/6273 MAINTAINER= koma2@lovepeers.org -COMMENT= An SKK-like Japanese input method for X11 +COMMENT= SKK-like Japanese input method for X11 USE_IMAKE= yes USE_XORG= ice sm x11 xext xt xmu -OPTIONS= DBSKKD "Use ja-dbskkd-cdb as skkserver" off \ - RSKKSERV "Use ja-rskkserv as skkserver" off +OPTIONS_RADIO= RG1 +OPTIONS_RADIO_RG1= DBSKKD RSKKSERV +RG1_DESC= Skkserver Selection +DBSKKD_DESC= Use ja-dbskkd-cdb as skkserver +RSKKSERV_DESC= Use ja-rskkserv as skkserver -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -# sanity check -.if defined(WITH_DBSKKD) && defined(WITH_RSKKSERV) -.error Cannot define both WITH_DBSKKD and WITH_RSKKSERV simultaneously. -.endif - -.if defined(WITH_DBSKKD) || exists(${LOCALBASE}/libexec/dbskkd-cdb) && !defined(WITH_RSKKSERV) +.if ${PORT_OPTIONS:MDBSKKD} RUN_DEPENDS= ${LOCALBASE}/libexec/dbskkd-cdb:${PORTSDIR}/japanese/dbskkd-cdb -.elif defined(WITH_RSKKSERV) || exists(${LOCALBASE}/libexec/rskkserv) && !defined(WITH_DBSKKD) +.elif ${PORT_OPTIONS:MRSKKSERV} RUN_DEPENDS= ${LOCALBASE}/libexec/rskkserv:${PORTSDIR}/japanese/rskkserv .else RUN_DEPENDS= ${LOCALBASE}/sbin/skkserv:${PORTSDIR}/japanese/skkserv @@ -43,10 +37,10 @@ MANCOMPRESSED= yes DOCS= *.jis ChangeLog \ myeval/skkinputlisp.doc dot.skkinput -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} post-install: @${MKDIR} ${DOCSDIR} @( cd ${WRKSRC} ; ${INSTALL_DATA} ${DOCS} ${DOCSDIR}) .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/japanese/skkinput3/Makefile ============================================================================== --- head/japanese/skkinput3/Makefile Sun May 26 00:17:24 2013 (r319080) +++ head/japanese/skkinput3/Makefile Sun May 26 00:33:54 2013 (r319081) @@ -1,9 +1,5 @@ -# New ports collection makefile for: skkinput3 -# Date created: Aug 14 2002 -# Whom: KOMATSU Shinichiro <koma2@jiro.c.u-tokyo.ac.jp> -# +# Created by: KOMATSU Shinichiro <koma2@jiro.c.u-tokyo.ac.jp> # $FreeBSD$ -# PORTNAME= skkinput3 PORTVERSION= 3.0.6 @@ -13,33 +9,32 @@ MASTER_SITES= http://downloads.sourcefor DISTNAME= skkinput-${PORTVERSION} MAINTAINER= koma2@lovepeers.org -COMMENT= An SKK-like Japanese input method for X11 +COMMENT= SKK-like Japanese input method for X11 USE_IMAKE= yes USE_XORG= ice sm x11 xext xmu xt -OPTIONS= DBSKKD "Use ja-dbskkd-cdb as skkserver" off \ - RSKKSERV "Use ja-rskkserv as skkserver" off \ - SKK10 "Use SKK10 elisps" off +OPTIONS_DEFINE= SKK10 +OPTIONS_RADIO= RG1 +OPTIONS_RADIO_RG1= DBSKKD RSKKSERV +RG1_DESC= Skkserver Selection +DBSKKD_DESC= Use ja-dbskkd-cdb as skkserver +RSKKSERV_DESC= Use ja-rskkserv as skkserver +SKK10_DESC= Use SKK10 elisps NO_INSTALL_MANPAGES= yes -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if defined(WITH_SKK10) +.if ${PORT_OPTIONS:MSKK10} PLIST_SUB= SKK8="@comment " SKK10="" .else PLIST_SUB= SKK8="" SKK10="@comment " .endif -# sanity check -.if defined(WITH_DBSKKD) && defined(WITH_RSKKSERV) -IGNORE= cannot define both WITH_DBSKKD and WITH_RSKKSERV simultaneously -.endif - -.if defined(WITH_DBSKKD) +.if ${PORT_OPTIONS:MDBSKKD} RUN_DEPENDS= ${LOCALBASE}/libexec/dbskkd-cdb:${PORTSDIR}/japanese/dbskkd-cdb -.elif defined(WITH_RSKKSERV) +.elif ${PORT_OPTIONS:MRSKKSERV} RUN_DEPENDS= ${LOCALBASE}/libexec/rskkserv:${PORTSDIR}/japanese/rskkserv .else RUN_DEPENDS= ${LOCALBASE}/sbin/skkserv:${PORTSDIR}/japanese/skkserv @@ -47,17 +42,17 @@ RUN_DEPENDS= ${LOCALBASE}/sbin/skkserv:$ DOCS= *.jis dot.skkinput ChangeLog -.if defined(WITH_SKK10) +.if ${PORT_OPTIONS:MSKK10} post-patch: ${REINPLACE_CMD} -e '/\(#define.*UseSkk8\)/ s/^/XCOMM /' \ -e '/XCOMM.*#define.*UseSkk10/ s/XCOMM[[:space:]]*//' \ ${WRKSRC}/Skkinput.conf .endif -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} post-install: ${MKDIR} ${DOCSDIR} cd ${WRKSRC}; ${INSTALL_DATA} ${DOCS} ${DOCSDIR} .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/japanese/trac/Makefile ============================================================================== --- head/japanese/trac/Makefile Sun May 26 00:17:24 2013 (r319080) +++ head/japanese/trac/Makefile Sun May 26 00:33:54 2013 (r319081) @@ -10,19 +10,22 @@ MASTER_SITE_SUBDIR= kuriyama DISTNAME= Trac-${PORTVERSION}.ja2 MAINTAINER= kuriyama@FreeBSD.org -COMMENT= An enhanced wiki and issue tracking system for software projects +COMMENT= Enhanced wiki and issue tracking system for software projects BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Genshi>=0.5:${PORTSDIR}/textproc/py-genshi \ ${PYTHON_PKGNAMEPREFIX}Babel>=0.9:${PORTSDIR}/devel/py-babel RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Genshi>=0.5:${PORTSDIR}/textproc/py-genshi \ ${PYTHON_PKGNAMEPREFIX}Babel>=0.9:${PORTSDIR}/devel/py-babel -OPTIONS= SILVERCITY "Use Silvercity for syntax highlighting" On \ - DOCUTILS "Allow additional text markup" On \ - PYGMENTS "Use generic syntax highlighter" On \ - TZ "Process Time Zones" On \ - PGSQL "Use PostgreSQL instead of SQLite3" Off \ - SUBVERSION "Support for subversion RCS" On +OPTIONS_DEFINE= SILVERCITY DOCUTILS PYGMENTS TZ PGSQL SVN +SILVERCITY_DESC= Use Silvercity for syntax highlighting +DOCUTILS_DESC= Allow additional text markup +PYGMENTS_DESC= Use generic syntax highlighter +TZ_DESC= Process Time Zones +SVN_DESC= Support for subversion RCS + +OPTIONS_DEFAULT= SILVERCITY DOCUTILS PYGMENTS TZ SUBVERSION + CONFLICTS= trac-0.* USE_ZIP= yes @@ -62,32 +65,32 @@ post-install: @${CAT} ${PKGMESSAGE} @${ECHO_CMD} -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if defined(WITH_SILVERCITY) +.if ${PORT_OPTIONS:MSILVERCITY} RUN_DEPENDS+= ${LOCALBASE}/bin/source2html.py:${PORTSDIR}/textproc/silvercity .endif -.if defined(WITH_DOCUTILS) +.if ${PORT_OPTIONS:MDOCUTILS} RUN_DEPENDS+= ${LOCALBASE}/bin/rst2html:${PORTSDIR}/textproc/py-docutils .endif -.if defined(WITH_PYGMENTS) +.if ${PORT_OPTIONS:MPYGMENTS} RUN_DEPENDS+= ${LOCALBASE}/bin/pygmentize:${PORTSDIR}/textproc/py-pygments .endif -.if defined(WITH_TZ) +.if ${PORT_OPTIONS:MTZ} RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pytz>0:${PORTSDIR}/devel/py-pytz .endif -.if defined(WITH_PGSQL) +.if ${PORT_OPTIONS:MPGSQL} RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/psycopg2/__init__.py:${PORTSDIR}/databases/py-psycopg2 .else RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 .endif -.if !defined(WITHOUT_SUBVERSION) +.if ${PORT_OPTIONS:MSVN} RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/svn/__init__.py:${PORTSDIR}/devel/py-subversion .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/japanese/xdtp/Makefile ============================================================================== --- head/japanese/xdtp/Makefile Sun May 26 00:17:24 2013 (r319080) +++ head/japanese/xdtp/Makefile Sun May 26 00:33:54 2013 (r319081) @@ -1,9 +1,5 @@ -# New ports collection makefile for: XDTP (XML Document Transfer Program) -# Date created: 11 October 2005 -# Whom: Masanori OZAWA (ozawa@ongs.co.jp) -# +# Created by: Masanori OZAWA (ozawa@ongs.co.jp) # $FreeBSD$ -# PORTNAME= xdtp PORTVERSION= 1.3.1 @@ -19,35 +15,38 @@ COMMENT= XDTP (XML Document Transfer Pro LIB_DEPENDS= glibmm-2.4:${PORTSDIR}/devel/glibmm USE_LDCONFIG= yes -USE_GNOME= libxml2 libxslt pkgconfig +USE_GNOME= libxml2 libxslt +USES= pkgconfig GNU_CONFIGURE= yes -OPTIONS= GDK "Build with Gdk-Pixbuf" on \ - DEBUG "Build with debug option" off \ - INCLUDE "Install with XDTP include files" on +OPTIONS_DEFINE= GDK DEBUG INCLUDE +GDK_DESC= Build with Gdk-Pixbuf +INCLUDE_DESC= Install with XDTP include files -.include <bsd.port.pre.mk> +OPTIONS_DEFAULT= GDK INCLUDE + +.include <bsd.port.options.mk> .if ${ARCH} == "amd64" CFLAGS+= -fPIC .endif -.if defined(WITH_GDK) +.if ${PORT_OPTIONS:MGDK} USE_GNOME+= gtk20 .else CONFIGURE_ENV+= WITHOUT_GDK="yes" MAKE_ARGS+= -DWITHOUT_GDK .endif -.if defined(WITH_DEBUG) +.if ${PORT_OPTIONS:MDEBUG} MAKE_ARGS+= -DDEBUG .endif -.if defined(WITH_INCLUDE) +.if ${PORT_OPTIONS:MINCLUDE} PLIST_SUB+= XDTP_INC="" .else MAKE_ARGS+= -DWITHOUT_INCLUDE PLIST_SUB+= XDTP_INC="@comment " .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/japanese/xyaku/Makefile ============================================================================== --- head/japanese/xyaku/Makefile Sun May 26 00:17:24 2013 (r319080) +++ head/japanese/xyaku/Makefile Sun May 26 00:33:54 2013 (r319081) @@ -1,9 +1,5 @@ -# New ports collection makefile for: xyaku -# Date created: 7 Dec 2000 -# Whom: Akinori MUSHA aka knu <knu@idaemons.org> -# +# Created by: Akinori MUSHA aka knu <knu@idaemons.org> # $FreeBSD$ -# PORTNAME= xyaku PORTVERSION= 1.4.0 @@ -13,16 +9,19 @@ MASTER_SITES= http://www.sepia.dti.ne.jp http://redundancy.redundancy.org/mirror/ MAINTAINER= lx@FreeBSD.org -COMMENT= A general dictionary/search engine front-end for X +COMMENT= General dictionary/search engine front-end for X BUILD_DEPENDS= gawk:${PORTSDIR}/lang/gawk RUN_DEPENDS= ${RUBY_SITEARCHLIBDIR}/eb.so:${PORTSDIR}/japanese/ruby-eb USE_XORG= x11 xt xext ice sm -OPTIONS= UTF8 "Use UTF-8 edict dictionaries" on +OPTIONS_DEFINE= UTF8 +OPTIONS_DEFAULT= UTF8 -.if !defined(WITHOUT_UTF8) +.include <bsd.port.options.mk> + +.if ${PORT_OPTIONS:MUTF8} EDICT_FILE= ${LOCALBASE}/share/dict/edict-utf-8/edict RUN_DEPENDS+= ${EDICT_FILE}:${PORTSDIR}/japanese/edict-utf-8 .else @@ -43,7 +42,7 @@ post-extract: ${MV} ${WRKSRC}/addin/ChangeLog ${WRKSRC}/addin/ADDIN.ChangeLog post-install: -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR} ${MKDIR} ${DOCSDIR}/ja .for f in ${DOCS_EN}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201305260033.r4Q0Xsmg070665>