svn commit: r372393 - in head/deskutils/sugarcrm: . files

[Wen Heping]

Author: wen
Date: Mon Nov 10 13:44:59 2014
New Revision: 372393
URL: https://svnweb.freebsd.org/changeset/ports/372393
QAT: https://qat.redports.org/buildarchive/r372393/

Log:
  - Add missing DEPENDS [1]
  - Update pkg-message for apache-2.4
  - Use dynamic plist instead of static plist
  
  Reported by:	Iasen Kostov <iasen.kostov at gmail.com> (via email) [1]

Deleted:
  head/deskutils/sugarcrm/pkg-plist
Modified:
  head/deskutils/sugarcrm/Makefile
  head/deskutils/sugarcrm/files/pkg-message.in

Modified: head/deskutils/sugarcrm/Makefile
==============================================================================
--- head/deskutils/sugarcrm/Makefile	Mon Nov 10 13:43:11 2014	(r372392)
+++ head/deskutils/sugarcrm/Makefile	Mon Nov 10 13:44:59 2014	(r372393)
@@ -3,6 +3,7 @@
 
 PORTNAME=	sugarcrm
 PORTVERSION=	6.5.18
+PORTREVISION=	1
 CATEGORIES=	deskutils www
 MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=	${PORTNAME}/1%20-%20SugarCRM%206.5.X/SugarCommunityEdition-6.5.X
@@ -12,19 +13,29 @@ MAINTAINER=	wen at FreeBSD.org
 COMMENT=	Web based customer relationship management suite
 
 USES=		zip
-USE_PHP=	gd mysql session pcre xml zlib mbstring curl imap spl posix
+USE_PHP=	gd mysql session pcre xml zlib mbstring curl imap spl posix \
+		json ctype zip
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/SugarCE-Full-${PORTVERSION}
 
-PKGMESSAGE=	${WRKDIR}/pkg-message
+PLIST=		${WRKDIR}/plist
+SUGARDIR=	www/sugarcrm
 
+PKGMESSAGE=	${WRKDIR}/pkg-message
 SUB_FILES+=	pkg-message pkg-install
 
+pre-install:
+	@${ECHO_CMD} "@owner ${WWWOWN}" >> ${PLIST}
+	@${ECHO_CMD} "@group ${WWWGRP}" >> ${PLIST}
+	@${ECHO_CMD} "@mode 755" >> ${PLIST}
+	@${FIND} -s -d ${WRKSRC} -type f | ${SED} "s?${WRKSRC}?${SUGARDIR}?g" >>${PLIST}
+	@${FIND} -s -d ${WRKSRC} -type d  | ${SED} "s?${WRKSRC}?@dir ${SUGARDIR}?g" >> ${PLIST}
+	@${ECHO_CMD} "@mode" >> ${PLIST}
+	@${ECHO_CMD} "@group" >> ${PLIST}
+	@${ECHO_CMD} "@owner" >> ${PLIST}
+
 do-install:
 	@${MKDIR} ${STAGEDIR}/${WWWDIR}
-
 	@cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}/${WWWDIR}/
-	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${STAGEDIR}/${WWWDIR}
-	@${CHMOD} -R 755 ${STAGEDIR}/${WWWDIR}
 
 .include <bsd.port.mk>

Modified: head/deskutils/sugarcrm/files/pkg-message.in
==============================================================================
--- head/deskutils/sugarcrm/files/pkg-message.in	Mon Nov 10 13:43:11 2014	(r372392)
+++ head/deskutils/sugarcrm/files/pkg-message.in	Mon Nov 10 13:44:59 2014	(r372393)
@@ -28,6 +28,7 @@ session.save_path = "/tmp"
 Alias /sugarcrm %%WWWDIR%%
 <Directory %%WWWDIR%%>
 	AllowOverride None
+	Require all granted
 	Order allow,deny
 	Allow from all
 </Directory>