6 files changed, 127 insertions, 89 deletions

diff --git a/japanese/slrn/Makefile b/japanese/slrn/Makefile
index dba7b0355edd..9f412551d07c 100644
--- a/japanese/slrn/Makefile
+++ b/japanese/slrn/Makefile
@@ -1,45 +1,38 @@
 # New ports collection makefile for:	ja-slrn
-# Version required:	0.9.5.4
-# Date created:		26 Jun 1998
+# Version required:	0.9.5.7
+# Date created:		6 Sept 1999
 # Whom:			Takashi Mega <mega@minz.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	slrn0.9.5.4
-PKGNAME=	ja-slrn-0.9.5.4
+DISTNAME=	slrn-0.9.5.7
+PKGNAME=	ja-slrn-0.9.5.7
 CATEGORIES=	japanese news
 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
+DISTFILES= 	slrn-0.9.5.7.tar.gz  slrn-doc-j0.9.5.6-0.tar.gz
 
 PATCH_SITES=	http://home.sprintmail.com/~kikutani/slang/
-PATCHFILES= 	slrn0.9.5.4jp0.pat.gz
+PATCHFILES= 	slrn0.9.5.7jp0.pat.gz
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	mega@minz.org
 
 LIB_DEPENDS=	slang.2:${PORTSDIR}/japanese/libslang
 
-WRKSRC=         ${WRKDIR}/slrn
-JDOCSRC=	${WRKDIR}/slrn-doc-j0.9.5.3-0
-HAS_CONFIGURE=	yes
+WRKSRC=         ${WRKDIR}/slrn-0.9.5.7
+JDOCSRC=	${WRKDIR}/slrn-doc-j0.9.5.6-0
+GNU_CONFIGURE=	yes
 ALL_TARGET=     all slrnpull
-MANLANG=	ja ''
+MANLANG=	'' ja
 MAN1=		slrn.1
 
-do-build:
-	@(cd ${WRKSRC}/src; make ${ALL_TARGET})
-
-do-install:
-	${ECHO} "installing slrn and slrnpull in ${PREFIX}/bin"
-	${INSTALL_PROGRAM} ${WRKSRC}/src/objs/slrn ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/src/objs/slrnpull ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/src/objs/chkslang ${PREFIX}/bin
-	${ECHO} "installing documents files in ${PREFIX}/share/doc/slrn"
-	${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
+pre-install:
+	strip ${WRKSRC}/src/i386objs/slrn
+	strip ${WRKSRC}/src/i386objs/slrnpull
+
+post-install:
 	${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 bff7309c2e67..0e5a16eb0ca9 100644
--- a/japanese/slrn/distinfo
+++ b/japanese/slrn/distinfo
@@ -1,3 +1,3 @@
-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
+MD5 (slrn-0.9.5.7.tar.gz) = 1d3b29a68ad9a79ee442dcaba2bb7939
+MD5 (slrn-doc-j0.9.5.6-0.tar.gz) = dce948434a19e2d7333c39477013950f
+MD5 (slrn0.9.5.7jp0.pat.gz) = de934ed18c5ea468f49bc8ce5ff8a456
diff --git a/japanese/slrn/files/patch-aa b/japanese/slrn/files/patch-aa
index fcc72de2fa0d..9c41d0826b64 100644
--- a/japanese/slrn/files/patch-aa
+++ b/japanese/slrn/files/patch-aa
@@ -1,11 +1,38 @@
---- 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
+*** src/slrnfeat.h.orig2	Mon Sep  6 01:10:37 1999
+--- src/slrnfeat.h	Mon Sep  6 01:26:54 1999
+***************
+*** 24,31 ****
+  #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 SLRN_DEFAULT_TIMEZONE "JST"
+  #define SLRN_DEFAULT_CHARSET "ISO-2022-JP"
+--- 24,31 ----
+  #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 SLRN_DEFAULT_TIMEZONE "JST"
+  #define SLRN_DEFAULT_CHARSET "ISO-2022-JP"
+***************
+*** 226,232 ****
+  #   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"
+  #   ifndef SLRN_LIB_DIR
+  #    define SLRN_LIB_DIR		"/usr/local/lib/slrn"
+  #   endif
+--- 226,232 ----
+  #   define SLRN_ARTICLE_FILENAME	".article"
+  #   define SLRN_FOLLOWUP_FILENAME	".followup"
+  #   define SLRN_SIGNATURE_FILE		".signature"
+! #   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/files/patch-ab b/japanese/slrn/files/patch-ab
index 40d52ff4952f..f02fc08973ce 100644
--- a/japanese/slrn/files/patch-ab
+++ b/japanese/slrn/files/patch-ab
@@ -1,12 +1,19 @@
-*** configure.org	Sun Apr 18 21:51:14 1999
---- configure	Sun Apr 18 22:04:15 1999
+*** configure.orig	Sun Sep  5 21:26:49 1999
+--- configure	Sun Sep  5 21:40:41 1999
 ***************
-*** 2486,2491 ****
---- 2486,2492 ----
-  # version.
+*** 2488,2494 ****
   
   JD_Search_Dirs="$JD_Search_Dirs \
-+ 		/usr/local/include/slang,/usr/local/lib \
-                  /usr/local/include,/usr/local/lib \
+                  $includedir,$libdir \
+!                 /usr/local/include,/usr/local/lib \
   		/usr/include,/usr/lib \
   		/usr/include/slang,/usr/lib \
+  		/usr/include/slang,/usr/lib/slang"
+--- 2488,2494 ----
+  
+  JD_Search_Dirs="$JD_Search_Dirs \
+                  $includedir,$libdir \
+!                 /usr/local/include/slang,/usr/local/lib \
+  		/usr/include,/usr/lib \
+  		/usr/include/slang,/usr/lib \
+  		/usr/include/slang,/usr/lib/slang"
diff --git a/japanese/slrn/files/patch-ac b/japanese/slrn/files/patch-ac
index 08a6e8bb0bf5..791f350913d6 100644
--- a/japanese/slrn/files/patch-ac
+++ b/japanese/slrn/files/patch-ac
@@ -1,21 +1,19 @@
-*** src/slrnfeat.h.orig	Sun Apr 18 21:51:20 1999
---- src/slrnfeat.h	Sun Apr 18 22:05:53 1999
+*** src/Makefile.in.orig	Thu Jul 15 16:27:24 1999
+--- src/Makefile.in	Sun Sep  5 21:42:00 1999
 ***************
-*** 215,222 ****
-  #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 */
-  #ifndef SLRNPULL_CODE
-  #define KANJI
-  #endif
---- 215,222 ----
-  #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
-  #ifndef SLRNPULL_CODE
-  #define KANJI
-  #endif
+*** 61,67 ****
+  prefix = @prefix@
+  exec_prefix = @exec_prefix@
+  BINDIR = @bindir@
+! DOCDIR = $(prefix)/doc/slrn
+  MANDIR = @mandir@
+  MACRODIR = @datadir@/slrn
+  
+--- 61,67 ----
+  prefix = @prefix@
+  exec_prefix = @exec_prefix@
+  BINDIR = @bindir@
+! DOCDIR = $(prefix)/share/doc/slrn
+  MANDIR = @mandir@
+  MACRODIR = @datadir@/slrn
+  
diff --git a/japanese/slrn/pkg-plist b/japanese/slrn/pkg-plist
index 0de0693916ff..4ce6a86c9d4c 100644
--- a/japanese/slrn/pkg-plist
+++ b/japanese/slrn/pkg-plist
@@ -1,22 +1,16 @@
-bin/chkslang
 bin/slrn
 bin/slrnpull
-share/doc/slrn/FAQ
-share/doc/slrn/INSTALL
-share/doc/slrn/README.GroupLens
-share/doc/slrn/README.macros
-share/doc/slrn/README.os2
-share/doc/slrn/README.vms
-share/doc/slrn/README.w95
-share/doc/slrn/SCORE_FAQ
-share/doc/slrn/VMS-SLRN.HLP
-share/doc/slrn/help.txt
-share/doc/slrn/pc-keys.txt
-share/doc/slrn/score.sl
-share/doc/slrn/score.txt
-share/doc/slrn/slrn.1
-share/doc/slrn/slrn.rc
-share/doc/slrn/slrn.sl
+share/slrn/color.sl
+share/slrn/ispell.sl
+share/slrn/nn.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
 share/doc/slrn/ja/BUG.euc
 share/doc/slrn/ja/README.euc
 share/doc/slrn/ja/README.macros.euc
@@ -29,14 +23,33 @@ share/doc/slrn/ja/jslrn.rc
 share/doc/slrn/ja/kon.terminfo
 share/doc/slrn/ja/score.euc
 share/doc/slrn/ja/slrn.1
-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
 @dirrm share/doc/slrn/ja
+share/doc/slrn/slrnpull/FAQ
+share/doc/slrn/slrnpull/QUICK_INSTALL
+share/doc/slrn/slrnpull/README
+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
+share/doc/slrn/COPYING
+share/doc/slrn/COPYRIGHT
+share/doc/slrn/FAQ
+share/doc/slrn/INSTALL
+share/doc/slrn/README
+share/doc/slrn/README.GroupLens
+share/doc/slrn/README.macros
+share/doc/slrn/README.os2
+share/doc/slrn/README.vms
+share/doc/slrn/README.w95
+share/doc/slrn/SCORE_FAQ
+share/doc/slrn/changes.txt
+share/doc/slrn/help.txt
+share/doc/slrn/pc-keys.txt
+share/doc/slrn/score.sl
+share/doc/slrn/score.txt
+share/doc/slrn/slrn-doc.html
+share/doc/slrn/slrn.rc
+share/doc/slrn/slrnfuns.txt
 @dirrm share/doc/slrn
-@dirrm share/doc/slrnpull