svn commit: r508829 - in head: Mk devel/elfio devel/subversion games/xboard games/xboard-devel misc/dnetc www/mod_dav_svn www/nuvolaplayer-all-services
Tobias Kortkamp
tobik at FreeBSD.org
Tue Aug 13 14:46:30 UTC 2019
Author: tobik
Date: Tue Aug 13 14:46:28 2019
New Revision: 508829
URL: https://svnweb.freebsd.org/changeset/ports/508829
Log:
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
Modified:
head/Mk/bsd.sanity.mk
head/devel/elfio/Makefile
head/devel/subversion/Makefile.addons
head/games/xboard-devel/Makefile
head/games/xboard/Makefile
head/misc/dnetc/Makefile
head/www/mod_dav_svn/Makefile
head/www/nuvolaplayer-all-services/Makefile
Modified: head/Mk/bsd.sanity.mk
==============================================================================
--- head/Mk/bsd.sanity.mk Tue Aug 13 14:19:04 2019 (r508828)
+++ head/Mk/bsd.sanity.mk Tue Aug 13 14:46:28 2019 (r508829)
@@ -168,6 +168,14 @@ DEV_ERROR+= "PORT${_type} does not do anything unless
. 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=
Modified: head/devel/elfio/Makefile
==============================================================================
--- head/devel/elfio/Makefile Tue Aug 13 14:19:04 2019 (r508828)
+++ head/devel/elfio/Makefile Tue Aug 13 14:46:28 2019 (r508829)
@@ -3,7 +3,7 @@
PORTNAME= elfio
PORTVERSION= 3.4
-PORTREVISION=
+PORTREVISION= 0
CATEGORIES= devel
MASTER_SITES= SF/elfio/ELFIO-sources/ELFIO-${PORTVERSION}
Modified: head/devel/subversion/Makefile.addons
==============================================================================
--- head/devel/subversion/Makefile.addons Tue Aug 13 14:19:04 2019 (r508828)
+++ head/devel/subversion/Makefile.addons Tue Aug 13 14:46:28 2019 (r508829)
@@ -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
Modified: head/games/xboard-devel/Makefile
==============================================================================
--- head/games/xboard-devel/Makefile Tue Aug 13 14:19:04 2019 (r508828)
+++ head/games/xboard-devel/Makefile Tue Aug 13 14:46:28 2019 (r508829)
@@ -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}
Modified: head/games/xboard/Makefile
==============================================================================
--- head/games/xboard/Makefile Tue Aug 13 14:19:04 2019 (r508828)
+++ head/games/xboard/Makefile Tue Aug 13 14:46:28 2019 (r508829)
@@ -4,7 +4,7 @@
PORTNAME?= xboard
PORTVERSION?= 4.9.1
PORTREVISION?= 1
-PORTEPOCH?=
+PORTEPOCH?= 0
CATEGORIES?= games
MASTER_SITES?= GNU
Modified: head/misc/dnetc/Makefile
==============================================================================
--- head/misc/dnetc/Makefile Tue Aug 13 14:19:04 2019 (r508828)
+++ head/misc/dnetc/Makefile Tue Aug 13 14:46:28 2019 (r508829)
@@ -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}/ \
Modified: head/www/mod_dav_svn/Makefile
==============================================================================
--- head/www/mod_dav_svn/Makefile Tue Aug 13 14:19:04 2019 (r508828)
+++ head/www/mod_dav_svn/Makefile Tue Aug 13 14:46:28 2019 (r508829)
@@ -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} \
Modified: head/www/nuvolaplayer-all-services/Makefile
==============================================================================
--- head/www/nuvolaplayer-all-services/Makefile Tue Aug 13 14:19:04 2019 (r508828)
+++ head/www/nuvolaplayer-all-services/Makefile Tue Aug 13 14:46:28 2019 (r508829)
@@ -30,7 +30,7 @@ ${o}_RUN_DEPENDS=${_DATADIR:S,^${PREFIX}/,${LOCALBASE}
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
More information about the svn-ports-all
mailing list