From owner-svn-ports-head@FreeBSD.ORG  Mon Apr 22 22:13:15 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id D4751EA;
 Mon, 22 Apr 2013 22:13:15 +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 C70051917;
 Mon, 22 Apr 2013 22:13:15 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r3MMDFRS026887;
 Mon, 22 Apr 2013 22:13:15 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r3MMDFec026886;
 Mon, 22 Apr 2013 22:13:15 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201304222213.r3MMDFec026886@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Mon, 22 Apr 2013 22:13:15 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r316281 - 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 22:13:15 -0000

Author: bapt
Date: Mon Apr 22 22:13:14 2013
New Revision: 316281
URL: http://svnweb.freebsd.org/changeset/ports/316281

Log:
  Remove old links while creating the new packages
  Force creation of the symlink for pkgng to avoid failure if the link already exists
  
  Submitted by:	ohauer@

Modified:
  head/Mk/bsd.pkgng.mk

Modified: head/Mk/bsd.pkgng.mk
==============================================================================
--- head/Mk/bsd.pkgng.mk	Mon Apr 22 22:06:34 2013	(r316280)
+++ head/Mk/bsd.pkgng.mk	Mon Apr 22 22:13:14 2013	(r316281)
@@ -258,6 +258,9 @@ do-package: ${TMPPLIST}
 			fi; \
 		fi; \
 	fi;
+	@for cat in ${CATEGORIES}; do \
+		${RM} -fv ${PACKAGES}/$$cat/${PKGNAMEPREFIX}${PORTNAME}*${PKG_SUFX} ; \
+	done
 	@if ${PKG_CREATE} -o ${PKGREPOSITORY} ${PKGNAME}; then \
 		if [ "${PKGORIGIN}" = "ports-mgmt/pkg" ]; then \
 			if [ ! -d ${PKGLATESTREPOSITORY} ]; then \
@@ -266,7 +269,7 @@ do-package: ${TMPPLIST}
 					exit 1; \
 				fi; \
 			fi ; \
-			${LN} -s ../${PKGREPOSITORYSUBDIR}/${PKGNAME}${PKG_SUFX} ${PKGLATESTFILE} ; \
+			${LN} -sf ../${PKGREPOSITORYSUBDIR}/${PKGNAME}${PKG_SUFX} ${PKGLATESTFILE} ; \
 		fi; \
 	else \
 		cd ${.CURDIR} && eval ${MAKE} delete-package; \