updated initscripts and added a small patch to middleman makefile so it would install into the correct /etc/mman dir

6 files changed, 34 insertions, 19 deletions

diff --git a/net-www/middleman/Manifest b/net-www/middleman/Manifest
index 2cbab671f2ad..71c053c97192 100644
--- a/net-www/middleman/Manifest
+++ b/net-www/middleman/Manifest
@@ -1,9 +1,9 @@
-MD5 a49a72c0c63a64018fc8ce0ac9b00944 ChangeLog 2014
+MD5 ee1334cbef2fa2657fd08e27443e4cd0 ChangeLog 2014
 MD5 b3089a22f33a39676bb267f8d3d59c07 metadata.xml 1012
-MD5 6adb32fffba9995ceafda928ffa31805 middleman-1.9.1-r1.ebuild 1723
+MD5 77450e8a9ad00be169da280ae57b93ed middleman-1.9.1-r1.ebuild 1726
 MD5 df5573ffac22a594cfcb9998b7ba7b16 middleman-1.9.1.ebuild 1876
 MD5 5e7fe1fa845ace7e8f4d753e7770c2f1 files/digest-middleman-1.9.1 67
 MD5 5e7fe1fa845ace7e8f4d753e7770c2f1 files/digest-middleman-1.9.1-r1 67
 MD5 d36ec4253bc7ad3bf51972238274d107 files/middleman-1.9.1-makefile.patch 861
 MD5 5cca318658e1fe03d10adece2c8e4d42 files/conf.d/mman 108
-MD5 af5b130cd2db673f6498f7c2d4bc6340 files/init.d/mman 914
+MD5 adaeaa9a833c363e71229fd494f8df49 files/init.d/mman 914
diff --git a/net-www/middleman/files/digest-middleman-1.9 b/net-www/middleman/files/digest-middleman-1.9
deleted file mode 100644
index 73d683dd87c3..000000000000
--- a/net-www/middleman/files/digest-middleman-1.9
+++ /dev/null
@@ -1 +0,0 @@
-MD5 235302e462d9dfe833e9484d445089bf middleman-1.9.tar.gz 624685
diff --git a/net-www/middleman/files/digest-middleman-1.9.1-r1 b/net-www/middleman/files/digest-middleman-1.9.1-r1
new file mode 100644
index 000000000000..7bd129568f74
--- /dev/null
+++ b/net-www/middleman/files/digest-middleman-1.9.1-r1
@@ -0,0 +1 @@
+MD5 7bd8b8be6c23400aac22eecd86e27e23 middleman-1.9.1.tar.gz 626022
diff --git a/net-www/middleman/files/init.d/mman b/net-www/middleman/files/init.d/mman
index 3378e9cb7547..e500caf3d9ba 100644
--- a/net-www/middleman/files/init.d/mman
+++ b/net-www/middleman/files/init.d/mman
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/middleman/files/init.d/mman,v 1.1 2003/07/25 21:24:55 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/middleman/files/init.d/mman,v 1.2 2003/11/28 22:45:48 solar Exp $
 
 
 opts="depend checkconfig stop start"
@@ -11,9 +11,8 @@ depend() {
 }
 
 checkconfig() {
-	if [ ! -e /etc/mman/mman.conf ]; then
-		eerror "You need to create /etc/mman/mman.conf first."
-		eerror "An example can be found in /etc/mman/sample/mman.conf.sample"
+	if [ ! -e /etc/mman/config.xml ]; then
+		eerror "You need to create a /etc/mman/config.xml first."
 		return 1
 	fi
 }
@@ -26,10 +25,10 @@ stop() {
 }
 
 start() {
-	local myopts=""
-	[ -z "${CONFIG}" ] && myopts="${myopts} -c ${CONFIG}"
-	[ -z "${LOGFILE}" ] && myopts="${myopts} -l ${LOGFILE}"
-	[ -z "${LOGLEVEL}" ] && myopts="${myopts} -d ${LOGLEVEL}"
+	local myopts="-p /var/run/mman.pid"
+	[ "${CONFIG}" != ""  ] && myopts="${myopts} -c ${CONFIG}"
+	[ "${LOGFILE}"  != "" ] && myopts="${myopts} -l ${LOGFILE}"
+	[ "${LOGLEVEL}" != "" ] && myopts="${myopts} -d ${LOGLEVEL}"
 
 	ebegin "Starting mman"
 	start-stop-daemon --start --quiet --exec /usr/bin/mman -- ${myopts}
diff --git a/net-www/middleman/files/middleman-1.9.1-makefile.patch b/net-www/middleman/files/middleman-1.9.1-makefile.patch
new file mode 100644
index 000000000000..248dcfd34a71
--- /dev/null
+++ b/net-www/middleman/files/middleman-1.9.1-makefile.patch
@@ -0,0 +1,19 @@
+Index: Makefile.in
+===================================================================
+RCS file: /cvsroot/middle-man/middleman/Makefile.in,v
+retrieving revision 1.51
+diff -u -b -B -w -p -r1.51 Makefile.in
+--- Makefile.in	11 Sep 2003 14:13:42 -0000	1.51
++++ Makefile.in	28 Nov 2003 21:31:12 -0000
+@@ -63,9 +63,9 @@ distclean: clean
+ 
+ install:
+ 	$(STRIP) $(TARGET)
+-	$(INSTALL) -d $(DESTDIR)/$(bindir)/ $(DESTDIR)/$(sysconfdir)/$(TARGET)
++	$(INSTALL) -d $(DESTDIR)/$(bindir)/ $(DESTDIR)/$(sysconfdir)/
+ 	$(INSTALL) -m0711 $(TARGET) $(DESTDIR)/$(bindir)/
+-	$(INSTALL) -m0644 config.xml $(DESTDIR)/$(sysconfdir)/$(TARGET)/config.xml.sample
++	$(INSTALL) -m0644 config.xml $(DESTDIR)/$(sysconfdir)/config.xml.sample
+ 	$(INSTALL) -d $(DESTDIR)/$(mandir)/man8/
+ 	$(INSTALL) -m0644 man/mman.8 $(DESTDIR)/$(mandir)/man8/mman.8
+ 	$(INSTALL) -d $(DESTDIR)/var/cache/mman	
diff --git a/net-www/middleman/middleman-1.9.ebuild b/net-www/middleman/middleman-1.9.1-r1.ebuild
index 832dc969b193..63e715800c94 100644
--- a/net-www/middleman/middleman-1.9.ebuild
+++ b/net-www/middleman/middleman-1.9.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/middleman/middleman-1.9.ebuild,v 1.3 2003/11/10 02:05:08 zhen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/middleman/middleman-1.9.1-r1.ebuild,v 1.1 2003/11/28 22:45:48 solar Exp $
 
 inherit eutils
 
@@ -23,12 +23,9 @@ DEPEND="virtual/glibc
 
 src_unpack() {
 	unpack ${A}
-	[ -f ${FILESDIR}/${P}-gentoo.diff ] && epatch ${FILESDIR}/${P}-gentoo.diff
+	# [ -f ${FILESDIR}/${P}-gentoo.diff ] && epatch ${FILESDIR}/${P}-gentoo.diff
 	cd ${S}
-	if [ "$PV" = "1.9" ]; then
-		einfo "Patching Makefile.in to avoid sandbox problems"
-		sed -e s:"INSTALL) -d /var":"INSTALL) -d \$(DESTDIR)/var":g < Makefile.in > Makefile.out && mv Makefile.{out,in}
-	fi
+	epatch ${FILESDIR}/${PN}-1.9.1-makefile.patch
 }
 
 src_compile() {
@@ -48,8 +45,8 @@ src_compile() {
 
 src_install() {
 	cd ${S}
-	# mkdir -p ${D}/usr/share/man/man8/
 	make DESTDIR="${D}" install || die "einstall failed"
+	mv ${D}/etc/mman/config.xml{.sample,}
 
 	dodoc CHANGELOG COPYING
 	dohtml README.html