svn commit: r358773 - in head/editors: flim flim-emacs21 flim-emacs22 flim-xemacs21-mule
MANTANI Nobutaka
nobutaka at FreeBSD.org
Sun Jun 22 09:26:27 UTC 2014
Author: nobutaka
Date: Sun Jun 22 09:26:25 2014
New Revision: 358773
URL: http://svnweb.freebsd.org/changeset/ports/358773
QAT: https://qat.redports.org/buildarchive/r358773/
Log:
Support staging.
Modified:
head/editors/flim-emacs21/Makefile
head/editors/flim-emacs22/Makefile
head/editors/flim-xemacs21-mule/Makefile
head/editors/flim/Makefile
Modified: head/editors/flim-emacs21/Makefile
==============================================================================
--- head/editors/flim-emacs21/Makefile Sun Jun 22 09:22:52 2014 (r358772)
+++ head/editors/flim-emacs21/Makefile Sun Jun 22 09:26:25 2014 (r358773)
@@ -13,5 +13,4 @@ MASTERDIR= ${.CURDIR}/../../editors/flim
USE_EMACS= yes
EMACS_PORT_NAME= emacs21
-NO_STAGE= yes
.include "${MASTERDIR}/Makefile"
Modified: head/editors/flim-emacs22/Makefile
==============================================================================
--- head/editors/flim-emacs22/Makefile Sun Jun 22 09:22:52 2014 (r358772)
+++ head/editors/flim-emacs22/Makefile Sun Jun 22 09:26:25 2014 (r358773)
@@ -13,5 +13,4 @@ MASTERDIR= ${.CURDIR}/../../editors/flim
USE_EMACS= yes
EMACS_PORT_NAME= emacs22
-NO_STAGE= yes
.include "${MASTERDIR}/Makefile"
Modified: head/editors/flim-xemacs21-mule/Makefile
==============================================================================
--- head/editors/flim-xemacs21-mule/Makefile Sun Jun 22 09:22:52 2014 (r358772)
+++ head/editors/flim-xemacs21-mule/Makefile Sun Jun 22 09:26:25 2014 (r358773)
@@ -48,9 +48,8 @@ FLIMDOCDIR= ${EMACS_PACKAGESDIR}/lisp/fl
xemacs-package: install
@${RM} -f ${.CURDIR}/${XEMACS_PKG_TARBALL}
- @(cd ${LOCALBASE}/${EMACS_PACKAGESDIR} ;\
+ @(cd ${STAGEDIR}${LOCALBASE}/${EMACS_PACKAGESDIR} ;\
${TAR} -zcf ${.CURDIR}/${XEMACS_PKG_TARBALL} ${XEMACS_PKG_CONTENTS} ;\
)
-NO_STAGE= yes
.include "${MASTERDIR}/Makefile"
Modified: head/editors/flim/Makefile
==============================================================================
--- head/editors/flim/Makefile Sun Jun 22 09:22:52 2014 (r358772)
+++ head/editors/flim/Makefile Sun Jun 22 09:26:25 2014 (r358773)
@@ -39,11 +39,10 @@ OPTIONS_DEFAULT= DOCS
ALL_TARGET?= elc
# environments
PLIST_SUB+= FLIMDOCDIR=${FLIMDOCDIR} FLIM_COOKIE=${FLIM_COOKIE}
-MAKE_ARGS+= PREFIX="${LOCALBASE}" \
- LISPDIR="${FLIM_LISPDIR}" \
- VERSION_SPECIFIC_LISPDIR="${FLIM_VERSION_SPECIFIC_LISPDIR}"
+MAKE_ARGS+= PREFIX="${STAGEDIR}${LOCALBASE}" \
+ LISPDIR="${STAGEDIR}${FLIM_LISPDIR}" \
+ VERSION_SPECIFIC_LISPDIR="${STAGEDIR}${FLIM_VERSION_SPECIFIC_LISPDIR}"
-NO_STAGE= yes
.include <bsd.port.pre.mk>
.if defined(EMACS_PORT_NAME)
@@ -59,7 +58,7 @@ PLIST= ${PKGDIR}/pkg-plist.emacs21
.if defined(EMACS_PACKAGESDIR)
BUILD_DEPENDS+= ${LOCALBASE}/${EMACS_LIBDIR}/xemacs-packages/lisp/apel/emu.el:${PORTSDIR}/editors/xemacs-packages
RUN_DEPENDS+= ${LOCALBASE}/${EMACS_LIBDIR}/xemacs-packages/lisp/apel/emu.el:${PORTSDIR}/editors/xemacs-packages
-MAKE_ARGS+= PACKAGEDIR="${LOCALBASE}/${EMACS_PACKAGESDIR}"
+MAKE_ARGS+= PACKAGEDIR="${STAGEDIR}${LOCALBASE}/${EMACS_PACKAGESDIR}"
.else
# depends on apel (case of gnu emacsen etc...)
BUILD_DEPENDS+= ${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/emu/emu.el:${PORTSDIR}/editors/apel${DEPPORT_SUFFIX}
@@ -150,34 +149,34 @@ pkg-el-copy:
pkg-el-install:
@(if [ -f ${FILESDIR}/_pkg.el ] ; then \
- ${MKDIR} ${LOCALBASE}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME} ;\
+ ${MKDIR} ${STAGEDIR}${LOCALBASE}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME} ;\
${INSTALL_DATA} ${FILESDIR}/_pkg.el \
- ${LOCALBASE}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME}/_pkg.el ;\
+ ${STAGEDIR}${LOCALBASE}/${EMACS_PACKAGESDIR}/lisp/${XEMACS_PKGNAME}/_pkg.el ;\
fi)
mkdir-site-packages:
@(for i in ${EMACS_PACKAGES_SUBDIRS} ; do \
- ${MKDIR} ${LOCALBASE}/${EMACS_PACKAGESDIR}/$${i} ; \
+ ${MKDIR} ${STAGEDIR}${LOCALBASE}/${EMACS_PACKAGESDIR}/$${i} ; \
done)
doc-install:
- @${MKDIR} ${LOCALBASE}/${FLIMDOCDIR}
+ @${MKDIR} ${STAGEDIR}${LOCALBASE}/${FLIMDOCDIR}
@(cd ${WRKSRC} ; \
for i in ChangeLog NEWS README.* VERSION ; do \
- ${INSTALL_DATA} $${i} ${LOCALBASE}/${FLIMDOCDIR}/ ; \
+ ${INSTALL_DATA} $${i} ${STAGEDIR}${LOCALBASE}/${FLIMDOCDIR}/ ; \
done)
info-install:
@(cd ${WRKSRC} ; \
for i in mime-en.info; do \
- ${INSTALL_DATA} ${WRKSRC}/$${i} ${LOCALBASE}/info ; \
- install-info ${LOCALBASE}/info/$${i} ${LOCALBASE}/info/dir ; \
+ ${INSTALL_DATA} ${WRKSRC}/$${i} ${STAGEDIR}${LOCALBASE}/info ; \
+ install-info ${STAGEDIR}${LOCALBASE}/info/$${i} ${STAGEDIR}${LOCALBASE}/info/dir ; \
done)
.if defined(EMACS_HAS_MULE) && (${EMACS_HAS_MULE} == "YES")
@(cd ${WRKSRC} ; \
for i in mime-ja.info; do \
- ${INSTALL_DATA} ${WRKSRC}/$${i} ${LOCALBASE}/info ; \
- install-info ${LOCALBASE}/info/$${i} ${LOCALBASE}/info/dir ; \
+ ${INSTALL_DATA} ${WRKSRC}/$${i} ${STAGEDIR}${LOCALBASE}/info ; \
+ install-info ${STAGEDIR}${LOCALBASE}/info/$${i} ${STAGEDIR}${LOCALBASE}/info/dir ; \
done)
.endif
@@ -185,12 +184,12 @@ info-package-install:
@(cd ${WRKSRC} ; \
for i in mime-en.info mime-ja.info; do \
${INSTALL_DATA} ${WRKSRC}/$${i} \
- ${LOCALBASE}/${EMACS_PACKAGESDIR}/info ; \
+ ${STAGEDIR}${LOCALBASE}/${EMACS_PACKAGESDIR}/info ; \
done ; \
- ${MKDIR} ${LOCALBASE}/${EMACS_PACKAGESDIR}/man/flim ; \
+ ${MKDIR} ${STAGEDIR}${LOCALBASE}/${EMACS_PACKAGESDIR}/man/flim ; \
for i in mime-en.texi mime-ja.texi; do \
${INSTALL_DATA} ${WRKSRC}/$${i} \
- ${LOCALBASE}/${EMACS_PACKAGESDIR}/man/flim ; \
+ ${STAGEDIR}${LOCALBASE}/${EMACS_PACKAGESDIR}/man/flim ; \
done)
manifest-install:
@@ -198,11 +197,11 @@ manifest-install:
@${CAT} ${PLIST} | ${GREP} -e "^%%EMACS_PACKAGESDIR%%" | \
${SED} -e "s;^%%EMACS_PACKAGESDIR%%/;;" > ${WRKDIR}/${MANIFEST}
@${INSTALL_DATA} ${WRKDIR}/${MANIFEST} \
- ${LOCALBASE}/${EMACS_PACKAGESDIR}/pkginfo/
+ ${STAGEDIR}${LOCALBASE}/${EMACS_PACKAGESDIR}/pkginfo/
pkgcookie-install:
# install package-cookie
- @${MKDIR} ${LOCALBASE}/share/flim
- @${TOUCH} ${LOCALBASE}/share/flim/${FLIM_COOKIE}
+ @${MKDIR} ${STAGEDIR}${LOCALBASE}/share/flim
+ @${TOUCH} ${STAGEDIR}${LOCALBASE}/share/flim/${FLIM_COOKIE}
.include <bsd.port.post.mk>
More information about the svn-ports-all
mailing list