diff -urN /usr/ports/japanese/plain2/Makefile japanese/plain2/Makefile
--- /usr/ports/japanese/plain2/Makefile	Mon Nov 11 18:59:59 2002
+++ japanese/plain2/Makefile	Sat Nov 30 08:54:07 2002
@@ -6,20 +6,31 @@
 #
 
 PORTNAME=	plain2
-PORTVERSION=	2.54
+PORTVERSION=	2.54.1
 CATEGORIES=	japanese textproc
-MASTER_SITES=	ftp://ftp.nec.co.jp/pub/packages/plain2/
+MASTER_SITES=	http://ftp.debian.or.jp/debian-jp/pool/main/p/plain2/
+DISTNAME=	${PORTNAME}_${PORTVERSION:R}p${PORTVERSION:E}.orig
 
-MAINTAINER=	ports@freebsd.org
+PATCH_SITES=	${MASTER_SITES}
+PATCHFILES=	${PORTNAME}_${PORTVERSION:R}p${PORTVERSION:E}-4.1.diff.gz
+PATCH_DIST_STRIP=	-p1
 
-WRKSRC=		${WRKDIR}/${DISTNAME}/src
-ALL_TARGET=	plain2
+MAINTAINER=	ports@FreeBSD.org
 
-# Some hint for incorporating unofficial HTML support patch.
-# Currently it is not supported.
-#PATCH_SITES=	http://shika.aist-nara.ac.jp/products/DEST/plain2/
-#PATCHFILES=	plain2-2.53-html.94aug14.patch.gz
-#RUN_DEPENDS+=	tcsh:${PORTSDIR}/shells/tcsh
-#PATCH_DIST_STRIP=	-p2 -F 3
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:R}p${PORTVERSION:E}.orig
+BUILD_WRKSRC=	${WRKDIR}/${PORTNAME}-${PORTVERSION:R}p${PORTVERSION:E}.orig/src
+
+USE_REINPLACE=	yes
+MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS} -DBSD -DKANJI -DPICTURE -DHTML"
+ALL_TARGET=	${PORTNAME}
+
+post-patch:
+	@${REINPLACE_CMD} -e \
+		's|/usr/lib/plain2|${DATADIR}|g' ${BUILD_WRKSRC}/plain2.h
+
+do-install:
+	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/${PORTNAME} ${PREFIX}/bin
+	@${MKDIR} ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/lib/*.p2 ${DATADIR}
 
 .include <bsd.port.mk>
diff -urN /usr/ports/japanese/plain2/distinfo japanese/plain2/distinfo
--- /usr/ports/japanese/plain2/distinfo	Wed Aug 13 00:36:39 1997
+++ japanese/plain2/distinfo	Sat Nov 30 08:38:44 2002
@@ -1 +1,2 @@
-MD5 (plain2-2.54.tar.gz) = fac1118541ba8e439b72a3a38061c46c
+MD5 (plain2_2.54p1.orig.tar.gz) = de64fb22d007017a3f891bc0882ea2da
+MD5 (plain2_2.54p1-4.1.diff.gz) = 793c95d1819318b00d1ec23cfb6cde3c
diff -urN /usr/ports/japanese/plain2/files/patch-aa japanese/plain2/files/patch-aa
--- /usr/ports/japanese/plain2/files/patch-aa	Wed Aug 13 00:36:39 1997
+++ japanese/plain2/files/patch-aa	Thu Jan  1 09:00:00 1970
@@ -1,39 +0,0 @@
---- Makefile.orig	Tue Apr 19 19:35:38 1994
-+++ Makefile	Wed Aug 13 00:20:49 1997
-@@ -5,8 +5,8 @@
- #	Makefile for plain2 1993 by A.Uchida 
- #
- #
--BINDIR=/usr/local/bin
--LIBDIR=/usr/local/lib/plain2
-+BINDIR=${PREFIX}/bin
-+LIBDIR=${PREFIX}/lib/plain2
- 
- SHELL=/bin/sh
- 
-@@ -15,8 +15,8 @@
- #CC=gcc
- #CFLAGS= -fwritable-strings ${DEFINES} -DBSD -DDEBUG
- 
--CC=cc
--CFLAGS= -O ${DEFINES} -DBSD -DDEBUG
-+CC=cc 
-+CFLAGS= -O ${DEFINES} -DBSD -DDEBUG -fwritable-strings
- #CFLAGS=  -g ${DEFINES} -DDEBUG
- 
- SRCS=plain2.c readfile.c analyze.c miscutil.c\
-@@ -46,8 +46,12 @@
- 	etags ${SRCS}
- 
- install:
--	install -s plain2 ${BINDIR}
--	cp ../lib/*.p2 ${LIBDIR}
-+	install -c -s -o bin -g bin -m 555 plain2 ${BINDIR}
-+	[ -d ${LIBDIR} ] || mkdir ${LIBDIR}
-+	install -c -o bin -g bin -m 444 ../lib/*.p2 ${LIBDIR}
-+# hint for unofficial html patch
-+#	install -c -o bin -g bin -m 555 plain2html ${BINDIR}
-+#	install -c -o bin -g bin -m 444 pt2htcol.awk ${LIBDIR}
- 
- clean:
- 	rm -f plain2 *.o asccvt x.c error.LINT
diff -urN /usr/ports/japanese/plain2/files/patch-ab japanese/plain2/files/patch-ab
--- /usr/ports/japanese/plain2/files/patch-ab	Wed Aug 13 00:36:39 1997
+++ japanese/plain2/files/patch-ab	Thu Jan  1 09:00:00 1970
@@ -1,11 +0,0 @@
---- headfoot.c-	Tue Apr 19 19:16:22 1994
-+++ headfoot.c	Sun Apr 20 18:52:25 1997
-@@ -290,7 +290,7 @@
- {
- 	char	left[HF_MAXLEN];
- 	char	right[HF_MAXLEN];
--	char	ret[64];
-+	static char	ret[64];
- 	if (build(pat1, pat2, left, right)) {
- 		(void)strcpy(ret, codeCvt(textQuote(left, roffTransQ)));
- 		(void)strcat(ret, "\\\\\\\\nP");
diff -urN /usr/ports/japanese/plain2/pkg-plist japanese/plain2/pkg-plist
--- /usr/ports/japanese/plain2/pkg-plist	Fri Jul 14 21:12:43 2000
+++ japanese/plain2/pkg-plist	Sat Nov 30 08:52:48 2002
@@ -1,8 +1,8 @@
 bin/plain2
-lib/plain2/OHP.p2
-lib/plain2/OHP_t.p2
-lib/plain2/header.p2
-lib/plain2/header_t.p2
-lib/plain2/jbook.p2
-lib/plain2/supsnum.p2
-@dirrm lib/plain2
+share/plain2/OHP.p2
+share/plain2/OHP_t.p2
+share/plain2/header.p2
+share/plain2/header_t.p2
+share/plain2/jbook.p2
+share/plain2/supsnum.p2
+@dirrm share/plain2