diff options
-rw-r--r-- | www/snownews/Makefile | 13 | ||||
-rw-r--r-- | www/snownews/PLIST | 7 | ||||
-rw-r--r-- | www/snownews/distinfo | 12 | ||||
-rw-r--r-- | www/snownews/patches/patch-aa | 26 | ||||
-rw-r--r-- | www/snownews/patches/patch-ab | 13 | ||||
-rw-r--r-- | www/snownews/patches/patch-ac | 20 | ||||
-rw-r--r-- | www/snownews/patches/patch-ad | 13 |
7 files changed, 37 insertions, 67 deletions
diff --git a/www/snownews/Makefile b/www/snownews/Makefile index c955747fbd3..ac7e9f9f906 100644 --- a/www/snownews/Makefile +++ b/www/snownews/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.9 2004/10/03 00:18:27 tv Exp $ +# $NetBSD: Makefile,v 1.10 2004/11/20 00:30:29 wiz Exp $ -DISTNAME= snownews-1.5.1 -PKGREVISION= 1 +DISTNAME= snownews-1.5.5.1 CATEGORIES= www MASTER_SITES= http://home.kcore.de/~kiza/software/snownews/download/ @@ -16,8 +15,8 @@ USE_GNU_TOOLS+= make USE_NCURSES= # missing WA_BOLD, WA_REVERSE, KEY_RESIZE USE_PKGLOCALEDIR= YES -MAKE_ENV+= PKGLOCALEDIR="${PKGLOCALEDIR}" MAKE="${GMAKE}" -MAKE_ENV+= EXTRA_CFLAGS="${CFLAGS}" LOCALBASE="${LOCALBASE}" +MAKE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR:Q} +MAKE_ENV+= EXTRA_CFLAGS=${CFLAGS:Q} LOCALBASE=${LOCALBASE:Q} # XXX -lintl hack suggested by Jeremy C. Reed: blocking on PR #23369 .include "../../devel/gettext-lib/buildlink3.mk" @@ -26,13 +25,13 @@ MAKE_ENV+= EXTRA_LDFLAGS="${LDFLAGS} ${BUILDLINK_LDADD.gettext}" do-install: ${INSTALL_PROGRAM} ${WRKSRC}/snownews ${LOCALBASE}/bin ${INSTALL_SCRIPT} ${WRKSRC}/opml2snow ${LOCALBASE}/bin -.for M in de fr it nl +.for M in de fr it nl ru_RU.KOI8-R ${INSTALL_DATA_DIR} ${LOCALBASE}/man/${M}/man1 ${INSTALL_MAN} ${WRKSRC}/doc/man/${M}/snownews.1 ${LOCALBASE}/man/${M}/man1 .endfor ${INSTALL_MAN} ${WRKSRC}/doc/man/snownews.1 ${LOCALBASE}/man/man1 ${INSTALL_MAN} ${WRKSRC}/doc/man/opml2snow.1 ${LOCALBASE}/man/man1 -.for L in de es fr it nl sl zh_TW +.for L in de es nl pt_BR ru sl zh_TW ${INSTALL_DATA_DIR} ${LOCALBASE}/${PKGLOCALEDIR}/locale/${L}/LC_MESSAGES ${INSTALL_DATA} ${WRKSRC}/po/${L}.mo ${LOCALBASE}/${PKGLOCALEDIR}/locale/${L}/LC_MESSAGES/snownews.mo .endfor diff --git a/www/snownews/PLIST b/www/snownews/PLIST index 965b1668117..9061127c628 100644 --- a/www/snownews/PLIST +++ b/www/snownews/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2004/02/15 23:52:29 wiz Exp $ +@comment $NetBSD: PLIST,v 1.3 2004/11/20 00:30:29 wiz Exp $ bin/opml2snow bin/snownews man/de/man1/snownews.1 @@ -7,11 +7,12 @@ man/it/man1/snownews.1 man/man1/opml2snow.1 man/man1/snownews.1 man/nl/man1/snownews.1 +man/ru_RU.KOI8-R/man1/snownews.1 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/snownews.mo ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/snownews.mo -${PKGLOCALEDIR}/locale/it/LC_MESSAGES/snownews.mo -${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/snownews.mo ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/snownews.mo +${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/snownews.mo +${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/snownews.mo ${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/snownews.mo ${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/snownews.mo @unexec ${RMDIR} %D/man/nl/man1 2> /dev/null || ${TRUE} diff --git a/www/snownews/distinfo b/www/snownews/distinfo index 454afb89c08..2cf183a6d8d 100644 --- a/www/snownews/distinfo +++ b/www/snownews/distinfo @@ -1,8 +1,6 @@ -$NetBSD: distinfo,v 1.4 2004/04/20 18:28:11 minskim Exp $ +$NetBSD: distinfo,v 1.5 2004/11/20 00:30:29 wiz Exp $ -SHA1 (snownews-1.5.1.tar.gz) = 328ec03c48d10bb434a22157725a9a1f2608e14f -Size (snownews-1.5.1.tar.gz) = 111095 bytes -SHA1 (patch-aa) = 05faea2cd77c2a92ab0f6d7238a2af3caa86d614 -SHA1 (patch-ab) = 70e30d145f673db2cb7b87568470b41179cb1a84 -SHA1 (patch-ac) = 224547ea2bf0a4565eaf48ae137a12c609fa7f2b -SHA1 (patch-ad) = 2c8d9f5276ff7ff69f852ab7f18435cf9bf0f85d +SHA1 (snownews-1.5.5.1.tar.gz) = 1efdb24e54a316f902ddd10af1652da2c4968756 +Size (snownews-1.5.5.1.tar.gz) = 139990 bytes +SHA1 (patch-aa) = 33caf6cc7833691c6e503364a2efa9bee07831f4 +SHA1 (patch-ac) = 92a5b727c1626560058482a6f2b6a47f987bd5c0 diff --git a/www/snownews/patches/patch-aa b/www/snownews/patches/patch-aa index 78ce458b2e0..03484e0fbf1 100644 --- a/www/snownews/patches/patch-aa +++ b/www/snownews/patches/patch-aa @@ -1,15 +1,13 @@ -$NetBSD: patch-aa,v 1.3 2004/04/09 00:04:23 wiz Exp $ +$NetBSD: patch-aa,v 1.4 2004/11/20 00:30:29 wiz Exp $ ---- Makefile.inc.orig 2004-03-07 14:41:07.000000000 -0700 -+++ Makefile.inc -@@ -1,8 +1,6 @@ --CC = gcc --MAKE = make - INSTALL = install --PREFIX = /usr/local --LOCALEPATH = $(PREFIX)/share/locale -+PREFIX = $(LOCALBASE) -+LOCALEPATH = $(PREFIX)/$(PKGLOCALEDIR)/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 \ +--- interface.c.orig 2004-10-31 22:09:14.000000000 +0100 ++++ interface.c +@@ -1540,7 +1540,7 @@ void UIMainInterface (void) { + first_scr_ptr = first_ptr; + highlighted = first_ptr; + first_bak = NULL; +- } else if (highlighted->feedcategories != NULL) { ++ } else if ((highlighted != NULL) && (highlighted->feedcategories != NULL)) { + filters[0] = strdup (highlighted->feedcategories->name); + filteractivated = 1; + } diff --git a/www/snownews/patches/patch-ab b/www/snownews/patches/patch-ab deleted file mode 100644 index bcbd9eb4486..00000000000 --- a/www/snownews/patches/patch-ab +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ab,v 1.3 2004/04/09 00:04:23 wiz Exp $ - ---- conversions.c.orig 2004-03-01 08:12:03.000000000 -0700 -+++ conversions.c -@@ -37,7 +37,7 @@ - - extern struct entity *first_entity; - --char * iconvert (char * inbuf, char * from, char * to) { -+char * iconvert (const char * inbuf, char * from, char * to) { - iconv_t cd; /* Iconvs conversion descriptor. */ - char *outbuf, *outbuf_first; /* We need two pointers so we do not lose - the strings starting position. */ diff --git a/www/snownews/patches/patch-ac b/www/snownews/patches/patch-ac index 724f3d56c77..b0553856cef 100644 --- a/www/snownews/patches/patch-ac +++ b/www/snownews/patches/patch-ac @@ -1,13 +1,13 @@ -$NetBSD: patch-ac,v 1.3 2004/04/09 00:04:23 wiz Exp $ +$NetBSD: patch-ac,v 1.4 2004/11/20 00:30:29 wiz Exp $ ---- Makefile.orig 2004-03-07 14:41:07.000000000 -0700 +--- Makefile.orig 2004-11-11 16:23:02.000000000 +0100 +++ Makefile -@@ -2,7 +2,7 @@ include Makefile.inc +@@ -1,7 +1,5 @@ +-CC= gcc +-MAKE= make + INSTALL= install +-LOCALEPATH= $(PREFIX)/share/locale ++LOCALEPATH= $(PREFIX)/${PKG_LOCALEDIR}/locale - LDFLAGS = -lncurses `xml2-config --libs` $(EXTRA_LDFLAGS) - 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 --CFLAGS = -Wall -O2 -DLOCALEPATH="\"$(LOCALEPATH)\"" -DOS=\"$(shell uname)\" `xml2-config --cflags` $(EXTRA_CFLAGS) -+CFLAGS = -Wall -DLOCALEPATH="\"$(LOCALEPATH)\"" -DOS=\"$(shell uname)\" `xml2-config --cflags` $(EXTRA_CFLAGS) - VERSION = `grep VERSION version.h | sed s/\"//g | sed s/\#define\ VERSION\ //` - MAN = doc/man - DISTDIR = snownews-$(VERSION) + ### Compiler/linker flags ### + ### Generated via configure ### diff --git a/www/snownews/patches/patch-ad b/www/snownews/patches/patch-ad deleted file mode 100644 index d849d2e865a..00000000000 --- a/www/snownews/patches/patch-ad +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ad,v 1.2 2004/04/20 18:28:11 minskim Exp $ - ---- conversions.h.orig 2004-03-07 15:41:07.000000000 -0600 -+++ conversions.h -@@ -23,7 +23,7 @@ - #ifndef CONVERSIONS_H - #define CONVERSIONS_H - --char * iconvert (char * inbuf, char * from, char * to); -+char * iconvert (const char * inbuf, char * from, char * to); - char * UIDejunk (char * feed_description); - char * WrapText (char * text, int width); - void *zlib_uncompress(void *in_buf, int in_size, int *out_size, int voodoo_magic); |