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

(-)/usr/ports/devel/esvn/Makefile (-5 / +23 lines)
Lines 6-15 Link Here
6
#
6
#
7
7
8
PORTNAME=	esvn
8
PORTNAME=	esvn
9
PORTVERSION=	0.4.7
9
PORTVERSION=	0.5.5
10
CATEGORIES=	devel
10
CATEGORIES=	devel
11
MASTER_SITES=	http://esvn.umputun.com/
11
MASTER_SITES=	http://esvn.umputun.com/
12
DISTNAME=	${PORTNAME}-${PORTVERSION}-2
12
DISTNAME=	${PORTNAME}-${PORTVERSION}-1
13
13
14
MAINTAINER=	az@inec.ru
14
MAINTAINER=	az@inec.ru
15
COMMENT=	GUI frontend for the Subversion revision system
15
COMMENT=	GUI frontend for the Subversion revision system
Lines 18-23 Link Here
18
RUN_DEPENDS=	svn:${PORTSDIR}/devel/subversion
18
RUN_DEPENDS=	svn:${PORTSDIR}/devel/subversion
19
19
20
ESVN_DIST=	esvn
20
ESVN_DIST=	esvn
21
ESVNPRO=	esvn.pro esvn-diff-wrapper.pro
21
22
22
WRKSRC=		${WRKDIR}/${ESVN_DIST}
23
WRKSRC=		${WRKDIR}/${ESVN_DIST}
23
24
Lines 31-50 Link Here
31
MAKE_ARGS+=	QTDIR=${X11BASE} \
32
MAKE_ARGS+=	QTDIR=${X11BASE} \
32
		QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++
33
		QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++
33
34
34
PLIST_FILES=	bin/esvn
35
PORTDOCS=	AUTHORS ChangeLog README VERSION
35
36
36
.include <bsd.port.pre.mk>
37
.include <bsd.port.pre.mk>
37
38
38
do-configure:
39
do-configure:
40
	@for proj in ${ESVNPRO}; do \
39
	cd ${WRKSRC}; \
41
	cd ${WRKSRC}; \
40
	${SETENV} ${CONFIGURE_ENV} ${LOCALBASE}/bin/qmake -spec ${LOCALBASE}/share/qt/mkspecs/freebsd-g++ esvn.pro
42
	${SETENV} ${CONFIGURE_ENV} ${LOCALBASE}/bin/qmake -spec ${LOCALBASE}/share/qt/mkspecs/freebsd-g++ $${proj}; \
43
	done
41
44
42
post-configure:
45
post-configure:
43
.if exists(/boot/modules/nvidia.ko) && ${OSVERSION} > 502122
46
.if exists(/boot/modules/nvidia.ko) && ${OSVERSION} > 502122
44
	${REINPLACE_CMD} -e 's#-lpthread#-lc_r#' ${WRKSRC}/Makefile
47
	${REINPLACE_CMD} -e 's#-lpthread#-lc_r#' ${WRKSRC}/esvn.mak ${WRKSRC}/esvn-diff-wrapper.mak
45
.endif
48
.endif
46
49
50
post-build:
51
	${REINPLACE_CMD} -e 's#esvn.png#${PREFIX}/share/pixmaps/esvn.png#' ${WRKSRC}/eSvn.desktop
52
47
do-install:
53
do-install:
48
	${INSTALL_PROGRAM} ${WRKSRC}/esvn ${PREFIX}/bin
54
	${INSTALL_PROGRAM} ${WRKSRC}/esvn ${PREFIX}/bin
55
	${INSTALL_PROGRAM} ${WRKSRC}/esvn-diff-wrapper ${PREFIX}/bin
56
	${MKDIR} ${PREFIX}/share/applications ${PREFIX}/share/pixmaps
57
	${INSTALL_DATA} ${WRKSRC}/eSvn.desktop ${PREFIX}/share/applications
58
	${INSTALL_DATA} ${WRKSRC}/esvn.png ${PREFIX}/share/pixmaps
59
60
post-install:
61
.if !defined(NOPORTDOCS)
62
	${MKDIR} ${DOCSDIR}
63
	for f in ${PORTDOCS}; do \
64
	    ${INSTALL_DATA} ${WRKSRC}/$$f ${DOCSDIR}; \
65
	done
66
.endif				  
49
67
50
.include <bsd.port.post.mk>
68
.include <bsd.port.post.mk>
(-)/usr/ports/devel/esvn/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
MD5 (esvn-0.4.7-2.tar.gz) = 3a1461b2df467182e8dc196719f05f4d
1
MD5 (esvn-0.5.5-1.tar.gz) = 9ec15f575237a24738957816156cd249
2
SIZE (esvn-0.4.7-2.tar.gz) = 266423
2
SIZE (esvn-0.5.5-1.tar.gz) = 949208
(-)/usr/ports/devel/esvn/files/patch-Makefile (+14 lines)
Line 0 Link Here
1
--- Makefile.orig	Sun Aug 15 22:12:07 2004
2
+++ Makefile	Mon Aug 23 17:38:55 2004
3
@@ -6,11 +6,9 @@
4
 	@echo "** done **"
5
 
6
 esvn:
7
-	qmake esvn.pro
8
 	make -f esvn.mak
9
 	
10
 esvn-diff-wrapper:
11
-	qmake esvn-diff-wrapper.pro
12
 	make -f esvn-diff-wrapper.mak
13
 
14
 install:
(-)/usr/ports/devel/esvn/files/patch-src-cmd_lineedit.cpp (+14 lines)
Line 0 Link Here
1
--- cmd_lineedit.cpp	Sun Aug 22 03:18:28 2004
2
+++ src/cmd_lineedit.cpp	Tue Aug 24 13:11:50 2004
3
@@ -29,9 +29,9 @@
4
 void Cmd_LineEdit::keyPressEvent( QKeyEvent * e )
5
 {
6
 	if( ( e->key() == Qt::Key_Up ) && ( pos > 0) )
7
-		setText(cmd_hist.at(--pos));
8
+		setText(cmd_hist[--pos]);
9
 	else if( ( e->key() == Qt::Key_Down ) &&  ( pos + 1 < cmd_hist.size() ) )
10
-			setText(cmd_hist.at(++pos));
11
+			setText(cmd_hist[++pos]);
12
 	else
13
 		QLineEdit::keyPressEvent(e);
14
 }
(-)/usr/ports/devel/esvn/files/patch-src-entries_parser.h (-12 / +3 lines)
Lines 1-6 Link Here
1
--- src/entries_parser.h.orig	Sun Aug 15 16:14:54 2004
1
--- entries_parser.h.orig	Fri Aug 20 06:09:58 2004
2
+++ src/entries_parser.h	Sun Aug 15 16:15:04 2004
2
+++ src/entries_parser.h	Mon Aug 23 18:43:51 2004
3
@@ -20,6 +20,8 @@
3
@@ -24,6 +24,8 @@
4
 #include <qstring.h>
4
 #include <qstring.h>
5
 #include <qdir.h>
5
 #include <qdir.h>
6
 
6
 
Lines 9-20 Link Here
9
 #include <map>
9
 #include <map>
10
 #include <iostream>
10
 #include <iostream>
11
 
11
 
12
@@ -116,7 +118,7 @@
13
 #if (__FreeBSD__ || __NetBSD__ || __OpenBSD__ || ESVN_BSD)
14
 			time_t a; a = time(NULL);
15
 			struct tm bsd_hack = *localtime(&a);
16
-			result = ret.addSecs(-(bsd_hack.tm_gmtoff - bsd_hack.tm_isdst*3600) );
17
+			result = result.addSecs(-(bsd_hack.tm_gmtoff - bsd_hack.tm_isdst*3600) );
18
 #else
19
 			result = result.addSecs(-(timezone - daylight*3600));
20
 #endif
(-)/usr/ports/devel/esvn/files/patch-src-mainwindow.cpp (-24 / +6 lines)
Lines 1-28 Link Here
1
--- src/mainwindow.cpp.orig	Sun Aug 15 16:11:59 2004
1
--- mainwindow.cpp.orig	Sun Aug 22 02:22:34 2004
2
+++ src/mainwindow.cpp	Sun Aug 15 16:12:07 2004
2
+++ src/mainwindow.cpp	Mon Aug 23 18:44:41 2004
3
@@ -14,6 +14,7 @@
3
@@ -16,6 +16,7 @@
4
  *                                                                         *
5
  ***************************************************************************/
6
 
4
 
7
+#include <unistd.h>
8
 #include "mainwindow.h"
5
 #include "mainwindow.h"
9
 
6
 
7
+#include <unistd.h>
10
 #include <qlistview.h>
8
 #include <qlistview.h>
11
@@ -441,7 +442,7 @@
9
 #include <qtextcodec.h> 
12
 	QListViewItem *selected_item = list_files->selectedItem();
10
 #include <qsocket.h>
13
 
14
 	bool was_selected = (selected_item != 0);
15
-	QString file_name = was_selected ? selected_item->text(0) : "";
16
+	QString file_name = was_selected ? selected_item->text(0) : (QString)"";
17
 
18
 	C_FilesList file_list;
19
 	file_list.load(selected_path_, list_files, hide_unknown_);
20
@@ -635,7 +636,7 @@
21
 
22
 			int res = svn_commands_->cat(workingFileDir(), rev, file2);
23
 			if (res == 0) {
24
-				QString rev_str = (rev == "") ? "last" : rev;
25
+				QString rev_str = (rev == "") ? (QString)"last" : rev;
26
 				diff_tmp_file_ = workingFileDir()+".r_" + rev_str;
27
 				FILE *fh_tmp = fopen(diff_tmp_file_.local8Bit(), "wb");
28
 				if (fh_tmp != NULL) {
(-)/usr/ports/devel/esvn/pkg-plist (+6 lines)
Line 0 Link Here
1
bin/esvn
2
bin/esvn-diff-wrapper
3
share/applications/eSvn.desktop
4
share/pixmaps/esvn.png
5
@unexec rmdir %D/share/pixmaps 2>/dev/null || true
6
@unexec rmdir %D/share/applications 2>/dev/null || true

Return to bug 70896