Attachment #182879 for bug #219514

Lines 13-20 Link Here

(-)net/samba42/Makefile (-1 / +4 lines)
13		13
14	LICENSE= GPLv3	14	LICENSE= GPLv3
15		15
16	CONFLICTS?= samba3[2-6]-3. samba4-4.0.* samba41-4.1.* samba43-4.3.* samba44-4.4.*	16	CONFLICTS?= samba4[3-9]-4.*
17		17
		18	DEPRECATED= not supported upstream https://wiki.samba.org/index.php/Samba_Release_Planning
		19	EXPIRATION_DATE= 2016-09-07
		20
18	EXTRA_PATCHES= ${PATCHDIR}/extra-patch-progress:-p1	21	EXTRA_PATCHES= ${PATCHDIR}/extra-patch-progress:-p1
19		22
20	SAMBA4_BASENAME= samba	23	SAMBA4_BASENAME= samba

Lines 13-21 Link Here

(-)net/samba43/Makefile (-2 / +3 lines)
13		13
14	LICENSE= GPLv3	14	LICENSE= GPLv3
15		15
16	CONFLICTS?= samba3[2-6]-3. samba4-4.0.* samba41-4.1.* samba42-4.2.* samba44-4.4.*	16	CONFLICTS?= samba4[24-9]-4.*
17		17
18	#EXTRA_PATCHES= ${PATCHDIR}/extra-patch-progress:-p1	18	DEPRECATED= not supported upstream https://wiki.samba.org/index.php/Samba_Release_Planning
		19	EXPIRATION_DATE= 2017-03-07
19		20
20	SAMBA4_BASENAME= samba	21	SAMBA4_BASENAME= samba
21	SAMBA4_PORTNAME= ${SAMBA4_BASENAME}4	22	SAMBA4_PORTNAME= ${SAMBA4_BASENAME}4

Lines 13-19 Link Here

(-)net/samba44/Makefile (-1 / +1 lines)
13		13
14	LICENSE= GPLv3	14	LICENSE= GPLv3
15		15
16	CONFLICTS?= samba3[2-6]-3. samba4-4.0.* samba4[1-356]-4.* p5-Parse-Pidl-4.*	16	CONFLICTS?= samba4[235-9]-4.* p5-Parse-Pidl-4.*
17		17
18	#EXTRA_PATCHES= ${PATCHDIR}/extra-patch-security:-p1	18	#EXTRA_PATCHES= ${PATCHDIR}/extra-patch-security:-p1
19		19

Lines 13-19 Link Here

(-)net/samba45/Makefile (-1 / +1 lines)
13		13
14	LICENSE= GPLv3	14	LICENSE= GPLv3
15		15
16	CONFLICTS?= samba3[2-6]-3. samba4-4.0.* samba4[1-46]-4.* p5-Parse-Pidl-4.*	16	CONFLICTS?= samba4[2-46-9]-4.* p5-Parse-Pidl-4.*
17		17
18	#EXTRA_PATCHES= ${PATCHDIR}/extra-patch-security:-p1	18	#EXTRA_PATCHES= ${PATCHDIR}/extra-patch-security:-p1
19		19

Lines 13-19 Link Here

(-)net/samba46/Makefile (-1 / +1 lines)
13		13
14	LICENSE= GPLv3	14	LICENSE= GPLv3
15		15
16	CONFLICTS?= samba3[2-6]-3. samba4-4.0.* samba4[1-5]-4.* p5-Parse-Pidl-4.*	16	CONFLICTS?= samba4[1-57-9]-4.* p5-Parse-Pidl-4.*
17		17
18	#EXTRA_PATCHES= ${PATCHDIR}/extra-patch-security:-p1	18	#EXTRA_PATCHES= ${PATCHDIR}/extra-patch-security:-p1
19		19

Return to bug 219514