Date: Fri, 3 Jan 2014 23:05:38 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r338592 - head/Mk Message-ID: <201401032305.s03N5chd091583@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401032305.s03N5chd091583>