CVS commit: pkgsrc/www/serf

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Jun  7 18:26:06 UTC 2023

Modified Files:
        pkgsrc/www/serf: Makefile options.mk

Log Message:
serf: switch to devel/scons4


To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 pkgsrc/www/serf/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/www/serf/options.mk

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

Modified files:

Index: pkgsrc/www/serf/Makefile
diff -u pkgsrc/www/serf/Makefile:1.42 pkgsrc/www/serf/Makefile:1.43
--- pkgsrc/www/serf/Makefile:1.42       Tue Jun  6 10:55:13 2023
+++ pkgsrc/www/serf/Makefile    Wed Jun  7 18:26:05 2023
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.42 2023/06/06 10:55:13 wiz Exp $
+# $NetBSD: Makefile,v 1.43 2023/06/07 18:26:05 wiz Exp $
 
 DISTNAME=      serf-1.3.10
+PKGREVISION=   1
 CATEGORIES=    www
 MASTER_SITES=  https://www.apache.org/dist/serf/
 EXTRACT_SUFX=  .tar.bz2
@@ -10,33 +11,26 @@ HOMEPAGE=   https://serf.apache.org/
 COMMENT=       High-performance asynchronous HTTP client library
 LICENSE=       apache-2.0
 
-SCONS_ARGS+=           APR=${PREFIX}/bin/apr-1-config
-SCONS_ARGS+=           APU=${PREFIX}/bin/apu-1-config
-SCONS_ARGS+=           CC=${CC:Q}
-SCONS_ARGS+=           CFLAGS=${CFLAGS:Q}
-SCONS_ARGS+=           LDFLAGS=${LDFLAGS:Q}
-SCONS_ARGS+=           LINKFLAGS=${LDFLAGS:Q}
-SCONS_ARGS+=           OPENSSL=${PREFIX}/lib
-SCONS_ARGS+=           --install-sandbox=${DESTDIR}
+SCONS_BUILD_ARGS+=     APR=${PREFIX}/bin/apr-1-config
+SCONS_BUILD_ARGS+=     APU=${PREFIX}/bin/apu-1-config
+SCONS_BUILD_ARGS+=     CC=${CC:Q}
+SCONS_BUILD_ARGS+=     CFLAGS=${CFLAGS:Q}
+SCONS_BUILD_ARGS+=     LDFLAGS=${LDFLAGS:Q}
+SCONS_BUILD_ARGS+=     LINKFLAGS=${LDFLAGS:Q}
+SCONS_BUILD_ARGS+=     OPENSSL=${PREFIX}/lib
+SCONS_INSTALL_ARGS+=   --install-sandbox=${DESTDIR}
 
 .include "options.mk"
 
 CFLAGS.SunOS+=         -D__EXTENSIONS__
 
 # Upstream distfile incorrectly has world-writable files.
-post-extract:
-       ${CHMOD} -R go-w ${WRKSRC}
-
-do-build:
-       cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${SCONSBIN} PREFIX=${PREFIX} ${SCONS_ARGS}
-
-do-install:
-       cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${SCONSBIN} PREFIX=${PREFIX} ${SCONS_ARGS} install
+#post-extract:
+#      ${CHMOD} -R go-w ${WRKSRC}
 
 .include "../../devel/apr/buildlink3.mk"
 .include "../../devel/apr-util/buildlink3.mk"
-PYTHON_FOR_BUILD_ONLY?=        yes
-.include "../../devel/scons/buildlink3.mk"
+.include "../../devel/scons4/build.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/www/serf/options.mk
diff -u pkgsrc/www/serf/options.mk:1.1 pkgsrc/www/serf/options.mk:1.2
--- pkgsrc/www/serf/options.mk:1.1      Thu Jan 29 10:29:13 2015
+++ pkgsrc/www/serf/options.mk  Wed Jun  7 18:26:05 2023
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2015/01/29 10:29:13 wiz Exp $
+# $NetBSD: options.mk,v 1.2 2023/06/07 18:26:05 wiz Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.serf
 PKG_SUPPORTED_OPTIONS= gssapi
@@ -8,5 +8,5 @@ PKG_SUGGESTED_OPTIONS=  gssapi
 
 .if !empty(PKG_OPTIONS:Mgssapi)
 .include "../../mk/krb5.buildlink3.mk"
-SCONS_ARGS+=           GSSAPI=${KRB5_CONFIG:Q}
+SCONS_BUILD_ARGS+=     GSSAPI=${KRB5_CONFIG:Q}
 .endif