From 21a283f3bec444388d1448f993783ec673a06502 Mon Sep 17 00:00:00 2001 From: Mathieu Arnold Date: Mon, 17 Aug 2015 14:20:40 +0000 Subject: 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 --- ports-mgmt/pkg-devel/Makefile | 4 ---- 1 file changed, 4 deletions(-) (limited to 'ports-mgmt/pkg-devel') 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 -- cgit v1.2.3