svn commit: r347113 - head/Mk

[Bryan Drewery]

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)