diff options
-rw-r--r-- | news/slrn/Makefile | 17 | ||||
-rw-r--r-- | news/slrn/files/md5 | 4 | ||||
-rw-r--r-- | news/slrn/files/patch-sum | 6 | ||||
-rw-r--r-- | news/slrn/patches/patch-aa | 12 | ||||
-rw-r--r-- | news/slrn/patches/patch-ab | 37 | ||||
-rw-r--r-- | news/slrn/patches/patch-ac | 63 | ||||
-rw-r--r-- | news/slrn/pkg/PLIST | 45 |
7 files changed, 64 insertions, 120 deletions
diff --git a/news/slrn/Makefile b/news/slrn/Makefile index b9b6e9bfb2d..9a9fe0f1f88 100644 --- a/news/slrn/Makefile +++ b/news/slrn/Makefile @@ -1,19 +1,24 @@ -# $NetBSD: Makefile,v 1.11 2001/02/17 17:54:51 wiz Exp $ +# $NetBSD: Makefile,v 1.12 2001/03/30 18:13:24 mjl Exp $ # -DISTNAME= slrn-0.9.6.3 +DISTNAME= slrn-0.9.7.0 CATEGORIES= news -MASTER_SITES= ftp://space.mit.edu/pub/davis/slrn/ \ - ftp://ftp.uni-stuttgart.de/pub/unix/misc/slang/slrn/ +MASTER_SITES= ftp://slrn.sourceforge.net/pub/slrn/ \ + ftp://ftp.uni-stuttgart.de/pub/unix/misc/slang/slrn/ \ + ftp://ftp.fu-berlin.de/pub/unix/news/slrn/ \ + ftp://ftp.ntua.gr/pub/lang/slang/ \ + ftp://ftp.plig.org/pub/slrn/ MAINTAINER= mjl@netbsd.org -HOMEPAGE= http://space.mit.edu/%7Edavis/slrn.html +HOMEPAGE= http://slrn.sourceforge.net/ COMMENT= Powerful threaded newsreader, that is highly customizable DEPENDS+= libslang-*:../../devel/libslang GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --without-X +CONFIGURE_ARGS+= --without-X \ + --disable-slrnpull --disable-spool --disable-inews \ + --disable-gen-mid --with-libdir=${PREFIX}/lib/slrn # the next is a workaround, as 1.3.2 install doesn't like -c and -d # together diff --git a/news/slrn/files/md5 b/news/slrn/files/md5 index 317907844ea..0432022caac 100644 --- a/news/slrn/files/md5 +++ b/news/slrn/files/md5 @@ -1,3 +1,3 @@ -$NetBSD: md5,v 1.6 2000/10/30 14:17:20 mjl Exp $ +$NetBSD: md5,v 1.7 2001/03/30 18:13:25 mjl Exp $ -MD5 (slrn-0.9.6.3.tar.gz) = d36f00f2dd2c077fe1640e877a6d9ce1 +SHA1 (slrn-0.9.7.0.tar.gz) = f3b3648fd266a646c6e962771f396ff94c3d3a3b diff --git a/news/slrn/files/patch-sum b/news/slrn/files/patch-sum index b72f5d0c2b0..0989ec707f9 100644 --- a/news/slrn/files/patch-sum +++ b/news/slrn/files/patch-sum @@ -1,5 +1,3 @@ -$NetBSD: patch-sum,v 1.4 2000/01/10 01:25:14 wiz Exp $ +$NetBSD: patch-sum,v 1.5 2001/03/30 18:13:25 mjl Exp $ -MD5 (patch-aa) = 48fa2b733d050a7967a32bd236280687 -MD5 (patch-ab) = 443c43142238633733cc43913e088907 -MD5 (patch-ac) = 5e9c1069fde9eebf90ba3e7dc1b035c6 +SHA1 (patch-ac) = f8d6cee35de3c983e8832c8cc729418713a5d3d5 diff --git a/news/slrn/patches/patch-aa b/news/slrn/patches/patch-aa deleted file mode 100644 index 786de9cca08..00000000000 --- a/news/slrn/patches/patch-aa +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-aa,v 1.4 2000/01/01 18:24:32 mjl Exp $ - ---- configure.orig Sat Jan 1 18:35:22 2000 -+++ configure Sat Jan 1 18:37:45 2000 -@@ -2554,6 +2554,7 @@ - - # This list consists of "include,lib include,lib ..." - JD_Search_Dirs="$JD_Above_Dir2/slang/libsrc,$JD_Above_Dir2/slang/libsrc/"$ARCH"objs \ -+ $prefix/include,$prefix/lib \ - $JD_Above_Dir/slang/libsrc,$JD_Above_Dir/slang/libsrc/"$ARCH"objs \ - $JD_Above_Dir2/slang/src,$JD_Above_Dir2/slang/src/"$ARCH"objs \ - $JD_Above_Dir/slang/src,$JD_Above_Dir/slang/src/"$ARCH"objs \ diff --git a/news/slrn/patches/patch-ab b/news/slrn/patches/patch-ab deleted file mode 100644 index 6c8e21007d1..00000000000 --- a/news/slrn/patches/patch-ab +++ /dev/null @@ -1,37 +0,0 @@ -$NetBSD: patch-ab,v 1.4 2000/01/01 18:24:32 mjl Exp $ - ---- src/Makefile.in.orig Thu Dec 23 18:24:38 1999 -+++ src/Makefile.in Sat Jan 1 19:04:34 2000 -@@ -62,7 +62,7 @@ - exec_prefix = @exec_prefix@ - - BINDIR = @bindir@ --DOCDIR = $(prefix)/doc/slrn -+DOCDIR = $(prefix)/share/slrn - MANDIR = @mandir@ - MACRODIR = @datadir@/slrn - MKINSDIR = ../autoconf/mkinsdir.sh -@@ -98,7 +98,7 @@ - CONFIG_H = config.h - ALL_CFLAGS = $(CFLAGS) -Dunix -I$(SLANGINC) \ - $(MISCINCLUDES) $(NNTPSERVERFILE) $(SLRNLIBDIR) $(SLRN_MACRO_DIR) --EXECLIBS = -L$(SLANGLIB) -lslang $(MISCLIBS) -lm -+EXECLIBS = -L$(SLANGLIB) -Wl,-R$(prefix)/lib -lslang $(MISCLIBS) -lm - DOT_O_DEPS = slrnfeat.h - server_O_DEP = clientlib.c spool.c nntp.c sltcp.c nntplib.c - chmap_O_DEP = chmap.h charmaps.h -@@ -181,14 +181,6 @@ - do \ - echo $(INSTALL_DATA) $$i $(DEST_MANDIR)/man1/; \ - $(INSTALL_DATA) $$i $(DEST_MANDIR)/man1/; \ -- if [ "$$?" != "0" ]; then \ -- exit 1; \ -- fi; \ -- done -- @for i in $(SLRNPULL_DOCS); \ -- do \ -- echo $(INSTALL_DATA) $$i $(DEST_DOCDIR)/slrnpull; \ -- $(INSTALL_DATA) $$i $(DEST_DOCDIR)/slrnpull; \ - if [ "$$?" != "0" ]; then \ - exit 1; \ - fi; \ diff --git a/news/slrn/patches/patch-ac b/news/slrn/patches/patch-ac index d2edc310025..96a853d64af 100644 --- a/news/slrn/patches/patch-ac +++ b/news/slrn/patches/patch-ac @@ -1,39 +1,28 @@ -$NetBSD: patch-ac,v 1.4 2000/01/01 18:24:32 mjl Exp $ +$NetBSD: patch-ac,v 1.5 2001/03/30 18:13:26 mjl Exp $ ---- src/slrnfeat.h.orig Sat Jan 1 18:42:08 2000 -+++ src/slrnfeat.h Sat Jan 1 18:45:21 2000 -@@ -14,10 +14,10 @@ - * NOTE: if you intend to use slrnpull, make sure you enable SPOOL_SUPPORT - * in addition to PULL_SUPPORT. - */ --#define SLRN_HAS_PULL_SUPPORT 1 -+#define SLRN_HAS_PULL_SUPPORT 0 - #define SLRN_HAS_NNTP_SUPPORT 1 --#define SLRN_HAS_SPOOL_SUPPORT 1 --#define SLRN_HAS_INEWS_SUPPORT 1 -+#define SLRN_HAS_SPOOL_SUPPORT 0 -+#define SLRN_HAS_INEWS_SUPPORT 0 - /* Set this to 1 to force the user to use INEWS for posting. This also means - * that slrn will use the hardcoded inews program pathname. - */ -@@ -65,7 +65,7 @@ - #define SLRN_HAS_SLANG 1 +--- src/Makefile.in.orig Fri Mar 30 19:58:10 2001 ++++ src/Makefile.in Fri Mar 30 19:58:18 2001 +@@ -68,7 +68,7 @@ + exec_prefix = @exec_prefix@ - /* Set this to 0 if you do not want slrn to generate message-id header. */ --#define SLRN_HAS_GEN_MSGID 1 -+#define SLRN_HAS_GEN_MSGID 0 - - /* If you want mapping ISO Latin <--> native character set, set this to 1. - * Supported character sets: isolatin, ibm850, and next -@@ -214,9 +214,9 @@ - # define SLRN_ARTICLE_FILENAME ".article" - # define SLRN_FOLLOWUP_FILENAME ".followup" - # define SLRN_SIGNATURE_FILE ".signature" --# define SLRN_SENDMAIL_COMMAND "/usr/lib/sendmail -oi -t -oem -odb" -+# define SLRN_SENDMAIL_COMMAND "/usr/sbin/sendmail -oi -t -oem -odb" - # ifndef SLRN_LIB_DIR --# define SLRN_LIB_DIR "/usr/local/lib/slrn" -+# define SLRN_LIB_DIR "/usr/pkg/lib/slrn" - # endif - # endif /* unix */ - # endif /* os2 */ + BINDIR = @bindir@ +-DOCDIR = $(prefix)/doc/slrn ++DOCDIR = $(prefix)/share/doc/slrn + MANDIR = @mandir@ + MACRODIR = @datadir@/slrn + MKINSDIR = ../autoconf/mkinsdir.sh +@@ -188,14 +188,6 @@ + do \ + echo $(INSTALL_DATA) $$i $(DEST_MANDIR)/man1/; \ + $(INSTALL_DATA) $$i $(DEST_MANDIR)/man1/; \ +- if [ "$$?" != "0" ]; then \ +- exit 1; \ +- fi; \ +- done +- @for i in $(SLRNPULL_DOCS); \ +- do \ +- echo $(INSTALL_DATA) $$i $(DEST_DOCDIR)/slrnpull; \ +- $(INSTALL_DATA) $$i $(DEST_DOCDIR)/slrnpull; \ + if [ "$$?" != "0" ]; then \ + exit 1; \ + fi; \ diff --git a/news/slrn/pkg/PLIST b/news/slrn/pkg/PLIST index 75934a206ea..dae68050e38 100644 --- a/news/slrn/pkg/PLIST +++ b/news/slrn/pkg/PLIST @@ -1,34 +1,35 @@ -@comment $NetBSD: PLIST,v 1.4 2000/01/01 18:24:33 mjl Exp $ +@comment $NetBSD: PLIST,v 1.5 2001/03/30 18:13:26 mjl Exp $ bin/slrn man/man1/slrn.1 -share/slrn/FAQ -share/slrn/INSTALL -share/slrn/README.GroupLens -share/slrn/README.macros -share/slrn/README.os2 -share/slrn/README.vms -share/slrn/README.w95 -share/slrn/SCORE_FAQ -share/slrn/help.txt -share/slrn/pc-keys.txt -share/slrn/score.sl -share/slrn/score.txt -share/slrn/slrn-doc.html -share/slrn/slrn.rc -share/slrn/slrnfuns.txt -share/slrn/COPYRIGHT -share/slrn/COPYING -share/slrn/README -share/slrn/changes.txt +share/doc/slrn/help.txt +share/doc/slrn/INSTALL +share/doc/slrn/README.vms +share/doc/slrn/README.os2 +share/doc/slrn/README.GroupLens +share/doc/slrn/README.macros +share/doc/slrn/FAQ +share/doc/slrn/SCORE_FAQ +share/doc/slrn/score.txt +share/doc/slrn/score.sl +share/doc/slrn/slrn.rc +share/doc/slrn/pc-keys.txt +share/doc/slrn/slrn-doc.html +share/doc/slrn/slrnfuns.txt +share/doc/slrn/COPYRIGHT +share/doc/slrn/COPYING +share/doc/slrn/README +share/doc/slrn/changes.txt +@dirrm share/doc/slrn/slrnpull +@dirrm share/doc/slrn share/slrn/color.sl share/slrn/ispell.sl +share/slrn/latin2.sl share/slrn/nn.sl -share/slrn/util.sl share/slrn/posthook.sl share/slrn/search.sl share/slrn/tin-art.sl share/slrn/tin-group.sl share/slrn/ttyprint.sl +share/slrn/util.sl share/slrn/xcomment.sl -@dirrm share/slrn/slrnpull @dirrm share/slrn |