4 files changed, 34 insertions, 32 deletions

diff --git a/japanese/ebnetd/Makefile b/japanese/ebnetd/Makefile
index 7b5329a9568e..8b30d8fed06f 100644
--- a/japanese/ebnetd/Makefile
+++ b/japanese/ebnetd/Makefile
@@ -3,7 +3,7 @@
 # Date created:			2 Oct 1997
 # Whom:				Motoyuki Kasahara <m-kasahr@sra.co.jp>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1998/04/21 15:10:50 kuriyama Exp $
 #
 
 DISTNAME=	ndtpd-1.0.6
@@ -33,6 +33,7 @@ APPENDIXFILES=	chujiten-2.3.tar.gz \
 
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
+DIST_SUBDIR=	ndtpd
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--localstatedir=/var --enable-ja-info
 CONFIGURE_ENV=	INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
@@ -45,7 +46,7 @@ post-install:
 	    dir="`echo $$i | ${SED} 's/\.tar\.gz$$//'`"; \
 	    ${RM} -rf ${PREFIX}/${APPENDIXDIR}/$$dir; \
 	    (cd ${PREFIX}/${APPENDIXDIR} && ${EXTRACT_CMD} \
-		${EXTRACT_BEFORE_ARGS} ${DISTDIR}/$$i ${EXTRACT_AFTER_ARGS}); \
+		${EXTRACT_BEFORE_ARGS} ${DISTDIR}/${DIST_SUBDIR}/$$i ${EXTRACT_AFTER_ARGS}); \
 	done
 	if [ ! -f ${PREFIX}/info/dir ]; then \
 	  ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
@@ -61,7 +62,7 @@ plist: extract
 	${CAT} ${PKGDIR}/PLIST.top > ${PKGDIR}/PLIST
 	for i in ${APPENDIXFILES}; do \
 	    (cd ${WRKDIR}; \
-		${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/$$i \
+		${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/${DIST_SUBDIR}/$$i \
 		    ${EXTRACT_AFTER_ARGS}; \
 		find "`echo $$i | ${SED} 's/\.tar\.gz$$//'`" -type f -print \
 		    | ${SED} 's;^;${APPENDIXDIR}/;' >> ${PKGDIR}/PLIST); \
diff --git a/japanese/ebnetd/distinfo b/japanese/ebnetd/distinfo
index 3b62a611cc3e..ab4d6a340d96 100644
--- a/japanese/ebnetd/distinfo
+++ b/japanese/ebnetd/distinfo
@@ -1,13 +1,13 @@
-MD5 (ndtpd-1.0.6.tar.gz) = fd543f48921ebde6b06b40cde6eff422
-MD5 (chujiten-2.3.tar.gz) = 750c15b8e94faca7cb4b15b98d1fbb19
-MD5 (chujiten2-2.0.tar.gz) = 62a86bdb51a38b554bc6c3bb40da443a
-MD5 (chujiten6-2.3.tar.gz) = 76718d9ad23c75f0eb68f54222c6066d
-MD5 (heritage-2.2.tar.gz) = 71ef3b257474c83a0af385001eee3fbf
-MD5 (jitenban-2.4.tar.gz) = 884c9a57aef50dc55c458d5b17c04d30
-MD5 (jitenban97-2.1.tar.gz) = 3313235d76dbc57a2df29afd998a2894
-MD5 (kanjigen-2.0.tar.gz) = f023ec2e0772f3d2cf10972130971815
-MD5 (kojien-2.3.tar.gz) = baf54b5fd33c1fc3ce53627fc1e80d98
-MD5 (kojien2-2.0.tar.gz) = 00ec924d7d52d145588bed26aa24a325
-MD5 (kojien4-2.2.tar.gz) = b5cd05b34d24ec6c25c177550b66c787
-MD5 (readers-2.2.tar.gz) = 73e27f0f9727a9e225117f4611257fb3
-MD5 (readers2-2.0.tar.gz) = 5125b2925c76291ee2c0c616a09217c4
+MD5 (ndtpd/ndtpd-1.0.6.tar.gz) = fd543f48921ebde6b06b40cde6eff422
+MD5 (ndtpd/chujiten-2.3.tar.gz) = 750c15b8e94faca7cb4b15b98d1fbb19
+MD5 (ndtpd/chujiten2-2.0.tar.gz) = 62a86bdb51a38b554bc6c3bb40da443a
+MD5 (ndtpd/chujiten6-2.3.tar.gz) = 76718d9ad23c75f0eb68f54222c6066d
+MD5 (ndtpd/heritage-2.2.tar.gz) = 71ef3b257474c83a0af385001eee3fbf
+MD5 (ndtpd/jitenban-2.4.tar.gz) = 884c9a57aef50dc55c458d5b17c04d30
+MD5 (ndtpd/jitenban97-2.1.tar.gz) = 3313235d76dbc57a2df29afd998a2894
+MD5 (ndtpd/kanjigen-2.0.tar.gz) = f023ec2e0772f3d2cf10972130971815
+MD5 (ndtpd/kojien-2.3.tar.gz) = baf54b5fd33c1fc3ce53627fc1e80d98
+MD5 (ndtpd/kojien2-2.0.tar.gz) = 00ec924d7d52d145588bed26aa24a325
+MD5 (ndtpd/kojien4-2.2.tar.gz) = b5cd05b34d24ec6c25c177550b66c787
+MD5 (ndtpd/readers-2.2.tar.gz) = 73e27f0f9727a9e225117f4611257fb3
+MD5 (ndtpd/readers2-2.0.tar.gz) = 5125b2925c76291ee2c0c616a09217c4
diff --git a/japanese/ndtpd/Makefile b/japanese/ndtpd/Makefile
index 7b5329a9568e..8b30d8fed06f 100644
--- a/japanese/ndtpd/Makefile
+++ b/japanese/ndtpd/Makefile
@@ -3,7 +3,7 @@
 # Date created:			2 Oct 1997
 # Whom:				Motoyuki Kasahara <m-kasahr@sra.co.jp>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1998/04/21 15:10:50 kuriyama Exp $
 #
 
 DISTNAME=	ndtpd-1.0.6
@@ -33,6 +33,7 @@ APPENDIXFILES=	chujiten-2.3.tar.gz \
 
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
+DIST_SUBDIR=	ndtpd
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--localstatedir=/var --enable-ja-info
 CONFIGURE_ENV=	INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
@@ -45,7 +46,7 @@ post-install:
 	    dir="`echo $$i | ${SED} 's/\.tar\.gz$$//'`"; \
 	    ${RM} -rf ${PREFIX}/${APPENDIXDIR}/$$dir; \
 	    (cd ${PREFIX}/${APPENDIXDIR} && ${EXTRACT_CMD} \
-		${EXTRACT_BEFORE_ARGS} ${DISTDIR}/$$i ${EXTRACT_AFTER_ARGS}); \
+		${EXTRACT_BEFORE_ARGS} ${DISTDIR}/${DIST_SUBDIR}/$$i ${EXTRACT_AFTER_ARGS}); \
 	done
 	if [ ! -f ${PREFIX}/info/dir ]; then \
 	  ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
@@ -61,7 +62,7 @@ plist: extract
 	${CAT} ${PKGDIR}/PLIST.top > ${PKGDIR}/PLIST
 	for i in ${APPENDIXFILES}; do \
 	    (cd ${WRKDIR}; \
-		${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/$$i \
+		${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/${DIST_SUBDIR}/$$i \
 		    ${EXTRACT_AFTER_ARGS}; \
 		find "`echo $$i | ${SED} 's/\.tar\.gz$$//'`" -type f -print \
 		    | ${SED} 's;^;${APPENDIXDIR}/;' >> ${PKGDIR}/PLIST); \
diff --git a/japanese/ndtpd/distinfo b/japanese/ndtpd/distinfo
index 3b62a611cc3e..ab4d6a340d96 100644
--- a/japanese/ndtpd/distinfo
+++ b/japanese/ndtpd/distinfo
@@ -1,13 +1,13 @@
-MD5 (ndtpd-1.0.6.tar.gz) = fd543f48921ebde6b06b40cde6eff422
-MD5 (chujiten-2.3.tar.gz) = 750c15b8e94faca7cb4b15b98d1fbb19
-MD5 (chujiten2-2.0.tar.gz) = 62a86bdb51a38b554bc6c3bb40da443a
-MD5 (chujiten6-2.3.tar.gz) = 76718d9ad23c75f0eb68f54222c6066d
-MD5 (heritage-2.2.tar.gz) = 71ef3b257474c83a0af385001eee3fbf
-MD5 (jitenban-2.4.tar.gz) = 884c9a57aef50dc55c458d5b17c04d30
-MD5 (jitenban97-2.1.tar.gz) = 3313235d76dbc57a2df29afd998a2894
-MD5 (kanjigen-2.0.tar.gz) = f023ec2e0772f3d2cf10972130971815
-MD5 (kojien-2.3.tar.gz) = baf54b5fd33c1fc3ce53627fc1e80d98
-MD5 (kojien2-2.0.tar.gz) = 00ec924d7d52d145588bed26aa24a325
-MD5 (kojien4-2.2.tar.gz) = b5cd05b34d24ec6c25c177550b66c787
-MD5 (readers-2.2.tar.gz) = 73e27f0f9727a9e225117f4611257fb3
-MD5 (readers2-2.0.tar.gz) = 5125b2925c76291ee2c0c616a09217c4
+MD5 (ndtpd/ndtpd-1.0.6.tar.gz) = fd543f48921ebde6b06b40cde6eff422
+MD5 (ndtpd/chujiten-2.3.tar.gz) = 750c15b8e94faca7cb4b15b98d1fbb19
+MD5 (ndtpd/chujiten2-2.0.tar.gz) = 62a86bdb51a38b554bc6c3bb40da443a
+MD5 (ndtpd/chujiten6-2.3.tar.gz) = 76718d9ad23c75f0eb68f54222c6066d
+MD5 (ndtpd/heritage-2.2.tar.gz) = 71ef3b257474c83a0af385001eee3fbf
+MD5 (ndtpd/jitenban-2.4.tar.gz) = 884c9a57aef50dc55c458d5b17c04d30
+MD5 (ndtpd/jitenban97-2.1.tar.gz) = 3313235d76dbc57a2df29afd998a2894
+MD5 (ndtpd/kanjigen-2.0.tar.gz) = f023ec2e0772f3d2cf10972130971815
+MD5 (ndtpd/kojien-2.3.tar.gz) = baf54b5fd33c1fc3ce53627fc1e80d98
+MD5 (ndtpd/kojien2-2.0.tar.gz) = 00ec924d7d52d145588bed26aa24a325
+MD5 (ndtpd/kojien4-2.2.tar.gz) = b5cd05b34d24ec6c25c177550b66c787
+MD5 (ndtpd/readers-2.2.tar.gz) = 73e27f0f9727a9e225117f4611257fb3
+MD5 (ndtpd/readers2-2.0.tar.gz) = 5125b2925c76291ee2c0c616a09217c4