Re: update: education/anki-2.1.16
On 2020/07/05 10:03, Andrea Fleckenstein wrote: > marfabastewart writes: > > > Thank you for the continuing work on anki. However, I > > am getting an error on -current now. After installing > > with pkg_add -D snap, > > I get > > > > marfaba$ anki > > Traceback (most recent call last): > > File "/usr/local/bin/anki", line 3, in > > import aqt > > File "/usr/local/lib/python3.7/site-packages/aqt/__init__.py", line 57, > > in > > from aqt import addcards, browser, editcurrent, stats, about, \ > > File "/usr/local/lib/python3.7/site-packages/aqt/addcards.py", line 13, > > in > > import aqt.editor, aqt.modelchooser, aqt.deckchooser > > File "/usr/local/lib/python3.7/site-packages/aqt/editor.py", line 25, in > > > > import requests > > ModuleNotFoundError: No module named 'requests' > > > > Thanks, Makefile diff below > > > --- Makefile.orig Sun Jul 5 08:42:34 2020 > +++ Makefile Sun Jul 5 08:43:13 2020 > @@ -33,6 +33,7 @@ > sysutils/py-distro${MODPY_FLAVOR} \ > textproc/py-markdown${MODPY_FLAVOR} \ > www/py-beautifulsoup4${MODPY_FLAVOR} \ > + www/py-requests${MODPY_FLAVOR} \ > www/py-qtwebengine${MODPY_FLAVOR} > > do-build: > I already committed a fix (and then Antoine fixed my fix :-) For the record, adding/bumping REVISION is necessary for any change to the port which results in a change to the package (so that includes HOMEPAGE, patches which affect the built files, dependency changes, etc)
Re: update: education/anki-2.1.16
marfabastewart writes: > Thank you for the continuing work on anki. However, I > am getting an error on -current now. After installing > with pkg_add -D snap, > I get > > marfaba$ anki > Traceback (most recent call last): > File "/usr/local/bin/anki", line 3, in > import aqt > File "/usr/local/lib/python3.7/site-packages/aqt/__init__.py", line 57, in > > from aqt import addcards, browser, editcurrent, stats, about, \ > File "/usr/local/lib/python3.7/site-packages/aqt/addcards.py", line 13, in > > import aqt.editor, aqt.modelchooser, aqt.deckchooser > File "/usr/local/lib/python3.7/site-packages/aqt/editor.py", line 25, in > > import requests > ModuleNotFoundError: No module named 'requests' > Thanks, Makefile diff below --- Makefile.orig Sun Jul 5 08:42:34 2020 +++ MakefileSun Jul 5 08:43:13 2020 @@ -33,6 +33,7 @@ sysutils/py-distro${MODPY_FLAVOR} \ textproc/py-markdown${MODPY_FLAVOR} \ www/py-beautifulsoup4${MODPY_FLAVOR} \ + www/py-requests${MODPY_FLAVOR} \ www/py-qtwebengine${MODPY_FLAVOR} do-build:
Re: update: education/anki-2.1.16
Thank you for the continuing work on anki. However, I am getting an error on -current now. After installing with pkg_add -D snap, I get marfaba$ anki Traceback (most recent call last): File "/usr/local/bin/anki", line 3, in import aqt File "/usr/local/lib/python3.7/site-packages/aqt/__init__.py", line 57, in from aqt import addcards, browser, editcurrent, stats, about, \ File "/usr/local/lib/python3.7/site-packages/aqt/addcards.py", line 13, in import aqt.editor, aqt.modelchooser, aqt.deckchooser File "/usr/local/lib/python3.7/site-packages/aqt/editor.py", line 25, in import requests ModuleNotFoundError: No module named 'requests' I haven't tried to install the module separately. This error occurs on several machines, including one that started with no other packages, running kern.version=OpenBSD 6.7-current (GENERIC) #313: Fri Jul 3 08:45:24 MDT 2020 dera...@amd64.openbsd.org:/usr/src/sys/arch/amd64/compile/GENERIC My python knowledge is very limited, but please let me know if I can help in any way.
Re: update: education/anki-2.1.16
On 2020/07/04 20:13, marfabastewart wrote: > Thank you for the continuing work on anki. However, I > am getting an error on -current now. After installing > with pkg_add -D snap, > I get > > marfaba$ anki > Traceback (most recent call last): > File "/usr/local/bin/anki", line 3, in > import aqt > File "/usr/local/lib/python3.7/site-packages/aqt/__init__.py", line 57, in > > from aqt import addcards, browser, editcurrent, stats, about, \ > File "/usr/local/lib/python3.7/site-packages/aqt/addcards.py", line 13, in > > import aqt.editor, aqt.modelchooser, aqt.deckchooser > File "/usr/local/lib/python3.7/site-packages/aqt/editor.py", line 25, in > > import requests > ModuleNotFoundError: No module named 'requests' > > I haven't tried to install the module separately. > This error occurs on several machines, including one > that started with no other packages, running > > kern.version=OpenBSD 6.7-current (GENERIC) #313: Fri Jul 3 08:45:24 MDT 2020 > dera...@amd64.openbsd.org:/usr/src/sys/arch/amd64/compile/GENERIC > > My python knowledge is very limited, but please let me know > if I can help in any way. > > > > workaround until a new package is available with a fixed dependency list: "pkg_add py3-requests"
Re: update: education/anki-2.1.16
On 2020/06/16 16:27, Andrea Fleckenstein wrote: > Thanks to the newly ported qtwebengine (and py-qtwebengine), a newer > version of anki is now possible. I have chosen 2.1.16 based on the > advice of @sthen, who recommended to use the latest version before rust > code was added. Neat! Thanks, I have made a few changes and committed it. > The "web" folder in the source distribution needs to be installed, which > is an addition from the older 2.0.52 version. I decided to install it > within the aqt folder, and made the according changes in aqt/mediasrv.py > to detect it. Is this a reasonable choice? I think so - we can change it if someone has a good reason not to. > 'py-distro' is a dependency if the platform is not 'win32' or 'darwin', > this obviously is intended to mean 'linux', but I'm not sure what it > means for OpenBSD. It doesn't seem to do much that's useful. > There are a few errors given on startup: > > [77254:-1971705896:0616/150959.964156:ERROR:process_metrics_openbsd.cc(146)] > Not implemented reached in bool > base::GetSystemMemoryInfo(base::SystemMemoryInfoKB *) > [77254:-1971705896:0616/150959.968819:ERROR:process_posix.cc(389)] Not > implemented reached in base::Time base::Process::CreationTime() const > > but it doesn't seem to affect basic functionality. I will be doing more > heavy use in the coming days. These are qtwebengine things which aren't ported to OpenBSD yet, they shouldn't cause a real problem. > I've done my best with my limited porting and python module knowledge, > advice and corrections much appreciated. > > Happy remembering, > Andrea > Thanks for the update!
update: education/anki-2.1.16
Hello, Thanks to the newly ported qtwebengine (and py-qtwebengine), a newer version of anki is now possible. I have chosen 2.1.16 based on the advice of @sthen, who recommended to use the latest version before rust code was added. A few notes: The "web" folder in the source distribution needs to be installed, which is an addition from the older 2.0.52 version. I decided to install it within the aqt folder, and made the according changes in aqt/mediasrv.py to detect it. Is this a reasonable choice? 'py-distro' is a dependency if the platform is not 'win32' or 'darwin', this obviously is intended to mean 'linux', but I'm not sure what it means for OpenBSD. There are a few errors given on startup: [77254:-1971705896:0616/150959.964156:ERROR:process_metrics_openbsd.cc(146)] Not implemented reached in bool base::GetSystemMemoryInfo(base::SystemMemoryInfoKB *) [77254:-1971705896:0616/150959.968819:ERROR:process_posix.cc(389)] Not implemented reached in base::Time base::Process::CreationTime() const but it doesn't seem to affect basic functionality. I will be doing more heavy use in the coming days. I've done my best with my limited porting and python module knowledge, advice and corrections much appreciated. Happy remembering, Andrea anki.tar.gz Description: Binary data
Re: UPDATE: education/anki to 2.0.45
I dont know how that previous diff slipped in :) So here goes again, Index: Makefile === RCS file: /cvs/ports/education/anki/Makefile,v retrieving revision 1.12 diff -u -p -r1.12 Makefile --- Makefile8 Jul 2016 10:32:34 - 1.12 +++ Makefile25 Jul 2017 13:41:06 - @@ -2,7 +2,8 @@ COMMENT= spaced learning system -DISTNAME = anki-2.0.36 +DISTNAME = anki-2.0.45 +EXTRACT_SUFX = -source.tgz CATEGORIES = education @@ -13,9 +14,7 @@ MAINTAINER = Federico G. Schwindt http://ankisrs.net/download/mirror/ - -EXTRACT_SUFX = .tgz +MASTER_SITES = https://apps.ankiweb.net/downloads/current/ MODULES = lang/python Index: distinfo === RCS file: /cvs/ports/education/anki/distinfo,v retrieving revision 1.10 diff -u -p -r1.10 distinfo --- distinfo8 Jul 2016 10:32:34 - 1.10 +++ distinfo25 Jul 2017 13:41:06 - @@ -1,2 +1,2 @@ -SHA256 (anki-2.0.36.tgz) = +yCCMM3FDqAtU/UhzwOSbGJ//3z3MbfSnccz06sEFxw= -SIZE (anki-2.0.36.tgz) = 3410538 +SHA256 (anki-2.0.45-source.tgz) = PFRpNgeiBsX3DsxR6U3+xBUWAm8++ZMhNq7UNUprmYo= +SIZE (anki-2.0.45-source.tgz) = 3421960
Re: UPDATE: education/anki to 2.0.45
Stuart Hendersonwrites: > On 2017/07/24 22:32, Gleydson Soares wrote: > > Hi, > > please find below a diff that brings anki to the latest release (2.0.45). > > works fine here, > > It's a bit cleaner if you apply this on top, otherwise ok with me: sure. thanks. Index: Makefile === RCS file: /cvs/ports/education/anki/Makefile,v retrieving revision 1.12 diff -u -p -r1.12 Makefile --- Makefile8 Jul 2016 10:32:34 - 1.12 +++ Makefile25 Jul 2017 12:03:27 - @@ -2,7 +2,8 @@ COMMENT= spaced learning system -DISTNAME = anki-2.0.36 +DISTNAME = anki-2.0.45-source +PKGNAME = ${DISTNAME:S/-source//} CATEGORIES = education @@ -13,7 +14,7 @@ MAINTAINER = Federico G. Schwindt http://ankisrs.net/download/mirror/ +MASTER_SITES = https://apps.ankiweb.net/downloads/current/ EXTRACT_SUFX = .tgz @@ -32,6 +33,8 @@ RUN_DEPENDS = audio/py-audio \ CONFIGURE_STYLE= none NO_TEST = Yes + +WRKDIST= ${WRKDIR}/${DISTNAME:S/-source//} do-build: ${MODPY_BIN} -mcompileall -q ${WRKSRC} Index: distinfo === RCS file: /cvs/ports/education/anki/distinfo,v retrieving revision 1.10 diff -u -p -r1.10 distinfo --- distinfo8 Jul 2016 10:32:34 - 1.10 +++ distinfo25 Jul 2017 12:03:27 - @@ -1,2 +1,2 @@ -SHA256 (anki-2.0.36.tgz) = +yCCMM3FDqAtU/UhzwOSbGJ//3z3MbfSnccz06sEFxw= -SIZE (anki-2.0.36.tgz) = 3410538 +SHA256 (anki-2.0.45-source.tgz) = PFRpNgeiBsX3DsxR6U3+xBUWAm8++ZMhNq7UNUprmYo= +SIZE (anki-2.0.45-source.tgz) = 3421960
Re: UPDATE: education/anki to 2.0.45
What about this? --- MakefileTue Jul 25 13:30:27 2017 +++ MakefileTue Jul 25 13:36:34 2017 @@ -2,9 +2,14 @@ COMMENT= spaced learning system -DISTNAME = anki-2.0.45 -EXTRACT_SUFX = -source.tgz +V = 2.0.45 +DISTNAME = anki-${V} + +PKGNAME = anki-${V} + +DISTFILES =anki-${V}-source${EXTRACT_SUFX} + CATEGORIES = education HOMEPAGE = http://ankisrs.net/ @@ -15,6 +20,8 @@ PERMIT_PACKAGE_CDROM = Yes MASTER_SITES = https://apps.ankiweb.net/downloads/current/ + +EXTRACT_SUFX = .tgz MODULES = lang/python
Re: UPDATE: education/anki to 2.0.45
On 2017/07/24 22:32, Gleydson Soares wrote: > Hi, > please find below a diff that brings anki to the latest release (2.0.45). > works fine here, It's a bit cleaner if you apply this on top, otherwise ok with me: --- Makefile- Tue Jul 25 11:34:24 2017 +++ MakefileTue Jul 25 11:34:48 2017 @@ -2,8 +2,8 @@ COMMENT= spaced learning system -DISTNAME = anki-2.0.45-source -PKGNAME = ${DISTNAME:S/-source//} +DISTNAME = anki-2.0.45 +EXTRACT_SUFX = -source.tgz CATEGORIES = education @@ -16,8 +16,6 @@ PERMIT_PACKAGE_CDROM =Yes MASTER_SITES = https://apps.ankiweb.net/downloads/current/ -EXTRACT_SUFX = .tgz - MODULES = lang/python MODPY_ADJ_FILES = anki/anki @@ -33,8 +31,6 @@ RUN_DEPENDS = audio/py-audio \ CONFIGURE_STYLE= none NO_TEST = Yes - -WRKDIST= ${WRKDIR}/${DISTNAME:S/-source//} do-build: ${MODPY_BIN} -mcompileall -q ${WRKSRC}
UPDATE: education/anki to 2.0.45
Hi, please find below a diff that brings anki to the latest release (2.0.45). works fine here, Index: Makefile === RCS file: /cvs/ports/education/anki/Makefile,v retrieving revision 1.12 diff -u -p -r1.12 Makefile --- Makefile8 Jul 2016 10:32:34 - 1.12 +++ Makefile25 Jul 2017 00:36:57 - @@ -2,7 +2,8 @@ COMMENT= spaced learning system -DISTNAME = anki-2.0.36 +DISTNAME = anki-2.0.45-source +PKGNAME = ${DISTNAME:S/-source//} CATEGORIES = education @@ -13,7 +14,7 @@ MAINTAINER = Federico G. Schwindt http://ankisrs.net/download/mirror/ +MASTER_SITES = https://apps.ankiweb.net/downloads/current/ EXTRACT_SUFX = .tgz @@ -32,6 +33,8 @@ RUN_DEPENDS = audio/py-audio \ CONFIGURE_STYLE= none NO_TEST = Yes + +WRKDIST= ${WRKDIR}/${DISTNAME:S/-source//} do-build: ${MODPY_BIN} -mcompileall -q ${WRKSRC} Index: distinfo === RCS file: /cvs/ports/education/anki/distinfo,v retrieving revision 1.10 diff -u -p -r1.10 distinfo --- distinfo8 Jul 2016 10:32:34 - 1.10 +++ distinfo25 Jul 2017 00:36:57 - @@ -1,2 +1,2 @@ -SHA256 (anki-2.0.36.tgz) = +yCCMM3FDqAtU/UhzwOSbGJ//3z3MbfSnccz06sEFxw= -SIZE (anki-2.0.36.tgz) = 3410538 +SHA256 (anki-2.0.45-source.tgz) = PFRpNgeiBsX3DsxR6U3+xBUWAm8++ZMhNq7UNUprmYo= +SIZE (anki-2.0.45-source.tgz) = 3421960
update education/anki (amd64) to 2.0.36 works
(Maintainerasked me to send to ports@ since he's busy) Update to: /usr/ports/education/anki/ Downloaded newest stable: http://ankisrs.net/download/mirror/anki-2.0.36.tgz Updated the distinfo: SHA256 (anki-2.0.36.tgz) = +yCCMM3FDqAtU/UhzwOSbGJ//3z3MbfSnccz06sEFxw= SIZE (anki-2.0.36.tgz) = 3410538 Updated the Makefile: DISTNAME = anki-2.0.36 ... and everything worked great, with only those changes.
UPDATE: education/anki
Hi Below is a trivial update to anki 2.0.18. Comments? OK? f.- Index: Makefile === RCS file: /cvs/ports/education/anki/Makefile,v retrieving revision 1.9 diff -p -u -u -p -r1.9 Makefile --- Makefile3 Nov 2013 00:02:55 - 1.9 +++ Makefile28 Nov 2013 07:37:38 - @@ -2,7 +2,7 @@ COMMENT= spaced learning system -DISTNAME = anki-2.0.16 +DISTNAME = anki-2.0.18 CATEGORIES = education Index: distinfo === RCS file: /cvs/ports/education/anki/distinfo,v retrieving revision 1.7 diff -p -u -u -p -r1.7 distinfo --- distinfo3 Nov 2013 00:02:55 - 1.7 +++ distinfo28 Nov 2013 07:37:38 - @@ -1,2 +1,2 @@ -SHA256 (anki-2.0.16.tgz) = MGCfJMVxpPMHxFIQyUgBdrXbJ9Avr1v0qbY0vQFWJks= -SIZE (anki-2.0.16.tgz) = 3167535 +SHA256 (anki-2.0.18.tgz) = EpRs1S85OBg/FhgpY2q0MABFZNHMvxZcAfCf99ZQ9MI= +SIZE (anki-2.0.18.tgz) = 3179157
UPDATE: education/anki
Hi, Update anki to 2.0.16. For changes see http://ankisrs.net/docs/changes.html This depends on the py-send2trash port that I sent yesterday. Comments? OK? f.- Index: Makefile === RCS file: /cvs/ports/education/anki/Makefile,v retrieving revision 1.8 diff -p -u -r1.8 Makefile --- Makefile18 May 2013 05:54:52 - 1.8 +++ Makefile1 Nov 2013 12:05:24 - @@ -2,7 +2,7 @@ COMMENT= spaced learning system -DISTNAME = anki-2.0.8 +DISTNAME = anki-2.0.16 CATEGORIES = education @@ -23,6 +23,7 @@ MODPY_ADJ_FILES = anki/anki RUN_DEPENDS = audio/py-audio \ devel/desktop-file-utils \ + devel/py-send2trash \ www/py-beautifulsoup \ www/py-httplib2=0.7.7 \ x11/mplayer \ @@ -37,7 +38,7 @@ do-build: do-install: ${INSTALL_DATA_DIR} ${PREFIX}/bin - ${INSTALL_PROGRAM} ${WRKSRC}/anki/anki ${PREFIX}/bin + ${INSTALL_SCRIPT} ${WRKSRC}/anki/anki ${PREFIX}/bin ${INSTALL_DATA_DIR} ${PREFIX}/man/man1 ${INSTALL_DATA} ${WRKSRC}/anki.1 ${PREFIX}/man/man1 ${INSTALL_DATA_DIR} ${PREFIX}/share/applications Index: distinfo === RCS file: /cvs/ports/education/anki/distinfo,v retrieving revision 1.6 diff -p -u -r1.6 distinfo --- distinfo5 Mar 2013 00:13:53 - 1.6 +++ distinfo1 Nov 2013 12:05:24 - @@ -1,2 +1,2 @@ -SHA256 (anki-2.0.8.tgz) = 3WcLAr9rXJjc+p4WBqwA9uEEb43rtYEuDzg//kd4uGg= -SIZE (anki-2.0.8.tgz) = 2924821 +SHA256 (anki-2.0.16.tgz) = MGCfJMVxpPMHxFIQyUgBdrXbJ9Avr1v0qbY0vQFWJks= +SIZE (anki-2.0.16.tgz) = 3167535 Index: patches/patch-anki_anki === RCS file: /cvs/ports/education/anki/patches/patch-anki_anki,v retrieving revision 1.1 diff -p -u -r1.1 patch-anki_anki --- patches/patch-anki_anki 19 Jan 2013 20:42:26 - 1.1 +++ patches/patch-anki_anki 1 Nov 2013 12:05:24 - @@ -1,10 +1,7 @@ $OpenBSD: patch-anki_anki,v 1.1 2013/01/19 20:42:26 fgsch Exp $ --- anki/anki.orig Sat Dec 22 00:12:33 2012 +++ anki/anki Thu Jan 10 21:44:12 2013 -@@ -1,15 +1,4 @@ --#!/usr/bin/env python -+#!/usr/local/bin/python2.7 - +@@ -2,13 +2,2 @@ -import os, sys -# system-wide install -sys.path.insert(0, /usr/share/anki) Index: pkg/PLIST === RCS file: /cvs/ports/education/anki/pkg/PLIST,v retrieving revision 1.4 diff -p -u -r1.4 PLIST --- pkg/PLIST 5 Mar 2013 00:13:53 - 1.4 +++ pkg/PLIST 1 Nov 2013 12:05:25 - @@ -40,6 +40,8 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/anki/importing/mnemo.pyc lib/python${MODPY_VERSION}/site-packages/anki/importing/noteimp.py lib/python${MODPY_VERSION}/site-packages/anki/importing/noteimp.pyc +lib/python${MODPY_VERSION}/site-packages/anki/importing/pauker.py +lib/python${MODPY_VERSION}/site-packages/anki/importing/pauker.pyc lib/python${MODPY_VERSION}/site-packages/anki/importing/supermemo_xml.py lib/python${MODPY_VERSION}/site-packages/anki/importing/supermemo_xml.pyc lib/python${MODPY_VERSION}/site-packages/anki/js.py @@ -103,6 +105,9 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/anki/locale/fr/ lib/python${MODPY_VERSION}/site-packages/anki/locale/fr/LC_MESSAGES/ lib/python${MODPY_VERSION}/site-packages/anki/locale/fr/LC_MESSAGES/anki.mo +lib/python${MODPY_VERSION}/site-packages/anki/locale/gl/ +lib/python${MODPY_VERSION}/site-packages/anki/locale/gl/LC_MESSAGES/ +lib/python${MODPY_VERSION}/site-packages/anki/locale/gl/LC_MESSAGES/anki.mo lib/python${MODPY_VERSION}/site-packages/anki/locale/gu/ lib/python${MODPY_VERSION}/site-packages/anki/locale/gu/LC_MESSAGES/ lib/python${MODPY_VERSION}/site-packages/anki/locale/gu/LC_MESSAGES/anki.mo @@ -121,6 +126,9 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/anki/locale/ja/ lib/python${MODPY_VERSION}/site-packages/anki/locale/ja/LC_MESSAGES/ lib/python${MODPY_VERSION}/site-packages/anki/locale/ja/LC_MESSAGES/anki.mo +lib/python${MODPY_VERSION}/site-packages/anki/locale/km/ +lib/python${MODPY_VERSION}/site-packages/anki/locale/km/LC_MESSAGES/ +lib/python${MODPY_VERSION}/site-packages/anki/locale/km/LC_MESSAGES/anki.mo lib/python${MODPY_VERSION}/site-packages/anki/locale/ko/ lib/python${MODPY_VERSION}/site-packages/anki/locale/ko/LC_MESSAGES/ lib/python${MODPY_VERSION}/site-packages/anki/locale/ko/LC_MESSAGES/anki.mo @@ -188,9 +196,15 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/anki/locale/ru/ lib/python${MODPY_VERSION}/site-packages/anki/locale/ru/LC_MESSAGES/ lib/python${MODPY_VERSION}/site-packages/anki/locale/ru/LC_MESSAGES/anki.mo +lib/python${MODPY_VERSION}/site-packages/anki/locale/sk/
UPDATE: education/anki
Update to version 2.0.4 and add myself as maintainer. Tested with some Japanese decks and plugins (both migrated from prev version and from scratch). OK? f.- Index: Makefile === RCS file: /cvs/ports/education/anki/Makefile,v retrieving revision 1.3 diff -u -p -r1.3 Makefile --- Makefile30 Dec 2012 02:54:14 - 1.3 +++ Makefile14 Jan 2013 21:00:32 - @@ -2,11 +2,13 @@ COMMENT= spaced learning system -DISTNAME = anki-2.0.3 +DISTNAME = anki-2.0.4 CATEGORIES = education HOMEPAGE = http://ankisrs.net/ +MAINTAINER = Federico G. Schwindt fg...@openbsd.org + # AGPL3 PERMIT_PACKAGE_CDROM = Yes PERMIT_PACKAGE_FTP = Yes @@ -21,7 +23,7 @@ MODULES = lang/python MODPY_VERSION =2.7 -MODPY_ADJ_FILES = anki +MODPY_ADJ_FILES = anki/anki RUN_DEPENDS = audio/py-audio \ devel/desktop-file-utils \ @@ -39,7 +41,7 @@ do-build: do-install: ${INSTALL_DATA_DIR} ${PREFIX}/bin - ${INSTALL_PROGRAM} ${WRKSRC}/anki ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/anki/anki ${PREFIX}/bin ${INSTALL_DATA_DIR} ${PREFIX}/man/man1 ${INSTALL_DATA} ${WRKSRC}/anki.1 ${PREFIX}/man/man1 ${INSTALL_DATA_DIR} ${PREFIX}/share/applications @@ -50,10 +52,12 @@ do-install: ${PREFIX}/share/pixmaps ${INSTALL_DATA_DIR} \ ${PREFIX}/lib/python${MODPY_VERSION}/site-packages - cd ${WRKSRC}/libanki pax -rw anki \ + cd ${WRKSRC} pax -rw anki \ ${PREFIX}/lib/python${MODPY_VERSION}/site-packages + cd ${WRKSRC} pax -rw locale \ + ${PREFIX}/lib/python${MODPY_VERSION}/site-packages/anki cd ${WRKSRC} pax -rw aqt \ ${PREFIX}/lib/python${MODPY_VERSION}/site-packages - rm ${PREFIX}/lib/python${MODPY_VERSION}/site-packages/{aqt,anki}/*.orig + rm ${PREFIX}/lib/python${MODPY_VERSION}/site-packages/anki/*.orig .include bsd.port.mk Index: distinfo === RCS file: /cvs/ports/education/anki/distinfo,v retrieving revision 1.3 diff -u -p -r1.3 distinfo --- distinfo30 Dec 2012 02:54:14 - 1.3 +++ distinfo14 Jan 2013 21:00:32 - @@ -1,2 +1,2 @@ -SHA256 (anki-2.0.3.tgz) = 9A7k7ynJEQHPmXjOe9TFE/E8p8d0l6P7ULgSit86UXg= -SIZE (anki-2.0.3.tgz) = 2833114 +SHA256 (anki-2.0.4.tgz) = +qnJYANRX6ASXaSJvbij1gGv8XZ9kvoT/49BHD2FacU= +SIZE (anki-2.0.4.tgz) = 2877891 Index: patches/patch-anki === RCS file: patches/patch-anki diff -N patches/patch-anki --- patches/patch-anki 30 Dec 2012 02:54:14 - 1.1 +++ /dev/null 1 Jan 1970 00:00:00 - @@ -1,19 +0,0 @@ -$OpenBSD: patch-anki,v 1.1 2012/12/30 02:54:14 fgsch Exp $ anki.orig Tue Oct 16 01:50:42 2012 -+++ anki Tue Oct 16 01:50:51 2012 -@@ -1,15 +1,4 @@ - #!/usr/bin/env python - --import os, sys --# system-wide install --sys.path.insert(0, /usr/share/anki) --sys.path.insert(0, /usr/share/anki/libanki) --# running from extracted folder --base = os.path.dirname(os.path.realpath(__file__)) --sys.path.insert(0, base) --sys.path.insert(0, os.path.join(base, libanki)) --# or git --sys.path.insert(0, os.path.join(base, .., libanki)) --# start - import anki, aqt - aqt.run() Index: patches/patch-anki_anki === RCS file: patches/patch-anki_anki diff -N patches/patch-anki_anki --- /dev/null 1 Jan 1970 00:00:00 - +++ patches/patch-anki_anki 14 Jan 2013 21:00:34 - @@ -0,0 +1,20 @@ +$OpenBSD$ +--- anki/anki.orig Sat Dec 22 00:12:33 2012 anki/anki Thu Jan 10 21:44:12 2013 +@@ -1,15 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/local/bin/python2.7 + +-import os, sys +-# system-wide install +-sys.path.insert(0, /usr/share/anki) +-sys.path.insert(0, /usr/share/anki/libanki) +-# running from extracted folder +-base = os.path.dirname(os.path.realpath(__file__)) +-sys.path.insert(0, base) +-sys.path.insert(0, os.path.join(base, libanki)) +-# or git +-sys.path.insert(0, os.path.join(base, .., libanki)) +-# start + import aqt + aqt.run() Index: patches/patch-aqt_share_py === RCS file: patches/patch-aqt_share_py diff -N patches/patch-aqt_share_py --- patches/patch-aqt_share_py 30 Dec 2012 02:54:14 - 1.1 +++ /dev/null 1 Jan 1970 00:00:00 - @@ -1,20 +0,0 @@ -$OpenBSD: patch-aqt_share_py,v 1.1 2012/12/30 02:54:14 fgsch Exp $ aqt/share.py.orig Tue Oct 16 01:39:40 2012 -+++ aqt/share.py Tue Oct 16 01:39:44 2012 -@@ -1,6 +1,6 @@ - # to be moved into libanki - --def _copyToTmpDeck(self, name=cram.anki, tags=, ids=[]): -+def _copyToTmpDeck(self, name=cram.anki, tags=, ids=[]): - # fixme: use namedtmp - ndir = tempfile.mkdtemp(prefix=anki) - path = os.path.join(ndir, name) -@@ -15,7 +15,7 @@ -
UPDATE: education/anki
Hi, This is an update to anki 2.0.0. Since it's not backward compatible and Ankidroid 2 is still beta I won't commit it just yet but I'd like some feedback if anyone is using it and don't care about Ankidroid. Cheers, f.- Index: Makefile === RCS file: /cvs/ports/education/anki/Makefile,v retrieving revision 1.2 diff -u -p -r1.2 Makefile --- Makefile25 May 2012 13:16:13 - 1.2 +++ Makefile20 Oct 2012 19:50:43 - @@ -2,45 +2,57 @@ COMMENT= spaced learning system -MODPY_EGG_VERSION = 1.2.11 -DISTNAME = anki-${MODPY_EGG_VERSION} +DISTNAME = anki-2.0.0 CATEGORIES = education HOMEPAGE = http://ankisrs.net/ -# GPLv3 +# AGPL3 PERMIT_PACKAGE_CDROM = Yes PERMIT_PACKAGE_FTP = Yes PERMIT_DISTFILES_CDROM = Yes PERMIT_DISTFILES_FTP = Yes -MASTER_SITES = http://ankisrs.net/download/mirror/ \ - http://anki.googlecode.com/files/ +MASTER_SITES = http://ankisrs.net/download/mirror/ EXTRACT_SUFX = .tgz MODULES = lang/python -MODPY_SETUPTOOLS = Yes +MODPY_VERSION =2.7 + +MODPY_ADJ_FILES = anki -BUILD_DEPENDS =databases/py-sqlalchemy \ - devel/py-simplejson \ - x11/py-qt4 RUN_DEPENDS = audio/py-audio \ - audio/sox \ - databases/py-sqlalchemy \ - devel/py-simplejson \ www/py-beautifulsoup \ + www/py-httplib2 \ x11/mplayer \ x11/py-qt4 +RUN_DEPENDS += devel/desktop-file-utils + +CONFIGURE_STYLE= none + +WRKDIST = ${WRKDIR}/anki-2.0 + +do-build: + ${MODPY_BIN} -mcompileall -q ${WRKSRC} -pre-build: - @cd ${WRKSRC}/libanki ${SETENV} ${MAKE_ENV} \ - ${MODPY_BIN} ./${MODPY_SETUP} ${MODPY_DISTUTILS_BUILD} - -pre-install: - @cd ${WRKSRC}/libanki ${SETENV} ${MAKE_ENV} \ - ${MODPY_BIN} ./${MODPY_SETUP} ${MODPY_DISTUTILS_BUILD} \ - ${MODPY_DISTUTILS_INSTALL} +do-install: + ${INSTALL_DATA_DIR} ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/anki ${PREFIX}/bin + ${INSTALL_DATA_DIR} ${PREFIX}/man/man1 + ${INSTALL_DATA} ${WRKSRC}/anki.1 ${PREFIX}/man/man1 + ${INSTALL_DATA_DIR} ${PREFIX}/share/applications + ${INSTALL_DATA} ${WRKSRC}/anki.desktop \ + ${PREFIX}/share/applications + ${INSTALL_DATA_DIR} ${PREFIX}/share/pixmaps + cd ${WRKSRC} ${INSTALL_DATA} anki.xpm anki.png \ + ${PREFIX}/share/pixmaps + ${INSTALL_DATA_DIR} \ + ${PREFIX}/lib/python${MODPY_VERSION}/site-packages + cd ${WRKSRC}/libanki pax -rw anki \ + ${PREFIX}/lib/python${MODPY_VERSION}/site-packages + cd ${WRKSRC} pax -rw aqt \ + ${PREFIX}/lib/python${MODPY_VERSION}/site-packages .include bsd.port.mk Index: distinfo === RCS file: /cvs/ports/education/anki/distinfo,v retrieving revision 1.2 diff -u -p -r1.2 distinfo --- distinfo25 May 2012 13:16:13 - 1.2 +++ distinfo20 Oct 2012 19:50:43 - @@ -1,5 +1,2 @@ -MD5 (anki-1.2.11.tgz) = 3NQ3h77S2+Y/+20VPunb5Q== -RMD160 (anki-1.2.11.tgz) = ylTXiLmvUaoplrJ0O2xBZKU5FGg= -SHA1 (anki-1.2.11.tgz) = nG3Y4ieEHldLVsUe5DnSmL1RrCc= -SHA256 (anki-1.2.11.tgz) = ygdf0MDWhR0iBG3o9vqQ18RCzdSmeD98b/rX+8RvUIk= -SIZE (anki-1.2.11.tgz) = 1886062 +SHA256 (anki-2.0.0.tgz) = IWaFdEfVc/16mYgd5fkomLJLM0H4Jx+6ueyVEWfl3A8= +SIZE (anki-2.0.0.tgz) = 2727060 Index: pkg/PLIST === RCS file: /cvs/ports/education/anki/pkg/PLIST,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 PLIST --- pkg/PLIST 2 Mar 2012 09:34:06 - 1.1.1.1 +++ pkg/PLIST 20 Oct 2012 19:50:43 - @@ -1,57 +1,62 @@ -@comment $OpenBSD: PLIST,v 1.1.1.1 2012/03/02 09:34:06 fgsch Exp $ +@comment $OpenBSD$ bin/anki lib/python${MODPY_VERSION}/site-packages/anki/ -lib/python${MODPY_VERSION}/site-packages/anki-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/ -lib/python${MODPY_VERSION}/site-packages/anki-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO -lib/python${MODPY_VERSION}/site-packages/anki-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt -lib/python${MODPY_VERSION}/site-packages/anki-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt -lib/python${MODPY_VERSION}/site-packages/anki-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/not-zip-safe -lib/python${MODPY_VERSION}/site-packages/anki-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt lib/python${MODPY_VERSION}/site-packages/anki/__init__.py lib/python${MODPY_VERSION}/site-packages/anki/__init__.pyc +lib/python${MODPY_VERSION}/site-packages/anki/ankiweb.certs lib/python${MODPY_VERSION}/site-packages/anki/cards.py lib/python${MODPY_VERSION}/site-packages/anki/cards.pyc +lib/python${MODPY_VERSION}/site-packages/anki/collection.py