From 0cc63f1b2ee39effce71f1771175a09dbd99b82f Mon Sep 17 00:00:00 2001 From: Shigeyuki Fukushima Date: Fri, 14 Jan 2000 14:59:42 +0000 Subject: [PATCH] Use ${PORTSDIR} instead of ${.CURDIR}/../.. in (BUILD|RUN)_DEPENDS variables and other variables. Because there is no relation of master/slave between this port and editors/emacs20-dl. ${.CURDIR}/../.. should not be used. --- japanese/emacs20-dl-canna/Makefile | 2 +- japanese/emacs20-dl-wnn6/Makefile | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/japanese/emacs20-dl-canna/Makefile b/japanese/emacs20-dl-canna/Makefile index 8ecffd513f8f..db4d01c579a2 100644 --- a/japanese/emacs20-dl-canna/Makefile +++ b/japanese/emacs20-dl-canna/Makefile @@ -32,7 +32,7 @@ PLIST_SUB= EMACS_VER=${EMACS_VER} EMACS_ARCH=${MACHINE_ARCH}--freebsd \ # 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 diff --git a/japanese/emacs20-dl-wnn6/Makefile b/japanese/emacs20-dl-wnn6/Makefile index fa0bc0fad862..39bb0dd1878a 100644 --- a/japanese/emacs20-dl-wnn6/Makefile +++ b/japanese/emacs20-dl-wnn6/Makefile @@ -23,14 +23,15 @@ 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 \