Date: 11 Feb 2003 14:32:30 -0500 From: Joe Marcus Clarke <marcus@FreeBSD.org> To: FreeBSD GNOME Users <gnome@FreeBSD.org> Subject: HEADS UP: Removing GNOMENG Message-ID: <1044991950.305.36.camel@gyros>
next in thread | raw e-mail | index | archive | help
--=-pgU9nDFJklOtAa2s/dyo Content-Type: multipart/mixed; boundary="=-mDlTW1sMSB0O/yqmrVe/" --=-mDlTW1sMSB0O/yqmrVe/ Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Okay, here is my release candidate diff for removing need for the GNOMENG keyword, and adding GNOME 2 support to the new GNOME porting infrastructure. This patch applies directly to ports/Mk/bsd.gnome.mk, and removes the need for the bsd.gnomeng.mk file. =20 I'd like to commit this tomorrow if possible. Please let me know if you see of foresee any problems. Thanks. Joe --=20 Joe Marcus Clarke FreeBSD GNOME Team :: marcus@FreeBSD.org http://www.FreeBSD.org/gnome --=-mDlTW1sMSB0O/yqmrVe/ Content-Disposition: attachment; filename=bsd.gnome.mk.diff Content-Type: text/plain; name=bsd.gnome.mk.diff; charset=ISO8859-1 Content-Transfer-Encoding: quoted-printable --- ports/Mk/bsd.gnome.mk.orig Mon Dec 9 00:09:56 2002 +++ ports/Mk/bsd.gnome.mk Tue Feb 11 13:54:55 2003 @@ -1,359 +1,486 @@ -#-*- mode: Fundamental; tab-width: 4; -*- -# ex:ts=3D4 # -# $FreeBSD: ports/Mk/bsd.gnome.mk,v 1.20 2002/12/09 05:09:56 adamw Exp $ -# $NetBSD: $ +# $FreeBSD$ # -# Please view me with 4 column tabs! =20 -.if !defined(USE_GNOMENG) .if !defined(_POSTMKINCLUDED) =20 -# Please make sure all changes to this file are passed through the maintai= ner.=20 +# Please make sure all changes to this file are passed through the maintai= ner. # Do not commit them yourself (unless of course you're the Port's Wraith ;= ). Gnome_Include_MAINTAINER=3D gnome@FreeBSD.org =20 +# This section defines possible names of GNOME components and all informat= ion +# necessary for ports to use those components. + +# Ports can use this as follows: +# +# USE_GNOME=3D gnomeprint bonobo +# +# .include <bsd.port.mk> +# +# As a result proper LIB_DEPENDS/RUN_DEPENDS will be added and CONFIGURE_E= NV +# and MAKE_ENV defined. + +_USE_GNOME_ALL=3D gnomehack gnomeprefix gnomehier gnomeaudio esound libght= tp \ + glib12 gtk12 libxml gdkpixbuf imlib orbit gnomelibs \ + gnomecanvas oaf gnomemimedata gconf gnomevfs libcapplet \ + gnomeprint bonobo libgda gnomedb libglade gal glibwww gtkhtml \ + libpanel +_USE_GNOME_ALL+=3Dglib20 atk pango gtk20 linc libidl orbit2 libglade2 libx= ml2 \ + libxslt bonoboactivation libbonobo gconf2 gnomevfs2 gail \ + libgnomecanvas libartlgpl2 libgnomeprint libgnomeprintui \ + libgnome libbonoboui libgnomeui atspi libgailgnome \ + libgtkhtml gnomedesktop libwnck vte libzvt librsvg2 eel2 \ + gnomepanel + +SCROLLKEEPER_DIR=3D /var/db/scrollkeeper +gnomehack_PRE_PATCH=3D ${FIND} ${WRKSRC} -name "Makefile.in*" | ${XARGS} $= {REINPLACE_CMD} -e \ + 's|[(]GNOME_datadir[)]/gnome/|(datadir)/|g ; \ + s|[(]GNOME_datadir[)]/locale|(prefix)/share/locale|g ; \ + s|[(]datadir[)]/locale|(prefix)/share/locale|g ; \ + s|[(]libdir[)]/locale|(prefix)/share/locale|g ; \ + s|[(]gnomedatadir[)]/gnome|(gnomedatadir)|g ; \ + s|[(]datadir[)]/aclocal|(prefix)/share/aclocal|g ; \ + s|[(]datadir[)]/gnome/|(datadir)/|g ; \ + s|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g ; \ + s|[$$][(]localstatedir[)]/scrollkeeper|${SCROLLKEEPER_DIR}|g ; \ + s|[(]libdir[)]/bonobo/servers|(prefix)/libdata/bonobo/servers|g' + +gnomehier_RUN_DEPENDS=3D ${X11BASE}/share/gnome/.keep_me:${PORTSDIR}/misc/= gnomehier +gnomehier_DETECT=3D ${X11BASE}/share/gnome/.keep_me + +GNOME_HTML_DIR?=3D ${PREFIX}/share/doc +gnomeprefix_CONFIGURE_ENV=3DGTKDOC=3D"false" +gnomeprefix_CONFIGURE_ARGS=3D--localstatedir=3D${PREFIX}/share/gnome \ + --datadir=3D${PREFIX}/share/gnome \ + --with-html-dir=3D${GNOME_HTML_DIR} \ + --disable-gtk-doc \ + --with-gconf-source=3Dxml::${PREFIX}/etc/gconf/gconf.xml.defaults +gnomeprefix_USE_GNOME_IMPL=3Dgnomehier + +gnomeaudio_RUN_DEPENDS=3D ${X11BASE}/share/gnome/sounds/login.wav:${PORTSD= IR}/audio/gnomeaudio +gnomeaudio_DETECT=3D ${X11BASE}/share/gnome/sounds/login.wav + +ESD_CONFIG?=3D ${LOCALBASE}/bin/esd-config +esound_LIB_DEPENDS=3D esd.2:${PORTSDIR}/audio/esound +esound_CONFIGURE_ENV=3D ESD_CONFIG=3D"${ESD_CONFIG}" +esound_MAKE_ENV=3D ESD_CONFIG=3D"${ESD_CONFIG}" +esound_DETECT=3D ${ESD_CONFIG} + +libghttp_LIB_DEPENDS=3D ghttp.1:${PORTSDIR}/www/libghttp +libghttp_DETECT=3D ${LOCALBASE}/etc/ghttpConf.sh + +GLIB_CONFIG?=3D ${LOCALBASE}/bin/glib12-config +glib12_LIB_DEPENDS=3D glib12.3:${PORTSDIR}/devel/glib12 +glib12_CONFIGURE_ENV=3D GLIB_CONFIG=3D"${GLIB_CONFIG}" +glib12_MAKE_ENV=3D GLIB_CONFIG=3D"${GLIB_CONFIG}" +glib12_DETECT=3D ${GLIB_CONFIG} + +GTK_CONFIG?=3D ${X11BASE}/bin/gtk12-config +gtk12_LIB_DEPENDS=3D gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 +gtk12_CONFIGURE_ENV=3D GTK_CONFIG=3D"${GTK_CONFIG}" +gtk12_MAKE_ENV=3D GTK_CONFIG=3D"${GTK_CONFIG}" +gtk12_DETECT=3D ${GTK_CONFIG} +gtk12_USE_GNOME_IMPL=3D glib12 + +XML_CONFIG?=3D ${LOCALBASE}/bin/xml-config +libxml_LIB_DEPENDS=3D xml.5:${PORTSDIR}/textproc/libxml +libxml_CONFIGURE_ENV=3D XML_CONFIG=3D"${XML_CONFIG}" +libxml_MAKE_ENV=3D XML_CONFIG=3D"${XML_CONFIG}" +libxml_DETECT=3D ${XML_CONFIG} +libxml_USE_GNOME_IMPL=3D glib12 + +ORBIT_CONFIG?=3D ${LOCALBASE}/bin/orbit-config +orbit_LIB_DEPENDS=3D ORBit.2:${PORTSDIR}/devel/ORBit +orbit_CONFIGURE_ENV=3D ORBIT_CONFIG=3D"${ORBIT_CONFIG}" +orbit_MAKE_ENV=3D ORBIT_CONFIG=3D"${ORBIT_CONFIG}" +orbit_DETECT=3D ${ORBIT_CONFIG} +orbit_USE_GNOME_IMPL=3D glib12 + +GDK_PIXBUF_CONFIG?=3D ${X11BASE}/bin/gdk-pixbuf-config +gdkpixbuf_LIB_DEPENDS=3D gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf +gdkpixbuf_CONFIGURE_ENV=3DGDK_PIXBUF_CONFIG=3D"${GDK_PIXBUF_CONFIG}" +gdkpixbuf_MAKE_ENV=3D GDK_PIXBUF_CONFIG=3D"${GDK_PIXBUF_CONFIG}" +gdkpixbuf_DETECT=3D ${GDK_PIXBUF_CONFIG} +gdkpixbuf_USE_GNOME_IMPL=3Dgtk12 + +IMLIB_CONFIG?=3D ${X11BASE}/bin/imlib-config +imlib_LIB_DEPENDS=3D Imlib.5:${PORTSDIR}/graphics/imlib +imlib_CONFIGURE_ENV=3D IMLIB_CONFIG=3D"${IMLIB_CONFIG}" +imlib_MAKE_ENV=3D IMLIB_CONFIG=3D"${IMLIB_CONFIG}" +imlib_DETECT=3D ${IMLIB_CONFIG} +imlib_USE_GNOME_IMPL=3D gtk12 + +GNOME_CONFIG?=3D ${X11BASE}/bin/gnome-config +gnomelibs_LIB_DEPENDS=3D gnome.5:${PORTSDIR}/x11/gnomelibs +gnomelibs_CONFIGURE_ENV=3DGNOME_CONFIG=3D"${GNOME_CONFIG}" +gnomelibs_MAKE_ENV=3D GNOME_CONFIG=3D"${GNOME_CONFIG}" +gnomelibs_DETECT=3D ${GNOME_CONFIG} +gnomelibs_USE_GNOME_IMPL=3Desound gtk12 imlib libxml orbit + +gnomecanvas_LIB_DEPENDS=3Dgnomecanvaspixbuf.1:${PORTSDIR}/graphics/gnomeca= nvas +gnomecanvas_DETECT=3D ${X11BASE}/etc/gnomecanvaspixbufConf.sh +gnomecanvas_USE_GNOME_IMPL=3Dgnomelibs gdkpixbuf + +OAF_CONFIG?=3D ${X11BASE}/bin/oaf-config +oaf_LIB_DEPENDS=3D oaf.0:${PORTSDIR}/devel/oaf +oaf_CONFIGURE_ENV=3D OAF_CONFIG=3D"${OAF_CONFIG}" +oaf_MAKE_ENV=3D OAF_CONFIG=3D"${OAF_CONFIG}" +oaf_DETECT=3D ${OAF_CONFIG} +oaf_USE_GNOME_IMPL=3D glib12 orbit libxml + +gnomemimedata_BUILD_DEPENDS=3D${X11BASE}/libdata/pkgconfig/gnome-mime-data= -2.0.pc:${PORTSDIR}/misc/gnomemimedata +gnomemimedata_RUN_DEPENDS=3D${X11BASE}/libdata/pkgconfig/gnome-mime-data-2= .0.pc:${PORTSDIR}/misc/gnomemimedata +gnomemimedata_DETECT=3D ${X11BASE}/libdata/pkgconfig/gnome-mime-data-2.0.p= c +gnomemimedata_USE_GNOME_IMPL=3Dgnomehier + +GCONF_CONFIG?=3D ${X11BASE}/bin/gconf-config +gconf_LIB_DEPENDS=3D gconf-1.1:${PORTSDIR}/devel/gconf +gconf_CONFIGURE_ENV=3D GCONF_CONFIG=3D"${GCONF_CONFIG}" +gconf_MAKE_ENV=3D GCONF_CONFIG=3D"${GCONF_CONFIG}" +gconf_DETECT=3D ${GCONF_CONFIG} +gconf_USE_GNOME_IMPL=3D oaf + +GNOME_VFS_CONFIG?=3D ${X11BASE}/bin/gnome-vfs-config +gnomevfs_LIB_DEPENDS=3D gnomevfs.0:${PORTSDIR}/devel/gnomevfs +gnomevfs_CONFIGURE_ENV=3D GNOME_VFS_CONFIG=3D"${GNOME_VFS_CONFIG}" +gnomevfs_MAKE_ENV=3D GNOME_VFS_CONFIG=3D"${GNOME_VFS_CONFIG}" +gnomevfs_DETECT=3D ${GNOME_VFS_CONFIG} +gnomevfs_USE_GNOME_IMPL=3Dgnomemimedata gconf gnomelibs + +libcapplet_LIB_DEPENDS=3D capplet.5:${PORTSDIR}/x11/libcapplet +libcapplet_DETECT=3D ${X11BASE}/etc/cappletConf.sh +libcapplet_USE_GNOME_IMPL=3Dgnomelibs + +gnomeprint_LIB_DEPENDS=3D gnomeprint.16:${PORTSDIR}/print/gnomeprint +gnomeprint_DETECT=3D ${X11BASE}/etc/printConf.sh +gnomeprint_USE_GNOME_IMPL=3Dgnomelibs gnomecanvas + +bonobo_LIB_DEPENDS=3D bonobo.2:${PORTSDIR}/devel/bonobo +bonobo_DETECT=3D ${X11BASE}/etc/bonoboConf.sh +bonobo_USE_GNOME_IMPL=3D oaf gnomeprint + +GDA_CONFIG?=3D ${X11BASE}/bin/gda-config +libgda_LIB_DEPENDS=3D gda-client.0:${PORTSDIR}/databases/libgda +libgda_CONFIGURE_ENV=3D GDA_CONFIG=3D"${GDA_CONFIG}" +libgda_MAKE_ENV=3D GDA_CONFIG=3D"${GDA_CONFIG}" +libgda_DETECT=3D ${GDA_CONFIG} +libgda_USE_GNOME_IMPL=3D gconf bonobo + +GNOMEDB_CONFIG?=3D ${X11BASE}/bin/gnomedb-config +gnomedb_LIB_DEPENDS=3D gnomedb.0:${PORTSDIR}/databases/gnomedb +gnomedb_CONFIGURE_ENV=3D GNOMEDB_CONFIG=3D"${GNOMEDB_CONFIG}" +gnomedb_MAKE_ENV=3D GNOMEDB_CONFIG=3D"${GNOMEDB_CONFIG}" +gnomedb_DETECT=3D ${GNOMEDB_CONFIG} +gnomedb_USE_GNOME_IMPL=3D libgda + +LIBGLADE_CONFIG?=3D ${X11BASE}/bin/libglade-config +libglade_LIB_DEPENDS=3D glade.4:${PORTSDIR}/devel/libglade +libglade_CONFIGURE_ENV=3D LIBGLADE_CONFIG=3D"${LIBGLADE_CONFIG}" +libglade_MAKE_ENV=3D LIBGLADE_CONFIG=3D"${LIBGLADE_CONFIG}" +libglade_DETECT=3D ${LIBGLADE_CONFIG} +libglade_USE_GNOME_IMPL=3Dgnomedb + +gal_LIB_DEPENDS=3D gal.22:${PORTSDIR}/x11-toolkits/gal +gal_DETECT=3D ${X11BASE}/etc/galConf.sh +gal_USE_GNOME_IMPL=3D libglade + +glibwww_LIB_DEPENDS=3D glibwww.1:${PORTSDIR}/www/glibwww +glibwww_DETECT=3D ${X11BASE}/etc/glibwwwConf.sh +glibwww_USE_GNOME_IMPL=3D gnomelibs + +gtkhtml_LIB_DEPENDS=3D gtkhtml-1.1.3:${PORTSDIR}/www/gtkhtml +gtkhtml_DETECT=3D ${X11BASE}/etc/gtkhtmlConf.sh +gtkhtml_USE_GNOME_IMPL=3D glibwww gal libghttp libcapplet + +libpanel_LIB_DEPENDS=3D panel_applet.5:${PORTSDIR}/x11/libpanel +libpanel_DETECT=3D ${X11BASE}/etc/appletsConf.sh +libpanel_USE_GNOME_IMPL=3Dgnomelibs +libpanel_GNOME_DESKTOP=3D1 + +glib20_LIB_DEPENDS=3D glib-2.0.0:${PORTSDIR}/devel/glib20 +glib20_DETECT=3D ${LOCALBASE}/libdata/pkgconfig/glib-2.0.pc + +atk_LIB_DEPENDS=3D atk-1.0.0:${PORTSDIR}/devel/atk +atk_DETECT=3D ${LOCALBASE}/libdata/pkgconfig/atk.pc +atk_USE_GNOME_IMPL=3D glib20 + +pango_LIB_DEPENDS=3D pango-1.0.0:${PORTSDIR}/x11-toolkits/pango +pango_DETECT=3D ${X11BASE}/libdata/pkgconfig/pango.pc +pango_USE_GNOME_IMPL=3D glib20 + +gtk20_LIB_DEPENDS=3D gtk-x11-2.0.0:${PORTSDIR}/x11-toolkits/gtk20 +gtk20_DETECT=3D ${X11BASE}/libdata/pkgconfig/gtk+-x11-2.0.pc +gtk20_USE_GNOME_IMPL=3D atk pango + +linc_LIB_DEPENDS=3D linc.1:${PORTSDIR}/net/linc +linc_DETECT=3D ${LOCALBASE}/libdata/pkgconfig/linc.pc +linc_USE_GNOME_IMPL=3D glib20 + +libidl_LIB_DEPENDS=3D IDL-2.0:${PORTSDIR}/devel/libIDL +libidl_DETECT=3D ${LOCALBASE}/libdata/pkgconfig/libIDL-2.0.pc +libidl_USE_GNOME_IMPL=3D glib20 + +orbit2_LIB_DEPENDS=3D ORBit-2.0:${PORTSDIR}/devel/ORBit2 +orbit2_DETECT=3D ${LOCALBASE}/libdata/pkgconfig/ORBit-2.0.pc +orbit2_USE_GNOME_IMPL=3D libidl linc + +libglade2_LIB_DEPENDS=3D glade-2.0.0:${PORTSDIR}/devel/libglade2 +libglade2_DETECT=3D ${X11BASE}/libdata/pkgconfig/libglade-2.0.pc +libglade2_USE_GNOME_IMPL=3Dlibxml2 gtk20 + +libxml2_LIB_DEPENDS=3D xml2.5:${PORTSDIR}/textproc/libxml2 +libxml2_DETECT=3D ${LOCALBASE}/libdata/pkgconfig/libxml-2.0.pc + +libxslt_LIB_DEPENDS=3D xslt.1:${PORTSDIR}/textproc/libxslt +libxslt_DETECT=3D ${LOCALBASE}/libdata/pkgconfig/libxslt.pc +libxslt_USE_GNOME_IMPL=3D libxml2 + +bonoboactivation_LIB_DEPENDS=3D bonobo-activation.4:${PORTSDIR}/devel/bono= bo-activation +bonoboactivation_DETECT=3D ${LOCALBASE}/libdata/pkgconfig/bonobo-activatio= n-2.0.pc +bonoboactivation_USE_GNOME_IMPL=3Dlibxml2 orbit2 + +libbonobo_LIB_DEPENDS=3D bonobo-2.0:${PORTSDIR}/devel/libbonobo +libbonobo_DETECT=3D ${LOCALBASE}/libdata/pkgconfig/libbonobo-2.0.pc +libbonobo_USE_GNOME_IMPL=3Dbonoboactivation + +gconf2_LIB_DEPENDS=3D gconf-2.5:${PORTSDIR}/devel/gconf2 +gconf2_DETECT=3D ${X11BASE}/libdata/pkgconfig/gconf-2.0.pc +gconf2_USE_GNOME_IMPL=3D orbit2 libxml2 gtk20 + +gnomevfs2_LIB_DEPENDS=3D gnomevfs-2.0:${PORTSDIR}/devel/gnomevfs2 +gnomevfs2_DETECT=3D ${X11BASE}/libdata/pkgconfig/gnome-vfs-2.0.pc +gnomevfs2_USE_GNOME_IMPL=3Dgconf2 libbonobo gnomemimedata + +gail_LIB_DEPENDS=3D gailutil.17:${PORTSDIR}/x11-toolkits/gail +gail_DETECT=3D ${X11BASE}/libdata/pkgconfig/gail.pc +gail_USE_GNOME_IMPL=3D libgnomecanvas + +libgnomecanvas_LIB_DEPENDS=3D gnomecanvas-2.200:${PORTSDIR}/graphics/libgn= omecanvas +libgnomecanvas_DETECT=3D ${X11BASE}/libdata/pkgconfig/libgnomecanvas-2.0.= pc +libgnomecanvas_USE_GNOME_IMPL=3D libglade2 libartlgpl2 + +libartlgpl2_LIB_DEPENDS=3D art_lgpl_2.5:${PORTSDIR}/graphics/libart_lgpl2 +libartlgpl2_DETECT=3D ${LOCALBASE}/libdata/pkgconfig/libart-2.0.pc + +libgnomeprint_LIB_DEPENDS=3D gnomeprint-2-2.0:${PORTSDIR}/print/libgnomepr= int +libgnomeprint_DETECT=3D ${X11BASE}/libdata/pkgconfig/libgnomeprint-2.0.pc +libgnomeprint_USE_GNOME_IMPL=3D libbonobo libartlgpl2 gtk20 + +libgnomeprintui_LIB_DEPENDS=3D gnomeprintui-2-2.0:${PORTSDIR}/x11-toolkits= /libgnomeprintui +libgnomeprintui_DETECT=3D ${X11BASE}/libdata/pkgconfig/libgnomeprintui-2.= 0.pc +libgnomeprintui_USE_GNOME_IMPL=3D libgnomeprint libgnomecanvas + +libgnome_LIB_DEPENDS=3D gnome-2.200:${PORTSDIR}/x11/libgnome +libgnome_DETECT=3D ${X11BASE}/libdata/pkgconfig/libgnome-2.0.pc +libgnome_USE_GNOME_IMPL=3Dlibxslt gnomevfs2 esound + +libbonoboui_LIB_DEPENDS=3D bonoboui-2.0:${PORTSDIR}/x11-toolkits/libbonobo= ui +libbonoboui_DETECT=3D ${X11BASE}/libdata/pkgconfig/libbonoboui-2.0.pc +libbonoboui_USE_GNOME_IMPL=3D libgnomecanvas libgnome + +libgnomeui_LIB_DEPENDS=3D gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnome= ui +libgnomeui_DETECT=3D ${X11BASE}/libdata/pkgconfig/libgnomeui-2.0.pc +libgnomeui_USE_GNOME_IMPL=3D libbonoboui + +atspi_LIB_DEPENDS=3D spi.1:${PORTSDIR}/x11-toolkits/at-spi +atspi_DETECT=3D ${X11BASE}/libdata/pkgconfig/cspi-1.0.pc +atspi_USE_GNOME_IMPL=3D gail libbonobo + +libgailgnome_RUN_DEPENDS=3D ${X11BASE}/lib/gtk-2.0/modules/libgail-gnome.s= o +libgailgnome_DETECT=3D ${X11BASE}/libdata/pkgconfig/libgail-gnome.pc +libgailgnome_USE_GNOME_IMPL=3D libgnomeui atspi + +libgtkhtml_LIB_DEPENDS=3D gtkhtml-2.0:${PORTSDIR}/www/libgtkhtml +libgtkhtml_DETECT=3D ${X11BASE}/libdata/pkgconfig/libgtkhtml-2.0.pc +libgtkhtml_USE_GNOME_IMPL=3Dlibxslt gnomevfs2 gail + +gnomedesktop_LIB_DEPENDS=3D gnome-desktop-2.3:${PORTSDIR}/x11/gnomedesktop +gnomedesktop_DETECT=3D ${X11BASE}/libdata/pkgconfig/gnome-desktop-2.0.pc +gnomedesktop_USE_GNOME_IMPL=3D libgnomeui +gnomedesktop_GNOME_DESKTOP=3D 2 + +libwnck_LIB_DEPENDS=3D wnck-1.9:${PORTSDIR}/x11-toolkits/libwnck +libwnck_DETECT=3D ${X11BASE}/libdata/pkgconfig/libwnck-1.0.pc +libwnck_USE_GNOME_IMPL=3D gtk20 + +vte_LIB_DEPENDS=3D vte.4:${PORTSDIR}/x11-toolkits/vte +vte_DETECT=3D ${X11BASE}/libdata/pkgconfig/vte.pc +vte_USE_GNOME_IMPL=3D gtk20 + +libzvt_LIB_DEPENDS=3D zvt-2.0.0:${PORTSDIR}/x11-toolkits/libzvt +libzvt_DETECT=3D ${X11BASE}/libdata/pkgconfig/libzvt-2.0.pc +libzvt_USE_GNOME_IMPL=3D gtk20 + +librsvg2_LIB_DEPENDS=3D rsvg-2.4:${PORTSDIR}/graphics/librsvg2 +librsvg2_DETECT=3D ${X11BASE}/libdata/pkgconfig/librsvg-2.0.pc +librsvg2_USE_GNOME_IMPL=3Dlibartlgpl2 libxml2 gtk20 + +eel2_LIB_DEPENDS=3D eel-2.4:${PORTSDIR}/x11-toolkits/eel2 +eel2_DETECT=3D ${X11BASE}/libdata/pkgconfig/eel-2.0.pc +eel2_USE_GNOME_IMPL=3D gnomevfs2 libgnomeui gail + +gnomepanel_LIB_DEPENDS=3D panel-applet-2.0:${PORTSDIR}/x11/gnomepanel +gnomepanel_DETECT=3D ${X11BASE}/libdata/pkgconfig/libpanelapplet-2.0.pc +gnomepanel_USE_GNOME_IMPL=3Dlibwnck gnomedesktop +gnomepanel_GNOME_DESKTOP=3D2 + +# End component definition section + # This section defines tests for optional software. These work off four -# types of variables: WANT_, WITH_, HAVE_ and USE_. The logic of -# this is that a port can WANT support for a package; a user specifies -# if they want ports compiled WITH certain features; this section tests -# if we HAVE these features; and the port is then free to USE them. +# types of variables: WANT_GNOME, WITH_GNOME, HAVE_GNOME and USE_GNOME. +# The logic of this is that a port can WANT support for a package; a user +# specifies if they want ports compiled WITH certain features; this sectio= n +# tests if we HAVE these features; and the port is then free to USE them. =20 # The logic of this section is like this: # -# .if defined(WANT_FOO) -# .if defined(WITH_FOO) -# HAVE_FOO=3Dyes -# .elif defined(WITHOUT_FOO) -# .undef HAVE_FOO -# .elif (if FOO installed) -# HAVE_FOO=3Dyes -# .else -# Print option message -# .endif +# .if defined(WANT_GNOME) && !defined(WITHOUT_GNOME) +# .for foo in ALL_GNOME_COMPONENTS +# .if defined(WITH_GNOME) +# HAVE_GNOME +=3D foo +# .elif (foo installed) +# HAVE_GNOME +=3D foo +# .else +# Print option message +# .endif +# .endfor # .endif # # Although it apears a little more convoluted in the tests. =20 # Ports can make use of this like so: # -# WANT_FOO=3D yes +# WANT_GNOME=3D yes # # .include <bsd.port.pre.mk> # -# .if defined(HAVE_FOO) +# .if ${HAVE_GNOME:Mfoo}!=3D"" # ... Do some things ... -# USE_FOO=3D yes +# USE_GNOME=3D foo # .else # ... Do some other things ... # .endif -=20 -# The following defines are for the various levels of libraries in the -# GLib/GTK+/GNOME group of software. There are the following options: -# -# WITH_GLIB, WITH_GTK, WITH_ESOUND, WITH_IMLIB, WITH_GNOME: -# - Only set by the user, indicates that they always want -# this setting. -# WITHOUT_GLIB, WITHOUT_GTK, WITHOUT_ESOUND, WITHOUT_IMLIB, WITHOUT_GNOME: -# - Only set by the user, indicates that they never want -# this setting. -# -# The following variables might be set: -# -# HAVE_GLIB, HAVE_GTK: -# yes - found GLib/GTK+ 1.2.x or WITH_GLIB/WITH_GTK set to yes. -# HAVE_ESOUND: -# yes - either found ESound or WITH_ESOUND set to yes. -# HAVE_IMLIB: -# yes - either found Imlib or WITH_IMLIB set to yes. -# HAVE_GNOME: -# yes - either found GNOME or WITH_GNOME set to yes. - -.if defined(WANT_ESOUND) && !defined(WITHOUT_ESOUND) && !defined(WITHOUT_A= LL) -.if defined(HAVE_ESOUND) -.undef HAVE_ESOUND -.endif -.if defined(WITH_ESOUND) || defined(WITH_ALL) -HAVE_ESOUND=3D yes -.else -ESD_CONFIG?=3D ${LOCALBASE}/bin/esd-config -.if exists(${ESD_CONFIG}) -HAVE_ESOUND=3D yes -.else -pre-everything:: - @${ECHO_MSG} - @${ECHO_MSG} "If you want to compile with ESound support," - @${ECHO_MSG} "hit Ctrl-C right now and use \"make WITH_ESOUND=3Dyes\"" - @${ECHO_MSG} -.endif -.endif -.endif - -.if defined(WANT_GLIB) && !defined(WITHOUT_GLIB) && !defined(WITHOUT_ALL) -.if defined(HAVE_GLIB) -.undef HAVE_GLIB -.endif -.if defined(WITH_GLIB) || defined(WITH_ALL) -HAVE_GLIB=3D yes -.else -GLIB_CONFIG?=3D ${LOCALBASE}/bin/glib12-config -.if exists(${GLIB_CONFIG}) -HAVE_GLIB=3D yes -.else -pre-everything:: - @${ECHO_MSG} - @${ECHO_MSG} "If you want to compile with GLib support," - @${ECHO_MSG} "hit Ctrl-C right now and use \"make WITH_GLIB=3Dyes\"" - @${ECHO_MSG} -.endif -.endif -.endif =20 -.if defined(WANT_GTK) && !defined(WITHOUT_GTK) && !defined(WITHOUT_ALL) -.if defined(HAVE_GTK) -.undef HAVE_GTK -.endif -.if defined(WITH_GTK) || defined(WITH_ALL) -HAVE_GTK=3D yes -.else -GTK_CONFIG?=3D ${X11BASE}/bin/gtk12-config -.if exists(${GTK_CONFIG}) -HAVE_GTK=3D yes -.else -pre-everything:: - @${ECHO_MSG} - @${ECHO_MSG} "If you want to compile with GTK+ support," - @${ECHO_MSG} "hit Ctrl-C right now and use \"make WITH_GTK=3Dyes\"" - @${ECHO_MSG} -.endif -.endif -.endif - -.if defined(WANT_IMLIB) && !defined(WITHOUT_IMLIB) && !defined(WITHOUT_ALL= ) -.if defined(HAVE_IMLIB) -.undef HAVE_IMLIB -.endif -.if defined(WITH_IMLIB) || defined(WITH_ALL) -HAVE_IMLIB=3D yes -.else -IMLIB_CONFIG?=3D ${X11BASE}/bin/imlib-config -.if exists(${IMLIB_CONFIG}) -HAVE_IMLIB=3D yes -.else -pre-everything:: - @${ECHO_MSG} - @${ECHO_MSG} "If you want to compile with Imlib support," - @${ECHO_MSG} "hit Ctrl-C right now and use \"make WITH_IMLIB=3Dyes\"" - @${ECHO_MSG} -.endif -.endif -.endif - -.if defined(WANT_GNOME) && !defined(WITHOUT_GNOME) && !defined(WITHOUT_ALL= ) -.if defined(HAVE_GNOME) -.undef HAVE_GNOME -.endif -.if defined(WITH_GNOME) || defined (WITH_ALL) -HAVE_GNOME=3D yes -.else -GNOME_CONFIG?=3D ${X11BASE}/bin/gnome-config -.if exists(${GNOME_CONFIG}) -HAVE_GNOME=3D yes -.else -pre-everything:: - @${ECHO_MSG} - @${ECHO_MSG} "If you want to compile with GNOME support," - @${ECHO_MSG} "hit Ctrl-C right now and use \"make WITH_GNOME=3Dyes\"" - @${ECHO_MSG} -.endif -.endif +# We also check each component to see if it has a desktop requirement. If +# it does, and its requirement disagrees with the user's chosen desktop, +# do not add the component to the HAVE_GNOME list. + +_USE_GNOME_SAVED:=3D${USE_GNOME} +_USE_GNOME_DESKTOP=3Dyes +HAVE_GNOME?=3D +.if (defined(WANT_GNOME) && !defined(WITHOUT_GNOME)) +. for component in ${_USE_GNOME_ALL} +. if defined(WITH_GNOME_DESKTOP) && defined(${component}_GNOME_DESKTO= P) +. if ${WITH_GNOME_DESKTOP}=3D=3D${${component}_GNOME_DESKTOP} +HAVE_GNOME+=3D ${component} +. else +_USE_GNOME_DESKTOP=3Dno +. endif +. else +. if exists(${${component}_DETECT}) +HAVE_GNOME+=3D ${component} +. elif defined(WITH_GNOME) +. if ${WITH_GNOME}=3D=3D"yes" || ${WITH_GNOME:M${component}}!= =3D"" || \ + ${WITH_GNOME}=3D=3D"1" +HAVE_GNOME+=3D ${component} +. endif +. endif +. endif +. endfor +.elif defined(WITHOUT_GNOME) +. if ${WITHOUT_GNOME}!=3D"yes" && ${WITHOUT_GNOME}!=3D"1" +. for component in ${_USE_GNOME_ALL} +. if ${WITHOUT_GNOME:M${component}}=3D=3D"" +. if exists(${${component}_DETECT}) +HAVE_GNOME+=3D ${component} +. endif +. endif +. endfor +. endif .endif =20 .endif # End of optional part. =20 .if defined(_POSTMKINCLUDED) -# This section contains the USE_ definitions. These also pass any HAVE_ -# options through to the build process so that ports can use them for -# conditional building of components. Also, if optional support has been -# requested, add a packagename suffix, to indicate the change in the port'= s -# behaviour. - -# USE_ESOUND - Says that the port uses ESound. -# USE_GLIB - Says that the port uses the GLib package. -# USE_GTK - Says that the port uses the GTK+ toolkit. -# USE_IMLIB - Says that the port uses the Imlib library. -# USE_GNOMELIBS - Says that the port uses the GNOME libraries. -# USE_GNOMECTRL - Says that the port uses the GNOME control center. -# USE_GNOME - Says that the port uses the GNOME desktop environment. - -# These are the only "entry points" into the GNOME distribution that will -# be supported. If you need to use a port that is (say) part of -# the controlcenter metaport, then simply request USE_GNOMECTRL=3DYES. -# -# Any explicit depends on any of the ports that make up the x11/gnome -# metaport will be periodically eradicated by marking the port BROKEN. -# Please use the guidelines above to help everybody maintain a cohesive -# FreeBSD/GNOME environment. -# -# Unless you're experienced with the GNOME system, we highly recommend -# simply using USE_GNOME=3Dyes if you have GNOME related ports you wish -# to commit. This will certainly be a *guaranteed* interface that won't -# be broken without significant warning. Practically all of your target -# audience will already have the x11/gnome metaport installed, so there -# will be minimal inconvenience in terms of excessive downloads. -# -# Ports using GNOME should also have USE_X_PREFIX defined. -# (Perhaps we should add it?? XXX: aDe) -=20 -.if defined(USE_GNOME) -USE_GNOMECTRL=3D yes -.endif -.if defined(USE_GNOMECTRL) -USE_GNOMELIBS=3D yes -.endif -.if defined(USE_GNOMELIBS) -USE_IMLIB=3D yes -USE_ESOUND=3D yes -.endif -.if defined(USE_IMLIB) -USE_GTK=3D yes -.endif -.if defined(USE_GTK) -USE_GLIB=3D yes -.endif =20 -.if defined(USE_ESOUND) -LIB_DEPENDS+=3D esd.2:${PORTSDIR}/audio/esound -ESD_CONFIG?=3D ${LOCALBASE}/bin/esd-config -CONFIGURE_ENV+=3D ESD_CONFIG=3D"${ESD_CONFIG}" -MAKE_ENV+=3D ESD_CONFIG=3D"${ESD_CONFIG}" -.if defined(HAVE_ESOUND) -.if defined(PKGNAMESUFFIX) -PKGNAMESUFFIX:=3D ${PKGNAMESUFFIX}-esound -.else -PKGNAMESUFFIX=3D -esound -.endif -CONFIGURE_ENV+=3D HAVE_ESOUND=3D${HAVE_ESOUND} -MAKE_ENV+=3D HAVE_ESOUND=3D${HAVE_ESOUND} -.endif -.endif - -.if defined(USE_GLIB) -LIB_DEPENDS+=3D glib12.3:${PORTSDIR}/devel/glib12 -GLIB_CONFIG?=3D ${LOCALBASE}/bin/glib12-config -CONFIGURE_ENV+=3D GLIB_CONFIG=3D"${GLIB_CONFIG}" -MAKE_ENV+=3D GLIB_CONFIG=3D"${GLIB_CONFIG}" -.if defined(HAVE_GLIB) -.if defined(PKGNAMESUFFIX) -PKGNAMESUFFIX:=3D ${PKGNAMESUFFIX}-glib -.else -PKGNAMESUFFIX=3D -glib -.endif -CONFIGURE_ENV+=3D HAVE_GLIB=3D${HAVE_GLIB} -MAKE_ENV+=3D HAVE_GLIB=3D${HAVE_GLIB} -.endif -.endif - -.if defined(USE_GTK) -LIB_DEPENDS+=3D gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 -GTK_CONFIG?=3D ${X11BASE}/bin/gtk12-config -CONFIGURE_ENV+=3D GTK_CONFIG=3D"${GTK_CONFIG}" -MAKE_ENV+=3D GTK_CONFIG=3D"${GTK_CONFIG}" -.if defined(HAVE_GTK) -.if defined(PKGNAMESUFFIX) -PKGNAMESUFFIX:=3D ${PKGNAMESUFFIX}-gtk -.else -PKGNAMESUFFIX=3D -gtk -.endif -CONFIGURE_ENV+=3D HAVE_GTK=3D${HAVE_GTK} -MAKE_ENV+=3D HAVE_GTK=3D${HAVE_GTK} -.endif -.endif - -.if defined(USE_IMLIB) -LIB_DEPENDS+=3D Imlib.5:${PORTSDIR}/graphics/imlib -IMLIB_CONFIG?=3D ${X11BASE}/bin/imlib-config -CONFIGURE_ENV+=3D IMLIB_CONFIG=3D"${IMLIB_CONFIG}" -MAKE_ENV+=3D IMLIB_CONFIG=3D"${IMLIB_CONFIG}" -.if defined(HAVE_IMLIB) -.if defined(PKGNAMESUFFIX) -PKGNAMESUFFIX:=3D ${PKGNAMESUFFIX}-imlib -.else -PKGNAMESUFFIX=3D -imlib -.endif -CONFIGURE_ENV+=3D HAVE_IMLIB=3D${HAVE_IMLIB} -MAKE_ENV+=3D HAVE_IMLIB=3D${HAVE_IMLIB} -.endif -.endif - -# Ports which optionally depend on GNOME can add '--datadir=3D${PREFIX}/sh= are' -# to CONFIGURE_ARGS before including <bsd.port.post.mk> if they do not wis= h -# to install their data files in /usr/X11R6/share/gnome. Please be aware -# that you will need to make non-standard patches to get the rest of the -# files into the correct places. Specifically, the help files and pixmaps -# must still go into /usr/X11R6/share/gnome/help and -# /usr/X11R6/share/gnome/pixmaps respectively. %%DATADIR%% will still be -# defined for you to use. - -.if defined(USE_GNOMELIBS) -CONFIGURE_ARGS+=3D--with-gnome=3D${PREFIX} -.if ${CONFIGURE_ARGS:S/--localstatedir=3D//} =3D=3D ${CONFIGURE_ARGS:S/ /= /g} -CONFIGURE_ARGS+=3D--localstatedir=3D${PREFIX}/share/gnome -.endif -.if ${CONFIGURE_ARGS:S/--datadir=3D//} =3D=3D ${CONFIGURE_ARGS:S/ / /g} -CONFIGURE_ARGS+=3D--datadir=3D${PREFIX}/share/gnome -.endif -LIB_DEPENDS+=3D gnome.5:${PORTSDIR}/x11/gnomelibs -GNOME_CONFIG?=3D ${X11BASE}/bin/gnome-config -CONFIGURE_ENV+=3D GNOME_CONFIG=3D"${GNOME_CONFIG}" -MAKE_ENV+=3D GNOME_CONFIG=3D"${GNOME_CONFIG}" -.if defined(HAVE_GNOME) -.if defined(PKGNAMESUFFIX) -PKGNAMESUFFIX:=3D ${PKGNAMESUFFIX}-gnome -.else -PKGNAMESUFFIX=3D -gnome -.endif -CONFIGURE_ENV+=3D HAVE_GNOME=3D${HAVE_GNOME} -MAKE_ENV+=3D HAVE_GNOME=3D${HAVE_GNOME} -PLIST_SUB+=3D GNOME:=3D"" NOGNOME:=3D"@comment " DATADIR=3D"share/gnome" -.endif -.endif -.if defined(USE_GNOMECTRL) -BUILD_DEPENDS+=3D ${X11BASE}/bin/gnomecc:${PORTSDIR}/sysutils/gnomecontrol= center -RUN_DEPENDS+=3D ${X11BASE}/bin/gnomecc:${PORTSDIR}/sysutils/gnomecontrolce= nter -.endif +# Hack USE_GNOME to the new GNOMENG style for port mataintainers that +# didn't do so themselves. This will allow us to get rid of the old +# GNOME porting infrastructure more quickly. .if defined(USE_GNOME) -LIB_DEPENDS+=3D panel_status.5:${PORTSDIR}/x11/gnomecore \ - gtkhtml-1.1.3:${PORTSDIR}/www/gtkhtml -.endif -.if defined(WANT_GNOME) && !defined(HAVE_GNOME) -PLIST_SUB+=3D GNOME:=3D"@comment " NOGNOME:=3D"" DATADIR=3D"share" +. if ${USE_GNOME}=3D=3D"yes" +USE_GNOME=3Dgnomeprefix gnomehack gtkhtml libpanel +. endif + +# Set a reasonable (overrideable) configure target for GNOME apps. +CONFIGURE_TARGET?=3D --target=3D${MACHINE_ARCH}-unknown-freebsd${OSREL} + +# First of all expand all USE_GNOME_IMPL recursively +. for component in ${_USE_GNOME_ALL} +. for subcomponent in ${${component}_USE_GNOME_IMPL} +${component}_USE_GNOME_IMPL+=3D${${subcomponent}_USE_GNOME_IMPL} +. endfor +. endfor + +# Then use already expanded USE_GNOME_IMPL to expand USE_GNOME. +# Also, check to see if each component has a desktop requirement. If it d= oes, +# and if the user's chosen desktop is not of the same version, mark the +# port as broken. +. for component in ${USE_GNOME} +. if defined(WITH_GNOME_DESKTOP) && defined(${component}_GNOME_DESKTO= P) +. if ${WITH_GNOME_DESKTOP}!=3D${${component}_GNOME_DESKTOP} +BROKEN=3D ${PORTNAME} wants to use the GNOME ${${component}_GNOME_DESKTOP}= =20 +BROKEN+=3Ddesktop, but you wish to use the GNOME ${WITH_GNOME_DESKTOP} des= ktop. +. endif +. endif +. if ${_USE_GNOME_ALL:M${component}}=3D=3D"" +BROKEN=3D "Unknown component ${component}" +. endif +_USE_GNOME+=3D ${${component}_USE_GNOME_IMPL} ${component} +. endfor + +# Then traverse through all components, check which of them +# exist in ${_USE_GNOME} and set variables accordingly +. for component in ${_USE_GNOME_ALL} +. if ${_USE_GNOME:M${component}}=3D=3D${component} +BUILD_DEPENDS+=3D ${${component}_BUILD_DEPENDS} +LIB_DEPENDS+=3D ${${component}_LIB_DEPENDS} +RUN_DEPENDS+=3D ${${component}_RUN_DEPENDS} + +CONFIGURE_ARGS+=3D${${component}_CONFIGURE_ARGS} +CONFIGURE_ENV+=3D ${${component}_CONFIGURE_ENV} +MAKE_ENV+=3D ${${component}_MAKE_ENV} + +. if defined(${component}_PRE_PATCH) +GNOME_PRE_PATCH+=3D ${${component}_PRE_PATCH} +. endif + +. endif +. endfor +.endif + +.if defined(GNOME_PRE_PATCH) && !target(pre-patch) +USE_REINPLACE=3D yes + +pre-patch: + @${GNOME_PRE_PATCH} +.endif + +.if defined(WANT_GNOME) +USE_GNOME?=3D +.if ${_USE_GNOME_SAVED}=3D=3D${USE_GNOME} +PLIST_SUB+=3D GNOME:=3D"@comment " NOGNOME:=3D"" +.else +PLIST_SUB+=3D GNOME:=3D"" NOGNOME:=3D"@comment " +.if defined(WITH_GNOME_DESKTOP) +.if ${_USE_GNOME_DESKTOP}=3D=3D"yes" +PLIST_SUB+=3D GNOMEDESKTOP:=3D"" NOGNOMEDESKTOP:=3D"@comment " +.else +PLIST_SUB+=3D GNOMEDESKTOP:=3D"@comment " NOGNOMEDESKTOP:=3D"" .endif - -# Start of GNOME_VALIDATE_DEPS_CHAIN part. -.if defined(USE_GNOMELIBS) && defined(GNOME_VALIDATE_DEPS_CHAIN) -BUILD_DEPENDS+=3D python:${PORTSDIR}/lang/python -CHKDPCHN_CMD?=3D ${PORTSDIR}/Tools/scripts/chkdepschain.py -CHKDPCHN_CACHE=3D .chkdpchn.cache.${PKGNAME} - -.if !target(pre-extract) -pre-extract:: - @${ECHO_MSG} "=3D=3D=3D> Validating build-time dependency chain for ${PK= GNAME}" - @${MKDIR} ${WRKDIR} - @${CHKDPCHN_CMD} -b -s ${WRKDIR}/${CHKDPCHN_CACHE} .endif - -.if !target(pre-install) -pre-install:: - @${ECHO_MSG} "=3D=3D=3D> Validating run-time dependency chain for ${PKGN= AME}" - @${CHKDPCHN_CMD} -r -L ${WRKDIR}/${CHKDPCHN_CACHE} .endif .endif -# End of GNOME_VALIDATE_DEPS_CHAIN part. =20 .endif # End of use part. -.else -.include "${PORTSDIR}/Mk/bsd.gnomeng.mk" -.endif --=-mDlTW1sMSB0O/yqmrVe/-- --=-pgU9nDFJklOtAa2s/dyo Content-Type: application/pgp-signature; name=signature.asc Content-Description: This is a digitally signed message part -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.1 (FreeBSD) iD8DBQA+SU/Ob2iPiv4Uz4cRAgp0AKCXULFPbP+6UhqxE1WSIsWsxuwvKQCfUd1X 8NLsUUuaAao4FgxHN4+MW24= =6rPN -----END PGP SIGNATURE----- --=-pgU9nDFJklOtAa2s/dyo-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-gnome" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1044991950.305.36.camel>