1 |
nelchael 12/02/11 18:52:28 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: resin-4.0.25.ebuild |
5 |
Log: |
6 |
Version bump. |
7 |
|
8 |
(Portage version: 2.1.10.45/cvs/Linux x86_64) |
9 |
|
10 |
Revision Changes Path |
11 |
1.109 www-servers/resin/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/resin/ChangeLog?rev=1.109&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/resin/ChangeLog?rev=1.109&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/resin/ChangeLog?r1=1.108&r2=1.109 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/www-servers/resin/ChangeLog,v |
20 |
retrieving revision 1.108 |
21 |
retrieving revision 1.109 |
22 |
diff -u -r1.108 -r1.109 |
23 |
--- ChangeLog 6 Sep 2011 16:46:05 -0000 1.108 |
24 |
+++ ChangeLog 11 Feb 2012 18:52:28 -0000 1.109 |
25 |
@@ -1,6 +1,12 @@ |
26 |
# ChangeLog for www-servers/resin |
27 |
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/ChangeLog,v 1.108 2011/09/06 16:46:05 nelchael Exp $ |
29 |
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
30 |
+# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/ChangeLog,v 1.109 2012/02/11 18:52:28 nelchael Exp $ |
31 |
+ |
32 |
+*resin-4.0.25 (11 Feb 2012) |
33 |
+ |
34 |
+ 11 Feb 2012; Krzysztof Pawlik <nelchael@g.o> +files/4.0.25/resin.conf, |
35 |
+ +files/4.0.25/resin.init, +resin-4.0.25.ebuild: |
36 |
+ Version bump. |
37 |
|
38 |
*resin-4.0.22 (06 Sep 2011) |
39 |
|
40 |
|
41 |
|
42 |
|
43 |
1.1 www-servers/resin/resin-4.0.25.ebuild |
44 |
|
45 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/resin/resin-4.0.25.ebuild?rev=1.1&view=markup |
46 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/resin/resin-4.0.25.ebuild?rev=1.1&content-type=text/plain |
47 |
|
48 |
Index: resin-4.0.25.ebuild |
49 |
=================================================================== |
50 |
# Copyright 1999-2012 Gentoo Foundation |
51 |
# Distributed under the terms of the GNU General Public License v2 |
52 |
# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/resin-4.0.25.ebuild,v 1.1 2012/02/11 18:52:28 nelchael Exp $ |
53 |
|
54 |
EAPI="2" |
55 |
|
56 |
JAVA_PKG_IUSE="source" |
57 |
|
58 |
inherit java-pkg-2 java-ant-2 eutils flag-o-matic multilib autotools |
59 |
|
60 |
DESCRIPTION="A fast Servlet and JSP engine." |
61 |
HOMEPAGE="http://www.caucho.com" |
62 |
SRC_URI="http://www.caucho.com/download/${P}-src.zip |
63 |
mirror://gentoo/resin-gentoo-patches-${PV}.tar.bz2" |
64 |
LICENSE="GPL-2" |
65 |
SLOT="0" |
66 |
IUSE="admin doc" |
67 |
|
68 |
KEYWORDS="~amd64 ~x86" |
69 |
|
70 |
COMMON_DEP="~dev-java/resin-servlet-api-${PV} |
71 |
dev-java/glassfish-deployment-api:1.2 |
72 |
java-virtuals/javamail |
73 |
dev-java/jsr101 |
74 |
dev-java/mojarra:1.2 |
75 |
dev-java/validation-api:1.0" |
76 |
|
77 |
RDEPEND=">=virtual/jdk-1.5 |
78 |
${COMMON_DEP}" |
79 |
DEPEND=">=virtual/jdk-1.5 |
80 |
app-arch/unzip |
81 |
dev-java/ant-core |
82 |
dev-libs/openssl |
83 |
${COMMON_DEP}" |
84 |
|
85 |
RESIN_HOME="/usr/$(get_libdir)/resin" |
86 |
|
87 |
# Rewrites build.xml in documentation |
88 |
JAVA_PKG_BSFIX="off" |
89 |
|
90 |
pkg_setup() { |
91 |
java-pkg-2_pkg_setup |
92 |
enewgroup resin |
93 |
enewuser resin -1 /bin/bash ${RESIN_HOME} resin |
94 |
} |
95 |
|
96 |
src_prepare() { |
97 |
for i in "${WORKDIR}"/${PV}/resin-${PV}-*; do |
98 |
epatch "${i}" |
99 |
done; |
100 |
|
101 |
# Respect LDFLAGS: |
102 |
sed -i -e 's/-o/$(LDFLAGS) -o/' modules/c/src/resin_os/Makefile.in |
103 |
|
104 |
# No bundled JARs! |
105 |
rm -f "${S}/modules/ext/"*.jar |
106 |
rm -rf "${S}/project-jars" |
107 |
|
108 |
java-ant_bsfix_one "${S}/build.xml" |
109 |
java-ant_bsfix_one "${S}/build-common.xml" |
110 |
|
111 |
mkdir -p "${S}/m4" |
112 |
eautoreconf |
113 |
|
114 |
# Symlink our libraries: |
115 |
mkdir -p "${S}/gentoo-deps" |
116 |
cd "${S}/gentoo-deps/" |
117 |
java-pkg_jar-from --virtual javamail |
118 |
java-pkg_jar-from glassfish-deployment-api-1.2 |
119 |
java-pkg_jar-from resin-servlet-api-3.0 resin-servlet-api.jar |
120 |
java-pkg_jar-from mojarra-1.2 |
121 |
java-pkg_jar-from jsr101 |
122 |
java-pkg_jar-from validation-api-1.0 |
123 |
ln -s $(java-config --jdk-home)/lib/tools.jar |
124 |
} |
125 |
|
126 |
src_configure() { |
127 |
append-flags -fPIC -DPIC |
128 |
|
129 |
chmod 755 "${S}/configure" |
130 |
econf --prefix=${RESIN_HOME} || die "econf failed" |
131 |
} |
132 |
|
133 |
src_compile() { |
134 |
einfo "Building libraries..." |
135 |
emake || die "make failed" |
136 |
|
137 |
einfo "Building jars..." |
138 |
eant || die "ant failed" |
139 |
} |
140 |
|
141 |
src_install() { |
142 |
emake DESTDIR="${D}" install || die "Install failed" |
143 |
|
144 |
einfo "Moving configuration to /etc ..." |
145 |
dodir /etc/ |
146 |
mv "${D}/${RESIN_HOME}/conf" "${D}/etc/resin" || die "mv of conf failed" |
147 |
dosym /etc/resin ${RESIN_HOME}/conf |
148 |
|
149 |
einfo "Rewriting resin.xml ..." |
150 |
sed -i \ |
151 |
-e 's,${resin.root}/doc/resin-doc,webapps/resin-doc,' \ |
152 |
-e 's,${resin.root}/doc/admin,webapps/admin,' \ |
153 |
"${D}/etc/resin/resin.xml" |
154 |
|
155 |
einfo "Fixing log directory ..." |
156 |
rm -rf "${D}/${RESIN_HOME}/log" |
157 |
keepdir /var/log/resin |
158 |
dosym /var/log/resin ${RESIN_HOME}/log |
159 |
|
160 |
einfo "Installing basic documentation ..." |
161 |
dodoc README "${S}"/conf/*.xml |
162 |
|
163 |
einfo "Installing init.d script ..." |
164 |
newinitd "${FILESDIR}/${PV}/resin.init" resin |
165 |
newconfd "${FILESDIR}/${PV}/resin.conf" resin |
166 |
|
167 |
sed -i -e "s,__RESIN_HOME__,${RESIN_HOME},g" "${D}/etc/init.d/resin" |
168 |
|
169 |
einfo "Fixing location of jars ..." |
170 |
rm -f "${S}/lib/tools.jar" |
171 |
java-pkg_dojar "${S}"/lib/*.jar |
172 |
rm -fr "${D}/${RESIN_HOME}/lib" |
173 |
dosym /usr/share/resin/lib ${RESIN_HOME}/lib |
174 |
|
175 |
einfo "Symlinking directories from /var/lib/resin ..." |
176 |
rm -rf "${D}/${RESIN_HOME}/resin-data" |
177 |
rm -rf "${D}/${RESIN_HOME}/watchdog-data" |
178 |
dodir /var/lib/resin/webapps |
179 |
keepdir /var/lib/resin/hosts |
180 |
keepdir /var/lib/resin/resin-data |
181 |
keepdir /var/lib/resin/watchdog-data |
182 |
mv "${D}"/${RESIN_HOME}/webapps/* "${D}/var/lib/resin/webapps" || \ |
183 |
die "mv of webapps failed" |
184 |
rm -rf "${D}/${RESIN_HOME}/webapps" |
185 |
dosym /var/lib/resin/webapps ${RESIN_HOME}/webapps |
186 |
dosym /var/lib/resin/hosts ${RESIN_HOME}/hosts |
187 |
dosym /var/lib/resin/resin-data ${RESIN_HOME}/resin-data |
188 |
dosym /var/lib/resin/watchdog-data ${RESIN_HOME}/watchdog-data |
189 |
|
190 |
dosym \ |
191 |
"$(java-pkg_getjar resin-servlet-api-3.0 resin-servlet-api.jar)" \ |
192 |
"${JAVA_PKG_JARDEST}/resin-servlet-api.jar" || die |
193 |
|
194 |
use admin && { |
195 |
einfo "Installing administration app ..." |
196 |
cp -a "${S}/doc/admin" "${D}/var/lib/resin/webapps/" || die |
197 |
} |
198 |
use doc && { |
199 |
einfo "Installing documentation app ..." |
200 |
cp -a "${S}/doc/resin-doc" "${D}/var/lib/resin/webapps/" || die |
201 |
} |
202 |
|
203 |
use source && { |
204 |
einfo "Installing sources ..." |
205 |
java-pkg_dosrc "${S}"/modules/*/src/* > /dev/null |
206 |
} |
207 |
|
208 |
einfo "Removing stale directories ..." |
209 |
rm -fr "${D}/${RESIN_HOME}/bin" |
210 |
rm -fr "${D}/${RESIN_HOME}/doc" |
211 |
rm -fr "${D}/${RESIN_HOME}/keys" |
212 |
rm -fr "${D}/${RESIN_HOME}/licenses" |
213 |
rm -fr "${D}/etc/resin/"*.orig |
214 |
|
215 |
einfo "Fixing ownerships and permissions ..." |
216 |
chown -R 0:root "${D}/" |
217 |
chown -R resin:resin "${D}/etc/resin" |
218 |
chown -R resin:resin "${D}/var/lib/resin" |
219 |
chown -R resin:resin "${D}/var/log/resin" |
220 |
|
221 |
chmod 644 "${D}/etc/conf.d/resin" |
222 |
chmod 755 "${D}/etc/init.d/resin" |
223 |
chmod 750 "${D}/var/lib/resin" |
224 |
chmod 750 "${D}/etc/resin" |
225 |
} |
226 |
|
227 |
pkg_postinst() { |
228 |
elog |
229 |
elog " User and group 'resin' have been added." |
230 |
elog |
231 |
elog " By default, Resin runs on port 8080. You can change this" |
232 |
elog " value by editing /etc/resin/resin.xml." |
233 |
elog |
234 |
} |