- Update to 1.2.3

- Pass maintainership to submitter

PR:		125404
Submitted by:	Naram Qashat <cyberbotx@cyberbotx.com>
Approved by:	maintainer

8 files changed, 120 insertions, 102 deletions

diff --git a/devel/subcommander/Makefile b/devel/subcommander/Makefile
index f2879cb4a4c4..2161dbfeb9b9 100644
--- a/devel/subcommander/Makefile
+++ b/devel/subcommander/Makefile
@@ -6,16 +6,15 @@
 #
 
 PORTNAME=	subcommander
-PORTVERSION=	1.2.2
-PORTREVISION=	2
+PORTVERSION=	1.2.3
 CATEGORIES=	devel
-MASTER_SITES=	http://subcommander.tigris.org/files/documents/1759/35437/
+MASTER_SITES=	http://subcommander.tigris.org/files/documents/1759/42385/
 DISTNAME=	Subcommander-${PORTVERSION}
 
-MAINTAINER=	zhoushuqun@gmail.com
+MAINTAINER=	cyberbotx@cyberbotx.com
 COMMENT=	Qt based multiplatform subversion client, diff & merge tool
 
-LIB_DEPENDS=	neon.26:${PORTSDIR}/www/neon26 \
+LIB_DEPENDS=	neon.28:${PORTSDIR}/www/neon28 \
 		apr-1.3:${PORTSDIR}/devel/apr-svn \
 		boost_thread.4:${PORTSDIR}/devel/boost \
 		svn_client-1.0:${PORTSDIR}/devel/subversion
@@ -25,8 +24,7 @@ WRKSRC=	${WRKDIR}/${PORTNAME}-${PORTVERSION}
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_QT_VER=	3
-CONFIGURE_ARGS+=	--with-boost=${LOCALBASE}
-CONFIGURE_ARGS+=	--with-neon=${LOCALBASE}
+CONFIGURE_ARGS+=	--with-boost=${LOCALBASE} --with-neon=${LOCALBASE}
 CONFIGURE_ENV=	QTDIR=${LOCALBASE} CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 
diff --git a/devel/subcommander/distinfo b/devel/subcommander/distinfo
index 63b064d0f746..c76e9c9a1c50 100644
--- a/devel/subcommander/distinfo
+++ b/devel/subcommander/distinfo
@@ -1,3 +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
+MD5 (Subcommander-1.2.3.tar.gz) = edbbf697c8653bdcb4778dc0182ad05c
+SHA256 (Subcommander-1.2.3.tar.gz) = 808a1e590ae20f914069a1251c98e6643069a5e3de032d0af2671e1b5398f301
+SIZE (Subcommander-1.2.3.tar.gz) = 7343786
diff --git a/devel/subcommander/files/patch-subcommander-Makefile.in b/devel/subcommander/files/patch-subcommander-Makefile.in
new file mode 100644
index 000000000000..f9de6cdc90a0
--- /dev/null
+++ b/devel/subcommander/files/patch-subcommander-Makefile.in
@@ -0,0 +1,11 @@
+--- subcommander/Makefile.in.orig	2008-04-06 16:52:58.000000000 -0400
++++ subcommander/Makefile.in	2008-07-08 10:05:14.000000000 -0400
+@@ -332,7 +332,7 @@
+ 
+ subcommander_LDADD = -L../util -L../svn -L../sublib -lsvn -lutil -lsublib @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@
+ 
diff --git a/devel/subcommander/pkg-plist b/devel/subcommander/pkg-plist
index 953a86bbab50..6383a0ff133c 100644
--- a/devel/subcommander/pkg-plist
+++ b/devel/subcommander/pkg-plist
@@ -1,43 +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
+%%DATADIR%%/icons/default/BookmarkProjectClosed.png
+%%DATADIR%%/icons/default/BookmarkProjectOpened.png
+%%DATADIR%%/icons/default/BookmarkRepository.png
+%%DATADIR%%/icons/default/BookmarkWorkingCopy.png
+%%DATADIR%%/icons/default/Cancel-Active.png
+%%DATADIR%%/icons/default/Cancel-Disabled.png
+%%DATADIR%%/icons/default/Cancel-Normal.png
+%%DATADIR%%/icons/default/Failed.png
+%%DATADIR%%/icons/default/FailedSmall.png
+%%DATADIR%%/icons/default/Folder.png
+%%DATADIR%%/icons/default/FolderSvn.png
+%%DATADIR%%/icons/default/Force-NormalOff.png
+%%DATADIR%%/icons/default/Force-NormalOn.png
+%%DATADIR%%/icons/default/GNU.png
+%%DATADIR%%/icons/default/LICENSE
+%%DATADIR%%/icons/default/Merge-Active.png
+%%DATADIR%%/icons/default/Merge-Disabled.png
+%%DATADIR%%/icons/default/Merge-Normal.png
+%%DATADIR%%/icons/default/NextDiff-Active.png
+%%DATADIR%%/icons/default/NextDiff-Disabled.png
+%%DATADIR%%/icons/default/NextDiff-Normal.png
+%%DATADIR%%/icons/default/PrevDiff-Active.png
+%%DATADIR%%/icons/default/PrevDiff-Disabled.png
+%%DATADIR%%/icons/default/PrevDiff-Normal.png
+%%DATADIR%%/icons/default/README
+%%DATADIR%%/icons/default/Recursive-NormalOff.png
+%%DATADIR%%/icons/default/Recursive-NormalOn.png
+%%DATADIR%%/icons/default/Reload-Active.png
+%%DATADIR%%/icons/default/Reload-Disabled.png
+%%DATADIR%%/icons/default/Reload-Normal.png
+%%DATADIR%%/icons/default/WcAll-NormalOff.png
+%%DATADIR%%/icons/default/WcAll-NormalOn.png
+%%DATADIR%%/icons/default/WcIgnored-NormalOff.png
+%%DATADIR%%/icons/default/WcIgnored-NormalOn.png
+%%DATADIR%%/icons/default/WcUpdates-NormalOff.png
+%%DATADIR%%/icons/default/WcUpdates-NormalOn.png
+%%DATADIR%%/icons/default/Whitespace-NormalOff.png
+%%DATADIR%%/icons/default/Whitespace-NormalOn.png
+@dirrm %%DATADIR%%/icons/default
+@dirrm %%DATADIR%%/icons
+@dirrm %%DATADIR%%
diff --git a/devel/subcommander2/Makefile b/devel/subcommander2/Makefile
index f2879cb4a4c4..2161dbfeb9b9 100644
--- a/devel/subcommander2/Makefile
+++ b/devel/subcommander2/Makefile
@@ -6,16 +6,15 @@
 #
 
 PORTNAME=	subcommander
-PORTVERSION=	1.2.2
-PORTREVISION=	2
+PORTVERSION=	1.2.3
 CATEGORIES=	devel
-MASTER_SITES=	http://subcommander.tigris.org/files/documents/1759/35437/
+MASTER_SITES=	http://subcommander.tigris.org/files/documents/1759/42385/
 DISTNAME=	Subcommander-${PORTVERSION}
 
-MAINTAINER=	zhoushuqun@gmail.com
+MAINTAINER=	cyberbotx@cyberbotx.com
 COMMENT=	Qt based multiplatform subversion client, diff & merge tool
 
-LIB_DEPENDS=	neon.26:${PORTSDIR}/www/neon26 \
+LIB_DEPENDS=	neon.28:${PORTSDIR}/www/neon28 \
 		apr-1.3:${PORTSDIR}/devel/apr-svn \
 		boost_thread.4:${PORTSDIR}/devel/boost \
 		svn_client-1.0:${PORTSDIR}/devel/subversion
@@ -25,8 +24,7 @@ WRKSRC=	${WRKDIR}/${PORTNAME}-${PORTVERSION}
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_QT_VER=	3
-CONFIGURE_ARGS+=	--with-boost=${LOCALBASE}
-CONFIGURE_ARGS+=	--with-neon=${LOCALBASE}
+CONFIGURE_ARGS+=	--with-boost=${LOCALBASE} --with-neon=${LOCALBASE}
 CONFIGURE_ENV=	QTDIR=${LOCALBASE} CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 
diff --git a/devel/subcommander2/distinfo b/devel/subcommander2/distinfo
index 63b064d0f746..c76e9c9a1c50 100644
--- a/devel/subcommander2/distinfo
+++ b/devel/subcommander2/distinfo
@@ -1,3 +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
+MD5 (Subcommander-1.2.3.tar.gz) = edbbf697c8653bdcb4778dc0182ad05c
+SHA256 (Subcommander-1.2.3.tar.gz) = 808a1e590ae20f914069a1251c98e6643069a5e3de032d0af2671e1b5398f301
+SIZE (Subcommander-1.2.3.tar.gz) = 7343786
diff --git a/devel/subcommander2/files/patch-subcommander-Makefile.in b/devel/subcommander2/files/patch-subcommander-Makefile.in
new file mode 100644
index 000000000000..f9de6cdc90a0
--- /dev/null
+++ b/devel/subcommander2/files/patch-subcommander-Makefile.in
@@ -0,0 +1,11 @@
+--- subcommander/Makefile.in.orig	2008-04-06 16:52:58.000000000 -0400
++++ subcommander/Makefile.in	2008-07-08 10:05:14.000000000 -0400
+@@ -332,7 +332,7 @@
+ 
+ subcommander_LDADD = -L../util -L../svn -L../sublib -lsvn -lutil -lsublib @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@
+ 
diff --git a/devel/subcommander2/pkg-plist b/devel/subcommander2/pkg-plist
index 953a86bbab50..6383a0ff133c 100644
--- a/devel/subcommander2/pkg-plist
+++ b/devel/subcommander2/pkg-plist
@@ -1,43 +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
+%%DATADIR%%/icons/default/BookmarkProjectClosed.png
+%%DATADIR%%/icons/default/BookmarkProjectOpened.png
+%%DATADIR%%/icons/default/BookmarkRepository.png
+%%DATADIR%%/icons/default/BookmarkWorkingCopy.png
+%%DATADIR%%/icons/default/Cancel-Active.png
+%%DATADIR%%/icons/default/Cancel-Disabled.png
+%%DATADIR%%/icons/default/Cancel-Normal.png
+%%DATADIR%%/icons/default/Failed.png
+%%DATADIR%%/icons/default/FailedSmall.png
+%%DATADIR%%/icons/default/Folder.png
+%%DATADIR%%/icons/default/FolderSvn.png
+%%DATADIR%%/icons/default/Force-NormalOff.png
+%%DATADIR%%/icons/default/Force-NormalOn.png
+%%DATADIR%%/icons/default/GNU.png
+%%DATADIR%%/icons/default/LICENSE
+%%DATADIR%%/icons/default/Merge-Active.png
+%%DATADIR%%/icons/default/Merge-Disabled.png
+%%DATADIR%%/icons/default/Merge-Normal.png
+%%DATADIR%%/icons/default/NextDiff-Active.png
+%%DATADIR%%/icons/default/NextDiff-Disabled.png
+%%DATADIR%%/icons/default/NextDiff-Normal.png
+%%DATADIR%%/icons/default/PrevDiff-Active.png
+%%DATADIR%%/icons/default/PrevDiff-Disabled.png
+%%DATADIR%%/icons/default/PrevDiff-Normal.png
+%%DATADIR%%/icons/default/README
+%%DATADIR%%/icons/default/Recursive-NormalOff.png
+%%DATADIR%%/icons/default/Recursive-NormalOn.png
+%%DATADIR%%/icons/default/Reload-Active.png
+%%DATADIR%%/icons/default/Reload-Disabled.png
+%%DATADIR%%/icons/default/Reload-Normal.png
+%%DATADIR%%/icons/default/WcAll-NormalOff.png
+%%DATADIR%%/icons/default/WcAll-NormalOn.png
+%%DATADIR%%/icons/default/WcIgnored-NormalOff.png
+%%DATADIR%%/icons/default/WcIgnored-NormalOn.png
+%%DATADIR%%/icons/default/WcUpdates-NormalOff.png
+%%DATADIR%%/icons/default/WcUpdates-NormalOn.png
+%%DATADIR%%/icons/default/Whitespace-NormalOff.png
+%%DATADIR%%/icons/default/Whitespace-NormalOn.png
+@dirrm %%DATADIR%%/icons/default
+@dirrm %%DATADIR%%/icons
+@dirrm %%DATADIR%%