From 57097d6b18f3a5b0e7bce0f6717319fa88e83495 Mon Sep 17 00:00:00 2001 From: "Stefan Garthe (the_mgt)" Date: Mon, 8 Feb 2010 00:09:59 +0000 Subject: www-servers/webcit: Version bump to current 7.71 version. Corrected init script svn path=/sunrise/; revision=9996 --- www-servers/webcit/ChangeLog | 6 +++- www-servers/webcit/Manifest | 9 +++-- www-servers/webcit/files/as-needed.patch | 30 ---------------- www-servers/webcit/files/webcit.init.d | 4 +-- www-servers/webcit/webcit-7.66.ebuild | 60 -------------------------------- www-servers/webcit/webcit-7.71.ebuild | 56 +++++++++++++++++++++++++++++ 6 files changed, 67 insertions(+), 98 deletions(-) delete mode 100644 www-servers/webcit/files/as-needed.patch delete mode 100644 www-servers/webcit/webcit-7.66.ebuild create mode 100644 www-servers/webcit/webcit-7.71.ebuild (limited to 'www-servers') diff --git a/www-servers/webcit/ChangeLog b/www-servers/webcit/ChangeLog index 4451a536c..fceb387fd 100644 --- a/www-servers/webcit/ChangeLog +++ b/www-servers/webcit/ChangeLog @@ -1,7 +1,11 @@ # ChangeLog for www-servers/webcit -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 08 Feb 2010; the_mgt themgt@mail.ru -webcit-7.66.ebuild, + +webcit-7.71.ebuild, -files/as-needed.patch, ,files/webcit.init.d: + Version bump to current 7.71 version. Corrected init script + 15 Oct 2009; Thomas Sachau (Tommy[D]) metadata.xml: Drop maintainer from metadata.xml, this is reserved for main tree diff --git a/www-servers/webcit/Manifest b/www-servers/webcit/Manifest index 44b95c3bf..9dda2afac 100644 --- a/www-servers/webcit/Manifest +++ b/www-servers/webcit/Manifest @@ -1,7 +1,6 @@ -AUX as-needed.patch 1145 RMD160 ea6c4e24c77f0a3d7ccca4823ec831622bb494d2 SHA1 f799cd1e2199a0b95e488382311afef228a6748e SHA256 b83cef89ba07391e1a2ece789733db7159141424731a3d383b2fac3d11922b7a AUX webcit.conf.d 941 RMD160 490ec57f6e6243bc20b31279e879f1122b5fb563 SHA1 636303ff9b3f769894552a431eb3b07a7f60894a SHA256 1868ac4758e678c118987a245049a25d29c5ee5f855aadf7fc018399a5bda576 -AUX webcit.init.d 589 RMD160 4ec78918308426a1bad507cd092ddb2b9eafd8e2 SHA1 1bb5f1c901f74de71f9e930b88493564c9f159d0 SHA256 ea979103b5f53ba52ed3270548d25d59be164c78e1f7611e8e8fedeb1281e53f -DIST webcit-7.66.tar.gz 1365114 RMD160 631eca1f250a34696b3895e6c692d6da5da12c58 SHA1 80ac71f9ec0264917c603e25657fcce88e13075f SHA256 517683352dd294f759325265ef87a1e06504dd1f4c1ef711cc68cf3e85266617 -EBUILD webcit-7.66.ebuild 1584 RMD160 7e123d0c9d65b52265b6ce5155ca6e79b891ef18 SHA1 1b0a4c66bc77496c63dbc144268e080b226c4485 SHA256 cff80da288f8c904a43a02e832453d8c99aa010d8789de98887b13dc5c7bf5d4 -MISC ChangeLog 504 RMD160 931aa77441d3eb5c2f1717503afff7a7c29900db SHA1 6386c3da142aeee2bda7854ad9dc4f121e627a50 SHA256 1f57fc1135f7b97c3a5e4af648d70421089495fab4eef9b3094eaba32d5f7614 +AUX webcit.init.d 581 RMD160 2c0b8a9c64b2611e2cb8439402096a6527f2593f SHA1 424699afca02cc49bc0ead43b517ac5448fa00fe SHA256 65715da03657486265986e238205483eaf7e7ec2ecc057499d6b5b7e499d29a9 +DIST webcit-7.71.tar.gz 1386835 RMD160 a66d6db8035e95de6359c560af50d86b16d24e9d SHA1 8640dc2ad8acdf2a93e76a5b29bbe78b3cb8a267 SHA256 3e67858e4c36ce2ff541e3a8a53e35f1a355141ee0365c9fdae3e677dae1693d +EBUILD webcit-7.71.ebuild 1527 RMD160 38c1147f9577248bbcb7c0ae88ae04077d92edbd SHA1 8f60fef1d177819c482845b67513f998cadad92e SHA256 abbd144bae9eda915547ebc18d3cdf213a0bbf27a4a2d715449db64ec9c371d3 +MISC ChangeLog 695 RMD160 b25fca281e6e29d6c9143ba17876a364bb2ca8e2 SHA1 5b65616e8d42af611d6003517c78f41fa932ed1e SHA256 1311d333223b48102679f957ef08a876a8b4fb657ebcc8281e65d22bc322a995 MISC metadata.xml 698 RMD160 7be58fa9dfecb304bd9f3542f396fabda1d2e7f8 SHA1 b9c70776dd8f97766a6c5b155f8ffb5e4001c678 SHA256 cb0be7311e1a23eb293372eb7252f84d479ee5c903efe0c0d97ba8ff7fe5c83a diff --git a/www-servers/webcit/files/as-needed.patch b/www-servers/webcit/files/as-needed.patch deleted file mode 100644 index 912591076..000000000 --- a/www-servers/webcit/files/as-needed.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- Makefile.in 2009-09-28 16:09:43.000000000 +0200 -+++ Makefile.in.as-needed 2009-10-03 16:42:19.207824900 +0200 -@@ -37,8 +37,8 @@ - $(srcdir)/TAGS - - setup: setup.o gettext.o -- $(CC) $(LDFLAGS) $(LIBOBJS) $(LIBS) $(SETUP_LIBS) \ -- gettext.o setup.o -o setup -+ $(CC) $(LDFLAGS) $(LIBOBJS) gettext.o setup.o -o setup \ -+ $(LIBS) $(SETUP_LIBS) - - webcit: webserver.o context_loop.o ical_dezonify.o \ - cookie_conversion.o locate_host.o floors.o summary.o \ -@@ -55,7 +55,7 @@ - decode.o modules_init.o paramhandling.o utils.o \ - ical_maps.o ical_subst.o static.o \ - $(LIBOBJS) -- $(CC) $(LDFLAGS) $(LIBOBJS) $(LIBS) \ -+ $(CC) $(LDFLAGS) $(LIBOBJS) -o webcit \ - webserver.o context_loop.o cookie_conversion.o marchlist.o \ - webcit.o auth.o tcp_sockets.o mainmenu.o serv_func.o who.o listsub.o \ - roomops.o roomlist.o messages.o msg_renderers.o userlist.o paging.o sysmsgs.o \ -@@ -68,7 +68,6 @@ - groupdav_put.o http_datestring.o setup_wizard.o fmt_date.o modules_init.o \ - gettext.o downloads.o addressbook_popup.o pushemail.o sysdep.o decode.o \ - paramhandling.o utils.o ical_maps.o ical_subst.o static.o \ -- -o webcit \ - $(LIBS) - - .c.o: diff --git a/www-servers/webcit/files/webcit.init.d b/www-servers/webcit/files/webcit.init.d index 8d687c38c..942dd9bab 100644 --- a/www-servers/webcit/files/webcit.init.d +++ b/www-servers/webcit/files/webcit.init.d @@ -7,14 +7,14 @@ depend() { need net } -svc_start() { +start() { ebegin "Starting WebCit" start-stop-daemon --start --quiet --background \ --exec /usr/sbin/webcit -- $WEBCIT_OPTS eend $? "Failed to start WebCit" } -svc_stop() { +stop() { ebegin "Stopping WebCit" start-stop-daemon --stop --quiet \ --exec /usr/sbin/webcit diff --git a/www-servers/webcit/webcit-7.66.ebuild b/www-servers/webcit/webcit-7.66.ebuild deleted file mode 100644 index cb3960184..000000000 --- a/www-servers/webcit/webcit-7.66.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="2" -inherit eutils - -DESCRIPTION="Modern AJAX-style web interface for Citadel" -HOMEPAGE="http://www.citadel.org/" -SRC_URI="http://easyinstall.citadel.org/${P}.tar.gz" - -LICENSE="GPL-2 MIT LGPL-3 LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="ssl" - -DEPEND=">=dev-libs/libical-0.43 - >=dev-libs/libcitadel-${PV} - ssl? ( >=dev-libs/openssl-0.9.6 )" - -RDEPEND="${DEPEND}" - -src_prepare() { - epatch "${FILESDIR}/as-needed.patch" -} - -src_configure() { - econf \ - --with-included-gettext \ - $(use_with ssl) \ - --with-libical \ - --without-newt \ - --prefix=/usr/sbin/ \ - --with-wwwdir=/usr/share/citadel-webcit \ - --with-localedir=/usr/share/ \ - --with-editordir=/usr/share/citadel-webcit/tiny_mce/ \ - --with-rundir=/var/run/citadel \ - --with-ssldir=/etc/ssl/webcit/ \ - --with-datadir=/var/run/citadel -} - -src_install() { - emake DESTDIR="${D}" install || die "make install failed" - newinitd "${FILESDIR}"/webcit.init.d webcit || die "Installing initscript failed" - newconfd "${FILESDIR}"/webcit.conf.d webcit || die "Installing conf for initscript failed" - - ##House cleaning... - #We don't use Webcit's setup program - #Settings are in /etc/conf.d/webcit - rm "${D}"/usr/sbin/setup || "Removing upstreams setup bin failed" - - dodoc *.txt || die "dodoc failed" -} - -pkg_postinst() { - einfo "Make sure to configure webcit under /etc/conf.d/webcit." - einfo "Then start the server with /etc/init.d/webcit start" - einfo - einfo "Webcit will listen on port 2000 by default" -} diff --git a/www-servers/webcit/webcit-7.71.ebuild b/www-servers/webcit/webcit-7.71.ebuild new file mode 100644 index 000000000..58a49453f --- /dev/null +++ b/www-servers/webcit/webcit-7.71.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="2" +inherit eutils + +DESCRIPTION="Modern AJAX-style web interface for Citadel" +HOMEPAGE="http://www.citadel.org/" +SRC_URI="http://easyinstall.citadel.org/${P}.tar.gz" + +LICENSE="GPL-2 MIT LGPL-3 LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="ssl" + +DEPEND=">=dev-libs/libical-0.43 + >=dev-libs/libcitadel-${PV} + ssl? ( >=dev-libs/openssl-0.9.6 )" + +RDEPEND="${DEPEND}" + +src_configure() { + econf \ + --with-included-gettext \ + $(use_with ssl) \ + --with-libical \ + --without-newt \ + --prefix=/usr/sbin/ \ + --with-wwwdir=/usr/share/citadel-webcit \ + --with-localedir=/usr/share/ \ + --with-editordir=/usr/share/citadel-webcit/tiny_mce/ \ + --with-rundir=/var/run/citadel \ + --with-ssldir=/etc/ssl/webcit/ \ + --with-datadir=/var/run/citadel +} + +src_install() { + emake DESTDIR="${D}" install || die "make install failed" + newinitd "${FILESDIR}"/webcit.init.d webcit || die "Installing initscript failed" + newconfd "${FILESDIR}"/webcit.conf.d webcit || die "Installing conf for initscript failed" + + ##House cleaning... + #We don't use Webcit's setup program + #Settings are in /etc/conf.d/webcit + rm "${D}"/usr/sbin/setup || "Removing upstreams setup bin failed" + + dodoc *.txt || die "dodoc failed" +} + +pkg_postinst() { + einfo "Make sure to configure webcit under /etc/conf.d/webcit." + einfo "Then start the server with /etc/init.d/webcit start" + einfo + einfo "Webcit will listen on port 2000 by default" +} -- cgit v1.2.3-18-g5258