--- a/open-src/font/Makefile.bdf Sat Nov 20 17:51:15 2010 -0800
+++ b/open-src/font/Makefile.bdf Mon Nov 22 13:28:12 2010 -0800
@@ -73,37 +73,22 @@
BUILD_TYPES = core $(BDF_SUBDIR_ENCODINGS)
BUILD_TYPES_SET = yes
-DISABLE_ALL_ENCODINGS = $(ALL_ENCODINGS:%=--disable-%)
core_ENCODING_CONFIG_OPTS = $(BDF_SUBDIR_ENCODINGS:%=--disable-%)
-iso8859-1_ENCODING_CONFIG_OPTS = \
- $(DISABLE_ALL_ENCODINGS:--disable-iso8859-1=--enable-iso8859-1)
-iso8859-2_ENCODING_CONFIG_OPTS = \
- $(DISABLE_ALL_ENCODINGS:--disable-iso8859-2=--enable-iso8859-2)
-iso8859-3_ENCODING_CONFIG_OPTS = \
- $(DISABLE_ALL_ENCODINGS:--disable-iso8859-3=--enable-iso8859-3)
-iso8859-4_ENCODING_CONFIG_OPTS = \
- $(DISABLE_ALL_ENCODINGS:--disable-iso8859-4=--enable-iso8859-4)
-iso8859-5_ENCODING_CONFIG_OPTS = \
- $(DISABLE_ALL_ENCODINGS:--disable-iso8859-5=--enable-iso8859-5)
-iso8859-7_ENCODING_CONFIG_OPTS = \
- $(DISABLE_ALL_ENCODINGS:--disable-iso8859-7=--enable-iso8859-7)
-iso8859-8_ENCODING_CONFIG_OPTS = \
- $(DISABLE_ALL_ENCODINGS:--disable-iso8859-8=--enable-iso8859-8)
-iso8859-9_ENCODING_CONFIG_OPTS = \
- $(DISABLE_ALL_ENCODINGS:--disable-iso8859-9=--enable-iso8859-9)
-iso8859-10_ENCODING_CONFIG_OPTS = \
- $(DISABLE_ALL_ENCODINGS:--disable-iso8859-10=--enable-iso8859-10)
-iso8859-11_ENCODING_CONFIG_OPTS = \
- $(DISABLE_ALL_ENCODINGS:--disable-iso8859-11=--enable-iso8859-11)
-iso8859-13_ENCODING_CONFIG_OPTS = \
- $(DISABLE_ALL_ENCODINGS:--disable-iso8859-13=--enable-iso8859-13)
-iso8859-14_ENCODING_CONFIG_OPTS = \
- $(DISABLE_ALL_ENCODINGS:--disable-iso8859-14=--enable-iso8859-14)
-iso8859-15_ENCODING_CONFIG_OPTS = \
- $(DISABLE_ALL_ENCODINGS:--disable-iso8859-15=--enable-iso8859-15)
-iso8859-16_ENCODING_CONFIG_OPTS = \
- $(DISABLE_ALL_ENCODINGS:--disable-iso8859-16=--enable-iso8859-16)
+ iso8859-1_ENCODING_CONFIG_OPTS = --disable-all-encodings --enable-iso8859-1
+ iso8859-2_ENCODING_CONFIG_OPTS = --disable-all-encodings --enable-iso8859-2
+ iso8859-3_ENCODING_CONFIG_OPTS = --disable-all-encodings --enable-iso8859-3
+ iso8859-4_ENCODING_CONFIG_OPTS = --disable-all-encodings --enable-iso8859-4
+ iso8859-5_ENCODING_CONFIG_OPTS = --disable-all-encodings --enable-iso8859-5
+ iso8859-7_ENCODING_CONFIG_OPTS = --disable-all-encodings --enable-iso8859-7
+ iso8859-8_ENCODING_CONFIG_OPTS = --disable-all-encodings --enable-iso8859-8
+ iso8859-9_ENCODING_CONFIG_OPTS = --disable-all-encodings --enable-iso8859-9
+iso8859-10_ENCODING_CONFIG_OPTS = --disable-all-encodings --enable-iso8859-10
+iso8859-11_ENCODING_CONFIG_OPTS = --disable-all-encodings --enable-iso8859-11
+iso8859-13_ENCODING_CONFIG_OPTS = --disable-all-encodings --enable-iso8859-13
+iso8859-14_ENCODING_CONFIG_OPTS = --disable-all-encodings --enable-iso8859-14
+iso8859-15_ENCODING_CONFIG_OPTS = --disable-all-encodings --enable-iso8859-15
+iso8859-16_ENCODING_CONFIG_OPTS = --disable-all-encodings --enable-iso8859-16
ENCODED_FONTSUBDIR = $(FONTSUBDIR)-$(BUILD_TYPE:iso%=ISO%)
--- a/open-src/font/adobe-100dpi/Makefile Sat Nov 20 17:51:15 2010 -0800
+++ b/open-src/font/adobe-100dpi/Makefile Mon Nov 22 13:28:12 2010 -0800
@@ -27,11 +27,11 @@
MODULE_NAME=font-adobe-100dpi
# Version number (used in path names)
-MODULE_VERSION=1.0.1
+MODULE_VERSION = 1.0.3
# Checksums for upstream tarball
-TARBALL_MD5 = c754c3f4a5e08442bf6972b9466625ed
-TARBALL_SHA1 = 814baccf5cf6c6545b7e8f3bbbad377be369042d
+TARBALL_MD5 = 1347c3031b74c9e91dc4dfa53b12f143
+TARBALL_SHA1 = 53311cbd604f18bd9570727105a4222473d363e3
# Subdirectory of $(FONTDIR) to install fonts in
FONTSUBDIR=100dpi
--- a/open-src/font/adobe-75dpi/Makefile Sat Nov 20 17:51:15 2010 -0800
+++ b/open-src/font/adobe-75dpi/Makefile Mon Nov 22 13:28:12 2010 -0800
@@ -27,11 +27,11 @@
MODULE_NAME=font-adobe-75dpi
# Version number (used in path names)
-MODULE_VERSION=1.0.1
+MODULE_VERSION = 1.0.3
# Checksums for upstream tarball
-TARBALL_MD5 = a47681c97bd012196691c95e34d400f1
-TARBALL_SHA1 = 3cbed8a4a3a6bbe6ccd3d6e07a238f8c9ab7a26c
+TARBALL_MD5 = 6c9f26c92393c0756f3e8d614713495b
+TARBALL_SHA1 = 6a2ec569336b5646682a14eee3c7790274beffd1
# Subdirectory of $(FONTDIR) to install fonts in
FONTSUBDIR=75dpi
--- a/open-src/font/adobe-utopia-100dpi/Makefile Sat Nov 20 17:51:15 2010 -0800
+++ b/open-src/font/adobe-utopia-100dpi/Makefile Mon Nov 22 13:28:12 2010 -0800
@@ -31,11 +31,11 @@
MODULE_LICENSE_SET = yes
# Version number (used in path names)
-MODULE_VERSION=1.0.2
+MODULE_VERSION = 1.0.4
# Checksums for upstream tarball
-TARBALL_MD5 = 1c3a2c26bd3f6e406fbadc7380efa369
-TARBALL_SHA1 = e692c3d3933c47c69656be0fd0f06218c2db138d
+TARBALL_MD5 = 66fb6de561648a6dce2755621d6aea17
+TARBALL_SHA1 = 9e80cf5bbd5522a5cfad2a9f8f8fce86de0f0226
# Subdirectory of $(FONTDIR) to install fonts in
FONTSUBDIR=100dpi
--- a/open-src/font/adobe-utopia-75dpi/Makefile Sat Nov 20 17:51:15 2010 -0800
+++ b/open-src/font/adobe-utopia-75dpi/Makefile Mon Nov 22 13:28:12 2010 -0800
@@ -31,11 +31,11 @@
MODULE_LICENSE_SET = yes
# Version number (used in path names)
-MODULE_VERSION=1.0.2
+MODULE_VERSION = 1.0.4
# Checksums for upstream tarball
-TARBALL_MD5 = 71dffebeeb702d10876555c361fb69cf
-TARBALL_SHA1 = 2db08c2e0186831e4d68f7a2ffb2f9fe598a7280
+TARBALL_MD5 = e99276db3e7cef6dccc8a57bc68aeba7
+TARBALL_SHA1 = 50e837322a09f1a7c40fb78fc6aad1a157284507
# Subdirectory of $(FONTDIR) to install fonts in
FONTSUBDIR=75dpi
--- a/open-src/font/adobe-utopia-type1/Makefile Sat Nov 20 17:51:15 2010 -0800
+++ b/open-src/font/adobe-utopia-type1/Makefile Mon Nov 22 13:28:12 2010 -0800
@@ -35,11 +35,11 @@
MODULE_PKGNAME_SET=yes
# Version number (used in path names)
-MODULE_VERSION=1.0.2
+MODULE_VERSION = 1.0.4
# Checksums for upstream tarball
-TARBALL_MD5 = ad945b19b2db64dec3a19507848ff63b
-TARBALL_SHA1 = 565cb66523f59f02da02aa9e74604634a2113643
+TARBALL_MD5 = fcf24554c348df3c689b91596d7f9971
+TARBALL_SHA1 = 3113cfafb91c2c53df6a1fae57dca6c50fb8ce20
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES=
--- a/open-src/font/alias/Makefile Sat Nov 20 17:51:15 2010 -0800
+++ b/open-src/font/alias/Makefile Mon Nov 22 13:28:12 2010 -0800
@@ -31,11 +31,11 @@
MODULE_PKGNAME_SET=yes
# Version number (used in path names)
-MODULE_VERSION=1.0.2
+MODULE_VERSION = 1.0.3
# Checksums for upstream tarball
-TARBALL_MD5 = 9d40dba6fb8cb58dacb433fc7bcaafca
-TARBALL_SHA1 = 9a0e97d974349e3a943b0ab77015f115f15d34c3
+TARBALL_MD5 = 6d25f64796fef34b53b439c2e9efa562
+TARBALL_SHA1 = 96b0aa38f88a54ef32ab85d3eef6f29b0437f70d
### Include common rulesets
include ../Makefile.inc
--- a/open-src/font/arabic-misc/Makefile Sat Nov 20 17:51:15 2010 -0800
+++ b/open-src/font/arabic-misc/Makefile Mon Nov 22 13:28:12 2010 -0800
@@ -31,11 +31,11 @@
MODULE_PKGNAME_SET=yes
# Version number (used in path names)
-MODULE_VERSION=1.0.1
+MODULE_VERSION = 1.0.3
# Checksums for upstream tarball
-TARBALL_MD5 = 817ceb99636c873ad7679fe2a468678d
-TARBALL_SHA1 = d11a7bdce7500c3ccc2fe59505f2bc89e4c7aa2a
+TARBALL_MD5 = cc0726e4a277d6ed93b8e09c1f195470
+TARBALL_SHA1 = 322ae41e74deea8de11fa077fd0e0191927a667c
### Include common rulesets
include ../Makefile.inc
--- a/open-src/font/bh-100dpi/Makefile Sat Nov 20 17:51:15 2010 -0800
+++ b/open-src/font/bh-100dpi/Makefile Mon Nov 22 13:28:12 2010 -0800
@@ -31,11 +31,11 @@
MODULE_LICENSE_SET = yes
# Version number (used in path names)
-MODULE_VERSION=1.0.1
+MODULE_VERSION = 1.0.3
# Checksums for upstream tarball
-TARBALL_MD5 = 8af580b87e17ddacdf0ce3d775248387
-TARBALL_SHA1 = 4f3edda5dd35145cbd1ce8759e0a999b3a04f9c0
+TARBALL_MD5 = 9f11ade089d689b9d59e0f47d26f39cd
+TARBALL_SHA1 = 47d5e50be9e78695017650a088da52bfcf1eeb40
# Subdirectory of $(FONTDIR) to install fonts in
FONTSUBDIR=100dpi
--- a/open-src/font/bh-75dpi/Makefile Sat Nov 20 17:51:15 2010 -0800
+++ b/open-src/font/bh-75dpi/Makefile Mon Nov 22 13:28:12 2010 -0800
@@ -31,11 +31,11 @@
MODULE_LICENSE_SET = yes
# Version number (used in path names)
-MODULE_VERSION=1.0.1
+MODULE_VERSION = 1.0.3
# Checksums for upstream tarball
-TARBALL_MD5 = 53785d2688392aec5cba79fc0ddb23a2
-TARBALL_SHA1 = 7b891d5bfd966c405c19574bca8f87b8803146d1
+TARBALL_MD5 = 565494fc3b6ac08010201d79c677a7a7
+TARBALL_SHA1 = 7290567d42a0f5adb6a3ad170524bb7ed59871d7
# Subdirectory of $(FONTDIR) to install fonts in
FONTSUBDIR=75dpi
--- a/open-src/font/bh-lucidatypewriter-100dpi/Makefile Sat Nov 20 17:51:15 2010 -0800
+++ b/open-src/font/bh-lucidatypewriter-100dpi/Makefile Mon Nov 22 13:28:12 2010 -0800
@@ -31,11 +31,11 @@
MODULE_LICENSE_SET = yes
# Version number (used in path names)
-MODULE_VERSION=1.0.1
+MODULE_VERSION = 1.0.3
# Checksums for upstream tarball
-TARBALL_MD5 = a2b3951dbc6ddb2e4c7e09519dd13333
-TARBALL_SHA1 = a1c9d28a619358092f7196473ff3e0f0dc5304d0
+TARBALL_MD5 = c8b73a53dcefe3e8d3907d3500e484a9
+TARBALL_SHA1 = bc4f804e49db8c6add04f52ffb1c0cd63e714b2c
# Subdirectory of $(FONTDIR) to install fonts in
FONTSUBDIR=100dpi
--- a/open-src/font/bh-lucidatypewriter-75dpi/Makefile Sat Nov 20 17:51:15 2010 -0800
+++ b/open-src/font/bh-lucidatypewriter-75dpi/Makefile Mon Nov 22 13:28:12 2010 -0800
@@ -31,11 +31,11 @@
MODULE_LICENSE_SET = yes
# Version number (used in path names)
-MODULE_VERSION=1.0.1
+MODULE_VERSION = 1.0.3
# Checksums for upstream tarball
-TARBALL_MD5 = 6397062f2b346ce5bbe5472f3353a9a9
-TARBALL_SHA1 = 26efd25d2802c8406a96ccc3240b2c14e511d49f
+TARBALL_MD5 = f6d65758ac9eb576ae49ab24c5e9019a
+TARBALL_SHA1 = 3c6678e6bbb2bd352baaf610a8f6aac9c5140c85
# Subdirectory of $(FONTDIR) to install fonts in
FONTSUBDIR=75dpi
--- a/open-src/font/bh-ttf/Makefile Sat Nov 20 17:51:15 2010 -0800
+++ b/open-src/font/bh-ttf/Makefile Mon Nov 22 13:28:12 2010 -0800
@@ -31,11 +31,11 @@
MODULE_LICENSE_SET = yes
# Version number (used in path names)
-MODULE_VERSION=1.0.1
+MODULE_VERSION = 1.0.3
# Checksums for upstream tarball
-TARBALL_MD5 = 664df71cb510b744b4a10e778445c37b
-TARBALL_SHA1 = 0e9ffbc738072ca832cdf5f82bff071c67b71825
+TARBALL_MD5 = e8ca58ea0d3726b94fe9f2c17344be60
+TARBALL_SHA1 = f42ebd527096011040a312e0f9cdf78d64177419
# pkg(5) name we deliver the files in (override default)
MODULE_PKGNAME=system/font/truetype/bh-luxi
@@ -45,5 +45,8 @@
MODULE_FONTDIR = $(TRUETYPE_FONT_DIR)/bh-luxi
FONTPATH_LINKS = bh-luxi:pri=42
+# Set correct path for fontconfig files
+MODULE_CONFIG_OPTS = --with-fc-confdir=/etc/fonts
+
### Include common rulesets
include ../Makefile.inc
--- a/open-src/font/bh-type1/Makefile Sat Nov 20 17:51:15 2010 -0800
+++ b/open-src/font/bh-type1/Makefile Mon Nov 22 13:28:12 2010 -0800
@@ -35,11 +35,11 @@
MODULE_PKGNAME_SET=yes
# Version number (used in path names)
-MODULE_VERSION=1.0.1
+MODULE_VERSION = 1.0.3
# Checksums for upstream tarball
-TARBALL_MD5 = 374d954c61363206c93d1ce7e9445c31
-TARBALL_SHA1 = b960d8523b02d4401dc6e1257f68dc120761ee4b
+TARBALL_MD5 = 53ed9a42388b7ebb689bdfc374f96a22
+TARBALL_SHA1 = 69ff038d38015cd305a4cd4d1a921fe3bd08bbde
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES=
--- a/open-src/font/bitstream-100dpi/Makefile Sat Nov 20 17:51:15 2010 -0800
+++ b/open-src/font/bitstream-100dpi/Makefile Mon Nov 22 13:28:12 2010 -0800
@@ -31,11 +31,11 @@
MODULE_PKGNAME_SET=yes
# Version number (used in path names)
-MODULE_VERSION=1.0.1
+MODULE_VERSION = 1.0.3
# Checksums for upstream tarball
-TARBALL_MD5 = 3b8748f8029c53595e4a4a1b23fa790a
-TARBALL_SHA1 = ba163df365a591de5eb9e45fa302059d572dd171
+TARBALL_MD5 = 6b223a54b15ecbd5a1bc52312ad790d8
+TARBALL_SHA1 = 138376f8683c09b9068c7c124842a7af9f0fcc2e
### Include common rulesets
include ../Makefile.inc
--- a/open-src/font/bitstream-75dpi/Makefile Sat Nov 20 17:51:15 2010 -0800
+++ b/open-src/font/bitstream-75dpi/Makefile Mon Nov 22 13:28:12 2010 -0800
@@ -31,11 +31,11 @@
MODULE_PKGNAME_SET=yes
# Version number (used in path names)
-MODULE_VERSION=1.0.1
+MODULE_VERSION = 1.0.3
# Checksums for upstream tarball
-TARBALL_MD5 = aed54fb53d2d24aff10c92985286d1e5
-TARBALL_SHA1 = 43344b8ff3b2c2fda8d4cdbcc12c0688b2e04789
+TARBALL_MD5 = d7c0588c26fac055c0dd683fdd65ac34
+TARBALL_SHA1 = 975e9f7872483394ebd87610f8bbc924d99bea34
### Include common rulesets
include ../Makefile.inc
--- a/open-src/font/bitstream-type1/Makefile Sat Nov 20 17:51:15 2010 -0800
+++ b/open-src/font/bitstream-type1/Makefile Mon Nov 22 13:28:12 2010 -0800
@@ -35,11 +35,11 @@
MODULE_PKGNAME_SET=yes
# Version number (used in path names)
-MODULE_VERSION=1.0.1
+MODULE_VERSION = 1.0.3
# Checksums for upstream tarball
-TARBALL_MD5 = a4e8e229a051c0ede9eb525e4006d93a
-TARBALL_SHA1 = 53800b904fc3ead6b577a34fb7c1f96c1af4423f
+TARBALL_MD5 = 5e0c9895d69d2632e2170114f8283c11
+TARBALL_SHA1 = 7633551be3525c501278e81259b22ad9a893de4d
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES=
--- a/open-src/font/cronyx-cyrillic/Makefile Sat Nov 20 17:51:15 2010 -0800
+++ b/open-src/font/cronyx-cyrillic/Makefile Mon Nov 22 13:28:12 2010 -0800
@@ -31,11 +31,11 @@
MODULE_PKGTAIL_SET=yes
# Version number (used in path names)
-MODULE_VERSION=1.0.1
+MODULE_VERSION = 1.0.3
# Checksums for upstream tarball
-TARBALL_MD5 = 15f86f5e572df21218617982eb4b3bfc
-TARBALL_SHA1 = dfff5974629dab97677a70fa20e21c2cf48071a0
+TARBALL_MD5 = e452b94b59b9cfd49110bb49b6267fba
+TARBALL_SHA1 = e5af8c2e8fb23955808a08bd38728ab3ad284d61
### Include common rulesets
include ../Makefile.inc
--- a/open-src/font/cursor-misc/Makefile Sat Nov 20 17:51:15 2010 -0800
+++ b/open-src/font/cursor-misc/Makefile Mon Nov 22 13:28:12 2010 -0800
@@ -31,11 +31,11 @@
MODULE_PKGNAME_SET=yes
# Version number (used in path names)
-MODULE_VERSION=1.0.1
+MODULE_VERSION = 1.0.3
# Checksums for upstream tarball
-TARBALL_MD5 = 13c21c4d74155c662152a1a74f249d96
-TARBALL_SHA1 = 5087a94e74f8157cb6989f71fb3b4815b236065a
+TARBALL_MD5 = 3e0069d4f178a399cffe56daa95c2b63
+TARBALL_SHA1 = 1649271129bbeff3aeee70a9da87a8e5e59162c1
### Include common rulesets
include ../Makefile.inc
--- a/open-src/font/daewoo-misc/Makefile Sat Nov 20 17:51:15 2010 -0800
+++ b/open-src/font/daewoo-misc/Makefile Mon Nov 22 13:28:12 2010 -0800
@@ -31,11 +31,11 @@
MODULE_LICENSE_SET = yes
# Version number (used in path names)
-MODULE_VERSION=1.0.1
+MODULE_VERSION = 1.0.3
# Checksums for upstream tarball
-TARBALL_MD5 = 05597e2b193a7b7de2ca525468276b1d
-TARBALL_SHA1 = d169cec4e92fe1e99f3ff6766d4c6edcbb808860
+TARBALL_MD5 = 0571bf77f8fab465a5454569d9989506
+TARBALL_SHA1 = 0c7b24e08e6d42eb006d79ae7ab4bbf446d59f7a
# Install to separate directory for easier packaging
MODULE_FONTDIR = $(X11_FONT_DIR)/daewoo
--- a/open-src/font/dec-misc/Makefile Sat Nov 20 17:51:15 2010 -0800
+++ b/open-src/font/dec-misc/Makefile Mon Nov 22 13:28:12 2010 -0800
@@ -31,11 +31,11 @@
MODULE_PKGNAME_SET=yes
# Version number (used in path names)
-MODULE_VERSION=1.0.1
+MODULE_VERSION = 1.0.3
# Checksums for upstream tarball
-TARBALL_MD5 = 05714516824c680ce747c6ef9d2fbbdd
-TARBALL_SHA1 = 2489d19650f2a787b476dab2fa2412d20b95f38e
+TARBALL_MD5 = 6e7c5108f1b16d7a1c7b2c9760edd6e5
+TARBALL_SHA1 = a748d35b8b0241abd3e1d85f80da318b529a74d0
### Include common rulesets
include ../Makefile.inc
--- a/open-src/font/encodings/Makefile Sat Nov 20 17:51:15 2010 -0800
+++ b/open-src/font/encodings/Makefile Mon Nov 22 13:28:12 2010 -0800
@@ -31,11 +31,11 @@
MODULE_PKGNAME_SET=yes
# Version number (used in path names)
-MODULE_VERSION=1.0.3
+MODULE_VERSION = 1.0.4
# Checksums for upstream tarball
-TARBALL_MD5 = 29637480e7ce12546668631067c19ced
-TARBALL_SHA1 = 615b8367ee20fc50688e4876aa250419927d64cc
+TARBALL_MD5 = 0f2d6546d514c5cc4ecf78a60657a5c1
+TARBALL_SHA1 = 24ace2470403f85a0d393769204029bd8247992a
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES=
--- a/open-src/font/ibm-type1/Makefile Sat Nov 20 17:51:15 2010 -0800
+++ b/open-src/font/ibm-type1/Makefile Mon Nov 22 13:28:12 2010 -0800
@@ -36,11 +36,11 @@
MODULE_PKGNAME_SET=yes
# Version number (used in path names)
-MODULE_VERSION=1.0.1
+MODULE_VERSION = 1.0.3
# Checksums for upstream tarball
-TARBALL_MD5 = 1646179ff224b3e2c9b1e7f59042897f
-TARBALL_SHA1 = 9bcf72bcabfcbe218ad3a96ba2a45e92ef9efbc3
+TARBALL_MD5 = bfb2593d2102585f45daa960f43cb3c4
+TARBALL_SHA1 = bfc7d0a3aa0f96bf61ea26d6b3f5afbbdd0f35f6
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES=
--- a/open-src/font/isas-misc/Makefile Sat Nov 20 17:51:15 2010 -0800
+++ b/open-src/font/isas-misc/Makefile Mon Nov 22 13:28:12 2010 -0800
@@ -27,11 +27,11 @@
MODULE_NAME=font-isas-misc
# Version number (used in path names)
-MODULE_VERSION=1.0.1
+MODULE_VERSION = 1.0.3
# Checksums for upstream tarball
-TARBALL_MD5 = 88b5b32c5a27576e9d00675bcc966806
-TARBALL_SHA1 = 13fe07a669dd93dfdb08717a03efe47936ab9cea
+TARBALL_MD5 = a2401caccbdcf5698e001784dbd43f1a
+TARBALL_SHA1 = cbd9bf441b25362123c817b1aa7a7be1ee4a9321
# Install to separate directory for easier packaging
MODULE_FONTDIR = $(X11_FONT_DIR)/isas
--- a/open-src/font/jis-misc/Makefile Sat Nov 20 17:51:15 2010 -0800
+++ b/open-src/font/jis-misc/Makefile Mon Nov 22 13:28:12 2010 -0800
@@ -31,11 +31,11 @@
MODULE_LICENSE_SET = yes
# Version number (used in path names)
-MODULE_VERSION=1.0.1
+MODULE_VERSION = 1.0.3
# Checksums for upstream tarball
-TARBALL_MD5 = 5835c99d056f4a29d7d6a5ae873cf00e
-TARBALL_SHA1 = adb3275d19e71e9553aa8a5fdc3b2c647277d8d4
+TARBALL_MD5 = cb7b57d7800fd9e28ec35d85761ed278
+TARBALL_SHA1 = 8c08c5fe01d4605f2886822cb3655548a6535e58
# Install to separate directory for easier packaging
MODULE_FONTDIR = $(X11_FONT_DIR)/jiskan
--- a/open-src/font/micro-misc/Makefile Sat Nov 20 17:51:15 2010 -0800
+++ b/open-src/font/micro-misc/Makefile Mon Nov 22 13:28:12 2010 -0800
@@ -35,11 +35,11 @@
MODULE_PKGNAME_SET=yes
# Version number (used in path names)
-MODULE_VERSION=1.0.1
+MODULE_VERSION = 1.0.3
# Checksums for upstream tarball
-TARBALL_MD5 = 6350117efebe340f33e818f4a33e4e4b
-TARBALL_SHA1 = 74a8be2b0b6ace97d8841356e88570f5fa3faad6
+TARBALL_MD5 = 143c228286fe9c920ab60e47c1b60b67
+TARBALL_SHA1 = db3e912d41bda20f60b520c19e65bd7134ee1224
### Include common rulesets
include ../Makefile.inc
--- a/open-src/font/misc-cyrillic/Makefile Sat Nov 20 17:51:15 2010 -0800
+++ b/open-src/font/misc-cyrillic/Makefile Mon Nov 22 13:28:12 2010 -0800
@@ -35,11 +35,11 @@
MODULE_PKGTAIL_SET=yes
# Version number (used in path names)
-MODULE_VERSION=1.0.1
+MODULE_VERSION = 1.0.3
# Checksums for upstream tarball
-TARBALL_MD5 = c79d7921d95b2c4f10fad464bb121090
-TARBALL_SHA1 = c178f8a8b6897a8382a0f4315a5b577760ba703c
+TARBALL_MD5 = 96109d0890ad2b6b0e948525ebb0aba8
+TARBALL_SHA1 = 9c0e283ae59e7b05c0798fe0645cc822d22dcb0c
# Link to make in font catalogue dir
FONTPATH_LINKS = cyrillic:pri=75
--- a/open-src/font/misc-ethiopic/Makefile Sat Nov 20 17:51:15 2010 -0800
+++ b/open-src/font/misc-ethiopic/Makefile Mon Nov 22 13:28:12 2010 -0800
@@ -27,11 +27,11 @@
MODULE_NAME=font-misc-ethiopic
# Version number (used in path names)
-MODULE_VERSION=1.0.1
+MODULE_VERSION = 1.0.3
# Checksums for upstream tarball
-TARBALL_MD5 = 4c88c79b8e5d47af90b21e948d42755f
-TARBALL_SHA1 = 2677191fd8b515c53bde6402513249fc0f48d53a
+TARBALL_MD5 = 6306c808f7d7e7d660dfb3859f9091d2
+TARBALL_SHA1 = 3f6af53047cb1206d737e8e8fbbbbb315c5419bb
# Install to separate directory for easier packaging
MODULE_FONTDIR = $(TRUETYPE_FONT_DIR)/ethiopic
--- a/open-src/font/misc-meltho/Makefile Sat Nov 20 17:51:15 2010 -0800
+++ b/open-src/font/misc-meltho/Makefile Mon Nov 22 13:28:12 2010 -0800
@@ -31,11 +31,11 @@
MODULE_LICENSE_SET = yes
# Version number (used in path names)
-MODULE_VERSION=1.0.1
+MODULE_VERSION = 1.0.3
# Checksums for upstream tarball
-TARBALL_MD5 = 345f1a78312e30cd2c41d24ea3f3276f
-TARBALL_SHA1 = d20d9f8ffdeb88b62842b021d5d3d2a8cc31ea2c
+TARBALL_MD5 = e3e7b0fda650adc7eb6964ff3c486b1c
+TARBALL_SHA1 = f0693ea8fbc1d43177014155a0ecd2516348b51b
# Install to separate directory for easier packaging
MODULE_FONTDIR = $(TRUETYPE_FONT_DIR)/syriac
--- a/open-src/font/misc-misc/Makefile Sat Nov 20 17:51:15 2010 -0800
+++ b/open-src/font/misc-misc/Makefile Mon Nov 22 13:28:12 2010 -0800
@@ -31,11 +31,11 @@
MODULE_LICENSE_SET = yes
# Version number (used in path names)
-MODULE_VERSION=1.1.0
+MODULE_VERSION = 1.1.2
# Checksums for upstream tarball
-TARBALL_MD5 = 878bfd4e9f14c1279cea3a8392e0dbdd
-TARBALL_SHA1 = 83c44111b5727c26e52eb915b66dc6c9eba4c458
+TARBALL_MD5 = c88eb44b3b903d79fb44b860a213e623
+TARBALL_SHA1 = c6d28c56880807963175cbbd682fb6f75a35f77d
# Subdirectory of $(FONTDIR) to install fonts in
FONTSUBDIR=misc
--- a/open-src/font/mutt-misc/Makefile Sat Nov 20 17:51:15 2010 -0800
+++ b/open-src/font/mutt-misc/Makefile Mon Nov 22 13:28:12 2010 -0800
@@ -31,11 +31,11 @@
MODULE_PKGNAME_SET=yes
# Version number (used in path names)
-MODULE_VERSION=1.0.1
+MODULE_VERSION = 1.0.3
# Checksums for upstream tarball
-TARBALL_MD5 = aab7ac62b960e77aa11d032bafe1d460
-TARBALL_SHA1 = b677831b477027f56ad3f35c95ef3cd6711f87ac
+TARBALL_MD5 = 56b0296e8862fc1df5cdbb4efe604e86
+TARBALL_SHA1 = 245d3041d9138b7e4a00858228adad2de304043b
### Include common rulesets
include ../Makefile.inc
--- a/open-src/font/schumacher-misc/Makefile Sat Nov 20 17:51:15 2010 -0800
+++ b/open-src/font/schumacher-misc/Makefile Mon Nov 22 13:28:12 2010 -0800
@@ -27,11 +27,11 @@
MODULE_NAME=font-schumacher-misc
# Version number (used in path names)
-MODULE_VERSION=1.1.0
+MODULE_VERSION = 1.1.2
# Checksums for upstream tarball
-TARBALL_MD5 = 86f4b7d8b11a2e6da70884c59b5866a3
-TARBALL_SHA1 = ea7e009e222379fa31a16bdbd4ca5b1e9d412944
+TARBALL_MD5 = e805feb7c4f20e6bfb1118d19d972219
+TARBALL_SHA1 = fbe3629e9dcc03d12300d4ebab64fd038ea98952
# Subdirectory of $(FONTDIR) to install fonts in
FONTSUBDIR=misc
--- a/open-src/font/screen-cyrillic/Makefile Sat Nov 20 17:51:15 2010 -0800
+++ b/open-src/font/screen-cyrillic/Makefile Mon Nov 22 13:28:12 2010 -0800
@@ -31,11 +31,11 @@
MODULE_PKGTAIL_SET=yes
# Version number (used in path names)
-MODULE_VERSION=1.0.2
+MODULE_VERSION = 1.0.4
# Checksums for upstream tarball
-TARBALL_MD5 = c912a976b66073acd80c9d5c624f3aae
-TARBALL_SHA1 = 4795ea77e14246122d21bc0fa68a3c0d5261e39d
+TARBALL_MD5 = 6f3fdcf2454bf08128a651914b7948ca
+TARBALL_SHA1 = de1f0226f74d7e4d3ee9ab0b9c87478ab2a7db30
### Include common rulesets
include ../Makefile.inc
--- a/open-src/font/sony-misc/Makefile Sat Nov 20 17:51:15 2010 -0800
+++ b/open-src/font/sony-misc/Makefile Mon Nov 22 13:28:12 2010 -0800
@@ -31,11 +31,11 @@
MODULE_PKGNAME_SET=yes
# Version number (used in path names)
-MODULE_VERSION=1.0.1
+MODULE_VERSION = 1.0.3
# Checksums for upstream tarball
-TARBALL_MD5 = 7b6f5117814599b86ed3470de6c62aa3
-TARBALL_SHA1 = e9717546682382ebf3e6e7039766fe52bdb8846c
+TARBALL_MD5 = beef61a9b0762aba8af7b736bb961f86
+TARBALL_SHA1 = 8d0dd87148283c8ac8c5ac37906b12fab5ddb1d8
### Include common rulesets
include ../Makefile.inc
--- a/open-src/font/sun-misc/Makefile Sat Nov 20 17:51:15 2010 -0800
+++ b/open-src/font/sun-misc/Makefile Mon Nov 22 13:28:12 2010 -0800
@@ -31,11 +31,11 @@
MODULE_PKGNAME_SET=yes
# Version number (used in path names)
-MODULE_VERSION=1.0.1
+MODULE_VERSION = 1.0.3
# Checksums for upstream tarball
-TARBALL_MD5 = 5a185c5549a650bf062d343e128682ca
-TARBALL_SHA1 = fc91999e66fe479d07ea74e5dd2d950ff02ccb80
+TARBALL_MD5 = 948f2e07810b4f31195185921470f68d
+TARBALL_SHA1 = 6a72602557bb5dfe46c1ee3b56658aeed1e04f9d
### Include common rulesets
include ../Makefile.inc
--- a/open-src/font/util/Makefile Sat Nov 20 17:51:15 2010 -0800
+++ b/open-src/font/util/Makefile Mon Nov 22 13:28:12 2010 -0800
@@ -35,11 +35,11 @@
MODULE_PKGCLASS_SET=yes
# Version number (used in path names)
-MODULE_VERSION=1.1.1
+MODULE_VERSION = 1.2.0
# Checksums for upstream tarball
-TARBALL_MD5 = 5c735ae6916b65186f3c876d76c27ce3
-TARBALL_SHA1 = 6ee3af5466de84d61411e173e578a256aeb1074d
+TARBALL_MD5 = 1bdd8ed070e02b2165d7b0f0ed93280b
+TARBALL_SHA1 = 011fa9c8fe08d9f6f848df570374ed1cb7488146
# Set encoding directory path used during build in fontutil.pc
FIX_PC_FILES = fontutil.pc.in
--- a/open-src/font/winitzki-cyrillic/Makefile Sat Nov 20 17:51:15 2010 -0800
+++ b/open-src/font/winitzki-cyrillic/Makefile Mon Nov 22 13:28:12 2010 -0800
@@ -35,11 +35,11 @@
MODULE_PKGTAIL_SET=yes
# Version number (used in path names)
-MODULE_VERSION=1.0.1
+MODULE_VERSION = 1.0.3
# Checksums for upstream tarball
-TARBALL_MD5 = 92bf4ecb373faac545cef2dcbe40be35
-TARBALL_SHA1 = d19f476710783d784dfdbcb6a1f34ef7746d3439
+TARBALL_MD5 = 829a3159389b7f96f629e5388bfee67b
+TARBALL_SHA1 = 29249b49eac7e3f32d7a1a93808fcfd9d399011c
### Include common rulesets
include ../Makefile.inc
--- a/open-src/font/xfree86-type1/Makefile Sat Nov 20 17:51:15 2010 -0800
+++ b/open-src/font/xfree86-type1/Makefile Mon Nov 22 13:28:12 2010 -0800
@@ -31,11 +31,11 @@
MODULE_PKGNAME_SET=yes
# Version number (used in path names)
-MODULE_VERSION=1.0.2
+MODULE_VERSION = 1.0.4
# Checksums for upstream tarball
-TARBALL_MD5 = a966f5a8aade9e63af86d8a6bf3e8586
-TARBALL_SHA1 = 09a4c9b8455f3f4954bfe9dd991d7fd1d0f5595a
+TARBALL_MD5 = 3eeb3fb44690b477d510bbd8f86cf5aa
+TARBALL_SHA1 = 1381f274a178cbd08627560e17a4a8f6653be3f7
# Patches to apply to source after unpacking, in order
SOURCE_PATCHES=
--- a/pkg/manifests/system-font-truetype-bh-luxi.mf Sat Nov 20 17:51:15 2010 -0800
+++ b/pkg/manifests/system-font-truetype-bh-luxi.mf Mon Nov 22 13:28:12 2010 -0800
@@ -27,11 +27,15 @@
dir path=etc
dir path=etc/X11
dir path=etc/X11/fontpath.d
+dir path=etc/fonts
+dir path=etc/fonts/conf.avail
+dir path=etc/fonts/conf.d
dir path=usr
dir path=usr/share
dir path=usr/share/fonts
dir path=usr/share/fonts/TrueType
dir path=usr/share/fonts/TrueType/bh-luxi
+file path=etc/fonts/conf.avail/42-luxi-mono.conf
file path=usr/share/fonts/TrueType/bh-luxi/fonts.dir
file path=usr/share/fonts/TrueType/bh-luxi/fonts.scale
file path=usr/share/fonts/TrueType/bh-luxi/luximb.ttf
@@ -51,3 +55,5 @@
name="Luxi font family from Bigelow & Holmes"
link path=etc/X11/fontpath.d/bh-luxi:pri=42 \
target=../../../usr/share/fonts/TrueType/bh-luxi
+link path=etc/fonts/conf.d/42-luxi-mono.conf \
+ target=../conf.avail/42-luxi-mono.conf