Index: head/misc/bsdiff/Makefile
===================================================================
--- head/misc/bsdiff/Makefile	(revision 148082)
+++ head/misc/bsdiff/Makefile	(revision 148083)
@@ -1,19 +1,25 @@
 # New ports collection makefile for:		Binary patch tool
 # Date created:					7 June 2003
 # Whom:						cperciva@daemonology.net
 #
 # $FreeBSD$
 #
 
 PORTNAME=	bsdiff
 PORTVERSION=	4.2
 CATEGORIES=	misc devel
 MASTER_SITES=	http://www.daemonology.net/bsdiff/
 
 MAINTAINER=	cperciva@daemonology.net
 COMMENT=	Generates and applies patches to binary files
 
 MAN1=		bsdiff.1 bspatch.1
 PLIST_FILES=	bin/bsdiff bin/bspatch
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} > 600033 || ( ${OSVERSION} > 504103 && ${OSVERSION} < 600000 )
+IGNORE=		bsdiff now contained in the base system
+.endif
+
+.include <bsd.port.post.mk>

Property changes on: head/misc/bsdiff/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.5
\ No newline at end of property
+1.6
\ No newline at end of property
Index: head/ports-mgmt/portsnap/Makefile
===================================================================
--- head/ports-mgmt/portsnap/Makefile	(revision 148082)
+++ head/ports-mgmt/portsnap/Makefile	(revision 148083)
@@ -1,54 +1,58 @@
 # New ports collection makefile for:		Ports tree snapshot utility
 # Date created:					29 October 2004
 # Whom:						cperciva@daemonology.net
 #
 # $FreeBSD$
 #
 
 PORTNAME=	portsnap
 PORTVERSION=	0.9.5
 CATEGORIES=	sysutils net
 MASTER_SITES=	http://www.daemonology.net/portsnap/
 
 MAINTAINER=	cperciva@daemonology.net
 COMMENT=	Provides secure snapshots of the ports directory
 
 RUN_DEPENDS=	bspatch:${PORTSDIR}/misc/bsdiff
 
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 600021 && ( ${OSVERSION} < 504102 || ${OSVERSION} > 599999 )
 RUN_DEPENDS+=	sha256:${PORTSDIR}/sysutils/freebsd-sha256
 .endif
 
+.if ${OSVERSION} > 600033 || ( ${OSVERSION} > 504103 && ${OSVERSION} < 600000 )
+IGNORE=		portsnap now contained in the base system
+.endif
+
 MAN5=		portsnap.conf.5
 MAN8=		portsnap.8
 PLIST_FILES=	etc/portsnap.conf.sample sbin/portsnap		\
 		libexec/phttpget				\
 		libexec/make_index portsnap/.package.this.directory
 PLIST_DIRS=	portsnap
 
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
 post-extract:
 	${SED} -e "s#PREFIX=/usr/local#PREFIX=${PREFIX}#g" \
 		${WRKSRC}/portsnap > ${WRKSRC}/portsnap.new
 	${MV} ${WRKSRC}/portsnap.new ${WRKSRC}/portsnap
 	@${SED} -e "s=%%PREFIX%%=${PREFIX}=g" ${PKGDIR}/pkg-message \
 		> ${PKGMESSAGE}
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/portsnap ${PREFIX}/sbin
 	${INSTALL_PROGRAM} ${WRKSRC}/make_index ${PREFIX}/libexec
 	${INSTALL_PROGRAM} ${WRKSRC}/phttpget ${PREFIX}/libexec
 	${INSTALL_MAN} ${WRKSRC}/portsnap.conf.5 ${PREFIX}/man/man5/
 	${INSTALL_MAN} ${WRKSRC}/portsnap.8 ${PREFIX}/man/man8/
 	${INSTALL_DATA} ${WRKSRC}/portsnap.conf		\
 		${PREFIX}/etc/portsnap.conf.sample
 	${MKDIR} ${PREFIX}/portsnap
 	${TOUCH} ${PREFIX}/portsnap/.package.this.directory
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>

Property changes on: head/ports-mgmt/portsnap/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.12
\ No newline at end of property
+1.13
\ No newline at end of property
Index: head/sysutils/portsnap/Makefile
===================================================================
--- head/sysutils/portsnap/Makefile	(revision 148082)
+++ head/sysutils/portsnap/Makefile	(revision 148083)
@@ -1,54 +1,58 @@
 # New ports collection makefile for:		Ports tree snapshot utility
 # Date created:					29 October 2004
 # Whom:						cperciva@daemonology.net
 #
 # $FreeBSD$
 #
 
 PORTNAME=	portsnap
 PORTVERSION=	0.9.5
 CATEGORIES=	sysutils net
 MASTER_SITES=	http://www.daemonology.net/portsnap/
 
 MAINTAINER=	cperciva@daemonology.net
 COMMENT=	Provides secure snapshots of the ports directory
 
 RUN_DEPENDS=	bspatch:${PORTSDIR}/misc/bsdiff
 
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 600021 && ( ${OSVERSION} < 504102 || ${OSVERSION} > 599999 )
 RUN_DEPENDS+=	sha256:${PORTSDIR}/sysutils/freebsd-sha256
 .endif
 
+.if ${OSVERSION} > 600033 || ( ${OSVERSION} > 504103 && ${OSVERSION} < 600000 )
+IGNORE=		portsnap now contained in the base system
+.endif
+
 MAN5=		portsnap.conf.5
 MAN8=		portsnap.8
 PLIST_FILES=	etc/portsnap.conf.sample sbin/portsnap		\
 		libexec/phttpget				\
 		libexec/make_index portsnap/.package.this.directory
 PLIST_DIRS=	portsnap
 
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
 post-extract:
 	${SED} -e "s#PREFIX=/usr/local#PREFIX=${PREFIX}#g" \
 		${WRKSRC}/portsnap > ${WRKSRC}/portsnap.new
 	${MV} ${WRKSRC}/portsnap.new ${WRKSRC}/portsnap
 	@${SED} -e "s=%%PREFIX%%=${PREFIX}=g" ${PKGDIR}/pkg-message \
 		> ${PKGMESSAGE}
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/portsnap ${PREFIX}/sbin
 	${INSTALL_PROGRAM} ${WRKSRC}/make_index ${PREFIX}/libexec
 	${INSTALL_PROGRAM} ${WRKSRC}/phttpget ${PREFIX}/libexec
 	${INSTALL_MAN} ${WRKSRC}/portsnap.conf.5 ${PREFIX}/man/man5/
 	${INSTALL_MAN} ${WRKSRC}/portsnap.8 ${PREFIX}/man/man8/
 	${INSTALL_DATA} ${WRKSRC}/portsnap.conf		\
 		${PREFIX}/etc/portsnap.conf.sample
 	${MKDIR} ${PREFIX}/portsnap
 	${TOUCH} ${PREFIX}/portsnap/.package.this.directory
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>

Property changes on: head/sysutils/portsnap/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.12
\ No newline at end of property
+1.13
\ No newline at end of property