Update to 0.12.

4 files changed, 30 insertions, 13 deletions

diff --git a/textproc/pspell/Makefile b/textproc/pspell/Makefile
index 37b1f615ec9..038d1a1e09e 100644
--- a/textproc/pspell/Makefile
+++ b/textproc/pspell/Makefile
@@ -6,19 +6,21 @@
 #
 
 PORTNAME=	pspell
-PORTVERSION= 	0.11.2
+PORTVERSION= 	0.12
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTNAME=	${PORTNAME}-.11.2
+DISTNAME=	${PORTNAME}-${PORTVERSION:S/^0//}
 
 MAINTAINER=	ports@FreeBSD.org
 
 USE_NEWGCC=	yes
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
-LIBTOOLFILES=	configure modules/configure
-CONFIGURE_ENV+=	CXXFLAGS="${CXXFLAGS} -I${WRKSRC}"
+LIBTOOLFILES=	configure modules/configure libltdl/configure
+CONFIGURE_ENV+=	CXXFLAGS="${CXXFLAGS} -I${WRKSRC}" \
+		CPPFLAGS=-I${LOCALBASE}/include \
+		LDFLAGS=-L${LOCALBASE}/lib
 MAKE_ARGS+=	NOPORTDOCS=${NOPORTDOCS}
 .if !defined(NOPORTDOCS)
 CONFIGURE_ARGS=	--enable-doc-dir=${PREFIX}/share/doc/pspell
diff --git a/textproc/pspell/distinfo b/textproc/pspell/distinfo
index b66a53a7bc8..e7e4367f9ef 100644
--- a/textproc/pspell/distinfo
+++ b/textproc/pspell/distinfo
@@ -1 +1 @@
-MD5 (pspell-.11.2.tar.gz) = 37585dbcced59d7fefadd2dcb97e87bb
+MD5 (pspell-.12.tar.gz) = 1eefb06d0287697036534b009992602a
diff --git a/textproc/pspell/files/patch-aa b/textproc/pspell/files/patch-aa
index a6bcfe41af0..a6e2e6eda2d 100644
--- a/textproc/pspell/files/patch-aa
+++ b/textproc/pspell/files/patch-aa
@@ -1,15 +1,27 @@
---- configure.orig	Sun Jun 11 02:08:24 2000
-+++ configure	Tue Jun 13 13:30:58 2000
-@@ -2268,7 +2268,7 @@
+
+$FreeBSD$
+
+--- configure.orig	Mon Jan 22 19:13:41 2001
++++ configure	Wed Jan 31 13:36:34 2001
+@@ -2282,7 +2282,7 @@
  objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
  deplibs_check_method="$deplibs_check_method" file_magic_cmd="$file_magic_cmd" \
  ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
--$libtool_flags --no-verify --build="$build" $ac_aux_dir/ltmain.sh $lt_target \
-+$libtool_flags --build="$build" $ac_aux_dir/ltmain.sh $lt_target \
+-$libtool_flags --no-verify --build="$build" $ac_aux_dir/ltmain.sh $host \
++$libtool_flags --build="$build" $ac_aux_dir/ltmain.sh $host \
  || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
  
  # Reload cache, that may have been modified by ltconfig
-@@ -2676,10 +2676,10 @@
+@@ -2319,7 +2319,7 @@
+ deplibs_check_method="$deplibs_check_method" \
+ file_magic_cmd="$file_magic_cmd" \
+ ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig -o libtool $libtool_flags \
+---build="$build" --add-tag=CXX $ac_aux_dir/ltcf-cxx.sh $host \
++--build="$build" $ac_aux_dir/ltmain.sh $host \
+ || { echo "configure: error: libtool tag configuration failed" 1>&2; exit 1; }
+ CC="$lt_save_CC"
+ CFLAGS="$lt_save_CFLAGS"
+@@ -2717,10 +2717,10 @@
        *) # Relative path.
          ac_sub_cache_file="$ac_dots$cache_file" ;;
        esac
diff --git a/textproc/pspell/pkg-plist b/textproc/pspell/pkg-plist
index 2e71c32da77..0b225fbea89 100644
--- a/textproc/pspell/pkg-plist
+++ b/textproc/pspell/pkg-plist
@@ -26,13 +26,13 @@ include/pspell/string_pair_emulation.h
 include/pspell/wordlist.h
 lib/libpspell-impl.a
 lib/libpspell-impl.so
-lib/libpspell-impl.so.3
+lib/libpspell-impl.so.4
 lib/libpspell-modules.a
 lib/libpspell-modules.so
 lib/libpspell-modules.so.1
 lib/libpspell.a
 lib/libpspell.so
-lib/libpspell.so.2
+lib/libpspell.so.4
 share/doc/pspell/man-html/1_Introduction.html
 share/doc/pspell/man-html/2_Getting.html
 share/doc/pspell/man-html/3_Library.html
@@ -70,6 +70,8 @@ share/doc/pspell/manual.tex
 share/pspell/cp1252.map
 share/pspell/iso8859-1.map
 share/pspell/iso8859-10.map
+share/pspell/iso8859-13.map
+share/pspell/iso8859-14.map
 share/pspell/iso8859-15.map
 share/pspell/iso8859-2.map
 share/pspell/iso8859-3.map
@@ -80,6 +82,7 @@ share/pspell/iso8859-7.map
 share/pspell/iso8859-8.map
 share/pspell/iso8859-9.map
 share/pspell/koi8-r.map
+share/pspell/region-to-spelling.map
 share/pspell/viscii.map
 @dirrm share/pspell
 @dirrm share/doc/pspell/man-text