Fri Oct 2 09:50:38 2009 UTC ()
Split up the libpreludedb. Approved by agc@.


(hasso)
diff -r1.26 -r1.27 pkgsrc/security/libpreludedb/Makefile
diff -r0 -r1.1 pkgsrc/security/libpreludedb/Makefile.common
diff -r1.11 -r1.12 pkgsrc/security/libpreludedb/PLIST
diff -r1.12 -r1.13 pkgsrc/security/libpreludedb/buildlink3.mk
diff -r1.14 -r1.15 pkgsrc/security/libpreludedb/distinfo
diff -r1.1 -r0 pkgsrc/security/libpreludedb/options.mk
diff -r0 -r1.1 pkgsrc/security/libpreludedb/patches/patch-ab
diff -r0 -r1.1 pkgsrc/security/libpreludedb/patches/patch-ac
diff -r0 -r1.1 pkgsrc/security/libpreludedb/patches/patch-ad

cvs diff -r1.26 -r1.27 pkgsrc/security/libpreludedb/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/security/libpreludedb/Attic/Makefile 2009/08/24 13:50:03 1.26
+++ pkgsrc/security/libpreludedb/Attic/Makefile 2009/10/02 09:50:38 1.27
@@ -1,32 +1,21 @@ @@ -1,32 +1,21 @@
1# $NetBSD: Makefile,v 1.26 2009/08/24 13:50:03 hasso Exp $ 1# $NetBSD: Makefile,v 1.27 2009/10/02 09:50:38 hasso Exp $
2# 2#
3 3
4DISTNAME= libpreludedb-0.9.15.3 4.include "../../security/libpreludedb/Makefile.common"
5CATEGORIES= security 5.include "../../mk/bsd.prefs.mk"
6MASTER_SITES= http://www.prelude-ids.com/download/releases/libpreludedb/ 
7 6
8MAINTAINER= shannonjr@NetBSD.org 7COMMENT= LibPreludeDB libraries
9HOMEPAGE= http://www.prelude-ids.org/download/releases/ 
10COMMENT= Provides an interface to the database used to store IDMEF alerts 
11 8
12PKG_DESTDIR_SUPPORT= user-destdir 9CONFIGURE_ARGS+= --with-perl=no
13 10CONFIGURE_ARGS+= --with-python=no
14USE_PKGLOCALEDIR= yes 11CONFIGURE_ARGS+= --with-mysql=no
15USE_LIBTOOL= yes 12CONFIGURE_ARGS+= --with-postgresql=no
16GNU_CONFIGURE= yes 13CONFIGURE_ARGS+= --with-sqlite3=no
17USE_TOOLS+= make 
18CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} 
19USE_LANGUAGES= c c++ 
20 
21.include "options.mk" 
22 
23pre-configure: 
24 ${LN} -s ${BUILDLINK_DIR}/lib/libltdl.la ${BUILDLINK_DIR}/lib/libltdlc.la 
25 14
26post-install: 15post-install:
27 ${INSTALL_DATA} ${FILESDIR}/addIndices.sql ${DESTDIR}${PREFIX}/share/libpreludedb/classic 16 ${INSTALL_DATA} ${FILESDIR}/addIndices.sql ${DESTDIR}${PREFIX}/share/libpreludedb/classic
28 17
29.include "../../security/libprelude/buildlink3.mk" 18.include "../../security/libprelude/buildlink3.mk"
30.include "../../devel/libltdl/buildlink3.mk" 19.include "../../devel/libltdl/buildlink3.mk"
31.include "../../mk/pthread.buildlink3.mk" 20.include "../../mk/pthread.buildlink3.mk"
32.include "../../mk/bsd.pkg.mk" 21.include "../../mk/bsd.pkg.mk"

File Added: pkgsrc/security/libpreludedb/Attic/Makefile.common
# $NetBSD: Makefile.common,v 1.1 2009/10/02 09:50:38 hasso Exp $
#
# used by security/libpreludedb/Makefile
# used by security/libpreludedb-mysql/Makefile
# used by security/libpreludedb-perl/Makefile
# used by security/libpreludedb-pgsql/Makefile
# used by security/libpreludedb-python/Makefile
# used by security/libpreludedb-sqlite3/Makefile

DISTNAME=		libpreludedb-${VERSION}
VERSION=		0.9.15.3
CATEGORIES=		security
MASTER_SITES=		http://www.prelude-ids.com/download/releases/libpreludedb/

MAINTAINER=		shannonjr@NetBSD.org
HOMEPAGE=		http://www.prelude-ids.org/download/releases/
COMMENT=		Provides an interface to the database used to store IDMEF alerts

PKG_DESTDIR_SUPPORT=	user-destdir

USE_PKGLOCALEDIR=	yes
USE_LIBTOOL=		yes
GNU_CONFIGURE=		yes
USE_TOOLS+=		make
CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
USE_LANGUAGES=		c c++

PKG_OPTIONS_VAR=	PKG_OPTIONS.libpreludedb


pre-configure:
	${LN} -s ${BUILDLINK_DIR}/lib/libltdl.la ${BUILDLINK_DIR}/lib/libltdlc.la

cvs diff -r1.11 -r1.12 pkgsrc/security/libpreludedb/Attic/PLIST (expand / switch to unified diff)

--- pkgsrc/security/libpreludedb/Attic/PLIST 2009/08/24 13:50:03 1.11
+++ pkgsrc/security/libpreludedb/Attic/PLIST 2009/10/02 09:50:38 1.12
@@ -1,63 +1,57 @@ @@ -1,63 +1,57 @@
1@comment $NetBSD: PLIST,v 1.11 2009/08/24 13:50:03 hasso Exp $ 1@comment $NetBSD: PLIST,v 1.12 2009/10/02 09:50:38 hasso Exp $
2bin/libpreludedb-config 2bin/libpreludedb-config
3bin/preludedb-admin 3bin/preludedb-admin
4include/libpreludedb/preludedb-error.h 4include/libpreludedb/preludedb-error.h
5include/libpreludedb/preludedb-path-selection.h 5include/libpreludedb/preludedb-path-selection.h
6include/libpreludedb/preludedb-plugin-format.h 6include/libpreludedb/preludedb-plugin-format.h
7include/libpreludedb/preludedb-plugin-sql.h 7include/libpreludedb/preludedb-plugin-sql.h
8include/libpreludedb/preludedb-sql-settings.h 8include/libpreludedb/preludedb-sql-settings.h
9include/libpreludedb/preludedb-sql.h 9include/libpreludedb/preludedb-sql.h
10include/libpreludedb/preludedb-version.h 10include/libpreludedb/preludedb-version.h
11include/libpreludedb/preludedb.h 11include/libpreludedb/preludedb.h
12lib/libpreludedb.la 12lib/libpreludedb.la
13lib/libpreludedb/plugins/formats/classic.la 13lib/libpreludedb/plugins/formats/classic.la
14${PLIST.mysql}lib/libpreludedb/plugins/sql/mysql.la 
15${PLIST.pgsql}lib/libpreludedb/plugins/sql/pgsql.la 
16${PLIST.sqlite3}lib/libpreludedb/plugins/sql/sqlite3.la 
17${PLIST.python}${PYSITELIB}/_preludedb.so 
18${PLIST.python}${PYSITELIB}/preludedb.py 
19${PLIST.python}${PYSITELIB}/preludedb.pyc 
20share/aclocal/libpreludedb.m4 14share/aclocal/libpreludedb.m4
21share/gtk-doc/html/libpreludedb/ch01.html 15share/gtk-doc/html/libpreludedb/ch01.html
22share/gtk-doc/html/libpreludedb/libpreludedb.devhelp2 16share/gtk-doc/html/libpreludedb/libpreludedb.devhelp2
23share/gtk-doc/html/libpreludedb/home.png 17share/gtk-doc/html/libpreludedb/home.png
24share/gtk-doc/html/libpreludedb/index.html 18share/gtk-doc/html/libpreludedb/index.html
25share/gtk-doc/html/libpreludedb/index.sgml 19share/gtk-doc/html/libpreludedb/index.sgml
26share/gtk-doc/html/libpreludedb/left.png 20share/gtk-doc/html/libpreludedb/left.png
27share/gtk-doc/html/libpreludedb/libpreludedb-preludedb-error.html 21share/gtk-doc/html/libpreludedb/libpreludedb-preludedb-error.html
28share/gtk-doc/html/libpreludedb/libpreludedb-preludedb-path-selection.html 22share/gtk-doc/html/libpreludedb/libpreludedb-preludedb-path-selection.html
29share/gtk-doc/html/libpreludedb/libpreludedb-preludedb-plugin-format.html 23share/gtk-doc/html/libpreludedb/libpreludedb-preludedb-plugin-format.html
30share/gtk-doc/html/libpreludedb/libpreludedb-preludedb-plugin-sql.html 24share/gtk-doc/html/libpreludedb/libpreludedb-preludedb-plugin-sql.html
31share/gtk-doc/html/libpreludedb/libpreludedb-preludedb-sql-settings.html 25share/gtk-doc/html/libpreludedb/libpreludedb-preludedb-sql-settings.html
32share/gtk-doc/html/libpreludedb/libpreludedb-preludedb-sql.html 26share/gtk-doc/html/libpreludedb/libpreludedb-preludedb-sql.html
33share/gtk-doc/html/libpreludedb/libpreludedb-preludedb-version.html 27share/gtk-doc/html/libpreludedb/libpreludedb-preludedb-version.html
34share/gtk-doc/html/libpreludedb/libpreludedb-preludedb.html 28share/gtk-doc/html/libpreludedb/libpreludedb-preludedb.html
35share/gtk-doc/html/libpreludedb/libpreludedb.devhelp 29share/gtk-doc/html/libpreludedb/libpreludedb.devhelp
36share/gtk-doc/html/libpreludedb/right.png 30share/gtk-doc/html/libpreludedb/right.png
37share/gtk-doc/html/libpreludedb/style.css 31share/gtk-doc/html/libpreludedb/style.css
38share/gtk-doc/html/libpreludedb/up.png 32share/gtk-doc/html/libpreludedb/up.png
 33share/libpreludedb/classic/addIndices.sql
39share/libpreludedb/classic/mysql-update-14-1.sql 34share/libpreludedb/classic/mysql-update-14-1.sql
40share/libpreludedb/classic/mysql-update-14-2.sql 35share/libpreludedb/classic/mysql-update-14-2.sql
41share/libpreludedb/classic/mysql-update-14-3.sql 36share/libpreludedb/classic/mysql-update-14-3.sql
42share/libpreludedb/classic/mysql-update-14-4.sql 37share/libpreludedb/classic/mysql-update-14-4.sql
43share/libpreludedb/classic/mysql-update-14-5.sql 38share/libpreludedb/classic/mysql-update-14-5.sql
44share/libpreludedb/classic/pgsql-update-14-5.sql 39share/libpreludedb/classic/pgsql-update-14-5.sql
45share/libpreludedb/classic/sqlite-update-14-5.sql 40share/libpreludedb/classic/sqlite-update-14-5.sql
46share/libpreludedb/classic/mysql-update-14-7.sql 41share/libpreludedb/classic/mysql-update-14-7.sql
47share/libpreludedb/classic/pgsql-update-14-7.sql 42share/libpreludedb/classic/pgsql-update-14-7.sql
48share/libpreludedb/classic/sqlite-update-14-7.sql 43share/libpreludedb/classic/sqlite-update-14-7.sql
49share/libpreludedb/classic/mysql.sql 44share/libpreludedb/classic/mysql.sql
50share/libpreludedb/classic/mysql2pgsql.sh 45share/libpreludedb/classic/mysql2pgsql.sh
51share/libpreludedb/classic/mysql2sqlite.sh 46share/libpreludedb/classic/mysql2sqlite.sh
52share/libpreludedb/classic/pgsql-update-14-1.sql 47share/libpreludedb/classic/pgsql-update-14-1.sql
53share/libpreludedb/classic/pgsql-update-14-2.sql 48share/libpreludedb/classic/pgsql-update-14-2.sql
54share/libpreludedb/classic/pgsql-update-14-3.sql 49share/libpreludedb/classic/pgsql-update-14-3.sql
55share/libpreludedb/classic/pgsql-update-14-4.sql 50share/libpreludedb/classic/pgsql-update-14-4.sql
56share/libpreludedb/classic/addIndices.sql 
57share/libpreludedb/classic/pgsql.sql 51share/libpreludedb/classic/pgsql.sql
58share/libpreludedb/classic/sqlite.sql 52share/libpreludedb/classic/sqlite.sql
59share/libpreludedb/classic/sqlite-update-14-4.sql 53share/libpreludedb/classic/sqlite-update-14-4.sql
60share/libpreludedb/classic/mysql-update-14-6.sql 54share/libpreludedb/classic/mysql-update-14-6.sql
61share/libpreludedb/classic/pgsql-update-14-6.sql 55share/libpreludedb/classic/pgsql-update-14-6.sql
62share/libpreludedb/classic/sqlite-update-14-6.sql 56share/libpreludedb/classic/sqlite-update-14-6.sql
63man/man1/preludedb-admin.1 57man/man1/preludedb-admin.1

cvs diff -r1.12 -r1.13 pkgsrc/security/libpreludedb/Attic/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/security/libpreludedb/Attic/buildlink3.mk 2009/03/20 19:25:19 1.12
+++ pkgsrc/security/libpreludedb/Attic/buildlink3.mk 2009/10/02 09:50:38 1.13
@@ -1,16 +1,15 @@ @@ -1,16 +1,15 @@
1# $NetBSD: buildlink3.mk,v 1.12 2009/03/20 19:25:19 joerg Exp $ 1# $NetBSD: buildlink3.mk,v 1.13 2009/10/02 09:50:38 hasso Exp $
2 2
3BUILDLINK_TREE+= libpreludedb 3BUILDLINK_TREE+= libpreludedb
4 4
5.if !defined(LIBPRELUDEDB_BUILDLINK3_MK) 5.if !defined(LIBPRELUDEDB_BUILDLINK3_MK)
6LIBPRELUDEDB_BUILDLINK3_MK:= 6LIBPRELUDEDB_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.libpreludedb+= libpreludedb>=0.9.3 8BUILDLINK_API_DEPENDS.libpreludedb+= libpreludedb>=0.9.15.3
9BUILDLINK_ABI_DEPENDS.libpreludedb?= libpreludedb>=0.9.13nb2 
10BUILDLINK_PKGSRCDIR.libpreludedb?= ../../security/libpreludedb 9BUILDLINK_PKGSRCDIR.libpreludedb?= ../../security/libpreludedb
11 10
12.include "../../security/libprelude/buildlink3.mk" 11.include "../../security/libprelude/buildlink3.mk"
13.include "../../lang/perl5/buildlink3.mk" 12.include "../../devel/libltdl/buildlink3.mk"
14.endif # LIBPRELUDEDB_BUILDLINK3_MK 13.endif # LIBPRELUDEDB_BUILDLINK3_MK
15 14
16BUILDLINK_TREE+= -libpreludedb 15BUILDLINK_TREE+= -libpreludedb

cvs diff -r1.14 -r1.15 pkgsrc/security/libpreludedb/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/security/libpreludedb/Attic/distinfo 2009/08/24 13:50:03 1.14
+++ pkgsrc/security/libpreludedb/Attic/distinfo 2009/10/02 09:50:38 1.15
@@ -1,6 +1,9 @@ @@ -1,6 +1,9 @@
1$NetBSD: distinfo,v 1.14 2009/08/24 13:50:03 hasso Exp $ 1$NetBSD: distinfo,v 1.15 2009/10/02 09:50:38 hasso Exp $
2 2
3SHA1 (libpreludedb-0.9.15.3.tar.gz) = 617ca366401f461380ceff5de037efa7743ca1ec 3SHA1 (libpreludedb-0.9.15.3.tar.gz) = 617ca366401f461380ceff5de037efa7743ca1ec
4RMD160 (libpreludedb-0.9.15.3.tar.gz) = 70af1692966a6b31d4b18a2342a74991d3e8bfed 4RMD160 (libpreludedb-0.9.15.3.tar.gz) = 70af1692966a6b31d4b18a2342a74991d3e8bfed
5Size (libpreludedb-0.9.15.3.tar.gz) = 935457 bytes 5Size (libpreludedb-0.9.15.3.tar.gz) = 935457 bytes
6SHA1 (patch-aa) = 11cb4f1353a5dbfc046992d862230849aeb21afa 6SHA1 (patch-aa) = 11cb4f1353a5dbfc046992d862230849aeb21afa
 7SHA1 (patch-ab) = 52fe326b51634cdc123d4ccb48ac054c7cf318c4
 8SHA1 (patch-ac) = d71fa2d8ec5c84692dc68801e06651bc70628e89
 9SHA1 (patch-ad) = abd409d4e955f202796a5cb9da3360a76e8d2855

File Deleted: pkgsrc/security/libpreludedb/Attic/options.mk

File Added: pkgsrc/security/libpreludedb/patches/Attic/patch-ab
$NetBSD: patch-ab,v 1.1 2009/10/02 09:50:38 hasso Exp $

--- plugins/sql/sqlite3/Makefile.in.orig	2009-09-26 16:38:21 +0200
+++ plugins/sql/sqlite3/Makefile.in	2009-09-26 16:39:12 +0200
@@ -121,7 +121,7 @@
 am__installdirs = "$(DESTDIR)$(sqlite3dir)"
 LTLIBRARIES = $(sqlite3_LTLIBRARIES)
 @HAVE_SQLITE3_TRUE@sqlite3_la_DEPENDENCIES =  \
-@HAVE_SQLITE3_TRUE@	$(top_builddir)/src/libpreludedb.la
+@HAVE_SQLITE3_TRUE@	$(top_builddir)/../.buildlink/lib/libpreludedb.la
 am__sqlite3_la_SOURCES_DIST = sqlite3.c
 @HAVE_SQLITE3_TRUE@am_sqlite3_la_OBJECTS = sqlite3.lo
 sqlite3_la_OBJECTS = $(am_sqlite3_la_OBJECTS)
@@ -590,7 +590,7 @@
 AM_CPPFLAGS = @PCFLAGS@ -I$(top_srcdir)/src/include -I$(top_srcdir)/libmissing -I$(top_builddir)/libmissing @LIBPRELUDE_CFLAGS@ @SQLITE3_CFLAGS@
 sqlite3_la_LDFLAGS = -module -avoid-version @LIBPRELUDE_LDFLAGS@
 @HAVE_SQLITE3_TRUE@sqlite3_la_SOURCES = sqlite3.c
-@HAVE_SQLITE3_TRUE@sqlite3_la_LIBADD = $(top_builddir)/src/libpreludedb.la @LIBPRELUDE_LIBS@ @SQLITE3_LDFLAGS@
+@HAVE_SQLITE3_TRUE@sqlite3_la_LIBADD = $(top_builddir)/../.buildlink/lib/libpreludedb.la @LIBPRELUDE_LIBS@ @SQLITE3_LDFLAGS@
 @HAVE_SQLITE3_TRUE@sqlite3dir = $(sql_plugin_dir)
 @HAVE_SQLITE3_TRUE@sqlite3_LTLIBRARIES = sqlite3.la
 all: all-am

File Added: pkgsrc/security/libpreludedb/patches/Attic/patch-ac
$NetBSD: patch-ac,v 1.1 2009/10/02 09:50:38 hasso Exp $

--- plugins/sql/mysql/Makefile.in.orig	2009-09-26 16:39:48 +0200
+++ plugins/sql/mysql/Makefile.in	2009-09-26 16:40:18 +0200
@@ -121,7 +121,7 @@
 am__installdirs = "$(DESTDIR)$(mysqldir)"
 LTLIBRARIES = $(mysql_LTLIBRARIES)
 @HAVE_MYSQL_TRUE@mysql_la_DEPENDENCIES =  \
-@HAVE_MYSQL_TRUE@	$(top_builddir)/src/libpreludedb.la
+@HAVE_MYSQL_TRUE@	$(top_builddir)/../.buildlink/lib/libpreludedb.la
 am__mysql_la_SOURCES_DIST = mysql.c
 @HAVE_MYSQL_TRUE@am_mysql_la_OBJECTS = mysql.lo
 mysql_la_OBJECTS = $(am_mysql_la_OBJECTS)
@@ -590,7 +590,7 @@
 AM_CPPFLAGS = @PCFLAGS@ -I$(top_srcdir)/src/include -I$(top_srcdir)/libmissing -I$(top_builddir)/libmissing @LIBPRELUDE_CFLAGS@ @MYSQL_CFLAGS@
 mysql_la_LDFLAGS = -module -avoid-version @LIBPRELUDE_LDFLAGS@
 @HAVE_MYSQL_TRUE@mysql_la_SOURCES = mysql.c
-@HAVE_MYSQL_TRUE@mysql_la_LIBADD = $(top_builddir)/src/libpreludedb.la @LIBPRELUDE_LIBS@ @MYSQL_LDFLAGS@
+@HAVE_MYSQL_TRUE@mysql_la_LIBADD = $(top_builddir)/../.buildlink/lib/libpreludedb.la @LIBPRELUDE_LIBS@ @MYSQL_LDFLAGS@
 @HAVE_MYSQL_TRUE@mysqldir = $(sql_plugin_dir)
 @HAVE_MYSQL_TRUE@mysql_LTLIBRARIES = mysql.la
 all: all-am

File Added: pkgsrc/security/libpreludedb/patches/Attic/patch-ad
$NetBSD: patch-ad,v 1.1 2009/10/02 09:50:38 hasso Exp $

--- plugins/sql/pgsql/Makefile.in.orig	2009-09-26 16:39:52 +0200
+++ plugins/sql/pgsql/Makefile.in	2009-09-26 16:40:32 +0200
@@ -121,7 +121,7 @@
 am__installdirs = "$(DESTDIR)$(pgsqldir)"
 LTLIBRARIES = $(pgsql_LTLIBRARIES)
 @HAVE_PGSQL_TRUE@pgsql_la_DEPENDENCIES =  \
-@HAVE_PGSQL_TRUE@	$(top_builddir)/src/libpreludedb.la
+@HAVE_PGSQL_TRUE@	$(top_builddir)/../.buildlink/lib/libpreludedb.la
 am__pgsql_la_SOURCES_DIST = pgsql.c
 @HAVE_PGSQL_TRUE@am_pgsql_la_OBJECTS = pgsql.lo
 pgsql_la_OBJECTS = $(am_pgsql_la_OBJECTS)
@@ -590,7 +590,7 @@
 AM_CPPFLAGS = @PCFLAGS@ -I$(top_srcdir)/src/include -I$(top_srcdir)/libmissing -I$(top_builddir)/libmissing @LIBPRELUDE_CFLAGS@ @POSTGRESQL_CFLAGS@
 pgsql_la_LDFLAGS = -module -avoid-version @LIBPRELUDE_LDFLAGS@ 
 @HAVE_PGSQL_TRUE@pgsql_la_SOURCES = pgsql.c
-@HAVE_PGSQL_TRUE@pgsql_la_LIBADD = $(top_builddir)/src/libpreludedb.la @LIBPRELUDE_LIBS@ @POSTGRESQL_LDFLAGS@
+@HAVE_PGSQL_TRUE@pgsql_la_LIBADD = $(top_builddir)/../.buildlink/lib/libpreludedb.la @LIBPRELUDE_LIBS@ @POSTGRESQL_LDFLAGS@
 @HAVE_PGSQL_TRUE@pgsqldir = $(sql_plugin_dir)
 @HAVE_PGSQL_TRUE@pgsql_LTLIBRARIES = pgsql.la
 all: all-am