5 files changed, 88 insertions, 28 deletions

diff --git a/textproc/aspell/Makefile b/textproc/aspell/Makefile
index 6d61a84cf91d..113eb5b3c615 100644
--- a/textproc/aspell/Makefile
+++ b/textproc/aspell/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:	aspell
-# Version required:	0.27.2
+# Version required:	0.28.2.1
 # Date created:		7 December 1998
 # Whom:			Josh Gilliam <josh@quick.net>
 #
-# $Id: Makefile,v 1.7 1999/08/19 12:35:41 sheldonh Exp $
+# $Id: Makefile,v 1.8 1999/08/22 19:46:21 cpiazza Exp $
 #
 
-DISTNAME=	aspell-.27.2
-PKGNAME=	aspell-0.27.2
+DISTNAME=	aspell-.28.2.1
+PKGNAME=	aspell-0.28.2.1
 CATEGORIES=	textproc
 MASTER_SITES=	http://metalab.unc.edu/kevina/aspell/ \
 		ftp://ftp.kddlabs.co.jp/pub/Tools/aspell/ \
@@ -15,8 +15,14 @@ MASTER_SITES=	http://metalab.unc.edu/kevina/aspell/ \
 
 MAINTAINER=	ade@lovett.com
 
-USE_NEWGCC=	yes
-GNU_CONFIGURE=	yes
+# As and when gcc-2.95.1 becomes the 4.x system compiler, we can
+# remove this and uncomment USE_NEWGCC
+BUILD_DEPENDS=	g++295:${PORTSDIR}/lang/egcs
+
+CC=		gcc295
+CXX=		g++295
+#USE_NEWGCC=	yes
+USE_LIBTOOL=	yes
 CONFIGURE_ENV=	CXXFLAGS="${CXXFLAGS} -I${WRKSRC}"
 USE_GMAKE=	yes
 MAKE_ARGS=	NOPORTDOCS=${NOPORTDOCS}
diff --git a/textproc/aspell/distinfo b/textproc/aspell/distinfo
index b1cf667d847c..5bccb643d957 100644
--- a/textproc/aspell/distinfo
+++ b/textproc/aspell/distinfo
@@ -1 +1 @@
-MD5 (aspell-.27.2.tar.gz) = 2bc00bd261ddf0064b4f7d40bed5394b
+MD5 (aspell-.28.2.1.tar.gz) = a024a7c6bca99584cdae63abe41af3ad
diff --git a/textproc/aspell/files/patch-aa b/textproc/aspell/files/patch-aa
index 3737a8179d67..5d38107e6922 100644
--- a/textproc/aspell/files/patch-aa
+++ b/textproc/aspell/files/patch-aa
@@ -1,15 +1,6 @@
---- manual/Makefile.in.orig	Mon Feb 22 22:47:08 1999
-+++ manual/Makefile.in	Sat Feb 27 20:23:24 1999
-@@ -70,7 +70,7 @@
- RANLIB = @RANLIB@
- VERSION = @VERSION@
- 
--pkgdocdir = ${prefix}/doc/aspell
-+pkgdocdir = ${datadir}/doc/aspell
- 
- pkgdoc_DATA = manual.dvi manual.tex manual2.lyx manual.aux
- 
-@@ -78,7 +78,9 @@
+--- manual/Makefile.in.orig	Tue Jul 27 19:07:44 1999
++++ manual/Makefile.in	Thu Aug 19 11:03:13 1999
+@@ -85,7 +85,9 @@
  
  MAINTAINERCLEANFILES =  manual.dvi manual.log manual.aux
  
@@ -17,9 +8,9 @@
  SUBDIRS = man-html man-text
 +endif
  
- EXTRA_DIST = ${pkgdoc_DATA} html2txt.pl
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -252,7 +254,11 @@
+ EXTRA_DIST = ${pkgdoc_DATA}              html.sty html2txt.pl edit-man manual.per man-proc.pl
+ 
+@@ -260,7 +262,11 @@
  install-data: install-data-recursive
  
  install-am: all-am
diff --git a/textproc/aspell/files/patch-ah b/textproc/aspell/files/patch-ah
new file mode 100644
index 000000000000..749ecceac3c0
--- /dev/null
+++ b/textproc/aspell/files/patch-ah
@@ -0,0 +1,20 @@
+--- configure.orig	Mon Jul 26 12:31:53 1999
++++ configure	Thu Aug 19 11:42:57 1999
+@@ -2581,7 +2581,7 @@
+   \
+ dictdir=$enable_dict_dir
+ else
+-  dictdir=${libdir}/aspell 
++  dictdir=${datadir}/aspell 
+ fi
+ 
+ 
+@@ -2592,7 +2592,7 @@
+   \
+ pkgdocdir=$enable_doc_dir
+ else
+-  pkgdocdir=\${prefix}/doc/aspell 
++  pkgdocdir=\${prefix}/share/doc/aspell 
+ fi
+ 
+ 
diff --git a/textproc/aspell/pkg-plist b/textproc/aspell/pkg-plist
index 51a71bb96d1a..91b527f63803 100644
--- a/textproc/aspell/pkg-plist
+++ b/textproc/aspell/pkg-plist
@@ -1,22 +1,57 @@
 bin/aspell
 bin/run-with-aspell
+include/aspell/approx-t.hh
+include/aspell/approx.hh
 include/aspell/aspell.hh
 include/aspell/check-t.hh
 include/aspell/check.hh
+include/aspell/clone_ptr-t.hh
+include/aspell/clone_ptr.hh
+include/aspell/config.hh
+include/aspell/const_string.hh
 include/aspell/convert.hh
+include/aspell/copy_ptr-t.hh
+include/aspell/copy_ptr.hh
 include/aspell/data.hh
-include/aspell/i_data.hh
-include/aspell/i_error.hh
-include/aspell/i_iterator.hh
-include/aspell/i_object.hh
+include/aspell/data_base.hh
+include/aspell/error.hh
+include/aspell/hash-t.hh
+include/aspell/hash.hh
+include/aspell/hash_string.hh
+include/aspell/iterator.hh
 include/aspell/language.hh
+include/aspell/metaphone.hh
+include/aspell/object.hh
+include/aspell/phoneme.hh
+include/aspell/phonetic.hh
+include/aspell/popt.h
+include/aspell/prime.hh
+include/aspell/split.hh
+include/aspell/string_map.hh
+include/aspell/token-t.hh
+include/aspell/token.hh
+include/aspell/trim_space.hh
 lib/libaspell.a
-lib/libaspell.la
 lib/libaspell.so
-lib/libaspell.so.2
+lib/libaspell.so.3
+@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
+@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
+share/aspell/english.dat
 share/aspell/english.sl
 share/aspell/english.wrd
+share/aspell/iso8859-1.dat
+share/aspell/iso8859-10.dat
+share/aspell/iso8859-2.dat
+share/aspell/iso8859-3.dat
+share/aspell/iso8859-4.dat
+share/aspell/iso8859-5.dat
+share/aspell/iso8859-6.dat
+share/aspell/iso8859-7.dat
+share/aspell/iso8859-8.dat
+share/aspell/iso8859-9.dat
 share/aspell/ispell
+share/aspell/unicode.dat
+share/aspell/viscii.dat
 share/doc/aspell/man-html/1_Introduction.html
 share/doc/aspell/man-html/2_Getting.html
 share/doc/aspell/man-html/3_Aspell.html
@@ -31,9 +66,16 @@ share/doc/aspell/man-html/Contents.html
 share/doc/aspell/man-html/D_Credits.html
 share/doc/aspell/man-html/E_Glossary.html
 share/doc/aspell/man-html/F_Copyright.html
+share/doc/aspell/man-html/contents_motif.gif
 share/doc/aspell/man-html/index.html
 share/doc/aspell/man-html/manual.html
 share/doc/aspell/man-html/manual.css
+share/doc/aspell/man-html/next_motif.gif
+share/doc/aspell/man-html/next_motif_gr.gif
+share/doc/aspell/man-html/previous_motif.gif
+share/doc/aspell/man-html/previous_motif_gr.gif
+share/doc/aspell/man-html/up_motif.gif
+share/doc/aspell/man-html/up_motif_gr.gif
 share/doc/aspell/man-text/1_Introduction.txt
 share/doc/aspell/man-text/2_Getting.txt
 share/doc/aspell/man-text/3_Aspell.txt
@@ -54,6 +96,7 @@ share/doc/aspell/manual.aux
 share/doc/aspell/manual.dvi
 share/doc/aspell/manual.tex
 share/doc/aspell/manual2.lyx
+@dirrm include/aspell
 @dirrm share/aspell
 @dirrm share/doc/aspell/man-html
 @dirrm share/doc/aspell/man-text