4 files changed, 25 insertions, 40 deletions

diff --git a/japanese/slrn/Makefile b/japanese/slrn/Makefile
index ec0cf59ba108..0630a88e2b5e 100644
--- a/japanese/slrn/Makefile
+++ b/japanese/slrn/Makefile
@@ -3,31 +3,28 @@
 # Date created:		26 Jun 1998
 # Whom:			Takashi Mega <mega@minz.org>
 #
-# $Id: Makefile,v 1.3 1998/10/16 05:06:45 jseger Exp $
+# $Id: Makefile,v 1.4 1998/12/03 07:18:19 obrien Exp $
 
-DISTNAME=	slrn0.9.5.2
-PKGNAME=	ja-slrn-0.9.5.2
+DISTNAME=	slrn0.9.5.4
+PKGNAME=	ja-slrn-0.9.5.4
 CATEGORIES=	japanese news
-MASTER_SITES=	http://master.debian.or.jp/~kikutani/slang/
-DISTFILES= 	slrn0.9.5.2.tar.gz  slrn-doc-j0.9.5.2-0.tar.gz
+MASTER_SITES=	ftp://space.mit.edu/pub/davis/slrn/ \
+		http://home.sprintmail.com/~kikutani/slang/
+DISTFILES= 	slrn0.9.5.4.tar.gz  slrn-doc-j0.9.5.3-0.tar.gz
 
-PATCH_SITES=	http://master.debian.or.jp/~kikutani/slang/
-PATCHFILES= 	slrn0.9.5.2jp0.pat.gz
+PATCH_SITES=	http://home.sprintmail.com/~kikutani/slang/
+PATCHFILES= 	slrn0.9.5.4jp0.pat.gz
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	mega@minz.org
 
-BROKEN= 'fetch -- this needs more than one MASTER_STIE'
-
-BROKEN_ELF=	yes
-
 LIB_DEPENDS=	slang.1:${PORTSDIR}/japanese/libslang
 
 WRKSRC=         ${WRKDIR}/slrn
-JDOCSRC=	${WRKDIR}/slrn-doc-j0.9.5.2-0
+JDOCSRC=	${WRKDIR}/slrn-doc-j0.9.5.3-0
 HAS_CONFIGURE=	yes
 ALL_TARGET=     all slrnpull
-MANLANG=	ja
+MANLANG=	ja ''
 MAN1=		slrn.1
 
 do-build:
@@ -42,7 +39,6 @@ do-install:
 	${CP} -r ${WRKSRC}/doc ${PREFIX}/share/doc/slrn
 	${CP} -r ${WRKSRC}/slrnpull ${PREFIX}/share/doc/slrnpull
 	${INSTALL_MAN} ${WRKSRC}/doc/slrn.1 ${PREFIX}/man/man1
-	${GZIP_CMD} ${PREFIX}/man/man1/slrn.1
 	${INSTALL_MAN} ${JDOCSRC}/slrn.1 ${PREFIX}/man/ja/man1
 	${CP} -r ${JDOCSRC} ${PREFIX}/share/doc/slrn/ja
 
diff --git a/japanese/slrn/distinfo b/japanese/slrn/distinfo
index fd3a45bc4507..bff7309c2e67 100644
--- a/japanese/slrn/distinfo
+++ b/japanese/slrn/distinfo
@@ -1,3 +1,3 @@
-MD5 (slrn0.9.5.2.tar.gz) = 64430abf77b5d82dc8fdc07199014e56
-MD5 (slrn-doc-j0.9.5.2-0.tar.gz) = ff85e21002edb9f3808e777509720c56
-MD5 (slrn0.9.5.2jp0.pat.gz) = 383e09e5ff197bae43cae57082c28627
+MD5 (slrn0.9.5.4.tar.gz) = f28a183a378c8d80e1d1ec3d4ab1e591
+MD5 (slrn-doc-j0.9.5.3-0.tar.gz) = 25e16f3ee7c4f5f8707a5ae0792c8e24
+MD5 (slrn0.9.5.4jp0.pat.gz) = ea8c717cef4386712156c2f52071c535
diff --git a/japanese/slrn/files/patch-aa b/japanese/slrn/files/patch-aa
index 3dae290b6e4b..fcc72de2fa0d 100644
--- a/japanese/slrn/files/patch-aa
+++ b/japanese/slrn/files/patch-aa
@@ -1,21 +1,11 @@
-*** src/slrnfeat.h.orig	Fri Jun 26 17:49:39 1998
---- src/slrnfeat.h	Fri Jun 26 17:50:16 1998
-***************
-*** 217,224 ****
-  #define SLRN_TZ_TM_ZONE  2   /* timezone set in tm_zone of struct tm */
-  #define SLRN_TZ_TIMEZONE 3   /* timezone() */
-    /* choose one from listed above */
-! #define SLRN_TZ_TYPE SLRN_TZ_TZNAME
-! /* #define SLRN_TZ_TYPE SLRN_TZ_TM_ZONE */
-  #define KANJI
-  #ifdef SLRNPULL_CODE
-  #undef KANJI
---- 217,224 ----
-  #define SLRN_TZ_TM_ZONE  2   /* timezone set in tm_zone of struct tm */
-  #define SLRN_TZ_TIMEZONE 3   /* timezone() */
-    /* choose one from listed above */
-! /* #define SLRN_TZ_TYPE SLRN_TZ_TZNAME */
-! #define SLRN_TZ_TYPE SLRN_TZ_TM_ZONE
-  #define KANJI
-  #ifdef SLRNPULL_CODE
-  #undef KANJI
+--- src/slrnfeat.h.orig	Sun Dec  6 20:50:26 1998
++++ src/slrnfeat.h	Sun Dec  6 20:50:38 1998
+@@ -193,7 +193,7 @@
+ #   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"
+ #   endif
diff --git a/japanese/slrn/pkg-plist b/japanese/slrn/pkg-plist
index 82d0035dde24..0de0693916ff 100644
--- a/japanese/slrn/pkg-plist
+++ b/japanese/slrn/pkg-plist
@@ -1,8 +1,6 @@
 bin/chkslang
 bin/slrn
 bin/slrnpull
-man/ja/man1/slrn.1.gz
-man/man1/slrn.1.gz
 share/doc/slrn/FAQ
 share/doc/slrn/INSTALL
 share/doc/slrn/README.GroupLens
@@ -35,6 +33,7 @@ share/doc/slrnpull/FAQ
 share/doc/slrnpull/QUICK_INSTALL
 share/doc/slrnpull/README
 share/doc/slrnpull/score
+share/doc/slrnpull/setgid.txt
 share/doc/slrnpull/slrn.rc
 share/doc/slrnpull/slrnpull.conf
 share/doc/slrnpull/slrnpull.sh