From patchwork Sun Apr 12 21:01:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Daniel M. Capella" X-Patchwork-Id: 1581 Return-Path: Delivered-To: patchwork@archlinux.org Received: from apollo.archlinux.org (localhost [127.0.0.1]) by apollo.archlinux.org (Postfix) with ESMTP id D11E51829D4B5 for ; Sun, 12 Apr 2020 21:01:50 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on apollo.archlinux.org X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1,DKIM_VALID=-0.1,DKIM_VALID_AU=-0.1, MAILING_LIST_MULTI=-1,RCVD_IN_DNSWL_LOW=-0.7,SPF_HELO_NONE=0.001, T_DMARC_POLICY_NONE=0.01 autolearn=ham autolearn_force=no version=3.4.4 X-Spam-BL-Results: [127.0.9.1] [127.0.0.10, 127.0.0.14] [127.0.0.10] Received: from orion.archlinux.org (orion.archlinux.org [IPv6:2a01:4f8:160:6087::1]) by apollo.archlinux.org (Postfix) with ESMTPS for ; Sun, 12 Apr 2020 21:01:50 +0000 (UTC) Received: from orion.archlinux.org (localhost [127.0.0.1]) by orion.archlinux.org (Postfix) with ESMTP id 828761AEA89AFD; Sun, 12 Apr 2020 21:01:45 +0000 (UTC) Received: from luna.archlinux.org (luna.archlinux.org [5.9.250.164]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: luna) by orion.archlinux.org (Postfix) with ESMTPSA id 631B21AEA89AF8; Sun, 12 Apr 2020 21:01:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=archlinux.org; s=orion; t=1586725305; bh=2FmYwo5KwfsJL/pIC6YIY8hBpwSgRKeyluNY47oD898=; h=From:To:Date:Subject:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:Reply-To; b=gDWUjzaYNd9uwBSlDewPVnzbPqh6VkG93cZp+0QedeNnFRp1b3NwcrtzPDmpMtNlP jjv8rbvAuaBS68vC/byXWoYRGO+vXFR9Hn5SLr4YBZjc3JxzxLATTm15bgpOSsgTW8 kFKHrfe1Rx+KX29gkSfL88z6dUo3TBVV9l0bgQ7ag6K0fiWkwyu3J22MhknARCmJlf 53z5fTix+o0NTYN0s0LTgK8/bRHbducJJJEp5gVxI6/sZAEGT1/BQdB0JBEOcQTXMQ 43FkbLZzVHNK25iNmW79WBMyUJDxZlfjeMbA1VgUkFpFvbnApV+2PZKN7bc3m/jAsz G/eWrMo9eItwAgBxi5B3vH26cyBa+8+46ZB+O8Nqn7Y669u9mz3NRlxJwuA9eTFk0B LIxJcIht/o1RUsl2qDyToQbyz8J3o2AhVB0MGGgsS48avZ5iar+pQx2QZAUfes2Wvu bCOq2Jl/Hckf/reaCqUio/pfGIW9sPdNz+ZvSuP2YsUem2x2VJiqfpnj4my9NHTdzW vvf1/W+BzwSCM9wqJrjWj8KX+8HFJgK8t7Ndxe25DLpA1BiJgMURE1gkfFL6jBWzH+ +m803w2nSRg724ulpnYDfh8G+NLqkLuvN4L5CTKmMaYPg4x2jCs5sYo3nHaPHqHwGS n6Xkng9MRKv1bzzNjHoKvL1Y= Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id 53B112B2A7; Sun, 12 Apr 2020 21:01:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=archlinux.org; s=luna2; t=1586725305; bh=2FmYwo5KwfsJL/pIC6YIY8hBpwSgRKeyluNY47oD898=; h=From:To:Date:Subject:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:Reply-To; b=dRkCuQK44X0ynKrQO0uYW+aBktcfbWPu+xy66fhB4oigx1HuS9K5fTEMXiVrohCjS B1HFjTFKZpMODeCOGGLYl7NrmSWD3ooGR/DrY6wXTC1eW27tXOmnJnA9o7qrgtPsT3 pbVntwpOaf+W7SAporcQhL+JGIQpSKAz8+clLQHyReAq/45e83NwntAifdbweJcOZn 2g/lXjBfcHWwicPwuLVVgATzzbilQxWCrNyNVbJN9BBJ6BwxTFGJbTQAH9EktEahZG Zg2PINzpxKVCLnLZrZe34BkExVlPMmvr74vvMpHpuPfL/ZwZ6Hq+B9lwBIOh8I/DdP 9pTWBBhNDHXEL+It0NFFqYFKxDVWlBJTdh7NU32DqSW0oRmV1smDEH2SE1JtHXSbwP 5Z8hcOxwq6Wz0+QLDIMyPqyC/NPxSoGJZL5QMR2zyuKs9YvPCHnsb1Oq4iL8j88G1z 9+kTRUGsaqXG6TiGWNdMJQK7q7vhUHYha0KPKAaQMjC67D3zRhMGaJg0YeN+8dCcra AwtyKsUx16UC93+ruPUkymK/fKoTUjiRqbHeeNET1BQcCJp7etIIN86iXRTUga84Ix NiPZYAi/rlRZlTtDBi4HlEhRdmsiIUe++68HHlF/mLOQa+J7qekHDwt9KtXup3Gdyh wjTL+ToY2x2xktmwy+bprwxI= Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id 7168A2B2A4 for ; Sun, 12 Apr 2020 21:01:40 +0000 (UTC) Received: from orion.archlinux.org (orion.archlinux.org [IPv6:2a01:4f8:160:6087::1]) by luna.archlinux.org (Postfix) with ESMTPS for ; Sun, 12 Apr 2020 21:01:40 +0000 (UTC) Received: from orion.archlinux.org (localhost [127.0.0.1]) by orion.archlinux.org (Postfix) with ESMTP id 413EE1AEA89AF0 for ; Sun, 12 Apr 2020 21:01:35 +0000 (UTC) Received: from localhost.localdomain (pool-108-46-55-195.nycmny.fios.verizon.net [108.46.55.195]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: polyzen) by orion.archlinux.org (Postfix) with ESMTPSA id CF6341AEA89AEF for ; Sun, 12 Apr 2020 21:01:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=archlinux.org; s=orion; t=1586725295; bh=2FmYwo5KwfsJL/pIC6YIY8hBpwSgRKeyluNY47oD898=; h=From:To:Subject:Date; b=jB5wW74HorER9AoBPqCaE1+0+Th8fs7qs5Oxy3FcMYorkjEAWKfZKEIT/RV3rk3A4 sb4uGEX2yluM61oTMfo7ObIA8Oz/2UEvJ0y6MPmHMlphDbw0HkgG6Dls7ywnXsftkX Thj5y+OKfaJR4adTsKoWZ3Cy6s66viCCs3J+BxYMAjq3ju/3joZuNaG6OCpGD6BE6j VdR7oqD19oAZCBtxZeS+QxE2hjKV8LFPQgppAbdu9WIZh74WtfBQexUl+WwB0v720w YJ3Eu8YWbJLh7fQIo9//SXJWG+TyR8sbRXbTssf6JOJL4sNqq4vqSZIkxZOwH7wXwf 5B3lMtp91BV7zE8EgLJg0DMSRyAm2IWFX3b87XYj5/yyC+Rozgz+wuBqBMuRQBxNgJ DMXN8uoU4AcjpruDrDO/hRIAQwIJ7PkS5M6hCkxDVLRtjWZ9nkDTIlnWtFKQtiBkNa 9iTslbkyHIjwQv6LuYTTgvhsxuvfnIeOFVLNZ+18SPxjshUaOuHAUNdIsxfQ7gSpMY /VY6q5MLzCySEPGSnccMk3xUVCtg79Da/afiy+JFecCaOkSv1DMrYunVwlI3U5/L4u RohpJ6KiVlE024t4ogXx3OD0p1I0r76Rh3P6GlEOC21w7DgVZSqMFU342SpAQlC80s aRH6XFSGFTW0ENIA1SwuFUbY= From: "Daniel M. Capella" To: pacman-dev@lists.archlinux.org Date: Sun, 12 Apr 2020 17:01:29 -0400 Message-Id: <20200412210129.13345-1-polyzen@archlinux.org> X-Mailer: git-send-email 2.26.0 MIME-Version: 1.0 Subject: [pacman-dev] [PATCH] Touch up proto files X-BeenThere: pacman-dev@archlinux.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion list for pacman development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Discussion list for pacman development Errors-To: pacman-dev-bounces@archlinux.org Sender: "pacman-dev" - split: Fix erroneous $pkgname calls to use $pkgbase - VCS: - Add missing fields - Remove unnecessary $srcdir's - Move ./autogen.sh to prepare() - 80 char line length for comments and make license note stand out - Add ./autogen.sh to the other proto's Signed-off-by: Daniel M. Capella --- proto/PKGBUILD-split.proto | 18 ++++++++++-------- proto/PKGBUILD-vcs.proto | 21 +++++++++++++-------- proto/PKGBUILD.proto | 1 + 3 files changed, 24 insertions(+), 16 deletions(-) diff --git a/proto/PKGBUILD-split.proto b/proto/PKGBUILD-split.proto index 9898ef81..6fc91a56 100644 --- a/proto/PKGBUILD-split.proto +++ b/proto/PKGBUILD-split.proto @@ -1,7 +1,8 @@ -# This is an example of a PKGBUILD for splitting packages. Use this as a -# start to creating your own, and remove these comments. For more information, -# see 'man PKGBUILD'. NOTE: Please fill out the license field for your package! -# If it is unknown, then please put 'unknown'. +# This is an example of a PKGBUILD for splitting packages. Use this as a start +# to creating your own, and remove these comments. For more information, see +# 'man PKGBUILD'. +# NOTE: Please fill out the license field for your package! If it is unknown, +# then please put 'unknown'. # Maintainer: Your Name pkgname=('pkg1' 'pkg2') @@ -26,14 +27,15 @@ options=() install= changelog= source=("$pkgbase-$pkgver.tar.gz" - "$pkgname-$pkgver.patch") + "$pkgbase-$pkgver.patch") noextract=() md5sums=() validpgpkeys=() prepare() { - cd "$pkgname-$pkgver" - patch -p1 -i "$srcdir/$pkgname-$pkgver.patch" + cd "$pkgbase-$pkgver" + patch -p1 -i "$srcdir/$pkgbase-$pkgver.patch" + ./autogen.sh } build() { @@ -43,7 +45,7 @@ build() { } check() { - cd "$pkgname-$pkgver" + cd "$pkgbase-$pkgver" make -k check } diff --git a/proto/PKGBUILD-vcs.proto b/proto/PKGBUILD-vcs.proto index ae9956a9..01eddf98 100644 --- a/proto/PKGBUILD-vcs.proto +++ b/proto/PKGBUILD-vcs.proto @@ -1,5 +1,6 @@ -# This is an example PKGBUILD file. Use this as a start to creating your own, -# and remove these comments. For more information, see 'man PKGBUILD'. +# This is an example of a PKGBUILD for VCS packages. Use this as a start to +# creating your own, and remove these comments. For more information, see 'man +# PKGBUILD'. # NOTE: Please fill out the license field for your package! If it is unknown, # then please put 'unknown'. @@ -10,6 +11,7 @@ pkgname=NAME-VCS # '-bzr', '-git', '-hg' or '-svn' pkgver=VERSION pkgrel=1 +epoch= pkgdesc="" arch=() url="" @@ -17,21 +19,24 @@ license=('GPL') groups=() depends=() makedepends=('VCS_PACKAGE') # 'bzr', 'git', 'mercurial' or 'subversion' +checkdepends=() provides=("${pkgname%-VCS}") conflicts=("${pkgname%-VCS}") replaces=() backup=() options=() install= +changelog= source=('FOLDER::VCS+URL#FRAGMENT') noextract=() md5sums=('SKIP') +validpgpkeys=() # Please refer to the 'USING VCS SOURCES' section of the PKGBUILD man page for # a description of each element in the source array. pkgver() { - cd "$srcdir/${pkgname%-VCS}" + cd "${pkgname%-VCS}" # The examples below are not absolute and need to be adapted to each repo. The # primary goal is to generate version numbers that will increase according to @@ -56,23 +61,23 @@ pkgver() { } prepare() { - cd "$srcdir/${pkgname%-VCS}" + cd "${pkgname%-VCS}" patch -p1 -i "$srcdir/${pkgname%-VCS}.patch" + ./autogen.sh } build() { - cd "$srcdir/${pkgname%-VCS}" - ./autogen.sh + cd "${pkgname%-VCS}" ./configure --prefix=/usr make } check() { - cd "$srcdir/${pkgname%-VCS}" + cd "${pkgname%-VCS}" make -k check } package() { - cd "$srcdir/${pkgname%-VCS}" + cd "${pkgname%-VCS}" make DESTDIR="$pkgdir/" install } diff --git a/proto/PKGBUILD.proto b/proto/PKGBUILD.proto index a2c600d5..e72b1aa8 100644 --- a/proto/PKGBUILD.proto +++ b/proto/PKGBUILD.proto @@ -33,6 +33,7 @@ validpgpkeys=() prepare() { cd "$pkgname-$pkgver" patch -p1 -i "$srcdir/$pkgname-$pkgver.patch" + ./autogen.sh } build() {