Date: Mon, 1 Jul 2013 02:41:32 +0000 (UTC) From: "Timur I. Bakeyev" <timur@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r322112 - in head/net/samba36: . files Message-ID: <201307010241.r612fWXr031467@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: timur Date: Mon Jul 1 02:41:31 2013 New Revision: 322112 URL: http://svnweb.freebsd.org/changeset/ports/322112 Log: Fixed typo in the patch that broke winbind_krb5_locator linking. Add external dependency on tevent library. PR: 180074, 180053 Modified: head/net/samba36/Makefile head/net/samba36/files/patch-source3__Makefile.in Modified: head/net/samba36/Makefile ============================================================================== --- head/net/samba36/Makefile Mon Jul 1 02:36:07 2013 (r322111) +++ head/net/samba36/Makefile Mon Jul 1 02:41:31 2013 (r322112) @@ -2,7 +2,7 @@ PORTNAME= ${SAMBA_BASENAME}36 PORTVERSION= 3.6.16 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES?= net MASTER_SITES= ${MASTER_SITE_SAMBA} MASTER_SITE_SUBDIR= samba samba/stable samba/pre @@ -90,6 +90,10 @@ CONFIGURE_ARGS+= --without-libtdb --enab BUILD_DEPENDS+= talloc>=2.0.1:${PORTSDIR}/devel/talloc RUN_DEPENDS+= talloc>=2.0.1:${PORTSDIR}/devel/talloc CONFIGURE_ARGS+= --without-libtalloc --enable-external-libtalloc +# tevent +BUILD_DEPENDS+= tevent>=0.9.11:${PORTSDIR}/devel/tevent +RUN_DEPENDS+= tevent>=0.9.11:${PORTSDIR}/devel/tevent +CONFIGURE_ARGS+= --without-libtevent --enable-external-libtevent # These options are common for all (sub)ports CONFIGURE_ARGS+= --with-libiconv="${LOCALBASE}" \ --disable-as-needed Modified: head/net/samba36/files/patch-source3__Makefile.in ============================================================================== --- head/net/samba36/files/patch-source3__Makefile.in Mon Jul 1 02:36:07 2013 (r322111) +++ head/net/samba36/files/patch-source3__Makefile.in Mon Jul 1 02:41:31 2013 (r322112) @@ -1,5 +1,5 @@ --- ./source3/Makefile.in.orig 2013-06-19 07:35:24.000000000 +0000 -+++ ./source3/Makefile.in 2013-06-27 02:34:58.169873859 +0000 ++++ ./source3/Makefile.in 2013-06-30 04:26:08.399888796 +0000 @@ -151,7 +151,7 @@ # These can be overridden by command line switches (see smbd(8)) # or in smb.conf (see smb.conf(5)) @@ -38,19 +38,19 @@ PRECOMPILED_HEADER = $(builddir)/include/includes.h.gch # this adds support for precompiled headers. To use it, install a snapshot -@@ -2856,9 +2860,10 @@ +@@ -2856,9 +2860,9 @@ $(LDAP_LIBS) $(KRB5LIBS) $(LIBS) $(LIBTALLOC_LIBS) $(LIBTEVENT_LIBS) $(LIBTDB_LIBS) $(ZLIB_LIBS) \ @SONAMEFLAG@`basename $@`@NSSSONAMEVERSIONSUFFIX@ -bin/winbind_krb5_locator.@SHLIBEXT@: $(BINARY_PREREQS) $(WINBIND_KRB5_LOCATOR_OBJ) $(LIBWBCLIENT) +bin/winbind_krb5_locator.@SHLIBEXT@: $(BINARY_PREREQS) $(WINBIND_KRB5_LOCATOR_OBJ) $(LIBTALLOC) $(LIBWBCLIENT) @echo "Linking $@" - @$(SHLD) $(LDSHFLAGS) -o $@ $(WINBIND_KRB5_LOCATOR_OBJ) $(LIBWBCLIENT_LIBS) $(KRB5LIBS) \ +- @$(SHLD) $(LDSHFLAGS) -o $@ $(WINBIND_KRB5_LOCATOR_OBJ) $(LIBWBCLIENT_LIBS) $(KRB5LIBS) \ + @$(SHLD) $(LDSHFLAGS) -o $@ $(WINBIND_KRB5_LOCATOR_OBJ) $(LIBTALLOC_LIBS) $(LIBWBCLIENT_LIBS) $(KRB5LIBS) \ $(LIBREPLACE_LIBS) @SONAMEFLAG@`basename $@` bin/pam_winbind.@SHLIBEXT@: $(BINARY_PREREQS) $(PAM_WINBIND_OBJ) $(LIBTALLOC) $(LIBTEVENT) $(LIBWBCLIENT) -@@ -3215,7 +3220,8 @@ +@@ -3215,7 +3219,8 @@ @echo "Linking shared library $@" @$(SHLD) $(LDSHFLAGS) -o $@ $(PAM_SMBPASS_OBJ) $(LIBCLI_LDAP_NDR_OBJ) -lpam $(DYNEXP) \ $(LIBS) $(LDAP_LIBS) $(NSCD_LIBS) \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201307010241.r612fWXr031467>