- fix compilation and installation

- synce pkg-plist
- since 2.0 pfa-fonts are required, remove WITHOUT_PFA_FONTS option
- don't install .info twice
- make documentation optional

PR:		58120
Submitted by:	Patrick Atamaniuk <atamaniuk-ports@frobs.net> (maintainer)
Approved by:	marcus (mentor)

1 files changed, 36 insertions, 19 deletions

diff --git a/print/lilypond/Makefile b/print/lilypond/Makefile
index 20e12b9..80186b1 100644
--- a/print/lilypond/Makefile
+++ b/print/lilypond/Makefile
@@ -5,6 +5,7 @@
 #
 # $NetBSD: Makefile,v 1.1.1.1 2000/10/15 17:32:11 rh Exp $
 # $FreeBSD$
+# $Id: Makefile,v 1.11 2003/11/20 08:32:27 patrick Exp $
 #
 
 PORTNAME=	lilypond
@@ -15,52 +16,72 @@ MASTER_SITES=	ftp://ftp.lilypond.org//pub/LilyPond/v2.0/
 MAINTAINER=	atamaniuk-ports@frobs.net
 COMMENT=	The GNU music typesetter
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/latex:${PORTSDIR}/print/teTeX
+BUILD_DEPENDS=	latex:${PORTSDIR}/print/teTeX \
+		mftrace:${PORTSDIR}/print/mftrace
 LIB_DEPENDS=	guile.15:${PORTSDIR}/lang/guile
+RUN_DEPENDS=	latex:${PORTSDIR}/print/teTeX
 
 MAN1=	abc2ly.1 as2text.1 convert-ly.1 etf2ly.1 lilypond.1 lilypond-bin.1 \
 	lilypond-book.1 midi2ly.1 mup2ly.1 musedata2ly.1 pmx2ly.1
-INFO=		lilypond lilypond-internals
+INFO=		lilypond lilypond-internals music-glossary
+
+CONFLICTS=	lilypond-devel-2.*
+
+#INSTALLS_SHLIB not needed for phyton library midi.so
 
 GNU_CONFIGURE=	yes
 USE_BISON=	yes
 USE_GMAKE=	YES
 USE_PYTHON=	YES
 MAKEFILE=	GNUmakefile
+PKGINSTALL=	${WRKDIR}/pkg-install
 
-CONFIGURE_ARGS+=	--with-kpathsea-include=${PREFIX}/include \
-			--with-kpathsea-lib=${PREFIX}/lib
+CONFIGURE_ARGS+=	--with-kpathsea-include=${LOCALBASE}/include \
+			--with-kpathsea-lib=${LOCALBASE}/lib
+CONFIGURE_ENV+=		"CPPFLAGS=${CPPFLAGS}"
 
 # inform kpathsea.h of getopt-prototype version
 CFLAGS+=	-D__GNU_LIBRARY__
+CPPFLAGS+=	-I${WRKSRC}/lily/out
+CFLAGS+=	${CPPFLAGS}
 
 .include <bsd.port.pre.mk>
-.if !defined(WITHOUT_PFA_FONTS)
-BUILD_DEPENDS+=	${PREFIX}/bin/mftrace:${PORTSDIR}/print/mftrace
 MAKE_ENV+=	MAKE_PFA_FILES=1
-ALL_TARGET=	all	# XXX pfa-fonts
-.endif
+ALL_TARGET=	all
 
 .if ${OSVERSION} < 500000
 USE_GCC=	3.3
-OLD_CPP_INCLUDEDIR=	/usr/include/g++
-CONFIGURE_ENV+=	"CPPFLAGS=$${CPPFLAGS} -idirafter ${OLD_CPP_INCLUDEDIR}"
 .endif
 
 SCRIPTS_ENV+=	PORTVERSION=${PORTVERSION}
 
+.if defined(NOPORTDOCS)
+PLIST_SUB+=	CONDITIONAL="@comment "
+EXTRA_PATCHES+=	${FILESDIR}/extra-patch:GNUmakefile.in
+.else
+PLIST_SUB+=	CONDITIONAL=""
+.endif
+
+#IGNORING portlint 2.5.0 WARN: possible direct use of command "install" found at line 64. use ${INSTALL_foobaa} instead.
+INSTALL_INFO?=	install-info
+
 pre-everything::
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_CMD} Pausing ten seconds--press control-C to cancel the build.
 	@sleep 10
 
+pre-configure:
+	${SED} -e "s=%%LOCALBASE%%=${LOCALBASE}=g;s=%%DATADIRVERSION%%=${DATADIR}/${PORTVERSION}=g" \
+		< ${FILESDIR}/pkg-install.in \
+		| ${SED} -e "s=${PREFIX}=\$${PKG_PREFIX}=g" \
+	> ${PKGINSTALL}
+
 post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR} ${EXAMPLESDIR}/scripts
 	cd ${WRKSRC}/input ; \
 	${TAR} -chf - --exclude=out --exclude=CVS --exclude=GNUmakefile . | \
-		${TAR} -xf - -C ${EXAMPLESDIR};\
-	${FIND} ${EXAMPLESDIR} -name "out" | ${XARGS} ${RM} -rf ;
+		${TAR} -xf - -C ${EXAMPLESDIR};
 .for ii in login profile
 	${INSTALL_SCRIPT} ${WRKSRC}/buildscripts/out/lilypond-${ii} \
 		${EXAMPLESDIR}/scripts
@@ -76,15 +97,11 @@ post-install:
 		--exclude=dummy.dep --exclude=CVS --exclude=GNUmakefile . \
 		| ${TAR} -xf - -C ${DOCSDIR}
 
-.for file in ${INFO}
-	${INSTALL_DATA} ${WRKSRC}/Documentation/user/out/${file}.info \
-		${PREFIX}/info/
-	install-info ${PREFIX}/info/${file}.info ${PREFIX}/info/dir
+.for ii in ${INFO}
+	- ${INSTALL_INFO} ${PREFIX}/info/${ii}.info ${PREFIX}/info/dir
 .endfor
 .endif
-	${ENV} PKG_PREFIX=${PREFIX} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-#	${ENV} PATH=${LOCALBASE}/bin:${PREFIX}/bin:${PATH} \
-#	TEXMF="{${DATADIR}/${PORTVERSION}},"`kpsexpand  \\$$TEXMF`"}" texhash
+	${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 
 	@${ECHO_CMD} "* Look in ${EXAMPLESDIR}/scripts for needed additions to"
 	@${ECHO_CMD} "* your .profile (at least the TEXMF environment variable"