New diff after naddy's gettext sweep.
Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/arandr/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- Makefile 20 May 2019 22:15:27 -0000 1.7
+++ Makefile 21 May 2019 16:37:20 -0000
@@ -1,24 +1,25 @@
# $OpenBSD: Makefile,v 1.7 2019/05/20 22:15:27 naddy Exp $
-COMMENT = xrandr gui
-MODPY_EGG_VERSION = 0.1.9
+COMMENT = XRandR GUI
+MODPY_EGG_VERSION = 0.1.10
DISTNAME = arandr-${MODPY_EGG_VERSION}
CATEGORIES = x11 sysutils
-HOMEPAGE = http://christian.amsuess.com/tools/arandr/
-REVISION = 1
+HOMEPAGE = https://christian.amsuess.com/tools/arandr/
MAINTAINER = Edd Barrett <e...@openbsd.org>
# GPLv3
PERMIT_PACKAGE_CDROM = Yes
-MASTER_SITES = http://christian.amsuess.com/tools/arandr/files/
+MASTER_SITES = https://christian.amsuess.com/tools/arandr/files/
MODULES = lang/python
-RUN_DEPENDS = x11/py-gtk2 \
- devel/desktop-file-utils
+MODPY_VERSION = ${MODPY_DEFAULT_VERSION_3}
+
+RUN_DEPENDS = devel/desktop-file-utils \
+ devel/py-gobject3${MODPY_FLAVOR}
BUILD_DEPENDS = devel/gettext,-tools \
- textproc/py-docutils
+ textproc/py-docutils${MODPY_FLAVOR}
NO_TEST = Yes
Index: distinfo
===================================================================
RCS file: /cvs/ports/x11/arandr/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo 4 Jun 2016 20:24:54 -0000 1.3
+++ distinfo 17 May 2019 15:21:42 -0000
@@ -1,2 +1,2 @@
-SHA256 (arandr-0.1.9.tar.gz) = uytX3Dd4fE63wzxRNs6jgp0biFhizdgn8W71Hp8KbsQ=
-SIZE (arandr-0.1.9.tar.gz) = 90437
+SHA256 (arandr-0.1.10.tar.gz) = 28isiQ2njpwLo0A6iTKpJYE7uNYiZSdolOeAuikFuIw=
+SIZE (arandr-0.1.10.tar.gz) = 100203
Index: patches/patch-setup_py
===================================================================
RCS file: /cvs/ports/x11/arandr/patches/patch-setup_py,v
retrieving revision 1.2
diff -u -p -r1.2 patch-setup_py
--- patches/patch-setup_py 4 Jun 2016 20:24:54 -0000 1.2
+++ patches/patch-setup_py 18 May 2019 19:19:44 -0000
@@ -1,9 +1,12 @@
$OpenBSD: patch-setup_py,v 1.2 2016/06/04 20:24:54 giovanni Exp $
Do not compress manual pages and install them in the right place.
+Fix "TypeError: write() argument must be str, not bytes" with Python 3
+by decoding `manpage' properly.
---- setup.py.orig Wed Feb 24 13:47:08 2016
-+++ setup.py Wed Jun 1 12:20:09 2016
+Index: setup.py
+--- setup.py.orig
++++ setup.py
@@ -20,7 +20,6 @@ import os
import operator
import subprocess
@@ -36,11 +39,11 @@ Do not compress manual pages and install
- compressed.write(manpage)
- compressed.close()
+ with open(manfile, 'w') as fh:
-+ fh.write(manpage)
++ fh.write(manpage.decode('utf-8'))
class update_translator_credits(NoOptionCommand):
description = 'Examine the git history to produce an updated metadata
file.'
-@@ -212,7 +210,7 @@ class clean(_clean):
+@@ -218,7 +216,7 @@ class clean(_clean):
def run(self):
if self.all:
dirs = ['build/locale']
@@ -49,7 +52,7 @@ Do not compress manual pages and install
for directory in dirs:
if os.path.exists(directory):
remove_tree(directory, dry_run=self.dry_run)
-@@ -253,7 +251,7 @@ setup(name = PACKAGENAME,
+@@ -259,7 +257,7 @@ setup(name = PACKAGENAME,
},
data_files = [
('share/applications', ['data/arandr.desktop']), # FIXME: use
desktop-file-install?
Index: pkg/DESCR
===================================================================
RCS file: /cvs/ports/x11/arandr/pkg/DESCR,v
retrieving revision 1.2
diff -u -p -r1.2 DESCR
--- pkg/DESCR 14 Mar 2017 10:34:14 -0000 1.2
+++ pkg/DESCR 18 May 2019 19:59:29 -0000
@@ -1,3 +1,16 @@
ARandR is designed to provide a simple visual front end for XRandR.
Relative monitor positions are shown graphically and can be changed in a
drag-and-drop way.
+
+Features
+--------
+
+* Full control over output positioning
+ (instead of plain "left of") with edge snapping
+* Saving configurations as executable shell scripts
+ (configurations can be loaded without using this program)
+* Configuration files can be edited to include additional payload
+ (like xsetwacom_ commands tablet PC users need when rotating),
+ which is preserved when editing
+* Main widget separated from packaged application
+ (to facilitate integration with existing solutions)
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/arandr/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST
--- pkg/PLIST 27 Jun 2018 21:04:07 -0000 1.4
+++ pkg/PLIST 18 May 2019 19:56:27 -0000
@@ -4,32 +4,38 @@ bin/unxrandr
lib/python${MODPY_VERSION}/site-packages/arandr-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
lib/python${MODPY_VERSION}/site-packages/screenlayout/
lib/python${MODPY_VERSION}/site-packages/screenlayout/__init__.py
-lib/python${MODPY_VERSION}/site-packages/screenlayout/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/screenlayout/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/screenlayout/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/screenlayout/${MODPY_PYCACHE}auxiliary.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/screenlayout/${MODPY_PYCACHE}demo.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/screenlayout/${MODPY_PYCACHE}gui.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/screenlayout/${MODPY_PYCACHE}i18n.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/screenlayout/${MODPY_PYCACHE}meta.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/screenlayout/${MODPY_PYCACHE}snap.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/screenlayout/${MODPY_PYCACHE}widget.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/screenlayout/${MODPY_PYCACHE}xrandr.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/screenlayout/auxiliary.py
-lib/python${MODPY_VERSION}/site-packages/screenlayout/auxiliary.pyc
lib/python${MODPY_VERSION}/site-packages/screenlayout/data/
lib/python${MODPY_VERSION}/site-packages/screenlayout/data/gpl-3.txt
lib/python${MODPY_VERSION}/site-packages/screenlayout/demo.py
-lib/python${MODPY_VERSION}/site-packages/screenlayout/demo.pyc
lib/python${MODPY_VERSION}/site-packages/screenlayout/gui.py
-lib/python${MODPY_VERSION}/site-packages/screenlayout/gui.pyc
+lib/python${MODPY_VERSION}/site-packages/screenlayout/i18n.py
lib/python${MODPY_VERSION}/site-packages/screenlayout/meta.py
-lib/python${MODPY_VERSION}/site-packages/screenlayout/meta.pyc
-lib/python${MODPY_VERSION}/site-packages/screenlayout/metacity.py
-lib/python${MODPY_VERSION}/site-packages/screenlayout/metacity.pyc
lib/python${MODPY_VERSION}/site-packages/screenlayout/snap.py
-lib/python${MODPY_VERSION}/site-packages/screenlayout/snap.pyc
lib/python${MODPY_VERSION}/site-packages/screenlayout/widget.py
-lib/python${MODPY_VERSION}/site-packages/screenlayout/widget.pyc
lib/python${MODPY_VERSION}/site-packages/screenlayout/xrandr.py
-lib/python${MODPY_VERSION}/site-packages/screenlayout/xrandr.pyc
@man man/man1/arandr.1
@man man/man1/unxrandr.1
share/applications/arandr.desktop
share/locale/ar/LC_MESSAGES/arandr.mo
+share/locale/br/
+share/locale/br/LC_MESSAGES/
share/locale/br/LC_MESSAGES/arandr.mo
share/locale/bs/LC_MESSAGES/arandr.mo
share/locale/ca/LC_MESSAGES/arandr.mo
+share/locale/ckb/
+share/locale/ckb/LC_MESSAGES/
+share/locale/ckb/LC_MESSAGES/arandr.mo
share/locale/cs/LC_MESSAGES/arandr.mo
share/locale/da/LC_MESSAGES/arandr.mo
share/locale/de/LC_MESSAGES/arandr.mo
@@ -37,9 +43,12 @@ share/locale/el/LC_MESSAGES/arandr.mo
share/locale/es/LC_MESSAGES/arandr.mo
share/locale/et/LC_MESSAGES/arandr.mo
share/locale/fa/LC_MESSAGES/arandr.mo
+share/locale/fi/LC_MESSAGES/arandr.mo
share/locale/fr/LC_MESSAGES/arandr.mo
share/locale/gl/LC_MESSAGES/arandr.mo
+share/locale/he/LC_MESSAGES/arandr.mo
share/locale/hu/LC_MESSAGES/arandr.mo
+share/locale/id/LC_MESSAGES/arandr.mo
share/locale/it/LC_MESSAGES/arandr.mo
share/locale/ja/LC_MESSAGES/arandr.mo
share/locale/kn/LC_MESSAGES/arandr.mo
@@ -47,6 +56,9 @@ share/locale/ko_KR/
share/locale/ko_KR/LC_MESSAGES/
share/locale/ko_KR/LC_MESSAGES/arandr.mo
share/locale/lt/LC_MESSAGES/arandr.mo
+share/locale/nb_NO/
+share/locale/nb_NO/LC_MESSAGES/
+share/locale/nb_NO/LC_MESSAGES/arandr.mo
share/locale/nl/LC_MESSAGES/arandr.mo
share/locale/pl/LC_MESSAGES/arandr.mo
share/locale/pt_BR/LC_MESSAGES/arandr.mo
@@ -63,3 +75,6 @@ share/locale/tr/LC_MESSAGES/arandr.mo
share/locale/uk/LC_MESSAGES/arandr.mo
share/locale/zh_CN/LC_MESSAGES/arandr.mo
@tag update-desktop-database
+share/locale/zh_Hant/
+share/locale/zh_Hant/LC_MESSAGES/
+share/locale/zh_Hant/LC_MESSAGES/arandr.mo