Suggested simplification for bsd.gnome.mk

[Joe Marcus Clarke]

On Fri, 2003-12-19 at 10:37, Rolf Grossmann wrote:
> Hi,
> 
> I'm wondering if you'd be willing to commit a small change to bsd.gnome.mk
> that uses the *_DETECT variables for the test argument in *_RUN_DEPENDS,
> see appended patch. It includes one change for libgailgnome_DETECT to
> test the lib instead of the .pc file, taken from the dependency.
> 
> The changes makes it easier for me to install the whole of gnome in
> a location other than the default and reduces data duplication by using
> the variables.
> 
> On a side note, while looking over the bsd.gnome.mk, I also noticed what
> looks to be a typo: You're using
> 
> > libartlgpl1_USE_GNOME_IMPL=	pkgconfig
> 
> where I think it should be libartlgpl2_USE_GNOME_IMPL like the rest of the
> variables. I guess nobody would notice since everyone will have pkgconfig
> at that point.

This patch looks good to me.  Thanks!

Joe

> 
> Please let me know what you think.
> 
> Thanks, Rolf
> 
> --- bsd.gnome.mk	Wed Nov 12 05:11:09 2003
> +++ bsd.gnome.mk.rg	Fri Dec 19 16:21:37 2003
> @@ -54,8 +54,8 @@
>  				 s|DATADIRNAME=lib|DATADIRNAME=share|g'
>  
> 
> -gnomehier_RUN_DEPENDS=	${X11BASE}/share/gnome/.keep_me:${PORTSDIR}/misc/gnomehier
>  gnomehier_DETECT=	${X11BASE}/share/gnome/.keep_me
> +gnomehier_RUN_DEPENDS=	${gnomehier_DETECT}:${PORTSDIR}/misc/gnomehier
>  
>  GNOME_HTML_DIR?=	${PREFIX}/share/doc
>  gnomeprefix_CONFIGURE_ENV=GTKDOC="false"
> @@ -68,8 +68,8 @@
>  
>  gnometarget_CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
>  
> -gnomeaudio_RUN_DEPENDS=	${X11BASE}/share/gnome/sounds/login.wav:${PORTSDIR}/audio/gnomeaudio
>  gnomeaudio_DETECT=	${X11BASE}/share/gnome/sounds/login.wav
> +gnomeaudio_RUN_DEPENDS=	${gnomeaudio_DETECT}:${PORTSDIR}/audio/gnomeaudio
>  
>  ESD_CONFIG?=		${LOCALBASE}/bin/esd-config
>  esound_LIB_DEPENDS=	esd.2:${PORTSDIR}/audio/esound
> @@ -140,9 +140,9 @@
>  oaf_DETECT=		${OAF_CONFIG}
>  oaf_USE_GNOME_IMPL=	glib12 orbit libxml
>  
> -gnomemimedata_BUILD_DEPENDS=${X11BASE}/libdata/pkgconfig/gnome-mime-data-2.0.pc:${PORTSDIR}/misc/gnomemimedata
> -gnomemimedata_RUN_DEPENDS=${X11BASE}/libdata/pkgconfig/gnome-mime-data-2.0.pc:${PORTSDIR}/misc/gnomemimedata
>  gnomemimedata_DETECT=	${X11BASE}/libdata/pkgconfig/gnome-mime-data-2.0.pc
> +gnomemimedata_BUILD_DEPENDS=${gnomemimedata_DETECT}:${PORTSDIR}/misc/gnomemimedata
> +gnomemimedata_RUN_DEPENDS=${gnomemimedata_DETECT}:${PORTSDIR}/misc/gnomemimedata
>  gnomemimedata_USE_GNOME_IMPL=gnomehier pkgconfig
>  
>  GCONF_CONFIG?=		${X11BASE}/bin/gconf-config
> @@ -292,8 +292,8 @@
>  atspi_DETECT=		${X11BASE}/libdata/pkgconfig/cspi-1.0.pc
>  atspi_USE_GNOME_IMPL=	gail libbonobo
>  
> -libgailgnome_RUN_DEPENDS=	${X11BASE}/lib/gtk-2.0/modules/libgail-gnome.so:${PORTSDIR}/x11-toolkits/libgail-gnome
> -libgailgnome_DETECT=		${X11BASE}/libdata/pkgconfig/libgail-gnome.pc
> +libgailgnome_DETECT=		${X11BASE}/lib/gtk-2.0/modules/libgail-gnome.so
> +libgailgnome_RUN_DEPENDS=	${libgailgnome_DETECT}:${PORTSDIR}/x11-toolkits/libgail-gnome
>  libgailgnome_USE_GNOME_IMPL=	libgnomeui atspi
>  
>  libgtkhtml_LIB_DEPENDS=	gtkhtml-2.0:${PORTSDIR}/www/libgtkhtml
> _______________________________________________
> freebsd-gnome at freebsd.org mailing list
> http://lists.freebsd.org/mailman/listinfo/freebsd-gnome
> To unsubscribe, send any mail to "freebsd-gnome-unsubscribe at freebsd.org"
-- 
PGP Key : http://www.marcuscom.com/pgp.asc


-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 187 bytes
Desc: This is a digitally signed message part
Url : http://lists.freebsd.org/pipermail/freebsd-gnome/attachments/20031219/e64ff5b4/attachment.bin