From owner-freebsd-ports Thu May 17 6:20:16 2001 Delivered-To: freebsd-ports@hub.freebsd.org Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 1105D37B424 for ; Thu, 17 May 2001 06:20:01 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.11.1/8.11.1) id f4HDK1E62062; Thu, 17 May 2001 06:20:01 -0700 (PDT) (envelope-from gnats) Received: from heinz.jollem.com (c104187.upc-c.chello.nl [212.187.104.187]) by hub.freebsd.org (Postfix) with ESMTP id 2A89637B422 for ; Thu, 17 May 2001 06:19:48 -0700 (PDT) (envelope-from ernst@heinz.jollem.com) Received: (from ernst@localhost) by heinz.jollem.com (8.11.3/8.11.3) id f4HDI7h08517; Thu, 17 May 2001 15:18:07 +0200 (CEST) (envelope-from ernst) Message-Id: <200105171318.f4HDI7h08517@heinz.jollem.com> Date: Thu, 17 May 2001 15:18:07 +0200 (CEST) From: ernst@jollem.com Reply-To: ernst@heinz.jollem.com To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.113 Subject: ports/27407: Update port: java/orion Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 27407 >Category: ports >Synopsis: Update port: java/orion >Confidential: no >Severity: serious >Priority: high >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Thu May 17 06:20:00 PDT 2001 >Closed-Date: >Last-Modified: >Originator: Ernst de Haan >Release: FreeBSD 4.3-RELEASE i386 >Organization: Jollem Information Technology >Environment: System: FreeBSD heinz.jollem.com 4.3-RELEASE FreeBSD 4.3-RELEASE #5: Mon May 14 16:08:56 CEST 2001 root@heinz.jollem.com:/usr/src/sys/compile/HEINZ i386 >Description: The current version of the java/orion port installs a script in ${PREFIX}/etc/rc.d, but this script doesn't work to due to numerous small problems. Log: * Portrevision from 1 to 2 (version is still 1.4.5) * Changed reference to linux-jdk1.2.2 into linux-jdk1.3.0 in the shell script, since the port depends on linux-jdk1.3.0. * Fixed a few typos and other issues in the shell script * No longer installing a link from ${PREFIX}/orion -> ${PREFIX}/orion1.4.5 * Making all directories under ${PREFIX}/orion1.4.5 a+x * Added one mirror site for the DISTFILE * Renamed shell script from `orion.sh' to `orionctl' (similar to `apachectl') * Installing the shell script in the ${PREFIX}/bin/ directory and symlinking from ${PREFIX}/etc/rc.d/orion.sh to the former file, making sure that the shell script is +x * Including the shell script in ${FILESDIR} instead of downloading * TODO: Create a new account for Orion so it won't run as root * TODO: Support restarting Orion with the shell script script * TODO: Support obtaining status info from a running Orion instance * TODO: Add a man page for `orionctl' >How-To-Repeat: N/A >Fix: You can fetch this file from: * http://jollem.com/~ernst/orion1.4.5_1--1.4.5_2.diff diff -ruN --exclude=CVS /usr/ports/java/orion/Makefile /home/ernst/freebsd-ports/java/orion/Makefile --- /usr/ports/java/orion/Makefile Wed May 9 12:09:46 2001 +++ /home/ernst/freebsd-ports/java/orion/Makefile Thu May 17 15:03:41 2001 @@ -7,13 +7,13 @@ PORTNAME= orion PORTVERSION= 1.4.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= java www MASTER_SITES= ftp://ftp.sunet.se/pub/database/utils/orionserver/ \ - http://www.jollem.com/ + http://www.jollem.com/ \ + http://www.sebster.com/~elvis/ DISTNAME= ${PORTNAME}${PORTVERSION} -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ - orion.sh${EXTRACT_SUFX} +DISTFILES= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= ernst@jollem.com @@ -26,6 +26,8 @@ ORION_DESTDIR= ${PREFIX}/${DISTNAME} ORION_LINKDIR= ${PREFIX}/${PORTNAME} PORTTITLE= Orion Server +ORIONCTL_NAME= orionctl +ORIONCTL_DEST= ${PREFIX}/bin/${ORIONCTL_NAME} RC_SCRIPT= ${PREFIX}/etc/rc.d/${PORTNAME}.sh .include @@ -35,28 +37,33 @@ ${ECHO} "ERROR: The destination directory ${ORION_DESTDIR} already exists. Cancelling."; \ exit 65; \ fi - @if [ -L ${ORION_LINKDIR} ]; then \ - ${ECHO} "WARNING: The link ${ORION_LINKDIR} already exists. Overwriting."; \ - /bin/ls -ld ${ORION_LINKDIR}; \ - else \ - if [ -e ${ORION_LINKDIR} ]; then \ - ${ECHO} "ERROR: ${ORION_LINKDIR} already exists, and it's not a symlink. Cancelling."; \ - /bin/ls -ld ${ORION_LINKDIR}; \ - exit 66; \ - fi; \ - fi - @if [ -e ${ORION_LINKDIR} ]; then \ - ${ECHO} "WARNING: ${RC_SCRIPT} already exists. Overwriting."; \ - fi @${MKDIR} ${ORION_DESTDIR} @${CP} -R ${WRKSRC}/* ${ORION_DESTDIR} - @${CP} ${WRKDIR}/orion.sh ${RC_SCRIPT} - @if [ -e ${ORION_LINKDIR} ]; then \ - ${RM} ${ORION_LINKDIR}; \ - fi - @${LN} -sf ${ORION_DESTDIR} ${ORION_LINKDIR} + @${CHMOD} 755 `find ${ORION_DESTDIR} -type d` + @${CP} ${FILESDIR}/${ORIONCTL_NAME} ${ORIONCTL_DEST} + @${CHMOD} 755 ${ORIONCTL_DEST} + @${LN} -s ${ORIONCTL_DEST} ${RC_SCRIPT} post-install: @echo "${PORTTITLE} ${PORTVERSION} has been installed in ${ORION_DESTDIR}." .include + + +# Portrevision from 1 to 2 (version is still 1.4.5) +# Changed reference to linux-jdk1.2.2 into linux-jdk1.3.0 in the shell script, +# since the port depends on linux-jdk1.3.0. +# Fixed a few typos and other issues in the shell script +# No longer installing a link from ${PREFIX}/orion -> ${PREFIX}/orion1.4.5 +# Making all directories under ${PREFIX}/orion1.4.5 a+x +# Added one mirror site for the DISTFILE +# Renamed shell script from `orion.sh' to `orionctl' (similar to `apachectl') +# Installing the shell script in the ${PREFIX}/bin/ directory and symlinking +# from ${PREFIX}/etc/rc.d/orion.sh to the former file, making sure that the +# shell script is +x +# Including the shell script in ${FILESDIR} instead of downloading + +# TODO: Create a new account for Orion so it won't run as root +# TODO: Support restarting Orion with the shell script script +# TODO: Support obtaining status info from a running Orion instance +# TODO: Add a man page for `orionctl' diff -ruN --exclude=CVS /usr/ports/java/orion/files/orionctl /home/ernst/freebsd-ports/java/orion/files/orionctl --- /usr/ports/java/orion/files/orionctl Thu Jan 1 01:00:00 1970 +++ /home/ernst/freebsd-ports/java/orion/files/orionctl Thu May 17 14:36:13 2001 @@ -0,0 +1,33 @@ +#!/bin/sh + +if [ "${LOCALBASE}a" = "a" ]; then + LOCALBASE=/usr/local +fi + +JAVA_HOME=${LOCALBASE}/linux-jdk1.2.2 +ORION_HOME=${LOCALBASE}/orion +LOG=${ORION_HOME}/log/orion.log +PID_FILE=/var/run/orion.pid + +case "$1" in + start) + if [ -r ${ORION_HOME}/orion.jar ]; then + rm -rf ${PID_FILE} + touch ${PID_FILE} + chown root:wheel ${PID_FILE} + chmod 600 ${PID_FILE} + echo -n ' orion' + ( cd ${ORION_HOME} && ${JAVA_HOME}/bin/java -jar orion.jar & echo $! > ${PID_FILE} ) > ${LOG} 2>&1 + fi + ;; + stop) + /bin/kill `cat ${PID_FILE}` + echo -n ' orion' + ;; + *) + echo "" + echo "Usage: `basename $0` { start | stop }" + echo "" + exit 64 + ;; +esac diff -ruN --exclude=CVS /usr/ports/java/orion/orion1.4.5_1--1.4.5_2.diff /home/ernst/freebsd-ports/java/orion/orion1.4.5_1--1.4.5_2.diff --- /usr/ports/java/orion/orion1.4.5_1--1.4.5_2.diff Thu Jan 1 01:00:00 1970 +++ /home/ernst/freebsd-ports/java/orion/orion1.4.5_1--1.4.5_2.diff Thu May 17 15:12:13 2001 @@ -0,0 +1,119 @@ +diff -ruN --exclude=CVS /usr/ports/java/orion/Makefile /home/ernst/freebsd-ports/java/orion/Makefile +--- /usr/ports/java/orion/Makefile Wed May 9 12:09:46 2001 ++++ /home/ernst/freebsd-ports/java/orion/Makefile Thu May 17 15:03:41 2001 +@@ -7,13 +7,13 @@ + + PORTNAME= orion + PORTVERSION= 1.4.5 +-PORTREVISION= 1 ++PORTREVISION= 2 + CATEGORIES= java www + MASTER_SITES= ftp://ftp.sunet.se/pub/database/utils/orionserver/ \ +- http://www.jollem.com/ ++ http://www.jollem.com/ \ ++ http://www.sebster.com/~elvis/ + DISTNAME= ${PORTNAME}${PORTVERSION} +-DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ +- orion.sh${EXTRACT_SUFX} ++DISTFILES= ${DISTNAME}${EXTRACT_SUFX} + + MAINTAINER= ernst@jollem.com + +@@ -26,6 +26,8 @@ + ORION_DESTDIR= ${PREFIX}/${DISTNAME} + ORION_LINKDIR= ${PREFIX}/${PORTNAME} + PORTTITLE= Orion Server ++ORIONCTL_NAME= orionctl ++ORIONCTL_DEST= ${PREFIX}/bin/${ORIONCTL_NAME} + RC_SCRIPT= ${PREFIX}/etc/rc.d/${PORTNAME}.sh + + .include +@@ -35,28 +37,33 @@ + ${ECHO} "ERROR: The destination directory ${ORION_DESTDIR} already exists. Cancelling."; \ + exit 65; \ + fi +- @if [ -L ${ORION_LINKDIR} ]; then \ +- ${ECHO} "WARNING: The link ${ORION_LINKDIR} already exists. Overwriting."; \ +- /bin/ls -ld ${ORION_LINKDIR}; \ +- else \ +- if [ -e ${ORION_LINKDIR} ]; then \ +- ${ECHO} "ERROR: ${ORION_LINKDIR} already exists, and it's not a symlink. Cancelling."; \ +- /bin/ls -ld ${ORION_LINKDIR}; \ +- exit 66; \ +- fi; \ +- fi +- @if [ -e ${ORION_LINKDIR} ]; then \ +- ${ECHO} "WARNING: ${RC_SCRIPT} already exists. Overwriting."; \ +- fi + @${MKDIR} ${ORION_DESTDIR} + @${CP} -R ${WRKSRC}/* ${ORION_DESTDIR} +- @${CP} ${WRKDIR}/orion.sh ${RC_SCRIPT} +- @if [ -e ${ORION_LINKDIR} ]; then \ +- ${RM} ${ORION_LINKDIR}; \ +- fi +- @${LN} -sf ${ORION_DESTDIR} ${ORION_LINKDIR} ++ @${CHMOD} 755 `find ${ORION_DESTDIR} -type d` ++ @${CP} ${FILESDIR}/${ORIONCTL_NAME} ${ORIONCTL_DEST} ++ @${CHMOD} 755 ${ORIONCTL_DEST} ++ @${LN} -s ${ORIONCTL_DEST} ${RC_SCRIPT} + + post-install: + @echo "${PORTTITLE} ${PORTVERSION} has been installed in ${ORION_DESTDIR}." + + .include ++ ++ ++# Portrevision from 1 to 2 (version is still 1.4.5) ++# Changed reference to linux-jdk1.2.2 into linux-jdk1.3.0 in the shell script, ++# since the port depends on linux-jdk1.3.0. ++# Fixed a few typos and other issues in the shell script ++# No longer installing a link from ${PREFIX}/orion -> ${PREFIX}/orion1.4.5 ++# Making all directories under ${PREFIX}/orion1.4.5 a+x ++# Added one mirror site for the DISTFILE ++# Renamed shell script from `orion.sh' to `orionctl' (similar to `apachectl') ++# Installing the shell script in the ${PREFIX}/bin/ directory and symlinking ++# from ${PREFIX}/etc/rc.d/orion.sh to the former file, making sure that the ++# shell script is +x ++# Including the shell script in ${FILESDIR} instead of downloading ++ ++# TODO: Create a new account for Orion so it won't run as root ++# TODO: Support restarting Orion with the shell script script ++# TODO: Support obtaining status info from a running Orion instance ++# TODO: Add a man page for `orionctl' +diff -ruN --exclude=CVS /usr/ports/java/orion/files/orionctl /home/ernst/freebsd-ports/java/orion/files/orionctl +--- /usr/ports/java/orion/files/orionctl Thu Jan 1 01:00:00 1970 ++++ /home/ernst/freebsd-ports/java/orion/files/orionctl Thu May 17 14:36:13 2001 +@@ -0,0 +1,33 @@ ++#!/bin/sh ++ ++if [ "${LOCALBASE}a" = "a" ]; then ++ LOCALBASE=/usr/local ++fi ++ ++JAVA_HOME=${LOCALBASE}/linux-jdk1.2.2 ++ORION_HOME=${LOCALBASE}/orion ++LOG=${ORION_HOME}/log/orion.log ++PID_FILE=/var/run/orion.pid ++ ++case "$1" in ++ start) ++ if [ -r ${ORION_HOME}/orion.jar ]; then ++ rm -rf ${PID_FILE} ++ touch ${PID_FILE} ++ chown root:wheel ${PID_FILE} ++ chmod 600 ${PID_FILE} ++ echo -n ' orion' ++ ( cd ${ORION_HOME} && ${JAVA_HOME}/bin/java -jar orion.jar & echo $! > ${PID_FILE} ) > ${LOG} 2>&1 ++ fi ++ ;; ++ stop) ++ /bin/kill `cat ${PID_FILE}` ++ echo -n ' orion' ++ ;; ++ *) ++ echo "" ++ echo "Usage: `basename $0` { start | stop }" ++ echo "" ++ exit 64 ++ ;; ++esac diff -ruN --exclude=CVS /usr/ports/java/orion/pkg-descr /home/ernst/freebsd-ports/java/orion/pkg-descr --- /usr/ports/java/orion/pkg-descr Wed Jan 3 20:52:29 2001 +++ /home/ernst/freebsd-ports/java/orion/pkg-descr Thu May 17 15:01:24 2001 @@ -5,6 +5,6 @@ This version is only for development use or for non-commercial use. You need to purchase a license from http://www.orionserver.com/ -to be able to use this server commercially. +if you would like to use this server commercially. - WWW: http://www.orionserver.com/ +WWW: http://www.orionserver.com/ diff -ruN --exclude=CVS /usr/ports/java/orion/pkg-plist /home/ernst/freebsd-ports/java/orion/pkg-plist --- /usr/ports/java/orion/pkg-plist Wed May 9 12:09:46 2001 +++ /home/ernst/freebsd-ports/java/orion/pkg-plist Thu May 17 15:05:28 2001 @@ -1,5 +1,5 @@ etc/rc.d/orion.sh -orion +bin/orionctl orion1.4.5/config/database-schemas/hypersonic.xml orion1.4.5/config/database-schemas/ms-access.xml orion1.4.5/config/database-schemas/ms-sql.xml >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message