CVS commit: pkgsrc/databases

["Kamil Rytarowski" <kamil%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   kamil
Date:           Fri Oct 21 23:32:40 UTC 2016

Modified Files:
        pkgsrc/databases/sqlite3: Makefile
        pkgsrc/databases/sqlite3-tcl: Makefile
Added Files:
        pkgsrc/databases/sqlite3: Makefile.common

Log Message:
Add sqlite3/Makefile.common for sqlite3 packages to share code

The intention is to reuse Makefile.common in devel/lemon.

Replace ${IS_BUILTIN.editline} == "yes" with !empty(IS_BUILTIN.editline:M[yY][eE][sS])


To generate a diff of this commit:
cvs rdiff -u -r1.108 -r1.109 pkgsrc/databases/sqlite3/Makefile
cvs rdiff -u -r0 -r1.49 pkgsrc/databases/sqlite3/Makefile.common
cvs rdiff -u -r1.81 -r1.82 pkgsrc/databases/sqlite3-tcl/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/databases/sqlite3/Makefile
diff -u pkgsrc/databases/sqlite3/Makefile:1.108 pkgsrc/databases/sqlite3/Makefile:1.109
--- pkgsrc/databases/sqlite3/Makefile:1.108     Wed Apr 20 05:04:44 2016
+++ pkgsrc/databases/sqlite3/Makefile   Fri Oct 21 23:32:40 2016
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.108 2016/04/20 05:04:44 adam Exp $
+# $NetBSD: Makefile,v 1.109 2016/10/21 23:32:40 kamil Exp $
+#
+# used by databases/sqlite3-tcl/Makefile
+
+.include "Makefile.common"
 
-DISTNAME=      sqlite-autoconf-${SQLITE3_DISTVERSION}
 PKGNAME=       sqlite3-${SQLITE3_VERSION}
 CATEGORIES=    databases
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=      http://www.sqlite.org/
 COMMENT=       SQL Database Engine in a C Library
-LICENSE=       public-domain
 
-.include "../../databases/sqlite3/Makefile.version"
 .include "options.mk"
 
 USE_LIBTOOL=           yes
@@ -17,8 +17,6 @@ USE_TOOLS+=           gmake
 GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --disable-static-shell
 
-PKGCONFIG_OVERRIDE+=   sqlite3.pc.in
-
 INSTALLATION_DIRS+=    ${PKGMANDIR}/man1
 
 .include "../../mk/bsd.prefs.mk"
@@ -49,7 +47,7 @@ LDFLAGS.SCO_SV+=      -lpthread
 .endif
 
 .include "../../mk/readline.buildlink3.mk"
-.if ${READLINE_TYPE} == "editline" && ${IS_BUILTIN.editline} == "yes"
+.if ${READLINE_TYPE} == "editline" && !empty(IS_BUILTIN.editline:M[yY][eE][sS])
 LDFLAGS.NetBSD+=       -ledit
 LDFLAGS.DragonFly+=    -ledit
 LDFLAGS.FreeBSD+=      -ledit

Index: pkgsrc/databases/sqlite3-tcl/Makefile
diff -u pkgsrc/databases/sqlite3-tcl/Makefile:1.81 pkgsrc/databases/sqlite3-tcl/Makefile:1.82
--- pkgsrc/databases/sqlite3-tcl/Makefile:1.81  Wed Apr 20 05:04:44 2016
+++ pkgsrc/databases/sqlite3-tcl/Makefile       Fri Oct 21 23:32:40 2016
@@ -1,15 +1,12 @@
-# $NetBSD: Makefile,v 1.81 2016/04/20 05:04:44 adam Exp $
+# $NetBSD: Makefile,v 1.82 2016/10/21 23:32:40 kamil Exp $
+
+.include "../../databases/sqlite3/Makefile.common"
 
-DISTNAME=      sqlite-autoconf-${SQLITE3_DISTVERSION}
 PKGNAME=       sqlite3-tcl-${SQLITE3_VERSION}
 CATEGORIES=    databases
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=      http://www.sqlite.org/
 COMMENT=       SQL Database Engine in a C Library (TCL extension)
-LICENSE=       public-domain
-
-.include "../../databases/sqlite3/Makefile.version"
 
 WRKSRC=                ${WRKDIR}/${DISTNAME}/tea
 

Added files:

Index: pkgsrc/databases/sqlite3/Makefile.common
diff -u /dev/null pkgsrc/databases/sqlite3/Makefile.common:1.49
--- /dev/null   Fri Oct 21 23:32:40 2016
+++ pkgsrc/databases/sqlite3/Makefile.common    Fri Oct 21 23:32:40 2016
@@ -0,0 +1,10 @@
+# $NetBSD: Makefile.common,v 1.49 2016/10/21 23:32:40 kamil Exp $
+
+DISTNAME=      sqlite-autoconf-${SQLITE3_DISTVERSION}
+
+HOMEPAGE=      http://www.sqlite.org/
+LICENSE=       public-domain
+
+.include "../../databases/sqlite3/Makefile.version"
+
+PKGCONFIG_OVERRIDE+=   sqlite3.pc.in