summaryrefslogtreecommitdiff
path: root/databases
diff options
context:
space:
mode:
authorjmmv <jmmv@pkgsrc.org>2005-03-23 22:08:06 +0000
committerjmmv <jmmv@pkgsrc.org>2005-03-23 22:08:06 +0000
commitaa34e16c5e3ea2ff49f4521a1bb240fd388a34d6 (patch)
tree550d37bbf5238b62bc18dc6b022090d8f6ba45be /databases
parent891082d5779a2e7b31d1486d2e8f700502eff463 (diff)
downloadpkgsrc-aa34e16c5e3ea2ff49f4521a1bb240fd388a34d6.tar.gz
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 (limited to 'databases')
-rw-r--r--databases/sqlite3/Makefile21
-rw-r--r--databases/sqlite3/Makefile.common21
-rw-r--r--databases/sqlite3/PLIST5
-rw-r--r--databases/sqlite3/options.mk16
4 files changed, 26 insertions, 37 deletions
diff --git a/databases/sqlite3/Makefile b/databases/sqlite3/Makefile
index c1daac890aa..52dc31f2bbf 100644
--- a/databases/sqlite3/Makefile
+++ b/databases/sqlite3/Makefile
@@ -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
-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 --git a/databases/sqlite3/Makefile.common b/databases/sqlite3/Makefile.common
new file mode 100644
index 00000000000..cfb8939794a
--- /dev/null
+++ b/databases/sqlite3/Makefile.common
@@ -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
+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 --git a/databases/sqlite3/PLIST b/databases/sqlite3/PLIST
index 4c59295f768..d407882957d 100644
--- a/databases/sqlite3/PLIST
+++ b/databases/sqlite3/PLIST
@@ -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 --git a/databases/sqlite3/options.mk b/databases/sqlite3/options.mk
deleted file mode 100644
index 4bcc23cafe2..00000000000
--- a/databases/sqlite3/options.mk
+++ /dev/null
@@ -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