ports/159168: Update port german/tipp10 to current program version
Stefan Walter
stefan at FreeBSD.org
Thu Sep 1 06:40:09 UTC 2011
The following reply was made to PR ports/159168; it has been noted by GNATS.
From: Stefan Walter <stefan at FreeBSD.org>
To: GNATS <FreeBSD-gnats-submit at FreeBSD.org>
Cc:
Subject: Re: ports/159168: Update port german/tipp10 to current program
version
Date: Thu, 1 Sep 2011 08:30:33 +0200
--qMm9M+Fa2AknHoGS
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Patch received via mail, attached for the record.
???????????? ????????????, 31.08.11, 15:25h CEST:
> > Please note that updates to existing ports should be sent in unified diff format
> > (as produced by 'diff -u'), not as shar files, so changes to the port can be
> > seen in the problem report. Could you send a followup with your update in
> > unified diff format?
> >
> > http://www.freebsd.org/cgi/query-pr.cgi?pr=159168
>
> Yes, it is attached
--qMm9M+Fa2AknHoGS
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment; filename="tipp10.diff"
diff -uNr tipp10.old/Makefile tipp10/Makefile
--- tipp10.old/Makefile 2011-08-31 15:15:16.000000000 +0200
+++ tipp10/Makefile 2011-08-31 15:15:03.000000000 +0200
@@ -6,11 +6,10 @@
#
PORTNAME= tipp10
-PORTVERSION= 2.0.1
-PORTREVISION= 4
+PORTVERSION= 2.1.0
CATEGORIES= german
-MASTER_SITES= http://www.tipp10.de/download/
-DISTNAME= tipp10_source_v2-0-1
+MASTER_SITES= http://www.tipp10.com/en/download/
+DISTNAME= tipp10_source_v2-1-0
MAINTAINER= ports at FreeBSD.org
COMMENT= A 10 finger touch typing learning program
@@ -18,25 +17,34 @@
RUN_DEPENDS= ${LOCALBASE}/lib/qt4/plugins/sqldrivers/libqsqlite2.so:${PORTSDIR}/databases/qt4-sqlite-plugin \
${LOCALBASE}/lib/qt4/plugins/sqldrivers/libqsqlite.so:${PORTSDIR}/databases/qt4-sqlite3-plugin
+LICENSE= GPLv2
+LICENSE_FILE= ${WRKSRC}/license_en.txt
+
USE_ZIP= yes
USE_QT_VER= 4
QT_COMPONENTS= gui sql corelib network script qtestlib \
qmake_build rcc_build uic_build moc_build
-WRKSRC= ${WRKDIR}/source
+WRKSRC= ${WRKDIR}/tipp10_source_v2-1-0
-do-configure:
+pre-configure:
@cd ${WRKSRC} \
- && ${SETENV} ${MAKE_ENV} ${QMAKE} -spec ${QMAKESPEC}
+ && for i in `grep -lR 'QCoreApplication::applicationDirPath()' *`; do ${REINPLACE_CMD} -e 's/QCoreApplication::applicationDirPath()/QString(DATADIR)/g' $$i ; done
-do-install:
- ${INSTALL_DATA} -d ${DATADIR}/help/img
- ${INSTALL_DATA} -d ${DATADIR}/help/content
- ${INSTALL_PROGRAM} ${WRKSRC}/tipp10 ${DATADIR}
- ${INSTALL_DATA} ${WRKSRC}/tipp10v2.template ${WRKSRC}/license.txt ${WRKSRC}/wrong.wav ${DATADIR}
- ${INSTALL_DATA} ${WRKSRC}/help/content/* ${DATADIR}/help/content
- ${INSTALL_DATA} ${WRKSRC}/help/img/* ${DATADIR}/help/img
- ${INSTALL_DATA} ${WRKSRC}/help/index.html ${DATADIR}/help
- ${INSTALL_DATA} ${WRKSRC}/help/Thumbs.db ${DATADIR}/help
- ${LN} -s ${DATADIR}/tipp10 ${PREFIX}/bin
+do-configure:
+ cd ${WRKSRC} \
+ && ${SETENV} ${MAKE_ENV} DATADIR="${DATADIR}" ${QMAKE} -spec ${QMAKESPEC}
+do-install:
+ ${INSTALL_PROGRAM} ${WRKSRC}/tipp10 ${PREFIX}/bin
+ ${INSTALL_DATA} -d ${DATADIR}/help/de/img
+ ${INSTALL_DATA} -d ${DATADIR}/help/de/content
+ ${INSTALL_DATA} -d ${DATADIR}/help/en/img
+ ${INSTALL_DATA} -d ${DATADIR}/help/en/content
+ ${INSTALL_DATA} ${WRKSRC}/release/tipp10v2.template ${WRKSRC}/metronome.wav ${WRKSRC}/error.wav ${DATADIR}
+ ${INSTALL_DATA} ${WRKSRC}/release/help/de/index.html ${DATADIR}/help/de
+ ${INSTALL_DATA} ${WRKSRC}/release/help/de/content/* ${DATADIR}/help/de/content
+ ${INSTALL_DATA} ${WRKSRC}/release/help/de/img/* ${DATADIR}/help/de/img
+ ${INSTALL_DATA} ${WRKSRC}/release/help/en/index.html ${DATADIR}/help/en
+ ${INSTALL_DATA} ${WRKSRC}/release/help/en/content/* ${DATADIR}/help/en/content
+ ${INSTALL_DATA} ${WRKSRC}/release/help/en/img/* ${DATADIR}/help/en/img
.include <bsd.port.mk>
diff -uNr tipp10.old/distinfo tipp10/distinfo
--- tipp10.old/distinfo 2011-08-31 15:15:16.000000000 +0200
+++ tipp10/distinfo 2011-08-31 15:15:03.000000000 +0200
@@ -1,2 +1,2 @@
-SHA256 (tipp10_source_v2-0-1.zip) = 8fe9f116d4df31f3ab4a22f104526783a72f8162c59d9156ef308e46a6885983
-SIZE (tipp10_source_v2-0-1.zip) = 1441904
+SHA256 (tipp10_source_v2-1-0.zip) = 016dba017ead4a26fe8267b19f061d974b35831d65650c6944b5cfb7e4d38185
+SIZE (tipp10_source_v2-1-0.zip) = 2106535
diff -uNr tipp10.old/files/patch-sql-connection.h tipp10/files/patch-sql-connection.h
--- tipp10.old/files/patch-sql-connection.h 2011-08-31 15:15:16.000000000 +0200
+++ tipp10/files/patch-sql-connection.h 1970-01-01 01:00:00.000000000 +0100
@@ -1,18 +0,0 @@
---- ./sql/connection.h.orig 2007-10-02 20:22:22.000000000 +0800
-+++ ./sql/connection.h 2008-08-24 16:25:30.000000000 +0800
-@@ -170,6 +170,7 @@
- // -> copy database to user home dir
- QFile file(QCoreApplication::applicationDirPath() + "/" + dbNameTemplate);
- if (file.copy(dbPath)) {
-+ QFile::setPermissions(dbPath, QFile::permissions(dbPath) | QFile::WriteUser);
- dbExist = true;
- } else {
- ErrorMessage *errorMessage = new ErrorMessage();
-@@ -201,6 +202,7 @@
- dir.cd("tipp10");
- QFile file(dbPath);
- if (file.copy(dir.path() + "/" + dbNameUser)) {
-+ QFile::setPermissions(dir.path() + "/" + dbNameUser, QFile::permissions(dir.path() + "/" + dbNameUser) | QFile::WriteUser);
- dbPath = dir.path() + "/" + dbNameUser;
- } else {
- ErrorMessage *errorMessage = new ErrorMessage();
diff -uNr tipp10.old/files/patch-tipp10.pro tipp10/files/patch-tipp10.pro
--- tipp10.old/files/patch-tipp10.pro 1970-01-01 01:00:00.000000000 +0100
+++ tipp10/files/patch-tipp10.pro 2011-08-31 15:15:03.000000000 +0200
@@ -0,0 +1,8 @@
+--- tipp10.pro 2011-03-12 20:22:32.000000000 +0100
++++ tipp10.pro 2011-07-24 14:24:03.000000000 +0200
+@@ -88,3 +88,5 @@
+ sql/startsql.cpp \
+ games/abcrainwidget.cpp \
+ games/charball.cpp
++
++DEFINES += "DATADIR=\"\\\"$$(DATADIR)\\\"\""
diff -uNr tipp10.old/files/patch-widget-keyboard.cpp tipp10/files/patch-widget-keyboard.cpp
--- tipp10.old/files/patch-widget-keyboard.cpp 2011-08-31 15:15:16.000000000 +0200
+++ tipp10/files/patch-widget-keyboard.cpp 1970-01-01 01:00:00.000000000 +0100
@@ -1,12 +0,0 @@
---- widget/keyboard.cpp.orig Tue Nov 27 22:06:05 2007
-+++ widget/keyboard.cpp Tue Nov 27 22:07:15 2007
-@@ -293,7 +293,8 @@
- // Emit the help text of current key(s)
- emit statusRefreshed(statusText);
- // Call the paint event (refresh the keyboard)
-- repaint();
-+ if (keyColoring || keyColoringStart)
-+ repaint();
- }
- }
-
diff -uNr tipp10.old/pkg-plist tipp10/pkg-plist
--- tipp10.old/pkg-plist 2011-08-31 15:15:16.000000000 +0200
+++ tipp10/pkg-plist 2011-08-31 15:15:03.000000000 +0200
@@ -1,79 +1,111 @@
bin/tipp10
-share/tipp10/help/Thumbs.db
-share/tipp10/help/content/about.html
-share/tipp10/help/content/behaviour.html
-share/tipp10/help/content/characteristics.html
-share/tipp10/help/content/evaluation.html
-share/tipp10/help/content/help.html
-share/tipp10/help/content/helpdocs.html
-share/tipp10/help/content/installation.html
-share/tipp10/help/content/introduction.html
-share/tipp10/help/content/lessons.html
-share/tipp10/help/content/lessonsettings.html
-share/tipp10/help/content/license.html
-share/tipp10/help/content/runprogram.html
-share/tipp10/help/content/settings.html
-share/tipp10/help/content/support.html
-share/tipp10/help/content/training.html
-share/tipp10/help/content/update.html
-share/tipp10/help/img/Thumbs.db
-share/tipp10/help/img/arrow_left.png
-share/tipp10/help/img/arrow_right.png
-share/tipp10/help/img/h_comparison_table.png
-share/tipp10/help/img/h_desktop_mac.png
-share/tipp10/help/img/h_evaluation_attention.png
-share/tipp10/help/img/h_evaluation_chars.png
-share/tipp10/help/img/h_evaluation_formula_error.png
-share/tipp10/help/img/h_evaluation_formula_grade.png
-share/tipp10/help/img/h_evaluation_lessons.png
-share/tipp10/help/img/h_evaluation_lessons_filter.png
-share/tipp10/help/img/h_evaluation_progress.png
-share/tipp10/help/img/h_evaluation_progress_sort.png
-share/tipp10/help/img/h_evaluation_tabs.png
-share/tipp10/help/img/h_fingers.png
-share/tipp10/help/img/h_installer_exit.png
-share/tipp10/help/img/h_installer_language.png
-share/tipp10/help/img/h_installer_license.png
-share/tipp10/help/img/h_introduction.png
-share/tipp10/help/img/h_key_blue.png
-share/tipp10/help/img/h_key_green.png
-share/tipp10/help/img/h_key_greydark.png
-share/tipp10/help/img/h_key_greylight.png
-share/tipp10/help/img/h_key_red.png
-share/tipp10/help/img/h_key_yellow.png
-share/tipp10/help/img/h_lesson_open_theme.png
-share/tipp10/help/img/h_lesson_own_menu.png
-share/tipp10/help/img/h_lesson_own_menu_edit.png
-share/tipp10/help/img/h_lesson_own_new.png
-share/tipp10/help/img/h_lesson_own_ws.png
-share/tipp10/help/img/h_lesson_tabs.png
-share/tipp10/help/img/h_lesson_training_done.png
-share/tipp10/help/img/h_main_duration.png
-share/tipp10/help/img/h_main_empty.png
-share/tipp10/help/img/h_main_linux_cut.png
-share/tipp10/help/img/h_main_settings.png
-share/tipp10/help/img/h_program_shortcut.png
-share/tipp10/help/img/h_settings_database.png
-share/tipp10/help/img/h_settings_font.png
-share/tipp10/help/img/h_settings_mac.png
-share/tipp10/help/img/h_settings_other.png
-share/tipp10/help/img/h_settings_training.png
-share/tipp10/help/img/h_terminal_mac.png
-share/tipp10/help/img/h_training_first_char.png
-share/tipp10/help/img/h_training_progress.png
-share/tipp10/help/img/h_training_start.png
-share/tipp10/help/img/h_training_without_keyboard.png
-share/tipp10/help/img/h_update.png
-share/tipp10/help/img/h_update_mac.png
-share/tipp10/help/img/h_update_proxy.png
-share/tipp10/help/img/logo.png
-share/tipp10/help/img/tt_logo.png
-share/tipp10/help/index.html
-share/tipp10/license.txt
-share/tipp10/tipp10
+share/tipp10/help/de/img/Thumbs.db
+share/tipp10/help/de/img/arrow_left.png
+share/tipp10/help/de/img/arrow_right.png
+share/tipp10/help/de/img/h_fingers.png
+share/tipp10/help/de/img/h_game.png
+share/tipp10/help/de/img/h_home_settings.png
+share/tipp10/help/de/img/h_installer_mac.png
+share/tipp10/help/de/img/h_installer_win.png
+share/tipp10/help/de/img/h_key_blue.png
+share/tipp10/help/de/img/h_key_green.png
+share/tipp10/help/de/img/h_key_greydark.png
+share/tipp10/help/de/img/h_key_greylight.png
+share/tipp10/help/de/img/h_key_red.png
+share/tipp10/help/de/img/h_key_yellow.png
+share/tipp10/help/de/img/h_lesson_own.png
+share/tipp10/help/de/img/h_lesson_own_menu.png
+share/tipp10/help/de/img/h_lesson_tabs.png
+share/tipp10/help/de/img/h_program_shortcut.png
+share/tipp10/help/de/img/h_results_chars.png
+share/tipp10/help/de/img/h_results_comparison.png
+share/tipp10/help/de/img/h_results_fingers.png
+share/tipp10/help/de/img/h_results_lessons.png
+share/tipp10/help/de/img/h_results_progress.png
+share/tipp10/help/de/img/h_results_report.png
+share/tipp10/help/de/img/h_settings_database.png
+share/tipp10/help/de/img/h_settings_language.png
+share/tipp10/help/de/img/h_settings_other.png
+share/tipp10/help/de/img/h_settings_training.png
+share/tipp10/help/de/img/h_terminal_mac.png
+share/tipp10/help/de/img/h_training_lesson.png
+share/tipp10/help/de/img/h_training_numpad.png
+share/tipp10/help/de/img/logo.png
+share/tipp10/help/de/img/tt_logo.png
+share/tipp10/help/de/content/about.html
+share/tipp10/help/de/content/behaviour.html
+share/tipp10/help/de/content/donate.html
+share/tipp10/help/de/content/features.html
+share/tipp10/help/de/content/game.html
+share/tipp10/help/de/content/installation.html
+share/tipp10/help/de/content/introduction.html
+share/tipp10/help/de/content/lessons.html
+share/tipp10/help/de/content/license.html
+share/tipp10/help/de/content/parameters.html
+share/tipp10/help/de/content/results.html
+share/tipp10/help/de/content/settings.html
+share/tipp10/help/de/content/start.html
+share/tipp10/help/de/content/style.css
+share/tipp10/help/de/content/support.html
+share/tipp10/help/de/content/training.html
+share/tipp10/help/de/index.html
+share/tipp10/help/en/img/arrow_left.png
+share/tipp10/help/en/img/arrow_right.png
+share/tipp10/help/en/img/h_fingers.png
+share/tipp10/help/en/img/h_game.png
+share/tipp10/help/en/img/h_home_settings.png
+share/tipp10/help/en/img/h_installer_mac.png
+share/tipp10/help/en/img/h_installer_win.png
+share/tipp10/help/en/img/h_key_blue.png
+share/tipp10/help/en/img/h_key_green.png
+share/tipp10/help/en/img/h_key_greydark.png
+share/tipp10/help/en/img/h_key_greylight.png
+share/tipp10/help/en/img/h_key_red.png
+share/tipp10/help/en/img/h_key_yellow.png
+share/tipp10/help/en/img/h_lesson_own.png
+share/tipp10/help/en/img/h_lesson_own_menu.png
+share/tipp10/help/en/img/h_lesson_tabs.png
+share/tipp10/help/en/img/h_program_shortcut.png
+share/tipp10/help/en/img/h_results_chars.png
+share/tipp10/help/en/img/h_results_comparison.png
+share/tipp10/help/en/img/h_results_fingers.png
+share/tipp10/help/en/img/h_results_lessons.png
+share/tipp10/help/en/img/h_results_progress.png
+share/tipp10/help/en/img/h_results_report.png
+share/tipp10/help/en/img/h_settings_database.png
+share/tipp10/help/en/img/h_settings_language.png
+share/tipp10/help/en/img/h_settings_other.png
+share/tipp10/help/en/img/h_settings_training.png
+share/tipp10/help/en/img/h_terminal_mac.png
+share/tipp10/help/en/img/h_training_lesson.png
+share/tipp10/help/en/img/h_training_numpad.png
+share/tipp10/help/en/img/logo.png
+share/tipp10/help/en/img/tt_logo.png
+share/tipp10/help/en/content/about.html
+share/tipp10/help/en/content/behaviour.html
+share/tipp10/help/en/content/donate.html
+share/tipp10/help/en/content/features.html
+share/tipp10/help/en/content/game.html
+share/tipp10/help/en/content/installation.html
+share/tipp10/help/en/content/introduction.html
+share/tipp10/help/en/content/lessons.html
+share/tipp10/help/en/content/license.html
+share/tipp10/help/en/content/parameters.html
+share/tipp10/help/en/content/results.html
+share/tipp10/help/en/content/settings.html
+share/tipp10/help/en/content/start.html
+share/tipp10/help/en/content/style.css
+share/tipp10/help/en/content/support.html
+share/tipp10/help/en/content/training.html
+share/tipp10/help/en/index.html
share/tipp10/tipp10v2.template
-share/tipp10/wrong.wav
- at dirrm share/tipp10/help/img
- at dirrm share/tipp10/help/content
+share/tipp10/metronome.wav
+share/tipp10/error.wav
+ at dirrm share/tipp10/help/de/img
+ at dirrm share/tipp10/help/de/content
+ at dirrm share/tipp10/help/de
+ at dirrm share/tipp10/help/en/img
+ at dirrm share/tipp10/help/en/content
+ at dirrm share/tipp10/help/en
@dirrm share/tipp10/help
@dirrm share/tipp10
--qMm9M+Fa2AknHoGS--
More information about the freebsd-ports-bugs
mailing list