mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-27 00:57:50 +00:00
Code Issues Releases Activity

Using patch files for replacements in default-web-site.xml and

Browse Source 
rmi.xml. Changed the order in which certain steps are
performed. Fixed a small bug in the orionctl man page.
Including a dirty hack to make sure that WRKDIR is defined
(WRKDIR?=work).
Bumped PORTREVISION.
This commit is contained in:
Ernst de Haan 2002-03-30 12:47:34 +00:00
parent e30c71bc7a
commit 23b7e0ae1e
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=56951
8 changed files with 94 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
www/orion-devel/Makefile
View File

@ -7,7 +7,7 @@
PORTNAME= orion
PORTVERSION= 1.5.2
PORTREVISION= 14
PORTREVISION= 15
CATEGORIES= www java
MASTER_SITES= http://www.orionserver.com/distributions/ \
http://www.atlassian.com/software/orion/downloads/ \
@ -44,7 +44,10 @@ AUTO_START?= NO
PID_FILE= /var/run/${APP_SHORTNAME}.pid
REPLACE_FILES= ${FILESDIR}/daemonctl.c \
${FILESDIR}/${CONTROL_SCRIPT_NAME}.1 \
${FILESDIR}/${STARTUP_SCRIPT_NAME}
${FILESDIR}/${STARTUP_SCRIPT_NAME} \
${WRKSRC}/config/default-web-site.xml \
${WRKSRC}/config/rmi.xml
WRKDIR?= work
.include <bsd.port.pre.mk>
@ -69,25 +72,6 @@ do-install:
@${RM} -f `${FIND} ${WRKSRC} -name '*.bat'` `${FIND} ${WRKSRC} -name '*.orig'`
@${ECHO_CMD} " [ DONE ]"
@${ECHO_CMD} -n ">> Creating destination directory..."
@${MKDIR} ${APP_HOME}
@${MKDIR} ${APP_HOME}/application-deployments
@${ECHO_CMD} " [ DONE ]"
@${ECHO_CMD} -n ">> Copying files to destination directory..."
@${CP} -R ${WRKSRC}/* ${APP_HOME}
@${ECHO_CMD} " [ DONE ]"
@${ECHO_CMD} -n ">> Configuring HTTP server port..."
@${SED} -e "/port=\"80\"/s//port=\"${HTTP_PORT}\"/" \
${WRKSRC}/config/default-web-site.xml > ${APP_HOME}/config/default-web-site.xml
@${ECHO_CMD} " [ DONE ]"
@${ECHO_CMD} -n ">> Configuring RMI server port..."
@${SED} -e "/<rmi-server>/s//<rmi-server host=\"\[ALL\]\" port=\"${RMI_PORT}\">/" \
${WRKSRC}/config/rmi.xml > ${APP_HOME}/config/rmi.xml
@${ECHO_CMD} " [ DONE ]"
.for f in ${REPLACE_FILES}
@${ECHO_CMD} -n ">> Customizing `basename $f`..."
@${SED} \
@ -97,6 +81,7 @@ do-install:
-e "/%%CONTROL_SCRIPT%%/s//${CONTROL_SCRIPT:S/\//\\\//g}/g" \
-e "/%%CONTROL_SCRIPT_NAME%%/s//${CONTROL_SCRIPT_NAME}/g" \
-e "/%%GROUP%%/s//${GROUP}/g" \
-e "/%%HTTP_PORT%%/s//${HTTP_PORT}/g" \
-e "/%%JAVA_CMD%%/s//bin\/java/g" \
-e "/%%JAVA_HOME%%/s//${JAVA_HOME:S/\//\\\//g}/g" \
-e "/%%JAR_FILE%%/s//${APP_SHORTNAME}.jar/g" \
@ -108,11 +93,22 @@ do-install:
-e "/%%STDOUT_LOG%%/s//${STDOUT_LOG:S/\//\\\//g}/g" \
-e "/%%PREFIX%%/s//${PREFIX:S/\//\\\//g}/g" \
-e "/%%PID_FILE%%/s//${PID_FILE:S/\//\\\//g}/g" \
-e "/%%RMI_PORT%%/s//${RMI_PORT}/g" \
-e "/%%USER%%/s//${USER}/g" \
$f > ${WRKDIR}/`basename $f`
@${ECHO_CMD} " [ DONE ]"
.endfor
@${ECHO_CMD} -n ">> Creating destination directory..."
@${MKDIR} ${APP_HOME}
@${MKDIR} ${APP_HOME}/application-deployments
@${ECHO_CMD} " [ DONE ]"
@${ECHO_CMD} -n ">> Copying files to destination directory..."
@${CP} -R ${WRKSRC}/* ${APP_HOME}
@${CP} ${WRKDIR}/default-web-site.xml ${WRKDIR}/rmi.xml ${APP_HOME}/config
@${ECHO_CMD} " [ DONE ]"
.if defined(WITH_JIKES) && ${WITH_JIKES} == "YES"
@${ECHO_CMD} -n ">> Configuring Jikes support..."
@${SED} -e "/\<!-- \<compiler executable=\"jikes\" classpath=\"\/myjdkdir\/jre\/lib\/rt.jar\" \/\> -->/s//\<compiler executable=\"${JIKES_LOCATION:S/\//\\\//g}\" classpath=\"${JAVA_HOME:S/\//\\\//g}\/jre\/lib\/rt.jar\"\/\>/" \

4
www/orion-devel/files/orionctl.1
View File

@ -55,8 +55,8 @@ The following errors conditions are defined:
.It Em %%APP_TITLE%% is not running (error code 7)
.It Em Unable to chdir to the %%APP_TITLE%% home directory (error code 8)
.It Em Unable to open the stdout log file (error code 9)
.It Em Unable to open the stderr log file (error code 9)
.It Em Unable to start %%APP_TITLE%% (error code 9)
.It Em Unable to open the stderr log file (error code 10)
.It Em Unable to start %%APP_TITLE%% (error code 11)
.El
.Sh FILES
.Bl -tag -width -indent

17
www/orion-devel/files/patch-aa Normal file
View File

@ -0,0 +1,17 @@
--- config/default-web-site.xml.orig Sat Mar 30 13:16:11 2002
+++ config/default-web-site.xml Sat Mar 30 13:16:56 2002
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!DOCTYPE web-site PUBLIC "Orion Web-site" "http://www.orionserver.com/dtds/web-site.dtd">
-<web-site host="[ALL]" port="80" display-name="Default Orion WebSite">
+<web-site host="[ALL]" port="%%HTTP_PORT%%" display-name="Default Orion WebSite">
<!-- The default web-app for this site, bound to the root -->
<default-web-app application="default" name="defaultWebApp" />
<!-- Uncomment this to activate the news app -->
<!-- <web-app application="news" name="news-web" root="/news" /> -->
- <!-- Access Log, where requests are logged to -->
+ <!-- Access Log, where requests are logged to -->
<access-log path="../log/default-web-access.log" />
</web-site>

11
www/orion-devel/files/patch-ab Normal file
View File

@ -0,0 +1,11 @@
--- config/rmi.xml.orig Sat Mar 30 13:17:25 2002
+++ config/rmi.xml Sat Mar 30 13:17:59 2002
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE rmi-server PUBLIC "Orion RMI-server" "http://www.orionserver.com/dtds/rmi-server.dtd">
-<rmi-server>
+<rmi-server host="[ALL]" port="%%RMI_PORT%%">
<!-- A remote server connection example -->
<!-- <server host="the.remote.server.com" username="adminUser" password="123abc" /> -->

38
www/orion/Makefile
View File

@ -7,7 +7,7 @@
PORTNAME= orion
PORTVERSION= 1.5.2
PORTREVISION= 14
PORTREVISION= 15
CATEGORIES= www java
MASTER_SITES= http://www.orionserver.com/distributions/ \
http://www.atlassian.com/software/orion/downloads/ \
@ -44,7 +44,10 @@ AUTO_START?= NO
PID_FILE= /var/run/${APP_SHORTNAME}.pid
REPLACE_FILES= ${FILESDIR}/daemonctl.c \
${FILESDIR}/${CONTROL_SCRIPT_NAME}.1 \
${FILESDIR}/${STARTUP_SCRIPT_NAME}
${FILESDIR}/${STARTUP_SCRIPT_NAME} \
${WRKSRC}/config/default-web-site.xml \
${WRKSRC}/config/rmi.xml
WRKDIR?= work
.include <bsd.port.pre.mk>
@ -69,25 +72,6 @@ do-install:
@${RM} -f `${FIND} ${WRKSRC} -name '*.bat'` `${FIND} ${WRKSRC} -name '*.orig'`
@${ECHO_CMD} " [ DONE ]"
@${ECHO_CMD} -n ">> Creating destination directory..."
@${MKDIR} ${APP_HOME}
@${MKDIR} ${APP_HOME}/application-deployments
@${ECHO_CMD} " [ DONE ]"
@${ECHO_CMD} -n ">> Copying files to destination directory..."
@${CP} -R ${WRKSRC}/* ${APP_HOME}
@${ECHO_CMD} " [ DONE ]"
@${ECHO_CMD} -n ">> Configuring HTTP server port..."
@${SED} -e "/port=\"80\"/s//port=\"${HTTP_PORT}\"/" \
${WRKSRC}/config/default-web-site.xml > ${APP_HOME}/config/default-web-site.xml
@${ECHO_CMD} " [ DONE ]"
@${ECHO_CMD} -n ">> Configuring RMI server port..."
@${SED} -e "/<rmi-server>/s//<rmi-server host=\"\[ALL\]\" port=\"${RMI_PORT}\">/" \
${WRKSRC}/config/rmi.xml > ${APP_HOME}/config/rmi.xml
@${ECHO_CMD} " [ DONE ]"
.for f in ${REPLACE_FILES}
@${ECHO_CMD} -n ">> Customizing `basename $f`..."
@${SED} \
@ -97,6 +81,7 @@ do-install:
-e "/%%CONTROL_SCRIPT%%/s//${CONTROL_SCRIPT:S/\//\\\//g}/g" \
-e "/%%CONTROL_SCRIPT_NAME%%/s//${CONTROL_SCRIPT_NAME}/g" \
-e "/%%GROUP%%/s//${GROUP}/g" \
-e "/%%HTTP_PORT%%/s//${HTTP_PORT}/g" \
-e "/%%JAVA_CMD%%/s//bin\/java/g" \
-e "/%%JAVA_HOME%%/s//${JAVA_HOME:S/\//\\\//g}/g" \
-e "/%%JAR_FILE%%/s//${APP_SHORTNAME}.jar/g" \
@ -108,11 +93,22 @@ do-install:
-e "/%%STDOUT_LOG%%/s//${STDOUT_LOG:S/\//\\\//g}/g" \
-e "/%%PREFIX%%/s//${PREFIX:S/\//\\\//g}/g" \
-e "/%%PID_FILE%%/s//${PID_FILE:S/\//\\\//g}/g" \
-e "/%%RMI_PORT%%/s//${RMI_PORT}/g" \
-e "/%%USER%%/s//${USER}/g" \
$f > ${WRKDIR}/`basename $f`
@${ECHO_CMD} " [ DONE ]"
.endfor
@${ECHO_CMD} -n ">> Creating destination directory..."
@${MKDIR} ${APP_HOME}
@${MKDIR} ${APP_HOME}/application-deployments
@${ECHO_CMD} " [ DONE ]"
@${ECHO_CMD} -n ">> Copying files to destination directory..."
@${CP} -R ${WRKSRC}/* ${APP_HOME}
@${CP} ${WRKDIR}/default-web-site.xml ${WRKDIR}/rmi.xml ${APP_HOME}/config
@${ECHO_CMD} " [ DONE ]"
.if defined(WITH_JIKES) && ${WITH_JIKES} == "YES"
@${ECHO_CMD} -n ">> Configuring Jikes support..."
@${SED} -e "/\<!-- \<compiler executable=\"jikes\" classpath=\"\/myjdkdir\/jre\/lib\/rt.jar\" \/\> -->/s//\<compiler executable=\"${JIKES_LOCATION:S/\//\\\//g}\" classpath=\"${JAVA_HOME:S/\//\\\//g}\/jre\/lib\/rt.jar\"\/\>/" \

4
www/orion/files/orionctl.1
View File

@ -55,8 +55,8 @@ The following errors conditions are defined:
.It Em %%APP_TITLE%% is not running (error code 7)
.It Em Unable to chdir to the %%APP_TITLE%% home directory (error code 8)
.It Em Unable to open the stdout log file (error code 9)
.It Em Unable to open the stderr log file (error code 9)
.It Em Unable to start %%APP_TITLE%% (error code 9)
.It Em Unable to open the stderr log file (error code 10)
.It Em Unable to start %%APP_TITLE%% (error code 11)
.El
.Sh FILES
.Bl -tag -width -indent

17
www/orion/files/patch-aa Normal file
View File

@ -0,0 +1,17 @@
--- config/default-web-site.xml.orig Sat Mar 30 13:16:11 2002
+++ config/default-web-site.xml Sat Mar 30 13:16:56 2002
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<!DOCTYPE web-site PUBLIC "Orion Web-site" "http://www.orionserver.com/dtds/web-site.dtd">
-<web-site host="[ALL]" port="80" display-name="Default Orion WebSite">
+<web-site host="[ALL]" port="%%HTTP_PORT%%" display-name="Default Orion WebSite">
<!-- The default web-app for this site, bound to the root -->
<default-web-app application="default" name="defaultWebApp" />
<!-- Uncomment this to activate the news app -->
<!-- <web-app application="news" name="news-web" root="/news" /> -->
- <!-- Access Log, where requests are logged to -->
+ <!-- Access Log, where requests are logged to -->
<access-log path="../log/default-web-access.log" />
</web-site>

11
www/orion/files/patch-ab Normal file
View File

@ -0,0 +1,11 @@
--- config/rmi.xml.orig Sat Mar 30 13:17:25 2002
+++ config/rmi.xml Sat Mar 30 13:17:59 2002
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE rmi-server PUBLIC "Orion RMI-server" "http://www.orionserver.com/dtds/rmi-server.dtd">
-<rmi-server>
+<rmi-server host="[ALL]" port="%%RMI_PORT%%">
<!-- A remote server connection example -->
<!-- <server host="the.remote.server.com" username="adminUser" password="123abc" /> -->