Attachment #246077 for bug #274885

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

Lines 1-6 Link Here

(-)b/net/samba413/Makefile (-5 / +5 lines)
1	PORTNAME= ${SAMBA4_BASENAME}413	1	PORTNAME= ${SAMBA4_BASENAME}413
2	PORTVERSION= ${SAMBA4_VERSION}	2	PORTVERSION= ${SAMBA4_VERSION}
3	PORTREVISION= 6	3	PORTREVISION= 7
4	CATEGORIES?= net	4	CATEGORIES?= net
5	MASTER_SITES= SAMBA/samba/stable SAMBA/samba/rc	5	MASTER_SITES= SAMBA/samba/stable SAMBA/samba/rc
6	DISTNAME= ${SAMBA4_DISTNAME}	6	DISTNAME= ${SAMBA4_DISTNAME}
Lines 99-104 USE_LDCONFIG= ${SAMBA4_LIBDIR} Link Here
99	WAF_CMD= buildtools/bin/waf	99	WAF_CMD= buildtools/bin/waf
100	CONFIGURE_LOG= bin/config.log	100	CONFIGURE_LOG= bin/config.log
101		101
		102	# Make sure that the right version of Python is used by the tools
		103	# https://bugzilla.samba.org/show_bug.cgi?id=7305
		104	SHEBANG_FILES= ${PATCH_WRKSRC}/source4/scripting/bin/* ${PATCH_WRKSRC}/selftest/*
		105
102	PKGCONFIGDIR?= ${PREFIX}/libdata/pkgconfig	106	PKGCONFIGDIR?= ${PREFIX}/libdata/pkgconfig
103	PKGCONFIGDIR_REL?= ${PKGCONFIGDIR:S,^${PREFIX}/,,}	107	PKGCONFIGDIR_REL?= ${PKGCONFIGDIR:S,^${PREFIX}/,,}
104	PLIST_SUB+= PKGCONFIGDIR=${PKGCONFIGDIR_REL}	108	PLIST_SUB+= PKGCONFIGDIR=${PKGCONFIGDIR_REL}
Lines 572-581 MAKE_ENV+= RPCGEN_CPP="${CPP}" Link Here
572	# undefined symbols.	576	# undefined symbols.
573	LDFLAGS+= -Wl,--undefined-version	577	LDFLAGS+= -Wl,--undefined-version
574		578
575	# Make sure that the right version of Python is used by the tools
576	# https://bugzilla.samba.org/show_bug.cgi?id=7305
577	SHEBANG_FILES= ${PATCH_WRKSRC}/source4/scripting/bin/* ${PATCH_WRKSRC}/selftest/*
578
579	SAMBA4_SUB= SAMBA4_LOGDIR="${SAMBA4_LOGDIR}" \	579	SAMBA4_SUB= SAMBA4_LOGDIR="${SAMBA4_LOGDIR}" \
580	SAMBA4_RUNDIR="${SAMBA4_RUNDIR}" \	580	SAMBA4_RUNDIR="${SAMBA4_RUNDIR}" \
581	SAMBA4_LOCKDIR="${SAMBA4_LOCKDIR}" \	581	SAMBA4_LOCKDIR="${SAMBA4_LOCKDIR}" \

Lines 1-5 Link Here

(-)b/net/samba416/Makefile (-5 / +5 lines)
1	PORTNAME= ${SAMBA4_BASENAME}416	1	PORTNAME= ${SAMBA4_BASENAME}416
2	PORTVERSION= ${SAMBA4_VERSION}	2	PORTVERSION= ${SAMBA4_VERSION}
		3	PORTREVISION= 1
3	CATEGORIES?= net	4	CATEGORIES?= net
4	MASTER_SITES= SAMBA/samba/stable SAMBA/samba/rc	5	MASTER_SITES= SAMBA/samba/stable SAMBA/samba/rc
5	DISTNAME= ${SAMBA4_DISTNAME}	6	DISTNAME= ${SAMBA4_DISTNAME}
Lines 104-109 USE_LDCONFIG= ${SAMBA4_LIBDIR} Link Here
104	WAF_CMD= buildtools/bin/waf	105	WAF_CMD= buildtools/bin/waf
105	CONFIGURE_LOG= bin/config.log	106	CONFIGURE_LOG= bin/config.log
106		107
		108	# Make sure that the right version of Python is used by the tools
		109	# https://bugzilla.samba.org/show_bug.cgi?id=7305
		110	SHEBANG_FILES= ${PATCH_WRKSRC}/source4/scripting/bin/* ${PATCH_WRKSRC}/selftest/*
		111
107	PKGCONFIGDIR?= ${PREFIX}/libdata/pkgconfig	112	PKGCONFIGDIR?= ${PREFIX}/libdata/pkgconfig
108	PKGCONFIGDIR_REL?= ${PKGCONFIGDIR:S,^${PREFIX}/,,}	113	PKGCONFIGDIR_REL?= ${PKGCONFIGDIR:S,^${PREFIX}/,,}
109	PLIST_SUB= PKGCONFIGDIR=${PKGCONFIGDIR_REL}	114	PLIST_SUB= PKGCONFIGDIR=${PKGCONFIGDIR_REL}
Lines 554-563 MAKE_ENV+= RPCGEN_CPP="${CPP}" Link Here
554	#CFLAGS+= -D_FUNCTION_DEF	559	#CFLAGS+= -D_FUNCTION_DEF
555	#.endif	560	#.endif
556		561
557	# Make sure that the right version of Python is used by the tools
558	# https://bugzilla.samba.org/show_bug.cgi?id=7305
559	SHEBANG_FILES= ${PATCH_WRKSRC}/source4/scripting/bin/* ${PATCH_WRKSRC}/selftest/*
560
561	SAMBA4_SUB= SAMBA4_LOGDIR="${SAMBA4_LOGDIR}" \	562	SAMBA4_SUB= SAMBA4_LOGDIR="${SAMBA4_LOGDIR}" \
562	SAMBA4_RUNDIR="${SAMBA4_RUNDIR}" \	563	SAMBA4_RUNDIR="${SAMBA4_RUNDIR}" \
563	SAMBA4_LOCKDIR="${SAMBA4_LOCKDIR}" \	564	SAMBA4_LOCKDIR="${SAMBA4_LOCKDIR}" \
564	-

Return to bug 274885