diff options
| author | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2012-06-14 17:06:30 +0800 |
|---|---|---|
| committer | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2012-06-14 17:06:30 +0800 |
| commit | 3b86821fbfd68b7abc7315346e839917da608038 (patch) | |
| tree | 619e719a0491b917db213dc2ea81f17a9cb464e2 /sysutils | |
| parent | 25ca59426df1f3df3953d708779622b0c35d1e21 (diff) | |
| download | marcuscom-ports-3b86821fbfd68b7abc7315346e839917da608038.tar marcuscom-ports-3b86821fbfd68b7abc7315346e839917da608038.tar.gz marcuscom-ports-3b86821fbfd68b7abc7315346e839917da608038.tar.bz2 marcuscom-ports-3b86821fbfd68b7abc7315346e839917da608038.tar.lz marcuscom-ports-3b86821fbfd68b7abc7315346e839917da608038.tar.xz marcuscom-ports-3b86821fbfd68b7abc7315346e839917da608038.tar.zst marcuscom-ports-3b86821fbfd68b7abc7315346e839917da608038.zip | |
Correct cheese shlib version.
Pet portlint a bit.
bump some build requirement versions.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@16931 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/gnome-control-center3/Makefile | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/sysutils/gnome-control-center3/Makefile b/sysutils/gnome-control-center3/Makefile index 34c00ee90..3c87aeb23 100644 --- a/sysutils/gnome-control-center3/Makefile +++ b/sysutils/gnome-control-center3/Makefile @@ -3,7 +3,7 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/sysutils/gnome-control-center3/Makefile,v 1.36 2012/06/13 22:34:57 mezz Exp $ +# $MCom: ports/sysutils/gnome-control-center3/Makefile,v 1.37 2012/06/14 01:10:19 mezz Exp $ # PORTNAME= gnome-control-center @@ -15,8 +15,8 @@ DIST_SUBDIR= gnome3 MAINTAINER= gnome@FreeBSD.org COMMENT= Control center for GNOME 3 project -BUILD_DEPENDS= gnome-settings-daemon>=3.1.90:${PORTSDIR}/sysutils/gnome-settings-daemon3 \ - gsettings-desktop-schemas>=3.1.2:${PORTSDIR}/devel/gsettings-desktop-schemas \ +BUILD_DEPENDS= gnome-settings-daemon>=3.4.0:${PORTSDIR}/sysutils/gnome-settings-daemon3 \ + gsettings-desktop-schemas>=3.2.2:${PORTSDIR}/devel/gsettings-desktop-schemas \ ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes LIB_DEPENDS= canberra-gtk3.0:${PORTSDIR}/audio/libcanberra-gtk3 \ xklavier.12:${PORTSDIR}/x11/libxklavier \ @@ -28,13 +28,12 @@ LIB_DEPENDS= canberra-gtk3.0:${PORTSDIR}/audio/libcanberra-gtk3 \ dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ polkit-gobject-1.0:${PORTSDIR}/sysutils/polkit RUN_DEPENDS= gnome-eject:${PORTSDIR}/sysutils/gnome-mount \ - gnome-settings-daemon>=3.1.90:${PORTSDIR}/sysutils/gnome-settings-daemon3 \ - gsettings-desktop-schemas>=3.1.2:${PORTSDIR}/devel/gsettings-desktop-schemas \ + gnome-settings-daemon>=3.4.0:${PORTSDIR}/sysutils/gnome-settings-daemon3 \ + gsettings-desktop-schemas>=3.2.2:${PORTSDIR}/devel/gsettings-desktop-schemas \ ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes \ glxinfo:${PORTSDIR}/graphics/mesa-demos \ apg:${PORTSDIR}/security/apg \ gcm-calibrate:${PORTSDIR}/graphics/gnome-color-manager - CONFLICTS= gnome-control-center-2.[0-9]* gnome-media-2.[0-9]* @@ -45,13 +44,13 @@ USE_GMAKE= yes WANT_GNOME= yes USE_GNOME= gnomeprefix gnomehack gnomehier intlhack libxml2 gnomemenus3 \ libgnomekbd3 desktopfileutils gnomedesktop3 gconf2 -USE_XORG= xscrnsaver x11 xxf86misc kbproto +USE_XORG= xscrnsaver x11 xxf86misc kbproto xi GNU_CONFIGURE= yes INSTALLS_ICONS= yes USE_LDCONFIG= yes CONFIGURE_ARGS= --with-libsocialweb=yes -CPPFLAGS= -I${LOCALBASE}/include -LDFLAGS= -L${LOCALBASE}/lib +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib .if defined(PACKAGE_BUILDING) .undef WITHOUT_GNOME @@ -74,7 +73,7 @@ CONFIGURE_ARGS+=--disable-cups .if defined(WITH_CHEESE) && (${ARCH}=="i386" || ${ARCH}=="amd64") CONFIGURE_ARGS+=--with-cheese BUILD_DEPENDS+= cheese>=3.0.1:${PORTSDIR}/multimedia/cheese3 -LIB_DEPENDS+= cheese.2:${PORTSDIR}/multimedia/cheese3 +LIB_DEPENDS+= cheese.5:${PORTSDIR}/multimedia/cheese3 .else CONFIGURE_ARGS+=--without-cheese .endif |