summaryrefslogtreecommitdiff
path: root/regress/usr.sbin/pkg_add
diff options
context:
space:
mode:
authorMarc Espie <espie@cvs.openbsd.org>2009-12-11 13:03:00 +0000
committerMarc Espie <espie@cvs.openbsd.org>2009-12-11 13:03:00 +0000
commitc162ed6b563cad24cdb9fbb61f14b5070792fab4 (patch)
tree96d673351ac78f8deb6480b679b7d26be83555e1 /regress/usr.sbin/pkg_add
parentd0bc86d36922d19407faa5eaededeaeb6f9337d1 (diff)
simplify building of libs
Diffstat (limited to 'regress/usr.sbin/pkg_add')
-rw-r--r--regress/usr.sbin/pkg_add/Makefile14
1 files changed, 5 insertions, 9 deletions
diff --git a/regress/usr.sbin/pkg_add/Makefile b/regress/usr.sbin/pkg_add/Makefile
index fbb7f07d993..ee7fa5e8b28 100644
--- a/regress/usr.sbin/pkg_add/Makefile
+++ b/regress/usr.sbin/pkg_add/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.19 2009/12/03 18:45:50 espie Exp $
+# $OpenBSD: Makefile,v 1.20 2009/12/11 13:02:59 espie Exp $
REGRESS_TARGETS=pkgnames depends-check longnames always-update \
collision-check3 partial-update-test conflict-update \
@@ -140,16 +140,12 @@ plist7:
@echo "@conflict m-<1.0" >$@
@echo "@pkgpath test/m" >>$@
-plist-p/PLIST:
+plist8:
@mkdir -p ${@D}
@echo "@conflict o-<1.0" >$@
@echo "@pkgpath test/o" >>$@
@echo "@owner "`whoami` >>$@
- @echo "%%SHARED%%" >>$@
-
-plist-p/PFRAG.shared:
- @mkdir -p ${@D}
- @echo '@lib lib/libcoincoin.so.$${LIBcoincoin_VERSION}' >$@
+ @echo '@lib lib/libcoincoin.so.$${LIBcoincoin_VERSION}' >>$@
old/a-0.0.tgz:
${PKG_CREATE} -P'test/b:b-*:b-0.0' -f ${.CURDIR}/empty $@
@@ -162,10 +158,10 @@ old/n-0.0.tgz new/m-1.0.tgz old/o-0.0.tgz:
new/o-1.0.tgz:
${PKG_CREATE} -P'test/p:p-*:p-0.0' -W'coincoin.0.0' -f ${.CURDIR}/empty $@
-new/p-0.0.tgz: p/PLIST p/PFRAG.shared
+new/p-0.0.tgz: plist8
mkdir -p ${SRC13}/lib
@touch ${SRC13}/lib/libcoincoin.so.0.0
- ${PKG_CREATE} -B src13 -DSHARED_LIBS=1 -DLIBcoincoin_VERSION=0.0 -f p/PLIST $@
+ ${PKG_CREATE} -B src13 -DLIBcoincoin_VERSION=0.0 -f plist8 $@
new/b-1.0.tgz: