- Update to 1.5.2

PR:		ports/66138
Submitted by:	Cheng-Lung Sung <clsung@dragon2.net> (maintainer)

6 files changed, 35 insertions, 34 deletions

diff --git a/www/snownews/Makefile b/www/snownews/Makefile
index 1a43bd2f5d82..c385e8d50c24 100644
--- a/www/snownews/Makefile
+++ b/www/snownews/Makefile
@@ -7,22 +7,20 @@
 #
 
 PORTNAME=	snownews
-PORTVERSION=	1.5.1
+PORTVERSION=	1.5.2
 CATEGORIES=	www
 MASTER_SITES=	http://home.kcore.de/~kiza/software/snownews/download/
 
 MAINTAINER=	clsung@dragon2.net
 COMMENT=	A text mode RSS newsreader
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/xml2-config:${PORTSDIR}/textproc/libxml2
-
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
-USE_ICONV=	yes
+USE_GNOME=	libxml2
 USE_REINPLACE=	yes
 
 MAN1=		snownews.1
-MANLANG=	"" de nl fr it
+MANLANG=	"" de nl fr it ru_RU.KOI8-R
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|CFLAGS =|CFLAGS +=|g' ${WRKSRC}/Makefile
diff --git a/www/snownews/distinfo b/www/snownews/distinfo
index bdaf079ac010..f1e288846bcd 100644
--- a/www/snownews/distinfo
+++ b/www/snownews/distinfo
@@ -1,2 +1,2 @@
-MD5 (snownews-1.5.1.tar.gz) = e5c36a0199e7b18ddfc6ad0df6da9330
-SIZE (snownews-1.5.1.tar.gz) = 111095
+MD5 (snownews-1.5.2.tar.gz) = 0e29ba35717a47811fca24e1fa07d8d2
+SIZE (snownews-1.5.2.tar.gz) = 122543
diff --git a/www/snownews/files/patch-Makefile b/www/snownews/files/patch-Makefile
new file mode 100644
index 000000000000..a25f77a4ec0e
--- /dev/null
+++ b/www/snownews/files/patch-Makefile
@@ -0,0 +1,27 @@
+--- Makefile.orig	Wed Apr 14 12:01:59 2004
++++ Makefile	Sat Jun  5 17:15:12 2004
+@@ -1,12 +1,13 @@
+-CC=         gcc
+-MAKE=       make
++CC?=         gcc
++MAKE?=       gmake
+ INSTALL=    install
+-PREFIX=     /usr/local
++#PREFIX=     /usr/local
+ LOCALEPATH= $(PREFIX)/share/locale
+ 
+ ### Compiler/linker flags ###
+ CFLAGS=  -Wall -O2 -DLOCALEPATH="\"$(LOCALEPATH)\"" -DOS=\"$(shell uname)\" `xml2-config --cflags` $(EXTRA_CFLAGS)
+ LDFLAGS= -lncurses `xml2-config --libs` $(EXTRA_LDFLAGS)
++EXTRA_LDFLAGS = -lintl
+ 
+ ### Object files ###
+ OBJFILES= main.o netio.o interface.o xmlparse.o updatecheck.o conversions.o dialog.o ui-support.o categories.o about.o cookies.o setup.o net-support.o digcalc.o md5.o filters.o
+@@ -79,7 +80,6 @@
+ 		mkdir -p $(PREFIX)/man/man1; \
+ 	fi
+ 	$(INSTALL) -m 0644 $(MAN)/snownews.1 $(PREFIX)/man/man1
+-	$(INSTALL) -m 0644 $(MAN)/opml2snow.1 $(PREFIX)/man/man1
+ 	
+ 	for L in $(LANGS); do \
+ 		if [ ! -d "$(PREFIX)/man/$$L/man1" ]; then \
diff --git a/www/snownews/files/patch-Makefile.inc b/www/snownews/files/patch-Makefile.inc
deleted file mode 100644
index 7090e8b9900b..000000000000
--- a/www/snownews/files/patch-Makefile.inc
+++ /dev/null
@@ -1,17 +0,0 @@
---- Makefile.inc.orig	Sun Mar  7 22:41:07 2004
-+++ Makefile.inc	Sat Apr  3 09:05:38 2004
-@@ -1,10 +1,11 @@
--CC = gcc
--MAKE = make
-+CC ?= gcc
-+MAKE = gmake
- INSTALL = install
--PREFIX = /usr/local
-+#PREFIX = /usr/local
- LOCALEPATH = $(PREFIX)/share/locale
- DISTFILES = AUTHOR COPYING CREDITS Changelog README README.de README.colors README.patching INSTALL INSTALL.solaris INSTALL.FreeOpenNetBSD opml2snow \
- 	Makefile Makefile.inc Makefile.solaris \
- 	doc po scripts \
- 	main.c interface.c netio.c xmlparse.c updatecheck.c os-support.c conversions.c dialog.c ui-support.c categories.c about.c cookies.c setup.c net-support.c digcalc.c md5.c filters.c \
- 	config.h version.h main.h interface.h netio.h xmlparse.h updatecheck.h os-support.h conversions.h dialog.h ui-support.h categories.h about.h cookies.h setup.h net-support.h digcalc.h md5.h filters.h
-+EXTRA_LDFLAGS = -lintl -liconv
diff --git a/www/snownews/files/patch-doc::man::Makefile b/www/snownews/files/patch-doc::man::Makefile
deleted file mode 100644
index a6a8c38511ba..000000000000
--- a/www/snownews/files/patch-doc::man::Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
---- doc/man/Makefile.orig	Sat Apr  3 09:11:44 2004
-+++ doc/man/Makefile	Sat Apr  3 09:11:54 2004
-@@ -17,7 +17,6 @@
- 	  mkdir -p $(PREFIX)/man/man1; \
- 	fi
- 	$(INSTALL) -m 0644 snownews.1 $(PREFIX)/man/man1
--	$(INSTALL) -m 0644 opml2snow.1 $(PREFIX)/man/man1
- 	$(MAKE) -C de install-man
- 	$(MAKE) -C nl install-man
- 	$(MAKE) -C fr install-man
diff --git a/www/snownews/pkg-plist b/www/snownews/pkg-plist
index eb57049c3a45..df1742e8a094 100644
--- a/www/snownews/pkg-plist
+++ b/www/snownews/pkg-plist
@@ -6,6 +6,7 @@ share/locale/nl/LC_MESSAGES/snownews.mo
 share/locale/sl/LC_MESSAGES/snownews.mo
 share/locale/es/LC_MESSAGES/snownews.mo
 share/locale/it/LC_MESSAGES/snownews.mo
+share/locale/ru/LC_MESSAGES/snownews.mo
 share/locale/zh_TW/LC_MESSAGES/snownews.mo
 @unexec rmdir %D/man/fr/man1 2>/dev/null || true
 @unexec rmdir %D/man/fr 2>/dev/null || true
@@ -15,3 +16,5 @@ share/locale/zh_TW/LC_MESSAGES/snownews.mo
 @unexec rmdir %D/man/nl 2>/dev/null || true
 @unexec rmdir %D/man/it/man1 2>/dev/null || true
 @unexec rmdir %D/man/it 2>/dev/null || true
+@unexec rmdir %D/man/ru_RU.KOI8-R/man1 2>/dev/null || true
+@unexec rmdir %D/man/ru_RU.KOI8-R 2>/dev/null || true