[62725] trunk/dports/textproc/hunspell
nox at macports.org
nox at macports.org
Thu Jan 14 20:02:23 PST 2010
Revision: 62725
http://trac.macports.org/changeset/62725
Author: nox at macports.org
Date: 2010-01-14 20:02:20 -0800 (Thu, 14 Jan 2010)
Log Message:
-----------
Improve hunspell port
Universal support is now enabled and documentation installed.
Dependencies have been fixed (ncursesw instead of ncurses) and
architectures are checked through archcheck port group. Furthermore,
documentation is now installed and the license field has been properly
filled. Finally, we don't try to rename the tools as the patch wasn't
really working anyway.
Last but not least, please note that directories outside from MacPorts
are not searched for third-parties dictionaries by hunspell anymore as
it's not in MacPorts' policy and there is no file there provided by the
default installation of Mac OS X.
Modified Paths:
--------------
trunk/dports/textproc/hunspell/Portfile
Removed Paths:
-------------
trunk/dports/textproc/hunspell/files/patch-hunspell-renameexes.diff
Modified: trunk/dports/textproc/hunspell/Portfile
===================================================================
--- trunk/dports/textproc/hunspell/Portfile 2010-01-14 23:54:33 UTC (rev 62724)
+++ trunk/dports/textproc/hunspell/Portfile 2010-01-15 04:02:20 UTC (rev 62725)
@@ -2,9 +2,12 @@
# $Id$
PortSystem 1.0
+PortGroup archcheck 1.0
name hunspell
version 1.2.8
+revision 1
+license GPL-2.0+ LGPL-2.1+ MPL-1.1+
categories textproc
maintainers nomaintainer
description Spell checker and morphological analyzer
@@ -22,28 +25,47 @@
sha1 eaa76f82fcf08678e49f7a30afdaa268bcc75235 \
rmd160 e4fd39e5fadf96da1311f2aa7163ec17eacf0f83
-depends_lib port:gettext port:ncurses port:readline
+patchfiles patch-hunspell.cxx.diff
-patchfiles patch-hunspell.cxx.diff \
- patch-hunspell-renameexes.diff
+depends_lib port:gettext port:ncursesw port:readline
-configure.cflags-append -DLIBDIR=\\"${prefix}/share/hunspell:/usr/share/myspell:/usr/share/myspell/dicts\\"
-configure.cxxflags-append -DLIBDIR=\\"${prefix}/share/hunspell:/usr/share/myspell:/usr/share/myspell/dicts\\"
+archcheck.files \
+ lib/libintl.dylib \
+ lib/libncursesw.dylib \
+ lib/libreadline.dylib
+
+configure.cppflags-append -DLIBDIR=\\"${prefix}/share/hunspell\\"
configure.args --with-ui --with-readline
-use_parallel_build yes
+pre-test {
+ # Fix tools path in test script
+ reinplace /^alias/s:/src/tools:&/.libs: ${worksrcpath}/tests/test.sh
+}
-universal_variant no
-
test.run yes
test.target check
+post-destroot {
+ set docdir ${prefix}/share/doc/${name}
+ xinstall -d ${destroot}${docdir}
+ xinstall -m 644 -W ${worksrcpath} AUTHORS AUTHORS.myspell BUGS COPYING \
+ COPYING.LGPL COPYING.MPL ChangeLog NEWS README README.myspell THANKS \
+ TODO ${destroot}${docdir}
+}
+if {[variant_isset universal]} {
+ post-configure {
+ # Properly include universal ldflags when building the library
+ reinplace \
+ "/archive_cmds/s/-dynamiclib/& ${configure.universal_ldflags}/" \
+ ${worksrcpath}/libtool
+ }
+}
+
+
post-install {
ui_msg "******************************************************************"
ui_msg "You must install (at least) one of the language dictionaries after"
ui_msg "installing this port in order for it to work."
ui_msg "******************************************************************"
}
-
-livecheck.regex "(?i)<title>${name} (.*) released.*</title>"
Deleted: trunk/dports/textproc/hunspell/files/patch-hunspell-renameexes.diff
===================================================================
--- trunk/dports/textproc/hunspell/files/patch-hunspell-renameexes.diff 2010-01-14 23:54:33 UTC (rev 62724)
+++ trunk/dports/textproc/hunspell/files/patch-hunspell-renameexes.diff 2010-01-15 04:02:20 UTC (rev 62725)
@@ -1,115 +0,0 @@
-=== modified file 'src/tools/Makefile.am'
---- src/tools/Makefile.am 2008-05-04 15:53:24 +0000
-+++ src/tools/Makefile.am 2008-05-04 15:55:45 +0000
-@@ -1,4 +1,4 @@
--bin_PROGRAMS=analyze chmorph example hunspell munch unmunch hzip hunzip
-+bin_PROGRAMS=hunspell-analyze hunspell-chmorph hunspell-example hunspell hunspell-munch hunspell-unmunch hzip hunzip
-
- INCLUDES=-I${top_srcdir}/src/hunspell -I${top_srcdir}/src/parsers
-
-@@ -6,23 +6,23 @@
- hunzip_SOURCES=hunzip.cxx
- hunzip_LDADD = ../hunspell/libhunspell-1.2.la
-
--munch_SOURCES=munch.c
--unmunch_SOURCES=unmunch.c
-+hunspell_munch_SOURCES=munch.c
-+hunspell_unmunch_SOURCES=unmunch.c
- include_HEADERS=munch.h unmunch.h
-
--example_SOURCES=example.cxx
--example_LDADD = ../hunspell/libhunspell-1.2.la
-+hunspell_example_SOURCES=example.cxx
-+hunspell_example_LDADD = ../hunspell/libhunspell-1.2.la
-
- hunspell_SOURCES=hunspell.cxx
- hunspell_LDADD = @LIBINTL@ ../hunspell/libhunspell-1.2.la \
- ../parsers/libparsers.a @CURSESLIB@ @READLINELIB@
-
--analyze_SOURCES=analyze.cxx
--analyze_LDADD = ../hunspell/libhunspell-1.2.la
--
--chmorph_SOURCES=chmorph.cxx
--chmorph_LDADD = ../hunspell/libhunspell-1.2.la ../parsers/libparsers.a
--
--noinst_PROGRAMS=example
-+hunspell_analyze_SOURCES=analyze.cxx
-+hunspell_analyze_LDADD = ../hunspell/libhunspell-1.2.la
-+
-+hunspell_chmorph_SOURCES=chmorph.cxx
-+hunspell_chmorph_LDADD = ../hunspell/libhunspell-1.2.la ../parsers/libparsers.a
-+
-+noinst_PROGRAMS=hunspell-example
-
- EXTRA_DIST=makealias affixcompress
-
-=== modified file 'src/tools/example.cxx'
---- src/tools/example.cxx 2008-05-04 15:53:24 +0000
-+++ src/tools/example.cxx 2008-05-04 15:54:12 +0000
-@@ -17,8 +17,8 @@
- /* first parse the command line options */
-
- if (argc < 4) {
-- fprintf(stderr,"example (now it works with more dictionary files):\n");
-- fprintf(stderr,"example affix_file dictionary_file(s) file_of_words_to_check\n");
-+ fprintf(stderr,"hunspell-example (now it works with more dictionary files):\n");
-+ fprintf(stderr,"hunspell-example affix_file dictionary_file(s) file_of_words_to_check\n");
- exit(1);
- }
-
-
-=== modified file 'src/tools/munch.c'
---- src/tools/munch.c 2008-05-04 15:53:24 +0000
-+++ src/tools/munch.c 2008-05-04 15:56:18 +0000
-@@ -42,14 +42,14 @@
- wf = mystrdup(argv[1]);
- } else {
- fprintf(stderr,"correct syntax is:\n");
-- fprintf(stderr,"munch word_list_file affix_file\n");
-+ fprintf(stderr,"hunspell-munch word_list_file affix_file\n");
- exit(1);
- }
- if (argv[2]) {
- af = mystrdup(argv[2]);
- } else {
- fprintf(stderr,"correct syntax is:\n");
-- fprintf(stderr,"munch word_list_file affix_file\n");
-+ fprintf(stderr,"hunspell-munch word_list_file affix_file\n");
- exit(1);
- }
-
-
-=== modified file 'src/tools/unmunch.c'
---- src/tools/unmunch.c 2008-05-04 15:53:24 +0000
-+++ src/tools/unmunch.c 2008-05-04 15:56:39 +0000
-@@ -39,14 +39,14 @@
- wf = mystrdup(argv[1]);
- } else {
- fprintf(stderr,"correct syntax is:\n");
-- fprintf(stderr,"unmunch dic_file affix_file\n");
-+ fprintf(stderr,"hunspell-unmunch dic_file affix_file\n");
- exit(1);
- }
- if (argv[2]) {
- af = mystrdup(argv[2]);
- } else {
- fprintf(stderr,"correct syntax is:\n");
-- fprintf(stderr,"unmunch dic_file affix_file\n");
-+ fprintf(stderr,"hunspell-unmunch dic_file affix_file\n");
- exit(1);
- }
-
-
-=== modified file 'tests/test.sh'
---- tests/test.sh 2008-05-04 15:53:24 +0000
-+++ tests/test.sh 2008-05-04 15:57:07 +0000
-@@ -34,7 +34,7 @@
- shopt -s expand_aliases
-
- alias hunspell='../src/tools/hunspell'
--alias analyze='../src/tools/analyze'
-+alias analyze='../src/tools/hunspell-analyze'
-
- if [ "$VALGRIND" != "" ]; then
- rm -f $TEMPDIR/test.pid*
-
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100114/f88962eb/attachment.html>
More information about the macports-changes
mailing list