diff options
author | Sergey Matveychuk <sem@FreeBSD.org> | 2004-08-26 17:03:13 +0000 |
---|---|---|
committer | Sergey Matveychuk <sem@FreeBSD.org> | 2004-08-26 17:03:13 +0000 |
commit | 992456449e8249aecac9a0b0e77851c98510a5ab (patch) | |
tree | 0ae2a1145b37e5c29cd309ca52490bb9f5fdb5e4 /devel/esvn | |
parent | mark deprecated, scheduled for removal 2005-03-01 (diff) |
Update to 0.5.5
PR: ports/70896
Submitted by: maintainer
Notes
Notes:
svn path=/head/; revision=117322
Diffstat (limited to 'devel/esvn')
-rw-r--r-- | devel/esvn/Makefile | 28 | ||||
-rw-r--r-- | devel/esvn/distinfo | 4 | ||||
-rw-r--r-- | devel/esvn/files/patch-src-entries_parser.h | 15 | ||||
-rw-r--r-- | devel/esvn/files/patch-src-mainwindow.cpp | 30 |
4 files changed, 34 insertions, 43 deletions
diff --git a/devel/esvn/Makefile b/devel/esvn/Makefile index 21c259e7f16e..bb549beba380 100644 --- a/devel/esvn/Makefile +++ b/devel/esvn/Makefile @@ -6,10 +6,10 @@ # PORTNAME= esvn -PORTVERSION= 0.4.7 +PORTVERSION= 0.5.5 CATEGORIES= devel MASTER_SITES= http://esvn.umputun.com/ -DISTNAME= ${PORTNAME}-${PORTVERSION}-2 +DISTNAME= ${PORTNAME}-${PORTVERSION}-1 MAINTAINER= az@inec.ru COMMENT= GUI frontend for the Subversion revision system @@ -18,6 +18,7 @@ BUILD_DEPENDS= qmake:${PORTSDIR}/devel/qmake RUN_DEPENDS= svn:${PORTSDIR}/devel/subversion ESVN_DIST= esvn +ESVNPRO= esvn.pro esvn-diff-wrapper.pro WRKSRC= ${WRKDIR}/${ESVN_DIST} @@ -31,20 +32,37 @@ CONFIGURE_ARGS= --qtdir=${X11BASE} MAKE_ARGS+= QTDIR=${X11BASE} \ QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++ -PLIST_FILES= bin/esvn +PORTDOCS= AUTHORS ChangeLog README VERSION .include <bsd.port.pre.mk> do-configure: + @for proj in ${ESVNPRO}; do \ cd ${WRKSRC}; \ - ${SETENV} ${CONFIGURE_ENV} ${LOCALBASE}/bin/qmake -spec ${LOCALBASE}/share/qt/mkspecs/freebsd-g++ esvn.pro + ${SETENV} ${CONFIGURE_ENV} ${LOCALBASE}/bin/qmake -spec ${LOCALBASE}/share/qt/mkspecs/freebsd-g++ $${proj}; \ + done post-configure: .if exists(/boot/modules/nvidia.ko) && ${OSVERSION} > 502122 - ${REINPLACE_CMD} -e 's#-lpthread#-lc_r#' ${WRKSRC}/Makefile + ${REINPLACE_CMD} -e 's#-lpthread#-lc_r#' ${WRKSRC}/esvn.mak ${WRKSRC}/esvn-diff-wrapper.mak .endif +post-build: + ${REINPLACE_CMD} -e 's#esvn.png#${PREFIX}/share/pixmaps/esvn.png#' ${WRKSRC}/eSvn.desktop + do-install: ${INSTALL_PROGRAM} ${WRKSRC}/esvn ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/esvn-diff-wrapper ${PREFIX}/bin + ${MKDIR} ${PREFIX}/share/applications ${PREFIX}/share/pixmaps + ${INSTALL_DATA} ${WRKSRC}/eSvn.desktop ${PREFIX}/share/applications + ${INSTALL_DATA} ${WRKSRC}/esvn.png ${PREFIX}/share/pixmaps + +post-install: +.if !defined(NOPORTDOCS) + ${MKDIR} ${DOCSDIR} + for f in ${PORTDOCS}; do \ + ${INSTALL_DATA} ${WRKSRC}/$$f ${DOCSDIR}; \ + done +.endif .include <bsd.port.post.mk> diff --git a/devel/esvn/distinfo b/devel/esvn/distinfo index 17bdd2e2d8b3..e2923caa35fb 100644 --- a/devel/esvn/distinfo +++ b/devel/esvn/distinfo @@ -1,2 +1,2 @@ -MD5 (esvn-0.4.7-2.tar.gz) = 3a1461b2df467182e8dc196719f05f4d -SIZE (esvn-0.4.7-2.tar.gz) = 266423 +MD5 (esvn-0.5.5-1.tar.gz) = 9ec15f575237a24738957816156cd249 +SIZE (esvn-0.5.5-1.tar.gz) = 949208 diff --git a/devel/esvn/files/patch-src-entries_parser.h b/devel/esvn/files/patch-src-entries_parser.h index 4e341adc87bc..28199737f095 100644 --- a/devel/esvn/files/patch-src-entries_parser.h +++ b/devel/esvn/files/patch-src-entries_parser.h @@ -1,6 +1,6 @@ ---- src/entries_parser.h.orig Sun Aug 15 16:14:54 2004 -+++ src/entries_parser.h Sun Aug 15 16:15:04 2004 -@@ -20,6 +20,8 @@ +--- entries_parser.h.orig Fri Aug 20 06:09:58 2004 ++++ src/entries_parser.h Mon Aug 23 18:43:51 2004 +@@ -24,6 +24,8 @@ #include <qstring.h> #include <qdir.h> @@ -9,12 +9,3 @@ #include <map> #include <iostream> -@@ -116,7 +118,7 @@ - #if (__FreeBSD__ || __NetBSD__ || __OpenBSD__ || ESVN_BSD) - time_t a; a = time(NULL); - struct tm bsd_hack = *localtime(&a); -- result = ret.addSecs(-(bsd_hack.tm_gmtoff - bsd_hack.tm_isdst*3600) ); -+ result = result.addSecs(-(bsd_hack.tm_gmtoff - bsd_hack.tm_isdst*3600) ); - #else - result = result.addSecs(-(timezone - daylight*3600)); - #endif diff --git a/devel/esvn/files/patch-src-mainwindow.cpp b/devel/esvn/files/patch-src-mainwindow.cpp index 8ebed21dd72d..84dfbe481385 100644 --- a/devel/esvn/files/patch-src-mainwindow.cpp +++ b/devel/esvn/files/patch-src-mainwindow.cpp @@ -1,28 +1,10 @@ ---- src/mainwindow.cpp.orig Sun Aug 15 16:11:59 2004 -+++ src/mainwindow.cpp Sun Aug 15 16:12:07 2004 -@@ -14,6 +14,7 @@ - * * - ***************************************************************************/ +--- mainwindow.cpp.orig Sun Aug 22 02:22:34 2004 ++++ src/mainwindow.cpp Mon Aug 23 18:44:41 2004 +@@ -16,6 +16,7 @@ -+#include <unistd.h> #include "mainwindow.h" ++#include <unistd.h> #include <qlistview.h> -@@ -441,7 +442,7 @@ - QListViewItem *selected_item = list_files->selectedItem(); - - bool was_selected = (selected_item != 0); -- QString file_name = was_selected ? selected_item->text(0) : ""; -+ QString file_name = was_selected ? selected_item->text(0) : (QString)""; - - C_FilesList file_list; - file_list.load(selected_path_, list_files, hide_unknown_); -@@ -635,7 +636,7 @@ - - int res = svn_commands_->cat(workingFileDir(), rev, file2); - if (res == 0) { -- QString rev_str = (rev == "") ? "last" : rev; -+ QString rev_str = (rev == "") ? (QString)"last" : rev; - diff_tmp_file_ = workingFileDir()+".r_" + rev_str; - FILE *fh_tmp = fopen(diff_tmp_file_.local8Bit(), "wb"); - if (fh_tmp != NULL) { + #include <qtextcodec.h> + #include <qsocket.h> |