pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/chat/jabberd2 Simplify pre-configure target, fix a typ...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/26a94911e665
branches:  trunk
changeset: 477594:26a94911e665
user:      xtraeme <xtraeme%pkgsrc.org@localhost>
date:      Tue Jul 06 00:10:57 2004 +0000

description:
Simplify pre-configure target, fix a typo in a comment and remove the
option --enable-debug (which was disabled).

diffstat:

 chat/jabberd2/Makefile |  11 +++--------
 1 files changed, 3 insertions(+), 8 deletions(-)

diffs (46 lines):

diff -r 20a60e536234 -r 26a94911e665 chat/jabberd2/Makefile
--- a/chat/jabberd2/Makefile    Mon Jul 05 23:33:30 2004 +0000
+++ b/chat/jabberd2/Makefile    Tue Jul 06 00:10:57 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/06/26 11:21:46 abs Exp $
+# $NetBSD: Makefile,v 1.5 2004/07/06 00:10:57 xtraeme Exp $
 #
 
 DISTNAME=              jabberd-2.0s2
@@ -28,7 +28,6 @@
                        -e "s,\$sysconfdir/jabberd,\$sysconfdir,g"
 
 CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}
-#CONFIGURE_ARGS+=      --enable-debug
 
 REPLACE_PERL=          tools/pipe-auth.pl
 
@@ -41,7 +40,7 @@
 # This specify the actual method which will be used for authenticate
 # the users/accounts.
 #
-# JABBERD_AUTH_METHOD has 4 available options:
+# JABBERD_AUTH_METHOD has 5 available options:
 #
 # db (by default)
 # mysql (MySQL)
@@ -147,7 +146,7 @@
 .undef f
 
 pre-configure:
-.for f in ${FILES}
+.for f in ${FILES} jabberd.cfg
        @${SED}                                                         \
                -e "s|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g"             \
                -e "s|@PIDDIR@|${JABBERD_PIDDIR}|g"                     \
@@ -158,10 +157,6 @@
                ${WRKSRC}/etc/${f}.in > ${WRKSRC}/etc/${f}
 .endfor
 .undef f
-       @${SED}                                                         \
-               -e "s|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g"             \
-               -e "s|@BINDIR@|${PREFIX}/bin|g "                        \
-               ${WRKSRC}/etc/jabberd.cfg.in > ${WRKSRC}/etc/jabberd.cfg
 
 post-install:
        ${INSTALL_DATA_DIR} ${EGDIR}



Home | Main Index | Thread Index | Old Index