From bdd42d9a6320cf2c61c7a493aab3a568b7a9c056 Mon Sep 17 00:00:00 2001
From: wiz <wiz>
Date: Thu, 2 Mar 2006 20:54:08 +0000
Subject: Make MESSAGE mysql-specific, since it is. Final part of PR 32969 by
 Greg Oster.

---
 mail/gld/MESSAGE       | 22 ----------------------
 mail/gld/MESSAGE.mysql | 22 ++++++++++++++++++++++
 mail/gld/options.mk    |  7 ++++---
 3 files changed, 26 insertions(+), 25 deletions(-)
 delete mode 100644 mail/gld/MESSAGE
 create mode 100644 mail/gld/MESSAGE.mysql

(limited to 'mail/gld')

diff --git a/mail/gld/MESSAGE b/mail/gld/MESSAGE
deleted file mode 100644
index b23c72a3948..00000000000
--- a/mail/gld/MESSAGE
+++ /dev/null
@@ -1,22 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.5 2006/02/06 15:59:58 sketch Exp $
-
-To configure gld, the following steps should be completed:
-
- $ mysql -e "create database gld"
- $ mysql -e "grant all on gld.* to gld@localhost identified by 'PASSWORD'"
- $ mysql gld < ${PREFIX}/share/gld/tables.mysql
-
-Modify "PASSWORD" with your desired password.
-
-Now edit your postfix's main.cf configuration file, and add the following
-line:
-
-	smtpd_recipient_restrictions = permit_mynetworks,
-		reject_unauth_destination,
-		check_policy_service inet:127.0.0.1:2525
-
-Start gld via ${RCD_SCRIPTS_DIR}/gld start
-
-It should be running fine now; good luck!
-===========================================================================
diff --git a/mail/gld/MESSAGE.mysql b/mail/gld/MESSAGE.mysql
new file mode 100644
index 00000000000..7692e02d80b
--- /dev/null
+++ b/mail/gld/MESSAGE.mysql
@@ -0,0 +1,22 @@
+===========================================================================
+$NetBSD: MESSAGE.mysql,v 1.1 2006/03/02 20:54:08 wiz Exp $
+
+To configure gld, the following steps should be completed:
+
+ $ mysql -e "create database gld"
+ $ mysql -e "grant all on gld.* to gld@localhost identified by 'PASSWORD'"
+ $ mysql gld < ${PREFIX}/share/gld/tables.mysql
+
+Modify "PASSWORD" with your desired password.
+
+Now edit your postfix's main.cf configuration file, and add the following
+line:
+
+	smtpd_recipient_restrictions = permit_mynetworks,
+		reject_unauth_destination,
+		check_policy_service inet:127.0.0.1:2525
+
+Start gld via ${RCD_SCRIPTS_DIR}/gld start
+
+It should be running fine now; good luck!
+===========================================================================
diff --git a/mail/gld/options.mk b/mail/gld/options.mk
index 161ad586c82..b33632128b0 100644
--- a/mail/gld/options.mk
+++ b/mail/gld/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.5 2006/03/02 20:49:39 wiz Exp $
+# $NetBSD: options.mk,v 1.6 2006/03/02 20:54:08 wiz Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.gld
 PKG_OPTIONS_REQUIRED_GROUPS=	database
@@ -11,12 +11,13 @@ PKG_SUGGESTED_OPTIONS=		mysql
 .  include "../../mk/mysql.buildlink3.mk"
 CONFIGURE_ARGS+=	--with-mysql=${BUILDLINK_PREFIX.mysql-client}
 LIBS+=			-L${BUILDLINK_PREFIX.mysql-client}/lib \
-			-Wl,-R${BUILDLINK_PREFIX.mysql-client}/lib -lmysqlclient
+	${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.mysql-client}/lib -lmysqlclient
+MESSAGE_SRC+=		MESSAGE.mysql
 .endif
 
 .if !empty(PKG_OPTIONS:Mpgsql)
 .  include "../../mk/pgsql.buildlink3.mk"
 CONFIGURE_ARGS+=	--with-pgsql=${BUILDLINK_PREFIX.postgresql-libs}
 LIBS+=			-L${BUILDLINK_PREFIX.mysql-client}/lib \
-			-Wl,-R${BUILDLINK_PREFIX.mysql-client}/lib -lpq
+	${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.mysql-client}/lib -lpq
 .endif
-- 
cgit v1.2.3