From owner-p4-projects@FreeBSD.ORG  Fri Jul 10 14:58:38 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 471661065672; Fri, 10 Jul 2009 14:58:38 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 03720106566B
	for <perforce@freebsd.org>; Fri, 10 Jul 2009 14:58:38 +0000 (UTC)
	(envelope-from alepulver@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id E4FA78FC0C
	for <perforce@freebsd.org>; Fri, 10 Jul 2009 14:58:37 +0000 (UTC)
	(envelope-from alepulver@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n6AEwbWh034946
	for <perforce@freebsd.org>; Fri, 10 Jul 2009 14:58:37 GMT
	(envelope-from alepulver@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n6AEwbPo034944
	for perforce@freebsd.org; Fri, 10 Jul 2009 14:58:37 GMT
	(envelope-from alepulver@freebsd.org)
Date: Fri, 10 Jul 2009 14:58:37 GMT
Message-Id: <200907101458.n6AEwbPo034944@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	alepulver@freebsd.org using -f
From: Alejandro Pulver <alepulver@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 165904 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 10 Jul 2009 14:58:39 -0000

http://perforce.freebsd.org/chv.cgi?CH=165904

Change 165904 by alepulver@alepulver_deimos on 2009/07/10 14:57:39

	- Fix problem with configuration files.
	- Add php-posix dependency.
	- Fix incompatibility with FreeBSD's postgresql naming conventions.
	- Replace nonexistent "\w" pattern in grep with equivalent.
	- Fix post-installation script.

Affected files ...

.. //depot/projects/soc2008/alepulver-portslicense/ports/devel/fossology/Makefile#4 edit
.. //depot/projects/soc2008/alepulver-portslicense/ports/devel/fossology/files/patch-common__fo-postinstall.in#1 add
.. //depot/projects/soc2008/alepulver-portslicense/ports/devel/fossology/files/patch-db__dbcreate.in#1 add
.. //depot/projects/soc2008/alepulver-portslicense/ports/devel/fossology/files/patch-scheduler__lockfs.c#2 delete
.. //depot/projects/soc2008/alepulver-portslicense/ports/devel/fossology/files/patch-scheduler__selftest.c#1 add

Differences ...

==== //depot/projects/soc2008/alepulver-portslicense/ports/devel/fossology/Makefile#4 (text+ko) ====

@@ -43,7 +43,7 @@
 USE_PERL5=	yes
 USE_PGSQL=	yes
 IGNORE_WITH_PGSQL=	73 74 80
-USE_PHP=	pgsql session
+USE_PHP=	pgsql session posix
 IGNORE_WITH_PHP=4
 WANT_PHP_CLI=	yes
 USE_RC_SUBR=	fossology
@@ -82,6 +82,9 @@
 # Fix PostgreSQL user name (postgres -> pgsql)
 	@${REINPLACE_CMD} -e 's|su postgres|su pgsql|' \
 		${WRKSRC}/db/dbcreate.in
+# Fix shm file path
+	@${REINPLACE_CMD} -Ee 's|"(fossology-scheduler)"|"/var/tmp/\1"|' \
+		${WRKSRC}/scheduler/lockfs.c
 
 pre-install:
 	@${MKDIR} ${PREFIX}/lib/fossology/agents ${DATADIR}/php
@@ -91,6 +94,10 @@
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${WRKSRC}/INSTALL* ${DOCSDIR}
 .endif
+.for f in Db Depth Hosts Proxy RepPath
+	@cd ${PREFIX}/etc/fossology && test -f ${f}.conf || \
+		${CP} ${f}.conf.sample ${f}.conf
+.endfor
 	@${ECHO_CMD}; ${CAT} ${PKGMESSAGE}; ${ECHO_CMD}
 
 .include <bsd.port.mk>