Re: pkg/47161

["Jeremy C. Reed" <reed%reedmedia.net@localhost>]

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

From: "Jeremy C. Reed" <reed%reedmedia.net@localhost>
To: gnats-bugs%netbsd.org@localhost
Cc: 
Subject: Re: pkg/47161
Date: Wed, 7 Nov 2012 09:07:38 -0600 (CST)

 On Wed, 7 Nov 2012, diro%nixsyspaus.org@localhost wrote:
 
 >  >  (For some reason their changes file mentions it but I don't see it.)
 >  
 >  It's in here: http://zlib.net/zlib-1.2.7.tar.gz (zlib.pc.in)
 
 Thanks for making me look again :)
 
 I forgot we bundled the sources so I didn't see it when I did a "make 
 extract".
 
 Please test the following after adding the file to files:
 
 ? devel/zlib/files/zlib.pc.in
 Index: devel/zlib/Makefile
 ===================================================================
 RCS file: /cvsroot/pkgsrc/devel/zlib/Makefile,v
 retrieving revision 1.45
 diff -u -r1.45 Makefile
 --- devel/zlib/Makefile        31 Oct 2012 11:19:55 -0000      1.45
 +++ devel/zlib/Makefile        7 Nov 2012 15:06:41 -0000
 @@ -1,6 +1,7 @@
  # $NetBSD: Makefile,v 1.45 2012/10/31 11:19:55 asau Exp $
  
  DISTNAME=     zlib-1.2.7
 +PKGREVISION=  1
  CATEGORIES=   devel
  MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libpng/} \
                http://www.gzip.org/zlib/
 @@ -14,10 +15,21 @@
  PKG_INSTALLATION_TYPES=       overwrite pkgviews
  
  USE_LIBTOOL=          yes
 -
 +PKGCONFIG_OVERRIDE+=  zlib.pc.in
  CFLAGS+=              ${CPPFLAGS}
  
 -INSTALLATION_DIRS=    include lib ${PKGMANDIR}/man3
 +INSTALLATION_DIRS=    include lib lib/pkgconfig ${PKGMANDIR}/man3
 +
 +SUBST_CLASSES+=       pc
 +SUBST_MESSAGE.pc=     pkg-config file substitutions
 +SUBST_STAGE.pc=               pre-configure
 +SUBST_FILES.pc=               zlib.pc.in
 +SUBST_SED.pc=         -e "s|@prefix@|${PREFIX}|g"
 +SUBST_SED.pc+=                -e "s|@exec_prefix@|${PREFIX}|g"
 +SUBST_SED.pc+=                -e 's|@libdir@|$${exec_prefix}/lib|g'
 +SUBST_SED.pc+=                -e 's|@sharedlibdir@|$${exec_prefix}/lib|g'
 +SUBST_SED.pc+=                -e 's|@includedir@|$${prefix}/include|g'
 +SUBST_SED.pc+=                -e "s|@VERSION@|${PKGVERSION_NOREV}|g"
  
  do-extract:
        ${CP} -r ${FILESDIR} ${WRKSRC}
 @@ -27,5 +39,7 @@
        ${INSTALL_MAN} ${WRKSRC}/zlib.3 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man3
        ${INSTALL_DATA} ${WRKSRC}/zconf.h ${DESTDIR}${PREFIX}/include
        ${INSTALL_DATA} ${WRKSRC}/zlib.h ${DESTDIR}${PREFIX}/include
 +      ${INSTALL_DATA} ${WRKSRC}/zlib.pc.in \
 +              ${DESTDIR}${PREFIX}/lib/pkgconfig/zlib.pc
  
  .include "../../mk/bsd.pkg.mk"
 Index: devel/zlib/PLIST
 ===================================================================
 RCS file: /cvsroot/pkgsrc/devel/zlib/PLIST,v
 retrieving revision 1.3
 diff -u -r1.3 PLIST
 --- devel/zlib/PLIST   22 Sep 2004 08:09:30 -0000      1.3
 +++ devel/zlib/PLIST   7 Nov 2012 15:06:41 -0000
 @@ -2,4 +2,5 @@
  include/zconf.h
  include/zlib.h
  lib/libz.la
 +lib/pkgconfig/zlib.pc
  man/man3/zlib.3