6 files changed, 89 insertions, 35 deletions

diff --git a/devel/lincvs/Makefile b/devel/lincvs/Makefile
index 2c76be06c909..eb2d9167dea5 100644
--- a/devel/lincvs/Makefile
+++ b/devel/lincvs/Makefile
@@ -6,33 +6,42 @@
 #
 
 PORTNAME=	lincvs
-PORTVERSION=	1.1.5
-PORTREVISION=	1
+PORTVERSION=	1.3.0
 CATEGORIES=	devel kde
-MASTER_SITES=	http://ppprs1.phy.tu-dresden.de/~trogisch/lincvs/download/LinCVS/${PORTNAME}-${PORTVERSION}/
+MASTER_SITES=	http://ppprs1.phy.tu-dresden.de/~trogisch/lincvs/download/20_LinCVS/hp_${PORTNAME}-${PORTVERSION}/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-0-generic-src
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	jedgar@FreeBSD.org
+MAINTAINER=	brueffer@phoenix-systems.de
 COMMENT=	Graphical CVS front-end using QT
 
+BUILD_DEPENDS=	qmake:${PORTSDIR}/devel/qmake
+
 USE_GMAKE=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 USE_QT_VER=	3
 QTDIR?=		${X11BASE}
 MAKE_ENV+=      QTDIR=${QTDIR}
 ALL_TARGET=	install
+USE_REINPLACE=	yes
 
-BROKEN=		"Missing dependency on qmake"
+post-patch:
+	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' \
+		${WRKSRC}/src/main.cpp \
+		${WRKSRC}/src/lincvs.cpp
 
 pre-build:
-	( cd ${WRKSRC} && ${QTDIR}/bin/qmake -o Makefile lincvs.pro )
-	
-do-install:	  
+	( cd ${WRKSRC} && qmake -spec freebsd-g++ -o Makefile lincvs.pro )
+
+do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/LinCVS/lincvs.bin ${PREFIX}/bin/lincvs
 	${INSTALL_SCRIPT} ${WRKSRC}/LinCVS/Tools/start-ssh-agent.sh ${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/LinCVS/Tools/start-ssh.sh ${PREFIX}/bin	
-	${MKDIR} -p ${DOCSDIR}
+	${INSTALL_SCRIPT} ${WRKSRC}/LinCVS/Tools/start-ssh.sh ${PREFIX}/bin
+	${MKDIR} ${DATADIR}/translation
+	${INSTALL_DATA} ${WRKSRC}/ts/*.qm ${DATADIR}/translation
+.ifndef(NOPORTDOCS)
+	${MKDIR} ${DOCSDIR}
 	${CP} -R ${WRKSRC}/LinCVS/Help/* ${DOCSDIR}
-	
+.endif
+
 .include <bsd.port.mk>
diff --git a/devel/lincvs/distinfo b/devel/lincvs/distinfo
index 8e56a7028fdf..1eda214decb6 100644
--- a/devel/lincvs/distinfo
+++ b/devel/lincvs/distinfo
@@ -1 +1,2 @@
-MD5 (lincvs-1.1.5-0-generic-src.tgz) = a9b7ec73642eee617545cd003ac40f3d
+MD5 (lincvs-1.3.0-0-generic-src.tgz) = 8272c7761a1d1439c8268f3e9e75bda1
+SIZE (lincvs-1.3.0-0-generic-src.tgz) = 883828
diff --git a/devel/lincvs/files/patch-lincvs.cpp b/devel/lincvs/files/patch-lincvs.cpp
new file mode 100644
index 000000000000..4c6e337c5656
--- /dev/null
+++ b/devel/lincvs/files/patch-lincvs.cpp
@@ -0,0 +1,13 @@
+--- src/lincvs.cpp.orig	Tue Feb 17 17:45:15 2004
++++ src/lincvs.cpp	Tue Feb 17 17:47:51 2004
+@@ -2693,8 +2693,8 @@
+    
+    QString lang = QString(QTextCodec::locale()).left(2);  //maybe it's useful without left(2)
+ 
+-   helpDir    = APPDIR + "/" + LC_HELP_DIR + "/" + LC_TRANSLATIONS_SUBDIR + "/" + lang;
+-   helpDirDef = APPDIR + "/" + LC_HELP_DIR;
++   helpDir    = QString("%%PREFIX%%/share/doc/lincvs/") + LC_TRANSLATIONS_SUBDIR + "/" + lang;
++   helpDirDef = QString("%%PREFIX%%/share/doc/lincvs");
+ 
+    filename = helpDir + tr("/README.html");
+    f.setName(filename);
diff --git a/devel/lincvs/files/patch-main.cpp b/devel/lincvs/files/patch-main.cpp
new file mode 100644
index 000000000000..26d101af145e
--- /dev/null
+++ b/devel/lincvs/files/patch-main.cpp
@@ -0,0 +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());
+    if (bDebug) qDebug("LANG: " + lang);
+-   QString messagesDir = APPDIR + "/" + LC_MESSAGES_DIR;
++   QString messagesDir = "%%PREFIX%%/share/lincvs/translation";
+ 
+    QTranslator translator( 0 );
+    translator.load( lang, messagesDir );
diff --git a/devel/lincvs/pkg-descr b/devel/lincvs/pkg-descr
index b0ecf21449c5..0c025d191cfc 100644
--- a/devel/lincvs/pkg-descr
+++ b/devel/lincvs/pkg-descr
@@ -7,6 +7,3 @@ diff against the repository or view of the log messages in list
 form.
 
 WWW: http://www.lincvs.org/
-
-- Chris D. Faulhaber
- <jedgar@FreeBSD.org>
diff --git a/devel/lincvs/pkg-plist b/devel/lincvs/pkg-plist
index 75e1f136f424..6867e45d7f9b 100644
--- a/devel/lincvs/pkg-plist
+++ b/devel/lincvs/pkg-plist
@@ -1,23 +1,46 @@
 bin/lincvs
 bin/start-ssh-agent.sh
 bin/start-ssh.sh
-share/doc/lincvs/AUTHORS
-share/doc/lincvs/BUGS.txt
-share/doc/lincvs/COPYING
-share/doc/lincvs/FAQ.txt
-share/doc/lincvs/ChangeLog
-share/doc/lincvs/INSTALL
-share/doc/lincvs/INSTALL.html
-share/doc/lincvs/LICENSE
-share/doc/lincvs/NEWS
-share/doc/lincvs/PROXY-HOWTO.txt
-share/doc/lincvs/README
-share/doc/lincvs/README.html
-share/doc/lincvs/SSH-HOWTO.txt
-share/doc/lincvs/THANKS
-share/doc/lincvs/VERSION
-share/doc/lincvs/Translations/de/LIESMICH.txt
-share/doc/lincvs/Translations/de/LIESMICH.html
-@dirrm share/doc/lincvs/Translations/de
-@dirrm share/doc/lincvs/Translations
-@dirrm share/doc/lincvs
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/BUGS.txt
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/FAM-HOWTO.txt
+%%PORTDOCS%%%%DOCSDIR%%/FAQ.txt
+%%PORTDOCS%%%%DOCSDIR%%/INFO.txt
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL.html
+%%PORTDOCS%%%%DOCSDIR%%/LICENSE
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/PROXY-HOWTO.txt
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/README.html
+%%PORTDOCS%%%%DOCSDIR%%/SSH-HOWTO.txt
+%%PORTDOCS%%%%DOCSDIR%%/THANKS
+%%PORTDOCS%%%%DOCSDIR%%/Translations/de/LIESMICH.html
+%%PORTDOCS%%%%DOCSDIR%%/Translations/de/LIESMICH.txt
+%%PORTDOCS%%%%DOCSDIR%%/Translations/it/LEGGIMI.html
+%%PORTDOCS%%%%DOCSDIR%%/Translations/it/LEGGIMI.txt
+%%PORTDOCS%%%%DOCSDIR%%/Translations/ru/FAM-HOWTO.koi8r.txt
+%%PORTDOCS%%%%DOCSDIR%%/Translations/ru/FAM-HOWTO.ru.html
+%%PORTDOCS%%%%DOCSDIR%%/Translations/ru/FAQ.koi8r.txt
+%%PORTDOCS%%%%DOCSDIR%%/Translations/ru/INSTALL.html
+%%PORTDOCS%%%%DOCSDIR%%/Translations/ru/PROXY-HOWTO.koi8r.txt
+%%PORTDOCS%%%%DOCSDIR%%/Translations/ru/PROXY-HOWTO.ru.html
+%%PORTDOCS%%%%DOCSDIR%%/Translations/ru/README.koi8.txt
+%%PORTDOCS%%%%DOCSDIR%%/Translations/ru/README.ru.html
+%%PORTDOCS%%%%DOCSDIR%%/Translations/ru/SSH-HOWTO.koi8.txt
+%%PORTDOCS%%%%DOCSDIR%%/VERSION
+share/lincvs/translation/ca_ES.qm
+share/lincvs/translation/de.qm
+share/lincvs/translation/fr.qm
+share/lincvs/translation/it.qm
+share/lincvs/translation/ja.qm
+share/lincvs/translation/ru.qm
+@dirrm share/lincvs/translation
+@dirrm share/lincvs
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/Translations/ru
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/Translations/it
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/Translations/de
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/Translations
+%%PORTDOCS%%@dirrm %%DOCSDIR%%