diff options
author | taoka <taoka@FreeBSD.org> | 2001-12-03 21:42:53 +0800 |
---|---|---|
committer | taoka <taoka@FreeBSD.org> | 2001-12-03 21:42:53 +0800 |
commit | 27d1fdbdd4a0d25adfd86b9174f3fe0bab3586aa (patch) | |
tree | e92006d8f381c0cfb400fa8515bb3f8830b76506 /editors | |
parent | 3176bfc7cc8f265e4eb04e91cce6b9ef668f717a (diff) | |
download | freebsd-ports-gnome-27d1fdbdd4a0d25adfd86b9174f3fe0bab3586aa.tar.gz freebsd-ports-gnome-27d1fdbdd4a0d25adfd86b9174f3fe0bab3586aa.tar.zst freebsd-ports-gnome-27d1fdbdd4a0d25adfd86b9174f3fe0bab3586aa.zip |
Unbreak (a problem occurs by the modification of bsd.port.mk rev 1.379)
Fix for mule*wnn7 ports
Submitted by: motoyuki
Diffstat (limited to 'editors')
-rw-r--r-- | editors/mule-common/Makefile | 15 | ||||
-rw-r--r-- | editors/mule/Makefile | 2 |
2 files changed, 10 insertions, 7 deletions
diff --git a/editors/mule-common/Makefile b/editors/mule-common/Makefile index a7918e74d257..6012ba2e9726 100644 --- a/editors/mule-common/Makefile +++ b/editors/mule-common/Makefile @@ -35,18 +35,21 @@ WRKDIRBASE= ${WRKDIRPREFIX}${.CURDIR:S,/editors/mule-common$,,} japanese/mule-canna+freewnn \ japanese/mule-canna+freewnn+sj3 \ japanese/mule-canna+sj3+wnn6 \ + japanese/mule-canna+sj3+wnn7 \ japanese/mule-canna+sj3 \ japanese/mule-canna+wnn6 \ + japanese/mule-canna+wnn7 \ japanese/mule-freewnn \ japanese/mule-freewnn+sj3 \ japanese/mule-sj3 \ japanese/mule-sj3+wnn6 \ + japanese/mule-sj3+wnn7 \ japanese/mule-wnn6 \ + japanese/mule-wnn7 \ korean/mule-freewnn -.if exists(${WRKDIRBASE}/${dir}/work/.install_done) -WRKDIR= ${WRKDIRBASE}/${dir}/work -.elif exists(${WRKDIRBASE}/${dir}/work/.build_done) +.if exists(${WRKDIRBASE}/${dir}/work/.build_done.${dir:S,editors/,,:S,chinese/,zh-,:S,japanese/,ja-,:S,korean/,ko-,}-${PORTVERSION}${_SUF1}${_SUF2}) WRKDIR?= ${WRKDIRBASE}/${dir}/work +MULEPKG?= ${dir:S,editors/,,:S,chinese/,zh-,:S,japanese/,ja-,:S,korean/,ko-,}-${PORTVERSION}${_SUF1}${_SUF2} .endif .endfor WRKSRC= ${WRKDIR}/emacs-${EMACS_VERSION} @@ -63,8 +66,10 @@ BROKEN= First you should build install a port for mule except mule-common .endif .endif -INSTALL_COOKIE= ${WRKDIR}/.install_done-${PKGNAME} -PACKAGE_COOKIE= ${WRKDIR}/.package_done-${PKGNAME} +EXTRACT_COOKIE= ${WRKDIR}/.extract_done.${MULEPKG} +CONFIGURE_COOKIE= ${WRKDIR}/.configure_done.${MULEPKG} +BUILD_COOKIE= ${WRKDIR}/.build_done.${MULEPKG} +PATCH_COOKIE= ${WRKDIR}/.patch_done.${MULEPKG} TMPPLIST= ${WRKDIR}/.PLIST.mktmp-${PKGNAME} PLIST_SUB= EMACS_VERSION=${EMACS_VERSION} EMACS_ARCH=${CONFIGURE_TARGET} diff --git a/editors/mule/Makefile b/editors/mule/Makefile index a2bc624c9863..395d9b8ef525 100644 --- a/editors/mule/Makefile +++ b/editors/mule/Makefile @@ -40,8 +40,6 @@ FILESDIR= ${.CURDIR}/../../editors/mule-common/files MD5_FILE= ${.CURDIR}/../../editors/mule-common/distinfo SCRIPTDIR= ${.CURDIR}/../../editors/mule-common/scripts PLIST= ${.CURDIR}/../../editors/mule/pkg-plist -INSTALL_COOKIE= ${WRKDIR}/.install_done-${PKGNAME} -PACKAGE_COOKIE= ${WRKDIR}/.package_done-${PKGNAME} GNU_CONFIGURE= yes USE_GMAKE= yes MAKE_ENV= LIBDIR="${LIBDIR}" |