Fri Apr 30 04:05:16 2010 UTC ()
Change the pattern of the osabi dependence to one the actually works!


(sbd)
diff -r1.1967 -r1.1968 pkgsrc/mk/bsd.pkg.mk
cvs diff -r1.1967 -r1.1968 pkgsrc/mk/bsd.pkg.mk (expand / switch to unified diff)

--- pkgsrc/mk/bsd.pkg.mk 2010/04/30 03:29:55 1.1967
+++ pkgsrc/mk/bsd.pkg.mk 2010/04/30 04:05:16 1.1968
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: bsd.pkg.mk,v 1.1967 2010/04/30 03:29:55 sbd Exp $ 1# $NetBSD: bsd.pkg.mk,v 1.1968 2010/04/30 04:05:16 sbd Exp $
2# 2#
3# This file is in the public domain. 3# This file is in the public domain.
4# 4#
5# Please see the pkgsrc/doc/guide manual for details on the 5# Please see the pkgsrc/doc/guide manual for details on the
6# variables used in this make file template. 6# variables used in this make file template.
7# 7#
8# Default sequence for "all" is: 8# Default sequence for "all" is:
9# 9#
10# bootstrap-depends 10# bootstrap-depends
11# fetch 11# fetch
12# checksum 12# checksum
13# depends 13# depends
14# tools 14# tools
@@ -506,27 +506,27 @@ PKG_FAIL_REASON+= "${PKGNAME} is not ava @@ -506,27 +506,27 @@ PKG_FAIL_REASON+= "${PKGNAME} is not ava
506.endif 506.endif
507 507
508# Add these defs to the ones dumped into +BUILD_DEFS 508# Add these defs to the ones dumped into +BUILD_DEFS
509_BUILD_DEFS+= PKGPATH 509_BUILD_DEFS+= PKGPATH
510_BUILD_DEFS+= OPSYS OS_VERSION MACHINE_ARCH MACHINE_GNU_ARCH 510_BUILD_DEFS+= OPSYS OS_VERSION MACHINE_ARCH MACHINE_GNU_ARCH
511_BUILD_DEFS+= ABI 511_BUILD_DEFS+= ABI
512_BUILD_DEFS+= CPPFLAGS CFLAGS FFLAGS LDFLAGS 512_BUILD_DEFS+= CPPFLAGS CFLAGS FFLAGS LDFLAGS
513_BUILD_DEFS+= OBJECT_FMT LICENSE RESTRICTED 513_BUILD_DEFS+= OBJECT_FMT LICENSE RESTRICTED
514_BUILD_DEFS+= NO_SRC_ON_FTP NO_SRC_ON_CDROM 514_BUILD_DEFS+= NO_SRC_ON_FTP NO_SRC_ON_CDROM
515_BUILD_DEFS+= NO_BIN_ON_FTP NO_BIN_ON_CDROM 515_BUILD_DEFS+= NO_BIN_ON_FTP NO_BIN_ON_CDROM
516 516
517.if defined(OSVERSION_SPECIFIC) 517.if defined(OSVERSION_SPECIFIC)
518_BUILD_DEFS+= OSVERSION_SPECIFIC 518_BUILD_DEFS+= OSVERSION_SPECIFIC
519DEPENDS+= osabi-${OPSYS}=${OS_VERSION}:../../pkgtools/osabi 519DEPENDS+= osabi-${OPSYS}>=${OS_VERSION}<=${OS_VERSION}:../../pkgtools/osabi
520.endif # OSVERSION_SPECIFIC 520.endif # OSVERSION_SPECIFIC
521 521
522.PHONY: all 522.PHONY: all
523.if !target(all) 523.if !target(all)
524all: ${_PKGSRC_BUILD_TARGETS} 524all: ${_PKGSRC_BUILD_TARGETS}
525.endif 525.endif
526 526
527.PHONY: makedirs 527.PHONY: makedirs
528makedirs: ${WRKDIR} 528makedirs: ${WRKDIR}
529 529
530${WRKDIR}: 530${WRKDIR}:
531.if !defined(KEEP_WRKDIR) 531.if !defined(KEEP_WRKDIR)
532. if ${WRKDIR_LOCKTYPE} != "none" 532. if ${WRKDIR_LOCKTYPE} != "none"