summaryrefslogtreecommitdiff
path: root/chat
diff options
context:
space:
mode:
authorfhajny <fhajny>2016-02-26 10:52:01 +0000
committerfhajny <fhajny>2016-02-26 10:52:01 +0000
commit9ddb4f412d2c5bdbc2a1caab565d9f10f18a444a (patch)
tree08ab63e2207a62e09ca3bfee3f98b009a6b92722 /chat
parent839cda572ec8232cebef0a505a37dfa17489f6e8 (diff)
downloadpkgsrc-9ddb4f412d2c5bdbc2a1caab565d9f10f18a444a.tar.gz
Skip example certs build, simplifies and fixes unprivileged installation.
Bump PKGREVISION.
Diffstat (limited to 'chat')
-rw-r--r--chat/prosody/Makefile7
-rw-r--r--chat/prosody/PLIST5
2 files changed, 4 insertions, 8 deletions
diff --git a/chat/prosody/Makefile b/chat/prosody/Makefile
index d822f13c403..7f448d17e3f 100644
--- a/chat/prosody/Makefile
+++ b/chat/prosody/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.24 2016/02/25 11:28:58 jperkin Exp $
+# $NetBSD: Makefile,v 1.25 2016/02/26 10:52:01 fhajny Exp $
#
DISTNAME= prosody-0.9.10
+PKGREVISION= 1
CATEGORIES= chat
MASTER_SITES= http://prosody.im/downloads/source/
@@ -45,10 +46,7 @@ PKG_SHELL.${PROSODY_USER}= ${NOLOGIN}
PKG_SYSCONFSUBDIR= ${PKGBASE}
EGDIR= ${PREFIX}/share/examples/${PKGBASE}
CONF_FILES+= ${EGDIR}/prosody.cfg.lua ${PKG_SYSCONFDIR}/prosody.cfg.lua
-CONF_FILES+= ${EGDIR}/certs/example.com.cnf ${PKG_SYSCONFDIR}/certs/example.com.cnf
-CONF_FILES+= ${EGDIR}/certs/example.com.key ${PKG_SYSCONFDIR}/certs/example.com.key
CONF_FILES+= ${EGDIR}/certs/localhost.cnf ${PKG_SYSCONFDIR}/certs/localhost.cnf
-CONF_FILES+= ${EGDIR}/certs/localhost.key ${PKG_SYSCONFDIR}/certs/localhost.key
REPLACE_LUA+= prosody prosodyctl
@@ -62,6 +60,7 @@ SUBST_VARS.path= EGDIR PROSODY_DATA PROSODY_LOG PROSODY_RUN
CONFIGURE_ARGS+= --cflags=${CFLAGS:Q}
CONFIGURE_ARGS+= --datadir=${PROSODY_DATA}
CONFIGURE_ARGS+= --ldflags="-L${PREFIX}/lib ${COMPILER_RPATH_FLAG}${PREFIX}/lib -shared"
+CONFIGURE_ARGS+= --no-example-certs
CONFIGURE_ARGS+= --prefix=${PREFIX}
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
CONFIGURE_ARGS+= --with-lua-include=${PREFIX}/${LUA_INCDIR}
diff --git a/chat/prosody/PLIST b/chat/prosody/PLIST
index bcb2a44bd04..5c7723fdf7c 100644
--- a/chat/prosody/PLIST
+++ b/chat/prosody/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2016/01/25 13:01:39 fhajny Exp $
+@comment $NetBSD: PLIST,v 1.8 2016/02/26 10:52:01 fhajny Exp $
bin/prosody
bin/prosodyctl
lib/prosody/core/certmanager.lua
@@ -133,9 +133,6 @@ lib/prosody/util/xml.lua
lib/prosody/util/xmppstream.lua
man/man1/prosodyctl.1
share/examples/prosody/certs/Makefile
-share/examples/prosody/certs/example.com.cnf
-share/examples/prosody/certs/example.com.key
share/examples/prosody/certs/localhost.cnf
-share/examples/prosody/certs/localhost.key
share/examples/prosody/certs/openssl.cnf
share/examples/prosody/prosody.cfg.lua