5 files changed, 71 insertions, 24 deletions

diff --git a/devel/subcommander2/Makefile b/devel/subcommander2/Makefile
index 14a959458fa1..925e079b71ba 100644
--- a/devel/subcommander2/Makefile
+++ b/devel/subcommander2/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	subcommander
-DISTVERSION=	2.0.0.b4
-PORTREVISION=	2
+DISTVERSION=	2.0.0.b5
 CATEGORIES=	devel
-MASTER_SITES=	http://subcommander.tigris.org/files/documents/1759/43367/
+MASTER_SITES=	http://subcommander.tigris.org/files/documents/1759/46676/
 DISTNAME=	Subcommander-${PORTVERSION:S/.b/b/g}
 
 MAINTAINER=	cyberbotx@cyberbotx.com
@@ -17,20 +16,25 @@ COMMENT=	Qt4 based multiplatform subversion client, diff & merge tool
 
 LIB_DEPENDS=	neon.28:${PORTSDIR}/www/neon28 \
 		boost_thread.4:${PORTSDIR}/devel/boost-libs \
-		svn_client-1.0:${PORTSDIR}/devel/subversion
+		svn_client-1.0:${PORTSDIR}/devel/subversion \
+		sasl2.2:${PORTSDIR}/security/cyrus-sasl2
 
+LATEST_LINK=	subcommander2
 CONFLICTS=	subcommander-1.*
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:S/.b/b/g}
+USE_DOS2UNIX=	*.cpp
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
+USE_OPENSSL=	yes
 USE_QT_VER=	4
 QT_COMPONENTS=	qt3support gui network corelib moc_build uic_build rcc_build
-CONFIGURE_ARGS+=	--with-boost=${LOCALBASE} --with-neon=${LOCALBASE} \
+CONFIGURE_ARGS+=	--with-boost=${LOCALBASE}/include --with-neon=${LOCALBASE} \
 			--with-subversion=${LOCALBASE} --with-qt=${LOCALBASE} \
 			--with-apr=${LOCALBASE}/bin/apr-1-config \
-			--with-apr-util=${LOCALBASE}/bin/apu-1-config
+			--with-apr-util=${LOCALBASE}/bin/apu-1-config \
+			--with-openssl=${OPENSSLBASE}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${LOCALBASE}/lib/qt4 ${PTHREAD_LIBS}"
 
diff --git a/devel/subcommander2/distinfo b/devel/subcommander2/distinfo
index b5acdbcef0db..e254800b170b 100644
--- a/devel/subcommander2/distinfo
+++ b/devel/subcommander2/distinfo
@@ -1,3 +1,3 @@
-MD5 (Subcommander-2.0.0b4.tar.gz) = 9c19a695b7c632269f32da82a009fef2
-SHA256 (Subcommander-2.0.0b4.tar.gz) = e9165ba537f4f45474fd830e3f1ec9b48b566428beaf73584520630d7c7a7582
-SIZE (Subcommander-2.0.0b4.tar.gz) = 7005546
+MD5 (Subcommander-2.0.0b5.tar.gz) = a852d5ab25358817f5bb9533dbbdffad
+SHA256 (Subcommander-2.0.0b5.tar.gz) = 6fb555a9df84b833994f90d6016b66e46342ccd819ab2ccd715f1017eeebb79f
+SIZE (Subcommander-2.0.0b5.tar.gz) = 7282185
diff --git a/devel/subcommander2/files/patch-configure b/devel/subcommander2/files/patch-configure
index 638970fc6df4..3e9b0a12d9b2 100644
--- a/devel/subcommander2/files/patch-configure
+++ b/devel/subcommander2/files/patch-configure
@@ -1,6 +1,41 @@
---- configure.orig	2008-08-24 15:30:09.000000000 -0400
-+++ configure	2008-08-25 13:56:04.000000000 -0400
-@@ -6687,7 +6687,7 @@
+--- configure.orig	2009-09-20 05:28:22.000000000 -0400
++++ configure	2009-09-20 14:16:07.000000000 -0400
+@@ -4867,9 +4867,9 @@
+   goodsvn="bad";
+ elif test $SVN_MAJOR -eq 1 -a $SVN_MINOR -le 3; then
+   goodsvn="bad";
+-elif test x$SVN_VERSION == x1.4.4; then
++elif test x$SVN_VERSION = x1.4.4; then
+   goodsvn="bad";
+-elif test x$SVN_VERSION == x1.5.0; then
++elif test x$SVN_VERSION = x1.5.0; then
+   goodsvn="bad";
+ fi
+ 
+@@ -4878,7 +4878,7 @@
+ if test $SVN_MAJOR -ge 1; then
+ 
+   SVN_LIBS_ALL="$SVN_LIBS -lsvn_client-1 -lsvn_wc-1 -lsvn_repos-1"
+-  SVN_LIBS_ALL="$SVN_LIBS_ALL -lsvn_ra-1 -lsvn_ra_svn-1 -lsvn_ra_local-1"
++  SVN_LIBS_ALL="$SVN_LIBS_ALL -lsvn_ra-1 -lsvn_ra_local-1"
+   SVN_LIBS_ALL="$SVN_LIBS_ALL -lsvn_fs-1 -lsvn_fs_fs-1"
+   SVN_LIBS_ALL="$SVN_LIBS_ALL -lsvn_delta-1 -lsvn_diff-1"
+   SVN_LIBS_ALL="$SVN_LIBS_ALL -lsvn_subr-1"
+@@ -4897,7 +4897,7 @@
+ 
+ fi
+ 
+-if test x$goodsvn == xok; then
++if test x$goodsvn = xok; then
+   { echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6; }
+   { echo "$as_me:$LINENO: result:     headers   $SVN_INCLUDES" >&5
+@@ -6815,11 +6815,11 @@
+ 
+   QT_BIN="$qt_path/bin"
+   QT_PATH="$qt_path"
+-  QT_LIBPATH="$qt_path/lib"
++  QT_LIBPATH="$qt_path/lib/qt4"
  
    # extract version numbers of qt
  
@@ -9,7 +44,7 @@
    QT_MAJOR=`echo $QT_VERSION | sed "s/\(.*\)[.].*[.].*/\1/"`
    QT_MINOR=`echo $QT_VERSION | sed "s/.*[.]\(.*\)[.].*/\1/"`
  
-@@ -6715,7 +6715,7 @@
+@@ -6849,7 +6849,7 @@
      *)
        # any other Unix platform directly link with the libs
  
diff --git a/devel/subcommander2/files/patch-subcommander-Makefile.in b/devel/subcommander2/files/patch-subcommander-Makefile.in
index b7563247a184..396a5d47578f 100644
--- a/devel/subcommander2/files/patch-subcommander-Makefile.in
+++ b/devel/subcommander2/files/patch-subcommander-Makefile.in
@@ -1,6 +1,6 @@
---- subcommander/Makefile.in.orig	2008-06-22 13:22:05.000000000 -0400
-+++ subcommander/Makefile.in	2008-08-09 09:57:39.000000000 -0400
-@@ -326,7 +326,7 @@
+--- subcommander/Makefile.in.orig	2009-09-20 05:28:23.000000000 -0400
++++ subcommander/Makefile.in	2009-09-20 13:47:04.000000000 -0400
+@@ -334,7 +334,7 @@
  target_alias = @target_alias@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
@@ -9,15 +9,12 @@
  scdir = $(datadir)/subcommander
  icondir = $(scdir)/icons/default
  icons = ../pics/icons/default
-@@ -430,9 +430,9 @@
+@@ -450,7 +450,7 @@
  
  AM_CXXFLAGS = @MACOSX_UNIVERSAL_CXXFLAGS@
  AM_LDFLAGS = @MACOSX_UNIVERSAL_LDFLAGS@
--subcommander_LDADD = -L../util -L../svn -L../sublib -lsvn -lutil -lsublib @QT_LIBS@ \
-+subcommander_LDADD = -L../util -L../svn -L../sublib -lsvn -lsublib -lutil @QT_LIBS@ \
-                  -lz @APR_LIBS@ @APU_LIBS@ @SVN_LIBS@ -lsvn_client-1 -lsvn_subr-1 \
--                 -lsvn_ra-1 -lsvn_wc-1 -lsvn_delta-1 -lsvn_diff-1 -lsvn_ra_dav-1 \
-+                 -lsvn_ra-1 -lsvn_wc-1 -lsvn_delta-1 -lsvn_diff-1 \
-                  -lsvn_ra_local-1 -lsvn_ra_svn-1 -lsvn_repos-1 -lsvn_fs-1 \
-                  -lsvn_fs_fs-1 @STLPORT_LIBS@ @NEON_LIBS@
+-subcommander_LDADD = -L../util -L../svn -L../sublib -lsvn -lutil -lsublib \
++subcommander_LDADD = -L../util -L../svn -L../sublib -lsvn -lsublib -lutil \
+                      @QT_LIBS@ @SVN_LIBS_ALL@ @STLPORT_LIBS@ @NET_LIBS@ \
+                      @APU_LIBS@ @APR_LIBS@ -lsasl2 -lz
  
diff --git a/devel/subcommander2/files/patch-subcommander-settings-SingleProjectReader.cpp b/devel/subcommander2/files/patch-subcommander-settings-SingleProjectReader.cpp
new file mode 100644
index 000000000000..74101a46006b
--- /dev/null
+++ b/devel/subcommander2/files/patch-subcommander-settings-SingleProjectReader.cpp
@@ -0,0 +1,11 @@
+--- subcommander/settings/SingleProjectReader.cpp.orig	2009-01-04 10:11:39.000000000 -0500
++++ subcommander/settings/SingleProjectReader.cpp	2009-09-20 15:26:20.000000000 -0400
+@@ -11,7 +11,7 @@
+ #include "SingleProjectReader.h"
+ #include "Project.h"
+ #include "sublib/config/ConfigData.h"
+-#include "util/Uuid.h"
++#include "util/uuid.h"
+ 
+ // qt
+ #include <QtCore/QRegExp>