update to 0.50.5, add a patch from netbsd to make this work with

gcc3/libstdc++3 (it magically compiled on sparc64 for awhile tho..?)
This commit is contained in:
jolan 2004-04-08 05:16:41 +00:00
parent 85206afcb4
commit 21147d20bd
7 changed files with 59 additions and 39 deletions

View File

@ -1,13 +1,13 @@
# $OpenBSD: Makefile,v 1.3 2004/02/18 01:27:08 jolan Exp $
# $OpenBSD: Makefile,v 1.4 2004/04/08 05:16:41 jolan Exp $
COMMENT= "spell checker designed to eventually replace Ispell"
VER= 0.50.4.1
DISTNAME= aspell-${VER}
DISTNAME= aspell-0.50.5
DICT= en-0.51-1
DIST_SUBDIR= aspell
CATEGORIES= textproc
MASTER_SITES= ${MASTER_SITE_GNU:=aspell/}
MASTER_SITES0= ${MASTER_SITE_GNU:=aspell/dict/en/}
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} aspell-en-0.51-0.tar.bz2:0
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} aspell-${DICT}.tar.bz2:0
HOMEPAGE= http://aspell.sourceforge.net/
@ -19,19 +19,13 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
MODULES= gcc3
MODGCC3_ARCHES= powerpc sparc64
MODGCC3_LANGS= C++
CONFIGURE_STYLE=gnu
CONFIGURE_ARGS+=${CONFIGURE_SHARED} --enable-static
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
DICTS= en-0.51-0
post-build:
.for i in ${DICTS}
.for i in ${DICT}
${ECHO_MSG} "===> Building for aspell-$i"; \
cd ${WRKDIR}/aspell-$i; \
ASPELL=${WRKSRC}/prog/aspell \
@ -44,7 +38,7 @@ post-build:
.endfor
post-install:
.for i in ${DICTS}
.for i in ${DICT}
${ECHO_MSG} "===> Faking installation for aspell-$i"; \
cd ${WRKDIR}/aspell-$i; \
ASPELL=${WRKSRC}/prog/aspell \

View File

@ -1,6 +1,6 @@
MD5 (aspell/aspell-0.50.4.1.tar.gz) = 1370b8c628b63f79af63589d40fe27ec
MD5 (aspell/aspell-en-0.51-0.tar.bz2) = 8f1eab27d02e44b15c833d5a7b24f9cd
RMD160 (aspell/aspell-0.50.4.1.tar.gz) = 19b4f46e6437f3bdb75fdf175e8a8b77146b8079
RMD160 (aspell/aspell-en-0.51-0.tar.bz2) = a704aa47ee8e972f94d22c778415cdcd7af153b8
SHA1 (aspell/aspell-0.50.4.1.tar.gz) = d948a1571c38094b920b593de70bff2f2b7d5741
SHA1 (aspell/aspell-en-0.51-0.tar.bz2) = a1420be50b8d6e4d619e40a58c34fa94ce60d83e
MD5 (aspell/aspell-0.50.5.tar.gz) = 14403d2ea5ded5d3fc9bb259bf65aab5
MD5 (aspell/aspell-en-0.51-1.tar.bz2) = aabb933daee93be446c71e79babf8da4
RMD160 (aspell/aspell-0.50.5.tar.gz) = 6bfb0070e572ffdedf86ea87f50f4958bb418b12
RMD160 (aspell/aspell-en-0.51-1.tar.bz2) = 50165386f2a941b69687be023f2815b4a6203566
SHA1 (aspell/aspell-0.50.5.tar.gz) = 0b17272e1773ef133775d5e6be9fbccc8689ff58
SHA1 (aspell/aspell-en-0.51-1.tar.bz2) = df7210d341c609dd12df5e9e63a4d94e9cb41cc6

View File

@ -1,12 +1,12 @@
$OpenBSD: patch-Makefile_in,v 1.1 2004/01/16 20:46:44 naddy Exp $
--- Makefile.in.orig 2004-01-16 21:39:00.000000000 +0100
+++ Makefile.in 2004-01-16 21:39:10.000000000 +0100
@@ -139,7 +139,7 @@ target_alias = @target_alias@
$OpenBSD: patch-Makefile_in,v 1.2 2004/04/08 05:16:41 jolan Exp $
--- Makefile.in.orig 2004-02-10 19:05:49.000000000 -0600
+++ Makefile.in 2004-04-07 22:21:02.000000000 -0500
@@ -171,7 +171,7 @@ sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
AUTOMAKE_OPTIONS = foreign
-SUBDIRS = auto common modules lib examples prog data scripts interfaces manual
+SUBDIRS = auto common modules lib prog data scripts interfaces manual
EXTRA_DIST = README suncc/* win32/*
all: all-recursive
EXTRA_DIST = README
subdir = .

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-ltmain_sh,v 1.1.1.1 2003/11/21 03:41:35 jolan Exp $
--- ltmain.sh.orig 2003-05-23 06:03:59.000000000 -0500
+++ ltmain.sh 2003-11-20 16:42:40.000000000 -0600
@@ -1287,6 +1287,17 @@ EOF
$OpenBSD: patch-ltmain_sh,v 1.2 2004/04/08 05:16:41 jolan Exp $
--- ltmain.sh.orig 2004-01-25 13:55:02.000000000 -0600
+++ ltmain.sh 2004-04-07 22:19:59.000000000 -0500
@@ -1361,6 +1361,17 @@ EOF
continue
;;
@ -19,7 +19,7 @@ $OpenBSD: patch-ltmain_sh,v 1.1.1.1 2003/11/21 03:41:35 jolan Exp $
-module)
module=yes
continue
@@ -1958,6 +1969,19 @@ EOF
@@ -2011,6 +2022,19 @@ EOF
fi
continue
;;
@ -39,7 +39,7 @@ $OpenBSD: patch-ltmain_sh,v 1.1.1.1 2003/11/21 03:41:35 jolan Exp $
%DEPLIBS%)
alldeplibs=yes
continue
@@ -2206,10 +2230,6 @@ EOF
@@ -2259,10 +2283,6 @@ EOF
link_static=no # Whether the deplib will be linked statically
if test -n "$library_names" &&
{ test "$prefer_static_libs" = no || test -z "$old_library"; }; then
@ -50,7 +50,7 @@ $OpenBSD: patch-ltmain_sh,v 1.1.1.1 2003/11/21 03:41:35 jolan Exp $
# This is a shared library
# Warn about portability, can't link against -module's on some systems (darwin)
@@ -5696,40 +5716,6 @@ relink_command=\"$relink_command\""
@@ -5801,40 +5821,6 @@ relink_command=\"$relink_command\""
# Exit here if they wanted silent mode.
test "$show" = : && exit 0

View File

@ -0,0 +1,18 @@
$OpenBSD: patch-modules_speller_default_split_cpp,v 1.1 2004/04/08 05:16:41 jolan Exp $
--- modules/speller/default/split.cpp.orig 2001-11-29 21:55:48.000000000 -0600
+++ modules/speller/default/split.cpp 2004-04-07 22:22:19.000000000 -0500
@@ -1,4 +1,4 @@
-#include <strstream>
+#include <sstream>
#include "split.hpp"
using namespace std;
@@ -8,7 +8,7 @@ namespace aspeller {
vector<String> split(const String & str) {
vector<String> data;
- istrstream s(str.c_str());
+ istringstream s(str.c_str());
String item;
while (s >> item) {
data.push_back(item);

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2003/11/21 03:41:35 jolan Exp $
lib/libaspell.so.15.2
lib/libpspell.so.15.2
@comment $OpenBSD: PFRAG.shared,v 1.2 2004/04/08 05:16:41 jolan Exp $
lib/libaspell.so.15.3
lib/libpspell.so.15.3
DYNLIBDIR(%D/lib)

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2003/11/21 03:41:35 jolan Exp $
@comment $OpenBSD: PLIST,v 1.2 2004/04/08 05:16:41 jolan Exp $
bin/aspell
bin/aspell-import
bin/pspell-config
@ -29,6 +29,15 @@ lib/libaspell.la
lib/libpspell.a
lib/libpspell.la
share/aspell/ASCII.dat
share/aspell/cp1250.dat
share/aspell/cp1251.dat
share/aspell/cp1252.dat
share/aspell/cp1253.dat
share/aspell/cp1254.dat
share/aspell/cp1255.dat
share/aspell/cp1256.dat
share/aspell/cp1257.dat
share/aspell/cp1258.dat
share/aspell/dvorak.kbd
share/aspell/en.dat
share/aspell/en_phonet.dat
@ -50,12 +59,11 @@ share/aspell/koi8-f.dat
share/aspell/koi8-r.dat
share/aspell/koi8-u.dat
share/aspell/spell
share/aspell/split.kbd
share/aspell/standard.kbd
share/aspell/viscii.dat
share/doc/aspell/dev-html/devel.css
share/doc/aspell/dev-html/devel.html
share/doc/aspell/dev-html/img1.png
share/doc/aspell/dev-html/img2.png
share/doc/aspell/dev-html/index.html
share/doc/aspell/dev-html/nx_grp_g.png
share/doc/aspell/dev-html/prev_g.png