[pkgsrc/trunk]: pkgsrc Upgrade lemon 1.0 from sqlite 3.5.9 to lemon 1.0 from ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/f672731cdfca
branches:  trunk
changeset: 354194:f672731cdfca
user:      kamil <kamil%pkgsrc.org@localhost>
date:      Sat Oct 22 00:18:39 2016 +0000

description:
Upgrade lemon 1.0 from sqlite 3.5.9 to lemon 1.0 from sqlite 3.15.0

pkgsrc changes
==============

Bind this package with databases/sqlite3 to get immediate updates along
with the sqlite3 package.

Set new versioning policy and concatenate versions of lemon and sqlite3.
The reasoning for it is as follows:
 - currently lemon is an integral part of sqlite3
 - lemon has its own conservative versioning regardless of changes in its code
 - leave room for possible standalone lemon package with bumped versions
 - reflect reality and make it human readable without checking the sources

Set LICENSE to public-domain.

Install documentation in the HTML format.

Compile with LDFLAGS set.

Finally don't use databases/sqlite3/Makefile.common as lemon is not
distributed in the same archive. Make use of Makefile.version that does the
same job of tracking upstream.

Do not set PKGCONFIG_OVERRIDE in Makefile.common, it is not accessible in
sqlite3-tcl.

Upstream changelog
==================

Changes are unknown, but at least the program acquired a -T command line
option used by brlcad.

diffstat:

 databases/sqlite3/Makefile         |   4 +++-
 databases/sqlite3/Makefile.common  |   4 +---
 databases/sqlite3/Makefile.version |   4 +++-
 devel/lemon/Makefile               |  33 +++++++++++++++++++++------------
 devel/lemon/PLIST                  |   3 ++-
 devel/lemon/distinfo               |  10 +++++-----
 6 files changed, 35 insertions(+), 23 deletions(-)

diffs (126 lines):

diff -r e5a3df52fc62 -r f672731cdfca databases/sqlite3/Makefile
--- a/databases/sqlite3/Makefile        Fri Oct 21 23:32:40 2016 +0000
+++ b/databases/sqlite3/Makefile        Sat Oct 22 00:18:39 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.109 2016/10/21 23:32:40 kamil Exp $
+# $NetBSD: Makefile,v 1.110 2016/10/22 00:18:39 kamil Exp $
 #
 # used by databases/sqlite3-tcl/Makefile
 
@@ -17,6 +17,8 @@
 GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --disable-static-shell
 
+PKGCONFIG_OVERRIDE+=   sqlite3.pc.in
+
 INSTALLATION_DIRS+=    ${PKGMANDIR}/man1
 
 .include "../../mk/bsd.prefs.mk"
diff -r e5a3df52fc62 -r f672731cdfca databases/sqlite3/Makefile.common
--- a/databases/sqlite3/Makefile.common Fri Oct 21 23:32:40 2016 +0000
+++ b/databases/sqlite3/Makefile.common Sat Oct 22 00:18:39 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.49 2016/10/21 23:32:40 kamil Exp $
+# $NetBSD: Makefile.common,v 1.50 2016/10/22 00:18:39 kamil Exp $
 
 DISTNAME=      sqlite-autoconf-${SQLITE3_DISTVERSION}
 
@@ -6,5 +6,3 @@
 LICENSE=       public-domain
 
 .include "../../databases/sqlite3/Makefile.version"
-
-PKGCONFIG_OVERRIDE+=   sqlite3.pc.in
diff -r e5a3df52fc62 -r f672731cdfca databases/sqlite3/Makefile.version
--- a/databases/sqlite3/Makefile.version        Fri Oct 21 23:32:40 2016 +0000
+++ b/databases/sqlite3/Makefile.version        Sat Oct 22 00:18:39 2016 +0000
@@ -1,7 +1,9 @@
-# $NetBSD: Makefile.version,v 1.22 2016/10/17 12:17:49 adam Exp $
+# $NetBSD: Makefile.version,v 1.23 2016/10/22 00:18:39 kamil Exp $
+#
 # used by databases/sqlite3/Makefile
 # used by databases/sqlite3-docs/Makefile
 # used by databases/sqlite3-tcl/Makefile
+# used by devel/lemon/Makefile
 
 SQLITE3_DISTVERSION=   3150000
 SQLITE3_VERSION=       3.15.0
diff -r e5a3df52fc62 -r f672731cdfca devel/lemon/Makefile
--- a/devel/lemon/Makefile      Fri Oct 21 23:32:40 2016 +0000
+++ b/devel/lemon/Makefile      Sat Oct 22 00:18:39 2016 +0000
@@ -1,19 +1,27 @@
-# $NetBSD: Makefile,v 1.2 2012/10/31 11:17:10 asau Exp $
+# $NetBSD: Makefile,v 1.3 2016/10/22 00:18:39 kamil Exp $
+
+.include "../../databases/sqlite3/Makefile.version"
+
+LEMON_VERSION= 1.0
 
-PKGNAME=       lemon-1.0
-DISTNAME=      sqlite-3.5.9
-PKGREVISION=   1
+# Concatenate versions of lemon and sqlite3
+# The reasoning for it is as follows:
+# - currently lemon is an integral part of sqlite3
+# - lemon has its own conservative versioning regardless of changes in its code
+# - leave room for possible standalone lemon package with bumped versions
+# - reflect reality and make it human readable without checking the sources
+
+PKGNAME=       lemon-${LEMON_VERSION}.${SQLITE3_VERSION}
+DISTNAME=      sqlite-src-${SQLITE3_DISTVERSION}
 CATEGORIES=    devel
-MASTER_SITES=  http://www.hwaci.com/sw/sqlite/ \
-               http://www.sqlite.org/
+EXTRACT_SUFX=  .zip
 
 MAINTAINER=    airhead%users.sf.net@localhost
 HOMEPAGE=      http://www.hwaci.com/sw/lemon/
 COMMENT=       Simple LALR(1) parser generator
+LICENSE=       public-domain
 
-WRKSRC=                ${WRKDIR}/${DISTNAME}/tool
-
-INSTALLATION_DIRS=     bin share/lemon
+INSTALLATION_DIRS=     bin share/lemon share/doc/lemon
 
 SUBST_CLASSES+=                paths
 SUBST_FILES.paths=     lemon.c
@@ -21,10 +29,11 @@
 SUBST_STAGE.paths=     post-patch
 
 do-build:
-       cd ${WRKSRC} && ${CC} ${CFLAGS} lemon.c -o lemon
+       cd ${WRKSRC}/tool && ${CC} ${CFLAGS} ${LDFLAGS} lemon.c -o lemon
 
 do-install:
-       ${INSTALL_PROGRAM} ${WRKSRC}/lemon ${DESTDIR}${PREFIX}/bin
-       ${INSTALL_DATA} ${WRKSRC}/lempar.c ${DESTDIR}${PREFIX}/share/lemon
+       ${INSTALL_PROGRAM} ${WRKSRC}/tool/lemon ${DESTDIR}${PREFIX}/bin
+       ${INSTALL_DATA} ${WRKSRC}/tool/lempar.c ${DESTDIR}${PREFIX}/share/lemon
+       ${INSTALL_DATA} ${WRKSRC}/doc/lemon.html ${DESTDIR}${PREFIX}/share/doc/lemon
 
 .include "../../mk/bsd.pkg.mk"
diff -r e5a3df52fc62 -r f672731cdfca devel/lemon/PLIST
--- a/devel/lemon/PLIST Fri Oct 21 23:32:40 2016 +0000
+++ b/devel/lemon/PLIST Sat Oct 22 00:18:39 2016 +0000
@@ -1,3 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 17:48:50 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2016/10/22 00:18:39 kamil Exp $
 bin/lemon
+share/doc/lemon/lemon.html
 share/lemon/lempar.c
diff -r e5a3df52fc62 -r f672731cdfca devel/lemon/distinfo
--- a/devel/lemon/distinfo      Fri Oct 21 23:32:40 2016 +0000
+++ b/devel/lemon/distinfo      Sat Oct 22 00:18:39 2016 +0000
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2015/11/03 03:27:38 agc Exp $
+$NetBSD: distinfo,v 1.3 2016/10/22 00:18:39 kamil Exp $
 
-SHA1 (sqlite-3.5.9.tar.gz) = 8d81fb4ff606095734e721e3cf00bc9d3859a055
-RMD160 (sqlite-3.5.9.tar.gz) = ddaae6866419668021037a497c363e6194de7de5
-SHA512 (sqlite-3.5.9.tar.gz) = 9f24cf77233bd80d4015ed009a2dfd76491d9ff2c0adf7f5ad19db21180cc8dacafb94c1c28f160f1aaf052ff8d343538f15ab6f0725f93cad0c4460fc15ddd1
-Size (sqlite-3.5.9.tar.gz) = 2201083 bytes
+SHA1 (sqlite-src-3150000.zip) = 48aaa84b12f4c6c500ac2d7b99fa5efbd5183bf1
+RMD160 (sqlite-src-3150000.zip) = 6abbed030146863e05202eff8a4b935e375836d4
+SHA512 (sqlite-src-3150000.zip) = 1d3a3a0393f52ea5c9bbe5f2d08722f98d59ac6d4ee28493fa48c446e84ace25880ff169176ea445a92c97b6876211cc3736cf90e757408c8605f0d7ce3c0e31
+Size (sqlite-src-3150000.zip) = 9630655 bytes