Re: UPDATE: fonts/terminus-font to 4.46

2017-08-04 Thread LÉVAI Dániel 
Stuart Henderson @ 2017-08-04T14:05:18 +0200:
> On 2017/07/31 14:28, Kaashif Hymabaccus wrote:
> > On Mon, Jul 31, 2017 at 10:14:39AM +0100, Stuart Henderson wrote:
> > > MODULES +=lang/python
> > > MODPY_VERSION =   ${MODPY_DEFAULT_VERSION_3}
> > > MODPY_RUNDEP =No
> > > MAKE_FLAGS =  INT=${MODPY_BIN}
> > > 
> > > > -@comment share/fonts/terminus/ter-x12b.pcf.gz
> > > > +share/fonts/terminus/ter-x12b.pcf.gz
> > > 
> > > This @comment was intentional, nothing changed regarding this font
> > > (6x12 bold - see r1.2 of the ports Makefile).
> > 
> > Thanks for the improvements. See below for the improved diff.
> > 
> > > The other question is whether anyone needs the X11 8-bit fonts that
> > > weren't removed but stopped being installed by default with this
> > > update.
> > 
> > I don't know about this. If anyone uses them, they can reply to this
> > mail, I suppose.
> 
> Turns out I *was* using ter-112n which was removed by this. It took me
> a few days to reboot and notice that xstatbar wasn't displaying, then
> a bit longer to figure out why... I'm sure I'm not the only one, so
> here's a modified diff which re-adds them.
> 
> Is this ok with you Daniel?

Yes, and thanks guys so much for taking care of this, while I was
slacking!


Daniel

Re: UPDATE: fonts/terminus-font to 4.46

2017-08-04 Thread Stuart Henderson 
On 2017/07/31 14:28, Kaashif Hymabaccus wrote:
> On Mon, Jul 31, 2017 at 10:14:39AM +0100, Stuart Henderson wrote:
> > MODULES +=  lang/python
> > MODPY_VERSION = ${MODPY_DEFAULT_VERSION_3}
> > MODPY_RUNDEP =  No
> > MAKE_FLAGS =INT=${MODPY_BIN}
> > 
> > > -@comment share/fonts/terminus/ter-x12b.pcf.gz
> > > +share/fonts/terminus/ter-x12b.pcf.gz
> > 
> > This @comment was intentional, nothing changed regarding this font
> > (6x12 bold - see r1.2 of the ports Makefile).
> 
> Thanks for the improvements. See below for the improved diff.
> 
> > The other question is whether anyone needs the X11 8-bit fonts that
> > weren't removed but stopped being installed by default with this
> > update.
> 
> I don't know about this. If anyone uses them, they can reply to this
> mail, I suppose.

Turns out I *was* using ter-112n which was removed by this. It took me
a few days to reboot and notice that xstatbar wasn't displaying, then
a bit longer to figure out why... I'm sure I'm not the only one, so
here's a modified diff which re-adds them.

Is this ok with you Daniel?

Index: Makefile
===
RCS file: /cvs/ports/fonts/terminus-font/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- Makefile24 Apr 2016 15:44:32 -  1.11
+++ Makefile4 Aug 2017 12:05:03 -
@@ -2,8 +2,7 @@
 
 COMMENT =  fixed width fonts especially for long hacking sessions
 
-DISTNAME = terminus-font-4.40
-REVISION = 0
+DISTNAME = terminus-font-4.46
 CATEGORIES =   fonts x11
 
 HOMEPAGE = http://terminus-font.sourceforge.net/
@@ -15,11 +14,16 @@ PERMIT_PACKAGE_CDROM =  Yes
 
 MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=terminus-font/}
 
+MODULES += lang/python
+MODPY_VERSION =${MODPY_DEFAULT_VERSION_3}
+MODPY_RUNDEP = No
+MAKE_FLAGS =   INT=${MODPY_BIN}
+
 CONFIGURE_STYLE =  simple
 NO_TEST =  Yes
 USE_X11 =  Yes
 
-ALL_TARGET =   pcf
+ALL_TARGET =   pcf pcf-8bit
 
 FONTDIR =  ${PREFIX}/share/fonts/terminus
 
Index: distinfo
===
RCS file: /cvs/ports/fonts/terminus-font/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo13 Nov 2015 20:18:25 -  1.5
+++ distinfo4 Aug 2017 12:05:03 -
@@ -1,2 +1,2 @@
-SHA256 (terminus-font-4.40.tar.gz) = 
ZPUsJNPxweOfIebEMHepvj4h1DhPF29XZsAFWLpnBxE=
-SIZE (terminus-font-4.40.tar.gz) = 558440
+SHA256 (terminus-font-4.46.tar.gz) = 
TilDPlaZt23x9cmpbxIozM+OqKFnkc/vBj8rhQbHW80=
+SIZE (terminus-font-4.46.tar.gz) = 590210
Index: pkg/PLIST
===
RCS file: /cvs/ports/fonts/terminus-font/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- pkg/PLIST   31 Mar 2015 09:45:11 -  1.3
+++ pkg/PLIST   4 Aug 2017 12:05:03 -
@@ -165,6 +165,24 @@ share/fonts/terminus/ter-g28b.pcf.gz
 share/fonts/terminus/ter-g28n.pcf.gz
 share/fonts/terminus/ter-g32b.pcf.gz
 share/fonts/terminus/ter-g32n.pcf.gz
+@comment share/fonts/terminus/ter-i12b.pcf.gz
+share/fonts/terminus/ter-i12n.pcf.gz
+share/fonts/terminus/ter-i14b.pcf.gz
+share/fonts/terminus/ter-i14n.pcf.gz
+share/fonts/terminus/ter-i16b.pcf.gz
+share/fonts/terminus/ter-i16n.pcf.gz
+share/fonts/terminus/ter-i18b.pcf.gz
+share/fonts/terminus/ter-i18n.pcf.gz
+share/fonts/terminus/ter-i20b.pcf.gz
+share/fonts/terminus/ter-i20n.pcf.gz
+share/fonts/terminus/ter-i22b.pcf.gz
+share/fonts/terminus/ter-i22n.pcf.gz
+share/fonts/terminus/ter-i24b.pcf.gz
+share/fonts/terminus/ter-i24n.pcf.gz
+share/fonts/terminus/ter-i28b.pcf.gz
+share/fonts/terminus/ter-i28n.pcf.gz
+share/fonts/terminus/ter-i32b.pcf.gz
+share/fonts/terminus/ter-i32n.pcf.gz
 @comment share/fonts/terminus/ter-k12b.pcf.gz
 share/fonts/terminus/ter-k12n.pcf.gz
 share/fonts/terminus/ter-k14b.pcf.gz

Re: UPDATE: fonts/terminus-font to 4.46

2017-07-31 Thread Kaashif Hymabaccus 
On Mon, Jul 31, 2017 at 10:14:39AM +0100, Stuart Henderson wrote:
> MODULES +=lang/python
> MODPY_VERSION =   ${MODPY_DEFAULT_VERSION_3}
> MODPY_RUNDEP =No
> MAKE_FLAGS =  INT=${MODPY_BIN}
> 
> > -@comment share/fonts/terminus/ter-x12b.pcf.gz
> > +share/fonts/terminus/ter-x12b.pcf.gz
> 
> This @comment was intentional, nothing changed regarding this font
> (6x12 bold - see r1.2 of the ports Makefile).

Thanks for the improvements. See below for the improved diff.

> The other question is whether anyone needs the X11 8-bit fonts that
> weren't removed but stopped being installed by default with this
> update.

I don't know about this. If anyone uses them, they can reply to this
mail, I suppose. I would imagine that if there was significant demand,
the operating systems with version 4.46 (e.g. Gentoo, Arch Linux)
would have felt it, I haven't seen anything on forums or mailing lists
to indicate that. But I welcome any users telling me otherwise.

diff --git Makefile Makefile
index 5c90bfac485..744262e9494 100644
--- Makefile
+++ Makefile
@@ -2,8 +2,7 @@
 
 COMMENT =  fixed width fonts especially for long hacking sessions
 
-DISTNAME = terminus-font-4.40
-REVISION = 0
+DISTNAME = terminus-font-4.46
 CATEGORIES =   fonts x11
 
 HOMEPAGE = http://terminus-font.sourceforge.net/
@@ -15,6 +14,12 @@ PERMIT_PACKAGE_CDROM =   Yes
 
 MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=terminus-font/}
 
+MODULES += lang/python
+MODPY_VERSION =${MODPY_DEFAULT_VERSION_3}
+MODPY_RUNDEP = No
+
+MAKE_FLAGS =   INT=${MODPY_BIN}
+
 CONFIGURE_STYLE =  simple
 NO_TEST =  Yes
 USE_X11 =  Yes
diff --git distinfo distinfo
index 32558fe77d6..7165a0fe236 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (terminus-font-4.40.tar.gz) = 
ZPUsJNPxweOfIebEMHepvj4h1DhPF29XZsAFWLpnBxE=
-SIZE (terminus-font-4.40.tar.gz) = 558440
+SHA256 (terminus-font-4.46.tar.gz) = 
TilDPlaZt23x9cmpbxIozM+OqKFnkc/vBj8rhQbHW80=
+SIZE (terminus-font-4.46.tar.gz) = 590210
diff --git pkg/PLIST pkg/PLIST
index 7d077b84793..5aa928f1767 100644
--- pkg/PLIST
+++ pkg/PLIST
@@ -3,222 +3,6 @@
 share/fonts/
 @fontdir share/fonts/terminus/
 share/fonts/terminus/fonts.alias-terminus
-@comment share/fonts/terminus/ter-112b.pcf.gz
-share/fonts/terminus/ter-112n.pcf.gz
-share/fonts/terminus/ter-114b.pcf.gz
-share/fonts/terminus/ter-114n.pcf.gz
-share/fonts/terminus/ter-116b.pcf.gz
-share/fonts/terminus/ter-116n.pcf.gz
-share/fonts/terminus/ter-118b.pcf.gz
-share/fonts/terminus/ter-118n.pcf.gz
-share/fonts/terminus/ter-120b.pcf.gz
-share/fonts/terminus/ter-120n.pcf.gz
-share/fonts/terminus/ter-122b.pcf.gz
-share/fonts/terminus/ter-122n.pcf.gz
-share/fonts/terminus/ter-124b.pcf.gz
-share/fonts/terminus/ter-124n.pcf.gz
-share/fonts/terminus/ter-128b.pcf.gz
-share/fonts/terminus/ter-128n.pcf.gz
-share/fonts/terminus/ter-132b.pcf.gz
-share/fonts/terminus/ter-132n.pcf.gz
-@comment share/fonts/terminus/ter-212b.pcf.gz
-share/fonts/terminus/ter-212n.pcf.gz
-share/fonts/terminus/ter-214b.pcf.gz
-share/fonts/terminus/ter-214n.pcf.gz
-share/fonts/terminus/ter-216b.pcf.gz
-share/fonts/terminus/ter-216n.pcf.gz
-share/fonts/terminus/ter-218b.pcf.gz
-share/fonts/terminus/ter-218n.pcf.gz
-share/fonts/terminus/ter-220b.pcf.gz
-share/fonts/terminus/ter-220n.pcf.gz
-share/fonts/terminus/ter-222b.pcf.gz
-share/fonts/terminus/ter-222n.pcf.gz
-share/fonts/terminus/ter-224b.pcf.gz
-share/fonts/terminus/ter-224n.pcf.gz
-share/fonts/terminus/ter-228b.pcf.gz
-share/fonts/terminus/ter-228n.pcf.gz
-share/fonts/terminus/ter-232b.pcf.gz
-share/fonts/terminus/ter-232n.pcf.gz
-@comment share/fonts/terminus/ter-512b.pcf.gz
-share/fonts/terminus/ter-512n.pcf.gz
-share/fonts/terminus/ter-514b.pcf.gz
-share/fonts/terminus/ter-514n.pcf.gz
-share/fonts/terminus/ter-516b.pcf.gz
-share/fonts/terminus/ter-516n.pcf.gz
-share/fonts/terminus/ter-518b.pcf.gz
-share/fonts/terminus/ter-518n.pcf.gz
-share/fonts/terminus/ter-520b.pcf.gz
-share/fonts/terminus/ter-520n.pcf.gz
-share/fonts/terminus/ter-522b.pcf.gz
-share/fonts/terminus/ter-522n.pcf.gz
-share/fonts/terminus/ter-524b.pcf.gz
-share/fonts/terminus/ter-524n.pcf.gz
-share/fonts/terminus/ter-528b.pcf.gz
-share/fonts/terminus/ter-528n.pcf.gz
-share/fonts/terminus/ter-532b.pcf.gz
-share/fonts/terminus/ter-532n.pcf.gz
-@comment share/fonts/terminus/ter-712b.pcf.gz
-share/fonts/terminus/ter-712n.pcf.gz
-share/fonts/terminus/ter-714b.pcf.gz
-share/fonts/terminus/ter-714n.pcf.gz
-share/fonts/terminus/ter-716b.pcf.gz
-share/fonts/terminus/ter-716n.pcf.gz
-share/fonts/terminus/ter-718b.pcf.gz
-share/fonts/terminus/ter-718n.pcf.gz
-share/fonts/terminus/ter-720b.pcf.gz
-share/fonts/terminus/ter-720n.pcf.gz
-share/fonts/terminus/ter-722b.pcf.gz
-share/fonts/terminus/ter-722n.pcf.gz
-share/fonts/terminus/ter-724b.pcf.gz
-share/fonts/terminus/ter-724n.pcf.gz

Re: UPDATE: fonts/terminus-font to 4.46

2017-07-31 Thread Stuart Henderson 
On 2017/07/30 15:51, Kaashif Hymabaccus wrote:
> Attached is a patch which brings terminus-font to 4.46.
> 
> Changes to the port:
> 
> * The build scripts are now written in Python, not Perl
> * A lot of obsolete fonts disappeared
> 
> The upstream changelog entry is here:
> http://terminus-font.sourceforge.net/
> 
> The font still works for me. I saw this from last year:
> 
> http://marc.info/?l=openbsd-ports=147301603413582=2
> 
> Is there still interest in those flavors? Would they be OKed?  There
> are quite a few optional patches upstream, but providing FLAVORs for
> so many of them seems excessive (unless there is demand for it).

I'd be ok with packaging more variants, but we'd need a reasonable set
of combinations to link to the build in fonts/Makefile (and the following
mails in that thread about names still apply).

That's a separate diff than the update though.

> +BUILD_DEPENDS =  lang/python/3.6
> +
> +MAKE_FLAGS = INT=python3.6
> +

Use this instead:

MODULES +=  lang/python
MODPY_VERSION = ${MODPY_DEFAULT_VERSION_3}
MODPY_RUNDEP =  No
MAKE_FLAGS =INT=${MODPY_BIN}

> -@comment share/fonts/terminus/ter-x12b.pcf.gz
> +share/fonts/terminus/ter-x12b.pcf.gz

This @comment was intentional, nothing changed regarding this font
(6x12 bold - see r1.2 of the ports Makefile).

The other question is whether anyone needs the X11 8-bit fonts that
weren't removed but stopped being installed by default with this update.

UPDATE: fonts/terminus-font to 4.46

2017-07-30 Thread Kaashif Hymabaccus 
Hello ports@,

Attached is a patch which brings terminus-font to 4.46.

Changes to the port:

* The build scripts are now written in Python, not Perl
* A lot of obsolete fonts disappeared

The upstream changelog entry is here:
http://terminus-font.sourceforge.net/

The font still works for me. I saw this from last year:

http://marc.info/?l=openbsd-ports=147301603413582=2

Is there still interest in those flavors? Would they be OKed?  There
are quite a few optional patches upstream, but providing FLAVORs for
so many of them seems excessive (unless there is demand for it).

diff --git Makefile Makefile
index 5c90bfac485..fd40875c47a 100644
--- Makefile
+++ Makefile
@@ -2,8 +2,7 @@
 
 COMMENT =  fixed width fonts especially for long hacking sessions
 
-DISTNAME = terminus-font-4.40
-REVISION = 0
+DISTNAME = terminus-font-4.46
 CATEGORIES =   fonts x11
 
 HOMEPAGE = http://terminus-font.sourceforge.net/
@@ -15,6 +14,10 @@ PERMIT_PACKAGE_CDROM =   Yes
 
 MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=terminus-font/}
 
+BUILD_DEPENDS =lang/python/3.6
+
+MAKE_FLAGS =   INT=python3.6
+
 CONFIGURE_STYLE =  simple
 NO_TEST =  Yes
 USE_X11 =  Yes
diff --git distinfo distinfo
index 32558fe77d6..7165a0fe236 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (terminus-font-4.40.tar.gz) = 
ZPUsJNPxweOfIebEMHepvj4h1DhPF29XZsAFWLpnBxE=
-SIZE (terminus-font-4.40.tar.gz) = 558440
+SHA256 (terminus-font-4.46.tar.gz) = 
TilDPlaZt23x9cmpbxIozM+OqKFnkc/vBj8rhQbHW80=
+SIZE (terminus-font-4.46.tar.gz) = 590210
diff --git pkg/PLIST pkg/PLIST
index 7d077b84793..be286eb699d 100644
--- pkg/PLIST
+++ pkg/PLIST
@@ -3,223 +3,7 @@
 share/fonts/
 @fontdir share/fonts/terminus/
 share/fonts/terminus/fonts.alias-terminus
-@comment share/fonts/terminus/ter-112b.pcf.gz
-share/fonts/terminus/ter-112n.pcf.gz
-share/fonts/terminus/ter-114b.pcf.gz
-share/fonts/terminus/ter-114n.pcf.gz
-share/fonts/terminus/ter-116b.pcf.gz
-share/fonts/terminus/ter-116n.pcf.gz
-share/fonts/terminus/ter-118b.pcf.gz
-share/fonts/terminus/ter-118n.pcf.gz
-share/fonts/terminus/ter-120b.pcf.gz
-share/fonts/terminus/ter-120n.pcf.gz
-share/fonts/terminus/ter-122b.pcf.gz
-share/fonts/terminus/ter-122n.pcf.gz
-share/fonts/terminus/ter-124b.pcf.gz
-share/fonts/terminus/ter-124n.pcf.gz
-share/fonts/terminus/ter-128b.pcf.gz
-share/fonts/terminus/ter-128n.pcf.gz
-share/fonts/terminus/ter-132b.pcf.gz
-share/fonts/terminus/ter-132n.pcf.gz
-@comment share/fonts/terminus/ter-212b.pcf.gz
-share/fonts/terminus/ter-212n.pcf.gz
-share/fonts/terminus/ter-214b.pcf.gz
-share/fonts/terminus/ter-214n.pcf.gz
-share/fonts/terminus/ter-216b.pcf.gz
-share/fonts/terminus/ter-216n.pcf.gz
-share/fonts/terminus/ter-218b.pcf.gz
-share/fonts/terminus/ter-218n.pcf.gz
-share/fonts/terminus/ter-220b.pcf.gz
-share/fonts/terminus/ter-220n.pcf.gz
-share/fonts/terminus/ter-222b.pcf.gz
-share/fonts/terminus/ter-222n.pcf.gz
-share/fonts/terminus/ter-224b.pcf.gz
-share/fonts/terminus/ter-224n.pcf.gz
-share/fonts/terminus/ter-228b.pcf.gz
-share/fonts/terminus/ter-228n.pcf.gz
-share/fonts/terminus/ter-232b.pcf.gz
-share/fonts/terminus/ter-232n.pcf.gz
-@comment share/fonts/terminus/ter-512b.pcf.gz
-share/fonts/terminus/ter-512n.pcf.gz
-share/fonts/terminus/ter-514b.pcf.gz
-share/fonts/terminus/ter-514n.pcf.gz
-share/fonts/terminus/ter-516b.pcf.gz
-share/fonts/terminus/ter-516n.pcf.gz
-share/fonts/terminus/ter-518b.pcf.gz
-share/fonts/terminus/ter-518n.pcf.gz
-share/fonts/terminus/ter-520b.pcf.gz
-share/fonts/terminus/ter-520n.pcf.gz
-share/fonts/terminus/ter-522b.pcf.gz
-share/fonts/terminus/ter-522n.pcf.gz
-share/fonts/terminus/ter-524b.pcf.gz
-share/fonts/terminus/ter-524n.pcf.gz
-share/fonts/terminus/ter-528b.pcf.gz
-share/fonts/terminus/ter-528n.pcf.gz
-share/fonts/terminus/ter-532b.pcf.gz
-share/fonts/terminus/ter-532n.pcf.gz
-@comment share/fonts/terminus/ter-712b.pcf.gz
-share/fonts/terminus/ter-712n.pcf.gz
-share/fonts/terminus/ter-714b.pcf.gz
-share/fonts/terminus/ter-714n.pcf.gz
-share/fonts/terminus/ter-716b.pcf.gz
-share/fonts/terminus/ter-716n.pcf.gz
-share/fonts/terminus/ter-718b.pcf.gz
-share/fonts/terminus/ter-718n.pcf.gz
-share/fonts/terminus/ter-720b.pcf.gz
-share/fonts/terminus/ter-720n.pcf.gz
-share/fonts/terminus/ter-722b.pcf.gz
-share/fonts/terminus/ter-722n.pcf.gz
-share/fonts/terminus/ter-724b.pcf.gz
-share/fonts/terminus/ter-724n.pcf.gz
-share/fonts/terminus/ter-728b.pcf.gz
-share/fonts/terminus/ter-728n.pcf.gz
-share/fonts/terminus/ter-732b.pcf.gz
-share/fonts/terminus/ter-732n.pcf.gz
-@comment share/fonts/terminus/ter-912b.pcf.gz
-share/fonts/terminus/ter-912n.pcf.gz
-share/fonts/terminus/ter-914b.pcf.gz
-share/fonts/terminus/ter-914n.pcf.gz
-share/fonts/terminus/ter-916b.pcf.gz
-share/fonts/terminus/ter-916n.pcf.gz
-share/fonts/terminus/ter-918b.pcf.gz
-share/fonts/terminus/ter-918n.pcf.gz
-share/fonts/terminus/ter-920b.pcf.gz