2 files changed, 39 insertions, 39 deletions

diff --git a/shells/fish/Makefile b/shells/fish/Makefile
index 2f5e1671722f..c87778bf0787 100644
--- a/shells/fish/Makefile
+++ b/shells/fish/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	fish
 PORTVERSION=	1.23.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	shells
 MASTER_SITES=	SF
 
@@ -19,14 +19,14 @@ USE_ICONV=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 
-BUILD_DEPENDS+=	doxygen:${PORTSDIR}/devel/doxygen
+USE_GETTEXT=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LIBS="${LDFLAGS}" \
 		LDFLAGS="${LDFLAGS}"
 
-OPTIONS=	NLS	"Native language support"	on \
-		XSEL	"Build with xsel"		on
+OPTIONS=	XSEL	"Build with xsel"		on \
+		DOXYGEN "Build docs with doxygen"	on
 
 MAN1=		alias.1 and.1 begin.1 bg.1 bind.1 block.1 \
 		break.1 breakpoint.1 builtin.1 case.1 cd.1 \
@@ -43,27 +43,28 @@ MAN1=		alias.1 and.1 begin.1 bg.1 bind.1 block.1 \
 
 .include <bsd.port.pre.mk>
 
-.if !defined(WITHOUT_NLS)
-USE_GETTEXT=		yes
-PLIST_SUB+=		NLS=""
-.else
-CONFIGURE_ARGS+=	--without-gettext
-PLIST_SUB+=		NLS="@comment "
-.endif
+# Don't use the bundled xsel
+CONFIGURE_ARGS+=	--without-xsel
 
 .if !defined(WITHOUT_XSEL)
-CONFLICTS=		xsel-[0-9]*
-PLIST_SUB+=		XSEL=""
-MAN1+=			xsel.1
+RUN_DEPENDS=	xsel:${PORTSDIR}/x11/xsel-conrad
+.endif
+
+.if defined(WITHOUT_DOXYGEN) || defined(NOPORTDOCS)
+PLIST_SUB+=	DOCS="@comment "
 .else
-CONFIGURE_ARGS+=	--without-xsel
-PLIST_SUB+=		XSEL="@comment "
+BUILD_DEPENDS+=	doxygen:${PORTSDIR}/devel/doxygen
+PLIST_SUB+=	DOCS=""
 .endif
 
-post-install:
-.if !defined(WITHOUT_XSEL)
-	${MV} ${PREFIX}/man/man1/xsel.1x ${PREFIX}/man/man1/xsel.1
+post-patch:
+.if defined(WITHOUT_DOXYGEN) || defined(NOPORTDOCS)
+	@${REINPLACE_CMD} -e 's|$(PROGRAMS) user_doc|$(PROGRAMS)|' \
+		${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e 589,593d ${WRKSRC}/Makefile.in
 .endif
+
+post-install:
 	${CP} ${DATADIR}/man/*.1 ${PREFIX}/man/man1/
 	${RM} -rf ${DATADIR}/man
 	if ${GREP} -q '${PREFIX}/bin/${PORTNAME}' /etc/shells; then \
diff --git a/shells/fish/pkg-plist b/shells/fish/pkg-plist
index 938052de33e5..9ad6b0fe60b9 100644
--- a/shells/fish/pkg-plist
+++ b/shells/fish/pkg-plist
@@ -5,23 +5,22 @@ bin/fishd
 bin/mimedb
 bin/seq
 bin/set_color
-%%XSEL%%bin/xsel
 %%ETCDIR%%/config.fish
-share/doc/ChangeLog
-share/doc/commands.html
-share/doc/design.html
-share/doc/doc_8h-source.html
-share/doc/doxygen.css
-share/doc/doxygen.png
-share/doc/faq.html
-share/doc/files.html
-share/doc/index.html
-share/doc/license.html
-share/doc/pages.html
-share/doc/tab_b.gif
-share/doc/tab_l.gif
-share/doc/tab_r.gif
-share/doc/tabs.css
+%%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
 %%DATADIR%%/completions/acpi.fish
 %%DATADIR%%/completions/adduser.fish
 %%DATADIR%%/completions/and.fish
@@ -347,10 +346,10 @@ share/doc/tabs.css
 %%DATADIR%%/functions/umask.fish
 %%DATADIR%%/functions/up-or-search.fish
 %%DATADIR%%/functions/vared.fish
-%%NLS%%share/locale/de/LC_MESSAGES/fish.mo
-%%NLS%%share/locale/en/LC_MESSAGES/fish.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/fish.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/fish.mo
+share/locale/de/LC_MESSAGES/fish.mo
+share/locale/en/LC_MESSAGES/fish.mo
+share/locale/fr/LC_MESSAGES/fish.mo
+share/locale/sv/LC_MESSAGES/fish.mo
 @dirrm %%DATADIR%%/functions
 @dirrm %%DATADIR%%/completions
 @dirrm %%DATADIR%%