diff options
| -rw-r--r-- | chat/ircu/Makefile | 5 | ||||
| -rw-r--r-- | chat/ircu/distinfo | 6 | ||||
| -rw-r--r-- | chat/ircu/patches/patch-aa | 14 | ||||
| -rw-r--r-- | chat/ircu/patches/patch-ab | 13 | ||||
| -rw-r--r-- | chat/ircu/patches/patch-ah | 50 |
5 files changed, 83 insertions, 5 deletions
diff --git a/chat/ircu/Makefile b/chat/ircu/Makefile index 50bb508423a..cf205e882b7 100644 --- a/chat/ircu/Makefile +++ b/chat/ircu/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2006/04/23 00:12:36 jlam Exp $ +# $NetBSD: Makefile,v 1.23 2006/12/21 16:13:53 jmmv Exp $ # DISTNAME= ircu2.10.11.07 @@ -59,6 +59,9 @@ SUBST_MESSAGE.paths= Fixing hardcoded paths. INSTALLATION_DIRS= man/man8 sbin +post-extract: + mv ${WRKSRC}/tools/Makefile.crypt ${WRKSRC}/tools/Makefile.crypt.in + post-build: @cd ${WRKSRC}/tools && \ ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} \ diff --git a/chat/ircu/distinfo b/chat/ircu/distinfo index 9ad60471078..318b67332f0 100644 --- a/chat/ircu/distinfo +++ b/chat/ircu/distinfo @@ -1,11 +1,13 @@ -$NetBSD: distinfo,v 1.9 2005/12/13 18:14:10 joerg Exp $ +$NetBSD: distinfo,v 1.10 2006/12/21 16:13:54 jmmv Exp $ SHA1 (ircu2.10.11.07.tar.gz) = 1e1518cbbdf096aaaabf5f56a1ec266769d847ad RMD160 (ircu2.10.11.07.tar.gz) = 359f92bb7a4464baf9af571865ee4bf9fbe56426 Size (ircu2.10.11.07.tar.gz) = 844971 bytes +SHA1 (patch-aa) = 5bba1aa64e8b611688a1de1c3106b83a92a2cedd +SHA1 (patch-ab) = 92d532072fd291c077a8ff2ebc2f1f245da78c87 SHA1 (patch-af) = da533f03542c268c9e3502278f51777c3b85824d SHA1 (patch-ag) = f34df6342c8e26b4cdf59e56c893b4845f7d3974 -SHA1 (patch-ah) = 7413fb1b87df5931f34482ad3b18106c5ce7e2f1 +SHA1 (patch-ah) = f89f24ebc1f79070c16b1b6ca7689221afa98d6b SHA1 (patch-ai) = 83119426e72a4833460bced3cd11bf47829e8992 SHA1 (patch-aj) = ac16fd3e8a4c6d7da7e6f5383c746a9cfc2674ea SHA1 (patch-ak) = dec69de5c6b678cb5736173cccc34907d16b1ab8 diff --git a/chat/ircu/patches/patch-aa b/chat/ircu/patches/patch-aa new file mode 100644 index 00000000000..1edac2fdc33 --- /dev/null +++ b/chat/ircu/patches/patch-aa @@ -0,0 +1,14 @@ +$NetBSD: patch-aa,v 1.3 2006/12/21 16:13:54 jmmv Exp $ + +--- ircd/res.c.orig 2004-01-11 01:23:32.000000000 +0100 ++++ ircd/res.c +@@ -43,6 +43,9 @@ + #include <unistd.h> + #include <regex.h> + ++/* bind 8 compatibility needed because of T_PTR and other macros. Seen ++ * under Mac OS X 10.4. */ ++#define BIND_8_COMPAT + #include <arpa/nameser.h> + #include <resolv.h> + #include <netdb.h> diff --git a/chat/ircu/patches/patch-ab b/chat/ircu/patches/patch-ab new file mode 100644 index 00000000000..83a18bc12e5 --- /dev/null +++ b/chat/ircu/patches/patch-ab @@ -0,0 +1,13 @@ +$NetBSD: patch-ab,v 1.3 2006/12/21 16:13:54 jmmv Exp $ + +--- tools/Makefile.crypt.in.orig 2004-09-18 04:17:52.000000000 +0200 ++++ tools/Makefile.crypt.in +@@ -21,7 +21,7 @@ + # + IRCDCONF = /usr/local/lib/irc/ircd.conf + +-LIBS = -lcrypt ++LIBS = @LIBS@ + + all: mkpasswd + crypt: install diff --git a/chat/ircu/patches/patch-ah b/chat/ircu/patches/patch-ah index c5e1f70432c..0126d04c06c 100644 --- a/chat/ircu/patches/patch-ah +++ b/chat/ircu/patches/patch-ah @@ -1,6 +1,6 @@ -$NetBSD: patch-ah,v 1.3 2005/12/13 18:14:10 joerg Exp $ +$NetBSD: patch-ah,v 1.4 2006/12/21 16:13:54 jmmv Exp $ ---- configure.orig 2004-09-18 02:17:45.000000000 +0000 +--- configure.orig 2004-09-18 04:17:45.000000000 +0200 +++ configure @@ -2370,7 +2370,6 @@ if test x"$CFLAGS" != x; then fi @@ -19,3 +19,49 @@ $NetBSD: patch-ah,v 1.3 2005/12/13 18:14:10 joerg Exp $ echo "$as_me:$LINENO: result: Generic BSD ($host) found." >&5 echo "${ECHO_T}Generic BSD ($host) found." >&6 if test x"$ac_cv_header_poll_h" = xyes; then +@@ -7968,9 +7967,25 @@ cat >>confdefs.h <<_ACEOF + _ACEOF + + +-unet_maxcon=`ulimit -Hn` +-if test x"$unet_maxcon" = xunlimited; then +- unet_maxcon=`ulimit -Sn` ++if test x$unet_poll_syscall = xno; then ++ # Avoid usage of ulimit. pkgsrc removes some limits at run time and ++ # that raises the values too much in some cases to confuse the code in ++ # s_bsd.c (seen in Mac OS X 10.4). Better use FD_SETSIZE as that is ++ # the maximum value the code will be able to handle when using the ++ # select(2) system call. ++ cat >./conftest.c <<_ACEOF ++#include <sys/select.h> ++#include <stdio.h> ++int main(void) { printf("%d\n", FD_SETSIZE); return 0; } ++_ACEOF ++ cc -o ./conftest ./conftest.c ++ unet_maxcon=`./conftest` ++ rm ./conftest ./conftest.c ++else ++ unet_maxcon=`ulimit -Hn` ++ if test x"$unet_maxcon" = xunlimited; then ++ unet_maxcon=`ulimit -Sn` ++ fi + fi + unet_maxcon=`expr $unet_maxcon - 4` + echo "$as_me:$LINENO: checking max connections" >&5 +@@ -8002,7 +8017,7 @@ cat >>confdefs.h <<_ACEOF + _ACEOF + + +- ac_config_files="$ac_config_files Makefile ircd/Makefile doc/Makefile" ++ ac_config_files="$ac_config_files Makefile ircd/Makefile doc/Makefile tools/Makefile.crypt" + ac_config_commands="$ac_config_commands default" + cat >confcache <<\_ACEOF + # This file is a shell script that caches the results of configure +@@ -8534,6 +8549,7 @@ do + "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; + "ircd/Makefile" ) CONFIG_FILES="$CONFIG_FILES ircd/Makefile" ;; + "doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;; ++ "tools/Makefile.crypt" ) CONFIG_FILES="$CONFIG_FILES tools/Makefile.crypt" ;; + "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; + "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; + *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 |