commit 35f25a8391e3e74906719eef713e3c0ff815ac28 Author: Fredrik Rinnestam <fredrik@crux.nu> Date: Wed Oct 11 01:05:23 2017 +0200 intltool: new maintainer. fixed perl warnings diff --git a/intltool/.md5sum b/intltool/.md5sum index 147eda462..49bd4de26 100644 --- a/intltool/.md5sum +++ b/intltool/.md5sum @@ -1 +1,2 @@ 12e517cac2b57a0121cda351570f1e63 intltool-0.51.0.tar.gz +4ec4b1ecccf34e255ea895b08ff34686 intltool-perl-5.22.patch diff --git a/intltool/.signature b/intltool/.signature index e0f52f34d..2d2b4a742 100644 --- a/intltool/.signature +++ b/intltool/.signature @@ -1,5 +1,6 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/QD7mvpKpL4Do+6v+sgmEWP0w0n4ULA9n88LST75JFvJippROwEwaWkucRbwGjiDwKxyLhZst3udp6E8Lptjbg0= -SHA256 (Pkgfile) = 63608b3806360561c1063ea36080695a095cd4ac05cdfd1da3ba465d69e52243 +RWSE3ohX2g5d/YotTUhpHSFrc14mXmRL/PJulocLEZi7bKr7IB96lMoDI99i8NktmQD6mV25Ju1Ta0eFAQd84Gcneb8/r7EJjgg= +SHA256 (Pkgfile) = f4590ed166a2f4208ea64a3b07a9d3d63e89f0e70483396d764ae3b932572a40 SHA256 (.footprint) = 647b419419a77beccead82fba60683ba623ed23dd16e2bdf2541e12c54546924 SHA256 (intltool-0.51.0.tar.gz) = 67c74d94196b153b774ab9f89b2fa6c6ba79352407037c8c14d5aeb334e959cd +SHA256 (intltool-perl-5.22.patch) = ca9d6562f29f06c64150f50369a24402b7aa01a3a0dc73dce55106f3224330a1 diff --git a/intltool/Pkgfile b/intltool/Pkgfile index f93b1bafb..4c0a045f0 100644 --- a/intltool/Pkgfile +++ b/intltool/Pkgfile @@ -1,17 +1,18 @@ # Description: Internationalization tool collection. -# URL: http://freshmeat.net/projects/intltool/ -# Maintainer: Jose V Beneyto, sepen at crux dot nu +# URL: https://freedesktop.org/wiki/Software/intltool/ +# Maintainer: CRUX System Team, core-ports at crux dot nu # Depends on: p5-xml-parser name=intltool version=0.51.0 -release=1 -source=(http://edge.launchpad.net/$name/trunk/$version/+download/$name-$version.tar....) +release=2 +source=(http://edge.launchpad.net/$name/trunk/$version/+download/$name-$version.tar.... \ + intltool-perl-5.22.patch) build() { cd $name-$version - + patch -p0 -i $SRC/intltool-perl-5.22.patch ./configure --prefix=/usr make diff --git a/intltool/intltool-perl-5.22.patch b/intltool/intltool-perl-5.22.patch new file mode 100644 index 000000000..41a257178 --- /dev/null +++ b/intltool/intltool-perl-5.22.patch @@ -0,0 +1,43 @@ +--- intltool-update.in 2015-03-09 02:39:54.000000000 +0100 ++++ intltool-update.in 2015-09-01 11:43:40.595517191 +0200 +@@ -1062,7 +1062,7 @@ + } + } + +- if ($str =~ /^(.*)\${?([A-Z_]+)}?(.*)$/) ++ if ($str =~ /^(.*)\$\{?([A-Z_]+)}?(.*)$/) + { + my $rest = $3; + my $untouched = $1; +@@ -1190,10 +1190,10 @@ + $name =~ s/\(+$//g; + $version =~ s/\(+$//g; + +- $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\${?AC_PACKAGE_NAME}?/); +- $varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/); +- $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\${?AC_PACKAGE_VERSION}?/); +- $varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/); ++ $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\$\{?AC_PACKAGE_NAME}?/); ++ $varhash{"PACKAGE"} = $name if (not $name =~ /\$\{?PACKAGE}?/); ++ $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\$\{?AC_PACKAGE_VERSION}?/); ++ $varhash{"VERSION"} = $version if (not $name =~ /\$\{?VERSION}?/); + } + + if ($conf_source =~ /^AC_INIT\(([^,\)]+),([^,\)]+)[,]?([^,\)]+)?/m) +@@ -1219,11 +1219,11 @@ + $version =~ s/\(+$//g; + $bugurl =~ s/\(+$//g if (defined $bugurl); + +- $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\${?AC_PACKAGE_NAME}?/); +- $varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/); +- $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\${?AC_PACKAGE_VERSION}?/); +- $varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/); +- $varhash{"PACKAGE_BUGREPORT"} = $bugurl if (defined $bugurl and not $bugurl =~ /\${?\w+}?/); ++ $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\$\{?AC_PACKAGE_NAME}?/); ++ $varhash{"PACKAGE"} = $name if (not $name =~ /\$\{?PACKAGE}?/); ++ $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\$\{?AC_PACKAGE_VERSION}?/); ++ $varhash{"VERSION"} = $version if (not $name =~ /\$\{?VERSION}?/); ++ $varhash{"PACKAGE_BUGREPORT"} = $bugurl if (defined $bugurl and not $bugurl =~ /\$\{?\w+}?/); + } + + # \s makes this not work, why?