Attachment #218676 for bug #250281

Lines 15635-15637 Link Here

(-)MOVED (+2 lines)
15635	audio/zinf\|\|2020-10-02\|Has expired: Does not build, no upstream	15635	audio/zinf\|\|2020-10-02\|Has expired: Does not build, no upstream
15636	emulators/qemu-sbruno\|emulators/qemu\|2020-10-02\|Has expired: Port will be removed in favor of emulators/qemu	15636	emulators/qemu-sbruno\|emulators/qemu\|2020-10-02\|Has expired: Port will be removed in favor of emulators/qemu
15637	dns/knot2-lib\|dns/knot3-lib\|2020-10-04\|Replaced by a more recent version	15637	dns/knot2-lib\|dns/knot3-lib\|2020-10-04\|Replaced by a more recent version
		15638	devel/git-gui\|devel/git@gui\|2020-10-12\|Replaced by a flavor
		15639	devel/git-lite\|devel/git@lite\|2020-10-12\|Replaced by a flavor

Lines 784-792 Link Here

(-)devel/Makefile (-2 lines)
784	SUBDIR += git-cola	784	SUBDIR += git-cola
785	SUBDIR += git-delta	785	SUBDIR += git-delta
786	SUBDIR += git-extras	786	SUBDIR += git-extras
787	SUBDIR += git-gui
788	SUBDIR += git-lfs	787	SUBDIR += git-lfs
789	SUBDIR += git-lite
790	SUBDIR += git-merge-changelog	788	SUBDIR += git-merge-changelog
791	SUBDIR += git-modes	789	SUBDIR += git-modes
792	SUBDIR += git-review	790	SUBDIR += git-review




		${PORTNAME}-manpages-${DISTVERSION}${EXTRACT_SUFX}

MAINTAINER=	garga@FreeBSD.org
.if ${FLAVOR:U} == default
COMMENT=	Distributed source code management tool
.elif ${FLAVOR:U} == gui
COMMENT=	Distributed source code management tool (GUI enabled flavor)
.elif ${FLAVOR:U} == lite
COMMENT=	Distributed source code management tool (lite flavor)
.endif

LICENSE=	GPLv2
LICENSE_FILE=	${WRKSRC}/COPYING

FLAVORS=	default gui lite
default_CONFLICTS_INSTALL=	git-gui git-lite
gui_CONFLICTS_INSTALL=		git git-lite
gui_DESCR=			${.CURDIR}/pkg-descr-gui
gui_PKGNAMESUFFIX=		-gui
lite_CONFLISTS_INSTALL=		git git-gui
lite_DESCR=			${.CURDIR}/pkg-descr-lite
lite_PKGNAMESUFFIX=		-lite

USES=		autoreconf gmake iconv shebangfix ssl tar:xz

CONFLICTS_INSTALL?=	git-gui-[0-9]* git-lite-[0-9]*

USERS=		git_daemon
GROUPS=		git_daemon


		SEND_EMAIL NLS SUBTREE
OPTIONS_DEFAULT=	CONTRIB P4 CVS PERL GITWEB ICONV CURL SEND_EMAIL PCRE \
			SUBTREE SVN
.if ${FLAVOR:U} == gui
OPTIONS_DEFAULT+=	GUI
.elif ${FLAVOR:U} == lite
OPTIONS_EXCLUDE=	GUI SVN GITWEB CONTRIB P4 CVS PERL
.endif

OPTIONS_SUB=	yes

CONTRIB_DESC=	Install contributed scripts

Return to bug 250281

Lines 12-26 Link Here

(-)devel/git/Makefile (-3 / +22 lines)
12	${PORTNAME}-manpages-${DISTVERSION}${EXTRACT_SUFX}	12	${PORTNAME}-manpages-${DISTVERSION}${EXTRACT_SUFX}
13		13
14	MAINTAINER= garga@FreeBSD.org	14	MAINTAINER= garga@FreeBSD.org
15	COMMENT?= Distributed source code management tool	15	.if ${FLAVOR:U} == default
		16	COMMENT= Distributed source code management tool
		17	.elif ${FLAVOR:U} == gui
		18	COMMENT= Distributed source code management tool (GUI enabled flavor)
		19	.elif ${FLAVOR:U} == lite
		20	COMMENT= Distributed source code management tool (lite flavor)
		21	.endif
16		22
17	LICENSE= GPLv2	23	LICENSE= GPLv2
18	LICENSE_FILE= ${WRKSRC}/COPYING	24	LICENSE_FILE= ${WRKSRC}/COPYING
19		25
		26	FLAVORS= default gui lite
		27	default_CONFLICTS_INSTALL= git-gui git-lite
		28	gui_CONFLICTS_INSTALL= git git-lite
		29	gui_DESCR= ${.CURDIR}/pkg-descr-gui
		30	gui_PKGNAMESUFFIX= -gui
		31	lite_CONFLISTS_INSTALL= git git-gui
		32	lite_DESCR= ${.CURDIR}/pkg-descr-lite
		33	lite_PKGNAMESUFFIX= -lite
		34
20	USES= autoreconf gmake iconv shebangfix ssl tar:xz	35	USES= autoreconf gmake iconv shebangfix ssl tar:xz
21		36
22	CONFLICTS_INSTALL?= git-gui-[0-9]* git-lite-[0-9]*
23
24	USERS= git_daemon	37	USERS= git_daemon
25	GROUPS= git_daemon	38	GROUPS= git_daemon
26		39
Lines 57-62 Link Here
57	SEND_EMAIL NLS SUBTREE	70	SEND_EMAIL NLS SUBTREE
58	OPTIONS_DEFAULT= CONTRIB P4 CVS PERL GITWEB ICONV CURL SEND_EMAIL PCRE \	71	OPTIONS_DEFAULT= CONTRIB P4 CVS PERL GITWEB ICONV CURL SEND_EMAIL PCRE \
59	SUBTREE SVN	72	SUBTREE SVN
		73	.if ${FLAVOR:U} == gui
		74	OPTIONS_DEFAULT+= GUI
		75	.elif ${FLAVOR:U} == lite
		76	OPTIONS_EXCLUDE= GUI SVN GITWEB CONTRIB P4 CVS PERL
		77	.endif
		78
60	OPTIONS_SUB= yes	79	OPTIONS_SUB= yes
61		80
62	CONTRIB_DESC= Install contributed scripts	81	CONTRIB_DESC= Install contributed scripts