6 files changed, 29 insertions, 31 deletions
diff --git a/japanese/netscape4-communicator/Makefile b/japanese/netscape4-communicator/Makefile
index 52919035b168..e070e170d621 100644
--- a/japanese/netscape4-communicator/Makefile
+++ b/japanese/netscape4-communicator/Makefile
@@ -3,7 +3,7 @@
 # Date created:		13 Mar 1998
 # Whom:			sada@FreeBSD.ORG
 #
-# $Id: Makefile,v 1.23 1999/06/12 23:53:22 sada Exp $
+# $Id: Makefile,v 1.24 1999/06/24 20:10:39 sada Exp $
 #
 
 DISTNAME=	ja-netscape-${BROWSER}-${BROWSER_VERSION}
@@ -46,21 +46,21 @@ NETHELP?=	nethelp-v406
 
 .SILENT:
 
-post-patch:
-.if defined(PATCHDIRS)
-	for dir in ${PATCHDIRS}; do \
-		for patch in $$dir/patch-*; do \
-			${PATCH} ${PATCH_DIST_ARGS} < $$patch; \
-		done; \
-	done
-.endif
-
 do-configure:
 	${MAKESCRIPT} ${MASTERDIR}/files/start.sh.in >${WRKDIR}/start.sh
-	${MAKESCRIPT} ${WRKSRC}/Netscape.ad-ja_euc >${WRKDIR}/Netscape
+	${MAKESCRIPT} ${WRKSRC}/Netscape.ad-ja_euc \
+	 | ${SED} "s/-dt-interface system-medium-\*-\*-S\*-\*-\*-\*-\*-\*-\*-\*-\*:/-misc-fixed-medium-r-normal--14-\*-\*-\*-\*-\*-iso8859-1; -misc-fixed-medium-r-normal--14-*-*-*-*-*-jisx0208.1983-0; -misc-fixed-medium-r-normal--14-*-*-*-*-*-jisx0201.1976-0:/;" \
+	 >${WRKDIR}/Netscape
 	${MAKESCRIPT} ${MASTERDIR}/files/INSTALL >${PKGINSTALL}
 	${CP} ${WRKSRC}/about ${WRKDIR}/about
-	${CP} ${WRKSRC}/about ${WRKDIR}/splash
+.if (${BROWSER} == navigator)
+	${CP} ${WRKDIR}/Netscape ${WRKDIR}/Netscape.orig
+	${SED} "s/Communicator/Navigator/g" ${WRKDIR}/Netscape.orig \
+	 > ${WRKDIR}/Netscape
+	${SED} "s/Communicator/Navigator/g" ${WRKSRC}/about \
+	 > ${WRKDIR}/about
+.endif
+	${CP} ${WRKDIR}/about ${WRKDIR}/splash
 
 do-install:
 	${INSTALL_DATA} ${MASTERDIR}/files/preferences.js ${NDIR}
diff --git a/japanese/netscape4-navigator/Makefile b/japanese/netscape4-navigator/Makefile
index 3e4631d3ec82..048d6ce873b4 100644
--- a/japanese/netscape4-navigator/Makefile
+++ b/japanese/netscape4-navigator/Makefile
@@ -3,7 +3,7 @@
 # Date created:		13 Mar 1998
 # Whom:			sada@FreeBSD.ORG
 #
-# $Id: Makefile,v 1.10 1998/12/29 21:53:22 sada Exp $
+# $Id: Makefile,v 1.11 1999/06/24 20:10:47 sada Exp $
 #
 
 MASTERDIR=	${.CURDIR}/../netscape4-communicator
@@ -11,6 +11,5 @@ MASTERDIR=	${.CURDIR}/../netscape4-communicator
 MAINTAINER=	sada@FreeBSD.ORG
 
 BROWSER=	navigator
-PATCHDIRS=	${.CURDIR}/patches
 
 .include	"${MASTERDIR}/Makefile"
diff --git a/japanese/netscape47-communicator/Makefile b/japanese/netscape47-communicator/Makefile
index 4301ec87b799..b577c344da24 100644
--- a/japanese/netscape47-communicator/Makefile
+++ b/japanese/netscape47-communicator/Makefile
@@ -3,7 +3,7 @@
 # Date created:		13 Mar 1998
 # Whom:			sada
 #
-# $Id: Makefile,v 1.9 1999/06/12 23:53:28 sada Exp $
+# $Id: Makefile,v 1.10 1999/06/24 20:10:50 sada Exp $
 #
 
 MASTERDIR=	${.CURDIR}/../netscape4-communicator
@@ -17,7 +17,7 @@ PATCHDIR=	${.CURDIR}/../netscape46-communicator/patches
 
 BROWSER_CMD=	ja-${BROWSER}-46
 BROWSER_VERSION=	4.61
-JAPANIZE_KIT=	communicator-ja-euc-v46-export.generic-generic-generic.tar.gz
+JAPANIZE_KIT=	communicator-ja-euc-v461-export.generic-generic-generic.tar.gz
 NETHELP=	nethelp-v451
 
 .include "${MASTERDIR}/Makefile"
diff --git a/japanese/netscape47-communicator/distinfo b/japanese/netscape47-communicator/distinfo
index 7040227fcc46..7af350073161 100644
--- a/japanese/netscape47-communicator/distinfo
+++ b/japanese/netscape47-communicator/distinfo
@@ -1 +1 @@
-MD5 (communicator-ja-euc-v46-export.generic-generic-generic.tar.gz) = 10596607a51e35e336ac1d3070008557
+MD5 (communicator-ja-euc-v461-export.generic-generic-generic.tar.gz) = 8da3b960eb22481a6bd09144934afab8
diff --git a/japanese/netscape47-navigator/Makefile b/japanese/netscape47-navigator/Makefile
index 0de88c5d2504..4cd46f1e2d86 100644
--- a/japanese/netscape47-navigator/Makefile
+++ b/japanese/netscape47-navigator/Makefile
@@ -3,7 +3,7 @@
 # Date created:		29 Dec 1998
 # Whom:			sada@FreeBSD.ORG
 #
-# $Id: Makefile,v 1.5 1999/05/21 01:17:33 sada Exp $
+# $Id: Makefile,v 1.6 1999/06/24 20:10:55 sada Exp $
 #
 
 MAINTAINER=	sada@FreeBSD.ORG
@@ -12,6 +12,5 @@ FILESDIR=	${BASEDIR}/files
 
 BASEDIR=	${.CURDIR}/../netscape46-communicator
 BROWSER=	navigator
-PATCHDIRS=	${.CURDIR}/../netscape46-navigator/patches
 
 .include	"${BASEDIR}/Makefile"
diff --git a/japanese/netscape48-communicator/Makefile b/japanese/netscape48-communicator/Makefile
index 52919035b168..e070e170d621 100644
--- a/japanese/netscape48-communicator/Makefile
+++ b/japanese/netscape48-communicator/Makefile
@@ -3,7 +3,7 @@
 # Date created:		13 Mar 1998
 # Whom:			sada@FreeBSD.ORG
 #
-# $Id: Makefile,v 1.23 1999/06/12 23:53:22 sada Exp $
+# $Id: Makefile,v 1.24 1999/06/24 20:10:39 sada Exp $
 #
 
 DISTNAME=	ja-netscape-${BROWSER}-${BROWSER_VERSION}
@@ -46,21 +46,21 @@ NETHELP?=	nethelp-v406
 
 .SILENT:
 
-post-patch:
-.if defined(PATCHDIRS)
-	for dir in ${PATCHDIRS}; do \
-		for patch in $$dir/patch-*; do \
-			${PATCH} ${PATCH_DIST_ARGS} < $$patch; \
-		done; \
-	done
-.endif
-
 do-configure:
 	${MAKESCRIPT} ${MASTERDIR}/files/start.sh.in >${WRKDIR}/start.sh
-	${MAKESCRIPT} ${WRKSRC}/Netscape.ad-ja_euc >${WRKDIR}/Netscape
+	${MAKESCRIPT} ${WRKSRC}/Netscape.ad-ja_euc \
+	 | ${SED} "s/-dt-interface system-medium-\*-\*-S\*-\*-\*-\*-\*-\*-\*-\*-\*:/-misc-fixed-medium-r-normal--14-\*-\*-\*-\*-\*-iso8859-1; -misc-fixed-medium-r-normal--14-*-*-*-*-*-jisx0208.1983-0; -misc-fixed-medium-r-normal--14-*-*-*-*-*-jisx0201.1976-0:/;" \
+	 >${WRKDIR}/Netscape
 	${MAKESCRIPT} ${MASTERDIR}/files/INSTALL >${PKGINSTALL}
 	${CP} ${WRKSRC}/about ${WRKDIR}/about
-	${CP} ${WRKSRC}/about ${WRKDIR}/splash
+.if (${BROWSER} == navigator)
+	${CP} ${WRKDIR}/Netscape ${WRKDIR}/Netscape.orig
+	${SED} "s/Communicator/Navigator/g" ${WRKDIR}/Netscape.orig \
+	 > ${WRKDIR}/Netscape
+	${SED} "s/Communicator/Navigator/g" ${WRKSRC}/about \
+	 > ${WRKDIR}/about
+.endif
+	${CP} ${WRKDIR}/about ${WRKDIR}/splash
 
 do-install:
 	${INSTALL_DATA} ${MASTERDIR}/files/preferences.js ${NDIR}