Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 20 Jul 2012 17:27:23 GMT
From:      "4721@hushmail.com" <4721@hushmail.com>
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/170028: [patch] devel/llvm-devel: always build manual pages, fix packing list
Message-ID:  <201207201727.q6KHRNBg079902@red.freebsd.org>
Resent-Message-ID: <201207201730.q6KHUDbk092557@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         170028
>Category:       ports
>Synopsis:       [patch] devel/llvm-devel: always build manual pages, fix packing list
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Jul 20 17:30:12 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     4721@hushmail.com
>Release:        
>Organization:
>Environment:
>Description:
patch adds two missing files to packing list with docs enabled.
manual pages are now always built (instead of being conditional with docs)
docs option now controls html documentation only.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

Index: devel/llvm-devel/pkg-plist
===================================================================
--- devel/llvm-devel/pkg-plist	(revision 301219)
+++ devel/llvm-devel/pkg-plist	(working copy)
@@ -791,6 +791,8 @@
 %%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
Index: devel/llvm-devel/Makefile
===================================================================
--- devel/llvm-devel/Makefile	(revision 301219)
+++ devel/llvm-devel/Makefile	(working copy)
@@ -22,6 +22,8 @@
 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 +65,6 @@
 
 .if ${PORT_OPTIONS:MDOCS}
 CONFIGURE_ARGS+=	--enable-docs
-BUILD_DEPENDS+=		sphinx-build:${PORTSDIR}/textproc/py-sphinx
 .else
 CONFIGURE_ARGS+=	--disable-docs
 .endif
@@ -125,9 +126,10 @@
 	${REINPLACE_CMD} -e 's|\(PROJ_mandir.*:=\).*$$|\1${MANPREFIX}/man|g' \
 	    ${WRKSRC}/Makefile.config.in
 
+post-build:
+	@cd ${WRKSRC}/docs && ${GMAKE} -f Makefile.sphinx man
 .if ${PORT_OPTIONS:MDOCS}
-post-build:
-	@cd ${WRKSRC}/docs && ${GMAKE} -f Makefile.sphinx man html
+	@cd ${WRKSRC}/docs && ${GMAKE} -f Makefile.sphinx html
 .endif
 
 post-install:
@@ -137,11 +139,11 @@
 	${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}


>Release-Note:
>Audit-Trail:
>Unformatted:



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