From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Jun 26 05:00:25 2011 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 5A58F1065678 for ; Sun, 26 Jun 2011 05:00:25 +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 2CA728FC1D for ; Sun, 26 Jun 2011 05:00:25 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id p5Q50Oiu043423 for ; Sun, 26 Jun 2011 05:00:24 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p5Q50OkK043422; Sun, 26 Jun 2011 05:00:24 GMT (envelope-from gnats) Resent-Date: Sun, 26 Jun 2011 05:00:24 GMT Resent-Message-Id: <201106260500.p5Q50OkK043422@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, Darren Pilgrim Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0F210106566B for ; Sun, 26 Jun 2011 04:56:01 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22]) by mx1.freebsd.org (Postfix) with ESMTP id D9F748FC0C for ; Sun, 26 Jun 2011 04:56:00 +0000 (UTC) Received: from red.freebsd.org (localhost [127.0.0.1]) by red.freebsd.org (8.14.4/8.14.4) with ESMTP id p5Q4u0h4069185 for ; Sun, 26 Jun 2011 04:56:00 GMT (envelope-from nobody@red.freebsd.org) Received: (from nobody@localhost) by red.freebsd.org (8.14.4/8.14.4/Submit) id p5Q4u0xa069184; Sun, 26 Jun 2011 04:56:00 GMT (envelope-from nobody) Message-Id: <201106260456.p5Q4u0xa069184@red.freebsd.org> Date: Sun, 26 Jun 2011 04:56:00 GMT From: Darren Pilgrim To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/158303: databases/tdb doesn't need to always include python 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: Sun, 26 Jun 2011 05:00:25 -0000 >Number: 158303 >Category: ports >Synopsis: databases/tdb doesn't need to always include python >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: Sun Jun 26 05:00:24 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Darren Pilgrim >Release: 8.1-RELEASE-p4 >Organization: >Environment: FreeBSD [hostname redacted] 8.1-RELEASE-p4 FreeBSD 8.1-RELEASE-p4 #0: Sat Jun 18 20:32:25 PDT 2011 root@[hostname redacted]:/usr/obj/usr/src/sys/GENERIC amd64 >Description: The databases/tdb port (part of Samba) sets USE_PYTHON when it doesn't need to. The port uses waf[1] as part of its build-tools; however, the port provides waf as a compiled binary and the Makefile references it directly, thus removing the need for USE_PYTHON unless you explicitly need the python tdb library in addition to libtdb. Samba uses only libtdb--a fact I confirmed by removing the python components from databases/tdb then installing net/samba35. Attached is a patch to the Makefile to move the various python bits into an OPTIONS menu. With that patch applied, I am able to successfully build, install and run net/samba35 with the PYTHONLIB option unchecked. 1: http://code.google.com/p/waf/ >How-To-Repeat: n/a >Fix: n/a Patch attached with submission follows: --- Makefile.old 2011-06-25 21:49:25.400806840 -0700 +++ Makefile 2011-06-25 21:51:20.991628644 -0700 @@ -7,7 +7,7 @@ PORTNAME= tdb PORTVERSION= 1.2.1 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= databases MASTER_SITES= ftp://ftp.samba.org/pub/%SUBDIR%/ \ @@ -20,7 +20,6 @@ CONFLICTS= *samba3[0-4]-3.* -USE_PYTHON= yes USE_GMAKE= yes USE_LDCONFIG= yes GNU_CONFIGURE= yes @@ -35,7 +34,6 @@ AUTOCONF_ARGS= ${IPATHS} PKGCONFIGDIR?= ${PREFIX}/libdata/pkgconfig PKGCONFIGDIR_REL?= ${PKGCONFIGDIR:S|^${PREFIX}/||} -PYTHON_SITELIBDIR_REL?= ${PYTHONPREFIX_SITELIBDIR:S|^${PREFIX}/||} CONFIGURE_ENV+= XSLTPROC="/usr/bin/true" @@ -50,8 +48,17 @@ lib/libtdb.a \ lib/libtdb.so \ lib/libtdb.so.1 \ - ${PKGCONFIGDIR_REL}/tdb.pc \ - ${PYTHON_SITELIBDIR_REL}/tdb.so + ${PKGCONFIGDIR_REL}/tdb.pc + +OPTIONS= PYTHONLIB "Include Python tdb library" on + +.include + +.if defined(WITH_PYTHONLIB) +USE_PYTHON= yes +PYTHON_SITELIBDIR_REL?= ${PYTHONPREFIX_SITELIBDIR:S|^${PREFIX}/||} +PLIST_FILES+= ${PYTHON_SITELIBDIR_REL}/tdb.so +.endif pre-install: .for man in ${MAN8} >Release-Note: >Audit-Trail: >Unformatted: