Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 8 Aug 2016 19:13:17 +0000 (UTC)
From:      Kurt Jaeger <pi@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r419891 - head/www/seahub
Message-ID:  <201608081913.u78JDHuG022519@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: pi
Date: Mon Aug  8 19:13:17 2016
New Revision: 419891
URL: https://svnweb.freebsd.org/changeset/ports/419891

Log:
  www/seahub: Small revision fix
  
  This update is a small revision that fixes the web frontends seafile
  version. Previously the version would mistakingly show the seahub
  version, and it is intended to show the seafile port version.
  
  PR:		211636
  Submitted by:	Ultima1252@gmail.com (maintainer)

Modified:
  head/www/seahub/Makefile

Modified: head/www/seahub/Makefile
==============================================================================
--- head/www/seahub/Makefile	Mon Aug  8 19:09:40 2016	(r419890)
+++ head/www/seahub/Makefile	Mon Aug  8 19:13:17 2016	(r419891)
@@ -4,6 +4,7 @@ PORTNAME=	seahub
 PORTVERSION=	5.1.10
 DISTVERSIONPREFIX=	v
 DISTVERSIONSUFFIX=	-pro
+PORTREVISION=	1
 CATEGORIES=	www
 
 MAINTAINER=	ultima1252@gmail.com
@@ -60,6 +61,7 @@ SEAFILE_SERVER=	${HAIWENDIR}/seafile-ser
 SEAHUBDIR=	${SEAFILE_SERVER}/seahub
 SEALIB=		${SEAFILE_SERVER}/seafile/lib
 SITEPACKAGEDIR=	${SEAHUBDIR}/thirdpart
+SEAFILE_VER=	`${CAT} ${.CURDIR}/../../net-mgmt/seafile/Makefile | ${GREP} -Eom1 '[0-9]+\.[0-9]+\.[0-9]+'`
 SEAHUB_DATA_DIR=	${HAIWENDIR}/seahub-data
 
 USERS=		seafile
@@ -85,7 +87,7 @@ do-patch:
 	echo "${WRKSRC}..."
 	@${MKDIR} ${WRKSRC}/runtime
 	${CP} ${FILESDIR}/runtime_seahub.conf ${WRKSRC}/runtime/seahub.conf
-	${REINPLACE_CMD} -e "s|SEAFILE_VERSION = '[0-9].[0-9].[0-9]'|SEAFILE_VERSION = '${PORTVERSION}'|" \
+	${REINPLACE_CMD} -Ee "s|SEAFILE_VERSION = '[0-9]+\.[0-9]+\.[0-9]+'|SEAFILE_VERSION = '${SEAFILE_VER}'|" \
 			 ${WRKSRC}/seahub/settings.py
 	${REINPLACE_CMD} -e 's|##FIX_WWWDIR##|${PREFIX}/${HAIWENDIR}|' ${WRKSRC}/*.template
 	${REINPLACE_CMD} -e 's|##FIX_SEALIB##|${PREFIX}/${SEALIB}|' ${WRKSRC}/*.template



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201608081913.u78JDHuG022519>