From f14c1fc5515445840d2fbe3350cff0c03eae0b55 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 29 May 2014 11:40:49 +0200
Subject: resolve merge conflict

---
 package/file/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'package/file/Makefile')

diff --git a/package/file/Makefile b/package/file/Makefile
index 398d4e4b0..7b47a6530 100644
--- a/package/file/Makefile
+++ b/package/file/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:=		5.17
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		e19c47e069ced7b01ccb4db402cc01d3
 PKG_DESCR:=		file type guesser
-PKG_SECTION:=		utils
+PKG_SECTION:=		sys/utils
 PKG_BUILDDEP:=		file-host
 PKG_DEPENDS:=		libmagic
 PKG_URL:=		http://www.darwinsys.com/file
@@ -21,7 +21,7 @@ DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
 PKG_SUBPKGS:=		FILE LIBMAGIC
 PKGSD_LIBMAGIC:=	file type guesser library
-PKGSC_LIBMAGIC:=	libs
+PKGSC_LIBMAGIC:=	libs/misc
 
 ifeq ($(ADK_STATIC),y)
 PKG_OPTS+=		libmix
-- 
cgit v1.2.3