4 files changed, 18 insertions, 19 deletions
diff --git a/package/subversion/Makefile b/package/subversion/Makefile
index 85807565f..88bd980cb 100644
--- a/package/subversion/Makefile
+++ b/package/subversion/Makefile
@@ -9,12 +9,18 @@ PKG_NAME:=		subversion
 PKG_VERSION:=		1.6.2
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		93f128306b11e1a1c64ff51338777952
-PKG_DEPENDS:=		zlib, apr, apr-util, libiconv, libexpat
-MASTER_SITES:=		http://subversion.tigris.org/downloads/
+PKG_DESCR:=		revision control program
+PKG_SECTION:=		net
+PKG_DEPENDS:=		zlib apr apr-util libiconv libexpat
+PKG_SITES:=		http://subversion.tigris.org/downloads/
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,SUBVERSION,$(PKG_NAME),${PKG_VERSION}-${PKG_RELEASE}))
+ifeq ($(ADK_PACKAGE_SUBVERSION_NEON),y)
+PKG_DEPENDS+=		neon
+endif
+
+$(eval $(call PKG_template,SUBVERSION,$(PKG_NAME),${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIGURE_STYLE:=	gnu
 CONFIGURE_ARGS+=	--with-apr=${STAGING_DIR}/usr/bin/apr-config
@@ -34,7 +40,6 @@ LIBS= 			-laprutil-0 -lapr-0 -lexpat -liconv
 ifeq ($(ADK_PACKAGE_SUBVERSION_NEON),y)
 CONFIGURE_ARGS+=	-disable-neon-version-check
 LIBS+=			-lneon
-PKG_DEPENDS:=		${PKG_DEPENDS}, neon
 else
 CONFIGURE_ARGS+=	--without-neon
 endif
@@ -50,12 +55,8 @@ INSTALL_STYLE:=		auto
 INSTALL_TARGET:=	external-install local-install
 
 post-install:
-	${INSTALL_DIR} ${IDIR_SUBVERSION}/etc/init.d
-	${INSTALL_SCRIPT} files/svnserve.init \
-	    ${IDIR_SUBVERSION}/etc/init.d/svnserve
 	${INSTALL_DIR} ${IDIR_SUBVERSION}/usr/{bin,lib}
 	${CP} ${WRKINST}/usr/bin/* ${IDIR_SUBVERSION}/usr/bin
 	${CP} ${WRKINST}/usr/lib/* ${IDIR_SUBVERSION}/usr/lib
-	echo 'Depends: ${PKG_DEPENDS}' >> ${IDIR_SUBVERSION}/CONTROL/control
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/subversion/ipkg/subversion.postinst b/package/subversion/files/subversion.postinst
index ac45645d6..ac45645d6 100644
--- a/package/subversion/ipkg/subversion.postinst
+++ b/package/subversion/files/subversion.postinst
diff --git a/package/subversion/files/svnserve.init b/package/subversion/files/svnserve.init
index 5350a257c..a52fdb43a 100644
--- a/package/subversion/files/svnserve.init
+++ b/package/subversion/files/svnserve.init
@@ -1,14 +1,16 @@
 #!/bin/sh
-#FWINIT 80
+#PKG subversion
+#INIT 80
+
 . /etc/rc.conf
 
 case $1 in
-(autostop) ;;
-(autostart)
+autostop) ;;
+autostart)
 	[[ $svnserve = YES ]] || exit 0
 	exec sh $0 start
 	;;
-(start)
+start)
 	if [[ ! -d $svnserve_path ]]; then
 		echo "The subversion repository ($svnserve_path) does not exist."
 		echo "Create a new repository and/or change the path in /etc/rc.conf"
@@ -22,14 +24,14 @@ case $1 in
 
 	/usr/bin/svnserve -d -r $svnserve_path
 	;;
-(stop)
+stop)
 	killall svnserve
 	;;
-(restart)
+restart)
 	sh $0 stop
 	sh $0 start
 	;;
-(*)
+*)
 	echo "Usage: $0 {start|stop|restart}"
 	;;
 esac
diff --git a/package/subversion/ipkg/subversion.control b/package/subversion/ipkg/subversion.control
deleted file mode 100644
index fb66b78f1..000000000
--- a/package/subversion/ipkg/subversion.control
+++ /dev/null
@@ -1,4 +0,0 @@
-Package: subversion
-Priority: optional
-Section: net
-Description: revision control program