Re: pkg/51396: pkgsrc-2016Q2 cross/mingw-gcc PLIST mismatch

[Matthew Mondor <mm_lists%pulsar-zone.net@localhost>]

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

From: Matthew Mondor <mm_lists%pulsar-zone.net@localhost>
To: gnats-bugs%NetBSD.org@localhost
Cc: 
Subject: Re: pkg/51396: pkgsrc-2016Q2 cross/mingw-gcc PLIST mismatch
Date: Mon, 8 Aug 2016 19:02:09 -0400

 --MP_/6mV/bzIbURYOY0AK_JDj_g.
 Content-Type: text/plain; charset=US-ASCII
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline
 
 
 The following solution makes use of GENERATE_PLIST to dynamically
 generate a PLIST (idea borrowed from the gcc-aux package), and of
 PLIST_SUBST to substract the PKGREVISION (i.e. nb2) from
 ${PKGVERSION} in the automatically created PLIST.  Resulting is a
 working package where any automatically built extra files such as
 precompiled C++ headers (.gch) ones are automatically included.
 
 I also bumped the revision to 2 (I'm unsure if this is necessary).
 
 If applying the following patch, please discard any previously
 suggested diffs in this PR, and make sure to also delete the static
 PLIST file.  I could not test it, but I believe that the same changes
 would apply for pkgsrc-current, after briefly checking the stub via
 cvsweb.
 
 Thanks,
 Matt
 
 
 --MP_/6mV/bzIbURYOY0AK_JDj_g.
 Content-Type: text/plain
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment; filename=pkgsrc-2016Q2_cross_mingw-gcc_3.diff
 
 Index: Makefile
 ===================================================================
 RCS file: /data/rsync/netbsd-cvs/pkgsrc/cross/mingw-gcc/Makefile,v
 retrieving revision 1.6
 diff -u -r1.6 Makefile
 --- Makefile	19 Jun 2016 16:23:59 -0000	1.6
 +++ Makefile	8 Aug 2016 22:31:17 -0000
 @@ -2,7 +2,7 @@
  
  DISTNAME=		mingw-gcc-${DIST_VERSION}
  PKGNAME=		${DISTNAME:S/-${DIST_VERSION}/-${GCC_VERSION}/}
 -PKGREVISION=		1
 +PKGREVISION=		2
  CATEGORIES=		cross
  MASTER_SITES=		${MASTER_SITE_MINGW}
  DISTFILES=		gcc-core-${DIST_VERSION}-src.tar.gz \
 @@ -13,7 +13,7 @@
  HOMEPAGE=		http://mingw.sourceforge.net/
  COMMENT=		GNU C Compiler for win32 cross-development
  
 -USE_TOOLS+=		gmake
 +USE_TOOLS+=		gmake perl
  GNU_CONFIGURE=		yes
  GNU_CONFIGURE_PREFIX=	${PREFIX}/cross
  INFO_FILES=		yes
 @@ -23,6 +23,11 @@
  GCC_VERSION=		3.4.5
  DIST_VERSION=		${GCC_VERSION}-20060117-2
  
 +# Automatic package list generation
 +PLIST_SUBST+=		PKGVERSION=${PKGVERSION_NOREV:Q}
 +GENERATE_PLIST=		cd ${DESTDIR}${PREFIX};
 +GENERATE_PLIST+=	${FIND} * \( -type f -or -type l \) | ${SORT} -dr;
 +
  do-build:
  	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS}
  	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \
 
 --MP_/6mV/bzIbURYOY0AK_JDj_g.--