6 files changed, 12 insertions, 27 deletions
diff --git a/japanese/FreeWnn-lib/Makefile b/japanese/FreeWnn-lib/Makefile
index 8d844754e3b0..8a1f4f2cbb06 100644
--- a/japanese/FreeWnn-lib/Makefile
+++ b/japanese/FreeWnn-lib/Makefile
@@ -3,7 +3,7 @@
 # Date created:		22 November 1994
 # Whom:			asami
 #
-# $Id: Makefile,v 1.8 1995/04/01 12:46:22 jkh Exp $
+# $Id: Makefile,v 1.9 1995/04/07 05:48:02 asami Exp $
 #
 
 DISTNAME=	Wnn4.2
@@ -21,12 +21,9 @@ IS_INTERACTIVE=	yes
 pre-build:
 	@(cd ${WRKSRC}; ${MAKE} ${MAKE_FLAGS} Makefile.inst World)
 
-pre-install:
-	@PREFIX=${PREFIX} ${SCRIPTDIR}/pre-install
+post-install:
 # This package uses imake's "install.man" target to install man pages but
 #  I can't define USE_IMAKE because it doesn't involve xmkmf
 	@(cd ${WRKSRC}; ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} install.man)
 
-pre-reinstall: pre-install
-
 .include <bsd.port.mk>
diff --git a/japanese/FreeWnn-server/Makefile b/japanese/FreeWnn-server/Makefile
index 8d844754e3b0..8a1f4f2cbb06 100644
--- a/japanese/FreeWnn-server/Makefile
+++ b/japanese/FreeWnn-server/Makefile
@@ -3,7 +3,7 @@
 # Date created:		22 November 1994
 # Whom:			asami
 #
-# $Id: Makefile,v 1.8 1995/04/01 12:46:22 jkh Exp $
+# $Id: Makefile,v 1.9 1995/04/07 05:48:02 asami Exp $
 #
 
 DISTNAME=	Wnn4.2
@@ -21,12 +21,9 @@ IS_INTERACTIVE=	yes
 pre-build:
 	@(cd ${WRKSRC}; ${MAKE} ${MAKE_FLAGS} Makefile.inst World)
 
-pre-install:
-	@PREFIX=${PREFIX} ${SCRIPTDIR}/pre-install
+post-install:
 # This package uses imake's "install.man" target to install man pages but
 #  I can't define USE_IMAKE because it doesn't involve xmkmf
 	@(cd ${WRKSRC}; ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} install.man)
 
-pre-reinstall: pre-install
-
 .include <bsd.port.mk>
diff --git a/japanese/Wnn6-lib/Makefile b/japanese/Wnn6-lib/Makefile
index 8d844754e3b0..8a1f4f2cbb06 100644
--- a/japanese/Wnn6-lib/Makefile
+++ b/japanese/Wnn6-lib/Makefile
@@ -3,7 +3,7 @@
 # Date created:		22 November 1994
 # Whom:			asami
 #
-# $Id: Makefile,v 1.8 1995/04/01 12:46:22 jkh Exp $
+# $Id: Makefile,v 1.9 1995/04/07 05:48:02 asami Exp $
 #
 
 DISTNAME=	Wnn4.2
@@ -21,12 +21,9 @@ IS_INTERACTIVE=	yes
 pre-build:
 	@(cd ${WRKSRC}; ${MAKE} ${MAKE_FLAGS} Makefile.inst World)
 
-pre-install:
-	@PREFIX=${PREFIX} ${SCRIPTDIR}/pre-install
+post-install:
 # This package uses imake's "install.man" target to install man pages but
 #  I can't define USE_IMAKE because it doesn't involve xmkmf
 	@(cd ${WRKSRC}; ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} install.man)
 
-pre-reinstall: pre-install
-
 .include <bsd.port.mk>
diff --git a/japanese/Wnn6/Makefile b/japanese/Wnn6/Makefile
index 8d844754e3b0..8a1f4f2cbb06 100644
--- a/japanese/Wnn6/Makefile
+++ b/japanese/Wnn6/Makefile
@@ -3,7 +3,7 @@
 # Date created:		22 November 1994
 # Whom:			asami
 #
-# $Id: Makefile,v 1.8 1995/04/01 12:46:22 jkh Exp $
+# $Id: Makefile,v 1.9 1995/04/07 05:48:02 asami Exp $
 #
 
 DISTNAME=	Wnn4.2
@@ -21,12 +21,9 @@ IS_INTERACTIVE=	yes
 pre-build:
 	@(cd ${WRKSRC}; ${MAKE} ${MAKE_FLAGS} Makefile.inst World)
 
-pre-install:
-	@PREFIX=${PREFIX} ${SCRIPTDIR}/pre-install
+post-install:
 # This package uses imake's "install.man" target to install man pages but
 #  I can't define USE_IMAKE because it doesn't involve xmkmf
 	@(cd ${WRKSRC}; ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} install.man)
 
-pre-reinstall: pre-install
-
 .include <bsd.port.mk>
diff --git a/japanese/Wnn7-lib/Makefile b/japanese/Wnn7-lib/Makefile
index 8d844754e3b0..8a1f4f2cbb06 100644
--- a/japanese/Wnn7-lib/Makefile
+++ b/japanese/Wnn7-lib/Makefile
@@ -3,7 +3,7 @@
 # Date created:		22 November 1994
 # Whom:			asami
 #
-# $Id: Makefile,v 1.8 1995/04/01 12:46:22 jkh Exp $
+# $Id: Makefile,v 1.9 1995/04/07 05:48:02 asami Exp $
 #
 
 DISTNAME=	Wnn4.2
@@ -21,12 +21,9 @@ IS_INTERACTIVE=	yes
 pre-build:
 	@(cd ${WRKSRC}; ${MAKE} ${MAKE_FLAGS} Makefile.inst World)
 
-pre-install:
-	@PREFIX=${PREFIX} ${SCRIPTDIR}/pre-install
+post-install:
 # This package uses imake's "install.man" target to install man pages but
 #  I can't define USE_IMAKE because it doesn't involve xmkmf
 	@(cd ${WRKSRC}; ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} install.man)
 
-pre-reinstall: pre-install
-
 .include <bsd.port.mk>
diff --git a/japanese/nkf/Makefile b/japanese/nkf/Makefile
index 3ca8c42dc808..97a701135546 100644
--- a/japanese/nkf/Makefile
+++ b/japanese/nkf/Makefile
@@ -3,7 +3,7 @@
 # Date created:		5 February 1995
 # Whom:			asami
 #
-# $Id: Makefile,v 1.4 1995/04/01 12:46:31 jkh Exp $
+# $Id: Makefile,v 1.5 1995/04/07 05:48:10 asami Exp $
 #
 
 DISTNAME=	nkf-1.5pl1
@@ -13,7 +13,7 @@ MASTER_SITES=	ftp://www.hitachi-sk.co.jp/pub/Japanese/filter/
 
 MAINTAINER=	asami@FreeBSD.ORG
 
-pre-patch: ${PATCH_COOKIE}
+pre-patch:
 	@echo "===>  Installing custom Makefile for ${DISTNAME}"
 	@(cp ${FILESDIR}/Makefile ${WRKSRC})