[Gsrc-commit] /srv/bzr/gsrc/trunk r1004: clean up freefont and change to building from source with fontforge

[Brandon Invergo]

------------------------------------------------------------
revno: 1004
committer: Brandon Invergo <address@hidden>
branch nick: trunk
timestamp: Sun 2012-10-28 22:50:31 +0100
message:
  clean up freefont and change to building from source with fontforge
added:
  gnu/freefont/config.mk
modified:
  gnu/freefont/Makefile
  gnu/freefont/sha256sums

=== modified file 'gnu/freefont/Makefile'
--- a/gnu/freefont/Makefile     2012-08-20 22:06:02 +0000
+++ b/gnu/freefont/Makefile     2012-10-28 21:50:31 +0000
@@ -1,16 +1,45 @@
-GARNAME = freefont-otf
+GARNAME = freefont
 GARVERSION = 20120503
-
-MASTER_SITES = $(MASTER_GNU)
-MASTER_SUBDIR = freefont/
-
-DISTFILES = $(DISTNAME).tar.gz
-SIGFILES = $(DISTNAME).tar.gz.sig
-
-# BUILDDEPS = 
-# LIBDEPS = 
-
 HOME_URL = http://www.gnu.org/software/freefont/
 DESCRIPTION = Free UCS Outline Fonts
 
-include ../../gar.lib/auto.mk
+######################################################################
+
+MASTER_SITES = $(MASTER_GNU)
+MASTER_SUBDIR = $(GARNAME)/
+DISTFILES = $(GARNAME)-src-$(GARVERSION).tar.gz
+SIGFILES = $(GARNAME)-src-$(GARVERSION).tar.gz.sig
+BUILD_SCRIPTS = $(WORKSRC)/sfd/Makefile
+INSTALL_SCRIPTS = $(BUILD_TARGET)
+
+BUILDDEPS = fontforge
+LIBDEPS = 
+
+######################################################################
+
+include config.mk
+include ../../gar.mk
+
+build-%/Makefile:
+       $(BUILD_ENV) $(MAKE) -C $* $(BUILD_ARGS) $(BUILD_TARGET)
+       $(MAKECOOKIE)
+
+install-all: install-ttf install-otf install-woff
+
+install-ttf:
+       @mkdir -p $(packageprefix)/share/fonts/TTF
+       @install -m644 -t $(packageprefix)/share/fonts/TTF \
+               $(WORKOBJ)/sfd/*.ttf
+       $(MAKECOOKIE)
+
+install-otf:
+       @mkdir -p $(packageprefix)/share/fonts/OTF
+       @install -m644 -t $(packageprefix)/share/fonts/OTF \
+               $(WORKOBJ)/sfd/*.otf
+       $(MAKECOOKIE)
+
+install-woff:
+       @mkdir -p $(packageprefix)/share/fonts/WOFF
+       @install -m644 -t $(packageprefix)/share/fonts/WOFF \
+               $(WORKOBJ)/sfd/*.woff
+       $(MAKECOOKIE)

=== added file 'gnu/freefont/config.mk'
--- a/gnu/freefont/config.mk    1970-01-01 00:00:00 +0000
+++ b/gnu/freefont/config.mk    2012-10-28 21:50:31 +0000
@@ -0,0 +1,7 @@
+## Configuration options for freefont ##
+
+BUILD_OPTS ?=
+
+# Choose which font format(s) to build (otf, ttf, woff, or all)
+BUILD_TARGET ?= all
+

=== modified file 'gnu/freefont/sha256sums'
--- a/gnu/freefont/sha256sums   2012-08-20 22:06:02 +0000
+++ b/gnu/freefont/sha256sums   2012-10-28 21:50:31 +0000
@@ -1,2 +1,2 @@
-3a6c51868c71b006c33c4bcde63d90927e6fcca8f51c965b8ad62d021614a860  
download/freefont-otf-20120503.tar.gz
-d321e69be81e51d3a5d10372e616657084ff9880497c361468764c1263d5b064  
download/freefont-otf-20120503.tar.gz.sig
+0d62e2e22655f841c3ac5fb8c8059a52fe2c09c695d9e8eda9903406e942657a  
download/freefont-src-20120503.tar.gz
+ab373444d4711b8daec8ca8dbef45feec7d552ee2373efe025b9b870811f1e13  
download/freefont-src-20120503.tar.gz.sig