Update to 0.12.2

PR:		29280
Submitted by:	John Merryweather Cooper <jmcoopr@webmail.bmi.net>

6 files changed, 10 insertions, 70 deletions

diff --git a/textproc/pspell/Makefile b/textproc/pspell/Makefile
index 88f51bfad945..7774f8f6ff92 100644
--- a/textproc/pspell/Makefile
+++ b/textproc/pspell/Makefile
@@ -16,14 +16,15 @@ MAINTAINER=	petef@FreeBSD.org
 
 LIB_DEPENDS=	ltdl.1:${PORTSDIR}/devel/libtool
 
-USE_NEWGCC=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL=	yes
-LIBTOOLFILES=	configure modules/configure libltdl/configure
+GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--enable-doc-dir=${PREFIX}/share/doc/pspell
-MAKE_ARGS=	NOPORTDOCS=${NOPORTDOCS}
 INSTALLS_SHLIB=	yes
 
+post-patch:
+	@${PERL} -pi -e 's,\@INSTALL\@,install,' ${WRKSC}/libltdl/Makefile.in \
+		${WRKSRC}/modules/Makefile.in
+
 .include <bsd.port.mk>
diff --git a/textproc/pspell/distinfo b/textproc/pspell/distinfo
index b7d60966954a..025011016245 100644
--- a/textproc/pspell/distinfo
+++ b/textproc/pspell/distinfo
@@ -1 +1 @@
-MD5 (pspell-.12.1.tar.gz) = 502ac9b6212874a7e7d308d2e29cfeaf
+MD5 (pspell-.12.2.tar.gz) = cfd3816b2372932a1b71c0ce4e9f881e
diff --git a/textproc/pspell/files/patch-aa b/textproc/pspell/files/patch-aa
deleted file mode 100644
index a6e2e6eda2df..000000000000
--- a/textproc/pspell/files/patch-aa
+++ /dev/null
@@ -1,38 +0,0 @@
-
-$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 $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
-@@ -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
--  case "$ac_given_INSTALL" in
--        [/$]*) INSTALL="$ac_given_INSTALL" ;;
--        *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
--        esac
-+#  case "$ac_given_INSTALL" in
-+#        [/$]*) INSTALL="$ac_given_INSTALL" ;;
-+#        *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
-+#        esac
- 
-       echo "running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir"
-       # The eval makes quoting arguments work.
diff --git a/textproc/pspell/files/patch-ab b/textproc/pspell/files/patch-ab
deleted file mode 100644
index 1b2e61034288..000000000000
--- a/textproc/pspell/files/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
---- modules/configure.orig	Fri Jun  9 20:49:40 2000
-+++ modules/configure	Tue Jun 13 13:32:00 2000
-@@ -2149,7 +2149,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 \
- || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
- 
- # Reload cache, that may have been modified by ltconfig
diff --git a/textproc/pspell/files/patch-libltdl_Makefile.in b/textproc/pspell/files/patch-libltdl_Makefile.in
deleted file mode 100644
index 10341981cfec..000000000000
--- a/textproc/pspell/files/patch-libltdl_Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- libltdl/Makefile.in	2001/01/31 23:03:23	1.1
-+++ libltdl/Makefile.in	2001/01/31 23:03:38
-@@ -69,7 +69,7 @@
- GCJFLAGS = @GCJFLAGS@
- LIBADD_DL = @LIBADD_DL@
- LIBTOOL = @LIBTOOL@
--LIBTOOL_DEPS = @LIBTOOL_DEPS@
-+LIBTOOL_DEPS = #@LIBTOOL_DEPS@
- LN_S = @LN_S@
- MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
diff --git a/textproc/pspell/pkg-plist b/textproc/pspell/pkg-plist
index 3c93da4ff002..f26471b11cd1 100644
--- a/textproc/pspell/pkg-plist
+++ b/textproc/pspell/pkg-plist
@@ -1,6 +1,5 @@
 bin/pspell-config
 include/pspell/app_string.hh
-include/pspell/conf.h
 include/pspell/config.h
 include/pspell/config_impl.hh
 include/pspell/convert.hh
@@ -25,12 +24,15 @@ include/pspell/string_pair.h
 include/pspell/string_pair_emulation.h
 include/pspell/wordlist.h
 lib/libpspell-impl.a
+lib/libpspell-impl.la
 lib/libpspell-impl.so
-lib/libpspell-impl.so.5
+lib/libpspell-impl.so.6
 lib/libpspell-modules.a
+lib/libpspell-modules.la
 lib/libpspell-modules.so
 lib/libpspell-modules.so.1
 lib/libpspell.a
+lib/libpspell.la
 lib/libpspell.so
 lib/libpspell.so.4
 %%PORTDOCS%%share/doc/pspell/man-html/1_Introduction.html