diff options
| author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2003-08-12 16:25:45 +0000 |
|---|---|---|
| committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2003-08-12 16:25:45 +0000 |
| commit | d6b50362c28e064453f85ad642261fa0b140d6a0 (patch) | |
| tree | ce7ac3561487f83dbf673a29172a265e238bd46a /Mk/bsd.gnome.mk | |
| parent | Add a forgotten GNOME 1.4 entry. (diff) | |
Remove libpanel, and only detect the GNOME 2 desktop.
Reminded by: adamw
Notes
Notes:
svn path=/head/; revision=86838
Diffstat (limited to 'Mk/bsd.gnome.mk')
| -rw-r--r-- | Mk/bsd.gnome.mk | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/Mk/bsd.gnome.mk b/Mk/bsd.gnome.mk index 6afc19906ca2..61e045976615 100644 --- a/Mk/bsd.gnome.mk +++ b/Mk/bsd.gnome.mk @@ -28,7 +28,7 @@ _USE_GNOME_ALL= gnomehack gnomeprefix gnomehier gnomeaudio esound libghttp \ glib12 gtk12 libxml gdkpixbuf imlib orbit gnomelibs \ gnomecanvas oaf gnomemimedata gconf gnomevfs libcapplet \ gnomeprint bonobo libgda gnomedb libglade gal glibwww gtkhtml \ - libpanel gnometarget + gnometarget _USE_GNOME_ALL+=glib20 atk pango gtk20 linc libidl orbit2 libglade2 libxml2 \ libxslt bonoboactivation libbonobo gconf2 gnomevfs2 gail \ libgnomecanvas libartlgpl2 libgnomeprint libgnomeprintui \ @@ -203,11 +203,6 @@ gtkhtml_LIB_DEPENDS= gtkhtml-1.1.3:${PORTSDIR}/www/gtkhtml gtkhtml_DETECT= ${X11BASE}/etc/gtkhtmlConf.sh gtkhtml_USE_GNOME_IMPL= glibwww gal libghttp libcapplet -libpanel_LIB_DEPENDS= panel_applet.5:${PORTSDIR}/x11/libpanel -libpanel_DETECT= ${X11BASE}/etc/appletsConf.sh -libpanel_USE_GNOME_IMPL=gnomelibs -libpanel_GNOME_DESKTOP_VERSION=1 - glib20_LIB_DEPENDS= glib-2.0.200:${PORTSDIR}/devel/glib20 glib20_DETECT= ${LOCALBASE}/libdata/pkgconfig/glib-2.0.pc glib20_USE_GNOME_IMPL=gnometarget pkgconfig @@ -417,8 +412,8 @@ libgsf_USE_GNOME_IMPL= gnomevfs2 libbonobo # intelligent choice on the user's behalf. .if exists(${gnomepanel_DETECT}) GNOME_DESKTOP_VERSION?= 2 -.elif exists(${libpanel_DETECT}) -GNOME_DESKTOP_VERSION?= 1 +#.elif exists(${libpanel_DETECT}) +#GNOME_DESKTOP_VERSION?= 1 .endif # We also check each component to see if it has a desktop requirement. If @@ -478,7 +473,7 @@ USE_GNOME+= gtk12 # didn't do so themselves. New ports should NOT set USE_GNOME=yes. . if ${USE_GNOME}=="yes" USE_GNOME:= ${USE_GNOME:S/yes//} -USE_GNOME+= gnomeprefix gnomehack gtkhtml libpanel +USE_GNOME+= gnomeprefix gnomehack gtkhtml . endif # First of all expand all USE_GNOME_IMPL recursively |