diff options
| author | Dirk Meyer <dinoex@FreeBSD.org> | 2009-07-20 13:14:13 +0000 |
|---|---|---|
| committer | Dirk Meyer <dinoex@FreeBSD.org> | 2009-07-20 13:14:13 +0000 |
| commit | aeeab93e5892aeb22f033150a8425b396bcc0a5c (patch) | |
| tree | d3d63022e346b4b724d88cee04512e3f5e72b637 /graphics | |
| parent | - Fix build on 64-bit platforms (diff) | |
- fix build for NOPORTDOCS
Reported by: QAT
Notes
Notes:
svn path=/head/; revision=238104
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/graphviz/Makefile | 9 | ||||
| -rw-r--r-- | graphics/graphviz/pkg-plist | 15 |
2 files changed, 14 insertions, 10 deletions
diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile index 007cd27811b8..63fbdd6a8d2b 100644 --- a/graphics/graphviz/Makefile +++ b/graphics/graphviz/Makefile @@ -386,6 +386,7 @@ post-patch: -e "s|\([^:]*:.*\) install-demoDATA\(.*\)|\1\2|g" \ -e "s|\([^:]*:.*\) install-demoSCRIPTS\(.*\)|\1\2|g" \ -e "s|\([^:]*:.*\) install-pathplanexampleDATA\(.*\)|\1\2|g" \ + -e 's|txtdir = $$(pkgdatadir)/doc|txtdir = ${DOCSDIR}|' \ -e 's|demodir = $$(pkgdatadir)/demo|demodir = ${EXAMPLESDIR}|'; @${REINPLACE_CMD} \ -e 's|^\.SUFFIXES: \(.*\)\.1\(.*\)|.SUFFIXES: \1 \2|' \ @@ -405,6 +406,10 @@ post-patch: ${WRKSRC}/cmd/smyrna/tvnodes.h @${REINPLACE_CMD} -e 's|#include "regex_win32.h"|#include <regex.h>|' \ ${WRKSRC}/cmd/smyrna/btree.c +.if defined(NOPORTDOCS) + @${REINPLACE_CMD} -e 's| install-txtDATA$$||' \ + ${WRKSRC}/Makefile.in +.endif post-install: install-ldconfig-file cd ${WRKSRC}/lib/expr && \ @@ -412,11 +417,11 @@ post-install: install-ldconfig-file cd ${WRKSRC} && \ ${INSTALL_DATA} ${FIX_INCLUDE} ${PREFIX}/include/graphviz/ .if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR}/doc + @${MKDIR} ${DOCSDIR} @${MKDIR} ${DOCSDIR}/html @${MKDIR} ${DOCSDIR}/pdf cd ${WRKSRC} && \ - ${INSTALL_DATA} ${PDOCS_TXT} ${DOCSDIR}/doc/ && \ + ${INSTALL_DATA} ${PDOCS_TXT} ${DOCSDIR}/ && \ ${INSTALL_DATA} ${PDOCS_PDF} ${DOCSDIR}/pdf/ && \ ${INSTALL_DATA} ${PDOCS_HTML} ${DOCSDIR}/html/ . for i in neato.pdf twopi.pdf fdp.pdf circo.pdf diff --git a/graphics/graphviz/pkg-plist b/graphics/graphviz/pkg-plist index 57c5b8d41fd9..383282b85101 100644 --- a/graphics/graphviz/pkg-plist +++ b/graphics/graphviz/pkg-plist @@ -196,13 +196,12 @@ libdata/pkgconfig/libgraph.pc libdata/pkgconfig/libcgraph.pc libdata/pkgconfig/libpathplan.pc libdata/pkgconfig/libgvc.pc -%%PORTDOCS%%%%DATADIR%%/doc/AUTHORS -%%PORTDOCS%%%%DATADIR%%/doc/COPYING -%%PORTDOCS%%%%DATADIR%%/doc/ChangeLog -%%PORTDOCS%%%%DOCSDIR%%/doc/Dot.ref -%%PORTDOCS%%%%DATADIR%%/doc/NEWS -%%PORTDOCS%%%%DATADIR%%/doc/cpl1.0.txt -%%PORTDOCS%%%%DOCSDIR%%/doc/latex_suggestions.txt +%%PORTDOCS%%%%DOCSDIR%%/AUTHORS +%%PORTDOCS%%%%DOCSDIR%%/COPYING +%%PORTDOCS%%%%DOCSDIR%%/ChangeLog +%%PORTDOCS%%%%DOCSDIR%%/Dot.ref +%%PORTDOCS%%%%DOCSDIR%%/NEWS +%%PORTDOCS%%%%DOCSDIR%%/cpl1.0.txt %%PORTDOCS%%%%DOCSDIR%%/html/FAQ.html %%PORTDOCS%%%%DOCSDIR%%/html/build.html %%PORTDOCS%%%%DOCSDIR%%/html/char.html @@ -314,6 +313,7 @@ libdata/pkgconfig/libgvc.pc %%PORTDOCS%%%%DOCSDIR%%/html/trapezium.gif %%PORTDOCS%%%%DOCSDIR%%/html/triangle.gif %%PORTDOCS%%%%DOCSDIR%%/html/tripleoctagon.gif +%%PORTDOCS%%%%DOCSDIR%%/latex_suggestions.txt %%PORTDOCS%%%%DOCSDIR%%/pdf/acyclic.1.pdf %%PORTDOCS%%%%DOCSDIR%%/pdf/bcomps.1.pdf %%PORTDOCS%%%%DOCSDIR%%/pdf/ccomps.1.pdf @@ -568,7 +568,6 @@ libdata/pkgconfig/libgvc.pc @dirrm %%DATADIR%% %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/pathplan_data %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%% -%%PORTDOCS%%@dirrm %%DOCSDIR%%/doc %%PORTDOCS%%@dirrm %%DOCSDIR%%/html %%PORTDOCS%%@dirrm %%DOCSDIR%%/pdf %%PORTDOCS%%@dirrm %%DOCSDIR%% |