Sat Aug 2 20:32:10 2008 UTC ()
Use -fPIC on NetBSD. (Same as FreeBSD.) Fixes broken amd64 build.


(dholland)
diff -r1.5 -r1.6 pkgsrc/chat/jabberd/distinfo
diff -r1.3 -r1.4 pkgsrc/chat/jabberd/patches/patch-aa
cvs diff -r1.5 -r1.6 pkgsrc/chat/jabberd/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/chat/jabberd/Attic/distinfo 2005/12/19 18:27:54 1.5
+++ pkgsrc/chat/jabberd/Attic/distinfo 2008/08/02 20:32:09 1.6
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1$NetBSD: distinfo,v 1.5 2005/12/19 18:27:54 joerg Exp $ 1$NetBSD: distinfo,v 1.6 2008/08/02 20:32:09 dholland Exp $
2 2
3SHA1 (jabber-1.4.2.tar.gz) = aa0bc2e9815e4fa4a1ca8ba7f320bfd3c85ba11f 3SHA1 (jabber-1.4.2.tar.gz) = aa0bc2e9815e4fa4a1ca8ba7f320bfd3c85ba11f
4RMD160 (jabber-1.4.2.tar.gz) = bff5a02d3b76243ce59ddb66873ca1c51ef4bb5f 4RMD160 (jabber-1.4.2.tar.gz) = bff5a02d3b76243ce59ddb66873ca1c51ef4bb5f
5Size (jabber-1.4.2.tar.gz) = 690217 bytes 5Size (jabber-1.4.2.tar.gz) = 690217 bytes
6SHA1 (patch-aa) = 26ca7e04443789b78e916565772bbbfa02e72f6c 6SHA1 (patch-aa) = d1fbf5a5533367ff689114c4d5e9099cfa308649
7SHA1 (patch-ab) = 8722b0db3870e14eaf3e40f5493544db8a813fc1 7SHA1 (patch-ab) = 8722b0db3870e14eaf3e40f5493544db8a813fc1
8SHA1 (patch-ac) = 3b17761c9ea2d1e17f3194ac8cf54fbca4c80367 8SHA1 (patch-ac) = 3b17761c9ea2d1e17f3194ac8cf54fbca4c80367
9SHA1 (patch-ad) = 0e8f2faa154e8c147b129aa3ca3cfd2dbaff1093 9SHA1 (patch-ad) = 0e8f2faa154e8c147b129aa3ca3cfd2dbaff1093
cvs diff -r1.3 -r1.4 pkgsrc/chat/jabberd/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/chat/jabberd/patches/Attic/patch-aa 2005/12/19 18:27:55 1.3
+++ pkgsrc/chat/jabberd/patches/Attic/patch-aa 2008/08/02 20:32:10 1.4
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1$NetBSD: patch-aa,v 1.3 2005/12/19 18:27:55 joerg Exp $ 1$NetBSD: patch-aa,v 1.4 2008/08/02 20:32:10 dholland Exp $
2 2
3--- configure.orig Mon Feb 11 20:14:06 2002 3--- configure.orig 2002-02-11 14:14:06.000000000 -0500
4+++ configure Sat Feb 14 01:59:47 2004 4+++ configure 2008-08-02 16:29:13.000000000 -0400
5@@ -32,7 +32,8 @@ MCFLAGS="$MCFLAGS -shared" 5@@ -32,7 +32,8 @@ MCFLAGS="$MCFLAGS -shared"
6 LDFLAGS="$LDFLAGS" 6 LDFLAGS="$LDFLAGS"
7 LIBS="$LIBS" 7 LIBS="$LIBS"
8 XLDFLAGS="$XLDFLAGS " 8 XLDFLAGS="$XLDFLAGS "
9-JHOME=`pwd` 9-JHOME=`pwd`
10+JHOME=${PKG_SYSCONFDIR} 10+JHOME=${PKG_SYSCONFDIR}
11+WRKSRC="`cat .wrksrc-freebsd`" 11+WRKSRC="`cat .wrksrc-freebsd`"
12  12
13 ## 13 ##
14 # Print a cool header 14 # Print a cool header
15@@ -76,31 +77,19 @@ fi; 15@@ -76,31 +77,19 @@ fi;
16 ## 16 ##
17 # Pth check 17 # Pth check
@@ -47,22 +47,26 @@ $NetBSD: patch-aa,v 1.3 2005/12/19 18:27 @@ -47,22 +47,26 @@ $NetBSD: patch-aa,v 1.3 2005/12/19 18:27
47+echo "Configuring jabber pth-1.4.0..." 47+echo "Configuring jabber pth-1.4.0..."
48+./configure || (echo "Error Configuring pth"; exit 1); 48+./configure || (echo "Error Configuring pth"; exit 1);
49+echo "Building pth-1.4.0..." 49+echo "Building pth-1.4.0..."
50+gmake 50+gmake
51+cd $opwd; 51+cd $opwd;
52+PSUBDIR="pth-1.4.0"; 52+PSUBDIR="pth-1.4.0";
53+PTHP="`pwd`/jabberd/pth-1.4.0"; 53+PTHP="`pwd`/jabberd/pth-1.4.0";
54+PLINK="$PTHP/pth_*.o"; 54+PLINK="$PTHP/pth_*.o";
55+CFLAGS="$CFLAGS -I${PTHP}"; 55+CFLAGS="$CFLAGS -I${PTHP}";
56+LDFLAGS="$LDFLAGS -L${PTHP}"; 56+LDFLAGS="$LDFLAGS -L${PTHP}";
57  57
58  58
59  59
60@@ -123,7 +112,7 @@ case $hosttype in 60@@ -123,10 +112,11 @@ case $hosttype in
61 CFLAGS="$CFLAGS -fPIC -D_REENTRANT" 61 CFLAGS="$CFLAGS -fPIC -D_REENTRANT"
62 SLIBS="$SLIBS /usr/lib/libresolv.a"; 62 SLIBS="$SLIBS /usr/lib/libresolv.a";
63 LIBS="$LIBS -ldl -lsocket -lnsl -lresolv";; 63 LIBS="$LIBS -ldl -lsocket -lnsl -lresolv";;
64- FreeBSD) 64- FreeBSD)
65+ FreeBSD|DragonFly) 65+ FreeBSD|DragonFly)
66 CFLAGS="$CFLAGS -fPIC" 66 CFLAGS="$CFLAGS -fPIC"
67 XLDFLAGS="$XLDFLAGS -Wl,-E";; 67 XLDFLAGS="$XLDFLAGS -Wl,-E";;
68 NetBSD) 68 NetBSD)
 69+ CFLAGS="$CFLAGS -fPIC"
 70 LIBS="$LIBS -lresolv"
 71 SLIBS="$SLIBS /usr/lib/libresolv.a";
 72 XLDFLAGS="$XLDFLAGS -Wl,--export-dynamic";;