- Unify COMMENT and pkg-descr

- Set WRKSRC
- Fix typo
- Add trailing slash of WWW

16 files changed, 25 insertions, 20 deletions

diff --git a/textproc/en-hunspell/Makefile b/textproc/en-hunspell/Makefile
index 6364e0440120..6c6f29d7045b 100644
--- a/textproc/en-hunspell/Makefile
+++ b/textproc/en-hunspell/Makefile
@@ -18,10 +18,11 @@ DISTFILES=	hunspell-en_US-${PORTVERSION}-0${EXTRACT_SUFX} \
 		en_GB.zip:GB
 
 MAINTAINER=	office@FreeBSD.org
-COMMENT=	Hunspell english dictionaries
+COMMENT=	English hunspell dictionaries
 
 USE_ZIP=	yes
 NO_BUILD=	yes
+NO_WRKSUBDIR=	yes
 
 PLIST_FILES=	%%DATADIR%%/en_CA.aff \
 		%%DATADIR%%/en_CA.dic \
@@ -41,7 +42,7 @@ PLIST_FILES+=	%%DATADIR%%/${ALIAS}.aff \
 
 do-install:
 	${MKDIR} ${DATADIR}/
-	${INSTALL_DATA} ${WRKDIR}/*.aff ${WRKDIR}/*.dic ${DATADIR}/
+	${INSTALL_DATA} ${WRKSRC}/*.aff ${WRKSRC}/*.dic ${DATADIR}/
 .for ALIAS in ${GBALIASES}
 	${LN} -s en_GB.aff ${DATADIR}/${ALIAS}.aff
 	${LN} -s en_GB.dic ${DATADIR}/${ALIAS}.dic
diff --git a/textproc/en-hunspell/pkg-descr b/textproc/en-hunspell/pkg-descr
index cf3be1f14b0f..e682921f55a1 100644
--- a/textproc/en-hunspell/pkg-descr
+++ b/textproc/en-hunspell/pkg-descr
@@ -1,4 +1,4 @@
-Hunspell english dictionnaries
+English hunspell dictionaries
 
 WWW:	http://wordlist.sourceforge.net/
 WWW:	http://en-gb.pyxidium.co.uk/dictionary/
diff --git a/textproc/es-hunspell/Makefile b/textproc/es-hunspell/Makefile
index 94c3dc17faed..cdcd6ee3eadb 100644
--- a/textproc/es-hunspell/Makefile
+++ b/textproc/es-hunspell/Makefile
@@ -22,6 +22,7 @@ LICENSE_COMB=	dual
 
 USE_ZIP=	yes
 NO_BUILD=	yes
+NO_WRKSUBDIR=	yes
 
 PLIST_FILES=	%%DATADIR%%/es_ES.aff \
 		%%DATADIR%%/es_ES.dic
@@ -36,8 +37,8 @@ PLIST_FILES+=	%%DATADIR%%/${ALIAS}.aff \
 
 do-install:
 	${MKDIR} ${DATADIR}/
-	${INSTALL_DATA} ${WRKDIR}/es_ANY.aff ${DATADIR}/es_ES.aff
-	${INSTALL_DATA} ${WRKDIR}/es_ANY.dic ${DATADIR}/es_ES.dic
+	${INSTALL_DATA} ${WRKSRC}/es_ANY.aff ${DATADIR}/es_ES.aff
+	${INSTALL_DATA} ${WRKSRC}/es_ANY.dic ${DATADIR}/es_ES.dic
 .for ALIAS in ${ESALIASES}
 	${LN} -s es_ES.aff ${DATADIR}/${ALIAS}.aff
 	${LN} -s es_ES.dic ${DATADIR}/${ALIAS}.dic
diff --git a/textproc/it-hunspell/Makefile b/textproc/it-hunspell/Makefile
index f92e7c94f188..8af1d24533da 100644
--- a/textproc/it-hunspell/Makefile
+++ b/textproc/it-hunspell/Makefile
@@ -20,6 +20,7 @@ LICENSE=	GPLv3
 
 USE_ZIP=	yes
 NO_BUILD=	yes
+NO_WRKSUBDIR=	yes
 
 PLIST_FILES=	%%DATADIR%%/it_IT.aff \
 		%%DATADIR%%/it_IT.dic
@@ -27,6 +28,6 @@ PLIST_DIRSTRY=	%%DATADIR%%
 
 do-install:
 	${MKDIR} ${DATADIR}/
-	${INSTALL_DATA} ${WRKDIR}/it_IT.aff ${WRKDIR}/it_IT.dic ${DATADIR}/
+	${INSTALL_DATA} ${WRKSRC}/it_IT.aff ${WRKSRC}/it_IT.dic ${DATADIR}/
 
 .include <bsd.port.mk>
diff --git a/textproc/no-hunspell/Makefile b/textproc/no-hunspell/Makefile
index bbb5ca072d24..26ebfbca1aa4 100644
--- a/textproc/no-hunspell/Makefile
+++ b/textproc/no-hunspell/Makefile
@@ -26,8 +26,8 @@ PLIST_FILES=	%%DATADIR%%/nb_NO.aff \
 PLIST_DIRSTRY=	%%DATADIR%%
 
 post-extract:
-	@${EXTRACT_CMD} ${WRKDIR}/nb_NO.zip -d ${WRKSRC}
-	@${EXTRACT_CMD} ${WRKDIR}/nn_NO.zip -d ${WRKSRC}
+	@${EXTRACT_CMD} ${WRKDIR}/nb_NO.zip -d ${WRKSRC}/
+	@${EXTRACT_CMD} ${WRKDIR}/nn_NO.zip -d ${WRKSRC}/
 
 do-install:
 	${MKDIR} ${DATADIR}/
diff --git a/textproc/no-hunspell/pkg-descr b/textproc/no-hunspell/pkg-descr
index 36fbf7827737..e8bfcf75f53d 100644
--- a/textproc/no-hunspell/pkg-descr
+++ b/textproc/no-hunspell/pkg-descr
@@ -1,3 +1,3 @@
 Norwegian (Nynorsk and Bokmaal) hunspell dictionaries
 
-WWW:	http://spell-norwegian.alioth.debian.org
+WWW:	http://spell-norwegian.alioth.debian.org/
diff --git a/textproc/ro-hunspell/Makefile b/textproc/ro-hunspell/Makefile
index e85d9d850cc3..5824d93a91b1 100644
--- a/textproc/ro-hunspell/Makefile
+++ b/textproc/ro-hunspell/Makefile
@@ -21,6 +21,7 @@ LICENSE_COMB=	dual
 
 USE_ZIP=	yes
 NO_BUILD=	yes
+NO_WRKSUBDIR=	yes
 
 PLIST_FILES=	%%DATADIR%%/ro_RO.aff \
 		%%DATADIR%%/ro_RO.dic
@@ -28,6 +29,6 @@ PLIST_DIRSTRY=	%%DATADIR%%
 
 do-install:
 	${MKDIR} ${DATADIR}/
-	${INSTALL_DATA} ${WRKDIR}/ro_RO.aff ${WRKDIR}/ro_RO.dic ${DATADIR}/
+	${INSTALL_DATA} ${WRKSRC}/ro_RO.aff ${WRKSRC}/ro_RO.dic ${DATADIR}/
 
 .include <bsd.port.mk>
diff --git a/textproc/sr-hunspell/pkg-descr b/textproc/sr-hunspell/pkg-descr
index 83b5f5952fec..83d3a3abcde7 100644
--- a/textproc/sr-hunspell/pkg-descr
+++ b/textproc/sr-hunspell/pkg-descr
@@ -1 +1 @@
-Serbian hunspell dictionnaries
+Serbian hunspell dictionaries
diff --git a/textproc/ss-hunspell/pkg-descr b/textproc/ss-hunspell/pkg-descr
index 7aae91308320..878342ef2535 100644
--- a/textproc/ss-hunspell/pkg-descr
+++ b/textproc/ss-hunspell/pkg-descr
@@ -1,3 +1,3 @@
-Swati hunspell dictionnaries
+Swati hunspell dictionaries
 
 WWW:	http://www.translate.org.za/
diff --git a/textproc/sw-hunspell/pkg-descr b/textproc/sw-hunspell/pkg-descr
index f7ca4f3eb4f3..a88f2e2681fe 100644
--- a/textproc/sw-hunspell/pkg-descr
+++ b/textproc/sw-hunspell/pkg-descr
@@ -1,3 +1,3 @@
-Swedish hunspell dictionnaries
+Swedish hunspell dictionaries
 
 WWW:	http://code.google.com/p/dsso/
diff --git a/textproc/tn-hunspell/pkg-descr b/textproc/tn-hunspell/pkg-descr
index 2b5c3e1726f3..926d8da9b1e8 100644
--- a/textproc/tn-hunspell/pkg-descr
+++ b/textproc/tn-hunspell/pkg-descr
@@ -1,3 +1,3 @@
-Tswana hunspell dictionnaries
+Tswana hunspell dictionaries
 
 WWW:	http://www.translate.org.za/
diff --git a/textproc/ts-hunspell/Makefile b/textproc/ts-hunspell/Makefile
index 5b80e1f7d8ec..f31a2d3348dd 100644
--- a/textproc/ts-hunspell/Makefile
+++ b/textproc/ts-hunspell/Makefile
@@ -20,6 +20,7 @@ COMMENT=	Tsonga hunspell dictionaries
 
 USE_ZIP=	yes
 NO_BUILD=	yes
+WRKSRC=		${WRKDIR}/dictionaries
 
 PLIST_FILES=	%%DATADIR%%/ts_ZA.aff \
 		%%DATADIR%%/ts_ZA.dic
@@ -27,7 +28,7 @@ PLIST_DIRSTRY=	%%DATADIR%%
 
 do-install:
 	${MKDIR} ${DATADIR}/
-	${INSTALL_DATA} ${WRKDIR}/dictionaries/ts-ZA.aff ${DATADIR}/ts_ZA.aff
-	${INSTALL_DATA} ${WRKDIR}/dictionaries/ts-ZA.dic ${DATADIR}/ts_ZA.dic
+	${INSTALL_DATA} ${WRKSRC}/ts-ZA.aff ${DATADIR}/ts_ZA.aff
+	${INSTALL_DATA} ${WRKSRC}/ts-ZA.dic ${DATADIR}/ts_ZA.dic
 
 .include <bsd.port.mk>
diff --git a/textproc/ts-hunspell/pkg-descr b/textproc/ts-hunspell/pkg-descr
index df12b4493afd..fae6fb62ebe0 100644
--- a/textproc/ts-hunspell/pkg-descr
+++ b/textproc/ts-hunspell/pkg-descr
@@ -1,3 +1,3 @@
-Tsonga hunspell dictionnaries
+Tsonga hunspell dictionaries
 
 WWW:	http://www.translate.org.za/
diff --git a/textproc/ve-hunspell/pkg-descr b/textproc/ve-hunspell/pkg-descr
index 45e00d4b9793..fb9fca003172 100644
--- a/textproc/ve-hunspell/pkg-descr
+++ b/textproc/ve-hunspell/pkg-descr
@@ -1,3 +1,3 @@
-Venda hunspell dictionnaries
+Venda hunspell dictionaries
 
 WWW:	http://www.translate.org.za/
diff --git a/textproc/xh-hunspell/pkg-descr b/textproc/xh-hunspell/pkg-descr
index f1b423afcf2d..3b7c79ce0e02 100644
--- a/textproc/xh-hunspell/pkg-descr
+++ b/textproc/xh-hunspell/pkg-descr
@@ -1,3 +1,3 @@
-Xhosa hunspell dictionnaries
+Xhosa hunspell dictionaries
 
 WWW:	http://www.translate.org.za/
diff --git a/textproc/zu-hunspell/pkg-descr b/textproc/zu-hunspell/pkg-descr
index e934d2d38b39..2f395b6d93e0 100644
--- a/textproc/zu-hunspell/pkg-descr
+++ b/textproc/zu-hunspell/pkg-descr
@@ -1,3 +1,3 @@
-Zulu hunspell dictionnaries
+Zulu hunspell dictionaries
 
 WWW:	http://www.translate.org.za/