From 0a22d227bf59dcb97c83e5a841ab5b399c95bcfb Mon Sep 17 00:00:00 2001 From: Tilman Keskinoz Date: Wed, 14 May 2003 17:34:06 +0000 Subject: Update to 1.1.1Update to 1.1.12 --- news/newscache/Makefile | 17 +- news/newscache/distinfo | 2 +- news/newscache/files/patch-Article.cc | 20 +++ news/newscache/files/patch-aa | 301 -------------------------------- news/newscache/files/patch-configure.in | 19 ++ news/newscache/pkg-plist | 8 +- 6 files changed, 52 insertions(+), 315 deletions(-) create mode 100644 news/newscache/files/patch-Article.cc delete mode 100644 news/newscache/files/patch-aa create mode 100644 news/newscache/files/patch-configure.in (limited to 'news') diff --git a/news/newscache/Makefile b/news/newscache/Makefile index fb313cb40299..e270b484eb42 100644 --- a/news/newscache/Makefile +++ b/news/newscache/Makefile @@ -6,23 +6,26 @@ # PORTNAME= newscache -PORTVERSION= 0.99.22 -PORTREVISION= 1 +PORTVERSION= 1.1.12 CATEGORIES= news -MASTER_SITES= http://members.aon.at/hstraub/linux/newscache/ \ +MASTER_SITES= http://www.hstraub.at/linux/downloads/src/ \ http://www.infosys.tuwien.ac.at/NewsCache/download/ DISTNAME= NewsCache-${PORTVERSION} MAINTAINER= arved@FreeBSD.org COMMENT= NewsCache is a free cache server for USENET News -WRKSRC= ${WRKDIR}/NewsCache +LIB_DEPENDS= socket[+][+].1:${PORTSDIR}/net/libsocket++ -GNU_CONFIGURE= yes +USE_AUTOMAKE_VER= 15 USE_GMAKE= yes -USE_GCC= 2.95 +CONFIGURE_ENV= CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include" LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" +MAKE_ENV= LIBS="-lsocket++" MAN5= newscache.conf.5 -MAN8= NewsCache.8 NewsCacheClean.8 updatenews.8 +MAN8= newscache.8 newscacheclean.8 updatenews.8 + +post-patch: + cd ${WRKSRC}; ./autogen .include diff --git a/news/newscache/distinfo b/news/newscache/distinfo index ca52fd1830dd..6697306f6b0a 100644 --- a/news/newscache/distinfo +++ b/news/newscache/distinfo @@ -1 +1 @@ -MD5 (NewsCache-0.99.22.tar.gz) = 5ac4bed16dfaa506d207fabd6d7daef0 +MD5 (NewsCache-1.1.12.tar.gz) = 13248be94403aad9c9495e6c5efa1cb2 diff --git a/news/newscache/files/patch-Article.cc b/news/newscache/files/patch-Article.cc new file mode 100644 index 000000000000..19aead7c2182 --- /dev/null +++ b/news/newscache/files/patch-Article.cc @@ -0,0 +1,20 @@ +--- NServer-0.9.1/Article.cc.orig Sun Apr 6 18:09:33 2003 ++++ NServer-0.9.1/Article.cc Sun Apr 6 18:10:44 2003 +@@ -93,7 +93,7 @@ + } + } + +-string Article::getfield(const char *ifld, int Full = 0) const ++string Article::getfield(const char *ifld, int Full) const + { + string rfld; + const char *p, *fld; +@@ -214,7 +214,7 @@ + _ctext = _text.c_str(); + } + +-ostream & Article::write(ostream & os, int flags = Head | Body) ++ostream & Article::write(ostream & os, int flags) + { + const char *p, *q; + diff --git a/news/newscache/files/patch-aa b/news/newscache/files/patch-aa deleted file mode 100644 index f0f4483fcb14..000000000000 --- a/news/newscache/files/patch-aa +++ /dev/null @@ -1,301 +0,0 @@ -Index: ChangeLog -diff -u ChangeLog:1.18 ChangeLog:1.18.2.1 ---- ChangeLog:1.18 Tue Mar 12 12:02:18 2002 -+++ ChangeLog Tue Mar 18 15:00:37 2003 -@@ -1,3 +1,8 @@ -+2003-03-12 Herbert Straub -+ * Bugfix: DATE command returns localtime instead of gmtime. Thanks to -+ Matthias Andree (Leafnode maintainer) for -+ reporting this error. -+ - 2002-03-12 Herbert Straub - * Bugfix: stat_articles was useless - see news.info exit - message. Now it counts the complete retrieved articles by -Index: Makefile.in -diff -u Makefile.in:1.3 Makefile.in:1.3.2.1 ---- Makefile.in:1.3 Tue Mar 12 09:35:48 2002 -+++ Makefile.in Tue Mar 18 15:01:22 2003 -@@ -1,6 +1,6 @@ --# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am -+# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am - --# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. -+# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -95,7 +95,7 @@ - $(ACLOCAL_M4): configure.in - cd $(srcdir) && $(ACLOCAL) - --config.status: $(srcdir)/configure.in $(CONFIG_STATUS_DEPENDENCIES) -+config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - $(SHELL) ./config.status --recheck - $(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) - cd $(srcdir) && $(AUTOCONF) -@@ -164,7 +164,7 @@ - dot_seen=no; \ - rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \ - rev="$$subdir $$rev"; \ -- test "$$subdir" = "." && dot_seen=yes; \ -+ test "$$subdir" != "." || dot_seen=yes; \ - done; \ - test "$$dot_seen" = "no" && rev=". $$rev"; \ - target=`echo $@ | sed s/-recursive//`; \ -@@ -206,7 +206,7 @@ - awk ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)config.h.in$$unique$(LISP)$$tags" \ -- || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP) -o $$here/TAGS) -+ || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP)) - - mostlyclean-tags: - -Index: aclocal.m4 -diff -u aclocal.m4:1.2 aclocal.m4:1.2.2.1 ---- aclocal.m4:1.2 Tue Feb 19 22:12:15 2002 -+++ aclocal.m4 Tue Mar 18 15:01:22 2003 -@@ -1,6 +1,6 @@ --dnl aclocal.m4 generated automatically by aclocal 1.4-p4 -+dnl aclocal.m4 generated automatically by aclocal 1.4-p5 - --dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. -+dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, - dnl with or without modifications, as long as this notice is preserved. -@@ -12,7 +12,7 @@ - - # Like AC_CONFIG_HEADER, but automatically create stamp file. - --AC_DEFUN(AM_CONFIG_HEADER, -+AC_DEFUN([AM_CONFIG_HEADER], - [AC_PREREQ([2.12]) - AC_CONFIG_HEADER([$1]) - dnl When config.status generates a header, we must update the stamp-h file. -@@ -42,7 +42,7 @@ - dnl Usage: - dnl AM_INIT_AUTOMAKE(package,version, [no-define]) - --AC_DEFUN(AM_INIT_AUTOMAKE, -+AC_DEFUN([AM_INIT_AUTOMAKE], - [AC_REQUIRE([AC_PROG_INSTALL]) - PACKAGE=[$1] - AC_SUBST(PACKAGE) -@@ -70,7 +70,7 @@ - # Check to make sure that the build environment is sane. - # - --AC_DEFUN(AM_SANITY_CHECK, -+AC_DEFUN([AM_SANITY_CHECK], - [AC_MSG_CHECKING([whether build environment is sane]) - # Just in case - sleep 1 -@@ -111,7 +111,7 @@ - - dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY) - dnl The program must properly implement --version. --AC_DEFUN(AM_MISSING_PROG, -+AC_DEFUN([AM_MISSING_PROG], - [AC_MSG_CHECKING(for working $2) - # Run test in a subshell; some versions of sh will print an error if - # an executable is not found, even if stderr is redirected. -Index: configure -diff -u configure:1.9 configure:1.9.2.1 ---- configure:1.9 Tue Mar 12 12:02:18 2002 -+++ configure Tue Mar 18 15:01:22 2003 -@@ -714,7 +714,7 @@ - - PACKAGE=NewsCache - --VERSION=0.99.22 -+VERSION=0.99.22p1 - - if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then - { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; } -Index: configure.in -diff -u configure.in:1.8 configure.in:1.8.2.1 ---- configure.in:1.8 Tue Mar 12 12:02:18 2002 -+++ configure.in Tue Mar 18 15:00:37 2003 -@@ -5,7 +5,7 @@ - AM_CONFIG_HEADER(config.h) - - dnl Initialize automake stuff --AM_INIT_AUTOMAKE(NewsCache, 0.99.22) -+AM_INIT_AUTOMAKE(NewsCache, 0.99.22p1) - - AC_DEFUN(AC_PROG_CXX_EXCEPTIONS, - []) -Index: NServer-0.9.1/Makefile.in -diff -u NServer-0.9.1/Makefile.in:1.4 NServer-0.9.1/Makefile.in:1.4.2.1 ---- NServer-0.9.1/Makefile.in:1.4 Tue Mar 12 09:35:48 2002 -+++ NServer-0.9.1/Makefile.in Tue Mar 18 15:01:22 2003 -@@ -1,6 +1,6 @@ --# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am -+# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am - --# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. -+# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -193,7 +193,7 @@ - dot_seen=no; \ - rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \ - rev="$$subdir $$rev"; \ -- test "$$subdir" = "." && dot_seen=yes; \ -+ test "$$subdir" != "." || dot_seen=yes; \ - done; \ - test "$$dot_seen" = "no" && rev=". $$rev"; \ - target=`echo $@ | sed s/-recursive//`; \ -@@ -235,7 +235,7 @@ - awk ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ -- || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) -+ || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP)) - - mostlyclean-tags: - -Index: NServer-0.9.1/checks/Makefile.in -diff -u NServer-0.9.1/checks/Makefile.in:1.3 NServer-0.9.1/checks/Makefile.in:1.3.2.1 ---- NServer-0.9.1/checks/Makefile.in:1.3 Tue Mar 12 09:35:48 2002 -+++ NServer-0.9.1/checks/Makefile.in Tue Mar 18 15:01:22 2003 -@@ -1,6 +1,6 @@ --# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am -+# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am - --# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. -+# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -190,7 +190,7 @@ - awk ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ -- || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) -+ || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP)) - - mostlyclean-tags: - -Index: NVClasses-0.9.1/Makefile.in -diff -u NVClasses-0.9.1/Makefile.in:1.3 NVClasses-0.9.1/Makefile.in:1.3.2.1 ---- NVClasses-0.9.1/Makefile.in:1.3 Tue Mar 12 09:35:48 2002 -+++ NVClasses-0.9.1/Makefile.in Tue Mar 18 15:01:22 2003 -@@ -1,6 +1,6 @@ --# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am -+# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am - --# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. -+# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -168,7 +168,7 @@ - awk ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ -- || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) -+ || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP)) - - mostlyclean-tags: - -Index: doc/Makefile.in -diff -u doc/Makefile.in:1.3 doc/Makefile.in:1.3.2.1 ---- doc/Makefile.in:1.3 Tue Mar 12 09:35:48 2002 -+++ doc/Makefile.in Tue Mar 18 15:01:22 2003 -@@ -1,6 +1,6 @@ --# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am -+# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am - --# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. -+# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -Index: etc/Makefile.in -diff -u etc/Makefile.in:1.3 etc/Makefile.in:1.3.2.1 ---- etc/Makefile.in:1.3 Tue Mar 12 09:35:48 2002 -+++ etc/Makefile.in Tue Mar 18 15:01:22 2003 -@@ -1,6 +1,6 @@ --# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am -+# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am - --# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. -+# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -Index: man/Makefile.in -diff -u man/Makefile.in:1.3 man/Makefile.in:1.3.2.1 ---- man/Makefile.in:1.3 Tue Mar 12 09:35:48 2002 -+++ man/Makefile.in Tue Mar 18 15:01:22 2003 -@@ -1,6 +1,6 @@ --# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am -+# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am - --# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. -+# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -Index: md5lib/Makefile.in -diff -u md5lib/Makefile.in:1.3 md5lib/Makefile.in:1.3.2.1 ---- md5lib/Makefile.in:1.3 Tue Mar 12 09:35:48 2002 -+++ md5lib/Makefile.in Tue Mar 18 15:01:22 2003 -@@ -1,6 +1,6 @@ --# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am -+# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am - --# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. -+# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -164,7 +164,7 @@ - awk ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ -- || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) -+ || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP)) - - mostlyclean-tags: - -Index: src/Makefile.in -diff -u src/Makefile.in:1.4 src/Makefile.in:1.4.2.1 ---- src/Makefile.in:1.4 Tue Mar 12 09:35:48 2002 -+++ src/Makefile.in Tue Mar 18 15:01:22 2003 -@@ -1,6 +1,6 @@ --# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am -+# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am - --# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. -+# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -296,7 +296,7 @@ - awk ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ -- || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) -+ || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP)) - - mostlyclean-tags: - -Index: src/NewsCache.cc -diff -u src/NewsCache.cc:1.12 src/NewsCache.cc:1.12.2.1 ---- src/NewsCache.cc:1.12 Tue Mar 12 12:02:18 2002 -+++ src/NewsCache.cc Tue Mar 18 15:00:37 2003 -@@ -661,8 +661,8 @@ - // return -1; - // } - time(&conv); -- if((ltm=localtime(&conv))==NULL) { -- (*clt->co) << "500 localtime failed\r\n"; -+ if((ltm=gmtime(&conv))==NULL) { -+ (*clt->co) << "500 gmtime failed\r\n"; - return -1; - } - sprintf(buf,"111 %04d%02d%02d%02d%02d%02d\r\n", diff --git a/news/newscache/files/patch-configure.in b/news/newscache/files/patch-configure.in new file mode 100644 index 000000000000..bb5119f1a2d6 --- /dev/null +++ b/news/newscache/files/patch-configure.in @@ -0,0 +1,19 @@ +--- configure.in.orig Sun Apr 6 18:49:34 2003 ++++ configure.in Sun Apr 6 18:50:31 2003 +@@ -220,14 +220,14 @@ + LIBS="-lsocket++ $LIBS" + AC_TRY_LINK([#include ], [iosockinet sio; sio.rdbuf()->setname("Test");], + libsocket_found=yes ,) +-if eval "test $libsocket_found == 'yes'"; then ++if eval "test x$libsocket_found = xyes"; then + AC_MSG_RESULT(yes) + else + AC_MSG_RESULT(no) + LIBS=$OLDLIBS + fi + +-if eval "test $libsocket_found == 'no'"; then ++if eval "test x$libsocket_found = xno"; then + AC_MSG_ERROR(No libsocket++ Library found!) + fi + diff --git a/news/newscache/pkg-plist b/news/newscache/pkg-plist index 15aa10d5ff3d..5268208328b2 100644 --- a/news/newscache/pkg-plist +++ b/news/newscache/pkg-plist @@ -1,11 +1,7 @@ bin/updatenews etc/newscache.conf-dist -sbin/NewsCache -sbin/NewsCacheClean -sbin/accesslog -sbin/cachestat -sbin/hostlog -sbin/hoststat +sbin/newscache +sbin/newscacheclean @unexec install-info --delete %D/info/NewsCache.info %D/info/dir info/NewsCache.info @exec install-info %D/info/NewsCache.info %D/info/dir -- cgit v1.2.3