From owner-svn-ports-head@FreeBSD.ORG  Fri Jan  3 23:05:38 2014
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])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 9EF628CC;
 Fri,  3 Jan 2014 23:05:38 +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 714131A32;
 Fri,  3 Jan 2014 23:05:38 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s03N5cHW091585;
 Fri, 3 Jan 2014 23:05:38 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s03N5chd091583;
 Fri, 3 Jan 2014 23:05:38 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201401032305.s03N5chd091583@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Fri, 3 Jan 2014 23:05:38 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r338592 - 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.17
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: Fri, 03 Jan 2014 23:05:38 -0000

Author: bapt
Date: Fri Jan  3 23:05:37 2014
New Revision: 338592
URL: http://svnweb.freebsd.org/changeset/ports/338592

Log:
  Remove more now useless fallback targets

Modified:
  head/Mk/bsd.licenses.mk
  head/Mk/bsd.pkgng.mk

Modified: head/Mk/bsd.licenses.mk
==============================================================================
--- head/Mk/bsd.licenses.mk	Fri Jan  3 23:01:01 2014	(r338591)
+++ head/Mk/bsd.licenses.mk	Fri Jan  3 23:05:37 2014	(r338592)
@@ -766,9 +766,6 @@ install-license:
 	@${ECHO_CMD} "@dirrm ${_LICENSE_DIR_REL}" >> ${TMPPLIST}
 	@${ECHO_CMD} "@unexec rmdir %D/share/licenses 2>/dev/null || true" >> ${TMPPLIST}
 
-.else
-install-license:
-	@${DO_NADA}
 .endif
 
 .else	# !LICENSE

Modified: head/Mk/bsd.pkgng.mk
==============================================================================
--- head/Mk/bsd.pkgng.mk	Fri Jan  3 23:01:01 2014	(r338591)
+++ head/Mk/bsd.pkgng.mk	Fri Jan  3 23:05:37 2014	(r338592)
@@ -119,8 +119,8 @@ STAGE_ARGS=		-l
 STAGE_ARGS=		-i ${STAGEDIR}
 .endif
 
-fake-pkg: create-manifest
 .if !defined(NO_PKG_REGISTER)
+fake-pkg: create-manifest
 .if defined(INSTALLS_DEPENDS)
 	@${ECHO_MSG} "===>   Registering installation for ${PKGNAME} as automatic"
 .else
@@ -132,8 +132,6 @@ fake-pkg: create-manifest
 	@${SETENV} FORCE_POST="${_FORCE_POST_PATTERNS}" ${PKG_CMD} ${STAGE_ARGS} -m ${METADIR} -f ${TMPPLIST}
 .endif
 	@${RM} -rf ${METADIR}
-.else
-	@${DO_NADA}
 .endif
 .endif
 
@@ -272,8 +270,8 @@ do-package: ${TMPPLIST}
 
 .if defined(WITH_PKGNG)
 .if !target(check-already-installed)
-check-already-installed:
 .if !defined(NO_PKG_REGISTER) && !defined(FORCE_PKG_REGISTER)
+check-already-installed:
 		@${ECHO_MSG} "===>  Checking if ${PKGORIGIN} already installed"; \
 		pkgname=`${PKG_INFO} -q -O ${PKGORIGIN}`; \
 		if [ -n "$${pkgname}" ]; then \
@@ -290,8 +288,6 @@ check-already-installed:
 			${ECHO_MSG} "      in your environment or the \"make install\" command line."; \
 			exit 1; \
 		fi
-.else
-	@${DO_NADA}
 .endif
 .endif