diff options
Diffstat (limited to 'net')
| -rw-r--r-- | net/ytalk/Makefile | 3 | ||||
| -rw-r--r-- | net/ytalk/Makefile.common | 10 | ||||
| -rw-r--r-- | net/ytalk/distinfo | 15 | ||||
| -rw-r--r-- | net/ytalk/patches/patch-aa | 43 | ||||
| -rw-r--r-- | net/ytalk/patches/patch-ab | 30 | ||||
| -rw-r--r-- | net/ytalk/patches/patch-ac | 10 | ||||
| -rw-r--r-- | net/ytalk/patches/patch-ad | 143 |
7 files changed, 197 insertions, 57 deletions
diff --git a/net/ytalk/Makefile b/net/ytalk/Makefile index 72a1da836cb..56bf8bdd273 100644 --- a/net/ytalk/Makefile +++ b/net/ytalk/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.11 2004/03/06 12:01:32 grant Exp $ +# $NetBSD: Makefile,v 1.12 2006/01/12 19:57:00 wiz Exp $ .include "../../net/ytalk/Makefile.common" -PKGREVISION= 2 COMMENT= Multi-user replacement for UNIX talk CONFIGURE_ARGS+=--without-x diff --git a/net/ytalk/Makefile.common b/net/ytalk/Makefile.common index 4709af51856..9420dd341f1 100644 --- a/net/ytalk/Makefile.common +++ b/net/ytalk/Makefile.common @@ -1,11 +1,11 @@ -# $NetBSD: Makefile.common,v 1.3 2005/12/29 06:22:04 jlam Exp $ +# $NetBSD: Makefile.common,v 1.4 2006/01/12 19:57:00 wiz Exp $ -DISTNAME= ytalk-3.1.1 +DISTNAME= ytalk-3.3.0 CATEGORIES= net -MASTER_SITES= ${MASTER_SITE_SUNSITE:=system/network/chat/} +MASTER_SITES= http://www.impul.se/ytalk/ MAINTAINER= mike@ethmoid.org -HOMEPAGE= http://www.iagora.com/~espel/ytalk/ytalk.html +HOMEPAGE= http://www.impul.se/ytalk/index.php COMMENT= Multi-user replacement for UNIX talk GNU_CONFIGURE= yes @@ -14,3 +14,5 @@ CONFIGURE_ARGS+=--sysconfdir=${PKG_SYSCONFDIR:Q} EGDIR= ${PREFIX}/share/examples/ytalk CONF_FILES= ${EGDIR}/ytalkrc ${PKG_SYSCONFDIR}/ytalkrc + +.include "../../mk/curses.buildlink3.mk" diff --git a/net/ytalk/distinfo b/net/ytalk/distinfo index 19f3a7b23a1..a51d072cac6 100644 --- a/net/ytalk/distinfo +++ b/net/ytalk/distinfo @@ -1,8 +1,9 @@ -$NetBSD: distinfo,v 1.5 2005/12/18 18:23:19 joerg Exp $ +$NetBSD: distinfo,v 1.6 2006/01/12 19:57:00 wiz Exp $ -SHA1 (ytalk-3.1.1.tar.gz) = be7828b46bac5cb0c3a1a95052e49b9d8337ea27 -RMD160 (ytalk-3.1.1.tar.gz) = 443770dc8028737b922ae37796c6fa26fb7cd753 -Size (ytalk-3.1.1.tar.gz) = 83244 bytes -SHA1 (patch-aa) = 7c5cd9207b19016c471a26fbb66148adf5f24e0a -SHA1 (patch-ab) = 65db8d60db07ec7bc4530a8fca84f6d411b61db2 -SHA1 (patch-ac) = 64791cc92b19b82b10fd032e5895ae798afd750c +SHA1 (ytalk-3.3.0.tar.gz) = 7a988cc6f7ef1ca7499aa54e73ed6db4e7416bc6 +RMD160 (ytalk-3.3.0.tar.gz) = 1332d5600d1a669f517727542d6c1b7226212cfc +Size (ytalk-3.3.0.tar.gz) = 137989 bytes +SHA1 (patch-aa) = 8e82bc438aacb5e2f612ab7596097aadb696fac2 +SHA1 (patch-ab) = 46d4cfcd480a11070a5b5bd2a51f6938ea517627 +SHA1 (patch-ac) = ff42a7f98f39daf17b336c9d16e9091c19410d02 +SHA1 (patch-ad) = 55b130c2e070d93fad2cd050952fa3602cd32d2d diff --git a/net/ytalk/patches/patch-aa b/net/ytalk/patches/patch-aa index e955846af72..d28e11ad8b2 100644 --- a/net/ytalk/patches/patch-aa +++ b/net/ytalk/patches/patch-aa @@ -1,23 +1,28 @@ -$NetBSD: patch-aa,v 1.1 1999/09/13 14:54:40 jlam Exp $ +$NetBSD: patch-aa,v 1.2 2006/01/12 19:57:00 wiz Exp $ ---- configure.orig Sun May 9 21:11:25 1999 -+++ configure Mon Sep 13 10:36:44 1999 -@@ -833,6 +833,7 @@ - test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' +--- configure.in.orig 2005-02-07 18:33:28.000000000 +0100 ++++ configure.in +@@ -45,18 +45,15 @@ AC_ARG_WITH(curses, AC_HELP_STRING([--wi + CPPFLAGS="$CPPFLAGS -I${ytalk_cv_curses}/include" + fi]) +-AC_CHECK_LIB(ncurses, initscr, +- [LIBS="$LIBS -lncurses" +- if test x$ytalk_cv_curses = x/usr -a -d /usr/include/ncurses; then +- CPPFLAGS="$CPPFLAGS -I/usr/include/ncurses" +- fi +- AC_CHECK_HEADERS(ncurses.h)], ++AC_CHECK_LIB(curses, initscr, ++ [LIBS="$LIBS -lcurses" ++ AC_CHECK_HEADERS(curses.h)], + [CF_CURSES_LIBS]) -+if false; then - echo $ac_n "checking for initscr in -lncurses""... $ac_c" 1>&6 - echo "configure:838: checking for initscr in -lncurses" >&5 - ac_lib_var=`echo ncurses'_'initscr | sed 'y%./+-%__p_%'` -@@ -879,6 +880,10 @@ - else - echo "$ac_t""no" 1>&6 - no_ncurses=1 -+fi -+else -+ # NetBSD doesn't need ncurses. -+ no_ncurses=1 - fi - + dnl Check for keypad() +-AC_CHECK_LIB(ncurses, keypad, ++AC_CHECK_LIB(curses, keypad, + [AC_DEFINE(HAVE_KEYPAD, 1, [Define to 1 if you have keypad()])], +-[AC_CHECK_LIB(curses, keypad, ++[AC_CHECK_LIB(ncurses, keypad, + [AC_DEFINE(HAVE_KEYPAD, 1, [Define to 1 if you have keypad()])], + [])]) diff --git a/net/ytalk/patches/patch-ab b/net/ytalk/patches/patch-ab index f5bba970903..6098c74aa0f 100644 --- a/net/ytalk/patches/patch-ab +++ b/net/ytalk/patches/patch-ab @@ -1,23 +1,13 @@ -$NetBSD: patch-ab,v 1.1 2002/12/22 19:39:27 jmmv Exp $ +$NetBSD: patch-ab,v 1.2 2006/01/12 19:57:00 wiz Exp $ ---- Makefile.in.orig Sun Nov 15 04:53:52 1998 +--- Makefile.in.orig 2005-02-13 15:20:12.000000000 +0100 +++ Makefile.in -@@ -21,7 +21,8 @@ VPATH = @srcdir@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - bindir = @bindir@ --sysconfdir = @sysconfdir@ -+realsysconfdir = @sysconfdir@ +@@ -155,7 +155,7 @@ prefix = @prefix@ + program_transform_name = @program_transform_name@ + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ +-sysconfdir = @sysconfdir@ +sysconfdir = @datadir@/examples/ytalk - mandir = @mandir@ - manext = 1 - -@@ -31,7 +32,7 @@ CPPFLAGS = @CPPFLAGS@ - INCLUDES = @XINCS@ - LIBS = @LIBS@ @XLIBS@ - LDFLAGS = @LDFLAGS@ --DEFS = @DEFS@ -DSYSTEM_YTALKRC=\"$(sysconfdir)/ytalkrc\" -+DEFS = @DEFS@ -DSYSTEM_YTALKRC=\"$(realsysconfdir)/ytalkrc\" - - COMPILE = $(CC) $(INCLUDES) $(CPPFLAGS) $(DEFS) $(CFLAGS) - LINK = $(CC) $(CFLAGS) $(LDFLAGS) -o $@ + target_alias = @target_alias@ + confdir = $(sysconfdir) + conf_DATA = ytalkrc diff --git a/net/ytalk/patches/patch-ac b/net/ytalk/patches/patch-ac index 9c79045f625..a675f596074 100644 --- a/net/ytalk/patches/patch-ac +++ b/net/ytalk/patches/patch-ac @@ -1,10 +1,10 @@ -$NetBSD: patch-ac,v 1.1 2005/12/18 18:23:19 joerg Exp $ +$NetBSD: patch-ac,v 1.2 2006/01/12 19:57:00 wiz Exp $ ---- header.h.orig 2005-12-18 18:16:38.000000000 +0000 -+++ header.h -@@ -261,10 +261,6 @@ extern int io_len; /* user input cou - +--- src/header.h.orig 2005-02-13 14:48:53.000000000 +0100 ++++ src/header.h +@@ -290,10 +290,6 @@ extern int io_len; /* user input count extern int running_process; /* flag: is process running? */ + extern ylong myuid; /* stores your uid */ -/* ---- some machine compatibility definitions ---- */ - diff --git a/net/ytalk/patches/patch-ad b/net/ytalk/patches/patch-ad new file mode 100644 index 00000000000..832ba87847e --- /dev/null +++ b/net/ytalk/patches/patch-ad @@ -0,0 +1,143 @@ +$NetBSD: patch-ad,v 1.1 2006/01/12 19:57:00 wiz Exp $ + +--- configure.orig 2005-02-13 15:20:16.000000000 +0100 ++++ configure +@@ -4331,13 +4331,13 @@ if test "${with_curses+set}" = set; then + fi + fi; + +-echo "$as_me:$LINENO: checking for initscr in -lncurses" >&5 +-echo $ECHO_N "checking for initscr in -lncurses... $ECHO_C" >&6 +-if test "${ac_cv_lib_ncurses_initscr+set}" = set; then ++echo "$as_me:$LINENO: checking for initscr in -lcurses" >&5 ++echo $ECHO_N "checking for initscr in -lcurses... $ECHO_C" >&6 ++if test "${ac_cv_lib_curses_initscr+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lncurses $LIBS" ++LIBS="-lcurses $LIBS" + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -4382,26 +4382,23 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +- ac_cv_lib_ncurses_initscr=yes ++ ac_cv_lib_curses_initscr=yes + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_cv_lib_ncurses_initscr=no ++ac_cv_lib_curses_initscr=no + fi + rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:$LINENO: result: $ac_cv_lib_ncurses_initscr" >&5 +-echo "${ECHO_T}$ac_cv_lib_ncurses_initscr" >&6 +-if test $ac_cv_lib_ncurses_initscr = yes; then +- LIBS="$LIBS -lncurses" +- if test x$ytalk_cv_curses = x/usr -a -d /usr/include/ncurses; then +- CPPFLAGS="$CPPFLAGS -I/usr/include/ncurses" +- fi ++echo "$as_me:$LINENO: result: $ac_cv_lib_curses_initscr" >&5 ++echo "${ECHO_T}$ac_cv_lib_curses_initscr" >&6 ++if test $ac_cv_lib_curses_initscr = yes; then ++ LIBS="$LIBS -lcurses" + +-for ac_header in ncurses.h ++for ac_header in curses.h + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` + if eval "test \"\${$as_ac_Header+set}\" = set"; then +@@ -5297,13 +5294,13 @@ fi + fi + + +-echo "$as_me:$LINENO: checking for keypad in -lncurses" >&5 +-echo $ECHO_N "checking for keypad in -lncurses... $ECHO_C" >&6 +-if test "${ac_cv_lib_ncurses_keypad+set}" = set; then ++echo "$as_me:$LINENO: checking for keypad in -lcurses" >&5 ++echo $ECHO_N "checking for keypad in -lcurses... $ECHO_C" >&6 ++if test "${ac_cv_lib_curses_keypad+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lncurses $LIBS" ++LIBS="-lcurses $LIBS" + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -5348,33 +5345,33 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +- ac_cv_lib_ncurses_keypad=yes ++ ac_cv_lib_curses_keypad=yes + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_cv_lib_ncurses_keypad=no ++ac_cv_lib_curses_keypad=no + fi + rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:$LINENO: result: $ac_cv_lib_ncurses_keypad" >&5 +-echo "${ECHO_T}$ac_cv_lib_ncurses_keypad" >&6 +-if test $ac_cv_lib_ncurses_keypad = yes; then ++echo "$as_me:$LINENO: result: $ac_cv_lib_curses_keypad" >&5 ++echo "${ECHO_T}$ac_cv_lib_curses_keypad" >&6 ++if test $ac_cv_lib_curses_keypad = yes; then + + cat >>confdefs.h <<\_ACEOF + #define HAVE_KEYPAD 1 + _ACEOF + + else +- echo "$as_me:$LINENO: checking for keypad in -lcurses" >&5 +-echo $ECHO_N "checking for keypad in -lcurses... $ECHO_C" >&6 +-if test "${ac_cv_lib_curses_keypad+set}" = set; then ++ echo "$as_me:$LINENO: checking for keypad in -lncurses" >&5 ++echo $ECHO_N "checking for keypad in -lncurses... $ECHO_C" >&6 ++if test "${ac_cv_lib_ncurses_keypad+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lcurses $LIBS" ++LIBS="-lncurses $LIBS" + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -5419,20 +5416,20 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +- ac_cv_lib_curses_keypad=yes ++ ac_cv_lib_ncurses_keypad=yes + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_cv_lib_curses_keypad=no ++ac_cv_lib_ncurses_keypad=no + fi + rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:$LINENO: result: $ac_cv_lib_curses_keypad" >&5 +-echo "${ECHO_T}$ac_cv_lib_curses_keypad" >&6 +-if test $ac_cv_lib_curses_keypad = yes; then ++echo "$as_me:$LINENO: result: $ac_cv_lib_ncurses_keypad" >&5 ++echo "${ECHO_T}$ac_cv_lib_ncurses_keypad" >&6 ++if test $ac_cv_lib_ncurses_keypad = yes; then + + cat >>confdefs.h <<\_ACEOF + #define HAVE_KEYPAD 1 |