PERFORCE change 165904 for review

Alejandro Pulver alepulver at FreeBSD.org
Fri Jul 10 14:58:39 UTC 2009


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

Change 165904 by alepulver at 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>


More information about the p4-projects mailing list