Page MenuHomeFreeBSD
Files F108059779

D37077.id112078.diff
No OneTemporary
Actions

D37077.id112078.diff
View Options

Index: Mk/Uses/kde.mk
===================================================================
--- Mk/Uses/kde.mk
+++ Mk/Uses/kde.mk
@@ -134,7 +134,7 @@
GL_SITE= https://invent.kde.org
GL_ACCOUNT= ${_invent_category}
GL_PROJECT= ${_invent_name}
-GL_COMMIT= ${_invent_hash}
+GL_TAGNAME= ${_invent_hash}
. endif
. endif
Index: Mk/Uses/xorg-cat.mk
===================================================================
--- Mk/Uses/xorg-cat.mk
+++ Mk/Uses/xorg-cat.mk
@@ -26,7 +26,7 @@
# * meson (experimental)
#
#
-# By defining USE_GITLAB and GL_COMMIT, it is possible to pull code straight
+# By defining USE_GITLAB and GL_TAGNAME, it is possible to pull code straight
# from the freedesktop.org gitlab, instead of official release tarballs.
#
#.MAINTAINER: x11@FreeBSD.org
Index: Mk/bsd.options.mk
===================================================================
--- Mk/bsd.options.mk
+++ Mk/bsd.options.mk
@@ -184,7 +184,7 @@
CONFLICTS CONFLICTS_BUILD CONFLICTS_INSTALL CPPFLAGS CXXFLAGS \
DESKTOP_ENTRIES DISTFILES EXTRA_PATCHES EXTRACT_ONLY \
GH_ACCOUNT GH_PROJECT GH_SUBDIR GH_TAGNAME GH_TUPLE \
- GL_ACCOUNT GL_COMMIT GL_PROJECT GL_SITE GL_SUBDIR GL_TUPLE \
+ GL_ACCOUNT GL_PROJECT GL_SITE GL_SUBDIR GL_TAGNAME GL_TUPLE \
IGNORE INFO INSTALL_TARGET LDFLAGS LIBS MAKE_ARGS MAKE_ENV \
MASTER_SITES PATCHFILES PATCH_SITES PLIST_DIRS PLIST_FILES \
PLIST_SUB PORTDOCS PORTEXAMPLES SUB_FILES SUB_LIST \
Index: Mk/bsd.port.mk
===================================================================
--- Mk/bsd.port.mk
+++ Mk/bsd.port.mk
@@ -1704,7 +1704,7 @@
. if defined(WRKSRC)
DEV_WARNING+= "You are using USE_GITLAB and WRKSRC is set which is wrong. Set GL_PROJECT, GL_ACCOUNT correctly, and/or set WRKSRC_SUBDIR and remove WRKSRC entirely."
. endif
-WRKSRC?= ${WRKDIR}/${GL_PROJECT}-${GL_COMMIT}
+WRKSRC?= ${WRKDIR}/${GL_PROJECT}-${GL_TAGNAME}
. endif
# If the distname is not extracting into a specific subdirectory, have the
@@ -2945,12 +2945,6 @@
. endif
. endif
-. if defined(USE_GITLAB) && !${USE_GITLAB:Mnodefault} && empty(GL_COMMIT_DEFAULT)
-check-makevars::
- @${ECHO_MSG} "GL_COMMIT is a required 40 character hash for use USE_GITLAB"
- @${FALSE}
-. endif
-
################################################################
#
# Do preliminary work to detect if we need to run the config
Index: Mk/bsd.sites.mk
===================================================================
--- Mk/bsd.sites.mk
+++ Mk/bsd.sites.mk
@@ -292,10 +292,10 @@
. if defined(GH_TUPLE)
. for _tuple in ${GH_TUPLE}
_t_tmp=${_tuple}
-. if ${_t_tmp:C@^([^:]*):([^:]*):([^:]*)((:[^:/]*)?)((/.*)?)@\4@:S/://:C/[a-zA-Z0-9_]//g}
+. if ${_t_tmp:C@^([^:]*):([^:]*):([^:]*)((:[^:/]*)?)((/.*)?)@\4@:S/://:C/[a-zA-Z0-9_.+-]//g}
check-makevars::
@${ECHO_MSG} "The ${_tuple} GH_TUPLE line has"
- @${ECHO_MSG} "a tag containing something else than [a-zA-Z0-9_]"
+ @${ECHO_MSG} "a tag containing something else than [a-zA-Z0-9_.+-]"
@${FALSE}
. endif
. endfor
@@ -443,34 +443,36 @@
# GL_PROJECT - name of the project on GitLab
# default: ${PORTNAME}
#
-# GL_COMMIT - the commit hash of the repository, must be the full hash and
-# is a required variable for GitLab.
+# GL_TAGNAME - name of the tag to download (2.0.1, hash, ...)
+# Using the name of a branch here is incorrect. It is
+# possible to do GL_TAGNAME= GIT_HASH to do a snapshot.
+# default: ${DISTVERSIONFULL}
#
# GL_SUBDIR - directory relative to WRKSRC where to move this distfile's
# content after extracting.
#
-# GL_TUPLE - above shortened to [site[:port][/webroot]:]account:project:commit:group[/subdir]
+# GL_TUPLE - above shortened to [site[:port][/webroot]:]account:project:tagname:group[/subdir]
#
. if defined(USE_GITLAB)
. if defined(GL_TUPLE)
. for _tuple in ${GL_TUPLE}
-. if ${_tuple:C@^(([^:]*://[^:/]*(:[0-9]{1,5})?(/[^:]*[^/])?:)?)([^:]*):([^:]*):([^:]*)(:[^:/]*)((/.*)?)@\7@:S/^://:C/[a-f0-9]{40}//g}
+. if ${_tuple:C@^(([^:]*://[^:/]*(:[0-9]{1,5})?(/[^:]*[^/])?:)?)([^:]*):([^:]*):([^:]*)(:[^:/]*)((/.*)?)@\7@:S/^://:C/[a-zA-Z0-9_.+-]//g}
check-makevars::
@${ECHO_MSG} "The ${_tuple}"
- @${ECHO_MSG} "GL_TUPLE is improperly formatted or, the commit"
- @${ECHO_MSG} "section contains something other than [a-f0-9]"
+ @${ECHO_MSG} "GL_TUPLE is improperly formatted or, the tagname"
+ @${ECHO_MSG} "section contains something other than [a-zA-Z0-9_.+-]"
@${FALSE}
. endif
. endfor
GL_SITE+= ${GL_TUPLE:C@^(([^:]*://[^:/]*(:[0-9]{1,5})?(/[^:]*[^/])?:)?)([^:]*):([^:]*):([^:]*)(:[^:/]*)((/.*)?)@\1\8@:S@::@:@}
GL_ACCOUNT+= ${GL_TUPLE:C@^(([^:]*://[^:/]*(:[0-9]{1,5})?(/[^:]*[^/])?:)?)([^:]*):([^:]*):([^:]*)(:[^:/]*)((/.*)?)@\5\8@}
GL_PROJECT+= ${GL_TUPLE:C@^(([^:]*://[^:/]*(:[0-9]{1,5})?(/[^:]*[^/])?:)?)([^:]*):([^:]*):([^:]*)(:[^:/]*)((/.*)?)@\6\8@}
-GL_COMMIT+= ${GL_TUPLE:C@^(([^:]*://[^:/]*(:[0-9]{1,5})?(/[^:]*[^/])?:)?)([^:]*):([^:]*):([^:]*)(:[^:/]*)((/.*)?)@\7\8@}
+GL_TAGNAME+= ${GL_TUPLE:C@^(([^:]*://[^:/]*(:[0-9]{1,5})?(/[^:]*[^/])?:)?)([^:]*):([^:]*):([^:]*)(:[^:/]*)((/.*)?)@\7\8@}
GL_SUBDIR+= ${GL_TUPLE:C@^(([^:]*://[^:/]*(:[0-9]{1,5})?(/[^:]*[^/])?:)?)([^:]*):([^:]*):([^:]*)(:[^:/]*)((/.*)?)@\9\8@:M/*:S/^\///}
. endif
. if empty(USE_GITLAB:Mnodefault)
-MASTER_SITES+= ${GL_SITE}/${GL_ACCOUNT}/${GL_PROJECT}/-/archive/${GL_COMMIT}.tar.gz?dummy=/
+MASTER_SITES+= ${GL_SITE}/${GL_ACCOUNT}/${GL_PROJECT}/-/archive/${GL_TAGNAME:C@^[a-f0-9]{40}$@\0.tar.gz?dummy=@}/
. endif
GL_SITE_DEFAULT= https://gitlab.com
GL_SITE?= ${GL_SITE_DEFAULT}
@@ -478,8 +480,10 @@
GL_ACCOUNT?= ${GL_ACCOUNT_DEFAULT}
GL_PROJECT_DEFAULT= ${PORTNAME}
GL_PROJECT?= ${GL_PROJECT_DEFAULT}
+GL_TAGNAME_DEFAULT= ${DISTVERSIONFULL}
+GL_TAGNAME?= ${GL_TAGNAME_DEFAULT}
_GITLAB_GROUPS= DEFAULT
-. for _gl_v in GL_SITE GL_ACCOUNT GL_PROJECT GL_COMMIT GL_SUBDIR
+. for _gl_v in GL_SITE GL_ACCOUNT GL_PROJECT GL_TAGNAME GL_SUBDIR
. for _v_ex in ${${_gl_v}}
_GL_GROUPS= ${_v_ex:S/^${_v_ex:C@:[^/:]+$@@}//:S/^://}
. if !empty(_GL_GROUPS)
@@ -503,18 +507,24 @@
GL_SITE:= ${GL_SITE_DEFAULT}
GL_ACCOUNT:= ${GL_ACCOUNT_DEFAULT}
GL_PROJECT:= ${GL_PROJECT_DEFAULT}
-GL_COMMIT:= ${GL_COMMIT_DEFAULT}
+GL_TAGNAME:= ${GL_TAGNAME_DEFAULT}
GL_SUBDIR:= ${GL_SUBDIR_DEFAULT}
_GITLAB_REV= 0
-_GITLAB_EXTRACT_SUFX= .tar.gz
+_GITLAB_EXTRACT_SUFX= .tar.gz
+_GITLAB_TAG_EXTRACT_SUFX= .tar.bz2
_GITLAB_CLONE_DIR?= ${WRKDIR}/git-clone
_PORTS_DIRECTORIES+= ${_GITLAB_CLONE_DIR}
. if !${USE_GITLAB:Mnodefault}
-DISTNAME:= ${GL_ACCOUNT}-${GL_PROJECT}-${GL_COMMIT}_GL${_GITLAB_REV}
+. if ${GL_TAGNAME:C/^[a-f0-9]{40}$//}
+DISTNAME:= ${GL_PROJECT}-${GL_TAGNAME}
+DISTFILES+= ${DISTNAME}${_GITLAB_TAG_EXTRACT_SUFX}
+. else
+DISTNAME:= ${GL_ACCOUNT}-${GL_PROJECT}-${GL_TAGNAME}_GL${_GITLAB_REV}
DISTFILES+= ${DISTNAME}${_GITLAB_EXTRACT_SUFX}
+. endif
git-clone: git-clone-DEFAULT
git-clone-DEFAULT: ${_GITLAB_CLONE_DIR}
@git clone ${GL_SITE_DEFAULT}/${GL_ACCOUNT_DEFAULT}/${GL_PROJECT_DEFAULT}.git ${_GITLAB_CLONE_DIR}/${GL_PROJECT_DEFAULT}
@@ -536,12 +546,18 @@
GL_ACCOUNT_${_group}?= ${GL_ACCOUNT_DEFAULT}
GL_PROJECT_${_group}?= ${GL_PROJECT_DEFAULT}
-_GL_TUPLE_OUT:= ${_GL_TUPLE_OUT} ${GL_SITE_${_group}}:${GL_ACCOUNT_${_group}}:${GL_PROJECT_${_group}}:${GL_COMMIT_${_group}}:${_group}/${GL_SUBDIR_${_group}}
-DISTNAME_${_group}:= ${GL_ACCOUNT_${_group}}-${GL_PROJECT_${_group}}-${GL_COMMIT_${_group}}_GL${_GITLAB_REV}
+_GL_TUPLE_OUT:= ${_GL_TUPLE_OUT} ${GL_SITE_${_group}}:${GL_ACCOUNT_${_group}}:${GL_PROJECT_${_group}}:${GL_TAGNAME_${_group}}:${_group}/${GL_SUBDIR_${_group}}
+. if ${GL_TAGNAME_${_group}:C/^[a-f0-9]{40}$//}
+DISTNAME_${_group}:= ${GL_PROJECT_${_group}}-${GL_TAGNAME_${_group}}
+DISTFILE_${_group}:= ${DISTNAME_${_group}}${_GITLAB_TAG_EXTRACT_SUFX}
+MASTER_SITES:= ${MASTER_SITES} ${GL_SITE_${_group}}/${GL_ACCOUNT_${_group}}/${GL_PROJECT_${_group}}/-/archive/${GL_TAGNAME_${_group}}/:${_group}
+. else
+DISTNAME_${_group}:= ${GL_ACCOUNT_${_group}}-${GL_PROJECT_${_group}}-${GL_TAGNAME_${_group}}_GL${_GITLAB_REV}
DISTFILE_${_group}:= ${DISTNAME_${_group}}${_GITLAB_EXTRACT_SUFX}
+MASTER_SITES:= ${MASTER_SITES} ${GL_SITE_${_group}}/${GL_ACCOUNT_${_group}}/${GL_PROJECT_${_group}}/-/archive/${GL_TAGNAME_${_group}}.tar.gz?dummy=/:${_group}
+. endif
DISTFILES:= ${DISTFILES} ${DISTFILE_${_group}}:${_group}
-MASTER_SITES:= ${MASTER_SITES} ${GL_SITE_${_group}}/${GL_ACCOUNT_${_group}}/${GL_PROJECT_${_group}}/-/archive/${GL_COMMIT_${_group}}.tar.gz?dummy=/:${_group}
-WRKSRC_${_group}:= ${WRKDIR}/${GL_PROJECT_${_group}}-${GL_COMMIT_${_group}}
+WRKSRC_${_group}:= ${WRKDIR}/${GL_PROJECT_${_group}}-${GL_TAGNAME_${_group}}
. if !empty(GL_SUBDIR_${_group})
_SITES_extract:= ${_SITES_extract} 690:post-extract-gl-${_group}
post-extract-gl-${_group}:
Index: net/liblinphone/Makefile
===================================================================
--- net/liblinphone/Makefile
+++ net/liblinphone/Makefile
@@ -29,7 +29,6 @@
USE_GITLAB= yes
GL_SITE= https://gitlab.linphone.org/BC
GL_ACCOUNT= public
-GL_COMMIT= c5d52f725840bceca36874f480d86bdbb91f5b7e
USE_GNOME= libxml2
USE_LDCONFIG= yes
Index: net/liblinphone/distinfo
===================================================================
--- net/liblinphone/distinfo
+++ net/liblinphone/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1661328845
-SHA256 (public-liblinphone-c5d52f725840bceca36874f480d86bdbb91f5b7e_GL0.tar.gz) = e7f680c2eb46bd751245250f0a22074dbf219dd2955362620c9ba63a6e76351e
-SIZE (public-liblinphone-c5d52f725840bceca36874f480d86bdbb91f5b7e_GL0.tar.gz) = 22756256
+TIMESTAMP = 1666339767
+SHA256 (liblinphone-5.1.56.tar.bz2) = cb58766e425dc0d613dacfba492e40446db15fd5db70e327df9e4f38b6a573fc
+SIZE (liblinphone-5.1.56.tar.bz2) = 20143879
Index: net/ortp/Makefile
===================================================================
--- net/ortp/Makefile
+++ net/ortp/Makefile
@@ -15,7 +15,7 @@
USE_GITLAB= yes
GL_SITE= https://gitlab.linphone.org/BC
GL_ACCOUNT= public
-GL_COMMIT= d5505bf226f8c81e5742d854ef559e201fdc2ee9
+GL_TAGNAME= d5505bf226f8c81e5742d854ef559e201fdc2ee9
USE_LDCONFIG= yes
CMAKE_ARGS= -DENABLE_DOC=NO -DENABLE_STATIC=NO -DENABLE_STRICT=NO \
Index: textproc/linuxdoc-tools/Makefile
===================================================================
--- textproc/linuxdoc-tools/Makefile
+++ textproc/linuxdoc-tools/Makefile
@@ -1,8 +1,6 @@
PORTNAME= linuxdoc-tools
-PORTVERSION= 0.9.82
+DISTVERSION= 0.9.82
CATEGORIES= textproc
-# USE_GITLAB requires a commit hash, so construct MASTER_SITES manually
-MASTER_SITES= https://gitlab.com/agmartin/${PORTNAME}/-/archive/${PORTVERSION}/
MAINTAINER= zirias@FreeBSD.org
COMMENT= Fork of SGML-tools specially tailored for linuxdoc SGMLs
@@ -22,11 +20,12 @@
sgmlsasp:textproc/sgmls
GNU_CONFIGURE= yes
-USES= gmake groff:both perl5 tar:bzip2
+USES= gmake groff:both perl5
+USE_GITLAB= yes
+GL_ACCOUNT= agmartin
CONFIGURE_ARGS= --with-installed-sgmlsasp
PORTDOCS= *
-WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
OPTIONS_DEFINE= DOCS

File Metadata

Mime Type
text/plain
Expires
Wed, Jan 22, 12:48 AM (20 h, 31 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
16022497
Default Alt Text
D37077.id112078.diff (10 KB)

Event Timeline