sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-05-29 01:16:28 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Mk/bsd.sanity.mk: Flag non-integer PORTREVISION/PORTEPOCH

Browse source 
Currently they are not checked and something like PORTREVISION=foo
or just PORTREVISION= is accepted.  Some ports use indirection via
custom variables for them so it is worthwhile to check that they
are set to sane values.

While here fix ports that currently have non-integer PORTREVISION
or PORTEPOCH.

Approved by:	portmgr (mat)
Differential Revision:	https://reviews.freebsd.org/D21225
This commit is contained in:
Tobias Kortkamp 2019-08-13 14:46:28 +00:00
parent b26c6ea338
commit 5223f58a48
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=508829
8 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Mk/bsd.sanity.mk
View file

@ -168,6 +168,14 @@ DEV_ERROR+= "PORT${_type} does not do anything unless the ${_type} option is pre
. endif . endif
.endfor .endfor
.if empty(PORTEPOCH) || !empty(PORTEPOCH:C/[0-9]+//)
DEV_ERROR+= "PORTEPOCH needs to be an integer \>= 0"
.endif
.if empty(PORTREVISION) || !empty(PORTREVISION:C/[0-9]+//)
DEV_ERROR+= "PORTREVISION needs to be an integer \>= 0"
.endif
# Whitelist of options helper lookalikes that should not be reported on: # Whitelist of options helper lookalikes that should not be reported on:
_OPTIONS_HELPERS_SEEN+= OPENSSL_LDFLAGS _OPTIONS_HELPERS_SEEN+= OPENSSL_LDFLAGS
_BROKEN_OPTIONS_HELPERS= _BROKEN_OPTIONS_HELPERS=

2
devel/elfio/Makefile
View file

@ -3,7 +3,7 @@
PORTNAME= elfio PORTNAME= elfio
PORTVERSION= 3.4 PORTVERSION= 3.4
PORTREVISION= PORTREVISION= 0
CATEGORIES= devel CATEGORIES= devel
MASTER_SITES= SF/elfio/ELFIO-sources/ELFIO-${PORTVERSION} MASTER_SITES= SF/elfio/ELFIO-sources/ELFIO-${PORTVERSION}

4
devel/subversion/Makefile.addons
View file

@ -12,7 +12,7 @@ CONFLICTS_BUILD+= ${PORTNAME}-1.[0-9].[0-9]* \
${PORTNAME}-1.[^1][0-9].[0-9]* \ ${PORTNAME}-1.[^1][0-9].[0-9]* \
${PORTNAME}-1.1[0-1].[0-9]* \ ${PORTNAME}-1.1[0-1].[0-9]* \
${PORTNAME}-lts-1.[0-9][0-9].[0-9]* ${PORTNAME}-lts-1.[0-9][0-9].[0-9]*
PORTREVISION= ${PORTREVISION_112} PORTREVISION= ${PORTREVISION_112:U0}
PLIST_SUB+= SVN112="" SVNLTS="@comment " PLIST_SUB+= SVN112="" SVNLTS="@comment "
LIB_DEPENDS+= libsvn_client-1.so:devel/subversion LIB_DEPENDS+= libsvn_client-1.so:devel/subversion
OPTIONS_NAME= devel_subversion OPTIONS_NAME= devel_subversion
@ -22,7 +22,7 @@ MASTERDIR= ${.CURDIR}/../../devel/subversion
PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-lts PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-lts
CONFLICTS_BUILD+= ${PORTNAME}-1.[0-9].[0-9]* \ CONFLICTS_BUILD+= ${PORTNAME}-1.[0-9].[0-9]* \
${PORTNAME}-1.[0-9][0-9].[0-9]* ${PORTNAME}-1.[0-9][0-9].[0-9]*
PORTREVISION= ${PORTREVISION_LTS} PORTREVISION= ${PORTREVISION_LTS:U0}
PLIST_SUB+= SVN112="@comment " SVNLTS="" PLIST_SUB+= SVN112="@comment " SVNLTS=""
LIB_DEPENDS+= libsvn_client-1.so:devel/subversion-lts LIB_DEPENDS+= libsvn_client-1.so:devel/subversion-lts
OPTIONS_NAME= devel_subversion-lts OPTIONS_NAME= devel_subversion-lts

4
games/xboard-devel/Makefile
View file

@ -2,8 +2,8 @@
PORTNAME= xboard-devel PORTNAME= xboard-devel
PORTVERSION= 4.8.0.20151020.3 PORTVERSION= 4.8.0.20151020.3
PORTREVISION= PORTREVISION= 0
PORTEPOCH= PORTEPOCH= 0
MASTER_SITES= http://freeheimdall.spdns.org/files/ MASTER_SITES= http://freeheimdall.spdns.org/files/
# http://hgm.nubati.net/cgi-bin/gitweb.cgi?p=xboard.git;a=snapshot;h=${COMMIT_HASH};sf=tgz # http://hgm.nubati.net/cgi-bin/gitweb.cgi?p=xboard.git;a=snapshot;h=${COMMIT_HASH};sf=tgz
# http://hgm.nubati.net/cgi-bin/gitweb.cgi/xboard.git/snapshot/${COMMIT_HASH} # http://hgm.nubati.net/cgi-bin/gitweb.cgi/xboard.git/snapshot/${COMMIT_HASH}

2
games/xboard/Makefile
View file

@ -4,7 +4,7 @@
PORTNAME?= xboard PORTNAME?= xboard
PORTVERSION?= 4.9.1 PORTVERSION?= 4.9.1
PORTREVISION?= 1 PORTREVISION?= 1
PORTEPOCH?= PORTEPOCH?= 0
CATEGORIES?= games CATEGORIES?= games
MASTER_SITES?= GNU MASTER_SITES?= GNU

2
misc/dnetc/Makefile
View file

@ -3,7 +3,7 @@
PORTNAME= dnetc PORTNAME= dnetc
PORTVERSION= ${VERSION} PORTVERSION= ${VERSION}
PORTREVISION= ${REVISION} PORTREVISION= ${REVISION:U0}
PORTEPOCH= 1 PORTEPOCH= 1
CATEGORIES= misc CATEGORIES= misc
MASTER_SITES= http://http.distributed.net/pub/dcti/v${PORTVERSION:R}/ \ MASTER_SITES= http://http.distributed.net/pub/dcti/v${PORTVERSION:R}/ \

3
www/mod_dav_svn/Makefile
View file

@ -11,9 +11,6 @@ COMMENT= Apache module for subversion serving
USES= apache:2.2+ USES= apache:2.2+
PORTREVISION_111= 1
PORTREVISION_19= 0
.include "${.CURDIR}/../../devel/subversion/Makefile.addons" .include "${.CURDIR}/../../devel/subversion/Makefile.addons"
CONFIGURE_ARGS+= --with-apxs=${APXS} \ CONFIGURE_ARGS+= --with-apxs=${APXS} \

2
www/nuvolaplayer-all-services/Makefile
View file

@ -30,7 +30,7 @@ ${o}_RUN_DEPENDS=${_DATADIR:S,^${PREFIX}/,${LOCALBASE}/,}/web_apps/${NV_${o}_NAM
NV_ID= ${${.CURDIR:T:S/${PORTNAME}-//}_ID} NV_ID= ${${.CURDIR:T:S/${PORTNAME}-//}_ID}
PORTVERSION= ${NV_${NV_ID}_VERSION} PORTVERSION= ${NV_${NV_ID}_VERSION}
PORTREVISION?= ${NV_${NV_ID}_REVISION} PORTREVISION?= ${NV_${NV_ID}_REVISION:U0}
PKGNAMESUFFIX?= -${NV_${NV_ID}_NAME} PKGNAMESUFFIX?= -${NV_${NV_ID}_NAME}
COMMENT?= ${NV_${NV_ID}_DESC} integration for Nuvola Player COMMENT?= ${NV_${NV_ID}_DESC} integration for Nuvola Player