diff options
| author | spz <spz@pkgsrc.org> | 2020-11-01 14:21:43 +0000 |
|---|---|---|
| committer | spz <spz@pkgsrc.org> | 2020-11-01 14:21:43 +0000 |
| commit | 6c0a1d5dc84d6a80aa08fb8577462fb660d0ea1c (patch) | |
| tree | beebc6e8abfb7d83ca934832eb9aaaaadf21cf77 /mail | |
| parent | b541d8d49ed26475a0d4be1da96c48ce04ec4f5e (diff) | |
| download | pkgsrc-6c0a1d5dc84d6a80aa08fb8577462fb660d0ea1c.tar.gz | |
building the gld package against pgsql broke, this commit fixes it.
pkgrev bumped for the changes to files/gld.sh
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/gld/Makefile | 4 | ||||
| -rw-r--r-- | mail/gld/files/gld.sh | 13 | ||||
| -rw-r--r-- | mail/gld/options.mk | 13 |
3 files changed, 16 insertions, 14 deletions
diff --git a/mail/gld/Makefile b/mail/gld/Makefile index 1b4a2bc5b7e..9c1dc83b31b 100644 --- a/mail/gld/Makefile +++ b/mail/gld/Makefile @@ -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 diff --git a/mail/gld/files/gld.sh b/mail/gld/files/gld.sh index 852b78002c2..6e53cac8910 100644 --- a/mail/gld/files/gld.sh +++ b/mail/gld/files/gld.sh @@ -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} } diff --git a/mail/gld/options.mk b/mail/gld/options.mk index 90bbcd07a43..9ff0260efae 100644 --- a/mail/gld/options.mk +++ b/mail/gld/options.mk @@ -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 |