mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-02-06 11:41:52 +00:00
Code Issues Releases Activity

- Update to 2.0.0 beta 4

Browse Source 
PR:		126548
Submitted by:	Naram Qashat <cyberbotx@cyberbotx.com>
This commit is contained in:
Martin Wilke 2008-08-26 12:34:33 +00:00
parent 06dc6dc0f4
commit b2d2c3b5c3
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=219214
7 changed files with 177 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
devel/subcommander2/Makefile
View File

@ -1,31 +1,46 @@
# New ports collection makefile for: subcommander
# Date created: 22 July 2007
# Whom: sutra
# New ports collection makefile for: subcommander2
# Date created: 6 August 2008
# Whom: Naram Qashat
#
# $FreeBSD$
#
PORTNAME= subcommander
PORTVERSION= 1.2.3
DISTVERSION= 2.0.0.b4
CATEGORIES= devel
MASTER_SITES= http://subcommander.tigris.org/files/documents/1759/42385/
DISTNAME= Subcommander-${PORTVERSION}
MASTER_SITES= http://subcommander.tigris.org/files/documents/1759/43367/
DISTNAME= Subcommander-${PORTVERSION:S/.b/b/g}
MAINTAINER= cyberbotx@cyberbotx.com
COMMENT= Qt based multiplatform subversion client, diff & merge tool
COMMENT= Qt4 based multiplatform subversion client, diff & merge tool
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
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
CONFLICTS= subcommander-1.*
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:S/.b/b/g}
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_QT_VER= 3
CONFIGURE_ARGS+= --with-boost=${LOCALBASE} --with-neon=${LOCALBASE}
CONFIGURE_ENV= QTDIR=${LOCALBASE} CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
USE_QT_VER= 4
QT_COMPONENTS= qt3support gui network corelib moc_build uic_build rcc_build
CONFIGURE_ARGS+= --with-boost=${LOCALBASE} --with-neon=${LOCALBASE} \
--with-subversion=${LOCALBASE} --with-qt=${LOCALBASE} \
--with-apr=${LOCALBASE}/bin/apr-1-config \
--with-apr-util=${LOCALBASE}/bin/apu-1-config
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -L${LOCALBASE}/lib/qt4 ${PTHREAD_LIBS}"
.include <bsd.port.mk>
post-extract:
@${CHMOD} +x ${WRKSRC}/configure
.include <bsd.port.pre.mk>
.if ${OSVERSION} < 700000
BROKEN= Does not compile on 6.x
.endif
.include <bsd.port.post.mk>

6
devel/subcommander2/distinfo
View File

@ -1,3 +1,3 @@
MD5 (Subcommander-1.2.3.tar.gz) = edbbf697c8653bdcb4778dc0182ad05c
SHA256 (Subcommander-1.2.3.tar.gz) = 808a1e590ae20f914069a1251c98e6643069a5e3de032d0af2671e1b5398f301
SIZE (Subcommander-1.2.3.tar.gz) = 7343786
MD5 (Subcommander-2.0.0b4.tar.gz) = 9c19a695b7c632269f32da82a009fef2
SHA256 (Subcommander-2.0.0b4.tar.gz) = e9165ba537f4f45474fd830e3f1ec9b48b566428beaf73584520630d7c7a7582
SIZE (Subcommander-2.0.0b4.tar.gz) = 7005546

20
devel/subcommander2/files/patch-configure Normal file
View File

@ -0,0 +1,20 @@
--- configure.orig 2008-08-24 15:30:09.000000000 -0400
+++ configure 2008-08-25 13:56:04.000000000 -0400
@@ -6687,7 +6687,7 @@
# extract version numbers of qt
- QT_VERSION=`$QT_BIN/moc -v 2>&1 | sed "s/.*(Qt \(.*\))/\1/"`
+ QT_VERSION=`$QT_BIN/moc-qt4 -v 2>&1 | sed "s/.*(Qt \(.*\))/\1/"`
QT_MAJOR=`echo $QT_VERSION | sed "s/\(.*\)[.].*[.].*/\1/"`
QT_MINOR=`echo $QT_VERSION | sed "s/.*[.]\(.*\)[.].*/\1/"`
@@ -6715,7 +6715,7 @@
*)
# any other Unix platform directly link with the libs
- QT_INCLUDES="-DQT3_SUPPORT -I$qt_path/include -I$qt_path/include/Qt"
+ QT_INCLUDES="-DQT3_SUPPORT -I$qt_path/include -I$qt_path/include/qt4"
QT_LIBS="-L$QT_LIBPATH -lQt3Support -lQtGui -lQtNetwork -lQtCore"
;;
esac

20
devel/subcommander2/files/patch-subcommander-Makefile.in
View File

@ -1,8 +1,20 @@
--- 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/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 @@
target_alias = @target_alias@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-QT_MOC = @QT_BIN@/moc
+QT_MOC = @QT_BIN@/moc-qt4
scdir = $(datadir)/subcommander
icondir = $(scdir)/icons/default
icons = ../pics/icons/default
@@ -430,9 +430,9 @@
subcommander_LDADD = -L../util -L../svn -L../sublib -lsvn -lutil -lsublib @QT_LIBS@ \
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 \

11
devel/subcommander2/files/patch-sublib-Makefile.in Normal file
View File

@ -0,0 +1,11 @@
--- sublib/Makefile.in.orig 2008-06-22 13:22:05.000000000 -0400
+++ sublib/Makefile.in 2008-08-09 09:24:43.000000000 -0400
@@ -216,7 +216,7 @@
target_alias = @target_alias@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-QT_MOC = @QT_BIN@/moc
+QT_MOC = @QT_BIN@/moc-qt4
QT_RCC = @QT_BIN@/rcc
scdir = $(datadir)/subcommander
AM_CPPFLAGS = @APR_CPPFLAGS@ \

20
devel/subcommander2/files/patch-submerge-Makefile.in Normal file
View File

@ -0,0 +1,20 @@
--- submerge/Makefile.in.orig 2008-06-22 13:22:05.000000000 -0400
+++ submerge/Makefile.in 2008-08-09 09:44:42.000000000 -0400
@@ -221,7 +221,7 @@
target_alias = @target_alias@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-QT_MOC = @QT_BIN@/moc
+QT_MOC = @QT_BIN@/moc-qt4
scdir = $(datadir)/subcommander
icondir = $(scdir)/icons/default
icon_DATA = ../pics/icons/default/MergeFile-Normal.png \
@@ -245,7 +245,7 @@
AM_CXXFLAGS = @MACOSX_UNIVERSAL_CXXFLAGS@
AM_LDFLAGS = @MACOSX_UNIVERSAL_LDFLAGS@
-submerge_LDADD = -L../util -L../svn -L../sublib -lutil -lsvn -lsublib \
+submerge_LDADD = -L../util -L../svn -L../sublib -lsublib -lutil -lsvn \
@QT_LIBS@ @APR_LIBS@ @APU_LIBS@ @SVN_LIBS@ -lsvn_diff-1 \
-lsvn_subr-1 @STLPORT_LIBS@ -lz

81
devel/subcommander2/pkg-plist
View File

@ -1,12 +1,39 @@
bin/subcommander
bin/submerge
%%DATADIR%%/icons/default/Add-Active.png
%%DATADIR%%/icons/default/Add-Disabled.png
%%DATADIR%%/icons/default/Add-Normal.png
%%DATADIR%%/icons/default/AutoRefresh.png
%%DATADIR%%/icons/default/AutoRefresh-Disabled.png
%%DATADIR%%/icons/default/AutoRefresh-NormalOff.png
%%DATADIR%%/icons/default/AutoRefresh-NormalOn.png
%%DATADIR%%/icons/default/Blame-Active.png
%%DATADIR%%/icons/default/Blame-Disabled.png
%%DATADIR%%/icons/default/Blame-Normal.png
%%DATADIR%%/icons/default/BookmarkProjectClosed.png
%%DATADIR%%/icons/default/BookmarkProjectOpened.png
%%DATADIR%%/icons/default/BookmarkRepository.png
%%DATADIR%%/icons/default/BookmarkWorkingCopy.png
%%DATADIR%%/icons/default/BranchTag-Active.png
%%DATADIR%%/icons/default/BranchTag-Disabled.png
%%DATADIR%%/icons/default/BranchTag-Normal.png
%%DATADIR%%/icons/default/Cancel-Active.png
%%DATADIR%%/icons/default/Cancel-Disabled.png
%%DATADIR%%/icons/default/Cancel-Normal.png
%%DATADIR%%/icons/default/Cat-Active.png
%%DATADIR%%/icons/default/Cat-Disabled.png
%%DATADIR%%/icons/default/Cat-Normal.png
%%DATADIR%%/icons/default/Cleanup-Active.png
%%DATADIR%%/icons/default/Cleanup-Disabled.png
%%DATADIR%%/icons/default/Cleanup-Normal.png
%%DATADIR%%/icons/default/Checkout.png
%%DATADIR%%/icons/default/Commit-Active.png
%%DATADIR%%/icons/default/Commit-Disabled.png
%%DATADIR%%/icons/default/Commit-Normal.png
%%DATADIR%%/icons/default/Commit-Overlay.png
%%DATADIR%%/icons/default/Diff-Active.png
%%DATADIR%%/icons/default/Diff-Disabled.png
%%DATADIR%%/icons/default/Diff-Normal.png
%%DATADIR%%/icons/default/Failed.png
%%DATADIR%%/icons/default/FailedSmall.png
%%DATADIR%%/icons/default/Folder.png
@ -15,29 +42,79 @@ bin/submerge
%%DATADIR%%/icons/default/Force-NormalOn.png
%%DATADIR%%/icons/default/GNU.png
%%DATADIR%%/icons/default/LICENSE
%%DATADIR%%/icons/default/Lock-Active.png
%%DATADIR%%/icons/default/Lock-Disabled.png
%%DATADIR%%/icons/default/Lock-Normal.png
%%DATADIR%%/icons/default/Log-Active.png
%%DATADIR%%/icons/default/Log-Disabled.png
%%DATADIR%%/icons/default/Log-Normal.png
%%DATADIR%%/icons/default/LogGraph-Active.png
%%DATADIR%%/icons/default/LogGraph-Disabled.png
%%DATADIR%%/icons/default/LogGraph-Normal.png
%%DATADIR%%/icons/default/Logo_Icon_16x16.png
%%DATADIR%%/icons/default/Merge-Active.png
%%DATADIR%%/icons/default/Merge-Disabled.png
%%DATADIR%%/icons/default/Merge-Normal.png
%%DATADIR%%/icons/default/MergeFile-Active.png
%%DATADIR%%/icons/default/MergeFile-Disabled.png
%%DATADIR%%/icons/default/MergeFile-Normal.png
%%DATADIR%%/icons/default/MessageBox-Critical.png
%%DATADIR%%/icons/default/MessageBox-Information.png
%%DATADIR%%/icons/default/MessageBox-Warning.png
%%DATADIR%%/icons/default/Mkdir-Active.png
%%DATADIR%%/icons/default/Mkdir-Disabled.png
%%DATADIR%%/icons/default/Mkdir-Normal.png
%%DATADIR%%/icons/default/NextDiff-Active.png
%%DATADIR%%/icons/default/NextDiff-Disabled.png
%%DATADIR%%/icons/default/NextDiff-Normal.png
%%DATADIR%%/icons/default/None.png
%%DATADIR%%/icons/default/PrevDiff-Active.png
%%DATADIR%%/icons/default/PrevDiff-Disabled.png
%%DATADIR%%/icons/default/PrevDiff-Normal.png
%%DATADIR%%/icons/default/ProjectNew-Active.png
%%DATADIR%%/icons/default/ProjectNew-Disabled.png
%%DATADIR%%/icons/default/ProjectNew-Normal.png
%%DATADIR%%/icons/default/ProjectNewWizard-Active.png
%%DATADIR%%/icons/default/ProjectNewWizard-Disabled.png
%%DATADIR%%/icons/default/ProjectNewWizard-Normal.png
%%DATADIR%%/icons/default/README
%%DATADIR%%/icons/default/Recursive.png
%%DATADIR%%/icons/default/Recursive-Disabled.png
%%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/Relocate.png
%%DATADIR%%/icons/default/Remove-Active.png
%%DATADIR%%/icons/default/Remove-Disabled.png
%%DATADIR%%/icons/default/Remove-Normal.png
%%DATADIR%%/icons/default/Revert-Active.png
%%DATADIR%%/icons/default/Revert-Disabled.png
%%DATADIR%%/icons/default/Revert-Normal.png
%%DATADIR%%/icons/default/Switch.png
%%DATADIR%%/icons/default/ToggleOn.png
%%DATADIR%%/icons/default/Undo-Active.png
%%DATADIR%%/icons/default/Undo-Disabled.png
%%DATADIR%%/icons/default/Undo-Normal.png
%%DATADIR%%/icons/default/Unlock-Active.png
%%DATADIR%%/icons/default/Unlock-Disabled.png
%%DATADIR%%/icons/default/Unlock-Normal.png
%%DATADIR%%/icons/default/Update-Active.png
%%DATADIR%%/icons/default/Update-Disabled.png
%%DATADIR%%/icons/default/Update-Normal.png
%%DATADIR%%/icons/default/Updates.png
%%DATADIR%%/icons/default/Updates-Disabled.png
%%DATADIR%%/icons/default/Updates-NormalOff.png
%%DATADIR%%/icons/default/Updates-NormalOn.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
%%DATADIR%%/icons/default/WorkingCopy-Overlay.png
%%DATADIR%%/icons/default/WorkingCopy-Overlay2.png
@dirrm %%DATADIR%%/icons/default
@dirrm %%DATADIR%%/icons
@dirrm %%DATADIR%%