Upgrade to 0.60.1.

This release adds a new Nroff and Texinfo filter and fixes a number
of bugs and portability problems.

Warning: aspell-0.60.1 is now incompatible with the base ncurses.
To keep the ncurses interfaces, please define WITH_NCURSES: aspell
will then depend on the port devel/ncurses.
Since devel/ncurses is not packageable, this is not the default.

5 files changed, 56 insertions, 23 deletions

diff --git a/textproc/aspell/Makefile b/textproc/aspell/Makefile
index 0d68cbafbe2b..7f7b876d9589 100644
--- a/textproc/aspell/Makefile
+++ b/textproc/aspell/Makefile
@@ -6,13 +6,12 @@
 #
 
 PORTNAME?=	aspell
-PORTVERSION=	0.60
-PORTREVISION=	2
+PORTVERSION=	0.60.1
 CATEGORIES+=	textproc
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	aspell
-DISTFILES=	aspell-0.60.tar.gz	# needed for slave ports / options
-EXTRACT_ONLY=	aspell-0.60.tar.gz
+DISTFILES=	aspell-0.60.1.tar.gz	# needed for slave ports / options
+EXTRACT_ONLY=	aspell-0.60.1.tar.gz
 
 MAINTAINER?=	thierry@FreeBSD.org
 COMMENT?=	Spelling checker with better suggestion logic than ispell
@@ -37,7 +36,7 @@ USE_PERL5_BUILD=	yes
 INSTALLS_SHLIB=		yes
 
 MAKE_ARGS=		NOPORTDOCS=${NOPORTDOCS}
-PLIST_SUB=		VER=${PORTVERSION}
+PLIST_SUB=		VER=${PORTVERSION:R}
 
 .if defined(WITH_ISPELL)
 CONFLICTS=		ispell* ??-ispell*
@@ -80,6 +79,18 @@ DICT_SUFFIX=	.tar.bz2
 .include <bsd.port.pre.mk>
 .include "${FILESDIR}/verdict"
 
+.if exists(${LOCALBASE}/include/ncurses/ncurses.h)
+WITH_NCURSES=	yes
+.endif
+.if defined(WITH_NCURSES)
+BUILD_DEPENDS+=	${LOCALBASE}/lib/libncurses.so.5.4:${PORTSDIR}/devel/ncurses
+RUN_DEPENDS+=	${LOCALBASE}/lib/libncurses.so.5.4:${PORTSDIR}/devel/ncurses
+CONFIGURE_ARGS+=--enable-curses=${LOCALBASE}/lib/libncurses.so			\
+		--enable-curses-include=${LOCALBASE}/include
+.else
+CONFIGURE_ARGS+=--disable-curses # Curses implementation on FreeBSD is outdated!
+.endif
+
 .if defined(LANG)
 . for i in ${AVAIL_DICT} no
 .  if ${LANG:M${i}*} != ""
@@ -177,6 +188,8 @@ DICTS+=		${LG}
 	@${ECHO_MSG} '*  - Zulu                         ASPELL_ZU=yes         *'
 	@${ECHO_MSG} '*                                                       *'
 	@${ECHO_MSG} '* Example: "make ASPELL_FR=yes ASPELL_EN=yes install"   *'
+	@${ECHO_MSG} '*                                                       *'
+	@${ECHO_MSG} '* Define WITH_NCURSES to get the full screen interface. *'
 	@${ECHO_MSG} '*********************************************************'
 . for LG in ${AVAIL_DICT}
 .  if (${DEF_DICT} == ${LG})
@@ -204,11 +217,11 @@ post-install:
 	@cd ${WRKDIR}/aspell${VERDICT_${DICO:U}} &&	\
 	 ${CONF_DICT_ENV} ./${CONFIGURE_SCRIPT} &&		\
 	 ${GMAKE} install
-	@${SED} -e "s|%%VER%%|${PORTVERSION}|" ${MASTERDIR}/pkg-plist.${DICO}	\
+	@${SED} -e "s|%%VER%%|${PORTVERSION:R}|" ${MASTERDIR}/pkg-plist.${DICO}	\
 		>> ${TMPPLIST}
 .endfor
 	@${ECHO_CMD} "@dirrm share/aspell" >> ${TMPPLIST}
-	@${ECHO_CMD} "@dirrm lib/aspell-${PORTVERSION}" >> ${TMPPLIST}
+	@${ECHO_CMD} "@dirrm lib/aspell-${PORTVERSION:R}" >> ${TMPPLIST}
 .if defined(WITH_ISPELL)
 	${INSTALL_SCRIPT} ${SCRIPTS:S|^|${WRKSRC}/scripts/|} ${PREFIX}/bin
 .endif
diff --git a/textproc/aspell/distinfo b/textproc/aspell/distinfo
index b95a171af84e..1e01a88313e6 100644
--- a/textproc/aspell/distinfo
+++ b/textproc/aspell/distinfo
@@ -1,5 +1,5 @@
-MD5 (aspell-0.60.tar.gz) = 8fa031d0eb37a5538aa6fefa657e707f
-SIZE (aspell-0.60.tar.gz) = 1622677
+MD5 (aspell-0.60.1.tar.gz) = 277a5e04498c72d47647c1bced88d0d0
+SIZE (aspell-0.60.1.tar.gz) = 1586475
 MD5 (aspell-af-0.50-0.tar.bz2) = bde617a195e70364f96eea71cf71a333
 SIZE (aspell-af-0.50-0.tar.bz2) = 256111
 MD5 (aspell6-az-0.02-0.tar.bz2) = 24d9d46c8fc23197666a43a7962a7b0d
diff --git a/textproc/aspell/files/patch-Makefile.in b/textproc/aspell/files/patch-Makefile.in
index bd3318b3e10e..26c30cf04651 100644
--- a/textproc/aspell/files/patch-Makefile.in
+++ b/textproc/aspell/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig	Mon Aug 23 03:22:41 2004
-+++ Makefile.in	Mon Aug 30 00:39:45 2004
-@@ -424,7 +424,12 @@
+--- Makefile.in.orig	Mon Nov  8 02:12:41 2004
++++ Makefile.in	Mon Nov  8 10:09:19 2004
+@@ -447,7 +447,12 @@
  target_os = @target_os@
  target_vendor = @target_vendor@
  AUTOMAKE_OPTIONS = foreign subdir-objects
@@ -14,17 +14,17 @@
  DIST_SUBDIRS = ${SUBDIRS} examples myspell lib5
  filterdir = ${pkglibdir}
  optdir = ${pkgdatadir}
-@@ -512,7 +517,7 @@
+@@ -536,7 +541,7 @@
  	lib/string_list-c.cpp lib/find_speller.cpp lib/speller-c.cpp \
  	lib/string_pair_enumeration-c.cpp lib/new_checker.cpp \
  	modules/filter/url.cpp $(am__append_3)
 -libaspell_la_LIBADD = $(LIBINTL) $(PTHREAD_LIB)
 +libaspell_la_LIBADD = $(LIBINTL) $(PTHREAD_LIB) $(LTLIBINTL)
- @INCREMENTED_SONAME_FALSE@libaspell_la_LDFLAGS = -version-info 16:0:1
- @INCREMENTED_SONAME_TRUE@libaspell_la_LDFLAGS = -version-info 16:0:0
+ @INCREMENTED_SONAME_FALSE@libaspell_la_LDFLAGS = -version-info 16:0:1 -no-undefined
+ @INCREMENTED_SONAME_TRUE@libaspell_la_LDFLAGS = -version-info 16:0:0 -no-undefined
  @PSPELL_COMPATIBILITY_TRUE@libpspell_la_SOURCES = lib/dummy.cpp
-@@ -521,7 +526,7 @@
- @INCREMENTED_SONAME_TRUE@@PSPELL_COMPATIBILITY_TRUE@libpspell_la_LDFLAGS = -version-info 16:0:0
+@@ -545,7 +550,7 @@
+ @INCREMENTED_SONAME_TRUE@@PSPELL_COMPATIBILITY_TRUE@libpspell_la_LDFLAGS = -version-info 16:0:0 -no-undefined
  word_list_compress_SOURCES = prog/compress.c
  aspell_SOURCES = prog/aspell.cpp prog/check_funs.cpp prog/checker_string.cpp
 -aspell_LDADD = libaspell.la $(CURSES_LIB)
@@ -32,7 +32,7 @@
  prezip_bin_SOURCES = prog/prezip.c
  static_optfiles = modules/filter/url-filter.info $(am__append_2)
  dynamic_optfiles = $(am__append_4)
-@@ -1259,6 +1264,1590 @@
+@@ -1335,6 +1340,1590 @@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
diff --git a/textproc/aspell/files/patch-configure b/textproc/aspell/files/patch-configure
index e508b39feebf..7fc5b944da08 100644
--- a/textproc/aspell/files/patch-configure
+++ b/textproc/aspell/files/patch-configure
@@ -1,5 +1,5 @@
---- configure.orig	Mon Aug 23 03:22:42 2004
-+++ configure	Mon Oct 18 14:05:59 2004
+--- configure.orig	Mon Nov  8 02:12:49 2004
++++ configure	Mon Nov  8 13:47:08 2004
 @@ -2902,7 +2902,7 @@
  fi
  
@@ -9,7 +9,7 @@
  then
    CXXFLAGS="$CXXFLAGS -fno-exceptions"
  fi
-@@ -9825,13 +9825,6 @@
+@@ -9830,13 +9830,6 @@
  	;;
      esac
  
@@ -23,7 +23,7 @@
      # Update the list of available tags.
      if test -n "$tagname"; then
        echo appending configuration tag \"$tagname\" to $ofile
-@@ -19379,6 +19372,10 @@
+@@ -19388,6 +19381,10 @@
  
  # This can be used to rebuild libtool when needed
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@@ -34,7 +34,7 @@
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -21274,16 +21271,16 @@
+@@ -21283,16 +21280,16 @@
  /* end confdefs.h.  */
  #include <libintl.h>
  extern int _nl_msg_cat_cntr;
@@ -53,3 +53,21 @@
    ;
    return 0;
  }
+@@ -22406,7 +22403,7 @@
+   CURSES_LIB=-lncurses
+ 
+ cat >>confdefs.h <<\_ACEOF
+-#define CURSES_HEADER <ncurses/curses.h>
++#define CURSES_HEADER <ncurses/ncurses.h>
+ _ACEOF
+ 
+ else
+@@ -22589,7 +22586,7 @@
+ 
+ 
+ cat >>confdefs.h <<\_ACEOF
+-#define CURSES_HEADER <curses.h>
++#define CURSES_HEADER <ncurses/ncurses.h>
+ _ACEOF
+ 
+ 
diff --git a/textproc/aspell/pkg-plist b/textproc/aspell/pkg-plist
index 5f6941c4cbd5..124cd3fb6541 100644
--- a/textproc/aspell/pkg-plist
+++ b/textproc/aspell/pkg-plist
@@ -79,9 +79,11 @@ lib/libpspell.so.16
 %%DATADIR%%/email.amf
 %%DATADIR%%/html.amf
 %%DATADIR%%/none.amf
+%%DATADIR%%/nroff.amf
 %%DATADIR%%/perl.amf
 %%DATADIR%%/sgml.amf
 %%DATADIR%%/tex.amf
+%%DATADIR%%/texinfo.amf
 %%DATADIR%%/url.amf
 %%NLS%%share/locale/be/LC_MESSAGES/aspell.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/aspell.mo