pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk Change the files to be used for PLIST_SRC from



details:   https://anonhg.NetBSD.org/pkgsrc/rev/752e00f946bc
branches:  trunk
changeset: 489452:752e00f946bc
user:      veego <veego%pkgsrc.org@localhost>
date:      Mon Feb 21 20:12:01 2005 +0000

description:
Change the files to be used for PLIST_SRC from
 PLIST.common
 PLIST.${OPSYS}
 PLIST
 PLIST.common_end
to
 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

Which makes it possible to remove duplicated code in some packages.
This doesn't change anything, because all affected packages define PLIST_SRC,
so this code would never be used for them.
And most of them will be fixed with the next commit.

ToDO: ${MACHINE_ARCH:C/i[3-6]86/i386/g} looks wrong and should be changed,
but thats what we allready use for MESSAGE_SRC.

diffstat:

 mk/bsd.pkg.mk |  6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diffs (20 lines):

diff -r 1e4f862822d3 -r 752e00f946bc mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk     Mon Feb 21 17:31:31 2005 +0000
+++ b/mk/bsd.pkg.mk     Mon Feb 21 20:12:01 2005 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.pkg.mk,v 1.1592 2005/02/20 06:02:06 grant Exp $
+#      $NetBSD: bsd.pkg.mk,v 1.1593 2005/02/21 20:12:01 veego Exp $
 #
 # This file is in the public domain.
 #
@@ -107,6 +107,10 @@
 .  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



Home | Main Index | Thread Index | Old Index