Sat Jun 14 14:30:23 2008 UTC ()
* 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


(adrianp)
diff -r1.13 -r1.14 pkgsrc/chat/inspircd/Makefile
diff -r1.12 -r1.13 pkgsrc/chat/inspircd/distinfo
diff -r1.4 -r1.5 pkgsrc/chat/inspircd/patches/patch-ac
diff -r0 -r1.1 pkgsrc/chat/inspircd/patches/patch-ad
cvs diff -r1.13 -r1.14 pkgsrc/chat/inspircd/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/chat/inspircd/Attic/Makefile 2008/06/14 13:07:51 1.13
+++ pkgsrc/chat/inspircd/Attic/Makefile 2008/06/14 14:30:23 1.14
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.13 2008/06/14 13:07:51 adrianp Exp $ 1# $NetBSD: Makefile,v 1.14 2008/06/14 14:30:23 adrianp Exp $
2# 2#
3 3
4DISTNAME= InspIRCd-1.1.20 4DISTNAME= InspIRCd-1.1.20
5PKGNAME= ${DISTNAME:S/InspIRCd/inspircd/} 5PKGNAME= ${DISTNAME:S/InspIRCd/inspircd/}
6CATEGORIES= chat 6CATEGORIES= chat
7MASTER_SITES= http://www.inspircd.org/downloads/ 7MASTER_SITES= http://www.inspircd.org/downloads/
8EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
9 9
10MAINTAINER= adrianp@NetBSD.org 10MAINTAINER= adrianp@NetBSD.org
11HOMEPAGE= http://www.inspircd.org/ 11HOMEPAGE= http://www.inspircd.org/
12COMMENT= Modular C++ IRC Daemon 12COMMENT= Modular C++ IRC Daemon
13 13
14USE_TOOLS+= perl:build gmake pkg-config 14USE_TOOLS+= perl:build gmake pkg-config
@@ -91,34 +91,36 @@ INSP_MAXQUIT?= 255 @@ -91,34 +91,36 @@ INSP_MAXQUIT?= 255
91INSP_MAXTOPIC?= 307 91INSP_MAXTOPIC?= 307
92INSP_MAXKICK?= 255 92INSP_MAXKICK?= 255
93INSP_MAXGECOS?= 128 93INSP_MAXGECOS?= 128
94INSP_MAXAWAY?= 200 94INSP_MAXAWAY?= 200
95INSP_MAXMODES?= 20 95INSP_MAXMODES?= 20
96 96
97CHECK_BUILTIN.openssl:=yes 97CHECK_BUILTIN.openssl:=yes
98.include "../../security/openssl/builtin.mk" 98.include "../../security/openssl/builtin.mk"
99CHECK_BUILTIN.openssl:=no 99CHECK_BUILTIN.openssl:=no
100 100
101post-extract: 101post-extract:
102 ${MV} ${WRKDIR}/inspircd ${WRKDIR}/${DISTNAME:S/InspIRCd/inspircd/} 102 ${MV} ${WRKDIR}/inspircd ${WRKDIR}/${DISTNAME:S/InspIRCd/inspircd/}
103.if !empty(USE_BUILTIN.openssl:M[yY][eE][sS]) 103.if !empty(USE_BUILTIN.openssl:M[yY][eE][sS])
104 ${CP} ${FILESDIR}/openssl.pc ${WRKSRC} 104 ${CP} ${FILESDIR}/openssl.pc ${WRKSRC}/openssl.pc
105SUBST_FILES.conf+= openssl.pc 105SUBST_FILES.conf+= ${WRKSRC}/openssl.pc
106SUBST_SED.conf+= -e "s|@SSLBASE@|${BUILDLINK_PREFIX.openssl}|g" 106SUBST_SED.conf+= -e "s|@SSLBASE@|${BUILDLINK_PREFIX.openssl}|g"
107SUBST_SED.conf+= -e "s|@SSLVER@|${BUILTIN_VERSION.openssl}|g" 107SUBST_SED.conf+= -e "s|@SSLVER@|${BUILTIN_VERSION.openssl}|g"
108CONFIGURE_ENV+= PKG_CONFIG_PATH=${WRKSRC:Q} 
109.endif 108.endif
110 109
111pre-configure: 110pre-configure:
 111.if !empty(USE_BUILTIN.openssl:M[yY][eE][sS])
 112 ${CP} ${WRKSRC}/openssl.pc ${BUILDLINK_DIR}/lib/pkgconfig
 113.endif
112.if defined(MODULES) 114.if defined(MODULES)
113. for f in ${MODULES} 115. for f in ${MODULES}
114 ${CP} ${EXTRA}/${f} ${WRKSRC}/src/modules/${f} 116 ${CP} ${EXTRA}/${f} ${WRKSRC}/src/modules/${f}
115. endfor 117. endfor
116.endif 118.endif
117.if defined(HEADERS) 119.if defined(HEADERS)
118. for f in ${HEADERS} 120. for f in ${HEADERS}
119 ${CP} ${EXTRA}/${f} ${WRKSRC}/src/modules/${f} 121 ${CP} ${EXTRA}/${f} ${WRKSRC}/src/modules/${f}
120. endfor 122. endfor
121.endif 123.endif
122 124
123post-build: 125post-build:
124 ${CP} ${PKGDIR}/PLIST ${WRKDIR}/.PLIST_SRC 126 ${CP} ${PKGDIR}/PLIST ${WRKDIR}/.PLIST_SRC
cvs diff -r1.12 -r1.13 pkgsrc/chat/inspircd/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/chat/inspircd/Attic/distinfo 2008/06/14 13:07:51 1.12
+++ pkgsrc/chat/inspircd/Attic/distinfo 2008/06/14 14:30:23 1.13
@@ -1,8 +1,9 @@ @@ -1,8 +1,9 @@
1$NetBSD: distinfo,v 1.12 2008/06/14 13:07:51 adrianp Exp $ 1$NetBSD: distinfo,v 1.13 2008/06/14 14:30:23 adrianp Exp $
2 2
3SHA1 (InspIRCd-1.1.20.tar.bz2) = 9d4208cbdfeaba625b5ada4c03bc6de9bae448fa 3SHA1 (InspIRCd-1.1.20.tar.bz2) = 9d4208cbdfeaba625b5ada4c03bc6de9bae448fa
4RMD160 (InspIRCd-1.1.20.tar.bz2) = c2500a895dec34854488ded926c3d2439a12ccdc 4RMD160 (InspIRCd-1.1.20.tar.bz2) = c2500a895dec34854488ded926c3d2439a12ccdc
5Size (InspIRCd-1.1.20.tar.bz2) = 505952 bytes 5Size (InspIRCd-1.1.20.tar.bz2) = 505952 bytes
6SHA1 (patch-aa) = d62675b6ace79ba5c0c0c4db2b4f9454346170c3 6SHA1 (patch-aa) = d62675b6ace79ba5c0c0c4db2b4f9454346170c3
7SHA1 (patch-ab) = 683344dc906be076aaed688924bfad4e4aabe508 7SHA1 (patch-ab) = 683344dc906be076aaed688924bfad4e4aabe508
8SHA1 (patch-ac) = 36974411a7aeb96c08be8b38c1a0c3e208416590 8SHA1 (patch-ac) = 266c8d6015923d890748d4157f7e5aff87da5df1
 9SHA1 (patch-ad) = d35df392a574728f6c61c4107bb3d2ce1e11568a
cvs diff -r1.4 -r1.5 pkgsrc/chat/inspircd/patches/Attic/patch-ac (expand / switch to unified diff)

--- pkgsrc/chat/inspircd/patches/Attic/patch-ac 2007/10/13 21:11:39 1.4
+++ pkgsrc/chat/inspircd/patches/Attic/patch-ac 2008/06/14 14:30:23 1.5
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1$NetBSD: patch-ac,v 1.4 2007/10/13 21:11:39 adrianp Exp $ 1$NetBSD: patch-ac,v 1.5 2008/06/14 14:30:23 adrianp Exp $
2 2
3--- configure.orig 2007-08-20 22:06:16.000000000 +0100 3--- configure.orig 2008-05-11 01:19:59.000000000 +0100
4+++ configure 4+++ configure
5@@ -230,8 +230,8 @@ $config{EXTRA_DIR} = ""; # 5@@ -232,8 +231,8 @@ $config{EXTRA_DIR} = ""; #
6 if ($config{OSNAME} =~ /darwin/i) 6 if ($config{OSNAME} =~ /darwin/i)
7 { 7 {
8 $config{IS_DARWIN} = "YES"; 8 $config{IS_DARWIN} = "YES";
9- $config{STARTSCRIPT} = "org.inspircd.plist"; # start script for OSX. 9- $config{STARTSCRIPT} = "org.inspircd.plist"; # start script for OSX.
10- $config{DESTINATION} = "LAUNCHDPATH"; # Is OSX target. 10- $config{DESTINATION} = "LAUNCHDPATH"; # Is OSX target.
11+# $config{STARTSCRIPT} = "org.inspircd.plist"; # start script for OSX. 11+# $config{STARTSCRIPT} = "org.inspircd.plist"; # start script for OSX.
12+# $config{DESTINATION} = "LAUNCHDPATH"; # Is OSX target. 12+# $config{DESTINATION} = "LAUNCHDPATH"; # Is OSX target.
13 $config{EXTRA_DIR} = " launchd_dir"; # Is OSX specific path. 13 $config{EXTRA_DIR} = " launchd_dir"; # Is OSX specific path.
14 } 14 }
15 $config{CC} = "g++"; # C++ compiler 15 $config{CC} = "g++"; # C++ compiler
File Added: pkgsrc/chat/inspircd/patches/Attic/patch-ad
$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 {