diff options
author | Mark Linimon <linimon@FreeBSD.org> | 2004-03-09 22:48:23 +0000 |
---|---|---|
committer | Mark Linimon <linimon@FreeBSD.org> | 2004-03-09 22:48:23 +0000 |
commit | 7bbf670f111421c502a1c626140dd042a2c582f7 (patch) | |
tree | 46e98b99bfb117e84dc6e3addc962ee9d62cd46f /www | |
parent | Fix PKGNAME. Bump PORTREVISION. (diff) |
Correct the CONFLICTS. Remove unneccessary fluff.
Pointed out by: eik
Notes
Notes:
svn path=/head/; revision=103472
Diffstat (limited to 'www')
-rw-r--r-- | www/dansguardian-devel/Makefile | 9 | ||||
-rw-r--r-- | www/dansguardian/Makefile | 9 |
2 files changed, 8 insertions, 10 deletions
diff --git a/www/dansguardian-devel/Makefile b/www/dansguardian-devel/Makefile index 2083f672777a..cab903ae61d8 100644 --- a/www/dansguardian-devel/Makefile +++ b/www/dansguardian-devel/Makefile @@ -14,16 +14,15 @@ DISTNAME= DansGuardian-${PORTVERSION:R}-${PORTVERSION:E}.source MAINTAINER= fcash@bigfoot.com COMMENT= A fast, feature-rich web content filter for Squid proxy servers -RUN_DEPENDS= ${LOCALBASE}/sbin/squid:${PORTSDIR}/www/squid:install \ - ${LOCALBASE}/sbin/httpd:${PORTSDIR}/${APACHE_PORT}:install +RUN_DEPENDS= ${LOCALBASE}/sbin/squid:${PORTSDIR}/www/squid \ + ${LOCALBASE}/sbin/httpd:${PORTSDIR}/${APACHE_PORT} WRKSRC= ${WRKDIR}/DansGuardian-${PORTVERSION:R}-${PORTVERSION:E} -CONFLICTS= dansguardian* +CONFLICTS= dansguardian-2.6* GNU_CONFIGURE= yes -CONFIGURE_ARGS= --prefix=${PREFIX} \ - --bindir=/sbin/ \ +CONFIGURE_ARGS= --bindir=/sbin/ \ --sysconfdir=/etc/dansguardian/ \ --sysvdir=/etc/rc.d/ \ --mandir=/man/ \ diff --git a/www/dansguardian/Makefile b/www/dansguardian/Makefile index dc5ca4b6f731..85293a0a3b11 100644 --- a/www/dansguardian/Makefile +++ b/www/dansguardian/Makefile @@ -15,16 +15,15 @@ DISTNAME= DansGuardian-${PORTVERSION:R}-${PORTVERSION:E}.source MAINTAINER= fcash@sd73.bc.ca COMMENT= A fast, feature-rich web content filter for Squid proxy servers -RUN_DEPENDS= ${LOCALBASE}/sbin/squid:${PORTSDIR}/www/squid:install \ - ${LOCALBASE}/sbin/httpd:${PORTSDIR}/${APACHE_PORT}:install +RUN_DEPENDS= ${LOCALBASE}/sbin/squid:${PORTSDIR}/www/squid \ + ${LOCALBASE}/sbin/httpd:${PORTSDIR}/${APACHE_PORT} -CONFLICTS= dansguardian* +CONFLICTS= dansguardian-2.7* LATEST_LINK= dansguardian WRKSRC= ${WRKDIR}/DansGuardian-${PORTVERSION:R} GNU_CONFIGURE= yes -CONFIGURE_ARGS= --prefix=${PREFIX} \ - --bindir=/sbin/ \ +CONFIGURE_ARGS= --bindir=/sbin/ \ --sysconfdir=/etc/dansguardian/ \ --sysvdir=/etc/rc.d/ \ --mandir=/man/ \ |