From owner-svn-ports-head@FreeBSD.ORG  Mon Jun  8 01:23:28 2015
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id C7D6FD86;
 Mon,  8 Jun 2015 01:23:28 +0000 (UTC)
 (envelope-from amdmi3@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 9C7021F7D;
 Mon,  8 Jun 2015 01:23:28 +0000 (UTC)
 (envelope-from amdmi3@FreeBSD.org)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t581NSsj038037;
 Mon, 8 Jun 2015 01:23:28 GMT (envelope-from amdmi3@FreeBSD.org)
Received: (from amdmi3@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t581NSlI038036;
 Mon, 8 Jun 2015 01:23:28 GMT (envelope-from amdmi3@FreeBSD.org)
Message-Id: <201506080123.t581NSlI038036@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to
 amdmi3@FreeBSD.org using -f
From: Dmitry Marakasov <amdmi3@FreeBSD.org>
Date: Mon, 8 Jun 2015 01:23:28 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r388820 - head/www/tikiwiki
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 08 Jun 2015 01:23:28 -0000

Author: amdmi3
Date: Mon Jun  8 01:23:27 2015
New Revision: 388820
URL: https://svnweb.freebsd.org/changeset/ports/388820

Log:
  - Fix license
  - Add LICENSE_FILE
  - Modernize plist

Modified:
  head/www/tikiwiki/Makefile

Modified: head/www/tikiwiki/Makefile
==============================================================================
--- head/www/tikiwiki/Makefile	Mon Jun  8 01:22:07 2015	(r388819)
+++ head/www/tikiwiki/Makefile	Mon Jun  8 01:23:27 2015	(r388820)
@@ -10,7 +10,8 @@ DISTNAME=	tiki-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Powerful PHP based Wiki/CMS/Groupware
 
-LICENSE=	LGPL20
+LICENSE=	LGPL21
+LICENSE_FILE=	${WRKSRC}/license.txt
 
 USE_PHP=	gettext pcre posix session xml zlib
 WANT_PHP_WEB=	yes
@@ -22,7 +23,7 @@ SUB_FILES=	pkg-message
 SUB_LIST+=	PORTNAME=${PORTNAME} TIKIWIKI_DIR=${TIKIWIKI_DIR}
 
 post-extract:
-	@${FIND} ${WRKSRC} -name '.DS_Store' -delete
+	@${FIND} ${WRKSRC} -name '.DS_Store' -o -name '.git' | ${XARGS} ${RM} -rf
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${TIKIWIKI_DIR}
@@ -33,11 +34,16 @@ do-install:
 # The benefits of a fixed pkg-plist aren't worth it, autogen!
 
 post-install:
-	@echo "@owner ${WWWOWN}" >> ${TMPPLIST}
-	@echo "@group ${WWWGRP}" >> ${TMPPLIST}
+	@${ECHO_CMD} "@owner ${WWWOWN}" >> ${TMPPLIST}
+	@${ECHO_CMD} "@group ${WWWGRP}" >> ${TMPPLIST}
 	@(cd ${STAGEDIR}${PREFIX}; ${FIND} * \( -type f -or -type l \) | \
 		${SORT} >> ${TMPPLIST})
-	@echo "@owner" >> ${TMPPLIST}
-	@echo "@group" >> ${TMPPLIST}
+	@${ECHO_CMD} "@owner" >> ${TMPPLIST}
+	@${ECHO_CMD} "@group" >> ${TMPPLIST}
+	@${ECHO_CMD} "@dir ${TIKIWIKI_DIR}/lib/test/core/Profile" >> ${TMPPLIST}
+	@${ECHO_CMD} "@dir ${TIKIWIKI_DIR}/permissioncheck/meta_755" >> ${TMPPLIST}
+	@${ECHO_CMD} "@dir ${TIKIWIKI_DIR}/permissioncheck/meta_775" >> ${TMPPLIST}
+	@${ECHO_CMD} "@dir ${TIKIWIKI_DIR}/permissioncheck/meta_777" >> ${TMPPLIST}
+	@${ECHO_CMD} "@dir ${TIKIWIKI_DIR}/vendor_extra/elfinder/files" >> ${TMPPLIST}
 
 .include <bsd.port.mk>