Minor updates.

PR:		3631
Submitted by:	Kazuhiko Kiriyama <kiri@kiri.toba-cmt.ac.jp>

2 files changed, 15 insertions, 29 deletions

diff --git a/japanese/man/Makefile b/japanese/man/Makefile
index 9a83a7f44eaf..dec1dce52ee9 100644
--- a/japanese/man/Makefile
+++ b/japanese/man/Makefile
@@ -3,7 +3,7 @@
 # Date created:		4 December 1996
 # Whom:			Kiriyama Kazuhiko <kiri@kiri.toba-cmt.ac.jp>
 #
-# $Id: Makefile,v 1.6 1997/03/30 02:57:16 max Exp $
+# $Id: Makefile,v 1.7 1997/03/30 12:40:11 asami Exp $
 #
 
 DISTNAME=	jp-man-1.1
@@ -34,44 +34,31 @@ JMANELDIR=	${PREFIX}/lib/mule/site-lisp/jman
 # See a make rule of target pre-patch for details.
 # 
 XPG4LIBPATH?=		/usr/lib
-XPG4PATCHFILEORG=	patch-xpg4_org
-NOXPG4PATCHFILEORG=	patch-noxpg4_org
-XPG4PATCHFILE=		patch-xpg4
-XPG4PATCHSUFX=		xpg4
 
 pre-patch:
 	@${MKDIR} ${PATCHDIR}
-	@rm -f ${PATCHDIR}/patch-${XPG4PATCHSUFX}
+	@${RM} -f ${PATCHDIR}/patch-aa
 .if !defined(NOUSE_XPG4LIB)
-	@${SED} -e "s,%xpg4_lib_path%,${XPG4LIBPATH},g" < ${FILESDIR}/${XPG4PATCHFILEORG} > ${FILESDIR}/${XPG4PATCHFILE}
-.if defined(PATCH_DEBUG)
+	@${SED} -e "s,%XPG4LIBPATH%,${XPG4LIBPATH},g" \
+		< ${FILESDIR}/patch-xpg4.tmpl > ${FILESDIR}/patch-xpg4
 	@(for libfile in ${XPG4LIBPATH}/libxpg4*; do \
 		if [ ! "$$libfile" = "" ]; then \
-			${ECHO_MSG} "===>  Finding the xpg4 library in /usr/lib"; \
-			ln -sf ${FILESDIR}/${XPG4PATCHFILE} ${PATCHDIR}/patch-${XPG4PATCHSUFX}; \
-			${ECHO_MSG} "===>  Adding on a patch for to use the xpg4 libray when linking"; \
+			ln -sf ${FILESDIR}/patch-xpg4 \
+				${PATCHDIR}/patch-aa; \
 			break 1; \
 		fi; \
 	done)
 .else
-	@(for libfile in ${XPG4LIBPATH}/libxpg4*; do \
-		if [ ! "$$libfile" = "" ]; then \
-			ln -sf ${FILESDIR}/${XPG4PATCHFILE} ${PATCHDIR}/patch-${XPG4PATCHSUFX}; \
-			break 1; \
-		fi; \
-	done)
-.endif
-.else
-	@${CP} ${FILESDIR}/${NOXPG4PATCHFILEORG} ${FILESDIR}/${XPG4PATCHFILE}
-	@ln -sf ${FILESDIR}/${XPG4PATCHFILE} ${PATCHDIR}/patch-${XPG4PATCHSUFX}
+	@ln -sf ${FILESDIR}/patch-noxpg4 ${PATCHDIR}/patch-aa
 .endif
 
 post-install:
 	@${MKDIR} ${JMANELDIR}
 	@${INSTALL_DATA} ${FILESDIR}/jman.el ${JMANELDIR}
-	@${SETENV} CP=${CP} PKG_PREFIX=${PREFIX} /bin/sh ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
+	@${SETENV} CP=${CP} PKG_PREFIX=${PREFIX} \
+		/bin/sh ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
 
 pre-clean:
-	@rm -f ${FILESDIR}/${XPG4PATCHFILE} ${PATCHDIR}/patch-${XPG4PATCHSUFX}
+	@${RM} -f ${PATCHDIR}/patch-aa ${FILESDIR}/patch-xpg4
 
 .include <bsd.port.mk>
diff --git a/japanese/man/pkg-install b/japanese/man/pkg-install
index da45a139b8b8..4bd69c476b81 100644
--- a/japanese/man/pkg-install
+++ b/japanese/man/pkg-install
@@ -1,20 +1,19 @@
 #!/bin/sh
 
-CP=${CP:-/bin/cp}
+TOUCH=${TOUCH:-/usr/bin/touch}
 
-usr_tmac=/usr/share/tmac
-local_tmac=${PKG_PREFIX}/share/groff/tmac
 elispdir=${PKG_PREFIX}/lib/mule/site-lisp
 
 OptionStart=";;; Jman configuration options"
 OptionEnd=";;; End of Jman configuration options"
 
 if [ "X$2" = X"POST-INSTALL" ]; then
-	${CP} -p ${usr_tmac}/tmac.an ${local_tmac}
-	${CP} -p ${usr_tmac}/tmac.groff_an ${local_tmac}
+	if [ ! -f ${elispdir}/site-start.el ]; then 
+		 ${TOUCH} ${elispdir}/site-start.el
+	fi
 	if [ "`grep \"^${OptionStart}\"  ${elispdir}/site-start.el`" ]; then 
 		sed -e "/^${OptionStart}/,/^${OptionEnd}/d" \
-			${elispdir}/site-start.el > ${elispdir}/site-start.el.bak
+		    ${elispdir}/site-start.el > ${elispdir}/site-start.el.bak
 		mv ${elispdir}/site-start.el.bak ${elispdir}/site-start.el
 	fi
 	echo "Adding \"Jman\" entry to ${elispdir}/site-start.el"