From bb200cebe6afdd7e7c2c75409ac3d8d1f287234d Mon Sep 17 00:00:00 2001 From: Marc Espie Date: Fri, 18 Aug 2006 13:14:35 +0000 Subject: py-cairo/py-gtk2 deathlock of dependencies. Not fixed yet. --- regress/usr.sbin/pkg_add/Makefile | 49 ++++++++++++++++++++++++++++++++++++--- regress/usr.sbin/pkg_add/empty | 1 + 2 files changed, 47 insertions(+), 3 deletions(-) create mode 100644 regress/usr.sbin/pkg_add/empty diff --git a/regress/usr.sbin/pkg_add/Makefile b/regress/usr.sbin/pkg_add/Makefile index 165a281fb75..c2c5bea8fa0 100644 --- a/regress/usr.sbin/pkg_add/Makefile +++ b/regress/usr.sbin/pkg_add/Makefile @@ -1,10 +1,53 @@ -# $OpenBSD: Makefile,v 1.2 2004/03/02 06:55:26 david Exp $ +# $OpenBSD: Makefile,v 1.3 2006/08/18 13:14:34 espie Exp $ -REGRESS_TARGETS=pkgnames +REGRESS_TARGETS=pkgnames depends-check pkgnames: perl ${.CURDIR}/check-name -.PHONY: pkgnames +depends-check: old/a-0.0.tgz old/b-0.0.tgz new/a-1.0.tgz new/b-1.0.tgz + -rm -rf ${.OBJDIR}/depends + -mkdir -p ${.OBJDIR}/depends/pkgdb + PKG_DBDIR=${.OBJDIR}/depends/pkgdb pkg_add -F nonroot -B${.OBJDIR}/depends old/a-0.0.tgz old/b-0.0.tgz + PKG_DBDIR=${.OBJDIR}/depends/pkgdb PKG_PATH=${.OBJDIR}/new pkg_add -F nonroot -B${.OBJDIR}/depends -u a b + PKG_DBDIR=${.OBJDIR}/depends/pkgdb PKG_PATH=${.OBJDIR}/old pkg_add -F nonroot -B${.OBJDIR}/depends -u a b + +old/a-0.0.tgz: + -mkdir -p ${@D} + pkg_create -p /usr/local -A \* \ + -DFULLPKGPATH=test/a \ + -DPERMIT_PACKAGE_FTP=Yes \ + -DPERMIT_PACKAGE_CDROM=Yes \ + -P'test/b:b-*:b-0.0' \ + -c '-comment' -d '-descr' -f ${.CURDIR}/empty $@ + +new/a-1.0.tgz: + -mkdir -p ${@D} + pkg_create -p /usr/local -A \* \ + -DFULLPKGPATH=test/a \ + -DPERMIT_PACKAGE_FTP=Yes \ + -DPERMIT_PACKAGE_CDROM=Yes \ + -c '-comment' -d '-descr' -f ${.CURDIR}/empty $@ + +old/b-0.0.tgz: + -mkdir -p ${@D} + pkg_create -p /usr/local -A \* \ + -DFULLPKGPATH=test/a \ + -DPERMIT_PACKAGE_FTP=Yes \ + -DPERMIT_PACKAGE_CDROM=Yes \ + -c '-comment' -d '-descr' -f ${.CURDIR}/empty $@ + +new/b-1.0.tgz: + -mkdir -p ${@D} + pkg_create -p /usr/local -A \* \ + -DFULLPKGPATH=test/a \ + -DPERMIT_PACKAGE_FTP=Yes \ + -DPERMIT_PACKAGE_CDROM=Yes \ + -P'test/a:a-*:a-1.0' \ + -c '-comment' -d '-descr' -f ${.CURDIR}/empty $@ + +.PHONY: pkgnames depends-check + +CLEANFILES+=old/*.tgz new/*.tgz depends/*/*/* .include diff --git a/regress/usr.sbin/pkg_add/empty b/regress/usr.sbin/pkg_add/empty new file mode 100644 index 00000000000..868f64d2edd --- /dev/null +++ b/regress/usr.sbin/pkg_add/empty @@ -0,0 +1 @@ +@comment $OpenBSD: empty,v 1.1 2006/08/18 13:14:34 espie Exp $ -- cgit v1.2.3