Index: head/japanese/emacs20-dl-canna/Makefile
===================================================================
--- head/japanese/emacs20-dl-canna/Makefile	(revision 24720)
+++ head/japanese/emacs20-dl-canna/Makefile	(revision 24721)
@@ -1,54 +1,54 @@
 # New ports collection makefile for:	emacs20-dl-canna
 # Version required:	1.2
 # Date created:		10 October 1998
 # Whom:			shige
 #
 # $FreeBSD$
 #
 
 DISTNAME=	emacs-canna-${DLCANNA_VER}
 PKGNAME=	ja-emacs20-dl-canna-${DLCANNA_VER}
 CATEGORIES=	japanese editors
 MASTER_SITES=	ftp://ftp.jaist.ac.jp/pub/GNU/elisp/emacs-20-dl/ \
 		${MASTER_SITE_PORTS_JP} 
 
 MAINTAINER=	shige@FreeBSD.org
 
 LIB_DEPENDS=	canna.1:${PORTSDIR}/japanese/Canna
 # Building this port requires emacs-dl source tree: ${EMACSDL_DIR}:configure
 BUILD_DEPENDS=	emacs-dl-${EMACS_VER}:${EMACSDL_DIR} \
 		/nonexistent:${EMACSDL_DIR}:configure \
 		${APEL_DEPENDS}:${PORTSDIR}/editors/apel-emacs20
 RUN_DEPENDS=	emacs-dl-${EMACS_VER}:${EMACSDL_DIR} \
 		${APEL_DEPENDS}:${PORTSDIR}/editors/apel-emacs20
 
 GNU_CONFIGURE=	YES
 CONFIGURE_ARGS=	--with-canna-includes=${PREFIX}/include \
 		--with-canna-libraries=${PREFIX}/lib \
 		--with-emacs-srcdir=${EMACSDL_SRCDIR}
 CONFIGURE_ENV=	EMACS="emacs-dl-${EMACS_VER}"
 PLIST_SUB=	EMACS_VER=${EMACS_VER} EMACS_ARCH=${MACHINE_ARCH}--freebsd \
 		DLCANNA_VER=${DLCANNA_VER} LISPDIR=${LISPDIR} DOCDIR=${DOCDIR}
 
 # ports variables
 EMACS_VER=	20.5
-EMACSDL_DIR=	${.CURDIR}/../../editors/emacs20-dl
+EMACSDL_DIR=	${PORTSDIR}/editors/emacs20-dl
 EMACSDL_SRCDIR=	${WRKDIRPREFIX}${EMACSDL_DIR}/work/emacs-${EMACS_VER}/src
 APEL_DEPENDS=	${PREFIX}/share/emacs/${EMACS_VER}/site-lisp/emu/emu.el
 LISPDIR=	share/emacs/site-lisp
 DOCDIR=		share/doc/emacs20-dl-canna
 DLCANNA_VER=	1.2
 # hack to allow parallel build to work
 .if defined(PARALLEL_PACKAGE_BUILD)
 BUILD_DEPENDS+=	gmake:${PORTSDIR}/devel/gmake \
 		autoconf:${PORTSDIR}/devel/autoconf
 .endif
 
 post-install:
 .if !defined(NOPORTDOCS)
 	@[ -d ${PREFIX}/${DOCDIR} ] || ${MKDIR} ${PREFIX}/${DOCDIR}
 	@${INSTALL_DATA} ${WRKSRC}/README.ja ${PREFIX}/${DOCDIR}
 	@${INSTALL_DATA} ${WRKSRC}/ChangeLog ${PREFIX}/${DOCDIR}
 .endif
 
 .include <bsd.port.mk>

Property changes on: head/japanese/emacs20-dl-canna/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.12
\ No newline at end of property
+1.13
\ No newline at end of property
Index: head/japanese/emacs20-dl-wnn6/Makefile
===================================================================
--- head/japanese/emacs20-dl-wnn6/Makefile	(revision 24720)
+++ head/japanese/emacs20-dl-wnn6/Makefile	(revision 24721)
@@ -1,49 +1,50 @@
 # New ports collection makefile for:	emacs20-dl-wnn6
 # Version required:	0.3.6
 # Date created:		10 October 1998
 # Whom:			shige
 #
 # $FreeBSD$
 #
 
 DISTNAME=	dl-wnn-0.3.6
 PKGNAME=	ja-emacs20-dl-wnn6-0.3.6
 CATEGORIES=	japanese editors
 MASTER_SITES=	http://tt-www.cs.titech.ac.jp/~katsuya/emacs/
 
 MAINTAINER=	shige@FreeBSD.org
 
 LIB_DEPENDS=	wnn6.1:${.CURDIR}/../../japanese/Wnn6-lib
 BUILD_DEPENDS=	emacs-dl-${EMACS_VER}:${EMACSDL_DIR} \
 		/nonexistent:${EMACSDL_DIR}:configure
 RUN_DEPENDS=	emacs-dl-${EMACS_VER}:${EMACSDL_DIR}
 
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-wnn6 \
 		--with-wnn-includes=${PREFIX}/include/wnn \
 		--with-wnn-libraries=${PREFIX}/lib \
-		--with-emacs-src=${WRKDIRPREFIX}${EMACSDL_DIR}/work/emacs-${EMACS_VER}
+		--with-emacs-src=${EMACSDL_SRCDIR}
 CONFIGURE_ENV=	EMACS=${PREFIX}/bin/emacs-dl-${EMACS_VER}
 PLIST_SUB=	EMACS_VER=${EMACS_VER} EMACS_ARCH=${MACHINE_ARCH}--freebsd \
 		DOCDIR=${DOCDIR}
 
 DOCDIR=		share/doc/emacs20-dl-wnn6
 EMACS_VER=	20.5
-EMACSDL_DIR=	${.CURDIR}/../../editors/emacs20-dl
+EMACSDL_DIR=	${PORTSDIR}/editors/emacs20-dl
+EMACSDL_SRCDIR=	${WRKDIRPREFIX}${EMACSDL_DIR}/work/emacs-${EMACS_VER}
 # hack to allow parallel build to work
 .if defined(PARALLEL_PACKAGE_BUILD)
 BUILD_DEPENDS+=	gmake:${PORTSDIR}/devel/gmake \
 		autoconf:${PORTSDIR}/devel/autoconf
 .endif
 
 post-install:
 	@${LN} -sf ${PREFIX}/share/emacs/site-lisp/egg/eggrc-wnn \
 		${PREFIX}/share/emacs/site-lisp/egg/.eggrc
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${PREFIX}/${DOCDIR}
 	@${INSTALL_DATA} ${WRKSRC}/README.ja ${PREFIX}/${DOCDIR}
 	@${INSTALL_DATA} ${WRKSRC}/ChangeLog ${PREFIX}/${DOCDIR}
 .endif
 
 .include <bsd.port.mk>

Property changes on: head/japanese/emacs20-dl-wnn6/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.10
\ No newline at end of property
+1.11
\ No newline at end of property