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 <raf...@sizeofvoid.org>
> >
> > # 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 <raf...@sizeofvoid.org>
+MAINTAINER = Rafael Sadowski <raf...@sizeofvoid.org>
-# 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
