6 files changed, 11 insertions, 46 deletions

diff --git a/net-im/jabberd/Makefile b/net-im/jabberd/Makefile
index 0406b8424489..ad2cbd4612c8 100644
--- a/net-im/jabberd/Makefile
+++ b/net-im/jabberd/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	jabberd
-PORTVERSION=	2.0.6
+PORTVERSION=	2.0.7
 CATEGORIES=	net
-MASTER_SITES=	http://www.jabberstudio.org/files/jabberd2/
-DISTNAME=	${PORTNAME}-2.0s6
+MASTER_SITES=	http://files.jabberstudio.org/jabberd2/
+DISTNAME=	${PORTNAME}-2.0s7
 DIST_SUBDIR=	jabber
 
 MAINTAINER=	kirk@strauser.com
@@ -20,15 +20,13 @@ LIB_DEPENDS=	idn.16:${PORTSDIR}/devel/libidn
 GNU_CONFIGURE=	yes
 USE_OPENSSL=	yes
 USE_ICONV=	yes
-USE_RC_SUBR=	yes
+USE_RC_SUBR=	jabberd.sh
 CONFIGURE_ARGS=	--localstatedir=/var \
 		--enable-ssl \
 		--with-extra-include-path=${LOCALBASE}/include${EIP} \
 		--with-extra-library-path=${LOCALBASE}/lib${ELP} \
 		--enable-fs
 
-RC_SCRIPTS_SUB=	PREFIX=${PREFIX} RC_SUBR=${RC_SUBR}
-
 .if !defined(WITHOUT_DEBUG)
 CONFIGURE_ARGS+=--enable-debug
 .endif
@@ -83,10 +81,6 @@ pre-everything::
 	@${ECHO} "WITH_PAM		use PAM for authentication"
 	@${ECHO}
 
-post-patch:
-	@${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
-		${FILESDIR}/jabberd.sh > ${WRKDIR}/jabberd.sh
-
 pre-install:
 	PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 
diff --git a/net-im/jabberd/distinfo b/net-im/jabberd/distinfo
index bb877c38b1c5..b35682d75506 100644
--- a/net-im/jabberd/distinfo
+++ b/net-im/jabberd/distinfo
@@ -1,2 +1,2 @@
-MD5 (jabber/jabberd-2.0s6.tar.gz) = ca2818885e126181e002949c71603df3
-SIZE (jabber/jabberd-2.0s6.tar.gz) = 724448
+MD5 (jabber/jabberd-2.0s7.tar.gz) = 1f10641964d257944eae2f8f295cfcba
+SIZE (jabber/jabberd-2.0s7.tar.gz) = 749170
diff --git a/net-im/jabberd/files/jabberd.sh b/net-im/jabberd/files/jabberd.sh.in
index baf05a5d4fe7..5efc02dbdc8e 100644
--- a/net-im/jabberd/files/jabberd.sh
+++ b/net-im/jabberd/files/jabberd.sh.in
@@ -1,7 +1,7 @@
 #!/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 $
+# $FreeBSD$
 
 # PROVIDE: jabberd
 # REQUIRE: DAEMON
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=<HOST>-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=<HOST>-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 <time.h>
- #include <errno.h>
- #include <assert.h>
-+#include <sys/types.h>
-+#include <sys/socket.h>
- 
- #ifdef HAVE_NETINET_IN_H
- # include <netinet/in.h>