diff options
| -rw-r--r-- | editors/xemacs21-mule-common/Makefile | 22 | ||||
| -rw-r--r-- | editors/xemacs21-mule/Makefile | 17 |
2 files changed, 24 insertions, 15 deletions
diff --git a/editors/xemacs21-mule-common/Makefile b/editors/xemacs21-mule-common/Makefile index cfe709cb50f3..36b96486b79f 100644 --- a/editors/xemacs21-mule-common/Makefile +++ b/editors/xemacs21-mule-common/Makefile @@ -3,7 +3,7 @@ # Date created: 5 Dec 1997 # Whom: Kazuyuki IENAGA <ienaga@jsys.co.jp> # -# $Id: Makefile,v 1.2 1998/10/10 15:28:21 kuriyama Exp $ +# $Id: Makefile,v 1.3 1998/12/02 08:01:14 asami Exp $ # DISTNAME= xemacs-20.4 @@ -13,7 +13,7 @@ MASTER_SITES= ftp://unipro.jsys.co.jp/pub/editor/xemacs/20.4/ \ ftp://ftp.lab.kdd.co.jp/xemacs/xemacs-20.4/ \ ftp://ftp.xemacs.org/pub/xemacs-20.4/ \ ftp://ftp2.xemacs.org/pub/xemacs/xemacs-20.4/ \ - ftp://ftp.jpl.org/pub/elisp/alpha/ + ftp://ftp.jpl.org/pub/elisp/ DISTFILES= xemacs-20.4.tar.gz xemacs-20.4-elc.tar.gz \ xemacs-20.4-info.tar.gz xemacs-20.4-mule.tar.gz \ ps-print-jp.el.gz @@ -28,7 +28,10 @@ LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm \ USE_AUTOCONF= yes EXTRACT_ONLY= xemacs-20.4.tar.gz xemacs-20.4-elc.tar.gz \ - xemacs-20.4-info.tar.gz xemacs-20.4-mule.tar.gz + xemacs-20.4-info.tar.gz xemacs-20.4-mule.tar.gz + +.include <bsd.port.pre.mk> + .for dir in \ editors/xemacs-mule \ japanese/xemacs \ @@ -37,10 +40,13 @@ EXTRACT_ONLY= xemacs-20.4.tar.gz xemacs-20.4-elc.tar.gz \ japanese/xemacs-canna+wnn6 \ japanese/xemacs-wnn4 \ japanese/xemacs-wnn6 -.if exists(${.CURDIR}/../../${dir}/work/.install_done) -WRKDIR= ${.CURDIR}/../../${dir}/work -.elif exists(${.CURDIR}/../../${dir}/work/.build_done) -WRKDIR?= ${.CURDIR}/../../${dir}/work +.if exists(${WRKDIRPREFIX}${PORTSDIR}/${dir}/work/.install_done) +WRKDIR= ${WRKDIRPREFIX}${PORTSDIR}/${dir}/work +.if !exists(${WRKDIR}/.install_done-${PKGNAME}) +rvalue_touch!= ${TOUCH} ${WRKDIR}/.install_done-${PKGNAME} +.endif +.elif exists(${WRKDIRPREFIX}${PORTSDIR}/${dir}/work/.build_done) +WRKDIR?= ${WRKDIRPREFIX}${PORTSDIR}/${dir}/work .endif .endfor WRKSRC= ${WRKDIR}/xemacs-20.4 @@ -95,4 +101,4 @@ post-install: post-package: @${TOUCH} ${TOUCH_FLAGS} ${PACKAGE_COOKIE} -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/editors/xemacs21-mule/Makefile b/editors/xemacs21-mule/Makefile index 0df4e9b34a50..d2e4a5971618 100644 --- a/editors/xemacs21-mule/Makefile +++ b/editors/xemacs21-mule/Makefile @@ -3,7 +3,7 @@ # Date created: 5 Dec 1997 # Whom: Kazuyuki IENAGA <ienaga@jsys.co.jp> # -# $Id: Makefile,v 1.10 1998/10/10 15:27:50 kuriyama Exp $ +# $Id: Makefile,v 1.11 1998/11/11 12:55:23 asami Exp $ # DISTNAME= xemacs-20.4 @@ -13,7 +13,7 @@ MASTER_SITES= ftp://unipro.jsys.co.jp/pub/editor/xemacs/20.4/ \ ftp://ftp.lab.kdd.co.jp/xemacs/xemacs-20.4/ \ ftp://ftp.xemacs.org/pub/xemacs-20.4/ \ ftp://ftp2.xemacs.org/pub/xemacs/xemacs-20.4/ \ - ftp://ftp.jpl.org/pub/elisp/alpha/ + ftp://ftp.jpl.org/pub/elisp/ DISTFILES= xemacs-20.4.tar.gz xemacs-20.4-elc.tar.gz \ xemacs-20.4-info.tar.gz xemacs-20.4-mule.tar.gz \ ps-print-jp.el.gz @@ -26,10 +26,10 @@ LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm \ png.2:${PORTSDIR}/graphics/png \ compface.1:${PORTSDIR}/mail/faces \ ${LIB_INPUT_METHOD} -RUN_DEPENDS= ${PREFIX}/lib/xemacs-20.4/etc/BABYL:${PORTSDIR}/editors/xemacs-mule-common +RUN_DEPENDS= ${PREFIX}/lib/${XEMACS_DIR}/etc/BABYL:${PORTSDIR}/editors/xemacs-mule-common EXTRACT_ONLY= xemacs-20.4.tar.gz xemacs-20.4-elc.tar.gz \ - xemacs-20.4-info.tar.gz xemacs-20.4-mule.tar.gz + xemacs-20.4-info.tar.gz xemacs-20.4-mule.tar.gz WRKSRC= ${WRKDIR}/xemacs-20.4 PATCHDIR= ${.CURDIR}/../../editors/xemacs-mule-common/patches FILESDIR= ${.CURDIR}/../../editors/xemacs-mule-common/files @@ -47,7 +47,7 @@ CONFIGURE_ARGS= i386-unknown-freebsd \ --x-libraries=${X11BASE}/lib \ --site-libraries='${SITE_LIBRARIES}' \ --site-includes='${SITE_INCLUDES}' \ - --sitelispdir=${PREFIX}/lib/xemacs-20.4/lisp:${PREFIX}/lib/xemacs-20.4/site-lisp:${PREFIX}/lib/xemacs/site-lisp:${PREFIX}/share/emacs/site-lisp \ + --sitelispdir=${PREFIX}/lib/${XEMACS_DIR}/lisp:${PREFIX}/lib/${XEMACS_DIR}/site-lisp:${PREFIX}/lib/xemacs/site-lisp:${PREFIX}/share/emacs/site-lisp \ --infopath=${PREFIX}/lib/xemacs/info:${PREFIX}/info:${X11BASE}/info:/usr/info:${PREFIX}/lib/texmf/doc/info:/usr/lib/texmf/doc:/usr/share/info \ ${MISC_OPTIONS} ${WITH_INPUT_METHOD} ${WITH_WIDGETS} @@ -55,9 +55,10 @@ STRIP= INSTALL_TARGET= install-arch-dep -PLIST_SUB= XEMACS_DIR=xemacs-20.4 +PLIST_SUB= XEMACS_DIR=${XEMACS_DIR} PKGLDIR= ${.CURDIR}/../../editors/xemacs-mule/pkg +XEMACS_DIR= xemacs-20.4 .if defined(WNN4) SITE_INCLUDES= ${X11BASE}/include @@ -96,6 +97,9 @@ pre-build: @find ${WRKSRC} \( -name \*.orig -o -name \*~ \) -exec ${RM} -f \{} \; @${RM} -f ${WRKSRC}/lib-src/DOC* ${WRKSRC}/src/xemacs .if (${LANGUAGE} == "Japanese") + @if [ -e ${WRKSRC}/lisp/packages/ps-print.elc ]; then \ + ${RM} -f ${WRKSRC}/lisp/packages/ps-print.elc; \ + fi @${GZCAT} ${DISTDIR}/ps-print-jp.el.gz > ${WRKSRC}/lisp/packages/ps-print.el .endif @@ -113,4 +117,3 @@ post-package: @${TOUCH} ${TOUCH_FLAGS} ${PACKAGE_COOKIE} .include <bsd.port.mk> - |