From 6d6c88be4e73684fa6416a632fcf25d7c22a1d17 Mon Sep 17 00:00:00 2001
From: Stephen Walker <stephendwalker@gmail.com>
Date: Sat, 30 Jan 2010 23:29:11 +0000
Subject: [PATCH 1/1] [packages] dmapd: update to 0.0.21 (#6516)

SVN-Revision: 19434
---
 net/dmapd/Makefile                     | 31 ++++++++++++++++----------
 net/dmapd/files/dmapd.init             |  6 ++---
 net/dmapd/patches/001-dmapd_conf.patch | 10 +++++++++
 3 files changed, 32 insertions(+), 15 deletions(-)
 create mode 100644 net/dmapd/patches/001-dmapd_conf.patch

diff --git a/net/dmapd/Makefile b/net/dmapd/Makefile
index f4c1bc410d..3b6da3a53d 100644
--- a/net/dmapd/Makefile
+++ b/net/dmapd/Makefile
@@ -1,13 +1,21 @@
+#
+# Copyright (C) 2009-2010 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dmapd
-PKG_VERSION:=0.0.19
-PKG_RELEASE:=2
-PKG_SOURCE:=dmapd-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://www.flyn.org/projects/dmapd/
-PKG_MD5SUM:=24ead9b689d569abd87fa055625a8356
+PKG_VERSION:=0.0.21
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=http://www.flyn.org/projects/dmapd
+PKG_MD5SUM:=f9ce3f4222dc7918257d3a4e53b7a462
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/dmapd-$(PKG_VERSION)
+PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -23,17 +31,16 @@ define Package/dmapd/decription
 	Dmapd is a DMAP server
 endef
 
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		all install
+define Package/dmapd/conffiles
+/etc/dmapd.conf
 endef
 
 define Package/dmapd/install
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_CONF) $(PKG_BUILD_DIR)/distro/dmapd.conf $(1)/etc/
 	$(INSTALL_BIN) ./files/dmapd.init $(1)/etc/init.d/dmapd
-	$(INSTALL_DIR) $(1)/usr/lib/dmapd/$(PKG_VERSION)/modules/
+	$(INSTALL_DIR) $(1)/usr/lib/dmapd/$(PKG_VERSION)/modules
 	$(CP) \
 		$(PKG_INSTALL_DIR)/usr/sbin/dmapd \
 		$(1)/usr/sbin/
@@ -42,7 +49,7 @@ define Package/dmapd/install
 		$(1)/usr/lib/
 	$(CP) \
 		$(PKG_INSTALL_DIR)/usr/lib/dmapd/$(PKG_VERSION)/modules/*.so \
-		$(1)/usr/lib/dmapd/$(PKG_VERSION)/modules
+		$(1)/usr/lib/dmapd/$(PKG_VERSION)/modules/
 endef
 
 $(eval $(call BuildPackage,dmapd))
diff --git a/net/dmapd/files/dmapd.init b/net/dmapd/files/dmapd.init
index 9f6c024f68..b565397a41 100644
--- a/net/dmapd/files/dmapd.init
+++ b/net/dmapd/files/dmapd.init
@@ -1,5 +1,5 @@
 #!/bin/sh /etc/rc.common
-# Copyright (C) 2009 OpenWrt.org
+# Copyright (C) 2009-2010 OpenWrt.org
 
 START=60
 
@@ -7,8 +7,8 @@ start() {
 	mkdir -p /var/cache/dmapd/
 	mkdir -p /var/run/dmapd/
 	mkdir -p /var/lock/subsys/
-	
-	/usr/sbin/dmapd -m /var/db/BigDisk/Storage/Music/ -p /var/db/BigDisk/Storage/Pictures
+
+	/usr/sbin/dmapd
 }
 
 stop() {
diff --git a/net/dmapd/patches/001-dmapd_conf.patch b/net/dmapd/patches/001-dmapd_conf.patch
new file mode 100644
index 0000000000..8300feec85
--- /dev/null
+++ b/net/dmapd/patches/001-dmapd_conf.patch
@@ -0,0 +1,10 @@
+--- a/distro/dmapd.conf
++++ b/distro/dmapd.conf
+@@ -1,6 +1,6 @@
+ [General]
+ # Name that will be used to identify share:
+-Share-Name=dmapd
++Share-Name=OpenWrt
+ 
+ # User that dmapd will run as, current user if undefined:
+ # User=dmapd
-- 
2.30.2