summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2012-10-22 02:42:20 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2012-10-22 02:42:20 +0000
commit23d060628fa764cf3a16a0c68248fb763feae09c (patch)
tree1926e86195ae11ff497a086b4a764a731e4f4468 /net-proxy/c-icap/files
parentRemove need net line. (diff)
downloadgentoo-2-23d060628fa764cf3a16a0c68248fb763feae09c.tar.gz
gentoo-2-23d060628fa764cf3a16a0c68248fb763feae09c.tar.bz2
gentoo-2-23d060628fa764cf3a16a0c68248fb763feae09c.zip
Remove old; remove 'need net' from init script.
(Portage version: 2.2.0_alpha141/cvs/Linux x86_64, signed Manifest commit with key 1CD13C8AD4301342)
Diffstat (limited to 'net-proxy/c-icap/files')
-rw-r--r--net-proxy/c-icap/files/c-icap-0.2.1-asneeded.patch27
-rw-r--r--net-proxy/c-icap/files/c-icap.init.26
2 files changed, 3 insertions, 30 deletions
diff --git a/net-proxy/c-icap/files/c-icap-0.2.1-asneeded.patch b/net-proxy/c-icap/files/c-icap-0.2.1-asneeded.patch
deleted file mode 100644
index 5a5801c3e760..000000000000
--- a/net-proxy/c-icap/files/c-icap-0.2.1-asneeded.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Index: c_icap-0.2.1/Makefile.am
-===================================================================
---- c_icap-0.2.1.orig/Makefile.am
-+++ c_icap-0.2.1/Makefile.am
-@@ -37,7 +37,7 @@ c_icap_SOURCES = aserver.c request.c cfg
- # libicapapi ......
- libicapapi_la_CFLAGS= -Iinclude/ @ZLIB_ADD_FLAG@ -DCI_BUILD_LIB
-
--libicapapi_la_LIBADD = @ZLIB_ADD_LDFLAG@
-+libicapapi_la_LIBADD = @ZLIB_ADD_LDFLAG@ @DL_ADD_FLAG@ @THREADS_LDADD@
- libicapapi_la_LDFLAGS= -shared -version-info @CICAPLIB_VERSION@
-
-
-@@ -47,10 +47,10 @@ c_icap_CFLAGS= -Iinclude/ -DCONFDIR=\"$(
- -DSERVDIR=\"$(SERVICESDIR)\" -DLOGDIR=\"$(LOGDIR)\" \
- -DDATADIR=\"$(DATADIR)\"
-
--c_icap_LDADD = libicapapi.la @DL_ADD_FLAG@ @THREADS_LDADD@
--c_icap_LDFLAGS = -rdynamic -rpath @libdir@ @THREADS_LDFLAGS@
-+c_icap_LDADD = libicapapi.la
-+c_icap_LDFLAGS = -rdynamic @THREADS_LDFLAGS@
-
--EXT_PROGRAMS_MKLIB = -licapapi @DL_ADD_FLAG@ @THREADS_LDADD@
-+EXT_PROGRAMS_MKLIB = -licapapi
-
-
- INCS = access.h body.h cfg_param.h c-icap-conf.h c-icap.h ci_threads.h \
diff --git a/net-proxy/c-icap/files/c-icap.init.2 b/net-proxy/c-icap/files/c-icap.init.2
index a649e7c8b206..461cac7a612a 100644
--- a/net-proxy/c-icap/files/c-icap.init.2
+++ b/net-proxy/c-icap/files/c-icap.init.2
@@ -1,7 +1,7 @@
#!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/c-icap/files/c-icap.init.2,v 1.1 2011/10/21 23:56:20 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/c-icap/files/c-icap.init.2,v 1.2 2012/10/22 02:42:20 flameeyes Exp $
pidfile=$(awk '$1 == "PidFile" { print $2 }' /etc/c-icap/c-icap.conf)
@@ -9,7 +9,7 @@ command="/usr/libexec/c-icap"
command_arguments="${EXTRA_OPTS}"
depend() {
- need localmount net
+ need localmount
}
start_pre() {