From owner-svn-ports-head@FreeBSD.ORG Mon Feb 24 11:38:01 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8BEFC139; Mon, 24 Feb 2014 11:38:01 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 6C6731A37; Mon, 24 Feb 2014 11:38:01 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1OBc1qb083570; Mon, 24 Feb 2014 11:38:01 GMT (envelope-from gahr@svn.freebsd.org) Received: (from gahr@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1OBc1Wo083569; Mon, 24 Feb 2014 11:38:01 GMT (envelope-from gahr@svn.freebsd.org) Message-Id: <201402241138.s1OBc1Wo083569@svn.freebsd.org> From: Pietro Cerutti Date: Mon, 24 Feb 2014 11:38:01 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r345816 - head/devel/meta-cvs X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Feb 2014 11:38:01 -0000 Author: gahr Date: Mon Feb 24 11:38:00 2014 New Revision: 345816 URL: http://svnweb.freebsd.org/changeset/ports/345816 QAT: https://qat.redports.org/buildarchive/r345816/ Log: - Unbreak - STAGE-clean - Add OPTIONS (DOCS) Modified: head/devel/meta-cvs/Makefile Modified: head/devel/meta-cvs/Makefile ============================================================================== --- head/devel/meta-cvs/Makefile Mon Feb 24 11:18:30 2014 (r345815) +++ head/devel/meta-cvs/Makefile Mon Feb 24 11:38:00 2014 (r345816) @@ -9,16 +9,15 @@ MASTER_SITES= http://common-lisp.net/pro MAINTAINER= gahr@FreeBSD.org COMMENT= A more capable version control system than CVS, built around CVS -BROKEN= loop on install - -OPTIONS_DEFINE= PDFDOC -PDFDOC_DESC= Build PDF documentation +LICENSE= GPLv2 BUILD_DEPENDS= clisp:${PORTSDIR}/lang/clisp \ lndir:${PORTSDIR}/devel/lndir RUN_DEPENDS= clisp:${PORTSDIR}/lang/clisp -USE_GMAKE= yes +OPTIONS_DEFINE= DOCS + +USES= gmake GNU_CONFIGURE= yes PLIST_FILES= bin/mcvs \ @@ -27,35 +26,42 @@ PLIST_FILES= bin/mcvs \ ${DATADIR:C/${PREFIX}\///}/mcvs-debug.mem PLIST_DIRS= ${DATADIR:C/${PREFIX}\///} -PORTDOCS= Meta-CVS-PAPER \ - PORTING \ - QUICK-GUIDE \ - SCRIPTING +PORTDOCS= * -NO_STAGE= yes .include -.if ${PORT_OPTIONS:MPDFDOC} && !defined(NOPORTDOCS) -USE_TEX= latex:build -PORTDOCS+= meta-cvs.pdf -.endif - post-patch: +# libc.so is now a symlink, see +# http://svnweb.freebsd.org/base/head/lib/libc/libc.ldscript?revision=251668&view=markup + (if [ -h /usr/lib/libc.so ]; then \ + rep=libc.so; \ + else \ + rep=`${SED} -e '1d; s|^.*\(/lib/libc\.so\.[0-9]*\).*$$|\1|' /usr/lib/libc.so`; \ + fi; \ + ${REINPLACE_CMD} -e "s|libc.so.6|$$rep|" ${WRKSRC}/code/clisp-ffi.lisp) + ${REINPLACE_CMD} -e '232s|make|${GMAKE}|g' ${WRKSRC}/configure ${REINPLACE_CMD} -e 's|type -P|which|g;s|$$(prefix)/lib|${DATADIR}|g' ${WRKSRC}/Makefile - ${REINPLACE_CMD} -e 's|libc.so.6|libc.so|' ${WRKSRC}/code/clisp-ffi.lisp - ${REINPLACE_CMD} -e '12s|latex|pdflatex|' ${WRKSRC}/docs/tex-manual/Makefile -post-install: -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} -. if !defined(WITHOUT_PDFDOC) - (cd ${WRKSRC}/docs/tex-manual && ${GMAKE} && \ - ${CP} ${WRKSRC}/docs/tex-manual/meta-cvs.pdf ${WRKSRC}/docs/misc-text-files) -. endif -.for doc in ${PORTDOCS} - ${INSTALL_DATA} ${WRKSRC}/docs/misc-text-files/${doc} ${DOCSDIR} -.endfor +.if ${PORT_OPTIONS:MDOCS} +USE_TEX= latex:build +post-build: + cd ${WRKSRC}/docs/tex-manual && \ + pdflatex meta-cvs.latex && \ + pdflatex meta-cvs.latex && \ + pdflatex meta-cvs.latex +.endif + +do-install: + ${INSTALL_SCRIPT} ${WRKSRC}/mcvs ${STAGEDIR}${PREFIX}/bin + ${INSTALL_SCRIPT} ${WRKSRC}/mcvs-debug ${STAGEDIR}${PREFIX}/bin + @${MKDIR} ${STAGEDIR}${DATADIR} + ${INSTALL_DATA} ${WRKSRC}/mcvs.mem ${STAGEDIR}${DATADIR} + ${INSTALL_DATA} ${WRKSRC}/mcvs-debug.mem ${STAGEDIR}${DATADIR} +.if ${PORT_OPTIONS:MDOCS} + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/docs/misc-text-files/* ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/docs/tex-manual/*.pdf ${STAGEDIR}${DOCSDIR} .endif .include