On Wed, Jun 07, 2006 at 04:35:49PM -0600, Matt Jibson wrote:
> >3. --disable-documentation? Why? Back in Lilypond-2.4 aera it was the
[...]
> I wanted to get the base program running, and building the docs was
> screwing it up. Adding docs was a plan for later.
Then just lets drop the dependency to texinfo for now, o.k.?
> >4. ec-fonts-mftraced: use binaries or build from (MetaFont) source?
>
> Building from source takes a really long time, so why not use the
> pre-packaged binaries that we would end up getting anyway?
Dunno. I just prefer to build them from MF sources for no good
reason -- but IIRC we did discuss this several months ago, so let's
forget about it ;-)
Anyways, below are some diffs to your ec-fonts-mftraced and lilypond
ports.
The former just makes the package architecture-independent and
clears a possibly set environment variable TEXMF on @exec and
@unexec.
The latter removes texinfo, fixes the fonts.cache-1 in every
directory, adds NO_REGRESS, moves python to MODULES, and fixes the
version check for fontforge (you get wrong results when comparing
number such as 20050624000000 and 20060413000000).
Ciao,
Kili
diff -x CVS -rNu ec-fonts-mftraced.matt/Makefile ec-fonts-mftraced/Makefile
--- ec-fonts-mftraced.matt/Makefile Wed Jun 7 06:24:01 2006
+++ ec-fonts-mftraced/Makefile Sat Jun 10 18:18:40 2006
@@ -8,6 +8,7 @@
V= 1.0.12
N= ec-fonts-mftraced
PKGNAME= ${N}-${V}
+PKG_ARCH= *
MAINTAINER= Matt Jibson <[EMAIL PROTECTED]>
diff -x CVS -rNu ec-fonts-mftraced.matt/pkg/PLIST ec-fonts-mftraced/pkg/PLIST
--- ec-fonts-mftraced.matt/pkg/PLIST Wed Jun 7 20:50:00 2006
+++ ec-fonts-mftraced/pkg/PLIST Sat Jun 10 18:17:01 2006
@@ -121,5 +121,5 @@
share/texmf/fonts/type1/public/ec-fonts-mftraced/ectt12.pfa
share/texmf/fonts/type1/public/ec-fonts-mftraced/ectt8.pfa
share/texmf/fonts/type1/public/ec-fonts-mftraced/ectt9.pfa
[EMAIL PROTECTED] TEXMFMAIN=%D/share/texmf %D/bin/mktexlsr
[EMAIL PROTECTED] TEXMFMAIN=%D/share/texmf %D/bin/mktexlsr
[EMAIL PROTECTED] TEXMFMAIN=%D/share/texmf TEXMF= %D/bin/mktexlsr
[EMAIL PROTECTED] TEXMFMAIN=%D/share/texmf TEXMF= %D/bin/mktexlsr
diff -x CVS -rNu lilypond.matt/Makefile lilypond/Makefile
--- lilypond.matt/Makefile Wed Jun 7 06:24:02 2006
+++ lilypond/Makefile Sat Jun 10 20:34:06 2006
@@ -23,33 +23,32 @@
WANTLIB= c m stdc++ fontconfig X11 freetype
-MODULES= gettext
+MODULES= devel/gettext lang/python
-PYTHON_VER= 2.4
-TEXINFO_VER= 4.8
-
LIB_DEPENDS= guile.15:guile-1.6.*:lang/guile \
guile-ltdl.1:guile-1.6.*:lang/guile \
glib-2.0.0.0,gobject-2.0.0.0,gmodule-2.0.0.0::devel/glib2 \
pango-1.0.0.0,pangoft2-1.0.0.0::devel/pango
RUN_DEPENDS= :ec-fonts-mftraced-1.*:print/ec-fonts-mftraced \
- :python-${PYTHON_VER}*:lang/python/${PYTHON_VER} \
:teTeX_base-3.*:print/teTeX/base
BUILD_DEPENDS= mftrace::print/mftrace \
- :texinfo->=${TEXINFO_VER}:textproc/texinfo \
bison-1::devel/bison \
:ghostscript->=8.14:print/ghostscript/afpl \
${RUN_DEPENDS}
+AUTOCONF_VERSION= 2.59
CONFIGURE_STYLE= gnu
-CONFIGURE_ENV= MAKEINFO=${LOCALBASE}/bin/makeinfo${TEXINFO_VER} \
+CONFIGURE_SCRIPT= autogen.sh
+CONFIGURE_ENV= AUTOCONF_VERSION=${AUTOCONF_VERSION} \
+ PYTHON=${MODPY_BIN} \
FLEXLEXER_PATH=/usr/include/g++
-CONFIGURE_ARGS += PYTHON=python${PYTHON_VER} \
- --with-ncsb-dir=/usr/local/lib/X11/fonts/ghostscript \
+CONFIGURE_ARGS += --with-ncsb-dir=/usr/local/lib/X11/fonts/ghostscript \
--disable-documentation
USE_GMAKE= Yes
MAKE_FILE= GNUmakefile
SUBST_VARS+= VERSION
+
+NO_REGRESS= Yes
.include <bsd.port.mk>
diff -x CVS -rNu lilypond.matt/patches/patch-configure_in
lilypond/patches/patch-configure_in
--- lilypond.matt/patches/patch-configure_in Thu Jan 1 01:00:00 1970
+++ lilypond/patches/patch-configure_in Sat Jun 10 18:26:00 2006
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- configure.in.orig Tue May 9 10:16:22 2006
++++ configure.in Sat Jun 10 18:25:54 2006
+@@ -160,7 +160,7 @@ STEPMAKE_PERL(OPTIONAL)
+ # makeinfo should avoid bug reports; if people want to build lily
+ # without the docs, they can find this comment and use an older
+ # makeinfo--but hopefully won't report makeinfo problems.
+-STEPMAKE_PROGS(MAKEINFO, makeinfo, REQUIRED, 4.7)
++# STEPMAKE_PROGS(MAKEINFO, makeinfo, REQUIRED, 4.7)
+
+ AC_DEFINE_UNQUOTED(FLOWER_VERSION, "${FULL_FLOWER_VERSION}")
+
diff -x CVS -rNu lilypond.matt/patches/patch-mf_GNUmakefile
lilypond/patches/patch-mf_GNUmakefile
--- lilypond.matt/patches/patch-mf_GNUmakefile Thu Jan 1 01:00:00 1970
+++ lilypond/patches/patch-mf_GNUmakefile Sat Jun 10 21:01:05 2006
@@ -0,0 +1,23 @@
+$OpenBSD$
+--- 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
+
+ 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)))
+
+ 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)
+
+-INSTALLATION_OUT_SUFFIXES=1 2 3 4 5 6
++INSTALLATION_OUT_SUFFIXES=1 2 3 4 5
+
+ INSTALLATION_OUT_DIR1=$(local_lilypond_datadir)/tex
+ INSTALLATION_OUT_FILES1=$(TEXTABLES)
diff -x CVS -rNu lilypond.matt/patches/patch-stepmake_aclocal_m4
lilypond/patches/patch-stepmake_aclocal_m4
--- lilypond.matt/patches/patch-stepmake_aclocal_m4 Thu Jan 1 01:00:00 1970
+++ lilypond/patches/patch-stepmake_aclocal_m4 Sat Jun 10 18:52:26 2006
@@ -0,0 +1,19 @@
+$OpenBSD$
+--- stepmake/aclocal.m4.orig Tue May 9 09:40:27 2006
++++ stepmake/aclocal.m4 Sat Jun 10 18:52:23 2006
+@@ -47,12 +47,9 @@ AC_DEFUN(STEPMAKE_GET_VERSION, [
+ # Calculate simplistic numeric version from version string ($1)
+ # As yet, we have no need for something more elaborate.
+ AC_DEFUN(STEPMAKE_NUMERIC_VERSION, [
+- echo "$1" | awk -F. '
+- {
+- if ([$]3) {three = [$]3}
+- else {three = 0}
+- }
+- {printf "%.0f\n", [$]1*1000000 + [$]2*1000 + three}'
++ echo "$1" | awk -F. '
++ NF==1 {print; next}
++ {printf "%.0f\n", [$]1*1000000 + [$]2*1000 + [$]3}'
+ ])
+
+
diff -x CVS -rNu lilypond.matt/patches/patch-stepmake_configure_in
lilypond/patches/patch-stepmake_configure_in
--- lilypond.matt/patches/patch-stepmake_configure_in Thu Jan 1 01:00:00 1970
+++ lilypond/patches/patch-stepmake_configure_in Sat Jun 10 18:27:41 2006
@@ -0,0 +1,11 @@
+$OpenBSD$
+--- stepmake/configure.in.orig Sat Nov 16 16:51:43 2002
++++ stepmake/configure.in Sat Jun 10 18:27:37 2006
+@@ -40,6 +40,6 @@ STEPMAKE_LOCALE
+ # AM_PATH_GTK(1.0.0,,AC_MSG_ERROR([please install proper version of gtk]))
+ # AM_PATH_GTK__(0.9.4,,AC_MSG_ERROR([please install proper version of gtk--]))
+
+-AC_CHECK_PROGS(MAKEINFO, makeinfo, error)
++# AC_CHECK_PROGS(MAKEINFO, makeinfo, error)
+
+ STEPMAKE_END
diff -x CVS -rNu lilypond.matt/pkg/PLIST lilypond/pkg/PLIST
--- lilypond.matt/pkg/PLIST Wed Jun 7 06:24:02 2006
+++ lilypond/pkg/PLIST Sat Jun 10 21:24:13 2006
@@ -3,81 +3,14 @@
bin/abc2ly
bin/convert-ly
bin/etf2ly
-bin/fonts.cache-1
bin/lilypond
bin/lilypond-book
bin/lilypond-invoke-editor
bin/midi2ly
bin/musicxml2ly
-fonts.cache-1
-include/X11/fonts.cache-1
-include/fonts.cache-1
-info/fonts.cache-1
-lib/X11/app-defaults/fonts.cache-1
-lib/X11/fonts.cache-1
-lib/fonts.cache-1
lib/lilypond/
lib/lilypond/${VERSION}/
-lib/lilypond/${VERSION}/fonts.cache-1
lib/lilypond/${VERSION}/python/
-lib/lilypond/${VERSION}/python/fonts.cache-1
-lib/lilypond/fonts.cache-1
-libdata/fonts.cache-1
-libdata/perl5/fonts.cache-1
-libdata/perl5/site_perl/fonts.cache-1
-libexec/fonts.cache-1
-man/cat1/fonts.cache-1
-man/cat2/fonts.cache-1
-man/cat3/fonts.cache-1
-man/cat3p/fonts.cache-1
-man/cat4/fonts.cache-1
-man/cat5/fonts.cache-1
-man/cat6/fonts.cache-1
-man/cat7/fonts.cache-1
-man/cat8/fonts.cache-1
-man/cat9/fonts.cache-1
-man/catl/fonts.cache-1
-man/catn/fonts.cache-1
-man/fonts.cache-1
-man/ja_JP.EUC/cat1/fonts.cache-1
-man/ja_JP.EUC/cat2/fonts.cache-1
-man/ja_JP.EUC/cat3/fonts.cache-1
-man/ja_JP.EUC/cat3p/fonts.cache-1
-man/ja_JP.EUC/cat4/fonts.cache-1
-man/ja_JP.EUC/cat5/fonts.cache-1
-man/ja_JP.EUC/cat6/fonts.cache-1
-man/ja_JP.EUC/cat7/fonts.cache-1
-man/ja_JP.EUC/cat8/fonts.cache-1
-man/ja_JP.EUC/cat9/fonts.cache-1
-man/ja_JP.EUC/catl/fonts.cache-1
-man/ja_JP.EUC/catn/fonts.cache-1
-man/ja_JP.EUC/fonts.cache-1
-man/ja_JP.EUC/man1/fonts.cache-1
-man/ja_JP.EUC/man2/fonts.cache-1
-man/ja_JP.EUC/man3/fonts.cache-1
-man/ja_JP.EUC/man4/fonts.cache-1
-man/ja_JP.EUC/man5/fonts.cache-1
-man/ja_JP.EUC/man6/fonts.cache-1
-man/ja_JP.EUC/man7/fonts.cache-1
-man/ja_JP.EUC/man8/fonts.cache-1
-man/ja_JP.EUC/man9/fonts.cache-1
-man/ja_JP.EUC/manl/fonts.cache-1
-man/ja_JP.EUC/mann/fonts.cache-1
-man/man1/fonts.cache-1
-man/man2/fonts.cache-1
-man/man3/fonts.cache-1
-man/man3p/fonts.cache-1
-man/man4/fonts.cache-1
-man/man5/fonts.cache-1
-man/man6/fonts.cache-1
-man/man7/fonts.cache-1
-man/man8/fonts.cache-1
-man/man9/fonts.cache-1
-man/manl/fonts.cache-1
-man/mann/fonts.cache-1
-sbin/fonts.cache-1
-share/dict/fonts.cache-1
-share/doc/fonts.cache-1
share/emacs/
share/emacs/site-lisp/
share/emacs/site-lisp/lilypond-font-lock.el
@@ -86,15 +19,11 @@
share/emacs/site-lisp/lilypond-mode.el
share/emacs/site-lisp/lilypond-what-beat.el
share/emacs/site-lisp/lilypond-words.el
-share/examples/fonts.cache-1
-share/fonts.cache-1
share/lilypond/
share/lilypond/${VERSION}/
share/lilypond/${VERSION}/dvips/
share/lilypond/${VERSION}/dvips/ps
share/lilypond/${VERSION}/fonts/
-share/lilypond/${VERSION}/fonts.cache-1
-share/lilypond/${VERSION}/fonts/fonts.cache-1
share/lilypond/${VERSION}/fonts/otf/
share/lilypond/${VERSION}/fonts/otf/CenturySchL-Bold.otf
share/lilypond/${VERSION}/fonts/otf/CenturySchL-BoldItal.otf
@@ -165,7 +94,6 @@
share/lilypond/${VERSION}/fonts/source/feta20.mf
share/lilypond/${VERSION}/fonts/source/feta23.mf
share/lilypond/${VERSION}/fonts/source/feta26.mf
-share/lilypond/${VERSION}/fonts/source/fonts.cache-1
share/lilypond/${VERSION}/fonts/source/parmesan-accidentals.mf
share/lilypond/${VERSION}/fonts/source/parmesan-clefs.mf
share/lilypond/${VERSION}/fonts/source/parmesan-custodes.mf
@@ -218,7 +146,6 @@
share/lilypond/${VERSION}/fonts/svg/feta20.svg
share/lilypond/${VERSION}/fonts/svg/feta23.svg
share/lilypond/${VERSION}/fonts/svg/feta26.svg
-share/lilypond/${VERSION}/fonts/svg/fonts.cache-1
share/lilypond/${VERSION}/fonts/svg/parmesan11.svg
share/lilypond/${VERSION}/fonts/svg/parmesan13.svg
share/lilypond/${VERSION}/fonts/svg/parmesan14.svg
@@ -253,7 +180,6 @@
share/lilypond/${VERSION}/fonts/tfm/feta20.tfm
share/lilypond/${VERSION}/fonts/tfm/feta23.tfm
share/lilypond/${VERSION}/fonts/tfm/feta26.tfm
-share/lilypond/${VERSION}/fonts/tfm/fonts.cache-1
share/lilypond/${VERSION}/fonts/tfm/parmesan11.tfm
share/lilypond/${VERSION}/fonts/tfm/parmesan13.tfm
share/lilypond/${VERSION}/fonts/tfm/parmesan14.tfm
@@ -340,7 +266,6 @@
share/lilypond/${VERSION}/python/convertrules.pyc
share/lilypond/${VERSION}/python/fontextract.py
share/lilypond/${VERSION}/python/fontextract.pyc
-share/lilypond/${VERSION}/python/fonts.cache-1
share/lilypond/${VERSION}/python/lilylib.py
share/lilypond/${VERSION}/python/lilylib.pyc
share/lilypond/${VERSION}/python/musicexp.py
@@ -446,7 +371,6 @@
share/lilypond/${VERSION}/tex/feta20.tex
share/lilypond/${VERSION}/tex/feta23.tex
share/lilypond/${VERSION}/tex/feta26.tex
-share/lilypond/${VERSION}/tex/fonts.cache-1
share/lilypond/${VERSION}/tex/lily-ps-defs.tex
share/lilypond/${VERSION}/tex/lilypond-tex-metrics.tex
share/lilypond/${VERSION}/tex/lilyponddefs.tex
@@ -471,7 +395,6 @@
share/lilypond/${VERSION}/vim/syntax/lilypond-words
share/lilypond/${VERSION}/vim/syntax/lilypond-words.vim
share/lilypond/${VERSION}/vim/syntax/lilypond.vim
-share/lilypond/fonts.cache-1
share/locale/
share/locale/cs/
share/locale/cs/LC_MESSAGES/
@@ -515,41 +438,3 @@
share/locale/zh_TW/
share/locale/zh_TW/LC_MESSAGES/
share/locale/zh_TW/LC_MESSAGES/lilypond.mo
-share/misc/fonts.cache-1
-share/nls/C/fonts.cache-1
-share/nls/da_DK.ISO_8859-1/fonts.cache-1
-share/nls/de_AT.ISO_8859-1/fonts.cache-1
-share/nls/de_CH.ISO_8859-1/fonts.cache-1
-share/nls/de_DE.ISO_8859-1/fonts.cache-1
-share/nls/el_GR.ISO_8859-7/fonts.cache-1
-share/nls/en_AU.ISO_8859-1/fonts.cache-1
-share/nls/en_CA.ISO_8859-1/fonts.cache-1
-share/nls/en_GB.ISO_8859-1/fonts.cache-1
-share/nls/en_US.ISO_8859-1/fonts.cache-1
-share/nls/es_ES.ISO_8859-1/fonts.cache-1
-share/nls/et_EE.ISO-8859-1/fonts.cache-1
-share/nls/fi_FI.ISO_8859-1/fonts.cache-1
-share/nls/fonts.cache-1
-share/nls/fr_BE.ISO_8859-1/fonts.cache-1
-share/nls/fr_CA.ISO_8859-1/fonts.cache-1
-share/nls/fr_CH.ISO_8859-1/fonts.cache-1
-share/nls/fr_FR.ISO_8859-1/fonts.cache-1
-share/nls/hr_HR.ISO_8859-2/fonts.cache-1
-share/nls/is_IS.ISO_8859-1/fonts.cache-1
-share/nls/it_CH.ISO_8859-1/fonts.cache-1
-share/nls/it_IT.ISO_8859-1/fonts.cache-1
-share/nls/ja_JP.EUC/fonts.cache-1
-share/nls/ko_KR.EUC/fonts.cache-1
-share/nls/lt_LN.ASCII/fonts.cache-1
-share/nls/lt_LN.ISO_8859-1/fonts.cache-1
-share/nls/lt_LN.ISO_8859-2/fonts.cache-1
-share/nls/nl_BE.ISO_8859-1/fonts.cache-1
-share/nls/nl_NL.ISO_8859-1/fonts.cache-1
-share/nls/no_NO.ISO_8859-1/fonts.cache-1
-share/nls/pt_PT.ISO_8859-1/fonts.cache-1
-share/nls/ru_RU.CP866/fonts.cache-1
-share/nls/ru_RU.ISO_8859-5/fonts.cache-1
-share/nls/ru_RU.KOI8-R/fonts.cache-1
-share/nls/sv_SE.ISO_8859-1/fonts.cache-1
-share/nls/uk_UA.KOI8-U/fonts.cache-1
-share/skel/fonts.cache-1
