Date: Tue, 17 Feb 2004 19:56:27 +0100 (CET) From: Markus Brueffer <brueffer@phoenix-systems.de> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/62972: devel/lincvs: Update to 1.3.0 and take maintainership Message-ID: <20040217185627.BD9DF208@maquis.hitnet.rwth-aachen.de> Resent-Message-ID: <200402171900.i1HJ0a0E034323@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 62972 >Category: ports >Synopsis: devel/lincvs: Update to 1.3.0 and take maintainership >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Tue Feb 17 11:00:36 PST 2004 >Closed-Date: >Last-Modified: >Originator: Markus Brueffer >Release: FreeBSD 5.2.1-RC i386 >Organization: >Environment: System: FreeBSD cheops.phoenix 5.2.1-RC FreeBSD 5.2.1-RC #0: Thu Feb 5 13:59:13 CET 2004 root@cheops.phoenix:/usr/obj/usr/src/sys/CHEOPS i386 >Description: Update devel/lincvs to 1.3.0: - take maintainership (approved by jedgar@freebsd.org) - make portlint happy - add missing BUILD_DEPENDS on qmake (and unbreak) - utilize NOPORTDOCS - install translations and add patches to make use of them - sizify Supersedes ports/62063 >How-To-Repeat: >Fix: --- lincvs.diff begins here --- diff -ruN lincvs.orig/Makefile lincvs/Makefile --- lincvs.orig/Makefile Tue Feb 17 15:46:37 2004 +++ lincvs/Makefile Tue Feb 17 19:24:52 2004 @@ -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 -ruN lincvs.orig/distinfo lincvs/distinfo --- lincvs.orig/distinfo Tue Feb 17 15:46:37 2004 +++ lincvs/distinfo Tue Feb 17 15:49:39 2004 @@ -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 -ruN lincvs.orig/files/patch-lincvs.cpp lincvs/files/patch-lincvs.cpp --- lincvs.orig/files/patch-lincvs.cpp Thu Jan 1 01:00:00 1970 +++ lincvs/files/patch-lincvs.cpp Tue Feb 17 18:19:18 2004 @@ -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 -ruN lincvs.orig/files/patch-main.cpp lincvs/files/patch-main.cpp --- lincvs.orig/files/patch-main.cpp Thu Jan 1 01:00:00 1970 +++ lincvs/files/patch-main.cpp Tue Feb 17 17:33:17 2004 @@ -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 -ruN lincvs.orig/pkg-descr lincvs/pkg-descr --- lincvs.orig/pkg-descr Tue Feb 17 15:46:37 2004 +++ lincvs/pkg-descr Tue Feb 17 16:08:27 2004 @@ -7,6 +7,3 @@ form. WWW: http://www.lincvs.org/ - -- Chris D. Faulhaber - <jedgar@FreeBSD.org> diff -ruN lincvs.orig/pkg-plist lincvs/pkg-plist --- lincvs.orig/pkg-plist Tue Feb 17 15:46:37 2004 +++ lincvs/pkg-plist Tue Feb 17 18:50:55 2004 @@ -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%% --- lincvs.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20040217185627.BD9DF208>