pkgsrc-Bugs archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Re: pkg/28690



The following reply was made to PR pkg/28690; it has been noted by GNATS.

From: Matthew Luckie <mjl%luckie.org.nz@localhost>
To: gnats-bugs%NetBSD.org@localhost
Cc: ben%netbsd.org@localhost, jmmv%netbsd.org@localhost, 
jschauma%netbsd.org@localhost
Subject: Re: pkg/28690
Date: Tue, 8 Feb 2005 20:32:10 +1300

 As discussed on a few mailing lists, the problem is with the gnutls plugin
 on NetBSD 1.6 systems.  2.0 systems are apparently unaffected.
 
 http://mail-index.netbsd.org/tech-pkg/2004/12/22/0001.html
 http://mail-index.netbsd.org/tech-pkg/2004/12/22/0004.html
 http://mail-index.netbsd.org/tech-pkg/2005/01/04/0004.html
 
 I have prepared packages for nspr and nss and had them imported into
 pkgsrc.  The patch below to gaim fixes this problem.
 
 Index: Makefile
 ===================================================================
 RCS file: /cvsroot/pkgsrc/chat/gaim/Makefile,v
 retrieving revision 1.78
 diff -u -r1.78 Makefile
 --- Makefile   21 Jan 2005 13:26:42 -0000      1.78
 +++ Makefile   8 Feb 2005 06:58:01 -0000
 @@ -1,6 +1,7 @@
  # $NetBSD: Makefile,v 1.78 2005/01/21 13:26:42 adam Exp $
  
  DISTNAME=     gaim-1.1.2
 +PKGREVISION=  1
  CATEGORIES=   chat x11
  MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gaim/}
  EXTRACT_SUFX= .tar.bz2
 @@ -26,11 +27,15 @@
  CONFIGURE_ARGS+=      --disable-binreloc
  CONFIGURE_ARGS+=      
--with-silc-includes=${BUILDLINK_PREFIX.silc-toolkit}/include/silc
  CONFIGURE_ARGS+=      
--with-silc-libs=${BUILDLINK_PREFIX.silc-toolkit}/lib/silc
 +CONFIGURE_ARGS+=      --disable-gnutls
  CONFIGURE_ARGS+=      --disable-nas
  CONFIGURE_ARGS+=      --disable-perl
 -CONFIGURE_ARGS+=      --disable-nss
  CONFIGURE_ARGS+=      --disable-tcl
  CONFIGURE_ARGS+=      --disable-gevolution
 +CONFIGURE_ARGS+=      
--with-nspr-includes=${BUILDLINK_PREFIX.nspr}/include/nspr
 +CONFIGURE_ARGS+=      --with-nspr-libs=${BUILDLINK_PREFIX.nspr}/lib
 +CONFIGURE_ARGS+=      
--with-nss-includes=${BUILDLINK_PREFIX.nss}/include/nss/nss
 +CONFIGURE_ARGS+=      --with-nss-libs=${BUILDLINK_PREFIX.nss}/lib
  
  .include "../../mk/bsd.prefs.mk"
  
 @@ -41,11 +46,12 @@
  .include "../../audio/libao/buildlink3.mk"
  .include "../../audio/libaudiofile/buildlink3.mk"
  .include "../../converters/libiconv/buildlink3.mk"
 +.include "../../devel/nspr/buildlink3.mk"
 +.include "../../devel/nss/buildlink3.mk"
  .include "../../devel/gettext-lib/buildlink3.mk"
  .include "../../devel/glib2/buildlink3.mk"
  .include "../../devel/pkgconfig/buildlink3.mk"
  .include "../../devel/silc-toolkit/buildlink3.mk"
 -.include "../../security/gnutls/buildlink3.mk"
  .include "../../textproc/gtkspell/buildlink3.mk"
  .include "../../x11/gtk2/buildlink3.mk"
  .include "../../x11/startup-notification/buildlink3.mk"
 Index: distinfo
 ===================================================================
 RCS file: /cvsroot/pkgsrc/chat/gaim/distinfo,v
 retrieving revision 1.57
 diff -u -r1.57 distinfo
 --- distinfo   21 Jan 2005 13:26:42 -0000      1.57
 +++ distinfo   8 Feb 2005 06:58:01 -0000
 @@ -3,5 +3,5 @@
  SHA1 (gaim-1.1.2.tar.bz2) = 6e829261e04d3da95ccfbfb07cc1164c5c725231
  Size (gaim-1.1.2.tar.bz2) = 5178791 bytes
  SHA1 (patch-aa) = 555c394dbb4cd9ef4fea621d30ce72baae309067
 -SHA1 (patch-ac) = 9cb0f91f58a556f44de84819e9c15083f012abbc
 -SHA1 (patch-ad) = e3c71479caeeebe287bcd063e5b8e470832a0c08
 +SHA1 (patch-ac) = 15015ea0082de7150fcb2703911fc689b6b48b54
 +SHA1 (patch-ad) = f79c453b41da2ffb7e35e86b044ed151687a485b
 Index: patches/patch-ac
 ===================================================================
 RCS file: /cvsroot/pkgsrc/chat/gaim/patches/patch-ac,v
 retrieving revision 1.9
 diff -u -r1.9 patch-ac
 --- patches/patch-ac   16 Nov 2004 19:49:42 -0000      1.9
 +++ patches/patch-ac   8 Feb 2005 06:58:01 -0000
 @@ -1,8 +1,8 @@
  $NetBSD: patch-ac,v 1.9 2004/11/16 19:49:42 ben Exp $
  
 ---- configure.ac.orig Thu Nov 11 13:51:08 2004
 -+++ configure.ac
 -@@ -125,7 +125,7 @@ else
 +--- configure.ac.orig Tue Jan 25 12:10:58 2005
 ++++ configure.ac      Tue Jan 25 12:11:37 2005
 +@@ -125,7 +125,7 @@
        if test "$ac_silc_libs" != "no"; then
                SILC_LIBS="-L$ac_silc_libs"
        fi
 @@ -11,3 +11,16 @@
        AC_CHECK_LIB(silcclient, silc_client_init, [silcclient=yes], , 
$SILC_LIBS)
   fi
   AC_SUBST(SILC_LIBS)
 +@@ -734,10 +734,10 @@
 + 
 +                                      enable_nss="no"
 +                              else
 +-                                     nsprlibs="-ldl 
$with_nspr_libs/libplc4.a $with_nspr_libs/libplds4.a $with_nspr_libs/libnspr4.a 
$PTHREAD_LIB"
 ++                                     nsprlibs="$with_nspr_libs/libplc4.a 
$with_nspr_libs/libplds4.a $with_nspr_libs/libnspr4.a $PTHREAD_LIB"
 +                              fi
 +                      else
 +-                             nsprlibs="-ldl -lplc4 -lplds4 -lnspr4 
$PTHREAD_LIB"
 ++                             nsprlibs="-lplc4 -lplds4 -lnspr4 $PTHREAD_LIB"
 +                      fi
 + 
 +                      AC_CACHE_CHECK([for Mozilla nspr libraries], 
moz_nspr_libs,
 Index: patches/patch-ad
 ===================================================================
 RCS file: /cvsroot/pkgsrc/chat/gaim/patches/patch-ad,v
 retrieving revision 1.6
 diff -u -r1.6 patch-ad
 --- patches/patch-ad   3 Dec 2004 12:43:24 -0000       1.6
 +++ patches/patch-ad   8 Feb 2005 06:58:01 -0000
 @@ -1,8 +1,8 @@
  $NetBSD: patch-ad,v 1.6 2004/12/03 12:43:24 adam Exp $
  
 ---- configure.orig    2004-12-03 04:24:48.000000000 +0000
 -+++ configure
 -@@ -27839,7 +27839,7 @@ fi
 +--- configure.orig    Tue Jan 25 12:09:34 2005
 ++++ configure Tue Jan 25 12:10:49 2005
 +@@ -27839,7 +27839,7 @@
        if test "$ac_silc_libs" != "no"; then
                SILC_LIBS="-L$ac_silc_libs"
        fi
 @@ -11,3 +11,16 @@
        echo "$as_me:$LINENO: checking for silc_client_init in -lsilcclient" >&5
   echo $ECHO_N "checking for silc_client_init in -lsilcclient... $ECHO_C" >&6
   if test "${ac_cv_lib_silcclient_silc_client_init+set}" = set; then
 +@@ -32902,10 +32902,10 @@
 + 
 +                                      enable_nss="no"
 +                              else
 +-                                     nsprlibs="-ldl 
$with_nspr_libs/libplc4.a $with_nspr_libs/libplds4.a $with_nspr_libs/libnspr4.a 
$PTHREAD_LIB"
 ++                                     nsprlibs="$with_nspr_libs/libplc4.a 
$with_nspr_libs/libplds4.a $with_nspr_libs/libnspr4.a $PTHREAD_LIB"
 +                              fi
 +                      else
 +-                             nsprlibs="-ldl -lplc4 -lplds4 -lnspr4 
$PTHREAD_LIB"
 ++                             nsprlibs="-lplc4 -lplds4 -lnspr4 $PTHREAD_LIB"
 +                      fi
 + 
 +                      echo "$as_me:$LINENO: checking for Mozilla nspr 
libraries" >&5
 



Home | Main Index | Thread Index | Old Index