svn commit: r313876 - in head/print/lilypond: . files

[Pietro Cerutti]

Author: gahr
Date: Mon Mar 11 12:37:09 2013
New Revision: 313876
URL: http://svnweb.freebsd.org/changeset/ports/313876

Log:
  - Fix texinfo arguments that cause problem during the build
  - Bison is build-dependency only

Added:
  head/print/lilypond/files/patch-stepmake_stepmake_texinfo-vars.make   (contents, props changed)
Modified:
  head/print/lilypond/Makefile

Modified: head/print/lilypond/Makefile
==============================================================================
--- head/print/lilypond/Makefile	Mon Mar 11 12:36:26 2013	(r313875)
+++ head/print/lilypond/Makefile	Mon Mar 11 12:37:09 2013	(r313876)
@@ -17,11 +17,11 @@ BUILD_DEPENDS=	latex:${PORTSDIR}/print/t
 		${LOCALBASE}/share/ghostscript/fonts/c059033l.pfb:${PORTSDIR}/print/gsfonts
 
 LIB_DEPENDS=	guile:${PORTSDIR}/lang/guile \
-    		gmp:${PORTSDIR}/math/gmp \
+		gmp:${PORTSDIR}/math/gmp \
 		freetype:${PORTSDIR}/print/freetype2
 
 RUN_DEPENDS=	latex:${PORTSDIR}/print/teTeX-base \
-    		mftrace:${PORTSDIR}/print/mftrace \
+		mftrace:${PORTSDIR}/print/mftrace \
 		${LOCALBASE}/lib/X11/fonts/dejavu/DejaVuSans-Bold.ttf:${PORTSDIR}/x11-fonts/dejavu
 
 MAN1=		lilymidi.1 lilypond-book.1 lilypond-invoke-editor.1 \
@@ -41,7 +41,7 @@ INFO=		lilypond-notation \
 		music-glossary \
 		internals
 
-USES=		bison
+USES=		bison:build
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_GHOSTSCRIPT=9
@@ -65,7 +65,6 @@ NOCCACHE=	yes
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
 
-.include <bsd.port.pre.mk>
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
@@ -84,4 +83,4 @@ post-patch:
 post-install:
 	@${LN} -fs ${DATADIR}/${PORTVERSION} ${DATADIR}/current
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Added: head/print/lilypond/files/patch-stepmake_stepmake_texinfo-vars.make
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/print/lilypond/files/patch-stepmake_stepmake_texinfo-vars.make	Mon Mar 11 12:37:09 2013	(r313876)
@@ -0,0 +1,11 @@
+--- stepmake/stepmake/texinfo-vars.make.orig	2013-01-04 06:41:56.000000000 -0700
++++ stepmake/stepmake/texinfo-vars.make	2013-03-04 18:44:15.000000000 -0700
+@@ -33,7 +33,7 @@
+ 
+ DOCUMENTATION_INCLUDES += -I $(top-src-dir)/Documentation
+ 
+-MAKEINFO_FLAGS += --enable-encoding --error-limit=0 $(DOCUMENTATION_INCLUDES)
++MAKEINFO_FLAGS += --enable-encoding --force $(DOCUMENTATION_INCLUDES)
+ MAKEINFO = LANG= $(MAKEINFO_PROGRAM) $(MAKEINFO_FLAGS)
+ 
+ # texi2html xref map files