On Mon, 18 May 2015 11:49:23 +0200
"Dmitrij D. Czarkoff" <[email protected]> wrote:
> Dmitrij D. Czarkoff said:
> > Now with MODPY_VERSION=${MODPY_DEFAULT_VERSION_2}.
> >
> > OKs?
>
> ping
>
1. Portcheck complains
$ /usr/ports/infrastructure/bin/portcheck
installs icon pysol01.png in share/icons, it should go in share/pysol01/icons/
or like instead
installs icon pysol02.png in share/icons, it should go in share/pysol02/icons/
or like instead
missing RDEP on devel/desktop-file-utils
missing @exec of update-desktop-database
missing @unexec-delete of update-desktop-database
translation file(s) found without devel/gettext dependency in MODULES or
RUN_DEPENDS
Python module without compiled version, consider using ${MODPY_BIN}
${MODPY_LIBDIR}/compileall.py: share/PySolFC/themes/clearlooks/create_imgs.py
games/pysol
Additionally I think that in pkg/PLIST:
bin/pysol
should be changed to
@bin bin/pysol
and share/applications/ entry can be dropped.
Plus it should update the desktop database:
+@exec %D/bin/update-desktop-database
+@unexec-delete %D/bin/update-desktop-database
After applying those changes I got the portcheck warning down to:
$ /usr/ports/infrastructure/bin/portcheck
installs icon pysol01.png in share/icons, it should go in share/pysol01/icons/
or like instead
installs icon pysol02.png in share/icons, it should go in share/pysol02/icons/
or like instead
Python module without compiled version, consider using ${MODPY_BIN}
${MODPY_LIBDIR}/compileall.py: share/PySolFC/themes/clearlooks/create_imgs.py
games/pysol
Not sure how to tackle the last two.
2. The .desktop icon seems wrong
First of all it doesn't show up in the gnome menu, though that might be my
changes?
Looking at the .desktop entry source I don't think it would ever work even if
it showed
up:
$ cat /usr/local/share/applications/pysol.desktop
[Desktop Entry]
Encoding=UTF-8
Name=PySol Fan Club Edition
Exec=pysol.py
Terminal=false
Type=Application
Categories=Game;CardGame;
Icon=/usr/share/icons/pysol01.png
Because:
- the port is not installing a pysol.py binary (it's /usr/local/bin/pysol)
- the icon is in /usr/local/share/icons/pysol0* not /usr/share/icons/pysol0*
Patch inlined:
diff --git a/Makefile b/Makefile
index 3e8e697..5aab75c 100644
--- a/Makefile
+++ b/Makefile
@@ -20,7 +20,9 @@ MODPY_VERSION = 2.7
RUN_DEPENDS = ${MODPY_TKINTER_DEPENDS} \
devel/pygame \
- graphics/py-Pillow
+ graphics/py-Pillow \
+ devel/desktop-file-utils \
+ devel/gettext
NO_TEST = Yes
diff --git a/pkg/PLIST b/pkg/PLIST
index 8a271a4..4c9a508 100644
--- a/pkg/PLIST
+++ b/pkg/PLIST
@@ -1,5 +1,5 @@
@comment $OpenBSD$
-bin/pysol
+@bin bin/pysol
lib/python${MODPY_VERSION}/site-packages/PySolFC-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
lib/python${MODPY_VERSION}/site-packages/pysollib/
lib/python${MODPY_VERSION}/site-packages/pysollib/__init__.py
@@ -2787,7 +2787,6 @@ share/PySolFC/tiles/stretch/
share/PySolFC/tiles/stretch/Blue_Fractal.jpg
share/PySolFC/tiles/stretch/Castle.gif
share/PySolFC/tiles/stretch/Sunset.gif
-share/applications/
share/applications/pysol.desktop
share/icons/
share/icons/pysol01.png
@@ -2799,3 +2798,5 @@ share/locale/ru_RU/LC_MESSAGES/pysol.mo
share/pixmaps/
share/pixmaps/pysol.xbm
share/pixmaps/pysol.xpm
+@exec %D/bin/update-desktop-database
+@unexec-delete %D/bin/update-desktop-database
