From owner-svn-ports-head@FreeBSD.ORG  Mon Nov 12 14:44:24 2012
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 88F65ABF;
 Mon, 12 Nov 2012 14:44:24 +0000 (UTC)
 (envelope-from ehaupt@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 6B6558FC08;
 Mon, 12 Nov 2012 14:44:24 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qACEiOpP036430;
 Mon, 12 Nov 2012 14:44:24 GMT (envelope-from ehaupt@svn.freebsd.org)
Received: (from ehaupt@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qACEiO5H036429;
 Mon, 12 Nov 2012 14:44:24 GMT (envelope-from ehaupt@svn.freebsd.org)
Message-Id: <201211121444.qACEiO5H036429@svn.freebsd.org>
From: Emanuel Haupt <ehaupt@FreeBSD.org>
Date: Mon, 12 Nov 2012 14:44:24 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r307339 - head/security/ssh-copy-id
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 12 Nov 2012 14:44:24 -0000

Author: ehaupt
Date: Mon Nov 12 14:44:24 2012
New Revision: 307339
URL: http://svnweb.freebsd.org/changeset/ports/307339

Log:
  Mark IGNORE on ${OSVERSION} >= 1000024 where the script got added to the base
  system.
  
  Feature safe:	yes

Modified:
  head/security/ssh-copy-id/Makefile

Modified: head/security/ssh-copy-id/Makefile
==============================================================================
--- head/security/ssh-copy-id/Makefile	Mon Nov 12 14:42:00 2012	(r307338)
+++ head/security/ssh-copy-id/Makefile	Mon Nov 12 14:44:24 2012	(r307339)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	ssh-copy-id
-# Date created:				14 Jan 2011
-# Whom:					Emanuel Haupt <ehaupt@FreeBSD.org>
-#
+# Created by: Emanuel Haupt <ehaupt@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	ssh-copy-id
 PORTVERSION=	5.6p1
@@ -19,6 +15,12 @@ NO_BUILD=	yes
 MAN1=		ssh-copy-id.1
 PLIST_FILES=	bin/ssh-copy-id
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 1000024
+IGNORE=		is already in the base system
+.endif
+
 pre-patch:
 .for f in ssh-copy-id ssh-copy-id.1
 	@${CP} ${FILESDIR}/${f} ${WRKDIR}
@@ -28,4 +30,4 @@ do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKDIR}/${MAN1} ${MANPREFIX}/man/man1
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>