Add mysql option, requested in private mail.

Add patch to make most modules build on NetBSD-4.99.20/amd64.

XXX: pike.so still doesn't; it won't get installed and the PLIST
is wrong.

5 files changed, 35 insertions, 3 deletions

diff --git a/net/ser/Makefile b/net/ser/Makefile
index ecd61e24572..8b49d5c1ed6 100644
--- a/net/ser/Makefile
+++ b/net/ser/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/03/23 06:24:49 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2007/06/01 00:26:36 wiz Exp $
 #
 
 DISTNAME=	ser-0.8.14_src
@@ -27,5 +27,7 @@ MAKE_ENV+= EGDIR=${EGDIR:Q}
 
 CHECK_PORTABILITY_SKIP+=	scripts/sc
 
+.include "options.mk"
+
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/ser/PLIST b/net/ser/PLIST
index e1e56d2a124..99346506b79 100644
--- a/net/ser/PLIST
+++ b/net/ser/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2007/03/23 06:24:49 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2007/06/01 00:26:36 wiz Exp $
 sbin/ser
 sbin/serctl
 sbin/ser_mysql.sh
@@ -18,6 +18,7 @@ lib/ser/modules/mangler.so
 lib/ser/modules/maxfwd.so
 lib/ser/modules/mediaproxy.so
 lib/ser/modules/msilo.so
+${WITH_MYSQL}lib/ser/modules/mysql.so
 lib/ser/modules/nathelper.so
 lib/ser/modules/pa.so
 lib/ser/modules/pdt.so
diff --git a/net/ser/distinfo b/net/ser/distinfo
index 5d52789d776..102d66bc0e5 100644
--- a/net/ser/distinfo
+++ b/net/ser/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.2 2007/05/31 04:22:10 rillig Exp $
+$NetBSD: distinfo,v 1.3 2007/06/01 00:26:36 wiz Exp $
 
 SHA1 (ser-0.8.14_src.tar.gz) = 91553951247506850d66da25819333b61b150d1d
 RMD160 (ser-0.8.14_src.tar.gz) = 72c3a0793f3dd88584ee65b3751ccf8a3776f840
 Size (ser-0.8.14_src.tar.gz) = 1551881 bytes
 SHA1 (patch-aa) = 25ee2488f106859ce1208923d5e5ae762dbe65f1
+SHA1 (patch-ab) = 871de5c826853381eb5b6889d8e3d8b2f310dc6b
 SHA1 (patch-ad) = aa7a962546fbfcbecde79d68c0765ae34c2916da
diff --git a/net/ser/options.mk b/net/ser/options.mk
new file mode 100644
index 00000000000..57d0b5751e7
--- /dev/null
+++ b/net/ser/options.mk
@@ -0,0 +1,14 @@
+# $NetBSD: options.mk,v 1.1 2007/06/01 00:26:36 wiz Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.ser
+PKG_SUPPORTED_OPTIONS=	mysql
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mmysql)
+MAKE_ENV+= include_modules="mysql"
+.include "../../mk/mysql.buildlink3.mk"
+PLIST_SUBST+=	WITH_MYSQL=""
+.else
+PLIST_SUBST+=	WITH_MYSQL="@comment "
+.endif
diff --git a/net/ser/patches/patch-ab b/net/ser/patches/patch-ab
new file mode 100644
index 00000000000..3c3cbe55ead
--- /dev/null
+++ b/net/ser/patches/patch-ab
@@ -0,0 +1,14 @@
+$NetBSD: patch-ab,v 1.1 2007/06/01 00:26:36 wiz Exp $
+
+--- lock_ops.h.orig	2004-07-26 23:18:35.000000000 +0000
++++ lock_ops.h
+@@ -66,6 +66,9 @@ WARNING: - lock_set_init may fail for la
+ #ifndef _lock_ops_h
+ #define _lock_ops_h
+ 
++#include <errno.h>
++#include <string.h>
++#include "dprint.h"
+ 
+ #ifdef FAST_LOCK
+ #include "fastlock.h"