From e8bcf403016d9035ed1d67ca9f9dcd52275d5825 Mon Sep 17 00:00:00 2001
From: bapt <bapt@FreeBSD.org>
Date: Thu, 18 Sep 2014 13:11:36 +0000
Subject: Fix WITH_PKGNG=devel backward compatibility

---
 Mk/bsd.port.mk | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'Mk/bsd.port.mk')

diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
index cd663d931fd3..d9f3ac71cbab 100644
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -1529,6 +1529,12 @@ CD_MOUNTPTS?=	/cdrom ${CD_MOUNTPT}
 WWWOWN?=	www
 WWWGRP?=	www
 
+# Keep PKGNG_ORIGIN/WITH_PKGNG for compat with scripts which are looking for it
+PKG_ORIGIN?=	ports-mgmt/pkg
+PKGNG_ORIGIN=	${PKG_ORIGIN}
+WITH_PKGNG?=	yes
+WITH_PKG?=	${WITH_PKGNG}
+
 .endif
 # End of pre-makefile section.
 
@@ -1663,12 +1669,6 @@ LIB32DIR=	lib
 .endif
 PLIST_SUB+=	LIB32DIR=${LIB32DIR}
 
-# Keep PKGNG_ORIGIN/WITH_PKGNG for compat with scripts which are looking for it
-PKG_ORIGIN?=	ports-mgmt/pkg
-PKGNG_ORIGIN=	${PKG_ORIGIN}
-WITH_PKGNG?=	yes
-WITH_PKG?=	${WITH_PKGNG}
-
 .if ${WITH_PKG} == devel
 PKG_ORIGIN=		ports-mgmt/pkg-devel
 .endif
-- 
cgit