From owner-svn-ports-all@FreeBSD.ORG  Thu Jun 20 06:47:38 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id B4ED9A1E;
 Thu, 20 Jun 2013 06:47:38 +0000 (UTC)
 (envelope-from danfe@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id A78191D38;
 Thu, 20 Jun 2013 06:47:38 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5K6lcuh050423;
 Thu, 20 Jun 2013 06:47:38 GMT (envelope-from danfe@svn.freebsd.org)
Received: (from danfe@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5K6lc1a050422;
 Thu, 20 Jun 2013 06:47:38 GMT (envelope-from danfe@svn.freebsd.org)
Message-Id: <201306200647.r5K6lc1a050422@svn.freebsd.org>
From: Alexey Dokuchaev <danfe@FreeBSD.org>
Date: Thu, 20 Jun 2013 06:47:38 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r321352 - head/devel/plan9port
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 20 Jun 2013 06:47:38 -0000

Author: danfe
Date: Thu Jun 20 06:47:38 2013
New Revision: 321352
URL: http://svnweb.freebsd.org/changeset/ports/321352

Log:
  - Unbreak on -CURRENT (10.x): their linker script (bin/9l) employs silly
    `uname -r` check which did not cover FreeBSD versions >9
  - Clean up Makefile slightly while here

Modified:
  head/devel/plan9port/Makefile

Modified: head/devel/plan9port/Makefile
==============================================================================
--- head/devel/plan9port/Makefile	Thu Jun 20 04:37:30 2013	(r321351)
+++ head/devel/plan9port/Makefile	Thu Jun 20 06:47:38 2013	(r321352)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	Plan 9 from User Space
-# Date created:				Wed Mar 31 17:11:24 EST 2004
-# Whom:					Serge Gagnon <serge.gagnon@b2b2c.ca>
-#
+# Created by: Serge Gagnon <serge.gagnon@b2b2c.ca>
 # $FreeBSD$
-#
 
 PORTNAME=	plan9port
 PORTVERSION=	20130320
@@ -103,6 +99,7 @@ post-patch:
 		| ${XARGS} ${REINPLACE_CMD} -e 's|\\\*9|${PLAN9}|'
 	@${REINPLACE_CMD} -e 's|X11=/usr/X11R6|X11=${LOCALBASE}|' \
 		${WRKSRC}/bin/9l ${WRKSRC}/src/cmd/devdraw/mkwsysrules.sh
+	@${REINPLACE_CMD} -e 's|\[5-9\]\.||' ${WRKSRC}/bin/9l
 	@${REINPLACE_CMD} -e 's|/lib/font/bit|${PLAN9}/font|' \
 		${WRKSRC}/src/cmd/acme/acme.c
 
@@ -121,7 +118,7 @@ post-build:
 	) > ${PLIST}
 
 do-install:
-	${CP} -Rp ${WRKSRC} ${PREFIX}
+	${CP} -a ${WRKSRC} ${PREFIX}
 
 post-install:
 	cd ${PLAN9} && ${SETENV} PLAN9=${PLAN9} PATH=${PATH}:${PLAN9}/bin \