pkg/40142: security/libpreludedb: added options.mk, fixed PLIST entries for the perl module

To: pkg-manager%netbsd.org@localhost,gnats-admin%netbsd.org@localhost,pkgsrc-bugs%netbsd.org@localhost
Subject: pkg/40142: security/libpreludedb: added options.mk, fixed PLIST entries for the perl module
From: rumcic%gmail.com@localhost
Date: Tue, 9 Dec 2008 12:55:01 +0000 (UTC)
>Number:         40142
>Category:       pkg
>Synopsis:       security/libpreludedb: added options.mk, fixed PLIST entries 
>for the perl module
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Tue Dec 09 12:55:00 +0000 2008
>Originator:     Rumko
>Release:        DragonFly BSD
>Organization:
>Environment:
DragonFly rumko.rumko.net 2.1.0-DEVELOPMENT DragonFly 2.1.0-DEVELOPMENT #312: 
Sat Nov 29 03:10:11 CET 2008     
root%rumko.rumko.net@localhost:/usr/obj/usr/src/sys/MYPRECIOUS  i386
>Description:
Added options.mk, ability to change the database engine (option of using 
sqlite3, mysql and pgsql) and ability to have the perl and/or python modules 
installed (previously it would always install both).
Also fixed the perl module PLIST entries and broke PLIST into multiple parts 
(needed because of different PKG_OPTIONS).

I also removed "@dirrm share/gtk-doc/html" and "@dirrm share/gtk-doc" from the 
PLIST since those dirs contain files from other packages (like glib2) and at 
least glib2 does the same (does not have those entries in it's PLIST).

Had to change configure since it didn't honor the --enable-$FEATURE=no options 
(and without this change it always found pgsql on my machine, but didn't find 
others - mysql, sqlite3 - ... the checks in this configure are too weird for me 
and am not able to find a cleaner solution).

Last but not least, changed the URL in MESSAGE, since there's nothing on that 
URL, the new one contains the documentation for database creation.
>How-To-Repeat:

>Fix:
Index: MESSAGE
===================================================================
RCS file: /cvsroot/pkgsrc/security/libpreludedb/MESSAGE,v
retrieving revision 1.1
diff -u -r1.1 MESSAGE
--- MESSAGE     6 Jun 2006 12:30:02 -0000       1.1
+++ MESSAGE     9 Dec 2008 12:45:15 -0000
@@ -3,7 +3,7 @@
 Instructions for setting database creation may be found in the prelude
 handbook:
 
-https://trac.prelude-ids.org/wiki/InstallingLibpreludedb
+https://trac.prelude-ids.org/wiki/InstallingPreludeDbLibrary
 
 Deletion of database entries can be quite slow unless some additional
 indices are created. The additional indices can be created by entering:
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/security/libpreludedb/Makefile,v
retrieving revision 1.23
diff -u -r1.23 Makefile
--- Makefile    19 Oct 2008 19:18:44 -0000      1.23
+++ Makefile    9 Dec 2008 12:45:15 -0000
@@ -10,28 +10,17 @@
 HOMEPAGE=              http://www.prelude-ids.org/download/releases/
 COMMENT=               Provides an interface to the database used to store 
IDMEF alerts
 
-.include "../../mk/mysql.buildlink3.mk"
-
 USE_PKGLOCALEDIR=      yes
 USE_LIBTOOL=           yes
 GNU_CONFIGURE=         yes
-USE_TOOLS+=            make perl:run
-CONFIGURE_ARGS+=       -enable-mysql
+USE_TOOLS+=            make
 CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR:Q}
-CONFIGURE_ARGS+=       --enable-python
-CONFIGURE_ENV+=                PYTHON=${PYTHONBIN:Q}
-CONFIGURE_ARGS+=       --with-mysql=${BUILDLINK_PREFIX.mysql-client}
-CONFIGURE_ARGS+=       --with-pgsql=no
-LDFLAGS+=              ${BUILDLINK_LDFLAGS.mysql-client}
-PYBINMODULE=           yes
-PY_PATCHPLIST=         yes
+
+.include "options.mk"
 
 post-install:
        ${INSTALL_DATA} ${FILESDIR}/addIndices.sql 
${PREFIX}/share/libpreludedb/classic
 
 .include "../../security/libprelude/buildlink3.mk"
-.include "../../lang/python/application.mk"
-.include "../../lang/python/extension.mk"
-.include "../../lang/perl5/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/security/libpreludedb/PLIST,v
retrieving revision 1.8
diff -u -r1.8 PLIST
--- PLIST       27 Aug 2008 22:37:09 -0000      1.8
+++ PLIST       9 Dec 2008 12:45:15 -0000
@@ -11,14 +11,6 @@
 include/libpreludedb/preludedb.h
 lib/libpreludedb.la
 lib/libpreludedb/plugins/formats/classic.la
-lib/libpreludedb/plugins/sql/mysql.la
-lib/perl5/site_perl/5.8.0/${MACHINE_ARCH}-${LOWER_OPSYS}-thread-multi/auto/PreludeDB/.packlist
-lib/perl5/site_perl/5.8.0/${MACHINE_ARCH}-${LOWER_OPSYS}-thread-multi/auto/PreludeDB/PreludeDB.bs
-lib/perl5/site_perl/5.8.0/${MACHINE_ARCH}-${LOWER_OPSYS}-thread-multi/auto/PreludeDB/PreludeDB.so
-lib/perl5/site_perl/5.8.0/${MACHINE_ARCH}-${LOWER_OPSYS}-thread-multi/PreludeDB.pm
-${PYSITELIB}/_preludedb.so
-${PYSITELIB}/preludedb.py
-${PYSITELIB}/preludedb.pyc
 share/aclocal/libpreludedb.m4
 share/gtk-doc/html/libpreludedb/ch01.html
 share/gtk-doc/html/libpreludedb/libpreludedb.devhelp2
@@ -66,9 +58,6 @@
 @dirrm share/libpreludedb/classic
 @dirrm share/libpreludedb
 @dirrm share/gtk-doc/html/libpreludedb
-@dirrm share/gtk-doc/html
-@dirrm share/gtk-doc
-@dirrm 
lib/perl5/site_perl/5.8.0/${MACHINE_ARCH}-${LOWER_OPSYS}-thread-multi/auto/PreludeDB
 @dirrm lib/libpreludedb/plugins/sql
 @dirrm lib/libpreludedb/plugins/formats
 @dirrm lib/libpreludedb/plugins
Index: PLIST.mysql
===================================================================
RCS file: PLIST.mysql
diff -N PLIST.mysql
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ PLIST.mysql 9 Dec 2008 12:45:15 -0000
@@ -0,0 +1,2 @@
+@comment $NetBSD$
+lib/libpreludedb/plugins/sql/mysql.la
Index: PLIST.pgsql
===================================================================
RCS file: PLIST.pgsql
diff -N PLIST.pgsql
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ PLIST.pgsql 9 Dec 2008 12:45:15 -0000
@@ -0,0 +1,2 @@
+@comment $NetBSD$
+lib/libpreludedb/plugins/sql/pgsql.la
Index: PLIST.py
===================================================================
RCS file: PLIST.py
diff -N PLIST.py
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ PLIST.py    9 Dec 2008 12:45:15 -0000
@@ -0,0 +1,4 @@
+@comment $NetBSD: PLIST.py,v 1.3 2006/10/11 14:46:10 shannonjr Exp $
+${PYSITELIB}/_preludedb.so
+${PYSITELIB}/preludedb.py
+${PYSITELIB}/preludedb.pyc
Index: PLIST.sqlite3
===================================================================
RCS file: PLIST.sqlite3
diff -N PLIST.sqlite3
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ PLIST.sqlite3       9 Dec 2008 12:45:15 -0000
@@ -0,0 +1,2 @@
+@comment $NetBSD$
+lib/libpreludedb/plugins/sql/sqlite3.la
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/security/libpreludedb/distinfo,v
retrieving revision 1.13
diff -u -r1.13 distinfo
--- distinfo    27 Aug 2008 22:37:09 -0000      1.13
+++ distinfo    9 Dec 2008 12:45:15 -0000
@@ -3,4 +3,4 @@
 SHA1 (libpreludedb-0.9.15.tar.gz) = 4de780db1b623a0ed1f73f3cb56165bfa943ecd7
 RMD160 (libpreludedb-0.9.15.tar.gz) = b9eb07df2fa569e046f6f2a143e98f3845bbcfff
 Size (libpreludedb-0.9.15.tar.gz) = 810314 bytes
-SHA1 (patch-aa) = a51e3b80b09f856c6cae21b0f0773d0a8a1eb95c
+SHA1 (patch-aa) = 664d99fd969a3f40f42c6a63622e471c796e9cb5
Index: options.mk
===================================================================
RCS file: options.mk
diff -N options.mk
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ options.mk  9 Dec 2008 12:45:15 -0000
@@ -0,0 +1,69 @@
+# $NetBSD: options.mk,v 1.8 2007/09/05 18:58:19 shannonjr Exp $
+
+PKG_OPTIONS_VAR=               PKG_OPTIONS.libpreludedb
+PKG_SUPPORTED_OPTIONS=         perl python
+PKG_OPTIONS_REQUIRED_GROUPS=   database
+PKG_OPTIONS_GROUP.database=    mysql pgsql sqlite3
+
+PKG_SUGGESTED_OPTIONS=         sqlite3
+
+.include "../../mk/bsd.options.mk"
+
+###
+### python is needed for prewikka
+###
+
+.if !empty(PKG_OPTIONS:Mperl)
+CONFIGURE_ARGS+=       --with-perl=${PERL5:Q} --with-perl-installdirs=vendor
+USE_TOOLS+=            perl:run
+
+PERL5_PACKLIST=                ${PERL5_VENDORARCH}auto/PreludeDB/.packlist
+PERL5_CONFIGURE=       no
+.include "../../lang/perl5/buildlink3.mk"
+.include "../../lang/perl5/module.mk"
+.else
+CONFIGURE_ARGS+=       --enable-perl=no
+.endif
+
+.if !empty(PKG_OPTIONS:Mpython)
+CONFIGURE_ENV+=                PYTHON=${PYTHONBIN:Q}
+PYBINMODULE=           yes
+PLIST_SRC+=            ${PKGDIR}/PLIST.py
+PY_PATCHPLIST=         yes
+.include "../../lang/python/application.mk"
+.include "../../lang/python/extension.mk"
+.else
+CONFIGURE_ARGS+=       --enable-python=no
+.endif
+
+.if !empty(PKG_OPTIONS:Mmysql)
+CONFIGURE_ARGS+=       --with-mysql=${BUILDLINK_PREFIX.mysql-client}
+CONFIGURE_ARGS+=       --with-mysql-prefix
+
+PLIST_SRC+=            ${PKGDIR}/PLIST.mysql
+.include "../../mk/mysql.buildlink3.mk"
+.else
+CONFIGURE_ARGS+=       --enable-mysql=no
+.endif
+
+.if !empty(PKG_OPTIONS:Mpgsql)
+CONFIGURE_ARGS+=       --with-pgsql=${PGSQL_PREFIX}
+CONFIGURE_ARGS+=       --with-pgsql-prefix=
+
+PLIST_SRC+=            ${PKGDIR}/PLIST.pgsql
+.include "../../mk/pgsql.buildlink3.mk"
+.else
+CONFIGURE_ARGS+=       --enable-pgsql=no
+.endif
+
+.if !empty(PKG_OPTIONS:Msqlite3)
+CONFIGURE_ARGS+=       --with-sqlite3=${BUILDLINK_PREFIX.sqlite3}
+CONFIGURE_ARGS+=       --with-sqlite3-prefix
+
+PLIST_SRC+=            ${PKGDIR}/PLIST.sqlite3
+.include "../../databases/sqlite3/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=       --enable-sqlite3=no
+.endif
+
+PLIST_SRC+=            ${PKGDIR}/PLIST
Index: patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/security/libpreludedb/patches/patch-aa,v
retrieving revision 1.1
diff -u -r1.1 patch-aa
--- patches/patch-aa    27 Aug 2008 22:37:09 -0000      1.1
+++ patches/patch-aa    9 Dec 2008 12:45:15 -0000
@@ -11,3 +11,52 @@
          { echo "$as_me:$LINENO: result: x86_64/static: adding -fPIC" >&5
  echo "${ECHO_T}x86_64/static: adding -fPIC" >&6; }
          { echo "$as_me:$LINENO: checking for a sed that does not truncate 
output" >&5
+@@ -22048,7 +22048,9 @@
+ if test "${with_mysql_prefix+set}" = set; then
+   withval=$with_mysql_prefix; mysql_required=true
+ else
+-  with_mysql=yes
++  if test x$enable_mysql != xno; then
++    with_mysql=yes
++  fi
+ fi
+ 
+ 
+@@ -22430,12 +22432,14 @@
+ if test "${with_pgsql_prefix+set}" = set; then
+   withval=$with_pgsql_prefix; pgsql_required=true
+ else
+-  with_pgsql=yes
++  if test x$enable_pgsql != xno; then
++    with_pgsql=yes
++  fi
+ fi
+ 
+ 
+ if test x$with_pgsql != xno; then
+-   if test x$with_pgsql != xyes; then default_path=$with_pgsql; fi
++   if test x$with_pgsql != xyes; then pgsql_path=$with_pgsql/bin; else 
pgsql_path=$PATH; fi
+ 
+    # Extract the first word of "pg_config", so it can be a program name with 
args.
+ set dummy pg_config; ac_word=$2
+@@ -22450,8 +22454,7 @@
+   ;;
+   *)
+   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-as_dummy="$PATH:$default_path/bin; fi"
+-for as_dir in $as_dummy
++for as_dir in $pgsql_path
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+@@ -22878,7 +22881,9 @@
+ if test "${with_sqlite3_prefix+set}" = set; then
+   withval=$with_sqlite3_prefix; sqlite3_required=true
+ else
+-  with_sqlite3=yes
++  if test x$enable_sqlite3 != xno; then
++    with_sqlite3=yes
++  fi
+ fi
+ 
+
Prev by Date: Re: pkg/40141 (apache restart not reliable)
Next by Date: Re: pkg/40142 (security/libpreludedb: added options.mk, fixed PLIST entries for the perl module)
Previous by Thread: PR/40138 CVS commit: pkgsrc/security/libprelude
Next by Thread: Re: pkg/40142: security/libpreludedb: added options.mk, fixed PLIST entries for the perl module
Indexes:
Home | Main Index | Thread Index | Old Index