summaryrefslogtreecommitdiff
path: root/net-im
diff options
context:
space:
mode:
authorJosef El-Rayes <josef@FreeBSD.org>2004-12-02 13:42:32 +0000
committerJosef El-Rayes <josef@FreeBSD.org>2004-12-02 13:42:32 +0000
commit1af7f1f51788ce0693083aed02ed38f1f05b2506 (patch)
tree8da739eeb90270f23c543c181a45184cbe5fb3e6 /net-im
parentUpdate to 2.0.1 (diff)
Update port to 2.0.5 (2.0s5). Based on submission by maintainer.
Submitted by: maintainer PR: ports/74565 Approved by: pav Tested by: simon
Notes
Notes: svn path=/head/; revision=122981
Diffstat (limited to 'net-im')
-rw-r--r--net-im/jabberd/Makefile10
-rw-r--r--net-im/jabberd/distinfo4
-rw-r--r--net-im/jabberd/files/patch-ltmain.sh18
3 files changed, 24 insertions, 8 deletions
diff --git a/net-im/jabberd/Makefile b/net-im/jabberd/Makefile
index 84f7ba41417b..c13042d5f857 100644
--- a/net-im/jabberd/Makefile
+++ b/net-im/jabberd/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= jabberd
-PORTVERSION= 2.0.4
+PORTVERSION= 2.0.5
CATEGORIES= net
MASTER_SITES= http://www.jabberstudio.org/files/jabberd2/
-DISTNAME= ${PORTNAME}-2.0s4
+DISTNAME= ${PORTNAME}-2.0s5
DIST_SUBDIR= jabber
MAINTAINER= kirk@strauser.com
@@ -17,7 +17,6 @@ COMMENT= Online presence and instant messaging server
LIB_DEPENDS= idn.16:${PORTSDIR}/devel/libidn
-FORBIDDEN= "http://www.vuxml.org/freebsd/553224e7-4325-11d9-a3d5-000c6e8f12ef.html"
GNU_CONFIGURE= yes
USE_OPENSSL= yes
USE_ICONV= yes
@@ -25,9 +24,8 @@ USE_RC_SUBR= yes
CONFIGURE_ARGS= --localstatedir=/var \
--enable-ssl \
--with-extra-include-path=${LOCALBASE}/include${EIP} \
- --with-extra-library-path=${LOCALBASE}/lib${ELP}
-
-CONFIGURE_ARGS+=--enable-fs
+ --with-extra-library-path=${LOCALBASE}/lib${ELP} \
+ --enable-fs
RC_SCRIPTS_SUB= PREFIX=${PREFIX} RC_SUBR=${RC_SUBR}
diff --git a/net-im/jabberd/distinfo b/net-im/jabberd/distinfo
index f631659f9b83..eb86f2b7b4ed 100644
--- a/net-im/jabberd/distinfo
+++ b/net-im/jabberd/distinfo
@@ -1,2 +1,2 @@
-MD5 (jabber/jabberd-2.0s4.tar.gz) = 2682037fc177e1f3e7d7869cb3f59c1d
-SIZE (jabber/jabberd-2.0s4.tar.gz) = 716819
+MD5 (jabber/jabberd-2.0s5.tar.gz) = f8d8acba7515e9e6233364a1a4aea467
+SIZE (jabber/jabberd-2.0s5.tar.gz) = 722712
diff --git a/net-im/jabberd/files/patch-ltmain.sh b/net-im/jabberd/files/patch-ltmain.sh
new file mode 100644
index 000000000000..3505d1423399
--- /dev/null
+++ b/net-im/jabberd/files/patch-ltmain.sh
@@ -0,0 +1,18 @@
+--- 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