diff options
Diffstat (limited to 'textproc')
-rw-r--r-- | textproc/aspell/Makefile | 9 | ||||
-rw-r--r-- | textproc/aspell/distinfo | 7 | ||||
-rw-r--r-- | textproc/aspell/patches/patch-aa | 13 | ||||
-rw-r--r-- | textproc/aspell/patches/patch-ab | 21 | ||||
-rw-r--r-- | textproc/aspell/patches/patch-ac | 20 | ||||
-rw-r--r-- | textproc/aspell/patches/patch-ad | 13 | ||||
-rw-r--r-- | textproc/aspell/patches/patch-ae | 13 |
7 files changed, 6 insertions, 90 deletions
diff --git a/textproc/aspell/Makefile b/textproc/aspell/Makefile index af3d77b62d1..b01c0b75fca 100644 --- a/textproc/aspell/Makefile +++ b/textproc/aspell/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2002/01/15 01:07:25 wiz Exp $ +# $NetBSD: Makefile,v 1.2 2002/10/05 02:54:22 wiz Exp $ # DISTNAME= aspell-.33.7.1 @@ -14,7 +14,7 @@ GNU_CONFIGURE= yes USE_GMAKE= yes USE_LIBTOOL= yes LIBTOOL_OVERRIDE= ${WRKSRC}/libtool -USE_BUILDLINK_ONLY= yes +USE_BUILDLINK2= yes # halfdelay() USE_NCURSES= yes @@ -22,6 +22,7 @@ USE_NCURSES= yes CONFIGURE_ARGS+= --enable-doc-dir=${PREFIX}/share/doc/aspell CONFIGURE_ARGS+= --enable-curses=ncurses -.include "../../devel/ncurses/buildlink.mk" -.include "../../textproc/libpspell/buildlink.mk" +.include "../../devel/libtool/buildlink2.mk" +.include "../../devel/ncurses/buildlink2.mk" +.include "../../textproc/libpspell/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/aspell/distinfo b/textproc/aspell/distinfo index d87ae27e2a2..d34f94a8698 100644 --- a/textproc/aspell/distinfo +++ b/textproc/aspell/distinfo @@ -1,9 +1,4 @@ -$NetBSD: distinfo,v 1.1.1.1 2002/01/15 01:07:25 wiz Exp $ +$NetBSD: distinfo,v 1.2 2002/10/05 02:54:22 wiz Exp $ SHA1 (aspell-.33.7.1.tar.gz) = 050f7736b5a162fc717d203905ecee9981666aff Size (aspell-.33.7.1.tar.gz) = 1647417 bytes -SHA1 (patch-aa) = 5cc046330c13421d7b43c9db6ee64aa87123eafe -SHA1 (patch-ab) = e05452fc4a329165f0dc75bf63bb74e74f5ed545 -SHA1 (patch-ac) = 745dd2431829ead23ee5c40b5acc5ebf895265a7 -SHA1 (patch-ad) = 07aea7fa9fb6b435ccae5280607dae6b597e474b -SHA1 (patch-ae) = a5656c8b024760452d365bd951fcc58e7cd228d9 diff --git a/textproc/aspell/patches/patch-aa b/textproc/aspell/patches/patch-aa deleted file mode 100644 index 14c156be1bd..00000000000 --- a/textproc/aspell/patches/patch-aa +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aa,v 1.1.1.1 2002/01/15 01:07:25 wiz Exp $ - ---- filter/Makefile.in.orig Mon Aug 20 05:44:49 2001 -+++ filter/Makefile.in -@@ -90,7 +90,7 @@ - - pkginclude_HEADERS = *.hh - --INCLUDES = -I../util -I$(includedir) -+INCLUDES = -I../util - - libaspell_filter_la_SOURCES = filter.cc map_repl_read.cc single_repl.cc hash_repl.cc repl.cc substr_repl.cc urlskip.cc map_repl.cc sgml.cc email.cc tex.cc - diff --git a/textproc/aspell/patches/patch-ab b/textproc/aspell/patches/patch-ab deleted file mode 100644 index cf4ecf3e3be..00000000000 --- a/textproc/aspell/patches/patch-ab +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-ab,v 1.1.1.1 2002/01/15 01:07:25 wiz Exp $ - ---- lib/Makefile.in.orig Mon Aug 20 05:44:55 2001 -+++ lib/Makefile.in -@@ -92,14 +92,14 @@ - - CLEANFILES = dirs.h - --INCLUDES = -I./inc -I../ -I../util -I../filter -I$(includedir) -+INCLUDES = -I./inc -I../ -I../util -I../filter - - lib_LTLIBRARIES = libaspell.la - - libaspell_la_SOURCES = config.cc language.cc phonetic.cc writable_repl.cc data.cc language_exceps.cc readonly_ws.cc writable_ws.cc manager.cc suggest.cc writable_base.cc token.cc check.cc invalid_word.cc invalid_flag.cc multi_ws.cc file_data_util.cc - - --libaspell_la_LIBADD = ../util/libaspell-util.la ../filter/libaspell-filter.la -L$(libdir) -lpspell -lpspell-impl -+libaspell_la_LIBADD = ../util/libaspell-util.la ../filter/libaspell-filter.la -lpspell -lpspell-impl - - - libaspell_la_LDFLAGS = ${extra_ldflags} -version-info 11:1:1 diff --git a/textproc/aspell/patches/patch-ac b/textproc/aspell/patches/patch-ac deleted file mode 100644 index 110aafc3946..00000000000 --- a/textproc/aspell/patches/patch-ac +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD: patch-ac,v 1.1.1.1 2002/01/15 01:07:25 wiz Exp $ - ---- pspell-module/Makefile.in.orig Mon Aug 20 05:45:14 2001 -+++ pspell-module/Makefile.in -@@ -86,13 +86,13 @@ - pkgdatadir = @pkgdatadir@ - pkgdocdir = @pkgdocdir@ - --INCLUDES = -I../ -I../util -I../lib/inc -I../filter -I$(includedir) -+INCLUDES = -I../ -I../util -I../lib/inc -I../filter - - lib_LTLIBRARIES = libpspell_aspell.la - - libpspell_aspell_la_SOURCES = manager.cc - --libpspell_aspell_la_LIBADD = -L$(libdir) -lpspell-impl -L../lib/.libs ../lib/libaspell.la -+libpspell_aspell_la_LIBADD = -lpspell-impl -L../lib/.libs ../lib/libaspell.la - - libpspell_aspell_la_LDFLAGS = ${extra_ldflags} -module -version-info 2:1:0 - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs diff --git a/textproc/aspell/patches/patch-ad b/textproc/aspell/patches/patch-ad deleted file mode 100644 index 46b2e119386..00000000000 --- a/textproc/aspell/patches/patch-ad +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ad,v 1.1.1.1 2002/01/15 01:07:25 wiz Exp $ - ---- src/Makefile.in.orig Mon Aug 20 05:45:00 2001 -+++ src/Makefile.in -@@ -88,7 +88,7 @@ - - bin_PROGRAMS = aspell word-list-compress - --INCLUDES = -I../ -I../util -I../lib/inc -I../filter $(CURSES_INCLUDE) -I$(includedir) -+INCLUDES = -I../ -I../util -I../lib/inc -I../filter $(CURSES_INCLUDE) - - aspell_SOURCES = aspell.cc termios.cc text_chain.cc - aspell_LDADD = ../lib/libaspell.la $(CURSES_LIB) diff --git a/textproc/aspell/patches/patch-ae b/textproc/aspell/patches/patch-ae deleted file mode 100644 index 599be7eb20b..00000000000 --- a/textproc/aspell/patches/patch-ae +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ae,v 1.1.1.1 2002/01/15 01:07:25 wiz Exp $ - ---- util/Makefile.in.orig Mon Aug 20 05:44:46 2001 -+++ util/Makefile.in -@@ -86,7 +86,7 @@ - pkgdatadir = @pkgdatadir@ - pkgdocdir = @pkgdocdir@ - --INCLUDES = -I$(includedir) -+INCLUDES = - - noinst_LTLIBRARIES = libaspell-util.la - |