Version bump + modifications not to depend on hardcoded /bin/install; see bug #171035

Package-Manager: portage-2.1.2.2

8 files changed, 87 insertions, 107 deletions

diff --git a/www-servers/bozohttpd/ChangeLog b/www-servers/bozohttpd/ChangeLog
index 1c1fd0fe49a9..daceb032d0a4 100644
--- a/www-servers/bozohttpd/ChangeLog
+++ b/www-servers/bozohttpd/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for www-servers/bozohttpd
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/bozohttpd/ChangeLog,v 1.6 2007/04/01 13:07:06 bangert Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/bozohttpd/ChangeLog,v 1.7 2007/04/19 09:33:11 s4t4n Exp $
+
+*bozohttpd-20060517 (19 Apr 2007)
+
+  19 Apr 2007; Michele Noberasco <s4t4n@gentoo.org> bozohttpd-20060517.ebuild:
+  Version bump, see bug #171035.
+  bozohttpd-20050410.ebuild, bozohttpd-20040823.ebuild:
+  Update Makefile and installation handling so that there is no dependancy on hardcoded
+  /bin/install
 
   01 Apr 2007; Thilo Bangert <bangert@gentoo.org>
   files/bozohttpd-20050410.Makefile:
diff --git a/www-servers/bozohttpd/Manifest b/www-servers/bozohttpd/Manifest
index 43e92f46516f..f1698f7bfe23 100644
--- a/www-servers/bozohttpd/Manifest
+++ b/www-servers/bozohttpd/Manifest
@@ -2,14 +2,6 @@ AUX bozohttpd-20040823.patch 409 RMD160 069b63af3c3fe2030b25a107daa3221e192edf25
 MD5 e5b17810911c15b6cf6b237a88707d7f files/bozohttpd-20040823.patch 409
 RMD160 069b63af3c3fe2030b25a107daa3221e192edf25 files/bozohttpd-20040823.patch 409
 SHA256 bff6c1d7125552d196652cf2cae055b1fedae91c1ffe2dff4bfdcd7f8e566f0f files/bozohttpd-20040823.patch 409
-AUX bozohttpd-20050410.Makefile 657 RMD160 b09dd800184212a9838c97f6e9d4ec9fa7d58aef SHA1 5720a9d6483aedbf6a316dead13ef803820edc34 SHA256 fe2348390d5a162de72e573480e18485e71cab2703e991acb8215b9239ea2115
-MD5 4843e029eea17018f3216584352e0f79 files/bozohttpd-20050410.Makefile 657
-RMD160 b09dd800184212a9838c97f6e9d4ec9fa7d58aef files/bozohttpd-20050410.Makefile 657
-SHA256 fe2348390d5a162de72e573480e18485e71cab2703e991acb8215b9239ea2115 files/bozohttpd-20050410.Makefile 657
-AUX bozohttpd.Makefile 558 RMD160 9daf80513f173acee6fa0bb7a8c199750b044fa1 SHA1 17ce8eb7019c15724aecc510c066abefb0fcbecc SHA256 e0e5c6bf929b7d490ec793e53b77185c53b6260caa9d1a4e1142686be5be58b8
-MD5 a03d8b709e4f73e324d499a91dcd00a9 files/bozohttpd.Makefile 558
-RMD160 9daf80513f173acee6fa0bb7a8c199750b044fa1 files/bozohttpd.Makefile 558
-SHA256 e0e5c6bf929b7d490ec793e53b77185c53b6260caa9d1a4e1142686be5be58b8 files/bozohttpd.Makefile 558
 AUX bozohttpd.conffile 218 RMD160 1ddeabccac411c889fe65d0c0b8da5e3cc0596bb SHA1 332f91550aed4fb025ec5a3560c169f7690d3b4e SHA256 fb44fd86b49072559f4f6ffab13e9e4e8ce62eda1b29cb6214042c4a697baaf4
 MD5 b87f6a7e77eb9397384dbd2e0ad33aaf files/bozohttpd.conffile 218
 RMD160 1ddeabccac411c889fe65d0c0b8da5e3cc0596bb files/bozohttpd.conffile 218
@@ -20,18 +12,23 @@ RMD160 abc49b53bcc13f36a685e7a8d95667af5a848afc files/bozohttpd.initscript 1063
 SHA256 36aa0b599157d9a5a6795594bebf5396717a094436235817c3cdf7d208dcf98b files/bozohttpd.initscript 1063
 DIST bozohttpd-20040823.tar.bz2 30906 RMD160 3d3177e5d6d6106b3518d217b4593445f902854f SHA1 215c7adb685d55fa3a91c3dc14a7ad1f3140e90a SHA256 6ed86cd739025dc3f5fb73127ada0a25fd967b8e9e3fbaef9ddc4ae892aa45d5
 DIST bozohttpd-20050410.tar.bz2 36882 RMD160 f3221c5311d9befeb65e729e597d8ef076527381 SHA1 4bc9e54f34b6b9943af09b881242361e065c4054 SHA256 166311c81563b6f0f5f4cce94a47f2b4cb0f568c32eca18090fe624d85853408
-EBUILD bozohttpd-20040823.ebuild 1121 RMD160 5d6c002e00196dff3d0700ae051714fd79529186 SHA1 cb96fbef98b8806e67ac4ead0db5bed117faf53f SHA256 720583c3d3792426aaf16da0d55bb345e0712005d03cff24675f363649e2bfc0
-MD5 a922dba561cfb8bde1499170f39b43ed bozohttpd-20040823.ebuild 1121
-RMD160 5d6c002e00196dff3d0700ae051714fd79529186 bozohttpd-20040823.ebuild 1121
-SHA256 720583c3d3792426aaf16da0d55bb345e0712005d03cff24675f363649e2bfc0 bozohttpd-20040823.ebuild 1121
-EBUILD bozohttpd-20050410.ebuild 988 RMD160 a7ec66efc7b4183bbe596a2ebcabf93ffb13d32d SHA1 cc06af1109f5094e6425982174ddbda9fdc0a093 SHA256 2e9080dfeb41be0e96e2be2701e1a42fb1d10dcfa1bc4b5ee67b7e31ea75d924
-MD5 a4829512a2d08502061eaef45f666672 bozohttpd-20050410.ebuild 988
-RMD160 a7ec66efc7b4183bbe596a2ebcabf93ffb13d32d bozohttpd-20050410.ebuild 988
-SHA256 2e9080dfeb41be0e96e2be2701e1a42fb1d10dcfa1bc4b5ee67b7e31ea75d924 bozohttpd-20050410.ebuild 988
-MISC ChangeLog 1729 RMD160 e50171d40f4a8b385d3e0543f888f20bba9ace23 SHA1 12c0737c845aaaa67dfcf8332b8f1ab17abc4835 SHA256 46ff2826f641e23eb26c885036c909a7fde738b8cad920ceaba369777e405f6e
-MD5 6aedd6485f1a5cc6df727f4b8d70c731 ChangeLog 1729
-RMD160 e50171d40f4a8b385d3e0543f888f20bba9ace23 ChangeLog 1729
-SHA256 46ff2826f641e23eb26c885036c909a7fde738b8cad920ceaba369777e405f6e ChangeLog 1729
+DIST bozohttpd-20060517.tar.bz2 33032 RMD160 edf15fe2998ca2fae0035f8380639e8741d0406a SHA1 45ed3c268fffc884db93ebc975121b7c79060fa8 SHA256 6b87c6d762f0100e0c32eb5fbd7ac33ab174ee7646a9b6787b9a79bf1f739bff
+EBUILD bozohttpd-20040823.ebuild 1000 RMD160 6e15c225ed035fa8b56c9afeb3cf09e6462d5864 SHA1 f6d03c76e13a27368f627567f26c3b060d75da29 SHA256 13ec4b472b4fffe5fe968f00b1b3ba8f8a13f568056ece20e7029e650bafa486
+MD5 84672619355f236ab9b57844e067acb8 bozohttpd-20040823.ebuild 1000
+RMD160 6e15c225ed035fa8b56c9afeb3cf09e6462d5864 bozohttpd-20040823.ebuild 1000
+SHA256 13ec4b472b4fffe5fe968f00b1b3ba8f8a13f568056ece20e7029e650bafa486 bozohttpd-20040823.ebuild 1000
+EBUILD bozohttpd-20050410.ebuild 868 RMD160 0a1e5b795bac18eb3366df2701d0eb464f965765 SHA1 8ec1008adebd4c7c931823529bbbd511800ef598 SHA256 74d74f5452ab3e9d17fe5c689721bf1d12a4a869ac05a9e0456671aa988c5a40
+MD5 a12d7f3ebf6877c3d1895e1c8e44e1ab bozohttpd-20050410.ebuild 868
+RMD160 0a1e5b795bac18eb3366df2701d0eb464f965765 bozohttpd-20050410.ebuild 868
+SHA256 74d74f5452ab3e9d17fe5c689721bf1d12a4a869ac05a9e0456671aa988c5a40 bozohttpd-20050410.ebuild 868
+EBUILD bozohttpd-20060517.ebuild 956 RMD160 edbffe6d2a3365e2d9546a8ceefd125a594bf5e0 SHA1 38a87d50e4ccb06ad040e1ecbe178aa5f89b7e14 SHA256 9e1301d419241a4ce0c2dc09dd9a4f3efa2778ac729acd36782e2dc49820116e
+MD5 5a24973292a73ade81a64d79344fd217 bozohttpd-20060517.ebuild 956
+RMD160 edbffe6d2a3365e2d9546a8ceefd125a594bf5e0 bozohttpd-20060517.ebuild 956
+SHA256 9e1301d419241a4ce0c2dc09dd9a4f3efa2778ac729acd36782e2dc49820116e bozohttpd-20060517.ebuild 956
+MISC ChangeLog 2034 RMD160 303e5712585e827ab530a7e42aa3a53c959ce079 SHA1 05252b72e2070ae610675988cd5b51821c937e0e SHA256 b8c3d8fdc40ab67d2727b9f5700bb675c0b542e866c863249d9a3ed4c29189d1
+MD5 7e6fd9131f493d8ea2a3be01242e1af9 ChangeLog 2034
+RMD160 303e5712585e827ab530a7e42aa3a53c959ce079 ChangeLog 2034
+SHA256 b8c3d8fdc40ab67d2727b9f5700bb675c0b542e866c863249d9a3ed4c29189d1 ChangeLog 2034
 MISC metadata.xml 404 RMD160 5bcbbea14017ea4bef784b7fc9885d9538acb54d SHA1 da10000ad3159effe65575095c0ec2aed27a9f19 SHA256 68bdd816d78892899f994144dcbcd3eefe2ae841cdbb0972843ae9ea0b22ac89
 MD5 8e648ecfc12f5c28f8e15b1e90444b55 metadata.xml 404
 RMD160 5bcbbea14017ea4bef784b7fc9885d9538acb54d metadata.xml 404
@@ -42,3 +39,6 @@ SHA256 3e6e67134f12f95897b6d0e119f2f999911e0b6f53f1a0baa60fc79f535909d3 files/di
 MD5 e9785b36bfed04a778e8280283a56d08 files/digest-bozohttpd-20050410 256
 RMD160 22e4aef31fe029084ad43d7c6f7967b529fe3291 files/digest-bozohttpd-20050410 256
 SHA256 7f175332e5063f051567ab1bb1430b96bc7efc2ed901f9a0f25e98feb295259a files/digest-bozohttpd-20050410 256
+MD5 75440a72c2f9d220d6f847fd1139b561 files/digest-bozohttpd-20060517 256
+RMD160 133edd6694d40ad094ac94bb3263ff02917ba8ba files/digest-bozohttpd-20060517 256
+SHA256 36a13c739c9c0712aa2eba27bd859c8fb5c2e6727bdcded32deae62bc677c1bb files/digest-bozohttpd-20060517 256
diff --git a/www-servers/bozohttpd/bozohttpd-20040823.ebuild b/www-servers/bozohttpd/bozohttpd-20040823.ebuild
index 36e0fdbf3246..3f241bd1e831 100644
--- a/www-servers/bozohttpd/bozohttpd-20040823.ebuild
+++ b/www-servers/bozohttpd/bozohttpd-20040823.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/bozohttpd/bozohttpd-20040823.ebuild,v 1.2 2005/09/16 07:06:28 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/bozohttpd/bozohttpd-20040823.ebuild,v 1.3 2007/04/19 09:33:11 s4t4n Exp $
 
 inherit eutils
 
@@ -16,11 +16,10 @@ DEPEND=">=dev-libs/openssl-0.9.7d-r1"
 src_unpack()
 {
 	unpack ${A}
-
-	# We substitute the Makefile because the original works only with BSD make
 	cd ${S}
-	rm -f Makefile
-	cp ${FILESDIR}/${PN}.Makefile Makefile
+
+	# Rename Makefile
+	mv Makefile.boot Makefile
 
 	# Apparently, support for '-a' cmd line arg was removed, but left in
 	# 'bozohpptd -h' explanations
@@ -29,9 +28,8 @@ src_unpack()
 
 src_install ()
 {
-	dodir usr/bin
-	dodir usr/share/man
-	PREFIX="${D}/usr" einstall || die
+	dobin bozohttpd
+	doman bozohttpd.8
 
 	insinto /etc/conf.d; newins ${FILESDIR}/${PN}.conffile   bozohttpd
 	exeinto /etc/init.d; newexe ${FILESDIR}/${PN}.initscript bozohttpd
diff --git a/www-servers/bozohttpd/bozohttpd-20050410.ebuild b/www-servers/bozohttpd/bozohttpd-20050410.ebuild
index d3c9515e8cc5..ac45190e0d8c 100644
--- a/www-servers/bozohttpd/bozohttpd-20050410.ebuild
+++ b/www-servers/bozohttpd/bozohttpd-20050410.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/bozohttpd/bozohttpd-20050410.ebuild,v 1.1 2005/09/16 07:06:28 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/bozohttpd/bozohttpd-20050410.ebuild,v 1.2 2007/04/19 09:33:11 s4t4n Exp $
 
 inherit eutils
 
@@ -16,18 +16,16 @@ DEPEND=">=dev-libs/openssl-0.9.7d-r1"
 src_unpack()
 {
 	unpack ${A}
-
-	# We substitute the Makefile because the original works only with BSD make
 	cd ${S}
-	rm -f Makefile
-	cp ${FILESDIR}/${P}.Makefile Makefile
+
+	# Rename Makefile
+	mv Makefile.boot Makefile
 }
 
 src_install ()
 {
-	dodir usr/bin
-	dodir usr/share/man
-	PREFIX="${D}/usr" einstall || die
+	dobin bozohttpd
+	doman bozohttpd.8
 
 	insinto /etc/conf.d; newins ${FILESDIR}/${PN}.conffile   bozohttpd
 	exeinto /etc/init.d; newexe ${FILESDIR}/${PN}.initscript bozohttpd
diff --git a/www-servers/bozohttpd/bozohttpd-20060517.ebuild b/www-servers/bozohttpd/bozohttpd-20060517.ebuild
new file mode 100644
index 000000000000..70b71c6e1230
--- /dev/null
+++ b/www-servers/bozohttpd/bozohttpd-20060517.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/bozohttpd/bozohttpd-20060517.ebuild,v 1.1 2007/04/19 09:33:11 s4t4n Exp $
+
+inherit eutils
+
+DESCRIPTION="bozohttpd is a small and secure http server"
+HOMEPAGE="http://www.eterna.com.au/bozohttpd/"
+SRC_URI="http://www.eterna.com.au/bozohttpd/${P}.tar.bz2"
+KEYWORDS="~x86 ~ppc"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+DEPEND=">=dev-libs/openssl-0.9.8d
+	>=sys-apps/sed-4.1.5"
+
+src_unpack()
+{
+	unpack ${A}
+	cd ${S}
+
+	# Rename Makefile
+	mv Makefile.boot Makefile
+
+	# Make it honour Gentoo CFLAGS
+	sed -ie "s/-O/${CFLAGS}/" Makefile
+}
+
+src_install ()
+{
+	dobin bozohttpd
+	doman bozohttpd.8
+
+	insinto /etc/conf.d; newins ${FILESDIR}/${PN}.conffile   bozohttpd
+	exeinto /etc/init.d; newexe ${FILESDIR}/${PN}.initscript bozohttpd
+}
+
+pkg_postinst()
+{
+	einfo "Remember to edit /etc/conf.d/bozohttpd to suit your needs."
+}
diff --git a/www-servers/bozohttpd/files/bozohttpd-20050410.Makefile b/www-servers/bozohttpd/files/bozohttpd-20050410.Makefile
deleted file mode 100644
index 035d36f7c01f..000000000000
--- a/www-servers/bozohttpd/files/bozohttpd-20050410.Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-ifndef MANDIR
-	MANDIR = share/man/man8
-endif
-ifndef PREFIX
-	PREFIX = /usr/local
-endif
-ifndef CC
-	CC     = gcc
-endif
-ifndef INSTALL
-	INSTALL = /bin/install
-endif
-
-SRCS = bozohttpd.c auth-bozo.c cgi-bozo.c content-bozo.c daemon-bozo.c dir-index-bozo.c ssl-bozo.c tilde-luzah-bozo.c
-OBJ  = bozohttpd
-
-all: bozohttpd
-
-bozohttpd:
-	$(CC) $(CFLAGS) -o $(OBJ) $(SRCS) -lssl -lcrypto
-
-clean:
-	rm -f $(OBJ)
-	rm -f *~
-
-install::	bozohttpd
-	mkdir -p $(PREFIX)/bin
-	$(INSTALL) -s -m 755 $(OBJ) $(PREFIX)/bin
-	$(INSTALL) -d $(PREFIX)/$(MANDIR)
-	$(INSTALL) -m 644 $(OBJ).8 $(PREFIX)/$(MANDIR)
-
-uninstall::
-	-rm -f $(PREFIX)/bin/$(OBJ)
-	-rm -f $(PREFIX)/$(MANDIR)/$(OBJ).8
diff --git a/www-servers/bozohttpd/files/bozohttpd.Makefile b/www-servers/bozohttpd/files/bozohttpd.Makefile
deleted file mode 100644
index 6259c3a2a71a..000000000000
--- a/www-servers/bozohttpd/files/bozohttpd.Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-ifndef MANDIR
-	MANDIR = share/man/man8
-endif
-ifndef PREFIX
-	PREFIX = /usr/local
-endif
-ifndef CC
-	CC     = gcc
-endif
-ifndef INSTALL
-	INSTALL = /bin/install
-endif
-
-SRCS = bozohttpd.c
-OBJ  = bozohttpd
-
-all: bozohttpd
-
-bozohttpd:
-	$(CC) $(CFLAGS) -o $(OBJ) $(SRCS) -lssl -lcrypto
-
-clean:
-	rm -f $(OBJ)
-	rm -f *~
-
-install::	bozohttpd
-	mkdir -p $(PREFIX)/bin
-	$(INSTALL) -s -m 755 $(OBJ) $(PREFIX)/bin
-	$(INSTALL) -d $(PREFIX)/$(MANDIR)
-	$(INSTALL) -m 644 $(OBJ).8 $(PREFIX)/$(MANDIR)
-
-uninstall::
-	-rm -f $(PREFIX)/bin/$(OBJ)
-	-rm -f $(PREFIX)/$(MANDIR)/$(OBJ).8
diff --git a/www-servers/bozohttpd/files/digest-bozohttpd-20060517 b/www-servers/bozohttpd/files/digest-bozohttpd-20060517
new file mode 100644
index 000000000000..b28a23f9d6f8
--- /dev/null
+++ b/www-servers/bozohttpd/files/digest-bozohttpd-20060517
@@ -0,0 +1,3 @@
+MD5 75b9b57bb56ecdbfac2f5d024080b226 bozohttpd-20060517.tar.bz2 33032
+RMD160 edf15fe2998ca2fae0035f8380639e8741d0406a bozohttpd-20060517.tar.bz2 33032
+SHA256 6b87c6d762f0100e0c32eb5fbd7ac33ab174ee7646a9b6787b9a79bf1f739bff bozohttpd-20060517.tar.bz2 33032