- Update to version 1.4.1

- Drop maintainership

11 files changed, 72 insertions, 52 deletions

diff --git a/devel/lincvs/Makefile b/devel/lincvs/Makefile
index 2e0d9fa3d710..928b381b9b26 100644
--- a/devel/lincvs/Makefile
+++ b/devel/lincvs/Makefile
@@ -6,13 +6,13 @@
 #
 
 PORTNAME=	lincvs
-PORTVERSION=	1.3.2
+PORTVERSION=	1.4.1
 CATEGORIES=	devel kde
-MASTER_SITES=	http://ppprs1.phy.tu-dresden.de/~trogisch/lincvs/download/20_LinCVS/hl_${PORTNAME}-${PORTVERSION}/
-DISTNAME=	${PORTNAME}-${PORTVERSION}-1-generic-src
+MASTER_SITES=	http://lincvs.com/download/
+DISTNAME=	${PORTNAME}-${PORTVERSION}-0-generic-src
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	markus@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Graphical CVS front-end using QT
 
 BUILD_DEPENDS=	qmake:${PORTSDIR}/devel/qmake
@@ -35,8 +35,9 @@ pre-build:
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/LinCVS/lincvs.bin ${PREFIX}/bin/lincvs
+	${INSTALL_SCRIPT} ${WRKSRC}/LinCVS/Tools/launch_emacs.sh ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/LinCVS/Tools/launch_xemacs.sh ${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/LinCVS/Tools/start-ssh-agent.sh ${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/LinCVS/Tools/start-ssh.sh ${PREFIX}/bin
 	${MKDIR} ${DATADIR}/translation
 	${INSTALL_DATA} ${WRKSRC}/ts/*.qm ${DATADIR}/translation
 .ifndef(NOPORTDOCS)
diff --git a/devel/lincvs/distinfo b/devel/lincvs/distinfo
index 3aff851ee569..2b7194297c4b 100644
--- a/devel/lincvs/distinfo
+++ b/devel/lincvs/distinfo
@@ -1,2 +1,2 @@
-MD5 (lincvs-1.3.2-1-generic-src.tgz) = 1dd48ddaa98192f271381b2217e0941f
-SIZE (lincvs-1.3.2-1-generic-src.tgz) = 957209
+MD5 (lincvs-1.4.1-0-generic-src.tgz) = 59d0ad70c98c11123334e08cf008ff33
+SIZE (lincvs-1.4.1-0-generic-src.tgz) = 1119325
diff --git a/devel/lincvs/files/patch-HistoryDialogImpl.cpp b/devel/lincvs/files/patch-HistoryDialogImpl.cpp
deleted file mode 100644
index 99cf44db1e0e..000000000000
--- a/devel/lincvs/files/patch-HistoryDialogImpl.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/HistoryDialogImpl.cpp.orig	Fri Aug 20 10:48:34 2004
-+++ src/HistoryDialogImpl.cpp	Fri Aug 20 10:56:13 2004
-@@ -268,7 +268,8 @@
-   if (failed) return;
-   switch( cmd) {
-      case EDIT_REVISION_CMD: {
--	 setPermission(QFile(tmpViewFileName),READABLE);//don't think you could change the file
-+	 QFile tmpFile(tmpViewFileName);
-+	 setPermission(tmpFile, READABLE);//don't think you could change the file
- 	 emit editFile(tmpViewFileName);
- 	 break;
-      }
diff --git a/devel/lincvs/files/patch-LogDialogImpl.cpp b/devel/lincvs/files/patch-LogDialogImpl.cpp
deleted file mode 100644
index c9cd7e16ae6c..000000000000
--- a/devel/lincvs/files/patch-LogDialogImpl.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/LogDialogImpl.cpp.orig	Fri Aug 20 10:57:57 2004
-+++ src/LogDialogImpl.cpp	Fri Aug 20 11:00:34 2004
-@@ -806,7 +806,8 @@
-        break;
-      }
-      case EDIT_REVISION_CMD: {
--       setPermission(QFile(m_tmpDiffFileNameA),READABLE);//don't think you could change the file
-+       QFile tmpFile(m_tmpDiffFileNameA);
-+       setPermission(tmpFile, READABLE);//don't think you could change the file
-        emit editFile(m_tmpDiffFileNameA);
-        break;
-      }
diff --git a/devel/lincvs/files/patch-cvslib-tzconvert.h b/devel/lincvs/files/patch-cvslib-tzconvert.h
new file mode 100644
index 000000000000..e1b998bb93bc
--- /dev/null
+++ b/devel/lincvs/files/patch-cvslib-tzconvert.h
@@ -0,0 +1,11 @@
+--- cvslib/tzconvert.h.orig	Wed May 18 22:34:52 2005
++++ cvslib/tzconvert.h	Wed May 18 22:35:54 2005
+@@ -73,6 +73,8 @@
+ #ifndef TZCONVERT_H
+ #define TZCONVERT_H
+ 
++#include <sys/time.h>
++
+ #include "globals.h"
+ 
+ inline QDateTime convertTimeZone(QDateTime &dateTime, bool hasDSTBug, bool toUTC)
diff --git a/devel/lincvs/files/patch-globals.cpp b/devel/lincvs/files/patch-globals.cpp
deleted file mode 100644
index ed549ba22528..000000000000
--- a/devel/lincvs/files/patch-globals.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/globals.cpp.orig	Sat Apr  3 15:11:45 2004
-+++ src/globals.cpp	Sat Apr  3 15:12:26 2004
-@@ -172,7 +172,7 @@
- #ifdef USE_TM_GMTOFF
-       timeZoneDiffInSecs = -(result->tm_gmtoff);
- #else
--      timeZoneDiffInSecs = timezone;
-+      timeZoneDiffInSecs = (int)timezone;
- #endif
-    }
-    TIMEZERO.setTime_t(0);//ATTENTION: this is different from QDateTime()
diff --git a/devel/lincvs/files/patch-main.cpp b/devel/lincvs/files/patch-main.cpp
index 26d101af145e..1315071049cc 100644
--- a/devel/lincvs/files/patch-main.cpp
+++ b/devel/lincvs/files/patch-main.cpp
@@ -1,11 +1,11 @@
---- src/main.cpp.orig	Tue Feb 17 17:28:10 2004
-+++ src/main.cpp	Tue Feb 17 17:29:43 2004
-@@ -225,7 +225,7 @@
-    //install translator
-    QString lang = QString(QTextCodec::locale());
+--- src/main.cpp.orig	Sun May 15 17:06:55 2005
++++ src/main.cpp	Wed May 18 21:58:58 2005
+@@ -302,7 +302,7 @@
+    if (pos > -1) lang.truncate(pos);
     if (bDebug) qDebug("LANG: " + lang);
--   QString messagesDir = APPDIR + "/" + LC_MESSAGES_DIR;
-+   QString messagesDir = "%%PREFIX%%/share/lincvs/translation";
  
+-   QString messagesDir = APPDIR + "/" + LC_MESSAGES_DIR;
++   QString messagesDir = "/usr/local/share/lincvs/translation";
+    bool qt_ts_found = false;
     QTranslator translator( 0 );
-    translator.load( lang, messagesDir );
+    QTranslator qtTranslator( 0 );
diff --git a/devel/lincvs/files/patch-src-Add.cpp b/devel/lincvs/files/patch-src-Add.cpp
new file mode 100644
index 000000000000..75b9368ee070
--- /dev/null
+++ b/devel/lincvs/files/patch-src-Add.cpp
@@ -0,0 +1,11 @@
+--- src/Add.cpp.orig	Thu May 19 00:34:26 2005
++++ src/Add.cpp	Thu May 19 00:34:52 2005
+@@ -224,7 +224,7 @@
+       }
+    }
+ 
+-   QString files = m_filesList.isEmpty() ? "" : masqWs(m_filesList.join("\" \""));
++   QString files = m_filesList.isEmpty() ? QString("") : masqWs(m_filesList.join("\" \""));
+    QString dir = m_dir->fullName();
+    QString topModule = m_dir->topControlledDir()->relativeName();
+    
diff --git a/devel/lincvs/files/patch-src-Commit.cpp b/devel/lincvs/files/patch-src-Commit.cpp
new file mode 100644
index 000000000000..e60653c37c70
--- /dev/null
+++ b/devel/lincvs/files/patch-src-Commit.cpp
@@ -0,0 +1,11 @@
+--- src/Commit.cpp.orig	Thu May 19 00:31:24 2005
++++ src/Commit.cpp	Thu May 19 00:31:57 2005
+@@ -188,7 +188,7 @@
+       command += " -r " + rev;
+    }
+    
+-   QString files = m_filesList.isEmpty() ? "" : masqWs(m_filesList.join("\" \""));
++   QString files = m_filesList.isEmpty() ? QString("") : masqWs(m_filesList.join("\" \""));
+    QString dir = m_dir->fullName();
+    QString topModule = m_dir->topControlledDir()->relativeName();
+    
diff --git a/devel/lincvs/files/patch-src-Merge.cpp b/devel/lincvs/files/patch-src-Merge.cpp
new file mode 100644
index 000000000000..edb962790909
--- /dev/null
+++ b/devel/lincvs/files/patch-src-Merge.cpp
@@ -0,0 +1,20 @@
+--- src/Merge.cpp.orig	Thu May 19 00:21:53 2005
++++ src/Merge.cpp	Thu May 19 00:24:07 2005
+@@ -106,7 +106,7 @@
+       }
+ 
+       MergeDialogImpl * dlg = new MergeDialogImpl(workBench, whatsThisIconSet,
+-	    parent, QString(isDir ? "" : masqWs(p->m_filesList.join("\" \""))), 
++	    parent, QString(isDir ? QString("") : masqWs(p->m_filesList.join("\" \""))), 
+ 	    currentTagList,
+ 	    dir->topControlledDir()->relativeName());
+       if (!isDir) {
+@@ -183,7 +183,7 @@
+    command += firstTag;
+    if (!secondTag.isEmpty()) command += " -j " + secondTag;
+ 
+-   QString files = m_filesList.isEmpty() ? "" : masqWs(m_filesList.join("\" \""));
++   QString files = m_filesList.isEmpty() ? QString("") : masqWs(m_filesList.join("\" \""));
+    QString dir = m_dir->fullName();
+    QString topModule = m_dir->topControlledDir()->relativeName();
+    
diff --git a/devel/lincvs/pkg-plist b/devel/lincvs/pkg-plist
index 6867e45d7f9b..6778571a7329 100644
--- a/devel/lincvs/pkg-plist
+++ b/devel/lincvs/pkg-plist
@@ -1,8 +1,8 @@
+bin/launch_emacs.sh
+bin/launch_xemacs.sh
 bin/lincvs
 bin/start-ssh-agent.sh
-bin/start-ssh.sh
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/BUGS.txt
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/FAM-HOWTO.txt
@@ -33,6 +33,7 @@ bin/start-ssh.sh
 %%PORTDOCS%%%%DOCSDIR%%/VERSION
 share/lincvs/translation/ca_ES.qm
 share/lincvs/translation/de.qm
+share/lincvs/translation/es.qm
 share/lincvs/translation/fr.qm
 share/lincvs/translation/it.qm
 share/lincvs/translation/ja.qm