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

(-)fish/Makefile (-18 / +20 lines)
Lines 7-12 Link Here
7
7
8
PORTNAME=	fish
8
PORTNAME=	fish
9
PORTVERSION=	1.23.1
9
PORTVERSION=	1.23.1
10
PORTREVISION=	1
10
CATEGORIES=	shells
11
CATEGORIES=	shells
11
MASTER_SITES=	SF
12
MASTER_SITES=	SF
12
13
Lines 18-31 Link Here
18
USE_GMAKE=	yes
19
USE_GMAKE=	yes
19
GNU_CONFIGURE=	yes
20
GNU_CONFIGURE=	yes
20
21
21
BUILD_DEPENDS+=	doxygen:${PORTSDIR}/devel/doxygen
22
USE_GETTEXT=	yes
22
CPPFLAGS+=	-I${LOCALBASE}/include
23
CPPFLAGS+=	-I${LOCALBASE}/include
23
LDFLAGS+=	-L${LOCALBASE}/lib
24
LDFLAGS+=	-L${LOCALBASE}/lib
24
CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LIBS="${LDFLAGS}" \
25
CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LIBS="${LDFLAGS}" \
25
		LDFLAGS="${LDFLAGS}"
26
		LDFLAGS="${LDFLAGS}"
26
27
27
OPTIONS=	NLS	"Native language support"	on \
28
OPTIONS=	XSEL	"Build with xsel"		on \
28
		XSEL	"Build with xsel"		on
29
		DOXYGEN "Build docs with doxygen"	on
29
30
30
MAN1=		alias.1 and.1 begin.1 bg.1 bind.1 block.1 \
31
MAN1=		alias.1 and.1 begin.1 bg.1 bind.1 block.1 \
31
		break.1 breakpoint.1 builtin.1 case.1 cd.1 \
32
		break.1 breakpoint.1 builtin.1 case.1 cd.1 \
Lines 42-68 Link Here
42
43
43
.include <bsd.port.pre.mk>
44
.include <bsd.port.pre.mk>
44
45
45
.if !defined(WITHOUT_NLS)
46
# Don't use the bundled xsel
46
USE_GETTEXT=		yes
47
CONFIGURE_ARGS+=	--without-xsel
47
PLIST_SUB+=		NLS=""
48
.else
49
CONFIGURE_ARGS+=	--without-gettext
50
PLIST_SUB+=		NLS="@comment "
51
.endif
52
48
53
.if !defined(WITHOUT_XSEL)
49
.if !defined(WITHOUT_XSEL)
54
CONFLICTS=		xsel-[0-9]*
50
RUN_DEPENDS=	xsel:${PORTSDIR}/x11/xsel-conrad
55
PLIST_SUB+=		XSEL=""
51
.endif
56
MAN1+=			xsel.1
52
53
.if !defined(WITHOUT_DOXYGEN) || defined(NOPORTDOCS)
54
BUILD_DEPENDS+=	doxygen:${PORTSDIR}/devel/doxygen
55
PLIST_SUB+=             DOCS=""
57
.else
56
.else
58
CONFIGURE_ARGS+=	--without-xsel
57
PLIST_SUB+=             DOCS="@comment "
59
PLIST_SUB+=		XSEL="@comment "
60
.endif
58
.endif
61
59
62
post-install:
60
post-patch:
63
.if !defined(WITHOUT_XSEL)
61
.if defined(WITHOUT_DOXYGEN) || defined(NOPORTDOCS)
64
	${MV} ${PREFIX}/man/man1/xsel.1x ${PREFIX}/man/man1/xsel.1
62
	@${REINPLACE_CMD} -e 's|$(PROGRAMS) user_doc|$(PROGRAMS)|' \
63
		${WRKSRC}/Makefile.in
64
	@${REINPLACE_CMD} -e 589,593d ${WRKSRC}/Makefile.in
65
.endif
65
.endif
66
67
post-install:
66
	${CP} ${DATADIR}/man/*.1 ${PREFIX}/man/man1/
68
	${CP} ${DATADIR}/man/*.1 ${PREFIX}/man/man1/
67
	${RM} -rf ${DATADIR}/man
69
	${RM} -rf ${DATADIR}/man
68
	if ${GREP} -q '${PREFIX}/bin/${PORTNAME}' /etc/shells; then \
70
	if ${GREP} -q '${PREFIX}/bin/${PORTNAME}' /etc/shells; then \
(-)fish/pkg-plist (-20 / +19 lines)
Lines 5-27 Link Here
5
bin/mimedb
5
bin/mimedb
6
bin/seq
6
bin/seq
7
bin/set_color
7
bin/set_color
8
%%XSEL%%bin/xsel
9
%%ETCDIR%%/config.fish
8
%%ETCDIR%%/config.fish
10
share/doc/ChangeLog
9
%%DOCS%%share/doc/ChangeLog
11
share/doc/commands.html
10
%%DOCS%%share/doc/commands.html
12
share/doc/design.html
11
%%DOCS%%share/doc/design.html
13
share/doc/doc_8h-source.html
12
%%DOCS%%share/doc/doc_8h-source.html
14
share/doc/doxygen.css
13
%%DOCS%%share/doc/doxygen.css
15
share/doc/doxygen.png
14
%%DOCS%%share/doc/doxygen.png
16
share/doc/faq.html
15
%%DOCS%%share/doc/faq.html
17
share/doc/files.html
16
%%DOCS%%share/doc/files.html
18
share/doc/index.html
17
%%DOCS%%share/doc/index.html
19
share/doc/license.html
18
%%DOCS%%share/doc/license.html
20
share/doc/pages.html
19
%%DOCS%%share/doc/pages.html
21
share/doc/tab_b.gif
20
%%DOCS%%share/doc/tab_b.gif
22
share/doc/tab_l.gif
21
%%DOCS%%share/doc/tab_l.gif
23
share/doc/tab_r.gif
22
%%DOCS%%share/doc/tab_r.gif
24
share/doc/tabs.css
23
%%DOCS%%share/doc/tabs.css
25
%%DATADIR%%/completions/acpi.fish
24
%%DATADIR%%/completions/acpi.fish
26
%%DATADIR%%/completions/adduser.fish
25
%%DATADIR%%/completions/adduser.fish
27
%%DATADIR%%/completions/and.fish
26
%%DATADIR%%/completions/and.fish
Lines 347-356 Link Here
347
%%DATADIR%%/functions/umask.fish
346
%%DATADIR%%/functions/umask.fish
348
%%DATADIR%%/functions/up-or-search.fish
347
%%DATADIR%%/functions/up-or-search.fish
349
%%DATADIR%%/functions/vared.fish
348
%%DATADIR%%/functions/vared.fish
350
%%NLS%%share/locale/de/LC_MESSAGES/fish.mo
349
share/locale/de/LC_MESSAGES/fish.mo
351
%%NLS%%share/locale/en/LC_MESSAGES/fish.mo
350
share/locale/en/LC_MESSAGES/fish.mo
352
%%NLS%%share/locale/fr/LC_MESSAGES/fish.mo
351
share/locale/fr/LC_MESSAGES/fish.mo
353
%%NLS%%share/locale/sv/LC_MESSAGES/fish.mo
352
share/locale/sv/LC_MESSAGES/fish.mo
354
@dirrm %%DATADIR%%/functions
353
@dirrm %%DATADIR%%/functions
355
@dirrm %%DATADIR%%/completions
354
@dirrm %%DATADIR%%/completions
356
@dirrm %%DATADIR%%
355
@dirrm %%DATADIR%%

Return to bug 142346