diff --git a/Manual.md b/Manual.md index 578e8004371..fa552f65ba5 100644 --- a/Manual.md +++ b/Manual.md @@ -512,8 +512,7 @@ can be specified by prepending a commercial at (@). For tarballs you can find the contents checksum by using the command `tar xf --to-stdout | sha256sum`. -- `wrksrc` The directory name where the package sources are extracted, by default -set to `${pkgname}-${version}`. If the top level directory of a package's `distfile` is different from the default, `wrksrc` must be set to the top level directory name inside the archive. +- `wrksrc` The directory name where the package sources are extracted, set to `${pkgname}-${version}`. - `build_wrksrc` A directory relative to `${wrksrc}` that will be used when building the package. diff --git a/common/build-style/slashpackage.sh b/common/build-style/slashpackage.sh index 83ad0304776..5f4fe4fb93f 100644 --- a/common/build-style/slashpackage.sh +++ b/common/build-style/slashpackage.sh @@ -5,7 +5,6 @@ # required variables # # build_style=slashpackage -# wrksrc= # build_wrksrc=${pkgname}-${version} # distfiles= # @@ -15,7 +14,6 @@ # pkgname=daemontools # version=0.76 # revision=1 -# wrksrc=admin # build_wrksrc=${pkgname}-${version} # build_style=slashpackage # short_desc="A collection of tools for managing UNIX services" diff --git a/common/xbps-src/shutils/common.sh b/common/xbps-src/shutils/common.sh index a640528f4d6..ea67dabfd96 100644 --- a/common/xbps-src/shutils/common.sh +++ b/common/xbps-src/shutils/common.sh @@ -655,11 +655,7 @@ setup_pkg() { fi # Setup some specific package vars. - if [ -z "$wrksrc" ]; then - wrksrc="$XBPS_BUILDDIR/${sourcepkg}-${version}" - else - wrksrc="$XBPS_BUILDDIR/$wrksrc" - fi + wrksrc="$XBPS_BUILDDIR/${sourcepkg}-${version}" if [ "$cross" -a "$nocross" ]; then report_broken \