diff options
| author | Mathieu Arnold <mat@FreeBSD.org> | 2017-04-11 15:21:23 +0000 |
|---|---|---|
| committer | Mathieu Arnold <mat@FreeBSD.org> | 2017-04-11 15:21:23 +0000 |
| commit | 6d588589c24082c8afc98e114cb7a21a81f76082 (patch) | |
| tree | 5a5d971bd61fde66fbaa1b8da9469708d182ffc8 /www | |
| parent | - Update to 6.4.0 (diff) | |
Make defining both PORTVERSION and DISTVERSION a DEV_ERROR.
There are two cases:
- The upstream versionning is compatible with our versionning, or using
DISTVERSION's magic leads to a compatible PORTVERSION, use
DISTVERSION. If it is possible to use DISTVERSIONPREFIX and
DISTVERSIONSUFFIX to make it compatible, use them.
- The upstream versionning is not compatible with our versionning, and
DISTVERSION's magic does not lead to a correct PORTVERSION, then set
PORTVERSION to the equivalent of our versionning, and set DISTNAME.
It is possible to use a third variable where you store upstream's
version and use it to compute PORTVERSION and/or DISTNAME, like the
dns/bind9* ports do.
Sponsored by: Absolight
Notes
Notes:
svn path=/head/; revision=438272
Diffstat (limited to 'www')
| -rw-r--r-- | www/WebMagick/Makefile | 2 | ||||
| -rw-r--r-- | www/caudium14/Makefile | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/www/WebMagick/Makefile b/www/WebMagick/Makefile index 2c3a792fcd2d..4be373bf2971 100644 --- a/www/WebMagick/Makefile +++ b/www/WebMagick/Makefile @@ -3,10 +3,10 @@ PORTNAME= WebMagick PORTVERSION= 2.03p29 -DISTVERSION= 2.03pre29 PORTEPOCH= 1 CATEGORIES= www graphics MASTER_SITES= SF/${PORTNAME:tl}/${PORTNAME:tl}-beta/${DISTVERSION} +DISTNAME= ${PORTNAME}-2.03pre29 MAINTAINER= ports@FreeBSD.org COMMENT= Image Web Generator - recursively build HTMLs, imagemaps, thumbnails diff --git a/www/caudium14/Makefile b/www/caudium14/Makefile index a58f27980609..c297b8975aec 100644 --- a/www/caudium14/Makefile +++ b/www/caudium14/Makefile @@ -2,13 +2,12 @@ # $FreeBSD$ PORTNAME= caudium14 -PORTVERSION= ${DISTVERSION}.${PIKEVERSION} -DISTVERSION= 1.4.18 +PORTVERSION= ${CAUDIUMVERSION}.${PIKEVERSION} PORTREVISION= 2 CATEGORIES= www MASTER_SITES= https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/caudium/ \ ftp://ftp.stack.nl/pub/users/johans/caudium/ -DISTNAME= Caudium-${DISTVERSION} +DISTNAME= Caudium-${CAUDIUMVERSION} MAINTAINER= johans@FreeBSD.org COMMENT= Free webserver based on the Roxen Challenger 1.3 code base @@ -17,6 +16,8 @@ BUILD_DEPENDS= pike78:lang/pike78 LIB_DEPENDS= libsablot.so:textproc/sablotron RUN_DEPENDS= lsof:sysutils/lsof +CAUDIUMVERSION= 1.4.18 + USES= gmake tar:bzip2 # Pike version included from lang/pike78 |