diff options
| -rw-r--r-- | MOVED | 1 | ||||
| -rw-r--r-- | www/Makefile | 1 | ||||
| -rw-r--r-- | www/mod_webapp/Makefile | 87 | ||||
| -rw-r--r-- | www/mod_webapp/distinfo | 3 | ||||
| -rw-r--r-- | www/mod_webapp/files/patch-configure.in | 31 | ||||
| -rw-r--r-- | www/mod_webapp/files/patch-lib-pr_warp_network.c | 11 | ||||
| -rw-r--r-- | www/mod_webapp/pkg-deinstall | 57 | ||||
| -rw-r--r-- | www/mod_webapp/pkg-descr | 5 | ||||
| -rw-r--r-- | www/mod_webapp/pkg-install | 65 | ||||
| -rw-r--r-- | www/mod_webapp/pkg-plist | 3 |
10 files changed, 1 insertions, 263 deletions
@@ -4474,3 +4474,4 @@ www/mplayer-plugin|www/gecko-mediaplayer|2010-08-08|Upstream support dropped lang/plt-scheme|lang/racket|2010-08-08|Upstream development discontinued emulators/sdlmess|emulators/mess|2010-08-08|SDL port has been integrated into mainstream security/libassuan-1||2010-08-08|This is an ex-library (Superseded by security/libassuan, but not compatible) +www/mod_webapp||2010-08-08|Removed diff --git a/www/Makefile b/www/Makefile index d344dfda5628..aa7f8aa43422 100644 --- a/www/Makefile +++ b/www/Makefile @@ -560,7 +560,6 @@ SUBDIR += mod_vdbh SUBDIR += mod_vhost_ldap SUBDIR += mod_vhs - SUBDIR += mod_webapp SUBDIR += mod_webkit SUBDIR += mod_webobjects SUBDIR += mod_wsgi diff --git a/www/mod_webapp/Makefile b/www/mod_webapp/Makefile deleted file mode 100644 index c815db877137..000000000000 --- a/www/mod_webapp/Makefile +++ /dev/null @@ -1,87 +0,0 @@ -# Ports collection makefile for: mod_webapp for Apache 1.3.x -# Date created: Jun 12 2003 -# Whom: Andre Sachs <asachs@uunet.co.za> -# -# $FreeBSD$ -# - -PORTNAME= mod_webapp -PORTVERSION= 4.1.24 -PORTREVISION= 5 -CATEGORIES= www -MASTER_SITES= http://jakarta.apache.org/%SUBDIR%/ -MASTER_SITE_SUBDIR= builds/jakarta-tomcat-4.0/release/v${TOMCAT_RELEASE}/src -PKGNAMEPREFIX= ${APACHE_PKGNAMEPREFIX} -DISTNAME= jakarta-tomcat-connectors-${CONNECTORS_RELEASE}-src -DIST_SUBDIR= mod_webapp - -MAINTAINER= apache@FreeBSD.org -COMMENT= Apache module mounts Tomcat web applications - -LIB_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/devel/apr1:configure - -BROKEN= does not build - -MAKE_JOBS_UNSAFE= yes - -USE_APACHE= 1.3 -USE_PYTHON_BUILD=yes -USE_AUTOTOOLS= automake:19:env autoconf:262:env libtool:22:env -GNU_CONFIGURE= yes -USE_GMAKE= yes -USE_LDCONFIG= yes - -# Release information for distribution files. -TOMCAT_RELEASE= ${PORTVERSION} -CONNECTORS_RELEASE= ${PORTVERSION} - -ONLY_FOR_ARCHS= i386 sparc64 - -.include <bsd.port.pre.mk> - -# Apache locations. -APACHECTL?= ${LOCALBASE}/sbin/apachectl -APR_LIB?= ${LOCALBASE}/lib/ -APR_INCLUDE?= ${LOCALBASE}/include/apr-${APR_MAJORVER}/ -APACHE_MODULES?=libexec/apache -APR_VER!= cd ${PORTSDIR}/devel/apr1 && ${MAKE} -V APR_VERSION -APR_WRKSRC!= cd ${PORTSDIR}/devel/apr1 && ${MAKE} -V WRKSRC -APR_MAJORVER= ${APR_VER:C/\..*//g} -APR_SRC= ${APR_WRKSRC}/apr-${APR_VER} -AUTOCONF?= ${LOCALBASE}/bin/autoconf - -# If the user's changed the modules directory, pack things correctly. -PLIST_SUB= APACHE_MODULES=${APACHE_MODULES} - -# Build options. -WRKSRC= ${WRKDIR}/${DISTNAME}/webapp -HAS_CONFIGURE= yes -CONFIGURE_ARGS= --with-apxs=${APXS} \ - --with-apr-lib=${APR_LIB} \ - --with-apr-include=${APR_INCLUDE} \ - --with-apr=${APR_SRC} \ - --without-ant - -post-patch: - ${REINPLACE_CMD} -e 's/apr-config/apr-${APR_MAJORVER}-config/g' \ - ${WRKSRC}/support/wa_apr.m4 - -pre-configure: - cd ${WRKSRC} && ${AUTOCONF} - -pre-build: - ${MKDIR} ${WRKSRC}/build - ${MKDIR} ${WRKSRC}/build/objs - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/apache-1.3/mod_webapp.so \ - ${PREFIX}/libexec/apache - -post-install: - @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} - ${INSTALL_MAN} ${WRKSRC}/INSTALL.txt ${DOCSDIR} -.endif - -.include <bsd.port.post.mk> diff --git a/www/mod_webapp/distinfo b/www/mod_webapp/distinfo deleted file mode 100644 index 2b131397ce49..000000000000 --- a/www/mod_webapp/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (mod_webapp/jakarta-tomcat-connectors-4.1.24-src.tar.gz) = 0daa701e51d04570006abce1ac580aed -SHA256 (mod_webapp/jakarta-tomcat-connectors-4.1.24-src.tar.gz) = 08e1eadc630a7b63eeeb21ee7755d50f257a03c3562d90f4bbdc8f900f227aac -SIZE (mod_webapp/jakarta-tomcat-connectors-4.1.24-src.tar.gz) = 1823428 diff --git a/www/mod_webapp/files/patch-configure.in b/www/mod_webapp/files/patch-configure.in deleted file mode 100644 index 09067272425c..000000000000 --- a/www/mod_webapp/files/patch-configure.in +++ /dev/null @@ -1,31 +0,0 @@ ---- configure.in.orig Tue Jun 10 12:18:27 2003 -+++ configure.in Tue Jun 10 12:18:57 2003 -@@ -207,17 +207,17 @@ - dnl ---------------------------------------------------------------------- - dnl Do a check on the C compiler to see if apxs reports the same one - dnl ---------------------------------------------------------------------- -- WA_APXS_GET([tempval],[${APXS}],[CC]) -- AC_MSG_CHECKING([for compiler coherency]) -- if test "${tempval}" != "${CC}" ; then -- AC_MSG_RESULT([error]) -- AC_MSG_RESULT([compiler discovered by apr: ${CC}]) -- AC_MSG_RESULT([compiler used by apache apxs: ${tempval}]) -- AC_MSG_ERROR([the apache apxs and apr compilers must be the same]) -- exit 1 -- fi -- AC_MSG_RESULT([ok (${CC})]) -- unset tempval -+ dnl WA_APXS_GET([tempval],[${APXS}],[CC]) -+ dnl AC_MSG_CHECKING([for compiler coherency]) -+ dnl if test "${tempval}" != "${CC}" ; then -+ dnl AC_MSG_RESULT([error]) -+ dnl AC_MSG_RESULT([compiler discovered by apr: ${CC}]) -+ dnl AC_MSG_RESULT([compiler used by apache apxs: ${tempval}]) -+ dnl AC_MSG_ERROR([the apache apxs and apr compilers must be the same]) -+ dnl exit 1 -+ dnl fi -+ dnl AC_MSG_RESULT([ok (${CC})]) -+ dnl unset tempval - - dnl ---------------------------------------------------------------------- - dnl Apache 1.3 configuration complete diff --git a/www/mod_webapp/files/patch-lib-pr_warp_network.c b/www/mod_webapp/files/patch-lib-pr_warp_network.c deleted file mode 100644 index b1e5d8cf1703..000000000000 --- a/www/mod_webapp/files/patch-lib-pr_warp_network.c +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/pr_warp_network.c.orig Wed May 25 10:37:48 2005 -+++ lib/pr_warp_network.c Wed May 25 10:38:03 2005 -@@ -142,7 +142,7 @@ - apr_status_t ret=APR_SUCCESS; - apr_socket_t *sock=NULL; - -- ret=apr_socket_create(&sock,AF_INET,SOCK_STREAM,wa_pool); -+ ret=apr_socket_create(&sock,AF_INET,SOCK_STREAM,0,wa_pool); - if (ret!=APR_SUCCESS) { - sock=NULL; - wa_log(WA_MARK,"Cannot create socket for conn. \"%s\"",conn->name); diff --git a/www/mod_webapp/pkg-deinstall b/www/mod_webapp/pkg-deinstall deleted file mode 100644 index 59acc0d43b83..000000000000 --- a/www/mod_webapp/pkg-deinstall +++ /dev/null @@ -1,57 +0,0 @@ -#!/bin/sh -# -# Try to de-activate mod_webapp in the installed httpd.conf and warn -# if this fails. -# -# $FreeBSD$ -# - -if [ "$2" != "POST-DEINSTALL" ]; then - exit 0 -fi - -TMPDIR=${TMPDIR:=/tmp} -PKG_TMPDIR=${PKG_TMPDIR:=${TMPDIR}} - -apxscmd=${PKG_PREFIX}/sbin/apxs -tmpdir=${PKG_TMPDIR}/deinstmod_webapp.$$ - -if [ ! -x ${apxscmd} ]; then - echo Can\'t find the apxs program: ${apxscmd}. - exit 1 -fi - -confdir=`${apxscmd} -q SYSCONFDIR` - -if [ ! -d ${confdir} ]; then - echo Can\'t find Apache conf dir: ${confdir} - exit 1 -fi - -if [ -f ${confdir}/httpd.conf ]; then - conffile=httpd.conf -fi -if [ -f ${confdir}/httpd.conf.default ]; then - conffile="${conffile} httpd.conf.default" -fi -if [ -z "${conffile}" ]; then - echo Can\'t find either of ${confdir}/httpd.conf or - echo ${confdir}/httpd.conf.default. - exit 1 -fi - -if ! mkdir ${tmpdir}; then - echo Can\'t create temporary directory: ${tmpdir} - exit 1 -fi - -for i in ${conffile}; do - awk '{if (!/^LoadModule webapp_module/ && !/^AddModule mod_webapp.c/) \ - print $0}' < ${confdir}/$i > ${tmpdir}/$i - echo Updating $i in config dir: ${confdir} - cat ${tmpdir}/$i > ${confdir}/$i -done - -rm -rf ${tmpdir} - -exit 0 diff --git a/www/mod_webapp/pkg-descr b/www/mod_webapp/pkg-descr deleted file mode 100644 index f91dde00d91e..000000000000 --- a/www/mod_webapp/pkg-descr +++ /dev/null @@ -1,5 +0,0 @@ -Mod_webapp is an Apache module that allows Tomcat applications to be -mounted into an Apache server. Tomcat is a Java servlet and JSP engine. -Apache is the popular webserver. - -WWW: http://jakarta.apache.org/tomcat/ diff --git a/www/mod_webapp/pkg-install b/www/mod_webapp/pkg-install deleted file mode 100644 index 366a08d796b6..000000000000 --- a/www/mod_webapp/pkg-install +++ /dev/null @@ -1,65 +0,0 @@ -#!/bin/sh -# -# Try to activate mod_webapp in the installed httpd.conf and warn -# if this fails. This script could be replaced with a simple @exec -# line in the PLIST if the apache13 package installed an httpd.conf. -# -# $FreeBSD$ -# - -if [ "$2" != "POST-INSTALL" ]; then - exit 0 -fi - -TMPDIR=${TMPDIR:=/tmp} -PKG_TMPDIR=${PKG_TMPDIR:=${TMPDIR}} - -apxscmd=${PKG_PREFIX}/sbin/apxs -webappmod=${PKG_PREFIX}/libexec/apache/mod_webapp.so -tmpdir=${PKG_TMPDIR}/instmod_webapp.$$ - -if [ ! -x ${apxscmd} ]; then - echo Can\'t find the apxs program: ${apxscmd}. - exit 1 -fi - -confdir=`${apxscmd} -q SYSCONFDIR` - -if [ ! -d ${confdir} ]; then - echo Can\'t find Apache conf dir: ${confdir} - exit 1 -fi - -if [ ! -f ${confdir}/httpd.conf ]; then - if [ ! -f ${confdir}/httpd.conf.default ]; then - echo Can\'t find either of ${confdir}/httpd.conf nor - echo ${confdir}/httpd.conf.default. - exit 1 - fi - - if ! mkdir ${tmpdir}; then - echo Can\'t create temporary directory: ${tmpdir} - exit 1 - fi - - cp ${confdir}/httpd.conf.default ${tmpdir}/httpd.conf - if ${apxscmd} -e -S SYSCONFDIR=${tmpdir} -a -n webapp ${webappmod}; then - echo Updating httpd.conf.default in config dir: ${confdir} - cat ${tmpdir}/httpd.conf > ${confdir}/httpd.conf.default - rm -rf ${tmpdir} - exit 0 - else - rm -rf ${tmpdir} - echo The apxs command failed to activate mod_webapp in the config - echo file: ${tmpdir}/httpd.conf. - exit 1 - fi -elif ${apxscmd} -e -a -n webapp ${webappmod}; then - exit 0 -else - echo The apxs command failed to activate mod_webapp in the config - echo file: ${confdir}/httpd.conf - exit 1 -fi - -exit 0 diff --git a/www/mod_webapp/pkg-plist b/www/mod_webapp/pkg-plist deleted file mode 100644 index 7216cdf2d63f..000000000000 --- a/www/mod_webapp/pkg-plist +++ /dev/null @@ -1,3 +0,0 @@ -%%APACHE_MODULES%%/mod_webapp.so -%%PORTDOCS%%%%DOCSDIR%%/INSTALL.txt -%%PORTDOCS%%@dirrm %%DOCSDIR%% |