cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to hunspell 1.6.1, went into a full bulk build without issues

Browse Source 
- requirement for upcoming firefox 53
- switch to github as upstream
- SHARED_LIBS renamed from hunspell-1.3 to hunspell-1.6, depending ports
  will be fixed shortly
- disable nls/gettext, it doesnt build (and is also disabled in freebsd)
- reset MAINTAINERship to ports@ (discussed with edd@)
- fix test.sh shebang patch so that all tests runs fine
ok sthen@
This commit is contained in:
landry 2017-04-12 18:09:01 +00:00
parent c380c0f6c1
commit c479371046
7 changed files with 79 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
textproc/hunspell/Makefile
View File

@ -1,31 +1,38 @@
# $OpenBSD: Makefile,v 1.14 2017/04/10 11:46:34 sthen Exp $
# $OpenBSD: Makefile,v 1.15 2017/04/12 18:09:01 landry Exp $
COMMENT = spelling, stemming, morphological analysis and generation
DISTNAME = hunspell-1.3.2
REVISION = 2
SHARED_LIBS = hunspell-1.3 0.0 # .0.0
GH_ACCOUNT = hunspell
GH_PROJECT = hunspell
GH_TAGNAME = v1.6.1
DISTNAME = hunspell-1.6.1
SHARED_LIBS = hunspell-1.6 0.0 # .0.0
CATEGORIES = textproc
HOMEPAGE = http://hunspell.sourceforge.net/
MAINTAINER = Edd Barrett <edd@openbsd.org>
HOMEPAGE = http://hunspell.github.io/
# GPL/LGPL/MPL
PERMIT_PACKAGE_CDROM = Yes
WANTLIB += c m ncurses ncursesw readline ${LIBCXX}
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=hunspell/}
MODULES = devel/gettext
AUTOCONF_VERSION= 2.69
AUTOMAKE_VERSION= 1.15
BUILD_DEPENDS = ${MODGNU_AUTOCONF_DEPENDS} \
${MODGNU_AUTOMAKE_DEPENDS} \
devel/libtool
CONFIGURE_STYLE = gnu
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -L${WRKBUILD}/src/hunspell/.libs"
CONFIGURE_ARGS = --with-ui \
--disable-nls \
--with-readline
# default dictionary
@ -38,6 +45,10 @@ pre-configure:
${WRKSRC}/src/tools/hunspell.cxx \
${WRKSRC}/man/hu/hunspell.1 \
${WRKSRC}/man/hunspell.1
cd ${WRKSRC} && env ${MAKE_ENV} \
AUTOCONF_VERSION=${AUTOCONF_VERSION} \
AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \
autoreconf -vif
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/hunspell

4
textproc/hunspell/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (hunspell-1.3.2.tar.gz) = tO3UpO6UTLn0hbNUc+Rrcp7XaOnSTajnjkxMbKVq3b0=
SIZE (hunspell-1.3.2.tar.gz) = 975917
SHA256 (hunspell-1.6.1.tar.gz) = MPWTczxQt5QBa7A9Mf0qIHHkYQxvpHCOM+2tIzUQLEk=
SIZE (hunspell-1.6.1.tar.gz) = 706893

12
textproc/hunspell/patches/patch-man_hu_hunspell_1
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-man_hu_hunspell_1,v 1.2 2010/11/14 14:25:23 sthen Exp $
--- man/hu/hunspell.1.orig Tue Feb 23 10:08:52 2010
+++ man/hu/hunspell.1 Sat Sep 25 11:39:53 2010
$OpenBSD: patch-man_hu_hunspell_1,v 1.3 2017/04/12 18:09:01 landry Exp $
--- man/hu/hunspell.1.orig Sat Mar 25 22:20:45 2017
+++ man/hu/hunspell.1 Sat Apr 8 19:13:44 2017
@@ -65,12 +65,12 @@ a javaslattevést). Az első szótár mindig alapszót
.PP
Az alapértelmezett szótár a környezet nyelvi beállításától függ
@ -16,7 +16,7 @@ $OpenBSD: patch-man_hu_hunspell_1,v 1.2 2010/11/14 14:25:23 sthen Exp $
és még több más könyvtárban keresi a szótárt a program. L. \-D és a
.BR PÉLDÁK.
.TP
@@ -307,7 +307,7 @@ macka
@@ -317,7 +317,7 @@ macka
.TP
.B hunspell \-d en_US english.html
Az amerikai angol helyesírási szótár kiválasztása (aktuális, vagy a
@ -24,8 +24,8 @@ $OpenBSD: patch-man_hu_hunspell_1,v 1.2 2010/11/14 14:25:23 sthen Exp $
+.BR ${PREFIX}/share/hunspell
könyvtárból.
.TP
.B hunspell \-d /opt/OpenOffice.org1.0.1/share/dict/ooo/de_DE
@@ -335,10 +335,10 @@ A saját szótár helyének megadására szolgál. Sze
.B hunspell -l szöveg.html
@@ -347,10 +347,10 @@ A saját szótár helyének megadására szolgál. Sze
.I \-p
kapcsolóval.
.SH ÁLLOMÁNYOK

12
textproc/hunspell/patches/patch-man_hunspell_1
View File

@ -1,16 +1,16 @@
$OpenBSD: patch-man_hunspell_1,v 1.3 2013/03/21 08:57:49 fgsch Exp $
--- man/hunspell.1.orig Fri Jan 21 16:53:05 2011
+++ man/hunspell.1 Tue Mar 5 20:17:54 2013
@@ -369,10 +369,10 @@ following environment variables are searched: LC_ALL,
$OpenBSD: patch-man_hunspell_1,v 1.4 2017/04/12 18:09:01 landry Exp $
--- man/hunspell.1.orig Sat Mar 25 22:20:45 2017
+++ man/hunspell.1 Sat Apr 8 19:13:44 2017
@@ -394,10 +394,10 @@ following environment variables are searched: LC_ALL,
LC_MESSAGES, and LANG. If none are set then the following
fallbacks are used:
-.BI /usr/share/myspell/default.aff
+.BI ${PREFIX}/share/myspell/default.aff
Path of default affix file. See hunspell(4).
Path of default affix file. See hunspell(5).
.PP
-.BI /usr/share/myspell/default.dic
+.BI ${PREFIX}/share/myspell/default.dic
Path of default dictionary file.
See hunspell(4).
See hunspell(5).
.PP

68
textproc/hunspell/patches/patch-src_tools_hunspell_cxx
View File

@ -1,38 +1,38 @@
$OpenBSD: patch-src_tools_hunspell_cxx,v 1.3 2013/03/21 08:57:49 fgsch Exp $
--- src/tools/hunspell.cxx.orig Fri Jan 21 17:01:29 2011
+++ src/tools/hunspell.cxx Tue Mar 5 22:56:02 2013
@@ -61,28 +61,14 @@
#include "firstparser.hxx"
$OpenBSD: patch-src_tools_hunspell_cxx,v 1.4 2017/04/12 18:09:01 landry Exp $
--- src/tools/hunspell.cxx.orig Sat Mar 25 22:20:45 2017
+++ src/tools/hunspell.cxx Sat Apr 8 19:17:14 2017
@@ -116,28 +116,14 @@
#include "odfparser.hxx"
#define LIBDIR \
- "/usr/share/hunspell:" \
- "/usr/share/myspell:" \
- "/usr/share/myspell/dicts:" \
- "/Library/Spelling"
+ "${PREFIX}/share/hunspell:" \
+ "${LOCALBASE}/share/myspell:" \
+ "${LOCALBASE}/share/myspell/dicts:" \
+ "${LOCALBASE}/share/mozilla-dicts"
#define USEROOODIR \
- ".openoffice.org/3/user/wordbook:" \
- ".openoffice.org2/user/wordbook:" \
- ".openoffice.org2.0/user/wordbook:" \
- "Library/Spelling"
+ ".config/libreoffice/3/user/wordbook"
#define OOODIR \
- "/opt/openoffice.org/basis3.0/share/dict/ooo:" \
- "/usr/lib/openoffice.org/basis3.0/share/dict/ooo:" \
- "/opt/openoffice.org2.4/share/dict/ooo:" \
- "/usr/lib/openoffice.org2.4/share/dict/ooo:" \
- "/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"
+ "${LOCALBASE}/lib/libreoffice/share/wordbook"
#define LIBDIR \
- "/usr/share/hunspell:" \
- "/usr/share/myspell:" \
- "/usr/share/myspell/dicts:" \
- "/Library/Spelling"
+ "${PREFIX}/share/hunspell:" \
+ "${LOCALBASE}/share/myspell:" \
+ "${LOCALBASE}/share/myspell/dicts:" \
+ "${LOCALBASE}/share/mozilla-dicts"
#define USEROOODIR { \
- ".openoffice.org/3/user/wordbook", \
- ".openoffice.org2/user/wordbook", \
- ".openoffice.org2.0/user/wordbook",\
- "Library/Spelling" }
+ ".config/libreoffice/4/user/wordbook" }
#define OOODIR \
- "/opt/openoffice.org/basis3.0/share/dict/ooo:" \
- "/usr/lib/openoffice.org/basis3.0/share/dict/ooo:" \
- "/opt/openoffice.org2.4/share/dict/ooo:" \
- "/usr/lib/openoffice.org2.4/share/dict/ooo:" \
- "/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"
+ "${LOCALBASE}/lib/libreoffice/share/wordbook"
#define HOME getenv("HOME")
#define DICBASENAME ".hunspell_"
#define LOGFILE "/tmp/hunspell.log"

12
textproc/hunspell/patches/patch-tests_test_sh
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-tests_test_sh,v 1.1.1.1 2009/06/13 07:48:53 ajacoutot Exp $
--- tests/test.sh.orig Fri Jun 5 17:37:50 2009
+++ tests/test.sh Fri Jun 5 17:37:58 2009
$OpenBSD: patch-tests_test_sh,v 1.2 2017/04/12 18:09:01 landry Exp $
--- tests/test.sh.orig Sat Mar 25 22:20:45 2017
+++ tests/test.sh Sat Apr 8 19:25:56 2017
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!${LOCALBASE}/bin/bash
export LC_ALL="C"
function check_valgrind_log () {
# ***** BEGIN LICENSE BLOCK *****
# Version: MPL 1.1/GPL 2.0/LGPL 2.1
#

26
textproc/hunspell/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.4 2015/05/22 11:31:18 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.5 2017/04/12 18:09:01 landry Exp $
bin/affixcompress
@bin bin/analyze
@bin bin/chmorph
@ -12,41 +12,25 @@ bin/makealias
bin/wordforms
bin/wordlist2hunspell
include/hunspell/
include/hunspell/affentry.hxx
include/hunspell/affixmgr.hxx
include/hunspell/atypes.hxx
include/hunspell/baseaffix.hxx
include/hunspell/csutil.hxx
include/hunspell/dictmgr.hxx
include/hunspell/filemgr.hxx
include/hunspell/hashmgr.hxx
include/hunspell/htypes.hxx
include/hunspell/hunspell.h
include/hunspell/hunspell.hxx
include/hunspell/hunvisapi.h
include/hunspell/hunzip.hxx
include/hunspell/langnum.hxx
include/hunspell/phonet.hxx
include/hunspell/replist.hxx
include/hunspell/suggestmgr.hxx
include/hunspell/w_char.hxx
lib/libhunspell-1.3.a
lib/libhunspell-1.3.la
@lib lib/libhunspell-1.3.so.${LIBhunspell-1.3_VERSION}
lib/libparsers.a
lib/libhunspell-1.6.a
lib/libhunspell-1.6.la
@lib lib/libhunspell-1.6.so.${LIBhunspell-1.6_VERSION}
lib/pkgconfig/hunspell.pc
man/hu/
man/hu/man1/
@man man/hu/man1/hunspell.1
man/hu/man4/
@man man/hu/man4/hunspell.4
@man man/man1/hunspell.1
@man man/man1/hunzip.1
@man man/man1/hzip.1
@man man/man3/hunspell.3
@man man/man4/hunspell.4
@man man/man5/hunspell.5
share/hunspell/
share/hunspell/default.aff
share/hunspell/default.dic
share/locale/hu/LC_MESSAGES/hunspell.mo
share/locale/it/LC_MESSAGES/hunspell.mo