From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Sep 25 18:10:10 2012 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A1F10106564A for ; Tue, 25 Sep 2012 18:10:10 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 7E0768FC0C for ; Tue, 25 Sep 2012 18:10:10 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q8PIAACA017123 for ; Tue, 25 Sep 2012 18:10:10 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q8PIAAr3017116; Tue, 25 Sep 2012 18:10:10 GMT (envelope-from gnats) Resent-Date: Tue, 25 Sep 2012 18:10:10 GMT Resent-Message-Id: <201209251810.q8PIAAr3017116@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, KATO Tsuguru Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 5A9F9106566B for ; Tue, 25 Sep 2012 18:00:49 +0000 (UTC) (envelope-from tkato432@yahoo.com) Received: from msa105lp.auone-net.jp (msa105lp.auone-net.jp [222.3.140.168]) by mx1.freebsd.org (Postfix) with ESMTP id 2AEC48FC28 for ; Tue, 25 Sep 2012 18:00:49 +0000 (UTC) Received: from localhost.localdomain (ZT030063.ppp.dion.ne.jp [59.128.30.63]) by msa105lp.auone-net.jp (au one net msa) with ESMTP id 22FD550036 for ; Wed, 26 Sep 2012 03:00:46 +0900 (JST) Message-Id: <20120926022032.7ac41ae4f79597cd1705163f@yahoo.com> Date: Wed, 26 Sep 2012 02:20:32 +0900 From: KATO Tsuguru To: FreeBSD-gnats-submit@FreeBSD.org Cc: Subject: ports/171962: audio/lash: Support USE_READLINE X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Sep 2012 18:10:10 -0000 >Number: 171962 >Category: ports >Synopsis: audio/lash: Support USE_READLINE >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Tue Sep 25 18:10:10 UTC 2012 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: FreeBSD 7.4-RELEASE-p10 i386 >Organization: >Environment: >Description: - Support USE_READLINE >How-To-Repeat: >Fix: diff -urN /usr/ports/audio/lash/Makefile audio/lash/Makefile --- /usr/ports/audio/lash/Makefile 2012-08-19 06:23:24.000000000 +0900 +++ audio/lash/Makefile 2012-09-25 03:16:25.000000000 +0900 @@ -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: ports/audio/lash/Makefile,v 1.21 2012/08/18 21:23:24 danfe Exp $ -# PORTNAME= lash PORTVERSION= 0.5.4 @@ -18,37 +14,50 @@ 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 diff -urN /usr/ports/audio/lash/pkg-plist audio/lash/pkg-plist --- /usr/ports/audio/lash/pkg-plist 2007-06-05 05:41:24.000000000 +0900 +++ audio/lash/pkg-plist 2012-09-20 18:23:24.000000000 +0900 @@ -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.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 @@ @dirrm %%DATADIR%%/icons @dirrm %%DATADIR%%/dtds @dirrm %%DATADIR%% +%%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm include/lash-1.0/lash @dirrm include/lash-1.0 >Release-Note: >Audit-Trail: >Unformatted: