summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThilo Bangert <bangert@gentoo.org>2011-01-30 19:20:04 +0000
committerThilo Bangert <bangert@gentoo.org>2011-01-30 19:20:04 +0000
commit21702e758e55d36d303760bb178c1ae4ed07ea28 (patch)
tree01d5994d730c295a2f64df36d7103e217f041115 /www-servers/fnord
parentalpha/ia64/sparc stable wrt #348987 (diff)
downloadgentoo-2-21702e758e55d36d303760bb178c1ae4ed07ea28.tar.gz
gentoo-2-21702e758e55d36d303760bb178c1ae4ed07ea28.tar.bz2
gentoo-2-21702e758e55d36d303760bb178c1ae4ed07ea28.zip
remove unused file
(Portage version: 2.2.0_alpha19/cvs/Linux i686)
Diffstat (limited to 'www-servers/fnord')
-rw-r--r--www-servers/fnord/ChangeLog5
-rw-r--r--www-servers/fnord/files/fnord-1.8-gentoo.diff96
2 files changed, 4 insertions, 97 deletions
diff --git a/www-servers/fnord/ChangeLog b/www-servers/fnord/ChangeLog
index b5bd85e613ef..83d88eb748eb 100644
--- a/www-servers/fnord/ChangeLog
+++ b/www-servers/fnord/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for www-servers/fnord
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/fnord/ChangeLog,v 1.22 2011/01/29 23:16:27 bangert Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/fnord/ChangeLog,v 1.23 2011/01/30 19:20:04 bangert Exp $
+
+ 30 Jan 2011; Thilo Bangert <bangert@gentoo.org> -files/fnord-1.8-gentoo.diff:
+ remove unused file
29 Jan 2011; Thilo Bangert <bangert@gentoo.org> fnord-1.10-r1.ebuild,
fnord-1.10-r2.ebuild:
diff --git a/www-servers/fnord/files/fnord-1.8-gentoo.diff b/www-servers/fnord/files/fnord-1.8-gentoo.diff
deleted file mode 100644
index 147e7ab485b9..000000000000
--- a/www-servers/fnord/files/fnord-1.8-gentoo.diff
+++ /dev/null
@@ -1,96 +0,0 @@
-diff --exclude='*~' -urN fnord-1.8.orig/fnord-conf fnord-1.8/fnord-conf
---- fnord-1.8.orig/fnord-conf 2005-03-06 22:45:55.181287400 -0500
-+++ fnord-1.8/fnord-conf 2005-03-06 22:46:13.049571008 -0500
-@@ -17,7 +17,7 @@
- mkdir -p $dir
- echo "#!/bin/sh" > $dir/run
- echo "cd $webroot" >> $dir/run
--echo "exec tcpserver -u $acct -RHl localhost ${myip:-0} 80 /command/fnord-httpd 2>&1" >> $dir/run
-+echo "exec tcpserver -u $acct -RHl localhost ${myip:-0} 80 /usr/bin/fnord 2>&1" >> $dir/run
- chmod 755 $dir/run
-
- # tell old daemontools that it should spawn a log process, too
-diff --exclude='*~' -urN fnord-1.8.orig/httpd.c fnord-1.8/httpd.c
---- fnord-1.8.orig/httpd.c 2005-03-06 22:45:55.181287400 -0500
-+++ fnord-1.8/httpd.c 2005-03-06 22:48:01.591070192 -0500
-@@ -25,7 +25,9 @@
- #include "scan.h"
-
- /* uncomment the following line to enable support for CGI */
--// #define CGI
-+#ifndef CGI
-+# define CGI
-+#endif
-
- #ifdef CGI
- /* uncomment the following line to enable support for "index.cgi"
-@@ -39,7 +41,9 @@
-
- /* uncomment the following line to enable support for autogenerated
- * directory-listings for directories without index */
--/* #define DIR_LIST */
-+#ifndef DIR_LIST
-+# define DIR_LIST
-+#endif
-
- #ifdef DIR_LIST
- /* uncomment the following line to enable support for system symlink
-diff --exclude='*~' -urN fnord-1.8.orig/Makefile fnord-1.8/Makefile
---- fnord-1.8.orig/Makefile 2005-03-06 22:45:55.178287856 -0500
-+++ fnord-1.8/Makefile 2005-03-06 22:50:44.729269416 -0500
-@@ -1,28 +1,19 @@
--CC=gcc
--CXX=g++
--
--#LIBOWFAT=../libowfat/
--DIET=diet -Os
--
--CFLAGS=-Os -fomit-frame-pointer
--#CFLAGS=-g
-+CC:=gcc
-+CXX:=g++
-
- all: fnord fnord-cgi fnord-idx
-
- fnord: httpd
- cp -p $^ $@
-- -strip -R .note -R .comment $@
-
- httpd: httpd.o libowfat.a
- $(DIET) $(CC) -o $@ $^ $(CFLAGS)
-
- fnord-cgi: httpd-cgi.o libowfat.a
- $(DIET) $(CC) -o $@ $^ $(CFLAGS)
-- -strip -R .note -R .comment $@
-
- fnord-idx: httpd-idx.o libowfat.a
- $(DIET) $(CC) -o $@ $^ $(CFLAGS)
-- -strip -R .note -R .comment $@
-
- libowfat.a: httpd.o buffer_1.o buffer_puts.o buffer_flush.o buffer_put.o \
- buffer_putulong.o buffer_2.o buffer_putspace.o buffer_stubborn.o \
-@@ -32,19 +23,19 @@
- -ranlib $@
-
- httpd.o: httpd.c
-- $(DIET) $(CC) -pipe $(CFLAGS) -c $^ -DFNORD=\"fnord/$(shell head -1 CHANGES|sed 's/://')\"
-+ $(DIET) $(CC) $(CFLAGS) -c $^ -DFNORD=\"fnord/$(shell head -1 CHANGES|sed 's/://')\"
-
- httpd-cgi.o: httpd.c
-- $(DIET) $(CC) -pipe $(CFLAGS) -c httpd.c -o $@ -DCGI -DFNORD=\"fnord/$(shell head -1 CHANGES|sed 's/://')\"
-+ $(DIET) $(CC) $(CFLAGS) -c httpd.c -o $@ -DCGI -DFNORD=\"fnord/$(shell head -1 CHANGES|sed 's/://')\"
-
- httpd-idx.o: httpd.c
-- $(DIET) $(CC) -pipe $(CFLAGS) -c httpd.c -o $@ -DDIR_LIST -DFNORD=\"fnord/$(shell head -1 CHANGES|sed 's/://')\"
-+ $(DIET) $(CC) $(CFLAGS) -c httpd.c -o $@ -DDIR_LIST -DFNORD=\"fnord/$(shell head -1 CHANGES|sed 's/://')\"
-
- %.o: %.c
-- $(DIET) $(CC) -pipe $(CFLAGS) -c $^
-+ $(DIET) $(CC) $(CFLAGS) -c $^
-
- %.o: %.cpp
-- $(DIET) $(CXX) -pipe $(CFLAGS) -c $^
-+ $(DIET) $(CXX) $(CFLAGS) -c $^
-
- .PHONY: rename clean install server
- server: fnord