Fri Apr 1 13:50:21 2016 UTC ()
Support PKGMANDIR.


(jperkin)
diff -r1.6 -r1.7 pkgsrc/mail/pulsar/distinfo
diff -r1.1.1.1 -r1.2 pkgsrc/mail/pulsar/patches/patch-aa
cvs diff -r1.6 -r1.7 pkgsrc/mail/pulsar/distinfo (expand / switch to unified diff)

--- pkgsrc/mail/pulsar/distinfo 2015/11/03 23:27:17 1.6
+++ pkgsrc/mail/pulsar/distinfo 2016/04/01 13:50:20 1.7
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: distinfo,v 1.6 2015/11/03 23:27:17 agc Exp $ 1$NetBSD: distinfo,v 1.7 2016/04/01 13:50:20 jperkin Exp $
2 2
3SHA1 (pulsar-0.1.1.tar.bz2) = bc99f184809f42b312d23d76aa34f01db65ac823 3SHA1 (pulsar-0.1.1.tar.bz2) = bc99f184809f42b312d23d76aa34f01db65ac823
4RMD160 (pulsar-0.1.1.tar.bz2) = bac068845f10a7c879c1fab9cff95791369bfa84 4RMD160 (pulsar-0.1.1.tar.bz2) = bac068845f10a7c879c1fab9cff95791369bfa84
5SHA512 (pulsar-0.1.1.tar.bz2) = 5bf2bb9cab16c7948d97c41daca8c6b44e4f9c38e333ab018d4fea88ada8ecb826cedc82e04287341b8377e09d50a00e7f92e9ca235fd78c3c78340fdd3ae860 5SHA512 (pulsar-0.1.1.tar.bz2) = 5bf2bb9cab16c7948d97c41daca8c6b44e4f9c38e333ab018d4fea88ada8ecb826cedc82e04287341b8377e09d50a00e7f92e9ca235fd78c3c78340fdd3ae860
6Size (pulsar-0.1.1.tar.bz2) = 149675 bytes 6Size (pulsar-0.1.1.tar.bz2) = 149675 bytes
7SHA1 (patch-aa) = 7b6ee91a55ec8c583df2bd0a407e9e43bd9e2c3f 7SHA1 (patch-aa) = 91e375d8b1daee28958836945fbeefea0231fb67
8SHA1 (patch-ab) = c48065bea2ec3516b547492929002658ebe33100 8SHA1 (patch-ab) = c48065bea2ec3516b547492929002658ebe33100
9SHA1 (patch-ac) = 217569860e801e8cd6277a75c7041aa721189b45 9SHA1 (patch-ac) = 217569860e801e8cd6277a75c7041aa721189b45
10SHA1 (patch-ad) = 09fa0f7746eba7fcf8eb68e8bcea904ea4ea62bc 10SHA1 (patch-ad) = 09fa0f7746eba7fcf8eb68e8bcea904ea4ea62bc
11SHA1 (patch-ae) = aa081ca35a7536ff3d78792cfa2a32a7c9bdd4f9 11SHA1 (patch-ae) = aa081ca35a7536ff3d78792cfa2a32a7c9bdd4f9
12SHA1 (patch-af) = 4fe6b687d71f27dd7755ba4cf4608a4883ce3aa5 12SHA1 (patch-af) = 4fe6b687d71f27dd7755ba4cf4608a4883ce3aa5
13SHA1 (patch-ag) = 5b257bf3d96283a3676cb8ed108a981a5f295b1b 13SHA1 (patch-ag) = 5b257bf3d96283a3676cb8ed108a981a5f295b1b
cvs diff -r1.1.1.1 -r1.2 pkgsrc/mail/pulsar/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/mail/pulsar/patches/patch-aa 2004/03/28 21:02:15 1.1.1.1
+++ pkgsrc/mail/pulsar/patches/patch-aa 2016/04/01 13:50:21 1.2
@@ -1,70 +1,76 @@ @@ -1,70 +1,76 @@
1$NetBSD: patch-aa,v 1.1.1.1 2004/03/28 21:02:15 martin Exp $ 1$NetBSD: patch-aa,v 1.2 2016/04/01 13:50:21 jperkin Exp $
2 2
3--- configure.in.orig 2003-09-07 17:23:12.000000000 +0200 3--- configure.in.orig 2003-09-07 15:23:12.000000000 +0000
4+++ configure.in 2004-03-14 11:23:23.000000000 +0100 4+++ configure.in
5@@ -178,7 +178,7 @@ 5@@ -178,7 +178,7 @@ if test "$with_tcp_wrappers" = "yes"; th
6 old_LDFLAGS=$LDFLAGS 6 old_LDFLAGS=$LDFLAGS
7 LIBS="$LIBS $TCP_WRAPPERS_LIBS" 7 LIBS="$LIBS $TCP_WRAPPERS_LIBS"
8 LDFLAGS="$LDFLAGS $TCP_WRAPPERS_LDFLAGS" 8 LDFLAGS="$LDFLAGS $TCP_WRAPPERS_LDFLAGS"
9- AC_CHECK_LIB(wrap, request_init, 9- AC_CHECK_LIB(wrap, request_init,
10+ AC_TRY_LINK([ int allow_severity; int deny_severity; ], [ request_init(); ], 10+ AC_TRY_LINK([ int allow_severity; int deny_severity; ], [ request_init(); ],
11 [ 11 [
12 AC_DEFINE(WITH_TCP_WRAPPERS) 12 AC_DEFINE(WITH_TCP_WRAPPERS)
13 AC_CHECK_LIB(nsl, yp_get_default_domain, 13 AC_CHECK_LIB(nsl, yp_get_default_domain,
14@@ -187,10 +187,17 @@ 14@@ -187,10 +187,17 @@ if test "$with_tcp_wrappers" = "yes"; th
15 ] 15 ]
16 ) 16 )
17 chk_tcp_wrappers=yes 17 chk_tcp_wrappers=yes
18+ dnl ** we can't yet enable tcp wrappers, it would 18+ dnl ** we can't yet enable tcp wrappers, it would
19+ dnl ** spoil future tests due to the badly broken 19+ dnl ** spoil future tests due to the badly broken
20+ dnl ** api in that library 20+ dnl ** api in that library
21+ LIBS=$old_LIBS 21+ LIBS=$old_LIBS
22+ LDFLAGS=$old_LDFLAGS 22+ LDFLAGS=$old_LDFLAGS
23 ], 23 ],
24 [ 24 [
25 LIBS=$old_LIBS 25 LIBS=$old_LIBS
26 LDFLAGS=$old_LDFLAGS 26 LDFLAGS=$old_LDFLAGS
27+ TCP_WRAPPERS_LIBS="" 27+ TCP_WRAPPERS_LIBS=""
28+ TCP_WRAPPERS_LIBS="" 28+ TCP_WRAPPERS_LIBS=""
29 AC_MSG_RESULT([tcp wrappers library not found, support disabled]) 29 AC_MSG_RESULT([tcp wrappers library not found, support disabled])
30 ] 30 ]
31 ) 31 )
32@@ -253,7 +260,7 @@ 32@@ -253,7 +260,7 @@ AC_ARG_WITH(
33 *) 33 *)
34 if test -d $with_ssl; then 34 if test -d $with_ssl; then
35 SSL_LDFLAGS="-L$with_ssl" 35 SSL_LDFLAGS="-L$with_ssl"
36- SSL_LIBS="-lssl" 36- SSL_LIBS="-lssl"
37+ SSL_LIBS="-lcrypto -lssl" 37+ SSL_LIBS="-lcrypto -lssl"
38 else 38 else
39 SSL_LIBS="$with_ssl" 39 SSL_LIBS="$with_ssl"
40 fi 40 fi
41@@ -267,7 +274,7 @@ 41@@ -267,7 +274,7 @@ AC_ARG_WITH(
42 ) 42 )
43 if test "$with_ssl" = "yes"; then 43 if test "$with_ssl" = "yes"; then
44 if test -z "$SSL_LIBS"; then 44 if test -z "$SSL_LIBS"; then
45- SSL_LIBS="-lssl" 45- SSL_LIBS="-lssl"
46+ SSL_LIBS="-lcrypto -lssl" 46+ SSL_LIBS="-lcrypto -lssl"
47 fi 47 fi
48 old_LIBS=$LIBS 48 old_LIBS=$LIBS
49 old_LDFLAGS=$LDFLAGS 49 old_LDFLAGS=$LDFLAGS
50@@ -332,6 +339,11 @@ 50@@ -332,6 +339,11 @@ if test "$chk_ssl_krb" = "yes"; then
51 ] 51 ]
52 ) 52 )
53 fi 53 fi
54+ 54+
55+dnl ** now we are ready to enable tcp wrappers libs ** 55+dnl ** now we are ready to enable tcp wrappers libs **
56+LIBS="$LIBS $TCP_WRAPPERS_LIBS" 56+LIBS="$LIBS $TCP_WRAPPERS_LIBS"
57+LDFLAGS="$LDFLAGS $TCP_WRAPPERS_LDFLAGS" 57+LDFLAGS="$LDFLAGS $TCP_WRAPPERS_LDFLAGS"
58+ 58+
59 dnl ******************************************************** 59 dnl ********************************************************
60 dnl ******************************************************** 60 dnl ********************************************************
61 dnl Output a list of included optional components 61 dnl Output a list of included optional components
62@@ -375,7 +387,7 @@ 62@@ -371,11 +383,11 @@ if test "${prefix}" = "NONE"; then
 63 prefix="/usr/local"
 64 fi
 65 if test "${prefix}" = "/usr" -o "${prefix}" = "/usr/local"; then
 66- mandir=${prefix}/share/man
 67+ mandir=${prefix}/${PKGMANDIR}
63 docdir=${prefix}/share/doc/pulsar-${VERSION} 68 docdir=${prefix}/share/doc/pulsar-${VERSION}
64 else 69 else
65 mandir=${prefix}/man 70- mandir=${prefix}/man
66- docdir=${prefix}/doc/pulsar-${VERSION} 71- docdir=${prefix}/doc/pulsar-${VERSION}
 72+ mandir=${prefix}/${PKGMANDIR}
67+ docdir=${prefix}/share/doc/pulsar-${VERSION} 73+ docdir=${prefix}/share/doc/pulsar-${VERSION}
68 fi 74 fi
69 sbindir=${prefix}/sbin 75 sbindir=${prefix}/sbin
70 AC_MSG_RESULT([Executables will go in: ] ${prefix}/sbin) 76 AC_MSG_RESULT([Executables will go in: ] ${prefix}/sbin)