Re: pkg/43845 ([PATCH] security/gnupg2 and security/dirmngr should not include pth/buildlink3.mk)

[Rumko <rumcic%gmail.com@localhost>]

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

From: Rumko <rumcic%gmail.com@localhost>
To: M.Drochner%fz-juelich.de@localhost
Cc: gnats-bugs%netbsd.org@localhost,
 pkg-manager%netbsd.org@localhost,
 pkgsrc-bugs%netbsd.org@localhost,
 gnats-admin%netbsd.org@localhost,
 drochner%netbsd.org@localhost
Subject: Re: pkg/43845 ([PATCH] security/gnupg2 and security/dirmngr should  
not include pth/buildlink3.mk)
Date: Tue, 7 Sep 2010 11:18:03 +0200

 --nextPart61208132.dIRiOoUVG4
 Content-Type: text/plain;
   charset="iso-8859-1"
 Content-Transfer-Encoding: quoted-printable
 Content-Disposition: inline
 
 On Tuesday 7. of September 2010 11:00:24 Matthias Drochner wrote:
 > rumcic%gmail.com@localhost said:
 > > will have to look towards devel/pth to see if it really needs to
 > > install  libpthread on systems where native version is available
 >
 > Might make sense, I did consider something similar too, for the pthread.h
 > header installed by pth. It can lead to confusion for programs built
 > outside the pkgsrc/bl3 framework.
 >
 > best regards
 > Matthias
 <snip>
 
 With the following patch, gnupg2 and dirmngr still compile, but I don't end=
  up=20
 with duplicate pthread stuff.
 Should this be put in a new PR? And is "defined(PTHREAD_TYPE)" really neede=
 d?=20
 
 diff --git a/devel/pth/Makefile b/devel/pth/Makefile
 index c94b116..5deb37c 100644
 =2D-- a/devel/pth/Makefile
 +++ b/devel/pth/Makefile
 @@ -19,7 +19,6 @@ MAKE_JOBS_SAFE=3D               no
 
  USE_LIBTOOL=3D           YES
  GNU_CONFIGURE=3D         YES
 =2DCONFIGURE_ARGS+=3D       --enable-pthread
  CONFIGURE_ARGS+=3D       --with-fdsetsize=3D1024
  #CONFIGURE_ARGS+=3D      --enable-debug
 
 @@ -39,6 +38,14 @@ CONFIGURE_ENV+=3D              ac_cv_check_nfdstype=3D'u=
 nsigned=20
 int'
  CONFIGURE_ENV+=3D                ac_cv_typedef_nfds_t=3Dno # in <poll.h>, =
 but=20
 that's unused
  .endif
 
 +PLIST_VARS+=3D           pthread
 +
 +.include "../../mk/pthread.buildlink3.mk"
 +.if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} !=3D "native"
 +CONFIGURE_ARGS+=3D       --enable-pthread
 +PLIST.pthread=3D         yes
 +.endif
 +
  INSTALLATION_DIRS=3D     share/doc/pth
 
  post-install:
 diff --git a/devel/pth/PLIST b/devel/pth/PLIST
 index 38e3669..71859ce 100644
 =2D-- a/devel/pth/PLIST
 +++ b/devel/pth/PLIST
 @@ -1,14 +1,14 @@
  @comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:29 jlam Exp $
  bin/pth-config
 =2Dbin/pthread-config
 +${PLIST.pthread}bin/pthread-config
  include/pth.h
 =2Dinclude/pthread.h
 +${PLIST.pthread}include/pthread.h
  lib/libpth.la
 =2Dlib/libpthread.la
 +${PLIST.pthread}lib/libpthread.la
  man/man1/pth-config.1
 =2Dman/man1/pthread-config.1
 +${PLIST.pthread}man/man1/pthread-config.1
  man/man3/pth.3
 =2Dman/man3/pthread.3
 +${PLIST.pthread}man/man3/pthread.3
  share/aclocal/pth.m4
  share/doc/pth/ANNOUNCE
  share/doc/pth/AUTHORS
 
 =2D-=20
 Regards,
 Rumko
 
 --nextPart61208132.dIRiOoUVG4
 Content-Type: application/pgp-signature; name=signature.asc 
 Content-Description: This is a digitally signed message part.
 
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (DragonFly)
 
 iEYEABECAAYFAkyGA00ACgkQxV3ce2RZW70oDACdGsql2cYyHUGJP6FjDl80cvoB
 GBIAoLSHlF6G00CRmFbwLRMb5cZl3qAW
 =Js5C
 -----END PGP SIGNATURE-----
 
 --nextPart61208132.dIRiOoUVG4--