* Increase pkg-config magic to get SSL enabled build to work when the

  builtin version of OpenSSL is used.
* Do not, under any case, do anything with svn during the configure process

4 files changed, 42 insertions, 9 deletions

diff --git a/chat/inspircd/Makefile b/chat/inspircd/Makefile
index 8798d4441ec..20e79ad04a8 100644
--- a/chat/inspircd/Makefile
+++ b/chat/inspircd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2008/06/14 13:07:51 adrianp Exp $
+# $NetBSD: Makefile,v 1.14 2008/06/14 14:30:23 adrianp Exp $
 #
 
 DISTNAME=	InspIRCd-1.1.20
@@ -101,14 +101,16 @@ CHECK_BUILTIN.openssl:=no
 post-extract:
 	${MV} ${WRKDIR}/inspircd ${WRKDIR}/${DISTNAME:S/InspIRCd/inspircd/}
 .if !empty(USE_BUILTIN.openssl:M[yY][eE][sS])
-	${CP} ${FILESDIR}/openssl.pc ${WRKSRC}
-SUBST_FILES.conf+=	openssl.pc
+	${CP} ${FILESDIR}/openssl.pc ${WRKSRC}/openssl.pc
+SUBST_FILES.conf+=	${WRKSRC}/openssl.pc
 SUBST_SED.conf+=	-e "s|@SSLBASE@|${BUILDLINK_PREFIX.openssl}|g"
 SUBST_SED.conf+=	-e "s|@SSLVER@|${BUILTIN_VERSION.openssl}|g"
-CONFIGURE_ENV+=	PKG_CONFIG_PATH=${WRKSRC:Q}
 .endif
 
 pre-configure:
+.if !empty(USE_BUILTIN.openssl:M[yY][eE][sS])
+	${CP} ${WRKSRC}/openssl.pc ${BUILDLINK_DIR}/lib/pkgconfig
+.endif
 .if defined(MODULES)
 .  for f in ${MODULES}
 	${CP} ${EXTRA}/${f} ${WRKSRC}/src/modules/${f}
diff --git a/chat/inspircd/distinfo b/chat/inspircd/distinfo
index 2522132f361..77763f01e56 100644
--- a/chat/inspircd/distinfo
+++ b/chat/inspircd/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.12 2008/06/14 13:07:51 adrianp Exp $
+$NetBSD: distinfo,v 1.13 2008/06/14 14:30:23 adrianp Exp $
 
 SHA1 (InspIRCd-1.1.20.tar.bz2) = 9d4208cbdfeaba625b5ada4c03bc6de9bae448fa
 RMD160 (InspIRCd-1.1.20.tar.bz2) = c2500a895dec34854488ded926c3d2439a12ccdc
 Size (InspIRCd-1.1.20.tar.bz2) = 505952 bytes
 SHA1 (patch-aa) = d62675b6ace79ba5c0c0c4db2b4f9454346170c3
 SHA1 (patch-ab) = 683344dc906be076aaed688924bfad4e4aabe508
-SHA1 (patch-ac) = 36974411a7aeb96c08be8b38c1a0c3e208416590
+SHA1 (patch-ac) = 266c8d6015923d890748d4157f7e5aff87da5df1
+SHA1 (patch-ad) = d35df392a574728f6c61c4107bb3d2ce1e11568a
diff --git a/chat/inspircd/patches/patch-ac b/chat/inspircd/patches/patch-ac
index 6fd03a66c9a..2aab70fd2d3 100644
--- a/chat/inspircd/patches/patch-ac
+++ b/chat/inspircd/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.4 2007/10/13 21:11:39 adrianp Exp $
+$NetBSD: patch-ac,v 1.5 2008/06/14 14:30:23 adrianp Exp $
 
---- configure.orig	2007-08-20 22:06:16.000000000 +0100
+--- configure.orig	2008-05-11 01:19:59.000000000 +0100
 +++ configure
-@@ -230,8 +230,8 @@ $config{EXTRA_DIR}          = "";						#
+@@ -232,8 +231,8 @@ $config{EXTRA_DIR}          = "";						#
  if ($config{OSNAME} =~ /darwin/i)
  {
  	$config{IS_DARWIN} = "YES";
diff --git a/chat/inspircd/patches/patch-ad b/chat/inspircd/patches/patch-ad
new file mode 100644
index 00000000000..9bcb058fdb3
--- /dev/null
+++ b/chat/inspircd/patches/patch-ad
@@ -0,0 +1,30 @@
+$NetBSD: patch-ad,v 1.1 2008/06/14 14:30:23 adrianp Exp $
+
+--- make/configure.pm.orig	2007-12-09 20:34:24.000000000 +0000
++++ make/configure.pm
+@@ -46,24 +46,7 @@ sub resolve_directory
+ }
+ 
+ sub getrevision {
+-	if ($no_svn)
+-	{
+-		return "0";
+-	}
+-	my $data = `svn info`;
+-	if ($data eq "")
+-	{
+-		$no_svn = 1;
+-		$rev = "0";
+-		return $rev;
+-	}
+-	$data =~ /Revision: (\d+)/;
+-	my $rev = $1;
+-	if (!defined($rev))
+-	{
+-		$rev = "0";
+-	}
+-	return $rev;
++	return "0";
+ }
+ 
+ sub getcompilerflags {