Re: pkg/48361: pkgsrc zlib missing at least pkg-config zlib.pc from upstream

[David Holland <dholland-pbugs%netbsd.org@localhost>]

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

From: David Holland <dholland-pbugs%netbsd.org@localhost>
To: gnats-bugs%NetBSD.org@localhost
Cc: 
Subject: Re: pkg/48361: pkgsrc zlib missing at least pkg-config zlib.pc from
 upstream
Date: Fri, 22 Nov 2013 02:25:08 +0000

 On Thu, Nov 21, 2013 at 05:35:00AM +0000, Richard PALO wrote:
  >  >   It is easier for everyone if you don't send mime-attachments to gnats;
  >  >   can you send the patch inline? (Or, alternatively, send it to me
  >  >   instead of gnats as a regular attachment and I'll post it)
 
 Here is the patch; I can commit it (or you can, for that matter) if we
 decide it's what we want.
 
 Sorry, I keep getting high-priority NMI's from real life objects. :-/
 
  >  On the otherhand, is there any reason not to do a normal build to ease 
  >  future upgrades?
 
 I ... don't follow.
 
 diff --git a/devel/zlib/Makefile b/devel/zlib/Makefile
 index d2c7ab7..639c25e 100644
 --- a/devel/zlib/Makefile
 +++ b/devel/zlib/Makefile
 @@ -1,6 +1,7 @@
  # $NetBSD: Makefile,v 1.47 2013/05/27 16:22:10 adam Exp $
  
  DISTNAME=     zlib-1.2.8
 +PKGREVISION=  1
  CATEGORIES=   devel
  MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libpng/} \
                http://zlib.net/
 @@ -15,10 +16,23 @@ PKG_INSTALLATION_TYPES=    overwrite pkgviews
  
  USE_LIBTOOL=          yes
  
 +PKGCONFIG_OVERRIDE+=  zlib.pc.in
 +
  CFLAGS+=              ${CPPFLAGS}
  LDFLAGS.Cygwin=               -no-undefined
  
 -INSTALLATION_DIRS=    include lib ${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,@VERSION@,${PKGVERSION_NOREV},g"
 +SUBST_SED.pc+=        -e "s,@includedir@,${PREFIX}/include,g"
 +SUBST_SED.pc+=        -e "s,@libdir@,${PREFIX}/lib,g"
 +SUBST_SED.pc+=        -e "s,@sharedlibdir@,${PREFIX}/lib,g"
 +
 +INSTALLATION_DIRS=    include lib/pkgconfig ${PKGMANDIR}/man3
  
  do-extract:
        ${CP} -r ${FILESDIR} ${WRKSRC}
 @@ -28,5 +42,6 @@ do-install:
        ${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"
 diff --git a/devel/zlib/PLIST b/devel/zlib/PLIST
 index 7008f62..5ef561a 100644
 --- a/devel/zlib/PLIST
 +++ b/devel/zlib/PLIST
 @@ -2,4 +2,5 @@
  include/zconf.h
  include/zlib.h
  lib/libz.la
 +lib/pkgconfig/zlib.pc
  man/man3/zlib.3
 diff --git a/devel/zlib/files/zlib.pc.in b/devel/zlib/files/zlib.pc.in
 new file mode 100644
 index 0000000..7e5acf9
 --- /dev/null
 +++ b/devel/zlib/files/zlib.pc.in
 @@ -0,0 +1,13 @@
 +prefix=@prefix@
 +exec_prefix=@exec_prefix@
 +libdir=@libdir@
 +sharedlibdir=@sharedlibdir@
 +includedir=@includedir@
 +
 +Name: zlib
 +Description: zlib compression library
 +Version: @VERSION@
 +
 +Requires:
 +Libs: -L${libdir} -L${sharedlibdir} -lz
 +Cflags: -I${includedir}
 
 -- 
 David A. Holland
 dholland%netbsd.org@localhost