From 205c226bb2601595e6aaade8ff90ba6d19ddbd35 Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Mon, 6 Apr 2009 10:05:20 +0000 Subject: [PATCH] Rework the way we handle build_depends with the gnome MODULE when MODGNOME_HELP_FILES is set to yes. * add a build_depends on gnome-doc-utils if MODGNOME_HELP_FILES is set to yes * add rarian as a run_depends for gnome-doc-utils (will help with older ports that will never be updated from using deprecated scrollkeeper) * remove build+run_depends on gnome-doc-utils and rarian for ports that have MODGNOME_HELP_FILES as they are now implied. * bump where needed This should help in having all required build dependencies for gnome-related ports and it greatly simplifies things. "thanks for cleaning this mess" and ok jasper@ --- x11/gnome/applets2/Makefile | 5 ++--- x11/gnome/baker/Makefile | 3 +-- x11/gnome/cheese/Makefile | 3 +-- x11/gnome/conduit/Makefile | 6 ++---- x11/gnome/controlcenter2/Makefile | 6 ++---- x11/gnome/dasher/Makefile | 5 ++--- x11/gnome/deskbar-applet/Makefile | 6 ++---- x11/gnome/desktop/Makefile | 4 +--- x11/gnome/devel-docs/Makefile | 6 ++---- x11/gnome/doc-utils/Makefile | 7 ++++--- x11/gnome/ekiga/Makefile | 4 +--- x11/gnome/empathy/Makefile | 6 ++---- x11/gnome/eog/Makefile | 6 ++---- x11/gnome/f-spot/Makefile | 5 ++--- x11/gnome/games/Makefile | 8 +++----- x11/gnome/gcalctool/Makefile | 6 ++---- x11/gnome/gdm/Makefile | 6 ++---- x11/gnome/gedit/Makefile | 11 ++++------- x11/gnome/genius/Makefile | 3 +-- x11/gnome/ghex/Makefile | 5 ++--- x11/gnome/gnome.port.mk | 7 ++++++- x11/gnome/gnopernicus/Makefile | 5 ++--- x11/gnome/gok/Makefile | 3 +-- x11/gnome/gucharmap/Makefile | 4 +--- x11/gnome/keyring-manager/Makefile | 4 +--- x11/gnome/media/Makefile | 6 ++---- x11/gnome/mousetweaks/Makefile | 3 +-- x11/gnome/panel/Makefile | 4 +--- x11/gnome/planner/Makefile | 5 ++--- x11/gnome/seahorse/Makefile | 6 ++---- x11/gnome/terminal/Makefile | 4 +--- x11/gnome/tomboy/Makefile | 6 ++---- x11/gnome/totem/Makefile | 3 +-- x11/gnome/utils/Makefile | 4 +--- x11/gnome/vinagre/Makefile | 4 +--- x11/gnome/zenity/Makefile | 6 ++---- 36 files changed, 67 insertions(+), 118 deletions(-) diff --git a/x11/gnome/applets2/Makefile b/x11/gnome/applets2/Makefile index f5538c05daf..9f09ee55ae4 100644 --- a/x11/gnome/applets2/Makefile +++ b/x11/gnome/applets2/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.67 2009/03/14 11:36:25 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.68 2009/04/06 10:05:20 ajacoutot Exp $ COMMENT-main= applets for use with the GNOME panel COMMENT-battstat= GNOME applet for monitoring battery level @@ -33,8 +33,7 @@ MODULES= devel/gettext \ MODGNOME_HELP_FILES= Yes -BUILD_DEPENDS= ${RUN_DEPENDS} \ - ::textproc/rarian +BUILD_DEPENDS= ${RUN_DEPENDS} RUN_DEPENDS= :gnome-icon-theme->=2.15.91:x11/gnome/icon-theme \ ::x11/gnome/py-gnome-desktop MODPY_RUNDEP= No diff --git a/x11/gnome/baker/Makefile b/x11/gnome/baker/Makefile index c9659d3cec4..2e2c9e142ff 100644 --- a/x11/gnome/baker/Makefile +++ b/x11/gnome/baker/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.12 2009/03/17 11:53:01 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.13 2009/04/06 10:05:20 ajacoutot Exp $ COMMENT= CD/DVD authoring application for GNOME @@ -33,7 +33,6 @@ EXTRACT_SUFX= .tar.gz LIB_DEPENDS= gstreamer-0.10::multimedia/gstreamer-0.10/core \ gnomeui-2::x11/gnome/libgnomeui -BUILD_DEPENDS= ::textproc/rarian RUN_DEPENDS= ::misc/cdrdao \ ::sysutils/cdrtools \ ::sysutils/dvd+rw-tools diff --git a/x11/gnome/cheese/Makefile b/x11/gnome/cheese/Makefile index af12a285208..192828f15be 100644 --- a/x11/gnome/cheese/Makefile +++ b/x11/gnome/cheese/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.13 2009/03/14 11:36:25 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.14 2009/04/06 10:05:20 ajacoutot Exp $ BROKEN= does not work after changes in the UVC layer @@ -34,7 +34,6 @@ WANTLIB= ICE ORBit-2 ORBitCosNaming-2 SM X11 Xau Xcomposite \ MODULES= devel/gettext \ x11/gnome -BUILD_DEPENDS= ::x11/gnome/doc-utils LIB_DEPENDS= camel-1.2.>=11,ebook-1.2,edataserver-1.2,smime3,softokn3::databases/evolution-data-server \ rsvg-2.>=20::x11/gnome/librsvg \ gstinterfaces-0.10,gstreamer-0.10::multimedia/gstreamer-0.10/plugins-base \ diff --git a/x11/gnome/conduit/Makefile b/x11/gnome/conduit/Makefile index 342921bc776..d33407f46aa 100644 --- a/x11/gnome/conduit/Makefile +++ b/x11/gnome/conduit/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.14 2009/03/14 11:36:25 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.15 2009/04/06 10:05:20 ajacoutot Exp $ # XXX the following modules are commented in PLIST # iPodModule ===> needs py-gpod which we don't provide @@ -21,9 +21,7 @@ PERMIT_DISTFILES_FTP= Yes MODULES= lang/python \ x11/gnome -BUILD_DEPENDS= ::x11/gnome/doc-utils \ - ::textproc/rarian \ - ${RUN_DEPENDS} +BUILD_DEPENDS= ${RUN_DEPENDS} # XXX needs avahi for network sync RUN_DEPENDS= ::devel/gettext \ ::devel/xdg-utils \ diff --git a/x11/gnome/controlcenter2/Makefile b/x11/gnome/controlcenter2/Makefile index 53ca5c5f883..beaf2a522ee 100644 --- a/x11/gnome/controlcenter2/Makefile +++ b/x11/gnome/controlcenter2/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.57 2009/03/14 11:36:25 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.58 2009/04/06 10:05:20 ajacoutot Exp $ COMMENT= GNOME control center @@ -43,9 +43,7 @@ LIB_DEPENDS= canberra,canberra-gtk:libcanberra->=0.10p0:audio/libcanberra \ xklavier::x11/gnome/libxklavier \ metacity-private::x11/gnome/metacity \ panel-applet-2::x11/gnome/panel -BUILD_DEPENDS= :gnome-doc-utils->=0.3.2:x11/gnome/doc-utils \ - ::textproc/rarian \ - ::x11/gnome/settings-daemon +BUILD_DEPENDS= ::x11/gnome/settings-daemon RUN_DEPENDS= :shared-mime-info->=0.21:misc/shared-mime-info \ ::multimedia/gstreamer-0.10/plugins-good,-gconf \ ::x11/gnome/settings-daemon \ diff --git a/x11/gnome/dasher/Makefile b/x11/gnome/dasher/Makefile index 1489929079c..e713e95d656 100644 --- a/x11/gnome/dasher/Makefile +++ b/x11/gnome/dasher/Makefile @@ -1,9 +1,10 @@ -# $OpenBSD: Makefile,v 1.13 2009/03/18 19:38:47 jasper Exp $ +# $OpenBSD: Makefile,v 1.14 2009/04/06 10:05:20 ajacoutot Exp $ COMMENT= graphical predictive text input system GNOME_PROJECT= dasher GNOME_VERSION= 4.10.0 +PKGNAME= ${DISTNAME}p0 CATEGORIES= x11 @@ -27,10 +28,8 @@ WANTLIB += gthread-2.0 gtk-x11-2.0 m pango-1.0 pangocairo-1.0 WANTLIB += pangoft2-1.0 pcre pixman-1 png popt pthread ssl stdc++ WANTLIB += util xml2 z -BUILD_DEPENDS= ::x11/gnome/doc-utils LIB_DEPENDS= gnomeui-2::x11/gnome/libgnomeui \ cspi,spi::x11/gnome/at-spi -RUN_DEPENDS= ::x11/gnome/doc-utils USE_X11= Yes MODGNOME_HELP_FILES= Yes diff --git a/x11/gnome/deskbar-applet/Makefile b/x11/gnome/deskbar-applet/Makefile index 57c6c043166..4f16fb6b2bc 100644 --- a/x11/gnome/deskbar-applet/Makefile +++ b/x11/gnome/deskbar-applet/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.17 2009/03/14 11:36:25 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.18 2009/04/06 10:05:21 ajacoutot Exp $ COMMENT= universal search and navigation for GNOME @@ -35,9 +35,7 @@ WANTLIB= ICE ORBit-2 ORBitCosNaming-2 SM X11 Xau Xcomposite \ startup-notification-1 tasn1 util xml2 z BUILD_DEPENDS= ::x11/dbus-python \ - ::x11/gnome/doc-utils \ - ::x11/gnome/py-gnome-desktop \ - ::textproc/rarian + ::x11/gnome/py-gnome-desktop RUN_DEPENDS= ::mail/evolution \ ::x11/dbus-python \ ::x11/gnome/py-gnome-desktop \ diff --git a/x11/gnome/desktop/Makefile b/x11/gnome/desktop/Makefile index 4cd6ccd2db0..144d776aae6 100644 --- a/x11/gnome/desktop/Makefile +++ b/x11/gnome/desktop/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.42 2009/03/14 11:36:25 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.43 2009/04/06 10:05:21 ajacoutot Exp $ COMMENT= components for the GNOME desktop @@ -29,8 +29,6 @@ WANTLIB= ICE ORBit-2 ORBitCosNaming-2 SM X11 Xau Xcomposite \ MODULES= devel/gettext \ x11/gnome -BUILD_DEPENDS= :gnome-doc-utils->=0.3.2:x11/gnome/doc-utils \ - ::textproc/rarian RUN_DEPENDS= ::x11/gnome/py-gnome LIB_DEPENDS= gnomeui-2::x11/gnome/libgnomeui \ startup-notification-1::devel/startup-notification diff --git a/x11/gnome/devel-docs/Makefile b/x11/gnome/devel-docs/Makefile index 8e3ed5d74d3..29e6d250980 100644 --- a/x11/gnome/devel-docs/Makefile +++ b/x11/gnome/devel-docs/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.10 2009/03/14 11:36:25 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.11 2009/04/06 10:05:21 ajacoutot Exp $ COMMENT= developer documentation for GNOME @@ -14,9 +14,7 @@ PERMIT_DISTFILES_FTP= Yes MODULES= x11/gnome -BUILD_DEPENDS= ${RUN_DEPENDS} \ - ::textproc/rarian \ - :gnome-doc-utils-*:x11/gnome/doc-utils +BUILD_DEPENDS= ${RUN_DEPENDS} MODGNOME_HELP_FILES= Yes diff --git a/x11/gnome/doc-utils/Makefile b/x11/gnome/doc-utils/Makefile index 61c13e8f501..26d059c5be4 100644 --- a/x11/gnome/doc-utils/Makefile +++ b/x11/gnome/doc-utils/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.22 2009/03/14 11:36:25 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.23 2009/04/06 10:05:21 ajacoutot Exp $ COMMENT= collection of documentation utilities for the GNOME project GNOME_PROJECT= gnome-doc-utils GNOME_VERSION= 0.14.2 -PKGNAME= ${DISTNAME}p4 +PKGNAME= ${DISTNAME}p5 CATEGORIES= textproc @@ -23,7 +23,8 @@ BUILD_DEPENDS= ${RUN_DEPENDS} \ ::textproc/rarian RUN_DEPENDS= ::devel/gettext \ :py-libxml-*:textproc/libxml,-python \ - :libxslt-*:textproc/libxslt,-python + :libxslt-*:textproc/libxslt,-python \ + ::textproc/rarian USE_LIBTOOL= No CONFIGURE_ARGS= --disable-scrollkeeper diff --git a/x11/gnome/ekiga/Makefile b/x11/gnome/ekiga/Makefile index 7aa81599ead..adffdfa55d2 100644 --- a/x11/gnome/ekiga/Makefile +++ b/x11/gnome/ekiga/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.16 2009/03/14 11:36:25 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.17 2009/04/06 10:05:21 ajacoutot Exp $ COMMENT= SIP and H.323 compatible conferencing application @@ -32,8 +32,6 @@ WANTLIB= ICE ORBit-2 ORBitCosNaming-2 SM X11 Xau Xcomposite \ MODULES= devel/gettext \ x11/gnome -BUILD_DEPENDS= ::textproc/rarian \ - ::x11/gnome/doc-utils LIB_DEPENDS= gnomeui-2.>=2000::x11/gnome/libgnomeui \ opal::net/opal \ SDL.>=8::devel/sdl \ diff --git a/x11/gnome/empathy/Makefile b/x11/gnome/empathy/Makefile index c08c11135fe..c51300a4656 100644 --- a/x11/gnome/empathy/Makefile +++ b/x11/gnome/empathy/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.21 2009/03/14 11:36:25 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.22 2009/04/06 10:05:21 ajacoutot Exp $ # (empathy:10245): Gtk-WARNING **: could not load image: Icon 'im-xmpp' not present in theme @@ -38,9 +38,7 @@ MODULES= devel/gettext \ x11/gnome BUILD_DEPENDS= ::devel/iso-codes \ - ::x11/gnome/doc-utils \ - ::x11/py-gtk2 \ - ::textproc/rarian + ::x11/py-gtk2 LIB_DEPENDS= camel-1.2,ebook-1.2,edataserver-1.2::databases/evolution-data-server \ missioncontrol-client::net/telepathy/telepathy-mission-control \ panel-applet-2::x11/gnome/panel \ diff --git a/x11/gnome/eog/Makefile b/x11/gnome/eog/Makefile index 57d38576d57..86cad6cb93a 100644 --- a/x11/gnome/eog/Makefile +++ b/x11/gnome/eog/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.37 2009/03/14 11:36:25 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.38 2009/04/06 10:05:21 ajacoutot Exp $ COMMENT= Eye of GNOME, image viewing and cataloging program @@ -28,9 +28,7 @@ WANTLIB= ICE ORBit-2 ORBitCosNaming-2 SM X11 Xau Xcomposite \ MODULES= devel/gettext \ x11/gnome -BUILD_DEPENDS= ${RUN_DEPENDS} \ - ::textproc/rarian \ - :gnome-doc-utils->=0.3.2:x11/gnome/doc-utils +BUILD_DEPENDS= ${RUN_DEPENDS} LIB_DEPENDS= gnome-desktop-2.>=5::x11/gnome/desktop \ exif::graphics/libexif \ lcms.>=1::graphics/lcms diff --git a/x11/gnome/f-spot/Makefile b/x11/gnome/f-spot/Makefile index dde041dfcf1..16b4730298a 100644 --- a/x11/gnome/f-spot/Makefile +++ b/x11/gnome/f-spot/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.14 2009/03/14 10:40:52 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.15 2009/04/06 10:05:21 ajacoutot Exp $ BROKEN= segfault on startup @@ -6,7 +6,7 @@ COMMENT= personal photo management application for GNOME GNOME_VERSION= 0.5.0.3 GNOME_PROJECT= f-spot -PKGNAME= ${DISTNAME}p4 +PKGNAME= ${DISTNAME}p5 SHARED_LIBS += fspoteog 0.0 # .0.0 SHARED_LIBS += fspotjpegtran 0.0 # .0.0 SHARED_LIBS += fspot 0.0 # .0.0 @@ -43,7 +43,6 @@ WANTLIB += pcre pixman-1 png popt ssl util xml2 z BUILD_DEPENDS= ${RUN_DEPENDS} RUN_DEPENDS= ::graphics/libgphoto2 \ ::sysutils/ndesk-dbus-glib \ - ::x11/gnome/doc-utils \ ::x11/gnome/mono-gnome \ ::x11/gnome/screensaver LIB_DEPENDS+= exif::graphics/libexif \ diff --git a/x11/gnome/games/Makefile b/x11/gnome/games/Makefile index b86d10a4690..6e8e70fdc4a 100755 --- a/x11/gnome/games/Makefile +++ b/x11/gnome/games/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.13 2009/03/22 20:56:52 jasper Exp $ +# $OpenBSD: Makefile,v 1.14 2009/04/06 10:05:21 ajacoutot Exp $ COMMENT= collection of games for the GNOME desktop @@ -30,10 +30,8 @@ MODULES= devel/gettext \ lang/python \ x11/gnome -BUILD_DEPENDS= ::x11/gnome/doc-utils \ - ::x11/gnome/py-gnome-desktop \ - ::lang/guile \ - ::textproc/rarian +BUILD_DEPENDS= ::x11/gnome/py-gnome-desktop \ + ::lang/guile LIB_DEPENDS= ggzcore,ggzmod::games/ggz/ggz-client-libs \ guile-ltdl,guile::lang/guile \ gnomeui-2::x11/gnome/libgnomeui \ diff --git a/x11/gnome/gcalctool/Makefile b/x11/gnome/gcalctool/Makefile index 6dc17cecce2..592a359d75e 100644 --- a/x11/gnome/gcalctool/Makefile +++ b/x11/gnome/gcalctool/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.17 2009/03/15 21:55:12 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.18 2009/04/06 10:05:21 ajacoutot Exp $ COMMENT= GTK2 desktop calculator @@ -28,9 +28,7 @@ MODULES= devel/gettext \ LIB_DEPENDS= gconf-2.>=6::devel/gconf2 \ glade-2.0.>=1::devel/libglade2 BUILD_DEPENDS= ::devel/bison \ - ::devel/gconf2 \ - :gnome-doc-utils->=0.3.2:x11/gnome/doc-utils \ - ::textproc/rarian + ::devel/gconf2 MODGNOME_HELP_FILES= Yes DESKTOP_FILES= Yes diff --git a/x11/gnome/gdm/Makefile b/x11/gnome/gdm/Makefile index 52ff35c7fd0..c7fb81449d9 100644 --- a/x11/gnome/gdm/Makefile +++ b/x11/gnome/gdm/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.57 2009/03/26 17:15:46 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.58 2009/04/06 10:05:21 ajacoutot Exp $ COMMENT= GNOME display manager @@ -22,9 +22,7 @@ WANTLIB= X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \ gtk-x11-2.0 m pango-1.0 pangocairo-1.0 pangoft2-1.0 \ pcre pixman-1 png util wrap xml2 z -BUILD_DEPENDS= :gnome-doc-utils->=0.3.2:x11/gnome/doc-utils \ - :rarian-*:textproc/rarian \ - ::x11/gnome/zenity +BUILD_DEPENDS= ::x11/gnome/zenity RUN_DEPENDS= :sox-*:audio/sox \ :gnome-audio-*:x11/gnome/audio \ :hicolor-icon-theme-*:x11/hicolor-icon-theme \ diff --git a/x11/gnome/gedit/Makefile b/x11/gnome/gedit/Makefile index 529c503b296..19a803bc535 100644 --- a/x11/gnome/gedit/Makefile +++ b/x11/gnome/gedit/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.35 2009/03/14 11:36:25 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.36 2009/04/06 10:05:21 ajacoutot Exp $ SHARED_ONLY= Yes @@ -6,7 +6,7 @@ COMMENT= lightweight GNOME text editor GNOME_PROJECT= gedit GNOME_VERSION= 2.24.3 -PKGNAME= ${DISTNAME}p3 +PKGNAME= ${DISTNAME}p4 CATEGORIES= editors HOMEPAGE= http://www.gnome.org/projects/gedit/ @@ -30,15 +30,12 @@ MODULES= devel/gettext \ x11/gnome BUILD_DEPENDS= :iso-codes-*:devel/iso-codes \ - :gnome-doc-utils-*:x11/gnome/doc-utils \ ::x11/py-gtksourceview \ - :py-gtk2->=2.12.0:x11/py-gtk2 \ - ::textproc/rarian + :py-gtk2->=2.12.0:x11/py-gtk2 LIB_DEPENDS= enchant::textproc/enchant \ gtksourceview-2.0::x11/gtksourceview \ ${MODPY_LIB_DEPENDS} -RUN_DEPENDS= :gnome-doc-utils-*:x11/gnome/doc-utils \ - :py-gtk2->=2.12.0:x11/py-gtk2 \ +RUN_DEPENDS= :py-gtk2->=2.12.0:x11/py-gtk2 \ ::x11/py-gtksourceview \ ::x11/gnome/py-gnome diff --git a/x11/gnome/genius/Makefile b/x11/gnome/genius/Makefile index 54bd60a42ab..ee75969892d 100644 --- a/x11/gnome/genius/Makefile +++ b/x11/gnome/genius/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 2009/03/18 11:28:37 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.4 2009/04/06 10:05:21 ajacoutot Exp $ COMMENT= advanced general purpose calculator @@ -28,7 +28,6 @@ WANTLIB += ssl termcap util xml2 z MODULES= devel/gettext \ x11/gnome -BUILD_DEPENDS= ::textproc/rarian RUN_DEPENDS= :shared-mime-info->=0.21:misc/shared-mime-info LIB_DEPENDS= gtksourceview-2.0.>=2::x11/gtksourceview \ gnomevfs-2.>=2400::x11/gnome/vfs2 \ diff --git a/x11/gnome/ghex/Makefile b/x11/gnome/ghex/Makefile index 870ad1abe1b..67074c5b0e5 100644 --- a/x11/gnome/ghex/Makefile +++ b/x11/gnome/ghex/Makefile @@ -1,9 +1,10 @@ -# $OpenBSD: Makefile,v 1.11 2009/03/04 20:01:08 jasper Exp $ +# $OpenBSD: Makefile,v 1.12 2009/04/06 10:05:21 ajacoutot Exp $ COMMENT= binary editor GNOME_PROJECT= ghex GNOME_VERSION= 2.24.0 +PKGNAME= ${DISTNAME}p0 SHARED_LIBS += gtkhex 1.0 # .0.0 CATEGORIES= sysutils editors @@ -27,10 +28,8 @@ WANTLIB= ICE ORBit-2 ORBitCosNaming-2 SM X11 Xau Xcomposite \ MODULES= devel/gettext \ x11/gnome -BUILD_DEPENDS= ::x11/gnome/doc-utils LIB_DEPENDS= gnomeui-2::x11/gnome/libgnomeui \ gnomeprintui-2-2::x11/gnome/libgnomeprintui -RUN_DEPENDS= ::x11/gnome/doc-utils MODGNOME_HELP_FILES= Yes USE_X11= Yes diff --git a/x11/gnome/gnome.port.mk b/x11/gnome/gnome.port.mk index 22c9585ad7a..6c311ec1be7 100644 --- a/x11/gnome/gnome.port.mk +++ b/x11/gnome/gnome.port.mk @@ -1,4 +1,4 @@ -# $OpenBSD: gnome.port.mk,v 1.20 2008/11/23 22:56:37 jasper Exp $ +# $OpenBSD: gnome.port.mk,v 1.21 2009/04/06 10:05:20 ajacoutot Exp $ # # Module for GNOME related ports # @@ -21,9 +21,14 @@ MODGNOME_RUN_DEPENDS+= :desktop-file-utils-*:devel/desktop-file-utils # Set to 'yes' if there are .xml GNOME help files under # share/gnome/help/ in the package list. .if defined(MODGNOME_HELP_FILES) && ${MODGNOME_HELP_FILES:L} == "yes" +MODGNOME_BUILD_DEPENDS+= ::x11/gnome/doc-utils MODGNOME_RUN_DEPENDS+= :yelp-*:x11/gnome/yelp .endif +.if defined(MODGNOME_BUILD_DEPENDS) +BUILD_DEPENDS+= ${MODGNOME_BUILD_DEPENDS} +.endif + .if defined(MODGNOME_RUN_DEPENDS) RUN_DEPENDS+= ${MODGNOME_RUN_DEPENDS} .endif diff --git a/x11/gnome/gnopernicus/Makefile b/x11/gnome/gnopernicus/Makefile index 07028e3c714..de27d0514d3 100644 --- a/x11/gnome/gnopernicus/Makefile +++ b/x11/gnome/gnopernicus/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.12 2009/03/14 11:36:25 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.13 2009/04/06 10:05:21 ajacoutot Exp $ COMMENT= screen reader and magnifier for GNOME desktop @@ -36,8 +36,7 @@ WANTLIB= ICE ORBit-2 ORBitCosNaming-2 SM X11 Xau Xcomposite \ m pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1 \ png popt pthread spi ssl util xml2 z -BUILD_DEPENDS= ${RUN_DEPENDS} \ - ::textproc/rarian +BUILD_DEPENDS= ${RUN_DEPENDS} RUN_DEPENDS= ::x11/gnome/libgail-gnome LIB_DEPENDS= gnome-mag::x11/gnome/mag \ gnomespeech::x11/gnome/speech diff --git a/x11/gnome/gok/Makefile b/x11/gnome/gok/Makefile index 7c1b9debd0b..3f5a840f31e 100644 --- a/x11/gnome/gok/Makefile +++ b/x11/gnome/gok/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.14 2009/03/14 11:36:25 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.15 2009/04/06 10:05:21 ajacoutot Exp $ COMMENT= GNOME on-screen keyboard @@ -28,7 +28,6 @@ WANTLIB= ICE ORBit-2 ORBitCosNaming-2 SM X11 XRes Xau Xcomposite \ MODULES= devel/gettext \ x11/gnome -BUILD_DEPENDS= ::textproc/rarian LIB_DEPENDS= wnck-1::devel/libwnck \ cspi,loginhelper,spi::x11/gnome/at-spi \ gnomeui-2::x11/gnome/libgnomeui \ diff --git a/x11/gnome/gucharmap/Makefile b/x11/gnome/gucharmap/Makefile index 5dc36677342..898e51ea119 100644 --- a/x11/gnome/gucharmap/Makefile +++ b/x11/gnome/gucharmap/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.20 2009/03/23 17:21:30 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.21 2009/04/06 10:05:21 ajacoutot Exp $ COMMENT= Unicode character map for the GNOME project @@ -22,8 +22,6 @@ WANTLIB= ORBit-2 X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext \ gtk-x11-2.0 m pango-1.0 pangocairo-1.0 pangoft2-1.0 \ pcre pixman-1 png pthread z -BUILD_DEPENDS= :gnome-doc-utils-*:x11/gnome/doc-utils \ - ::textproc/rarian LIB_DEPENDS= gconf-2::devel/gconf2 MODULES= devel/gettext \ diff --git a/x11/gnome/keyring-manager/Makefile b/x11/gnome/keyring-manager/Makefile index 1f9a4671a6e..21a6b67055b 100644 --- a/x11/gnome/keyring-manager/Makefile +++ b/x11/gnome/keyring-manager/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.10 2009/03/14 11:36:25 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.11 2009/04/06 10:05:21 ajacoutot Exp $ COMMENT= keyring management program for the GNOME desktop @@ -27,8 +27,6 @@ WANTLIB= ICE ORBit-2 ORBitCosNaming-2 SM X11 Xau Xcomposite \ MODULES= devel/gettext \ x11/gnome -BUILD_DEPENDS= ::x11/gnome/doc-utils \ - ::textproc/rarian RUN_DEPENDS= ::x11/gnome/themes-extras LIB_DEPENDS= gnomeui-2::x11/gnome/libgnomeui \ gnome-keyring::x11/gnome/keyring diff --git a/x11/gnome/media/Makefile b/x11/gnome/media/Makefile index 2bb3f68a65d..40696e5b47d 100644 --- a/x11/gnome/media/Makefile +++ b/x11/gnome/media/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.23 2009/03/14 11:36:25 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.24 2009/04/06 10:05:21 ajacoutot Exp $ COMMENT= GNOME media utilities @@ -27,9 +27,7 @@ WANTLIB= ICE ORBit-2 ORBitCosNaming-2 SM X11 Xau Xcomposite \ MODULES= devel/gettext \ x11/gnome -BUILD_DEPENDS= ::multimedia/gstreamer-0.10/plugins-good,-gconf \ - ::x11/gnome/doc-utils \ - ::textproc/rarian +BUILD_DEPENDS= ::multimedia/gstreamer-0.10/plugins-good,-gconf LIB_DEPENDS= gconf-2::devel/gconf2 \ bonoboui-2::x11/gnome/libbonoboui \ gnomevfs-2::x11/gnome/vfs2 \ diff --git a/x11/gnome/mousetweaks/Makefile b/x11/gnome/mousetweaks/Makefile index 5625095c205..f8e52dfb90e 100644 --- a/x11/gnome/mousetweaks/Makefile +++ b/x11/gnome/mousetweaks/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.8 2009/03/14 11:36:25 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.9 2009/04/06 10:05:21 ajacoutot Exp $ COMMENT= mouse accessibility enhancements for GNOME @@ -28,7 +28,6 @@ WANTLIB= ICE ORBit-2 SM X11 Xau Xcomposite Xcursor Xdamage \ MODULES= devel/gettext \ x11/gnome -BUILD_DEPENDS= ::textproc/rarian LIB_DEPENDS= panel-applet-2.>=2::x11/gnome/applets2 \ spi,cspi::x11/gnome/at-spi diff --git a/x11/gnome/panel/Makefile b/x11/gnome/panel/Makefile index 93f13ce99ec..b5d12828407 100644 --- a/x11/gnome/panel/Makefile +++ b/x11/gnome/panel/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.53 2009/03/14 11:36:25 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.54 2009/04/06 10:05:21 ajacoutot Exp $ COMMENT= GNOME panel @@ -37,8 +37,6 @@ WANTLIB= ICE ORBit-2 ORBitCosNaming-2 SM X11 XRes Xau Xcomposite \ MODULES= devel/gettext \ x11/gnome -BUILD_DEPENDS= :gnome-doc-utils->=0.3.2:x11/gnome/doc-utils \ - ::textproc/rarian LIB_DEPENDS= camel-1.2,ebook-1.2,ecal-1.2,edataserver-1.2,edataserverui-1.2::databases/evolution-data-server \ wnck-1.>=21::devel/libwnck \ gnome-desktop-2.>=5::x11/gnome/desktop \ diff --git a/x11/gnome/planner/Makefile b/x11/gnome/planner/Makefile index 4608695e753..476c68534b1 100755 --- a/x11/gnome/planner/Makefile +++ b/x11/gnome/planner/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.16 2009/03/14 11:36:25 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.17 2009/04/06 10:05:21 ajacoutot Exp $ COMMENT= project management application @@ -32,8 +32,7 @@ MODULES= devel/gettext \ lang/python \ x11/gnome -BUILD_DEPENDS= :rarian-*:textproc/rarian \ - :py-gtk2-*:x11/py-gtk2 +BUILD_DEPENDS= ${RUN_DEPENDS} RUN_DEPENDS= :py-gtk2-*:x11/py-gtk2 \ :shared-mime-info->=0.21:misc/shared-mime-info diff --git a/x11/gnome/seahorse/Makefile b/x11/gnome/seahorse/Makefile index 952c676b415..f477c32c948 100644 --- a/x11/gnome/seahorse/Makefile +++ b/x11/gnome/seahorse/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.21 2009/03/23 15:54:58 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.22 2009/04/06 10:05:21 ajacoutot Exp $ COMMENT= manage encryption keys @@ -25,9 +25,7 @@ WANTLIB= ORBit-2 X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext \ krb5 m pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1 \ png pthread sasl2 ssl tasn1 xml2 z -BUILD_DEPENDS= ${RUN_DEPENDS} \ - ::x11/gnome/doc-utils \ - ::textproc/rarian +BUILD_DEPENDS= ${RUN_DEPENDS} LIB_DEPENDS= lber,ldap::databases/openldap \ notify::devel/libnotify \ soup-2.4::devel/libsoup \ diff --git a/x11/gnome/terminal/Makefile b/x11/gnome/terminal/Makefile index 5aaabcfc084..bc0ce805c2a 100644 --- a/x11/gnome/terminal/Makefile +++ b/x11/gnome/terminal/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.44 2009/03/14 11:36:25 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.45 2009/04/06 10:05:21 ajacoutot Exp $ COMMENT= GNOME terminal @@ -25,8 +25,6 @@ WANTLIB= ICE ORBit-2 ORBitCosNaming-2 SM X11 Xau Xcomposite \ MODULES= devel/gettext \ x11/gnome -BUILD_DEPENDS= :gnome-doc-utils-*:x11/gnome/doc-utils \ - ::textproc/rarian LIB_DEPENDS= gnomeui-2::x11/gnome/libgnomeui \ startup-notification-1::devel/startup-notification \ vte.>=11::devel/vte diff --git a/x11/gnome/tomboy/Makefile b/x11/gnome/tomboy/Makefile index 893ea209e14..2581192c79d 100644 --- a/x11/gnome/tomboy/Makefile +++ b/x11/gnome/tomboy/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.14 2009/03/14 11:36:25 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.15 2009/04/06 10:05:21 ajacoutot Exp $ COMMENT= desktop note-taking application written in C\# @@ -30,9 +30,7 @@ WANTLIB= ICE SM X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext \ m pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1 \ png xml2 z gio-2.0 -BUILD_DEPENDS= ::x11/gnome/doc-utils \ - ::textproc/rarian \ - ${RUN_DEPENDS} +BUILD_DEPENDS= ${RUN_DEPENDS} RUN_DEPENDS= ::lang/mono \ ::devel/mono-addins \ ::sysutils/ndesk-dbus-glib \ diff --git a/x11/gnome/totem/Makefile b/x11/gnome/totem/Makefile index f783c242442..6a13b5ed12b 100644 --- a/x11/gnome/totem/Makefile +++ b/x11/gnome/totem/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.19 2009/03/27 15:33:02 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.20 2009/04/06 10:05:21 ajacoutot Exp $ COMMENT= simple media player for GNOME @@ -34,7 +34,6 @@ MODULES= devel/gettext \ x11/gnome BUILD_DEPENDS= ::x11/py-gtk2 \ - ::textproc/rarian \ ::devel/iso-codes RUN_DEPENDS= ::x11/gnome/settings-daemon \ ::x11/py-gtk2 \ diff --git a/x11/gnome/utils/Makefile b/x11/gnome/utils/Makefile index 2659d68f80d..eff7a4f537b 100644 --- a/x11/gnome/utils/Makefile +++ b/x11/gnome/utils/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.37 2009/03/14 11:36:25 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.38 2009/04/06 10:05:21 ajacoutot Exp $ COMMENT= GNOME utility programs @@ -25,8 +25,6 @@ WANTLIB= ICE ORBit-2 ORBitCosNaming-2 SM X11 Xau Xcomposite \ pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png popt \ pthread ssl startup-notification-1 util xml2 z -BUILD_DEPENDS= :gnome-doc-utils-*:x11/gnome/doc-utils \ - ::textproc/rarian LIB_DEPENDS= gtop-2.0.>=7::devel/libgtop2 \ gnomeui-2.>=1800::x11/gnome/libgnomeui \ panel-applet-2::x11/gnome/panel diff --git a/x11/gnome/vinagre/Makefile b/x11/gnome/vinagre/Makefile index 1f272c6fdad..600950ea748 100644 --- a/x11/gnome/vinagre/Makefile +++ b/x11/gnome/vinagre/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.11 2009/03/14 11:36:25 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.12 2009/04/06 10:05:21 ajacoutot Exp $ COMMENT= VNC Client for the GNOME Desktop @@ -27,8 +27,6 @@ WANTLIB= ORBit-2 X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext \ gtk-x11-2.0 m pango-1.0 pangocairo-1.0 pangoft2-1.0 \ pcre pixman-1 png pthread tasn1 xml2 z -BUILD_DEPENDS= ::x11/gnome/doc-utils \ - ::textproc/rarian RUN_DEPENDS= :shared-mime-info->=0.21:misc/shared-mime-info LIB_DEPENDS= gnome-keyring::x11/gnome/keyring \ gtk-vnc-1.0.>=1::x11/gtk-vnc diff --git a/x11/gnome/zenity/Makefile b/x11/gnome/zenity/Makefile index 54215802fca..a648ff998c1 100644 --- a/x11/gnome/zenity/Makefile +++ b/x11/gnome/zenity/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.28 2009/03/14 10:40:54 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.29 2009/04/06 10:05:21 ajacoutot Exp $ COMMENT= dialogs for GNOME GNOME_PROJECT= zenity GNOME_VERSION= 2.24.1 -PKGNAME= ${DISTNAME}p2 +PKGNAME= ${DISTNAME}p3 # LGPLv2 PERMIT_PACKAGE_CDROM= Yes @@ -22,8 +22,6 @@ WANTLIB= X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \ MODULES= devel/gettext \ x11/gnome -BUILD_DEPENDS= ${RUN_DEPENDS} -RUN_DEPENDS= :gnome-doc-utils-*:x11/gnome/doc-utils LIB_DEPENDS= dbus-glib-1.>=3::x11/dbus-glib \ gnomecanvas-2::x11/gnome/libgnomecanvas \ notify::devel/libnotify