diff options
| author | Wen Heping <wen@FreeBSD.org> | 2010-03-17 06:29:16 +0000 |
|---|---|---|
| committer | Wen Heping <wen@FreeBSD.org> | 2010-03-17 06:29:16 +0000 |
| commit | 49f22ad877298c0bc61122a31e289cc3fb02497d (patch) | |
| tree | e65cc0691915058c99c8743aa0a2c93b9d81b36f /shells | |
| parent | e0bc892a0e99733a1869a57540f7ba4a78c55732 (diff) | |
| download | ports-49f22ad877298c0bc61122a31e289cc3fb02497d.tar.gz ports-49f22ad877298c0bc61122a31e289cc3fb02497d.zip | |
Notes
Diffstat (limited to 'shells')
| -rw-r--r-- | shells/fish/Makefile | 10 | ||||
| -rw-r--r-- | shells/fish/pkg-plist | 33 |
2 files changed, 22 insertions, 21 deletions
diff --git a/shells/fish/Makefile b/shells/fish/Makefile index c87778bf0787..076d834f90df 100644 --- a/shells/fish/Makefile +++ b/shells/fish/Makefile @@ -7,7 +7,7 @@ PORTNAME= fish PORTVERSION= 1.23.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= shells MASTER_SITES= SF @@ -24,6 +24,7 @@ CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LIBS="${LDFLAGS}" \ LDFLAGS="${LDFLAGS}" +CONFIGURE_ARGS= --docdir=${DOCSDIR} OPTIONS= XSEL "Build with xsel" on \ DOXYGEN "Build docs with doxygen" on @@ -50,15 +51,14 @@ CONFIGURE_ARGS+= --without-xsel RUN_DEPENDS= xsel:${PORTSDIR}/x11/xsel-conrad .endif -.if defined(WITHOUT_DOXYGEN) || defined(NOPORTDOCS) -PLIST_SUB+= DOCS="@comment " +.if defined(WITHOUT_DOXYGEN) +NOPORTDOCS= yes .else BUILD_DEPENDS+= doxygen:${PORTSDIR}/devel/doxygen -PLIST_SUB+= DOCS="" .endif post-patch: -.if defined(WITHOUT_DOXYGEN) || defined(NOPORTDOCS) +.if defined(NOPORTDOCS) @${REINPLACE_CMD} -e 's|$(PROGRAMS) user_doc|$(PROGRAMS)|' \ ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e 589,593d ${WRKSRC}/Makefile.in diff --git a/shells/fish/pkg-plist b/shells/fish/pkg-plist index 9ad6b0fe60b9..37d8bf355092 100644 --- a/shells/fish/pkg-plist +++ b/shells/fish/pkg-plist @@ -2,25 +2,25 @@ bin/fish bin/fish_indent bin/fish_pager bin/fishd -bin/mimedb bin/seq +bin/mimedb bin/set_color %%ETCDIR%%/config.fish -%%DOCS%%share/doc/ChangeLog -%%DOCS%%share/doc/commands.html -%%DOCS%%share/doc/design.html -%%DOCS%%share/doc/doc_8h-source.html -%%DOCS%%share/doc/doxygen.css -%%DOCS%%share/doc/doxygen.png -%%DOCS%%share/doc/faq.html -%%DOCS%%share/doc/files.html -%%DOCS%%share/doc/index.html -%%DOCS%%share/doc/license.html -%%DOCS%%share/doc/pages.html -%%DOCS%%share/doc/tab_b.gif -%%DOCS%%share/doc/tab_l.gif -%%DOCS%%share/doc/tab_r.gif -%%DOCS%%share/doc/tabs.css +%%PORTDOCS%%%%DOCSDIR%%/ChangeLog +%%PORTDOCS%%%%DOCSDIR%%/commands.html +%%PORTDOCS%%%%DOCSDIR%%/design.html +%%PORTDOCS%%%%DOCSDIR%%/doc_8h-source.html +%%PORTDOCS%%%%DOCSDIR%%/doxygen.css +%%PORTDOCS%%%%DOCSDIR%%/doxygen.png +%%PORTDOCS%%%%DOCSDIR%%/faq.html +%%PORTDOCS%%%%DOCSDIR%%/files.html +%%PORTDOCS%%%%DOCSDIR%%/index.html +%%PORTDOCS%%%%DOCSDIR%%/license.html +%%PORTDOCS%%%%DOCSDIR%%/pages.html +%%PORTDOCS%%%%DOCSDIR%%/tab_b.gif +%%PORTDOCS%%%%DOCSDIR%%/tab_l.gif +%%PORTDOCS%%%%DOCSDIR%%/tab_r.gif +%%PORTDOCS%%%%DOCSDIR%%/tabs.css %%DATADIR%%/completions/acpi.fish %%DATADIR%%/completions/adduser.fish %%DATADIR%%/completions/and.fish @@ -353,6 +353,7 @@ share/locale/sv/LC_MESSAGES/fish.mo @dirrm %%DATADIR%%/functions @dirrm %%DATADIR%%/completions @dirrm %%DATADIR%% +@dirrm %%DOCSDIR%% @dirrm %%ETCDIR%% @exec cp /etc/shells /etc/shells.bak; (grep -v %D/bin/fish /etc/shells.bak; echo %D/bin/fish) > /etc/shells; rm -f /etc/shells.bak @unexec cp /etc/shells /etc/shells.bak; (grep -v %D/bin/fish /etc/shells.bak) > /etc/shells; rm -f /etc/shells.bak |