From 655edd3a293570c56ef2e95628d33962a52624c0 Mon Sep 17 00:00:00 2001
From: Yoichi NAKAYAMA <yoichi@FreeBSD.org>
Date: Sun, 2 Dec 2001 15:10:01 +0000
Subject: Create appropriate DOC_FILE in build stage, instead of renaming in
 install stage.

Submitted by:	MAINTAINER
Reviewed by:	knu(mentor)
---
 japanese/emacs-emcws/Makefile         |  5 ++---
 japanese/emacs-emcws/files/patch-eb   | 13 +++++++++++--
 japanese/emacs20-emcws/Makefile       |  5 ++---
 japanese/emacs20-emcws/files/patch-eb | 13 +++++++++++--
 japanese/emacs21-emcws/Makefile       |  5 ++---
 japanese/emacs21-emcws/files/patch-eb | 13 +++++++++++--
 6 files changed, 39 insertions(+), 15 deletions(-)

diff --git a/japanese/emacs-emcws/Makefile b/japanese/emacs-emcws/Makefile
index fc34f06ef33c..bf834ab8f26b 100644
--- a/japanese/emacs-emcws/Makefile
+++ b/japanese/emacs-emcws/Makefile
@@ -131,14 +131,13 @@ pre-fetch:
 pre-build:
 	find ${WRKSRC} \( -name \*.orig -o -name \*~ \) -exec ${RM} -f \{} \;
 	${RM} -rf ${WRKSRC}/info/*
-	${LN} -sf DOC ${WRKSRC}/etc/${DOC_FILE}
 	@(cd ${WRKSRC}/src; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} emacs)
 	@(cd ${WRKSRC}/src/../lisp; \
 	${WRKSRC}/src/emacs -batch -q -f batch-byte-compile \
 	ange-ftp.el help.el international/ccl.el international/mule-cmds.el \
 	international/mule.el international/titdic-cnv.el)
 	${RM} -f ${WRKSRC}/src/emacs ${WRKSRC}/src/emacs-${EMACS_VER}.1
-	${RM} -f ${WRKSRC}/etc/DOC-${EMACS_VER}.1
+	${RM} -f ${WRKSRC}/etc/${DOC_FILE}
 	${RM} -f ${WRKSRC}/lib-src/fns-emcws-${EMACS_VER}.1.el
 
 do-install:
@@ -147,7 +146,7 @@ do-install:
 	@${LN} ${PREFIX}/bin/emcws-${EMACS_VER} ${PREFIX}/bin/emcws
 	@test -d ${PREFIX}/share/emacs/${EMACS_VER}-emcws/etc || \
 		${MKDIR} ${PREFIX}/share/emacs/${EMACS_VER}-emcws/etc
-	@${INSTALL_DATA} ${WRKSRC}/etc/DOC ${PREFIX}/share/emacs/${EMACS_VER}-emcws/etc/${DOC_FILE}
+	@${INSTALL_DATA} ${WRKSRC}/etc/${DOC_FILE} ${PREFIX}/share/emacs/${EMACS_VER}-emcws/etc/${DOC_FILE}
 	@test -d ${PREFIX}/share/emacs/${EMACS_VER}-emcws/lisp/its || \
 		${MKDIR} ${PREFIX}/share/emacs/${EMACS_VER}-emcws/lisp/its
 	@for i in ${EMCWS_ELCS}; do \
diff --git a/japanese/emacs-emcws/files/patch-eb b/japanese/emacs-emcws/files/patch-eb
index 83cc685c15c3..3b471abbd975 100644
--- a/japanese/emacs-emcws/files/patch-eb
+++ b/japanese/emacs-emcws/files/patch-eb
@@ -1,5 +1,14 @@
---- lisp/loadup.el.orig	Wed Nov 28 20:54:00 2001
-+++ lisp/loadup.el	Wed Nov 28 20:55:24 2001
+--- lisp/loadup.el.orig	Sun Dec  2 22:10:51 2001
++++ lisp/loadup.el	Sun Dec  2 22:12:10 2001
+@@ -246,7 +246,7 @@
+       (if (memq system-type '(ms-dos windows-nt))
+ 	  (setq name (expand-file-name
+ 		      (if (fboundp 'x-create-frame) "DOC-X" "DOC") "../etc"))
+-	(setq name (concat (expand-file-name "../etc/DOC-") name))
++	(setq name (concat (expand-file-name "../etc/DOC-EMCWS-") name))
+ 	(if (file-exists-p name)
+ 	    (delete-file name))
+ 	(copy-file (expand-file-name "../etc/DOC") name t))
 @@ -280,11 +280,11 @@
  		    (expand-file-name
  		     (cond 
diff --git a/japanese/emacs20-emcws/Makefile b/japanese/emacs20-emcws/Makefile
index fc34f06ef33c..bf834ab8f26b 100644
--- a/japanese/emacs20-emcws/Makefile
+++ b/japanese/emacs20-emcws/Makefile
@@ -131,14 +131,13 @@ pre-fetch:
 pre-build:
 	find ${WRKSRC} \( -name \*.orig -o -name \*~ \) -exec ${RM} -f \{} \;
 	${RM} -rf ${WRKSRC}/info/*
-	${LN} -sf DOC ${WRKSRC}/etc/${DOC_FILE}
 	@(cd ${WRKSRC}/src; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} emacs)
 	@(cd ${WRKSRC}/src/../lisp; \
 	${WRKSRC}/src/emacs -batch -q -f batch-byte-compile \
 	ange-ftp.el help.el international/ccl.el international/mule-cmds.el \
 	international/mule.el international/titdic-cnv.el)
 	${RM} -f ${WRKSRC}/src/emacs ${WRKSRC}/src/emacs-${EMACS_VER}.1
-	${RM} -f ${WRKSRC}/etc/DOC-${EMACS_VER}.1
+	${RM} -f ${WRKSRC}/etc/${DOC_FILE}
 	${RM} -f ${WRKSRC}/lib-src/fns-emcws-${EMACS_VER}.1.el
 
 do-install:
@@ -147,7 +146,7 @@ do-install:
 	@${LN} ${PREFIX}/bin/emcws-${EMACS_VER} ${PREFIX}/bin/emcws
 	@test -d ${PREFIX}/share/emacs/${EMACS_VER}-emcws/etc || \
 		${MKDIR} ${PREFIX}/share/emacs/${EMACS_VER}-emcws/etc
-	@${INSTALL_DATA} ${WRKSRC}/etc/DOC ${PREFIX}/share/emacs/${EMACS_VER}-emcws/etc/${DOC_FILE}
+	@${INSTALL_DATA} ${WRKSRC}/etc/${DOC_FILE} ${PREFIX}/share/emacs/${EMACS_VER}-emcws/etc/${DOC_FILE}
 	@test -d ${PREFIX}/share/emacs/${EMACS_VER}-emcws/lisp/its || \
 		${MKDIR} ${PREFIX}/share/emacs/${EMACS_VER}-emcws/lisp/its
 	@for i in ${EMCWS_ELCS}; do \
diff --git a/japanese/emacs20-emcws/files/patch-eb b/japanese/emacs20-emcws/files/patch-eb
index 83cc685c15c3..3b471abbd975 100644
--- a/japanese/emacs20-emcws/files/patch-eb
+++ b/japanese/emacs20-emcws/files/patch-eb
@@ -1,5 +1,14 @@
---- lisp/loadup.el.orig	Wed Nov 28 20:54:00 2001
-+++ lisp/loadup.el	Wed Nov 28 20:55:24 2001
+--- lisp/loadup.el.orig	Sun Dec  2 22:10:51 2001
++++ lisp/loadup.el	Sun Dec  2 22:12:10 2001
+@@ -246,7 +246,7 @@
+       (if (memq system-type '(ms-dos windows-nt))
+ 	  (setq name (expand-file-name
+ 		      (if (fboundp 'x-create-frame) "DOC-X" "DOC") "../etc"))
+-	(setq name (concat (expand-file-name "../etc/DOC-") name))
++	(setq name (concat (expand-file-name "../etc/DOC-EMCWS-") name))
+ 	(if (file-exists-p name)
+ 	    (delete-file name))
+ 	(copy-file (expand-file-name "../etc/DOC") name t))
 @@ -280,11 +280,11 @@
  		    (expand-file-name
  		     (cond 
diff --git a/japanese/emacs21-emcws/Makefile b/japanese/emacs21-emcws/Makefile
index fc34f06ef33c..bf834ab8f26b 100644
--- a/japanese/emacs21-emcws/Makefile
+++ b/japanese/emacs21-emcws/Makefile
@@ -131,14 +131,13 @@ pre-fetch:
 pre-build:
 	find ${WRKSRC} \( -name \*.orig -o -name \*~ \) -exec ${RM} -f \{} \;
 	${RM} -rf ${WRKSRC}/info/*
-	${LN} -sf DOC ${WRKSRC}/etc/${DOC_FILE}
 	@(cd ${WRKSRC}/src; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} emacs)
 	@(cd ${WRKSRC}/src/../lisp; \
 	${WRKSRC}/src/emacs -batch -q -f batch-byte-compile \
 	ange-ftp.el help.el international/ccl.el international/mule-cmds.el \
 	international/mule.el international/titdic-cnv.el)
 	${RM} -f ${WRKSRC}/src/emacs ${WRKSRC}/src/emacs-${EMACS_VER}.1
-	${RM} -f ${WRKSRC}/etc/DOC-${EMACS_VER}.1
+	${RM} -f ${WRKSRC}/etc/${DOC_FILE}
 	${RM} -f ${WRKSRC}/lib-src/fns-emcws-${EMACS_VER}.1.el
 
 do-install:
@@ -147,7 +146,7 @@ do-install:
 	@${LN} ${PREFIX}/bin/emcws-${EMACS_VER} ${PREFIX}/bin/emcws
 	@test -d ${PREFIX}/share/emacs/${EMACS_VER}-emcws/etc || \
 		${MKDIR} ${PREFIX}/share/emacs/${EMACS_VER}-emcws/etc
-	@${INSTALL_DATA} ${WRKSRC}/etc/DOC ${PREFIX}/share/emacs/${EMACS_VER}-emcws/etc/${DOC_FILE}
+	@${INSTALL_DATA} ${WRKSRC}/etc/${DOC_FILE} ${PREFIX}/share/emacs/${EMACS_VER}-emcws/etc/${DOC_FILE}
 	@test -d ${PREFIX}/share/emacs/${EMACS_VER}-emcws/lisp/its || \
 		${MKDIR} ${PREFIX}/share/emacs/${EMACS_VER}-emcws/lisp/its
 	@for i in ${EMCWS_ELCS}; do \
diff --git a/japanese/emacs21-emcws/files/patch-eb b/japanese/emacs21-emcws/files/patch-eb
index 83cc685c15c3..3b471abbd975 100644
--- a/japanese/emacs21-emcws/files/patch-eb
+++ b/japanese/emacs21-emcws/files/patch-eb
@@ -1,5 +1,14 @@
---- lisp/loadup.el.orig	Wed Nov 28 20:54:00 2001
-+++ lisp/loadup.el	Wed Nov 28 20:55:24 2001
+--- lisp/loadup.el.orig	Sun Dec  2 22:10:51 2001
++++ lisp/loadup.el	Sun Dec  2 22:12:10 2001
+@@ -246,7 +246,7 @@
+       (if (memq system-type '(ms-dos windows-nt))
+ 	  (setq name (expand-file-name
+ 		      (if (fboundp 'x-create-frame) "DOC-X" "DOC") "../etc"))
+-	(setq name (concat (expand-file-name "../etc/DOC-") name))
++	(setq name (concat (expand-file-name "../etc/DOC-EMCWS-") name))
+ 	(if (file-exists-p name)
+ 	    (delete-file name))
+ 	(copy-file (expand-file-name "../etc/DOC") name t))
 @@ -280,11 +280,11 @@
  		    (expand-file-name
  		     (cond 
-- 
cgit v1.2.3