aboutsummaryrefslogtreecommitdiffstats
path: root/textproc
diff options
context:
space:
mode:
authorobrien <obrien@FreeBSD.org>1999-02-28 18:25:58 +0800
committerobrien <obrien@FreeBSD.org>1999-02-28 18:25:58 +0800
commitaded41b9586a405d7d8e3f55640161fa0701663b (patch)
tree5e4d63f92c40473de870b9c4556a157616d313db /textproc
parent7ce88711614aba19d0d5b7fa7a1112e285700d5e (diff)
downloadfreebsd-ports-gnome-aded41b9586a405d7d8e3f55640161fa0701663b.tar.gz
freebsd-ports-gnome-aded41b9586a405d7d8e3f55640161fa0701663b.tar.zst
freebsd-ports-gnome-aded41b9586a405d7d8e3f55640161fa0701663b.zip
Upgrade to 0.27.
If "HAVE_EGCS" is defined, aspell will not depend on the STL port and will use the natvie EGCS STL instead.
Diffstat (limited to 'textproc')
-rw-r--r--textproc/aspell/Makefile29
-rw-r--r--textproc/aspell/distinfo3
-rw-r--r--textproc/aspell/files/patch-aa39
-rw-r--r--textproc/aspell/pkg-plist38
4 files changed, 58 insertions, 51 deletions
diff --git a/textproc/aspell/Makefile b/textproc/aspell/Makefile
index 06835de6217e..89cdb9ec2827 100644
--- a/textproc/aspell/Makefile
+++ b/textproc/aspell/Makefile
@@ -3,11 +3,11 @@
# Date created: 7 December 1998
# Whom: Josh Gilliam <josh@quick.net>
#
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1998/12/24 16:29:00 flathill Exp $
#
-DISTNAME= aspell-.24
-PKGNAME= aspell-0.24
+DISTNAME= aspell-.27
+PKGNAME= aspell-0.27
CATEGORIES= textproc
MASTER_SITES= http://metalab.unc.edu/kevina/aspell/ \
ftp://ftp.kddlabs.co.jp/pub/Tools/aspell/ \
@@ -15,11 +15,20 @@ MASTER_SITES= http://metalab.unc.edu/kevina/aspell/ \
MAINTAINER= josh@quick.net
+.if defined(HAVE_EGCS)
+BUILD_DEPENDS= eg++:${PORTSDIR}/lang/egcs
+CC= egcc
+CXX= eg++
+.else
BUILD_DEPENDS= ${PREFIX}/include/stlport/hash_map:${PORTSDIR}/devel/stlport
+.endif
-WRKSRC= ${WRKDIR}/aspell
GNU_CONFIGURE= yes
+.if defined(HAVE_EGCS)
+CONFIGURE_ENV= CXXFLAGS="${CXXFLAGS} -I${WRKSRC}"
+.else
CONFIGURE_ENV= CXXFLAGS="${CXXFLAGS} -I${PREFIX}/include/stlport"
+.endif
USE_GMAKE= yes
MAKE_ARGS= NOPORTDOCS=${NOPORTDOCS}
@@ -36,11 +45,11 @@ post-patch:
@${ECHO_MSG} "===> Using ${WORDLIST} as English word list."
pre-install:
- @${RM} -f ${WRKSRC}/man-html/3_aspell.html \
- ${WRKSRC}/man-html/4_Libray.html \
- ${WRKSRC}/man-html/manual2.html \
- ${WRKSRC}/man-text/3_aspell.txt \
- ${WRKSRC}/man-text/4_Libray.txt \
- ${WRKSRC}/man-text/manual2.txt
+ @${RM} -f ${WRKSRC}/manual/man-html/C_Credits.html \
+ ${WRKSRC}/manual/man-html/D_Glossary.html \
+ ${WRKSRC}/manual/man-html/E_Copyright.html \
+ ${WRKSRC}/manual/man-text/C_Credits.txt \
+ ${WRKSRC}/manual/man-text/D_Glossary.txt \
+ ${WRKSRC}/manual/man-text/E_Copyright.txt
.include <bsd.port.mk>
diff --git a/textproc/aspell/distinfo b/textproc/aspell/distinfo
index 6b7349867f66..a735026486c8 100644
--- a/textproc/aspell/distinfo
+++ b/textproc/aspell/distinfo
@@ -1,2 +1 @@
-MD5 (aspell-.24.tar.gz) = f14d48761e860f9717917e09cf29de6e
-MD5 (aspell-.24.tar.gz) = 32b057baece3fd999bf7d5cb5f772b7d
+MD5 (aspell-.27.tar.gz) = 9eaee90c3761ec1b9b94d4a7b757682c
diff --git a/textproc/aspell/files/patch-aa b/textproc/aspell/files/patch-aa
index 8551c42f6f0d..3737a8179d67 100644
--- a/textproc/aspell/files/patch-aa
+++ b/textproc/aspell/files/patch-aa
@@ -1,5 +1,5 @@
---- Makefile.in~ Sat Nov 7 22:33:18 1998
-+++ Makefile.in Mon Dec 7 00:15:58 1998
+--- 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@
@@ -7,36 +7,27 @@
-pkgdocdir = ${prefix}/doc/aspell
+pkgdocdir = ${datadir}/doc/aspell
- AUTOMAKE_OPTIONS = foreign
+ pkgdoc_DATA = manual.dvi manual.tex manual2.lyx manual.aux
-@@ -101,7 +101,9 @@
+@@ -78,7 +78,9 @@
- pkgdoc_DATA = manual.dvi manual.tex manual2.lyx manual.aux
+ MAINTAINERCLEANFILES = manual.dvi manual.log manual.aux
+ifndef NOPORTDOCS
SUBDIRS = man-html man-text
+endif
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = as_config.h
-@@ -520,7 +522,11 @@
- install-exec-am: install-libLTLIBRARIES install-binPROGRAMS
+ EXTRA_DIST = ${pkgdoc_DATA} html2txt.pl
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -252,7 +254,11 @@
+ install-data: install-data-recursive
+ install-am: all-am
+ifndef NOPORTDOCS
- install-data-am: install-pkgdataDATA install-pkgdocDATA install-includeHEADERS
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+else
-+install-data-am: install-pkgdataDATA install-includeHEADERS
++ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am
+endif
-
- uninstall-am: uninstall-libLTLIBRARIES uninstall-binPROGRAMS uninstall-pkgdataDATA uninstall-pkgdocDATA uninstall-includeHEADERS
-
-@@ -623,7 +629,7 @@
- MAINTAINERCLEANFILES += manual.dvi manual.log manual.aux
-
- english.wrd english.mta: aspell english.wl
-- ./aspell master english < english.wl
-+ ./aspell master english < @WORDLIST@
-
- manual manual.dvi: manual.tex
- perl man-proc.pl
+ install: install-recursive
+ uninstall-am: uninstall-pkgdocDATA
+ uninstall: uninstall-recursive
diff --git a/textproc/aspell/pkg-plist b/textproc/aspell/pkg-plist
index 084082d9fb35..f5f8af0b1b71 100644
--- a/textproc/aspell/pkg-plist
+++ b/textproc/aspell/pkg-plist
@@ -1,17 +1,22 @@
bin/aspell
-include/as_check.hh
-include/as_config.h
-include/as_convert.hh
-include/as_error.hh
-include/aspell.hh
-include/const_string.hh
-include/hash_string.hh
+bin/run-with-aspell
+include/aspell/aspell.hh
+include/aspell/check-t.hh
+include/aspell/check.hh
+include/aspell/convert.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/language.hh
lib/libaspell.a
lib/libaspell.la
lib/libaspell.so
-lib/libaspell.so.0
-share/aspell/english.mta
+lib/libaspell.so.1
+share/aspell/english.sl
share/aspell/english.wrd
+share/aspell/ispell
share/doc/aspell/man-html/1_Introduction.html
share/doc/aspell/man-html/2_Getting.html
share/doc/aspell/man-html/3_Aspell.html
@@ -21,12 +26,14 @@ share/doc/aspell/man-html/6_How.html
share/doc/aspell/man-html/A_Changelog.html
share/doc/aspell/man-html/About_this.html
share/doc/aspell/man-html/B_Do.html
-share/doc/aspell/man-html/C_Credits.html
+share/doc/aspell/man-html/C_Support.html
share/doc/aspell/man-html/Contents.html
-share/doc/aspell/man-html/D_Glossary.html
-share/doc/aspell/man-html/E_Copyright.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/index.html
share/doc/aspell/man-html/manual.html
+share/doc/aspell/man-html/manual.css
share/doc/aspell/man-text/1_Introduction.txt
share/doc/aspell/man-text/2_Getting.txt
share/doc/aspell/man-text/3_Aspell.txt
@@ -36,10 +43,11 @@ share/doc/aspell/man-text/6_How.txt
share/doc/aspell/man-text/A_Changelog.txt
share/doc/aspell/man-text/About_this.txt
share/doc/aspell/man-text/B_Do.txt
-share/doc/aspell/man-text/C_Credits.txt
+share/doc/aspell/man-text/C_Support.txt
share/doc/aspell/man-text/Contents.txt
-share/doc/aspell/man-text/D_Glossary.txt
-share/doc/aspell/man-text/E_Copyright.txt
+share/doc/aspell/man-text/D_Credits.txt
+share/doc/aspell/man-text/E_Glossary.txt
+share/doc/aspell/man-text/F_Copyright.txt
share/doc/aspell/man-text/index.txt
share/doc/aspell/man-text/manual.txt
share/doc/aspell/manual.aux