[pkgsrc/pkgsrc-2005Q1]: pkgsrc/mail/gld Pullup ticket 486 - requested by Juan...

[salo <salo%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/054e9ee42747
branches:  pkgsrc-2005Q1
changeset: 491023:054e9ee42747
user:      salo <salo%pkgsrc.org@localhost>
date:      Sat May 07 16:11:59 2005 +0000

description:
Pullup ticket 486 - requested by Juan Romero Pardines
gld update

Revisions pulled up:
- pkgsrc/mail/gld/Makefile      1.7
- pkgsrc/mail/gld/distinfo      1.9
- pkgsrc/mail/gld/options.mk    1.1

   Module Name:         pkgsrc
   Committed By:        xtraeme
   Date:                Thu Apr 14 22:22:56 UTC 2005

   Modified Files:
        pkgsrc/mail/gld: Makefile distinfo
   Added Files:
        pkgsrc/mail/gld: options.mk

   Log Message:
   Update to 1.5.1, which fixes PR pkg/29975 by Robert Elz.

   Some changes were done: enabling the LOOPBACK option by default,
   fix some snprintf() calls, etc.

   While I'm here convert this pkg to use bsd.options.mk, now that it
   supports MySQL and PostgreSQL (MySQL by default as before).

diffstat:

 mail/gld/Makefile   |   8 +++-----
 mail/gld/distinfo   |   8 ++++----
 mail/gld/options.mk |  17 +++++++++++++++++
 3 files changed, 24 insertions(+), 9 deletions(-)

diffs (66 lines):

diff -r ed6d2012f92d -r 054e9ee42747 mail/gld/Makefile
--- a/mail/gld/Makefile Sat May 07 00:26:42 2005 +0000
+++ b/mail/gld/Makefile Sat May 07 16:11:59 2005 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3.2.1 2005/04/14 04:42:23 snj Exp $
+# $NetBSD: Makefile,v 1.3.2.2 2005/05/07 16:11:59 salo Exp $
 #
 
-DISTNAME=              gld-1.5
+DISTNAME=              gld-1.5.1
 CATEGORIES=            mail
 MASTER_SITES=          http://www.gasmi.net/down/
 EXTRACT_SUFX=          .tgz
@@ -14,8 +14,6 @@
 USE_PKGINSTALL=                yes
 GNU_CONFIGURE=         yes
 
-CONFIGURE_ARGS+=       --with-mysql=${BUILDLINK_PREFIX.mysql-client}
-
 EGDIR=                 ${PREFIX}/share/examples/${PKGBASE}
 CONF_FILES_PERMS=      ${EGDIR}/gld.conf ${PKG_SYSCONFDIR}/gld.conf    \
                        ${BINOWN} ${GLD_GROUP} 0740
@@ -37,5 +35,5 @@
 SUBST_SED.users+=      -e "s|\#GROUP=nobody|GROUP=${GLD_GROUP}|"
 SUBST_MESSAGE.users=   "Adjusting user/group in configuration file."
 
-.include "../../mk/mysql.buildlink3.mk"
+.include "options.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r ed6d2012f92d -r 054e9ee42747 mail/gld/distinfo
--- a/mail/gld/distinfo Sat May 07 00:26:42 2005 +0000
+++ b/mail/gld/distinfo Sat May 07 16:11:59 2005 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.2.2.1 2005/04/14 04:42:23 snj Exp $
+$NetBSD: distinfo,v 1.2.2.2 2005/05/07 16:11:59 salo Exp $
 
-SHA1 (gld-1.5.tgz) = febc398be2e68bf7b4bc6e3015da2f225760204d
-RMD160 (gld-1.5.tgz) = dab09c1776fb014effdd3d87d4a6808274bbfdd9
-Size (gld-1.4.tgz) = 39030 bytes
+SHA1 (gld-1.5.1.tgz) = 6ceed17af40c26c1f5a62b8f2941c930e3e2b85b
+RMD160 (gld-1.5.1.tgz) = f10a096dfd218ee95c5ec574c20582a14d6de851
+Size (gld-1.5.1.tgz) = 39132 bytes
 SHA1 (patch-aa) = 71bc915a5096a3d93cd7b5313f135b68312ec19a
 SHA1 (patch-ab) = 629b99be25d536ceb646d47f079455a4b092fe24
 SHA1 (patch-ac) = 8d484c0d6a5cbc88f2c4c66143e6aa9a91131bf1
diff -r ed6d2012f92d -r 054e9ee42747 mail/gld/options.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/gld/options.mk       Sat May 07 16:11:59 2005 +0000
@@ -0,0 +1,17 @@
+# $NetBSD: options.mk,v 1.1.2.2 2005/05/07 16:11:59 salo Exp $
+
+PKG_OPTIONS_VAR=       PKG_OPTIONS.gld
+PKG_SUPPORTED_OPTIONS= mysql pgsql
+PKG_DEFAULT_OPTIONS+=  mysql
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mmysql)
+.  include "../../mk/mysql.buildlink3.mk"
+CONFIGURE_ARGS+=       --with-mysql=${BUILDLINK_PREFIX.mysql-client}
+.endif
+
+.if !empty(PKG_OPTIONS:Mpgsql)
+.  include "../../mk/pgsql.buildlink3.mk"
+CONFIGURE_ARGS+=       --with-pgsql=${BUILDLINK_PREFIX.postgresql-libs}
+.endif