Date: Sun, 20 Sep 2009 15:42:11 -0400 (EDT) From: Naram Qashat <cyberbotx@cyberbotx.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/138996: [MAINTAINER] devel/subcommander2: update to 2.0.0.b5 Message-ID: <200909201942.n8KJgBLE008598@kirby.cyberbotx.com> Resent-Message-ID: <200909201950.n8KJo1Vr072568@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 138996 >Category: ports >Synopsis: [MAINTAINER] devel/subcommander2: update to 2.0.0.b5 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sun Sep 20 19:50:00 UTC 2009 >Closed-Date: >Last-Modified: >Originator: Naram Qashat >Release: FreeBSD 7.2-STABLE i386 >Organization: >Environment: System: FreeBSD kirby.cyberbotx.com 7.2-STABLE FreeBSD 7.2-STABLE #0: Wed Jun 3 04:24:13 EDT >Description: - Update to 2.0.0.b5 Added file(s): - files/patch-subcommander-settings-SingleProjectReader.cpp Generated with FreeBSD Port Tools 0.99 >How-To-Repeat: >Fix: --- subcommander-2.0.0.b5.patch begins here --- diff -ruN --exclude=CVS /usr/ports/devel/subcommander2/Makefile /kirby/shared/ports/subcommander2/Makefile --- /usr/ports/devel/subcommander2/Makefile 2009-07-28 12:08:41.000000000 -0400 +++ /kirby/shared/ports/subcommander2/Makefile 2009-09-20 13:57:06.000000000 -0400 @@ -6,15 +6,16 @@ # 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 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 @@ -25,12 +26,14 @@ 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 -ruN --exclude=CVS /usr/ports/devel/subcommander2/distinfo /kirby/shared/ports/subcommander2/distinfo --- /usr/ports/devel/subcommander2/distinfo 2008-08-26 10:22:29.000000000 -0400 +++ /kirby/shared/ports/subcommander2/distinfo 2009-09-20 13:34:17.000000000 -0400 @@ -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 -ruN --exclude=CVS /usr/ports/devel/subcommander2/files/patch-configure /kirby/shared/ports/subcommander2/files/patch-configure --- /usr/ports/devel/subcommander2/files/patch-configure 2008-08-26 08:34:33.000000000 -0400 +++ /kirby/shared/ports/subcommander2/files/patch-configure 2009-09-20 14:28:35.000000000 -0400 @@ -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 -ruN --exclude=CVS /usr/ports/devel/subcommander2/files/patch-subcommander-Makefile.in /kirby/shared/ports/subcommander2/files/patch-subcommander-Makefile.in --- /usr/ports/devel/subcommander2/files/patch-subcommander-Makefile.in 2008-08-26 10:22:29.000000000 -0400 +++ /kirby/shared/ports/subcommander2/files/patch-subcommander-Makefile.in 2009-09-20 13:47:29.000000000 -0400 @@ -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 -ruN --exclude=CVS /usr/ports/devel/subcommander2/files/patch-subcommander-settings-SingleProjectReader.cpp /kirby/shared/ports/subcommander2/files/patch-subcommander-settings-SingleProjectReader.cpp --- /usr/ports/devel/subcommander2/files/patch-subcommander-settings-SingleProjectReader.cpp 1969-12-31 19:00:00.000000000 -0500 +++ /kirby/shared/ports/subcommander2/files/patch-subcommander-settings-SingleProjectReader.cpp 2009-09-20 15:27:05.000000000 -0400 @@ -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> --- subcommander-2.0.0.b5.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200909201942.n8KJgBLE008598>