* [gentoo-commits] gentoo-x86 commit in www-servers/resin: ChangeLog resin-4.0.5.ebuild
@ 2010-04-02 15:41 Krzysztof Pawlik (nelchael)
0 siblings, 0 replies; 2+ messages in thread
From: Krzysztof Pawlik (nelchael) @ 2010-04-02 15:41 UTC (permalink / raw
To: gentoo-commits
nelchael 10/04/02 15:41:27
Modified: ChangeLog
Added: resin-4.0.5.ebuild
Log:
Version bump.
(Portage version: 2.1.8.3/cvs/Linux x86_64)
Revision Changes Path
1.92 www-servers/resin/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/resin/ChangeLog?rev=1.92&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/resin/ChangeLog?rev=1.92&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/resin/ChangeLog?r1=1.91&r2=1.92
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-servers/resin/ChangeLog,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- ChangeLog 12 Dec 2009 13:16:58 -0000 1.91
+++ ChangeLog 2 Apr 2010 15:41:27 -0000 1.92
@@ -1,6 +1,12 @@
# ChangeLog for www-servers/resin
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/ChangeLog,v 1.91 2009/12/12 13:16:58 nelchael Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/ChangeLog,v 1.92 2010/04/02 15:41:27 nelchael Exp $
+
+*resin-4.0.5 (02 Apr 2010)
+
+ 02 Apr 2010; Krzysztof Pawlik <nelchael@gentoo.org>
+ +files/4.0.5/resin.conf, +resin-4.0.5.ebuild, +files/4.0.5/resin.init:
+ Version bump.
*resin-3.1.9 (12 Dec 2009)
1.1 www-servers/resin/resin-4.0.5.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/resin/resin-4.0.5.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/resin/resin-4.0.5.ebuild?rev=1.1&content-type=text/plain
Index: resin-4.0.5.ebuild
===================================================================
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/resin-4.0.5.ebuild,v 1.1 2010/04/02 15:41:27 nelchael Exp $
EAPI="2"
JAVA_PKG_IUSE="source"
inherit java-pkg-2 java-ant-2 eutils flag-o-matic multilib autotools
DESCRIPTION="A fast Servlet and JSP engine."
HOMEPAGE="http://www.caucho.com"
SRC_URI="http://www.caucho.com/download/${P}-src.zip
mirror://gentoo/resin-gentoo-patches-${PV}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
IUSE="admin"
KEYWORDS="~amd64 ~x86"
COMMON_DEP="~dev-java/resin-servlet-api-${PV}.3.0
dev-java/glassfish-deployment-api:1.2
java-virtuals/javamail
dev-java/jsr101
dev-java/mojarra:1.2"
RDEPEND=">=virtual/jdk-1.5
${COMMON_DEP}"
DEPEND=">=virtual/jdk-1.5
app-arch/unzip
dev-java/ant-core
dev-libs/openssl
${COMMON_DEP}"
RESIN_HOME="/usr/$(get_libdir)/resin"
# Rewrites build.xml in documentation
JAVA_PKG_BSFIX="off"
pkg_setup() {
java-pkg-2_pkg_setup
enewgroup resin
enewuser resin -1 /bin/bash ${RESIN_HOME} resin
}
src_prepare() {
for i in "${WORKDIR}"/${PV}/resin-${PV}-*; do
epatch "${i}"
done;
# No bundled JARs!
rm -f "${S}/modules/ext/"*.jar
rm -rf "${S}/project-jars"
java-ant_bsfix_one "${S}/build.xml"
java-ant_bsfix_one "${S}/build-common.xml"
mkdir -p "${S}/m4"
eautoreconf
# Symlink our libraries:
mkdir -p "${S}/gentoo-deps"
cd "${S}/gentoo-deps/"
java-pkg_jar-from --virtual javamail
java-pkg_jar-from glassfish-deployment-api-1.2
java-pkg_jar-from resin-servlet-api-3.0
java-pkg_jar-from mojarra-1.2
java-pkg_jar-from jsr101
ln -s $(java-config --jdk-home)/lib/tools.jar
}
src_configure() {
append-flags -fPIC -DPIC
chmod 755 "${S}/configure"
econf --prefix=${RESIN_HOME} || die "econf failed"
}
src_compile() {
einfo "Building libraries..."
emake || die "make failed"
einfo "Building jars..."
eant || die "ant failed"
}
src_install() {
emake DESTDIR="${D}" install || die "Install failed"
dodir /etc/
mv "${D}/${RESIN_HOME}/conf" "${D}/etc/resin" || die "mv of conf failed"
dosym /etc/resin ${RESIN_HOME}/conf
keepdir /var/log/resin
keepdir /var/log/resin
keepdir /var/run/resin
dosym /var/log/resin ${RESIN_HOME}/logs
dosym /var/log/resin ${RESIN_HOME}/log
dodoc README "${S}"/conf/*.xml
newinitd "${FILESDIR}/${PV}/resin.init" resin
newconfd "${FILESDIR}/${PV}/resin.conf" resin
sed -i -e "s,__RESIN_HOME__,${RESIN_HOME},g" "${D}/etc/init.d/resin"
rm -f "${S}/lib/tools.jar"
java-pkg_dojar "${S}"/lib/*.jar
rm -fr "${D}/${RESIN_HOME}/lib"
dosym /usr/share/resin/lib ${RESIN_HOME}/lib
dosym /var/log/resin /usr/share/resin/log
dodir /var/lib/resin/webapps
mv "${D}"/${RESIN_HOME}/webapps/* "${D}/var/lib/resin/webapps" || \
die "mv of webapps failed"
rm -rf "${D}/${RESIN_HOME}/webapps"
dosym /var/lib/resin/webapps ${RESIN_HOME}/webapps
dodir /usr/lib/resin/project-jars
cp -a "${S}"/project-jars/*.jar "${D}/usr/lib/resin/project-jars"
use admin && {
cp -a "${S}/doc/admin" "${D}/var/lib/resin/webapps/" || die "cp failed"
}
use source && {
einfo "Zipping source..."
java-pkg_dosrc "${S}"/modules/*/src/* 2> /dev/null
}
einfo "Removing unneeded files..."
rm -fr "${D}/${RESIN_HOME}/bin"
rm -fr "${D}/${RESIN_HOME}/doc"
rm -f "${D}"/etc/resin/*.orig
einfo "Fixing permissions..."
chown -R resin:resin "${D}${RESIN_HOME}"
chown -R resin:resin "${D}/etc/resin"
chown -R resin:resin "${D}/var/log/resin"
chown -R resin:resin "${D}/var/lib/resin"
chown -R resin:resin "${D}/var/run/resin"
chmod 644 "${D}/etc/conf.d/resin"
chmod 755 "${D}/etc/init.d/resin"
chmod 750 "${D}/var/lib/resin"
chmod 750 "${D}/var/run/resin"
chmod 750 "${D}/etc/resin"
}
pkg_postinst() {
elog
elog " User and group 'resin' have been added."
elog
elog " By default, Resin runs on port 8080. You can change this"
elog " value by editing /etc/resin/resin.xml."
elog
elog " webapps directory was moved to /var/lib/resin/webapps"
elog
elog " Most options has been moved from /etc/conf.d/resin to"
elog " /etc/resin/resin.xml."
elog
}
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in www-servers/resin: ChangeLog resin-4.0.5.ebuild
@ 2010-04-02 15:46 Krzysztof Pawlik (nelchael)
0 siblings, 0 replies; 2+ messages in thread
From: Krzysztof Pawlik (nelchael) @ 2010-04-02 15:46 UTC (permalink / raw
To: gentoo-commits
nelchael 10/04/02 15:46:21
Modified: ChangeLog resin-4.0.5.ebuild
Log:
Add symlink for hosts for easy virtual host management.
(Portage version: 2.1.8.3/cvs/Linux x86_64)
Revision Changes Path
1.93 www-servers/resin/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/resin/ChangeLog?rev=1.93&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/resin/ChangeLog?rev=1.93&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/resin/ChangeLog?r1=1.92&r2=1.93
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-servers/resin/ChangeLog,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- ChangeLog 2 Apr 2010 15:41:27 -0000 1.92
+++ ChangeLog 2 Apr 2010 15:46:21 -0000 1.93
@@ -1,6 +1,9 @@
# ChangeLog for www-servers/resin
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/ChangeLog,v 1.92 2010/04/02 15:41:27 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/ChangeLog,v 1.93 2010/04/02 15:46:21 nelchael Exp $
+
+ 02 Apr 2010; Krzysztof Pawlik <nelchael@gentoo.org> resin-4.0.5.ebuild:
+ Add symlink for hosts for easy virtual host management.
*resin-4.0.5 (02 Apr 2010)
1.2 www-servers/resin/resin-4.0.5.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/resin/resin-4.0.5.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/resin/resin-4.0.5.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/resin/resin-4.0.5.ebuild?r1=1.1&r2=1.2
Index: resin-4.0.5.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-servers/resin/resin-4.0.5.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- resin-4.0.5.ebuild 2 Apr 2010 15:41:27 -0000 1.1
+++ resin-4.0.5.ebuild 2 Apr 2010 15:46:21 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/resin-4.0.5.ebuild,v 1.1 2010/04/02 15:41:27 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/resin-4.0.5.ebuild,v 1.2 2010/04/02 15:46:21 nelchael Exp $
EAPI="2"
@@ -112,10 +112,12 @@
dosym /var/log/resin /usr/share/resin/log
dodir /var/lib/resin/webapps
+ keepdir /var/lib/resin/hosts
mv "${D}"/${RESIN_HOME}/webapps/* "${D}/var/lib/resin/webapps" || \
die "mv of webapps failed"
rm -rf "${D}/${RESIN_HOME}/webapps"
dosym /var/lib/resin/webapps ${RESIN_HOME}/webapps
+ dosym /var/lib/resin/hosts ${RESIN_HOME}/hosts
dodir /usr/lib/resin/project-jars
cp -a "${S}"/project-jars/*.jar "${D}/usr/lib/resin/project-jars"
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-04-02 15:46 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-04-02 15:41 [gentoo-commits] gentoo-x86 commit in www-servers/resin: ChangeLog resin-4.0.5.ebuild Krzysztof Pawlik (nelchael)
-- strict thread matches above, loose matches on Subject: below --
2010-04-02 15:46 Krzysztof Pawlik (nelchael)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox