Index: Makefile
===================================================================
--- Makefile    (revision 507866)
+++ Makefile    (working copy)
@@ -3,7 +3,7 @@

 PORTNAME=                      ${SAMBA4_BASENAME}48
 PORTVERSION=                   ${SAMBA4_VERSION}
-PORTREVISION=                  4
+PORTREVISION=                  5
 CATEGORIES?=                   net
 MASTER_SITES=                  SAMBA/samba/stable SAMBA/samba/rc
 DISTNAME=                      ${SAMBA4_DISTNAME}
@@ -164,8 +164,7 @@
 # cmocka
 .if defined(SAMBA4_BUNDLED_CMOCKA) && ${SAMBA4_BUNDLED_CMOCKA} == yes
 SAMBA4_BUNDLED_LIBS+=          cmocka
-SAMBA4_BUILTIN_LIBS+=          cmocka
-CONFLICTS+=                    cmocka-1.*
+CONFLICTS_INSTALL+=                    cmocka-1.*
 PLIST_SUB+=                    SAMBA4_BUNDLED_CMOCKA=""
 SUB_LIST+=                     SAMBA4_BUNDLED_CMOCKA=""
 .else
@@ -178,8 +177,7 @@
 # talloc
 .if defined(SAMBA4_BUNDLED_TALLOC) && ${SAMBA4_BUNDLED_TALLOC} == yes
 SAMBA4_BUNDLED_LIBS+=          talloc
-SAMBA4_BUILTIN_LIBS+=          talloc
-CONFLICTS+=                    talloc1-2.*
+CONFLICTS_INSTALL+=                    talloc1-2.*
 PLIST_SUB+=                    SAMBA4_BUNDLED_TALLOC=""
 SUB_LIST+=                     SAMBA4_BUNDLED_TALLOC=""
 .else
@@ -192,8 +190,7 @@
 # tevent
 .if defined(SAMBA4_BUNDLED_TEVENT) && ${SAMBA4_BUNDLED_TEVENT} == yes
 SAMBA4_BUNDLED_LIBS+=          tevent
-SAMBA4_BUILTIN_LIBS+=          tevent
-CONFLICTS+=                    tevent1-0.*
+CONFLICTS_INSTALL+=                    tevent1-0.*
 PLIST_SUB+=                    SAMBA4_BUNDLED_TEVENT=""
 SUB_LIST+=                     SAMBA4_BUNDLED_TEVENT=""
 .else
@@ -206,8 +203,7 @@
 # tdb
 .if defined(SAMBA4_BUNDLED_TDB) && ${SAMBA4_BUNDLED_TDB} == yes
 SAMBA4_BUNDLED_LIBS+=          tdb
-SAMBA4_BUILTIN_LIBS+=          tdb
-CONFLICTS+=                    tdb1-1.*
+CONFLICTS_INSTALL+=                    tdb1-1.*
 PLIST_SUB+=                    SAMBA4_BUNDLED_TDB=""
 SUB_LIST+=                     SAMBA4_BUNDLED_TDB=""
 .else
@@ -221,8 +217,7 @@
 .if defined(SAMBA4_BUNDLED_LDB) && ${SAMBA4_BUNDLED_LDB} == yes
 SAMBA4_BUNDLED_LDB=            yes
 SAMBA4_BUNDLED_LIBS+=          ldb
-SAMBA4_BUILTIN_LIBS+=          ldb
-CONFLICTS+=                    ldb-1.* ldb1[23]-1.*
+CONFLICTS_INSTALL+=                    ldb-1.* ldb1[23]-1.*
 PLIST_SUB+=                    SAMBA4_BUNDLED_LDB=""
 SUB_LIST+=                     SAMBA4_BUNDLED_LDB=""
 .else
@@ -238,7 +233,6 @@
        || (defined(SAMBA4_BUNDLED_LDB) && ${SAMBA4_BUNDLED_LDB} == yes) \
        || (defined(SAMBA4_BUNDLED_TEVENT) && ${SAMBA4_BUNDLED_TEVENT} == yes)
 SAMBA4_BUNDLED_LIBS+=          replace
-SAMBA4_BUILTIN_LIBS+=          replace
 .endif
 # Don't use external libcom_err
 SAMBA4_BUNDLED_LIBS+=          com_err
@@ -437,7 +431,6 @@

 .if defined(SAMBA4_BUNDLED_LIBS) && !empty(SAMBA4_BUNDLED_LIBS)
 CONFIGURE_ARGS+=               --bundled-libraries="${SAMBA4_BUNDLED_LIBS:Q:C|(                                                                                                             \\\\ )+|,|g:S|\\||g}"
-CONFIGURE_ARGS+=               --builtin-libraries="${SAMBA4_BUILTIN_LIBS:Q:C|(                                                                                                             \\\\ )+|,|g:S|\\||g}"
 .endif

 .if defined(SAMBA4_MODULES) && !empty(SAMBA4_MODULES)
Index: pkg-plist
===================================================================
--- pkg-plist   (revision 507866)
+++ pkg-plist   (working copy)
@@ -238,6 +238,7 @@
 %%GSSAPI_BUILTIN%%lib/samba4/private/libkdc-samba4.so.2
 %%GSSAPI_BUILTIN%%lib/samba4/private/libkrb5-samba4.so.26
 lib/samba4/private/libkrb5samba-samba4.so
+%%SAMBA4_BUNDLED_LDB%%lib/samba4/private/libldb.so.1
 lib/samba4/private/libldbsamba-samba4.so
 lib/samba4/private/liblibcli-lsa3-samba4.so
 lib/samba4/private/liblibcli-netlogon3-samba4.so
@@ -257,6 +258,7 @@
 lib/samba4/private/libpopt-samba3-samba4.so
 lib/samba4/private/libpopt-samba3-cmdline-samba4.so
 lib/samba4/private/libprinting-migrate-samba4.so
+lib/samba4/private/libreplace-samba4.so
 lib/samba4/private/libregistry-samba4.so
 %%GSSAPI_BUILTIN%%lib/samba4/private/libroken-samba4.so.19
 lib/samba4/private/libsamba-cluster-support-samba4.so
@@ -281,8 +283,11 @@
 lib/samba4/private/libsmbpasswdparser-samba4.so
 lib/samba4/private/libsocket-blocking-samba4.so
 lib/samba4/private/libsys-rw-samba4.so
+%%SAMBA4_BUNDLED_TALLOC%%lib/samba4/private/libtalloc.so.2
 lib/samba4/private/libtalloc-report-samba4.so
+%%SAMBA4_BUNDLED_TDB%%lib/samba4/private/libtdb.so.1
 lib/samba4/private/libtdb-wrap-samba4.so
+%%SAMBA4_BUNDLED_TEVENT%%lib/samba4/private/libtevent.so.0
 lib/samba4/private/libtime-basic-samba4.so
 lib/samba4/private/libtorture-samba4.so
 lib/samba4/private/libtrusts-util-samba4.so
@@ -880,6 +885,8 @@
 man/man3/Parse::Pidl::Util.3.gz
 man/man3/Parse::Pidl::Wireshark::Conformance.3.gz
 man/man3/Parse::Pidl::Wireshark::NDR.3.gz
+%%SAMBA4_BUNDLED_LDB%%man/man3/ldb.3.gz
+%%SAMBA4_BUNDLED_TALLOC%%man/man3/talloc.3.gz
 man/man5/lmhosts.5.gz
 man/man5/pam_winbind.conf.5.gz
 man/man5/smb.conf.5.gz