Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 5 Jan 2010 12:57:15 GMT
From:      Rob Farmer <rfarmer@predatorlabs.net>
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/142346: [PATCH] [MAINTAINER] shells/fish Minor updates
Message-ID:  <201001051257.o05CvFhQ072337@www.freebsd.org>
Resent-Message-ID: <201001051300.o05D0COr070010@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         142346
>Category:       ports
>Synopsis:       [PATCH] [MAINTAINER] shells/fish Minor updates
>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:   Tue Jan 05 13:00:12 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Rob Farmer
>Release:        9.0-CURRENT
>Organization:
>Environment:
FreeBSD amethyst.predatorlabs.net 9.0-CURRENT FreeBSD 9.0-CURRENT #1 r201473: Mon Jan  4 19:10:44 PST 2010     rfarmer@amethyst.predatorlabs.net:/usr/obj/usr/src/sys/AMETHYST  i386
>Description:
* Remove option to build without NLS - it has been broken for a long time
* Use xsel from ports instead of the outdated bundled version
* Make building the manual with doxygen optional since it is a large dependency
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -ruN fish.old/Makefile fish/Makefile
--- fish.old/Makefile	2010-01-04 23:36:33.000000000 -0800
+++ fish/Makefile	2010-01-05 02:57:25.000000000 -0800
@@ -7,6 +7,7 @@
 
 PORTNAME=	fish
 PORTVERSION=	1.23.1
+PORTREVISION=	1
 CATEGORIES=	shells
 MASTER_SITES=	SF
 
@@ -18,14 +19,14 @@
 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 \
@@ -42,27 +43,28 @@
 
 .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)
+BUILD_DEPENDS+=	doxygen:${PORTSDIR}/devel/doxygen
+PLIST_SUB+=             DOCS=""
 .else
-CONFIGURE_ARGS+=	--without-xsel
-PLIST_SUB+=		XSEL="@comment "
+PLIST_SUB+=             DOCS="@comment "
 .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 -ruN fish.old/pkg-plist fish/pkg-plist
--- fish.old/pkg-plist	2010-01-04 23:36:33.000000000 -0800
+++ fish/pkg-plist	2010-01-05 01:13:51.000000000 -0800
@@ -5,23 +5,22 @@
 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 @@
 %%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%%


>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201001051257.o05CvFhQ072337>