* [gentoo-commits] gentoo-x86 commit in www-servers/resin: resin-3.1.2.ebuild ChangeLog resin-3.0.24.ebuild resin-2.1.17.ebuild
@ 2007-10-08 12:51 Krzysiek Pawlik (nelchael)
0 siblings, 0 replies; only message in thread
From: Krzysiek Pawlik (nelchael) @ 2007-10-08 12:51 UTC (permalink / raw
To: gentoo-commits
nelchael 07/10/08 12:51:15
Modified: resin-3.1.2.ebuild ChangeLog resin-3.0.24.ebuild
resin-2.1.17.ebuild
Log:
Fix variable quoting. resin-3.0.22 will be removed soon, so it was not fixed.
(Portage version: 2.1.3.12)
Revision Changes Path
1.3 www-servers/resin/resin-3.1.2.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/resin/resin-3.1.2.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/resin/resin-3.1.2.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/resin/resin-3.1.2.ebuild?r1=1.2&r2=1.3
Index: resin-3.1.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-servers/resin/resin-3.1.2.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- resin-3.1.2.ebuild 8 Oct 2007 12:39:49 -0000 1.2
+++ resin-3.1.2.ebuild 8 Oct 2007 12:51:15 -0000 1.3
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/resin-3.1.2.ebuild,v 1.2 2007/10/08 12:39:49 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/resin-3.1.2.ebuild,v 1.3 2007/10/08 12:51:15 nelchael Exp $
JAVA_PKG_IUSE="doc source"
@@ -56,22 +56,22 @@
append-flags -fPIC -DPIC
- chmod 755 ${S}/configure
+ chmod 755 "${S}/configure"
econf --prefix=${RESIN_HOME} || die "econf failed"
einfo "Building libraries..."
# Broken with -jn where n > 1
emake -j1 || die "emake failed"
- mkdir ${S}/lib
- cd ${S}/lib
+ mkdir "${S}/lib"
+ cd "${S}/lib"
java-pkg_jar-from sun-jaf
java-pkg_jar-from sun-javamail
java-pkg_jar-from iso-relax
java-pkg_jar-from aopalliance-1
java-pkg_jar-from resin-servlet-api-2.5 resin-servlet-api.jar jsdk-15.jar
ln -s $(java-config --jdk-home)/lib/tools.jar
- cd ${S}
+ cd "${S}"
einfo "Building jars..."
eant || die "ant failed"
@@ -85,10 +85,10 @@
src_install() {
- make DESTDIR=${D} install || die
+ make DESTDIR="${D}" install || die
dodir /etc/
- mv ${D}/${RESIN_HOME}/conf ${D}/etc/resin
+ mv "${D}/${RESIN_HOME}/conf" "${D}/etc/resin"
dosym /etc/resin ${RESIN_HOME}/conf
keepdir /var/log/resin
@@ -98,49 +98,49 @@
dosym /var/log/resin ${RESIN_HOME}/logs
dosym /var/log/resin ${RESIN_HOME}/log
- dodoc README ${S}/conf/*.conf
+ dodoc README "${S}"/conf/*.conf
- newinitd ${FILESDIR}/${PV}/resin.init resin
- newconfd ${FILESDIR}/${PV}/resin.conf resin
+ newinitd "${FILESDIR}/${PV}/resin.init" resin
+ newconfd "${FILESDIR}/${PV}/resin.conf" resin
- rm -f ${S}/lib/tools.jar
- java-pkg_dojar ${S}/lib/*.jar
- rm -fr ${D}/${RESIN_HOME}/lib
+ 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
keepdir /usr/share/resin/log
dodir /var/lib/resin/webapps
- mv ${D}/${RESIN_HOME}/webapps/* ${D}/var/lib/resin/webapps
- rm -rf ${D}/${RESIN_HOME}/webapps
+ mv "${D}"/${RESIN_HOME}/webapps/* "${D}/var/lib/resin/webapps"
+ rm -rf "${D}/${RESIN_HOME}/webapps"
dosym /var/lib/resin/webapps ${RESIN_HOME}/webapps
dosym /etc/resin/resin.conf /etc/resin/resin.xml
use admin && {
- cp -a ${S}/php ${D}/${RESIN_HOME}/ || die "cp failed"
+ cp -a "${S}/php" "${D}/${RESIN_HOME}/" || die "cp failed"
}
use source && {
einfo "Zipping source..."
- java-pkg_dosrc ${S}/modules/*/src/* 2> /dev/null
+ java-pkg_dosrc "${S}"/modules/*/src/* 2> /dev/null
}
einfo "Removing unneeded files..."
- rm -fr ${D}/${RESIN_HOME}/bin
- rm -f ${D}/etc/resin/*.orig
+ rm -fr "${D}/${RESIN_HOME}/bin"
+ 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
+ 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"
}
1.55 www-servers/resin/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/resin/ChangeLog?rev=1.55&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/resin/ChangeLog?rev=1.55&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/resin/ChangeLog?r1=1.54&r2=1.55
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-servers/resin/ChangeLog,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- ChangeLog 8 Oct 2007 12:39:49 -0000 1.54
+++ ChangeLog 8 Oct 2007 12:51:15 -0000 1.55
@@ -1,6 +1,10 @@
# ChangeLog for www-servers/resin
# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/ChangeLog,v 1.54 2007/10/08 12:39:49 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/ChangeLog,v 1.55 2007/10/08 12:51:15 nelchael Exp $
+
+ 08 Oct 2007; Krzysiek Pawlik <nelchael@gentoo.org> resin-2.1.17.ebuild,
+ resin-3.0.24.ebuild, resin-3.1.2.ebuild:
+ Fix variable quoting.
08 Oct 2007; Krzysiek Pawlik <nelchael@gentoo.org> resin-3.1.2.ebuild:
Raise maximum memory to 384m, see bug #194860.
1.4 www-servers/resin/resin-3.0.24.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/resin/resin-3.0.24.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/resin/resin-3.0.24.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/resin/resin-3.0.24.ebuild?r1=1.3&r2=1.4
Index: resin-3.0.24.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-servers/resin/resin-3.0.24.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- resin-3.0.24.ebuild 19 Sep 2007 19:05:00 -0000 1.3
+++ resin-3.0.24.ebuild 8 Oct 2007 12:51:15 -0000 1.4
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/resin-3.0.24.ebuild,v 1.3 2007/09/19 19:05:00 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/resin-3.0.24.ebuild,v 1.4 2007/10/08 12:51:15 nelchael Exp $
JAVA_PKG_IUSE="doc source"
@@ -54,22 +54,22 @@
append-flags -fPIC -DPIC
- chmod 755 ${S}/configure
+ chmod 755 "${S}/configure"
econf --prefix=${RESIN_HOME} || die "econf failed"
einfo "Building libraries..."
# Broken with -jn where n > 1
emake -j1 || die "emake failed"
- mkdir ${S}/lib
- cd ${S}/lib
+ mkdir "${S}/lib"
+ cd "${S}/lib"
java-pkg_jar-from sun-jaf
java-pkg_jar-from sun-javamail
java-pkg_jar-from iso-relax
java-pkg_jar-from aopalliance-1
java-pkg_jar-from resin-servlet-api-2.4
ln -s $(java-config --jdk-home)/lib/tools.jar
- cd ${S}
+ cd "${S}"
einfo "Building jars..."
eant || die "ant failed"
@@ -83,10 +83,10 @@
src_install() {
- make DESTDIR=${D} install || die
+ make DESTDIR="${D}" install || die
dodir /etc/
- mv ${D}/${RESIN_HOME}/conf ${D}/etc/resin
+ mv "${D}/${RESIN_HOME}/conf" "${D}/etc/resin"
dosym /etc/resin ${RESIN_HOME}/conf
keepdir /var/log/resin
@@ -98,43 +98,43 @@
dodoc README
- newinitd ${FILESDIR}/${PV}/resin.init resin
- newconfd ${FILESDIR}/${PV}/resin.conf resin
+ newinitd "${FILESDIR}/${PV}/resin.init" resin
+ newconfd "${FILESDIR}/${PV}/resin.conf" resin
- rm -f ${S}/lib/tools.jar
- java-pkg_dojar ${S}/lib/*.jar
- rm -fr ${D}/${RESIN_HOME}/lib
+ 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
dodir /var/lib/resin/webapps
- mv ${D}/${RESIN_HOME}/webapps/* ${D}/var/lib/resin/webapps
- rm -rf ${D}/${RESIN_HOME}/webapps
+ mv "${D}"/${RESIN_HOME}/webapps/* "${D}/var/lib/resin/webapps"
+ rm -rf "${D}/${RESIN_HOME}/webapps"
dosym /var/lib/resin/webapps ${RESIN_HOME}/webapps
dosym /etc/resin/resin.conf /etc/resin/resin.xml
use source && {
einfo "Zipping source..."
- java-pkg_dosrc ${S}/modules/*/src/* 2> /dev/null
+ java-pkg_dosrc "${S}"/modules/*/src/* 2> /dev/null
}
einfo "Removing unneeded files..."
- rm -f ${D}/${RESIN_HOME}/bin/*.in
- rm -f ${D}/etc/resin/*.orig
+ rm -f "${D}"/${RESIN_HOME}/bin/*.in
+ 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 755 ${D}${RESIN_HOME}/bin/*
- 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
+ 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 755 "${D}${RESIN_HOME}"/bin/*
+ 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"
}
1.7 www-servers/resin/resin-2.1.17.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/resin/resin-2.1.17.ebuild?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/resin/resin-2.1.17.ebuild?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/resin/resin-2.1.17.ebuild?r1=1.6&r2=1.7
Index: resin-2.1.17.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-servers/resin/resin-2.1.17.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- resin-2.1.17.ebuild 21 Apr 2007 20:49:17 -0000 1.6
+++ resin-2.1.17.ebuild 8 Oct 2007 12:51:15 -0000 1.7
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/resin-2.1.17.ebuild,v 1.6 2007/04/21 20:49:17 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/resin-2.1.17.ebuild,v 1.7 2007/10/08 12:51:15 nelchael Exp $
inherit java-pkg eutils
@@ -17,20 +17,20 @@
src_unpack() {
unpack ${A}
- cd ${S}
- epatch ${FILESDIR}/${PV}/${PN}.diff
+ cd "${S}"
+ epatch "${FILESDIR}/${PV}/${PN}.diff"
}
pkg_preinst() {
enewgroup resin
enewuser resin -1 /bin/bash /opt/resin resin
- chown -R resin:resin ${D}/opt/resin
- chown -R resin:resin ${D}/var/log/${PN}
+ chown -R resin:resin "${D}/opt/resin"
+ chown -R resin:resin "${D}/var/log/${PN}"
}
src_compile() { :; }
src_install() {
- cd ${S}
+ cd "${S}"
RESIN_HOME="/opt/resin"
diropts -m0755
@@ -57,7 +57,7 @@
contrib \
webapps \
xsl \
- ${D}${RESIN_HOME} || die
+ "${D}${RESIN_HOME}" || die
dosym /usr/share/${PN}/lib ${RESIN_HOME}/lib
}
--
gentoo-commits@gentoo.org mailing list
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2007-10-08 13:00 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-10-08 12:51 [gentoo-commits] gentoo-x86 commit in www-servers/resin: resin-3.1.2.ebuild ChangeLog resin-3.0.24.ebuild resin-2.1.17.ebuild Krzysiek Pawlik (nelchael)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox