1 files changed, 1 insertions, 69 deletions
diff --git a/mk/pkgformat/pkg/install.mk b/mk/pkgformat/pkg/install.mk
index 7fcbc274ffb..82feab95165 100644
--- a/mk/pkgformat/pkg/install.mk
+++ b/mk/pkgformat/pkg/install.mk
@@ -1,75 +1,7 @@
-# $NetBSD: install.mk,v 1.1 2011/10/15 00:23:09 reed Exp $
-#
-# _pkgformat-check-conflicts:
-#	Checks for conflicts between the package and installed packages.
-#
-#	XXX: Needs WRKDIR.
-#
-# _pkgformat-check-installed:
-#	Checks if the package (or an older version of it) is already
-#	installed on the system.
-#
-#	XXX: Needs WRKDIR.
-#
-# _pkgformat-register:
-#	Populates the package database with the appropriate entries to
-#	register the package as being installed on the system.
+# $NetBSD: install.mk,v 1.2 2016/04/10 15:58:03 joerg Exp $
 #
 # _pkgformat-install-clean:
 #	Removes the state files from the run of an ``install'' target.
 #
 
-_pkgformat-check-conflicts: .PHONY error-check
-	${RUN}${RM} -f ${WRKDIR}/.CONFLICTS
-.for _conflict_ in ${CONFLICTS}
-	${RUN}								\
-	found="`${_PKG_BEST_EXISTS} ${_conflict_:Q} || ${TRUE}`";	\
-	case "$$found" in						\
-	"")	;;							\
-	*)	${ECHO} "$$found" >> ${WRKDIR}/.CONFLICTS ;;		\
-	esac
-.endfor
-	${RUN}								\
-	${TEST} -f ${WRKDIR}/.CONFLICTS || exit 0;			\
-	exec 1>${ERROR_DIR}/${.TARGET};					\
-	${ECHO} "${PKGNAME} conflicts with installed package(s):";	\
-	${CAT} ${WRKDIR}/.CONFLICTS | ${SED} -e "s|^|    |";		\
-	${ECHO} "They install the same files into the same place.";	\
-	${ECHO} "Please remove conflicts first with pkg_delete(1).";	\
-	${RM} -f ${WRKDIR}/.CONFLICTS
-
-_pkgformat-check-installed: .PHONY error-check
-	${RUN}								\
-	found="`${_PKG_BEST_EXISTS} ${PKGWILDCARD:Q} || ${TRUE}`";	\
-	${TEST} -n "$$found" || exit 0;					\
-	exec 1>${ERROR_DIR}/${.TARGET};					\
-	${ECHO} "$$found is already installed - perhaps an older version?"; \
-	${ECHO} "If so, you may use either of:";			\
-	${ECHO} "    - \"pkg_delete $$found\" and \"${MAKE} reinstall\""; \
-	${ECHO} "      to upgrade properly";				\
-	${ECHO} "    - \"${MAKE} update\" to rebuild the package and all"; \
-	${ECHO} "      of its dependencies";				\
-	${ECHO} "    - \"${MAKE} replace\" to replace only the package without"; \
-	${ECHO} "      re-linking dependencies, risking various problems."
-
-_REGISTER_DEPENDENCIES=							\
-	${PKGSRC_SETENV} PKG_DBDIR=${_PKG_DBDIR:Q}			\
-		AWK=${TOOLS_AWK:Q}					\
-	${SH} ${PKGSRCDIR}/mk/pkgformat/pkg/register-dependencies
-
-_pkgformat-register: .PHONY _pkgformat-generate-metadata ${_RDEPENDS_FILE}
-	@${STEP_MSG} "Registering installation for ${PKGNAME}"
-	${RUN}${RM} -fr ${_PKG_DBDIR}/${PKGNAME}
-	${RUN}${MKDIR} ${_PKG_DBDIR}/${PKGNAME}
-	${RUN}${CP} ${PKG_DB_TMPDIR}/* ${_PKG_DBDIR}/${PKGNAME}
-	${RUN}${PKG_ADMIN} add ${PKGNAME}
-	${RUN}								\
-	case ${_AUTOMATIC:Q}"" in					\
-	[yY][eE][sS])	${PKG_ADMIN} set automatic=yes ${PKGNAME} ;;	\
-	esac
-	${RUN}${_FULL_DEPENDS_CMD} |					\
-		${SORT} -u | ${_REGISTER_DEPENDENCIES} ${PKGNAME}
-	${RUN}${GREP} '^@pkgdir ' < ${_PKG_DBDIR}/${PKGNAME}/+CONTENTS | \
-	    while read tag dir; do ${MKDIR} ${PREFIX}/$$dir; done
-
 _pkgformat-install-clean: .PHONY _pkgformat-clean-metadata