- Update to 1.1.4

PR:		ports/105350
Submitted by:	Janos Mohacsi <janos.mohacsi@bsd.hu> (maintainer)

5 files changed, 27 insertions, 71 deletions

diff --git a/hungarian/hunspell/Makefile b/hungarian/hunspell/Makefile
index 23bcf7a634e7..276111f31ec1 100644
--- a/hungarian/hunspell/Makefile
+++ b/hungarian/hunspell/Makefile
@@ -6,39 +6,40 @@
 #
 
 PORTNAME=	hunspell
-PORTVERSION=	1.0.R.2
+PORTVERSION=	1.1.4
 CATEGORIES=	hungarian textproc
-#MASTER_SITES=	http://www.szofi.hu/gnu/magyarispell/
-MASTER_SITES=	http://magyarispell.sourceforge.net/
-DISTFILES=	${PORTNAME}-1.0-RC2${EXTRACT_SUFX} hu_HU-1.0-RC2${EXTRACT_SUFX}
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}${PORTNAME}/:code \
+		http://magyarispell.sourceforge.net/:data
+DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:code hu_HU-pack.zip:data
 
 MAINTAINER=	janos.mohacsi@bsd.hu
 COMMENT=	Improved Hungarian spelling checker
 
+BUILD_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
+
 USE_GMAKE=	yes
-USE_GETTEXT=	yes
-WRKSRC=		${WRKDIR}/${PORTNAME}-1.0-RC2
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	"--with-ui"
 
 MAN1=		hunspell.1
 MAN4=		hunspell.4
 
-PORTDOCS=	OLVASS.EL README README.myspell
+PORTDOCS=	README README.myspell
 
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 500000
-BROKEN=		"Does not compile on FreeBSD-4.x at this time"
+BROKEN=		Does not compile on FreeBSD-4.x at this time
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \
-		${WRKSRC}/hunspell.cxx
+		${WRKSRC}/src/tools/hunspell.cxx
 
 do-install:
 	${INSTALL_MAN} ${WRKSRC}/man/hunspell.1 ${PREFIX}/man/man1
 	${INSTALL_MAN} ${WRKSRC}/man/hunspell.4 ${PREFIX}/man/man4
-	${INSTALL_PROGRAM} ${WRKSRC}/hunspell ${PREFIX}/bin
-	${LN} -s ${PREFIX}/bin/hunspell ${PREFIX}/bin/hunstem
+	${INSTALL_PROGRAM} ${WRKSRC}/src/tools/hunspell ${PREFIX}/bin
 	${MKDIR} ${PREFIX}/share/myspell/ && \
 	${INSTALL_DATA} ${WRKDIR}/hu_HU.dic \
 	${PREFIX}/share/myspell/ && \
@@ -50,11 +51,9 @@ do-install:
 	${LN} -s ${LOCALBASE}/share/myspell/hu_HU.aff ${PREFIX}/share/myspell/magyar.aff
 	${LN} -s ${LOCALBASE}/share/myspell/hu_HU.aff ${PREFIX}/share/myspell/hungarian.aff
 	${LN} -s ${LOCALBASE}/share/myspell/hu_HU.aff ${PREFIX}/share/myspell/default.aff
-	${INSTALL_DATA} ${WRKSRC}/dictionary.lst \
-	${PREFIX}/share/myspell/default.lst
-	${LOCALBASE}/bin/msgfmt -o ${WRKSRC}/hunspell.mo ${WRKSRC}/hunspell.po
-	${MKDIR} ${PREFIX}/share/locale/hu/LC_MESSAGES/ && \
-	${INSTALL_DATA} ${WRKSRC}/hunspell.mo ${PREFIX}/share/locale/hu/LC_MESSAGES/
+	#${LOCALBASE}/bin/msgfmt -o ${WRKSRC}/hunspell.mo ${WRKSRC}/hunspell.po
+	#${MKDIR} ${PREFIX}/share/locale/hu/LC_MESSAGES/ && \
+	#${INSTALL_DATA} ${WRKSRC}/hunspell.mo ${PREFIX}/share/locale/hu/LC_MESSAGES/
 
 .ifndef(NOPORTDOCS)
 post-install:
diff --git a/hungarian/hunspell/distinfo b/hungarian/hunspell/distinfo
index 3021fafd2b7b..6dec441c5aea 100644
--- a/hungarian/hunspell/distinfo
+++ b/hungarian/hunspell/distinfo
@@ -1,6 +1,6 @@
-MD5 (hunspell-1.0-RC2.tar.gz) = a90f951c575798616bb890a969d346d7
-SHA256 (hunspell-1.0-RC2.tar.gz) = dd38b536b573a94ec1023b856d951732199e933221ae89db6052e6eaf9e7850c
-SIZE (hunspell-1.0-RC2.tar.gz) = 181134
-MD5 (hu_HU-1.0-RC2.tar.gz) = 9368dd2105b388b0c12a58d276adad5e
-SHA256 (hu_HU-1.0-RC2.tar.gz) = 21e6ef12f9474837f0bf5664f63bcfeb1a5d98853829a5375f46d366f9ef55b3
-SIZE (hu_HU-1.0-RC2.tar.gz) = 517512
+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
diff --git a/hungarian/hunspell/files/patch-Makefile b/hungarian/hunspell/files/patch-Makefile
deleted file mode 100644
index 21aa5c7ad884..000000000000
--- a/hungarian/hunspell/files/patch-Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
---- Makefile.orig	Wed Dec 17 18:50:49 2003
-+++ Makefile	Thu May 20 15:04:38 2004
-@@ -1,29 +1,29 @@
- #------ beállítások --  configuration -------------------
- # szótárak -- dictionaries (hu_HU.aff, hu_HU.dic)
--MYSPELL_DIR?=/usr/share/myspell
-+MYSPELL_DIR?=${PREFIX}/share/myspell
- # Hunmorph szótárak -- hu_HU.morph, extended hu_HU.aff, hu_HU.dic
--HUNMORPH_DIR?=/usr/share/hunmorph
-+HUNMORPH_DIR?=${PREFIX}/share/hunmorph
- # Magyar üzenetek -- Hungarian messages
--LOCALE_DIR?=/usr/share/locale
-+LOCALE_DIR?=${PREFIX}/share/locale
- # Kézikönyvoldalak -- Manual pages
--MAN_DIR?=/usr/share/man
-+MAN_DIR?=${PREFIX}/share/man
- # Magyar kézikönyvoldalak -- Hungarian manual pages
--MAN_HU_DIR?=/usr/share/man/hu
-+MAN_HU_DIR?=${PREFIX}/share/man/hu
- # Futtatható program helye -- Directory for executables
--BIN_DIR?=/usr/bin
-+BIN_DIR?=${PREFIX}/bin
- #--------------------------------------------------------
- 
--CC=g++
-+CC=$(CXX)
- #CC=/opt/SUNWspro/bin/CC
- 
--CXXFLAGS=-O2 -Wall -ansi -pedantic -I.
-+CXXFLAGS+= -Wall -ansi -pedantic -I. -I${LOCALBASE}/include
- 
- # for debug only
- #CXXFLAGS=-g -O0 -Wall -ansi -pedantic -I.
- #CXXFLAGS=-g -O0 -Wall -ansi -pedantic -I. -g
- #CXXFLAGS=-O2 +w2 -I.
- 
--LDFLAGS=-L. -lmyspell
-+LDFLAGS=-L. -lmyspell -L$(LOCALBASE)/lib -lintl -lstdc++
- 
- LIBS=libmyspell.a
- 
diff --git a/hungarian/hunspell/files/patch-hunspell.cxx b/hungarian/hunspell/files/patch-src_tools_hunspell.cxx
index 5473c35eae82..01cfb372c230 100644
--- a/hungarian/hunspell/files/patch-hunspell.cxx
+++ b/hungarian/hunspell/files/patch-src_tools_hunspell.cxx
@@ -1,13 +1,14 @@
---- hunspell.cxx.orig	Wed Dec 17 18:50:49 2003
-+++ hunspell.cxx	Thu May 20 15:54:49 2004
-@@ -49,8 +49,8 @@
+
+$FreeBSD$
+
+--- src/tools/hunspell.cxx.orig
++++ src/tools/hunspell.cxx
+@@ -47,7 +47,7 @@
  #include "manparser.hxx"
  #include "firstparser.hxx"
  
 -#define LIBDIR "/usr/share/myspell/"
--#define LIBDIR2 "/usr/share/hunmorph/"
 +#define LIBDIR "%%PREFIX%%/share/myspell/"
-+#define LIBDIR2 "%%PREFIX%%/share/hunmorph/"
  #define HOME getenv("HOME")
  #define DICBASENAME ".hunspell_"
  #define LOGFILE "/tmp/hunspell.log"
diff --git a/hungarian/hunspell/pkg-plist b/hungarian/hunspell/pkg-plist
index f664d3b2fd46..acdf94a8ba9b 100644
--- a/hungarian/hunspell/pkg-plist
+++ b/hungarian/hunspell/pkg-plist
@@ -1,5 +1,4 @@
 bin/hunspell
-bin/hunstem
 share/myspell/hu_HU.aff
 share/myspell/hu_HU.dic
 share/myspell/hungarian.aff
@@ -8,6 +7,4 @@ share/myspell/magyar.aff
 share/myspell/magyar.dic
 share/myspell/default.aff
 share/myspell/default.dic
-share/myspell/default.lst
-share/locale/hu/LC_MESSAGES/hunspell.mo
 @dirrm share/myspell