diff options
| author | Bruce A. Mah <bmah@FreeBSD.org> | 2003-04-06 22:36:25 +0000 |
|---|---|---|
| committer | Bruce A. Mah <bmah@FreeBSD.org> | 2003-04-06 22:36:25 +0000 |
| commit | cb7f6637cb6cd9dc8dd8d635c941691c122e8476 (patch) | |
| tree | 2f69b7d9382285457e2e6a11ff7e19177ca1e453 /devel/apr1 | |
| parent | 5f81323968003f38cb09015ab2a8b03ed6610c0d (diff) | |
| download | ports-cb7f6637cb6cd9dc8dd8d635c941691c122e8476.tar.gz ports-cb7f6637cb6cd9dc8dd8d635c941691c122e8476.zip | |
Maintainer update:
devel/apr and www/apache2 can coexist now (in fact, this has been
true since ports/www/apache2/Makefile rev. 1.136), so remove the
checks that prevented both from being installed on the same system.
No PORTREVISION bump because anyone who was affected by this change
would not have been able to install this port anyway.
Submitted by: Craig Rodrigues <rodrigc@attbi.com> (MAINTAINER)
Notes
Notes:
svn path=/head/; revision=78457
Diffstat (limited to 'devel/apr1')
| -rw-r--r-- | devel/apr1/Makefile | 3 | ||||
| -rw-r--r-- | devel/apr1/pkg-install | 15 |
2 files changed, 0 insertions, 18 deletions
diff --git a/devel/apr1/Makefile b/devel/apr1/Makefile index c8f5aec8e6b1..05707e590345 100644 --- a/devel/apr1/Makefile +++ b/devel/apr1/Makefile @@ -40,9 +40,6 @@ APR_UTIL_CONF_ARGS= --with-apr=../apr-${INTERNALPORTVERSION} \ --with-expat=${PREFIX} \ --with-iconv=${PREFIX} -pre-fetch: - ${SH} pkg-install apr PRE-INSTALL - pre-configure: cd ${WRKDIR}/apr-${INTERNALPORTVERSION}; ./buildconf cd ${WRKDIR}/apr-util-${INTERNALPORTVERSION}; ./buildconf \ diff --git a/devel/apr1/pkg-install b/devel/apr1/pkg-install deleted file mode 100644 index 6ef9e11b1c75..000000000000 --- a/devel/apr1/pkg-install +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh -# $FreeBSD$ - -if [ "$2" != "PRE-INSTALL" ]; then - exit 0 -fi - -pkg_info 'apache-2*' > /dev/null 2<&1 - -if [ $? = 0 ]; then - echo "apr cannot currently be installed alongside apache2. sorry." - exit 1 -fi - -exit 0 |