kermit: Update to beta04

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: kermit: Update to beta04
From: Greg Troxel <gdt%lexort.com@localhost>
Date: Fri, 19 Aug 2022 12:08:18 +0000
Module Name:	pkgsrc-wip
Committed By:	Greg Troxel <gdt%lexort.com@localhost>
Pushed By:	gdt
Date:		Fri Aug 19 08:08:18 2022 -0400
Changeset:	4fa3950e32dd88104eec1d73ba077f0281a71305

Modified Files:
	kermit/Makefile
	kermit/PLIST
	kermit/distinfo
	kermit/patches/patch-makefile

Log Message:
kermit: Update to beta04

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=4fa3950e32dd88104eec1d73ba077f0281a71305

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

diffstat:
 kermit/Makefile               | 26 ++++++++--------
 kermit/PLIST                  |  2 +-
 kermit/distinfo               |  8 ++---
 kermit/patches/patch-makefile | 69 ++++++++++++++++++++++++++++++++++++++-----
 4 files changed, 81 insertions(+), 24 deletions(-)

diffs:
diff --git a/kermit/Makefile b/kermit/Makefile
index 990378fc35..6082261f29 100644
--- a/kermit/Makefile
+++ b/kermit/Makefile
@@ -1,38 +1,40 @@
 # $NetBSD: Makefile,v 1.93 2020/04/08 15:22:07 rhialto Exp $
 
-DISTNAME=	pre-alpha03
-PKGNAME=	kermit-9.0.305a2bis
+# https://www.kermitproject.org/ftp/kermit/test/tar/cku10.0-beta04.tar.gz
+VERSION=	10.0
+VERSIONSEP=	-
+VERSIONRC=	beta04
+DISTNAME=	cku${VERSION}${VERSIONSEP}${VERSIONRC}
+PKGNAME=	kermit-${VERSION}${VERSIONRC}
 CATEGORIES=	comms
-#MASTER_SITES=	ftp://ftp.kermitproject.org/kermit/archives/
-MASTER_SITES=	http://www.kermitproject.org/ftp/kermit/test/tar/
+MASTER_SITES=	https://www.kermitproject.org/ftp/kermit/test/tar/
 
 MAINTAINER=	gdt%NetBSD.org@localhost
-HOMEPAGE=	http://www.kermitproject.org/
+HOMEPAGE=	https://www.kermitproject.org/
 COMMENT=	Network and serial communication, file transfer, and scripting utility
 
-# UNIX C-Kermit 9.0 has been released with the Revised 3-Clause BSD License.
-# http://www.columbia.edu/kermit/licensing.html
 LICENSE=	modified-bsd
 
 .include "../../mk/bsd.prefs.mk"
 
+# The tarball just has files, no directory.
+# \todo Create "kermit" in ${WRKDIR} and unpack into it.
 WRKSRC=		${WRKDIR}
-DIST_SUBDIR=	${PKGNAME_NOREV}
 BUILD_DEFS+=	KFLAGS LIBS MANINSTALL
-MAKE_ENV+=	KFLAGS=${KFLAGS:Q} LIBS=${LIBS:Q}
+MAKE_ENV+=	prefix=${PREFIX} KFLAGS=${KFLAGS:Q} LIBS=${LIBS:Q}
 MAKE_FILE=	makefile
 
-LIBS+=		${BUILDLINK_LDADD.termcap}
-
 #KFLAGS+=	-DNODEBUG -DNOOLDMODEMS
 KFLAGS+=	${BUILDLINK_CPPFLAGS}
+
+LIBS+=		${BUILDLINK_LDADD.termcap}
 LIBS+=		${BUILDLINK_LDFLAGS}
 
 .include "options.mk"
 
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 share/doc/kermit
 
-do-install:
+foo-do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/wermit ${DESTDIR}${PREFIX}/bin/kermit
 	#${INSTALL_MAN} ${WRKSRC}/ckuker.nr \
 	#	${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/kermit.1
diff --git a/kermit/PLIST b/kermit/PLIST
index 9f21d469fc..a282724781 100644
--- a/kermit/PLIST
+++ b/kermit/PLIST
@@ -1,3 +1,3 @@
 @comment $NetBSD: PLIST,v 1.9 2011/08/25 14:54:06 hans Exp $
 bin/kermit
-@comment man/man1/kermit.1
+man/man1/kermit.1
diff --git a/kermit/distinfo b/kermit/distinfo
index bb02cf8ec7..3a4d8c0a0c 100644
--- a/kermit/distinfo
+++ b/kermit/distinfo
@@ -1,9 +1,9 @@
 $NetBSD: distinfo,v 1.28 2020/07/30 03:03:07 gutteridge Exp $
 
-RMD160 (kermit-9.0.305a2bis/pre-alpha03.tar.gz) = e9d09fa9a9f532262a6a52b7bbdf9e24f80b15f2
-SHA512 (kermit-9.0.305a2bis/pre-alpha03.tar.gz) = 24dd9f9e63209f4d9dcf3d12f1989b7617af7de2f05256794275f4bc050ad75c8447a96924a951106c8391c1f9c08e8c9a6e9c4a3b08936eb295dca130ff0059
-Size (kermit-9.0.305a2bis/pre-alpha03.tar.gz) = 2278371 bytes
+BLAKE2s (cku10.0-beta04.tar.gz) = 0a78e39c41a9c18a3c8ad232f341df84e54650f3d3205ee655de38cd72b8685a
+SHA512 (cku10.0-beta04.tar.gz) = 2c84ab6d15a4363884b9e57459fbed6ac1cae587795010bf2a5223af78ccba63718bbf1bed9799fd74f55974734afb6339dd4a23bbf32460d7d13fab80e3bac4
+Size (cku10.0-beta04.tar.gz) = 3009017 bytes
 SHA1 (patch-ckuath.c) = 494e9f5dc9edc2b8738129bb53de2d5affa8cca2
 SHA1 (patch-ckupty.c) = 97cb6cca9b90d4c9a3a2faf9161310cb51fd2a58
 SHA1 (patch-ckuusx.c) = d92471b5f2b1e0444a9498052ec768f5d1bacef7
-SHA1 (patch-makefile) = 67754adea3116a8bab45870adbb8166d8cbac32f
+SHA1 (patch-makefile) = e38c98a10fb1d10c5227d0499b6a659bab054d27
diff --git a/kermit/patches/patch-makefile b/kermit/patches/patch-makefile
index e09a3e1474..3193dd2b4c 100644
--- a/kermit/patches/patch-makefile
+++ b/kermit/patches/patch-makefile
@@ -1,5 +1,6 @@
 $NetBSD: patch-aa,v 1.10 2011/12/06 01:19:16 sbd Exp $
 
+* Don't override DESTDIR
 * Get K5LIB, K5INC, SSLLIB and SSLINC from pkgsrc.
 * s/-lgssapi/-lgssapi_krb5/ on netbsd+krb5* 
 * Add $(LIBS) to link command on solaris2xg+openssl+zlib+pam+shadow
@@ -7,10 +8,19 @@ $NetBSD: patch-aa,v 1.10 2011/12/06 01:19:16 sbd Exp $
 * On linux get HAVE_LIBCURSES and HAVE_CURSES from pkgsrc (with the 
   curses include and library pathes coming from BUILDLINK_*FLAGS).
 
+Not yet sent upstream.
 
---- makefile.orig	2020-09-19 20:17:04.000000000 +0000
+--- makefile.orig	2022-06-02 14:59:50.000000000 +0000
 +++ makefile
-@@ -827,12 +827,12 @@ manroot = $(prefix)
+@@ -824,19 +824,19 @@ CKVER= "10.0 Beta.03"
+ #
+ # The following symbols are used to specify library and header file locations:
+ # 
+-prefix  = /usr/local
++prefix  ?= /usr/local
+ srproot = $(prefix)
+ sslroot = $(prefix)
+ manroot = $(prefix)
  
  K4LIB=-L/usr/kerberos/lib
  K4INC=-I/usr/kerberos/include
@@ -27,7 +37,52 @@ $NetBSD: patch-aa,v 1.10 2011/12/06 01:19:16 sbd Exp $
  
  # To override these assignments; for example, if your OpenSSL files are
  # not in /usr/local/ssl, invoke the desired target like this:
-@@ -1878,7 +1878,7 @@ netbsd+krb5:
+@@ -973,7 +973,7 @@ BOOTFILE=/edition7
+ #
+ WERMIT = makewhat
+ BINARY = wermit
+-DESTDIR =
++DESTDIR ?=
+ BINDIR = $(prefix)/bin
+ MANDIR = $(manroot)/man/man1
+ MANEXT = 1
+@@ -1088,13 +1088,9 @@ install:
+ 	rm -f $(DESTDIR)$(BINDIR)/kermit;\
+ 	cp $(BINARY) $(DESTDIR)$(BINDIR)/kermit || exit 1;\
+ 	chmod 755    $(DESTDIR)$(BINDIR)/kermit || exit 1;\
+-	rm -f        $(DESTDIR)$(BINDIR)/kermit-sshsub;\
+-	ln -s        $(DESTDIR)$(BINDIR)/kermit\
+-		     $(DESTDIR)$(BINDIR)/kermit-sshsub || exit 1;\
+ 	echo 'set flag=f\nPrC Removing binaries' >&3;\
+-	echo "RmF $(DESTDIR)$(BINDIR)/kermit-sshsub" >&3;\
+ 	echo "RmF $(DESTDIR)$(BINDIR)/kermit" >&3;\
+-	if test -f ckermit.ini; then\
++	if false && test -f ckermit.ini; then\
+ 		echo "#!$(BINDIR)/kermit" >\
+ 			$(DESTDIR)$(BINDIR)/_tmp.ini;\
+ 		cat ckermit.ini >> $(DESTDIR)$(BINDIR)/_tmp.ini;\
+@@ -1107,7 +1103,6 @@ install:
+ 	echo 'EfM' >&3;\
+ 	echo "Kermit binary installed:";\
+ 	ls -l $(DESTDIR)$(BINDIR)/kermit\
+-	      $(DESTDIR)$(BINDIR)/kermit-sshsub\
+ 	      $(DESTDIR)$(BINDIR)/ckermit.ini;\
+ 	echo;\
+ 	echo " WARNING: If C-Kermit is to be used for dialing out,";\
+@@ -1120,9 +1115,9 @@ install:
+ 		if test -d $(DESTDIR)$(MANDIR); then\
+ 			echo  "$(DESTDIR)$(MANDIR) exists...";\
+ 		else\
+-			echo "Creating $(MANDIR)...";\
+-			mkdir $(MANDIR) || exit 1;\
+-			chmod 755 $(MANDIR) || exit 1;\
++			echo "Creating $(DESTDIR)$(MANDIR)...";\
++			mkdir $(DESTDIR)$(MANDIR) || exit 1;\
++			chmod 755 $(DESTDIR)$(MANDIR) || exit 1;\
+ 		fi;\
+ 		rm -f $(DESTDIR)$(MANDIR)/kermit.$(MANEXT);\
+ 		cp ckuker.nr $(DESTDIR)$(MANDIR)/kermit.$(MANEXT) || exit 1;\
+@@ -1935,7 +1930,7 @@ netbsd+krb5:
  	-DCK_CAST $$HAVE_DES -DNOFTP_GSSAPI $(K5INC) $(K5INC)/krb5 \
  	$(KFLAGS)" \
  	"LIBS= $(K5LIB) -L/usr/pkg/lib -R/usr/pkg/lib -lcurses $$DES_LIB \
@@ -36,7 +91,7 @@ $NetBSD: patch-aa,v 1.10 2011/12/06 01:19:16 sbd Exp $
  
  # NetBSD - With Kerberos 5 and SSL and Zlib.
  # OK: 2011/08/21 on 5.1 with MIT Kerberos.
-@@ -1905,7 +1905,7 @@ netbsd+krb5+ssl netbsd+krb5+openssl+zlib
+@@ -1962,7 +1957,7 @@ netbsd+krb5+ssl netbsd+krb5+openssl+zlib
  	-DCK_SSL -DCK_PAM -DZLIB -DNO_DCL_INET_ATON $$OPENSSLOPTION \
  	$(KFLAGS)" "LNKFLAGS = $(LNKFLAGS)" \
  	"LIBS= $(K5LIB) -L/usr/pkg/lib -R/usr/pkg/lib -lssl $$DES_LIB \
@@ -45,7 +100,7 @@ $NetBSD: patch-aa,v 1.10 2011/12/06 01:19:16 sbd Exp $
  
  #Special Security Enhanced NetBSD target with SRP, SSL, and zlib support.
  #To build this, you need to BUILD the pkgsrc srp_client package.  After
-@@ -3553,7 +3553,7 @@ solaris2xg+openssl+zlib+pam+shadow:
+@@ -3673,7 +3668,7 @@ solaris2xg+openssl+zlib+pam+shadow:
  	-DCK_AUTHENTICATION -DCK_SSL -DCK_PAM -DCK_SHADOW  -DZLIB \
  	-DBIGBUFOK $(SSLINC) $(KFLAGS)" \
  	"LIBS= $(SSLLIB) -ltermlib \
@@ -54,7 +109,7 @@ $NetBSD: patch-aa,v 1.10 2011/12/06 01:19:16 sbd Exp $
  
  #Ditto but with GCC 3.1 in which you have to specify 32-bit with -m32.
  #In Solaris 9 (and maybe 8) you'll also need specifiy the Library path.
-@@ -3908,7 +3908,7 @@ solaris9g+krb5+ssl solaris10g+krb5+ssl s
+@@ -4028,7 +4023,7 @@ solaris9g+krb5+ssl solaris10g+krb5+ssl s
  	-DCK_CURSES -DCK_NEWTERM -DDIRENT -DHDBUUCP -DTCPSOCKET  -DBIGBUFOK \
  	-DCK_AUTHENTICATION -DCK_SSL -DZLIB -DCK_KERBEROS -DKRB5 \
  	-DCK_ENCRYPTION -DCK_CAST $$OPENSSLOPTION \
@@ -63,7 +118,7 @@ $NetBSD: patch-aa,v 1.10 2011/12/06 01:19:16 sbd Exp $
  	"LIBS= $(SSLLIB) $(K5LIB) -lz -lssl -ltermlib -lsocket -lnsl -lm \
  	-lresolv -lcrypto \
  	$$GSSAPILIB -lkrb5 -lcom_err -lk5crypto $$DES_LIB $(LIBS)"
-@@ -6207,32 +6207,6 @@ linux-2015:
+@@ -6367,32 +6362,6 @@ linux-2015:
  	if test `grep openpty /usr/include/pty.h | wc -l` -gt 0; \
  	then HAVE_OPENPTY='-DHAVE_OPENPTY'; \
  	else HAVE_OPENPTY=''; fi ; \
Prev by Date: muon: Update to git commit 6b8073be2501abf34f488c46f9eca9958d702f8a
Next by Date: kermit: add patch comments
Previous by Thread: muon: Update to git commit 6b8073be2501abf34f488c46f9eca9958d702f8a
Next by Thread: kermit: add patch comments
Indexes:
Home | Main Index | Thread Index | Old Index