From owner-svn-ports-head@FreeBSD.ORG Fri Dec 14 09:35:03 2012 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A4EF7E57; Fri, 14 Dec 2012 09:35:03 +0000 (UTC) (envelope-from araujo@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 8A7D18FC0A; Fri, 14 Dec 2012 09:35:03 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBE9Z3lh034150; Fri, 14 Dec 2012 09:35:03 GMT (envelope-from araujo@svn.freebsd.org) Received: (from araujo@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBE9Z3B3034147; Fri, 14 Dec 2012 09:35:03 GMT (envelope-from araujo@svn.freebsd.org) Message-Id: <201212140935.qBE9Z3B3034147@svn.freebsd.org> From: Marcelo Araujo Date: Fri, 14 Dec 2012 09:35:03 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r308892 - head/audio/lash X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Dec 2012 09:35:03 -0000 Author: araujo Date: Fri Dec 14 09:35:02 2012 New Revision: 308892 URL: http://svnweb.freebsd.org/changeset/ports/308892 Log: - Support USE_READLINE. - Convert to new option framework. PR: ports/171962 Submitted by: KATO Tsuguru Modified: head/audio/lash/Makefile (contents, props changed) head/audio/lash/pkg-plist (contents, props changed) Modified: head/audio/lash/Makefile ============================================================================== --- head/audio/lash/Makefile Fri Dec 14 09:09:16 2012 (r308891) +++ head/audio/lash/Makefile Fri Dec 14 09:35:02 2012 (r308892) @@ -1,9 +1,5 @@ -# New ports collection makefile for: lash -# Date created: 2007-01-13 -# Whom: Edward Tomasz Napierala -# +# Created by: Edward Tomasz Napierala # $FreeBSD$ -# PORTNAME= lash PORTVERSION= 0.5.4 @@ -18,37 +14,50 @@ LICENSE= GPLv2 GPLv3 LICENSE_COMB= dual LIB_DEPENDS= jack:${PORTSDIR}/audio/jack \ - uuid:${PORTSDIR}/misc/e2fsprogs-libuuid \ - dssialsacompat:${PORTSDIR}/audio/libdssialsacompat + dssialsacompat:${PORTSDIR}/audio/libdssialsacompat \ + uuid:${PORTSDIR}/misc/e2fsprogs-libuuid -GNU_CONFIGURE= yes +OPTIONS_DEFINE= READLINE DOCS +OPTIONS_DEFAULT=READLINE +READLINE_DESC= Enable readline support + +USE_GNOME= gnomehack gtk20 libxml2 USE_GMAKE= yes +GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-alsa-midi -USE_GNOME= gnomehack gtk20 libxml2 USE_LDCONFIG= yes MAKE_JOBS_SAFE= yes CPPFLAGS+= -I${LOCALBASE}/include/dssi -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -PORTDOCS= * - .include +.if ${PORT_OPTIONS:MREADLINE} +USE_READLINE= yes +PLIST_SUB+= READLINE="" +.else +CONFIGURE_ENV+= vl_cv_lib_readline=no +PLIST_SUB+= READLINE="@comment " +.endif + .if ${PORT_OPTIONS:MDOCS} -BUILD_DEPENDS= texi2html:${PORTSDIR}/textproc/texi2html +BUILD_DEPENDS+= texi2html:${PORTSDIR}/textproc/texi2html +.else +CONFIGURE_ENV+= ac_cv_prog_lash_texi2html=no .endif -post-extract: - @${REINPLACE_CMD} -e 's|texi2html --number|texi2html|' \ - ${WRKSRC}/docs/Makefile.in +post-patch: + @${REINPLACE_CMD} -e \ + '/if test/s|==|=|' ${WRKSRC}/configure + @${REINPLACE_CMD} -e \ + '/texi2html/s|--number||' ${WRKSRC}/docs/Makefile.in post-install: .if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} \ - ${WRKSRC}/docs/lash-manual-html-one-page/lash-manual.html \ - ${DOCSDIR} + cd ${WRKSRC}/docs/lash-manual-html-one-page \ + && ${INSTALL_DATA} lash-manual.html ${DOCSDIR} .endif .include Modified: head/audio/lash/pkg-plist ============================================================================== --- head/audio/lash/pkg-plist Fri Dec 14 09:09:16 2012 (r308891) +++ head/audio/lash/pkg-plist Fri Dec 14 09:35:02 2012 (r308892) @@ -1,5 +1,5 @@ bin/lashd -bin/lash_control +%%READLINE%%bin/lash_control bin/lash_save_button bin/lash_panel include/lash-1.0/lash/lash.h @@ -13,6 +13,7 @@ lib/liblash.so lib/liblash.la lib/liblash.a libdata/pkgconfig/lash-1.0.pc +%%PORTDOCS%%%%DOCSDIR%%/lash-manual.html %%DATADIR%%/dtds/lash-project-1.0.dtd %%DATADIR%%/icons/lash_16px.png %%DATADIR%%/icons/lash_24px.png @@ -23,5 +24,6 @@ libdata/pkgconfig/lash-1.0.pc @dirrm %%DATADIR%%/icons @dirrm %%DATADIR%%/dtds @dirrm %%DATADIR%% +%%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm include/lash-1.0/lash @dirrm include/lash-1.0