From 8f7c0fc69743cb260951fdf3988ec6dc27039fe5 Mon Sep 17 00:00:00 2001 From: pav Date: Sun, 17 Apr 2005 16:29:41 +0000 Subject: - Update to 2.0.7 PR: ports/79993 Submitted by: Kirk Strauser (maintainer) --- net-im/jabberd/files/jabberd.sh | 46 ------------------------------------ net-im/jabberd/files/jabberd.sh.in | 46 ++++++++++++++++++++++++++++++++++++ net-im/jabberd/files/patch-configure | 8 +++---- net-im/jabberd/files/patch-ltmain.sh | 18 -------------- net-im/jabberd/files/patch-util.h | 11 --------- 5 files changed, 50 insertions(+), 79 deletions(-) delete mode 100644 net-im/jabberd/files/jabberd.sh create mode 100644 net-im/jabberd/files/jabberd.sh.in delete mode 100644 net-im/jabberd/files/patch-ltmain.sh delete mode 100644 net-im/jabberd/files/patch-util.h (limited to 'net-im/jabberd/files') diff --git a/net-im/jabberd/files/jabberd.sh b/net-im/jabberd/files/jabberd.sh deleted file mode 100644 index baf05a5d4fe7..000000000000 --- a/net-im/jabberd/files/jabberd.sh +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/sh - -# Start or stop jabberd -# $FreeBSD: /tmp/pcvs/ports/net-im/jabberd/files/Attic/jabberd.sh,v 1.5 2004-07-29 20:56:33 pav Exp $ - -# PROVIDE: jabberd -# REQUIRE: DAEMON -# BEFORE: LOGIN -# KEYWORD: FreeBSD shutdown -# -prefix=%%PREFIX%% - -# Define these jabberd_* variables in one of these files: -# /etc/rc.conf -# /etc/rc.conf.local -# -# DO NOT CHANGE THESE DEFAULT VALUES HERE -# -jabberd_chdir=${jabberd_chdir-"/var/jabberd/pid"} -jabberd_enable=${jabberd_enable-"NO"} -jabberd_user=${jabberd_user-"jabber"} - -. %%RC_SUBR%% - -name="jabberd" -rcvar=`set_rcvar` -command="${prefix}/bin/jabberd" -command_args="&" -procname="${prefix}/bin/router" - -load_rc_config $name - -pidfile="${jabberd_chdir}/router.pid" - -case "$1" in - stop|faststop|onestop) - echo "Stopping Jabber2" - killall -u ${jabberd_user} jabberd c2s resolver router s2s sm - for file in c2s resolver router s2s sm; do - rm -f ${jabberd_chdir}/$file.pid - done - ;; - *) - run_rc_command "$1" - ;; -esac diff --git a/net-im/jabberd/files/jabberd.sh.in b/net-im/jabberd/files/jabberd.sh.in new file mode 100644 index 000000000000..5efc02dbdc8e --- /dev/null +++ b/net-im/jabberd/files/jabberd.sh.in @@ -0,0 +1,46 @@ +#!/bin/sh + +# Start or stop jabberd +# $FreeBSD$ + +# PROVIDE: jabberd +# REQUIRE: DAEMON +# BEFORE: LOGIN +# KEYWORD: FreeBSD shutdown +# +prefix=%%PREFIX%% + +# Define these jabberd_* variables in one of these files: +# /etc/rc.conf +# /etc/rc.conf.local +# +# DO NOT CHANGE THESE DEFAULT VALUES HERE +# +jabberd_chdir=${jabberd_chdir-"/var/jabberd/pid"} +jabberd_enable=${jabberd_enable-"NO"} +jabberd_user=${jabberd_user-"jabber"} + +. %%RC_SUBR%% + +name="jabberd" +rcvar=`set_rcvar` +command="${prefix}/bin/jabberd" +command_args="&" +procname="${prefix}/bin/router" + +load_rc_config $name + +pidfile="${jabberd_chdir}/router.pid" + +case "$1" in + stop|faststop|onestop) + echo "Stopping Jabber2" + killall -u ${jabberd_user} jabberd c2s resolver router s2s sm + for file in c2s resolver router s2s sm; do + rm -f ${jabberd_chdir}/$file.pid + done + ;; + *) + run_rc_command "$1" + ;; +esac diff --git a/net-im/jabberd/files/patch-configure b/net-im/jabberd/files/patch-configure index ac6637e6d87d..d68759cb09d2 100644 --- a/net-im/jabberd/files/patch-configure +++ b/net-im/jabberd/files/patch-configure @@ -1,11 +1,11 @@ ---- configure.orig Mon Jul 12 10:15:17 2004 -+++ configure Mon Jul 12 10:15:26 2004 -@@ -20575,7 +20575,7 @@ +--- configure.orig Fri Apr 15 23:25:38 2005 ++++ configure Fri Apr 15 23:27:08 2005 +@@ -23985,7 +23985,7 @@ done if test "x-$ac_cv_header_db_h" = "x-yes" ; then - for lib in db-4.2 db-4.1 db-4 db4 db ; do -+ for lib in db-4.2 db-4.1 db-4 db4 db41 ; do ++ for lib in db-4.2 db-4.1 db-4 db4 db41 db ; do if test "x-$have_db_version" != "x-yes" ; then echo "$as_me:$LINENO: checking for db_create in -l$lib" >&5 echo $ECHO_N "checking for db_create in -l$lib... $ECHO_C" >&6 diff --git a/net-im/jabberd/files/patch-ltmain.sh b/net-im/jabberd/files/patch-ltmain.sh deleted file mode 100644 index 3505d1423399..000000000000 --- a/net-im/jabberd/files/patch-ltmain.sh +++ /dev/null @@ -1,18 +0,0 @@ ---- ltmain.sh.orig Tue Nov 30 15:55:46 2004 -+++ ltmain.sh Tue Nov 30 15:55:59 2004 -@@ -561,7 +561,6 @@ - # Evaluate the configuration. - eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $0`" - # user sometimes does CC=-gcc so we need to match that to 'gcc' -- trimedcc="${CC/${host}-}" - case "$base_compile " in - "gcc "* | " gcc "* | "${host}-gcc "* | " ${host}-gcc "*) - tagname=CC -@@ -954,7 +953,6 @@ - # Evaluate the configuration. - eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $0`" - # user sometimes does CC=-gcc so we need to match that to 'gcc' -- trimedcc="${CC/${host}-}" - case $base_compile in - "gcc "* | " gcc "* | "${host}-gcc "* | " ${host}-gcc "*) - tagname=CC diff --git a/net-im/jabberd/files/patch-util.h b/net-im/jabberd/files/patch-util.h deleted file mode 100644 index dd73e70867aa..000000000000 --- a/net-im/jabberd/files/patch-util.h +++ /dev/null @@ -1,11 +0,0 @@ ---- util/util.h.orig Mon May 31 16:31:06 2004 -+++ util/util.h Mon Jul 12 10:29:58 2004 -@@ -30,6 +30,8 @@ - #include - #include - #include -+#include -+#include - - #ifdef HAVE_NETINET_IN_H - # include -- cgit