4 files changed, 38 insertions, 19 deletions

diff --git a/textproc/hunspell/Makefile b/textproc/hunspell/Makefile
index 6bf554f46a52..94fbb7eeba37 100644
--- a/textproc/hunspell/Makefile
+++ b/textproc/hunspell/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	hunspell
-PORTVERSION=	1.1.4
+PORTVERSION=	1.1.8
 CATEGORIES=	hungarian textproc
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}${PORTNAME}/:code \
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:S@$@:code@:S@%SUBDIR%@${PORTNAME}@} \
 		http://magyarispell.sourceforge.net/:data
-DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:code hu_HU-pack.zip:data
+DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:code hu_HU.zip:data
 
 MAINTAINER=	janos.mohacsi@bsd.hu
 COMMENT=	Improved Hungarian spelling checker
@@ -18,6 +18,7 @@ COMMENT=	Improved Hungarian spelling checker
 BUILD_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
 
 USE_GMAKE=	yes
+USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	"--with-ui"
 
@@ -28,12 +29,6 @@ PORTDOCS=	README README.myspell
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 500000
-BROKEN=		Does not compile on FreeBSD-4.x at this time
-.elif ${OSVERSION} >= 602001
-BROKEN=		Does not compile on FreeBSD >= 6.x
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \
 		${WRKSRC}/src/tools/hunspell.cxx
@@ -41,7 +36,11 @@ post-patch:
 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/hunspell ${PREFIX}/bin
+	${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
 	${MKDIR} ${PREFIX}/share/myspell/ && \
 	${INSTALL_DATA} ${WRKDIR}/hu_HU.dic \
 	${PREFIX}/share/myspell/ && \
diff --git a/textproc/hunspell/distinfo b/textproc/hunspell/distinfo
index 6dec441c5aea..54136dbc4f22 100644
--- a/textproc/hunspell/distinfo
+++ b/textproc/hunspell/distinfo
@@ -1,6 +1,6 @@
-MD5 (hunspell-1.1.4.tar.gz) = 4cf2dfb89dd58392ad5a1183c69eb628
-SHA256 (hunspell-1.1.4.tar.gz) = 8d39c03beb71ec1482d2fdbfc2d5b7690c8a70fb6da4885369752ee0d2e3a635
-SIZE (hunspell-1.1.4.tar.gz) = 438667
-MD5 (hu_HU-pack.zip) = 648c795ceb8bfc24488b92e6bb1099d4
-SHA256 (hu_HU-pack.zip) = c8ac368cc8ce8909307c24f7439f8b8a2601624dd1f42a29809ad76e8fe2d742
-SIZE (hu_HU-pack.zip) = 1472123
+MD5 (hunspell-1.1.8.tar.gz) = 18051676c0b00f78a0c77a68dafbb25d
+SHA256 (hunspell-1.1.8.tar.gz) = ba0f42ff00d79f4e075dfba95a922876bc8224cd5fc5c9ab044483f0ca542269
+SIZE (hunspell-1.1.8.tar.gz) = 677672
+MD5 (hu_HU.zip) = c5a0af97a41c1ad65b3f48824b575ad1
+SHA256 (hu_HU.zip) = ab039056c7b38a07981e0b1dd7ea0c2dbfd38326392981e6893d3325376e9908
+SIZE (hu_HU.zip) = 1197277
diff --git a/textproc/hunspell/files/patch-src_tools_hunspell.cxx b/textproc/hunspell/files/patch-src_tools_hunspell.cxx
index 01cfb372c230..1b82c1ecf916 100644
--- a/textproc/hunspell/files/patch-src_tools_hunspell.cxx
+++ b/textproc/hunspell/files/patch-src_tools_hunspell.cxx
@@ -3,12 +3,25 @@ $FreeBSD$
 
 --- src/tools/hunspell.cxx.orig
 +++ src/tools/hunspell.cxx
-@@ -47,7 +47,7 @@
+@@ -59,16 +59,12 @@
  #include "manparser.hxx"
  #include "firstparser.hxx"
  
--#define LIBDIR "/usr/share/myspell/"
-+#define LIBDIR "%%PREFIX%%/share/myspell/"
+-#define LIBDIR "/usr/share/hunspell:/usr/share/myspell"
++#define LIBDIR "%%PREFIX%%/share/hunspell:%%PREFIX%%/share/myspell"
+ #define USEROOODIR ".openoffice.org2/user/wordbook"
+-#define OOODIR "/opt/openoffice.org2.3/share/dict/ooo:" \
+-    "/usr/lib/openoffice.org2.3/share/dict/ooo:" \
+-    "/opt/openoffice.org2.2/share/dict/ooo:" \
+-    "/usr/lib/openoffice.org2.2/share/dict/ooo:" \
+-    "/opt/openoffice.org2.1/share/dict/ooo:" \
+-    "/usr/lib/openoffice.org2.1/share/dict/ooo:" \
+-    "/opt/openoffice.org2.0/share/dict/ooo:" \
+-    "/usr/lib/openoffice.org2.0/share/dict/ooo"
++#define OOODIR "%%PREFIX%%/openoffice.org-2.3/share/dict/ooo:" \
++    "%%PREFIX%%/openoffice.org-2.2/share/dict/ooo:" \
++    "%%PREFIX%%/openoffice.org-2.1/share/dict/ooo:" \
++    "%%PREFIX%%/openoffice.org2.0/share/dict/ooo"
  #define HOME getenv("HOME")
  #define DICBASENAME ".hunspell_"
  #define LOGFILE "/tmp/hunspell.log"
diff --git a/textproc/hunspell/pkg-plist b/textproc/hunspell/pkg-plist
index acdf94a8ba9b..8bfce3b50d38 100644
--- a/textproc/hunspell/pkg-plist
+++ b/textproc/hunspell/pkg-plist
@@ -1,4 +1,8 @@
 bin/hunspell
+lib/libhunspell-1.1.a
+lib/libhunspell-1.1.la
+lib/libhunspell-1.1.so.0
+lib/libhunspell-1.1.so
 share/myspell/hu_HU.aff
 share/myspell/hu_HU.dic
 share/myspell/hungarian.aff
@@ -8,3 +12,6 @@ share/myspell/magyar.dic
 share/myspell/default.aff
 share/myspell/default.dic
 @dirrm share/myspell
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/README.myspell
+%%PORTDOCS%%@dirrm %%DOCSDIR%%