Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 12 Nov 2012 14:44:24 +0000 (UTC)
From:      Emanuel Haupt <ehaupt@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r307339 - head/security/ssh-copy-id
Message-ID:  <201211121444.qACEiO5H036429@svn.freebsd.org>

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



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