CVS commit: pkgsrc/www/analog

["David H. Gutteridge" <gutteridge%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gutteridge
Date:           Thu Jan  4 00:07:04 UTC 2024

Modified Files:
        pkgsrc/www/analog: Makefile distinfo
        pkgsrc/www/analog/patches: patch-aa

Log Message:
analog: fix packaging so $VARBASE is respected


To generate a diff of this commit:
cvs rdiff -u -r1.65 -r1.66 pkgsrc/www/analog/Makefile
cvs rdiff -u -r1.27 -r1.28 pkgsrc/www/analog/distinfo
cvs rdiff -u -r1.25 -r1.26 pkgsrc/www/analog/patches/patch-aa

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

Modified files:

Index: pkgsrc/www/analog/Makefile
diff -u pkgsrc/www/analog/Makefile:1.65 pkgsrc/www/analog/Makefile:1.66
--- pkgsrc/www/analog/Makefile:1.65     Fri Dec 29 01:16:27 2023
+++ pkgsrc/www/analog/Makefile  Thu Jan  4 00:07:04 2024
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.65 2023/12/29 01:16:27 jklos Exp $
+# $NetBSD: Makefile,v 1.66 2024/01/04 00:07:04 gutteridge Exp $
 
 DISTNAME=      analog-6.0
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    www
 MASTER_SITES=  ${HOMEPAGE}
 
@@ -11,7 +11,8 @@ COMMENT=      Extremely fast program for anal
 
 WRKSRC=                ${WRKDISTDIR}/src
 BUILD_TARGET=  analog
-MAKE_ENV+=     PREFIX=${PREFIX:Q} SYSCONFDIR=${PKG_SYSCONFDIR:Q}
+BUILD_DEFS+=   VARBASE
+MAKE_ENV+=     PREFIX=${PREFIX:Q} SYSCONFDIR=${PKG_SYSCONFDIR:Q} VARBASE=${VARBASE:Q}
 WRKDISTDIR=    ${WRKDIR}/${DISTNAME}
 
 EGDIR=         ${PREFIX}/share/examples

Index: pkgsrc/www/analog/distinfo
diff -u pkgsrc/www/analog/distinfo:1.27 pkgsrc/www/analog/distinfo:1.28
--- pkgsrc/www/analog/distinfo:1.27     Tue Oct 26 11:29:17 2021
+++ pkgsrc/www/analog/distinfo  Thu Jan  4 00:07:04 2024
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.27 2021/10/26 11:29:17 nia Exp $
+$NetBSD: distinfo,v 1.28 2024/01/04 00:07:04 gutteridge Exp $
 
 BLAKE2s (analog-6.0.tar.gz) = c38c333c8978c42d7df57f500c1ca29a002d44168eefa5bd67d2a49a1859bf04
 SHA512 (analog-6.0.tar.gz) = 42b766d45f86a32d2e97cc2be35ebb5f4e0ffc2fb72d48196939027ea1ed3398a8cc0a43c47868f542bfb464199ab35bd93fa2ba5e37c4fc83ff15cfe19b9c60
 Size (analog-6.0.tar.gz) = 1553316 bytes
-SHA1 (patch-aa) = dc65dc097131572251f6e1490e3336c21ee53ee7
+SHA1 (patch-aa) = c881274455c38099e769d90c8ca2664da679d128
 SHA1 (patch-ab) = e59f91bedf08f4ece6b36ee06bc8d7d7742948c4
 SHA1 (patch-ac) = 389f46758838c353e38f68f44d24330bef473278

Index: pkgsrc/www/analog/patches/patch-aa
diff -u pkgsrc/www/analog/patches/patch-aa:1.25 pkgsrc/www/analog/patches/patch-aa:1.26
--- pkgsrc/www/analog/patches/patch-aa:1.25     Thu Aug 25 10:09:48 2005
+++ pkgsrc/www/analog/patches/patch-aa  Thu Jan  4 00:07:04 2024
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.25 2005/08/25 10:09:48 grant Exp $
+$NetBSD: patch-aa,v 1.26 2024/01/04 00:07:04 gutteridge Exp $
 
 --- Makefile.orig      2004-12-20 00:51:30.000000000 +1100
 +++ Makefile
@@ -23,7 +23,7 @@ $NetBSD: patch-aa,v 1.25 2005/08/25 10:0
 +      -DDEFAULTCONFIGFILE=\"${SYSCONFDIR}/analog.cfg\" \
 +      -DIMAGEDIR=\"/images/\" \
 +      -DLANGDIR=\"${PREFIX}/lib/analog/lang/\" \
-+      -DLOGFILE=\"/var/log/httpd-access.log\"
++      -DLOGFILE=\"${VARBASE}/log/httpd-access.log\"
  #                 ... -DNOOPEN -DNOFOLLOW -DNOALARM -DNOGRAPHICS -DNOGMTIME ...
  #                 ... -DEBCDIC -DUSE_PLAIN_SETJMP ...
  #                 ... -DHAVE_GD -DHAVE_ZLIB -DHAVE_BZLIB -DHAVE_PCRE ...