Date: Mon, 8 Mar 2010 06:19:00 GMT From: Rob Farmer <rfarmer@predatorlabs.net> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/144545: [MAINTAINER] [PATCH] shells/fish Install docs in right place Message-ID: <201003080619.o286J0Ap073558@www.freebsd.org> Resent-Message-ID: <201003080620.o286K1ec089921@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 144545 >Category: ports >Synopsis: [MAINTAINER] [PATCH] shells/fish Install docs in right place >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Mon Mar 08 06:20:01 UTC 2010 >Closed-Date: >Last-Modified: >Originator: Rob Farmer >Release: 9.0-CURRENT >Organization: >Environment: FreeBSD pentium4.predatorlabs.net 9.0-CURRENT FreeBSD 9.0-CURRENT #0: Wed Mar 3 22:21:56 PST 2010 rfarmer@pentium4.predatorlabs.net:/usr/obj/usr/src/sys/PENTIUM4 i386 >Description: Install documentation into DOCSDIR instead of dumping it straight into ${PREFIX}/share/docs >How-To-Repeat: >Fix: Patch attached with submission follows: Index: Makefile =================================================================== RCS file: /home/ncvs/ports/shells/fish/Makefile,v retrieving revision 1.9 diff -u -r1.9 Makefile --- Makefile 14 Jan 2010 03:16:39 -0000 1.9 +++ Makefile 8 Mar 2010 01:41:45 -0000 @@ -7,7 +7,7 @@ PORTNAME= fish PORTVERSION= 1.23.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= shells MASTER_SITES= SF @@ -24,6 +24,7 @@ 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 @@ 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 Index: pkg-plist =================================================================== RCS file: /home/ncvs/ports/shells/fish/pkg-plist,v retrieving revision 1.4 diff -u -r1.4 pkg-plist --- pkg-plist 14 Jan 2010 03:16:39 -0000 1.4 +++ pkg-plist 8 Mar 2010 01:38:42 -0000 @@ -3,24 +3,23 @@ bin/fish_pager bin/fishd bin/mimedb -bin/seq 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 +352,7 @@ @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 >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201003080619.o286J0Ap073558>