Date: Sat, 6 Oct 2018 08:35:32 +0000 (UTC) From: Tobias Kortkamp <tobik@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r481328 - in head/german/tipp10: . files Message-ID: <201810060835.w968ZWRq069655@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tobik Date: Sat Oct 6 08:35:32 2018 New Revision: 481328 URL: https://svnweb.freebsd.org/changeset/ports/481328 Log: german/tipp10: Fix runtime, cleanup dependencies - Drop unnecessary sqlite2 plugin run, and unused qtestlib and script dependencies - Make sure DATADIR is actually passed through to the build. Currently qmake passes it as "" to the compiler which leads to tipp10 not finding its data files on first startup. Deleted: head/german/tipp10/files/patch-tipp10.pro Modified: head/german/tipp10/Makefile Modified: head/german/tipp10/Makefile ============================================================================== --- head/german/tipp10/Makefile Sat Oct 6 08:19:19 2018 (r481327) +++ head/german/tipp10/Makefile Sat Oct 6 08:35:32 2018 (r481328) @@ -2,11 +2,11 @@ # $FreeBSD$ PORTNAME= tipp10 -PORTVERSION= 2.1.0 -PORTREVISION= 2 +DISTVERSION= 2-1-0 +PORTREVISION= 3 CATEGORIES= german MASTER_SITES= http://www.tipp10.com/en/download/ -DISTNAME= tipp10_source_v2-1-0 +DISTNAME= tipp10_source_v${DISTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= 10-finger touch typing learning program @@ -16,15 +16,13 @@ LICENSE_FILE= ${WRKSRC}/license_en.txt USES= qmake dos2unix qt:4 zip DOS2UNIX_GLOB= *.pro *.cpp -USE_QT= gui sql corelib network script qtestlib \ - rcc_build uic_build moc_build \ - sql-sqlite2_run sql-sqlite3_run -QMAKE_ARGS+= DATADIR="${DATADIR}" -WRKSRC= ${WRKDIR}/tipp10_source_v2-1-0 +USE_QT= corelib gui network sql rcc_build uic_build moc_build \ + sql-sqlite3_run pre-configure: - @cd ${WRKSRC} \ - && for i in `grep -lR 'QCoreApplication::applicationDirPath()' *`; do ${REINPLACE_CMD} -e 's/QCoreApplication::applicationDirPath()/QString(DATADIR)/g' $$i ; done + cd ${WRKSRC} \ + && for i in `grep -lR 'QCoreApplication::applicationDirPath()' *`; do \ + ${REINPLACE_CMD} -e 's,QCoreApplication::applicationDirPath(),QString("${DATADIR}"),g' $$i ; done do-install: ${INSTALL_PROGRAM} ${WRKSRC}/tipp10 ${STAGEDIR}${PREFIX}/bin
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201810060835.w968ZWRq069655>