Removed dtc, extra-cmake-modules (already in base)

diff --git a/Makefile b/Makefile
index ada604c911539302a250c0c68c4d77ee742463ed..9be4bfac7d45600f741b697236b9bdd86001df15 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -634,7 +634,6 @@ SUBDIR+=    dscan
 SUBDIR+=       dsniff
 SUBDIR+=       dsniff-nox11
 SUBDIR+=       dssi
-SUBDIR+=       dtc
 SUBDIR+=       duali-data
 SUBDIR+=       duff
 SUBDIR+=       dumb
@@ -737,7 +736,6 @@ SUBDIR+=    exact-image
 SUBDIR+=       execline
 SUBDIR+=       exhume
 SUBDIR+=       expiretable
-SUBDIR+=       extra-cmake-modules
 SUBDIR+=       exult-snapshot
 SUBDIR+=       ez-pine-gpg
 SUBDIR+=       ezbounce

diff --git a/dtc/DESCR b/dtc/DESCR
deleted file mode 100644 (file)
index 3f2939f..0000000
--- a/dtc/DESCR
+++ /dev/null
@@ -1,7 +0,0 @@
-Device Tree Compiler (dtc) toolchain for working with device tree source and 
-binary files and libfdt, a utility library for reading and manipulating the
-binary format.
-
-Both DTC and LIBFDT are made available under the terms of the GNU GPLv2.
-LIBFDT also available under the terms of the BSD license. For more information
-see README.license in the source tree.

diff --git a/dtc/Makefile b/dtc/Makefile
deleted file mode 100644 (file)
index fcf27f7..0000000
--- a/dtc/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# $NetBSD$
-
-DISTNAME=      dtc-1.4.4
-CATEGORIES=    devel
-MASTER_SITES=  https://www.kernel.org/pub/software/utils/dtc/
-
-MAINTAINER=    joe.davis512@gmail.com
-HOMEPAGE=      http://devicetree.org/
-COMMENT=       Device Tree Compiler (dtc)
-LICENSE=       gnu-gpl-v2
-
-USE_TOOLS+=    gmake bison
-
-MAKE_FLAGS+=   PREFIX=${PREFIX}
-
-REPLACE_BASH+= dtdiff
-MAKE_FLAGS+=   DESTDIR=${DESTDIR}
-
-.include "../../mk/bsd.pkg.mk"

diff --git a/dtc/PLIST b/dtc/PLIST
deleted file mode 100644 (file)
index 551bd9c..0000000
--- a/dtc/PLIST
+++ /dev/null
@@ -1,14 +0,0 @@
-@comment $NetBSD$
-bin/convert-dtsv0
-bin/dtc
-bin/dtdiff
-bin/fdtdump
-bin/fdtget
-bin/fdtput
-include/fdt.h
-include/libfdt.h
-include/libfdt_env.h
-lib/libfdt-${PKGVERSION}.so
-lib/libfdt.a
-lib/libfdt.so
-lib/libfdt.so.1

diff --git a/dtc/distinfo b/dtc/distinfo
deleted file mode 100644 (file)
index 11f1f85..0000000
--- a/dtc/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD$
-
-SHA1 (dtc-1.4.4.tar.gz) = 014dc9fdd9a05a948af9c09899c567cf7d674b50
-RMD160 (dtc-1.4.4.tar.gz) = 2f3fe820e1f3ba0e93094f2a00e29add99fd0cc6
-SHA512 (dtc-1.4.4.tar.gz) = 98e090c34464b416b905510f8adce1568d840fb25e0096739051e5c33139e9c1df00a6c709f238a1f17e018ae477f7a91fb1c9eee029b14894cbfee689c086c8
-Size (dtc-1.4.4.tar.gz) = 155590 bytes

diff --git a/extra-cmake-modules/DESCR b/extra-cmake-modules/DESCR
deleted file mode 100644 (file)
index c5ce018..0000000
--- a/extra-cmake-modules/DESCR
+++ /dev/null
@@ -1,9 +0,0 @@
-Extra CMake Modules, or ECM, aims to augment CMake with additional modules.
-It serves as both a staging ground for new modules before they are moved
-upstream to CMake and a place for modules that, for whatever reason, are not
-a good fit for CMake itself.
-
-It is primarily driven by the needs of the KDE community, but it is hoped that
-other projects will find it useful, and outside contributions are always
-welcome. The main rule for new modules is that there must be at least two
-downstream users.

diff --git a/extra-cmake-modules/Makefile b/extra-cmake-modules/Makefile
deleted file mode 100644 (file)
index 4286455..0000000
--- a/extra-cmake-modules/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# $NetBSD: Makefile,v 1.1 2015/04/11 12:34:09 krytarowski Exp $
-
-DISTNAME=      extra-cmake-modules-5.9.0
-CATEGORIES=    devel
-MASTER_SITES=  http://download.kde.org/stable/frameworks/5.9/
-EXTRACT_SUFX=  .tar.xz
-
-MAINTAINER=    pkgsrc-users@NetBSD.org
-HOMEPAGE=      https://projects.kde.org/projects/kdesupport/extra-cmake-modules
-COMMENT=       Extra modules and scripts for CMake
-LICENSE=       modified-bsd
-
-USE_CMAKE=     yes
-
-.include "../../x11/qt5-qttools/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"

diff --git a/extra-cmake-modules/PLIST b/extra-cmake-modules/PLIST
deleted file mode 100644 (file)
index be47411..0000000
--- a/extra-cmake-modules/PLIST
+++ /dev/null
@@ -1,43 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2015/04/11 12:34:09 krytarowski Exp $
-share/ECM/cmake/ECMConfig.cmake
-share/ECM/cmake/ECMConfigVersion.cmake
-share/ECM/find-modules/ECMFindModuleHelpersStub.cmake
-share/ECM/find-modules/FindEGL.cmake
-share/ECM/find-modules/FindKF5.cmake
-share/ECM/find-modules/FindLibGit2.cmake
-share/ECM/find-modules/FindOpenEXR.cmake
-share/ECM/find-modules/FindPng2Ico.cmake
-share/ECM/find-modules/FindQtWaylandScanner.cmake
-share/ECM/find-modules/FindSharedMimeInfo.cmake
-share/ECM/find-modules/FindWayland.cmake
-share/ECM/find-modules/FindWaylandScanner.cmake
-share/ECM/find-modules/FindX11_XCB.cmake
-share/ECM/find-modules/FindXCB.cmake
-share/ECM/kde-modules/KDECMakeSettings.cmake
-share/ECM/kde-modules/KDECompilerSettings.cmake
-share/ECM/kde-modules/KDEFrameworkCompilerSettings.cmake
-share/ECM/kde-modules/KDEInstallDirs.cmake
-share/ECM/modules/ECMAddAppIcon.cmake
-share/ECM/modules/ECMAddTests.cmake
-share/ECM/modules/ECMCoverageOption.cmake
-share/ECM/modules/ECMCreateQmFromPoFiles.cmake
-share/ECM/modules/ECMEnableSanitizers.cmake
-share/ECM/modules/ECMFindModuleHelpers.cmake
-share/ECM/modules/ECMGenerateHeaders.cmake
-share/ECM/modules/ECMGeneratePkgConfigFile.cmake
-share/ECM/modules/ECMGeneratePriFile.cmake
-share/ECM/modules/ECMInstallIcons.cmake
-share/ECM/modules/ECMMarkAsTest.cmake
-share/ECM/modules/ECMMarkNonGuiExecutable.cmake
-share/ECM/modules/ECMOptionalAddSubdirectory.cmake
-share/ECM/modules/ECMPackageConfigHelpers.cmake
-share/ECM/modules/ECMPoQmTools.cmake
-share/ECM/modules/ECMQmLoader.cpp.in
-share/ECM/modules/ECMQueryQmake.cmake
-share/ECM/modules/ECMSetupVersion.cmake
-share/ECM/modules/ECMUninstallTarget.cmake
-share/ECM/modules/ECMUseFindModules.cmake
-share/ECM/modules/ECMVersionHeader.h.in
-share/ECM/modules/ecm_uninstall.cmake.in
-share/ECM/toolchain/Android.cmake
-share/ECM/toolchain/deployment-file.json.in

diff --git a/extra-cmake-modules/buildlink3.mk b/extra-cmake-modules/buildlink3.mk
deleted file mode 100644 (file)
index 43a6ff2..0000000
--- a/extra-cmake-modules/buildlink3.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.1 2015/04/11 12:36:52 krytarowski Exp $
-
-BUILDLINK_TREE+=       extra-cmake-modules
-
-.if !defined(EXTRA_CMAKE_MODULES_BUILDLINK3_MK)
-EXTRA_CMAKE_MODULES_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.extra-cmake-modules+=    extra-cmake-modules>=5.9.0
-BUILDLINK_PKGSRCDIR.extra-cmake-modules?=      ../../wip/extra-cmake-modules
-
-.include "../../x11/qt5-qttools/buildlink3.mk"
-.endif # EXTRA_CMAKE_MODULES_BUILDLINK3_MK
-
-BUILDLINK_TREE+=       -extra-cmake-modules

diff --git a/extra-cmake-modules/distinfo b/extra-cmake-modules/distinfo
deleted file mode 100644 (file)
index 8953d5a..0000000
--- a/extra-cmake-modules/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.1 2015/04/11 12:34:09 krytarowski Exp $
-
-SHA1 (extra-cmake-modules-5.9.0.tar.xz) = bbfc5d9ec13e88454f6da8c527d9bb83453bcb85
-RMD160 (extra-cmake-modules-5.9.0.tar.xz) = f5907691006f6aa722a654ee31fdd34f09384a26
-Size (extra-cmake-modules-5.9.0.tar.xz) = 130148 bytes

diff --git a/qtaccountsservice/Makefile b/qtaccountsservice/Makefile
index 6016a27b65a02ba4edfa134bf499fd0104a3f589..6a6e2dd39fdfc6a2986a3acc20cde771259efe18 100644 (file)
--- a/qtaccountsservice/Makefile
+++ b/qtaccountsservice/Makefile
@@ -13,5 +13,5 @@ LICENSE=      gnu-gpl-v2 AND gnu-lgpl-v2.1 AND gnu-fdl-v1.3
 USE_CMAKE=     yes
 USE_LANGUAGES= c c++
 
-.include "../../wip/extra-cmake-modules/buildlink3.mk"
+.include "../../devel/extra-cmake-modules/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

diff --git a/u-boot-full/Makefile b/u-boot-full/Makefile
index 97df1494658bb15730ae3eb62a398304c662a1d1..ee38b699765cdbc3ca2f98f264f728d6d6a07499 100644 (file)
--- a/u-boot-full/Makefile
+++ b/u-boot-full/Makefile
@@ -16,7 +16,7 @@ USE_TOOLS+=   gmake pkg-config
 USE_LANGUAGES= c c++
 
 # Require the linux device tree compiler
-BUILD_DEPENDS= dtc>=1.4.1:../../wip/dtc
+BUILD_DEPENDS= dtc>=1.4.1:../../sysutils/dtc
 AUTO_MKDIRS=   yes
 
 .include "../../mk/bsd.prefs.mk"