Imported Upstream version 20220101upstream/20220101

9 files changed, 47 insertions, 33 deletions

diff --git a/package/byacc.spec b/package/byacc.spec
index 36f1d62..9cff7ab 100644
--- a/package/byacc.spec
+++ b/package/byacc.spec
@@ -1,9 +1,9 @@
 Summary: byacc - public domain Berkeley LALR Yacc parser generator
 %define AppProgram byacc
-%define AltProgram btyacc
-%define AppVersion 20211224
+%define AltProgram byacc2
+%define AppVersion 20220101
 %define UseProgram yacc
-# $Id: byacc.spec,v 1.60 2021/12/25 00:13:22 tom Exp $
+# $Id: byacc.spec,v 1.62 2022/01/01 14:59:55 tom Exp $
 Name: %{AppProgram}
 Version: %{AppVersion}
 Release: 1
@@ -20,10 +20,10 @@ parsers consist of a set of LALR(1) parsing tables and a driver
 routine written in the C programming language.  It has a public domain
 license which includes the generated C.
 
-%package -n btyacc
+%package -n byacc2
 Summary:        Curses library with POSIX thread support.
 
-%description -n btyacc
+%description -n byacc2
 This package provides a parser generator utility that reads a grammar
 specification from a file and generates an LR(1) parser for it.  The
 parsers consist of a set of LALR(1) parsing tables and a driver
@@ -58,18 +58,16 @@ pushd BUILD-byacc
 CONFIGURE_TOP=%{my_srcdir} \
 %configure %{CFG_OPTS} \
   --program-prefix=b \
-  --program-transform-name='s,\^,b,'
 make
 popd
 
-mkdir BUILD-btyacc
-pushd BUILD-btyacc
+mkdir BUILD-byacc2
+pushd BUILD-byacc2
 CONFIGURE_TOP=%{my_srcdir} \
 %configure %{CFG_OPTS} \
   --enable-btyacc \
-  --program-prefix=bt \
+  --program-transform-name='s,\<yacc,byacc2,g' \
   --with-max-table-size=123456 \
-  --program-transform-name='s,\^,bt,'
 make
 popd
 
@@ -81,7 +79,7 @@ make install DESTDIR=$RPM_BUILD_ROOT
 ( cd $RPM_BUILD_ROOT%{_bindir} && ln -vs %{AppProgram} %{UseProgram} )
 popd
 
-pushd BUILD-btyacc
+pushd BUILD-byacc2
 make install DESTDIR=$RPM_BUILD_ROOT
 popd
 
@@ -94,7 +92,7 @@ popd
 %{_prefix}/bin/%{UseProgram}
 %{_mandir}/man1/%{AppProgram}.*
 
-%files -n btyacc
+%files -n byacc2
 %defattr(-,root,root)
 %{_prefix}/bin/%{AltProgram}
 %{_mandir}/man1/%{AltProgram}.*
@@ -102,6 +100,9 @@ popd
 %changelog
 # each patch should add its ChangeLog entries here
 
+* Sat Jan 01 2022 Thomas Dickey
+- rename btyacc package to byacc2 to co-exist with traditional btyacc
+
 * Fri May 25 2018 Thomas Dickey
 - add btyacc package
 
diff --git a/package/debian/changelog b/package/debian/changelog
index 84f3ee6..bf3dee9 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,3 +1,9 @@
+byacc (20220101) unstable; urgency=low
+
+  * maintenance updates
+
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 01 Jan 2022 07:06:35 -0500
+
 byacc (20211224) unstable; urgency=low
 
   * maintenance updates
diff --git a/package/debian/control b/package/debian/control
index a6b8644..46beb2f 100644
--- a/package/debian/control
+++ b/package/debian/control
@@ -8,6 +8,7 @@ Homepage: https://invisible-island.net/byacc/
 Vcs-Git: https://salsa.debian.org/dickey/byacc
 
 Package: byacc
+Provides: yacc
 Architecture: any
 Multi-Arch: foreign
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -18,7 +19,8 @@ Description: public domain Berkeley LALR Yacc parser generator
  routine written in the C programming language.  It has a public domain
  license which includes the generated C.
 
-Package: btyacc
+Package: byacc2
+Provides: yacc
 Architecture: any
 Multi-Arch: foreign
 Depends: ${shlibs:Depends}, ${misc:Depends}
diff --git a/package/debian/copyright b/package/debian/copyright
index 073020c..dbbb151 100644
--- a/package/debian/copyright
+++ b/package/debian/copyright
@@ -36,7 +36,7 @@ skeleton.c with the bug report.  Do not expect rapid responses.
 
 Files: aclocal.m4
 Licence: other-BSD
-Copyright:  2004-2020,2021 by Thomas E. Dickey
+Copyright:  2004-2021,2022 by Thomas E. Dickey
     Permission is hereby granted, free of charge, to any person obtaining a
     copy of this software and associated documentation files (the
     "Software"), to deal in the Software without restriction, including
diff --git a/package/debian/postinst b/package/debian/postinst
index ca6276d..28bcd08 100644
--- a/package/debian/postinst
+++ b/package/debian/postinst
@@ -8,6 +8,10 @@ if [ $1 != "upgrade" ] ; then
 		--install /usr/bin/yacc yacc /usr/bin/byacc 80 \
 		--slave /usr/share/man/man1/yacc.1.gz yaccman \
 			/usr/share/man/man1/byacc.1.gz
+	update-alternatives \
+		--install /usr/bin/yacc yacc /usr/bin/byacc2 80 \
+		--slave /usr/share/man/man1/yacc.1.gz yaccman \
+			/usr/share/man/man1/byacc2.1.gz
 fi
 
 #DEBHELPER#
diff --git a/package/debian/prerm b/package/debian/prerm
index f3889d7..d300dcf 100644
--- a/package/debian/prerm
+++ b/package/debian/prerm
@@ -5,6 +5,7 @@ set -e
 
 if [ $1 != "upgrade" ]; then
 	update-alternatives --remove yacc /usr/bin/byacc
+	update-alternatives --remove yacc /usr/bin/byacc2
 fi
 
 #DEBHELPER#
diff --git a/package/debian/rules b/package/debian/rules
index b71dc19..acd148e 100755
--- a/package/debian/rules
+++ b/package/debian/rules
@@ -1,5 +1,5 @@
 #!/usr/bin/make -f
-# $Id: rules,v 1.6 2021/12/25 01:55:41 tom Exp $
+# $Id: rules,v 1.7 2022/01/01 13:01:37 tom Exp $
 #
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
@@ -9,7 +9,7 @@
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
-PACKAGES.arch  = byacc btyacc
+PACKAGES.arch  = byacc byacc2
 
 CPPFLAGS	:= $(shell dpkg-buildflags --get CPPFLAGS)
 CFLAGS		:= $(shell dpkg-buildflags --get CFLAGS)
@@ -25,10 +25,10 @@ ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
 endif
 
 BYACC_DIR = $(CURDIR)/debian/byacc
-BTYACC_DIR = $(CURDIR)/debian/btyacc
+BTYACC_DIR = $(CURDIR)/debian/byacc2
 
 BYACC_TMP = t/byacc
-BTYACC_TMP = t/btyacc
+BTYACC_TMP = t/byacc2
 
 verbose = # -v
 
@@ -43,7 +43,7 @@ configure = \
 		--mandir=\$${prefix}/share/man \
 		--sysconfdir=/etc \
 		--enable-stdnoreturn \
-		--program-transform-name='s,^,b,'
+		--program-transform-name='s,^yacc,byacc,'
 
 all: build
 
@@ -67,7 +67,7 @@ config-byacc-stamp:
 
 	touch $@
 
-config-btyacc-stamp:
+config-byacc2-stamp:
 	dh_testdir
 
 	rm -rf $(BTYACC_TMP)
@@ -75,7 +75,7 @@ config-btyacc-stamp:
 	cd $(BTYACC_TMP); $(configure) \
 		--enable-btyacc \
 		--with-max-table-size=123456 \
-		--program-transform-name='s,^,bt,'
+		--program-transform-name='s,^yacc,byacc2,'
 
 	touch $@
 
@@ -86,7 +86,7 @@ build-byacc-stamp: config-byacc-stamp
 
 	touch $@
 
-build-btyacc-stamp: config-btyacc-stamp
+build-byacc2-stamp: config-byacc2-stamp
 	dh_testdir
 
 	cd $(BTYACC_TMP); $(MAKE)
@@ -103,13 +103,13 @@ install-byacc-stamp: build-byacc-stamp
 
 	touch $@
 
-install-btyacc-stamp: build-btyacc-stamp
+install-byacc2-stamp: build-byacc2-stamp
 	dh_testdir
 	dh_testroot
 	dh_installdirs
 
 	cd $(BTYACC_TMP); $(MAKE) install DESTDIR=$(BTYACC_DIR)
-	sed -i '/- an LALR/s,^..N,btyacc,' $(BTYACC_DIR)/usr/share/man/man1/btyacc.1
+	sed -i '/- an LALR/s,^..N,byacc2,' $(BTYACC_DIR)/usr/share/man/man1/byacc2.1
 
 	touch $@
 
diff --git a/package/mingw-byacc.spec b/package/mingw-byacc.spec
index d7281c5..b3b95a9 100644
--- a/package/mingw-byacc.spec
+++ b/package/mingw-byacc.spec
@@ -1,8 +1,8 @@
 Summary: byacc - public domain Berkeley LALR Yacc parser generator
 %define AppProgram byacc
-%define AppVersion 20211224
+%define AppVersion 20220101
 %define UseProgram yacc
-# $Id: mingw-byacc.spec,v 1.38 2021/12/25 00:13:22 tom Exp $
+# $Id: mingw-byacc.spec,v 1.39 2022/01/01 12:06:35 tom Exp $
 Name: %{AppProgram}
 Version: %{AppVersion}
 Release: 1
diff --git a/package/pkgsrc/Makefile b/package/pkgsrc/Makefile
index 09e9310..d0051f9 100644
--- a/package/pkgsrc/Makefile
+++ b/package/pkgsrc/Makefile
@@ -1,17 +1,17 @@
-# $NetBSD: Makefile,v 1.9 2008/07/24 17:13:00 tonnerre Exp $
+# $NetBSD: Makefile,v 1.24 2021/08/14 01:04:32 mef Exp $
 #
 
-DISTNAME=	byacc-20211224
-PKGREVISION=	1
+DISTNAME=	byacc-20220101
 CATEGORIES=	devel
-MASTER_SITES=	ftp://ftp.invisible-island.net/byacc/
+MASTER_SITES=	https://invisible-mirror.net/archives/byacc/
+DIST_SUBDIR=	byacc-20220101
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://invisible-island.net/byacc/byacc.html
+MAINTAINER=	fcambus@NetBSD.org
+HOMEPAGE=	https://invisible-island.net/byacc/byacc.html
 COMMENT=	Berkeley Yacc
+LICENSE=	public-domain
 
-PKG_DESTDIR_SUPPORT=	user-destdir
 
 GNU_CONFIGURE=	YES
 MAKE_FILE=	makefile