From 5223f58a4891cb4b842355aa2cdaaed78d901b3c Mon Sep 17 00:00:00 2001 From: Tobias Kortkamp Date: Tue, 13 Aug 2019 14:46:28 +0000 Subject: [PATCH] Mk/bsd.sanity.mk: Flag non-integer PORTREVISION/PORTEPOCH 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 --- Mk/bsd.sanity.mk | 8 ++++++++ devel/elfio/Makefile | 2 +- devel/subversion/Makefile.addons | 4 ++-- games/xboard-devel/Makefile | 4 ++-- games/xboard/Makefile | 2 +- misc/dnetc/Makefile | 2 +- www/mod_dav_svn/Makefile | 3 --- www/nuvolaplayer-all-services/Makefile | 2 +- 8 files changed, 16 insertions(+), 11 deletions(-) diff --git a/Mk/bsd.sanity.mk b/Mk/bsd.sanity.mk index 2aa0f21fe4c8..04542537d798 100644 --- a/Mk/bsd.sanity.mk +++ b/Mk/bsd.sanity.mk @@ -168,6 +168,14 @@ DEV_ERROR+= "PORT${_type} does not do anything unless the ${_type} option is pre . endif .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: _OPTIONS_HELPERS_SEEN+= OPENSSL_LDFLAGS _BROKEN_OPTIONS_HELPERS= diff --git a/devel/elfio/Makefile b/devel/elfio/Makefile index 9cc1dd37645d..db941c476a6d 100644 --- a/devel/elfio/Makefile +++ b/devel/elfio/Makefile @@ -3,7 +3,7 @@ PORTNAME= elfio PORTVERSION= 3.4 -PORTREVISION= +PORTREVISION= 0 CATEGORIES= devel MASTER_SITES= SF/elfio/ELFIO-sources/ELFIO-${PORTVERSION} diff --git a/devel/subversion/Makefile.addons b/devel/subversion/Makefile.addons index 950e7a03f299..5fb5196316b9 100644 --- a/devel/subversion/Makefile.addons +++ b/devel/subversion/Makefile.addons @@ -12,7 +12,7 @@ CONFLICTS_BUILD+= ${PORTNAME}-1.[0-9].[0-9]* \ ${PORTNAME}-1.[^1][0-9].[0-9]* \ ${PORTNAME}-1.1[0-1].[0-9]* \ ${PORTNAME}-lts-1.[0-9][0-9].[0-9]* -PORTREVISION= ${PORTREVISION_112} +PORTREVISION= ${PORTREVISION_112:U0} PLIST_SUB+= SVN112="" SVNLTS="@comment " LIB_DEPENDS+= libsvn_client-1.so:devel/subversion OPTIONS_NAME= devel_subversion @@ -22,7 +22,7 @@ MASTERDIR= ${.CURDIR}/../../devel/subversion PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-lts CONFLICTS_BUILD+= ${PORTNAME}-1.[0-9].[0-9]* \ ${PORTNAME}-1.[0-9][0-9].[0-9]* -PORTREVISION= ${PORTREVISION_LTS} +PORTREVISION= ${PORTREVISION_LTS:U0} PLIST_SUB+= SVN112="@comment " SVNLTS="" LIB_DEPENDS+= libsvn_client-1.so:devel/subversion-lts OPTIONS_NAME= devel_subversion-lts diff --git a/games/xboard-devel/Makefile b/games/xboard-devel/Makefile index 683cfd3326dd..65fb35afecf9 100644 --- a/games/xboard-devel/Makefile +++ b/games/xboard-devel/Makefile @@ -2,8 +2,8 @@ PORTNAME= xboard-devel PORTVERSION= 4.8.0.20151020.3 -PORTREVISION= -PORTEPOCH= +PORTREVISION= 0 +PORTEPOCH= 0 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/xboard.git/snapshot/${COMMIT_HASH} diff --git a/games/xboard/Makefile b/games/xboard/Makefile index a1e455006637..cf1ae06f764a 100644 --- a/games/xboard/Makefile +++ b/games/xboard/Makefile @@ -4,7 +4,7 @@ PORTNAME?= xboard PORTVERSION?= 4.9.1 PORTREVISION?= 1 -PORTEPOCH?= +PORTEPOCH?= 0 CATEGORIES?= games MASTER_SITES?= GNU diff --git a/misc/dnetc/Makefile b/misc/dnetc/Makefile index 7b04595e42a5..1e48721426b2 100644 --- a/misc/dnetc/Makefile +++ b/misc/dnetc/Makefile @@ -3,7 +3,7 @@ PORTNAME= dnetc PORTVERSION= ${VERSION} -PORTREVISION= ${REVISION} +PORTREVISION= ${REVISION:U0} PORTEPOCH= 1 CATEGORIES= misc MASTER_SITES= http://http.distributed.net/pub/dcti/v${PORTVERSION:R}/ \ diff --git a/www/mod_dav_svn/Makefile b/www/mod_dav_svn/Makefile index 7cbbab64d617..0eb8ae7a9aeb 100644 --- a/www/mod_dav_svn/Makefile +++ b/www/mod_dav_svn/Makefile @@ -11,9 +11,6 @@ COMMENT= Apache module for subversion serving USES= apache:2.2+ -PORTREVISION_111= 1 -PORTREVISION_19= 0 - .include "${.CURDIR}/../../devel/subversion/Makefile.addons" CONFIGURE_ARGS+= --with-apxs=${APXS} \ diff --git a/www/nuvolaplayer-all-services/Makefile b/www/nuvolaplayer-all-services/Makefile index 62242443c927..82ceba47eacc 100644 --- a/www/nuvolaplayer-all-services/Makefile +++ b/www/nuvolaplayer-all-services/Makefile @@ -30,7 +30,7 @@ ${o}_RUN_DEPENDS=${_DATADIR:S,^${PREFIX}/,${LOCALBASE}/,}/web_apps/${NV_${o}_NAM NV_ID= ${${.CURDIR:T:S/${PORTNAME}-//}_ID} PORTVERSION= ${NV_${NV_ID}_VERSION} -PORTREVISION?= ${NV_${NV_ID}_REVISION} +PORTREVISION?= ${NV_${NV_ID}_REVISION:U0} PKGNAMESUFFIX?= -${NV_${NV_ID}_NAME} COMMENT?= ${NV_${NV_ID}_DESC} integration for Nuvola Player