On Mon, Feb 21, 2005 at 10:31:15PM +0100, Bernd Ernesti wrote:
> I commited my changes, except for two parts in the diff which had nothing to
> do with this change.
> And i merged the PLIST.* files, from emulators/netbsd32_compat16, into the PLIST
> one as much as possible.

And while doing that i broke it for some of the packages where i changed the PLIST_SRC.

pkgsrc/emulators/compat13
pkgsrc/emulators/compat14
pkgsrc/emulators/compat14-crypto
pkgsrc/emulators/twin
pkgsrc/lang/blackdown-jdk13
pkgsrc/multimedia/transcode

Could someone please review this diff and say if its okay?
And what should i do with these packages? bump the version?

Index: bsd.pkg.mk
===================================================================
RCS file: /home/source/NetBSD-cvs/main/pkgsrc/mk/bsd.pkg.mk,v
retrieving revision 1.1595
diff -c -r1.1595 bsd.pkg.mk
*** bsd.pkg.mk	25 Feb 2005 13:05:52 -0000	1.1595
--- bsd.pkg.mk	27 Feb 2005 20:53:33 -0000
***************
*** 107,117 ****
  .  endif
  .  if exists(${PKGDIR}/PLIST.${OPSYS})
  PLIST_SRC+=		${PKGDIR}/PLIST.${OPSYS}
! .  elif exists(${PKGDIR}/PLIST.${MACHINE_ARCH:C/i[3-6]86/i386/g})
  PLIST_SRC+=		${PKGDIR}/PLIST.${MACHINE_ARCH:C/i[3-6]86/i386/g}
! .  elif exists(${PKGDIR}/PLIST.${OPSYS}-${MACHINE_ARCH:C/i[3-6]86/i386/g})
  PLIST_SRC+=		${PKGDIR}/PLIST.${OPSYS}-${MACHINE_ARCH:C/i[3-6]86/i386/g}
! .  elif exists(${PKGDIR}/PLIST)
  PLIST_SRC+=		${PKGDIR}/PLIST
  .  endif
  .  if exists(${PKGDIR}/PLIST.common_end)
--- 107,120 ----
  .  endif
  .  if exists(${PKGDIR}/PLIST.${OPSYS})
  PLIST_SRC+=		${PKGDIR}/PLIST.${OPSYS}
! .  endif
! .  if exists(${PKGDIR}/PLIST.${MACHINE_ARCH:C/i[3-6]86/i386/g})
  PLIST_SRC+=		${PKGDIR}/PLIST.${MACHINE_ARCH:C/i[3-6]86/i386/g}
! .  endif
! .  if exists(${PKGDIR}/PLIST.${OPSYS}-${MACHINE_ARCH:C/i[3-6]86/i386/g})
  PLIST_SRC+=		${PKGDIR}/PLIST.${OPSYS}-${MACHINE_ARCH:C/i[3-6]86/i386/g}
! .  endif
! .  if exists(${PKGDIR}/PLIST)
  PLIST_SRC+=		${PKGDIR}/PLIST
  .  endif
  .  if exists(${PKGDIR}/PLIST.common_end)

That way all PLIST* files end up in PLIST_SRC and not just the first found
PLIST.* one.

And if we should keep that order or move the PLIST up before the OPSYS or MACHINE_ARCH
ones.

With the patch its now:

PLIST.common
PLIST.${OPSYS}
PLIST.${MACHINE_ARCH:C/i[3-6]86/i386/g}
PLIST.${OPSYS}-${MACHINE_ARCH:C/i[3-6]86/i386/g}
PLIST
PLIST.common_end

Bernd