diff options
| author | linimon <linimon@FreeBSD.org> | 2004-03-10 06:48:23 +0800 |
|---|---|---|
| committer | linimon <linimon@FreeBSD.org> | 2004-03-10 06:48:23 +0800 |
| commit | beb87f460ec1b0a42b4e365c04b9ea4f32fb026d (patch) | |
| tree | 5824f7de97666c066ad7981246b17d968935b075 | |
| parent | 8d0c1e2779fd22d65342f5cbb9baff6c0c83748a (diff) | |
| download | freebsd-ports-gnome-beb87f460ec1b0a42b4e365c04b9ea4f32fb026d.tar.gz freebsd-ports-gnome-beb87f460ec1b0a42b4e365c04b9ea4f32fb026d.tar.zst freebsd-ports-gnome-beb87f460ec1b0a42b4e365c04b9ea4f32fb026d.zip | |
Correct the CONFLICTS. Remove unneccessary fluff.
Pointed out by: eik
| -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/ \ |