1 files changed, 78 insertions, 82 deletions

diff --git a/textproc/aspell/Makefile b/textproc/aspell/Makefile
index d465a5f8c3b5..bf75f24e0654 100644
--- a/textproc/aspell/Makefile
+++ b/textproc/aspell/Makefile
@@ -6,14 +6,12 @@
 #
 
 PORTNAME?=	aspell
-PORTVERSION=	0.50.5
-PORTREVISION=	4
+PORTVERSION=	0.60
 CATEGORIES+=	textproc
-MASTER_SITES=	http://aspell.net/	\
-		${MASTER_SITE_GNU}
+MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	aspell
-DISTFILES=	aspell-0.50.5.tar.gz	# needed for slave ports / options
-EXTRACT_ONLY=	aspell-0.50.5.tar.gz
+DISTFILES=	aspell-0.60.tar.gz	# needed for slave ports / options
+EXTRACT_ONLY=	aspell-0.60.tar.gz
 
 MAINTAINER?=	thierry@FreeBSD.org
 COMMENT?=	Spelling checker with better suggestion logic than ispell
@@ -24,18 +22,44 @@ BUILD_DEPENDS+=	bzip2:${PORTSDIR}/archivers/bzip2
 
 USE_LIBTOOL_VER=	15
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ARGS=	--enable-dict-dir=${DATADIR}	\
-		--enable-doc-dir=${DOCSDIR}	\
-		--enable-static
-USE_GMAKE=	yes
-USE_REINPLACE=	yes	# To be removed after commit of PR ports/63944
+CONFIGURE_ARGS=		--enable-dict-dir=${DATADIR}	\
+			--enable-docdir=${DOCSDIR}	\
+			--enable-static
+CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}"	\
+			LDFLAGS="-L${LOCALBASE}/lib ${LDFLAGS} ${PTHREAD_LIBS}"
+USE_GMAKE=		yes
+USE_ICONV=		yes
+USE_PERL5_BUILD=	yes
+INSTALLS_SHLIB=		yes
 
-MAKE_ARGS=	NOPORTDOCS=${NOPORTDOCS}
-INSTALLS_SHLIB=	yes
+MAKE_ARGS=		NOPORTDOCS=${NOPORTDOCS}
+PLIST_SUB=		VER=${PORTVERSION}
+
+.if defined(WITH_ISPELL)
+CONFLICTS=		ispell* ??-ispell*
+SCRIPTS=		ispell spell
+PLIST_SUB+=		SCRIPTS=""
+.else
+PLIST_SUB+=		SCRIPTS="@comment "
+.endif
+
+.if defined(WITHOUT_NLS)
+CONFIGURE_ARGS+=	--disable-nls
+PLIST_SUB+=		NLS="@comment "
+.else
+USE_GETTEXT=		yes
+PLIST_SUB+=		NLS=""
+.endif
+
+.if !defined(NOPORTDOCS)
+MAN1=			aspell-import.1 aspell.1 pspell-config.1	\
+			run-with-aspell.1 word-list-compress.1
+INFO=			aspell-dev aspell
+.endif
 
 # Does not link without at least -O
 .if !defined(CFLAGS) || ${CFLAGS:M-O*} == ""
-CFLAGS+=	-O
+CFLAGS+=		-O
 .endif
 
 WRKSRC=		${WRKDIR}/aspell-${PORTVERSION}	# needed for slave ports / options
@@ -45,48 +69,13 @@ DESCR=		${.CURDIR}/pkg-descr
 
 CONF_DICT_ENV=	ASPELL="${PREFIX}/bin/aspell"	\
 		WORD_LIST_COMPRESS="${PREFIX}/bin/word-list-compress"
-AVAIL_DICT=	af bg br ca cs cy da de el en eo es fo fr hr ia id it ga gd gl gv is mi \
-		ms mt nb nl nn pl pt ro ru sk sl sv sw tn tr uk wa zu
-SPECDICTS=	af bg cs cy da el en fo fr ga gd gl gv hr ia id is it mi ms mt nb nn pl \
-		sk sl sv sw tn tr uk wa zu
-DICTVERSION=	0.50-2
-DICTVER_AF=	0.50-0
-DICTVER_BG=	0.50-0
-DICTVER_CS=	0.51-0
-DICTVER_CY=	0.50-3
-DICTVER_DA=	0.50.1-0
-DICTVER_EL=	0.50-3
-DICTVER_EN=	6.0-0
-DICTVER_FO=	0.51-0
-DICTVER_FR=	0.50-3
-DICTVER_GA=	0.50.1-0
-DICTVER_GD=	0.50-0
-DICTVER_GL=	0.50-0
-DICTVER_GV=	0.50-0
-DICTVER_HR=	0.51-0
-DICTVER_IA=	0.50-1
-DICTVER_ID=	0.50.1-0
-DICTVER_IS=	0.51-0
-DICTVER_IT=	0.53-0
-DICTVER_MI=	0.50-0
-DICTVER_MS=	0.50-0
-DICTVER_MT=	0.50-0
-DICTVER_NB=	0.50.1-0
-DICTVER_NN=	0.50.1-1
-DICTVER_PL=	0.51-0
-DICTVER_SK=	0.52-0
-DICTVER_SL=	0.50-0
-DICTVER_SV=	0.51-0
-DICTVER_SW=	0.50-0
-DICTVER_TN=	0.50-0
-DICTVER_TR=	0.50-0
-DICTVER_UK=	0.51-0
-DICTVER_WA=	0.50-0
-DICTVER_ZU=	0.50-0
+AVAIL_DICT=	af az be bg bn br ca cs cy da de el en eo es et fi fo fr ga gd gl \
+		gv he hr hsb hu ia id is it la lt lv mi mk mn ms mt nb nl nn ny pl \
+		pt qu ro ru rw sc sk sl sv sw ta tet tl tn tr uk uz vi wa yi zu
 DICT_SUFFIX=	.tar.bz2
-D5=		en
 
 .include <bsd.port.pre.mk>
+.include "${FILESDIR}/verdict"
 
 .if defined(LANG)
 . for i in ${AVAIL_DICT} no
@@ -119,46 +108,69 @@ DICTS+=		${LG}
 	@${ECHO_MSG} '* You can add further dictionaries:                     *'
 	@${ECHO_MSG} '*                                 Use make-flag:        *'
 	@${ECHO_MSG} '*  - Afrikaans                    ASPELL_AF=yes         *'
+	@${ECHO_MSG} '*  - Azerbaijani                  ASPELL_AZ=yes         *'
+	@${ECHO_MSG} '*  - Belarusian                   ASPELL_BE=yes         *'
+	@${ECHO_MSG} '*  - Bengali                      ASPELL_BN=yes         *'
 	@${ECHO_MSG} '*  - Bulgarian                    ASPELL_BG=yes         *'
 	@${ECHO_MSG} '*  - Breton                       ASPELL_BR=yes         *'
-	@${ECHO_MSG} '*  - Catalan                      ASPELL_CA=yes         *'
+	@${ECHO_MSG} '*  - Catalan / Valencian          ASPELL_CA=yes         *'
 	@${ECHO_MSG} '*  - Croatian                     ASPELL_HR=yes         *'
 	@${ECHO_MSG} '*  - Czech                        ASPELL_CS=yes         *'
 	@${ECHO_MSG} '*  - Danish                       ASPELL_DA=yes         *'
 	@${ECHO_MSG} '*  - Dutch                        ASPELL_NL=yes         *'
 	@${ECHO_MSG} '*  - English                      ASPELL_EN=yes         *'
 	@${ECHO_MSG} '*  - Esperanto                    ASPELL_EO=yes         *'
+	@${ECHO_MSG} '*  - Estonian                     ASPELL_ET=yes         *'
 	@${ECHO_MSG} '*  - Faroese                      ASPELL_FO=yes         *'
+	@${ECHO_MSG} '*  - Finnish                      ASPELL_FI=yes         *'
 	@${ECHO_MSG} '*  - French                       ASPELL_FR=yes         *'
 	@${ECHO_MSG} '*  - Galician                     ASPELL_GL=yes         *'
 	@${ECHO_MSG} '*  - German                       ASPELL_DE=yes         *'
 	@${ECHO_MSG} '*  - Greek                        ASPELL_EL=yes         *'
+	@${ECHO_MSG} '*  - Hebrew                       ASPELL_HE=yes         *'
+	@${ECHO_MSG} '*  - Hungarian                    ASPELL_HU=yes         *'
 	@${ECHO_MSG} '*  - Icelandic                    ASPELL_IS=yes         *'
 	@${ECHO_MSG} '*  - Indonesian                   ASPELL_ID=yes         *'
 	@${ECHO_MSG} '*  - Interlingua                  ASPELL_IA=yes         *'
 	@${ECHO_MSG} '*  - Irish (Gaelic)               ASPELL_GA=yes         *'
 	@${ECHO_MSG} '*  - Italian                      ASPELL_IT=yes         *'
+	@${ECHO_MSG} '*  - Kinyarwanda                  ASPELL_RW=yes         *'
+	@${ECHO_MSG} '*  - Latin                        ASPELL_LA=yes         *'
+	@${ECHO_MSG} '*  - Latvian                      ASPELL_LV=yes         *'
+	@${ECHO_MSG} '*  - Lithuanian                   ASPELL_LT=yes         *'
+	@${ECHO_MSG} '*  - Macedonian                   ASPELL_MK=yes         *'
 	@${ECHO_MSG} '*  - Maori                        ASPELL_MI=yes         *'
 	@${ECHO_MSG} '*  - Malay                        ASPELL_MS=yes         *'
 	@${ECHO_MSG} '*  - Maltese                      ASPELL_MT=yes         *'
 	@${ECHO_MSG} '*  - Manx Gaelic                  ASPELL_GV=yes         *'
+	@${ECHO_MSG} '*  - Mongolian                    ASPELL_MN=yes         *'
 	@${ECHO_MSG} '*  - Norwegian Bokmal             ASPELL_NB=yes         *'
 	@${ECHO_MSG} '*  - Norwegian Nynorsk            ASPELL_NN=yes         *'
+	@${ECHO_MSG} '*  - Nyanja (Chichewa)            ASPELL_NY=yes         *'
 	@${ECHO_MSG} '*  - Polish                       ASPELL_PL=yes         *'
 	@${ECHO_MSG} '*  - Portuguese                   ASPELL_PT=yes         *'
+	@${ECHO_MSG} '*  - Quechua                      ASPELL_QU=yes         *'
 	@${ECHO_MSG} '*  - Romanian                     ASPELL_RO=yes         *'
 	@${ECHO_MSG} '*  - Russian                      ASPELL_RU=yes         *'
+	@${ECHO_MSG} '*  - Sardinian                    ASPELL_SC=yes         *'
 	@${ECHO_MSG} '*  - Scottish Gaelic              ASPELL_GD=yes         *'
 	@${ECHO_MSG} '*  - Slovak                       ASPELL_SK=yes         *'
 	@${ECHO_MSG} '*  - Slovenian                    ASPELL_SL=yes         *'
 	@${ECHO_MSG} '*  - Swahili                      ASPELL_SW=yes         *'
 	@${ECHO_MSG} '*  - Spanish                      ASPELL_ES=yes         *'
 	@${ECHO_MSG} '*  - Swedish                      ASPELL_SV=yes         *'
+	@${ECHO_MSG} '*  - Tagalog                      ASPELL_TL=yes         *'
+	@${ECHO_MSG} '*  - Tamil                        ASPELL_TA=yes         *'
+	@${ECHO_MSG} '*  - Tetum                        ASPELL_TET=yes        *'
 	@${ECHO_MSG} '*  - Tswana                       ASPELL_TN=yes         *'
 	@${ECHO_MSG} '*  - Turkish                      ASPELL_TR=yes         *'
 	@${ECHO_MSG} '*  - Ukrainian                    ASPELL_UK=yes         *'
+	@${ECHO_MSG} '*  - Upper Sorbian                ASPELL_HSB=yes        *'
+	@${ECHO_MSG} '*  - Uzbek                        ASPELL_UZ=yes         *'
+	@${ECHO_MSG} '*  - Vietnamese                   ASPELL_VI=yes         *'
 	@${ECHO_MSG} '*  - Walloon                      ASPELL_WA=yes         *'
 	@${ECHO_MSG} '*  - Welsh                        ASPELL_CY=yes         *'
+	@${ECHO_MSG} '*  - Yiddish                      ASPELL_YI=yes         *'
 	@${ECHO_MSG} '*  - Zulu                         ASPELL_ZU=yes         *'
 	@${ECHO_MSG} '*                                                       *'
 	@${ECHO_MSG} '* Example: "make ASPELL_FR=yes ASPELL_EN=yes install"   *'
@@ -171,47 +183,31 @@ DICTS=	${LG}
 .endif
 .for DICO in ${DICTS}
 MASTER_SITES+=	ftp://ftp.gnu.org/gnu/aspell/dict/${DICO}/:dict${DICO}
-. if ${D5} == ${DICO}
-DISTFILES+=	aspell5-${DICO}-${DICTVER_${DICO:U}}${DICT_SUFFIX}:dict${DICO}
-. elif (${SPECDICTS:M${DICO}*} != "")
-DISTFILES+=	aspell-${DICO}-${DICTVER_${DICO:U}}${DICT_SUFFIX}:dict${DICO}
-. else
-DISTFILES+=	aspell-${DICO}-${DICTVERSION}${DICT_SUFFIX}:dict${DICO}
-. endif
+DISTFILES+=	aspell${VERDICT_${DICO:U}}${DICT_SUFFIX}:dict${DICO}
 .endfor
 
 post-extract:
 .for DICO in ${DICTS}
-. if ${D5} == ${DICO}
-	@cd ${WRKDIR} && \
-	 ${TAR} -xjf ${DISTDIR}/aspell5-${DICO}-${DICTVER_${DICO:U}}${DICT_SUFFIX}
-. elif (${SPECDICTS:M${DICO}*} != "")
-	@cd ${WRKDIR} && \
-	 ${TAR} -xjf ${DISTDIR}/aspell-${DICO}-${DICTVER_${DICO:U}}${DICT_SUFFIX}
-. else
 	@cd ${WRKDIR} && \
-	 ${TAR} -xjf ${DISTDIR}/aspell-${DICO}-${DICTVERSION}${DICT_SUFFIX}
-. endif
+	 ${TAR} -xjf ${DISTDIR}/aspell${VERDICT_${DICO:U}}${DICT_SUFFIX}
 .endfor
 
+pre-configure:
+	@cd ${WRKSRC} && ${ACLOCAL}
+
 post-install:
 .for DICO in ${DICTS}
 	@${ECHO_MSG} "===>   Installing for ${DICO} dictionaries"
-. if ${D5} == ${DICO}
-	@cd ${WRKDIR}/aspell5-${DICO}-${DICTVER_${DICO:U}} &&	\
-	 ${CONF_DICT_ENV} ./${CONFIGURE_SCRIPT} &&		\
-	 ${GMAKE} install
-. elif (${SPECDICTS:M${DICO}*} != "")
-	@cd ${WRKDIR}/aspell-${DICO}-${DICTVER_${DICO:U}} &&	\
+	@cd ${WRKDIR}/aspell${VERDICT_${DICO:U}} &&	\
 	 ${CONF_DICT_ENV} ./${CONFIGURE_SCRIPT} &&		\
 	 ${GMAKE} install
-. else
-	@cd ${WRKDIR}/aspell-${DICO}-${DICTVERSION} &&		\
-	 ${CONF_DICT_ENV} ./${CONFIGURE_SCRIPT} &&		\
-	 ${GMAKE} install
-. endif
-	@${CAT} ${MASTERDIR}/pkg-plist.${DICO} >> ${TMPPLIST}
+	@${SED} -e "s|%%VER%%|${PORTVERSION}|" ${MASTERDIR}/pkg-plist.${DICO}	\
+		>> ${TMPPLIST}
 .endfor
 	@${ECHO_CMD} "@dirrm share/aspell" >> ${TMPPLIST}
+	@${ECHO_CMD} "@dirrm lib/aspell-${PORTVERSION}" >> ${TMPPLIST}
+.if defined(WITH_ISPELL)
+	${INSTALL_SCRIPT} ${SCRIPTS:S|^|${WRKSRC}/scripts/|} ${PREFIX}/bin
+.endif
 
 .include <bsd.port.post.mk>