Upgrade to 2.1.

PR:		ports/13498
Submitted by:	CHOI Junho <cjh@kr.FreeBSD.org>

6 files changed, 41 insertions, 31 deletions

diff --git a/korean/nhppf/Makefile b/korean/nhppf/Makefile
index 7566e79a5718..64480c0acf94 100644
--- a/korean/nhppf/Makefile
+++ b/korean/nhppf/Makefile
@@ -1,30 +1,35 @@
-# New ports collection makefile for:    nhppf-1.2
-# Version required:     1.2
+# New ports collection makefile for:    nhppf-2.1
+# Version required:     2.1
 # Date created:         19 Apr 1997
-# Whom:                 Choi Jun Ho <junker@jazz.snu.ac.kr>
+# Whom:                 CHOI Junho <cjh@kr.freebsd.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	nhppf-1.2
-PKGNAME=	ko-nhppf-1.2
+DISTNAME=	nhppf-2.1
+PKGNAME=	ko-nhppf-2.1
 CATEGORIES=	korean
-MASTER_SITES=	ftp://jazz.snu.ac.kr/pub/unix/util/nhppf/
+MASTER_SITES=	ftp://ftp.kr.freebsd.org/pub/users/cjh/nhppf/ \
+		ftp://jazz.snu.ac.kr/pub/unix/util/nhppf/
 
-MAINTAINER=	junker@jazz.snu.ac.kr
+MAINTAINER=	cjh@kr.freebsd.org
 
-RUN_DEPENDS=    ${PREFIX}/share/fonts/HLaTeX-0.95-pfb:$(PORTSDIR)/korean/hlatexpsfonts
+RUN_DEPENDS=    ${PREFIX}/share/texmf/fonts/type1/korean/pkmj/pkmjm0.pfb:$(PORTSDIR)/korean/hlatexpsfonts-wansungstd
 
-USE_PERL5=	yes
 NO_BUILD=	yes
 
+USE_PERL5=	yes
+
 do-configure:
-	@cd ${WRKSRC}; \
-	${ECHO_MSG} "#!${PERL5}" > scriptheader; \
-	${CAT} scriptheader nhppf > nhppf.new
+	${SED} -e 's,%%PREFIX%%,${PREFIX},g' \
+		${WRKSRC}/nhppf > ${WRKSRC}/nhppf.perl
 
 do-install:
 	@cd ${WRKSRC}; \
-	${INSTALL_SCRIPT} nhppf.new ${PREFIX}/bin/nhppf
+	${INSTALL_SCRIPT} nhppf.perl ${PREFIX}/bin/nhppf
+	${MKDIR} ${PREFIX}/share/doc/nhppf
+.for DOC in ChangeLog README charlist test.html
+	${INSTALL_DATA} ${WRKSRC}/${DOC} ${PREFIX}/share/doc/nhppf
+.endfor
 
 .include <bsd.port.mk>
diff --git a/korean/nhppf/distinfo b/korean/nhppf/distinfo
index 301f052d56a2..e9a4c18b1382 100644
--- a/korean/nhppf/distinfo
+++ b/korean/nhppf/distinfo
@@ -1 +1 @@
-MD5 (nhppf-1.2.tar.gz) = f3ad6e21b96233bb8473bf08cdee0ad2
+MD5 (nhppf-2.1.tar.gz) = 369506f0d930ad2dc5697a68268cb479
diff --git a/korean/nhppf/files/patch-aa b/korean/nhppf/files/patch-aa
index 738db1036931..d1dc6ed194e2 100644
--- a/korean/nhppf/files/patch-aa
+++ b/korean/nhppf/files/patch-aa
@@ -1,9 +1,8 @@
-*** nhppf.old	Wed Apr  2 17:48:12 1997
---- nhppf	Wed Apr  2 17:48:17 1997
-***************
-*** 1,4 ****
-- #!/usr/local/bin/perl
-  # 
-  # Netscape 3.0 Hangul Print Filter - for using only "Print" menu
-  #
---- 1,3 ----
+--- nhppf.orig	Sun Aug  9 19:46:57 1998
++++ nhppf	Sun Aug  9 19:47:09 1998
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl
++#!%%PREFIX%%/bin/perl
+ # 
+ # Netscape 3.0 Hangul Print Filter - for using only "Print" menu
+ #
diff --git a/korean/nhppf/pkg-comment b/korean/nhppf/pkg-comment
index cae213422d32..ecfe71cae57f 100644
--- a/korean/nhppf/pkg-comment
+++ b/korean/nhppf/pkg-comment
@@ -1 +1 @@
-Hangul Printing Filter for Netscape with HLaTeX-0.95 PS font
+Hangul printing filter for Netscape 3.0 and above
diff --git a/korean/nhppf/pkg-descr b/korean/nhppf/pkg-descr
index ed1aa786e176..9c3de82ffb01 100644
--- a/korean/nhppf/pkg-descr
+++ b/korean/nhppf/pkg-descr
@@ -1,11 +1,12 @@
-nhppf-1.2
----------
+nhppf
+-----
 
-This program makes you can print hangul homepages with Netscape 3.0x,
-in Unix with Ghostscript. 
+This program makes you can print hangul webpages with Netscape 3.0
+and above in Unix with Ghostscript. 
 
-It use HLaTeX-0.95 PostScript Type1 font set, so it can print all
-Hangul and Hanja character of KS C 5601, except symbols.
+It can use HLaTeX PostScript Type1 font set.
+Depending on the fontset you have, it can print Hangul, Hanja, and 
+other KSC Symbols.
 
 --
-Ports by Choi Jun Ho <junker@jazz.snu.ac.kr>
+Ports by CHOI Junho <cjh@kr.freebsd.org>
diff --git a/korean/nhppf/pkg-plist b/korean/nhppf/pkg-plist
index b2f25124b165..21ce5cf6a166 100644
--- a/korean/nhppf/pkg-plist
+++ b/korean/nhppf/pkg-plist
@@ -1 +1,6 @@
 bin/nhppf
+share/doc/nhppf/ChangeLog
+share/doc/nhppf/README
+share/doc/nhppf/charlist
+share/doc/nhppf/test.html
+@dirrm share/doc/nhppf