diff options
| author | timur <timur@FreeBSD.org> | 2013-07-01 10:41:31 +0800 |
|---|---|---|
| committer | timur <timur@FreeBSD.org> | 2013-07-01 10:41:31 +0800 |
| commit | da91dc27fda6fc9dd34ab88d892573f9f4061bc4 (patch) | |
| tree | 639b6ac18b274bf03003b9a8492cb4220e1d78a7 | |
| parent | 88f6d07e57c5cefb611c5ebf739f653badce2943 (diff) | |
| download | freebsd-ports-gnome-da91dc27fda6fc9dd34ab88d892573f9f4061bc4.tar.gz freebsd-ports-gnome-da91dc27fda6fc9dd34ab88d892573f9f4061bc4.tar.zst freebsd-ports-gnome-da91dc27fda6fc9dd34ab88d892573f9f4061bc4.zip | |
Fixed typo in the patch that broke winbind_krb5_locator linking. Add external
dependency on tevent library.
PR: 180074, 180053
| -rw-r--r-- | net/samba36/Makefile | 6 | ||||
| -rw-r--r-- | net/samba36/files/patch-source3__Makefile.in | 8 |
2 files changed, 9 insertions, 5 deletions
diff --git a/net/samba36/Makefile b/net/samba36/Makefile index aa21e5c3a25a..860284971b9c 100644 --- a/net/samba36/Makefile +++ b/net/samba36/Makefile @@ -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 --enable-external-libtdb 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 diff --git a/net/samba36/files/patch-source3__Makefile.in b/net/samba36/files/patch-source3__Makefile.in index 4bef015a5772..084dd93c0b10 100644 --- a/net/samba36/files/patch-source3__Makefile.in +++ b/net/samba36/files/patch-source3__Makefile.in @@ -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) \ |