diff options
| author | jmcneill <jmcneill@pkgsrc.org> | 2008-11-24 14:05:40 +0000 |
|---|---|---|
| committer | jmcneill <jmcneill@pkgsrc.org> | 2008-11-24 14:05:40 +0000 |
| commit | 6f59addf2005a21a9ba27935f7fc90efe8f810fa (patch) | |
| tree | 29b7a63bd2ab0321c0283e6db334e0ee2b8d553b /x11 | |
| parent | 0dc39a8a5ba8cb236558dd7dc6bd8249dfdb90e7 (diff) | |
| download | pkgsrc-6f59addf2005a21a9ba27935f7fc90efe8f810fa.tar.gz | |
enable hal, bump PKGREVISION
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/gnome-control-center/Makefile | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/x11/gnome-control-center/Makefile b/x11/gnome-control-center/Makefile index 014a216a1e6..5c3d8d0d0d8 100644 --- a/x11/gnome-control-center/Makefile +++ b/x11/gnome-control-center/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.17 2008/10/24 23:45:34 jnemeth Exp $ +# $NetBSD: Makefile,v 1.18 2008/11/24 14:05:40 jmcneill Exp $ # DISTNAME= gnome-control-center-2.24.0.1 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-control-center/2.24/} EXTRACT_SUFX= .tar.bz2 @@ -21,8 +21,6 @@ USE_LIBTOOL= yes CONFLICTS+= gnome2-control-center-[0-9]* control-center-[0-9]* -CONFIGURE_ARGS+= --disable-hal - CPPFLAGS+= -DDBUS_API_SUBJECT_TO_CHANGE #PKGCONFIG_OVERRIDE+= gnome-settings-daemon/gnome-settings-daemon.pc.in @@ -49,14 +47,20 @@ BUILDLINK_API_DEPENDS.libxklavier= libxklavier>=3.6 BUILDLINK_API_DEPENDS.Xft2+= Xft2>=2.1.2 PKG_OPTIONS_VAR= PKG_OPTIONS.gnome-control-center -PKG_SUPPORTED_OPTIONS= evolution -PKG_SUGGESTED_OPTIONS= evolution +PKG_SUPPORTED_OPTIONS= evolution hal +PKG_SUGGESTED_OPTIONS= evolution hal .include "../../mk/bsd.options.mk" PLIST_VARS+= evolution .if !empty(PKG_OPTIONS:Mevolution) CONFIGURE_ARGS+= --enable-aboutme PLIST.evolution= yes .endif +.if !empty(PKG_OPTIONS:Mhal) +CONFIGURE_ARGS+= --enable-hal +.else +CONFIGURE_ARGS+= --disable-hal +.endif + _TOOLS_USE_MSGFMT_SH= yes @@ -91,6 +95,9 @@ post-patch: .include "../../sysutils/dbus-glib/buildlink3.mk" .include "../../sysutils/gnome-menus/buildlink3.mk" .include "../../sysutils/gnome-vfs/buildlink3.mk" +.if !empty(PKG_OPTIONS:Mhal) +.include "../../sysutils/hal/buildlink3.mk" +.endif .include "../../sysutils/nautilus/buildlink3.mk" .include "../../textproc/gnome-doc-utils/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" |