5 files changed, 38 insertions, 31 deletions

diff --git a/news/slrn/Makefile b/news/slrn/Makefile
index eeeea10d96c8..24dd24589775 100644
--- a/news/slrn/Makefile
+++ b/news/slrn/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	slrn
-PORTVERSION=	0.9.8.0
-PORTREVISION=	3
+PORTVERSION=	0.9.8.1
 CATEGORIES=	news ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		ftp://ftp.rge.com/pub/usenet/readers/unix/slrn/ \
@@ -18,7 +17,8 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 PATCH_SITES=	http://slrn.sourceforge.net/patches/
-PATCHFILES=	slrn-0.9.8.0-ranges2.diff
+PATCHFILES=	slrn-0.9.8.1-fetch.diff \
+		slrn-0.9.8.1-lastchar2.diff
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	petef@FreeBSD.org
diff --git a/news/slrn/distinfo b/news/slrn/distinfo
index 49ae0ea8bcbb..9113c7475915 100644
--- a/news/slrn/distinfo
+++ b/news/slrn/distinfo
@@ -1,4 +1,6 @@
-MD5 (slrn-0.9.8.0.tar.bz2) = 47e9931771114ba192356a0473e9649e
-SIZE (slrn-0.9.8.0.tar.bz2) = 995881
-MD5 (slrn-0.9.8.0-ranges2.diff) = c6206596799c2e5186648f76c63515a6
-SIZE (slrn-0.9.8.0-ranges2.diff) = 615
+MD5 (slrn-0.9.8.1.tar.bz2) = 9b613007df537444a5f8a4a2994fadb7
+SIZE (slrn-0.9.8.1.tar.bz2) = 1034332
+MD5 (slrn-0.9.8.1-fetch.diff) = 969471685aa7412bc60869649312618f
+SIZE (slrn-0.9.8.1-fetch.diff) = 920
+MD5 (slrn-0.9.8.1-lastchar2.diff) = 01717350eabdcda662ff2444d8b3e560
+SIZE (slrn-0.9.8.1-lastchar2.diff) = 4732
diff --git a/news/slrn/files/patch-Makefile.in b/news/slrn/files/patch-Makefile.in
index 1e742993ff93..5298a3a84b10 100644
--- a/news/slrn/files/patch-Makefile.in
+++ b/news/slrn/files/patch-Makefile.in
@@ -1,28 +1,30 @@
---- Makefile.in.orig	Mon Aug 25 09:39:58 2003
-+++ Makefile.in	Sat Oct 11 12:31:29 2003
-@@ -176,6 +176,7 @@
+--- Makefile.in.orig	Thu Oct  7 00:30:27 2004
++++ Makefile.in	Fri Nov  5 21:57:51 2004
+@@ -243,6 +243,7 @@
+ 	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
  uninstall-info-am:
- docDATA_INSTALL = $(INSTALL_DATA)
  install-docDATA: $(doc_DATA)
 +ifndef NOPORTDOCS
  	@$(NORMAL_INSTALL)
- 	$(mkinstalldirs) $(DESTDIR)$(docdir)
+ 	test -z "$(docdir)" || $(mkdir_p) "$(DESTDIR)$(docdir)"
  	@list='$(doc_DATA)'; for p in $$list; do \
-@@ -184,6 +185,7 @@
- 	  echo " $(docDATA_INSTALL) $$d$$p $(DESTDIR)$(docdir)/$$f"; \
- 	  $(docDATA_INSTALL) $$d$$p $(DESTDIR)$(docdir)/$$f; \
+@@ -251,6 +252,7 @@
+ 	  echo " $(docDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(docdir)/$$f'"; \
+ 	  $(docDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(docdir)/$$f"; \
  	done
 +endif
  
  uninstall-docDATA:
  	@$(NORMAL_UNINSTALL)
-@@ -399,7 +401,9 @@
+@@ -524,9 +526,11 @@
  all-am: Makefile $(DATA) all-local
  installdirs: installdirs-recursive
  installdirs-am:
 +ifndef NOPORTDOCS
- 	$(mkinstalldirs) $(DESTDIR)$(docdir)
+ 	for dir in "$(DESTDIR)$(docdir)"; do \
+ 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ 	done
 +endif
- 
  install: install-recursive
  install-exec: install-exec-recursive
+ install-data: install-data-recursive
diff --git a/news/slrn/files/patch-doc::Makefile.in b/news/slrn/files/patch-doc::Makefile.in
index e394c28f0410..ebd9957df90f 100644
--- a/news/slrn/files/patch-doc::Makefile.in
+++ b/news/slrn/files/patch-doc::Makefile.in
@@ -1,32 +1,34 @@
---- doc/Makefile.in.orig	Sun Oct  5 12:34:38 2003
-+++ doc/Makefile.in	Sun Oct  5 12:35:38 2003
-@@ -205,6 +205,7 @@
+--- doc/Makefile.in.orig	Thu Oct  7 00:30:28 2004
++++ doc/Makefile.in	Fri Nov  5 21:40:07 2004
+@@ -268,6 +268,7 @@
+ 	  rm -f "$(DESTDIR)$(man1dir)/$$inst"; \
  	done
- docDATA_INSTALL = $(INSTALL_DATA)
  install-docDATA: $(doc_DATA)
 +ifndef NOPORTDOCS
  	@$(NORMAL_INSTALL)
- 	$(mkinstalldirs) $(DESTDIR)$(docdir)
+ 	test -z "$(docdir)" || $(mkdir_p) "$(DESTDIR)$(docdir)"
  	@list='$(doc_DATA)'; for p in $$list; do \
-@@ -213,6 +214,7 @@
- 	  echo " $(docDATA_INSTALL) $$d$$p $(DESTDIR)$(docdir)/$$f"; \
- 	  $(docDATA_INSTALL) $$d$$p $(DESTDIR)$(docdir)/$$f; \
+@@ -276,6 +277,7 @@
+ 	  echo " $(docDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(docdir)/$$f'"; \
+ 	  $(docDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(docdir)/$$f"; \
  	done
 +endif
  
  uninstall-docDATA:
  	@$(NORMAL_UNINSTALL)
-@@ -362,7 +364,9 @@
+@@ -447,9 +449,11 @@
  all-am: Makefile $(MANS) $(DATA)
  installdirs: installdirs-recursive
  installdirs-am:
 +ifndef NOPORTDOCS
- 	$(mkinstalldirs) $(DESTDIR)$(man1dir) $(DESTDIR)$(docdir)
+ 	for dir in "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(docdir)"; do \
+ 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ 	done
 +endif
- 
  install: install-recursive
  install-exec: install-exec-recursive
-@@ -449,6 +453,7 @@
+ install-data: install-data-recursive
+@@ -542,6 +546,7 @@
  
  
  install-data-local:
@@ -34,7 +36,7 @@
  	@if test "x$(SLRNPULL)" = "xslrnpull"; then \
  	$(mkinstalldirs) $(DESTDIR)$(docdir)/slrnpull; \
  	list='$(PULLDOCS)'; for p in $$list; do \
-@@ -458,6 +463,7 @@
+@@ -551,6 +556,7 @@
  	  fi; \
  	done; \
  	fi;
diff --git a/news/slrn/pkg-plist b/news/slrn/pkg-plist
index 3d729a1b97ce..e5b399104d28 100644
--- a/news/slrn/pkg-plist
+++ b/news/slrn/pkg-plist
@@ -37,6 +37,7 @@ bin/slrnpull
 %%NLS%%share/locale/nl/LC_MESSAGES/slrn.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/slrn.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/slrn.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/slrn.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/slrn.mo
 share/slrn/macros/color.sl
 share/slrn/macros/gsort.sl