svn commit: r316718 - in head/textproc: docbook docbook-500 docbook-xsl stardict2-dictd_mova stardict2-quick

Jason Helfman jgh at FreeBSD.org
Sun Apr 28 16:32:54 UTC 2013


Thanks for taking care of this!
I had all the docbook's converted, and was waiting on feedback from
maintainer on a patch I had sent.
Looks like what I had sent :)

-jgh


On Sun, Apr 28, 2013 at 6:34 AM, Baptiste Daroussin <bapt at freebsd.org>wrote:

> Author: bapt
> Date: Sun Apr 28 13:34:26 2013
> New Revision: 316718
> URL: http://svnweb.freebsd.org/changeset/ports/316718
>
> Log:
>   Convert textproc to new options framework
>
> Modified:
>   head/textproc/docbook-500/Makefile
>   head/textproc/docbook-xsl/Makefile
>   head/textproc/docbook/Makefile
>   head/textproc/stardict2-dictd_mova/Makefile
>   head/textproc/stardict2-quick/Makefile
>
> Modified: head/textproc/docbook-500/Makefile
>
> ==============================================================================
> --- head/textproc/docbook-500/Makefile  Sun Apr 28 13:31:21 2013
>  (r316717)
> +++ head/textproc/docbook-500/Makefile  Sun Apr 28 13:34:26 2013
>  (r316718)
> @@ -1,7 +1,4 @@
> -# New ports collection makefile for:   docbook-450
> -# Date created:                14 Jul 2008
> -# Whom:                        Gabor Kovesdan <gabor at kovesdan.org>
> -#
> +# Created by: Gabor Kovesdan <gabor at kovesdan.org>
>  # $FreeBSD$
>
>  PORTNAME=      docbook
> @@ -33,52 +30,54 @@ XMLCAT_ADD= ${XMLCATMGR} -c ${XMLCAT} ad
>  XMLCAT_RM=     ${XMLCATMGR} -c ${XMLCAT} remove \
>                     ${PREFIX}/${DOCBOOKDIR}/catalog.xml
>
> -OPTIONS=       DTD             "XML DTD"                               on
> \
> -               SCHEMA          "W3C XML Schema"                        on
> \
> -               RELAX_NG        "RELAX NG Schema"                       on
> \
> -               SCHEMATRON      "Schematron constraints"                on
> \
> -               NVDL            "NVDL description"                      on
> \
> -               TOOLS           "Tools for working with DocBook"        on
> \
> -               XMLCHARENT      "Install ISO 8879 XML entites"          on
> +OPTIONS_DEFINE=        DTD SCHEMA RELAX_NG SCHEMATRON NVDL TOOLS
> XMLCHARENT DOCS
> +OPTIONS_DEFAULT=       DTD SCHEMA RELAX_NG SCHEMATRON NVDL TOOLS
> XMLCHARENT
> +DTD_DESC=              XML DTD
> +SCHEMA_DESC=           W3C XML Schema
> +RELAX_NG_DESC=         RELAX NG Schema
> +SCHEMATRON_DESC=       Schematron constraints
> +NVDL_DESC=             NVDL description
> +TOOLS_DESC=            Tools for working with DocBook
> +XMLCHARENT_DESC=       Install ISO 8879 XML entites
>
> -.include <bsd.port.pre.mk>
> +.include <bsd.port.options.mk>
>
> -.if defined(WITH_DTD)
> +.if ${PORT_OPTIONS:MDTD}
>  PLIST_SUB+=    DTD=""
>  MODULES+=      dtd
>  .else
>  PLIST_SUB+=    DTD="@comment "
>  .endif
> -.if defined(WITH_SCHEMA)
> +.if ${PORT_OPTIONS:MSCHEMA}
>  PLIST_SUB+=    SCHEMA=""
>  MODULES+=      xsd
>  .else
>  PLIST_SUB+=    SCHEMA="@comment "
>  .endif
> -.if defined(WITH_RELAX_NG)
> +.if ${PORT_OPTIONS:MRELAX_NG}
>  PLIST_SUB+=    RELAXNG=""
>  MODULES+=      rng
>  .else
>  PLIST_SUB+=    RELAXNG="@comment "
>  .endif
> -.if defined(WITH_SCHEMATRON)
> +.if ${PORT_OPTIONS:MSCHEMATRON}
>  PLIST_SUB+=    SCHEMATRON=""
>  MODULES+=      sch
>  .else
>  PLIST_SUB+=    SCHEMATRON="@comment "
>  .endif
> -.if defined(WITH_NVDL)
> +.if ${PORT_OPTIONS:MNVDL}
>  PLIST_SUB+=    NVDL=""
>  .else
>  PLIST_SUB+=    NVDL="@comment "
>  .endif
> -.if defined(WITH_TOOLS)
> +.if ${PORT_OPTIONS:MTOOLS}
>  PLIST_SUB+=    TOOLS=""
>  MODULES+=      tools
>  .else
>  PLIST_SUB+=    TOOLS="@comment "
>  .endif
> -.if defined(WITH_XMLCHARENT)
> +.if ${PORT_OPTIONS:MXMLCHARENT}
>  RUN_DEPENDS+=
>  ${LOCALBASE}/share/xml/xmlcharent/catalog:${PORTSDIR}/textproc/xmlcharent
>  .endif
>
> @@ -92,11 +91,11 @@ do-install:
>                         ${INSTALL_DATA} $${i}
> ${PREFIX}/${DOCBOOKDIR}/${m}; \
>                 done
>  .endfor
> -.if defined(WITH_NVDL)
> +.if ${PORT_OPTIONS:MNVDL}
>         ${MKDIR} ${PREFIX}/${DOCBOOKDIR}/nvdl
>         ${INSTALL_DATA} ${WRKSRC}/docbook.nvdl ${PREFIX}/${DOCBOOKDIR}/nvdl
>  .endif
> -.if !defined(NOPORTDOCS)
> +.if ${PORT_OPTIONS:MDOCS}
>         ${MKDIR} ${DOCSDIR}
>         files1=$$(${FIND} ${WRKSRC} -type f -depth 1| ${GREP} -v -e
> '.xml$$' -e '.nvdl$$'); \
>         files2=$$(${FIND} ${WRKSRC}/docs -type f -depth 1); \
> @@ -113,4 +112,4 @@ do-install:
>  post-install:
>         -${XMLCAT_ADD}
>
> -.include <bsd.port.post.mk>
> +.include <bsd.port.mk>
>
> Modified: head/textproc/docbook-xsl/Makefile
>
> ==============================================================================
> --- head/textproc/docbook-xsl/Makefile  Sun Apr 28 13:31:21 2013
>  (r316717)
> +++ head/textproc/docbook-xsl/Makefile  Sun Apr 28 13:34:26 2013
>  (r316718)
> @@ -14,10 +14,6 @@ BUILD_DEPENDS=       xmlcatmgr:${PORTSDIR}/tex
>  RUN_DEPENDS=   docbook>=0:${PORTSDIR}/textproc/docbook \
>                 xmlcatmgr:${PORTSDIR}/textproc/xmlcatmgr
>
> -.if !defined(NOPORTDOCS)
> -DISTFILES+=    ${PORTNAME}-doc-${PORTVERSION}${EXTRACT_SUFX}:doc
> -.endif
> -
>  USE_BZIP2=     yes
>  NO_BUILD=      yes
>
> @@ -34,102 +30,113 @@ XMLCATMGR=        ${LOCALBASE}/bin/xmlcatmgr
>
>  MODULES=       common fo html images lib manpages params xhtml
>
> -OPTIONS=       ECLIPSE         "Eclipse modules"               on \
> -               EPUB            "Epub modules"                  on \
> -               EXTENSIONS      "Extensions"                    on \
> -               HIGHLIGHTING    "highlighting modules"          on \
> -               HTMLHELP        "HTML Help modules"             on \
> -               JAVAHELP        "Java Help modules"             on \
> -               PROFILING       "Profiling modules"             on \
> -               ROUNDTRIP       "Roundtrip modules"             on \
> -               SLIDES          "Slides modules"                on \
> -               TEMPLATE        "Templates"                     on \
> -               TESTS           "Test tools"                    on \
> -               TOOLS           "Tools"                         on \
> -               WEBSITE         "Website modules"               on \
> -               XHTML11         "XHTML 1.1 modules"             on
> +OPTIONS_DEFINE=        ECLIPSE EPUB EXTENSIONS HIGHLIGHTING HTMLHELP
> JAVAHELP \
> +               PROFILING ROUNDTRIP SLIDES TEMPLATE TESTS TOOLS WEBSITE \
> +               XHTML11 DOCS
> +OPTIONS_DEFAULT=       ECLIPSE EPUB EXTENSIONS HIGHLIGHTING HTMLHELP
> JAVAHELP \
> +                       PROFILING ROUNDTRIP SLIDES TEMPLATE TESTS TOOLS
> WEBSITE \
> +                       XHTML11
> +
> +ECLIPSE_DESC=          Eclipse modules
> +EPUB_DESC=             Epub modules
> +EXTENSIONS_DESC=       Extensions
> +HIGHLIGHTING_DESC=     highlighting modules
> +HTMLHELP_DESC=         HTML Help modules
> +JAVAHELP_DESC=         Java Help modules
> +PROFILING_DESC=                Profiling modules
> +ROUNDTRIP_DESC=                Roundtrip modules
> +SLIDES_DESC=           Slides modules
> +TEMPLATE_DESC=         Templates
> +TESTS_DESC=            Test tools
> +TOOLS_DESC=            Tools
> +WEBSITE_DESC=          Website modules
> +XHTML11_DESC=          XHTML 1.1 modules
>
> -.include <bsd.port.pre.mk>
> +.include <bsd.port.options.mk>
> +
> +.if ${PORT_OPTIONS:MDOCS}
> +DISTFILES+=    ${PORTNAME}-doc-${PORTVERSION}${EXTRACT_SUFX}:doc
> +.endif
>
> -.if defined(WITH_ECLIPSE)
> +.if ${PORT_OPTIONS:MECLIPSE}
>  PLIST_SUB+=    ECLIPSE=""
>  MODULES+=      eclipse
>  .else
>  PLIST_SUB+=    ECLIPSE="@comment "
>  .endif
> -.if defined(WITH_EPUB)
> +.if ${PORT_OPTIONS:MEPUB}
>  PLIST_SUB+=    EPUB=""
>  MODULES+=      epub
>  .else
>  PLIST_SUB+=    EPUB="@comment "
>  .endif
> -.if defined(WITH_EXTENSIONS)
> +.if ${PORT_OPTIONS:MEXTENSIONS}
>  PLIST_SUB+=    EXTENSIONS=""
>  MODULES+=      extensions
>  .else
>  PLIST_SUB+=    EXTENSIONS="@comment "
>  .endif
> -.if defined(WITH_HIGHLIGHTING)
> +.if ${PORT_OPTIONS:MHIGHLIGHTING}
>  PLIST_SUB+=    HIGHLIGHTING=""
>  MODULES+=      highlighting
>  .else
>  PLIST_SUB+=    HIGHLIGHTING="@comment "
>  .endif
> -.if defined(WITH_HTMLHELP)
> +.if ${PORT_OPTIONS:MHTMLHELP}
>  PLIST_SUB+=    HTMLHELP=""
>  MODULES+=      htmlhelp
>  .else
>  PLIST_SUB+=    HTMLHELP="@comment "
>  .endif
> -.if defined(WITH_JAVAHELP)
> +.if ${PORT_OPTIONS:MJAVAHELP}
>  PLIST_SUB+=    JAVAHELP=""
>  MODULES+=      javahelp
>  .else
>  PLIST_SUB+=    JAVAHELP="@comment "
>  .endif
> -.if defined(WITH_PROFILING)
> +.if ${PORT_OPTIONS:MPROFILING}
>  PLIST_SUB+=    PROFILING=""
>  MODULES+=      profiling
>  .else
>  PLIST_SUB+=    PROFILING="@comment "
>  .endif
> -.if defined(WITH_ROUNDTRIP)
> +.if ${PORT_OPTIONS:MROUNDTRIP}
>  PLIST_SUB+=    ROUNDTRIP=""
>  MODULES+=      roundtrip
>  .else
>  PLIST_SUB+=    ROUNDTRIP="@comment "
>  .endif
> -.if defined(WITH_SLIDES)
> +.if ${PORT_OPTIONS:MSLIDES}
>  PLIST_SUB+=    SLIDES=""
>  MODULES+=      slides
>  .else
>  PLIST_SUB+=    SLIDES="@comment "
>  .endif
> -.if defined(WITH_TEMPLATE)
> +.if ${PORT_OPTIONS:MTEMPLATE}
>  PLIST_SUB+=    TEMPLATE=""
>  MODULES+=      template
>  .else
>  PLIST_SUB+=    TEMPLATE="@comment "
>  .endif
> -.if defined(WITH_TESTS)
> +.if ${PORT_OPTIONS:MTESTS}
>  PLIST_SUB+=    TESTS=""
>  MODULES+=      tests
>  .else
>  PLIST_SUB+=    TESTS="@comment "
>  .endif
> -.if defined(WITH_TOOLS)
> +.if ${PORT_OPTIONS:MTOOLS}
>  PLIST_SUB+=    TOOLS=""
>  MODULES+=      tools
>  .else
>  PLIST_SUB+=    TOOLS="@comment "
>  .endif
> -.if defined(WITH_WEBSITE)
> +.if ${PORT_OPTIONS:MWEBSITE}
>  PLIST_SUB+=    WEBSITE=""
>  MODULES+=      website
>  .else
>  PLIST_SUB+=    WEBSITE="@comment "
>  .endif
> -.if defined(WITH_XHTML11)
> +.if ${PORT_OPTIONS:MXHTML11}
>  PLIST_SUB+=    XHTML11=""
>  MODULES+=      xhtml-1_1
>  .else
> @@ -142,7 +149,7 @@ post-extract:
>                 ${XARGS} -0 ${RM} -rf
>
>  do-install:
> -.if !defined(NOPORTDOCS)
> +.if ${PORT_OPTIONS:MDOCS}
>         ${MKDIR} ${DOCSDIR}
>         (cd ${WRKSRC}/doc && ${TAR} -cf - . |\
>                 ${TAR} -xf - -C${DOCSDIR})
> @@ -171,4 +178,4 @@ post-install:
>         @${SETENV} PKG_PREFIX=${PREFIX} \
>                 ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
>
> -.include <bsd.port.post.mk>
> +.include <bsd.port.mk>
>
> Modified: head/textproc/docbook/Makefile
>
> ==============================================================================
> --- head/textproc/docbook/Makefile      Sun Apr 28 13:31:21 2013
>  (r316717)
> +++ head/textproc/docbook/Makefile      Sun Apr 28 13:34:26 2013
>  (r316718)
> @@ -1,11 +1,5 @@
> -# New ports collection makefile for:   docbook
> -# Date created:        7 April 1999
> -# Whom:                Nik Clayton <nik at freebsd.org>
> -#
> -# Based heavily on work by jfieber
> -#
> +# Created by: Nik Clayton <nik at freebsd.org>
>  # $FreeBSD$
> -#
>
>  PORTNAME=      docbook
>  PORTVERSION=   1.4
> @@ -18,100 +12,105 @@ COMMENT=  Meta-port for the different ver
>
>  NO_BUILD=      yes
>
> -OPTIONS=       DB241 "DocBook SGML DTD 2.4.1" off \
> -               DB30 "DocBook SGML DTD 3.0" off \
> -               DB31 "DocBook SGML DTD 3.1" off \
> -               DB40 "DocBook SGML DTD 4.0" off \
> -               DB41 "DocBook SGML DTD 4.1" on \
> -               DB42 "DocBook SGML DTD 4.2" on \
> -               DB43 "DocBook SGML DTD 4.3" on \
> -               DB44 "DocBook SGML DTD 4.4" on \
> -               DB45 "DocBook SGML DTD 4.5" on \
> -               DB41_XML "DocBook XML DTD 4.1" on \
> -               DB42_XML "DocBook XML DTD 4.2" on \
> -               DB43_XML "DocBook XML DTD 4.3" on \
> -               DB44_XML "DocBook XML DTD 4.4" on \
> -               DB45_XML "DocBook XML DTD 4.5" on \
> -               DB50_XML "DocBook XML 5.0 distribution" on \
> -               SDB_XML "Simplified DocBook XML DTD" off \
> -               SGMLCHARENT "ISO 8879:1986 character entity sets (SGML)"
> on \
> -               XMLCHARENT "ISO 8879:1986 character entity sets (XML)" on
> +OPTIONS_DEFINE=        DB241 DB30 DB31 DB40 DB41 DB42 DB43 DB44 DB45
> DB41_XML \
> +               DB42_XML DB43_XML DB44_XML DB45_XML DB50_XML SDB_XML \
> +               SGMLCHARENT XMLCHARENT
> +OPTIONS_DEFAULT=       DB41_XML DB42_XML DB43_XML DB44_XML DB45_XML
> DB50_XML \
> +                       SGMLCHARENT XMLCHARENT
> +DB241_DESC=    DocBook SGML DTD 2.4.1
> +DB30_DESC=     DocBook SGML DTD 3.0
> +DB31_DESC=     DocBook SGML DTD 3.1
> +DB40_DESC=     DocBook SGML DTD 4.0
> +DB41_DESC=     DocBook SGML DTD 4.1
> +DB42_DESC=     DocBook SGML DTD 4.2
> +DB43_DESC=     DocBook SGML DTD 4.3
> +DB44_DESC=     DocBook SGML DTD 4.4
> +DB45_DESC=     DocBook SGML DTD 4.5
> +DB41_XML_DESC= DocBook XML DTD 4.1
> +DB42_XML_DESC= DocBook XML DTD 4.2
> +DB43_XML_DESC= DocBook XML DTD 4.3
> +DB44_XML_DESC= DocBook XML DTD 4.4
> +DB45_XML_DESC= DocBook XML DTD 4.5
> +DB50_XML_DESC= DocBook XML 5.0 distribution
> +SDB_XML_DESC=  Simplified DocBook XML DTD
> +SGMLCHARENT_DESC=      ISO 8879:1986 character entity sets (SGML)
> +XMLCHARENT_DESC+       ISO 8879:1986 character entity sets (XML)
>
> -.include <bsd.port.pre.mk>
> +.include <bsd.port.options.mk>
>
> -.if defined(WITH_DB241)
> +.if ${PORT_OPTIONS:MDB241}
>  RUN_DEPENDS+=
>  ${LOCALBASE}/share/sgml/docbook/2.4.1:${PORTSDIR}/textproc/docbook-241
>  .endif
>
> -.if defined(WITH_DB30)
> +.if ${PORT_OPTIONS:MDB30}
>  RUN_DEPENDS+=
>  ${LOCALBASE}/share/sgml/docbook/3.0:${PORTSDIR}/textproc/docbook-300
>  .endif
>
> -.if defined(WITH_DB31)
> +.if ${PORT_OPTIONS:MDB31}
>  RUN_DEPENDS+=
>  ${LOCALBASE}/share/sgml/docbook/3.1:${PORTSDIR}/textproc/docbook-310
>  .endif
>
> -.if defined(WITH_DB40)
> +.if ${PORT_OPTIONS:MDB40}
>  RUN_DEPENDS+=
>  ${LOCALBASE}/share/sgml/docbook/4.0:${PORTSDIR}/textproc/docbook-400
>  .endif
>
> -.if defined(WITH_DB41)
> +.if ${PORT_OPTIONS:MDB41}
>  RUN_DEPENDS+=
>  ${LOCALBASE}/share/sgml/docbook/4.1:${PORTSDIR}/textproc/docbook-410
>  .endif
>
> -.if defined(WITH_DB42)
> +.if ${PORT_OPTIONS:MDB42}
>  RUN_DEPENDS+=
>  ${LOCALBASE}/share/sgml/docbook/4.2:${PORTSDIR}/textproc/docbook-420
>  .endif
>
> -.if defined(WITH_DB43)
> +.if ${PORT_OPTIONS:MDB43}
>  RUN_DEPENDS+=
>  ${LOCALBASE}/share/sgml/docbook/4.3:${PORTSDIR}/textproc/docbook-430
>  .endif
>
> -.if defined(WITH_DB44)
> +.if ${PORT_OPTIONS:MDB44}
>  RUN_DEPENDS+=
>  ${LOCALBASE}/share/sgml/docbook/4.4:${PORTSDIR}/textproc/docbook-440
>  .endif
>
> -.if defined(WITH_DB45)
> +.if ${PORT_OPTIONS:MDB45}
>  RUN_DEPENDS+=
>  ${LOCALBASE}/share/sgml/docbook/4.5:${PORTSDIR}/textproc/docbook-450
>  .endif
>
> -.if defined(WITH_DB41_XML)
> +.if ${PORT_OPTIONS:MDB41_XML}
>  RUN_DEPENDS+=
>  ${LOCALBASE}/share/xml/docbook/4.1.2:${PORTSDIR}/textproc/docbook-sk
>  .endif
>
> -.if defined(WITH_DB42_XML)
> +.if ${PORT_OPTIONS:MDB42_XML}
>  RUN_DEPENDS+=
>  ${LOCALBASE}/share/xml/docbook/4.2:${PORTSDIR}/textproc/docbook-xml
>  .endif
>
> -.if defined(WITH_DB43_XML)
> +.if ${PORT_OPTIONS:MDB43_XML}
>  RUN_DEPENDS+=
>  ${LOCALBASE}/share/xml/docbook/4.3:${PORTSDIR}/textproc/docbook-xml-430
>  .endif
>
> -.if defined(WITH_DB44_XML)
> +.if ${PORT_OPTIONS:MDB44_XML}
>  RUN_DEPENDS+=
>  ${LOCALBASE}/share/xml/docbook/4.4:${PORTSDIR}/textproc/docbook-xml-440
>  .endif
>
> -.if defined(WITH_DB45_XML)
> +.if ${PORT_OPTIONS:MDB45_XML}
>  RUN_DEPENDS+=
>  ${LOCALBASE}/share/xml/docbook/4.5:${PORTSDIR}/textproc/docbook-xml-450
>  .endif
>
> -.if defined(WITH_DB50_XML)
> +.if ${PORT_OPTIONS:MDB50_XML}
>  RUN_DEPENDS+=
>  ${LOCALBASE}/share/xml/docbook/5.0:${PORTSDIR}/textproc/docbook-500
>  .endif
>
> -.if defined(WITH_SDB_XML)
> +.if ${PORT_OPTIONS:MSDB_XML}
>  RUN_DEPENDS+=
>  ${LOCALBASE}/share/xml/sdocbook/1.1:${PORTSDIR}/textproc/sdocbook-xml
>  .endif
>
> -.if defined(WITH_SGMLCHARENT)
> +.if ${PORT_OPTIONS:MSGMLCHARENT}
>  RUN_DEPENDS+=
>  ${LOCALBASE}/share/sgml/iso8879:${PORTSDIR}/textproc/iso8879
>  .endif
>
> -.if defined(WITH_XMLCHARENT)
> +.if ${PORT_OPTIONS:MXMLCHARENT}
>  RUN_DEPENDS+=
>  ${LOCALBASE}/share/xml/xmlcharent/catalog:${PORTSDIR}/textproc/xmlcharent
>  .endif
>
>  do-install:
>         @${DO_NADA}
>
> -.include <bsd.port.post.mk>
> +.include <bsd.port.mk>
>
> Modified: head/textproc/stardict2-dictd_mova/Makefile
>
> ==============================================================================
> --- head/textproc/stardict2-dictd_mova/Makefile Sun Apr 28 13:31:21 2013
>      (r316717)
> +++ head/textproc/stardict2-dictd_mova/Makefile Sun Apr 28 13:34:26 2013
>      (r316718)
> @@ -1,9 +1,5 @@
> -# Ports collection makefile for:       stardict-dictd_www.mova.org
> -# Date created:                                16 Dec 2004
> -# Whom:                                        Timur I. Bakeyev <
> timur at gnome.org>
> -#
> +# Created by: Timur I. Bakeyev <timur at gnome.org>
>  # $FreeBSD$
> -#
>
>  PORTNAME=      stardict
>  PORTVERSION=   2.4.2
> @@ -40,16 +36,19 @@ DICTIONARIES=       1000pbio aviation beslov b
>                 zhelezyaki_abbr zhelezyaki_analogs
>
>  .if !defined(DICT_PACK)
> -OPTIONS=       ALL "All dictionaries" on
> +OPTIONS_DEFINE=        ALL
> +OPTIONS_DEFAULT=       ALL
> +ALL_DESC=      All dictionaries
>  .for dict in ${DICTIONARIES}
> -OPTIONS+=      ${dict:U:S|-|_|g} "${dict} dictionary" off
> +OPTIONS_DEFINE+=       ${dict:U:S|-|_|g}
> +${dict:U:S|-|_|g}_DESC=        ${dict} dictionary
>  .endfor
>  .endif
>
> -.include <bsd.port.pre.mk>
> +.include <bsd.port.options.mk>
>
>  .for dict in ${DICTIONARIES}
> -.if defined(WITH_ALL) || defined(WITH_${dict:U:S|-|_|g})
> +.if ${PORT_OPTIONS:MALL} || ${PORT_OPTIONS:M${dict:U:S|-|_|g}}
>  INSTALL_DICTIONARIES+= ${dict}
>  .endif
>  .endfor
> @@ -74,4 +73,4 @@ do-install:
>             @${ECHO_CMD} "@unexec ${RMDIR} %D/${DICTDIR} 2>/dev/null ||
> true" >> ${TMPPLIST}
>             @${ECHO_CMD} "@unexec ${RMDIR} %D/${STARDICT_DIR} 2>/dev/null
> || true" >> ${TMPPLIST}
>
> -.include <bsd.port.post.mk>
> +.include <bsd.port.mk>
>
> Modified: head/textproc/stardict2-quick/Makefile
>
> ==============================================================================
> --- head/textproc/stardict2-quick/Makefile      Sun Apr 28 13:31:21 2013
>      (r316717)
> +++ head/textproc/stardict2-quick/Makefile      Sun Apr 28 13:34:26 2013
>      (r316718)
> @@ -1,9 +1,5 @@
> -# Ports collection makefile for:       stardict-quick
> -# Date created:                                16 Dec 2004
> -# Whom:                                        Timur I. Bakeyev <
> timur at gnome.org>
> -#
> +# Created by: Timur I. Bakeyev <timur at gnome.org>
>  # $FreeBSD$
> -#
>
>  PORTNAME=      stardict
>  PORTVERSION=   2.4.2
> @@ -43,16 +39,19 @@ DICTIONARIES=       afr-eng afr-swe bul-swe da
>                 swe-spa swe-swa swe-wel wel-swe
>
>  .if !defined(DICT_PACK)
> -OPTIONS=       ALL "All dictionaries" on
> +OPTIONS_DEFINE=        ALL
> +OPTIONS_DEFAULT=       ALL
> +ALL_DESC=      All dictionaries
>  .for dict in ${DICTIONARIES}
> -OPTIONS+=      ${dict:U:S|-|_|g} "${dict} dictionary" off
> +OPTIONS_DEFINE+=       ${dict:U:S|-|_|g}
> +${dict:U:S|-|_|g}_DESC=        ${dict} dictionary
>  .endfor
>  .endif
>
> -.include <bsd.port.pre.mk>
> +.include <bsd.port.options.mk>
>
>  .for dict in ${DICTIONARIES}
> -.if defined(WITH_ALL) || defined(WITH_${dict:U:S|-|_|g})
> +.if ${PORT_OPTIONS:MALL} || ${PORT_OPTIONS:M${dict:U:S|-|_|g}}
>  INSTALL_DICTIONARIES+= ${dict}
>  .endif
>  .endfor
> @@ -79,4 +78,4 @@ post-install:
>                 @${ECHO_CMD} "@unexec ${RMDIR} %D/${DICTDIR} 2>/dev/null
> || true" >> ${TMPPLIST}
>                 @${ECHO_CMD} "@unexec ${RMDIR} %D/${STARDICT_DIR}
> 2>/dev/null || true" >> ${TMPPLIST}
>
> -.include <bsd.port.post.mk>
> +.include <bsd.port.mk>
>
>


-- 
--
Jason Helfman          | FreeBSD Committer
jgh at FreeBSD.org     | http://people.freebsd.org/~jgh  | The Power to Serve


More information about the svn-ports-all mailing list