Date: Sun, 31 Aug 2014 18:00:17 +0000 (UTC) From: Hiroki Sato <hrs@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r366804 - in head/editors/tamago: . files Message-ID: <201408311800.s7VI0HBZ075916@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: hrs Date: Sun Aug 31 18:00:17 2014 New Revision: 366804 URL: http://svnweb.freebsd.org/changeset/ports/366804 QAT: https://qat.redports.org/buildarchive/r366804/ Log: Add a patch forgotten in the previous commit. Added: head/editors/tamago/files/patch-Makefile.in (contents, props changed) Modified: head/editors/tamago/Makefile Modified: head/editors/tamago/Makefile ============================================================================== --- head/editors/tamago/Makefile Sun Aug 31 17:53:37 2014 (r366803) +++ head/editors/tamago/Makefile Sun Aug 31 18:00:17 2014 (r366804) @@ -41,11 +41,6 @@ PLIST_SUB+= HAS_JISX0213="" PLIST_SUB+= HAS_JISX0213="@comment " .endif -post-patch: - @${REINPLACE_CMD} -e '/^lispdir/s|@lispdir@|${STAGEDIR}&|' \ - -e 's|mkdir|${MKDIR}|' \ - ${WRKSRC}/Makefile.in - pre-configure: @${REINPLACE_CMD} -e 's|emacs/site-lisp|${EMACS_NAME}/${EMACS_VER}/site-lisp|g' \ ${WRKSRC}/configure @@ -60,8 +55,9 @@ post-build: post-install: ${INSTALL_PROGRAM} ${WRKSRC}/helper/egg-helper \ ${STAGEDIR}${PREFIX}/bin/egg-helper - +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${STAGEDIR}${DOCSDIR} (cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}) +.endif .include <bsd.port.post.mk> Added: head/editors/tamago/files/patch-Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/editors/tamago/files/patch-Makefile.in Sun Aug 31 18:00:17 2014 (r366804) @@ -0,0 +1,45 @@ +--- Makefile.in.orig 2004-11-22 03:53:05.000000000 +0900 ++++ Makefile.in 2014-06-10 13:51:03.000000000 +0900 +@@ -113,32 +115,32 @@ + + install-site: all + echo "Egg system will be installed in ${lispdir}/egg...."; \ +- if [ -d ${lispdir}/egg ]; then \ ++ if [ -d -p ${DESTDIR}${lispdir}/egg ]; then \ + echo "Clean up the previsous installation...."; \ +- rm -rf ${lispdir}/egg/*; \ ++ rm -rf ${DESTDIR}${lispdir}/egg/*; \ + else \ + echo "Make the directory ${lispdir}/egg..."; \ +- mkdir ${lispdir}/egg; \ ++ mkdir -p ${DESTDIR}${lispdir}/egg; \ + fi; \ + # + for FILE in ${TOPSRCS} ${TOPELCS} ${INITELS}; \ + do \ +- ${INSTALL_DATA} $${FILE} ${lispdir}/egg/; \ ++ ${INSTALL_DATA} $${FILE} ${DESTDIR}${lispdir}/egg/; \ + done; \ + # +- mkdir ${lispdir}/egg/egg ; \ ++ mkdir -p ${DESTDIR}${lispdir}/egg/egg ; \ + for FILE in ${EGGSRCS} ${EGGELCS} ; \ + do \ +- ${INSTALL_DATA} $${FILE} ${lispdir}/egg/egg; \ ++ ${INSTALL_DATA} $${FILE} ${DESTDIR}${lispdir}/egg/egg; \ + done; \ +- touch ${lispdir}/egg/egg/.nosearch; \ ++ touch ${DESTDIR}${lispdir}/egg/egg/.nosearch; \ + # +- mkdir ${lispdir}/egg/its ; \ ++ mkdir -p ${DESTDIR}${lispdir}/egg/its ; \ + for FILE in ${ITSSRCS} ${ITSELCS} ; \ + do \ +- ${INSTALL_DATA} $${FILE} ${lispdir}/egg/its ; \ ++ ${INSTALL_DATA} $${FILE} ${DESTDIR}${lispdir}/egg/its ; \ + done; \ +- touch ${lispdir}/egg/its/.nosearch; \ ++ touch ${DESTDIR}${lispdir}/egg/its/.nosearch; \ + + + uninstall-site:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201408311800.s7VI0HBZ075916>