svn commit: r356893 - in head: lang/pike78 www/caudium14

[Johan van Selst]

Author: johans
Date: Sat Jun  7 10:00:54 2014
New Revision: 356893
URL: http://svnweb.freebsd.org/changeset/ports/356893
QAT: https://qat.redports.org/buildarchive/r356893/

Log:
  Make Caudium version automatically depend on the version of Pike 7.8

Added:
  head/lang/pike78/Makefile.common   (contents, props changed)
Modified:
  head/lang/pike78/Makefile
  head/www/caudium14/Makefile

Modified: head/lang/pike78/Makefile
==============================================================================
--- head/lang/pike78/Makefile	Sat Jun  7 09:59:36 2014	(r356892)
+++ head/lang/pike78/Makefile	Sat Jun  7 10:00:54 2014	(r356893)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	pike78
-PORTVERSION=	7.8.866
+PORTVERSION=	${PIKEVERSION}
 CATEGORIES=	lang
 MASTER_SITES=	http://pike.ida.liu.se/pub/pike/all/${PORTVERSION}/ \
 		ftp://pike.ida.liu.se/pub/pike/beta/${PORTVERSION}/ \
@@ -116,4 +116,5 @@ post-install:
 verify:
 	cd ${WRKSRC}; ${GMAKE} verify
 
+.include "Makefile.common"
 .include <bsd.port.mk>

Added: head/lang/pike78/Makefile.common
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/lang/pike78/Makefile.common	Sat Jun  7 10:00:54 2014	(r356893)
@@ -0,0 +1,6 @@
+# $FreeBSD$
+
+# Also used by www/caudium14
+
+PIKEVERSION=	7.8.866
+

Modified: head/www/caudium14/Makefile
==============================================================================
--- head/www/caudium14/Makefile	Sat Jun  7 09:59:36 2014	(r356892)
+++ head/www/caudium14/Makefile	Sat Jun  7 10:00:54 2014	(r356893)
@@ -2,24 +2,22 @@
 # $FreeBSD$
 
 PORTNAME=	caudium14
-PORTVERSION=	1.4.18
-PORTREVISION=	1
+PORTVERSION=	${DISTVERSION}.${PIKEVERSION}
+DISTVERSION=	1.4.18
 CATEGORIES=	www
 MASTER_SITES=	http://caudium.googlecode.com/files/
-DISTNAME=	Caudium-${PORTVERSION}
+DISTNAME=	Caudium-${DISTVERSION}
 
 MAINTAINER=	johans at FreeBSD.org
 COMMENT=	Free webserver based on the Roxen Challenger 1.3 code base
 
-BROKEN=		Fails to build
-
 BUILD_DEPENDS=	pike78:${PORTSDIR}/lang/pike78
 LIB_DEPENDS=	libsablot.so:${PORTSDIR}/textproc/sablotron
 RUN_DEPENDS=	lsof:${PORTSDIR}/sysutils/lsof
 
 USES=		tar:bzip2 gmake
 
-PIKEVERSION=	7.8.852
+# Pike version included from lang/pike78
 SUB_LIST+=	PIKEVERSION=${PIKEVERSION}
 PLIST_SUB+=	PIKEVERSION=${PIKEVERSION}
 
@@ -56,4 +54,5 @@ post-configure:
 . endfor
 .endif
 
+.include "../../lang/pike78/Makefile.common"
 .include <bsd.port.post.mk>