Attachment #206226 for bug #239480

View | Details | Raw Unified | Return to bug 239480
Collapse All | Expand All




PORTNAME=                      ${SAMBA4_BASENAME}48
PORTVERSION=                   ${SAMBA4_VERSION}
PORTREVISION=                  5
CATEGORIES?=                   net
MASTER_SITES=                  SAMBA/samba/stable SAMBA/samba/rc
DISTNAME=                      ${SAMBA4_DISTNAME}

# cmocka
.if defined(SAMBA4_BUNDLED_CMOCKA) && ${SAMBA4_BUNDLED_CMOCKA} == yes
SAMBA4_BUNDLED_LIBS+=          cmocka
CONFLICTS_INSTALL+=                    cmocka-1.*
CONFLICTS+=                    cmocka-1.*
PLIST_SUB+=                    SAMBA4_BUNDLED_CMOCKA=""
SUB_LIST+=                     SAMBA4_BUNDLED_CMOCKA=""
.else

# talloc
.if defined(SAMBA4_BUNDLED_TALLOC) && ${SAMBA4_BUNDLED_TALLOC} == yes
SAMBA4_BUNDLED_LIBS+=          talloc
CONFLICTS_INSTALL+=                    talloc1-2.*
CONFLICTS+=                    talloc1-2.*
PLIST_SUB+=                    SAMBA4_BUNDLED_TALLOC=""
SUB_LIST+=                     SAMBA4_BUNDLED_TALLOC=""
.else

# tevent
.if defined(SAMBA4_BUNDLED_TEVENT) && ${SAMBA4_BUNDLED_TEVENT} == yes
SAMBA4_BUNDLED_LIBS+=          tevent
CONFLICTS_INSTALL+=                    tevent1-0.*
CONFLICTS+=                    tevent1-0.*
PLIST_SUB+=                    SAMBA4_BUNDLED_TEVENT=""
SUB_LIST+=                     SAMBA4_BUNDLED_TEVENT=""
.else

# tdb
.if defined(SAMBA4_BUNDLED_TDB) && ${SAMBA4_BUNDLED_TDB} == yes
SAMBA4_BUNDLED_LIBS+=          tdb
CONFLICTS_INSTALL+=                    tdb1-1.*
CONFLICTS+=                    tdb1-1.*
PLIST_SUB+=                    SAMBA4_BUNDLED_TDB=""
SUB_LIST+=                     SAMBA4_BUNDLED_TDB=""
.else

.if defined(SAMBA4_BUNDLED_LDB) && ${SAMBA4_BUNDLED_LDB} == yes
SAMBA4_BUNDLED_LDB=            yes
SAMBA4_BUNDLED_LIBS+=          ldb
CONFLICTS_INSTALL+=                    ldb-1.* ldb1[23]-1.*
CONFLICTS+=                    ldb-1.* ldb1[23]-1.*
PLIST_SUB+=                    SAMBA4_BUNDLED_LDB=""
SUB_LIST+=                     SAMBA4_BUNDLED_LDB=""
.else

       || (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

.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)




%%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

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

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

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

Return to bug 239480

Lines 3-9 Link Here

(-)Makefile (working copy) (-13 / +6 lines)
3	PORTNAME= ${SAMBA4_BASENAME}48	3	PORTNAME= ${SAMBA4_BASENAME}48
4	PORTVERSION= ${SAMBA4_VERSION}	4	PORTVERSION= ${SAMBA4_VERSION}
5	PORTREVISION= 4	5	PORTREVISION= 5
6	CATEGORIES?= net	6	CATEGORIES?= net
7	MASTER_SITES= SAMBA/samba/stable SAMBA/samba/rc	7	MASTER_SITES= SAMBA/samba/stable SAMBA/samba/rc
8	DISTNAME= ${SAMBA4_DISTNAME}	8	DISTNAME= ${SAMBA4_DISTNAME}
Lines 164-171 Link Here
164	# cmocka	164	# cmocka
165	.if defined(SAMBA4_BUNDLED_CMOCKA) && ${SAMBA4_BUNDLED_CMOCKA} == yes	165	.if defined(SAMBA4_BUNDLED_CMOCKA) && ${SAMBA4_BUNDLED_CMOCKA} == yes
166	SAMBA4_BUNDLED_LIBS+= cmocka	166	SAMBA4_BUNDLED_LIBS+= cmocka
167	SAMBA4_BUILTIN_LIBS+= cmocka	167	CONFLICTS_INSTALL+= cmocka-1.*
168	CONFLICTS+= cmocka-1.*
169	PLIST_SUB+= SAMBA4_BUNDLED_CMOCKA=""	168	PLIST_SUB+= SAMBA4_BUNDLED_CMOCKA=""
170	SUB_LIST+= SAMBA4_BUNDLED_CMOCKA=""	169	SUB_LIST+= SAMBA4_BUNDLED_CMOCKA=""
171	.else	170	.else
Lines 178-185 Link Here
178	# talloc	177	# talloc
179	.if defined(SAMBA4_BUNDLED_TALLOC) && ${SAMBA4_BUNDLED_TALLOC} == yes	178	.if defined(SAMBA4_BUNDLED_TALLOC) && ${SAMBA4_BUNDLED_TALLOC} == yes
180	SAMBA4_BUNDLED_LIBS+= talloc	179	SAMBA4_BUNDLED_LIBS+= talloc
181	SAMBA4_BUILTIN_LIBS+= talloc	180	CONFLICTS_INSTALL+= talloc1-2.*
182	CONFLICTS+= talloc1-2.*
183	PLIST_SUB+= SAMBA4_BUNDLED_TALLOC=""	181	PLIST_SUB+= SAMBA4_BUNDLED_TALLOC=""
184	SUB_LIST+= SAMBA4_BUNDLED_TALLOC=""	182	SUB_LIST+= SAMBA4_BUNDLED_TALLOC=""
185	.else	183	.else
Lines 192-199 Link Here
192	# tevent	190	# tevent
193	.if defined(SAMBA4_BUNDLED_TEVENT) && ${SAMBA4_BUNDLED_TEVENT} == yes	191	.if defined(SAMBA4_BUNDLED_TEVENT) && ${SAMBA4_BUNDLED_TEVENT} == yes
194	SAMBA4_BUNDLED_LIBS+= tevent	192	SAMBA4_BUNDLED_LIBS+= tevent
195	SAMBA4_BUILTIN_LIBS+= tevent	193	CONFLICTS_INSTALL+= tevent1-0.*
196	CONFLICTS+= tevent1-0.*
197	PLIST_SUB+= SAMBA4_BUNDLED_TEVENT=""	194	PLIST_SUB+= SAMBA4_BUNDLED_TEVENT=""
198	SUB_LIST+= SAMBA4_BUNDLED_TEVENT=""	195	SUB_LIST+= SAMBA4_BUNDLED_TEVENT=""
199	.else	196	.else
Lines 206-213 Link Here
206	# tdb	203	# tdb
207	.if defined(SAMBA4_BUNDLED_TDB) && ${SAMBA4_BUNDLED_TDB} == yes	204	.if defined(SAMBA4_BUNDLED_TDB) && ${SAMBA4_BUNDLED_TDB} == yes
208	SAMBA4_BUNDLED_LIBS+= tdb	205	SAMBA4_BUNDLED_LIBS+= tdb
209	SAMBA4_BUILTIN_LIBS+= tdb	206	CONFLICTS_INSTALL+= tdb1-1.*
210	CONFLICTS+= tdb1-1.*
211	PLIST_SUB+= SAMBA4_BUNDLED_TDB=""	207	PLIST_SUB+= SAMBA4_BUNDLED_TDB=""
212	SUB_LIST+= SAMBA4_BUNDLED_TDB=""	208	SUB_LIST+= SAMBA4_BUNDLED_TDB=""
213	.else	209	.else
Lines 221-228 Link Here
221	.if defined(SAMBA4_BUNDLED_LDB) && ${SAMBA4_BUNDLED_LDB} == yes	217	.if defined(SAMBA4_BUNDLED_LDB) && ${SAMBA4_BUNDLED_LDB} == yes
222	SAMBA4_BUNDLED_LDB= yes	218	SAMBA4_BUNDLED_LDB= yes
223	SAMBA4_BUNDLED_LIBS+= ldb	219	SAMBA4_BUNDLED_LIBS+= ldb
224	SAMBA4_BUILTIN_LIBS+= ldb	220	CONFLICTS_INSTALL+= ldb-1.* ldb1[23]-1.*
225	CONFLICTS+= ldb-1.* ldb1[23]-1.*
226	PLIST_SUB+= SAMBA4_BUNDLED_LDB=""	221	PLIST_SUB+= SAMBA4_BUNDLED_LDB=""
227	SUB_LIST+= SAMBA4_BUNDLED_LDB=""	222	SUB_LIST+= SAMBA4_BUNDLED_LDB=""
228	.else	223	.else
Lines 238-244 Link Here
238	\|\| (defined(SAMBA4_BUNDLED_LDB) && ${SAMBA4_BUNDLED_LDB} == yes) \	233	\|\| (defined(SAMBA4_BUNDLED_LDB) && ${SAMBA4_BUNDLED_LDB} == yes) \
239	\|\| (defined(SAMBA4_BUNDLED_TEVENT) && ${SAMBA4_BUNDLED_TEVENT} == yes)	234	\|\| (defined(SAMBA4_BUNDLED_TEVENT) && ${SAMBA4_BUNDLED_TEVENT} == yes)
240	SAMBA4_BUNDLED_LIBS+= replace	235	SAMBA4_BUNDLED_LIBS+= replace
241	SAMBA4_BUILTIN_LIBS+= replace
242	.endif	236	.endif
243	# Don't use external libcom_err	237	# Don't use external libcom_err
244	SAMBA4_BUNDLED_LIBS+= com_err	238	SAMBA4_BUNDLED_LIBS+= com_err
Lines 437-443 Link Here
437	.if defined(SAMBA4_BUNDLED_LIBS) && !empty(SAMBA4_BUNDLED_LIBS)	431	.if defined(SAMBA4_BUNDLED_LIBS) && !empty(SAMBA4_BUNDLED_LIBS)
438	CONFIGURE_ARGS+= --bundled-libraries="${SAMBA4_BUNDLED_LIBS:Q:C\|( \\\\ )+\|,\|g:S\|\\\|\|g}"	432	CONFIGURE_ARGS+= --bundled-libraries="${SAMBA4_BUNDLED_LIBS:Q:C\|( \\\\ )+\|,\|g:S\|\\\|\|g}"
439	CONFIGURE_ARGS+= --builtin-libraries="${SAMBA4_BUILTIN_LIBS:Q:C\|( \\\\ )+\|,\|g:S\|\\\|\|g}"
440	.endif	433	.endif
441	.if defined(SAMBA4_MODULES) && !empty(SAMBA4_MODULES)	434	.if defined(SAMBA4_MODULES) && !empty(SAMBA4_MODULES)

Lines 238-243 Link Here

(-)pkg-plist (working copy) (+7 lines)
238	%%GSSAPI_BUILTIN%%lib/samba4/private/libkdc-samba4.so.2	238	%%GSSAPI_BUILTIN%%lib/samba4/private/libkdc-samba4.so.2
239	%%GSSAPI_BUILTIN%%lib/samba4/private/libkrb5-samba4.so.26	239	%%GSSAPI_BUILTIN%%lib/samba4/private/libkrb5-samba4.so.26
240	lib/samba4/private/libkrb5samba-samba4.so	240	lib/samba4/private/libkrb5samba-samba4.so
		241	%%SAMBA4_BUNDLED_LDB%%lib/samba4/private/libldb.so.1
241	lib/samba4/private/libldbsamba-samba4.so	242	lib/samba4/private/libldbsamba-samba4.so
242	lib/samba4/private/liblibcli-lsa3-samba4.so	243	lib/samba4/private/liblibcli-lsa3-samba4.so
243	lib/samba4/private/liblibcli-netlogon3-samba4.so	244	lib/samba4/private/liblibcli-netlogon3-samba4.so
Lines 257-262 Link Here
257	lib/samba4/private/libpopt-samba3-samba4.so	258	lib/samba4/private/libpopt-samba3-samba4.so
258	lib/samba4/private/libpopt-samba3-cmdline-samba4.so	259	lib/samba4/private/libpopt-samba3-cmdline-samba4.so
259	lib/samba4/private/libprinting-migrate-samba4.so	260	lib/samba4/private/libprinting-migrate-samba4.so
		261	lib/samba4/private/libreplace-samba4.so
260	lib/samba4/private/libregistry-samba4.so	262	lib/samba4/private/libregistry-samba4.so
261	%%GSSAPI_BUILTIN%%lib/samba4/private/libroken-samba4.so.19	263	%%GSSAPI_BUILTIN%%lib/samba4/private/libroken-samba4.so.19
262	lib/samba4/private/libsamba-cluster-support-samba4.so	264	lib/samba4/private/libsamba-cluster-support-samba4.so
Lines 281-288 Link Here
281	lib/samba4/private/libsmbpasswdparser-samba4.so	283	lib/samba4/private/libsmbpasswdparser-samba4.so
282	lib/samba4/private/libsocket-blocking-samba4.so	284	lib/samba4/private/libsocket-blocking-samba4.so
283	lib/samba4/private/libsys-rw-samba4.so	285	lib/samba4/private/libsys-rw-samba4.so
		286	%%SAMBA4_BUNDLED_TALLOC%%lib/samba4/private/libtalloc.so.2
284	lib/samba4/private/libtalloc-report-samba4.so	287	lib/samba4/private/libtalloc-report-samba4.so
		288	%%SAMBA4_BUNDLED_TDB%%lib/samba4/private/libtdb.so.1
285	lib/samba4/private/libtdb-wrap-samba4.so	289	lib/samba4/private/libtdb-wrap-samba4.so
		290	%%SAMBA4_BUNDLED_TEVENT%%lib/samba4/private/libtevent.so.0
286	lib/samba4/private/libtime-basic-samba4.so	291	lib/samba4/private/libtime-basic-samba4.so
287	lib/samba4/private/libtorture-samba4.so	292	lib/samba4/private/libtorture-samba4.so
288	lib/samba4/private/libtrusts-util-samba4.so	293	lib/samba4/private/libtrusts-util-samba4.so
Lines 880-885 Link Here
880	man/man3/Parse::Pidl::Util.3.gz	885	man/man3/Parse::Pidl::Util.3.gz
881	man/man3/Parse::Pidl::Wireshark::Conformance.3.gz	886	man/man3/Parse::Pidl::Wireshark::Conformance.3.gz
882	man/man3/Parse::Pidl::Wireshark::NDR.3.gz	887	man/man3/Parse::Pidl::Wireshark::NDR.3.gz
		888	%%SAMBA4_BUNDLED_LDB%%man/man3/ldb.3.gz
		889	%%SAMBA4_BUNDLED_TALLOC%%man/man3/talloc.3.gz
883	man/man5/lmhosts.5.gz	890	man/man5/lmhosts.5.gz
884	man/man5/pam_winbind.conf.5.gz	891	man/man5/pam_winbind.conf.5.gz
885	man/man5/smb.conf.5.gz	892	man/man5/smb.conf.5.gz