3 files changed, 64 insertions, 42 deletions

diff --git a/textproc/apertium/Makefile b/textproc/apertium/Makefile
index d6cfa6e61092..7c88f0d58432 100644
--- a/textproc/apertium/Makefile
+++ b/textproc/apertium/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	apertium
-PORTVERSION=	3.1.1
+PORTVERSION=	${APVER}.${APREV}
 CATEGORIES=	textproc
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/3.1
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${APVER}
 
 MAINTAINER=	i@levsha.me
 COMMENT=	A toolbox to build shallow-transfer machine translation systems
@@ -20,10 +20,18 @@ LIB_DEPENDS=	xml2:${PORTSDIR}/textproc/libxml2 \
 		lttoolbox3:${PORTSDIR}/textproc/lttoolbox \
 		pcre:${PORTSDIR}/devel/pcre
 
+APVER=	3.2
+APREV=	0
+
 MAKE_JOBS_UNSAFE=	yes
 
 GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
 USE_GNOME=	gnomehack pkgconfig
+USE_LDCONFIG=	yes
+
+PLIST_SUB+=	APVER="${APVER}"
 
 MAN1=	apertium-deshtml.1 apertium-desodt.1 apertium-despptx.1 \
 	apertium-desrtf.1 apertium-destxt.1 apertium-deswxml.1 \
@@ -42,6 +50,6 @@ MAN1=	apertium-deshtml.1 apertium-desodt.1 apertium-despptx.1 \
 	apertium-validate-interchunk.1 apertium-validate-modes.1 \
 	apertium-validate-postchunk.1 apertium-validate-tagger.1\
 		apertium-validate-transfer.1 apertium-unformat.1 \
-	apertium.1
+	apertium.1 apertium-desmediawiki.1 apertium-remediawiki.1
 
 .include <bsd.port.mk>
diff --git a/textproc/apertium/distinfo b/textproc/apertium/distinfo
index ee246ddc0a97..9eced9f91e5b 100644
--- a/textproc/apertium/distinfo
+++ b/textproc/apertium/distinfo
@@ -1,3 +1,2 @@
-MD5 (apertium-3.1.1.tar.gz) = bf993e1ddc1b510f8d734b29d2a415e9
-SHA256 (apertium-3.1.1.tar.gz) = 42bc030bc94ea414ab0cc809378eff8c2b8bec022642bf6aa3311e60f6821223
-SIZE (apertium-3.1.1.tar.gz) = 710100
+SHA256 (apertium-3.2.0.tar.gz) = 6ce2fdc85da5d1e50d69da2e50cc97a87b689476f2c83417765636d9a4b7e9ac
+SIZE (apertium-3.2.0.tar.gz) = 767311
diff --git a/textproc/apertium/pkg-plist b/textproc/apertium/pkg-plist
index 2bca7a20a0b7..a4fd0532afb9 100644
--- a/textproc/apertium/pkg-plist
+++ b/textproc/apertium/pkg-plist
@@ -1,5 +1,6 @@
 bin/apertium
 bin/apertium-deshtml
+bin/apertium-desmediawiki
 bin/apertium-desodt
 bin/apertium-despptx
 bin/apertium-desrtf
@@ -24,6 +25,7 @@ bin/apertium-preprocess-corpus-lextor
 bin/apertium-preprocess-transfer
 bin/apertium-pretransfer
 bin/apertium-rehtml
+bin/apertium-remediawiki
 bin/apertium-reodt
 bin/apertium-repptx
 bin/apertium-rertf
@@ -43,43 +45,56 @@ bin/apertium-validate-modes
 bin/apertium-validate-postchunk
 bin/apertium-validate-tagger
 bin/apertium-validate-transfer
-include/apertium-3.1/apertium/apertium_re.h
-include/apertium-3.1/apertium/collection.h
-include/apertium-3.1/apertium/constant_manager.h
-include/apertium-3.1/apertium/endian_double_util.h
-include/apertium-3.1/apertium/hmm.h
-include/apertium-3.1/apertium/interchunk.h
-include/apertium-3.1/apertium/interchunk_word.h
-include/apertium-3.1/apertium/lextor.h
-include/apertium-3.1/apertium/lextor_data.h
-include/apertium-3.1/apertium/lextor_eval.h
-include/apertium-3.1/apertium/lextor_word.h
-include/apertium-3.1/apertium/morpho_stream.h
-include/apertium-3.1/apertium/postchunk.h
-include/apertium-3.1/apertium/string_utils.h
-include/apertium-3.1/apertium/tagger.h
-include/apertium-3.1/apertium/tagger_data.h
-include/apertium-3.1/apertium/tagger_utils.h
-include/apertium-3.1/apertium/tagger_word.h
-include/apertium-3.1/apertium/tmx_builder.h
-include/apertium-3.1/apertium/transfer.h
-include/apertium-3.1/apertium/transfer_data.h
-include/apertium-3.1/apertium/transfer_instr.h
-include/apertium-3.1/apertium/transfer_mult.h
-include/apertium-3.1/apertium/transfer_token.h
-include/apertium-3.1/apertium/transfer_word.h
-include/apertium-3.1/apertium/transfer_word_list.h
-include/apertium-3.1/apertium/trx_reader.h
-include/apertium-3.1/apertium/tsx_reader.h
-include/apertium-3.1/apertium/ttag.h
-include/apertium-3.1/apertium/unlocked_cstdio.h
-include/apertium-3.1/apertium/utf_converter.h
-lib/libapertium3-3.1.so
-lib/libapertium3-3.1.so.0
+include/apertium-%%APVER%%/apertium/apertium_re.h
+include/apertium-%%APVER%%/apertium/collection.h
+include/apertium-%%APVER%%/apertium/constant_manager.h
+include/apertium-%%APVER%%/apertium/endian_double_util.h
+include/apertium-%%APVER%%/apertium/hmm.h
+include/apertium-%%APVER%%/apertium/interchunk.h
+include/apertium-%%APVER%%/apertium/interchunk_word.h
+include/apertium-%%APVER%%/apertium/lextor.h
+include/apertium-%%APVER%%/apertium/lextor_data.h
+include/apertium-%%APVER%%/apertium/lextor_eval.h
+include/apertium-%%APVER%%/apertium/lextor_word.h
+include/apertium-%%APVER%%/apertium/morpho_stream.h
+include/apertium-%%APVER%%/apertium/postchunk.h
+include/apertium-%%APVER%%/apertium/string_utils.h
+include/apertium-%%APVER%%/apertium/tagger.h
+include/apertium-%%APVER%%/apertium/tagger_data.h
+include/apertium-%%APVER%%/apertium/tagger_utils.h
+include/apertium-%%APVER%%/apertium/tagger_word.h
+include/apertium-%%APVER%%/apertium/tmx_align_parameters.h
+include/apertium-%%APVER%%/apertium/tmx_aligner_tool.h
+include/apertium-%%APVER%%/apertium/tmx_alignment.h
+include/apertium-%%APVER%%/apertium/tmx_arguments_parser.h
+include/apertium-%%APVER%%/apertium/tmx_book_to_matrix.h
+include/apertium-%%APVER%%/apertium/tmx_builder.h
+include/apertium-%%APVER%%/apertium/tmx_dic_tree.h
+include/apertium-%%APVER%%/apertium/tmx_dictionary.h
+include/apertium-%%APVER%%/apertium/tmx_quasi_diagonal.h
+include/apertium-%%APVER%%/apertium/tmx_serialize_impl.h
+include/apertium-%%APVER%%/apertium/tmx_strings_and_streams.h
+include/apertium-%%APVER%%/apertium/tmx_trail_postprocessors.h
+include/apertium-%%APVER%%/apertium/tmx_translate.h
+include/apertium-%%APVER%%/apertium/tmx_words.h
+include/apertium-%%APVER%%/apertium/transfer.h
+include/apertium-%%APVER%%/apertium/transfer_data.h
+include/apertium-%%APVER%%/apertium/transfer_instr.h
+include/apertium-%%APVER%%/apertium/transfer_mult.h
+include/apertium-%%APVER%%/apertium/transfer_token.h
+include/apertium-%%APVER%%/apertium/transfer_word.h
+include/apertium-%%APVER%%/apertium/transfer_word_list.h
+include/apertium-%%APVER%%/apertium/trx_reader.h
+include/apertium-%%APVER%%/apertium/tsx_reader.h
+include/apertium-%%APVER%%/apertium/ttag.h
+include/apertium-%%APVER%%/apertium/unlocked_cstdio.h
+include/apertium-%%APVER%%/apertium/utf_converter.h
+lib/libapertium3-%%APVER%%.so
+lib/libapertium3-%%APVER%%.so.0
 lib/libapertium3.a
 lib/libapertium3.la
 lib/libapertium3.so
-libdata/pkgconfig/apertium-3.1.pc
+libdata/pkgconfig/apertium-%%APVER%%.pc
 %%DATADIR%%/acx.rng
 %%DATADIR%%/apertium-createmodes.awk
 %%DATADIR%%/deformat.xsl
@@ -96,7 +111,7 @@ libdata/pkgconfig/apertium-3.1.pc
 %%DATADIR%%/reformat.xsl
 %%DATADIR%%/tagger.dtd
 %%DATADIR%%/transfer.dtd
+@dirrm include/apertium-%%APVER%%/apertium
+@dirrm include/apertium-%%APVER%%
 @dirrm %%DATADIR%%/modes
 @dirrm %%DATADIR%%
-@dirrm include/apertium-3.1/apertium
-@dirrm include/apertium-3.1