9 files changed, 165 insertions, 0 deletions

diff --git a/devel/Makefile b/devel/Makefile
index 9b956d8db0b8..ca4d3e0f0ec0 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -2194,6 +2194,7 @@
     SUBDIR += stringencoders
     SUBDIR += styx
     SUBDIR += subclipse
+    SUBDIR += subcommander
     SUBDIR += subversion
     SUBDIR += subversion-perl
     SUBDIR += subversion-python
diff --git a/devel/subcommander/Makefile b/devel/subcommander/Makefile
new file mode 100644
index 000000000000..09afcd0dc3fb
--- /dev/null
+++ b/devel/subcommander/Makefile
@@ -0,0 +1,31 @@
+# New ports collection makefile for:	subcommander
+# Date created:		22 July 2007
+# Whom:			sutra
+#
+# $FreeBSD$
+#
+
+PORTNAME=	subcommander
+PORTVERSION=	1.2.2
+CATEGORIES=	devel
+MASTER_SITES=	http://subcommander.tigris.org/files/documents/1759/35437/
+DISTNAME=	Subcommander-${PORTVERSION}
+
+MAINTAINER=	zhoushuqun@gmail.com
+COMMENT=	Qt based multiplatform subversion client, diff & merge tool
+
+LIB_DEPENDS=	neon.26:${PORTSDIR}/www/neon \
+		apr-1.2:${PORTSDIR}/devel/apr-svn
+RUN_DEPENDS=	subversion>=1.2.0:${PORTSDIR}/devel/subversion
+
+WRKSRC=	${WRKDIR}/${PORTNAME}-${PORTVERSION}
+
+GNU_CONFIGURE=	yes
+USE_GMAKE=	yes
+USE_QT_VERE=	3
+CONFIGURE_ARGS+=	--with-boost=${LOCALBASE}
+CONFIGURE_ARGS+=	--with-neon=${LOCALBASE}
+CONFIGURE_ENV=	QTDIR=${X11BASE} CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+
+.include <bsd.port.mk>
diff --git a/devel/subcommander/distinfo b/devel/subcommander/distinfo
new file mode 100644
index 000000000000..63b064d0f746
--- /dev/null
+++ b/devel/subcommander/distinfo
@@ -0,0 +1,3 @@
+MD5 (Subcommander-1.2.2.tar.gz) = d32fa91546151347707f6c1a553cbcec
+SHA256 (Subcommander-1.2.2.tar.gz) = f3aa511ea43bc53c480aa5ab21974372c65020de5f4cf01da40703ead673a1d7
+SIZE (Subcommander-1.2.2.tar.gz) = 7290023
diff --git a/devel/subcommander/pkg-descr b/devel/subcommander/pkg-descr
new file mode 100644
index 000000000000..22d376edf194
--- /dev/null
+++ b/devel/subcommander/pkg-descr
@@ -0,0 +1,5 @@
+The goal of the Subcommander project is to build an easy to use, 
+cross platform (Win32, Unix, MacOSX)  subversion GUI client (subcommander) 
+including a visual diff and merge tool (submerge).
+
+WWW:   http://subcommander.tigris.org/
diff --git a/devel/subcommander/pkg-plist b/devel/subcommander/pkg-plist
new file mode 100644
index 000000000000..953a86bbab50
--- /dev/null
+++ b/devel/subcommander/pkg-plist
@@ -0,0 +1,43 @@
+bin/subcommander
+bin/submerge
+share/subcommander/icons/default/BookmarkProjectClosed.png
+share/subcommander/icons/default/BookmarkProjectOpened.png
+share/subcommander/icons/default/BookmarkRepository.png
+share/subcommander/icons/default/BookmarkWorkingCopy.png
+share/subcommander/icons/default/Cancel-Active.png
+share/subcommander/icons/default/Cancel-Disabled.png
+share/subcommander/icons/default/Cancel-Normal.png
+share/subcommander/icons/default/Failed.png
+share/subcommander/icons/default/FailedSmall.png
+share/subcommander/icons/default/Folder.png
+share/subcommander/icons/default/FolderSvn.png
+share/subcommander/icons/default/Force-NormalOff.png
+share/subcommander/icons/default/Force-NormalOn.png
+share/subcommander/icons/default/GNU.png
+share/subcommander/icons/default/LICENSE
+share/subcommander/icons/default/Merge-Active.png
+share/subcommander/icons/default/Merge-Disabled.png
+share/subcommander/icons/default/Merge-Normal.png
+share/subcommander/icons/default/NextDiff-Active.png
+share/subcommander/icons/default/NextDiff-Disabled.png
+share/subcommander/icons/default/NextDiff-Normal.png
+share/subcommander/icons/default/PrevDiff-Active.png
+share/subcommander/icons/default/PrevDiff-Disabled.png
+share/subcommander/icons/default/PrevDiff-Normal.png
+share/subcommander/icons/default/README
+share/subcommander/icons/default/Recursive-NormalOff.png
+share/subcommander/icons/default/Recursive-NormalOn.png
+share/subcommander/icons/default/Reload-Active.png
+share/subcommander/icons/default/Reload-Disabled.png
+share/subcommander/icons/default/Reload-Normal.png
+share/subcommander/icons/default/WcAll-NormalOff.png
+share/subcommander/icons/default/WcAll-NormalOn.png
+share/subcommander/icons/default/WcIgnored-NormalOff.png
+share/subcommander/icons/default/WcIgnored-NormalOn.png
+share/subcommander/icons/default/WcUpdates-NormalOff.png
+share/subcommander/icons/default/WcUpdates-NormalOn.png
+share/subcommander/icons/default/Whitespace-NormalOff.png
+share/subcommander/icons/default/Whitespace-NormalOn.png
+@dirrm share/subcommander/icons/default
+@dirrm share/subcommander/icons
+@dirrm share/subcommander
diff --git a/devel/subcommander2/Makefile b/devel/subcommander2/Makefile
new file mode 100644
index 000000000000..09afcd0dc3fb
--- /dev/null
+++ b/devel/subcommander2/Makefile
@@ -0,0 +1,31 @@
+# New ports collection makefile for:	subcommander
+# Date created:		22 July 2007
+# Whom:			sutra
+#
+# $FreeBSD$
+#
+
+PORTNAME=	subcommander
+PORTVERSION=	1.2.2
+CATEGORIES=	devel
+MASTER_SITES=	http://subcommander.tigris.org/files/documents/1759/35437/
+DISTNAME=	Subcommander-${PORTVERSION}
+
+MAINTAINER=	zhoushuqun@gmail.com
+COMMENT=	Qt based multiplatform subversion client, diff & merge tool
+
+LIB_DEPENDS=	neon.26:${PORTSDIR}/www/neon \
+		apr-1.2:${PORTSDIR}/devel/apr-svn
+RUN_DEPENDS=	subversion>=1.2.0:${PORTSDIR}/devel/subversion
+
+WRKSRC=	${WRKDIR}/${PORTNAME}-${PORTVERSION}
+
+GNU_CONFIGURE=	yes
+USE_GMAKE=	yes
+USE_QT_VERE=	3
+CONFIGURE_ARGS+=	--with-boost=${LOCALBASE}
+CONFIGURE_ARGS+=	--with-neon=${LOCALBASE}
+CONFIGURE_ENV=	QTDIR=${X11BASE} CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+
+.include <bsd.port.mk>
diff --git a/devel/subcommander2/distinfo b/devel/subcommander2/distinfo
new file mode 100644
index 000000000000..63b064d0f746
--- /dev/null
+++ b/devel/subcommander2/distinfo
@@ -0,0 +1,3 @@
+MD5 (Subcommander-1.2.2.tar.gz) = d32fa91546151347707f6c1a553cbcec
+SHA256 (Subcommander-1.2.2.tar.gz) = f3aa511ea43bc53c480aa5ab21974372c65020de5f4cf01da40703ead673a1d7
+SIZE (Subcommander-1.2.2.tar.gz) = 7290023
diff --git a/devel/subcommander2/pkg-descr b/devel/subcommander2/pkg-descr
new file mode 100644
index 000000000000..22d376edf194
--- /dev/null
+++ b/devel/subcommander2/pkg-descr
@@ -0,0 +1,5 @@
+The goal of the Subcommander project is to build an easy to use, 
+cross platform (Win32, Unix, MacOSX)  subversion GUI client (subcommander) 
+including a visual diff and merge tool (submerge).
+
+WWW:   http://subcommander.tigris.org/
diff --git a/devel/subcommander2/pkg-plist b/devel/subcommander2/pkg-plist
new file mode 100644
index 000000000000..953a86bbab50
--- /dev/null
+++ b/devel/subcommander2/pkg-plist
@@ -0,0 +1,43 @@
+bin/subcommander
+bin/submerge
+share/subcommander/icons/default/BookmarkProjectClosed.png
+share/subcommander/icons/default/BookmarkProjectOpened.png
+share/subcommander/icons/default/BookmarkRepository.png
+share/subcommander/icons/default/BookmarkWorkingCopy.png
+share/subcommander/icons/default/Cancel-Active.png
+share/subcommander/icons/default/Cancel-Disabled.png
+share/subcommander/icons/default/Cancel-Normal.png
+share/subcommander/icons/default/Failed.png
+share/subcommander/icons/default/FailedSmall.png
+share/subcommander/icons/default/Folder.png
+share/subcommander/icons/default/FolderSvn.png
+share/subcommander/icons/default/Force-NormalOff.png
+share/subcommander/icons/default/Force-NormalOn.png
+share/subcommander/icons/default/GNU.png
+share/subcommander/icons/default/LICENSE
+share/subcommander/icons/default/Merge-Active.png
+share/subcommander/icons/default/Merge-Disabled.png
+share/subcommander/icons/default/Merge-Normal.png
+share/subcommander/icons/default/NextDiff-Active.png
+share/subcommander/icons/default/NextDiff-Disabled.png
+share/subcommander/icons/default/NextDiff-Normal.png
+share/subcommander/icons/default/PrevDiff-Active.png
+share/subcommander/icons/default/PrevDiff-Disabled.png
+share/subcommander/icons/default/PrevDiff-Normal.png
+share/subcommander/icons/default/README
+share/subcommander/icons/default/Recursive-NormalOff.png
+share/subcommander/icons/default/Recursive-NormalOn.png
+share/subcommander/icons/default/Reload-Active.png
+share/subcommander/icons/default/Reload-Disabled.png
+share/subcommander/icons/default/Reload-Normal.png
+share/subcommander/icons/default/WcAll-NormalOff.png
+share/subcommander/icons/default/WcAll-NormalOn.png
+share/subcommander/icons/default/WcIgnored-NormalOff.png
+share/subcommander/icons/default/WcIgnored-NormalOn.png
+share/subcommander/icons/default/WcUpdates-NormalOff.png
+share/subcommander/icons/default/WcUpdates-NormalOn.png
+share/subcommander/icons/default/Whitespace-NormalOff.png
+share/subcommander/icons/default/Whitespace-NormalOn.png
+@dirrm share/subcommander/icons/default
+@dirrm share/subcommander/icons
+@dirrm share/subcommander