From 9a233c5c90e37915c1b343a6200dba7c68e8a153 Mon Sep 17 00:00:00 2001 From: kwm Date: Wed, 9 Mar 2011 15:28:00 +0000 Subject: Update to 2.91.91. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@15427 df743ca5-7f9a-e211-a948-0013205c9059 --- sysutils/gnome-control-center3/Makefile | 20 +++++++++++++------- sysutils/gnome-control-center3/distinfo | 4 ++-- sysutils/gnome-control-center3/files/patch-configure | 17 ++++++++++++++--- .../files/patch-panels_datetime_Makefile.in | 14 ++++++++++++++ sysutils/gnome-control-center3/pkg-plist | 8 ++++++++ 5 files changed, 51 insertions(+), 12 deletions(-) create mode 100644 sysutils/gnome-control-center3/files/patch-panels_datetime_Makefile.in (limited to 'sysutils/gnome-control-center3') diff --git a/sysutils/gnome-control-center3/Makefile b/sysutils/gnome-control-center3/Makefile index 0c0b83326..5736e90a3 100644 --- a/sysutils/gnome-control-center3/Makefile +++ b/sysutils/gnome-control-center3/Makefile @@ -3,13 +3,13 @@ # Whom: Joe Marcus Clarke # # $FreeBSD$ -# $MCom: ports/sysutils/gnome-control-center3/Makefile,v 1.7 2011/02/02 12:44:30 kwm Exp $ +# $MCom: ports/sysutils/gnome-control-center3/Makefile,v 1.8 2011/02/22 16:44:38 kwm Exp $ # # add cheese suppor when it gets gtk3 version PORTNAME= gnome-control-center -PORTVERSION= 2.91.90 +PORTVERSION= 2.91.91 CATEGORIES= sysutils gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome3 @@ -53,13 +53,19 @@ GCONF_SCHEMAS= gnome-control-center.schemas WITH_GNOME= yes .endif -.include +OPTIONS= CUPS "Enable cups (printing) support" On -post-patch: -# @${REINPLACE_CMD} -e 's|/usr/sbin|${PREFIX}/sbin|g' \ -# ${WRKSRC}/panels/display/org.gnome.randr.policy.in +.include + +.if defined(WITH_CUPS) +LIB_DEPENDS+= cups.2:${PORTSDIR}/print/cups-client +PLIST_SUB+= CUPS="" +.else +PLIST_SUB+= CUPS="@comment " +CONFIGURE_ARGS+=--disable-cups +.endif post-install: @-update-desktop-database -.include +.include diff --git a/sysutils/gnome-control-center3/distinfo b/sysutils/gnome-control-center3/distinfo index 30b350f20..ff7018c43 100644 --- a/sysutils/gnome-control-center3/distinfo +++ b/sysutils/gnome-control-center3/distinfo @@ -1,2 +1,2 @@ -SHA256 (gnome3/gnome-control-center-2.91.90.tar.bz2) = 563f254a60267be8326f5168bc2cf4c4ca6308f3d5231327bbfc3d7ffc44e813 -SIZE (gnome3/gnome-control-center-2.91.90.tar.bz2) = 4369387 +SHA256 (gnome3/gnome-control-center-2.91.91.tar.bz2) = 44c703c069fc88831ce333906cefc7ae180c696be6d6051a97142c21f33341a4 +SIZE (gnome3/gnome-control-center-2.91.91.tar.bz2) = 4459312 diff --git a/sysutils/gnome-control-center3/files/patch-configure b/sysutils/gnome-control-center3/files/patch-configure index f245a3d60..fc033df86 100644 --- a/sysutils/gnome-control-center3/files/patch-configure +++ b/sysutils/gnome-control-center3/files/patch-configure @@ -1,6 +1,17 @@ ---- configure.orig 2011-01-20 15:29:00.000000000 +0000 -+++ configure 2011-01-20 15:29:07.000000000 +0000 -@@ -16762,7 +16762,7 @@ +--- configure.orig 2011-03-09 15:56:47.000000000 +0100 ++++ configure 2011-03-09 15:57:07.000000000 +0100 +@@ -17397,8 +17397,8 @@ + + + CUPS_API_VERSION=`$CUPS_CONFIG --api-version` +- CUPS_API_MAJOR=`echo $ECHO_N $CUPS_API_VERSION | sed -e "s/\./\n/g" | sed -n "1p"` +- CUPS_API_MINOR=`echo $ECHO_N $CUPS_API_VERSION | sed -e "s/\./\n/g" | sed -n "2p"` ++ CUPS_API_MAJOR=`echo $ECHO_N $CUPS_API_VERSION | sed -e "s/\./\ /g" | awk '{ print $1 }'` ++ CUPS_API_MINOR=`echo $ECHO_N $CUPS_API_VERSION | sed -e "s/\./\ /g" | awk '{ print $2 }'` + + for ac_header in cups/cups.h cups/http.h cups/ipp.h + do : +@@ -17808,7 +17808,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_libsocialweb" >&5 $as_echo "$with_libsocialweb" >&6; } diff --git a/sysutils/gnome-control-center3/files/patch-panels_datetime_Makefile.in b/sysutils/gnome-control-center3/files/patch-panels_datetime_Makefile.in new file mode 100644 index 000000000..a6054c408 --- /dev/null +++ b/sysutils/gnome-control-center3/files/patch-panels_datetime_Makefile.in @@ -0,0 +1,14 @@ +--- panels/datetime/Makefile.in.orig 2011-03-09 16:13:54.000000000 +0100 ++++ panels/datetime/Makefile.in 2011-03-09 16:14:28.000000000 +0100 +@@ -1078,9 +1078,9 @@ distdir: $(DISTFILES) + fi; \ + done + check-am: all-am +- $(MAKE) $(AM_MAKEFLAGS) check-local ++ $(MAKE) $(AM_MAKEFLAGS) + check: check-recursive +-all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA) all-local ++all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA) + installdirs: installdirs-recursive + installdirs-am: + for dir in "$(DESTDIR)$(ccpanelsdir)" "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(icons16dir)" "$(DESTDIR)$(icons22dir)" "$(DESTDIR)$(icons256dir)" "$(DESTDIR)$(icons32dir)" "$(DESTDIR)$(icons48dir)" "$(DESTDIR)$(iconsscalabledir)" "$(DESTDIR)$(tzdatadir)" "$(DESTDIR)$(uidir)"; do \ diff --git a/sysutils/gnome-control-center3/pkg-plist b/sysutils/gnome-control-center3/pkg-plist index 84d6e92cd..fe24e3389 100644 --- a/sysutils/gnome-control-center3/pkg-plist +++ b/sysutils/gnome-control-center3/pkg-plist @@ -2,6 +2,7 @@ bin/gnome-control-center bin/gnome-sound-applet etc/xdg/autostart/gnome-sound-applet.desktop etc/xdg/menus/gnomecc.menu +include/gnome-control-center-1/libgnome-control-center/cc-lockbutton.h include/gnome-control-center-1/libgnome-control-center/cc-panel.h include/gnome-control-center-1/libgnome-control-center/cc-shell.h include/gnome-control-center-1/libgnome-control-center/gconf-property-editor.h @@ -29,6 +30,9 @@ lib/control-center-1/panels/libmouse-properties.so lib/control-center-1/panels/libpower.a lib/control-center-1/panels/libpower.la lib/control-center-1/panels/libpower.so +%%CUPS%%lib/control-center-1/panels/libprinters.a +%%CUPS%%lib/control-center-1/panels/libprinters.la +%%CUPS%%lib/control-center-1/panels/libprinters.so lib/control-center-1/panels/libregion.a lib/control-center-1/panels/libregion.la lib/control-center-1/panels/libregion.so @@ -57,6 +61,7 @@ share/applications/gnome-info-panel.desktop share/applications/gnome-keyboard-panel.desktop share/applications/gnome-media-panel.desktop share/applications/gnome-mouse-panel.desktop +%%CUPS%%share/applications/gnome-printers-panel.desktop share/applications/gnome-power-panel.desktop share/applications/gnome-region-panel.desktop share/applications/gnome-screen-panel.desktop @@ -204,6 +209,8 @@ share/doc/libgnome-control-center/up.png %%DATADIR%%/ui/gnome-region-panel-options-dialog.ui %%DATADIR%%/ui/gnome-region-panel.ui %%DATADIR%%/ui/info.ui +%%CUPS%%%%DATADIR%%/ui/printers/new-printer-dialog.ui +%%CUPS%%%%DATADIR%%/ui/printers/printers.ui %%DATADIR%%/ui/power.ui %%DATADIR%%/ui/screen.ui %%DATADIR%%/ui/shell.ui @@ -502,6 +509,7 @@ share/sounds/gnome/default/alerts/sonar.ogg @dirrm share/gnome/help/control-center/C @dirrm share/gnome/help/control-center @dirrm %%DATADIR%%/ui/user-accounts +%%CUPS%%@dirrm %%DATADIR%%/ui/printers @dirrm %%DATADIR%%/ui/datetime @dirrm %%DATADIR%%/ui/background @dirrm %%DATADIR%%/ui -- cgit v1.2.3