CVS commit: pkgsrc/mail/gld

["S.P.Zeidler" <spz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   spz
Date:           Sun Nov  1 14:21:44 UTC 2020

Modified Files:
        pkgsrc/mail/gld: Makefile options.mk
        pkgsrc/mail/gld/files: gld.sh

Log Message:
building the gld package against pgsql broke, this commit fixes it.
pkgrev bumped for the changes to files/gld.sh


To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 pkgsrc/mail/gld/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/mail/gld/options.mk
cvs rdiff -u -r1.5 -r1.6 pkgsrc/mail/gld/files/gld.sh

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

Modified files:

Index: pkgsrc/mail/gld/Makefile
diff -u pkgsrc/mail/gld/Makefile:1.33 pkgsrc/mail/gld/Makefile:1.34
--- pkgsrc/mail/gld/Makefile:1.33       Wed Jul  4 13:40:23 2018
+++ pkgsrc/mail/gld/Makefile    Sun Nov  1 14:21:43 2020
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.33 2018/07/04 13:40:23 jperkin Exp $
+# $NetBSD: Makefile,v 1.34 2020/11/01 14:21:43 spz Exp $
 #
 
 DISTNAME=              gld-1.7
-PKGREVISION=           5
+PKGREVISION=           6
 CATEGORIES=            mail
 MASTER_SITES=          https://www.gasmi.net/down/
 EXTRACT_SUFX=          .tgz

Index: pkgsrc/mail/gld/options.mk
diff -u pkgsrc/mail/gld/options.mk:1.7 pkgsrc/mail/gld/options.mk:1.8
--- pkgsrc/mail/gld/options.mk:1.7      Tue Jan  2 11:47:40 2007
+++ pkgsrc/mail/gld/options.mk  Sun Nov  1 14:21:43 2020
@@ -1,14 +1,19 @@
-# $NetBSD: options.mk,v 1.7 2007/01/02 11:47:40 ghen Exp $
+# $NetBSD: options.mk,v 1.8 2020/11/01 14:21:43 spz Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.gld
 PKG_OPTIONS_REQUIRED_GROUPS=   database
 PKG_OPTIONS_GROUP.database=    mysql pgsql
 PKG_SUGGESTED_OPTIONS=         mysql
 
+BUILD_DEFS+=                   GLDDB
+FILES_SUBST+=                  GLDDB=${GLDDB}
+
+
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mmysql)
 .  include "../../mk/mysql.buildlink3.mk"
+GLDDB=mysqld
 CONFIGURE_ARGS+=       --with-mysql=${BUILDLINK_PREFIX.mysql-client}
 LIBS+=                 -L${BUILDLINK_PREFIX.mysql-client}/lib \
        ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.mysql-client}/lib -lmysqlclient
@@ -17,12 +22,8 @@ MESSAGE_SRC+=                MESSAGE.mysql
 
 .if !empty(PKG_OPTIONS:Mpgsql)
 .  include "../../mk/pgsql.buildlink3.mk"
+GLDDB=pgsql
 CONFIGURE_ARGS+=       --with-pgsql=${BUILDLINK_PREFIX.postgresql-libs}
 LIBS+=                 -L${BUILDLINK_PREFIX.mysql-client}/lib \
        ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.mysql-client}/lib -lpq
-# Replace rc.d dependency by pgsql
-SUBST_CLASSES+=                pgsql
-SUBST_STAGE.pgsql=     pre-install
-SUBST_FILES.pgsql=     ../gld
-SUBST_SED.pgsql=       -e "s,mysqld,pgsql,"
 .endif

Index: pkgsrc/mail/gld/files/gld.sh
diff -u pkgsrc/mail/gld/files/gld.sh:1.5 pkgsrc/mail/gld/files/gld.sh:1.6
--- pkgsrc/mail/gld/files/gld.sh:1.5    Wed Jan 19 15:48:41 2005
+++ pkgsrc/mail/gld/files/gld.sh        Sun Nov  1 14:21:44 2020
@@ -1,11 +1,11 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: gld.sh,v 1.5 2005/01/19 15:48:41 xtraeme Exp $
+# $NetBSD: gld.sh,v 1.6 2020/11/01 14:21:44 spz Exp $
 #
 
 # PROVIDE: gld
 # BEFORE: mail
-# REQUIRE: DAEMON LOGIN mysqld
+# REQUIRE: DAEMON LOGIN @GLDDB@
 
 . /etc/rc.subr
 
@@ -14,19 +14,20 @@ rcvar=$name
 command="@PREFIX@/bin/${name}"
 required_files="@PKG_SYSCONFDIR@/$name.conf"
 pidfile="@VARBASE@/run/${name}.pid"
-extra_commands="gld_waitmysql_seconds"
+extra_commands="gld_waitdb_seconds"
 
 : ${gld_waitmysql_seconds:=5}
-start_precmd="waitmysql $gld_waitmysql_seconds"
+: ${gld_waitdb_seconds:=$gld_waitmysql_seconds}
+start_precmd="waitdb $gld_waitdb_seconds"
 
 if [ "$1" != "stop" -o "$1" != "status" ]; then
        echo $(check_process $command) > $pidfile
 fi
 
-waitmysql()
+waitdb()
 {
        _sec=$1
-       echo "$name: waiting for MySQL ${_sec} seconds..."
+       echo "$name: waiting for @GLDDB@ ${_sec} seconds..."
        sleep ${_sec}
 }