Tue Jul 15 11:48:34 2008 UTC ()
Make sure the pkgconfig directory exists before we try and copy a file there
Don't bother doing any SSL magic if the user hasn't set the SSL option


(adrianp)
diff -r1.14 -r1.15 pkgsrc/chat/inspircd/Makefile
cvs diff -r1.14 -r1.15 pkgsrc/chat/inspircd/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/chat/inspircd/Attic/Makefile 2008/06/14 14:30:23 1.14
+++ pkgsrc/chat/inspircd/Attic/Makefile 2008/07/15 11:48:34 1.15
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.14 2008/06/14 14:30:23 adrianp Exp $ 1# $NetBSD: Makefile,v 1.15 2008/07/15 11:48:34 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
@@ -90,35 +90,36 @@ INSP_MAXIDENT?= 12 @@ -90,35 +90,36 @@ INSP_MAXIDENT?= 12
90INSP_MAXQUIT?= 255 90INSP_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]) && !empty(PKG_OPTIONS:Mssl)
104 ${CP} ${FILESDIR}/openssl.pc ${WRKSRC}/openssl.pc 104 ${CP} ${FILESDIR}/openssl.pc ${WRKSRC}/openssl.pc
105SUBST_FILES.conf+= ${WRKSRC}/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"
108.endif 108.endif
109 109
110pre-configure: 110pre-configure:
111.if !empty(USE_BUILTIN.openssl:M[yY][eE][sS]) 111.if !empty(USE_BUILTIN.openssl:M[yY][eE][sS]) && !empty(PKG_OPTIONS:Mssl)
 112 ${MKDIR} ${BUILDLINK_DIR}/lib/pkgconfig
112 ${CP} ${WRKSRC}/openssl.pc ${BUILDLINK_DIR}/lib/pkgconfig 113 ${CP} ${WRKSRC}/openssl.pc ${BUILDLINK_DIR}/lib/pkgconfig
113.endif 114.endif
114.if defined(MODULES) 115.if defined(MODULES)
115. for f in ${MODULES} 116. for f in ${MODULES}
116 ${CP} ${EXTRA}/${f} ${WRKSRC}/src/modules/${f} 117 ${CP} ${EXTRA}/${f} ${WRKSRC}/src/modules/${f}
117. endfor 118. endfor
118.endif 119.endif
119.if defined(HEADERS) 120.if defined(HEADERS)
120. for f in ${HEADERS} 121. for f in ${HEADERS}
121 ${CP} ${EXTRA}/${f} ${WRKSRC}/src/modules/${f} 122 ${CP} ${EXTRA}/${f} ${WRKSRC}/src/modules/${f}
122. endfor 123. endfor
123.endif 124.endif
124 125