Module Name: src
Committed By: tls
Date: Sun Aug 10 07:00:45 UTC 2014
Modified Files:
src/x11/share/fonts/bdf [tls-earlyentropy]: Makefile.bdf
src/x11/share/fonts/encodings [tls-earlyentropy]: Makefile.enc
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.8.2.1 src/x11/share/fonts/bdf/Makefile.bdf
cvs rdiff -u -r1.9 -r1.9.2.1 src/x11/share/fonts/encodings/Makefile.enc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/x11/share/fonts/bdf/Makefile.bdf
diff -u src/x11/share/fonts/bdf/Makefile.bdf:1.8 src/x11/share/fonts/bdf/Makefile.bdf:1.8.2.1
--- src/x11/share/fonts/bdf/Makefile.bdf:1.8 Mon Jan 27 08:18:08 2014
+++ src/x11/share/fonts/bdf/Makefile.bdf Sun Aug 10 07:00:45 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bdf,v 1.8 2014/01/27 08:18:08 apb Exp $
+# $NetBSD: Makefile.bdf,v 1.8.2.1 2014/08/10 07:00:45 tls Exp $
# Font files built using this makefile are cleaned in two ways:
#
@@ -17,7 +17,7 @@ FILESDIR= ${X11FONTDIR}/${FONTSUBDIR}
.PATH: ${X11SRCDIR.xc}/fonts/bdf/${FONTSUBDIR}
FONTSUFFIX= .gz
-FONTGZIP= | ${TOOL_GZIP} ${GZIPLEVEL:U-9} -ncf
+FONTGZIP= | ${TOOL_GZIP_N} ${GZIPLEVEL:U-9} -cf
.include "${NETBSDSRCDIR}/x11/tools/bdftopcf/Makefile.bdftopcf"
.include "${NETBSDSRCDIR}/x11/tools/ucs2any/Makefile.ucs2any"
Index: src/x11/share/fonts/encodings/Makefile.enc
diff -u src/x11/share/fonts/encodings/Makefile.enc:1.9 src/x11/share/fonts/encodings/Makefile.enc:1.9.2.1
--- src/x11/share/fonts/encodings/Makefile.enc:1.9 Mon Jan 27 08:18:08 2014
+++ src/x11/share/fonts/encodings/Makefile.enc Sun Aug 10 07:00:45 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.enc,v 1.9 2014/01/27 08:18:08 apb Exp $
+# $NetBSD: Makefile.enc,v 1.9.2.1 2014/08/10 07:00:45 tls Exp $
FILESDIR= ${X11FONTDIR}/${ENCDIR}
.PATH: ${X11SRCDIR.xc}/fonts/${ENCDIR}
@@ -11,7 +11,7 @@ CLEANFILES+= ${GZFILES:S/.gz$/.gz.tmp/}
.SUFFIXES: .enc .enc.gz
.enc.enc.gz:
${_MKTARGET_CREATE}
- ${TOOL_GZIP} -9nfc ${.IMPSRC} > ${.TARGET}.tmp \
+ ${TOOL_GZIP_N} -9fc ${.IMPSRC} > ${.TARGET}.tmp \
&& mv ${.TARGET}.tmp ${.TARGET}
