Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 3 Aug 2012 21:09:26 +0000 (UTC)
From:      Brooks Davis <brooks@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r301971 - head/devel/llvm-devel
Message-ID:  <201208032109.q73L9QaM069053@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201208032109.q73L9QaM069053>