Make this build on Mac OS, as Apple doesn't shop telnet any more.

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: Make this build on Mac OS, as Apple doesn't shop telnet any more.
From: hubertf <hubertf%gmx.de@localhost>
Date: Fri, 18 May 2018 14:31:32 +0000
Module Name:	pkgsrc-wip
Committed By:	hubertf <hubertf%gmx.de@localhost>
Pushed By:	hubertf
Date:		Fri May 18 16:31:32 2018 +0200
Changeset:	936ea5a6348013377347e9c293b06c658ff99771

Modified Files:
	netkit-telnet/DESCR
	netkit-telnet/Makefile
	netkit-telnet/distinfo
Added Files:
	netkit-telnet/patches/patch-configure
	netkit-telnet/patches/patch-telnet_Makefile
	netkit-telnet/patches/patch-telnet_externs.h
	netkit-telnet/patches/patch-telnet_ring.h
	netkit-telnet/patches/patch-telnetd_Makefile
	netkit-telnet/patches/patch-telnetd_setproctitle.c
Removed Files:
	netkit-telnet/patches/patch-aa

Log Message:
Make this build on Mac OS, as Apple doesn't shop telnet any more.

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

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

diffstat:
 netkit-telnet/DESCR                                |  2 +-
 netkit-telnet/Makefile                             |  3 +-
 netkit-telnet/distinfo                             |  7 ++++-
 netkit-telnet/patches/patch-aa                     | 11 -------
 netkit-telnet/patches/patch-configure              | 36 ++++++++++++++++++++++
 netkit-telnet/patches/patch-telnet_Makefile        | 13 ++++++++
 netkit-telnet/patches/patch-telnet_externs.h       | 14 +++++++++
 netkit-telnet/patches/patch-telnet_ring.h          | 11 +++++++
 netkit-telnet/patches/patch-telnetd_Makefile       | 14 +++++++++
 netkit-telnet/patches/patch-telnetd_setproctitle.c | 16 ++++++++++
 10 files changed, 113 insertions(+), 14 deletions(-)

diffs:
diff --git a/netkit-telnet/DESCR b/netkit-telnet/DESCR
index b2a4e7188d..af667d1db1 100644
--- a/netkit-telnet/DESCR
+++ b/netkit-telnet/DESCR
@@ -1 +1 @@
-The netkit-telnet package contains telnet and telnetd for Linux.
+The netkit-telnet package contains telnet client and server (telnetd).
diff --git a/netkit-telnet/Makefile b/netkit-telnet/Makefile
index 59c02e3e5f..3bea579da9 100644
--- a/netkit-telnet/Makefile
+++ b/netkit-telnet/Makefile
@@ -14,9 +14,10 @@ USE_PKGLOCALEDIR=	yes
 HAS_CONFIGURE=		yes
 USE_LANGUAGES=		c c++
 USE_TOOLS+=		gmake
-ONLY_FOR_PLATFORM=	Linux-*-*
+ONLY_FOR_PLATFORM=	Linux-*-* Darwin-*-*
 
 CONFIGURE_ARGS+=	--prefix=${PREFIX}
+CONFIGURE_ARGS+=	--installroot=${DESTDIR}
 
 SUBST_CLASSES+=		warn
 SUBST_STAGE.warn=	pre-configure
diff --git a/netkit-telnet/distinfo b/netkit-telnet/distinfo
index 6a02ce0058..7c9dd0b2c5 100644
--- a/netkit-telnet/distinfo
+++ b/netkit-telnet/distinfo
@@ -3,4 +3,9 @@ $NetBSD: distinfo,v 1.2 2005/09/28 05:56:11 rillig Exp $
 SHA1 (netkit-telnet-0.17.tar.gz) = 41213dedaf242126b54a3ac51b905a351eb22b15
 RMD160 (netkit-telnet-0.17.tar.gz) = faa273e6e4fbb31299d242d8329c597f402c7b83
 Size (netkit-telnet-0.17.tar.gz) = 133749 bytes
-SHA1 (patch-aa) = 5345df317dc8a75b46930dc117d278d8cef73839
+SHA1 (patch-configure) = b5301b9b4f873a4dbd4ad20a741078ee661c6be7
+SHA1 (patch-telnet_Makefile) = f163a106f06260c5747ab2cdd531f9966ca6a9ac
+SHA1 (patch-telnet_externs.h) = 1e53e0d51d919c6800dd0e4e97be3399ae2fc336
+SHA1 (patch-telnet_ring.h) = 5345df317dc8a75b46930dc117d278d8cef73839
+SHA1 (patch-telnetd_Makefile) = 7e7cc107704c85c0961dae8f60bc34e789307cd0
+SHA1 (patch-telnetd_setproctitle.c) = f7c5219e5ca2af111e1c69f655b539d3ea9e13d5
diff --git a/netkit-telnet/patches/patch-aa b/netkit-telnet/patches/patch-aa
deleted file mode 100644
index e2678ccffa..0000000000
--- a/netkit-telnet/patches/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2005/09/28 05:56:11 rillig Exp $
-
---- telnet/ring.h.orig	2004-08-02 12:49:37.000000000 -0400
-+++ telnet/ring.h	2004-08-02 12:49:54.000000000 -0400
-@@ -37,3 +37,6 @@
-+#include <string.h>
-+#include <stdlib.h>
-+
- class datasink {
-  public:
-     virtual ~datasink() {}
diff --git a/netkit-telnet/patches/patch-configure b/netkit-telnet/patches/patch-configure
new file mode 100644
index 0000000000..0a354d5222
--- /dev/null
+++ b/netkit-telnet/patches/patch-configure
@@ -0,0 +1,36 @@
+$NetBSD$
+
+--- configure.orig	2000-07-29 18:00:29.000000000 +0000
++++ configure
+@@ -67,7 +67,7 @@ fi
+ 
+ ##################################################
+ 
+-WARNINGS='-Wall -W -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -Winline '
++#WARNINGS='-Wall -W -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -Winline '
+ 
+ cat << EOF > __conftest.c
+     int main() { int class=0; return class; }
+@@ -382,7 +382,11 @@ rm -f __conftest*
+ 
+ echo -n 'Checking for forkpty... '
+ cat <<EOF >__conftest.cc
+-#include <pty.h>
++#if defined __APPLE__
++#  include <util.h>
++#else
++#  include <pty.h>
++#endif
+ int main() { forkpty(0, 0, 0, 0); }
+ 
+ EOF
+@@ -537,8 +541,7 @@ fi
+ 
+ echo 'Generating MCONFIG...'
+ (
+-    echo -n '# Generated by configure (confgen version 2) on '
+-    date
++    echo '# Generated by configure (confgen version 2) on '`date`
+     echo '#'
+     echo
+ 
diff --git a/netkit-telnet/patches/patch-telnet_Makefile b/netkit-telnet/patches/patch-telnet_Makefile
new file mode 100644
index 0000000000..66b93b4ec8
--- /dev/null
+++ b/netkit-telnet/patches/patch-telnet_Makefile
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- telnet/Makefile.orig	1999-08-01 05:06:37.000000000 +0000
++++ telnet/Makefile
+@@ -22,6 +22,8 @@ depend:
+ 	$(CXX) $(CXXFLAGS) -MM $(SRCS) >depend.mk
+ 
+ install: telnet
++	install -d $(INSTALLROOT)$(BINDIR)
++	install -d $(INSTALLROOT)$(MANDIR)/man1
+ 	install -s -m$(BINMODE) telnet $(INSTALLROOT)$(BINDIR)
+ 	install -m$(MANMODE) telnet.1 $(INSTALLROOT)$(MANDIR)/man1
+ 
diff --git a/netkit-telnet/patches/patch-telnet_externs.h b/netkit-telnet/patches/patch-telnet_externs.h
new file mode 100644
index 0000000000..3554140d8e
--- /dev/null
+++ b/netkit-telnet/patches/patch-telnet_externs.h
@@ -0,0 +1,14 @@
+$NetBSD$
+
+--- telnet/externs.h.orig	1999-08-19 09:34:15.000000000 +0000
++++ telnet/externs.h
+@@ -41,7 +41,9 @@
+ #include <stdio.h>
+ #include <setjmp.h>
+ #include <sys/ioctl.h>
++#if defined(__linux__)
+ #include <features.h>
++#endif
+ #include <termios.h>
+ 
+ #if defined(NO_CC_T)
diff --git a/netkit-telnet/patches/patch-telnet_ring.h b/netkit-telnet/patches/patch-telnet_ring.h
new file mode 100644
index 0000000000..e2678ccffa
--- /dev/null
+++ b/netkit-telnet/patches/patch-telnet_ring.h
@@ -0,0 +1,11 @@
+$NetBSD: patch-aa,v 1.2 2005/09/28 05:56:11 rillig Exp $
+
+--- telnet/ring.h.orig	2004-08-02 12:49:37.000000000 -0400
++++ telnet/ring.h	2004-08-02 12:49:54.000000000 -0400
+@@ -37,3 +37,6 @@
++#include <string.h>
++#include <stdlib.h>
++
+ class datasink {
+  public:
+     virtual ~datasink() {}
diff --git a/netkit-telnet/patches/patch-telnetd_Makefile b/netkit-telnet/patches/patch-telnetd_Makefile
new file mode 100644
index 0000000000..0791679e0a
--- /dev/null
+++ b/netkit-telnet/patches/patch-telnetd_Makefile
@@ -0,0 +1,14 @@
+$NetBSD$
+
+--- telnetd/Makefile.orig	1999-12-14 00:43:30.000000000 +0000
++++ telnetd/Makefile
+@@ -27,6 +27,9 @@ $(OBJS): defs.h ext.h pathnames.h telnet
+ telnetd.o: ../version.h
+ 
+ install: telnetd
++	install -d $(INSTALLROOT)$(SBINDIR)
++	install -d $(INSTALLROOT)$(MANDIR)/man5
++	install -d $(INSTALLROOT)$(MANDIR)/man8
+ 	install -s -m$(DAEMONMODE) telnetd $(INSTALLROOT)$(SBINDIR)/in.telnetd
+ 	install -m$(MANMODE) issue.net.5 $(INSTALLROOT)$(MANDIR)/man5/
+ 	install -m$(MANMODE) telnetd.8 $(INSTALLROOT)$(MANDIR)/man8/in.telnetd.8
diff --git a/netkit-telnet/patches/patch-telnetd_setproctitle.c b/netkit-telnet/patches/patch-telnetd_setproctitle.c
new file mode 100644
index 0000000000..8310696869
--- /dev/null
+++ b/netkit-telnet/patches/patch-telnetd_setproctitle.c
@@ -0,0 +1,16 @@
+$NetBSD$
+
+--- telnetd/setproctitle.c.orig	1999-12-10 23:06:39.000000000 +0000
++++ telnetd/setproctitle.c
+@@ -47,6 +47,11 @@ char setproctitle_rcsid[] =
+ #include <stdarg.h>
+ #include <stdio.h>
+ 
++#if defined __APPLE__
++extern char **environ; /* from environ(7) */
++#  define __environ environ
++#endif
++
+ #include "setproctitle.h"
+ /*
+ **  SETPROCTITLE -- set process title for ps
Prev by Date: mackerel-agent-plugins: update to 0.49.0
Next by Date: py-numba: Imported into pkgsrc
Previous by Thread: mackerel-agent-plugins: update to 0.49.0
Next by Thread: py-numba: Imported into pkgsrc
Indexes:
Home | Main Index | Thread Index | Old Index