diff options
| -rw-r--r-- | MOVED | 2 | ||||
| -rw-r--r-- | devel/Makefile | 2 | ||||
| -rw-r--r-- | devel/git-gui/Makefile | 17 | ||||
| -rw-r--r-- | devel/git-lite/Makefile | 17 | ||||
| -rw-r--r-- | devel/git/Makefile | 25 | ||||
| -rw-r--r-- | devel/git/pkg-descr-gui (renamed from devel/git-gui/pkg-descr) | 0 | ||||
| -rw-r--r-- | devel/git/pkg-descr-lite (renamed from devel/git-lite/pkg-descr) | 0 |
7 files changed, 24 insertions, 39 deletions
@@ -15640,6 +15640,8 @@ lang/spidermonkey68|lang/spidermonkey78|2020-10-01|Replaced by a more recent ver audio/zinf||2020-10-02|Has expired: Does not build, no upstream emulators/qemu-sbruno|emulators/qemu|2020-10-02|Has expired: Port will be removed in favor of emulators/qemu dns/knot2-lib|dns/knot3-lib|2020-10-04|Replaced by a more recent version +devel/git-gui|devel/git@gui|2020-10-12|Replaced by a flavor +devel/git-lite|devel/git@lite|2020-10-12|Replaced by a flavor graphics/libxatracker|graphics/mesa-gallium-xa|2020-10-12|Rename to have all gallium driver properly named sysutils/gnome-mount||2020-10-12|Replaced by gio/gvfs sysutils/syslog-ng322|sysutils/syslog-ng|2020-10-12|Has expired: Agreed upon upstream one year deprecation policy diff --git a/devel/Makefile b/devel/Makefile index fe6e64d19add..ac70b4a49111 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -784,9 +784,7 @@ SUBDIR += git-cola SUBDIR += git-delta SUBDIR += git-extras - SUBDIR += git-gui SUBDIR += git-lfs - SUBDIR += git-lite SUBDIR += git-merge-changelog SUBDIR += git-modes SUBDIR += git-review diff --git a/devel/git-gui/Makefile b/devel/git-gui/Makefile deleted file mode 100644 index 8f54f1ce5fa9..000000000000 --- a/devel/git-gui/Makefile +++ /dev/null @@ -1,17 +0,0 @@ -# $FreeBSD$ - -PKGNAMESUFFIX= -gui - -COMMENT= Distributed source code management tool (GUI enabled) - -MASTERDIR= ${.CURDIR}/../git - -DESCR= ${.CURDIR}/pkg-descr - -OPTIONS_SLAVE= GUI - -CONFLICTS_INSTALL= git-[0-9]* git-lite-[0-9]* - -DISTINFO_FILE= ${MASTERDIR}/distinfo - -.include "${MASTERDIR}/Makefile" diff --git a/devel/git-lite/Makefile b/devel/git-lite/Makefile deleted file mode 100644 index d0036c76342a..000000000000 --- a/devel/git-lite/Makefile +++ /dev/null @@ -1,17 +0,0 @@ -# $FreeBSD$ - -PKGNAMESUFFIX= -lite - -COMMENT= Distributed source code management tool (lite package) - -MASTERDIR= ${.CURDIR}/../git - -DESCR= ${.CURDIR}/pkg-descr - -OPTIONS_EXCLUDE=GUI SVN GITWEB CONTRIB P4 CVS PERL - -CONFLICTS_INSTALL= git-[0-9]* git-gui-[0-9]* - -DISTINFO_FILE= ${MASTERDIR}/distinfo - -.include "${MASTERDIR}/Makefile" diff --git a/devel/git/Makefile b/devel/git/Makefile index 721e603297dc..e6c248f9ffa4 100644 --- a/devel/git/Makefile +++ b/devel/git/Makefile @@ -12,14 +12,27 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} \ ${PORTNAME}-manpages-${DISTVERSION}${EXTRACT_SUFX} MAINTAINER= garga@FreeBSD.org -COMMENT?= Distributed source code management tool +.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 -USES= autoreconf gmake iconv shebangfix ssl tar:xz +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 -CONFLICTS_INSTALL?= git-gui-[0-9]* git-lite-[0-9]* +USES= autoreconf gmake iconv shebangfix ssl tar:xz USERS= git_daemon GROUPS= git_daemon @@ -57,6 +70,12 @@ OPTIONS_DEFINE= GUI SVN GITWEB CONTRIB P4 CVS HTMLDOCS PERL ICONV CURL \ 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 diff --git a/devel/git-gui/pkg-descr b/devel/git/pkg-descr-gui index e35e69cca957..e35e69cca957 100644 --- a/devel/git-gui/pkg-descr +++ b/devel/git/pkg-descr-gui diff --git a/devel/git-lite/pkg-descr b/devel/git/pkg-descr-lite index dbb113dc5246..dbb113dc5246 100644 --- a/devel/git-lite/pkg-descr +++ b/devel/git/pkg-descr-lite |