Hi Jasper, hi Steven, hi Wijnand, i reworked jasper@'s version of the net/jabberd14 port in two respects. Hopefully, this is now final...
1. To clean up the {SYS,J_}CONFDIR havoc, i have
- added "--sysconfdir=${J_CONFDIR}" to CONFIGURE_ARGS
to make ${WRKSRC}/Makefile and ${WRKSRC}/config.h happy
- added "old" to CONFIGURE_STYLE in order to prevent gnu.port.mk
from appending --sysconfdir=${SYSCONFDIR} to CONFIGURE_ARGS,
thus overriding my beautiful --sysconfdir=${J_CONFDIR}
(this idea shamelessly stolen from the mail/mutt port)
- added "--mandir=${PREFIX}/man" to CONFIGURE_ARGS
to compensate for a side effect of CONFIGURE_STYLE=old
- added "SUBST_VARS= J_CONFDIR"
- changed ${SYSCONFDIR} to ${J_CONFDIR} in ${PKGDIR}/PLIST
2. To use xenocara expat, i have
- added "expat" to WANTLIB
- removed "expat::textproc/expat" from LIB_DEPENDS
- added "--with-libexpat=/usr/X11R6" to CONFIGURE_ARGS
After that, all four jabberd14 flavors build fine when the
expat package is not installed.
When the expat package is installed, the port picks it up,
ignoring xenocara. No idea how to avoid that while at the
same time linking against idn, popt and pth. No idea whether
this is any problem at all. The expat port will go away anyway,
so nobody ought to have it installed during bulk builds, right?
This is what i kept:
- Wijnand's patch to detect snprintf by autoconf
- Jasper's improvements to README.OpenBSD and MESSAGE
Please cross-check once more and commit.
By the way, when you commit, i suggest to link the -mysql and
-postgresql flavors from net/Makefile, like in
SUBDIR += jabberd14,mysql
SUBDIR += jabberd14,postgresql
The double flavor is of little practical relevance, and the vanilla
flavor is not recommended for new production servers by the upstream
maintainer, but it is mainly provided for backward compatibility.
The attached file is also available as
http://www.studis.de/Software/jabberd14-1.6.0b7.tgz
Thank you for your patience,
Ingo
jabberd14-1.6.0b7.tgz
Description: application/tar-gz
