diff options
-rw-r--r-- | chat/inspircd/Makefile | 30 | ||||
-rw-r--r-- | chat/inspircd/files/openssl.pc | 11 | ||||
-rw-r--r-- | chat/inspircd/options.mk | 30 |
3 files changed, 44 insertions, 27 deletions
diff --git a/chat/inspircd/Makefile b/chat/inspircd/Makefile index e45dcda9831..73f98eac3bb 100644 --- a/chat/inspircd/Makefile +++ b/chat/inspircd/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.1.1.1 2007/07/24 20:13:19 adrianp Exp $ +# $NetBSD: Makefile,v 1.2 2007/07/28 22:52:15 adrianp Exp $ # DISTNAME= InspIRCd-1.1.10 PKGNAME= ${DISTNAME:S/InspIRCd/inspircd/} +PKGREVISION= 1 CATEGORIES= chat MASTER_SITES= http://www.inspircd.org/downloads/ EXTRACT_SUFX= .tar.bz2 @@ -11,7 +12,7 @@ MAINTAINER= adrianp@NetBSD.org HOMEPAGE= http://www.inspircd.org/ COMMENT= Modular C++ IRC Daemon -USE_TOOLS+= perl:build gmake +USE_TOOLS+= perl:build gmake pkg-config REPLACE_PERL+= .inspircd.inc configure WRKSRC= ${WRKDIR}/${DISTNAME:S/InspIRCd/inspircd/} @@ -44,12 +45,6 @@ PKG_USERS= ${INSPIRCD_USER:Q}:${INSPIRCD_GROUP:Q} PKG_GECOS.${INSPIRCD_USER}= InspIRCd user -SUBST_CLASSES+= conf -SUBST_STAGE.conf= pre-configure -SUBST_FILES.conf= docs/inspircd.conf.example -SUBST_SED.conf+= -e "s|/path/to/inspircd.pid|${VARBASE}/run/inspircd/inspircd.pid|g" -SUBST_MESSAGE.conf= Fixing configuration files. - CONFIGURE_ARGS+= --disable-interactive CONFIGURE_ARGS+= --prefix=${PREFIX}/share/inspircd CONFIGURE_ARGS+= --config-dir=${PKG_SYSCONFDIR} @@ -70,6 +65,12 @@ CONFIGURE_ARGS+= --with-max-modes=${INSP_MAXMODES:Q} .include "options.mk" +SUBST_CLASSES+= conf +SUBST_STAGE.conf= pre-configure +SUBST_FILES.conf= docs/inspircd.conf.example +SUBST_SED.conf+= -e "s|/path/to/inspircd.pid|${VARBASE}/run/inspircd/inspircd.pid|g" +SUBST_MESSAGE.conf= Fixing configuration files. + BUILD_DEFS+= INSP_NICLEN INSP_CHANLEN INSPIRCD_USER INSPIRCD_GROUP BUILD_DEFS+= INSP_MAXCLI INSP_MAXIDENT INSP_MAXQUIT INSP_MAXTOPIC BUILD_DEFS+= INSP_MAXKICK INSP_MAXGECOS INSP_MAXAWAY INSP_MAXMODES @@ -93,8 +94,19 @@ INSP_MAXGECOS?= 128 INSP_MAXAWAY?= 200 INSP_MAXMODES?= 20 +CHECK_BUILTIN.openssl:=yes +.include "../../security/openssl/builtin.mk" +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 +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 defined(MODULES) @@ -102,7 +114,7 @@ pre-configure: ${CP} ${EXTRA}/${f} ${WRKSRC}/src/modules/${f} . endfor .endif -.if defined(HEADER) +.if defined(HEADERS) . for f in ${HEADERS} ${CP} ${EXTRA}/${f} ${WRKSRC}/src/modules/${f} . endfor diff --git a/chat/inspircd/files/openssl.pc b/chat/inspircd/files/openssl.pc new file mode 100644 index 00000000000..3ee6bfd395c --- /dev/null +++ b/chat/inspircd/files/openssl.pc @@ -0,0 +1,11 @@ +prefix=@SSLBASE@ +exec_prefix=${prefix} +libdir=${exec_prefix}/lib +includedir=${prefix}/include + +Name: OpenSSL +Description: Secure Sockets Layer and cryptography libraries and tools +Version: @SSLVER@ +Requires: +Libs: -L${libdir} -lssl -lcrypto -Wl,-R@SSLBASE@/lib +Cflags: -I${includedir} diff --git a/chat/inspircd/options.mk b/chat/inspircd/options.mk index 82e47dae286..f1465f2195b 100644 --- a/chat/inspircd/options.mk +++ b/chat/inspircd/options.mk @@ -1,10 +1,10 @@ -# $NetBSD: options.mk,v 1.1.1.1 2007/07/24 20:13:19 adrianp Exp $ +# $NetBSD: options.mk,v 1.2 2007/07/28 22:52:15 adrianp Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.inspircd PKG_SUPPORTED_OPTIONS= inet6 ssl gnutls kqueue epoll inspircd-remoteinet6 -PKG_SUPPORTED_OPTIONS+= pcre inspircd-ziplinks mysql pgsql inspircd-sqlauth -PKG_SUPPORTED_OPTIONS+= inspircd-sqllog inspircd-sqloper inspircd-sqlutils +PKG_SUPPORTED_OPTIONS+= pcre inspircd-ziplinks inspircd-sqlauth +PKG_SUPPORTED_OPTIONS+= inspircd-sqllog inspircd-sqloper PKG_SUGGESTED_OPTIONS= inet6 .include "../../mk/bsd.options.mk" @@ -13,7 +13,7 @@ PKG_SUGGESTED_OPTIONS= inet6 ### Dependency notes: ### ### sql = mysql, pgsql, sqlite3 -### sqlutils = sqlutils +### sqlutils = m_sqlutils.cpp m_sqlutils.h ### ### sqloper needs sql sqlutils ### sqllog needs sql @@ -60,7 +60,9 @@ CONFIGURE_ARGS+= --disable-remote-ipv6 ### .if !empty(PKG_OPTIONS:Mssl) . include "../../security/openssl/buildlink3.mk" +BUILDLINK_API_DEPENDS.openssl+= openssl>=0.9.7 CONFIGURE_ARGS+= --enable-openssl +MODULES+= m_ssl_openssl.cpp .endif ### @@ -70,6 +72,7 @@ CONFIGURE_ARGS+= --enable-openssl .if !empty(PKG_OPTIONS:Mgnutls) . include "../../security/gnutls/buildlink3.mk" CONFIGURE_ARGS+= --enable-gnutls +MODULES+= m_ssl_gnutls.cpp .endif ### @@ -94,8 +97,8 @@ MODULES+= m_filter_pcre.cpp ### .if !empty(PKG_OPTIONS:Minspircd-sqlauth) INSPIRCD_STORAGE_DRIVER?= mysql -MODULES+= m_sqlauth.cpp -PKG_SUGGESTED_OPTIONS+= inspircd-sqlutils +MODULES+= m_sqlauth.cpp m_sqlutils.cpp +HEADERS+= m_sqlutils.h .endif ### @@ -111,16 +114,7 @@ MODULES+= m_sqllog.cpp ### .if !empty(PKG_OPTIONS:Minspircd-sqloper) INSPIRCD_STORAGE_DRIVER?= mysql -MODULES+= m_sqloper.cpp -PKG_SUGGESTED_OPTIONS+= inspircd-sqlutils -.endif - -### -### SQL utilities -### -.if !empty(PKG_OPTIONS:Minspircd-sqlutils) -INSPIRCD_STORAGE_DRIVER?= mysql -MODULES+= m_sqlutils.cpp +MODULES+= m_sqloper.cpp m_sqlutils.cpp HEADERS+= m_sqlutils.h .endif @@ -137,11 +131,11 @@ BUILD_DEFS+= INSPIRCD_STORAGE_DRIVER . include "../../mk/mysql.buildlink3.mk" MODULES+= m_mysql.cpp HEADERS+= m_sqlv2.h -. elif !empty(DSPAM_STORAGE_DRIVER:Mpgsql) +. elif !empty(INSPIRCD_STORAGE_DRIVER:Mpgsql) . include "../../mk/pgsql.buildlink3.mk" MODULES+= m_pgsql.cpp HEADERS+= m_sqlv2.h -. elif !empty(DSPAM_STORAGE_DRIVER:Msqlite3) +. elif !empty(INSPIRCD_STORAGE_DRIVER:Msqlite3) . include "../../databases/sqlite3/buildlink3.mk" MODULES+= m_sqlite3.cpp HEADERS+= m_sqlv2.h |