Index: head/www/resin3/Makefile =================================================================== --- head/www/resin3/Makefile (revision 159343) +++ head/www/resin3/Makefile (revision 159344) @@ -1,152 +1,153 @@ # New ports collection makefile for: resin3 # Whom: Jean-Baptiste Quenot # Date Created: 2003-09-29 14:17:14 # # $FreeBSD$ # PORTNAME= resin PORTVERSION= 3.0.18 CATEGORIES= www java MASTER_SITES= http://www.caucho.com/download/ MAINTAINER= jb.quenot@caraldi.com COMMENT= Resin, a Java-based Application Server, 3.x branch USE_JAVA= yes JAVA_VERSION= 1.2+ HAS_CONFIGURE= yes USE_PYTHON= yes USE_OPENSSL= yes +USE_AUTOTOOLS= libtool:15 # Customizable settings RUNASUSER?= www RUNASUID?= 80 GROUP?= ${RUNASUSER} GID?= ${RUNASUID} PORT?= 8080 # Do not use PKGNAMESUFFIX here because version info is already in PORTVERSION # If we used PKGNAMESUFFIX, the package name would be resin2-2.1.11 APP_NAME_SUFFIX= ${PORTVERSION:C/\..*$//} APP_NAME?= ${PORTNAME}${APP_NAME_SUFFIX} LATEST_LINK= ${APP_NAME} APP_HOME?= ${PREFIX}/${APP_NAME} WITH_APACHE?= NO WITH_APACHE2?= NO PID_FILE?= ${APP_HOME}/${APP_NAME}.pid LOG_FILE?= ${APP_HOME}/${APP_NAME}.log # Other settings APXS?= ${LOCALBASE}/sbin/apxs PKGINSTALL= ${WRKDIR}/pkg-install PKGDEINSTALL= ${WRKDIR}/pkg-deinstall PKGMESSAGE= ${WRKDIR}/pkg-message REINPLACE_FILES= ${WRKSRC}/modules/c/src/apache1/Makefile.in \ ${WRKSRC}/modules/c/src/apache2/Makefile.in REPLACE_FILES= ${FILESDIR}/pkg-install \ ${FILESDIR}/pkg-deinstall \ ${FILESDIR}/install.sh \ ${FILESDIR}/pkg-message.in \ ${WRKSRC}/conf/resin.conf \ ${FILESDIR}/resinctl \ ${FILESDIR}/resin.sh.in COPYDIRS= lib libexec webapps .include # Pass JAVA_HOME as determined by bsd.java.mk CONFIGURE_ARGS+= --with-java-home=${JAVA_HOME} \ --with-openssl-lib=${OPENSSLLIB} \ --with-openssl-include=${OPENSSLINC} LDFLAGS+= -L${OPENSSLLIB} -lcrypto -lssl # We need to link with cc instead of ld for the FreeBSD specific options used # by threading libraries -CONFIGURE_ENV= LD=${CC} PTHREAD_LIBS=${PTHREAD_LIBS} LDFLAGS="${LDFLAGS}" +CONFIGURE_ENV= LD=${CC} PTHREAD_LIBS=${PTHREAD_LIBS} LDFLAGS="${LDFLAGS}" LIBTOOL=${LIBTOOL} # Install the Apache plugin if needed .if defined(WITH_APACHE) && (${WITH_APACHE} == yes || ${WITH_APACHE} == YES) # # Apache 1.3 # BUILD_DEPENDS+= ${APXS}:${PORTSDIR}/www/apache13 CONFIGURE_ARGS+= --with-apxs=${APXS} PLIST_SUB+= MOD_DIR=libexec/apache # Allow apxs invocations PLIST_SUB+= APACHE="" .elif defined(WITH_APACHE2) && (${WITH_APACHE2} == yes || ${WITH_APACHE2} == YES) # # Apache 2 # BUILD_DEPENDS+= ${APXS}:${PORTSDIR}/www/apache20 CONFIGURE_ARGS+= --with-apxs=${APXS} PLIST_SUB+= MOD_DIR=libexec/apache2 # Allow apxs invocations PLIST_SUB+= APACHE="" .else PLIST_SUB+= MOD_DIR="@comment " # Prevent apxs invocations PLIST_SUB+= APACHE="@comment " .endif PLIST_SUB+= APP_NAME=${APP_NAME} PLIST_SUB+= APXS=${APXS} SUBSTITUTIONS= -e "s|%%APP_HOME%%|${APP_HOME}|g" \ -e "s|%%APP_NAME%%|${APP_NAME}|g" \ -e "s|%%APXS%%|${APXS}|g" \ -e "s|%%COPYDIRS%%|${COPYDIRS}|g" \ -e "s|%%FILESDIR%%|${FILESDIR}|g" \ -e "s|%%GID%%|${GID}|g" \ -e "s|%%GROUP%%|${GROUP}|g" \ -e "s|%%JAVA%%|${JAVA}|g" \ -e "s|%%JAVA_HOME%%|${JAVA_HOME}|g" \ -e "s|%%LOG_FILE%%|${LOG_FILE}|g" \ -e "s|%%PID_FILE%%|${PID_FILE}|g" \ -e "s|%%PORT%%|${PORT}|g" \ -e "s|%%PORTNAME%%|${PORTNAME}|g" \ -e "s|%%PREFIX%%|${PREFIX}|g" \ -e "s|%%PYTHON_CMD%%|${PYTHON_CMD}|g" \ -e "s|%%RUNASUID%%|${RUNASUID}|g" \ -e "s|%%RUNASUSER%%|${RUNASUSER}|g" \ -e "s|%%WRKDIR%%|${WRKDIR}|g" \ -e "s|%%WRKSRC%%|${WRKSRC}|g" post-patch: @${REINPLACE_CMD} ${SUBSTITUTIONS} ${REINPLACE_FILES} @for FILE in ${REPLACE_FILES} ; do \ ${SED} ${SUBSTITUTIONS} $${FILE} > ${WRKDIR}/`basename $${FILE}` ; \ done @${FMT} -w 80 < ${WRKDIR}/pkg-message.in > ${PKGMESSAGE} .if (defined(WITH_APACHE2) && (${WITH_APACHE2} == yes || ${WITH_APACHE2} == YES) || \ defined(WITH_APACHE) && (${WITH_APACHE} == yes || ${WITH_APACHE} == YES)) @${ECHO_CMD} >> ${PKGMESSAGE} @${ECHO_CMD} The Resin Apache module mod_caucho has been activated \ in the Apache configuration file, where you should also \ add a line to specify the location of the Resin configuration \ server, for example: | ${FMT} -w 80 >> ${PKGMESSAGE} @${ECHO_CMD} >> ${PKGMESSAGE} @${ECHO_CMD} "" >> ${PKGMESSAGE} @${ECHO_CMD} " ResinConfigServer localhost 6802" >> ${PKGMESSAGE} @${ECHO_CMD} "" >> ${PKGMESSAGE} .endif post-build: - cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_ARGS} install + cd ${WRKSRC}/modules/c/src/resin_os && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_ARGS} install # Resin does not handle installation, so proceed now do-install: @${SETENV} RUNASUSER=${RUNASUSER} GROUP=${GROUP} ${SH} ${WRKDIR}/install.sh .if (defined(WITH_APACHE2) && (${WITH_APACHE2} == yes || ${WITH_APACHE2} == YES)) ${APXS} -i -n caucho -a ${WRKSRC}/modules/c/src/apache2/.libs/mod_caucho.so .endif .if (defined(WITH_APACHE) && (${WITH_APACHE} == yes || ${WITH_APACHE} == YES)) ${APXS} -i -n caucho -a ${WRKSRC}/modules/c/src/apache1/.libs/mod_caucho.so .endif @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL @${ECHO_MSG} @${ECHO_MSG} "********************************************************************************" @${CAT} ${PKGMESSAGE} @${ECHO_MSG} "********************************************************************************" @${ECHO_MSG} .include Property changes on: head/www/resin3/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.22 \ No newline at end of property +1.23 \ No newline at end of property Index: head/www/resin3/files/patch-configure =================================================================== --- head/www/resin3/files/patch-configure (revision 159343) +++ head/www/resin3/files/patch-configure (revision 159344) @@ -1,37 +1,78 @@ --- configure.orig Thu Feb 23 00:59:58 2006 -+++ configure Mon Apr 3 10:55:28 2006 -@@ -9026,33 +9026,8 @@ ++++ configure Wed Apr 5 11:03:16 2006 +@@ -8193,37 +8193,12 @@ + + + +-# This can be used to rebuild libtool when needed +-LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" +- +-# Always use our own libtool. +-LIBTOOL='$(SHELL) $(top_builddir)/libtool' +- +-# Prevent multiple expansion +- +- + # + # libtool stuff + # +-if test -z "${LTFLAGS}"; then +- LTFLAGS="--silent" +-fi +- +-LIBTOOL_SCRIPT="`pwd`/libtool" +-LIBTOOL="${LIBTOOL_SCRIPT} ${LTFLAGS}" +-libtoolversion=`${SHELL} ${LIBTOOL_SCRIPT} --version` +-case $libtoolversion in +- *1.4*) +- SH_LIBTOOL="${LIBTOOL_SCRIPT}" +- SHLTCFLAGS="-prefer-pic" +- LTCFLAGS="-prefer-non-pic -static" +- ;; +- *) +- SH_LIBTOOL="${SHELL} ${LIBTOOL_SCRIPT} ${LTFLAGS}" +- SHLTCFLAGS="" +- LTCFLAGS="" +- ;; +-esac ++SH_LIBTOOL="${SHELL} ${LIBTOOL}" ++SHLTCFLAGS="" ++LTCFLAGS="" + + + +@@ -9026,33 +9001,8 @@ PROXY_LIBS='-lnsl -lsocket -lthread' ;; - *freebsd*5*) - PROXY_LIBS='-lpthread' - jni_os=freebsd - - tmp=`ldd $JAVA_HOME/bin/java | sed 's/.*=>//' | grep -c libc_r` - tmp=$tmp `ldd $JAVA_HOME/bin/java | sed 's/.*=>//' | grep -c libpthread` - tmp=$tmp `ldd $JAVA_HOME/bin/java | sed 's/.*=>//' | grep -c libthr` - - case "$tmp" in - 100) - PROXY_LIBS='-lc_r'; - ;; - 010) - PROXY_LIBS='-lpthread'; - ;; - 001) - PROXY_LIBS='-lthr'; - ;; - *) - PROXY_LIBS='-lpthread' - echo "Using -lpthread as default" - ;; - esac - ;; - *freebsd*) - PROXY_LIBS='-lc_r' + PROXY_LIBS="${PTHREAD_LIBS}" jni_os=freebsd ;; Property changes on: head/www/resin3/files/patch-configure ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.6 \ No newline at end of property +1.7 \ No newline at end of property Index: head/www/resin3/files/pkg-message.in =================================================================== --- head/www/resin3/files/pkg-message.in (revision 159343) +++ head/www/resin3/files/pkg-message.in (revision 159344) @@ -1,47 +1,50 @@ Resin is now installed in %%APP_HOME%% You may want to activate it in /etc/rc.conf: %%APP_NAME%%_enable="YES" Then start it: env - %%PREFIX%%/etc/rc.d/%%APP_NAME%%.sh start For this control script to run seamlessly, it is recommended to increase the maximum length of commands displayed by ps(1). Please append the following setting to /etc/sysctl.conf: # Do not truncate command line arguments in ps(1) listing kern.ps_arg_cache_limit=10000 This setting will take effect at next reboot, however it is possible to have immediate effect with the following command as root: # sysctl kern.ps_arg_cache_limit=10000 If you wish to skip this setting, please note that the `stop', `restart' and `status' will not function properly with %%APP_NAME%%.sh. Once Resin is started, point your web browser to the default home page at http://localhost:%%PORT%%/ to read the documentation and test the samples. Resin configuration is located at %%PREFIX%%/etc/%%APP_NAME%%/resin.xml Enjoy! -------------------------------------------------------------------------------- ADVANCED USAGE If you need to pass special options to Java, please set the %%APP_NAME%%_flags option in /etc/rc.conf, see examples below: # Prevent Java from opening an X11 display + %%APP_NAME%%_flags="-Djava.awt.headless=true" # Increase memory limit of the Java virtual machine + %%APP_NAME%%_flags="-Xms32m -Xmx256m" # Run Java with remote debugging turned on on port 8000 + %%APP_NAME%%_flags="-Xdebug -Xnoagent -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=8000" Property changes on: head/www/resin3/files/pkg-message.in ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.6 \ No newline at end of property +1.7 \ No newline at end of property