pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

kamailio: Resolve config files and restore xmpp module



Module Name:	pkgsrc-wip
Committed By:	Greg Troxel <gdt%lexort.com@localhost>
Pushed By:	gdt
Date:		Sat Nov 30 20:07:58 2019 -0500
Changeset:	781a5646977b26bd919832b669c98ec68f47848b

Modified Files:
	kamailio/Makefile
	kamailio/PLIST

Log Message:
kamailio: Resolve config files and restore xmpp module

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=781a5646977b26bd919832b669c98ec68f47848b

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 kamailio/Makefile | 18 +++++++++++++-----
 kamailio/PLIST    |  3 +++
 2 files changed, 16 insertions(+), 5 deletions(-)

diffs:
diff --git a/kamailio/Makefile b/kamailio/Makefile
index 33c2d91fe2..b590d9309c 100644
--- a/kamailio/Makefile
+++ b/kamailio/Makefile
@@ -13,15 +13,23 @@ LICENSE=	gnu-gpl-v2
 
 WRKSRC=		${WRKDIR}/kamailio-${VERSION}
 USE_LANGUAGES=	c c++
-
 USE_TOOLS+=	gmake
-MAKE_ENV=	include_modules="xmpp"
 
-FAKE_NCURSES=	yes
+do-configure:
+	cd ${WRKSRC} && ${GMAKE} cfg include_modules="xmpp"
 
-CONF_FILES+=	share/examples/kamailio/kamailio.cfg  ${PKGSYSCONFDIR}/kamailio/kamailio.cfg
-CONF_FILES+=	share/examples/kamailio/kamctlrc ${PKGSYSCONFDIR}/kamailio/kamctlrc
+# Brute-force move the config files to the example directory, because
+# it's easier than teaching the kamailio build system the pkgsrc way
+# of config files.
+post-install:
+	mkdir -p ${DESTDIR}/${PREFIX}/share/examples/kamailio
+	mv ${DESTDIR}/${PKG_SYSCONFDIR}/kamailio/kamailio.cfg ${DESTDIR}/${PREFIX}/share/examples/kamailio/kamailio.cfg
+	mv ${DESTDIR}/${PKG_SYSCONFDIR}/kamailio/kamctlrc ${DESTDIR}/${PREFIX}/share/examples/kamailio/kamctlrc
 
+CONF_FILES+=	share/examples/kamailio/kamailio.cfg  ${PKG_SYSCONFDIR}/kamailio/kamailio.cfg
+CONF_FILES+=	share/examples/kamailio/kamctlrc ${PKG_SYSCONFDIR}/kamailio/kamctlrc
+
+FAKE_NCURSES=	yes
 .include "../../mk/curses.buildlink3.mk"
 .include "../../mk/readline.buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
diff --git a/kamailio/PLIST b/kamailio/PLIST
index 66fef82b78..7bf95d49dc 100644
--- a/kamailio/PLIST
+++ b/kamailio/PLIST
@@ -292,6 +292,8 @@ share/doc/kamailio/modules/README.xhttp_rpc
 share/doc/kamailio/modules/README.xlog
 share/doc/kamailio/modules/README.xmpp
 share/doc/kamailio/modules/README.xprint
+share/examples/kamailio/kamailio.cfg
+share/examples/kamailio/kamctlrc
 share/kamailio/dbtext/kamailio/acc
 share/kamailio/dbtext/kamailio/acc_cdrs
 share/kamailio/dbtext/kamailio/active_watchers
@@ -363,3 +365,4 @@ share/kamailio/dbtext/kamailio/version
 share/kamailio/dbtext/kamailio/watchers
 share/kamailio/dbtext/kamailio/xcap
 @pkgdir man/man7
+@pkgdir etc/kamailio


Home | Main Index | Thread Index | Old Index