From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Jan 2 11:50:05 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 [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 38AAE16A41F for ; Mon, 2 Jan 2006 11:50:05 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id D234043D55 for ; Mon, 2 Jan 2006 11:50:03 +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 k02Bo3qn044146 for ; Mon, 2 Jan 2006 11:50:03 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k02Bo34P044145; Mon, 2 Jan 2006 11:50:03 GMT (envelope-from gnats) Resent-Date: Mon, 2 Jan 2006 11:50:03 GMT Resent-Message-Id: <200601021150.k02Bo34P044145@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, Eric Anholt Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D02BA16A41F for ; Mon, 2 Jan 2006 11:41:32 +0000 (GMT) (envelope-from anholt@leguin.anholt.net) Received: from leguin.anholt.net (69-30-77-85.dq1sn.easystreet.com [69.30.77.85]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7850443D49 for ; Mon, 2 Jan 2006 11:41:32 +0000 (GMT) (envelope-from anholt@leguin.anholt.net) Received: from leguin.anholt.net (localhost [127.0.0.1]) by leguin.anholt.net (8.13.4/8.13.1) with ESMTP id k02BfVEt020915 for ; Mon, 2 Jan 2006 03:41:31 -0800 (PST) (envelope-from anholt@leguin.anholt.net) Received: (from anholt@localhost) by leguin.anholt.net (8.13.4/8.13.1/Submit) id k02BfVef020914; Mon, 2 Jan 2006 03:41:31 -0800 (PST) (envelope-from anholt) Message-Id: <200601021141.k02BfVef020914@leguin.anholt.net> Date: Mon, 2 Jan 2006 03:41:31 -0800 (PST) From: Eric Anholt To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/91213: pkg-config ignores autotools normal .pc directories X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Eric Anholt List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Jan 2006 11:50:05 -0000 >Number: 91213 >Category: ports >Synopsis: pkg-config ignores autotools normal .pc directories >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: Mon Jan 02 11:50:02 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Eric Anholt >Release: FreeBSD 7.0-CURRENT amd64 >Organization: >Environment: System: FreeBSD leguin.anholt.net 7.0-CURRENT FreeBSD 7.0-CURRENT #26: Mon Dec 26 02:08:57 PST 2005 anholt@leguin.anholt.net:/usr/obj/usr/src/current/sys/MYKERNEL amd64 >Description: Dealing with FreeBSD's autotools and pkgconfig environment is a pain when working on 3rd-party software. One of the issues is that our pkgconfig from ports doesn't look in the default place to which 3rd party software (built using autotools, at least) installs .pc files (${prefix}/lib/pkgconfig). While FreeBSD's hier(7) may specify that they should go in libdata, it's hard to expect upstream to do that for just us (and it seems like it's not the norm for upstreams). So, I propose that we apply the following change, which will look in ${prefix}/lib/pkgconfig after each ${prefix}/libdata/pkgconfig. The only issue I see with it is getting .pc files out of sync between software versions in ports vs. not, but that already happens with 3rd-party software where the default may be to install in /usr/local/ though the ports system has decided on /usr/X11R6. Oh, and I cleaned up a couple of very minor portlint warnings. >How-To-Repeat: >Fix: --- pkgconfig-locations.diff begins here --- Index: Makefile =================================================================== RCS file: /home/ncvs/ports/devel/pkgconfig/Makefile,v retrieving revision 1.41 diff -u -r1.41 Makefile --- Makefile 14 Nov 2005 13:01:26 -0000 1.41 +++ Makefile 2 Jan 2006 08:00:39 -0000 @@ -8,6 +8,7 @@ PORTNAME= pkgconfig PORTVERSION= 0.20 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= http://pkgconfig.freedesktop.org/releases/ DISTNAME= pkg-config-${PORTVERSION} @@ -25,12 +26,15 @@ .include PC_PATH=${PREFIX}/libdata/pkgconfig +PC_PATH=${PREFIX}/lib/pkgconfig .if ${LOCALBASE} != ${PREFIX} PC_PATH:= ${PC_PATH}:${LOCALBASE}/libdata/pkgconfig -.endif +PC_PATH:= ${PC_PATH}:${LOCALBASE}/lib/pkgconfig +.endif .if ${X11BASE} != ${PREFIX} PC_PATH:= ${PC_PATH}:${X11BASE}/libdata/pkgconfig -.endif +PC_PATH:= ${PC_PATH}:${X11BASE}/lib/pkgconfig +.endif CONFIGURE_ARGS= --disable-threads \ --with-pc-path="${PC_PATH}" Index: pkg-descr =================================================================== RCS file: /home/ncvs/ports/devel/pkgconfig/pkg-descr,v retrieving revision 1.5 diff -u -r1.5 pkg-descr --- pkg-descr 5 Nov 2005 04:53:19 -0000 1.5 +++ pkg-descr 2 Jan 2006 08:00:12 -0000 @@ -6,8 +6,10 @@ pkg-config retrieves information about packages from special metadata files. These files are named after the package, with the extension .pc. By default, pkg-config looks for these files in the following directories: -${PREFIX}/libdata/pkgconfig, ${LOCALBASE}/libdata/pkgconfig and -${X11BASE}/libdata/pkgconfig; it will also look in the list of directories -specified by the PKG_CONFIG_PATH environment variable. +${PREFIX}/libdata/pkgconfig, ${PREFIX}/lib/pkgconfig, +${LOCALBASE}/libdata/pkgconfig, ${LOCALBASE}/lib/pkgconfig, +${X11BASE}/libdata/pkgconfig, and ${X11BASE}/lib/pkgconfig; it will also look in +in the list of directories specified by the PKG_CONFIG_PATH environment +variable. It alo WWW: http://pkgconfig.freedesktop.org/wiki/ --- pkgconfig-locations.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: