Date: Tue, 26 Mar 2013 07:28:58 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r315263 - in head/editors: morla setedit softmaker-office spe texmakerx Message-ID: <201303260728.r2Q7SwOC057230@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Tue Mar 26 07:28:58 2013 New Revision: 315263 URL: http://svnweb.freebsd.org/changeset/ports/315263 Log: Finish converting the editor category to new options framework Modified: head/editors/morla/Makefile head/editors/setedit/Makefile head/editors/softmaker-office/Makefile head/editors/spe/Makefile head/editors/texmakerx/Makefile Modified: head/editors/morla/Makefile ============================================================================== --- head/editors/morla/Makefile Tue Mar 26 07:25:00 2013 (r315262) +++ head/editors/morla/Makefile Tue Mar 26 07:28:58 2013 (r315263) @@ -1,9 +1,5 @@ -# New ports collection makefile for: morla -# Date created: 2006-04-09 -# Whom: Nicola Vitale <nivit@email.it> -# +# Created by: Nicola Vitale <nivit@email.it> # $FreeBSD$ -# PORTNAME= morla PORTVERSION= 0.16.1 @@ -22,7 +18,8 @@ LIB_DEPENDS= nxml.18:${PORTSDIR}/textpro BUILD_DEPENDS= dot:${PORTSDIR}/graphics/graphviz RUN_DEPENDS= dot:${PORTSDIR}/graphics/graphviz -OPTIONS= XULRUNNER "Install xulrunner as JavaScript engine" off +OPTIONS_DEFINE= XULRUNNER +XULRUNNER_DESC= Xulrunner as JavaScript engine GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include @@ -45,13 +42,13 @@ post-patch: @${REINPLACE_CMD} -e 's|-D.*_DISABLE_DEPRECATED||g' \ ${WRKSRC}/configure -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if defined(WITH_XULRUNNER) +.if ${PORT_OPTIONS:MXULRUNNER} USE_GECKO= libxul19 CONFIGURE_ARGS+= --with-javascript=xulrunner .else CONFIGURE_ARGS+= --with-javascript=none .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/editors/setedit/Makefile ============================================================================== --- head/editors/setedit/Makefile Tue Mar 26 07:25:00 2013 (r315262) +++ head/editors/setedit/Makefile Tue Mar 26 07:28:58 2013 (r315263) @@ -1,7 +1,4 @@ -# New ports collection makefile for: setedit -# Date created: 29 September 2005 -# Whom: Sten Feldman -# +# Created by: Sten Feldman # $FreeBSD$ PORTNAME= setedit @@ -27,34 +24,33 @@ CFLAGS+= -Wno-write-strings -I${LOCALBAS MAN1= setedit.1 infview.1 INFO= setedit sdg infview -OPTIONS= BZIP2 "Support for bzip2" On \ - CALC "Enable internal calculator" On \ - CALENDAR "Enable internal calendar" On \ - NLS "International support (requires intl)" On \ - AALIB "Support for AAlib" Off \ - ELECTRIC "Compile with Electric Fence memory debugger" Off +OPTIONS_DEFINE= BZIP2 CALC CALENDAR NLS AALIB ELECTRIC DOCS +OPTIONS_DEFAULT= BZIP2 CALC CALENDAR +CALC_DESC= Internal calculator +CALENDAR_DESC= Internal calendar +ELECTRIC_DESC= Compile with Electric Fence memory debugger WRKSRC= ${WRKDIR}/${PORTNAME} CONFIGURE_ARGS= --prefix=${PREFIX} --without-mp3 -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if defined(WITHOUT_BZIP2) +.if ! ${PORT_OPTIONS:MBZIP2} CONFIGURE_ARGS+= --no-bzip2 .else CONFIGURE_ARGS+= --bzip2 .endif -.if defined(WITHOUT_CALC) +.if ! ${PORT_OPTIONS:MCALC} CONFIGURE_ARGS+= --without-calc .endif -.if defined(WITHOUT_CALENDAR) +.if ! ${PORT_OPTIONS:MCALENDAR} CONFIGURE_ARGS+= --without-calendar .endif -.if defined(WITHOUT_NLS) +.if ! ${PORT_OPTIONS:MNLS} CONFIGURE_ARGS+= --no-intl .else USE_GETTEXT= yes @@ -62,14 +58,14 @@ PLIST_FILES= share/locale/es/LC_MESSAGES share/locale/de/LC_MESSAGES/setedit.mo .endif -.if defined(WITH_AALIB) +.if ${PORT_OPTIONS:MAALIB} LIB_DEPENDS+= aa.1:${PORTSDIR}/graphics/aalib CONFIGURE_ARGS+= --with-aa .else CONFIGURE_ARGS+= --without-aa .endif -.if defined(WITH_ELECTRIC) +.if ${PORT_OPTIONS:MELECTRIC} LIB_DEPENDS+= efence.0:${PORTSDIR}/devel/ElectricFence CONFIGURE_ARGS+= --with-efence .endif @@ -133,11 +129,11 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/cfgfiles/errors.cle ${DATADIR} ${INSTALL_DATA} ${WRKSRC}/doc/readme.1st ${DATADIR} cd ${WRKSRC}/doc && ${INSTALL_DATA} ${MAN1} ${MANPREFIX}/man/man1 -.if !defined(WITHOUT_NLS) +.if ${PORT_OPTIONS:MNLS} ${INSTALL_DATA} ${WRKSRC}/internac/es.mo ${PREFIX}/share/locale/es/LC_MESSAGES/setedit.mo ${INSTALL_DATA} ${WRKSRC}/internac/de.mo ${PREFIX}/share/locale/de/LC_MESSAGES/setedit.mo .endif -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} @${MKDIR} ${DOCSDIR}/examples @${MKDIR} ${DOCSDIR}/tag_imgs @@ -166,4 +162,4 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/doc/sdg.info ${PREFIX}/info ${INSTALL_DATA} ${WRKSRC}/doc/infview.info ${PREFIX}/info -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/editors/softmaker-office/Makefile ============================================================================== --- head/editors/softmaker-office/Makefile Tue Mar 26 07:25:00 2013 (r315262) +++ head/editors/softmaker-office/Makefile Tue Mar 26 07:28:58 2013 (r315263) @@ -1,9 +1,5 @@ -# Ports collection makefile for:SoftMaker Office -# Date created: 2006-12-20 -# Whom: Ion-Mihai "IOnut" Tetcu<itetcu@FreeBSD.org> -# +# Created by: Ion-Mihai "IOnut" Tetcu<itetcu@FreeBSD.org> # $FreeBSD$ -# PORTNAME= SoftMaker-Office PORTVERSION= 2006 @@ -23,16 +19,18 @@ NO_BUILD= yes WRKSRC= ${WRKDIR}/officetrial -OPTIONS= ALL_DICTS "Install all available dictionaries" on +OPTIONS_DEFINE= ALL_DICTS +OPTIONS_DEFAULT= ALL_DICTS +ALL_DICTS_DESC= Install all available dictionaries NO_CDROM= distribution with other products of any kind forbiden NO_PACKAGE= distribution with other products of any kind forbiden ONLY_FOR_ARCHS= i386 -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.ifndef(WITHOUT_ALL_DICTS) +.if ${PORT_OPTIONS:MALL_DICTS} DISTFILES+= sml06dict.tgz .endif @@ -46,4 +44,4 @@ do-install: ${LN} -s ${PREFIX}/${PORTNAME}/planmaker ${PREFIX}/bin/planmaker ${LN} -s ${PREFIX}/${PORTNAME}/textmaker ${PREFIX}/bin/textmaker -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/editors/spe/Makefile ============================================================================== --- head/editors/spe/Makefile Tue Mar 26 07:25:00 2013 (r315262) +++ head/editors/spe/Makefile Tue Mar 26 07:28:58 2013 (r315263) @@ -1,9 +1,5 @@ -# New ports collection makefile for: SPE -# Date created: 2005-10-12 -# Whom: Nicola Vitale <nivit@email.it> -# +# Created by: Nicola Vitale <nivit@email.it> # $FreeBSD$ -# PORTNAME= SPE PORTVERSION= 0.8.4.h @@ -24,7 +20,8 @@ USE_WX= 2.6 WANT_UNICODE= yes WX_COMPS= python -OPTIONS= ENCRYPTED_DEBUG "Enable encrypted debug in SPE" off +OPTIONS_DEFINE= ENCRYPTED_DEBUG DOCS EXAMPLES +ENCRYPTED_DEBUG_DESC= Enable encrypted debug in SPE REINPLACE_ARGS= -i.bak -E -e "1s,^(\#!.* )python$$,\1 -S PYTHONPATH=${DATADIR} ${PYTHON_CMD},1" @@ -42,6 +39,13 @@ DESKTOP_ENTRIES= "SPE (Stani's Python Ed "spe" \ "Development;IDE;Debugger;GUIDesigner;" \ true + +.include <bsd.port.options.mk> + +.if ${PORT_OPTIONS:MENCRYPTED_DEBUG} +RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/Crypto/__init__.py:${PORTSDIR}/security/py-pycrypto +.endif + post-patch: @cd ${WRKSRC}/_spe && ${REINPLACE_CMD} ${SPESCRIPTS} && ${RM} ${RM_OPTS} *.bak @@ -51,14 +55,14 @@ do-install: ${LN} ${LN_OPTS} ${DATADIR}/_spe/spe ${PREFIX}/bin/spe # documentation -.if !defined (NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${MV} ${SPEDOCS} ${DOCSDIR} && \ ${LN} ${LN_OPTS} ${DOCSDIR} ${SPEDOCS} .else @${RM} ${RM_OPTS} ${SPEDOCS} .endif # examples -.if !defined (NOPORTEXAMPLES) +.if ${PORT_OPTIONS:MNLS} @${MV} ${SPEXAMPLES} ${EXAMPLESDIR} && \ ${LN} ${LN_OPTS} ${EXAMPLESDIR} ${SPEXAMPLES} .else @@ -69,10 +73,4 @@ post-install: @cd ${DATADIR}/_spe && \ ${CHMOD} ${BINMODE} ${SPESCRIPTS} -.include <bsd.port.pre.mk> - -.if defined(WITH_ENCRYPTED_DEBUG) -RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/Crypto/__init__.py:${PORTSDIR}/security/py-pycrypto -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/editors/texmakerx/Makefile ============================================================================== --- head/editors/texmakerx/Makefile Tue Mar 26 07:25:00 2013 (r315262) +++ head/editors/texmakerx/Makefile Tue Mar 26 07:28:58 2013 (r315263) @@ -1,9 +1,5 @@ -# Ports collection makefile for: texmakerx -# Date created: Feb 22, 2009 -# Whom: lx -# +# Created by: lx # $FreeBSD$ -# PORTNAME= texmakerx PORTVERSION= 2.1 @@ -30,16 +26,17 @@ HAS_CONFIGURE= yes INSTALLS_ICONS= yes MAKE_JOBS_UNSAFE= yes -OPTIONS= XDVI "view dvi with xdvi" On \ - GV "view ps with gv" On +OPTIONS_DEFINE= XDVI GV +GV_DESC= View ps files with gv +XDVI_DESC= View dvi files with xdvi -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if !defined(WITHOUT_XDVI) +.if ${PORT_OPTIONS:MXDVI} RUN_DEPENDS+= xdvi:${PORTSDIR}/print/xdvik .endif -.if !defined(WITHOUT_GV) +.if ${PORT_OPTIONS:MGV} RUN_DEPENDS+= gv:${PORTSDIR}/print/gv .endif @@ -53,4 +50,4 @@ do-configure: @cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \ ${QMAKE} PREFIX=${PREFIX} ${PORTNAME}.pro -.include <bsd.port.post.mk> +.include <bsd.port.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201303260728.r2Q7SwOC057230>