From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Apr 12 06:10:01 2010 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B6301106566B for ; Mon, 12 Apr 2010 06:10:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 7475F8FC1C for ; Mon, 12 Apr 2010 06:10:01 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id o3C6A1Ib048048 for ; Mon, 12 Apr 2010 06:10:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id o3C6A14A048047; Mon, 12 Apr 2010 06:10:01 GMT (envelope-from gnats) Resent-Date: Mon, 12 Apr 2010 06:10:01 GMT Resent-Message-Id: <201004120610.o3C6A14A048047@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Rob Farmer Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1426B106564A for ; Mon, 12 Apr 2010 06:07:46 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21]) by mx1.freebsd.org (Postfix) with ESMTP id 037A48FC1B for ; Mon, 12 Apr 2010 06:07:46 +0000 (UTC) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.14.3/8.14.3) with ESMTP id o3C67jdn016954 for ; Mon, 12 Apr 2010 06:07:45 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.14.3/8.14.3/Submit) id o3C67j5Q016953; Mon, 12 Apr 2010 06:07:45 GMT (envelope-from nobody) Message-Id: <201004120607.o3C67j5Q016953@www.freebsd.org> Date: Mon, 12 Apr 2010 06:07:45 GMT From: Rob Farmer To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/145640: [MAINTAINER] [PATCH] shells/fish fix plist if seq provided by base system X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 Apr 2010 06:10:01 -0000 >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@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: