From owner-freebsd-ports Tue Oct 10 2:18:41 2000 Delivered-To: freebsd-ports@freebsd.org Received: from shale.csir.co.za (shale.csir.co.za [146.64.46.5]) by hub.freebsd.org (Postfix) with ESMTP id 822CB37B66C; Tue, 10 Oct 2000 02:18:29 -0700 (PDT) Received: from C992631-A.pinol1.sfba.home.com (C992631-A.pinol1.sfba.home.com [24.12.58.155]) by shale.csir.co.za (8.9.3/8.9.3) with ESMTP id LAA66873; Tue, 10 Oct 2000 11:18:12 +0200 (SAT) (envelope-from reg@shale.csir.co.za) Received: (from reg@localhost) by C992631-A.pinol1.sfba.home.com (8.11.0/8.11.0) id e9A9HfK34534; Tue, 10 Oct 2000 02:17:41 -0700 (PDT) (envelope-from reg) Date: Tue, 10 Oct 2000 02:17:40 -0700 From: Jeremy Lea To: Maxim Sobolev Cc: ports@FreeBSD.org, asami@FreeBSD.org Subject: Re: Problems with bsd.gnome.mk [patch] Message-ID: <20001010021740.Q30468@shale.csir.co.za> References: <39E184FE.7FCE1E41@FreeBSD.org> <20001009094132.H30468@shale.csir.co.za> <39E2AFE2.EF3DE9D0@FreeBSD.org> <39E2C818.59B1E871@FreeBSD.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.2.5i In-Reply-To: <39E2C818.59B1E871@FreeBSD.org>; from sobomax@FreeBSD.org on Tue, Oct 10, 2000 at 10:41:13AM +0300 Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org Hi, On Tue, Oct 10, 2000 at 10:41:13AM +0300, Maxim Sobolev wrote: > Please make GNOME's CONFIGURE_ARGS optional! Completely ignore the last patch... I need to go to sleep... -Jeremy -- FreeBSD - Because the best things in life are free... http://www.freebsd.org/ Index: bsd.gnome.mk =================================================================== RCS file: /usr/home/ncvs/ports/Mk/bsd.gnome.mk,v retrieving revision 1.3 diff -u -r1.3 bsd.gnome.mk --- bsd.gnome.mk 2000/10/09 16:56:43 1.3 +++ bsd.gnome.mk 2000/10/10 09:14:23 @@ -253,9 +253,13 @@ .endif .if defined(USE_GNOMELIBS) -CONFIGURE_ARGS+=--localstatedir=${PREFIX}/share/gnome \ - --datadir=${PREFIX}/share/gnome \ - --with-gnome=${PREFIX} +.if !defined(HAVE_GNOME) || ${CONFIGURE_ARGS:S/--localstatedir=//} == ${CONFIGURE_ARGS} +CONFIGURE_ARGS+=--localstatedir=${PREFIX}/share/gnome +.endif +.if !defined(HAVE_GNOME) || ${CONFIGURE_ARGS:S/--datadir=//} == ${CONFIGURE_ARGS} +CONFIGURE_ARGS+=--datadir=${PREFIX}/share/gnome +.endif +CONFIGURE_ARGS+=--with-gnome=${PREFIX} LIB_DEPENDS+= gnome.4:${PORTSDIR}/x11/gnomelibs GNOME_CONFIG?= ${X11BASE}/bin/gnome-config CONFIGURE_ENV+= GNOME_CONFIG="${GNOME_CONFIG}" To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message