March 2014 - macports-changes - lists.macosforge.org

[117652] trunk/dports/devel/capstone
by ryandesign＠macports.org 07 Mar '14

07 Mar '14

Revision: 117652 https://trac.macports.org/changeset/117652 Author: ryandesign(a)macports.org Date: 2014-03-06 21:09:28 -0800 (Thu, 06 Mar 2014) Log Message: ----------- capstone: update to 2.1 (#42724) Modified Paths: -------------- trunk/dports/devel/capstone/Portfile trunk/dports/devel/capstone/files/patch-Makefile.diff Modified: trunk/dports/devel/capstone/Portfile =================================================================== --- trunk/dports/devel/capstone/Portfile 2014-03-07 02:53:56 UTC (rev 117651) +++ trunk/dports/devel/capstone/Portfile 2014-03-07 05:09:28 UTC (rev 117652) @@ -4,8 +4,7 @@ PortSystem 1.0 name capstone -version 2.0 -revision 1 +version 2.1 categories devel platforms darwin maintainers gmail.com:aquynh @@ -19,8 +18,8 @@ master_sites ${homepage}download/${version}/ extract.suffix .tgz -checksums sha256 5d871b1e52047d1b2882bbcc6f049205ba6acc8d55d746937d22af5d0b33fa9e \ - rmd160 bb7551404e203fa99240b5e33c3d30ca8555830f +checksums sha256 5ebc168212a159218a4454c72d0c060b8a8af78605b93b214b3d6c5e2a124896 \ + rmd160 47b9a1949b7c82ec235dcb96a81d456f3b18eae6 patchfiles patch-Makefile.diff Modified: trunk/dports/devel/capstone/files/patch-Makefile.diff =================================================================== --- trunk/dports/devel/capstone/files/patch-Makefile.diff 2014-03-07 02:53:56 UTC (rev 117651) +++ trunk/dports/devel/capstone/files/patch-Makefile.diff 2014-03-07 05:09:28 UTC (rev 117652) @@ -1,6 +1,6 @@ ---- Makefile.orig 2014-01-22 04:33:35.000000000 -0600 -+++ Makefile 2014-02-14 18:38:48.000000000 -0600 -@@ -21,20 +21,23 @@ +--- Makefile.org 2014-03-04 18:18:25.000000000 -0800 ++++ Makefile 2014-03-04 18:27:48.000000000 -0800 +@@ -21,20 +21,24 @@ CFLAGS += -DUSE_SYS_DYN_MEM endif @@ -10,15 +10,16 @@ DESTDIR ?= -INCDIR = $(DESTDIR)$(PREFIX)/include +INCDIR = $(PREFIX)/include -+ + +-LIBDIR = $(DESTDIR)$(PREFIX)/lib +UNAME_S := $(shell uname -s) +ifeq ($(UNAME_S),Darwin) +LDFLAGS += -dynamiclib -install_name $(LIBDIR)/$(LIBRARY) +else +LDFLAGS += -shared +endif - --LIBDIR = $(DESTDIR)$(PREFIX)/lib ++ ++ +LIBDIR = $(PREFIX)/lib # on x86_64, we might have /usr/lib64 directory instead of /usr/lib -MACHINE := $(shell uname -m) @@ -33,15 +34,29 @@ endif endif -@@ -88,7 +91,6 @@ - +@@ -136,21 +140,10 @@ + LIBOBJ += $(LIBOBJ_ARM) $(LIBOBJ_ARM64) $(LIBOBJ_MIPS) $(LIBOBJ_PPC) $(LIBOBJ_X86) LIBOBJ += MCInst.o +- -UNAME_S := $(shell uname -s) +-PKGCFCGDIR = $(LIBDIR)/pkgconfig +- # OSX? ifeq ($(UNAME_S),Darwin) EXT = dylib -@@ -145,25 +147,25 @@ + AR_EXT = a +-# By default, suppose that Brew is installed & use Brew path for pkgconfig file +-PKGCFCGDIR = /usr/local/lib/pkgconfig +-# is Macport installed instead? +-ifneq (,$(wildcard /opt/local/bin/port)) +-# then correct the path for pkgconfig file +-PKGCFCGDIR = /opt/local/lib/pkgconfig +-endif + else + # Cygwin? + IS_CYGWIN := $(shell $(CC) -dumpmachine | grep -i cygwin | wc -l) +@@ -228,25 +221,25 @@ echo 'Description: Capstone disassembler engine' >> $(PKGCFGF) echo 'Version: $(VERSION)' >> $(PKGCFGF) echo 'libdir=$(LIBDIR)' >> $(PKGCFGF) @@ -57,8 +72,8 @@ - $(INSTALL_DATA) lib$(LIBNAME).$(AR_EXT) $(LIBDIR) - mkdir -p $(INCDIR)/$(LIBNAME) - $(INSTALL_DATA) include/*.h $(INCDIR)/$(LIBNAME) -- mkdir -p $(LIBDIR)/pkgconfig -- $(INSTALL_DATA) $(PKGCFGF) $(LIBDIR)/pkgconfig/ +- mkdir -p $(PKGCFCGDIR) +- $(INSTALL_DATA) $(PKGCFGF) $(PKGCFCGDIR)/ + mkdir -p $(DESTDIR)$(LIBDIR) + $(INSTALL_LIBRARY) lib$(LIBNAME).$(EXT) $(DESTDIR)$(LIBDIR) + $(INSTALL_DATA) lib$(LIBNAME).$(AR_EXT) $(DESTDIR)$(LIBDIR) @@ -71,7 +86,7 @@ - rm -rf $(INCDIR)/$(LIBNAME) - rm -f $(LIBDIR)/lib$(LIBNAME).$(EXT) - rm -f $(LIBDIR)/lib$(LIBNAME).$(AR_EXT) -- rm -f $(LIBDIR)/pkgconfig/$(LIBNAME).pc +- rm -f $(PKGCFCGDIR)/$(LIBNAME).pc + rm -rf $(DESTDIR)$(INCDIR)/$(LIBNAME) + rm -f $(DESTDIR)$(LIBDIR)/lib$(LIBNAME).$(EXT) + rm -f $(DESTDIR)$(LIBDIR)/lib$(LIBNAME).$(AR_EXT)

1 0

[117651] trunk/dports/editors/frescobaldi
by ryandesign＠macports.org 07 Mar '14

07 Mar '14

Revision: 117651 https://trac.macports.org/changeset/117651 Author: ryandesign(a)macports.org Date: 2014-03-06 18:53:56 -0800 (Thu, 06 Mar 2014) Log Message: ----------- frescobaldi: update to 2.0.14 (#42745) Modified Paths: -------------- trunk/dports/editors/frescobaldi/Portfile Removed Paths: ------------- trunk/dports/editors/frescobaldi/files/ Modified: trunk/dports/editors/frescobaldi/Portfile =================================================================== --- trunk/dports/editors/frescobaldi/Portfile 2014-03-07 02:34:45 UTC (rev 117650) +++ trunk/dports/editors/frescobaldi/Portfile 2014-03-07 02:53:56 UTC (rev 117651) @@ -5,24 +5,24 @@ PortGroup python 1.0 PortGroup github 1.0 -github.setup wbsoft frescobaldi 2.0.13 v +github.setup wbsoft frescobaldi 2.0.14 v conflicts frescobaldi-devel categories editors python maintainers gmail.com:davide.liessi openmaintainer description A LilyPond sheet music text editor -long_description Frescobaldi is a LilyPond sheet music text editor. \ - It aims to be powerful, yet lightweight and easy to use. +long_description Frescobaldi is an advanced text editor \ + to edit LilyPond sheet music files. \ + Features include an integrated PDF preview \ + and a powerful Score Wizard. homepage http://www.frescobaldi.org/ platforms darwin supported_archs noarch license GPL-2+ -checksums rmd160 bf385c596e26e0c15b994b7b6bd4122711c5b9c4 \ - sha256 5b272a65a329fe32d986edb28afb6a7361773ff895b13f26e3207ab268e9b955 +checksums rmd160 2d1a18d3137e1e8cead8736dfc02984b3bfef6e3 \ + sha256 97e2582e14d565222bfe11cb677f81a67176ac96309c750d0c8f42f6ce1102f9 subport frescobaldi-devel { - github.setup wbsoft frescobaldi 0cfa5eac4cdbe6136035cb3d2f9d5edf8f03d467 - # github.setup also sets 'name frescobaldi', overriding the subport name. # With 'name ${subport}', `port lint frescobaldi-devel` gives the following error: # 'Error: Portfile directory frescobaldi does not match port name frescobaldi-devel'. @@ -32,15 +32,10 @@ set PortInfo(name) ${subport} conflicts frescobaldi - version 20140211 + version 20140306 set dev_version 2.0.14 - - checksums rmd160 640169b560cea175aa4d8d260dcb324948d65fb3 \ - sha256 79cfea2e2c43dd6a3e752eeeab1142d8ff186798662057d27c2f46c94a255682 } -build {} - depends_run-append port:portmidi variant python26 conflicts python27 description {Use Python 2.6} { @@ -64,6 +59,19 @@ } default_variants +app +build { + if {[variant_isset app]} { + if {${name} eq ${subport}} { + set bundle_version ${version} + } else { + set bundle_version ${dev_version}-dev-${version} + } + + system -W ${worksrcpath} "${prefix}/bin/python${python.branch} \ + macosx/mac-app.py -f -v ${bundle_version} -s ${prefix}/bin/frescobaldi" + } +} + post-destroot { set share_destroot ${destroot}${prefix}/share set share_python ${python.prefix}/share @@ -90,28 +98,7 @@ ${doc_dir} if {[variant_isset app]} { - if {${name} eq ${subport}} { - set bundle_version ${version} - } else { - set bundle_version ${dev_version}-dev-${version} - } - - xinstall -m 644 -W ${filespath} mac-app.py ${workpath} - reinplace "s|%%VERSION%%|${bundle_version}|g" ${workpath}/mac-app.py - reinplace "s|%%PREFIX%%|${prefix}|g" ${workpath}/mac-app.py - - system "cd ${workpath} && ${prefix}/bin/python${python.branch} mac-app.py py2app" - - set app_resources ${workpath}/dist/Frescobaldi.app/Contents/Resources - xinstall -m 644 -W ${worksrcpath}/macosx/icons frescobaldi.icns ${app_resources} - - foreach l {cs de en es fr gl it nl pl pt ru tr uk} { - set app_lproj ${app_resources}/${l}.lproj - xinstall -d ${app_lproj} - xinstall -m 644 -W ${filespath} InfoPlist.strings ${app_lproj} - } - - file copy ${workpath}/dist/Frescobaldi.app ${destroot}${applications_dir} + file copy ${worksrcpath}/dist/Frescobaldi.app ${destroot}${applications_dir} } }

1 0

[117650] trunk/dports/lang/php
by ryandesign＠macports.org 07 Mar '14

07 Mar '14

Revision: 117650 https://trac.macports.org/changeset/117650 Author: ryandesign(a)macports.org Date: 2014-03-06 18:34:45 -0800 (Thu, 06 Mar 2014) Log Message: ----------- php: update php56 to 5.6.0alpha3 Modified Paths: -------------- trunk/dports/lang/php/Portfile Added Paths: ----------- trunk/dports/lang/php/files/patch-php56-ext-openssl-xp_ssl.c.diff Modified: trunk/dports/lang/php/Portfile =================================================================== --- trunk/dports/lang/php/Portfile 2014-03-07 02:19:54 UTC (rev 117649) +++ trunk/dports/lang/php/Portfile 2014-03-07 02:34:45 UTC (rev 117650) @@ -97,15 +97,15 @@ # When this becomes a stable version, remove the overrides for homepage, # master_sites and livecheck, and update php.latest_stable_branch in the # php-1.1 portgroup. - version 5.6.0alpha2 + version 5.6.0alpha3 homepage http://qa.php.net/ master_sites http://downloads.php.net/tyrael/ use_xz yes set suhosin_available no checksums ${distname}${extract.suffix} \ - md5 b1944a0ec309eb31551e07ae5a8f426c \ - rmd160 72015411a6bb76dadfbc165192cfe7a5322d0f82 \ - sha256 d240a4fd09610b44f2567fcb6f7970e06222506ae6d8dcba7b31b0ee4b58207d + md5 57d9317dab2e8eab962990ff0c5ea70a \ + rmd160 8ff9342129f312915e51b4e201fb08a63bb65055 \ + sha256 7a91e609b772072011dc3e4988826bfe4e5c41f9339283d9f09c48f2bdd66702 livecheck.url ${homepage} livecheck.regex php-([strsed ${subport_branch} {g/\\./\\./}](?:\\.\[0-9.\]+)*(?:(?:alpha|beta|RC)\\d+|-latest))\\.tar } @@ -888,6 +888,10 @@ move ${php.build_dirs}/config0.m4 ${php.build_dirs}/config.m4 } + if {[vercmp ${branch} 5.6] == 0} { + patchfiles-append patch-${php}-ext-openssl-xp_ssl.c.diff + } + configure.args-append --with-kerberos=${prefix} \ --with-openssl=${prefix} } Added: trunk/dports/lang/php/files/patch-php56-ext-openssl-xp_ssl.c.diff =================================================================== --- trunk/dports/lang/php/files/patch-php56-ext-openssl-xp_ssl.c.diff (rev 0) +++ trunk/dports/lang/php/files/patch-php56-ext-openssl-xp_ssl.c.diff 2014-03-07 02:34:45 UTC (rev 117650) @@ -0,0 +1,14 @@ +https://bugs.php.net/bug.php?id=66840 +--- ext/openssl/xp_ssl.c.orig 2014-02-26 19:36:56.000000000 -0600 ++++ ext/openssl/xp_ssl.c 2014-03-06 20:21:56.000000000 -0600 +@@ -18,6 +18,10 @@ + + /* $Id$ */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "php.h" + #include "ext/standard/file.h" + #include "ext/standard/url.h"

1 0

[117649] trunk/dports/x11/gtkspell2/Portfile
by devans＠macports.org 07 Mar '14

07 Mar '14

Revision: 117649 https://trac.macports.org/changeset/117649 Author: devans(a)macports.org Date: 2014-03-06 18:19:54 -0800 (Thu, 06 Mar 2014) Log Message: ----------- gtkspell2: add missing build dep on libxslt (#42744). Modified Paths: -------------- trunk/dports/x11/gtkspell2/Portfile Modified: trunk/dports/x11/gtkspell2/Portfile =================================================================== --- trunk/dports/x11/gtkspell2/Portfile 2014-03-07 01:26:59 UTC (rev 117648) +++ trunk/dports/x11/gtkspell2/Portfile 2014-03-07 02:19:54 UTC (rev 117649) @@ -28,6 +28,7 @@ depends_build port:pkgconfig \ port:gtk-doc \ + port:libxslt \ port:intltool depends_lib port:enchant \

1 0

[117648] trunk/dports/net/youtube-dl/Portfile
by ryandesign＠macports.org 07 Mar '14

07 Mar '14

Revision: 117648 https://trac.macports.org/changeset/117648 Author: ryandesign(a)macports.org Date: 2014-03-06 17:26:59 -0800 (Thu, 06 Mar 2014) Log Message: ----------- youtube-dl: update to 2014.03.06 Modified Paths: -------------- trunk/dports/net/youtube-dl/Portfile Modified: trunk/dports/net/youtube-dl/Portfile =================================================================== --- trunk/dports/net/youtube-dl/Portfile 2014-03-07 01:20:47 UTC (rev 117647) +++ trunk/dports/net/youtube-dl/Portfile 2014-03-07 01:26:59 UTC (rev 117648) @@ -4,7 +4,7 @@ PortSystem 1.0 name youtube-dl -version 2014.03.04.2 +version 2014.03.06 categories net platforms darwin maintainers ryandesign openmaintainer @@ -18,8 +18,8 @@ homepage http://rg3.github.com/youtube-dl/ master_sites http://youtube-dl.org/downloads/${version} -checksums rmd160 ef019887b87dae7e078c98a81e52c9d8c7fa3f9d \ - sha256 973c197b9ec3a789486a3ce2f9a7cd49cd244968ef1f0389726b937fb4cc98de +checksums rmd160 dab0185a90062669215f34e4f14c809a6ba28be2 \ + sha256 01f4e5a9404a73e9fe7e6e1a7bfb1376ab3548c4083611dad02d53f0ad76eb33 depends_build bin:zip:zip

1 0

[117647] trunk/dports/www/phpmyadmin/Portfile
by ryandesign＠macports.org 07 Mar '14

07 Mar '14

Revision: 117647 https://trac.macports.org/changeset/117647 Author: ryandesign(a)macports.org Date: 2014-03-06 17:20:47 -0800 (Thu, 06 Mar 2014) Log Message: ----------- phpmyadmin: update to 4.1.9 Modified Paths: -------------- trunk/dports/www/phpmyadmin/Portfile Modified: trunk/dports/www/phpmyadmin/Portfile =================================================================== --- trunk/dports/www/phpmyadmin/Portfile 2014-03-07 01:16:52 UTC (rev 117646) +++ trunk/dports/www/phpmyadmin/Portfile 2014-03-07 01:20:47 UTC (rev 117647) @@ -5,7 +5,7 @@ name phpmyadmin set my_name phpMyAdmin -version 4.1.8 +version 4.1.9 categories www php databases platforms darwin freebsd maintainers ryandesign openmaintainer @@ -26,8 +26,8 @@ distname ${my_name}-${version}-all-languages use_xz yes -checksums rmd160 85e347c26c4813b84528b1a08af2a8c79fc2bc41 \ - sha256 857f133911eddcec16824f3ecc7a68f93288ab2a2f1943bfce3b06b58b625cd6 +checksums rmd160 c2490ef58b9e05370a6bba8aff6684aecb8cb43c \ + sha256 efc5bd669324cd094cc1912afee9c91fd052fe9f226f767f7ec7b31a1796ce2c # The php variants deliberately do not conflict

1 0

[117646] trunk/dports/lang/php/Portfile
by ryandesign＠macports.org 07 Mar '14

07 Mar '14

Revision: 117646 https://trac.macports.org/changeset/117646 Author: ryandesign(a)macports.org Date: 2014-03-06 17:16:52 -0800 (Thu, 06 Mar 2014) Log Message: ----------- php: update php55 to 5.5.10 Modified Paths: -------------- trunk/dports/lang/php/Portfile Modified: trunk/dports/lang/php/Portfile =================================================================== --- trunk/dports/lang/php/Portfile 2014-03-07 00:49:54 UTC (rev 117645) +++ trunk/dports/lang/php/Portfile 2014-03-07 01:16:52 UTC (rev 117646) @@ -85,13 +85,13 @@ } 5.5 { epoch 2 - version 5.5.9 + version 5.5.10 use_bzip2 yes set suhosin_available no checksums ${distname}${extract.suffix} \ - md5 c4a348a07b52f6e177d8fdc75fe507b1 \ - rmd160 9290668f79070e7a578de55498a4a5144f2d14cc \ - sha256 9d1dea5195e2bcd928416130a6e19173d02bd36fb76c382522bf145c458fbed3 + md5 d608230c7890b6a0cc5b92e66e866226 \ + rmd160 9f3a5a4521304bb9e9aa2846f0834a7a28d1f704 \ + sha256 bb34e61f8e6f56c612867bfe85d144d5045cd5e44497539bc126a4e8c6795419 } 5.6 { # When this becomes a stable version, remove the overrides for homepage,

1 0

[117645] trunk/dports/_resources/port1.0/fetch/mirror_sites.tcl
by ryandesign＠macports.org 07 Mar '14

07 Mar '14

Revision: 117645 https://trac.macports.org/changeset/117645 Author: ryandesign(a)macports.org Date: 2014-03-06 16:49:54 -0800 (Thu, 06 Mar 2014) Log Message: ----------- mirror_sites.tcl: update php group Modified Paths: -------------- trunk/dports/_resources/port1.0/fetch/mirror_sites.tcl Modified: trunk/dports/_resources/port1.0/fetch/mirror_sites.tcl =================================================================== --- trunk/dports/_resources/port1.0/fetch/mirror_sites.tcl 2014-03-07 00:14:42 UTC (rev 117644) +++ trunk/dports/_resources/port1.0/fetch/mirror_sites.tcl 2014-03-07 00:49:54 UTC (rev 117645) @@ -350,8 +350,10 @@ http://ar.php.net/:nosubdir http://at.php.net/:nosubdir http://au.php.net/:nosubdir + http://bd.php.net/:nosubdir http://be.php.net/:nosubdir http://bg.php.net/:nosubdir + http://br.php.net/:nosubdir http://ca.php.net/:nosubdir http://ch.php.net/:nosubdir http://cl.php.net/:nosubdir @@ -362,16 +364,15 @@ http://es.php.net/:nosubdir http://fi.php.net/:nosubdir http://fr.php.net/:nosubdir - http://gr.php.net/:nosubdir http://hk.php.net/:nosubdir http://hu.php.net/:nosubdir + http://id.php.net/:nosubdir http://ie.php.net/:nosubdir http://il.php.net/:nosubdir http://in.php.net/:nosubdir http://ir.php.net/:nosubdir http://is.php.net/:nosubdir http://it.php.net/:nosubdir - http://jm.php.net/:nosubdir http://jp.php.net/:nosubdir http://kr.php.net/:nosubdir http://li.php.net/:nosubdir @@ -381,6 +382,7 @@ http://md.php.net/:nosubdir http://mx.php.net/:nosubdir http://my.php.net/:nosubdir + http://nc.php.net/:nosubdir http://nl.php.net/:nosubdir http://no.php.net/:nosubdir http://nz.php.net/:nosubdir @@ -389,6 +391,7 @@ http://pl.php.net/:nosubdir http://pt.php.net/:nosubdir http://ro.php.net/:nosubdir + http://ru.php.net/:nosubdir http://se.php.net/:nosubdir http://sg.php.net/:nosubdir http://si.php.net/:nosubdir

1 0

[117644] trunk/dports/gnome/devhelp
by devans＠macports.org 07 Mar '14

07 Mar '14

Revision: 117644 https://trac.macports.org/changeset/117644 Author: devans(a)macports.org Date: 2014-03-06 16:14:42 -0800 (Thu, 06 Mar 2014) Log Message: ----------- devhelp: use upstream autogen.sh to reconfigure with our intltool.m4, build deps, update post-activate. Modified Paths: -------------- trunk/dports/gnome/devhelp/Portfile Added Paths: ----------- trunk/dports/gnome/devhelp/files/autogen.sh trunk/dports/gnome/devhelp/files/patch-configure.ac.diff Removed Paths: ------------- trunk/dports/gnome/devhelp/files/patch-configure.diff Modified: trunk/dports/gnome/devhelp/Portfile =================================================================== --- trunk/dports/gnome/devhelp/Portfile 2014-03-06 21:40:44 UTC (rev 117643) +++ trunk/dports/gnome/devhelp/Portfile 2014-03-07 00:14:42 UTC (rev 117644) @@ -26,10 +26,12 @@ checksums rmd160 8d855f485742a0bdc766591d36af09bdbea61801 \ sha256 a245b53824c6f2ff89245ff807bb2140bde74951ea6f1d759a0fd0c6959ca9f7 -patchfiles patch-configure.diff - depends_build port:pkgconfig \ - port:intltool + port:intltool \ + port:gnome-common \ + port:autoconf \ + port:automake \ + port:libtool depends_lib port:desktop-file-utils \ port:gnome-icon-theme \ @@ -57,6 +59,17 @@ } } +patchfiles patch-configure.ac.diff + +# use upstream autogen.sh to update m4/intltool.m4 using intltoolize and autoreconf + +post-patch { + xinstall -m 755 ${filespath}/autogen.sh ${worksrcpath} + copy ${worksrcpath}/libgd/libgd.m4 ${worksrcpath}/m4 +} + +configure.cmd ./autogen.sh + configure.args --with-webkit2=no \ --disable-schemas-compile @@ -75,7 +88,7 @@ } post-activate { - system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor" + system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor" system "${prefix}/bin/update-desktop-database ${prefix}/share/applications" system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas" } Added: trunk/dports/gnome/devhelp/files/autogen.sh =================================================================== --- trunk/dports/gnome/devhelp/files/autogen.sh (rev 0) +++ trunk/dports/gnome/devhelp/files/autogen.sh 2014-03-07 00:14:42 UTC (rev 117644) @@ -0,0 +1,21 @@ +#!/bin/sh +# Run this to generate all the initial makefiles, etc. + +srcdir=`dirname $0` +test -z "$srcdir" && srcdir=. + +PKG_NAME="Devhelp" +ACLOCAL_FLAGS="-I libgd $ACLOCAL_FLAGS" + +(test -f $srcdir/src/dh-main.c) || { + echo -n "**Error**: Directory "\`$srcdir\'" does not look like the" + echo " top-level $PKG_NAME directory" + exit 1 +} + +which gnome-autogen.sh || { + echo "You need to install gnome-common." + exit 1 +} + +. gnome-autogen.sh Added: trunk/dports/gnome/devhelp/files/patch-configure.ac.diff =================================================================== --- trunk/dports/gnome/devhelp/files/patch-configure.ac.diff (rev 0) +++ trunk/dports/gnome/devhelp/files/patch-configure.ac.diff 2014-03-07 00:14:42 UTC (rev 117644) @@ -0,0 +1,13 @@ +--- configure.ac.orig 2014-03-06 15:51:48.000000000 -0800 ++++ configure.ac 2014-03-06 15:52:52.000000000 -0800 +@@ -96,8 +96,8 @@ + # i18n stuff + IT_PROG_INTLTOOL([0.40.0]) + +-AM_GNU_GETTEXT_VERSION([0.17]) +-AM_GNU_GETTEXT([external]) ++#AM_GNU_GETTEXT_VERSION([0.17]) ++#AM_GNU_GETTEXT([external]) + + GETTEXT_PACKAGE=devhelp + AC_SUBST(GETTEXT_PACKAGE) Deleted: trunk/dports/gnome/devhelp/files/patch-configure.diff =================================================================== --- trunk/dports/gnome/devhelp/files/patch-configure.diff 2014-03-06 21:40:44 UTC (rev 117643) +++ trunk/dports/gnome/devhelp/files/patch-configure.diff 2014-03-07 00:14:42 UTC (rev 117644) @@ -1,14 +0,0 @@ ---- configure.orig 2013-05-15 04:07:33.000000000 -0700 -+++ configure 2013-08-03 06:37:28.000000000 -0700 -@@ -15341,9 +15341,9 @@ - - - -- PYTHON_PREFIX='${prefix}' -+ PYTHON_PREFIX=`$PYTHON -c 'import sys; print sys.prefix;'` - -- PYTHON_EXEC_PREFIX='${exec_prefix}' -+ PYTHON_EXEC_PREFIX=`$PYTHON -c 'import sys; print sys.exec_prefix;'` - - -

1 0

[117643] trunk/dports/gnome/libgnomeui
by devans＠macports.org 06 Mar '14

06 Mar '14

Revision: 117643 https://trac.macports.org/changeset/117643 Author: devans(a)macports.org Date: 2014-03-06 13:40:44 -0800 (Thu, 06 Mar 2014) Log Message: ----------- libgnomeui: use autoreconf in +x11 to fix intltool configuration, patch to fix format-nonliteral error when building with clang (#42734). Modified Paths: -------------- trunk/dports/gnome/libgnomeui/Portfile Added Paths: ----------- trunk/dports/gnome/libgnomeui/files/patch-libgnomeui-gnome-gconf-ui.c.diff Modified: trunk/dports/gnome/libgnomeui/Portfile =================================================================== --- trunk/dports/gnome/libgnomeui/Portfile 2014-03-06 20:44:30 UTC (rev 117642) +++ trunk/dports/gnome/libgnomeui/Portfile 2014-03-06 21:40:44 UTC (rev 117643) @@ -5,7 +5,7 @@ name libgnomeui version 2.24.5 -revision 11 +revision 12 set branch [join [lrange [split ${version} .] 0 1] .] maintainers nomaintainer categories gnome @@ -34,7 +34,8 @@ port:libffi \ port:libgnome-keyring -patchfiles patch-configure.in.diff +patchfiles patch-configure.in.diff \ + patch-libgnomeui-gnome-gconf-ui.c.diff use_autoreconf yes autoreconf.args -fvi @@ -50,7 +51,6 @@ depends_lib-append port:xorg-libsm \ port:xorg-libice \ port:xorg-libX11 - use_autoreconf no configure.args-append --x-includes=${prefix}/include \ --x-libraries=${prefix}/lib configure.args-delete --without-x Added: trunk/dports/gnome/libgnomeui/files/patch-libgnomeui-gnome-gconf-ui.c.diff =================================================================== --- trunk/dports/gnome/libgnomeui/files/patch-libgnomeui-gnome-gconf-ui.c.diff (rev 0) +++ trunk/dports/gnome/libgnomeui/files/patch-libgnomeui-gnome-gconf-ui.c.diff 2014-03-06 21:40:44 UTC (rev 117643) @@ -0,0 +1,46 @@ +--- libgnomeui/gnome-gconf-ui.c.orig 2014-03-06 13:11:45.000000000 -0800 ++++ libgnomeui/gnome-gconf-ui.c 2014-03-06 13:23:51.000000000 -0800 +@@ -168,24 +168,27 @@ + } + + if (have_overridden) { +- fmt = _("The application \"%s\" attempted to change an " +- "aspect of your configuration that your system " +- "administrator or operating system vendor does not " +- "allow you to change. Some of the settings you have " +- "selected may not take effect, or may not be " +- "restored next time you use the application."); ++ dialog = gtk_message_dialog_new (NULL /* parent */, ++ 0 /* flags */, ++ GTK_MESSAGE_ERROR, ++ GTK_BUTTONS_OK, ++ _("The application \"%s\" attempted to change an " ++ "aspect of your configuration that your system " ++ "administrator or operating system vendor does not " ++ "allow you to change. Some of the settings you have " ++ "selected may not take effect, or may not be " ++ "restored next time you use the application."), ++ gnome_program_get_human_readable_name(gnome_program_get())); + } else { +- fmt = _("An error occurred while loading or saving " +- "configuration information for %s. Some of your " +- "configuration settings may not work properly."); ++ dialog = gtk_message_dialog_new (NULL /* parent */, ++ 0 /* flags */, ++ GTK_MESSAGE_ERROR, ++ GTK_BUTTONS_OK, ++ _("An error occurred while loading or saving " ++ "configuration information for %s. Some of your " ++ "configuration settings may not work properly."), ++ gnome_program_get_human_readable_name(gnome_program_get())); + } +- +- dialog = gtk_message_dialog_new (NULL /* parent */, +- 0 /* flags */, +- GTK_MESSAGE_ERROR, +- GTK_BUTTONS_OK, +- fmt, +- gnome_program_get_human_readable_name(gnome_program_get())); + gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK); + g_signal_connect (dialog, "response", + G_CALLBACK (gtk_widget_destroy),

1 0