diff options
| author | ahze <ahze@FreeBSD.org> | 2006-05-01 23:39:54 +0800 |
|---|---|---|
| committer | ahze <ahze@FreeBSD.org> | 2006-05-01 23:39:54 +0800 |
| commit | ce406e1d2c49ec503f947ec03be57076b6aa50dd (patch) | |
| tree | 80b60212f6b51bc965f1365ef7d8bfe9922579dc /net | |
| parent | e979fa6297dae6f544b3057c5962c22625a6ae88 (diff) | |
| download | freebsd-ports-gnome-ce406e1d2c49ec503f947ec03be57076b6aa50dd.tar.gz freebsd-ports-gnome-ce406e1d2c49ec503f947ec03be57076b6aa50dd.tar.zst freebsd-ports-gnome-ce406e1d2c49ec503f947ec03be57076b6aa50dd.zip | |
- Disable mDNSResponder in avahi so net/mDNSResponder and avahi don't
conflict
Requested by: kde@
Diffstat (limited to 'net')
| -rw-r--r-- | net/avahi/Makefile | 7 | ||||
| -rw-r--r-- | net/avahi/pkg-plist | 7 |
2 files changed, 3 insertions, 11 deletions
diff --git a/net/avahi/Makefile b/net/avahi/Makefile index fae5fae41a31..f01f7edc42c5 100644 --- a/net/avahi/Makefile +++ b/net/avahi/Makefile @@ -7,7 +7,7 @@ PORTNAME= avahi PORTVERSION= 0.6.9 -PORTREVISION?= 4 +PORTREVISION?= 5 CATEGORIES?= net dns MASTER_SITES= http://www.avahi.org/download/ @@ -33,15 +33,14 @@ CONFIGURE_ARGS?=--with-distro=freebsd \ --disable-doxygen-doc \ --disable-doxygen-dot \ --localstatedir=/var \ - --enable-compat-howl \ - --enable-compat-libdns_sd + --enable-compat-howl CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" \ PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" .if !defined(AVAHI_SLAVE) -CONFLICTS= howl-[0-9]* mDNSResponder-[0-9]* +CONFLICTS= howl-[0-9]* MAN1= avahi-browse-domains.1 avahi-browse.1 avahi-publish-address.1 \ avahi-publish-service.1 avahi-publish.1 avahi-resolve-address.1 \ diff --git a/net/avahi/pkg-plist b/net/avahi/pkg-plist index 52fb63b9b0e2..e915b774b247 100644 --- a/net/avahi/pkg-plist +++ b/net/avahi/pkg-plist @@ -51,7 +51,6 @@ include/avahi-compat-howl/salt/salt.h include/avahi-compat-howl/salt/signal.h include/avahi-compat-howl/salt/socket.h include/avahi-compat-howl/salt/time.h -include/avahi-compat-libdns_sd/dns_sd.h include/avahi-core/core.h include/avahi-core/log.h include/avahi-core/lookup.h @@ -75,17 +74,12 @@ lib/libavahi-glib.a lib/libavahi-glib.la lib/libavahi-glib.so lib/libavahi-glib.so.1 -lib/libdns_sd.a -lib/libdns_sd.la -lib/libdns_sd.so -lib/libdns_sd.so.1 lib/libhowl.a lib/libhowl.la lib/libhowl.so lib/libhowl.so.0 libdata/pkgconfig/avahi-client.pc libdata/pkgconfig/avahi-compat-howl.pc -libdata/pkgconfig/avahi-compat-libdns_sd.pc libdata/pkgconfig/avahi-core.pc libdata/pkgconfig/avahi-glib.pc sbin/avahi-daemon @@ -107,7 +101,6 @@ sbin/avahi-dnsconfd @dirrm %%DATADIR%% @dirrm include/avahi-glib @dirrm include/avahi-core -@dirrm include/avahi-compat-libdns_sd @dirrm include/avahi-compat-howl/salt @dirrm include/avahi-compat-howl/rendezvous @dirrm include/avahi-compat-howl/discovery |