Revision: 145115 https://trac.macports.org/changeset/145115 Author: devans@macports.org Date: 2016-01-26 00:55:26 -0800 (Tue, 26 Jan 2016) Log Message: ----------- gnome-control-center: reorganize/simplify Portfile logic, update autogen.sh to latest upstream version. Modified Paths: -------------- trunk/dports/gnome/gnome-control-center/Portfile trunk/dports/gnome/gnome-control-center/files/autogen.sh Property Changed: ---------------- trunk/dports/gnome/gnome-control-center/ Property changes on: trunk/dports/gnome/gnome-control-center ___________________________________________________________________ Modified: svn:mergeinfo - /branches/mld-qt-481/dports/gnome/gnome-control-center:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856 /users/devans/GNOME-3/stable/dports/gnome/gnome-control-center:108269-142356 /users/devans/GNOME-3/unstable/dports/gnome/gnome-control-center:116416-118152,119539-125802,132280-134526,137392-140531 /users/rmstonecipher/gnome/gnome-control-center:102363-103172 + /branches/mld-qt-481/dports/gnome/gnome-control-center:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856 /users/devans/GNOME-3/stable/dports/gnome/gnome-control-center:108269-145114 /users/devans/GNOME-3/unstable/dports/gnome/gnome-control-center:116416-118152,119539-125802,132280-134526,137392-140531 /users/rmstonecipher/gnome/gnome-control-center:102363-103172 Modified: trunk/dports/gnome/gnome-control-center/Portfile =================================================================== --- trunk/dports/gnome/gnome-control-center/Portfile 2016-01-26 08:53:29 UTC (rev 145114) +++ trunk/dports/gnome/gnome-control-center/Portfile 2016-01-26 08:55:26 UTC (rev 145115) @@ -4,20 +4,7 @@ PortSystem 1.0 name gnome-control-center - -if {${os.platform} eq "darwin" && ${os.major} >= 13} { - - set mavericks_or_better yes - version 3.18.2 - -} else { - - set mavericks_or_better no - version 3.8.6 - revision 6 - -} - +version 3.18.2 set branch [join [lrange [split ${version} .] 0 1] .] description GNOME's main interface for configuration of the various \ aspects of your desktop. @@ -31,12 +18,10 @@ use_xz yes -if {$mavericks_or_better} { - - checksums rmd160 2ae8793c99356095b1c07b8d87547481c8739234 \ +checksums rmd160 2ae8793c99356095b1c07b8d87547481c8739234 \ sha256 36fe6157247d2b7c8a98dbb3dbcde1c3a6f9e5e8fcc9ccf357e2b2417578f8ad - depends_build port:pkgconfig \ +depends_build port:pkgconfig \ port:intltool \ port:libxslt \ port:gnome-common \ @@ -45,7 +30,7 @@ port:libtool \ port:gtk-doc - depends_lib port:desktop-file-utils \ +depends_lib port:desktop-file-utils \ port:gtk3 \ port:gsettings-desktop-schemas \ port:gnome-desktop \ @@ -68,23 +53,23 @@ port:xorg-libXxf86misc \ port:xorg-libXi - depends_run port:yelp +depends_run port:yelp # color panel disabled by patch, dependency colord requires libudev - patchfiles patch-disable-color-panel.diff \ +patchfiles patch-disable-color-panel.diff \ patch-disable-shell-test-hostname.diff \ patch-panels-user-accounts.diff # reconfigure using upstream autogen.sh for intltool 0.51 compatibility - post-patch { - xinstall -m 755 ${filespath}/autogen.sh ${worksrcpath} - } +post-patch { + xinstall -m 755 ${filespath}/autogen.sh ${worksrcpath} +} - configure.cmd ./autogen.sh +configure.cmd ./autogen.sh - configure.args --x-includes=${prefix}/include \ +configure.args --x-includes=${prefix}/include \ --x-libraries=${prefix}/lib \ --without-cheese \ --disable-ibus \ @@ -92,104 +77,39 @@ --disable-update-mimedb \ --disable-silent-rules -} else { - - checksums rmd160 3419412626e2de69c243423f31a0504c49955126 \ - sha256 8dba7eb3fa720580e84bb1a8241c745abacaa8999bbf9c28902819d5584fa42a - - depends_build port:pkgconfig \ - port:intltool \ - port:libxslt \ - port:gnome-common \ - port:autoconf \ - port:automake \ - port:libtool \ - port:gtk-doc - - depends_lib port:desktop-file-utils \ - port:gtk3 \ - port:gsettings-desktop-schemas \ - port:gnome-desktop \ - port:fontconfig \ - port:policykit \ - port:libxml2 \ - port:upower \ - port:libgtop \ - port:gnome-settings-daemon \ - port:gnome-menus \ - port:gnome-online-accounts \ - port:accountsservice \ - port:libcanberra \ - port:pulseaudio \ - port:libpwquality \ - port:kerberos5 \ - port:libsocialweb \ - port:shared-mime-info \ - port:xorg-libX11 \ - port:xorg-libXxf86misc \ - port:xorg-libXi - - depends_run port:yelp - -# color panel disabled by patch, dependency colord requires libudev -# power panel disabled by patch, doesn't support upower 0.99 API - - patchfiles patch-display-new-config-model.diff \ - patch-output-is-laptop.diff \ - patch-background-linker-fix.diff \ - patch-background-libsocialweb.diff \ - patch-users-logged-in-check.diff \ - patch-disable-color-panel-3.8.6.diff \ - patch-disable-shell-test-hostname-3.8.6.diff \ - patch-disable-power-panel.diff \ - patch-panels-user-accounts-3.8.6.diff - -# reconfigure using upstream autogen.sh for intltool 0.51 compatibility - - post-patch { - xinstall -m 755 ${filespath}/autogen.sh ${worksrcpath} - } - - configure.cmd ./autogen.sh - - configure.args --x-includes=${prefix}/include \ - --x-libraries=${prefix}/lib \ - --with-libsocialweb \ - --without-cheese \ - --disable-ibus \ - --disable-maintainer-mode \ - --disable-update-mimedb \ - --disable-silent-rules - -} - -pre-activate { - if {![catch {set installed [lindex [registry_active gdm] 0]}]} { - set _version [lindex $installed 1] - if {[vercmp $_version 3.0.0] < 0} { - registry_deactivate_composite gdm "" [list ports_nodepcheck 1] - } - } - if {![catch {set installed [lindex [registry_active gnome-media] 0]}]} { - set _version [lindex $installed 1] - if {[vercmp $_version 3.10.0] < 0} { - registry_deactivate_composite gnome-media "" [list ports_nodepcheck 1] - } - } -} - post-activate { system "${prefix}/bin/update-desktop-database ${prefix}/share/applications" system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor" } -if {$mavericks_or_better} { - - livecheck.type gnome - -} else { - -# Version 3.8.6 is the last version that will build on darwin < 13 - livecheck.type none - +platform darwin { + if {${configure.cxx_stdlib} eq "libstdc++"} { + version 3.8.6 + revision 6 + checksums rmd160 3419412626e2de69c243423f31a0504c49955126 \ + sha256 8dba7eb3fa720580e84bb1a8241c745abacaa8999bbf9c28902819d5584fa42a + depends_lib-delete \ + port:grilo \ + port:samba3 + depends_lib-append \ + port:gnome-menus \ + port:libsocialweb + # color panel disabled by patch, dependency colord requires libudev + # power panel disabled by patch, doesn't support upower 0.99 API + patchfiles patch-display-new-config-model.diff \ + patch-output-is-laptop.diff \ + patch-background-linker-fix.diff \ + patch-background-libsocialweb.diff \ + patch-users-logged-in-check.diff \ + patch-disable-color-panel-${version}.diff \ + patch-disable-shell-test-hostname-${version}.diff \ + patch-disable-power-panel.diff \ + patch-panels-user-accounts-${version}.diff + configure.args-append \ + --with-libsocialweb + # Version 3.8.6 is the last version that will build on platforms supporting libstdc++ + livecheck.type none + } else { + livecheck.type gnome + } } Modified: trunk/dports/gnome/gnome-control-center/files/autogen.sh =================================================================== --- trunk/dports/gnome/gnome-control-center/files/autogen.sh 2016-01-26 08:53:29 UTC (rev 145114) +++ trunk/dports/gnome/gnome-control-center/files/autogen.sh 2016-01-26 08:55:26 UTC (rev 145115) @@ -4,14 +4,13 @@ srcdir=`dirname $0` test -z "$srcdir" && srcdir=. -PKG_NAME="control-center" ACLOCAL_FLAGS="-I libgd $ACLOCAL_FLAGS" (test -f $srcdir/configure.ac \ && test -f $srcdir/autogen.sh \ && test -d $srcdir/shell) || { echo -n "**Error**: Directory "\`$srcdir\'" does not look like the" - echo " top-level $PKG_NAME directory" + echo " top-level gnome-control-center directory" exit 1 }