summaryrefslogtreecommitdiff
path: root/chat/jabberd/patches/patch-aa
blob: 0d2d264f2db14fb86527db9b3d12d3c1bf7e8e5a (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
$NetBSD: patch-aa,v 1.4 2008/08/02 20:32:10 dholland Exp $

--- configure.orig	2002-02-11 14:14:06.000000000 -0500
+++ configure	2008-08-02 16:29:13.000000000 -0400
@@ -32,7 +32,8 @@ MCFLAGS="$MCFLAGS -shared"
 LDFLAGS="$LDFLAGS"
 LIBS="$LIBS"
 XLDFLAGS="$XLDFLAGS "
-JHOME=`pwd`
+JHOME=${PKG_SYSCONFDIR}
+WRKSRC="`cat .wrksrc-freebsd`"
 
 ##
 # Print a cool header
@@ -76,31 +77,19 @@ fi;
 ##
 # Pth check
 ##
-printf "Getting pth settings..."
-PTH_CFLAGS=`pth-config --cflags`
-PTH_LDFLAGS=`pth-config --ldflags`
-PTH_LIBS=`pth-config --libs`
-PTH_LIBDIR=`pth-config --libdir`
-if [ -n "$PTH_CFLAGS" ]; then
-    CFLAGS="$CFLAGS $PTH_CFLAGS";
-    LDFLAGS="$LDFLAGS $PTH_LDFLAGS";
-    LIBS="$LIBS $PTH_LIBS";
-    SLIBS="$SLIBS $PTH_LIBDIR/libpth.a";
-    printf "         Done.\n";
-else
-    if [ -d "jabberd/pth-1.4.0" ]; then
-        opwd=`pwd`
-        cd jabberd/pth-1.4.0;
-        ./configure || (printf "Error Configuring pth"; exit 1);
-        cd $opwd;
-        PSUBDIR="pth-1.4.0";
-        PTHP=`pwd`"/jabberd/pth-1.4.0";
-        PLINK="$PTHP/pth_*.o";
-        CFLAGS="$CFLAGS -I`pwd`/jabberd/pth-1.4.0";
-    else
-        printf "          Error.\n\n No version of PTH is available on this system\nhttp://www.gnu.org/software/pth/";
-    fi
-fi
+echo "Using jabber's internal copy of pth 1.4.0 because 1.4.1 is incompatible"
+opwd=`pwd`
+cd jabberd/pth-1.4.0;
+echo "Configuring jabber pth-1.4.0..."
+./configure || (echo "Error Configuring pth"; exit 1);
+echo "Building pth-1.4.0..."
+gmake
+cd $opwd;
+PSUBDIR="pth-1.4.0";
+PTHP="`pwd`/jabberd/pth-1.4.0";
+PLINK="$PTHP/pth_*.o";
+CFLAGS="$CFLAGS -I${PTHP}";
+LDFLAGS="$LDFLAGS -L${PTHP}";
 
 
 
@@ -123,10 +112,11 @@ case $hosttype in
         CFLAGS="$CFLAGS -fPIC -D_REENTRANT"
         SLIBS="$SLIBS /usr/lib/libresolv.a";
         LIBS="$LIBS -ldl -lsocket -lnsl -lresolv";;
-    FreeBSD)
+    FreeBSD|DragonFly)
 	CFLAGS="$CFLAGS -fPIC"
         XLDFLAGS="$XLDFLAGS -Wl,-E";;
     NetBSD)
+	CFLAGS="$CFLAGS -fPIC"
         LIBS="$LIBS -lresolv"
         SLIBS="$SLIBS /usr/lib/libresolv.a";
         XLDFLAGS="$XLDFLAGS -Wl,--export-dynamic";;