Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 6 Mar 2016 06:19:54 +0000 (UTC)
From:      Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r410261 - head/textproc/en-hunspell
Message-ID:  <201603060619.u266JsW0037453@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: sunpoet
Date: Sun Mar  6 06:19:54 2016
New Revision: 410261
URL: https://svnweb.freebsd.org/changeset/ports/410261

Log:
  - Convert to new options helper
  - Convert to new options target helper
  - Cosmetic change
  - Reorder distinfo

Modified:
  head/textproc/en-hunspell/Makefile
  head/textproc/en-hunspell/distinfo

Modified: head/textproc/en-hunspell/Makefile
==============================================================================
--- head/textproc/en-hunspell/Makefile	Sun Mar  6 06:19:49 2016	(r410260)
+++ head/textproc/en-hunspell/Makefile	Sun Mar  6 06:19:54 2016	(r410261)
@@ -45,28 +45,21 @@ PLIST_FILES=	%%DATADIR%%/en_CA${CA_VARIA
 		%%DATADIR%%/en_GB.dic \
 		%%DATADIR%%/en_GB.aff \
 
-COPY=	-lh	# Use hardlinks rather than copies under stage/
-
-.include <bsd.port.options.mk>
+COPY=		-lh	# Use hardlinks rather than copies under stage/
 
 .for c in CA GB US
 .	for v in STANDARD ISE IZE LARGE
-.		if ${PORT_OPTIONS:M${c}_${v}}
-${c}_VARIANT=	${v:S/STANDARD//:tl:C/^.+$/-&/}
-.		endif
+${c}_${v}_VARS=		${c}_VARIANT=${v:S/STANDARD//:tl:C/^.+$/-&/}
 .	endfor
 .endfor
 
-.if ${PORT_OPTIONS:MUS_LARGE}
-PLIST_FILES+=	%%DATADIR%%/en_US.aff %%DATADIR%%/en_US.dic
-.endif
-.if ${PORT_OPTIONS:MCA_LARGE}
-PLIST_FILES+=	%%DATADIR%%/en_CA.aff %%DATADIR%%/en_CA.dic
-.endif
+US_LARGE_PLIST_FILES=	%%DATADIR%%/en_US.aff %%DATADIR%%/en_US.dic
+CA_LARGE_PLIST_FILES=	%%DATADIR%%/en_CA.aff %%DATADIR%%/en_CA.dic
 
 GBALIASES=	en_AG en_AU en_BS en_BW en_BZ en_DK en_GH en_HK en_IE en_IN \
 		en_JM en_NA en_NG en_NZ en_SG en_TT en_ZA en_ZW
 USALIASES=	en_PH
+
 .for ALIAS in ${GBALIASES} ${USALIASES}
 PLIST_FILES+=	%%DATADIR%%/${ALIAS}.aff \
 		%%DATADIR%%/${ALIAS}.dic
@@ -78,14 +71,6 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/README_*.txt ${STAGEDIR}${DATADIR}/
 	${LN} -s en_GB${GB_VARIANT}.aff ${STAGEDIR}${DATADIR}/en_GB.aff
 	${LN} -s en_GB${GB_VARIANT}.dic ${STAGEDIR}${DATADIR}/en_GB.dic
-.if ${PORT_OPTIONS:MUS_LARGE}
-	${LN} -s en_US-large.aff ${STAGEDIR}${DATADIR}/en_US.aff
-	${LN} -s en_US-large.dic ${STAGEDIR}${DATADIR}/en_US.dic
-.endif
-.if ${PORT_OPTIONS:MCA_LARGE}
-	${LN} -s en_CA-large.aff ${STAGEDIR}${DATADIR}/en_CA.aff
-	${LN} -s en_CA-large.dic ${STAGEDIR}${DATADIR}/en_CA.dic
-.endif
 .for ALIAS in ${GBALIASES}
 	${LN} -s en_GB.aff ${STAGEDIR}${DATADIR}/${ALIAS}.aff
 	${LN} -s en_GB.dic ${STAGEDIR}${DATADIR}/${ALIAS}.dic
@@ -95,4 +80,12 @@ do-install:
 	${LN} -s en_US.dic ${STAGEDIR}${DATADIR}/${ALIAS}.dic
 .endfor
 
+do-install-CA_LARGE-on:
+	${LN} -s en_CA-large.aff ${STAGEDIR}${DATADIR}/en_CA.aff
+	${LN} -s en_CA-large.dic ${STAGEDIR}${DATADIR}/en_CA.dic
+
+do-install-US_LARGE-on:
+	${LN} -s en_US-large.aff ${STAGEDIR}${DATADIR}/en_US.aff
+	${LN} -s en_US-large.dic ${STAGEDIR}${DATADIR}/en_US.dic
+
 .include <bsd.port.mk>

Modified: head/textproc/en-hunspell/distinfo
==============================================================================
--- head/textproc/en-hunspell/distinfo	Sun Mar  6 06:19:49 2016	(r410260)
+++ head/textproc/en-hunspell/distinfo	Sun Mar  6 06:19:54 2016	(r410261)
@@ -1,14 +1,14 @@
 SHA256 (hunspell/hunspell-en_CA-2016.01.19.zip) = f59b120b43ab444ee33e018a6416f3be70f867a928956fe4a1750245fd57a341
-SHA256 (hunspell/hunspell-en_CA-large-2016.01.19.zip) = 04fd5dcfdca048e18640a1d420077473ab105431fc14ebe307bda452732abf6c
-SHA256 (hunspell/hunspell-en_GB-ise-2016.01.19.zip) = d17486b550fa22e2da31f647daceec84ab6354289b99d5088e12f63d88a9a027
-SHA256 (hunspell/hunspell-en_GB-ize-2016.01.19.zip) = 52804f35c1dc44adabaf86fc0316181c2bed28c857880fa624aea248a23d677f
-SHA256 (hunspell/hunspell-en_GB-large-2016.01.19.zip) = edcca9b78ae8923e6209db523355b4a91ac6d9daad94df12413498b4e5069719
-SHA256 (hunspell/hunspell-en_US-2016.01.19.zip) = fe0c48084bfd534f244ecd12836ae5e0b27fc10dab28879fdafece892267a674
-SHA256 (hunspell/hunspell-en_US-large-2016.01.19.zip) = 1c8a7a5a993313620a7d96e74e5c45f4df7ab9ad0141764ffeea66db9bfc089f
 SIZE (hunspell/hunspell-en_CA-2016.01.19.zip) = 196294
+SHA256 (hunspell/hunspell-en_CA-large-2016.01.19.zip) = 04fd5dcfdca048e18640a1d420077473ab105431fc14ebe307bda452732abf6c
 SIZE (hunspell/hunspell-en_CA-large-2016.01.19.zip) = 312039
+SHA256 (hunspell/hunspell-en_GB-ise-2016.01.19.zip) = d17486b550fa22e2da31f647daceec84ab6354289b99d5088e12f63d88a9a027
 SIZE (hunspell/hunspell-en_GB-ise-2016.01.19.zip) = 196436
+SHA256 (hunspell/hunspell-en_GB-ize-2016.01.19.zip) = 52804f35c1dc44adabaf86fc0316181c2bed28c857880fa624aea248a23d677f
 SIZE (hunspell/hunspell-en_GB-ize-2016.01.19.zip) = 196388
+SHA256 (hunspell/hunspell-en_GB-large-2016.01.19.zip) = edcca9b78ae8923e6209db523355b4a91ac6d9daad94df12413498b4e5069719
 SIZE (hunspell/hunspell-en_GB-large-2016.01.19.zip) = 314577
+SHA256 (hunspell/hunspell-en_US-2016.01.19.zip) = fe0c48084bfd534f244ecd12836ae5e0b27fc10dab28879fdafece892267a674
 SIZE (hunspell/hunspell-en_US-2016.01.19.zip) = 195799
+SHA256 (hunspell/hunspell-en_US-large-2016.01.19.zip) = 1c8a7a5a993313620a7d96e74e5c45f4df7ab9ad0141764ffeea66db9bfc089f
 SIZE (hunspell/hunspell-en_US-large-2016.01.19.zip) = 310556



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201603060619.u266JsW0037453>