From owner-p4-projects@FreeBSD.ORG  Tue Aug  8 10:58:30 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 8CD3A16A4DF; Tue,  8 Aug 2006 10:58:30 +0000 (UTC)
X-Original-To: perforce@FreeBSD.org
Delivered-To: perforce@FreeBSD.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 688E016A4DA
	for <perforce@FreeBSD.org>; Tue,  8 Aug 2006 10:58:30 +0000 (UTC)
	(envelope-from gabor@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 2574043D53
	for <perforce@FreeBSD.org>; Tue,  8 Aug 2006 10:58:30 +0000 (GMT)
	(envelope-from gabor@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k78AwUD2076299
	for <perforce@FreeBSD.org>; Tue, 8 Aug 2006 10:58:30 GMT
	(envelope-from gabor@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k78AwTcX076293
	for perforce@freebsd.org; Tue, 8 Aug 2006 10:58:30 GMT
	(envelope-from gabor@FreeBSD.org)
Date: Tue, 8 Aug 2006 10:58:30 GMT
Message-Id: <200608081058.k78AwTcX076293@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	gabor@FreeBSD.org using -f
From: Gabor Kovesdan <gabor@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 103435 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 08 Aug 2006 10:58:30 -0000

http://perforce.freebsd.org/chv.cgi?CH=103435

Change 103435 by gabor@gabor_spitfire on 2006/08/08 10:58:11

	Fix errors when FORCE_PKG_REGISTER is set when doing make package.
	
	Reported by:	lofi

Affected files ...

.. //depot/projects/soc2006/gabor_ports/Mk/bsd.port.mk#75 edit

Differences ...

==== //depot/projects/soc2006/gabor_ports/Mk/bsd.port.mk#75 (text+ko) ====

@@ -5162,13 +5162,13 @@
 	fi
 	@${RM} -rf ${PKG_DBDIR}/${PKGNAME}
 .endif
-.if !exists(${PKG_DBDIR}/${PKGNAME})
-.if !defined(DESTDIR)
-		@${ECHO_MSG} "===>   Registering installation for ${PKGNAME}"
-.else
-		@${ECHO_MSG} "===>   Registering installation for ${PKGNAME} in ${DESTDIR}"
-.endif
-		@${MKDIR} ${PKG_DBDIR}/${PKGNAME}; \
+	@if [ ! -d ${PKG_DBDIR}/${PKGNAME} ]; then \
+		if [ -z "${DESTDIR}" ] ; then \
+			${ECHO_CMD} "===>   Registering installation for ${PKGNAME}"; \
+		else \
+			${ECHO_MSG} "===>   Registering installation for ${PKGNAME} in ${DESTDIR}"; \
+		fi; \
+		${MKDIR} ${PKG_DBDIR}/${PKGNAME}; \
 		${PKG_CMD} ${PKG_ARGS} -O ${PKGFILE} > ${PKG_DBDIR}/${PKGNAME}/+CONTENTS; \
 		${CP} ${DESCR} ${PKG_DBDIR}/${PKGNAME}/+DESC; \
 		${ECHO_CMD} ${COMMENT:Q} > ${PKG_DBDIR}/${PKGNAME}/+COMMENT; \
@@ -5191,8 +5191,8 @@
 					${ECHO_CMD} ${PKGNAME} >> ${PKG_DBDIR}/$$dep/+REQUIRED_BY; \
 				fi; \
 			fi; \
-		done
-.endif
+		done; \
+	fi
 .if !defined(NO_MTREE)
 	@if [ -f ${MTREE_FILE} ]; then \
 		${CP} ${MTREE_FILE} ${PKG_DBDIR}/${PKGNAME}/+MTREE_DIRS; \