5 files changed, 22 insertions, 31 deletions

diff --git a/textproc/aspell/Makefile b/textproc/aspell/Makefile
index 0e0ddd7cd7d5..645a7c8fdb32 100644
--- a/textproc/aspell/Makefile
+++ b/textproc/aspell/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	aspell
-PORTVERSION=	0.60.4
-PORTREVISION=	4
+PORTVERSION=	0.60.5
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	aspell
@@ -24,7 +23,9 @@ GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=		--enable-dict-dir=${DATADIR}	\
 			--enable-docdir=${DOCSDIR}	\
-			--enable-static
+			--enable-static			\
+			--mandir=${MANPREFIX}/man	\
+			--infodir=${PREFIX}/${INFO_PATH}
 PTHREAD_CFLAGS=		# Disable threading
 PTHREAD_LIBS=		# libaspell may be used by unthreaded apps.
 CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}"	\
@@ -108,8 +109,8 @@ post-install:	${DICT_TARGET}
 .if defined(WITH_ISPELL)
 	${INSTALL_SCRIPT} ${SCRIPTS:S|^|${WRKSRC}/scripts/|} ${PREFIX}/bin
 .endif
-	@${ECHO_CMD} "@dirrm share/aspell" >> ${TMPPLIST}
-	@${ECHO_CMD} "@dirrm lib/aspell-${VERINST}" >> ${TMPPLIST}
+	@${ECHO_CMD} "@dirrmtry share/aspell" >> ${TMPPLIST}
+	@${ECHO_CMD} "@dirrmtry lib/aspell-${VERINST}" >> ${TMPPLIST}
 
 inst-dicten:
 # Install en-aspell by default
diff --git a/textproc/aspell/distinfo b/textproc/aspell/distinfo
index 9df7e6d7677d..869ae156d052 100644
--- a/textproc/aspell/distinfo
+++ b/textproc/aspell/distinfo
@@ -1,6 +1,6 @@
-MD5 (aspell-0.60.4.tar.gz) = 4f1737e726d66476b9c7388831305510
-SHA256 (aspell-0.60.4.tar.gz) = 8931d8644da9a71fdd970cafe9d6c20d796ad1d8ef2aaf89a801171104e426e4
-SIZE (aspell-0.60.4.tar.gz) = 1676825
+MD5 (aspell-0.60.5.tar.gz) = 17fd8acac6293336bcef44391b71e337
+SHA256 (aspell-0.60.5.tar.gz) = ee9e81d2e3e66b01ad91da736e48568ed8acd6dfb6b664d904066ecc5ea4e84b
+SIZE (aspell-0.60.5.tar.gz) = 1754865
 MD5 (aspell6-en-6.0-0.tar.bz2) = 16449e0a266e1ecc526b2f3cd39d4bc2
 SHA256 (aspell6-en-6.0-0.tar.bz2) = 24f0688711d2b893fa06c16d14d0aa3a8000e326226b839aad32611f7ace4898
 SIZE (aspell6-en-6.0-0.tar.bz2) = 182442
diff --git a/textproc/aspell/files/patch-Makefile.in b/textproc/aspell/files/patch-Makefile.in
index 5b3d6af88b1f..d76e87bf44c9 100644
--- a/textproc/aspell/files/patch-Makefile.in
+++ b/textproc/aspell/files/patch-Makefile.in
@@ -1,8 +1,8 @@
---- Makefile.in.orig	Wed Oct 19 11:14:24 2005
-+++ Makefile.in	Wed Oct 19 18:12:26 2005
-@@ -446,7 +446,12 @@
- target_os = @target_os@
- target_vendor = @target_vendor@
+--- Makefile.in.orig	Tue Dec 19 12:03:37 2006
++++ Makefile.in	Tue Dec 19 19:38:22 2006
+@@ -474,7 +474,12 @@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
  AUTOMAKE_OPTIONS = foreign subdir-objects
 -SUBDIRS = . po manual
 +
@@ -14,16 +14,16 @@
  DIST_SUBDIRS = ${SUBDIRS} examples myspell lib5
  filterdir = ${pkglibdir}
  optdir = ${pkgdatadir}
-@@ -535,7 +540,7 @@
+@@ -562,7 +567,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)
+-libaspell_la_LIBADD = $(LTLIBINTL) $(PTHREAD_LIB)
++libaspell_la_LIBADD = $(LTLIBINTL) $(PTHREAD_LIB) $(LTLIBINTL)
  @INCREMENTED_SONAME_FALSE@libaspell_la_LDFLAGS = -version-info 16:4:1 -no-undefined
  @INCREMENTED_SONAME_TRUE@libaspell_la_LDFLAGS = -version-info 16:4:0 -no-undefined
  @PSPELL_COMPATIBILITY_TRUE@libpspell_la_SOURCES = lib/dummy.cpp
-@@ -544,7 +549,7 @@
+@@ -571,7 +576,7 @@
  @INCREMENTED_SONAME_TRUE@@PSPELL_COMPATIBILITY_TRUE@libpspell_la_LDFLAGS = -version-info 16:4:0 -no-undefined
  word_list_compress_SOURCES = prog/compress.c
  aspell_SOURCES = prog/aspell.cpp prog/check_funs.cpp prog/checker_string.cpp
diff --git a/textproc/aspell/files/patch-modules_filter_nroff.cpp b/textproc/aspell/files/patch-modules_filter_nroff.cpp
deleted file mode 100644
index 802bdd2e8d77..000000000000
--- a/textproc/aspell/files/patch-modules_filter_nroff.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-add the following as a new patch file in textproc/aspell/files:
-
---- modules/filter/nroff.cpp.orig	Fri Mar 31 09:52:23 2006
-+++ modules/filter/nroff.cpp	Fri Mar 31 09:52:42 2006
-@@ -73,7 +73,7 @@
-       return false;
-     }
-     
--    bool NroffFilter::process_char (FilterChar::Chr c);
-+    bool process_char (FilterChar::Chr c);
-       
-   public:
- 
-
diff --git a/textproc/aspell/pkg-plist b/textproc/aspell/pkg-plist
index 3af53ad037ee..5fbf6a1b66ac 100644
--- a/textproc/aspell/pkg-plist
+++ b/textproc/aspell/pkg-plist
@@ -89,6 +89,7 @@ lib/libpspell.so.16
 %%DATADIR%%/texinfo.amf
 %%DATADIR%%/url.amf
 %%NLS%%share/locale/be/LC_MESSAGES/aspell.mo
+%%NLS%%share/locale/ca/LC_MESSAGES/aspell.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/aspell.mo
 %%NLS%%share/locale/da/LC_MESSAGES/aspell.mo
 %%NLS%%share/locale/de/LC_MESSAGES/aspell.mo
@@ -105,6 +106,7 @@ lib/libpspell.so.16
 %%NLS%%share/locale/rw/LC_MESSAGES/aspell.mo
 %%NLS%%share/locale/sl/LC_MESSAGES/aspell.mo
 %%NLS%%share/locale/sr/LC_MESSAGES/aspell.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/aspell.mo
 %%NLS%%share/locale/tg/LC_MESSAGES/aspell.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/aspell.mo
 %%NLS%%share/locale/vi/LC_MESSAGES/aspell.mo
@@ -112,6 +114,8 @@ lib/libpspell.so.16
 @dirrm include/pspell
 %%NLS%%@dirrmtry share/locale/be/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/be
+%%NLS%%@dirrmtry share/locale/ca/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ca
 %%NLS%%@dirrmtry share/locale/cs/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/cs
 %%NLS%%@dirrmtry share/locale/pt/LC_MESSAGES