Attachment #99817 for bug #138996

View | Details | Raw Unified | Return to bug 138996
Collapse All | Expand All




#

PORTNAME=	subcommander
DISTVERSION=	2.0.0.b5
PORTREVISION=	2
CATEGORIES=	devel
MASTER_SITES=	http://subcommander.tigris.org/files/documents/1759/46676/
DISTNAME=	Subcommander-${PORTVERSION:S/.b/b/g}

MAINTAINER=	cyberbotx@cyberbotx.com
COMMENT=	Qt4 based multiplatform subversion client, diff & merge tool

LATEST_LINK=	subcommander2

LIB_DEPENDS=	neon.28:${PORTSDIR}/www/neon28 \
		boost_thread.4:${PORTSDIR}/devel/boost-libs \
		svn_client-1.0:${PORTSDIR}/devel/subversion


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}/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-openssl=${OPENSSLBASE}
CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
		LDFLAGS="-L${LOCALBASE}/lib -L${LOCALBASE}/lib/qt4 ${PTHREAD_LIBS}"


Lines 1-3 Link Here

(-)/kirby/shared/ports/subcommander2/distinfo (-3 / +3 lines)
1	MD5 (Subcommander-2.0.0b4.tar.gz) = 9c19a695b7c632269f32da82a009fef2	1	MD5 (Subcommander-2.0.0b5.tar.gz) = a852d5ab25358817f5bb9533dbbdffad
2	SHA256 (Subcommander-2.0.0b4.tar.gz) = e9165ba537f4f45474fd830e3f1ec9b48b566428beaf73584520630d7c7a7582	2	SHA256 (Subcommander-2.0.0b5.tar.gz) = 6fb555a9df84b833994f90d6016b66e46342ccd819ab2ccd715f1017eeebb79f
3	SIZE (Subcommander-2.0.0b4.tar.gz) = 7005546	3	SIZE (Subcommander-2.0.0b5.tar.gz) = 7282185




--- 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
 

   QT_MAJOR=`echo $QT_VERSION | sed "s/\(.*\)[.].*[.].*/\1/"`
   QT_MINOR=`echo $QT_VERSION | sed "s/.*[.]\(.*\)[.].*/\1/"`
 
@@ -6849,7 +6849,7 @@
     *)
       # any other Unix platform directly link with the libs
 




--- 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@

 scdir = $(datadir)/subcommander
 icondir = $(scdir)/icons/default
 icons = ../pics/icons/default
@@ -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 \
+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
+                 -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@
 

Line 0 Link Here

(-)/kirby/shared/ports/subcommander2/files/patch-subcommander-settings-SingleProjectReader.cpp (+11 lines)
	1	--- subcommander/settings/SingleProjectReader.cpp.orig 2009-01-04 10:11:39.000000000 -0500
	2	+++ subcommander/settings/SingleProjectReader.cpp 2009-09-20 15:26:20.000000000 -0400
	3	@@ -11,7 +11,7 @@
	4	#include "SingleProjectReader.h"
	5	#include "Project.h"
	6	#include "sublib/config/ConfigData.h"
	7	-#include "util/Uuid.h"
	8	+#include "util/uuid.h"
	9
	10	// qt
	11	#include <QtCore/QRegExp>

Return to bug 138996

Lines 6-20 Link Here

(-)/kirby/shared/ports/subcommander2/Makefile (-5 / +8 lines)
6	#	6	#
7		7
8	PORTNAME= subcommander	8	PORTNAME= subcommander
9	DISTVERSION= 2.0.0.b4	9	DISTVERSION= 2.0.0.b5
10	PORTREVISION= 2
11	CATEGORIES= devel	10	CATEGORIES= devel
12	MASTER_SITES= http://subcommander.tigris.org/files/documents/1759/43367/	11	MASTER_SITES= http://subcommander.tigris.org/files/documents/1759/46676/
13	DISTNAME= Subcommander-${PORTVERSION:S/.b/b/g}	12	DISTNAME= Subcommander-${PORTVERSION:S/.b/b/g}
14		13
15	MAINTAINER= cyberbotx@cyberbotx.com	14	MAINTAINER= cyberbotx@cyberbotx.com
16	COMMENT= Qt4 based multiplatform subversion client, diff & merge tool	15	COMMENT= Qt4 based multiplatform subversion client, diff & merge tool
17		16
		17	LATEST_LINK= subcommander2
		18
18	LIB_DEPENDS= neon.28:${PORTSDIR}/www/neon28 \	19	LIB_DEPENDS= neon.28:${PORTSDIR}/www/neon28 \
19	boost_thread.4:${PORTSDIR}/devel/boost-libs \	20	boost_thread.4:${PORTSDIR}/devel/boost-libs \
20	svn_client-1.0:${PORTSDIR}/devel/subversion	21	svn_client-1.0:${PORTSDIR}/devel/subversion
Lines 25-36 Link Here
25		26
26	GNU_CONFIGURE= yes	27	GNU_CONFIGURE= yes
27	USE_GMAKE= yes	28	USE_GMAKE= yes
		29	USE_OPENSSL= yes
28	USE_QT_VER= 4	30	USE_QT_VER= 4
29	QT_COMPONENTS= qt3support gui network corelib moc_build uic_build rcc_build	31	QT_COMPONENTS= qt3support gui network corelib moc_build uic_build rcc_build
30	CONFIGURE_ARGS+= --with-boost=${LOCALBASE} --with-neon=${LOCALBASE} \	32	CONFIGURE_ARGS+= --with-boost=${LOCALBASE}/include --with-neon=${LOCALBASE} \
31	--with-subversion=${LOCALBASE} --with-qt=${LOCALBASE} \	33	--with-subversion=${LOCALBASE} --with-qt=${LOCALBASE} \
32	--with-apr=${LOCALBASE}/bin/apr-1-config \	34	--with-apr=${LOCALBASE}/bin/apr-1-config \
33	--with-apr-util=${LOCALBASE}/bin/apu-1-config	35	--with-apr-util=${LOCALBASE}/bin/apu-1-config \
		36	--with-openssl=${OPENSSLBASE}
34	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \	37	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
35	LDFLAGS="-L${LOCALBASE}/lib -L${LOCALBASE}/lib/qt4 ${PTHREAD_LIBS}"	38	LDFLAGS="-L${LOCALBASE}/lib -L${LOCALBASE}/lib/qt4 ${PTHREAD_LIBS}"
36		39

Lines 1-6 Link Here

(-)/kirby/shared/ports/subcommander2/files/patch-configure (-4 / +39 lines)
1	--- configure.orig 2008-08-24 15:30:09.000000000 -0400	1	--- configure.orig 2009-09-20 05:28:22.000000000 -0400
2	+++ configure 2008-08-25 13:56:04.000000000 -0400	2	+++ configure 2009-09-20 14:16:07.000000000 -0400
3	@@ -6687,7 +6687,7 @@	3	@@ -4867,9 +4867,9 @@
		4	goodsvn="bad";
		5	elif test $SVN_MAJOR -eq 1 -a $SVN_MINOR -le 3; then
		6	goodsvn="bad";
		7	-elif test x$SVN_VERSION == x1.4.4; then
		8	+elif test x$SVN_VERSION = x1.4.4; then
		9	goodsvn="bad";
		10	-elif test x$SVN_VERSION == x1.5.0; then
		11	+elif test x$SVN_VERSION = x1.5.0; then
		12	goodsvn="bad";
		13	fi
		14
		15	@@ -4878,7 +4878,7 @@
		16	if test $SVN_MAJOR -ge 1; then
		17
		18	SVN_LIBS_ALL="$SVN_LIBS -lsvn_client-1 -lsvn_wc-1 -lsvn_repos-1"
		19	- SVN_LIBS_ALL="$SVN_LIBS_ALL -lsvn_ra-1 -lsvn_ra_svn-1 -lsvn_ra_local-1"
		20	+ SVN_LIBS_ALL="$SVN_LIBS_ALL -lsvn_ra-1 -lsvn_ra_local-1"
		21	SVN_LIBS_ALL="$SVN_LIBS_ALL -lsvn_fs-1 -lsvn_fs_fs-1"
		22	SVN_LIBS_ALL="$SVN_LIBS_ALL -lsvn_delta-1 -lsvn_diff-1"
		23	SVN_LIBS_ALL="$SVN_LIBS_ALL -lsvn_subr-1"
		24	@@ -4897,7 +4897,7 @@
		25
		26	fi
		27
		28	-if test x$goodsvn == xok; then
		29	+if test x$goodsvn = xok; then
		30	{ echo "$as_me:$LINENO: result: yes" >&5
		31	echo "${ECHO_T}yes" >&6; }
		32	{ echo "$as_me:$LINENO: result: headers $SVN_INCLUDES" >&5
		33	@@ -6815,11 +6815,11 @@
		34
		35	QT_BIN="$qt_path/bin"
		36	QT_PATH="$qt_path"
		37	- QT_LIBPATH="$qt_path/lib"
		38	+ QT_LIBPATH="$qt_path/lib/qt4"
4		39
5	# extract version numbers of qt	40	# extract version numbers of qt
6		41
Lines 9-15 Link Here
9	QT_MAJOR=`echo $QT_VERSION \| sed "s/\(.\)[.].[.].*/\1/"`	44	QT_MAJOR=`echo $QT_VERSION \| sed "s/\(.\)[.].[.].*/\1/"`
10	QT_MINOR=`echo $QT_VERSION \| sed "s/.[.]\(.\)[.].*/\1/"`	45	QT_MINOR=`echo $QT_VERSION \| sed "s/.[.]\(.\)[.].*/\1/"`
11		46
12	@@ -6715,7 +6715,7 @@	47	@@ -6849,7 +6849,7 @@
13	*)	48	*)
14	# any other Unix platform directly link with the libs	49	# any other Unix platform directly link with the libs
15		50

Lines 1-6 Link Here

(-)/kirby/shared/ports/subcommander2/files/patch-subcommander-Makefile.in (-11 / +8 lines)
1	--- subcommander/Makefile.in.orig 2008-06-22 13:22:05.000000000 -0400	1	--- subcommander/Makefile.in.orig 2009-09-20 05:28:23.000000000 -0400
2	+++ subcommander/Makefile.in 2008-08-09 09:57:39.000000000 -0400	2	+++ subcommander/Makefile.in 2009-09-20 13:47:04.000000000 -0400
3	@@ -326,7 +326,7 @@	3	@@ -334,7 +334,7 @@
4	target_alias = @target_alias@	4	target_alias = @target_alias@
5	top_builddir = @top_builddir@	5	top_builddir = @top_builddir@
6	top_srcdir = @top_srcdir@	6	top_srcdir = @top_srcdir@
Lines 9-23 Link Here
9	scdir = $(datadir)/subcommander	9	scdir = $(datadir)/subcommander
10	icondir = $(scdir)/icons/default	10	icondir = $(scdir)/icons/default
11	icons = ../pics/icons/default	11	icons = ../pics/icons/default
12	@@ -430,9 +430,9 @@	12	@@ -450,7 +450,7 @@
13		13
14	AM_CXXFLAGS = @MACOSX_UNIVERSAL_CXXFLAGS@	14	AM_CXXFLAGS = @MACOSX_UNIVERSAL_CXXFLAGS@
15	AM_LDFLAGS = @MACOSX_UNIVERSAL_LDFLAGS@	15	AM_LDFLAGS = @MACOSX_UNIVERSAL_LDFLAGS@
16	-subcommander_LDADD = -L../util -L../svn -L../sublib -lsvn -lutil -lsublib @QT_LIBS@ \	16	-subcommander_LDADD = -L../util -L../svn -L../sublib -lsvn -lutil -lsublib \
17	+subcommander_LDADD = -L../util -L../svn -L../sublib -lsvn -lsublib -lutil @QT_LIBS@ \	17	+subcommander_LDADD = -L../util -L../svn -L../sublib -lsvn -lsublib -lutil \
18	-lz @APR_LIBS@ @APU_LIBS@ @SVN_LIBS@ -lsvn_client-1 -lsvn_subr-1 \	18	@QT_LIBS@ @SVN_LIBS_ALL@ @STLPORT_LIBS@ @NET_LIBS@ \
19	- -lsvn_ra-1 -lsvn_wc-1 -lsvn_delta-1 -lsvn_diff-1 -lsvn_ra_dav-1 \	19	@APU_LIBS@ @APR_LIBS@ -lsasl2 -lz
20	+ -lsvn_ra-1 -lsvn_wc-1 -lsvn_delta-1 -lsvn_diff-1 \
21	-lsvn_ra_local-1 -lsvn_ra_svn-1 -lsvn_repos-1 -lsvn_fs-1 \
22	-lsvn_fs_fs-1 @STLPORT_LIBS@ @NEON_LIBS@
23		20