From owner-svn-ports-all@freebsd.org Fri May 18 08:34:10 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 51946EEE556; Fri, 18 May 2018 08:34:10 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id F13DE6CB62; Fri, 18 May 2018 08:34:09 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B835215BD2; Fri, 18 May 2018 08:34:09 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4I8Y9XL018639; Fri, 18 May 2018 08:34:09 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4I8Y9s3018638; Fri, 18 May 2018 08:34:09 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201805180834.w4I8Y9s3018638@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Fri, 18 May 2018 08:34:09 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r470278 - head/print/lilypond X-SVN-Group: ports-head X-SVN-Commit-Author: amdmi3 X-SVN-Commit-Paths: head/print/lilypond X-SVN-Commit-Revision: 470278 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 May 2018 08:34:10 -0000 Author: amdmi3 Date: Fri May 18 08:34:09 2018 New Revision: 470278 URL: https://svnweb.freebsd.org/changeset/ports/470278 Log: - Fix LICENSE - Add LICENSE_FILE - Pet portlint - Switch to options helpers - Switch to new test framework Approved by: portmgr blanket Modified: head/print/lilypond/Makefile Modified: head/print/lilypond/Makefile ============================================================================== --- head/print/lilypond/Makefile Fri May 18 07:46:46 2018 (r470277) +++ head/print/lilypond/Makefile Fri May 18 08:34:09 2018 (r470278) @@ -10,10 +10,9 @@ MASTER_SITES= http://download.linuxaudio.org/lilypond/ MAINTAINER= ports@FreeBSD.org COMMENT= GNU music typesetter -LICENSE= GPLv3 +LICENSE= GPLv3+ +LICENSE_FILE= ${WRKSRC}/COPYING -OPTIONS_DEFINE= NLS - BUILD_DEPENDS= pdftexi2dvi:print/texinfo \ t1ascii:print/t1utils \ bash:shells/bash \ @@ -34,62 +33,54 @@ LIB_DEPENDS= libguile.so:lang/guile \ RUN_DEPENDS= mftrace:print/mftrace \ ${LOCALBASE}/share/fonts/dejavu/DejaVuSans-Bold.ttf:x11-fonts/dejavu -INFO= internals \ - lilypond-changes \ - lilypond-contributor \ - lilypond-essay \ - lilypond-extending \ - lilypond-internals \ - lilypond-learning \ - lilypond-notation \ - lilypond-snippets \ - lilypond-usage \ - lilypond-web \ - music-glossary - USES= bison:build gettext ghostscript gmake pkgconfig perl5 \ python:2.7 USE_TEX= latex USE_PERL5= build USE_GNOME= pango - -MAKEFILE= GNUmakefile -GNU_MAKEFILE= yes #MAKE_JOBS_UNSAFE= yes - GNU_CONFIGURE= yes CONFIGURE_ARGS+=--with-ncsb-dir=${LOCALBASE}/share/ghostscript/fonts \ --with-python-include=${PYTHON_INCLUDEDIR} CONFIGURE_ENV+= ac_cv_prog_MAKEINFO="${LOCALBASE}/bin/makeinfo" \ FLEX=${FLEX} YACC=${YACC} +MAKEFILE= GNUmakefile +GNU_MAKEFILE= yes + ALL_TARGET= all +TEST_TARGET= test # fails with sig11 NO_CCACHE= yes PLIST_SUB= PORTVERSION=${PORTVERSION} -.include +INFO= internals \ + lilypond-changes \ + lilypond-contributor \ + lilypond-essay \ + lilypond-extending \ + lilypond-internals \ + lilypond-learning \ + lilypond-notation \ + lilypond-snippets \ + lilypond-usage \ + lilypond-web \ + music-glossary -.if ${PORT_OPTIONS:MNLS} -PLIST_SUB+= NLS="" -.else -PLIST_SUB+= NLS="@comment " -.endif +OPTIONS_DEFINE= NLS +OPTIONS_SUB= yes post-patch: - ${REINPLACE_CMD} -e 's||"/usr/include/FlexLexer.h"|' \ - ${WRKSRC}/lily/include/includable-lexer.hh -.if !${PORT_OPTIONS:MNLS} - ${REINPLACE_CMD} -e '/^PO_FILES/s|= |= #|' ${WRKSRC}/${MAKEFILE}.in -.endif + @${REINPLACE_CMD} -e 's||"/usr/include/FlexLexer.h"|' \ + ${WRKSRC}/lily/include/includable-lexer.hh +post-patch-NLS-off: + @${REINPLACE_CMD} -e '/^PO_FILES/s|= |= #|' ${WRKSRC}/${MAKEFILE}.in + post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/lilypond ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lilypond/${PORTVERSION}/python/midi.so @${LN} -fs ${DATADIR}/${PORTVERSION} ${STAGEDIR}${DATADIR}/current - -regression-test: build - cd ${WRKSRC} && ${MAKE_CMD} -f ${MAKEFILE} test .include