[kde-freebsd] Bug with x11-toolkits/qt33 and location of moc and other binaries

[Dima Panov]

On 9 April 2007 04:13, Bruce M Simpson wrote:
> Whilst attempting to port kdnssd-avahi to FreeBSD I ran into a difficult
> issue.
>
> It requires the avahi port to be built with the QT3 bindings. When
> attempting to build avahi with these bindings, the qt configure test
> fails. it appears that it is trying to run /usr/local/bin/moc ; however,
> x11-toolkits/qt33 installs under X11BASE, not LOCALBASE.
>

BTW, avahi-compat must install include/dns_sd.h for compatibility issue..

I try to migrate from mDNSResponder to avahi on my workstations, and have some 
patches ..  



Index: net/avahi/Makefile
===================================================================
RCS file: /home/ncvs/ports/net/avahi/Makefile,v
retrieving revision 1.45
diff -u -r1.45 Makefile
--- net/avahi/Makefile	10 Feb 2007 23:34:58 -0000	1.45
+++ net/avahi/Makefile	17 Feb 2007 05:46:02 -0000
@@ -20,6 +20,7 @@
 		gdbm.3:${PORTSDIR}/databases/gdbm
 
 USE_GNOME?=	gnomehack ltverhack glib20
+USE_QT_VER?=	3
 USE_GNOME_SUBR=yes
 USE_RC_SUBR=	yes
 USE_GMAKE=	yes
@@ -28,7 +29,6 @@
 USE_GETOPT_LONG=yes
 CONFIGURE_ARGS?=--with-distro=freebsd \
 		--with-dbus-system-address=unix:path=/var/run/dbus/system_bus_socket \
-		--disable-qt3 \
 		--disable-qt4 \
 		--disable-python \
 		--disable-mono \
@@ -54,7 +54,8 @@
 MAN8=	avahi-daemon.8 avahi-dnsconfd.8 avahi-dnsconfd.action.8
 
 OPTIONS=	GTK2 "Build a GTK+ 2 browser utility" off \
-		LIBDNS "Enable mDNSResponder compatibility" off
+		LIBDNS "Enable mDNSResponder compatibility" off \
+		QT3 "Enable QT3 compatibility" on
 .endif
 
 .include <bsd.port.pre.mk>
@@ -78,6 +79,14 @@
 PLIST_SUB+=	GTK="@comment "
 .endif
 
+.if !defined(WITHOUT_QT3)
+USE_QT_VER=	3
+PLIST_SUB+=	QT=""
+.else
+CONFIGURE_ARGS+=--disable-qt3
+PLIST_SUB+=	QT="@comment "
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|-ldl||g ; s|netdev|network|g' \
 		${WRKSRC}/configure \
@@ -92,6 +101,9 @@
 .if !defined(PACKAGE_BUILDING)
 	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 .endif
+.if defined(WITH_LIBDNS)
+	@${LN} -fs ${PREFIX}/include/avahi-compat-libdns_sd/dns_sd.h 
${PREFIX}/include/dns_sd.h
+.endif
 
 .endif
 
Index: net/avahi/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/net/avahi/pkg-plist,v
retrieving revision 1.14
diff -u -r1.14 pkg-plist
--- net/avahi/pkg-plist	10 Feb 2007 23:36:11 -0000	1.14
+++ net/avahi/pkg-plist	17 Feb 2007 05:43:10 -0000
@@ -54,6 +54,7 @@
 include/avahi-compat-howl/salt/socket.h
 include/avahi-compat-howl/salt/time.h
 %%LIBDNS%%include/avahi-compat-libdns_sd/dns_sd.h
+%%LIBDNS%%include/dns_sd.h
 include/avahi-core/core.h
 include/avahi-core/log.h
 include/avahi-core/lookup.h
@@ -61,6 +62,7 @@
 include/avahi-core/rr.h
 include/avahi-glib/glib-malloc.h
 include/avahi-glib/glib-watch.h
+%%QT%%include/avahi-qt3/qt-watch.h
 lib/libavahi-client.a
 lib/libavahi-client.la
 lib/libavahi-client.so
@@ -77,6 +79,10 @@
 lib/libavahi-glib.la
 lib/libavahi-glib.so
 lib/libavahi-glib.so.1
+%%QT%%lib/libavahi-qt3.a
+%%QT%%lib/libavahi-qt3.la
+%%QT%%lib/libavahi-qt3.so
+%%QT%%lib/libavahi-qt3.so.1
 %%LIBDNS%%lib/libdns_sd.a
 %%LIBDNS%%lib/libdns_sd.la
 %%LIBDNS%%lib/libdns_sd.so
@@ -90,6 +96,7 @@
 %%LIBDNS%%libdata/pkgconfig/avahi-compat-libdns_sd.pc
 libdata/pkgconfig/avahi-core.pc
 libdata/pkgconfig/avahi-glib.pc
+%%QT%%libdata/pkgconfig/avahi-qt3.pc
 sbin/avahi-daemon
 sbin/avahi-dnsconfd
 %%DATADIR%%/avahi-service.dtd


-- 
Дмитрий А. Панов

Академия Экономики и Права
Хабаровск, Россия