From owner-freebsd-gnome@FreeBSD.ORG Sun Feb 19 04:41:56 2006 Return-Path: X-Original-To: freebsd-gnome@freebsd.org Delivered-To: freebsd-gnome@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A748B16A423 for ; Sun, 19 Feb 2006 04:41:56 +0000 (GMT) (envelope-from tmclaugh@sdf.lonestar.org) Received: from straycat.dhs.org (c-24-63-86-11.hsd1.ma.comcast.net [24.63.86.11]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0827343D80 for ; Sun, 19 Feb 2006 04:41:48 +0000 (GMT) (envelope-from tmclaugh@sdf.lonestar.org) Received: from [192.168.1.101] ([192.168.1.101]) by straycat.dhs.org (8.13.4/8.13.4) with ESMTP id k1J4kt8b013669 for ; Sat, 18 Feb 2006 23:46:55 -0500 (EST) From: Tom McLaughlin To: freebsd-gnome@freebsd.org Content-Type: multipart/mixed; boundary="=-7qQFXWUYUDOFPvnV6XGX" Date: Sat, 18 Feb 2006 23:38:30 -0500 Message-Id: <1140323910.22358.2.camel@bofh.meditech.com> Mime-Version: 1.0 X-Mailer: Evolution 2.5.91 FreeBSD GNOME Team Port Subject: net/avahi: approval for patch X-BeenThere: freebsd-gnome@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: GNOME for FreeBSD -- porting and maintaining List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 19 Feb 2006 04:41:57 -0000 --=-7qQFXWUYUDOFPvnV6XGX Content-Type: text/plain Content-Transfer-Encoding: 7bit Hi all, I did an avahi-sharp slave port for the latest Muine and attached is a patch for avahi. I based it right off of the dbus ports. Is the patch okay for me to commit? Thanks. -- | tmclaugh at sdf.lonestar.org tmclaugh at FreeBSD.org | | FreeBSD http://www.FreeBSD.org | | BSD# http://www.mono-project.com/Mono:FreeBSD | --=-7qQFXWUYUDOFPvnV6XGX Content-Disposition: attachment; filename=avahi-master_port.diff Content-Type: text/x-patch; name=avahi-master_port.diff; charset=us-ascii Content-Transfer-Encoding: 7bit diff -Nur avahi.orig/Makefile avahi/Makefile --- avahi.orig/Makefile Wed Feb 1 14:57:09 2006 +++ avahi/Makefile Sat Feb 18 23:24:02 2006 @@ -2,28 +2,28 @@ # Date created: 18 November 2005 # Whom: Joe Marcus Clarke # -# $FreeBSD: ports/net/avahi/Makefile,v 1.15 2006/01/30 23:19:56 kuriyama Exp $ +# $FreeBSD$ # PORTNAME= avahi PORTVERSION= 0.6.5 -PORTREVISION= 2 -CATEGORIES= net dns +PORTREVISION?= 2 +CATEGORIES?= net dns MASTER_SITES= http://www.avahi.org/download/ -MAINTAINER= gnome@FreeBSD.org -COMMENT= Service discovery on a local network +MAINTAINER?= gnome@FreeBSD.org +COMMENT?= Service discovery on a local network -LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2 \ +LIB_DEPENDS?= expat.6:${PORTSDIR}/textproc/expat2 \ daemon.2:${PORTSDIR}/devel/libdaemon \ dbus-1.2:${PORTSDIR}/devel/dbus \ gdbm.3:${PORTSDIR}/databases/gdbm -USE_GNOME= gnomehack ltverhack glib20 +USE_GNOME?= gnomehack ltverhack glib20 USE_GMAKE= yes USE_AUTOTOOLS= libtool:15 INSTALLS_SHLIB= yes -CONFIGURE_ARGS= --with-distro=freebsd \ +CONFIGURE_ARGS?=--with-distro=freebsd \ --with-dbus-system-address=unix:path=/var/run/dbus \ --disable-qt3 \ --disable-qt4 \ @@ -38,6 +38,7 @@ PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" +.if !defined(AVAHI_SLAVE) USE_RC_SUBR= yes MAN1= avahi-browse-domains.1 avahi-browse.1 avahi-publish-address.1 \ @@ -47,9 +48,11 @@ MAN8= avahi-daemon.8 avahi-dnsconfd.8 avahi-dnsconfd.action.8 OPTIONS= GTK2 "Build a GTK+ 2 browser utility" off +.endif .include +.if !defined(AVAHI_SLAVE) .if ${OSVERSION} < 500000 IGNORE= does not work on FreeBSD 4.X .endif @@ -65,6 +68,8 @@ post-install: .if !defined(PACKAGE_BUILDING) @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL +.endif + .endif .include diff -Nur avahi.orig/files/patch-avahi-sharp_Makefile.in avahi/files/patch-avahi-sharp_Makefile.in --- avahi.orig/files/patch-avahi-sharp_Makefile.in Wed Dec 31 19:00:00 1969 +++ avahi/files/patch-avahi-sharp_Makefile.in Wed Feb 15 13:18:45 2006 @@ -0,0 +1,16 @@ +--- avahi-sharp/Makefile.in.orig Tue Feb 7 23:04:12 2006 ++++ avahi-sharp/Makefile.in Tue Feb 7 23:25:30 2006 +@@ -573,10 +573,10 @@ + $(ASSEMBLY): $(AVAHISOURCES) + mcs -keyfile:$(srcdir)/avahi.snk -target:library -out:$@ -debug $(AVAHISOURCES) -r:Mono.Posix + + $(ASSEMBLY).config: $(ASSEMBLY).config.in +- $(srcdir)/gencfg.sh $(top_builddir)/avahi-client/libavahi-client.la \ +- $(top_builddir)/avahi-common/libavahi-common.la \ +- $(top_builddir)/avahi-glib/libavahi-glib.la < $< > $@ ++# $(srcdir)/gencfg.sh $(top_builddir)/avahi-client/libavahi-client.la \ ++# $(top_builddir)/avahi-common/libavahi-common.la \ ++# $(top_builddir)/avahi-glib/libavahi-glib.la < $< > $@ + + @HAVE_DBUS_TRUE@@HAVE_MONO_TRUE@all: $(ASSEMBLY) $(ASSEMBLY).config + --=-7qQFXWUYUDOFPvnV6XGX--