Index: head/devel/subclipse/Makefile
===================================================================
--- head/devel/subclipse/Makefile	(revision 240730)
+++ head/devel/subclipse/Makefile	(revision 240731)
@@ -1,70 +1,72 @@
 # New ports collection makefile for:	subclipse
 # Date created:				06 Mar 2005
 # Whom:					tux@pinguru.net
 #
 # $FreeBSD$
 #
 
 PORTNAME=	subclipse
-PORTVERSION=	1.6.2
+PORTVERSION=	1.6.5
 CATEGORIES=	devel java
-MASTER_SITES=	http://subclipse.tigris.org/files/documents/906/45405/
+MASTER_SITES=	http://subclipse.tigris.org/files/documents/906/46495/
 DISTNAME=	site-${PORTVERSION}
 DIST_SUBDIR=	eclipse
 
 MAINTAINER=	gerrit.beine@gmx.de
 COMMENT=	A subversion plugin for the Eclipse IDE Framework
 
 RUN_DEPENDS=	${LOCALBASE}/bin/eclipse:${PORTSDIR}/java/eclipse
 
 WRKSRC=		${WRKDIR}
 NO_BUILD=	yes
 USE_ZIP=	yes
 
 ECLIPSE=	${PREFIX}/eclipse
 SUBCLIPSE=	org.tigris.subversion.subclipse
 SUBCLIPSEFILES=	features/${SUBCLIPSE}_${PORTVERSION} \
 		features/${SUBCLIPSE}.graph.feature_1.0.7 \
 		features/${SUBCLIPSE}.mylyn_3.0.0 \
-		features/org.tigris.subversion.clientadapter.feature_1.6.0.2 \
-		features/org.tigris.subversion.clientadapter.javahl.feature_1.6.2 \
-		features/org.tigris.subversion.clientadapter.svnkit.feature_1.6.1 \
+		features/org.tigris.subversion.clientadapter.feature_1.6.4.1 \
+		features/org.tigris.subversion.clientadapter.javahl.feature_1.6.4.1 \
+		features/org.tigris.subversion.clientadapter.svnkit.feature_1.6.4 \
+		features/com.collabnet.subversion.merge.feature_1.10.0 \
 		features/com.sun.jna_3.0.9 \
 		features/org.tmatesoft.svnkit_1.3.0.5847 \
-		plugins/org.tigris.subversion.clientadapter_1.6.0.2 \
-		plugins/org.tigris.subversion.clientadapter.javahl_1.6.2 \
-		plugins/org.tigris.subversion.clientadapter.svnkit_1.6.1 \
+		plugins/org.tigris.subversion.clientadapter_1.6.4.1 \
+		plugins/org.tigris.subversion.clientadapter.javahl_1.6.4.1 \
+		plugins/org.tigris.subversion.clientadapter.svnkit_1.6.4 \
 		plugins/${SUBCLIPSE}.core_${PORTVERSION} \
 		plugins/${SUBCLIPSE}.doc_1.3.0 \
 		plugins/${SUBCLIPSE}.graph_1.0.7 \
 		plugins/${SUBCLIPSE}.mylyn_3.0.0 \
 		plugins/${SUBCLIPSE}.ui_${PORTVERSION} \
+		plugins/com.collabnet.subversion.merge_1.10.0 \
 		plugins/com.sun.jna_3.0.9 \
 		plugins/org.tmatesoft.svnkit_1.3.0.5847
 
 .include <bsd.port.pre.mk>
 
 post-extract:
 .for f in ${SUBCLIPSEFILES}
 	cd ${WRKSRC} \
 	  && ${MKDIR} ${f} \
 	  && ${UNZIP_CMD} ${f}.jar -d ${f}
 .endfor
 
 do-install:
 .for f in ${SUBCLIPSEFILES}
 	@cd ${WRKSRC} \
 	  && ${MKDIR} ${ECLIPSE}/${f} \
 	  && ${FIND} ${f} -type d -exec ${MKDIR} ${ECLIPSE}/{} \; \
 	  && ${FIND} ${f} -type f -exec ${INSTALL_DATA} {} ${ECLIPSE}/{} \;
 .endfor
 
 post-install:
 .for f in ${SUBCLIPSEFILES}
 	@${FIND} ${WRKSRC}/${f} -not -type d \
 	  | ${SED} -ne 's,^${WRKSRC},${ECLIPSE:S,^${PREFIX}/,,},p' >> ${TMPPLIST}
 	@${FIND} -d ${WRKSRC}/${f} -type d \
 	  | ${SED} -ne 's,^${WRKSRC},@dirrm ${ECLIPSE:S,^${PREFIX}/,,},p' >> ${TMPPLIST}
 .endfor
 
 .include <bsd.port.post.mk>

Property changes on: head/devel/subclipse/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.18
\ No newline at end of property
+1.19
\ No newline at end of property
Index: head/devel/subclipse/distinfo
===================================================================
--- head/devel/subclipse/distinfo	(revision 240730)
+++ head/devel/subclipse/distinfo	(revision 240731)
@@ -1,3 +1,3 @@
-MD5 (eclipse/site-1.6.2.zip) = 80b662af21d322fdec554fbc3b358052
-SHA256 (eclipse/site-1.6.2.zip) = 5a4682227d1096623f1a3c6f0a1b12e5ff2477f6d3d8be2b4de92b2319f73863
-SIZE (eclipse/site-1.6.2.zip) = 11418835
+MD5 (eclipse/site-1.6.5.zip) = afedc55073d13ba9ba64bfc718cfc1fd
+SHA256 (eclipse/site-1.6.5.zip) = 413708c7a706e749d110cf92ea242b6d0be54bf6ae6470c611eced0ea01b4210
+SIZE (eclipse/site-1.6.5.zip) = 11489997

Property changes on: head/devel/subclipse/distinfo
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.14
\ No newline at end of property
+1.15
\ No newline at end of property