From owner-freebsd-ports@FreeBSD.ORG Wed Jan 3 18:39:14 2007 Return-Path: X-Original-To: freebsd-ports@freebsd.org Delivered-To: freebsd-ports@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id AF51016A500 for ; Wed, 3 Jan 2007 18:39:14 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from server.t-hosting.hu (server.t-hosting.hu [217.20.133.7]) by mx1.freebsd.org (Postfix) with ESMTP id 698BF13C4AD for ; Wed, 3 Jan 2007 18:39:09 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from localhost (localhost [127.0.0.1]) by server.t-hosting.hu (Postfix) with ESMTP id 56DCA9C08C3; Wed, 3 Jan 2007 19:38:50 +0100 (CET) X-Virus-Scanned: amavisd-new at t-hosting.hu Received: from server.t-hosting.hu ([127.0.0.1]) by localhost (server.t-hosting.hu [127.0.0.1]) (amavisd-new, port 10024) with LMTP id nTLK+OMB0MXS; Wed, 3 Jan 2007 19:38:45 +0100 (CET) Received: from [192.168.2.186] (catv-50635cb6.catv.broadband.hu [80.99.92.182]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by server.t-hosting.hu (Postfix) with ESMTP id 961409C08C1; Wed, 3 Jan 2007 19:38:45 +0100 (CET) Message-ID: <459BF832.4060502@FreeBSD.org> Date: Wed, 03 Jan 2007 19:38:42 +0100 From: Gabor Kovesdan User-Agent: Thunderbird 1.5.0.9 (Windows/20061207) MIME-Version: 1.0 To: freebsd@alaskaparadise.com References: <200701011956.14607.freebsd@alaskaparadise.com> <200701021503.22070.freebsd@alaskaparadise.com> <459B64C4.9040308@FreeBSD.org> <200701030803.08522.freebsd@alaskaparadise.com> In-Reply-To: <200701030803.08522.freebsd@alaskaparadise.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: freebsd-ports@freebsd.org Subject: Re: PLIST_FILES question X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Jan 2007 18:39:14 -0000 Beech Rintoul schrieb: > On Tuesday 02 January 2007 23:09, Gabor Kovesdan wrote: > >> Beech Rintoul schrieb: >> >>> On Tuesday 02 January 2007 13:43, you wrote: >>> >>>> Beech Rintoul schrieb: >>>> >>>>> Thanks to everyone who responded. I somehow missed that handbook >>>>> section, but I have it figured out now. What I needed to do is the >>>>> following: >>>>> >>>>> .if defined(WITH_MYSQL) >>>>> USE_MYSQL= yes >>>>> MODULES:=${MODULES}:mod_sql:mod_sql_mysql >>>>> INCLUDEDIRS:=${INCLUDEDIRS}:${LOCALBASE}/include >>>>> LIBDIRS:=${LIBDIRS}:${LOCALBASE}/lib/mysql >>>>> PLIST_FILES= include/proftpd/mod_sql.h >>>>> .endif >>>>> >>>>> The extra header file is not copied to include unless that option is >>>>> checked and hard coding it in pkg-plist broke the pkg build. It didn't >>>>> show up on pointyhat because that option is off by default. >>>>> >>>> Oh, do you want to mix PLIST_FILES and pkg-plist, did I catch it right? >>>> That should not be done. You can list that file in pkg-plist as >>>> %%MYSQL%%include/proftpd/mod_sql.h and do the following in Makefile: >>>> >>>> if defined(WITH_MYSQL) >>>> PLIST_SUB+= MYSQL="" >>>> [...another things here...] >>>> .else >>>> >>>> PLIST_SUB+= MYSQL="@comment " >>>> .endif >>>> >>>> Look at e.g. security/amavisd-new, I do something similar there. >>>> >>>> Regards, >>>> Gabor >>>> >>> Thanks, It doesn't say anything in the handbook about not doing that and >>> it works. In the interest of being correct I'll try what you suggest. >>> >> Yep. PH doesn't say it, but portlint does. Maybe this should be noted in >> PH as well. >> > > That would be a good idea. I did change the Makefile and pkg-plist as you > suggested, but before doing so I ran portlint again and it did NOT complain > about using both pkg-plist and PLIST_FILES. The PH in the advanced section > would lead one to believe that it's acceptable to use both. I'm glad I > posted what I was trying to do, this release was rushed to address a security > issue and was a real pain to get all the options building correctly. I > definitely don't want to add problems on top of it. Anyway, thanks again for > your input. > > Beech > Hmm, you might have an old portlint, I still can see this warning if a port uses both pkg-plist and PLIST_FILES: WARN: Makefile: [20]: You may remove pkg-plist if you use PLIST_FILES and/or PLIST_DIRS. Gabor