diff options
| author | Mathieu Arnold <mat@FreeBSD.org> | 2015-08-17 14:20:40 +0000 |
|---|---|---|
| committer | Mathieu Arnold <mat@FreeBSD.org> | 2015-08-17 14:20:40 +0000 |
| commit | 21a283f3bec444388d1448f993783ec673a06502 (patch) | |
| tree | 16be3a9188cf2781563095e15839c170074dd7a7 /ports-mgmt | |
| parent | Last update was causing pollution of BUILD_DEPENDS into RUN_DEPENDS (diff) | |
Remove UNIQUENAME and LATEST_LINK.
UNIQUENAME was never unique, it was only used by USE_LDCONFIG and now,
we won't have conflicts there.
Use PKGBASE instead of LATEST_LINK in PKGLATESTFILE, the *only* consumer
is pkg-devel, and it works just fine without LATEST_LINK as pkg-devel
has the correct PKGNAME anyway.
Now that UNIQUENAME is gone, OPTIONSFILE is too. (it's been called
OPTIONS_FILE now.)
Reviewed by: antoine, bapt
Exp-run by: antoine
Sponsored by: Absolight
Differential Revision: https://reviews.freebsd.org/D3336
Notes
Notes:
svn path=/head/; revision=394508
Diffstat (limited to 'ports-mgmt')
| -rw-r--r-- | ports-mgmt/pkg-devel/Makefile | 4 | ||||
| -rw-r--r-- | ports-mgmt/pkg/Makefile | 1 |
2 files changed, 0 insertions, 5 deletions
diff --git a/ports-mgmt/pkg-devel/Makefile b/ports-mgmt/pkg-devel/Makefile index 3f9f351b16f1..bc3e8594c64e 100644 --- a/ports-mgmt/pkg-devel/Makefile +++ b/ports-mgmt/pkg-devel/Makefile @@ -34,12 +34,10 @@ EXTRA_PATCHES= ${FILESDIR}/extra-patch-docs_pkg.8 .if defined(WITH_PKG) .if ${WITH_PKG} != devel -NO_LATEST_LINK= yes . if !defined(PACKAGE_BUILDING) IGNORE= WITH_PKG is not defined to 'devel', this version is the devel one . endif .else -LATEST_LINK= pkg PKGNAMESUFFIX= #define PKG_DEPENDS to nothing to avoid infinite loop looking for pkg :) PKG_DEPENDS= @@ -67,8 +65,6 @@ pre-everything:: .endif .endif -.else -LATEST_LINK= pkg-devel .endif .undef INSTALLS_DEPENDS diff --git a/ports-mgmt/pkg/Makefile b/ports-mgmt/pkg/Makefile index ad2917c69fa2..a5eb6dd3c3d2 100644 --- a/ports-mgmt/pkg/Makefile +++ b/ports-mgmt/pkg/Makefile @@ -37,7 +37,6 @@ MAKE_ARGS+= DEBUG_FLAGS="${DEBUG_FLAGS}" .if defined(WITH_PKG) .if ${WITH_PKG} == devel -NO_LATEST_LINK= yes IGNORE= WITH_PKG is defined to 'devel', this version is the stable one .endif .if exists(${LOCALBASE}/sbin/pkg_info) || exists(/usr/sbin/pkg_info) |