[pkgsrc/trunk]: pkgsrc/databases/sqlite3 Remove the 'tcl' option and split th...

[jmmv <jmmv%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/902c5f94d5e0
branches:  trunk
changeset: 491396:902c5f94d5e0
user:      jmmv <jmmv%pkgsrc.org@localhost>
date:      Wed Mar 23 22:08:06 2005 +0000

description:
Remove the 'tcl' option and split the Makefile in two parts to aid in the
addition of the new sqlite3-tcl package.  The TCL bindings can be easily
built and installed independently, so it's better to have an standalone
package rather than a build-time option.

While here, fix PKGCONFIG_OVERRIDE and bump PKGREVISION to 2.

diffstat:

 databases/sqlite3/Makefile        |  21 ++++-----------------
 databases/sqlite3/Makefile.common |  21 +++++++++++++++++++++
 databases/sqlite3/PLIST           |   5 +----
 databases/sqlite3/options.mk      |  16 ----------------
 4 files changed, 26 insertions(+), 37 deletions(-)

diffs (90 lines):

diff -r 36c43e3f9eb6 -r 902c5f94d5e0 databases/sqlite3/Makefile
--- a/databases/sqlite3/Makefile        Wed Mar 23 21:59:47 2005 +0000
+++ b/databases/sqlite3/Makefile        Wed Mar 23 22:08:06 2005 +0000
@@ -1,23 +1,10 @@
-# $NetBSD: Makefile,v 1.3 2005/03/07 14:59:06 adam Exp $
+# $NetBSD: Makefile,v 1.4 2005/03/23 22:08:06 jmmv Exp $
 
-DISTNAME=      sqlite-3.1.3
-PKGNAME=       ${DISTNAME:S/-/3-/}
-PKGREVISION=   1
-CATEGORIES=    databases
-MASTER_SITES=  http://www.hwaci.com/sw/sqlite/ \
-               http://www.sqlite.org/
+.include "Makefile.common"
 
-MAINTAINER=    tech-pkg%NetBSD.org@localhost
-HOMEPAGE=      http://www.hwaci.com/sw/sqlite/
-COMMENT=       SQL Database Engine in a C Library
+PKGREVISION=           2
 
-USE_BUILDLINK3=                yes
-USE_GNU_TOOLS+=                make
-USE_LIBTOOL=           yes
-GNU_CONFIGURE=         yes
-PKGCONFIG_OVERRIDE=    ${WRKDIR}/sqlite/sqlite3.pc.in
-
-.include "options.mk"
+CONFIGURE_ARGS+=       --disable-tcl
 
 post-install:
        ${INSTALL_MAN} ${WRKSRC}/sqlite3.1 ${PREFIX}/man/man1/sqlite3.1
diff -r 36c43e3f9eb6 -r 902c5f94d5e0 databases/sqlite3/Makefile.common
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/databases/sqlite3/Makefile.common Wed Mar 23 22:08:06 2005 +0000
@@ -0,0 +1,21 @@
+# $NetBSD: Makefile.common,v 1.1 2005/03/23 22:08:06 jmmv Exp $
+
+DISTNAME=      sqlite-3.1.3
+PKGNAME=       ${DISTNAME:S/-/3-/}
+CATEGORIES=    databases
+MASTER_SITES=  http://www.hwaci.com/sw/sqlite/ \
+               http://www.sqlite.org/
+
+MAINTAINER=    tech-pkg%NetBSD.org@localhost
+HOMEPAGE=      http://www.hwaci.com/sw/sqlite/
+COMMENT=       SQL Database Engine in a C Library
+
+DISTINFO_FILE= ${.CURDIR}/../../databases/sqlite3/distinfo
+PATCHDIR=      ${.CURDIR}/../../databases/sqlite3/patches
+
+GNU_CONFIGURE=         yes
+USE_BUILDLINK3=                yes
+USE_GNU_TOOLS+=                make
+USE_LIBTOOL=           yes
+
+PKGCONFIG_OVERRIDE=    sqlite3.pc.in
diff -r 36c43e3f9eb6 -r 902c5f94d5e0 databases/sqlite3/PLIST
--- a/databases/sqlite3/PLIST   Wed Mar 23 21:59:47 2005 +0000
+++ b/databases/sqlite3/PLIST   Wed Mar 23 22:08:06 2005 +0000
@@ -1,9 +1,6 @@
-@comment $NetBSD: PLIST,v 1.2 2005/03/07 14:59:06 adam Exp $
+@comment $NetBSD: PLIST,v 1.3 2005/03/23 22:08:06 jmmv Exp $
 bin/sqlite3
 include/sqlite3.h
 lib/libsqlite3.la
 lib/pkgconfig/sqlite3.pc
-${TCL_COMMENT}lib/tcl8.4/sqlite3/libtclsqlite3.so
-${TCL_COMMENT}lib/tcl8.4/sqlite3/pkgIndex.tcl
-${TCL_COMMENT}@dirrm lib/tcl8.4/sqlite3
 man/man1/sqlite3.1
diff -r 36c43e3f9eb6 -r 902c5f94d5e0 databases/sqlite3/options.mk
--- a/databases/sqlite3/options.mk      Wed Mar 23 21:59:47 2005 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-# $NetBSD: options.mk,v 1.1 2005/03/07 14:59:06 adam Exp $
-
-PKG_OPTIONS_VAR=       PKG_OPTIONS.sqlite3
-PKG_DEFAULT_OPTIONS=   # empty
-PKG_SUPPORTED_OPTIONS= tcl
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Mtcl)
-CONFIGURE_ARGS+=       --with-tcl=${BUILDLINK_PREFIX.tcl}/lib
-PLIST_SUBST+=          TCL_COMMENT=
-.  include "../../lang/tcl/buildlink3.mk"
-.else
-CONFIGURE_ARGS+=       --disable-tcl
-PLIST_SUBST+=          TCL_COMMENT="@comment "
-.endif