diff options
| author | Mikhail Teterin <mi@FreeBSD.org> | 2004-08-17 16:52:19 +0000 |
|---|---|---|
| committer | Mikhail Teterin <mi@FreeBSD.org> | 2004-08-17 16:52:19 +0000 |
| commit | 6146e0e3f572567b84ad0b0f29b9074de7d6395a (patch) | |
| tree | 95bbf600c4741b926679aab0ca469636a74e6871 /security/vxquery | |
| parent | Preprocess the heck out of this to bring it in line with C++98. (diff) | |
Don't require a particular version of libexpat. Use sh(1)'s `echo *'
instead of spawning off ls(1) in pkg_check.sh.
Approved by: maintainer
Notes
Notes:
svn path=/head/; revision=116534
Diffstat (limited to 'security/vxquery')
| -rw-r--r-- | security/vxquery/Makefile | 2 | ||||
| -rw-r--r-- | security/vxquery/files/pkg_check.sh | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/security/vxquery/Makefile b/security/vxquery/Makefile index c37e1bfd3ada..a2d77148d7d8 100644 --- a/security/vxquery/Makefile +++ b/security/vxquery/Makefile @@ -21,7 +21,7 @@ GNU_CONFIGURE= YES .include <bsd.port.pre.mk> .if ${OSVERSION} < 501111 CONFIGURE_ENV+= LIBS="-L${LOCALBASE}/lib" CPPFLAGS="-I${LOCALBASE}/include" -LIB_DEPENDS= expat.5:${PORTSDIR}/textproc/expat2 +LIB_DEPENDS= expat:${PORTSDIR}/textproc/expat2 .endif do-install: diff --git a/security/vxquery/files/pkg_check.sh b/security/vxquery/files/pkg_check.sh index bd79868393dd..ae31df2fc221 100644 --- a/security/vxquery/files/pkg_check.sh +++ b/security/vxquery/files/pkg_check.sh @@ -1,5 +1,4 @@ #! /bin/sh -LS="/bin/ls" VXQUERY="vxquery" PORTSDIR="${PORTSDIR:-/usr/ports}" PKGDIR="${PKGDIR:-/var/db/pkg}" @@ -7,4 +6,5 @@ FORMAT="${FORMAT:-text}" VULN_XML="${VULN_XML:-${PORTSDIR}/security/vuxml/vuln.xml}" set -e -(cd "$PKGDIR" && "${LS}") | "${VXQUERY}" -f - -t "${FORMAT}" "${VULN_XML}" +cd "$PKGDIR" +echo * | "${VXQUERY}" -f - -t "${FORMAT}" "${VULN_XML}" |