Add hyphenation dictionaries, add option INSTALLATION_BASEDIR to allow

adding dictionaries to linux openoffice ports and openoffice-devel port.

Fix several checksums (they only contain non security related content)
from updated distfiles.

Fixed client ooodict ports will follow soon.

Bump port version.

2 files changed, 84 insertions, 25 deletions

diff --git a/editors/ooodict-all/Makefile b/editors/ooodict-all/Makefile
index a09bf9b7ecfa..a71b530daaf8 100644
--- a/editors/ooodict-all/Makefile
+++ b/editors/ooodict-all/Makefile
@@ -6,10 +6,11 @@
 #
 
 PORTNAME=	ooodict
-PORTVERSION=	1.1
+PORTVERSION=	1.2
 CATEGORIES+=	editors
 MASTER_SITES+=	http://ftp.gwdg.de/pub/misc/openoffice/contrib/dictionaries/
 DISTFILES+=	${LANGDIST}
+DISTFILES+=	${HYPHDIST}
 
 MAINTAINER=     openoffice@FreeBSD.org
 COMMENT?=	MySpell dictionaries for OpenOffice.org
@@ -19,21 +20,36 @@ EXTRACT_ONLY=
 .if !defined(LANGDIST)
 DICTMETAPORT=	yes
 .endif
-.if !defined(LANGDIST)
-LANGDIST+=	bg_BG.zip ca_ES.zip hr_HR.zip cs_CZ.zip \
+LANGDIST?=	bg_BG.zip ca_ES.zip hr_HR.zip cs_CZ.zip \
 		da_DK.zip nl_NL.zip en_CA.zip en_GB.zip \
 		en_US.zip fr_FR.zip de_DE.zip de_CH.zip \
 		hu_HU.zip it_IT.zip pl_PL.zip pt_PT.zip \
 		pt_BR.zip es_ES.zip sk_SK.zip sv_SE.zip \
 		el_GR-enhanced.zip
-.endif
+
+HYPHDIST?=	hyph_cs.zip hyph_da.zip hyph_de_DE.zip \
+		hyph_en.zip hyph_en_CA.zip hyph_en_GB.zip \
+		hyph_en_US.zip hyph_es.zip hyph_fr.zip \
+		hyph_it.zip hyph_nl.zip hyph_pt_BR.zip \
+		hyph_pt_PT.zip hyph_ru.zip hyph_sk.zip \
+		hyph_sl.zip hyph_uk.zip
 
 SORT?=	/usr/bin/sort
 CUT?=	/usr/bin/cut
 
 .include <bsd.port.pre.mk>
 
+.if !defined(INSTALLATION_BASEDIR)
 INSTALLATION_BASEDIR=	OpenOffice.org1.0
+.if defined(RDEP)
+BUILD_DEPENDS=	${DICT_LIST_INST}:${RDEP}
+RUN_DEPENDS=	${DICT_LIST_INST}:${RDEP}
+.else
+BUILD_DEPENDS=	${DICT_LIST_INST}:${PORTSDIR}/editors/openoffice
+RUN_DEPENDS=	${DICT_LIST_INST}:${PORTSDIR}/editors/openoffice
+.endif
+.endif
+
 DIST_SUBDIR=		openoffice
 DICT_DIR=		${INSTALLATION_BASEDIR}/share/dict/ooo
 DICT_PATH=		${LOCALBASE}/${DICT_DIR}
@@ -56,14 +72,6 @@ DESCR=		${.CURDIR}/pkg-descr
 WRKSRC=		${WRKDIR}
 NO_BUILD=	yes
 
-.if defined(RDEP)
-BUILD_DEPENDS=	${DICT_LIST_INST}:${RDEP}
-RUN_DEPENDS=	${DICT_LIST_INST}:${RDEP}
-.else
-BUILD_DEPENDS=	${DICT_LIST_INST}:${PORTSDIR}/editors/openoffice
-RUN_DEPENDS=	${DICT_LIST_INST}:${PORTSDIR}/editors/openoffice
-.endif
-
 EXTRACT_CMD_L?=		unzip
 EXTRACT_BEFORE_ARGS_L?=	-q -o
 EXTRACT_AFTER_ARGS_L?=	-d ${PREFIX}/${DICT_DIR}
@@ -133,5 +141,40 @@ post-install:
 				${ECHO_MSG} "===>   Set DICT_OVERWRITE=YES if you like to overwrite it"; \
 		fi ; \
 	done
+	@for file in ${HYPHDIST}; do \
+		ABRV=`${ECHO_CMD} $${file} | ${SED} -e 's|\.zip||' -e 's|^hyph_||'`; \
+		LANGUAGE=`${ECHO_CMD} $${ABRV} | ${SED} -e 's|_.*||'`; \
+		COUNTRY=`${ECHO_CMD} $${ABRV} | ${SED} -e 's|.*_||' | ${CUT} -c 1,2 | ${TR} "[:lower:]" "[:upper:]"` ; \
+		if ! ( ${GREP} "HYPH $${LANGUAGE} $${COUNTRY}" \
+		    ${DICT_LIST_INST} > /dev/null && test -z $${DICT_OVERWRITE} ) ; \
+		then  \
+			if ! (cd ${DICT_PATH} && ${EXTRACT_CMD_L} \
+				${EXTRACT_BEFORE_ARGS_L} \
+				${_DISTDIR}/$${file} '*.dic' \
+				${EXTRACT_AFTER_ARGS_L}) ; \
+			then \
+				${ECHO} "Extracting of $${file} failed"; \
+				exit 1; \
+			fi ; \
+			${ECHO_MSG} "===>   Register hyphenation dictionary hyph_$${ABRV}"; \
+			${ECHO} "@exec ${ECHO} \"HYPH $${LANGUAGE} $${COUNTRY} hyph_$${ABRV}\" \
+			    >> ${DICT_LIST}" >> ${TMPPLIST} ; \
+			${ECHO_CMD} "HYPH $${LANGUAGE} $${COUNTRY} hyph_$${ABRV}" >> ${DICT_LIST_INST} ; \
+			cd ${PREFIX} && ${FIND} -s ${DICT_DIR} -type f | \
+			    ${GREP} hyph_$${ABRV}.dic >> ${TMPPLIST} ; \
+			${ECHO} "@unexec ${CP} ${DICT_LIST} \
+			    ${DICT_LIST}.hyph_$${LANGUAGE}_$${COUNTRY}" >> ${TMPPLIST} ; \
+			${ECHO} "@unexec \
+			    if ! ( ${CAT} ${DICT_LIST}.hyph_$${LANGUAGE}_$${COUNTRY} | \
+				${GREP} -v -e '^HYPH.*hyph_$${ABRV}' > ${DICT_LIST} ) ; then \
+					${ECHO_MSG} '===>   Notice: ${DICT_LIST} is empty' ; \
+			    fi" >> ${TMPPLIST} ; \
+			${ECHO} "@unexec ${RM} ${DICT_LIST}.hyph_$${LANGUAGE}_$${COUNTRY}" \
+			    >> ${TMPPLIST} ; \
+		else \
+				${ECHO_MSG} "===>   Hyphenation Dictionary $${LANGUAGE}_$${COUNTRY} already registered"; \
+				${ECHO_MSG} "===>   Set DICT_OVERWRITE=YES if you like to overwrite it"; \
+		fi ; \
+	done
 
 .include <bsd.port.post.mk>
diff --git a/editors/ooodict-all/distinfo b/editors/ooodict-all/distinfo
index cfe1f4c226d6..ae10df24667e 100644
--- a/editors/ooodict-all/distinfo
+++ b/editors/ooodict-all/distinfo
@@ -1,10 +1,9 @@
 MD5 (openoffice/bg_BG.zip) = a3dac0fb47648363d523157dd7b52c30
-MD5 (openoffice/ca_ES.zip) = 4df32ee7f6f3fd9ca9eaaa4458d6d788
 MD5 (openoffice/ca_ES.zip) = 7cef777678c2ffd9293d09d90c5d5f7c
-MD5 (openoffice/cs_CZ.zip) = a8f8424ea7e80ef0dd5a3e4a5443b486
-MD5 (openoffice/da_DK.zip) = ec586244a22be19dfba48d2b11377aaa
-MD5 (openoffice/de_CH.zip) = 720f14064f640f4991253a5a149b13d9
-MD5 (openoffice/de_DE.zip) = 001ae49cd78704b30945be33ba515364
+MD5 (openoffice/cs_CZ.zip) = cab19973d5b7f5eb87573422a6df62f4
+MD5 (openoffice/da_DK.zip) = f7d5a823baf842d02bd155b57015ff09
+MD5 (openoffice/de_CH.zip) = 0b38c88119ae963e941f95af70725f96
+MD5 (openoffice/de_DE.zip) = dcaca9681c9ca695b8b2855b00817c2b
 MD5 (openoffice/el_GR-enhanced.zip) = 5165d0efaedfdd7dc8ba2d54cdd3005c
 MD5 (openoffice/en_CA.zip) = c14942ea471a5182f376802c68933880
 MD5 (openoffice/en_GB.zip) = 5c86766ad09d27a95ffe185691a97bce
@@ -12,18 +11,35 @@ MD5 (openoffice/en_GB.zip) = 83abaeb192eabaf00ac90bca8dcf8e2b
 MD5 (openoffice/en_GB.zip) = 8d7ee777e917a0b94e86847db5a3726c
 MD5 (openoffice/en_US.zip) = 4ae9e132d09a522738b19c7f35628ed2
 MD5 (openoffice/en_US.zip) = 850810e02f620487ffcfdf2adf874b7e
-MD5 (openoffice/es_ES.zip) = 58fb308876e00f63ddce7433b76173a3
-MD5 (openoffice/es_ES.zip) = 8148167cd5dd39e95b755637ba6d8b8f
+MD5 (openoffice/es_ES.zip) = ddf75ad729da7aadd9463d5903b597ae
 MD5 (openoffice/fr_FR.zip) = 6a7bf8f3ba05abdcd905417523c32ba1
 MD5 (openoffice/hr_HR.zip) = 5c5d0479b0fb7e7d2b5e0533cc2e370b
 MD5 (openoffice/hu_HU.zip) = bd07bc3d912bb092e6e86a1d7cf19db3
-MD5 (openoffice/it_IT.zip) = 2f91bdda2c09d5ddd2d3026cecd63dda
-MD5 (openoffice/it_IT.zip) = b2787e9b9e4cf1035cdef19c0d977602
-MD5 (openoffice/it_IT.zip) = bd40c162bce26497ddcd6c62c22f6e24
+MD5 (openoffice/it_IT.zip) = e2043677a43ed25464c7cabfef71d8b6
 MD5 (openoffice/nl_NL.zip) = 8ed198f607b2014f77ff2b72454c1c0e
 MD5 (openoffice/nl_NL.zip) = be4c716306b59d3c80b5d9f9af30e735
 MD5 (openoffice/pl_PL.zip) = 69f575dde6e1f5d41b5d16980a70cddc
-MD5 (openoffice/pt_BR.zip) = 83aa4540283c0049c27271576890fd88
+MD5 (openoffice/pt_BR.zip) = 22d91b8a37e2669558bd2b7125191c91
 MD5 (openoffice/pt_PT.zip) = 6f44ed7caf6846dca9d539bb390719c4
-MD5 (openoffice/sk_SK.zip) = 91eee2e11b09975be92ac7ece6ff4ac6
-MD5 (openoffice/sv_SE.zip) = 93fcb2b8d2ebf4ecee283b1d47e602be
+MD5 (openoffice/sk_SK.zip) = 6a91f9ecc1b87c156c9ceb51d089b7a7
+MD5 (openoffice/sv_SE.zip) = 323bedf29c1c27e407b8b230fb0110c6
+MD5 (openoffice/hyph_cs.zip) = b1cd60f130668ee363baf566ee93ab99
+MD5 (openoffice/hyph_da.zip) = 647cb755de87e55f36b6819c88ca928b
+MD5 (openoffice/hyph_de.zip) = ac783ca0316247d40c656d4c79035865
+MD5 (openoffice/hyph_de_CH.zip) = ac783ca0316247d40c656d4c79035865
+MD5 (openoffice/hyph_de_DE.zip) = 677f7746764ea4721482c94198162a0f
+MD5 (openoffice/hyph_en.zip) = aadf421e4e17c90c9dd72c39e230aa68
+MD5 (openoffice/hyph_en_CA.zip) = 89631610a6c986a1e31984ada030b857
+MD5 (openoffice/hyph_en_GB.zip) = 0c739661042c6c0c7db10fb2e3f4a1e7
+MD5 (openoffice/hyph_en_US.zip) = 381712e0e0bf25908fbf7eaadfe4d16a
+MD5 (openoffice/hyph_es.zip) = ed9c64540d334469e55d8d588e2d09f5
+MD5 (openoffice/hyph_fr.zip) = 00f8a2a219b2eb7b6a4ed56c634c3988
+MD5 (openoffice/hyph_it.zip) = 1ef0f49b0c56bb0ed7cfa6e25fd266fe
+MD5 (openoffice/hyph_nl.zip) = 3cfd0339ec347f3b9c262d9fe323e919
+MD5 (openoffice/hyph_pt.zip) = c83ddf724cfdfc061f1e3fbf11577d49
+MD5 (openoffice/hyph_pt_BR.zip) = 2c5a8075eec63607bc412437c754ec84
+MD5 (openoffice/hyph_pt_PT.zip) = a00ecf42c2d6278d3228096deb2e70b5
+MD5 (openoffice/hyph_ru.zip) = 1c0e92f62496c6477fa5112f99e1074d
+MD5 (openoffice/hyph_sk.zip) = 62c7b806bab885de1ef51c69a91ab569
+MD5 (openoffice/hyph_sl.zip) = cc67d86781eae913c39d76cd9a12dce8
+MD5 (openoffice/hyph_uk.zip) = 0e4e5c997cab91ae4e53dcd93d7735bf