From owner-svn-ports-head@FreeBSD.ORG  Mon Apr 22 15:51:08 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 70934AF6;
 Mon, 22 Apr 2013 15:51:08 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 6326A1296;
 Mon, 22 Apr 2013 15:51:08 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r3MFp8qC003106;
 Mon, 22 Apr 2013 15:51:08 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r3MFp8YA003105;
 Mon, 22 Apr 2013 15:51:08 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201304221551.r3MFp8YA003105@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Mon, 22 Apr 2013 15:51:08 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r316243 - 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-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 22 Apr 2013 15:51:08 -0000

Author: bapt
Date: Mon Apr 22 15:51:07 2013
New Revision: 316243
URL: http://svnweb.freebsd.org/changeset/ports/316243

Log:
  LATEST_LINK makes no sense with pkgng
  
  Remove any symlink and category in the packages directory when using WITH_PKGNG.
  Only keep links for pkg itself (to allow bootstrap)

Modified:
  head/Mk/bsd.pkgng.mk

Modified: head/Mk/bsd.pkgng.mk
==============================================================================
--- head/Mk/bsd.pkgng.mk	Mon Apr 22 15:44:41 2013	(r316242)
+++ head/Mk/bsd.pkgng.mk	Mon Apr 22 15:51:07 2013	(r316243)
@@ -259,8 +259,14 @@ do-package: ${TMPPLIST}
 		fi; \
 	fi;
 	@if ${PKG_CREATE} -o ${PKGREPOSITORY} ${PKGNAME}; then \
-		if [ -d ${PACKAGES} ]; then \
-			cd ${.CURDIR} && eval ${MAKE} package-links; \
+		if [ "${PKGORIGIN}" = "ports-mgmt/pkg" ]; then \
+			if [ ! -d ${PKGLATESTREPOSITORY} ]; then \
+				if ! ${MKDIR} ${PKGLATESTREPOSITORY}; then \
+					${ECHO_MSG} "=> Can't create directory ${PKGLATESTREPOSITORY}."; \
+					exit 1; \
+				fi; \
+			fi ; \
+			${LN} -s ../${PKGREPOSITORYSUBDIR}/${PKGNAME}${PKG_SUFX} ${PKGLATESTFILE} ; \
 		fi; \
 	else \
 		cd ${.CURDIR} && eval ${MAKE} delete-package; \