UPDATE: fonts/dina-fonts

classic Classic list List threaded Threaded
14 messages Options
Reply | Threaded
Open this post in threaded view
|

UPDATE: fonts/dina-fonts

Rafael Sadowski
hey @ports,

dina font maintainer update. Okay?

Cheers, Rafael

Index: Makefile
===================================================================
RCS file: /cvs/ports/fonts/dina-fonts/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- Makefile 11 Mar 2013 11:06:05 -0000 1.3
+++ Makefile 29 Dec 2013 17:23:29 -0000
@@ -2,9 +2,9 @@
 
 COMMENT = monospace bitmap font, primarily aimed at programmers
 
-V = 2.89
+V = 2.92
 PKGNAME = dina-fonts-$V
-DISTNAME = dina-pcf-$V
+DISTNAME = Dina
 CATEGORIES = fonts
 
 HOMEPAGE = http://www.donationcoder.com/Software/Jibz/Dina/
@@ -12,21 +12,39 @@ HOMEPAGE = http://www.donationcoder.com
 MAINTAINER = Rafael Sadowski <[hidden email]>
 
 # FREE (c) Jorgen Ibsen (Though no license included in distribution)
-PERMIT_PACKAGE_CDROM = No
-PERMIT_PACKAGE_FTP = No
-PERMIT_DISTFILES_FTP = No
+PERMIT_PACKAGE_CDROM = No
+PERMIT_PACKAGE_FTP = No
+PERMIT_DISTFILES_FTP = No
 
-MASTER_SITES = http://ftp.fi.debian.org/gentoo/distfiles/
+EXTRACT_SUFX = .zip
+MASTER_SITES = http://www.donationcoder.com/Software/Jibz/Dina/downloads/
 
-NO_BUILD = Yes
-NO_TEST = Yes
+NO_BUILD = Yes
+NO_TEST = Yes
 USE_X11 = Yes
 
 FONTDIR= ${PREFIX}/lib/X11/fonts/dina
 
-WRKSRC = ${WRKDIR}/Dina-PCF
+WRKSRC = ${WRKDIST}/BDF
+
+do-extract:
+ mkdir -p ${WRKDIST}
+ unzip -oq -d ${WRKDIST} ${FULLDISTDIR}/${EXTRACT_ONLY}
+
 
 do-install:
+ bdftopcf -t -o ${WRKSRC}/DinaItalic10.pcf ${WRKSRC}/Dina_i400-10.bdf
+ bdftopcf -t -o ${WRKSRC}/DinaItalic8.pcf ${WRKSRC}/Dina_i400-8.bdf
+ bdftopcf -t -o ${WRKSRC}/DinaItalic9.pcf ${WRKSRC}/Dina_i400-9.bdf
+ bdftopcf -t -o ${WRKSRC}/DinaBoldItalic10.pcf ${WRKSRC}/Dina_i700-10.bdf
+ bdftopcf -t -o ${WRKSRC}/DinaBoldItalic8.pcf ${WRKSRC}/Dina_i700-8.bdf
+ bdftopcf -t -o ${WRKSRC}/DinaBoldItalic9.pcf ${WRKSRC}/Dina_i700-9.bdf
+ bdftopcf -t -o ${WRKSRC}/DinaMedium10.pcf ${WRKSRC}/Dina_r400-10.bdf
+ bdftopcf -t -o ${WRKSRC}/DinaMedium8.pcf ${WRKSRC}/Dina_r400-8.bdf
+ bdftopcf -t -o ${WRKSRC}/DinaMedium9.pcf ${WRKSRC}/Dina_r400-9.bdf
+ bdftopcf -t -o ${WRKSRC}/DinaBold10.pcf ${WRKSRC}/Dina_r700-10.bdf
+ bdftopcf -t -o ${WRKSRC}/DinaBold8.pcf ${WRKSRC}/Dina_r700-8.bdf
+ bdftopcf -t -o ${WRKSRC}/DinaBold9.pcf ${WRKSRC}/Dina_r700-9.bdf
  ${GZIP_CMD} ${WRKSRC}/*.pcf
  ${X11BASE}/bin/mkfontdir ${WRKSRC}
  egrep '\.pcf\.gz' ${WRKSRC}/fonts.dir | \
Index: distinfo
===================================================================
RCS file: /cvs/ports/fonts/dina-fonts/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo 7 Dec 2011 09:27:16 -0000 1.1.1.1
+++ distinfo 29 Dec 2013 17:23:29 -0000
@@ -1,5 +1,2 @@
-MD5 (dina-pcf-2.89.tar.gz) = 1sQlwAeppXa0u4jIjPVwdg==
-RMD160 (dina-pcf-2.89.tar.gz) = bQLzN2RIzzKstI5LpGS3Pmc3Ek8=
-SHA1 (dina-pcf-2.89.tar.gz) = dw8YqDJJCiLMjKWfCS7EAe72uEA=
-SHA256 (dina-pcf-2.89.tar.gz) = KYnGi8Tm8xQ1/nwnMNluZO8xlLEiNl8p+vBsS6xwGaY=
-SIZE (dina-pcf-2.89.tar.gz) = 36442
+SHA256 (Dina.zip) = H1G7pT91pk0ti9A36OD4S2+AZOUKcu6VQDO+3hc1CM8=
+SIZE (Dina.zip) = 68023

Reply | Threaded
Open this post in threaded view
|

Re: UPDATE: fonts/dina-fonts

Mikolaj Kucharski-3
On Sun, Dec 29, 2013 at 06:33:27PM +0100, Rafael Sadowski wrote:
> +SHA256 (Dina.zip) = H1G7pT91pk0ti9A36OD4S2+AZOUKcu6VQDO+3hc1CM8=
> +SIZE (Dina.zip) = 68023

You should make distfile name more unique, in case you update the port
in the future.

--
best regards
q#

Reply | Threaded
Open this post in threaded view
|

Re: UPDATE: fonts/dina-fonts

Rafael Sadowski
On Sun Dec 29, 2013 at 09:16:10PM +0000, Mikolaj Kucharski wrote:

> On Sun, Dec 29, 2013 at 06:33:27PM +0100, Rafael Sadowski wrote:
> > +SHA256 (Dina.zip) = H1G7pT91pk0ti9A36OD4S2+AZOUKcu6VQDO+3hc1CM8=
> > +SIZE (Dina.zip) = 68023
>
> You should make distfile name more unique, in case you update the port
> in the future.
>
> --
> best regards
> q#

yeah, thanks! New patch:


Index: Makefile
===================================================================
RCS file: /cvs/ports/fonts/dina-fonts/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- Makefile 11 Mar 2013 11:06:05 -0000 1.3
+++ Makefile 29 Dec 2013 21:24:02 -0000
@@ -2,9 +2,9 @@
 
 COMMENT = monospace bitmap font, primarily aimed at programmers
 
-V = 2.89
+V = 2.92
 PKGNAME = dina-fonts-$V
-DISTNAME = dina-pcf-$V
+DISTFILES= dina-fonts-${V}.zip{Dina.zip}
 CATEGORIES = fonts
 
 HOMEPAGE = http://www.donationcoder.com/Software/Jibz/Dina/
@@ -12,21 +12,39 @@ HOMEPAGE = http://www.donationcoder.com
 MAINTAINER = Rafael Sadowski <[hidden email]>
 
 # FREE (c) Jorgen Ibsen (Though no license included in distribution)
-PERMIT_PACKAGE_CDROM = No
-PERMIT_PACKAGE_FTP = No
-PERMIT_DISTFILES_FTP = No
+PERMIT_PACKAGE_CDROM = No
+PERMIT_PACKAGE_FTP = No
+PERMIT_DISTFILES_FTP = No
 
-MASTER_SITES = http://ftp.fi.debian.org/gentoo/distfiles/
+EXTRACT_SUFX = .zip
+MASTER_SITES = http://www.donationcoder.com/Software/Jibz/Dina/downloads/
 
-NO_BUILD = Yes
-NO_TEST = Yes
+NO_BUILD = Yes
+NO_TEST = Yes
 USE_X11 = Yes
 
 FONTDIR= ${PREFIX}/lib/X11/fonts/dina
 
-WRKSRC = ${WRKDIR}/Dina-PCF
+WRKSRC = ${WRKDIST}/BDF
+
+do-extract:
+ mkdir -p ${WRKDIST}
+ unzip -oq -d ${WRKDIST} ${FULLDISTDIR}/${EXTRACT_ONLY}
+
 
 do-install:
+ bdftopcf -t -o ${WRKSRC}/DinaItalic10.pcf ${WRKSRC}/Dina_i400-10.bdf
+ bdftopcf -t -o ${WRKSRC}/DinaItalic8.pcf ${WRKSRC}/Dina_i400-8.bdf
+ bdftopcf -t -o ${WRKSRC}/DinaItalic9.pcf ${WRKSRC}/Dina_i400-9.bdf
+ bdftopcf -t -o ${WRKSRC}/DinaBoldItalic10.pcf ${WRKSRC}/Dina_i700-10.bdf
+ bdftopcf -t -o ${WRKSRC}/DinaBoldItalic8.pcf ${WRKSRC}/Dina_i700-8.bdf
+ bdftopcf -t -o ${WRKSRC}/DinaBoldItalic9.pcf ${WRKSRC}/Dina_i700-9.bdf
+ bdftopcf -t -o ${WRKSRC}/DinaMedium10.pcf ${WRKSRC}/Dina_r400-10.bdf
+ bdftopcf -t -o ${WRKSRC}/DinaMedium8.pcf ${WRKSRC}/Dina_r400-8.bdf
+ bdftopcf -t -o ${WRKSRC}/DinaMedium9.pcf ${WRKSRC}/Dina_r400-9.bdf
+ bdftopcf -t -o ${WRKSRC}/DinaBold10.pcf ${WRKSRC}/Dina_r700-10.bdf
+ bdftopcf -t -o ${WRKSRC}/DinaBold8.pcf ${WRKSRC}/Dina_r700-8.bdf
+ bdftopcf -t -o ${WRKSRC}/DinaBold9.pcf ${WRKSRC}/Dina_r700-9.bdf
  ${GZIP_CMD} ${WRKSRC}/*.pcf
  ${X11BASE}/bin/mkfontdir ${WRKSRC}
  egrep '\.pcf\.gz' ${WRKSRC}/fonts.dir | \
Index: distinfo
===================================================================
RCS file: /cvs/ports/fonts/dina-fonts/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo 7 Dec 2011 09:27:16 -0000 1.1.1.1
+++ distinfo 29 Dec 2013 21:24:02 -0000
@@ -1,5 +1,2 @@
-MD5 (dina-pcf-2.89.tar.gz) = 1sQlwAeppXa0u4jIjPVwdg==
-RMD160 (dina-pcf-2.89.tar.gz) = bQLzN2RIzzKstI5LpGS3Pmc3Ek8=
-SHA1 (dina-pcf-2.89.tar.gz) = dw8YqDJJCiLMjKWfCS7EAe72uEA=
-SHA256 (dina-pcf-2.89.tar.gz) = KYnGi8Tm8xQ1/nwnMNluZO8xlLEiNl8p+vBsS6xwGaY=
-SIZE (dina-pcf-2.89.tar.gz) = 36442
+SHA256 (dina-fonts-2.92.zip) = H1G7pT91pk0ti9A36OD4S2+AZOUKcu6VQDO+3hc1CM8=
+SIZE (dina-fonts-2.92.zip) = 68023

Reply | Threaded
Open this post in threaded view
|

Re: UPDATE: fonts/dina-fonts

Tobias Ulmer
On Sun, Dec 29, 2013 at 10:24:39PM +0100, Rafael Sadowski wrote:

> On Sun Dec 29, 2013 at 09:16:10PM +0000, Mikolaj Kucharski wrote:
> > On Sun, Dec 29, 2013 at 06:33:27PM +0100, Rafael Sadowski wrote:
> > > +SHA256 (Dina.zip) = H1G7pT91pk0ti9A36OD4S2+AZOUKcu6VQDO+3hc1CM8=
> > > +SIZE (Dina.zip) = 68023
> >
> > You should make distfile name more unique, in case you update the port
> > in the future.
> >
> > --
> > best regards
> > q#
>
> yeah, thanks! New patch:
>
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/fonts/dina-fonts/Makefile,v
> retrieving revision 1.3
> diff -u -p -r1.3 Makefile
> --- Makefile 11 Mar 2013 11:06:05 -0000 1.3
> +++ Makefile 29 Dec 2013 21:24:02 -0000
> @@ -2,9 +2,9 @@
>  
>  COMMENT = monospace bitmap font, primarily aimed at programmers
>  
> -V = 2.89
> +V = 2.92
>  PKGNAME = dina-fonts-$V
> -DISTNAME = dina-pcf-$V
> +DISTFILES= dina-fonts-${V}.zip{Dina.zip}

Too clever for my taste

>  CATEGORIES = fonts
>  
>  HOMEPAGE = http://www.donationcoder.com/Software/Jibz/Dina/
> @@ -12,21 +12,39 @@ HOMEPAGE = http://www.donationcoder.com
>  MAINTAINER = Rafael Sadowski <[hidden email]>
>  
>  # FREE (c) Jorgen Ibsen (Though no license included in distribution)

The zip file now contains a license. It should be installed and the
permit markers updated. License looks good (MIT). You can drop all lines but
the CDROM one now (check bsd.port.mk(5)).

> -PERMIT_PACKAGE_CDROM = No
> -PERMIT_PACKAGE_FTP = No
> -PERMIT_DISTFILES_FTP = No
> +PERMIT_PACKAGE_CDROM = No
> +PERMIT_PACKAGE_FTP = No
> +PERMIT_DISTFILES_FTP = No

If you can't help re-formating those lines, at least use proper tabs ;)

>  
> -MASTER_SITES = http://ftp.fi.debian.org/gentoo/distfiles/
> +EXTRACT_SUFX = .zip
> +MASTER_SITES = http://www.donationcoder.com/Software/Jibz/Dina/downloads/

This will break once the author updates his "Dina.zip". The Debian
distfiles mirror had proper versioning. If you need a place to host
"dina-2.92.zip", ask here.. Even better if you can convince the author
to start releasing versioned zip files.

>  
> -NO_BUILD = Yes
> -NO_TEST = Yes
> +NO_BUILD = Yes
> +NO_TEST = Yes
>  USE_X11 = Yes
>  
>  FONTDIR= ${PREFIX}/lib/X11/fonts/dina
>  
> -WRKSRC = ${WRKDIR}/Dina-PCF
> +WRKSRC = ${WRKDIST}/BDF
> +
> +do-extract:
> + mkdir -p ${WRKDIST}
> + unzip -oq -d ${WRKDIST} ${FULLDISTDIR}/${EXTRACT_ONLY}
> +
>  
>  do-install:
> + bdftopcf -t -o ${WRKSRC}/DinaItalic10.pcf ${WRKSRC}/Dina_i400-10.bdf
> + bdftopcf -t -o ${WRKSRC}/DinaItalic8.pcf ${WRKSRC}/Dina_i400-8.bdf
> + bdftopcf -t -o ${WRKSRC}/DinaItalic9.pcf ${WRKSRC}/Dina_i400-9.bdf
> + bdftopcf -t -o ${WRKSRC}/DinaBoldItalic10.pcf ${WRKSRC}/Dina_i700-10.bdf
> + bdftopcf -t -o ${WRKSRC}/DinaBoldItalic8.pcf ${WRKSRC}/Dina_i700-8.bdf
> + bdftopcf -t -o ${WRKSRC}/DinaBoldItalic9.pcf ${WRKSRC}/Dina_i700-9.bdf
> + bdftopcf -t -o ${WRKSRC}/DinaMedium10.pcf ${WRKSRC}/Dina_r400-10.bdf
> + bdftopcf -t -o ${WRKSRC}/DinaMedium8.pcf ${WRKSRC}/Dina_r400-8.bdf
> + bdftopcf -t -o ${WRKSRC}/DinaMedium9.pcf ${WRKSRC}/Dina_r400-9.bdf
> + bdftopcf -t -o ${WRKSRC}/DinaBold10.pcf ${WRKSRC}/Dina_r700-10.bdf
> + bdftopcf -t -o ${WRKSRC}/DinaBold8.pcf ${WRKSRC}/Dina_r700-8.bdf
> + bdftopcf -t -o ${WRKSRC}/DinaBold9.pcf ${WRKSRC}/Dina_r700-9.bdf
>   ${GZIP_CMD} ${WRKSRC}/*.pcf
>   ${X11BASE}/bin/mkfontdir ${WRKSRC}
>   egrep '\.pcf\.gz' ${WRKSRC}/fonts.dir | \

Dina_r400-6.bdf is missing.

> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/fonts/dina-fonts/distinfo,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 distinfo
> --- distinfo 7 Dec 2011 09:27:16 -0000 1.1.1.1
> +++ distinfo 29 Dec 2013 21:24:02 -0000
> @@ -1,5 +1,2 @@
> -MD5 (dina-pcf-2.89.tar.gz) = 1sQlwAeppXa0u4jIjPVwdg==
> -RMD160 (dina-pcf-2.89.tar.gz) = bQLzN2RIzzKstI5LpGS3Pmc3Ek8=
> -SHA1 (dina-pcf-2.89.tar.gz) = dw8YqDJJCiLMjKWfCS7EAe72uEA=
> -SHA256 (dina-pcf-2.89.tar.gz) = KYnGi8Tm8xQ1/nwnMNluZO8xlLEiNl8p+vBsS6xwGaY=
> -SIZE (dina-pcf-2.89.tar.gz) = 36442
> +SHA256 (dina-fonts-2.92.zip) = H1G7pT91pk0ti9A36OD4S2+AZOUKcu6VQDO+3hc1CM8=
> +SIZE (dina-fonts-2.92.zip) = 68023
>

Reply | Threaded
Open this post in threaded view
|

Re: UPDATE: fonts/dina-fonts

Rafael Sadowski
On Tue Dec 31, 2013 at 07:26:28PM +0100, Tobias Ulmer wrote:

> On Sun, Dec 29, 2013 at 10:24:39PM +0100, Rafael Sadowski wrote:
> > On Sun Dec 29, 2013 at 09:16:10PM +0000, Mikolaj Kucharski wrote:
> > > On Sun, Dec 29, 2013 at 06:33:27PM +0100, Rafael Sadowski wrote:
> > > > +SHA256 (Dina.zip) = H1G7pT91pk0ti9A36OD4S2+AZOUKcu6VQDO+3hc1CM8=
> > > > +SIZE (Dina.zip) = 68023
> > >
> > > You should make distfile name more unique, in case you update the port
> > > in the future.
> > >
> > > --
> > > best regards
> > > q#
> >
> > yeah, thanks! New patch:
> >
> >
> > Index: Makefile
> > ===================================================================
> > RCS file: /cvs/ports/fonts/dina-fonts/Makefile,v
> > retrieving revision 1.3
> > diff -u -p -r1.3 Makefile
> > --- Makefile 11 Mar 2013 11:06:05 -0000 1.3
> > +++ Makefile 29 Dec 2013 21:24:02 -0000
> > @@ -2,9 +2,9 @@
> >  
> >  COMMENT = monospace bitmap font, primarily aimed at programmers
> >  
> > -V = 2.89
> > +V = 2.92
> >  PKGNAME = dina-fonts-$V
> > -DISTNAME = dina-pcf-$V
> > +DISTFILES= dina-fonts-${V}.zip{Dina.zip}
>
> Too clever for my taste
>
> >  CATEGORIES = fonts
> >  
> >  HOMEPAGE = http://www.donationcoder.com/Software/Jibz/Dina/
> > @@ -12,21 +12,39 @@ HOMEPAGE = http://www.donationcoder.com
> >  MAINTAINER = Rafael Sadowski <[hidden email]>
> >  
> >  # FREE (c) Jorgen Ibsen (Though no license included in distribution)
>
> The zip file now contains a license. It should be installed and the
> permit markers updated. License looks good (MIT). You can drop all lines but
> the CDROM one now (check bsd.port.mk(5)).
>
> > -PERMIT_PACKAGE_CDROM = No
> > -PERMIT_PACKAGE_FTP = No
> > -PERMIT_DISTFILES_FTP = No
> > +PERMIT_PACKAGE_CDROM = No
> > +PERMIT_PACKAGE_FTP = No
> > +PERMIT_DISTFILES_FTP = No
>
> If you can't help re-formating those lines, at least use proper tabs ;)
>
> >  
> > -MASTER_SITES = http://ftp.fi.debian.org/gentoo/distfiles/
> > +EXTRACT_SUFX = .zip
> > +MASTER_SITES = http://www.donationcoder.com/Software/Jibz/Dina/downloads/
>
> This will break once the author updates his "Dina.zip". The Debian
> distfiles mirror had proper versioning. If you need a place to host
> "dina-2.92.zip", ask here.. Even better if you can convince the author
> to start releasing versioned zip files.
>
> >  
> > -NO_BUILD = Yes
> > -NO_TEST = Yes
> > +NO_BUILD = Yes
> > +NO_TEST = Yes
> >  USE_X11 = Yes
> >  
> >  FONTDIR= ${PREFIX}/lib/X11/fonts/dina
> >  
> > -WRKSRC = ${WRKDIR}/Dina-PCF
> > +WRKSRC = ${WRKDIST}/BDF
> > +
> > +do-extract:
> > + mkdir -p ${WRKDIST}
> > + unzip -oq -d ${WRKDIST} ${FULLDISTDIR}/${EXTRACT_ONLY}
> > +
> >  
> >  do-install:
> > + bdftopcf -t -o ${WRKSRC}/DinaItalic10.pcf ${WRKSRC}/Dina_i400-10.bdf
> > + bdftopcf -t -o ${WRKSRC}/DinaItalic8.pcf ${WRKSRC}/Dina_i400-8.bdf
> > + bdftopcf -t -o ${WRKSRC}/DinaItalic9.pcf ${WRKSRC}/Dina_i400-9.bdf
> > + bdftopcf -t -o ${WRKSRC}/DinaBoldItalic10.pcf ${WRKSRC}/Dina_i700-10.bdf
> > + bdftopcf -t -o ${WRKSRC}/DinaBoldItalic8.pcf ${WRKSRC}/Dina_i700-8.bdf
> > + bdftopcf -t -o ${WRKSRC}/DinaBoldItalic9.pcf ${WRKSRC}/Dina_i700-9.bdf
> > + bdftopcf -t -o ${WRKSRC}/DinaMedium10.pcf ${WRKSRC}/Dina_r400-10.bdf
> > + bdftopcf -t -o ${WRKSRC}/DinaMedium8.pcf ${WRKSRC}/Dina_r400-8.bdf
> > + bdftopcf -t -o ${WRKSRC}/DinaMedium9.pcf ${WRKSRC}/Dina_r400-9.bdf
> > + bdftopcf -t -o ${WRKSRC}/DinaBold10.pcf ${WRKSRC}/Dina_r700-10.bdf
> > + bdftopcf -t -o ${WRKSRC}/DinaBold8.pcf ${WRKSRC}/Dina_r700-8.bdf
> > + bdftopcf -t -o ${WRKSRC}/DinaBold9.pcf ${WRKSRC}/Dina_r700-9.bdf
> >   ${GZIP_CMD} ${WRKSRC}/*.pcf
> >   ${X11BASE}/bin/mkfontdir ${WRKSRC}
> >   egrep '\.pcf\.gz' ${WRKSRC}/fonts.dir | \
>
> Dina_r400-6.bdf is missing.
>
> > Index: distinfo
> > ===================================================================
> > RCS file: /cvs/ports/fonts/dina-fonts/distinfo,v
> > retrieving revision 1.1.1.1
> > diff -u -p -r1.1.1.1 distinfo
> > --- distinfo 7 Dec 2011 09:27:16 -0000 1.1.1.1
> > +++ distinfo 29 Dec 2013 21:24:02 -0000
> > @@ -1,5 +1,2 @@
> > -MD5 (dina-pcf-2.89.tar.gz) = 1sQlwAeppXa0u4jIjPVwdg==
> > -RMD160 (dina-pcf-2.89.tar.gz) = bQLzN2RIzzKstI5LpGS3Pmc3Ek8=
> > -SHA1 (dina-pcf-2.89.tar.gz) = dw8YqDJJCiLMjKWfCS7EAe72uEA=
> > -SHA256 (dina-pcf-2.89.tar.gz) = KYnGi8Tm8xQ1/nwnMNluZO8xlLEiNl8p+vBsS6xwGaY=
> > -SIZE (dina-pcf-2.89.tar.gz) = 36442
> > +SHA256 (dina-fonts-2.92.zip) = H1G7pT91pk0ti9A36OD4S2+AZOUKcu6VQDO+3hc1CM8=
> > +SIZE (dina-fonts-2.92.zip) = 68023
> >

Thanks Tobias Ulmer, new try:


Index: Makefile
===================================================================
RCS file: /cvs/ports/fonts/dina-fonts/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- Makefile 11 Mar 2013 11:06:05 -0000 1.3
+++ Makefile 1 Jan 2014 19:32:33 -0000
@@ -1,32 +1,49 @@
 # $OpenBSD: Makefile,v 1.3 2013/03/11 11:06:05 espie Exp $
 
-COMMENT = monospace bitmap font, primarily aimed at programmers
+COMMENT = monospace bitmap font, primarily aimed at programmers
 
-V = 2.89
-PKGNAME = dina-fonts-$V
-DISTNAME = dina-pcf-$V
-CATEGORIES = fonts
+V = 2.92
+PKGNAME = dina-fonts-$V
+DISTFILES= dina-fonts-${V}.zip
+CATEGORIES = fonts
 
-HOMEPAGE = http://www.donationcoder.com/Software/Jibz/Dina/
+HOMEPAGE = http://www.donationcoder.com/Software/Jibz/Dina/
 
-MAINTAINER = Rafael Sadowski <[hidden email]>
+MAINTAINER = Rafael Sadowski <[hidden email]>
 
-# FREE (c) Jorgen Ibsen (Though no license included in distribution)
-PERMIT_PACKAGE_CDROM = No
-PERMIT_PACKAGE_FTP = No
-PERMIT_DISTFILES_FTP = No
+# MIT
+PERMIT_PACKAGE_CDROM = Yes
 
-MASTER_SITES = http://ftp.fi.debian.org/gentoo/distfiles/
+EXTRACT_SUFX = .zip
+MASTER_SITES = http://sizeofvoid.org/pub/OpenBSD/distfiles/
 
-NO_BUILD = Yes
-NO_TEST = Yes
+NO_BUILD = Yes
+NO_TEST = Yes
 USE_X11 = Yes
 
 FONTDIR= ${PREFIX}/lib/X11/fonts/dina
 
-WRKSRC = ${WRKDIR}/Dina-PCF
+WRKSRC = ${WRKDIST}/BDF
+
+do-extract:
+ mkdir -p ${WRKDIST}
+ unzip -oq -d ${WRKDIST} ${FULLDISTDIR}/${EXTRACT_ONLY}
+
 
 do-install:
+ bdftopcf -t -o ${WRKSRC}/DinaItalic10.pcf ${WRKSRC}/Dina_i400-10.bdf
+ bdftopcf -t -o ${WRKSRC}/DinaItalic8.pcf ${WRKSRC}/Dina_i400-8.bdf
+ bdftopcf -t -o ${WRKSRC}/DinaItalic9.pcf ${WRKSRC}/Dina_i400-9.bdf
+ bdftopcf -t -o ${WRKSRC}/DinaBoldItalic10.pcf ${WRKSRC}/Dina_i700-10.bdf
+ bdftopcf -t -o ${WRKSRC}/DinaBoldItalic8.pcf ${WRKSRC}/Dina_i700-8.bdf
+ bdftopcf -t -o ${WRKSRC}/DinaBoldItalic9.pcf ${WRKSRC}/Dina_i700-9.bdf
+ bdftopcf -t -o ${WRKSRC}/DinaMedium10.pcf ${WRKSRC}/Dina_r400-10.bdf
+ bdftopcf -t -o ${WRKSRC}/DinaMedium8.pcf ${WRKSRC}/Dina_r400-8.bdf
+ bdftopcf -t -o ${WRKSRC}/DinaMedium9.pcf ${WRKSRC}/Dina_r400-9.bdf
+ bdftopcf -t -o ${WRKSRC}/DinaMedium9.pcf ${WRKSRC}/Dina_r400-6.bdf
+ bdftopcf -t -o ${WRKSRC}/DinaBold10.pcf ${WRKSRC}/Dina_r700-10.bdf
+ bdftopcf -t -o ${WRKSRC}/DinaBold8.pcf ${WRKSRC}/Dina_r700-8.bdf
+ bdftopcf -t -o ${WRKSRC}/DinaBold9.pcf ${WRKSRC}/Dina_r700-9.bdf
  ${GZIP_CMD} ${WRKSRC}/*.pcf
  ${X11BASE}/bin/mkfontdir ${WRKSRC}
  egrep '\.pcf\.gz' ${WRKSRC}/fonts.dir | \
@@ -34,5 +51,8 @@ do-install:
  ${INSTALL_DATA_DIR} ${FONTDIR}
  ${INSTALL_DATA} ${WRKSRC}/*.pcf.gz ${FONTDIR}
  ${INSTALL_DATA} ${WRKSRC}/fonts.alias ${FONTDIR}/fonts.alias-dina
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/dina-fonts
+ ${INSTALL_DATA} ${WRKDIST}/LICENSE ${PREFIX}/share/doc/dina-fonts
+
 
 .include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/fonts/dina-fonts/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo 7 Dec 2011 09:27:16 -0000 1.1.1.1
+++ distinfo 1 Jan 2014 19:32:33 -0000
@@ -1,5 +1,2 @@
-MD5 (dina-pcf-2.89.tar.gz) = 1sQlwAeppXa0u4jIjPVwdg==
-RMD160 (dina-pcf-2.89.tar.gz) = bQLzN2RIzzKstI5LpGS3Pmc3Ek8=
-SHA1 (dina-pcf-2.89.tar.gz) = dw8YqDJJCiLMjKWfCS7EAe72uEA=
-SHA256 (dina-pcf-2.89.tar.gz) = KYnGi8Tm8xQ1/nwnMNluZO8xlLEiNl8p+vBsS6xwGaY=
-SIZE (dina-pcf-2.89.tar.gz) = 36442
+SHA256 (dina-fonts-2.92.zip) = H1G7pT91pk0ti9A36OD4S2+AZOUKcu6VQDO+3hc1CM8=
+SIZE (dina-fonts-2.92.zip) = 68023
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/fonts/dina-fonts/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 7 Dec 2011 09:27:16 -0000 1.1.1.1
+++ pkg/PLIST 1 Jan 2014 19:32:33 -0000
@@ -14,3 +14,5 @@ lib/X11/fonts/dina/DinaMedium10.pcf.gz
 lib/X11/fonts/dina/DinaMedium8.pcf.gz
 lib/X11/fonts/dina/DinaMedium9.pcf.gz
 lib/X11/fonts/dina/fonts.alias-dina
+share/doc/dina-fonts/
+share/doc/dina-fonts/LICENSE

Reply | Threaded
Open this post in threaded view
|

Re: UPDATE: fonts/dina-fonts

Tobias Ulmer
On Wed, Jan 01, 2014 at 08:34:02PM +0100, Rafael Sadowski wrote:
[...]

Looks almost good to me, but you added a new font and there is no PLIST
change. Spot the error ;)

> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/fonts/dina-fonts/pkg/PLIST,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 PLIST
> --- pkg/PLIST 7 Dec 2011 09:27:16 -0000 1.1.1.1
> +++ pkg/PLIST 1 Jan 2014 19:32:33 -0000
> @@ -14,3 +14,5 @@ lib/X11/fonts/dina/DinaMedium10.pcf.gz
>  lib/X11/fonts/dina/DinaMedium8.pcf.gz
>  lib/X11/fonts/dina/DinaMedium9.pcf.gz
>  lib/X11/fonts/dina/fonts.alias-dina
> +share/doc/dina-fonts/
> +share/doc/dina-fonts/LICENSE
>

Reply | Threaded
Open this post in threaded view
|

Re: UPDATE: fonts/dina-fonts

Rafael Sadowski
On Thu Jan 02, 2014 at 01:05:44PM +0100, Tobias Ulmer wrote:
> On Wed, Jan 01, 2014 at 08:34:02PM +0100, Rafael Sadowski wrote:
> [...]
>
> Looks almost good to me, but you added a new font and there is no PLIST
> change. Spot the error ;)
>

oh sorry. diff with fix:


Index: Makefile
===================================================================
RCS file: /cvs/ports/fonts/dina-fonts/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- Makefile 11 Mar 2013 11:06:05 -0000 1.3
+++ Makefile 2 Jan 2014 17:25:06 -0000
@@ -1,32 +1,49 @@
 # $OpenBSD: Makefile,v 1.3 2013/03/11 11:06:05 espie Exp $
 
-COMMENT = monospace bitmap font, primarily aimed at programmers
+COMMENT = monospace bitmap font, primarily aimed at programmers
 
-V = 2.89
-PKGNAME = dina-fonts-$V
-DISTNAME = dina-pcf-$V
-CATEGORIES = fonts
+V = 2.92
+PKGNAME = dina-fonts-$V
+DISTFILES= dina-fonts-${V}.zip
+CATEGORIES = fonts
 
-HOMEPAGE = http://www.donationcoder.com/Software/Jibz/Dina/
+HOMEPAGE = http://www.donationcoder.com/Software/Jibz/Dina/
 
-MAINTAINER = Rafael Sadowski <[hidden email]>
+MAINTAINER = Rafael Sadowski <[hidden email]>
 
-# FREE (c) Jorgen Ibsen (Though no license included in distribution)
-PERMIT_PACKAGE_CDROM = No
-PERMIT_PACKAGE_FTP = No
-PERMIT_DISTFILES_FTP = No
+# MIT
+PERMIT_PACKAGE_CDROM = Yes
 
-MASTER_SITES = http://ftp.fi.debian.org/gentoo/distfiles/
+EXTRACT_SUFX = .zip
+MASTER_SITES = http://sizeofvoid.org/pub/OpenBSD/distfiles/
 
-NO_BUILD = Yes
-NO_TEST = Yes
+NO_BUILD = Yes
+NO_TEST = Yes
 USE_X11 = Yes
 
 FONTDIR= ${PREFIX}/lib/X11/fonts/dina
 
-WRKSRC = ${WRKDIR}/Dina-PCF
+WRKSRC = ${WRKDIST}/BDF
+
+do-extract:
+ mkdir -p ${WRKDIST}
+ unzip -oq -d ${WRKDIST} ${FULLDISTDIR}/${EXTRACT_ONLY}
+
 
 do-install:
+ bdftopcf -t -o ${WRKSRC}/DinaItalic10.pcf ${WRKSRC}/Dina_i400-10.bdf
+ bdftopcf -t -o ${WRKSRC}/DinaItalic8.pcf ${WRKSRC}/Dina_i400-8.bdf
+ bdftopcf -t -o ${WRKSRC}/DinaItalic9.pcf ${WRKSRC}/Dina_i400-9.bdf
+ bdftopcf -t -o ${WRKSRC}/DinaBoldItalic10.pcf ${WRKSRC}/Dina_i700-10.bdf
+ bdftopcf -t -o ${WRKSRC}/DinaBoldItalic8.pcf ${WRKSRC}/Dina_i700-8.bdf
+ bdftopcf -t -o ${WRKSRC}/DinaBoldItalic9.pcf ${WRKSRC}/Dina_i700-9.bdf
+ bdftopcf -t -o ${WRKSRC}/DinaMedium10.pcf ${WRKSRC}/Dina_r400-10.bdf
+ bdftopcf -t -o ${WRKSRC}/DinaMedium8.pcf ${WRKSRC}/Dina_r400-8.bdf
+ bdftopcf -t -o ${WRKSRC}/DinaMedium9.pcf ${WRKSRC}/Dina_r400-9.bdf
+ bdftopcf -t -o ${WRKSRC}/DinaMedium6.pcf ${WRKSRC}/Dina_r400-6.bdf
+ bdftopcf -t -o ${WRKSRC}/DinaBold10.pcf ${WRKSRC}/Dina_r700-10.bdf
+ bdftopcf -t -o ${WRKSRC}/DinaBold8.pcf ${WRKSRC}/Dina_r700-8.bdf
+ bdftopcf -t -o ${WRKSRC}/DinaBold9.pcf ${WRKSRC}/Dina_r700-9.bdf
  ${GZIP_CMD} ${WRKSRC}/*.pcf
  ${X11BASE}/bin/mkfontdir ${WRKSRC}
  egrep '\.pcf\.gz' ${WRKSRC}/fonts.dir | \
@@ -34,5 +51,8 @@ do-install:
  ${INSTALL_DATA_DIR} ${FONTDIR}
  ${INSTALL_DATA} ${WRKSRC}/*.pcf.gz ${FONTDIR}
  ${INSTALL_DATA} ${WRKSRC}/fonts.alias ${FONTDIR}/fonts.alias-dina
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/dina-fonts
+ ${INSTALL_DATA} ${WRKDIST}/LICENSE ${PREFIX}/share/doc/dina-fonts
+
 
 .include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/fonts/dina-fonts/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo 7 Dec 2011 09:27:16 -0000 1.1.1.1
+++ distinfo 2 Jan 2014 17:25:06 -0000
@@ -1,5 +1,2 @@
-MD5 (dina-pcf-2.89.tar.gz) = 1sQlwAeppXa0u4jIjPVwdg==
-RMD160 (dina-pcf-2.89.tar.gz) = bQLzN2RIzzKstI5LpGS3Pmc3Ek8=
-SHA1 (dina-pcf-2.89.tar.gz) = dw8YqDJJCiLMjKWfCS7EAe72uEA=
-SHA256 (dina-pcf-2.89.tar.gz) = KYnGi8Tm8xQ1/nwnMNluZO8xlLEiNl8p+vBsS6xwGaY=
-SIZE (dina-pcf-2.89.tar.gz) = 36442
+SHA256 (dina-fonts-2.92.zip) = H1G7pT91pk0ti9A36OD4S2+AZOUKcu6VQDO+3hc1CM8=
+SIZE (dina-fonts-2.92.zip) = 68023
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/fonts/dina-fonts/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 7 Dec 2011 09:27:16 -0000 1.1.1.1
+++ pkg/PLIST 2 Jan 2014 17:25:06 -0000
@@ -1,6 +1,6 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2011/12/07 09:27:16 jasper Exp $
+@comment $OpenBSD$
 lib/X11/fonts/
-@fontdir lib/X11/fonts/dina/
+lib/X11/fonts/dina/
 lib/X11/fonts/dina/DinaBold10.pcf.gz
 lib/X11/fonts/dina/DinaBold8.pcf.gz
 lib/X11/fonts/dina/DinaBold9.pcf.gz
@@ -11,6 +11,9 @@ lib/X11/fonts/dina/DinaItalic10.pcf.gz
 lib/X11/fonts/dina/DinaItalic8.pcf.gz
 lib/X11/fonts/dina/DinaItalic9.pcf.gz
 lib/X11/fonts/dina/DinaMedium10.pcf.gz
+lib/X11/fonts/dina/DinaMedium6.pcf.gz
 lib/X11/fonts/dina/DinaMedium8.pcf.gz
 lib/X11/fonts/dina/DinaMedium9.pcf.gz
 lib/X11/fonts/dina/fonts.alias-dina
+share/doc/dina-fonts/
+share/doc/dina-fonts/LICENSE

Reply | Threaded
Open this post in threaded view
|

Re: UPDATE: fonts/dina-fonts

Tobias Ulmer
On Thu, Jan 02, 2014 at 06:27:23PM +0100, Rafael Sadowski wrote:
[...]

I've restored @fontdir in PLIST. Regarding the use of do-extract; espie@
wants to get rid of that, and only a few old ports are still allowed to
use it. What do you think of this simpler version?

Any porter wants to give their OK?

Index: Makefile
===================================================================
RCS file: /home/vcs/cvs/openbsd/ports/fonts/dina-fonts/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- Makefile 11 Mar 2013 11:06:05 -0000 1.3
+++ Makefile 3 Jan 2014 18:46:37 -0000
@@ -1,32 +1,42 @@
 # $OpenBSD: Makefile,v 1.3 2013/03/11 11:06:05 espie Exp $
 
-COMMENT = monospace bitmap font, primarily aimed at programmers
+COMMENT = monospace bitmap font, primarily aimed at programmers
 
-V = 2.89
-PKGNAME = dina-fonts-$V
-DISTNAME = dina-pcf-$V
-CATEGORIES = fonts
+DISTNAME = dina-fonts-2.92
+CATEGORIES = fonts
 
-HOMEPAGE = http://www.donationcoder.com/Software/Jibz/Dina/
+HOMEPAGE = http://www.donationcoder.com/Software/Jibz/Dina/
 
-MAINTAINER = Rafael Sadowski <[hidden email]>
+MAINTAINER = Rafael Sadowski <[hidden email]>
 
-# FREE (c) Jorgen Ibsen (Though no license included in distribution)
-PERMIT_PACKAGE_CDROM = No
-PERMIT_PACKAGE_FTP = No
-PERMIT_DISTFILES_FTP = No
+# MIT
+PERMIT_PACKAGE_CDROM = Yes
 
-MASTER_SITES = http://ftp.fi.debian.org/gentoo/distfiles/
+EXTRACT_SUFX = .zip
+MASTER_SITES = http://sizeofvoid.org/pub/OpenBSD/distfiles/
 
-NO_BUILD = Yes
-NO_TEST = Yes
+NO_BUILD = Yes
+NO_TEST = Yes
 USE_X11 = Yes
 
 FONTDIR= ${PREFIX}/lib/X11/fonts/dina
 
-WRKSRC = ${WRKDIR}/Dina-PCF
+WRKSRC = ${WRKDIR}/BDF
 
 do-install:
+ bdftopcf -t -o ${WRKSRC}/DinaItalic10.pcf ${WRKSRC}/Dina_i400-10.bdf
+ bdftopcf -t -o ${WRKSRC}/DinaItalic8.pcf ${WRKSRC}/Dina_i400-8.bdf
+ bdftopcf -t -o ${WRKSRC}/DinaItalic9.pcf ${WRKSRC}/Dina_i400-9.bdf
+ bdftopcf -t -o ${WRKSRC}/DinaBoldItalic10.pcf ${WRKSRC}/Dina_i700-10.bdf
+ bdftopcf -t -o ${WRKSRC}/DinaBoldItalic8.pcf ${WRKSRC}/Dina_i700-8.bdf
+ bdftopcf -t -o ${WRKSRC}/DinaBoldItalic9.pcf ${WRKSRC}/Dina_i700-9.bdf
+ bdftopcf -t -o ${WRKSRC}/DinaMedium10.pcf ${WRKSRC}/Dina_r400-10.bdf
+ bdftopcf -t -o ${WRKSRC}/DinaMedium8.pcf ${WRKSRC}/Dina_r400-8.bdf
+ bdftopcf -t -o ${WRKSRC}/DinaMedium9.pcf ${WRKSRC}/Dina_r400-9.bdf
+ bdftopcf -t -o ${WRKSRC}/DinaMedium6.pcf ${WRKSRC}/Dina_r400-6.bdf
+ bdftopcf -t -o ${WRKSRC}/DinaBold10.pcf ${WRKSRC}/Dina_r700-10.bdf
+ bdftopcf -t -o ${WRKSRC}/DinaBold8.pcf ${WRKSRC}/Dina_r700-8.bdf
+ bdftopcf -t -o ${WRKSRC}/DinaBold9.pcf ${WRKSRC}/Dina_r700-9.bdf
  ${GZIP_CMD} ${WRKSRC}/*.pcf
  ${X11BASE}/bin/mkfontdir ${WRKSRC}
  egrep '\.pcf\.gz' ${WRKSRC}/fonts.dir | \
@@ -34,5 +44,8 @@ do-install:
  ${INSTALL_DATA_DIR} ${FONTDIR}
  ${INSTALL_DATA} ${WRKSRC}/*.pcf.gz ${FONTDIR}
  ${INSTALL_DATA} ${WRKSRC}/fonts.alias ${FONTDIR}/fonts.alias-dina
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/dina-fonts
+ ${INSTALL_DATA} ${WRKDIR}/LICENSE ${PREFIX}/share/doc/dina-fonts
+
 
 .include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /home/vcs/cvs/openbsd/ports/fonts/dina-fonts/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo 7 Dec 2011 09:27:16 -0000 1.1.1.1
+++ distinfo 3 Jan 2014 18:46:37 -0000
@@ -1,5 +1,2 @@
-MD5 (dina-pcf-2.89.tar.gz) = 1sQlwAeppXa0u4jIjPVwdg==
-RMD160 (dina-pcf-2.89.tar.gz) = bQLzN2RIzzKstI5LpGS3Pmc3Ek8=
-SHA1 (dina-pcf-2.89.tar.gz) = dw8YqDJJCiLMjKWfCS7EAe72uEA=
-SHA256 (dina-pcf-2.89.tar.gz) = KYnGi8Tm8xQ1/nwnMNluZO8xlLEiNl8p+vBsS6xwGaY=
-SIZE (dina-pcf-2.89.tar.gz) = 36442
+SHA256 (dina-fonts-2.92.zip) = H1G7pT91pk0ti9A36OD4S2+AZOUKcu6VQDO+3hc1CM8=
+SIZE (dina-fonts-2.92.zip) = 68023
Index: pkg/PLIST
===================================================================
RCS file: /home/vcs/cvs/openbsd/ports/fonts/dina-fonts/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 7 Dec 2011 09:27:16 -0000 1.1.1.1
+++ pkg/PLIST 3 Jan 2014 18:46:37 -0000
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2011/12/07 09:27:16 jasper Exp $
+@comment $OpenBSD$
 lib/X11/fonts/
 @fontdir lib/X11/fonts/dina/
 lib/X11/fonts/dina/DinaBold10.pcf.gz
@@ -11,6 +11,9 @@ lib/X11/fonts/dina/DinaItalic10.pcf.gz
 lib/X11/fonts/dina/DinaItalic8.pcf.gz
 lib/X11/fonts/dina/DinaItalic9.pcf.gz
 lib/X11/fonts/dina/DinaMedium10.pcf.gz
+lib/X11/fonts/dina/DinaMedium6.pcf.gz
 lib/X11/fonts/dina/DinaMedium8.pcf.gz
 lib/X11/fonts/dina/DinaMedium9.pcf.gz
 lib/X11/fonts/dina/fonts.alias-dina
+share/doc/dina-fonts/
+share/doc/dina-fonts/LICENSE

Reply | Threaded
Open this post in threaded view
|

Re: UPDATE: fonts/dina-fonts

David Coppa
Il giorno 03/gen/2014 20.04, "Tobias Ulmer" <[hidden email]> ha scritto:
>
> On Thu, Jan 02, 2014 at 06:27:23PM +0100, Rafael Sadowski wrote:
> [...]
>
> I've restored @fontdir in PLIST. Regarding the use of do-extract; espie@
> wants to get rid of that, and only a few old ports are still allowed to
> use it. What do you think of this simpler version?
>
> Any porter wants to give their OK?

This revision looks ok to me.
Ciao,
dcoppa

> Index: Makefile
> ===================================================================
> RCS file: /home/vcs/cvs/openbsd/ports/fonts/dina-fonts/Makefile,v
> retrieving revision 1.3
> diff -u -p -r1.3 Makefile
> --- Makefile    11 Mar 2013 11:06:05 -0000      1.3
> +++ Makefile    3 Jan 2014 18:46:37 -0000
> @@ -1,32 +1,42 @@
>  # $OpenBSD: Makefile,v 1.3 2013/03/11 11:06:05 espie Exp $
>
> -COMMENT =              monospace bitmap font, primarily aimed at
programmers

> +COMMENT =      monospace bitmap font, primarily aimed at programmers
>
> -V =                    2.89
> -PKGNAME =              dina-fonts-$V
> -DISTNAME =             dina-pcf-$V
> -CATEGORIES =           fonts
> +DISTNAME =     dina-fonts-2.92
> +CATEGORIES =   fonts
>
> -HOMEPAGE =             http://www.donationcoder.com/Software/Jibz/Dina/
> +HOMEPAGE =     http://www.donationcoder.com/Software/Jibz/Dina/
>
> -MAINTAINER =           Rafael Sadowski <[hidden email]>
> +MAINTAINER =   Rafael Sadowski <[hidden email]>
>
> -# FREE (c) Jorgen Ibsen (Though no license included in distribution)
> -PERMIT_PACKAGE_CDROM =         No
> -PERMIT_PACKAGE_FTP =           No
> -PERMIT_DISTFILES_FTP =         No
> +# MIT
> +PERMIT_PACKAGE_CDROM = Yes
>
> -MASTER_SITES =         http://ftp.fi.debian.org/gentoo/distfiles/
> +EXTRACT_SUFX = .zip
> +MASTER_SITES = http://sizeofvoid.org/pub/OpenBSD/distfiles/
>
> -NO_BUILD =             Yes
> -NO_TEST =              Yes
> +NO_BUILD =     Yes
> +NO_TEST =      Yes
>  USE_X11 =      Yes
>
>  FONTDIR=       ${PREFIX}/lib/X11/fonts/dina
>
> -WRKSRC =       ${WRKDIR}/Dina-PCF
> +WRKSRC =       ${WRKDIR}/BDF
>
>  do-install:
> +       bdftopcf -t -o ${WRKSRC}/DinaItalic10.pcf
${WRKSRC}/Dina_i400-10.bdf
> +       bdftopcf -t -o ${WRKSRC}/DinaItalic8.pcf ${WRKSRC}/Dina_i400-8.bdf
> +       bdftopcf -t -o ${WRKSRC}/DinaItalic9.pcf ${WRKSRC}/Dina_i400-9.bdf
> +       bdftopcf -t -o ${WRKSRC}/DinaBoldItalic10.pcf
${WRKSRC}/Dina_i700-10.bdf
> +       bdftopcf -t -o ${WRKSRC}/DinaBoldItalic8.pcf
${WRKSRC}/Dina_i700-8.bdf
> +       bdftopcf -t -o ${WRKSRC}/DinaBoldItalic9.pcf
${WRKSRC}/Dina_i700-9.bdf
> +       bdftopcf -t -o ${WRKSRC}/DinaMedium10.pcf
${WRKSRC}/Dina_r400-10.bdf

> +       bdftopcf -t -o ${WRKSRC}/DinaMedium8.pcf ${WRKSRC}/Dina_r400-8.bdf
> +       bdftopcf -t -o ${WRKSRC}/DinaMedium9.pcf ${WRKSRC}/Dina_r400-9.bdf
> +       bdftopcf -t -o ${WRKSRC}/DinaMedium6.pcf ${WRKSRC}/Dina_r400-6.bdf
> +       bdftopcf -t -o ${WRKSRC}/DinaBold10.pcf ${WRKSRC}/Dina_r700-10.bdf
> +       bdftopcf -t -o ${WRKSRC}/DinaBold8.pcf ${WRKSRC}/Dina_r700-8.bdf
> +       bdftopcf -t -o ${WRKSRC}/DinaBold9.pcf ${WRKSRC}/Dina_r700-9.bdf
>         ${GZIP_CMD} ${WRKSRC}/*.pcf
>         ${X11BASE}/bin/mkfontdir ${WRKSRC}
>         egrep '\.pcf\.gz' ${WRKSRC}/fonts.dir | \
> @@ -34,5 +44,8 @@ do-install:
>         ${INSTALL_DATA_DIR} ${FONTDIR}
>         ${INSTALL_DATA} ${WRKSRC}/*.pcf.gz ${FONTDIR}
>         ${INSTALL_DATA} ${WRKSRC}/fonts.alias ${FONTDIR}/fonts.alias-dina
> +       ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/dina-fonts
> +       ${INSTALL_DATA} ${WRKDIR}/LICENSE ${PREFIX}/share/doc/dina-fonts
> +
>
>  .include <bsd.port.mk>
> Index: distinfo
> ===================================================================
> RCS file: /home/vcs/cvs/openbsd/ports/fonts/dina-fonts/distinfo,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 distinfo
> --- distinfo    7 Dec 2011 09:27:16 -0000       1.1.1.1
> +++ distinfo    3 Jan 2014 18:46:37 -0000
> @@ -1,5 +1,2 @@
> -MD5 (dina-pcf-2.89.tar.gz) = 1sQlwAeppXa0u4jIjPVwdg==
> -RMD160 (dina-pcf-2.89.tar.gz) = bQLzN2RIzzKstI5LpGS3Pmc3Ek8=
> -SHA1 (dina-pcf-2.89.tar.gz) = dw8YqDJJCiLMjKWfCS7EAe72uEA=
> -SHA256 (dina-pcf-2.89.tar.gz) =
KYnGi8Tm8xQ1/nwnMNluZO8xlLEiNl8p+vBsS6xwGaY=
> -SIZE (dina-pcf-2.89.tar.gz) = 36442
> +SHA256 (dina-fonts-2.92.zip) =
H1G7pT91pk0ti9A36OD4S2+AZOUKcu6VQDO+3hc1CM8=

> +SIZE (dina-fonts-2.92.zip) = 68023
> Index: pkg/PLIST
> ===================================================================
> RCS file: /home/vcs/cvs/openbsd/ports/fonts/dina-fonts/pkg/PLIST,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 PLIST
> --- pkg/PLIST   7 Dec 2011 09:27:16 -0000       1.1.1.1
> +++ pkg/PLIST   3 Jan 2014 18:46:37 -0000
> @@ -1,4 +1,4 @@
> -@comment $OpenBSD: PLIST,v 1.1.1.1 2011/12/07 09:27:16 jasper Exp $
> +@comment $OpenBSD$
>  lib/X11/fonts/
>  @fontdir lib/X11/fonts/dina/
>  lib/X11/fonts/dina/DinaBold10.pcf.gz
> @@ -11,6 +11,9 @@ lib/X11/fonts/dina/DinaItalic10.pcf.gz
>  lib/X11/fonts/dina/DinaItalic8.pcf.gz
>  lib/X11/fonts/dina/DinaItalic9.pcf.gz
>  lib/X11/fonts/dina/DinaMedium10.pcf.gz
> +lib/X11/fonts/dina/DinaMedium6.pcf.gz
>  lib/X11/fonts/dina/DinaMedium8.pcf.gz
>  lib/X11/fonts/dina/DinaMedium9.pcf.gz
>  lib/X11/fonts/dina/fonts.alias-dina
> +share/doc/dina-fonts/
> +share/doc/dina-fonts/LICENSE
>
Reply | Threaded
Open this post in threaded view
|

Re: UPDATE: fonts/dina-fonts

Antoine Jacoutot-7
In reply to this post by Tobias Ulmer
On Fri, Jan 03, 2014 at 08:03:32PM +0100, Tobias Ulmer wrote:

> On Thu, Jan 02, 2014 at 06:27:23PM +0100, Rafael Sadowski wrote:
> [...]
>
> I've restored @fontdir in PLIST. Regarding the use of do-extract; espie@
> wants to get rid of that, and only a few old ports are still allowed to
> use it. What do you think of this simpler version?
>
> Any porter wants to give their OK?
>
> Index: Makefile
> ===================================================================
> RCS file: /home/vcs/cvs/openbsd/ports/fonts/dina-fonts/Makefile,v
> retrieving revision 1.3
> diff -u -p -r1.3 Makefile
> --- Makefile 11 Mar 2013 11:06:05 -0000 1.3
> +++ Makefile 3 Jan 2014 18:46:37 -0000
> @@ -1,32 +1,42 @@
>  # $OpenBSD: Makefile,v 1.3 2013/03/11 11:06:05 espie Exp $
>  
> -COMMENT = monospace bitmap font, primarily aimed at programmers
> +COMMENT = monospace bitmap font, primarily aimed at programmers
>  
> -V = 2.89
> -PKGNAME = dina-fonts-$V
> -DISTNAME = dina-pcf-$V
> -CATEGORIES = fonts
> +DISTNAME = dina-fonts-2.92
> +CATEGORIES = fonts
>  
> -HOMEPAGE = http://www.donationcoder.com/Software/Jibz/Dina/
> +HOMEPAGE = http://www.donationcoder.com/Software/Jibz/Dina/
>  
> -MAINTAINER = Rafael Sadowski <[hidden email]>
> +MAINTAINER = Rafael Sadowski <[hidden email]>
>  
> -# FREE (c) Jorgen Ibsen (Though no license included in distribution)
> -PERMIT_PACKAGE_CDROM = No
> -PERMIT_PACKAGE_FTP = No
> -PERMIT_DISTFILES_FTP = No
> +# MIT
> +PERMIT_PACKAGE_CDROM = Yes
>  
> -MASTER_SITES = http://ftp.fi.debian.org/gentoo/distfiles/
> +EXTRACT_SUFX = .zip
> +MASTER_SITES = http://sizeofvoid.org/pub/OpenBSD/distfiles/
>  
> -NO_BUILD = Yes
> -NO_TEST = Yes
> +NO_BUILD = Yes
> +NO_TEST = Yes
>  USE_X11 = Yes
>  
>  FONTDIR= ${PREFIX}/lib/X11/fonts/dina
>  
> -WRKSRC = ${WRKDIR}/Dina-PCF
> +WRKSRC = ${WRKDIR}/BDF
>  
>  do-install:
> + bdftopcf -t -o ${WRKSRC}/DinaItalic10.pcf ${WRKSRC}/Dina_i400-10.bdf
> + bdftopcf -t -o ${WRKSRC}/DinaItalic8.pcf ${WRKSRC}/Dina_i400-8.bdf
> + bdftopcf -t -o ${WRKSRC}/DinaItalic9.pcf ${WRKSRC}/Dina_i400-9.bdf
> + bdftopcf -t -o ${WRKSRC}/DinaBoldItalic10.pcf ${WRKSRC}/Dina_i700-10.bdf
> + bdftopcf -t -o ${WRKSRC}/DinaBoldItalic8.pcf ${WRKSRC}/Dina_i700-8.bdf
> + bdftopcf -t -o ${WRKSRC}/DinaBoldItalic9.pcf ${WRKSRC}/Dina_i700-9.bdf
> + bdftopcf -t -o ${WRKSRC}/DinaMedium10.pcf ${WRKSRC}/Dina_r400-10.bdf
> + bdftopcf -t -o ${WRKSRC}/DinaMedium8.pcf ${WRKSRC}/Dina_r400-8.bdf
> + bdftopcf -t -o ${WRKSRC}/DinaMedium9.pcf ${WRKSRC}/Dina_r400-9.bdf
> + bdftopcf -t -o ${WRKSRC}/DinaMedium6.pcf ${WRKSRC}/Dina_r400-6.bdf
> + bdftopcf -t -o ${WRKSRC}/DinaBold10.pcf ${WRKSRC}/Dina_r700-10.bdf
> + bdftopcf -t -o ${WRKSRC}/DinaBold8.pcf ${WRKSRC}/Dina_r700-8.bdf
> + bdftopcf -t -o ${WRKSRC}/DinaBold9.pcf ${WRKSRC}/Dina_r700-9.bdf
>   ${GZIP_CMD} ${WRKSRC}/*.pcf
>   ${X11BASE}/bin/mkfontdir ${WRKSRC}
>   egrep '\.pcf\.gz' ${WRKSRC}/fonts.dir | \
> @@ -34,5 +44,8 @@ do-install:
>   ${INSTALL_DATA_DIR} ${FONTDIR}
>   ${INSTALL_DATA} ${WRKSRC}/*.pcf.gz ${FONTDIR}
>   ${INSTALL_DATA} ${WRKSRC}/fonts.alias ${FONTDIR}/fonts.alias-dina
> + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/dina-fonts
> + ${INSTALL_DATA} ${WRKDIR}/LICENSE ${PREFIX}/share/doc/dina-fonts
> +

Is that part really usefull?


>  
>  .include <bsd.port.mk>
> Index: distinfo
> ===================================================================
> RCS file: /home/vcs/cvs/openbsd/ports/fonts/dina-fonts/distinfo,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 distinfo
> --- distinfo 7 Dec 2011 09:27:16 -0000 1.1.1.1
> +++ distinfo 3 Jan 2014 18:46:37 -0000
> @@ -1,5 +1,2 @@
> -MD5 (dina-pcf-2.89.tar.gz) = 1sQlwAeppXa0u4jIjPVwdg==
> -RMD160 (dina-pcf-2.89.tar.gz) = bQLzN2RIzzKstI5LpGS3Pmc3Ek8=
> -SHA1 (dina-pcf-2.89.tar.gz) = dw8YqDJJCiLMjKWfCS7EAe72uEA=
> -SHA256 (dina-pcf-2.89.tar.gz) = KYnGi8Tm8xQ1/nwnMNluZO8xlLEiNl8p+vBsS6xwGaY=
> -SIZE (dina-pcf-2.89.tar.gz) = 36442
> +SHA256 (dina-fonts-2.92.zip) = H1G7pT91pk0ti9A36OD4S2+AZOUKcu6VQDO+3hc1CM8=
> +SIZE (dina-fonts-2.92.zip) = 68023
> Index: pkg/PLIST
> ===================================================================
> RCS file: /home/vcs/cvs/openbsd/ports/fonts/dina-fonts/pkg/PLIST,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 PLIST
> --- pkg/PLIST 7 Dec 2011 09:27:16 -0000 1.1.1.1
> +++ pkg/PLIST 3 Jan 2014 18:46:37 -0000
> @@ -1,4 +1,4 @@
> -@comment $OpenBSD: PLIST,v 1.1.1.1 2011/12/07 09:27:16 jasper Exp $
> +@comment $OpenBSD$
>  lib/X11/fonts/
>  @fontdir lib/X11/fonts/dina/
>  lib/X11/fonts/dina/DinaBold10.pcf.gz
> @@ -11,6 +11,9 @@ lib/X11/fonts/dina/DinaItalic10.pcf.gz
>  lib/X11/fonts/dina/DinaItalic8.pcf.gz
>  lib/X11/fonts/dina/DinaItalic9.pcf.gz
>  lib/X11/fonts/dina/DinaMedium10.pcf.gz
> +lib/X11/fonts/dina/DinaMedium6.pcf.gz
>  lib/X11/fonts/dina/DinaMedium8.pcf.gz
>  lib/X11/fonts/dina/DinaMedium9.pcf.gz
>  lib/X11/fonts/dina/fonts.alias-dina
> +share/doc/dina-fonts/
> +share/doc/dina-fonts/LICENSE
>

--
Antoine

Reply | Threaded
Open this post in threaded view
|

Re: UPDATE: fonts/dina-fonts

Tobias Ulmer
On Fri, Jan 03, 2014 at 11:52:42PM +0100, Antoine Jacoutot wrote:

> > @@ -34,5 +44,8 @@ do-install:
> >   ${INSTALL_DATA_DIR} ${FONTDIR}
> >   ${INSTALL_DATA} ${WRKSRC}/*.pcf.gz ${FONTDIR}
> >   ${INSTALL_DATA} ${WRKSRC}/fonts.alias ${FONTDIR}/fonts.alias-dina
> > + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/dina-fonts
> > + ${INSTALL_DATA} ${WRKDIR}/LICENSE ${PREFIX}/share/doc/dina-fonts
> > +
>
> Is that part really usefull?
>

Maybe if you want to embed the font into something and need to check its
license. I guess we do this in a number of fonts mainly out of
compliance.  It's usually requested that the license is kept with the
font files.

Should we drop this?

Reply | Threaded
Open this post in threaded view
|

Re: UPDATE: fonts/dina-fonts

Antoine Jacoutot-7
On Sat, Jan 04, 2014 at 12:12:33AM +0100, Tobias Ulmer wrote:

> On Fri, Jan 03, 2014 at 11:52:42PM +0100, Antoine Jacoutot wrote:
> > > @@ -34,5 +44,8 @@ do-install:
> > >   ${INSTALL_DATA_DIR} ${FONTDIR}
> > >   ${INSTALL_DATA} ${WRKSRC}/*.pcf.gz ${FONTDIR}
> > >   ${INSTALL_DATA} ${WRKSRC}/fonts.alias ${FONTDIR}/fonts.alias-dina
> > > + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/dina-fonts
> > > + ${INSTALL_DATA} ${WRKDIR}/LICENSE ${PREFIX}/share/doc/dina-fonts
> > > +
> >
> > Is that part really usefull?
> >
>
> Maybe if you want to embed the font into something and need to check its
> license. I guess we do this in a number of fonts mainly out of
> compliance.  It's usually requested that the license is kept with the
> font files.
>
> Should we drop this?

Unless it is a requirement and we must ship it within the pkg itself for whatever reason, I would drop it.
Others may disagree.

--
Antoine

Reply | Threaded
Open this post in threaded view
|

Re: UPDATE: fonts/dina-fonts

Matthieu Herrb
On Sat, Jan 04, 2014 at 09:39:05AM +0100, Antoine Jacoutot wrote:

> On Sat, Jan 04, 2014 at 12:12:33AM +0100, Tobias Ulmer wrote:
> > On Fri, Jan 03, 2014 at 11:52:42PM +0100, Antoine Jacoutot wrote:
> > > > @@ -34,5 +44,8 @@ do-install:
> > > >   ${INSTALL_DATA_DIR} ${FONTDIR}
> > > >   ${INSTALL_DATA} ${WRKSRC}/*.pcf.gz ${FONTDIR}
> > > >   ${INSTALL_DATA} ${WRKSRC}/fonts.alias ${FONTDIR}/fonts.alias-dina
> > > > + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/dina-fonts
> > > > + ${INSTALL_DATA} ${WRKDIR}/LICENSE ${PREFIX}/share/doc/dina-fonts
> > > > +
> > >
> > > Is that part really usefull?
> > >
> >
> > Maybe if you want to embed the font into something and need to check its
> > license. I guess we do this in a number of fonts mainly out of
> > compliance.  It's usually requested that the license is kept with the
> > font files.
> >
> > Should we drop this?
>
> Unless it is a requirement and we must ship it within the pkg itself for whatever reason, I would drop it.
> Others may disagree.
>

Yes I disagree. Most of the free software license ask that the
copyright notice and license are included somewhere in the
documentation. For ports, OpenBSD encourages people to use binary
packages. So the licenses file should be shipped within the
binary packages. For me it's just basic practices in free software.

Here the MIT license says :

> The above copyright notice and this permission notice shall be
> included in all copies or substantial portions of the Software.

For base and xenocara, we more or less consider the source as part of
the system and may thus avoid installing the corresponding copyright
notices and licenses somewhere under /usr/share.
--
Matthieu Herrb

Reply | Threaded
Open this post in threaded view
|

Re: UPDATE: fonts/dina-fonts

Antoine Jacoutot-7
On Sat, Jan 04, 2014 at 10:04:44AM +0100, Matthieu Herrb wrote:

> On Sat, Jan 04, 2014 at 09:39:05AM +0100, Antoine Jacoutot wrote:
> > On Sat, Jan 04, 2014 at 12:12:33AM +0100, Tobias Ulmer wrote:
> > > On Fri, Jan 03, 2014 at 11:52:42PM +0100, Antoine Jacoutot wrote:
> > > > > @@ -34,5 +44,8 @@ do-install:
> > > > >   ${INSTALL_DATA_DIR} ${FONTDIR}
> > > > >   ${INSTALL_DATA} ${WRKSRC}/*.pcf.gz ${FONTDIR}
> > > > >   ${INSTALL_DATA} ${WRKSRC}/fonts.alias ${FONTDIR}/fonts.alias-dina
> > > > > + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/dina-fonts
> > > > > + ${INSTALL_DATA} ${WRKDIR}/LICENSE ${PREFIX}/share/doc/dina-fonts
> > > > > +
> > > >
> > > > Is that part really usefull?
> > > >
> > >
> > > Maybe if you want to embed the font into something and need to check its
> > > license. I guess we do this in a number of fonts mainly out of
> > > compliance.  It's usually requested that the license is kept with the
> > > font files.
> > >
> > > Should we drop this?
> >
> > Unless it is a requirement and we must ship it within the pkg itself for whatever reason, I would drop it.
> > Others may disagree.
> >
>
> Yes I disagree. Most of the free software license ask that the
> copyright notice and license are included somewhere in the
> documentation. For ports, OpenBSD encourages people to use binary
> packages. So the licenses file should be shipped within the
> binary packages. For me it's just basic practices in free software.
>
> Here the MIT license says :
>
> > The above copyright notice and this permission notice shall be
> > included in all copies or substantial portions of the Software.
>
> For base and xenocara, we more or less consider the source as part of
> the system and may thus avoid installing the corresponding copyright
> notices and licenses somewhere under /usr/share.

... which is exactly why my previous message started with "Unless it is a requirement".

--
Antoine