summaryrefslogtreecommitdiff
path: root/net/gnut
diff options
context:
space:
mode:
authorkim <kim>2000-07-16 18:17:30 +0000
committerkim <kim>2000-07-16 18:17:30 +0000
commit5acd7c6b684e1f07306fc6ea3449d584f60d8a91 (patch)
treebb5e9c0531946a25815b89190c4e930daa3f0bec /net/gnut
parent957722426f9338c859ddcf24cc04697f01b37ac1 (diff)
downloadpkgsrc-5acd7c6b684e1f07306fc6ea3449d584f60d8a91.tar.gz
Upgrade to gnut-0.3.29.
- use readline from libedit - compile properly even when pth is installed (really should fix pgcc) - tried with pth: does not work - the version upgrade has bug fixes, but nothing that looked critical - documentation in HTML included
Diffstat (limited to 'net/gnut')
-rw-r--r--net/gnut/Makefile41
-rw-r--r--net/gnut/files/md54
-rw-r--r--net/gnut/files/patch-sum5
-rw-r--r--net/gnut/patches/patch-aa52
-rw-r--r--net/gnut/patches/patch-ab20
-rw-r--r--net/gnut/patches/patch-ac22
-rw-r--r--net/gnut/pkg/PLIST9
7 files changed, 141 insertions, 12 deletions
diff --git a/net/gnut/Makefile b/net/gnut/Makefile
index 31ae046ca28..e4f236bdaee 100644
--- a/net/gnut/Makefile
+++ b/net/gnut/Makefile
@@ -1,29 +1,52 @@
-# $NetBSD: Makefile,v 1.2 2000/04/18 07:05:14 deberg Exp $
+# $NetBSD: Makefile,v 1.3 2000/07/16 18:17:30 kim Exp $
#
-DISTNAME= gnut-0.3.22
+DISTNAME= gnut-0.3.29
CATEGORIES= net
MASTER_SITES= http://www.umr.edu/~jjp/
MAINTAINER= deberg@netbsd.org
HOMEPAGE= http://www.umr.edu/~jjp/
-# Sync these with devel/unproven-pthreads:
-ONLY_FOR_PLATFORM= NetBSD-*-i386 NetBSD-*-arm32 NetBSD-*-m68k
+BUILD_DEPENDS+= autoreconf:../../devel/autoconf
+#DEPENDS+= pth>=1.3.6:../../devel/pth
+# Sync these with devel/unproven-pthreads:
+ONLY_FOR_PLATFORM= NetBSD-*-i386 NetBSD-*-arm32 NetBSD-*-m68k
DEPENDS+= unproven-pthreads-0.*:../../devel/unproven-pthreads
+CONFIGURE_ENV+= CC=${LOCALBASE}/pthreads/bin/pgcc \
+ CXX=${LOCALBASE}/pthreads/bin/pg++
GNU_CONFIGURE= yes
-CONFIGURE_ARGS+=--with-mit-pthreads
-CONFIGURE_ENV+= CC=${LOCALBASE}/pthreads/bin/pgcc \
- CXX=${LOCALBASE}/pthreads/bin/pg++
+GNUTDOCDIR= ${PREFIX}/share/doc/gnut
+
+# Find <pthread.h>
+#.if make(do-configure)
+#CFLAGS+= -I${LOCALBASE}/include
+#.endif
+
+.if make(do-configure)
+LDFLAGS= -Wl,-R${LOCALBASE}/pthreads/lib -L${LOCALBASE}/pthreads/lib
+.endif
+
+post-patch:
+ cd ${WRKSRC} && autoreconf
-GNUTDOCDIR= ${PREFIX}/share/doc/gnut
+GNUTDOCS= TUTORIAL \
+ gnut-1.html \
+ gnut-2.html \
+ gnut-3.html \
+ gnut-4.html \
+ gnut-5.html \
+ gnut-6.html \
+ gnut.html
post-install:
${MKDIR} ${GNUTDOCDIR}
- ${INSTALL_DATA} ${WRKSRC}/TUTORIAL ${GNUTDOCDIR}
+ for i in ${GNUTDOCS}; do \
+ ${INSTALL_DATA} ${WRKSRC}/doc/$$i ${GNUTDOCDIR}; \
+ done
${INSTALL_DATA} ${WRKSRC}/gnutrc.sample ${GNUTDOCDIR}
.include "../../mk/bsd.pkg.mk"
diff --git a/net/gnut/files/md5 b/net/gnut/files/md5
index db636c04d30..01149d77d8e 100644
--- a/net/gnut/files/md5
+++ b/net/gnut/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.1.1.2 2000/04/18 06:57:35 deberg Exp $
+$NetBSD: md5,v 1.2 2000/07/16 18:17:30 kim Exp $
-MD5 (gnut-0.3.22.tar.gz) = c8d51d23b7e38e3096a13f8f8d6c0ef6
+MD5 (gnut-0.3.29.tar.gz) = 6d0d804715be0cac4c603a6524a72471
diff --git a/net/gnut/files/patch-sum b/net/gnut/files/patch-sum
new file mode 100644
index 00000000000..445c3f98a7c
--- /dev/null
+++ b/net/gnut/files/patch-sum
@@ -0,0 +1,5 @@
+$NetBSD: patch-sum,v 1.1 2000/07/16 18:17:30 kim Exp $
+
+MD5 (patch-aa) = 8827072f034e0ce33e990354d2afe802
+MD5 (patch-ab) = e5df1887c1de187c35a57678c83dae73
+MD5 (patch-ac) = e549a24bba21f3c558bd4a91d88f4620
diff --git a/net/gnut/patches/patch-aa b/net/gnut/patches/patch-aa
new file mode 100644
index 00000000000..7d70ac8d72f
--- /dev/null
+++ b/net/gnut/patches/patch-aa
@@ -0,0 +1,52 @@
+$NetBSD: patch-aa,v 1.1 2000/07/16 18:17:31 kim Exp $
+
+--- configure.in.orig Fri May 5 16:14:49 2000
++++ configure.in Sun Jul 16 12:09:57 2000
+@@ -49,13 +49,13 @@
+
+ dnl Checks for libraries.
+
+-AC_CACHE_CHECK([for readline in readline.h],
++AC_CACHE_CHECK([for readline in readline.h with libedit],
+ [g_cv_readline],[
+ save_LIBS="$LIBS"
+- LIBS="-lreadline $LIBS"
++ LIBS="-ledit -ltermcap $LIBS"
+ AC_TRY_LINK([
+ #include <stdio.h>
+- #include <readline/readline.h>
++ #include <readline.h>
+ ],
+ [readline(NULL);],
+ [g_cv_readline=yes],[g_cv_readline=no])
+@@ -63,8 +63,29 @@
+ ])
+
+ if test $g_cv_readline = yes ; then
+- LIBS="$LIBS -lreadline"
++ LIBS="$LIBS -ledit -ltermcap"
+ AC_DEFINE(HAVE_READLINE)
++ AC_DEFINE(HAVE_LIBEDIT)
++fi
++
++if test $g_cv_readline = no ; then
++ AC_CACHE_CHECK([for readline in readline.h],
++ [g_cv_readline],[
++ save_LIBS="$LIBS"
++ LIBS="-lreadline $LIBS"
++ AC_TRY_LINK([
++ #include <stdio.h>
++ #include <readline/readline.h>
++ ],
++ [readline(NULL);],
++ [g_cv_readline=yes],[g_cv_readline=no])
++ LIBS="$save_LIBS"
++ ])
++
++ if test $g_cv_readline = yes ; then
++ LIBS="$LIBS -lreadline"
++ AC_DEFINE(HAVE_READLINE)
++ fi
+ fi
+
+ if test $g_cv_readline = no ; then
diff --git a/net/gnut/patches/patch-ab b/net/gnut/patches/patch-ab
new file mode 100644
index 00000000000..5790205a136
--- /dev/null
+++ b/net/gnut/patches/patch-ab
@@ -0,0 +1,20 @@
+$NetBSD: patch-ab,v 1.1 2000/07/16 18:17:31 kim Exp $
+
+--- src/cli_input.c.orig Fri May 5 20:48:19 2000
++++ src/cli_input.c Sun Jul 16 12:12:20 2000
+@@ -15,8 +15,13 @@
+ #include <pthread.h>
+
+ #ifdef HAVE_READLINE
+- #include <readline/readline.h>
+- #include <readline/history.h>
++# ifdef HAVE_LIBEDIT
++# include <readline.h>
++# include <history.h>
++# else
++# include <readline/readline.h>
++# include <readline/history.h>
++# endif
+ #endif
+
+ #ifdef HAVE_REGEX_H
diff --git a/net/gnut/patches/patch-ac b/net/gnut/patches/patch-ac
new file mode 100644
index 00000000000..6f85d80aa47
--- /dev/null
+++ b/net/gnut/patches/patch-ac
@@ -0,0 +1,22 @@
+$NetBSD: patch-ac,v 1.1 2000/07/16 18:17:31 kim Exp $
+
+--- src/cli_readline.c.orig Fri Apr 28 00:31:24 2000
++++ src/cli_readline.c Sun Jul 16 12:19:12 2000
+@@ -6,8 +6,15 @@
+
+ #include <stdio.h>
+ #include <stdlib.h>
+-#include <readline/readline.h>
+-#include <readline/history.h>
++#include <string.h>
++
++#ifdef HAVE_LIBEDIT
++# include <readline.h>
++# include <history.h>
++#else
++# include <readline/readline.h>
++# include <readline/history.h>
++#endif
+
+ #include "gnut_lib.h"
+ #include "cli_input.h"
diff --git a/net/gnut/pkg/PLIST b/net/gnut/pkg/PLIST
index 2f5e76c7baa..5682c6076bb 100644
--- a/net/gnut/pkg/PLIST
+++ b/net/gnut/pkg/PLIST
@@ -1,5 +1,12 @@
-@comment $NetBSD: PLIST,v 1.2 2000/04/18 07:05:22 deberg Exp $
+@comment $NetBSD: PLIST,v 1.3 2000/07/16 18:17:31 kim Exp $
bin/gnut
share/doc/gnut/TUTORIAL
+share/doc/gnut/gnut-1.html
+share/doc/gnut/gnut-2.html
+share/doc/gnut/gnut-3.html
+share/doc/gnut/gnut-4.html
+share/doc/gnut/gnut-5.html
+share/doc/gnut/gnut-6.html
+share/doc/gnut/gnut.html
share/doc/gnut/gnutrc.sample
@dirrm share/doc/gnut