update to 1.5.4

This commit is contained in:
jolan 2004-10-13 03:58:41 +00:00
parent fec58a47d4
commit b880853726
9 changed files with 55 additions and 96 deletions

View File

@ -1,14 +1,12 @@
# $OpenBSD: Makefile,v 1.7 2004/08/10 08:46:50 xsa Exp $
# $OpenBSD: Makefile,v 1.8 2004/10/13 03:58:41 jolan Exp $
COMMENT= "text mode rss newsreader"
DISTNAME= snownews-1.4.4
DISTNAME= snownews-1.5.4
CATEGORIES= www
MASTER_SITES= ${HOMEPAGE}download/
HOMEPAGE= http://home.kcore.de/~kiza/software/snownews/
MAINTAINER= Jolan Luff <jolan@openbsd.org>
# GPL
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
@ -22,6 +20,12 @@ MODULES= devel/gettext
LIB_DEPENDS+= xml2.7.10::textproc/libxml
MAKE_ENV+= EXTRA_LDFLAGS="-lintl -liconv" INSTALL=install
MAKE_ENV+= EXTRA_LDFLAGS="-lintl -liconv" INSTALL=install \
EXTRA_CFLAGS="-DSTATIC_CONST_ICONV -I${LOCALBASE}/include ${CFLAGS}"
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/snownews
${INSTALL_DATA} ${WRKSRC}/README{,.colors,.de} \
${PREFIX}/share/doc/snownews
.include <bsd.port.mk>

View File

@ -1,3 +1,3 @@
MD5 (snownews-1.4.4.tar.gz) = 67b6d2baaea20561fb828b431b39b77c
RMD160 (snownews-1.4.4.tar.gz) = 069688a04323d7e22e0785d0a00865d366683ee8
SHA1 (snownews-1.4.4.tar.gz) = 174d894c74b5da3fc627f84bd7094a1d2e298160
MD5 (snownews-1.5.4.tar.gz) = 1165207017bbda339b6091946289b984
RMD160 (snownews-1.5.4.tar.gz) = f7d3b75f0cc864c5c936f68bdb2f9910cfefc012
SHA1 (snownews-1.5.4.tar.gz) = b601a87c6ed8cbc1398e5e16aa36f3598256ad71

View File

@ -1,21 +1,32 @@
$OpenBSD: patch-Makefile,v 1.6 2004/01/25 05:49:35 jolan Exp $
--- Makefile.orig 2004-01-23 06:13:29.000000000 -0600
+++ Makefile 2004-01-23 17:07:45.000000000 -0600
@@ -2,7 +2,7 @@ include Makefile.inc
$OpenBSD: patch-Makefile,v 1.7 2004/10/13 03:58:42 jolan Exp $
--- Makefile.orig Wed Sep 29 11:28:31 2004
+++ Makefile Tue Oct 12 22:52:36 2004
@@ -1,4 +1,4 @@
-CC= gcc
+#CC= gcc
MAKE= make
INSTALL= install
LOCALEPATH= $(PREFIX)/share/locale
@@ -42,11 +42,11 @@ locales:
done
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
-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)
@@ -29,7 +29,7 @@ install: snownews snownews.1 locales
manpages:
- cat $(MAN)/snownews.1.in | sed s#PREFIX#$(PREFIX)# | \
+ cat $(MAN)/snownews.1.in | sed s#PREFIX#$(TRUEPREFIX)# | \
sed s/VERSION/$(VERSION)/ > $(MAN)/snownews.1
for L in $(LANGS); do \
- cat $(MAN)/$$L/snownews.1.$$L.in | sed s#PREFIX#$(PREFIX)# | \
+ cat $(MAN)/$$L/snownews.1.$$L.in | sed s#PREFIX#$(TRUEPREFIX)# | \
sed s/VERSION/$(VERSION)/ > $(MAN)/$$L/snownews.1; \
done
@@ -60,7 +60,7 @@ install-bin: snownews
if [ ! -d "$(PREFIX)/bin" ]; then \
mkdir -p $(PREFIX)/bin; \
fi
- $(INSTALL) -s snownews $(PREFIX)/bin
+ $(INSTALL) snownews $(PREFIX)/bin
$(INSTALL) opml2snow $(PREFIX)/bin
$(MAKE) -C $(MAN) install-man
$(MAKE) -C po install
install-locales: locales

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-conversions_c,v 1.3 2003/12/16 07:03:27 jolan Exp $
--- conversions.c.orig 2003-12-07 07:14:40.000000000 -0600
+++ conversions.c 2003-12-16 01:01:13.000000000 -0600
@@ -38,7 +38,7 @@
# include "os-support.h"
#endif
-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. */

View File

@ -1,9 +0,0 @@
$OpenBSD: patch-conversions_h,v 1.2 2003/11/05 01:13:53 jolan Exp $
--- conversions.h.orig 2003-11-02 14:41:22.000000000 -0600
+++ conversions.h 2003-11-04 18:27:51.000000000 -0600
@@ -1,4 +1,4 @@
-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);

View File

@ -1,14 +0,0 @@
$OpenBSD: patch-doc_man_snownews_1_in,v 1.1 2004/01/25 05:49:35 jolan Exp $
--- doc/man/snownews.1.in.orig 2004-01-23 06:13:29.000000000 -0600
+++ doc/man/snownews.1.in 2004-01-23 17:07:16.000000000 -0600
@@ -182,8 +182,8 @@ the returned value with the local progra
notifies the user of a new version. It is done on exit to be least
annoying I hope. This way you can easily ignore it if you don't want
to upgrade for some reason or can't, because you're using a package
-that came with your distribution, etc. To disable this check, start
-the program with the option "--disable-versioncheck". The program will
+that came with your distribution, etc. To enable this check, start
+the program with the option "--enable-versioncheck". The program will
not transfer anything to my server. It will just download a file
containing the version number and compare it locally.
.P

View File

@ -1,37 +0,0 @@
$OpenBSD: patch-main_c,v 1.1 2004/01/25 05:49:35 jolan Exp $
--- main.c.orig 2004-01-23 06:13:29.000000000 -0600
+++ main.c 2004-01-23 17:07:16.000000000 -0600
@@ -53,7 +53,7 @@ struct color color;
extern struct feed *first_bak; /* For use with the signal handler. */
char *browser; /* Browser command. lynx is standard. */
-int versioncheck = 1; /* Autoupdate check. 1=yes, 0=no. */
+int versioncheck = 0; /* Autoupdate check. 1=yes, 0=no. */
char *proxyname; /* Hostname of proxyserver. */
char *useragent; /* Snownews User-Agent string. */
unsigned short proxyport = 0; /* Port on proxyserver to use. */
@@ -861,11 +861,11 @@ int main (int argc, char *argv[]) {
strcmp(argv[1], "-u") == 0) {
autoupdate = 1;
if (argv[2] != NULL) {
- if (strcmp(argv[2], "--disable-versioncheck") == 0)
- versioncheck = 0;
+ if (strcmp(argv[2], "--enable-versioncheck") == 0)
+ versioncheck = 1;
}
- } else if (strcmp(argv[1], "--disable-versioncheck") == 0) {
- versioncheck = 0;
+ } else if (strcmp(argv[1], "--enable-versioncheck") == 0) {
+ versioncheck = 1;
if (argv[2] != NULL) {
if (strcmp(argv[2], "--update") == 0 ||
strcmp(argv[2], "-u") == 0) {
@@ -878,7 +878,7 @@ int main (int argc, char *argv[]) {
printf (_("\t--update|-u\tAutomatically update every feed.\n"));
printf (_("\t--help|-h\tPrint this help message.\n"));
printf (_("\t--version|-V\tPrint version number and exit.\n"));
- printf (_("\t--disable-versioncheck\n"));
+ printf (_("\t--enable-versioncheck\n"));
return 0;
}
}

View File

@ -0,0 +1,7 @@
$OpenBSD: patch-platform_settings,v 1.1 2004/10/13 03:58:42 jolan Exp $
--- platform_settings.orig Wed Sep 29 11:28:31 2004
+++ platform_settings Tue Oct 12 22:27:01 2004
@@ -1,3 +1,2 @@
-PREFIX= /usr/local
CFLAGS= -Wall -g -DLOCALEPATH="\"$(LOCALEPATH)\"" -DOS=\"$(shell uname)\" `xml2-config --cflags` $(EXTRA_CFLAGS)
LDFLAGS= -lncurses `xml2-config --libs` $(EXTRA_LDFLAGS)

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.6 2004/09/15 18:49:52 espie Exp $
@comment $OpenBSD: PLIST,v 1.7 2004/10/13 03:58:42 jolan Exp $
@comment bin/opml2snow
bin/snownews
man/de/
@ -15,10 +15,19 @@ man/it/man1/
man/nl/
man/nl/man1/
@man man/nl/man1/snownews.1
man/ru_RU.KOI8-R/
man/ru_RU.KOI8-R/man1/
@man man/ru_RU.KOI8-R/man1/snownews.1
share/doc/snownews/
share/doc/snownews/README
share/doc/snownews/README.colors
share/doc/snownews/README.de
share/locale/de/LC_MESSAGES/snownews.mo
share/locale/es/LC_MESSAGES/snownews.mo
share/locale/fr/LC_MESSAGES/snownews.mo
share/locale/it/LC_MESSAGES/snownews.mo
share/locale/nl/LC_MESSAGES/snownews.mo
share/locale/pt_BR/LC_MESSAGES/snownews.mo
share/locale/ru/LC_MESSAGES/snownews.mo
share/locale/sl/LC_MESSAGES/snownews.mo
share/locale/zh_TW/LC_MESSAGES/snownews.mo