summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--news/slrn/Makefile38
-rw-r--r--news/slrn/distinfo9
-rw-r--r--news/slrn/patches/patch-aa88
-rw-r--r--news/slrn/patches/patch-ac28
-rw-r--r--news/slrn/pkg/PLIST38
5 files changed, 117 insertions, 84 deletions
diff --git a/news/slrn/Makefile b/news/slrn/Makefile
index 14087e2abaf..5f1d3817b92 100644
--- a/news/slrn/Makefile
+++ b/news/slrn/Makefile
@@ -1,30 +1,26 @@
-# $NetBSD: Makefile,v 1.15 2001/05/06 09:39:08 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2001/08/22 14:21:46 mjl Exp $
#
-DISTNAME= slrn-0.9.7.0a
-PKGNAME= slrn-0.9.7.0.1
-CATEGORIES= news
-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/
+DISTNAME= slrn-0.9.7.2
+CATEGORIES= news
+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://slrn.sourceforge.net/
-COMMENT= Powerful threaded newsreader, that is highly customizable
+MAINTAINER= mjl@netbsd.org
+HOMEPAGE= http://slrn.sourceforge.net/
+COMMENT= Highly customizable threaded newsreader
-DEPENDS+= libslang-*:../../devel/libslang
-
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --without-X --disable-inews \
- --disable-gen-mid --with-libdir=${PREFIX}/lib/slrn
+USE_GMAKE= yes
+GNU_CONFIGURE= yes
+CONFIGURE_ARGS+=--without-X --disable-inews --with-slrnpull \
+ --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
-CONFIGURE_ENV+= INSTALL=/usr/bin/install
-
-post-build:
- cd ${WRKSRC} && make slrnpull
+CONFIGURE_ENV+= INSTALL=/usr/bin/install
+.include "../../devel/libslang/buildlink.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/news/slrn/distinfo b/news/slrn/distinfo
index b8bb102bac5..8d3ed01080c 100644
--- a/news/slrn/distinfo
+++ b/news/slrn/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.3 2001/07/26 17:10:17 hubertf Exp $
+$NetBSD: distinfo,v 1.4 2001/08/22 14:21:46 mjl Exp $
-SHA1 (slrn-0.9.7.0a.tar.gz) = 55cf070ee208d7d3bcddc48506cd717224d98fd6
-Size (slrn-0.9.7.0a.tar.gz) = 427036 bytes
-SHA1 (patch-aa) = 6c6730bfa7a33c3f43184f552699823d7edcd904
-SHA1 (patch-ac) = f8d6cee35de3c983e8832c8cc729418713a5d3d5
+SHA1 (slrn-0.9.7.2.tar.gz) = 49a157fc0adb4ecd06f698de7755a46b137cca59
+Size (slrn-0.9.7.2.tar.gz) = 466665 bytes
+SHA1 (patch-aa) = 2fe15ab7455f366554e530a0bb2e25758440af4c
diff --git a/news/slrn/patches/patch-aa b/news/slrn/patches/patch-aa
index 31e986411f0..7a234dbacd6 100644
--- a/news/slrn/patches/patch-aa
+++ b/news/slrn/patches/patch-aa
@@ -1,22 +1,76 @@
-$NetBSD: patch-aa,v 1.6 2001/07/26 16:54:43 hubertf Exp $
+$NetBSD: patch-aa,v 1.7 2001/08/22 14:21:48 mjl Exp $
---- configure.orig Thu Jul 26 18:46:19 2001
-+++ configure Thu Jul 26 18:50:12 2001
-@@ -2058,7 +2058,7 @@
- /usr/local/lib \
- /usr/lib/slang \
- /usr/lib \
-- /usr/pkg/lib"
-+ ${PREFIX}/lib"
+--- configure.orig Wed Aug 15 00:00:36 2001
++++ configure Wed Aug 22 16:06:15 2001
+@@ -2219,11 +2219,6 @@
+
+
+ slang_library_dirs="\
+- /usr/local/lib/slang \
+- /usr/local/lib \
+- /usr/lib/slang \
+- /usr/lib \
+- /usr/pkg/lib \
+ $ev_libdir"
for slang_dir in $slang_library_dirs; do
- if test -r $slang_dir/libslang.a || test -r $slang_dir/libslang.so; then
-@@ -2126,7 +2126,7 @@
- /usr/local/include \
- /usr/include/slang \
- /usr/include \
-- /usr/pkg/include"
-+ ${PREFIX}/include"
+@@ -2298,11 +2293,6 @@
+
+
+ slang_include_dirs="\
+- /usr/local/include/slang \
+- /usr/local/include \
+- /usr/include/slang \
+- /usr/include \
+- /usr/pkg/include \
+ $ev_includedir"
for slang_dir in $slang_include_dirs; do
- if test -r "$slang_dir/slang.h"; then
+@@ -2394,11 +2384,7 @@
+
+
+ ssl_library_dirs="\
+- /usr/local/ssl/lib \
+- /usr/local/lib \
+- /usr/ssl/lib \
+- /usr/lib \
+- /usr/pkg/lib"
++ $ev_libdir"
+
+ if test "x$ac_ssl_home" != xno && test "x$ac_ssl_home" != xyes ; then
+ ssl_library_dirs="$ac_ssl_home $ac_ssl_home/lib $ssl_library_dirs"
+@@ -2457,11 +2443,7 @@
+
+
+ ssl_include_dirs="\
+- /usr/local/ssl/include \
+- /usr/local/include \
+- /usr/ssl/include \
+- /usr/include \
+- /usr/pkg/include"
++ $ev_includedir"
+
+ if test "x$ac_ssl_home" != xno && test "x$ac_ssl_home" != xyes ; then
+ ssl_include_dirs="$ac_ssl_home $ac_ssl_home/include $ssl_include_dirs"
+@@ -2544,9 +2526,7 @@
+
+
+ uu_library_dirs="\
+- /usr/local/lib \
+- /usr/lib \
+- /usr/pkg/lib"
++ $ev_libdir"
+
+ if test "x$ac_uu_home" != xno && test "x$ac_uu_home" != xyes ; then
+ uu_library_dirs="$ac_uu_home $ac_uu_home/lib $uu_library_dirs"
+@@ -2604,9 +2584,7 @@
+
+
+ uu_include_dirs="\
+- /usr/local/include \
+- /usr/include \
+- /usr/pkg/include"
++ $ev_includedir"
+
+ if test "x$ac_uu_home" != xno && test "x$ac_uu_home" != xyes ; then
+ uu_include_dirs="$ac_uu_home $ac_uu_home/include $uu_include_dirs"
diff --git a/news/slrn/patches/patch-ac b/news/slrn/patches/patch-ac
deleted file mode 100644
index 96a853d64af..00000000000
--- a/news/slrn/patches/patch-ac
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-ac,v 1.5 2001/03/30 18:13:26 mjl Exp $
-
---- 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@
-
- 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 4fd866a0222..825fd69142c 100644
--- a/news/slrn/pkg/PLIST
+++ b/news/slrn/pkg/PLIST
@@ -1,30 +1,42 @@
-@comment $NetBSD: PLIST,v 1.6 2001/05/06 09:39:08 wiz Exp $
+@comment $NetBSD: PLIST,v 1.7 2001/08/22 14:21:49 mjl Exp $
bin/slrn
bin/slrnpull
man/man1/slrn.1
-share/doc/slrn/help.txt
-share/doc/slrn/INSTALL
-share/doc/slrn/README.vms
-share/doc/slrn/README.os2
+man/man1/slrnpull.1
+share/doc/slrn/COPYING
+share/doc/slrn/COPYRIGHT
+share/doc/slrn/FAQ
+share/doc/slrn/FIRST_STEPS
+share/doc/slrn/README
share/doc/slrn/README.GroupLens
+share/doc/slrn/README.SSL
share/doc/slrn/README.macros
-share/doc/slrn/FAQ
+share/doc/slrn/README.multiuser
share/doc/slrn/SCORE_FAQ
-share/doc/slrn/score.txt
+share/doc/slrn/THANKS
+share/doc/slrn/changes.txt
+share/doc/slrn/help.txt
+share/doc/slrn/manual.txt
share/doc/slrn/score.sl
-share/doc/slrn/slrn.rc
-share/doc/slrn/pc-keys.txt
+share/doc/slrn/score.txt
share/doc/slrn/slrn-doc.html
+share/doc/slrn/slrn.rc
share/doc/slrn/slrnfuns.txt
-share/doc/slrn/COPYRIGHT
-share/doc/slrn/COPYING
-share/doc/slrn/README
-share/doc/slrn/changes.txt
+share/doc/slrn/slrnpull/FAQ
+share/doc/slrn/slrnpull/README
+share/doc/slrn/slrnpull/SETUP
+share/doc/slrn/slrnpull/score
+share/doc/slrn/slrnpull/setgid.txt
+share/doc/slrn/slrnpull/slrn.rc
+share/doc/slrn/slrnpull/slrnpull.conf
+share/doc/slrn/slrnpull/slrnpull.sh
@dirrm share/doc/slrn/slrnpull
@dirrm share/doc/slrn
share/slrn/color.sl
+share/slrn/gsort.sl
share/slrn/ispell.sl
share/slrn/latin2.sl
+share/slrn/multipart.sl
share/slrn/nn.sl
share/slrn/posthook.sl
share/slrn/search.sl
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-30 07:17:42 +0000