From owner-svn-ports-all@FreeBSD.ORG  Wed Mar  5 13:53:52 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 085416F8;
 Wed,  5 Mar 2014 13:53:52 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id CF64FBC9;
 Wed,  5 Mar 2014 13:53:51 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s25DrpUn025773;
 Wed, 5 Mar 2014 13:53:51 GMT (envelope-from bdrewery@svn.freebsd.org)
Received: (from bdrewery@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s25DrpQf025772;
 Wed, 5 Mar 2014 13:53:51 GMT (envelope-from bdrewery@svn.freebsd.org)
Message-Id: <201403051353.s25DrpQf025772@svn.freebsd.org>
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Wed, 5 Mar 2014 13:53:51 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r347113 - head/Mk
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 05 Mar 2014 13:53:52 -0000

Author: bdrewery
Date: Wed Mar  5 13:53:51 2014
New Revision: 347113
URL: http://svnweb.freebsd.org/changeset/ports/347113
QAT: https://qat.redports.org/buildarchive/r347113/

Log:
  - Remove redundant WITH_PKGNG checks. bsd.pkgng.mk is only included if
    it is defined.
  
  With hat:	portmgr
  Discussed with:	bapt

Modified:
  head/Mk/bsd.pkgng.mk

Modified: head/Mk/bsd.pkgng.mk
==============================================================================
--- head/Mk/bsd.pkgng.mk	Wed Mar  5 13:51:57 2014	(r347112)
+++ head/Mk/bsd.pkgng.mk	Wed Mar  5 13:53:51 2014	(r347113)
@@ -136,7 +136,6 @@ fake-pkg: create-manifest
 .endif
 .endif
 
-.if defined(WITH_PKGNG)
 .if !target(check-build-conflicts)
 check-build-conflicts:
 .if ( defined(CONFLICTS) || defined(CONFLICTS_BUILD) ) && !defined(DISABLE_CONFLICTS) && !defined(DEFER_CONFLICTS_CHECK)
@@ -228,7 +227,6 @@ check-install-conflicts:
 .endif # defined(DEFER_CONFLICTS_CHECK)
 .endif
 .endif
-.endif
 
 .if !target(do-package)
 .if !defined(NO_STAGE)
@@ -248,28 +246,21 @@ do-package: ${TMPPLIST}
 		${RM} -f ${PACKAGES}/$$cat/${PKGNAMEPREFIX}${PORTNAME}*${PKG_SUFX} ; \
 	done
 	@if ${SETENV} FORCE_POST="${_FORCE_POST_PATTERNS}" ${PKG_CREATE} ${PKG_CREATE_ARGS} -o ${PKGREPOSITORY} ${PKGNAME}; then \
-		if [ -n "${WITH_PKGNG}" ]; then \
-			if [ "${PKGORIGIN}" = "ports-mgmt/pkg" -o "${PKGORIGIN}" = "ports-mgmt/pkg-devel" ]; then \
-				if [ ! -d ${PKGLATESTREPOSITORY} ]; then \
-					if ! ${MKDIR} ${PKGLATESTREPOSITORY}; then \
-						${ECHO_MSG} "=> Can't create directory ${PKGLATESTREPOSITORY}."; \
-						exit 1; \
-					fi; \
-				fi ; \
-				${LN} -sf ../${PKGREPOSITORYSUBDIR}/${PKGNAME}${PKG_SUFX} ${PKGLATESTFILE} ; \
-			fi; \
-		else \
-			if [ -d ${PACKAGES} ]; then \
-				cd ${.CURDIR} && eval ${MAKE} package-links; \
-			fi; \
-		fi ; \
+		  if [ "${PKGORIGIN}" = "ports-mgmt/pkg" -o "${PKGORIGIN}" = "ports-mgmt/pkg-devel" ]; then \
+			  if [ ! -d ${PKGLATESTREPOSITORY} ]; then \
+				  if ! ${MKDIR} ${PKGLATESTREPOSITORY}; then \
+					  ${ECHO_MSG} "=> Can't create directory ${PKGLATESTREPOSITORY}."; \
+					  exit 1; \
+				  fi; \
+			  fi ; \
+			  ${LN} -sf ../${PKGREPOSITORYSUBDIR}/${PKGNAME}${PKG_SUFX} ${PKGLATESTFILE} ; \
+		  fi; \
 	else \
 		cd ${.CURDIR} && eval ${MAKE} delete-package; \
 		exit 1; \
 	fi
 .endif
 
-.if defined(WITH_PKGNG)
 .if !target(check-already-installed)
 .if !defined(NO_PKG_REGISTER) && !defined(FORCE_PKG_REGISTER)
 check-already-installed:
@@ -312,6 +303,5 @@ deinstall:
 	@${RM} -f ${INSTALL_COOKIE} ${PACKAGE_COOKIE}
 .endif
 .endif
-.endif
 
 .endif # defined(_POSTMKINCLUDED)