From cb7f6637cb6cd9dc8dd8d635c941691c122e8476 Mon Sep 17 00:00:00 2001 From: "Bruce A. Mah" Date: Sun, 6 Apr 2003 22:36:25 +0000 Subject: 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 (MAINTAINER) --- devel/apr1/Makefile | 3 --- devel/apr1/pkg-install | 15 --------------- 2 files changed, 18 deletions(-) delete mode 100644 devel/apr1/pkg-install (limited to 'devel/apr1') 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 -- cgit v1.2.3