CVS commit: pkgsrc/devel/php-libawl

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Wed Jun 22 10:19:51 UTC 2022

Modified Files:
        pkgsrc/devel/php-libawl: Makefile distinfo

Log Message:
php-libawl: Attempt to fix GITLAB_* misuse.


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 pkgsrc/devel/php-libawl/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/devel/php-libawl/distinfo

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/php-libawl/Makefile
diff -u pkgsrc/devel/php-libawl/Makefile:1.17 pkgsrc/devel/php-libawl/Makefile:1.18
--- pkgsrc/devel/php-libawl/Makefile:1.17       Fri May 10 12:26:34 2019
+++ pkgsrc/devel/php-libawl/Makefile    Wed Jun 22 10:19:50 2022
@@ -1,16 +1,24 @@
-# $NetBSD: Makefile,v 1.17 2019/05/10 12:26:34 hauke Exp $
+# $NetBSD: Makefile,v 1.18 2022/06/22 10:19:50 nia Exp $
 #
 
+LIBAWL_VERSION=        0.60
 DISTNAME=      libawl-${LIBAWL_VERSION}
 PKGNAME=       ${PHP_PKG_PREFIX}-${DISTNAME}
+PKGREVISION=   1
 CATEGORIES=    devel
-MASTER_SITES=  -https://gitlab.com/davical-project/awl/repository/archive.tar.gz?ref=${GITLAB_TAG}
+MASTER_SITES=  ${MASTER_SITE_GITLAB:=davical-project/}
+# Remove DIST_SUBDIR with next update!
+DIST_SUBDIR=   awl-r${LIBAWL_VERSION}
+GITLAB_PROJECT=        awl
+GITLAB_TAG=    r${LIBAWL_VERSION}
 
 MAINTAINER=    jym%NetBSD.org@localhost
 HOMEPAGE=      https://gitlab.com/davical-project/awl
 COMMENT=       PHP Andrew's Web Libraries
 LICENSE=       gnu-gpl-v2
 
+WRKSRC=                ${WRKDIR}/awl-${GITLAB_TAG}
+
 USE_TOOLS+=    gmake
 
 .include "../../lang/php/phpversion.mk"
@@ -20,13 +28,6 @@ DEPENDS+=    ${PHP_PKG_PREFIX}-gettext-[0-9
 
 INSTALLATION_DIRS=     ${LIBAWLDIR} ${LIBAWLDIR}/inc ${LIBAWLDIR}/dba
 
-LIBAWL_VERSION=        0.60
-GITLAB_TAG=    r${LIBAWL_VERSION}
-GITLAB_REV=    3efb13de38ea4c1cc298f206199848467af18456
-
-pre-patch:
-       ${MV} ${WRKDIR}/awl-${GITLAB_TAG}-${GITLAB_REV} ${WRKSRC}
-
 do-install:
        cd ${WRKSRC}/dba;                                       \
        for f in *; do                                          \

Index: pkgsrc/devel/php-libawl/distinfo
diff -u pkgsrc/devel/php-libawl/distinfo:1.16 pkgsrc/devel/php-libawl/distinfo:1.17
--- pkgsrc/devel/php-libawl/distinfo:1.16       Tue Oct 26 10:18:01 2021
+++ pkgsrc/devel/php-libawl/distinfo    Wed Jun 22 10:19:50 2022
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.16 2021/10/26 10:18:01 nia Exp $
+$NetBSD: distinfo,v 1.17 2022/06/22 10:19:50 nia Exp $
 
-BLAKE2s (libawl-0.60.tar.gz) = de3e1764ff840c65b41569d9b4b5003c86484106f9da0017f130a29f214e1346
-SHA512 (libawl-0.60.tar.gz) = f8f6e185dd885d07427a381032a69c87da5c26369913ff4ddde991391b50aab2a84a79f8641af44df597f34912cd9ed3db49e72acc72200db7bafe71fdbba5a3
-Size (libawl-0.60.tar.gz) = 601282 bytes
+BLAKE2s (awl-r0.60/libawl-0.60.tar.gz) = 51658386243710000c62cb274e0af25b71435c8d7178fb60bbec608897ed334c
+SHA512 (awl-r0.60/libawl-0.60.tar.gz) = 214a17aa4a03929bf12fb4d5ede3394f02740e98047175e82b1bcc8c7ed1976e2f77169bb18a81028c902359ad276ae76fff6647ef56c92dbe2a7e087f4d0493
+Size (awl-r0.60/libawl-0.60.tar.gz) = 601575 bytes
 SHA1 (patch-Makefile) = 5781f80363a91549ad8e8aaba2640d5bb960012e