cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Unbreak for xenocara: don't even run fc-cache, fix WANTLIB (+ expat z).

Browse Source 
While here, remove a bogus patch also related to fc-cache that is
never invoked (target install-fc-cache).

ok, martynas@
This commit is contained in:
kili 2007-04-01 22:07:44 +00:00
parent f4cac52f1e
commit ef8a6de95a
3 changed files with 15 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
print/lilypond/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.6 2007/04/01 16:44:19 sturm Exp $
# $OpenBSD: Makefile,v 1.7 2007/04/01 22:07:44 kili Exp $
#
# Credits to Matt Jibson. He did the initial work on this port and many
# tools it depends on.
@ -11,7 +11,7 @@ COMMENT-docs= "LilyPond documentation"
VERSION= 2.8.8
DISTNAME= lilypond-${VERSION}
DISTNAME-docs= ${DISTNAME}-1.documentation
PKGNAME-main= ${DISTNAME}
PKGNAME-main= ${DISTNAME}p0
PKGNAME-docs= ${DISTNAME:S,-,-docs-,}
CATEGORIES= print
@ -52,7 +52,7 @@ PKG_ARCH-docs= *
LIB_DEPENDS-docs=
RUN_DEPENDS-docs=
WANTLIB-main= c fontconfig freetype m stdc++ X11
WANTLIB-main= c expat fontconfig freetype m stdc++ z X11
MODULES= devel/gettext lang/python
LIB_DEPENDS= guile.>=15,guile-ltdl.>=1::lang/guile \
glib-2.0.>=1000,gmodule-2.0.>=1000,gobject-2.0.>=1000::devel/glib2 \

25
print/lilypond/patches/patch-mf_GNUmakefile
View File

@ -1,21 +1,18 @@
$OpenBSD: patch-mf_GNUmakefile,v 1.1.1.1 2006/10/29 19:27:12 kili Exp $
$OpenBSD: patch-mf_GNUmakefile,v 1.2 2007/04/01 22:07:44 kili Exp $
# Don't pollute everything with font caches.
# Don't run fc-cache.
--- mf/GNUmakefile.orig Tue May 9 12:11:16 2006
+++ mf/GNUmakefile Sat Jun 10 21:01:00 2006
@@ -92,8 +92,8 @@ $(outdir)/fonts.cache-1: $(PFA_FILES) $(
local-install: install-fc-cache
--- mf/GNUmakefile.orig Sun Apr 1 21:44:41 2007
+++ mf/GNUmakefile Sun Apr 1 21:44:22 2007
@@ -112,14 +112,14 @@ PFA_FILES = $(ALL_FONTS:%=$(outdir)/%.pfa)
install-fc-cache:
- $(foreach suff, $(INSTALLATION_OUT_SUFFIXES), rm -f $(DESTDIR)$(INSTALLATION_OUT_DIR$(suff))/fonts.cache-1 && ) true
- fc-cache $(foreach suff, $(INSTALLATION_OUT_SUFFIXES), $(DESTDIR)$(INSTALLATION_OUT_DIR$(suff)))
+ $(foreach suff, 2 5, rm -f $(DESTDIR)$(INSTALLATION_OUT_DIR$(suff))/fonts.cache-1 && ) true
+ fc-cache $(foreach suff, 2 5, $(DESTDIR)$(INSTALLATION_OUT_DIR$(suff)))
# Make tfm files first, log files last,
# so that normally log files aren't made twice
-ALL_GEN_FILES= $(TFM_FILES) $(TEXTABLES) $(TFM_FILES) $(LOG_FILES) $(ENC_FILES) $(LISP_FILES) $(FETA_LIST_FILES) $(OTF_TABLES) $(NCSB_OTFS) $(PFA_FILES) $(OTF_FILES) $(SVG_FILES) $(outdir)/fonts.cache-1
+ALL_GEN_FILES= $(TFM_FILES) $(TEXTABLES) $(TFM_FILES) $(LOG_FILES) $(ENC_FILES) $(LISP_FILES) $(FETA_LIST_FILES) $(OTF_TABLES) $(NCSB_OTFS) $(PFA_FILES) $(OTF_FILES) $(SVG_FILES)
#PRE_INSTALL=$(MAKE) "$(ALL_GEN_FILES)"
ALL_FONTS = $(FETA_FONTS) $(SAUTER_FONTS)
PFA_FILES = $(ALL_FONTS:%=$(outdir)/%.pfa)
@@ -107,7 +107,7 @@ ALL_GEN_FILES= $(TFM_FILES) $(TEXTABLES)
INSTALLATION_DIR=$(local_lilypond_datadir)/fonts/source
INSTALLATION_FILES=$(MF_FILES) $(AF_FILES)

4
print/lilypond/pkg/PLIST-main
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.1 2006/11/26 11:24:29 steven Exp $
@comment $OpenBSD: PLIST-main,v 1.2 2007/04/01 22:07:44 kili Exp $
@pkgpath print/lilypond
bin/abc2ly
bin/convert-ly
@ -49,7 +49,6 @@ share/lilypond/${VERSION}/fonts/otf/emmentaler-18.otf
share/lilypond/${VERSION}/fonts/otf/emmentaler-20.otf
share/lilypond/${VERSION}/fonts/otf/emmentaler-23.otf
share/lilypond/${VERSION}/fonts/otf/emmentaler-26.otf
share/lilypond/${VERSION}/fonts/otf/fonts.cache-1
share/lilypond/${VERSION}/fonts/source/
share/lilypond/${VERSION}/fonts/source/feta-accordion.mf
share/lilypond/${VERSION}/fonts/source/feta-alphabet.mf
@ -225,7 +224,6 @@ share/lilypond/${VERSION}/fonts/type1/feta18.pfa
share/lilypond/${VERSION}/fonts/type1/feta20.pfa
share/lilypond/${VERSION}/fonts/type1/feta23.pfa
share/lilypond/${VERSION}/fonts/type1/feta26.pfa
share/lilypond/${VERSION}/fonts/type1/fonts.cache-1
share/lilypond/${VERSION}/fonts/type1/parmesan11.pfa
share/lilypond/${VERSION}/fonts/type1/parmesan13.pfa
share/lilypond/${VERSION}/fonts/type1/parmesan14.pfa