From owner-svn-ports-all@FreeBSD.ORG Fri Aug 3 21:09:26 2012 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id DCDBD106566C; Fri, 3 Aug 2012 21:09:26 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id ADBD68FC08; Fri, 3 Aug 2012 21:09:26 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q73L9QaO069056; Fri, 3 Aug 2012 21:09:26 GMT (envelope-from brooks@svn.freebsd.org) Received: (from brooks@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q73L9QaM069053; Fri, 3 Aug 2012 21:09:26 GMT (envelope-from brooks@svn.freebsd.org) Message-Id: <201208032109.q73L9QaM069053@svn.freebsd.org> From: Brooks Davis Date: Fri, 3 Aug 2012 21:09:26 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r301971 - head/devel/llvm-devel X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Aug 2012 21:09:27 -0000 Author: brooks Date: Fri Aug 3 21:09:26 2012 New Revision: 301971 URL: http://svn.freebsd.org/changeset/ports/301971 Log: Always build manpages. Add a couple of missing plist entries. PR: ports/170028 Submitted by: 4721@hushmail.com Modified: head/devel/llvm-devel/Makefile head/devel/llvm-devel/pkg-plist Modified: head/devel/llvm-devel/Makefile ============================================================================== --- head/devel/llvm-devel/Makefile Fri Aug 3 20:34:19 2012 (r301970) +++ head/devel/llvm-devel/Makefile Fri Aug 3 21:09:26 2012 (r301971) @@ -7,6 +7,7 @@ PORTNAME= llvm DISTVERSION= 3.2.r${SVN_REV} +PORTREVISON= 1 CATEGORIES= devel lang MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= brooks @@ -22,6 +23,8 @@ BUILD_DEPENDS= bash:${PORTSDIR}/shells/b BUILD_DEPENDS+= f2c:${PORTSDIR}/lang/f2c .endif +BUILD_DEPENDS+= sphinx-build:${PORTSDIR}/textproc/py-sphinx + CONFLICTS= llvm-[23]* llvm-etoile-2* GNU_CONFIGURE= yes @@ -63,7 +66,6 @@ CONFIGURE_ARGS+= --enable-optimized .if ${PORT_OPTIONS:MDOCS} CONFIGURE_ARGS+= --enable-docs -BUILD_DEPENDS+= sphinx-build:${PORTSDIR}/textproc/py-sphinx .else CONFIGURE_ARGS+= --disable-docs .endif @@ -125,9 +127,10 @@ post-patch: ${REINPLACE_CMD} -e 's|\(PROJ_mandir.*:=\).*$$|\1${MANPREFIX}/man|g' \ ${WRKSRC}/Makefile.config.in -.if ${PORT_OPTIONS:MDOCS} post-build: - @cd ${WRKSRC}/docs && ${GMAKE} -f Makefile.sphinx man html + @cd ${WRKSRC}/docs && ${GMAKE} -f Makefile.sphinx man +.if ${PORT_OPTIONS:MDOCS} + @cd ${WRKSRC}/docs && ${GMAKE} -f Makefile.sphinx html .endif post-install: @@ -137,11 +140,11 @@ post-install: ${MKDIR} ${DOCSDIR}/html find ${WRKSRC}/docs/_build/html -type f | \ xargs -I _DOC_ ${INSTALL_DATA} _DOC_ ${DOCSDIR}/html/ +.endif .for man in ${MAN1} @${INSTALL_MAN} ${WRKSRC}/docs/_build/man/${man} \ ${MANPREFIX}/man/man1/ .endfor -.endif TEST_CMD= '(cd ${WRKSRC}/test; ${SETENV} ${MAKE_ENV} LD_LIBRARY_PATH=${WRKSRC}/Release/lib ${GMAKE} check-local-lit)' regression-test: ${BUILD_COOKIE} Modified: head/devel/llvm-devel/pkg-plist ============================================================================== --- head/devel/llvm-devel/pkg-plist Fri Aug 3 20:34:19 2012 (r301970) +++ head/devel/llvm-devel/pkg-plist Fri Aug 3 21:09:26 2012 (r301971) @@ -791,6 +791,8 @@ lib/libprofile_rt.so %%PORTDOCS%%%%DOCSDIR%%/html/userguides.html %%PORTDOCS%%%%DOCSDIR%%/html/userguides.txt %%PORTDOCS%%%%DOCSDIR%%/html/websupport.js +%%PORTDOCS%%%%DOCSDIR%%/html/doxygen.css +%%PORTDOCS%%%%DOCSDIR%%/html.tar.gz @dirrm include/llvm/Transforms/Utils @dirrm include/llvm/Transforms/IPO @dirrm include/llvm/Transforms