pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/databases/sqlrelay Explicitly disable all features not...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/43b03c349d62
branches:  trunk
changeset: 511892:43b03c349d62
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Tue Apr 25 13:51:24 2006 +0000

description:
Explicitly disable all features not enabled via option.
The configure script is too agreessive and bypasses the buildlink3
framework.
Add options for sqlite, odbc, freetds and perl.
Fix PLIST. Bump revision. OK by maintainer.

diffstat:

 databases/sqlrelay/Makefile   |  25 ++++++++++------
 databases/sqlrelay/PLIST      |  26 +++++++++++++++++-
 databases/sqlrelay/options.mk |  63 ++++++++++++++++++++++++++++++++++++++++--
 3 files changed, 99 insertions(+), 15 deletions(-)

diffs (177 lines):

diff -r 7b9cd28c48a7 -r 43b03c349d62 databases/sqlrelay/Makefile
--- a/databases/sqlrelay/Makefile       Tue Apr 25 13:43:59 2006 +0000
+++ b/databases/sqlrelay/Makefile       Tue Apr 25 13:51:24 2006 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2006/03/29 01:28:46 gavan Exp $
+# $NetBSD: Makefile,v 1.13 2006/04/25 13:51:24 joerg Exp $
 
 DISTNAME=              sqlrelay-0.37
+PKGREVISION=           1
 CATEGORIES=            databases
 MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=sqlrelay/}
 
@@ -13,13 +14,20 @@
 USE_TOOLS+=            gmake
 USE_LIBTOOL=           YES
 
-PERL5_PACKLIST=                auto/SQLRelay/Connection/.packlist
-PERL5_PACKLIST+=       auto/SQLRelay/Cursor/.packlist
-PERL5_PACKLIST+=       auto/DBD/SQLRelay/.packlist
-CONFIGURE_ARGS+=       --with-perl-site-arch=${PERL5_INSTALLVENDORARCH:Q}
-CONFIGURE_ARGS+=       --with-perl-site-lib=${PERL5_INSTALLVENDORLIB:Q}
-CONFIGURE_ARGS+=       --with-perl-install-man3-dir=${PERL5_INSTALLVENDORMAN3DIR:Q}
 CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR:Q}
+CONFIGURE_ARGS+=       --disable-oracle
+CONFIGURE_ARGS+=       --disable-sybase
+CONFIGURE_ARGS+=       --disable-db2
+CONFIGURE_ARGS+=       --disable-interbase
+CONFIGURE_ARGS+=       --disable-mdbtools
+CONFIGURE_ARGS+=       --disable-msql
+CONFIGURE_ARGS+=       --disable-python
+CONFIGURE_ARGS+=       --disable-zope
+CONFIGURE_ARGS+=       --disable-ruby
+CONFIGURE_ARGS+=       --disable-java
+CONFIGURE_ARGS+=       --disable-php
+CONFIGURE_ARGS+=       --disable-tcl
+CONFIGURE_ARGS+=       --disable-gtk
 MAKE_ENV+=             EXAMPLESDIR=${EGDIR:Q}
 
 PKG_SYSCONFSUBDIR=     sqlrelay
@@ -38,7 +46,4 @@
 .include "options.mk"
 
 .include "../../devel/rudiments/buildlink3.mk"
-.include "../../lang/perl5/buildlink3.mk"
-.include "../../lang/perl5/packlist.mk"
-.include "../../lang/perl5/vars.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 7b9cd28c48a7 -r 43b03c349d62 databases/sqlrelay/PLIST
--- a/databases/sqlrelay/PLIST  Tue Apr 25 13:43:59 2006 +0000
+++ b/databases/sqlrelay/PLIST  Tue Apr 25 13:51:24 2006 +0000
@@ -1,8 +1,18 @@
-@comment $NetBSD: PLIST,v 1.3 2006/03/29 01:28:46 gavan Exp $
+@comment $NetBSD: PLIST,v 1.4 2006/04/25 13:51:24 joerg Exp $
 bin/backupschema
 bin/fields
 bin/query
 bin/sqlr-cachemanager
+${COND_FREETDS}bin/sqlr-connection-freetds
+${COND_FREETDS}bin/sqlr-connection-freetds-debug
+${COND_MYSQL}bin/sqlr-connection-mysql
+${COND_MYSQL}bin/sqlr-connection-mysql-debug
+${COND_ODBC}bin/sqlr-connection-odbc
+${COND_ODBC}bin/sqlr-connection-odbc-debug
+${COND_PGSQL}bin/sqlr-connection-postgresql
+${COND_PGSQL}bin/sqlr-connection-postgresql-debug
+${COND_SQLITE}bin/sqlr-connection-sqlite
+${COND_SQLITE}bin/sqlr-connection-sqlite-debug
 bin/sqlr-export
 bin/sqlr-import
 bin/sqlr-listener
@@ -46,6 +56,16 @@
 man/man8/sqlr-scaler.8
 man/man8/sqlr-start.8
 man/man8/sqlr-stop.8
+${COND_PERL}${PERL5_SUB_INSTALLVENDORMAN3DIR}/SQLRelay::Connection.3
+${COND_PERL}${PERL5_SUB_INSTALLVENDORMAN3DIR}/SQLRelay::Cursor.3
+${COND_PERL}${PERL5_SUB_INSTALLVENDORARCH}/SQLRelay/Connection.pm
+${COND_PERL}${PERL5_SUB_INSTALLVENDORARCH}/SQLRelay/Cursor.pm
+${COND_PERL}${PERL5_SUB_INSTALLVENDORARCH}/auto/SQLRelay/Connection/Connection.so
+${COND_PERL}${PERL5_SUB_INSTALLVENDORARCH}/auto/SQLRelay/Cursor/Cursor.so
+${COND_PYTHON}${PYSITELIB}/SQLRelay/CSQLRelay.so
+${COND_PYTHON}${PYSITELIB}/SQLRelay/PySQLRClient.py
+${COND_PYTHON}${PYSITELIB}/SQLRelay/PySQLRDB.py
+${COND_PYTHON}${PYSITELIB}/SQLRelay/__init__.py
 share/doc/sqlrelay/api/c++/sqlrclient.h.html
 share/doc/sqlrelay/api/c/sqlrclientwrapper.h.html
 share/doc/sqlrelay/api/java/allclasses-frame.html
@@ -125,6 +145,10 @@
 share/doc/sqlrelay/running.html
 share/doc/sqlrelay/tuning.html
 share/doc/sqlrelay/windows.html
+share/examples/rc.d/sqlrelay
+share/examples/sqlrelay/sqlrelay.conf.example
+share/examples/sqlrelay/sqlrelay.dtd
+@dirrm share/examples/sqlrelay
 @dirrm share/doc/sqlrelay/programming/zope
 @dirrm share/doc/sqlrelay/programming
 @dirrm share/doc/sqlrelay/gettingstarted/sybase
diff -r 7b9cd28c48a7 -r 43b03c349d62 databases/sqlrelay/options.mk
--- a/databases/sqlrelay/options.mk     Tue Apr 25 13:43:59 2006 +0000
+++ b/databases/sqlrelay/options.mk     Tue Apr 25 13:51:24 2006 +0000
@@ -1,16 +1,71 @@
-# $NetBSD: options.mk,v 1.3 2006/01/01 18:53:03 wiz Exp $
+# $NetBSD: options.mk,v 1.4 2006/04/25 13:51:24 joerg Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.sqlrelay
-PKG_SUPPORTED_OPTIONS+= mysql pgsql
+PKG_SUPPORTED_OPTIONS+= mysql pgsql sqlite odbc freetds perl
 
 .include "../../mk/bsd.options.mk"
 
+.if !empty(PKG_OPTIONS:Mperl)
+PERL5_PACKLIST=                auto/SQLRelay/Connection/.packlist
+PERL5_PACKLIST+=       auto/SQLRelay/Cursor/.packlist
+PERL5_PACKLIST+=       auto/DBD/SQLRelay/.packlist
+
+CONFIGURE_ARGS+=       --with-perl-site-arch=${PERL5_INSTALLVENDORARCH:Q}
+CONFIGURE_ARGS+=       --with-perl-site-lib=${PERL5_INSTALLVENDORLIB:Q}
+CONFIGURE_ARGS+=       --with-perl-install-man3-dir=${PERL5_INSTALLVENDORMAN3DIR:Q}
+
+PLIST_SUBST+=  COND_PERL=""
+
+.include "../../lang/perl5/buildlink3.mk"
+.include "../../lang/perl5/packlist.mk"
+.include "../../lang/perl5/vars.mk"
+
+.else
+CONFIGURE_ARGS+=       --disable-perl
+PLIST_SUBST+=  COND_PERL="@comment "
+.endif
+
 .if !empty(PKG_OPTIONS:Mmysql)
-CONFIGURE_ARGS+=       --with-mysql=${BUILDLINK_DIR:Q}
+CONFIGURE_ARGS+=       --with-mysql=${BUILDLINK_PREFIX.mysql-client:Q}
+PLIST_SUBST+=  COND_MYSQL=""
 .include "../../mk/mysql.buildlink3.mk"
+.else
+CONFIGURE_ARGS+=       --disable-mysql
+PLIST_SUBST+=  COND_MYSQL="@comment "
 .endif
 
 .if !empty(PKG_OPTIONS:Mpgsql)
-CONFIGURE_ARGS+=       --with-postgresql=${BUILDLINK_DIR:Q}
+CONFIGURE_ARGS+=       --with-postgresql=${PGSQL_PREFIX:Q}
 .include "../../mk/pgsql.buildlink3.mk"
+PLIST_SUBST+=  COND_PGSQL=""
+.else
+CONFIGURE_ARGS+=       --disable-postgresql
+PLIST_SUBST+=  COND_PGSQL="@comment "
 .endif
+
+.if !empty(PKG_OPTIONS:Msqlite)
+CONFIGURE_ARGS+=       --with-sqlite=${BUILDLINK_PREFIX.sqlite3:Q}
+PLIST_SUBST+=  COND_SQLITE=""
+.include "../../databases/sqlite3/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=       --disable-sqlite
+PLIST_SUBST+=  COND_SQLITE="@comment "
+.endif
+
+.if !empty(PKG_OPTIONS:Modbc)
+CONFIGURE_ARGS+=       --with-odbc=${BUILDLINK_PREFIX.unixodbc:Q}
+PLIST_SUBST+=  COND_ODBC=""
+.include "../../databases/unixodbc/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=       --disable-odbc
+PLIST_SUBST+=  COND_ODBC="@comment "
+.endif
+
+.if !empty(PKG_OPTIONS:Mfreetds)
+CONFIGURE_ARGS+=       --with-freetds=${BUILDLINK_PREFIX.freetds:Q}
+PLIST_SUBST+=  COND_FREETDS=""
+.include "../../databases/freetds/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=       --disable-freetds
+PLIST_SUBST+=  COND_ODBC="@comment "
+.endif



Home | Main Index | Thread Index | Old Index