4 files changed, 25 insertions, 51 deletions

diff --git a/textproc/hunspell/Makefile b/textproc/hunspell/Makefile
index 6714beee4ad1..bf86e0b28563 100644
--- a/textproc/hunspell/Makefile
+++ b/textproc/hunspell/Makefile
@@ -6,16 +6,16 @@
 #
 
 PORTNAME=	hunspell
-PORTVERSION=	1.1.10
+PORTVERSION=	1.2.2b
 CATEGORIES=	hungarian textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:S@$@:code@:S@%SUBDIR%@${PORTNAME}@} \
-		http://magyarispell.sourceforge.net/:data
-DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:code hu_HU.zip:data
+		${MASTER_SITE_SOURCEFORGE:S@$@:data@:S@%SUBDIR%@magyarispell@}
+DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:code hu_HU-${DICTVERSION}${EXTRACT_SUFX}:data
 
 MAINTAINER=	janos.mohacsi@bsd.hu
 COMMENT=	Improved Hungarian spelling checker
 
-EXTRACT_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
+#EXTRACT_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
 
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
@@ -25,16 +25,17 @@ CONFIGURE_ARGS=	"--with-ui"
 MAN1=		hunspell.1
 MAN4=		hunspell.4
 
+DICTVERSION=	1.3
 PORTDOCS=	README README.myspell
 
 .include <bsd.port.pre.mk>
 
 # Ugly workaround for FreeBSD versions before the import of NetBSD gzip.
-do-extract:
-	@${RM} -rf ${WRKDIR}; \
-	${MKDIR} ${WRKDIR}; \
- 	cd ${WRKDIR} && ${TAR} -xzf  ${_DISTDIR}/${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX};\
-		${UNZIP_CMD} -qo ${_DISTDIR}/hu_HU.zip -d ${WRKDIR}
+#do-extract:
+#	@${RM} -rf ${WRKDIR}; \
+#	${MKDIR} ${WRKDIR}; \
+# 	cd ${WRKDIR} && ${TAR} -xzf  ${_DISTDIR}/${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX};\
+#		${UNZIP_CMD} -qo ${_DISTDIR}/hu_HU.zip -d ${WRKDIR}
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \
@@ -44,14 +45,14 @@ do-install:
 	${INSTALL_MAN} ${WRKSRC}/man/hunspell.1 ${PREFIX}/man/man1
 	${INSTALL_MAN} ${WRKSRC}/man/hunspell.4 ${PREFIX}/man/man4
 	${INSTALL_PROGRAM} ${WRKSRC}/src/tools/.libs/hunspell ${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/src/hunspell/.libs/libhunspell-1.1.a ${PREFIX}/lib
-	${INSTALL_DATA} ${WRKSRC}/src/hunspell/.libs/libhunspell-1.1.lai ${PREFIX}/lib/libhunspell-1.1.la
-	${INSTALL_DATA} ${WRKSRC}/src/hunspell/.libs/libhunspell-1.1.so.0 ${PREFIX}/lib
-	${LN} -s ${LOCALBASE}/lib/libhunspell-1.1.so.0 ${PREFIX}/lib/libhunspell-1.1.so
+	${INSTALL_DATA} ${WRKSRC}/src/hunspell/.libs/libhunspell-1.2.a ${PREFIX}/lib
+	${INSTALL_DATA} ${WRKSRC}/src/hunspell/.libs/libhunspell-1.2.lai ${PREFIX}/lib/libhunspell-1.1.la
+	${INSTALL_DATA} ${WRKSRC}/src/hunspell/.libs/libhunspell-1.2.so.0 ${PREFIX}/lib
+	${LN} -s ${LOCALBASE}/lib/libhunspell-1.2.so.0 ${PREFIX}/lib/libhunspell-1.2.so
 	${MKDIR} ${PREFIX}/share/myspell/ && \
-	${INSTALL_DATA} ${WRKDIR}/hu_HU.dic \
+	${INSTALL_DATA} ${WRKDIR}/hu_HU-${DICTVERSION}/hu_HU.dic \
 	${PREFIX}/share/myspell/ && \
-	${INSTALL_DATA} ${WRKDIR}/hu_HU.aff \
+	${INSTALL_DATA} ${WRKDIR}/hu_HU-${DICTVERSION}/hu_HU.aff \
 	${PREFIX}/share/myspell/
 	${LN} -s ${LOCALBASE}/share/myspell/hu_HU.dic ${PREFIX}/share/myspell/magyar.dic
 	${LN} -s ${LOCALBASE}/share/myspell/hu_HU.dic ${PREFIX}/share/myspell/hungarian.dic
diff --git a/textproc/hunspell/distinfo b/textproc/hunspell/distinfo
index 64b348866eee..42da2588f765 100644
--- a/textproc/hunspell/distinfo
+++ b/textproc/hunspell/distinfo
@@ -1,6 +1,6 @@
-MD5 (hunspell-1.1.10.tar.gz) = e1fe2a3de7eedf5e9ec8e62f9ecbdddd
-SHA256 (hunspell-1.1.10.tar.gz) = a241057dad469f4e61027816d800f2935f68b86a6155188e4ccb5280232f646c
-SIZE (hunspell-1.1.10.tar.gz) = 723968
-MD5 (hu_HU.zip) = c5a0af97a41c1ad65b3f48824b575ad1
-SHA256 (hu_HU.zip) = ab039056c7b38a07981e0b1dd7ea0c2dbfd38326392981e6893d3325376e9908
-SIZE (hu_HU.zip) = 1197277
+MD5 (hunspell-1.2.2b.tar.gz) = 46aecfa635868f2618b204968f4bebd1
+SHA256 (hunspell-1.2.2b.tar.gz) = 91a67974af4ee5cdfdcd0c0840009356aa3ce1b8d25820dc56c9a594684dad0e
+SIZE (hunspell-1.2.2b.tar.gz) = 745643
+MD5 (hu_HU-1.3.tar.gz) = 498c47666414fcebdd328e3a5ae20e05
+SHA256 (hu_HU-1.3.tar.gz) = 4f7d61e3f06d4cfb61aecbde457474a8f03b664a9500718d34015c253fff5a06
+SIZE (hu_HU-1.3.tar.gz) = 1384493
diff --git a/textproc/hunspell/files/patch-src_hunspell_suggestmgr.hxx b/textproc/hunspell/files/patch-src_hunspell_suggestmgr.hxx
deleted file mode 100644
index 0a381fae172c..000000000000
--- a/textproc/hunspell/files/patch-src_hunspell_suggestmgr.hxx
+++ /dev/null
@@ -1,27 +0,0 @@
-
-$FreeBSD$
-
---- src/hunspell/suggestmgr.hxx.orig
-+++ src/hunspell/suggestmgr.hxx
-@@ -61,8 +61,8 @@
- 
- private:
-    int testsug(char** wlst, const char * candidate, int wl, int ns, int cpdsuggest,
--     int * timer, time_t * timelimit);
--   int checkword(const char *, int, int, int *, time_t *);
-+     int * timer, clock_t * timelimit);
-+   int checkword(const char *, int, int, int *, clock_t *);
-    int check_forbidden(const char *, int);
- 
-    int capchars(char **, const char *, int, int);
-@@ -89,8 +89,8 @@
-    int movechar_utf(char **, const w_char *, int, int, int);
- 
-    int mapchars(char**, const char *, int, int);
--   int map_related(const char *, int, char ** wlst, int, int, const mapentry*, int, int *, time_t *);
--   int map_related_utf(w_char *, int, int, int, char ** wlst, int, const mapentry*, int, int *, time_t *);
-+   int map_related(const char *, int, char ** wlst, int, int, const mapentry*, int, int *, clock_t *);
-+   int map_related_utf(w_char *, int, int, int, char ** wlst, int, const mapentry*, int, int *, clock_t *);
-    int ngram(int n, char * s1, const char * s2, int opt);
-    int mystrlen(const char * word);
-    int leftcommonsubstring(char * s1, const char * s2);
diff --git a/textproc/hunspell/pkg-plist b/textproc/hunspell/pkg-plist
index ead236821b95..adbe536e023b 100644
--- a/textproc/hunspell/pkg-plist
+++ b/textproc/hunspell/pkg-plist
@@ -1,8 +1,8 @@
 bin/hunspell
-lib/libhunspell-1.1.a
+lib/libhunspell-1.2.a
 lib/libhunspell-1.1.la
-lib/libhunspell-1.1.so.0
-lib/libhunspell-1.1.so
+lib/libhunspell-1.2.so.0
+lib/libhunspell-1.2.so
 share/myspell/hu_HU.aff
 share/myspell/hu_HU.dic
 share/myspell/hungarian.aff