X-Original-To: alpine-aports@lists.alpinelinux.org Received: from mail.infogroup.kiev.ua (tera.infogroup.kiev.ua [195.144.25.26]) by lists.alpinelinux.org (Postfix) with ESMTP id 84B995C41BC for ; Mon, 23 Jan 2017 13:03:02 +0000 (GMT) Received: from ost.org.ua ([195.144.25.230] helo=alpine.ost.org.ua) by mail.infogroup.kiev.ua with esmtpsa (TLSv1:DHE-RSA-AES256-SHA:256) (Exim 4.80.1) (envelope-from ) id 1cVeGz-0004Qx-QY for alpine-aports@lists.alpinelinux.org; Mon, 23 Jan 2017 15:03:01 +0200 From: Valery Kartel To: alpine-aports@lists.alpinelinux.org Subject: [alpine-aports] [PATCH] main/perl-*: fix -doc, apkbuild cleanups Date: Mon, 23 Jan 2017 15:03:01 +0200 Message-Id: <20170123130301.12835-1-valery.kartel@gmail.com> X-Mailer: git-send-email 2.11.0 Sender: droid@infogroup.kiev.ua X-Mailinglist: alpine-aports Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: perl-carp perl-digest-md5 perl-exporter perl-getopt-long perl-io perl-mime-base64 perl-pathtools (+ add description) perl-scalar-list-utils perl-socket perl-test-harness (+ move script to -utils subpackage) perl-test-simple --- main/perl-carp/APKBUILD | 10 +++++++--- main/perl-digest-md5/APKBUILD | 18 +++++++++++------- main/perl-exporter/APKBUILD | 16 ++++++++++------ main/perl-getopt-long/APKBUILD | 20 ++++++++++++-------- main/perl-io/APKBUILD | 20 ++++++++++++-------- main/perl-mime-base64/APKBUILD | 20 ++++++++++++-------- main/perl-pathtools/APKBUILD | 18 +++++++++++------- main/perl-scalar-list-utils/APKBUILD | 7 ++++++- main/perl-socket/APKBUILD | 20 ++++++++++++-------- main/perl-test-harness/APKBUILD | 33 +++++++++++++++++++++------------ main/perl-test-simple/APKBUILD | 7 ++++++- 11 files changed, 120 insertions(+), 69 deletions(-) diff --git a/main/perl-carp/APKBUILD b/main/perl-carp/APKBUILD index 04b159a7fc..5600548948 100644 --- a/main/perl-carp/APKBUILD +++ b/main/perl-carp/APKBUILD @@ -1,9 +1,9 @@ -# Contributor: +# Contributor: Valery Kartel # Maintainer: Leonardo Arena pkgname=perl-carp _pkgreal=Carp pkgver=1.38 -pkgrel=0 +pkgrel=1 pkgdesc="alternative warn and die for modules" url="http://search.cpan.org/dist/Carp/" arch="noarch" @@ -14,7 +14,6 @@ depends="$cpandepends" makedepends="perl-dev $cpanmakedepends" subpackages="$pkgname-doc" source="http://search.cpan.org/CPAN/authors/id/R/RJ/RJBS/$_pkgreal-$pkgver.tar.gz" - builddir="$srcdir/$_pkgreal-$pkgver" prepare() { @@ -35,6 +34,11 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } +doc() { + default_doc + replaces="perl-doc" +} + md5sums="93ac4c56312a9db6cef3b502a8169859 Carp-1.38.tar.gz" sha256sums="a5a9ce3cbb959dfefa8c2dd16552567199b286d39b0e55053ca247c038977101 Carp-1.38.tar.gz" sha512sums="da59e6df490599ee8a83b18c9767438d29b18e4fdd291f2a432be6e7610bf312ddb40f1f2d6892787720ae0133e2b50c47d1fde122094e69114165ebd5b98920 Carp-1.38.tar.gz" diff --git a/main/perl-digest-md5/APKBUILD b/main/perl-digest-md5/APKBUILD index 38292075e7..3f599319fa 100644 --- a/main/perl-digest-md5/APKBUILD +++ b/main/perl-digest-md5/APKBUILD @@ -1,10 +1,10 @@ # Automatically generated by apkbuild-cpan, template 1 -# Contributor: +# Contributor: Valery Kartel # Maintainer: Leonardo Arena pkgname=perl-digest-md5 _pkgreal=Digest-MD5 pkgver=2.55 -pkgrel=0 +pkgrel=1 pkgdesc="Perl interface to the MD-5 algorithm" url="http://search.cpan.org/dist/Digest-MD5/" arch="all" @@ -15,27 +15,31 @@ depends="$cpandepends" makedepends="perl-dev $cpanmakedepends" subpackages="$pkgname-doc" source="http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/$_pkgreal-$pkgver.tar.gz" - -_builddir="$srcdir/$_pkgreal-$pkgver" +builddir="$srcdir/$_pkgreal-$pkgver" prepare() { - cd "$_builddir" + cd "$builddir" export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'` PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor } build() { - cd "$_builddir" + cd "$builddir" export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'` make && make test } package() { - cd "$_builddir" + cd "$builddir" make DESTDIR="$pkgdir" install || return 1 find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } +doc() { + default_doc + replaces="perl-doc" +} + md5sums="601519b826ca14c233f13a4578b967ef Digest-MD5-2.55.tar.gz" sha256sums="03b198a2d14425d951e5e50a885d3818c3162c8fe4c21e18d7798a9a179d0e3c Digest-MD5-2.55.tar.gz" sha512sums="e921fe802566047479d4f33e65cdda0c316e0de06b316845bb48feaefdf5d0c602e330d42335f2cbe34d5b076aa0da2ed6daa7f998e9fda09cf9d66fb3c66811 Digest-MD5-2.55.tar.gz" diff --git a/main/perl-exporter/APKBUILD b/main/perl-exporter/APKBUILD index 717cb13528..94d582776e 100644 --- a/main/perl-exporter/APKBUILD +++ b/main/perl-exporter/APKBUILD @@ -4,7 +4,7 @@ pkgname=perl-exporter _pkgreal=Exporter pkgver=5.72 -pkgrel=0 +pkgrel=1 pkgdesc="Implements default import method for modules" url="http://search.cpan.org/dist/Exporter/" arch="noarch" @@ -15,27 +15,31 @@ depends="$cpandepends" makedepends="perl-dev $cpanmakedepends" subpackages="$pkgname-doc" source="http://search.cpan.org/CPAN/authors/id/T/TO/TODDR/$_pkgreal-$pkgver.tar.gz" - -_builddir="$srcdir/$_pkgreal-$pkgver" +builddir="$srcdir/$_pkgreal-$pkgver" prepare() { - cd "$_builddir" + cd "$builddir" export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'` PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor } build() { - cd "$_builddir" + cd "$builddir" export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'` make && make test } package() { - cd "$_builddir" + cd "$builddir" make DESTDIR="$pkgdir" install || return 1 find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } +doc() { + default_doc + replaces="perl-doc" +} + md5sums="096f0692cbe46a3407a534a0d10970ca Exporter-5.72.tar.gz" sha256sums="cd13b7a0e91e8505a0ce4b25f40fab2c92bb28a99ef0d03da1001d95a32f0291 Exporter-5.72.tar.gz" sha512sums="ba3c3e4703c993a3bd9a73c7afd3f9ee38bf6997800fe0804c0ed645d15996a7d8fb3f46a15484c75272586bbf2cb879e2a036bf73e98bc01be5c5a23e0bf080 Exporter-5.72.tar.gz" diff --git a/main/perl-getopt-long/APKBUILD b/main/perl-getopt-long/APKBUILD index ea28618f98..b2c27e5f94 100644 --- a/main/perl-getopt-long/APKBUILD +++ b/main/perl-getopt-long/APKBUILD @@ -4,7 +4,7 @@ pkgname=perl-getopt-long _pkgreal=Getopt-Long pkgver=2.49.1 -pkgrel=0 +pkgrel=1 pkgdesc="Module to handle parsing command line options" url="http://search.cpan.org/dist/Getopt-Long/" arch="noarch" @@ -15,27 +15,31 @@ depends="$cpandepends" makedepends="perl-dev $cpanmakedepends" subpackages="$pkgname-doc" source="http://search.cpan.org/CPAN/authors/id/J/JV/JV/$_pkgreal-$pkgver.tar.gz" - -_builddir="$srcdir/$_pkgreal-$pkgver" +builddir="$srcdir/$_pkgreal-$pkgver" prepare() { - cd "$_builddir" - export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'` + cd "$builddir" + export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}') PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor } build() { - cd "$_builddir" - export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'` + cd "$builddir" + export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}') make && make test } package() { - cd "$_builddir" + cd "$builddir" make DESTDIR="$pkgdir" install || return 1 find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } +doc() { + default_doc + replaces="perl-doc" +} + md5sums="bb7c92be20117be5d5043b07b6fd20a1 Getopt-Long-2.49.1.tar.gz" sha256sums="98fad4235509aa24608d9ef895b5c60fe2acd2bca70ebdf1acaf6824e17a882f Getopt-Long-2.49.1.tar.gz" sha512sums="3a28eabdc8847e10d82b20f12f59f3797d73ea15245aeaacd678f0b1111ddc024e91c9ca0cf3897116533fb35dc4592e029444dee931844ddbadf90cda375200 Getopt-Long-2.49.1.tar.gz" diff --git a/main/perl-io/APKBUILD b/main/perl-io/APKBUILD index 7c1202cfbb..f4ba2bda5c 100644 --- a/main/perl-io/APKBUILD +++ b/main/perl-io/APKBUILD @@ -4,7 +4,7 @@ pkgname=perl-io _pkgreal=IO pkgver=1.25 -pkgrel=2 +pkgrel=3 pkgdesc="Perl core IO modules" url="http://search.cpan.org/dist/IO/" arch="all" @@ -15,28 +15,32 @@ depends="$cpandepends" makedepends="perl-dev $cpanmakedepends" subpackages="$pkgname-doc" source="http://search.cpan.org/CPAN/authors/id/G/GB/GBARR/$_pkgreal-$pkgver.tar.gz" - -_builddir="$srcdir/$_pkgreal-$pkgver" +builddir="$srcdir/$_pkgreal-$pkgver" prepare() { - cd "$_builddir" - export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'` + cd "$builddir" + export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}') PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor } build() { - cd "$_builddir" - export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'` + cd "$builddir" + export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}') # FIXME: it fails a test due to deprecated code make # && make test } package() { - cd "$_builddir" + cd "$builddir" make DESTDIR="$pkgdir" install || return 1 find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } +doc() { + default_doc + replaces="perl-doc" +} + md5sums="b88aaf2bb7437725b11e9eb48dfb6c93 IO-1.25.tar.gz" sha256sums="89790db8b9281235dc995c1a85d532042ff68a90e1504abd39d463f05623e7b5 IO-1.25.tar.gz" sha512sums="eb922dc89f3dd5996b3abd5e5ffc17b581f7b40b9128461da5d2f97466606a2775e44cb1a707673a4e9fbcda69318d462e1d6ad44c26c9378c2a5b49fb8c06e2 IO-1.25.tar.gz" diff --git a/main/perl-mime-base64/APKBUILD b/main/perl-mime-base64/APKBUILD index 927459c6c6..226d4e3882 100644 --- a/main/perl-mime-base64/APKBUILD +++ b/main/perl-mime-base64/APKBUILD @@ -4,7 +4,7 @@ pkgname=perl-mime-base64 _pkgreal=MIME-Base64 pkgver=3.15 -pkgrel=2 +pkgrel=3 pkgdesc="The RFC 2045 encodings; base64 and quoted-printable" url="http://search.cpan.org/dist/MIME-Base64/" arch="all" @@ -15,27 +15,31 @@ depends="$cpandepends" makedepends="perl-dev $cpanmakedepends" subpackages="$pkgname-doc" source="http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/$_pkgreal-$pkgver.tar.gz" - -_builddir="$srcdir/$_pkgreal-$pkgver" +builddir="$srcdir/$_pkgreal-$pkgver" prepare() { - cd "$_builddir" - export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'` + cd "$builddir" + export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}') PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor } build() { - cd "$_builddir" - export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'` + cd "$builddir" + export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}') make && make test } package() { - cd "$_builddir" + cd "$builddir" make DESTDIR="$pkgdir" install || return 1 find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } +doc() { + default_doc + replaces="perl-doc" +} + md5sums="ef958dc2bf96be5f759391c6ac1debd4 MIME-Base64-3.15.tar.gz" sha256sums="7f863566a6a9cb93eda93beadb77d9aa04b9304d769cea3bb921b9a91b3a1eb9 MIME-Base64-3.15.tar.gz" sha512sums="2f1ce99f755d7ae25f6b1907e043c16f72799e0cc9aa8b5efe8bb1f0542fc6f39bff691b2477e18136d06dfb38f6a844c76018a7fa4e60591ebf0e60cfea55d4 MIME-Base64-3.15.tar.gz" diff --git a/main/perl-pathtools/APKBUILD b/main/perl-pathtools/APKBUILD index 13cabce487..5c1d2e0f1f 100644 --- a/main/perl-pathtools/APKBUILD +++ b/main/perl-pathtools/APKBUILD @@ -4,8 +4,8 @@ pkgname=perl-pathtools _pkgreal=PathTools pkgver=3.62 -pkgrel=1 -pkgdesc="unknown" +pkgrel=2 +pkgdesc="The combined distribution for the File::Spec and Cwd modules" url="http://search.cpan.org/dist/PathTools/" arch="all" license="GPL PerlArtistic" @@ -15,25 +15,29 @@ depends="$cpandepends" makedepends="perl-dev $cpanmakedepends" subpackages="$pkgname-doc" source="http://search.cpan.org/CPAN/authors/id/R/RJ/RJBS/$_pkgreal-$pkgver.tar.gz" - -_builddir="$srcdir/$_pkgreal-$pkgver" +builddir="$srcdir/$_pkgreal-$pkgver" prepare() { - cd "$_builddir" + cd "$builddir" PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor } build() { - cd "$_builddir" + cd "$builddir" make && make test } package() { - cd "$_builddir" + cd "$builddir" make DESTDIR="$pkgdir" install || return 1 find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } +doc() { + default_doc + replaces="perl-doc" +} + md5sums="bfe148a89064078cf162504c30a4c41a PathTools-3.62.tar.gz" sha256sums="36350e12f58871437ba03391f80a506e447e3c6630cc37d0625bc25ff1c7b4d2 PathTools-3.62.tar.gz" sha512sums="c2c39bf57286d11131d027d97e4486698a4ffbb917a8b0fd7466a8c469c009fee1f70bfe4f51d5b6feef4d57de0c9be3145aa3a35625a5f26bbe7788c0ba66aa PathTools-3.62.tar.gz" diff --git a/main/perl-scalar-list-utils/APKBUILD b/main/perl-scalar-list-utils/APKBUILD index 30d302ae38..daaaff5efb 100644 --- a/main/perl-scalar-list-utils/APKBUILD +++ b/main/perl-scalar-list-utils/APKBUILD @@ -4,7 +4,7 @@ pkgname=perl-scalar-list-utils _pkgreal=Scalar-List-Utils pkgver=1.47 -pkgrel=0 +pkgrel=1 pkgdesc="Common Scalar and List utility subroutines" url="http://search.cpan.org/dist/Scalar-List-Utils/" arch="all" @@ -37,6 +37,11 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } +doc() { + default_doc + replaces="perl-doc" +} + md5sums="caf338334a64cd23ade695ba1561252c Scalar-List-Utils-1.47.tar.gz" sha256sums="c483347372a96972d61fd186522a9dafc2da899ef2951964513b7e8efb37efe1 Scalar-List-Utils-1.47.tar.gz" sha512sums="526d248a794bede2b9bda8cff73a10a116b16578fd646db69c88456aa432d84ced33e5024e632331a992412d0c05fed19846873554a731bbd1eaa3d9e6124c38 Scalar-List-Utils-1.47.tar.gz" diff --git a/main/perl-socket/APKBUILD b/main/perl-socket/APKBUILD index 258bd4bd30..2a63ce6235 100644 --- a/main/perl-socket/APKBUILD +++ b/main/perl-socket/APKBUILD @@ -3,7 +3,7 @@ pkgname=perl-socket _pkgreal=Socket pkgver=2.024 -pkgrel=0 +pkgrel=1 pkgdesc="networking constants and support functions" url="http://search.cpan.org/dist/Socket/" arch="all" @@ -14,28 +14,32 @@ depends="$cpandepends" makedepends="perl-dev $cpanmakedepends" subpackages="$pkgname-doc" source="http://search.cpan.org/CPAN/authors/id/P/PE/PEVANS/$_pkgreal-$pkgver.tar.gz" - -_builddir="$srcdir/$_pkgreal-$pkgver" +builddir="$srcdir/$_pkgreal-$pkgver" prepare() { - cd "$_builddir" - export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'` + cd "$builddir" + export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}') PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor } build() { - cd "$_builddir" - export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'` + cd "$builddir" + export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}') #FIXME: fail make #&& make test } package() { - cd "$_builddir" + cd "$builddir" make DESTDIR="$pkgdir" install || return 1 find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } +doc() { + default_doc + replaces="perl-doc" +} + md5sums="63e3c6a92e9d21ecb2d0f105a2f6be5a Socket-2.024.tar.gz" sha256sums="38d58dcd84ca480615ba5f45a82b97b3c4cc3b7e7b27323e68adbe6daf455e12 Socket-2.024.tar.gz" sha512sums="8a7b3a851e81459ca32382eecf517d456c7355998b9be7f15f753ce4b7c7d0fa9e95078d9ecb2beb074434ba674ef0014ec43380dbcc7c257b841a1ee20f0743 Socket-2.024.tar.gz" diff --git a/main/perl-test-harness/APKBUILD b/main/perl-test-harness/APKBUILD index 2cbdce6775..6a7928477f 100644 --- a/main/perl-test-harness/APKBUILD +++ b/main/perl-test-harness/APKBUILD @@ -4,7 +4,7 @@ pkgname=perl-test-harness _pkgreal=Test-Harness pkgver=3.36 -pkgrel=0 +pkgrel=1 pkgdesc="Run Perl standard test scripts with statistics" url="http://search.cpan.org/dist/Test-Harness/" arch="noarch" @@ -13,31 +13,40 @@ cpandepends="" cpanmakedepends=" " depends="$cpandepends" makedepends="perl-dev $cpanmakedepends" -subpackages="$pkgname-doc" +subpackages="$pkgname-doc $pkgname-utils" source="http://search.cpan.org/CPAN/authors/id/L/LE/LEONT/$_pkgreal-$pkgver.tar.gz" - -_builddir="$srcdir/$_pkgreal-$pkgver" +builddir="$srcdir/$_pkgreal-$pkgver" prepare() { - cd "$_builddir" - export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'` + cd "$builddir" + export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}') PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor } build() { - cd "$_builddir" - export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'` + cd "$builddir" + export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}') make && make test } package() { - cd "$_builddir" - make DESTDIR="$pkgdir" pure_install || return 1 - #conflicts with perl main package - mv "$pkgdir"/usr/bin/prove "$pkgdir"/usr/bin/prove-$_pkgreal || return 1 + cd "$builddir" + make DESTDIR="$pkgdir" install || return 1 find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } +utils() { + pkgdesc="$pkgdesc (utilities)" + replaces="perl-utils" + mkdir -p "$subpkgdir"/usr || return 1 + mv "$pkgdir"/usr/bin "$subpkgdir"/usr/ +} + +doc() { + default_doc + replaces="perl-doc" +} + md5sums="4c8d9c77e8e06ca96c7383c05c8f3616 Test-Harness-3.36.tar.gz" sha256sums="e7566f13b041d028b56f184b77ec2545ec6f0bb5a0f8f5368f7e4a08b496b63e Test-Harness-3.36.tar.gz" sha512sums="77815ac1a5fda1b8089b2efafeca956087154ec30e9b1494333d55570709e0efcffe3d7281b7716d655eb692ff5aedf81e3acf6d13f1b9f58e728a0c63a0e99a Test-Harness-3.36.tar.gz" diff --git a/main/perl-test-simple/APKBUILD b/main/perl-test-simple/APKBUILD index 4c8f4d4f31..1b644e1d28 100644 --- a/main/perl-test-simple/APKBUILD +++ b/main/perl-test-simple/APKBUILD @@ -4,7 +4,7 @@ pkgname=perl-test-simple _pkgreal=Test-Simple pkgver=1.302075 -pkgrel=0 +pkgrel=1 pkgdesc="Basic utilities for writing tests." url="http://search.cpan.org/dist/Test-Simple/" arch="noarch" @@ -38,6 +38,11 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } +doc() { + default_doc + replaces="perl-doc" +} + md5sums="2e7d9553c1877a5ad1fd3e723e3a1599 Test-Simple-1.302075.tar.gz" sha256sums="86f2205498f96302e00331ac586bf366547e946e8637ad208d6317a2097d40b7 Test-Simple-1.302075.tar.gz" sha512sums="ebd6fe42458b4608f8f54bf35f062dbb767bc48659e262a794f8383de206b28c7e5acbc9418301dc0f5ca0a43602c17caa49be1a8a8ce2ad0fc836e31ca32239 Test-Simple-1.302075.tar.gz" -- 2.11.0 --- Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---