pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/audio/rhythmbox Split off options into options.mk file.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/a4f18cdb02be
branches:  trunk
changeset: 393789:a4f18cdb02be
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Tue May 26 20:26:58 2009 +0000

description:
Split off options into options.mk file.
Use standard name for option variable.

diffstat:

 audio/rhythmbox/Makefile   |  32 +++++++-------------------------
 audio/rhythmbox/options.mk |  21 +++++++++++++++++++++
 2 files changed, 28 insertions(+), 25 deletions(-)

diffs (99 lines):

diff -r 0fa838a09693 -r a4f18cdb02be audio/rhythmbox/Makefile
--- a/audio/rhythmbox/Makefile  Tue May 26 20:23:50 2009 +0000
+++ b/audio/rhythmbox/Makefile  Tue May 26 20:26:58 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.63 2009/05/26 18:15:20 drochner Exp $
+# $NetBSD: Makefile,v 1.64 2009/05/26 20:26:58 wiz Exp $
 #
 
 DISTNAME=      rhythmbox-0.12.1
@@ -12,12 +12,7 @@
 
 PKG_DESTDIR_SUPPORT=   user-destdir
 
-PKG_OPTIONS_VAR=       rhythmbox
-PKG_SUPPORTED_OPTIONS= hal
-PKG_SUGGESTED_OPTIONS= hal
-PLIST_VARS+=           ${PKG_SUPPORTED_OPTIONS}
-
-.include "../../mk/bsd.options.mk"
+.include "options.mk"
 
 GNU_CONFIGURE=         YES
 USE_DIRS+=             gnome2-1.5
@@ -27,31 +22,16 @@
 
 CONFIGURE_ARGS+=       --disable-browser-plugin
 CONFIGURE_ARGS+=       --with-html-dir=${PREFIX}/share/doc
-.if !empty(PKG_OPTIONS:Mhal)
-CONFIGURE_ARGS+=       --with-ipod
-.include "../../audio/libgpod/buildlink3.mk"
-# needs a newer libmtp
-#CONFIGURE_ARGS+=      --with-mtp
-#.include "../../devel/libmtp/buildlink3.mk"
-CONFIGURE_ARGS+=       --with-hal
-PLIST.hal=             yes
-.include "../../sysutils/hal/buildlink3.mk"
-.else
-CONFIGURE_ARGS+=       --without-hal
-.endif
+
+GCONF_SCHEMAS=         rhythmbox.schemas
 
 # for DAAP
 .include "../../net/avahi/buildlink3.mk"
 
-GCONF_SCHEMAS=         rhythmbox.schemas
-
-BUILDLINK_API_DEPENDS.gtk2+=           gtk2+>=2.14.0
-BUILDLINK_API_DEPENDS.musicbrainz+=    musicbrainz>=2.1.0
-BUILDLINK_API_DEPENDS.totem+=          {totem,totem-xine}>=1.1.5
-
 .include "../../lang/python/application.mk"
 .include "../../x11/py-gtk2/buildlink3.mk"
 .include "../../multimedia/py-gstreamer0.10/buildlink3.mk"
+BUILDLINK_API_DEPENDS.musicbrainz+=    musicbrainz>=2.1.0
 .include "../../audio/musicbrainz/buildlink3.mk"
 .include "../../devel/GConf/schemas.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
@@ -62,6 +42,7 @@
 .include "../../multimedia/gnome-media/buildlink3.mk"
 .include "../../multimedia/gstreamer0.10/buildlink3.mk"
 .include "../../multimedia/gst-plugins0.10-base/buildlink3.mk"
+BUILDLINK_API_DEPENDS.totem+=          {totem,totem-xine}>=1.1.5
 .include "../../multimedia/totem-pl-parser/buildlink3.mk"
 .include "../../net/libsoup24/buildlink3.mk"
 .include "../../sysutils/dbus-glib/buildlink3.mk"
@@ -71,6 +52,7 @@
 .include "../../sysutils/libnotify/buildlink3.mk"
 .include "../../textproc/gnome-doc-utils/buildlink3.mk"
 .include "../../mk/omf-scrollkeeper.mk"
+BUILDLINK_API_DEPENDS.gtk2+=           gtk2+>=2.14.0
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/libSM/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 0fa838a09693 -r a4f18cdb02be audio/rhythmbox/options.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/rhythmbox/options.mk        Tue May 26 20:26:58 2009 +0000
@@ -0,0 +1,21 @@
+# $NetBSD: options.mk,v 1.1 2009/05/26 20:26:58 wiz Exp $
+
+PKG_OPTIONS_VAR=       PKG_OPTIONS.rhythmbox
+PKG_SUPPORTED_OPTIONS= hal
+PKG_SUGGESTED_OPTIONS= hal
+PLIST_VARS+=           hal
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mhal)
+CONFIGURE_ARGS+=       --with-ipod
+.include "../../audio/libgpod/buildlink3.mk"
+# needs a newer libmtp
+#CONFIGURE_ARGS+=      --with-mtp
+#.include "../../devel/libmtp/buildlink3.mk"
+CONFIGURE_ARGS+=       --with-hal
+PLIST.hal=             yes
+.include "../../sysutils/hal/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=       --without-hal
+.endif



Home | Main Index | Thread Index | Old Index