From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Feb 16 10:20:05 2007 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 5692716A400 for ; Fri, 16 Feb 2007 10:20:05 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [69.147.83.40]) by mx1.freebsd.org (Postfix) with ESMTP id 33BF413C441 for ; Fri, 16 Feb 2007 10:20:05 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id l1GAK5Wn015769 for ; Fri, 16 Feb 2007 10:20:05 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id l1GAK5Ud015768; Fri, 16 Feb 2007 10:20:05 GMT (envelope-from gnats) Resent-Date: Fri, 16 Feb 2007 10:20:05 GMT Resent-Message-Id: <200702161020.l1GAK5Ud015768@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, "Rashid N. Achilov" Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 8E97516A400 for ; Fri, 16 Feb 2007 10:14:44 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [69.147.83.33]) by mx1.freebsd.org (Postfix) with ESMTP id 630A513C461 for ; Fri, 16 Feb 2007 10:14:44 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.13.1/8.13.1) with ESMTP id l1GAEiCM094479 for ; Fri, 16 Feb 2007 10:14:44 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.13.1/8.13.1/Submit) id l1GAEheX094478; Fri, 16 Feb 2007 10:14:43 GMT (envelope-from nobody) Message-Id: <200702161014.l1GAEheX094478@www.freebsd.org> Date: Fri, 16 Feb 2007 10:14:43 GMT From: "Rashid N. Achilov" To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.0 Cc: Subject: ports/109221: Port to graphics/djvulibre to exclude unnessesary bash depend 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: Fri, 16 Feb 2007 10:20:05 -0000 >Number: 109221 >Category: ports >Synopsis: Port to graphics/djvulibre to exclude unnessesary bash depend >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Fri Feb 16 10:20:04 GMT 2007 >Closed-Date: >Last-Modified: >Originator: Rashid N. Achilov >Release: 6.2-RELEASE >Organization: LLC "AS-System Complex" >Environment: FreeBSD to-495.askd.ru 6.2-RELEASE FreeBSD 6.2-RELEASE #1: Thu Feb 15 15:56:49 NOVT 2007 root@to-495.askd.ru:/usr/obj/usr/src/sys/Sentry i386 >Description: graphics/djvulibre has a depend from bash, which needs only for any2djvu script. This patch adds option to include any2djvu in build or exclude it (so, add bash depend with it or do not add) >How-To-Repeat: Try to install djvulibre. When your box does not have bash, djvulibre port will install it, >Fix: Patch attached with submission follows: diff -ruN djvulibre.old/Makefile djvulibre/Makefile --- djvulibre.old/Makefile Wed Feb 14 04:34:51 2007 +++ djvulibre/Makefile Fri Feb 16 16:04:14 2007 @@ -17,7 +17,6 @@ LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ tiff.4:${PORTSDIR}/graphics/tiff -RUN_DEPENDS= bash:${PORTSDIR}/shells/bash USE_ICONV= yes USE_GNOME= gnomehack gnometarget @@ -32,11 +31,13 @@ CONFIGURE_ARGS= --enable-threads=pthread --enable-shared USE_LDCONFIG= yes +OPTIONS= ANY2DJVU "Install any2djvu script (required bash)" off + MANLANG= "" ja MAN1= bzz.1 c44.1 cjb2.1 cpaldjvu.1 csepdjvu.1 ddjvu.1 djvm.1 \ djvmcvt.1 djvu.1 djvudump.1 djvuextract.1 djvumake.1 djvups.1 \ djvused.1 djvuserve.1 djvutxt.1 -MAN1EXTRA= any2djvu.1 djvutoxml.1 djvuxml.1 djvuxmlparser.1 djvudigital.1 +MAN1EXTRA= djvutoxml.1 djvuxml.1 djvuxmlparser.1 djvudigital.1 MAN1+= ${MAN1EXTRA} PORTDOCS= djvu2spec.djvu lizard2002.djvu @@ -54,6 +55,16 @@ PLIST_SUB+= X11='@comment ' .endif +.include + +.if defined(WITH_ANY2DJVU) +MAN1+= any2djvu.1 +RUN_DEPENDS+= bash:${PORTSDIR}/shells/bash +PLIST_SUB+= ANY2DJVU='' +.else +PLIST_SUB+= ANY2DJVU='@comment ' +.endif + post-patch: @${REINPLACE_CMD} -e 's|$${libdir}/pkgconfig|${PREFIX}/libdata/pkgconfig|' \ ${WRKSRC}/libdjvu/Makefile.in @@ -61,8 +72,10 @@ s|$$OPTS -O3|$$OPTS|g ; \ s|$$OPTS -O2|$$OPTS|g ; \ s|$$OPTS $$opt|$$OPTS|g' ${WRKSRC}/configure +.if defined(WITH_ANY2DJVU) @${REINPLACE_CMD} -e 's|^#! /bin/bash|#! ${LOCALBASE}/bin/bash|g ; \ s|any2djvu\.sh|any2djvu|g' ${WRKSRC}/tools/any2djvu +.endif @${REINPLACE_CMD} -e 's,/netscape/,/djvulibre/,' \ ${WRKSRC}/gui/nsdejavu/nsdejavu.1.in @${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \ @@ -91,4 +104,4 @@ .endfor .endif -.include +.include diff -ruN djvulibre.old/pkg-plist djvulibre/pkg-plist --- djvulibre.old/pkg-plist Wed Feb 14 04:34:51 2007 +++ djvulibre/pkg-plist Fri Feb 16 15:55:05 2007 @@ -1,4 +1,4 @@ -bin/any2djvu +%%ANY2DJVU%%bin/any2djvu bin/bzz bin/c44 bin/cjb2 >Release-Note: >Audit-Trail: >Unformatted: