Install jar library files into ${JAVAJARDIR}, instead of into the JDK's
home directory. This is as directed by PH "Best Practices" for Java libraries. It also fixes the build of jboss4 (due to library pollution) when axis is installed. PR: ports/92781 Submitted by: Alex Kiesel Approved by: rui@ruilopes.com (maintainer, timeout 10 weeks)
This commit is contained in:
parent
aae18a9128
commit
2664912cd1
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=160897
2 changed files with 8 additions and 18 deletions
|
@ -43,22 +43,12 @@ USER= www
|
|||
GROUP= www
|
||||
|
||||
.include <bsd.port.pre.mk>
|
||||
#
|
||||
# Change install directory by JDK version
|
||||
#
|
||||
.if defined(JAVA_PORT_VERSION) && (${JAVA_PORT_VERSION} == "1.4.1")
|
||||
LIB_SUBDIR= endorsed
|
||||
.else
|
||||
LIB_SUBDIR= ext
|
||||
.endif
|
||||
JAR_INSTALL_DEST_DIR= ${JAVA_HOME}/jre/lib/${LIB_SUBDIR}
|
||||
|
||||
#
|
||||
# Install procedure
|
||||
#
|
||||
SYSTEM_JARS= jaxrpc.jar saaj.jar
|
||||
PLIST_SUB= PREFIX=${PREFIX} WEBAPPS=${WEBAPPDIR} JRE_HOME="${JAVA_HOME}/jre" \
|
||||
LIB_SUBDIR=${LIB_SUBDIR} USER=${USER} GROUP=${GROUP}
|
||||
SYSTEM_JARS= axis.jar jaxrpc.jar saaj.jar
|
||||
PLIST_SUB+= PREFIX=${PREFIX} WEBAPPS=${WEBAPPDIR} USER=${USER} GROUP=${GROUP}
|
||||
|
||||
.if !defined(NOPORTDOCS)
|
||||
SAMPLECLASSES=''
|
||||
|
@ -67,9 +57,9 @@ SAMPLECLASSES=classes
|
|||
.endif
|
||||
|
||||
do-install:
|
||||
${MKDIR} ${JAR_INSTALL_DEST_DIR}
|
||||
.for i in ${SYSTEM_JARS}
|
||||
${INSTALL_DATA} ${WRKSRC}/lib/${i} ${JAR_INSTALL_DEST_DIR}
|
||||
${MKDIR} ${JAVAJARDIR}/${PORTNAME}
|
||||
${INSTALL_DATA} ${WRKSRC}/lib/${i} ${JAVAJARDIR}/${PORTNAME}
|
||||
.endfor
|
||||
(cd ${WRKSRC}/webapps ; tar cf - --exclude "${SAMPLECLASSES}" axis) | (cd ${WEBAPPDIR} ; tar xvf -)
|
||||
${CHOWN} -R ${USER}:${GROUP} ${WEBAPPDIR}/axis
|
||||
|
|
|
@ -1,7 +1,3 @@
|
|||
@cwd %%JRE_HOME%%
|
||||
lib/%%LIB_SUBDIR%%/saaj.jar
|
||||
lib/%%LIB_SUBDIR%%/jaxrpc.jar
|
||||
@dirrm lib/%%LIB_SUBDIR%%
|
||||
@cwd %%WEBAPPS%%
|
||||
axis/EchoHeaders.jws
|
||||
axis/SOAPMonitorApplet.java
|
||||
|
@ -199,7 +195,11 @@ axis/index.html
|
|||
@dirrm axis/WEB-INF
|
||||
@dirrm axis
|
||||
@cwd %%PREFIX%%
|
||||
%%JAVAJARDIR%%/axis/axis.jar
|
||||
%%JAVAJARDIR%%/axis/jaxrpc.jar
|
||||
%%JAVAJARDIR%%/axis/saaj.jar
|
||||
%%PORTDOCS%%share/doc/axis/AxisJMSSample.pdf
|
||||
@dirrm %%JAVAJARDIR%%/axis
|
||||
%%PORTDOCS%%share/doc/axis/AxisTestRedesign.html
|
||||
%%PORTDOCS%%share/doc/axis/TestsNeeded.html
|
||||
%%PORTDOCS%%share/doc/axis/ant/ant.html
|
||||
|
|
Loading…
Reference in a new issue