On Mon, May 02, 2011 at 16:35:18 +0000, Stuart Henderson wrote:
> On 2011-05-02, LEVAI Daniel <[email protected]> wrote:
> > +USE_GMAKE = Yes
> > +BUILD_DEPENDS = devel/gmake
>
> Don't list gmake as BUILD_DEPENDS, USE_GMAKE does this.
> I'd prefer to patch the Makefile to work with BSD make though.
The current GNU Makefile contains wildcards for filenames, and I
couldn't replace them with '*' or '?', although in make(1) it says that
it is allowed to use them. If someone could shed some light on this, I
would try to patch the makefile.
> > -.if ${FLAVOR:L:Msymquotes}
> > -DISTFILES+= ${DISTNAME}-gq2.diff.gz
Oops, thanks. The FLAVOR remains, of course.
> > +@pkgpath x11/terminus-font
>
> that's wrong, you would need to specify the flavour you are replacing
> here. but see above, this variant still exists, so I think we should
> keep the flavour.
>
> > -@fontdir lib/X11/fonts/terminus/
> > +lib/X11/fonts/terminus/
>
> this should keep the @fontdir marker.
I've now hopefully fixed the PLIST.
> btw 4.34 is out now.
So, this is 4.35, which contains fixes to the previous release. It
finally contains size 18 and it just works.
Daniel
--
LÉVAI Dániel
PGP key ID = 0x83B63A8F
Key fingerprint = DBEC C66B A47A DFA2 792D 650C C69B BE4C 83B6 3A8F
Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/terminus-font/Makefile,v
retrieving revision 1.23
diff -p -u -r1.23 Makefile
--- Makefile 24 Oct 2010 21:15:34 -0000 1.23
+++ Makefile 16 May 2011 06:59:15 -0000
@@ -1,37 +1,38 @@
-# $OpenBSD: Makefile,v 1.23 2010/10/24 21:15:34 ajacoutot Exp $
+# $OpenBSD
-COMMENT= fixed width fonts especially for long hacking sessions
+COMMENT = fixed width fonts especially for long hacking sessions
-DISTNAME= terminus-font-4.30
-CATEGORIES= x11
+DISTNAME = terminus-font-4.35
+CATEGORIES = x11
-HOMEPAGE= http://terminus-font.sourceforge.net/
+HOMEPAGE = http://terminus-font.sourceforge.net/
-MAINTAINER= Ray Lai <[email protected]>
+MAINTAINER = LEVAI Daniel <[email protected]>
-# GPLv2+
-PERMIT_PACKAGE_CDROM= Yes
-PERMIT_PACKAGE_FTP= Yes
-PERMIT_DISTFILES_CDROM= Yes
-PERMIT_DISTFILES_FTP= Yes
+# OFL http://scripts.sil.org/OFL
+PERMIT_PACKAGE_CDROM = Yes
+PERMIT_PACKAGE_FTP = Yes
+PERMIT_DISTFILES_CDROM = Yes
+PERMIT_DISTFILES_FTP = Yes
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=terminus-font/}
+MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=terminus-font/}
-CONFIGURE_STYLE= simple
-NO_REGRESS= Yes
+CONFIGURE_STYLE = simple
+NO_REGRESS = Yes
-ALL_TARGET= n12
+#ALL_TARGET= n12
+ALL_TARGET= pcf
-FONTDIR= ${PREFIX}/lib/X11/fonts/terminus
+FONTDIR = ${PREFIX}/lib/X11/fonts/terminus
+
+USE_GMAKE = Yes
FLAVORS= symquotes
FLAVOR?=
.if ${FLAVOR:L:Msymquotes}
-DISTFILES+= ${DISTNAME}-gq2.diff.gz
-
post-patch:
- ${PATCH} -d ${WRKSRC} < ${WRKDIR}/${DISTNAME}-gq2.diff
+ ${PATCH} -d ${WRKSRC} < ${WRKSRC}/alt/gq2.diff
.endif
do-install:
Index: distinfo
===================================================================
RCS file: /cvs/ports/x11/terminus-font/distinfo,v
retrieving revision 1.15
diff -p -u -r1.15 distinfo
--- distinfo 19 Aug 2010 15:51:07 -0000 1.15
+++ distinfo 16 May 2011 06:59:15 -0000
@@ -1,10 +1,5 @@
-MD5 (terminus-font-4.30-gq2.diff.gz) = 8DseAYXavvrKbSCeYo5gSQ==
-MD5 (terminus-font-4.30.tar.gz) = b4vZW1k4Ufn1whCp0zy78Q==
-RMD160 (terminus-font-4.30-gq2.diff.gz) = 3uaTnZtG28zTYmUITNZ1/xgPE7o=
-RMD160 (terminus-font-4.30.tar.gz) = 14NemQEolbFfKV/B0ZVRye0kE1Q=
-SHA1 (terminus-font-4.30-gq2.diff.gz) = c+WQuMFOv7/AdHcpiPRfMwSq8qk=
-SHA1 (terminus-font-4.30.tar.gz) = Ry29yO5/pC6o+R5B6fFU8j+UU7k=
-SHA256 (terminus-font-4.30-gq2.diff.gz) =
oCG+I5jbw4la0b/HNn/UXJb+5CscmKU6UqoZcyRBxWM=
-SHA256 (terminus-font-4.30.tar.gz) =
yhVxj3FfHKevgnqKtVQ7DAM5slFfOfjBXyQbK8GhWpo=
-SIZE (terminus-font-4.30-gq2.diff.gz) = 648
-SIZE (terminus-font-4.30.tar.gz) = 267236
+MD5 (terminus-font-4.35.tar.gz) = quZAka2cfR0PiUL/qQJsNg==
+RMD160 (terminus-font-4.35.tar.gz) = jJ26O7E1U2d3t5DzyWI+sU20T3g=
+SHA1 (terminus-font-4.35.tar.gz) = DNJwfHBBrm4090PCQBxRAFPpyc8=
+SHA256 (terminus-font-4.35.tar.gz) =
auTNIYYFDJaZcFLhZwE6ohtgOaFk8x+gbprml/PYuNw=
+SIZE (terminus-font-4.35.tar.gz) = 313577
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/terminus-font/pkg/PLIST,v
retrieving revision 1.9
diff -p -u -r1.9 PLIST
--- pkg/PLIST 2 Feb 2009 11:19:21 -0000 1.9
+++ pkg/PLIST 16 May 2011 06:59:15 -0000
@@ -1,170 +1,237 @@
-@comment $OpenBSD: PLIST,v 1.9 2009/02/02 11:19:21 sthen Exp $
+@comment $OpenBSD$
+@pkgpath x11/terminus-font
+@pkgpath x11/terminus-font,symquotes
lib/X11/fonts/
@fontdir lib/X11/fonts/terminus/
lib/X11/fonts/terminus/fonts.alias-terminus
+lib/X11/fonts/terminus/ter-112b.pcf.gz
lib/X11/fonts/terminus/ter-112n.pcf.gz
lib/X11/fonts/terminus/ter-114b.pcf.gz
lib/X11/fonts/terminus/ter-114n.pcf.gz
lib/X11/fonts/terminus/ter-116b.pcf.gz
lib/X11/fonts/terminus/ter-116n.pcf.gz
+lib/X11/fonts/terminus/ter-118b.pcf.gz
+lib/X11/fonts/terminus/ter-118n.pcf.gz
lib/X11/fonts/terminus/ter-120b.pcf.gz
lib/X11/fonts/terminus/ter-120n.pcf.gz
+lib/X11/fonts/terminus/ter-122b.pcf.gz
+lib/X11/fonts/terminus/ter-122n.pcf.gz
lib/X11/fonts/terminus/ter-124b.pcf.gz
lib/X11/fonts/terminus/ter-124n.pcf.gz
lib/X11/fonts/terminus/ter-128b.pcf.gz
lib/X11/fonts/terminus/ter-128n.pcf.gz
lib/X11/fonts/terminus/ter-132b.pcf.gz
lib/X11/fonts/terminus/ter-132n.pcf.gz
+lib/X11/fonts/terminus/ter-212b.pcf.gz
lib/X11/fonts/terminus/ter-212n.pcf.gz
lib/X11/fonts/terminus/ter-214b.pcf.gz
lib/X11/fonts/terminus/ter-214n.pcf.gz
lib/X11/fonts/terminus/ter-216b.pcf.gz
lib/X11/fonts/terminus/ter-216n.pcf.gz
+lib/X11/fonts/terminus/ter-218b.pcf.gz
+lib/X11/fonts/terminus/ter-218n.pcf.gz
lib/X11/fonts/terminus/ter-220b.pcf.gz
lib/X11/fonts/terminus/ter-220n.pcf.gz
+lib/X11/fonts/terminus/ter-222b.pcf.gz
+lib/X11/fonts/terminus/ter-222n.pcf.gz
lib/X11/fonts/terminus/ter-224b.pcf.gz
lib/X11/fonts/terminus/ter-224n.pcf.gz
lib/X11/fonts/terminus/ter-228b.pcf.gz
lib/X11/fonts/terminus/ter-228n.pcf.gz
lib/X11/fonts/terminus/ter-232b.pcf.gz
lib/X11/fonts/terminus/ter-232n.pcf.gz
+lib/X11/fonts/terminus/ter-512b.pcf.gz
lib/X11/fonts/terminus/ter-512n.pcf.gz
lib/X11/fonts/terminus/ter-514b.pcf.gz
lib/X11/fonts/terminus/ter-514n.pcf.gz
lib/X11/fonts/terminus/ter-516b.pcf.gz
lib/X11/fonts/terminus/ter-516n.pcf.gz
+lib/X11/fonts/terminus/ter-518b.pcf.gz
+lib/X11/fonts/terminus/ter-518n.pcf.gz
lib/X11/fonts/terminus/ter-520b.pcf.gz
lib/X11/fonts/terminus/ter-520n.pcf.gz
+lib/X11/fonts/terminus/ter-522b.pcf.gz
+lib/X11/fonts/terminus/ter-522n.pcf.gz
lib/X11/fonts/terminus/ter-524b.pcf.gz
lib/X11/fonts/terminus/ter-524n.pcf.gz
lib/X11/fonts/terminus/ter-528b.pcf.gz
lib/X11/fonts/terminus/ter-528n.pcf.gz
lib/X11/fonts/terminus/ter-532b.pcf.gz
lib/X11/fonts/terminus/ter-532n.pcf.gz
+lib/X11/fonts/terminus/ter-712b.pcf.gz
lib/X11/fonts/terminus/ter-712n.pcf.gz
lib/X11/fonts/terminus/ter-714b.pcf.gz
lib/X11/fonts/terminus/ter-714n.pcf.gz
lib/X11/fonts/terminus/ter-716b.pcf.gz
lib/X11/fonts/terminus/ter-716n.pcf.gz
+lib/X11/fonts/terminus/ter-718b.pcf.gz
+lib/X11/fonts/terminus/ter-718n.pcf.gz
lib/X11/fonts/terminus/ter-720b.pcf.gz
lib/X11/fonts/terminus/ter-720n.pcf.gz
+lib/X11/fonts/terminus/ter-722b.pcf.gz
+lib/X11/fonts/terminus/ter-722n.pcf.gz
lib/X11/fonts/terminus/ter-724b.pcf.gz
lib/X11/fonts/terminus/ter-724n.pcf.gz
lib/X11/fonts/terminus/ter-728b.pcf.gz
lib/X11/fonts/terminus/ter-728n.pcf.gz
lib/X11/fonts/terminus/ter-732b.pcf.gz
lib/X11/fonts/terminus/ter-732n.pcf.gz
+lib/X11/fonts/terminus/ter-912b.pcf.gz
lib/X11/fonts/terminus/ter-912n.pcf.gz
lib/X11/fonts/terminus/ter-914b.pcf.gz
lib/X11/fonts/terminus/ter-914n.pcf.gz
lib/X11/fonts/terminus/ter-916b.pcf.gz
lib/X11/fonts/terminus/ter-916n.pcf.gz
+lib/X11/fonts/terminus/ter-918b.pcf.gz
+lib/X11/fonts/terminus/ter-918n.pcf.gz
lib/X11/fonts/terminus/ter-920b.pcf.gz
lib/X11/fonts/terminus/ter-920n.pcf.gz
+lib/X11/fonts/terminus/ter-922b.pcf.gz
+lib/X11/fonts/terminus/ter-922n.pcf.gz
lib/X11/fonts/terminus/ter-924b.pcf.gz
lib/X11/fonts/terminus/ter-924n.pcf.gz
lib/X11/fonts/terminus/ter-928b.pcf.gz
lib/X11/fonts/terminus/ter-928n.pcf.gz
lib/X11/fonts/terminus/ter-932b.pcf.gz
lib/X11/fonts/terminus/ter-932n.pcf.gz
+lib/X11/fonts/terminus/ter-c12b.pcf.gz
lib/X11/fonts/terminus/ter-c12n.pcf.gz
lib/X11/fonts/terminus/ter-c14b.pcf.gz
lib/X11/fonts/terminus/ter-c14n.pcf.gz
lib/X11/fonts/terminus/ter-c16b.pcf.gz
lib/X11/fonts/terminus/ter-c16n.pcf.gz
+lib/X11/fonts/terminus/ter-c18b.pcf.gz
+lib/X11/fonts/terminus/ter-c18n.pcf.gz
lib/X11/fonts/terminus/ter-c20b.pcf.gz
lib/X11/fonts/terminus/ter-c20n.pcf.gz
+lib/X11/fonts/terminus/ter-c22b.pcf.gz
+lib/X11/fonts/terminus/ter-c22n.pcf.gz
lib/X11/fonts/terminus/ter-c24b.pcf.gz
lib/X11/fonts/terminus/ter-c24n.pcf.gz
lib/X11/fonts/terminus/ter-c28b.pcf.gz
lib/X11/fonts/terminus/ter-c28n.pcf.gz
lib/X11/fonts/terminus/ter-c32b.pcf.gz
lib/X11/fonts/terminus/ter-c32n.pcf.gz
+lib/X11/fonts/terminus/ter-d12b.pcf.gz
lib/X11/fonts/terminus/ter-d12n.pcf.gz
lib/X11/fonts/terminus/ter-d14b.pcf.gz
lib/X11/fonts/terminus/ter-d14n.pcf.gz
lib/X11/fonts/terminus/ter-d16b.pcf.gz
lib/X11/fonts/terminus/ter-d16n.pcf.gz
+lib/X11/fonts/terminus/ter-d18b.pcf.gz
+lib/X11/fonts/terminus/ter-d18n.pcf.gz
lib/X11/fonts/terminus/ter-d20b.pcf.gz
lib/X11/fonts/terminus/ter-d20n.pcf.gz
+lib/X11/fonts/terminus/ter-d22b.pcf.gz
+lib/X11/fonts/terminus/ter-d22n.pcf.gz
lib/X11/fonts/terminus/ter-d24b.pcf.gz
lib/X11/fonts/terminus/ter-d24n.pcf.gz
lib/X11/fonts/terminus/ter-d28b.pcf.gz
lib/X11/fonts/terminus/ter-d28n.pcf.gz
lib/X11/fonts/terminus/ter-d32b.pcf.gz
lib/X11/fonts/terminus/ter-d32n.pcf.gz
+lib/X11/fonts/terminus/ter-f12b.pcf.gz
lib/X11/fonts/terminus/ter-f12n.pcf.gz
lib/X11/fonts/terminus/ter-f14b.pcf.gz
lib/X11/fonts/terminus/ter-f14n.pcf.gz
lib/X11/fonts/terminus/ter-f16b.pcf.gz
lib/X11/fonts/terminus/ter-f16n.pcf.gz
+lib/X11/fonts/terminus/ter-f18b.pcf.gz
+lib/X11/fonts/terminus/ter-f18n.pcf.gz
lib/X11/fonts/terminus/ter-f20b.pcf.gz
lib/X11/fonts/terminus/ter-f20n.pcf.gz
+lib/X11/fonts/terminus/ter-f22b.pcf.gz
+lib/X11/fonts/terminus/ter-f22n.pcf.gz
lib/X11/fonts/terminus/ter-f24b.pcf.gz
lib/X11/fonts/terminus/ter-f24n.pcf.gz
lib/X11/fonts/terminus/ter-f28b.pcf.gz
lib/X11/fonts/terminus/ter-f28n.pcf.gz
lib/X11/fonts/terminus/ter-f32b.pcf.gz
lib/X11/fonts/terminus/ter-f32n.pcf.gz
+lib/X11/fonts/terminus/ter-g12b.pcf.gz
lib/X11/fonts/terminus/ter-g12n.pcf.gz
lib/X11/fonts/terminus/ter-g14b.pcf.gz
lib/X11/fonts/terminus/ter-g14n.pcf.gz
lib/X11/fonts/terminus/ter-g16b.pcf.gz
lib/X11/fonts/terminus/ter-g16n.pcf.gz
+lib/X11/fonts/terminus/ter-g18b.pcf.gz
+lib/X11/fonts/terminus/ter-g18n.pcf.gz
lib/X11/fonts/terminus/ter-g20b.pcf.gz
lib/X11/fonts/terminus/ter-g20n.pcf.gz
+lib/X11/fonts/terminus/ter-g22b.pcf.gz
+lib/X11/fonts/terminus/ter-g22n.pcf.gz
lib/X11/fonts/terminus/ter-g24b.pcf.gz
lib/X11/fonts/terminus/ter-g24n.pcf.gz
lib/X11/fonts/terminus/ter-g28b.pcf.gz
lib/X11/fonts/terminus/ter-g28n.pcf.gz
lib/X11/fonts/terminus/ter-g32b.pcf.gz
lib/X11/fonts/terminus/ter-g32n.pcf.gz
+lib/X11/fonts/terminus/ter-k12b.pcf.gz
lib/X11/fonts/terminus/ter-k12n.pcf.gz
lib/X11/fonts/terminus/ter-k14b.pcf.gz
lib/X11/fonts/terminus/ter-k14n.pcf.gz
lib/X11/fonts/terminus/ter-k16b.pcf.gz
lib/X11/fonts/terminus/ter-k16n.pcf.gz
+lib/X11/fonts/terminus/ter-k18b.pcf.gz
+lib/X11/fonts/terminus/ter-k18n.pcf.gz
lib/X11/fonts/terminus/ter-k20b.pcf.gz
lib/X11/fonts/terminus/ter-k20n.pcf.gz
+lib/X11/fonts/terminus/ter-k22b.pcf.gz
+lib/X11/fonts/terminus/ter-k22n.pcf.gz
lib/X11/fonts/terminus/ter-k24b.pcf.gz
lib/X11/fonts/terminus/ter-k24n.pcf.gz
lib/X11/fonts/terminus/ter-k28b.pcf.gz
lib/X11/fonts/terminus/ter-k28n.pcf.gz
lib/X11/fonts/terminus/ter-k32b.pcf.gz
lib/X11/fonts/terminus/ter-k32n.pcf.gz
+lib/X11/fonts/terminus/ter-p12b.pcf.gz
lib/X11/fonts/terminus/ter-p12n.pcf.gz
lib/X11/fonts/terminus/ter-p14b.pcf.gz
lib/X11/fonts/terminus/ter-p14n.pcf.gz
lib/X11/fonts/terminus/ter-p16b.pcf.gz
lib/X11/fonts/terminus/ter-p16n.pcf.gz
+lib/X11/fonts/terminus/ter-p18b.pcf.gz
+lib/X11/fonts/terminus/ter-p18n.pcf.gz
lib/X11/fonts/terminus/ter-p20b.pcf.gz
lib/X11/fonts/terminus/ter-p20n.pcf.gz
+lib/X11/fonts/terminus/ter-p22b.pcf.gz
+lib/X11/fonts/terminus/ter-p22n.pcf.gz
lib/X11/fonts/terminus/ter-p24b.pcf.gz
lib/X11/fonts/terminus/ter-p24n.pcf.gz
lib/X11/fonts/terminus/ter-p28b.pcf.gz
lib/X11/fonts/terminus/ter-p28n.pcf.gz
lib/X11/fonts/terminus/ter-p32b.pcf.gz
lib/X11/fonts/terminus/ter-p32n.pcf.gz
+lib/X11/fonts/terminus/ter-u12b.pcf.gz
lib/X11/fonts/terminus/ter-u12n.pcf.gz
lib/X11/fonts/terminus/ter-u14b.pcf.gz
lib/X11/fonts/terminus/ter-u14n.pcf.gz
lib/X11/fonts/terminus/ter-u16b.pcf.gz
lib/X11/fonts/terminus/ter-u16n.pcf.gz
+lib/X11/fonts/terminus/ter-u18b.pcf.gz
+lib/X11/fonts/terminus/ter-u18n.pcf.gz
lib/X11/fonts/terminus/ter-u20b.pcf.gz
lib/X11/fonts/terminus/ter-u20n.pcf.gz
+lib/X11/fonts/terminus/ter-u22b.pcf.gz
+lib/X11/fonts/terminus/ter-u22n.pcf.gz
lib/X11/fonts/terminus/ter-u24b.pcf.gz
lib/X11/fonts/terminus/ter-u24n.pcf.gz
lib/X11/fonts/terminus/ter-u28b.pcf.gz
lib/X11/fonts/terminus/ter-u28n.pcf.gz
lib/X11/fonts/terminus/ter-u32b.pcf.gz
lib/X11/fonts/terminus/ter-u32n.pcf.gz
+lib/X11/fonts/terminus/ter-x12b.pcf.gz
lib/X11/fonts/terminus/ter-x12n.pcf.gz
lib/X11/fonts/terminus/ter-x14b.pcf.gz
lib/X11/fonts/terminus/ter-x14n.pcf.gz
lib/X11/fonts/terminus/ter-x16b.pcf.gz
lib/X11/fonts/terminus/ter-x16n.pcf.gz
+lib/X11/fonts/terminus/ter-x18b.pcf.gz
+lib/X11/fonts/terminus/ter-x18n.pcf.gz
lib/X11/fonts/terminus/ter-x20b.pcf.gz
lib/X11/fonts/terminus/ter-x20n.pcf.gz
+lib/X11/fonts/terminus/ter-x22b.pcf.gz
+lib/X11/fonts/terminus/ter-x22n.pcf.gz
lib/X11/fonts/terminus/ter-x24b.pcf.gz
lib/X11/fonts/terminus/ter-x24n.pcf.gz
lib/X11/fonts/terminus/ter-x28b.pcf.gz
