diff options
| author | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2013-06-07 00:09:58 +0800 |
|---|---|---|
| committer | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2013-06-07 00:09:58 +0800 |
| commit | 22ac137ba106297b5a5e33a59c9e33f5d7f01036 (patch) | |
| tree | 016ffc877ad80886e1963990713f653c362e1a2c /x11/gnome-panel/Makefile | |
| parent | afe6ebdf34fb4a51823a931978ce122f2033eada (diff) | |
| download | marcuscom-ports-22ac137ba106297b5a5e33a59c9e33f5d7f01036.tar marcuscom-ports-22ac137ba106297b5a5e33a59c9e33f5d7f01036.tar.gz marcuscom-ports-22ac137ba106297b5a5e33a59c9e33f5d7f01036.tar.bz2 marcuscom-ports-22ac137ba106297b5a5e33a59c9e33f5d7f01036.tar.lz marcuscom-ports-22ac137ba106297b5a5e33a59c9e33f5d7f01036.tar.xz marcuscom-ports-22ac137ba106297b5a5e33a59c9e33f5d7f01036.tar.zst marcuscom-ports-22ac137ba106297b5a5e33a59c9e33f5d7f01036.zip | |
Sync with ports, mostly OptionsNG conversion and some diff reductions.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@18518 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'x11/gnome-panel/Makefile')
| -rw-r--r-- | x11/gnome-panel/Makefile | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile index 7f0305479..c82eb778a 100644 --- a/x11/gnome-panel/Makefile +++ b/x11/gnome-panel/Makefile @@ -16,21 +16,20 @@ USE_BZIP2= yes .if !defined(REFERENCE_PORT) -LIB_DEPENDS= gweather.1:${PORTSDIR}/net/libgweather \ +LIB_DEPENDS= gweather:${PORTSDIR}/net/libgweather \ dbus-glib-1:${PORTSDIR}/devel/dbus-glib \ canberra-gtk:${PORTSDIR}/audio/libcanberra CONFLICTS= gnome-panel-3.[0-9]* -USES= gettext pathfix USE_XORG= ice sm x11 xau xrandr USE_PYTHON= yes INSTALLS_OMF= yes USE_LDCONFIG= yes INSTALLS_ICONS= yes +USES= gettext pathfix USE_GNOME= gnomeprefix intlhack gnomedesktop libwnck gnomemenus \ gnomedocutils ltverhack referencehack librsvg2 -WANT_GNOME= yes USE_GMAKE= yes USE_AUTOTOOLS= libtool CONFIGURE_ARGS= --disable-network-manager @@ -44,24 +43,22 @@ GCONF_SCHEMAS= clock.schemas fish.schemas \ panel-toplevel.schemas window-list.schemas \ workspace-switcher.schemas -OPTIONS= EVOLUTION "use the Evolution calendar if installed" on \ - BONOBO "Support for bonobo applets aka Gnome 2 applets" on -.if defined(PACKAGE_BUILDING) -.undef WITHOUT_GNOME -WITH_GNOME= yes -.endif +OPTIONS_DEFINE= EVOLUTION BONOBO +OPTIONS_DEFAULT=EVOLUTION BONOBO +EVOLUTION_DESC= Use the Evolution calendar +BONOBO_DESC= Support for bonobo applets aka Gnome 2 applets -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if !defined(WITHOUT_EVOLUTION) && ${HAVE_GNOME:Mevolutiondataserver}!="" +.if ${PORT_OPTIONS:MEVOLUTION} USE_GNOME+= evolutiondataserver #CONFIGURE_ARGS+=--enable-eds .else CONFIGURE_ARGS+=--disable-eds .endif -.if defined(WITH_BONOBO) +.if ${PORT_OPTIONS:MBONOBO} USE_GNOME+= libbonoboui CONFIGURE_ARGS+=--enable-bonobo PLIST_SUB+= BONOBO="" @@ -84,6 +81,6 @@ post-install: @${MKDIR} ${PREFIX}/lib/gnome-panel/modules -${LOCALBASE}/bin/gio-querymodules ${PREFIX}/lib/gnome-panel/modules -.include <bsd.port.post.mk> +.include <bsd.port.mk> .endif |