Fixed the build on NetBSD.

6 files changed, 21 insertions, 41 deletions

diff --git a/chat/quirc/Makefile b/chat/quirc/Makefile
index 88c3fbb6c0a..9bf7fc593bc 100644
--- a/chat/quirc/Makefile
+++ b/chat/quirc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2007/01/15 19:31:46 joerg Exp $
+# $NetBSD: Makefile,v 1.16 2007/03/17 16:06:22 rillig Exp $
 #
 
 DISTNAME=	quirc-0.9.84
@@ -12,9 +12,13 @@ COMMENT=	Stable and powerful graphical IRC client
 
 GNU_CONFIGURE=	YES
 USE_LANGUAGES=	c c++
-USE_TOOLS+=	gmake
+USE_TOOLS+=	gmake automake autoconf autoreconf
 
 CONFIGURE_ARGS+=	--with-tcl=${BUILDLINK_PREFIX.tcl}
+MAKE_FLAGS+=	docdir=${PREFIX}/share/doc/quirc
+
+pre-configure:
+	cd ${WRKSRC} && autoreconf
 
 BUILDLINK_DEPMETHOD.libXt?=	build
 
diff --git a/chat/quirc/distinfo b/chat/quirc/distinfo
index a5e4a791d23..1ad3f3a7254 100644
--- a/chat/quirc/distinfo
+++ b/chat/quirc/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2005/02/23 15:59:13 agc Exp $
+$NetBSD: distinfo,v 1.8 2007/03/17 16:06:22 rillig Exp $
 
 SHA1 (quirc-0.9.84.tar.gz) = 0d9aa3f35616c3d5e6835a318266f1c71232e4d1
 RMD160 (quirc-0.9.84.tar.gz) = 6fdacee28b63363c3276349c32bd7bfbd463ff19
@@ -8,4 +8,4 @@ SHA1 (patch-ab) = 15356ff0598db83eeaf549b29a8d285eb6a27630
 SHA1 (patch-ac) = 4353b22eb607d2e1f158ba4a2668ebf1e2616de7
 SHA1 (patch-ad) = 37a6e3525dc0ff7655fd62c8981eb81eae916126
 SHA1 (patch-ae) = 61486f04dc9c227ae753ec355b83a5c77aa278aa
-SHA1 (patch-af) = 87fd50dbfc9fb8a667e39403e781be2a1e221368
+SHA1 (patch-ag) = ae9a1383c20624f6f4ce7d4cb6a7c27ee06e85ea
diff --git a/chat/quirc/patches/patch-aa b/chat/quirc/patches/patch-aa
deleted file mode 100644
index 273c45de9c9..00000000000
--- a/chat/quirc/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2004/03/12 06:07:12 minskim Exp $
-
---- Makefile.in.orig	2004-01-13 01:23:10.000000000 -0600
-+++ Makefile.in
-@@ -225,7 +225,7 @@ BUILT_SOURCES = tags.cc
- generate_tags_SOURCES = generate_tags.cc
- 
- # Documentation
--docdir = $(prefix)/doc/@PACKAGE@
-+docdir = $(prefix)/share/doc/@PACKAGE@
- doc_DATA = FAQ AUTHORS COPYING ChangeLog INSTALL NEWS README ChangeLog.themes
- 
- # RPM and spec file generation
diff --git a/chat/quirc/patches/patch-ab b/chat/quirc/patches/patch-ab
deleted file mode 100644
index fbb3ead6f65..00000000000
--- a/chat/quirc/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2004/03/12 06:07:12 minskim Exp $
-
---- doc/Makefile.in.orig	2004-01-13 01:23:10.000000000 -0600
-+++ doc/Makefile.in
-@@ -132,7 +132,7 @@ sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--docdir = $(prefix)/doc/@PACKAGE@
-+docdir = $(prefix)/share/doc/@PACKAGE@
- doc_DATA = rfc1459.txt color.txt nickcomp.txt quedit.txt
- EXTRA_DIST = $(doc_DATA) dccresum.txt links.txt tdcc.txt
- MOSTLYCLEANFILES = \\\#*\\\# *~
diff --git a/chat/quirc/patches/patch-af b/chat/quirc/patches/patch-af
deleted file mode 100644
index fabb7853801..00000000000
--- a/chat/quirc/patches/patch-af
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-af,v 1.1 2004/08/02 00:07:40 kristerw Exp $
-
---- config.h.in.orig	Mon Aug  2 01:59:03 2004
-+++ config.h.in	Mon Aug  2 01:59:13 2004
-@@ -92,6 +92,3 @@
- 
- /* If socken_t is defined */
- #undef socklen_t
--
--/* Define to `unsigned int' if <sys/types.h> does not define. */
--#undef u_int32_t
diff --git a/chat/quirc/patches/patch-ag b/chat/quirc/patches/patch-ag
new file mode 100644
index 00000000000..536fa1723af
--- /dev/null
+++ b/chat/quirc/patches/patch-ag
@@ -0,0 +1,13 @@
+$NetBSD: patch-ag,v 1.1 2007/03/17 16:06:23 rillig Exp $
+
+--- configure.in.orig	2004-01-12 10:33:19.000000000 +0100
++++ configure.in	2007-03-17 16:52:15.000000000 +0100
+@@ -417,6 +417,8 @@ if test "$HAVETK" != "1"; then AC_MSG_ER
+ dnl Make sure size_t is defined
+ AC_TYPE_SIZE_T
+ 
++AC_CHECK_HEADERS([sys/types.h])
++
+ dnl Make sure u_int32_t is defined for arlib.c
+ AC_CHECK_TYPE(u_int32_t,unsigned int)
+