Update moss to 0.1.8. Patch submitted by Yongbin Yu, the maintainer.

Changes since 0.1.2:
  * Add options for pidfile/no-pidfile, user/group, and auth-file.
  * Store password's MD5 instead of plain text.

4 files changed, 111 insertions, 22 deletions

diff --git a/audio/moss/Makefile b/audio/moss/Makefile
index df34f41cb96..6e7084c2551 100644
--- a/audio/moss/Makefile
+++ b/audio/moss/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2004/08/13 15:09:58 minskim Exp $
+# $NetBSD: Makefile,v 1.3 2004/08/17 15:50:30 minskim Exp $
 
-DISTNAME=	moss-0.1.2
+DISTNAME=	moss-0.1.8
 CATEGORIES=	audio
-MASTER_SITES=	http://kldp.net/download.php/1377/
+MASTER_SITES=	http://kldp.net/download.php/1434/
 
 MAINTAINER=	yongbin@yongbin.com
 HOMEPAGE=	http://moss.kldp.net/
@@ -15,7 +15,7 @@ USE_BUILDLINK3=	yes
 USE_PKGINSTALL= yes
 
 PYTHON_VERSIONS_ACCEPTED=	23pth 22pth 21pth
-PYTHON_PATCH_SCRIPTS=		${WRKSRC}/*.py
+PYTHON_PATCH_SCRIPTS=	${WRKSRC}/*.py
 
 RCD_SCRIPTS=	moss
 CONF_FILES=	${PREFIX}/share/moss/moss.conf.sample	\
@@ -25,7 +25,8 @@ SUBST_CLASSES+=		path
 SUBST_MESSAGE.path=	"Fixing hardcoded paths."
 SUBST_STAGE.path=	post-patch
 SUBST_FILES.path=	moss.conf.sample
-SUBST_SED.path=		-e 's,/usr/local,${PREFIX},g' -e 's,/var,${VARBASE},g'
+SUBST_SED.path=		-e 's,$${prefix}/var,${VARBASE},g'	\
+			-e 's,$${prefix}/share,${PREFIX}/share,g'
 
 FILES_SUBST+=	INTERPRETER=${PYTHONBIN}
 
diff --git a/audio/moss/PLIST b/audio/moss/PLIST
index f4330f29e9d..89279ce9477 100644
--- a/audio/moss/PLIST
+++ b/audio/moss/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/08/10 06:48:21 minskim Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/08/17 15:50:30 minskim Exp $
 bin/moss
 ${PYSITELIB}/moss/__init__.py
 ${PYSITELIB}/moss/__init__.pyc
@@ -15,6 +15,9 @@ ${PYSITELIB}/moss/live.pyo
 ${PYSITELIB}/moss/moss.py
 ${PYSITELIB}/moss/moss.pyc
 ${PYSITELIB}/moss/moss.pyo
+${PYSITELIB}/moss/mkpasswd.py
+${PYSITELIB}/moss/mkpasswd.pyc
+${PYSITELIB}/moss/mkpasswd.pyo
 ${PYSITELIB}/moss/template.py
 ${PYSITELIB}/moss/template.pyc
 ${PYSITELIB}/moss/template.pyo
@@ -27,6 +30,7 @@ share/moss/images/file.gif
 share/moss/images/play.gif
 share/moss/images/root.gif
 share/moss/moss.conf.sample
+share/moss/mkpasswd.py
 share/moss/templates/default.tmpl
 @dirrm share/moss/templates
 @dirrm share/moss/images
diff --git a/audio/moss/distinfo b/audio/moss/distinfo
index addc4ee6b36..b658ec16dda 100644
--- a/audio/moss/distinfo
+++ b/audio/moss/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2004/08/10 06:48:21 minskim Exp $
+$NetBSD: distinfo,v 1.2 2004/08/17 15:50:30 minskim Exp $
 
-SHA1 (moss-0.1.2.tar.gz) = 1743987723035bbf150e5d1b59b81b5863ed1ab4
-Size (moss-0.1.2.tar.gz) = 40202 bytes
-SHA1 (patch-aa) = f343abfda298951268a0f834e55a26be1f2228fc
+SHA1 (moss-0.1.8.tar.gz) = 285058af55ffd58aef52e7a005a4d3d030c92ec2
+Size (moss-0.1.8.tar.gz) = 43295 bytes
+SHA1 (patch-aa) = 4eb7c5e0d3dc5a8c47d11284017f30fd798cb54c
diff --git a/audio/moss/patches/patch-aa b/audio/moss/patches/patch-aa
index de6a409cf1a..cc4e49c9efb 100644
--- a/audio/moss/patches/patch-aa
+++ b/audio/moss/patches/patch-aa
@@ -1,15 +1,99 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/08/10 06:48:21 minskim Exp $
+$NetBSD: patch-aa,v 1.2 2004/08/17 15:50:30 minskim Exp $
 
---- setup.py.orig	2004-08-07 00:35:08.000000000 +0900
+--- setup.py.orig	2004-08-10 17:56:30.000000000 +0900
 +++ setup.py
-@@ -47,8 +47,8 @@ class my_install_data(install_data):
- 			print "creating %s" % os.path.join(self.install_dir, "etc")
- 			os.mkdir(os.path.join(self.install_dir, "etc"))
- 		
--		print "copying moss.conf.sample -> %s" % os.path.join(self.install_dir, "etc/moss.conf")
--		shutil.copyfile("moss.conf.sample", os.path.join(self.install_dir, "etc/moss.conf"))
-+		#print "copying moss.conf.sample -> %s" % os.path.join(self.install_dir, "etc/moss.conf")
-+		#shutil.copyfile("moss.conf.sample", os.path.join(self.install_dir, "etc/moss.conf"))
- 		print "changing permission %s to 0755" % (os.path.join(installed_lib_dir, "moss/moss.py"))
- 		os.chmod(os.path.join(installed_lib_dir, "moss/moss.py"), 0755)
+@@ -42,50 +42,50 @@ class my_install_data(install_data):
+ 		global installed_lib_dir
+ 		install_data.finalize_options(self)
  		
+-		if not os.path.isdir(os.path.join(self.install_dir, "etc")):
+-			print "creating %s" % os.path.join(self.install_dir, "etc")
+-			os.mkdir(os.path.join(self.install_dir, "etc"))
+-	
+-		if not os.path.isfile(os.path.join(self.install_dir, "etc/moss.conf")):
+-			print "creating %s" % os.path.join(self.install_dir, "etc/moss.conf")
+-		
+-			src = open("moss.conf.sample", "r")
+-			dest = open(os.path.join(self.install_dir, "etc/moss.conf"), "w")
+-
+-			for line in src.readlines():
+-				if line.find("${prefix}") != -1:
+-					line = line.replace("${prefix}", self.install_dir)
+-	
+-				dest.write(line)
+-
+-			src.close()
+-			dest.close()
+-		else:
+-			if self.force:
+-				print "creating %s" % os.path.join(self.install_dir, "etc/moss.conf")
+-			
+-				src = open("moss.conf.sample", "r")
+-				dest = open(os.path.join(self.install_dir, "etc/moss.conf"), "w")
+-
+-				for line in src.readlines():
+-					if line.find("${prefix}") != -1:
+-						line = line.replace("${prefix}", self.install_dir)
+-		
+-					dest.write(line)
+-
+-				src.close()
+-				dest.close()
+-					
+-		if not os.path.isdir(os.path.join(self.install_dir, "var")):
+-			os.mkdir(os.path.join(self.install_dir, "var"))
+-		
+-		if not os.path.isdir(os.path.join(self.install_dir, "var/log")):
+-			print "creating %s" % os.path.join(self.install_dir, "var/log")
+-			os.mkdir(os.path.join(self.install_dir, "var/log"))
+-
+-		if not os.path.isdir(os.path.join(self.install_dir, "var/run")):
+-			print "creating %s" % os.path.join(self.install_dir, "var/run")
+-			os.mkdir(os.path.join(self.install_dir, "var/run"))
++#		if not os.path.isdir(os.path.join(self.install_dir, "etc")):
++#			print "creating %s" % os.path.join(self.install_dir, "etc")
++#			os.mkdir(os.path.join(self.install_dir, "etc"))
++#	
++#		if not os.path.isfile(os.path.join(self.install_dir, "etc/moss.conf")):
++#			print "creating %s" % os.path.join(self.install_dir, "etc/moss.conf")
++#		
++#			src = open("moss.conf.sample", "r")
++#			dest = open(os.path.join(self.install_dir, "etc/moss.conf"), "w")
++#
++#			for line in src.readlines():
++#				if line.find("${prefix}") != -1:
++#					line = line.replace("${prefix}", self.install_dir)
++#	
++#				dest.write(line)
++#
++#			src.close()
++#			dest.close()
++#		else:
++#			if self.force:
++#				print "creating %s" % os.path.join(self.install_dir, "etc/moss.conf")
++#			
++#				src = open("moss.conf.sample", "r")
++#				dest = open(os.path.join(self.install_dir, "etc/moss.conf"), "w")
++#
++#				for line in src.readlines():
++#					if line.find("${prefix}") != -1:
++#						line = line.replace("${prefix}", self.install_dir)
++#		
++#					dest.write(line)
++#
++#				src.close()
++#				dest.close()
++#					
++#		if not os.path.isdir(os.path.join(self.install_dir, "var")):
++#			os.mkdir(os.path.join(self.install_dir, "var"))
++#		
++#		if not os.path.isdir(os.path.join(self.install_dir, "var/log")):
++#			print "creating %s" % os.path.join(self.install_dir, "var/log")
++#			os.mkdir(os.path.join(self.install_dir, "var/log"))
++#
++#		if not os.path.isdir(os.path.join(self.install_dir, "var/run")):
++#			print "creating %s" % os.path.join(self.install_dir, "var/run")
++#			os.mkdir(os.path.join(self.install_dir, "var/run"))
+ 
+ 		if not os.path.isdir(os.path.join(self.install_dir, "share")):
+ 			os.mkdir(os.path.join(self.install_dir, "share"))