From owner-freebsd-gnome Mon May 6 1:23:28 2002 Delivered-To: freebsd-gnome@freebsd.org Received: from sdns.kv.ukrtel.net (sdns.kv.ukrtel.net [195.5.27.246]) by hub.freebsd.org (Postfix) with ESMTP id 79BCD37B404 for ; Mon, 6 May 2002 01:23:01 -0700 (PDT) Received: from vega.vega.com (195.5.51.243 [195.5.51.243]) by sdns.kv.ukrtel.net with SMTP (Microsoft Exchange Internet Mail Service Version 5.5.2650.21) id J9KHZCX2; Mon, 6 May 2002 11:24:41 +0300 Received: (from max@localhost) by vega.vega.com (8.11.6/8.11.3) id g468NK422178 for gnome@FreeBSD.org; Mon, 6 May 2002 11:23:20 +0300 (EEST) (envelope-from sobomax@FreeBSD.org) From: Maxim Sobolev Message-Id: <200205060823.g468NK422178@vega.vega.com> Subject: [RFC] bsd.gnome.mk NG To: gnome@FreeBSD.org Date: Mon, 6 May 2002 11:23:20 +0300 (EEST) X-Mailer: ELM [version 2.5 PL5] MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="%--multipart-mixed-boundary-1.22162.1020673400--%" Sender: owner-freebsd-gnome@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG --%--multipart-mixed-boundary-1.22162.1020673400--% Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Folks, In preparation to introduction of the GNOME2 desktop I started working out new from scratch reimplementation of bsd.gnome.mk, which should allow us to resolve number of issues with current GNOME1 infrastructure as well as to allow to intergate GNOME2 infrastructure properly. Attached please find proof-of-concept bsd.gnome.mk NG (work in progress therefore still incomplete) as well as example patch to move gnomelibs to the new infrastructure. Any feedback is appreciated. I also have in works new gnomehier port to create GNOME directory structure (you can see reference to it from bsd.gnomeng.mk). I'm planning to commit it tomorrow. -Maxim --%--multipart-mixed-boundary-1.22162.1020673400--% Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Content-Description: ASCII text Content-Disposition: attachment; filename="gnomelibs.diff" ? pkg-plist,v Index: Makefile =================================================================== RCS file: /home/ncvs/ports/x11/gnomelibs/Makefile,v retrieving revision 1.99 diff -d -u -r1.99 Makefile --- Makefile 30 Apr 2002 23:20:30 -0000 1.99 +++ Makefile 6 May 2002 08:11:30 -0000 @@ -17,8 +17,6 @@ MAINTAINER?= gnome@FreeBSD.org BUILD_DEPENDS= scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper -LIB_DEPENDS+= xml.5:${PORTSDIR}/textproc/libxml \ - ORBit.2:${PORTSDIR}/devel/ORBit RUN_DEPENDS= scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper USE_BZIP2= yes @@ -26,8 +24,7 @@ USE_XPM= yes USE_PERL5= yes USE_GMAKE= yes -USE_IMLIB= yes -USE_ESOUND= yes +USE_GNOME= libxml imlib esound orbit INSTALLS_SHLIB= yes USE_LIBTOOL= yes LIBTOOLFILES= configure libart_lgpl/configure --%--multipart-mixed-boundary-1.22162.1020673400--% Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Content-Description: ASCII troff or preprocessor input text Content-Disposition: attachment; filename="bsd.gnomeng.mk" .if !defined(_POSTMKINCLUDED) # Please make sure all changes to this file are past through the maintainer. # Do not commit them yourself (unless of course you're the Port's Wraith ;). Gnome_Include_MAINTAINER= gnome@FreeBSD.org # This section defines possible names of GNOME components and all information # necessary for ports to use those components. # Ports can use this as follows: # # USE_GNOME= gnomeprint bonobo # # .include # # As a result proper LIB_DEPENDS/RUN_DEPENDS will be added and CONFIGURE_ENV # and MAKE_ENV defined. _USE_GNOME_ALL= gnomehier gnomeaudio esound libghttp glib12 gtk12 libxml \ gdkpixbuf imlib orbit gnomelibs gnomecanvas oaf gnomemimedata \ gconf gnomevfs gnomecc gnomeprint bonobo libgda gnomedb \ libglade gal glibwww gtkhtml gnomecore gnomehier_RUN_DEPENDS= ${X11BASE}/share/gnome/.keep_me:${PORTSDIR}/misc/gnomehier gnomehier_DETECT= ${X11BASE}/share/gnome/.keep_me gnomeaudio_RUN_DEPENDS= ${X11BASE}/share/gnome/sounds/login.wav:${PORTSDIR}/audio/gnomeaudio gnomeaudio_DETECT= ${X11BASE}/share/gnome/sounds/login.wav gnomeaudio_USE_GNOME_IMPL=gnomehier ESD_CONFIG?= ${LOCALBASE}/bin/esd-config esound_LIB_DEPENDS= esd.2:${PORTSDIR}/audio/esound esound_CONFIGURE_ENV= ESD_CONFIG="${ESD_CONFIG}" esound_MAKE_ENV= ESD_CONFIG="${ESD_CONFIG}" esound_PKGNAMESUFFIX= -esound esound_DETECT= ${ESD_CONFIG} libghttp_LIB_DEPENDS= ghttp.1:${PORTSDIR}/www/libghttp libghttp_PKGNAMESUFFIX= -libghttp libghttp_DETECT= ${LOCALBASE}/etc/ghttpConf.sh GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config glib12_LIB_DEPENDS= glib12.3:${PORTSDIR}/devel/glib12 glib12_CONFIGURE_ENV= GLIB_CONFIG="${GLIB_CONFIG}" glib12_MAKE_ENV= GLIB_CONFIG="${GLIB_CONFIG}" glib12_PKGNAMESUFFIX= -glib glib12_DETECT= ${GLIB_CONFIG} GTK_CONFIG?= ${X11BASE}/bin/gtk12-config gtk12_LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 gtk12_CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" gtk12_MAKE_ENV= GTK_CONFIG="${GTK_CONFIG}" gtk12_PKGNAMESUFFIX= -gtk gtk12_DETECT= ${GTK_CONFIG} gtk12_USE_GNOME_IMPL= glib12 gnomehier XML_CONFIG?= ${LOCALBASE}/bin/xml-config libxml_LIB_DEPENDS= xml.5:${PORTSDIR}/textproc/libxml libxml_CONFIGURE_ENV= XML_CONFIG="${XML_CONFIG}" libxml_MAKE_ENV= XML_CONFIG="${XML_CONFIG}" libxml_PKGNAMESUFFIX= -libxml libxml_DETECT= ${XML_CONFIG} libxml_USE_GNOME_IMPL= glib12 ORBIT_CONFIG?= ${LOCALBASE}/bin/orbit-config orbit_LIB_DEPENDS= ORBit.2:${PORTSDIR}/devel/ORBit orbit_CONFIGURE_ENV= ORBIT_CONFIG="${ORBIT_CONFIG}" orbit_MAKE_ENV= ORBIT_CONFIG="${ORBIT_CONFIG}" orbit_PKGNAMESUFFIX= -orbit orbit_DETECT= ${ORBIT_CONFIG} orbit_USE_GNOME_IMPL= glib12 GDK_PIXBUF_CONFIG?= ${X11BASE}/bin/gdk-pixbuf-config gdkpixbuf_LIB_DEPENDS= gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf gdkpixbuf_CONFIGURE_ENV=GDK_PIXBUF_CONFIG="${GDK_PIXBUF_CONFIG}" gdkpixbuf_MAKE_ENV= GDK_PIXBUF_CONFIG="${GDK_PIXBUF_CONFIG}" gdkpixbuf_PKGNAMESUFFIX=-gdkpixbuf gdkpixbuf_DETECT= ${GDK_PIXBUF_CONFIG} gdkpixbuf_USE_GNOME_IMPL=gtk12 IMLIB_CONFIG?= ${X11BASE}/bin/imlib-config imlib_LIB_DEPENDS= Imlib.5:${PORTSDIR}/graphics/imlib imlib_CONFIGURE_ENV= IMLIB_CONFIG="${IMLIB_CONFIG}" imlib_MAKE_ENV= IMLIB_CONFIG="${IMLIB_CONFIG}" imlib_PKGNAMESUFFIX= -imlib imlib_DETECT= ${IMLIB_CONFIG} imlib_USE_GNOME_IMPL= gtk12 GNOME_CONFIG?= ${X11BASE}/bin/gnome-config gnomelibs_LIB_DEPENDS= gnome.5:${PORTSDIR}/x11/gnomelibs gnomelibs_CONFIGURE_ENV=GNOME_CONFIG="${GNOME_CONFIG}" gnomelibs_MAKE_ENV= GNOME_CONFIG="${GNOME_CONFIG}" gnomelibs_PKGNAMESUFFIX=-gnomelibs gnomelibs_DETECT= ${GNOME_CONFIG} gnomelibs_USE_GNOME_IMPL=esound gtk12 imlib libxml orbit gnomecanvas_LIB_DEPENDS=gnomecanvaspixbuf.1:${PORTSDIR}/graphics/gnomecanvas gnomecanvas_PKGNAMESUFFIX=-gnomecanvas gnomecanvas_DETECT= ${X11BASE}/etc/gnomecanvaspixbufConf.sh gnomecanvas_USE_GNOME_IMPL=gnomelibs gdkpixbuf OAF_CONFIG?= ${X11BASE}/bin/oaf-config oaf_LIB_DEPENDS= oaf.0:${PORTSDIR}/devel/oaf oaf_CONFIGURE_ENV= OAF_CONFIG="${OAF_CONFIG}" oaf_MAKE_ENV= OAF_CONFIG="${OAF_CONFIG}" oaf_PKGNAMESUFFIX= -oaf oaf_DETECT= ${OAF_CONFIG} oaf_USE_GNOME_IMPL= gnomelibs gnomemimedata_RUN_DEPENDS=${X11BASE}/libdata/pkgconfig/gnome-mime-data-2.0.pc:${PORTSDIR}/misc/gnomemimedata gnomemimedata_PKGNAMESUFFIX=-gnomemimedata gnomemimedata_DETECT= ${X11BASE}/libdata/pkgconfig/gnome-mime-data-2.0.pc gnomemimedata_USE_GNOME_IMPL=gnomelibs GCONF_CONFIG?= ${X11BASE}/bin/gconf-config gconf_LIB_DEPENDS= gconf-1.1:${PORTSDIR}/devel/gconf gconf_CONFIGURE_ENV= GCONF_CONFIG="${GCONF_CONFIG}" gconf_MAKE_ENV= GCONF_CONFIG="${GCONF_CONFIG}" gconf_PKGNAMESUFFIX= -gconf gconf_DETECT= ${GCONF_CONFIG} gconf_USE_GNOME_IMPL= oaf GNOME_VFS_CONFIG?= ${X11BASE}/bin/gnome-vfs-config gnomevfs_LIB_DEPENDS= gnomevfs.0:${PORTSDIR}/devel/gnomevfs gnomevfs_CONFIGURE_ENV= GNOME_VFS_CONFIG="${GNOME_VFS_CONFIG}" gnomevfs_MAKE_ENV= GNOME_VFS_CONFIG="${GNOME_VFS_CONFIG}" gnomevfs_PKGNAMESUFFIX= -gnomevfs gnomevfs_DETECT= ${GNOME_VFS_CONFIG} gnomevfs_USE_GNOME_IMPL=gnomemimedata gconf gnomecc_LIB_DEPENDS= capplet.5:${PORTSDIR}/sysutils/gnomecontrolcenter gnomecc_PKGNAMESUFFIX= -gnomecc gnomecc_DETECT= ${X11BASE}/etc/cappletConf.sh gnomecc_USE_GNOME_IMPL= gnomevfs gnomeprint_LIB_DEPENDS= gnomeprint.16:${PORTSDIR}/print/gnomeprint gnomeprint_PKGNAMESUFFIX=-gnomeprint gnomeprint_DETECT= ${X11BASE}/etc/printConf.sh gnomeprint_USE_GNOME_IMPL=gnomecc bonobo_LIB_DEPENDS= bonobo.2:${PORTSDIR}/devel/bonobo bonobo_PKGNAMESUFFIX= -bonobo bonobo_DETECT= ${X11BASE}/etc/bonoboConf.sh bonobo_USE_GNOME_IMPL= gnomeprint GDA_CONFIG?= ${X11BASE}/bin/gda-config libgda_LIB_DEPENDS= gda-client.0:${PORTSDIR}/databases/libgda libgda_CONFIGURE_ENV= GDA_CONFIG="${GDA_CONFIG}" libgda_MAKE_ENV= GDA_CONFIG="${GDA_CONFIG}" libgda_PKGNAMESUFFIX= -libgda libgda_DETECT= ${GDA_CONFIG} libgda_USE_GNOME_IMPL= bonobo GNOMEDB_CONFIG?= ${X11BASE}/bin/gnomedb-config gnomedb_LIB_DEPENDS= gnomedb.0:${PORTSDIR}/databases/gnomedb gnomedb_CONFIGURE_ENV= GNOMEDB_CONFIG="${GNOMEDB_CONFIG}" gnomedb_MAKE_ENV= GNOMEDB_CONFIG="${GNOMEDB_CONFIG}" gnomedb_PKGNAMESUFFIX= -gnomedb gnomedb_DETECT= ${GNOMEDB_CONFIG} gnomedb_USE_GNOME_IMPL= libgda LIBGLADE_CONFIG?= ${X11BASE}/bin/libglade-config libglade_LIB_DEPENDS= glade.4:${PORTSDIR}/devel/libglade libglade_CONFIGURE_ENV= LIBGLADE_CONFIG="${LIBGLADE_CONFIG}" libglade_MAKE_ENV= LIBGLADE_CONFIG="${LIBGLADE_CONFIG}" libglade_PKGNAMESUFFIX= -libglade libglade_DETECT= ${LIBGLADE_CONFIG} libglade_USE_GNOME_IMPL=gnomedb gal_LIB_DEPENDS= gal.19:${PORTSDIR}/x11-toolkits/gal gal_PKGNAMESUFFIX= -gal gal_DETECT= ${X11BASE}/etc/galConf.sh gal_USE_GNOME_IMPL= libglade glibwww_LIB_DEPENDS= glibwww.1:${PORTSDIR}/www/glibwww glibwww_PKGNAMESUFFIX= -glibwww glibwww_DETECT= ${X11BASE}/etc/glibwwwConf.sh glibwww_USE_GNOME_IMPL= gnomecc gtkhtml_LIB_DEPENDS= gtkhtml.21:${PORTSDIR}/www/gtkhtml gtkhtml_PKGNAMESUFFIX= -gtkhtml gtkhtml_DETECT= ${X11BASE}/etc/gtkhtmlConf.sh gtkhtml_USE_GNOME_IMPL= glibwww gnomecore_LIB_DEPENDS= panel_applet.5:${PORTSDIR}/x11/gnomecore gnomecore_PKGNAMESUFFIX=-gnome gnomecore_DETECT= ${X11BASE}/etc/appletsConf.sh gnomecore_USE_GNOME_IMPL=gtkhtml gnomeaudio # This section keeps tests for optional software. These work off four # types of of variables. WANT_GNOM, 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 compiles WITH certain features. This section # tests if we HAVE these features, and the port is then free to USE them. # The logic of this section is like this: # # .if WANT_GNOME == foo # .if WITH_GNOME == foo # HAVE_GNOME = foo # .elif WITHOUT_GNOME == foo # (do nothing) # .elif (if foo installed) # HAVE_GNOME = foo # .else # Print option message # .endif # .endif # # Although it apears a little more convoluted in the tests. # Ports can make use of this like so: # # WANT_GNOME= foo # # .include # # .if ${HAVE_GNOME:S/foo//}!=${HAVE_GNOME:S/ / /g} # ... Do some things ... # USE_GNOME= foo # .else # ... Do some other things ... # .endif # Due to make(1) stupidity we need those three lines to avoid # adding another several circles of `.ifdef(...)' WITH_GNONE?= WITHOUT_GNOME?= HAVE_GNOME?= .if defined(WANT_GNOME) . for component in ${_USE_GNOME_ALL} . if ${WANT_GNOME:S/${component}//}!=${WANT_GNOME:S/ / /g} . if ${WITH_GNOME:S/${component}//}!=${WITH_GNOME:S/ / /g} HAVE_GNOME+= ${component} . else . if ${WITHOUT_GNOME:S/${component}//}!=${WITHOUT_GNOME:S/ / /g} # Nothing . else . if exists(${${component}_DETECT}) HAVE_GNOME+= ${component} . endif . endif . endif . endif . endfor .endif .endif # End of optional part. .if defined(_POSTMKINCLUDED) .if defined(USE_GNOME) # 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+=${${subcomponent}_USE_GNOME_IMPL} . endfor . endfor # Then use already expanded USE_GNOME_IMPL to expand USE_GNOME . for component in ${USE_GNOME} _USE_GNOME+= ${${component}_USE_GNOME_IMPL} ${component} . endfor # Then traverse through all possible components, check which of them # exist in ${_USE_GNOME} and set variables accordingly . for component in ${_USE_GNOME_ALL} . if ${_USE_GNOME:S/${component}//}!=${_USE_GNOME:S/ / /g} BUILD_DEPENDS+= ${${component}_BUILD_DEPENDS} LIB_DEPENDS+= ${${component}_LIB_DEPENDS} RUN_DEPENDS+= ${${component}_RUN_DEPENDS} CONFIGURE_ENV+= ${${component}_CONFIGURE_ENV} MAKE_ENV+= ${${component}_MAKE_ENV} . if ${HAVE_GNOME:S/${component}//}!=${HAVE_GNOME:S/ / /g} PKGNAMESUFFIX= ${${component}_PKGNAMESUFFIX} . endif . endif . endfor .endif .if defined(WANT_GNOME) . for component in ${_USE_GNOME_ALL} . if ${WANT_GNOME:S/${component}//}!=${WANT_GNOME:S/ / /g} . if ${HAVE_GNOME:S/${component}//}==${HAVE_GNOME:S/ / /g} # XXX: STUB: FIXME PLIST_SUB+= GNOME:="@comment " NOGNOME:="" DATADIR="share" . endif . endif . endfor .endif .endif # End of use part. --%--multipart-mixed-boundary-1.22162.1020673400--%-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-gnome" in the body of the message