Re: UPDATE: fonts/terminus-font

2023-05-06 Thread Stuart Henderson 
Since terminus now has its own build infrastructure to produce otb
fonts, we should probably use it.

Index: Makefile
===
RCS file: /cvs/ports/fonts/terminus-font/Makefile,v
retrieving revision 1.23
diff -u -p -r1.23 Makefile
--- Makefile5 May 2023 02:02:46 -   1.23
+++ Makefile6 May 2023 17:00:08 -
@@ -1,6 +1,7 @@
 COMMENT =  fixed width fonts especially for long hacking sessions
 
 DISTNAME = terminus-font-4.49.1
+REVISION = 0
 CATEGORIES =   fonts x11
 
 HOMEPAGE = http://terminus-font.sourceforge.net/
@@ -20,7 +21,7 @@ CONFIGURE_STYLE = simple
 NO_TEST =  Yes
 USE_X11 =  Yes
 
-ALL_TARGET =   pcf pcf-8bit raw
+ALL_TARGET =   pcf pcf-8bit raw otb
 
 FONTDIR =  ${PREFIX}/share/fonts/terminus
 
@@ -42,10 +43,6 @@ PATCH_LIST = patch-* ${FLAVOR_PATCHES}
 PKG_ARCH = *
 
 post-build:
-   cd ${WRKSRC} && \
-   for bdf in ter-u???.bdf; do \
-   ${X11BASE}/bin/fonttosfnt -o `basename $$bdf .bdf`.otb $$bdf; \
-   done
${GZIP_CMD} ${WRKSRC}/*.pcf
 
 do-install:
Index: pkg/PLIST
===
RCS file: /cvs/ports/fonts/terminus-font/pkg/PLIST,v
retrieving revision 1.7
diff -u -p -r1.7 PLIST
--- pkg/PLIST   11 Mar 2022 19:00:27 -  1.7
+++ pkg/PLIST   6 May 2023 17:00:08 -
@@ -227,12 +227,10 @@ share/fonts/terminus/ter-u14b.otb
 share/fonts/terminus/ter-u14b.pcf.gz
 share/fonts/terminus/ter-u14n.otb
 share/fonts/terminus/ter-u14n.pcf.gz
-share/fonts/terminus/ter-u14v.otb
 share/fonts/terminus/ter-u16b.otb
 share/fonts/terminus/ter-u16b.pcf.gz
 share/fonts/terminus/ter-u16n.otb
 share/fonts/terminus/ter-u16n.pcf.gz
-share/fonts/terminus/ter-u16v.otb
 share/fonts/terminus/ter-u18b.otb
 share/fonts/terminus/ter-u18b.pcf.gz
 share/fonts/terminus/ter-u18n.otb

Re: UPDATE: fonts/terminus-font

2023-05-04 Thread Greg Steuck 
"Lévai, Dániel"  writes:

> Hi all,
>
> Attached is an update to the terminus font.
> Seems trivial enough, but couldn't test the raw fonts, though.

Thanks Dániel.

I also tested this with xterm, OK gnezdo

> Daniel
>
> diff --git a/fonts/terminus-font/Makefile b/fonts/terminus-font/Makefile
> index 85f77379aa2..02b0d9c905c 100644
> --- a/fonts/terminus-font/Makefile
> +++ b/fonts/terminus-font/Makefile
> @@ -1,8 +1,7 @@
>  COMMENT =fixed width fonts especially for long hacking sessions
>  
> -DISTNAME =   terminus-font-4.47
> +DISTNAME =   terminus-font-4.49.1
>  CATEGORIES = fonts x11
> -REVISION =   2
>  
>  HOMEPAGE =   http://terminus-font.sourceforge.net/
>  
> diff --git a/fonts/terminus-font/distinfo b/fonts/terminus-font/distinfo
> index bd5cd476f23..9f3fec6d0ad 100644
> --- a/fonts/terminus-font/distinfo
> +++ b/fonts/terminus-font/distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (terminus-font-4.47.tar.gz) = 
> DxsgWIjk4mqUh490a4Vmplw+N0KzPPmk5lF2RtVlEpc=
> -SIZE (terminus-font-4.47.tar.gz) = 620344
> +SHA256 (terminus-font-4.49.1.tar.gz) = 
> 2WHBt4Fie/QX+bNAaT1k/CGeAROtOjrxo0JMeqNz73k=
> +SIZE (terminus-font-4.49.1.tar.gz) = 648345
> diff --git a/fonts/terminus-font/patches/patch-Makefile 
> b/fonts/terminus-font/patches/patch-Makefile
> index 9a6b5879053..1ba6dbd7e2a 100644
> --- a/fonts/terminus-font/patches/patch-Makefile
> +++ b/fonts/terminus-font/patches/patch-Makefile
> @@ -8,12 +8,12 @@ Index: Makefile
>   UCS2ANY = $(INT) $(BIN)/ucstoany.$(EXT)
>   BDF2PSF = $(INT) $(BIN)/bdftopsf.$(EXT)
>  +BDF2RAW = $(INT) $(BIN)/bdftopsf.$(EXT) -r
> - UCS2X11 = $(INT) $(BIN)/ucstoany.$(EXT) -f
> - BDF2PCF = bdftopcf
> - 
> -@@ -56,6 +57,11 @@ PSF_VGAW_KOI8_UV = ter-u14v.psf ter-u16v.psf
> + UCS2X11 = $(INT) $(BIN)/ucstoany.$(EXT) -f
> + BDF2PCF = bdftopcf
> + #BDF2OTB = fontforge -lang=ff -c 'Open($$3); ScaleToEm(1024); Generate($$2)'
> +@@ -61,6 +62,11 @@ PSF_VGAW_KOI8_UV = ter-u14v.psf ter-u16v.psf
>   PSF_VGAW_XOS4_2  = ter-v14v.psf ter-v16v.psf
> - PSF_VGAW = $(PSF_VGAW_8859_1) $(PSF_VGAW_8859_2) $(PSF_VGAW_8859_7) 
> $(PSF_VGAW_8859_9) $(PSF_VGAW_MS_1251) $(PSF_VGAW_8859_13) 
> $(PSF_VGAW_8859_16) $(PSF_VGAW_IBM_437) $(PSF_VGAW_KOI8_RV) 
> $(PSF_VGAW_BG_MIK) $(PSF_VGAW_PT_154) $(PSF_VGAW_KOI8_UV) $(PSF_VGAW_XOS4_2)
> + PSF_VGAW = $(PSF_VGAW_8859_1) $(PSF_VGAW_8859_2) $(PSF_VGAW_8859_7) 
> $(PSF_VGAW_8859_9) $(PSF_VGAW_MS_1251) $(PSF_VGAW_8859_13) 
> $(PSF_VGAW_8859_16) $(PSF_VGAW_MS_1255) $(PSF_VGAW_IBM_437) 
> $(PSF_VGAW_KOI8_RV) $(PSF_VGAW_BG_MIK) $(PSF_VGAW_PT_154) $(PSF_VGAW_KOI8_UV) 
> $(PSF_VGAW_XOS4_2)
>   
>  +RAW_8859_1  = $(subst .psf,.raw,$(PSF_8859_1))
>  +RAW_VGAW_8859_1  = $(subst .psf,.raw,$(PSF_VGAW_8859_1))
> @@ -23,7 +23,7 @@ Index: Makefile
>   PCF_8859_1  = ter-112n.pcf ter-112b.pcf ter-114n.pcf ter-114b.pcf 
> ter-116n.pcf ter-116b.pcf ter-118n.pcf ter-118b.pcf ter-120n.pcf ter-120b.pcf 
> ter-122n.pcf ter-122b.pcf ter-124n.pcf ter-124b.pcf ter-128n.pcf ter-128b.pcf 
> ter-132n.pcf ter-132b.pcf
>   PCF_8859_2  = ter-212n.pcf ter-212b.pcf ter-214n.pcf ter-214b.pcf 
> ter-216n.pcf ter-216b.pcf ter-218n.pcf ter-218b.pcf ter-220n.pcf ter-220b.pcf 
> ter-222n.pcf ter-222b.pcf ter-224n.pcf ter-224b.pcf ter-228n.pcf ter-228b.pcf 
> ter-232n.pcf ter-232b.pcf
>   PCF_8859_5  = ter-512n.pcf ter-512b.pcf ter-514n.pcf ter-514b.pcf 
> ter-516n.pcf ter-516b.pcf ter-518n.pcf ter-518b.pcf ter-520n.pcf ter-520b.pcf 
> ter-522n.pcf ter-522b.pcf ter-524n.pcf ter-524b.pcf ter-528n.pcf ter-528b.pcf 
> ter-532n.pcf ter-532b.pcf
> -@@ -131,6 +137,9 @@ DUP_KOI8_UV = dup/cntrl.dup dup/ascii-h.dup dup/koi8.d
> +@@ -141,6 +147,9 @@ DUP_KOI8_UV = dup/cntrl.dup dup/ascii-h.dup dup/koi8.d
>   DUP_KOI8_U  = dup/cntrl.dup dup/ascii-h.dup dup/koi8.dup
>   DUP_XOS4_2  = dup/vgagr.dup dup/xos4-2.dup
>   
> @@ -33,7 +33,7 @@ Index: Makefile
>   $(PSF_8859_1) $(PSF_VGAW_8859_1): ter-1%.psf : ter-u%.bdf $(VGA_8859_1) 
> $(DUP_8859_1)
>   $(UCS2ANY) $< $(REG_8859_1) $(VGA_8859_1) | $(BDF2PSF) -o $@ 
> $(DUP_8859_1)
>   
> -@@ -202,6 +211,8 @@ install-psf-ref: README
> +@@ -215,6 +224,8 @@ install-psf-ref: README
>   
>   uninstall-psf-ref:
>   rm -f $(DESTDIR)$(psfref)

UPDATE: fonts/terminus-font

2023-05-04 Thread Lévai , Dániel 
Hi all,

Attached is an update to the terminus font.
Seems trivial enough, but couldn't test the raw fonts, though.

Danieldiff --git a/fonts/terminus-font/Makefile b/fonts/terminus-font/Makefile
index 85f77379aa2..02b0d9c905c 100644
--- a/fonts/terminus-font/Makefile
+++ b/fonts/terminus-font/Makefile
@@ -1,8 +1,7 @@
 COMMENT =		fixed width fonts especially for long hacking sessions
 
-DISTNAME =		terminus-font-4.47
+DISTNAME =		terminus-font-4.49.1
 CATEGORIES =		fonts x11
-REVISION =		2
 
 HOMEPAGE =		http://terminus-font.sourceforge.net/
 
diff --git a/fonts/terminus-font/distinfo b/fonts/terminus-font/distinfo
index bd5cd476f23..9f3fec6d0ad 100644
--- a/fonts/terminus-font/distinfo
+++ b/fonts/terminus-font/distinfo
@@ -1,2 +1,2 @@
-SHA256 (terminus-font-4.47.tar.gz) = DxsgWIjk4mqUh490a4Vmplw+N0KzPPmk5lF2RtVlEpc=
-SIZE (terminus-font-4.47.tar.gz) = 620344
+SHA256 (terminus-font-4.49.1.tar.gz) = 2WHBt4Fie/QX+bNAaT1k/CGeAROtOjrxo0JMeqNz73k=
+SIZE (terminus-font-4.49.1.tar.gz) = 648345
diff --git a/fonts/terminus-font/patches/patch-Makefile b/fonts/terminus-font/patches/patch-Makefile
index 9a6b5879053..1ba6dbd7e2a 100644
--- a/fonts/terminus-font/patches/patch-Makefile
+++ b/fonts/terminus-font/patches/patch-Makefile
@@ -8,12 +8,12 @@ Index: Makefile
  UCS2ANY = $(INT) $(BIN)/ucstoany.$(EXT)
  BDF2PSF = $(INT) $(BIN)/bdftopsf.$(EXT)
 +BDF2RAW = $(INT) $(BIN)/bdftopsf.$(EXT) -r
- UCS2X11	= $(INT) $(BIN)/ucstoany.$(EXT) -f
- BDF2PCF	= bdftopcf
- 
-@@ -56,6 +57,11 @@ PSF_VGAW_KOI8_UV = ter-u14v.psf ter-u16v.psf
+ UCS2X11 = $(INT) $(BIN)/ucstoany.$(EXT) -f
+ BDF2PCF = bdftopcf
+ #BDF2OTB = fontforge -lang=ff -c 'Open($$3); ScaleToEm(1024); Generate($$2)'
+@@ -61,6 +62,11 @@ PSF_VGAW_KOI8_UV = ter-u14v.psf ter-u16v.psf
  PSF_VGAW_XOS4_2  = ter-v14v.psf ter-v16v.psf
- PSF_VGAW = $(PSF_VGAW_8859_1) $(PSF_VGAW_8859_2) $(PSF_VGAW_8859_7) $(PSF_VGAW_8859_9) $(PSF_VGAW_MS_1251) $(PSF_VGAW_8859_13) $(PSF_VGAW_8859_16) $(PSF_VGAW_IBM_437) $(PSF_VGAW_KOI8_RV) $(PSF_VGAW_BG_MIK) $(PSF_VGAW_PT_154) $(PSF_VGAW_KOI8_UV) $(PSF_VGAW_XOS4_2)
+ PSF_VGAW = $(PSF_VGAW_8859_1) $(PSF_VGAW_8859_2) $(PSF_VGAW_8859_7) $(PSF_VGAW_8859_9) $(PSF_VGAW_MS_1251) $(PSF_VGAW_8859_13) $(PSF_VGAW_8859_16) $(PSF_VGAW_MS_1255) $(PSF_VGAW_IBM_437) $(PSF_VGAW_KOI8_RV) $(PSF_VGAW_BG_MIK) $(PSF_VGAW_PT_154) $(PSF_VGAW_KOI8_UV) $(PSF_VGAW_XOS4_2)
  
 +RAW_8859_1  = $(subst .psf,.raw,$(PSF_8859_1))
 +RAW_VGAW_8859_1  = $(subst .psf,.raw,$(PSF_VGAW_8859_1))
@@ -23,7 +23,7 @@ Index: Makefile
  PCF_8859_1  = ter-112n.pcf ter-112b.pcf ter-114n.pcf ter-114b.pcf ter-116n.pcf ter-116b.pcf ter-118n.pcf ter-118b.pcf ter-120n.pcf ter-120b.pcf ter-122n.pcf ter-122b.pcf ter-124n.pcf ter-124b.pcf ter-128n.pcf ter-128b.pcf ter-132n.pcf ter-132b.pcf
  PCF_8859_2  = ter-212n.pcf ter-212b.pcf ter-214n.pcf ter-214b.pcf ter-216n.pcf ter-216b.pcf ter-218n.pcf ter-218b.pcf ter-220n.pcf ter-220b.pcf ter-222n.pcf ter-222b.pcf ter-224n.pcf ter-224b.pcf ter-228n.pcf ter-228b.pcf ter-232n.pcf ter-232b.pcf
  PCF_8859_5  = ter-512n.pcf ter-512b.pcf ter-514n.pcf ter-514b.pcf ter-516n.pcf ter-516b.pcf ter-518n.pcf ter-518b.pcf ter-520n.pcf ter-520b.pcf ter-522n.pcf ter-522b.pcf ter-524n.pcf ter-524b.pcf ter-528n.pcf ter-528b.pcf ter-532n.pcf ter-532b.pcf
-@@ -131,6 +137,9 @@ DUP_KOI8_UV = dup/cntrl.dup dup/ascii-h.dup dup/koi8.d
+@@ -141,6 +147,9 @@ DUP_KOI8_UV = dup/cntrl.dup dup/ascii-h.dup dup/koi8.d
  DUP_KOI8_U  = dup/cntrl.dup dup/ascii-h.dup dup/koi8.dup
  DUP_XOS4_2  = dup/vgagr.dup dup/xos4-2.dup
  
@@ -33,7 +33,7 @@ Index: Makefile
  $(PSF_8859_1) $(PSF_VGAW_8859_1): ter-1%.psf : ter-u%.bdf $(VGA_8859_1) $(DUP_8859_1)
  	$(UCS2ANY) $< $(REG_8859_1) $(VGA_8859_1) | $(BDF2PSF) -o $@ $(DUP_8859_1)
  
-@@ -202,6 +211,8 @@ install-psf-ref: README
+@@ -215,6 +224,8 @@ install-psf-ref: README
  
  uninstall-psf-ref:
  	rm -f $(DESTDIR)$(psfref)

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

UPDATE: fonts/terminus-font

2014-05-08 Thread LEVAI Daniel 
Hi!

No-brainer update to 4.39.


Index: Makefile
===
RCS file: /cvs/ports/fonts/terminus-font/Makefile,v
retrieving revision 1.7
diff -u -p -p -u -r1.7 Makefile
--- Makefile11 Mar 2013 11:06:05 -  1.7
+++ Makefile8 May 2014 17:27:10 -
@@ -2,7 +2,7 @@
 
 COMMENT =  fixed width fonts especially for long hacking sessions
 
-DISTNAME = terminus-font-4.38
+DISTNAME = terminus-font-4.39
 CATEGORIES =   fonts x11
 
 HOMEPAGE = http://terminus-font.sourceforge.net/
@@ -40,9 +40,5 @@ do-install:
${INSTALL_DATA_DIR} ${FONTDIR}
${INSTALL_DATA} ${WRKSRC}/*.pcf.gz ${FONTDIR}
${INSTALL_DATA} ${WRKBUILD}/fonts.alias ${FONTDIR}/fonts.alias-terminus
-
-# XXX workaround for 4.38
-post-extract:
-   chmod a+x ${WRKSRC}/configure
 
 .include bsd.port.mk
Index: distinfo
===
RCS file: /cvs/ports/fonts/terminus-font/distinfo,v
retrieving revision 1.3
diff -u -p -p -u -r1.3 distinfo
--- distinfo13 Jul 2012 10:11:59 -  1.3
+++ distinfo8 May 2014 17:27:10 -
@@ -1,2 +1,2 @@
-SHA256 (terminus-font-4.38.tar.gz) = 
9vSHak2r5qN8Jwwgu54UHjj7UOC7ogDhudBHDl7tl7c=
-SIZE (terminus-font-4.38.tar.gz) = 316507
+SHA256 (terminus-font-4.39.tar.gz) = 
MQg4OYazZaS5zAjDGkGVGW9t6XTSc1139sbvqf6x9b8=
+SIZE (terminus-font-4.39.tar.gz) = 324890



Daniel

-- 
LÉVAI Dániel
PGP key ID = 0x83B63A8F
Key fingerprint = DBEC C66B A47A DFA2 792D  650C C69B BE4C 83B6 3A8F