Update to version 1.4.2.1.

PR:		23387
Submitted by:	KATO Tsuguru <tkato@prontomail.ne.jp>
Approved by:	maintainer

6 files changed, 24 insertions, 43 deletions

diff --git a/japanese/ng/Makefile b/japanese/ng/Makefile
index f60664271787..7bb8741a22ec 100644
--- a/japanese/ng/Makefile
+++ b/japanese/ng/Makefile
@@ -6,32 +6,33 @@
 #
 
 PORTNAME=	ng
-PORTVERSION=	1.4
-CATEGORIES=     japanese editors
-MASTER_SITES=   http://ha3.seikyou.ne.jp/home/amura/archives/ng/
+PORTVERSION=	1.4.2.1
+CATEGORIES=	japanese editors
+MASTER_SITES=	http://ha3.seikyou.ne.jp/home/amura/archives/ng/
+DISTNAME=	${PORTNAME}-${PORTVERSION:R}
 
-MAINTAINER=     ginga@athena.club.ne.jp
+PATCH_SITES=	${MASTER_SITES}
+PATCHFILES=	${PORTNAME}-${PORTVERSION:R}-line.patch
 
-WRKSRC=         ${WRKDIR}/ng
+MAINTAINER=	ginga@athena.club.ne.jp
+
+WRKSRC=		${WRKDIR}/${PORTNAME}
+MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}" LIBS="-ltermcap"
 ALL_TARGET=	ng
 
+PORTDOCS=	CHANGES.doc CHANGES.new Ng.FAQ Ng.doc Ng.ref Ng.tut \
+		README.Ng README.SKG
+
 post-patch:
-	@(cd ${WRKSRC}; ${LN} -s sys/bsd/Makefile . )
+	@(cd ${WRKSRC}; ${LN} -sf sys/bsd/Makefile . )
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/ng ${PREFIX}/bin/
-
-post-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/ng ${PREFIX}/bin
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/doc/ja/ng
-	${INSTALL_DATA} ${WRKSRC}/docs/Ng.FAQ ${PREFIX}/share/doc/ja/ng/Ng.FAQ.euc-jp
-	${INSTALL_DATA} ${WRKSRC}/docs/Ng.doc ${PREFIX}/share/doc/ja/ng/Ng.doc.euc-jp
-	${INSTALL_DATA} ${WRKSRC}/docs/Ng.ref ${PREFIX}/share/doc/ja/ng/Ng.ref.euc-jp
-	${INSTALL_DATA} ${WRKSRC}/docs/Ng.tut ${PREFIX}/share/doc/ja/ng/Ng.tut.euc-jp
-	${INSTALL_DATA} ${WRKSRC}/docs/README.Ng ${PREFIX}/share/doc/ja/ng/README.Ng.euc-jp
-	${INSTALL_DATA} ${WRKSRC}/docs/README.SKG ${PREFIX}/share/doc/ja/ng/README.SKG.euc-jp
-	${INSTALL_DATA} ${WRKSRC}/docs/CHANGES.new ${PREFIX}/share/doc/ja/ng/CHANGES.new.euc-jp
-	${INSTALL_DATA} ${WRKSRC}/docs/CHANGES.doc ${PREFIX}/share/doc/ja/ng/CHANGES.doc.euc-jp
+.for file in ${PORTDOCS}
+	${INSTALL_DATA} ${WRKSRC}/docs/${file} ${PREFIX}/share/doc/ja/ng/${file}.euc-jp
+.endfor
 .endif
 
 .include <bsd.port.mk>
diff --git a/japanese/ng/distinfo b/japanese/ng/distinfo
index 9d8da0c83056..80e17ae8190e 100644
--- a/japanese/ng/distinfo
+++ b/japanese/ng/distinfo
@@ -1 +1,2 @@
-MD5 (ng-1.4.tar.gz) = 83fd519100b78ba0f6809ba4899b1863
+MD5 (ng-1.4.2.tar.gz) = fe8ff375278f2615c6e1de2777a59494
+MD5 (ng-1.4.2-line.patch) = 23bbe068c485dd7c3f00412abab51925
diff --git a/japanese/ng/files/patch-aa b/japanese/ng/files/patch-aa
deleted file mode 100644
index 94a910f41b3e..000000000000
--- a/japanese/ng/files/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur work/ng/sys/bsd/Makefile work.new/ng/sys/bsd/Makefile
---- sys/bsd/Makefile.dist	Tue Jun 27 10:48:02 2000
-+++ sys/bsd/Makefile	Tue Sep 12 19:49:46 2000
-@@ -8,7 +8,7 @@
- # Modified for Ng 1.0	by Shigeki Yoshida (shige@csk.CO.JP)	1990.01.29
- 
- SYS	= bsd
--LIBS	= -L/usr/pkg/lib -lcanna -ltermcap
-+LIBS	= -L/usr/pkg/lib -ltermcap
- # CDEFS gets defines, and gets passed to lint. CFLAGS gets flags, and doesn't
- # get passed to lint.
- #
diff --git a/japanese/ng/files/patch-ab b/japanese/ng/files/patch-ab
deleted file mode 100644
index 374871031d8b..000000000000
--- a/japanese/ng/files/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
---- config.h.dist	Mon Jul 24 07:43:09 2000
-+++ config.h	Tue Sep 12 19:49:46 2000
-@@ -126,7 +126,7 @@
- 
- #define XKEYS		/* use numelic keypad (by Gen.KUROKI) */
- 
--#define CANNA		/* use CANNA kana-kanji server (by Endo) */
-+#undef CANNA		/* use CANNA kana-kanji server (by Endo) */
- 
- /*................................................*/
- #endif			/* Do not edit this line. */
diff --git a/japanese/ng/pkg-descr b/japanese/ng/pkg-descr
index c148f693a262..12e74e640f31 100644
--- a/japanese/ng/pkg-descr
+++ b/japanese/ng/pkg-descr
@@ -9,3 +9,5 @@ japanese port. Ng supports EUC, JIS and SJIS code.
 Ng also have (rather simple) C-mode.
 
 It is also very useful even if you don't need Japanese support.
+
+WWW: http://ha3.seikyou.ne.jp/home/amura/ng/
diff --git a/japanese/ng/pkg-plist b/japanese/ng/pkg-plist
index 3ebb9675087d..9a7bf02db835 100644
--- a/japanese/ng/pkg-plist
+++ b/japanese/ng/pkg-plist
@@ -1,10 +1,10 @@
 bin/ng
+share/doc/ja/ng/CHANGES.doc.euc-jp
+share/doc/ja/ng/CHANGES.new.euc-jp
 share/doc/ja/ng/Ng.FAQ.euc-jp
 share/doc/ja/ng/Ng.doc.euc-jp
 share/doc/ja/ng/Ng.ref.euc-jp
 share/doc/ja/ng/Ng.tut.euc-jp
 share/doc/ja/ng/README.Ng.euc-jp
 share/doc/ja/ng/README.SKG.euc-jp
-share/doc/ja/ng/CHANGES.new.euc-jp
-share/doc/ja/ng/CHANGES.doc.euc-jp
 @dirrm share/doc/ja/ng