Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 20 Jun 2013 06:47:38 +0000 (UTC)
From:      Alexey Dokuchaev <danfe@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r321352 - head/devel/plan9port
Message-ID:  <201306200647.r5K6lc1a050422@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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 \



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