ports/145640: [MAINTAINER] [PATCH] shells/fish fix plist if seq provided by base system

Rob Farmer rfarmer at predatorlabs.net
Mon Apr 12 06:10:01 UTC 2010


>Number:         145640
>Category:       ports
>Synopsis:       [MAINTAINER] [PATCH] shells/fish fix plist if seq provided by base system
>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 Apr 12 06:10: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: Fri Apr  2 23:28:12 PDT 2010     rfarmer at pentium4.predatorlabs.net:/usr/obj/usr/src/sys/PENTIUM4  i386
>Description:
If "seq" is provided by the base system (ie after svn r204103) fish will not install its own version. Fix the plist accordingly.

Reported by: pointyhat/erwin
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/shells/fish/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- Makefile	28 Mar 2010 06:43:32 -0000	1.11
+++ Makefile	12 Apr 2010 06:02:41 -0000
@@ -7,7 +7,7 @@
 
 PORTNAME=	fish
 PORTVERSION=	1.23.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	shells
 MASTER_SITES=	SF
 
@@ -57,6 +57,12 @@
 BUILD_DEPENDS+=	doxygen:${PORTSDIR}/devel/doxygen
 .endif
 
+.if ${OSVERSION} > 900008
+PLIST_SUB+=	SEQ="@comment"
+.else
+PLIST_SUB+=	SEQ=""
+.endif
+
 post-patch:
 .if defined(NOPORTDOCS)
 	@${REINPLACE_CMD} -e 's|$(PROGRAMS) user_doc|$(PROGRAMS)|' \
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/shells/fish/pkg-plist,v
retrieving revision 1.5
diff -u -r1.5 pkg-plist
--- pkg-plist	17 Mar 2010 06:29:16 -0000	1.5
+++ pkg-plist	12 Apr 2010 06:02:55 -0000
@@ -2,7 +2,7 @@
 bin/fish_indent
 bin/fish_pager
 bin/fishd
-bin/seq
+%%SEQ%%bin/seq
 bin/mimedb
 bin/set_color
 %%ETCDIR%%/config.fish


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



More information about the freebsd-ports-bugs mailing list