Date: Sun, 22 Jun 2014 09:33:31 +0000 (UTC) From: MANTANI Nobutaka <nobutaka@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r358775 - in head/editors: semi semi-emacs21 semi-emacs22 semi-xemacs21-mule Message-ID: <201406220933.s5M9XVaY040756@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: nobutaka Date: Sun Jun 22 09:33:31 2014 New Revision: 358775 URL: http://svnweb.freebsd.org/changeset/ports/358775 QAT: https://qat.redports.org/buildarchive/r358775/ Log: Support staging. Modified: head/editors/semi-emacs21/Makefile head/editors/semi-emacs22/Makefile head/editors/semi-xemacs21-mule/Makefile head/editors/semi/Makefile head/editors/semi/pkg-plist.xemacs21-mule Modified: head/editors/semi-emacs21/Makefile ============================================================================== --- head/editors/semi-emacs21/Makefile Sun Jun 22 09:27:13 2014 (r358774) +++ head/editors/semi-emacs21/Makefile Sun Jun 22 09:33:31 2014 (r358775) @@ -13,5 +13,4 @@ MASTERDIR= ${.CURDIR}/../../editors/semi USE_EMACS= yes EMACS_PORT_NAME= emacs21 -NO_STAGE= yes .include "${MASTERDIR}/Makefile" Modified: head/editors/semi-emacs22/Makefile ============================================================================== --- head/editors/semi-emacs22/Makefile Sun Jun 22 09:27:13 2014 (r358774) +++ head/editors/semi-emacs22/Makefile Sun Jun 22 09:33:31 2014 (r358775) @@ -13,5 +13,4 @@ MASTERDIR= ${.CURDIR}/../../editors/semi USE_EMACS= yes EMACS_PORT_NAME= emacs22 -NO_STAGE= yes .include "${MASTERDIR}/Makefile" Modified: head/editors/semi-xemacs21-mule/Makefile ============================================================================== --- head/editors/semi-xemacs21-mule/Makefile Sun Jun 22 09:27:13 2014 (r358774) +++ head/editors/semi-xemacs21-mule/Makefile Sun Jun 22 09:33:31 2014 (r358775) @@ -22,6 +22,7 @@ PLIST_SUB= EMACS_PACKAGESDIR=${EMACS_PAC # how to make and install ALL_TARGET= package INSTALL_TARGET= install-package +MAKE_ARGS+= PACKAGEDIR="${STAGEDIR}${LOCALBASE}/${EMACS_PACKAGESDIR}" # RUN_DEPENDS port name's suffix is '-common'. HAS_COMMON_PORT= YES @@ -52,9 +53,8 @@ SEMIDOCDIR= ${EMACS_PACKAGESDIR}/lisp/se 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/semi/Makefile ============================================================================== --- head/editors/semi/Makefile Sun Jun 22 09:27:13 2014 (r358774) +++ head/editors/semi/Makefile Sun Jun 22 09:33:31 2014 (r358775) @@ -36,14 +36,13 @@ DESCR= ${PKGDIR}/pkg-descr ALL_TARGET?= elc # environments PLIST_SUB+= SEMIDOCDIR=${SEMIDOCDIR} SEMI_COOKIE=${SEMI_COOKIE} -MAKE_ARGS+= PREFIX="${LOCALBASE}" \ - LISPDIR="${SEMI_LISPDIR}" \ - VERSION_SPECIFIC_LISPDIR="${SEMI_VERSION_SPECIFIC_LISPDIR}" +MAKE_ARGS+= PREFIX="${STAGEDIR}${LOCALBASE}" \ + LISPDIR="${STAGEDIR}${SEMI_LISPDIR}" \ + VERSION_SPECIFIC_LISPDIR="${STAGEDIR}${SEMI_VERSION_SPECIFIC_LISPDIR}" OPTIONS_DEFINE= DOCS OPTIONS_DEFAULT= DOCS -NO_STAGE= yes .include <bsd.port.pre.mk> .include <bsd.port.options.mk> @@ -96,8 +95,8 @@ pre-install: .endif post-install: - @${MKDIR} ${LOCALBASE}/share/semi - @${TOUCH} ${LOCALBASE}/share/semi/${SEMI_COOKIE} + @${MKDIR} ${STAGEDIR}${LOCALBASE}/share/semi + @${TOUCH} ${STAGEDIR}${LOCALBASE}/share/semi/${SEMI_COOKIE} .if defined(EMACS_PACKAGESDIR) && defined(MANIFEST) @${MAKE} -C ${.CURDIR} info-package-install @${MAKE} -C ${.CURDIR} manifest-install @@ -147,34 +146,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}/${SEMIDOCDIR} + @${MKDIR} ${STAGEDIR}${LOCALBASE}/${SEMIDOCDIR} @(cd ${WRKSRC} ; \ for i in ChangeLog NEWS README.* TODO VERSION ; do \ - ${INSTALL_DATA} $${i} ${LOCALBASE}/${SEMIDOCDIR}/ ; \ + ${INSTALL_DATA} $${i} ${STAGEDIR}${LOCALBASE}/${SEMIDOCDIR}/ ; \ done) info-install: @(cd ${WRKSRC} ; \ for i in mime-ui-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-ui-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 @@ -182,12 +181,12 @@ info-package-install: @(cd ${WRKSRC} ; \ for i in mime-ui-en.info mime-ui-ja.info; do \ ${INSTALL_DATA} ${WRKSRC}/$${i} \ - ${LOCALBASE}/${EMACS_PACKAGESDIR}/info ; \ + ${STAGEDIR}${LOCALBASE}/${EMACS_PACKAGESDIR}/info ; \ done ; \ - ${MKDIR} ${LOCALBASE}/${EMACS_PACKAGESDIR}/man/semi ; \ + ${MKDIR} ${STAGEDIR}${LOCALBASE}/${EMACS_PACKAGESDIR}/man/semi ; \ for i in mime-ui-en.texi mime-ui-ja.texi; do \ ${INSTALL_DATA} ${WRKSRC}/$${i} \ - ${LOCALBASE}/${EMACS_PACKAGESDIR}/man/semi ; \ + ${STAGEDIR}${LOCALBASE}/${EMACS_PACKAGESDIR}/man/semi ; \ done) manifest-install: @@ -195,6 +194,6 @@ 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/ .include <bsd.port.post.mk> Modified: head/editors/semi/pkg-plist.xemacs21-mule ============================================================================== --- head/editors/semi/pkg-plist.xemacs21-mule Sun Jun 22 09:27:13 2014 (r358774) +++ head/editors/semi/pkg-plist.xemacs21-mule Sun Jun 22 09:33:31 2014 (r358775) @@ -13,7 +13,7 @@ %%EMACS_PACKAGESDIR%%/lisp/semi/mail-mime-setup.el %%EMACS_PACKAGESDIR%%/lisp/semi/mail-mime-setup.elc %%EMACS_PACKAGESDIR%%/lisp/semi/mime-bbdb.el -@unexec rm -f %D/%%EMACS_PACKAGESDIR%%/lisp/semi/mime-bbdb.elc +%%EMACS_PACKAGESDIR%%/lisp/semi/mime-bbdb.elc %%EMACS_PACKAGESDIR%%/lisp/semi/mime-edit.el %%EMACS_PACKAGESDIR%%/lisp/semi/mime-edit.elc %%EMACS_PACKAGESDIR%%/lisp/semi/mime-image.el @@ -29,7 +29,7 @@ %%EMACS_PACKAGESDIR%%/lisp/semi/mime-view.el %%EMACS_PACKAGESDIR%%/lisp/semi/mime-view.elc %%EMACS_PACKAGESDIR%%/lisp/semi/mime-w3.el -@unexec rm -f %D/%%EMACS_PACKAGESDIR%%/lisp/semi/mime-w3.elc +%%EMACS_PACKAGESDIR%%/lisp/semi/mime-w3.elc %%EMACS_PACKAGESDIR%%/lisp/semi/pgg-def.el %%EMACS_PACKAGESDIR%%/lisp/semi/pgg-def.elc %%EMACS_PACKAGESDIR%%/lisp/semi/pgg-gpg.el
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201406220933.s5M9XVaY040756>