From f14c1fc5515445840d2fbe3350cff0c03eae0b55 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 29 May 2014 11:40:49 +0200 Subject: resolve merge conflict --- package/pptpd/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/pptpd') diff --git a/package/pptpd/Makefile b/package/pptpd/Makefile index 5934d24e6..1e76579c7 100644 --- a/package/pptpd/Makefile +++ b/package/pptpd/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= pptpd PKG_VERSION:= 1.3.4 PKG_RELEASE:= 2 PKG_MD5SUM:= b38df9c431041922c997c1148bedf591 -PKG_DESCR:= Point-to-Point Tunneling Protocol (PPTP) server -PKG_SECTION:= ppp +PKG_DESCR:= point-to-point tunneling protocol server +PKG_SECTION:= net/ppp PKG_DEPENDS:= ppp PKG_URL:= http://www.poptop.org/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=poptop/} -- cgit v1.2.3