Package: nis
Version: 3.17-28
Severity: important
Tags: patch
User: [email protected]
Usertags: kfreebsd

Hi,

the current version fails to build on GNU/kFreeBSD.

It needs small tweaks, see attached patch.

It would also be nice if you can ask upstream
to include the needed source change.

Thanks in advance

                        Petr

diff -u nis-3.17/debian/control nis-3.17/debian/control
--- nis-3.17/debian/control
+++ nis-3.17/debian/control
@@ -4,7 +4,9 @@
 Maintainer: Mark Brown <[email protected]>
 Uploaders: Miquel van Smoorenburg <[email protected]>
 Standards-Version: 3.8.1
-Build-Depends: libgdbm-dev, gcc (>= 2.95), gettext, po-debconf, libslp-dev, libdbus-glib-1-dev, network-manager-dev, file
+Build-Depends: libgdbm-dev, gcc (>= 2.95), gettext, po-debconf, libslp-dev, file,
+ libdbus-glib-1-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
+ network-manager-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386]
 Vcs-Bzr: http://bzr.debian.org/bzr/pkg-nis/nis/debian/
 
 Package: nis
diff -u nis-3.17/debian/rules nis-3.17/debian/rules
--- nis-3.17/debian/rules
+++ nis-3.17/debian/rules
@@ -15,6 +15,11 @@
 SHELL=/bin/bash
 DEB_BUILD_GNU_TYPE := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 DEB_HOST_GNU_TYPE := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_HOST_ARCH_OS  := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
+
+ifneq (linux,$(DEB_HOST_ARCH_OS))
+        YPBIND_CONF=--disable-dbus-nm
+endif
 
 ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
         CFLAGS = "-O2 -Wall -g"
@@ -47,6 +52,7 @@
 	(cd $(YPTOOLS) && make)
 	-(cd $(YPBIND) && [ ! -f config.status ] && \
 		CFLAGS=$(CFLAGS) ./configure \
+		$(YPBIND_CONF) \
 		--prefix=/usr --mandir=/usr/share/man \
 		--sysconfdir=/etc --libexecdir=/usr/lib/yp \
 		--enable-slp \
only in patch2:
unchanged:
--- nis-3.17.orig/ypbind-mt-1.20.1/src/ypbind-mt.c
+++ nis-3.17/ypbind-mt-1.20.1/src/ypbind-mt.c
@@ -875,8 +875,11 @@
       portmapper_disconnect ();
       exit (1);
     }
+
+#ifdef USE_DBUS_NM
   if (!is_online)
     portmapper_disconnect ();
+#endif
 
   pthread_create (&ping_thread, NULL, &test_bindings, NULL);
 

Reply via email to