View | Details | Raw Unified | Return to bug 144545
Collapse All | Expand All

(-)Makefile (-5 / +5 lines)
Lines 7-13 Link Here
7
7
8
PORTNAME=	fish
8
PORTNAME=	fish
9
PORTVERSION=	1.23.1
9
PORTVERSION=	1.23.1
10
PORTREVISION=	2
10
PORTREVISION=	3
11
CATEGORIES=	shells
11
CATEGORIES=	shells
12
MASTER_SITES=	SF
12
MASTER_SITES=	SF
13
13
Lines 24-29 Link Here
24
LDFLAGS+=	-L${LOCALBASE}/lib
24
LDFLAGS+=	-L${LOCALBASE}/lib
25
CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LIBS="${LDFLAGS}" \
25
CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LIBS="${LDFLAGS}" \
26
		LDFLAGS="${LDFLAGS}"
26
		LDFLAGS="${LDFLAGS}"
27
CONFIGURE_ARGS=	--docdir=${DOCSDIR}
27
28
28
OPTIONS=	XSEL	"Build with xsel"		on \
29
OPTIONS=	XSEL	"Build with xsel"		on \
29
		DOXYGEN "Build docs with doxygen"	on
30
		DOXYGEN "Build docs with doxygen"	on
Lines 50-64 Link Here
50
RUN_DEPENDS=	xsel:${PORTSDIR}/x11/xsel-conrad
51
RUN_DEPENDS=	xsel:${PORTSDIR}/x11/xsel-conrad
51
.endif
52
.endif
52
53
53
.if defined(WITHOUT_DOXYGEN) || defined(NOPORTDOCS)
54
.if defined(WITHOUT_DOXYGEN)
54
PLIST_SUB+=	DOCS="@comment "
55
NOPORTDOCS=	yes
55
.else
56
.else
56
BUILD_DEPENDS+=	doxygen:${PORTSDIR}/devel/doxygen
57
BUILD_DEPENDS+=	doxygen:${PORTSDIR}/devel/doxygen
57
PLIST_SUB+=	DOCS=""
58
.endif
58
.endif
59
59
60
post-patch:
60
post-patch:
61
.if defined(WITHOUT_DOXYGEN) || defined(NOPORTDOCS)
61
.if defined(NOPORTDOCS)
62
	@${REINPLACE_CMD} -e 's|$(PROGRAMS) user_doc|$(PROGRAMS)|' \
62
	@${REINPLACE_CMD} -e 's|$(PROGRAMS) user_doc|$(PROGRAMS)|' \
63
		${WRKSRC}/Makefile.in
63
		${WRKSRC}/Makefile.in
64
	@${REINPLACE_CMD} -e 589,593d ${WRKSRC}/Makefile.in
64
	@${REINPLACE_CMD} -e 589,593d ${WRKSRC}/Makefile.in
(-)pkg-plist (-16 / +16 lines)
Lines 3-26 Link Here
3
bin/fish_pager
3
bin/fish_pager
4
bin/fishd
4
bin/fishd
5
bin/mimedb
5
bin/mimedb
6
bin/seq
7
bin/set_color
6
bin/set_color
8
%%ETCDIR%%/config.fish
7
%%ETCDIR%%/config.fish
9
%%DOCS%%share/doc/ChangeLog
8
%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
10
%%DOCS%%share/doc/commands.html
9
%%PORTDOCS%%%%DOCSDIR%%/commands.html
11
%%DOCS%%share/doc/design.html
10
%%PORTDOCS%%%%DOCSDIR%%/design.html
12
%%DOCS%%share/doc/doc_8h-source.html
11
%%PORTDOCS%%%%DOCSDIR%%/doc_8h-source.html
13
%%DOCS%%share/doc/doxygen.css
12
%%PORTDOCS%%%%DOCSDIR%%/doxygen.css
14
%%DOCS%%share/doc/doxygen.png
13
%%PORTDOCS%%%%DOCSDIR%%/doxygen.png
15
%%DOCS%%share/doc/faq.html
14
%%PORTDOCS%%%%DOCSDIR%%/faq.html
16
%%DOCS%%share/doc/files.html
15
%%PORTDOCS%%%%DOCSDIR%%/files.html
17
%%DOCS%%share/doc/index.html
16
%%PORTDOCS%%%%DOCSDIR%%/index.html
18
%%DOCS%%share/doc/license.html
17
%%PORTDOCS%%%%DOCSDIR%%/license.html
19
%%DOCS%%share/doc/pages.html
18
%%PORTDOCS%%%%DOCSDIR%%/pages.html
20
%%DOCS%%share/doc/tab_b.gif
19
%%PORTDOCS%%%%DOCSDIR%%/tab_b.gif
21
%%DOCS%%share/doc/tab_l.gif
20
%%PORTDOCS%%%%DOCSDIR%%/tab_l.gif
22
%%DOCS%%share/doc/tab_r.gif
21
%%PORTDOCS%%%%DOCSDIR%%/tab_r.gif
23
%%DOCS%%share/doc/tabs.css
22
%%PORTDOCS%%%%DOCSDIR%%/tabs.css
24
%%DATADIR%%/completions/acpi.fish
23
%%DATADIR%%/completions/acpi.fish
25
%%DATADIR%%/completions/adduser.fish
24
%%DATADIR%%/completions/adduser.fish
26
%%DATADIR%%/completions/and.fish
25
%%DATADIR%%/completions/and.fish
Lines 353-358 Link Here
353
@dirrm %%DATADIR%%/functions
352
@dirrm %%DATADIR%%/functions
354
@dirrm %%DATADIR%%/completions
353
@dirrm %%DATADIR%%/completions
355
@dirrm %%DATADIR%%
354
@dirrm %%DATADIR%%
355
@dirrm %%DOCSDIR%%
356
@dirrm %%ETCDIR%%
356
@dirrm %%ETCDIR%%
357
@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
357
@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
358
@unexec cp /etc/shells /etc/shells.bak; (grep -v %D/bin/fish /etc/shells.bak) > /etc/shells; rm -f /etc/shells.bak
358
@unexec cp /etc/shells /etc/shells.bak; (grep -v %D/bin/fish /etc/shells.bak) > /etc/shells; rm -f /etc/shells.bak

Return to bug 144545