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/libxslt/Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'package/libxslt')

diff --git a/package/libxslt/Makefile b/package/libxslt/Makefile
index 291590908..5cc1b17c7 100644
--- a/package/libxslt/Makefile
+++ b/package/libxslt/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:=		libxslt
 PKG_VERSION:=		1.1.28
 PKG_RELEASE:=		2
 PKG_MD5SUM:=		9667bf6f9310b957254fdcf6596600b7
-PKG_DESCR:=		XSLT Library
-PKG_SECTION:=		libs
+PKG_DESCR:=		xslt Library
+PKG_SECTION:=		libs/data
 PKG_DEPENDS:=		libxml2 libstdcxx
 PKG_BUILDDEP:=		autotool libxml2
 HOST_BUILDDEP:=		libxml2-host
@@ -20,7 +20,7 @@ DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
 PKG_SUBPKGS:=		LIBXSLT XSLTPROC
 PKGSD_XSLTPROC:=	XSLT processor utility
-PKGSC_XSLTPROC:=	misc
+PKGSC_XSLTPROC:=	sys/misc
 
 ifeq ($(ADK_STATIC),y)
 PKG_OPTS+=		libmix
-- 
cgit v1.2.3