From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Nov 25 19:40:30 2006 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 8148616A415 for ; Sat, 25 Nov 2006 19:40:30 +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 B783243D49 for ; Sat, 25 Nov 2006 19:39:40 +0000 (GMT) (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 kAPJeQh0046817 for ; Sat, 25 Nov 2006 19:40:26 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id kAPJeQIk046816; Sat, 25 Nov 2006 19:40:26 GMT (envelope-from gnats) Resent-Date: Sat, 25 Nov 2006 19:40:26 GMT Resent-Message-Id: <200611251940.kAPJeQIk046816@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, Alex Kozlov Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 2CA4C16A412 for ; Sat, 25 Nov 2006 19:32:13 +0000 (UTC) (envelope-from stalker@ravenloft.kiev.ua) Received: from istc.kiev.ua (wolf.istc.kiev.ua [193.108.236.1]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5416A43D46 for ; Sat, 25 Nov 2006 19:31:21 +0000 (GMT) (envelope-from stalker@ravenloft.kiev.ua) Received: from localhost ([127.0.0.1] helo=ravenloft.kiev.ua) by istc.kiev.ua with esmtp (Exim 4.52) id 1Go3Fw-0006Q2-Rj for FreeBSD-gnats-submit@freebsd.org; Sat, 25 Nov 2006 21:32:09 +0200 Received: from stalker by ravenloft.kiev.ua with local (Exim 4.63 (FreeBSD)) (envelope-from ) id 1Go3FV-000Bf3-NG for FreeBSD-gnats-submit@freebsd.org; Sat, 25 Nov 2006 21:31:41 +0200 Message-Id: Date: Sat, 25 Nov 2006 21:31:41 +0200 From: Alex Kozlov Sender: Vlad Gnatov To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/105848: [devel/popt] [patch] remove xgettext depends X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Alex Kozlov List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 25 Nov 2006 19:40:30 -0000 >Number: 105848 >Category: ports >Synopsis: [devel/popt] [patch] remove xgettext depends >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Sat Nov 25 19:40:16 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Alex Kozlov >Release: FreeBSD 6.1 >Organization: private >Environment: >Description: remove xgettext depends; don't check gettext ver in WITHOUT_NLS case; cleanup >How-To-Repeat: >Fix: --- Makefile,orig Tue Aug 15 01:55:15 2006 +++ Makefile Mon Nov 18 10:32:08 2006 @@ -20,8 +20,6 @@ MAINTAINER= ports@FreeBSD.org COMMENT= A getopt(3) like library with a number of enhancements, from Redhat -BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext - GNU_CONFIGURE= yes USE_LDCONFIG= yes @@ -29,6 +27,9 @@ CONFIGURE_ARGS= --with-libiconv-prefix=${LOCALBASE} \ --program-prefix="" +CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" .if defined(WITHOUT_NLS) CONFIGURE_ARGS+=--disable-nls @@ -38,15 +39,17 @@ PLIST_SUB+= NLS="" .endif -CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} - -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" - pre-configure: +# remove check for xgettext - popt do not use it anyway + @${REINPLACE_CMD} -e \ + 's:if test ! -f ../rpm.c:if test "1" != "1":' \ + ${WRKSRC}/configure + +.if !defined(WITHOUT_NLS) @if [ -n "`${PKG_INFO} -I 'gettext-0.1[012].*' 2>/dev/null`" ]; then \ ${ECHO_CMD} "${PKGNAME}: requires at least gettext 0.13, please upgrade your installed version."; \ ${FALSE}; \ fi +.endif .include >Release-Note: >Audit-Trail: >Unformatted: