PERFORCE change 164299 for review
Alejandro Pulver
alepulver at FreeBSD.org
Sat Jun 13 21:46:39 UTC 2009
http://perforce.freebsd.org/chv.cgi?CH=164299
Change 164299 by alepulver at alepulver_deimos on 2009/06/13 21:45:37
- Integrate bsd.wx.mk changes from CVS.
- Add one step about increasing shared memory limit in
fossology/files/pkg-message.in.
- Fix bug in bsd.licenses.mk when using known licenses.
Affected files ...
.. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.licenses.mk#8 edit
.. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.wx.mk#2 integrate
.. //depot/projects/soc2008/alepulver-portslicense/ports/devel/fossology/files/pkg-message.in#3 edit
Differences ...
==== //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.licenses.mk#8 (text+ko) ====
@@ -252,13 +252,12 @@
. if !defined(LICENSE_FILE)
. if !defined(LICENSE_TEXT)
. if ${_LICENSE_TYPE} == "known"
-LICENSE_TEXT= License ${lic} is in internal database, please check ...
+LICENSE_TEXT= License ${lic} is in internal database, check repository.
. else
_LICENSE_ERROR?= LICENSE_FILE or LICENSE_TEXT must be defined for unknown licenses
. endif
-. else
+. endif
_LICENSE_FILE= ${WRKDIR}/License-freebsd-port
-. endif
. else
_LICENSE_FILE= ${LICENSE_FILE}
. endif
==== //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.wx.mk#2 (text+ko) ====
@@ -1,7 +1,7 @@
#-*- mode: makefile; tab-width: 4; -*-
# ex:ts=4
#
-# $FreeBSD: ports/Mk/bsd.wx.mk,v 1.13 2008/04/19 17:46:02 miwi Exp $
+# $FreeBSD: ports/Mk/bsd.wx.mk,v 1.14 2009/06/13 16:35:47 erwin Exp $
#
# bsd.wx.mk - Support for wxWidgets based ports.
#
@@ -35,7 +35,6 @@
# wx - The wxWidgets library.
# contrib - The wxWidgets contributed libraries.
# python - The wxWidgets API for Python.
-# mozilla - WxMozilla (only for 2.4).
# svg - WxSVG (only for 2.6).
# The available dependency types are:
# build - Requires component for building.
@@ -130,7 +129,7 @@
# _WX_VERS_LISTS - Reverse lists preference order.
#
-_WX_COMPS_ALL= wx contrib python mozilla svg
+_WX_COMPS_ALL= wx contrib python svg
_WX_DEP_TYPES_ALL= build lib run
_WX_VERS_ALL= 2.4 2.6 2.8
_WX_VERS_UC_ALL= 2.6 2.8
@@ -155,9 +154,6 @@
_WX_PORT_python_2.4= x11-toolkits/py-wxPython24
_WX_FILE_python_2.4= ${PYTHON_SITELIBDIR}/wx/__init__.py
-_WX_PORT_mozilla_2.4= x11-toolkits/wxmozilla
-_WX_LIB_mozilla_2.4= wxmozilla_gtk2-2.4
-
# wxgtk 2.6
_WX_PORT_wx_2.6= x11-toolkits/wxgtk26${_WX_UCL}
_WX_LIB_wx_2.6= wx_base${_WX_UC}-2.6
==== //depot/projects/soc2008/alepulver-portslicense/ports/devel/fossology/files/pkg-message.in#3 (text+ko) ====
@@ -6,14 +6,20 @@
1. Install PostgreSQL server: initialize database and start the daemon.
-2. Configure PHP: put the following in your php.ini file:
+2. Increase shared memory limit, by running:
+ # sysctl kern.ipc.shmmax=512000000
+
+ And to make the change persistent add this line to /etc/sysctl.conf:
+ kern.ipc.shmmax=512000000
+
+3. Configure PHP: put the following in your php.ini file:
max_execution_time = 90
memory_limit = 702M
post_max_size = 701M
upload_max_filesize = 700M
-3. Configure Apache, add the following to your httpd.conf:
+4. Configure Apache, add the following to your httpd.conf:
Alias /repo/ %%DATADIR%%/www/
<Directory "%%DATADIR%%/www">
@@ -26,22 +32,22 @@
#php_value error_reporting 2039
</Directory>
-4. Add the following to a robots.txt file to avoid them to index the site:
+5. Add the following to a robots.txt file to avoid them to index the site:
User-agent: *
Disallow: /repo
-5. Run the post installation setup script:
+6. Run the post installation setup script:
- %%PREFIX%%/lib/fossology/fo-postinstall
+ # %%PREFIX%%/lib/fossology/fo-postinstall
-6. Enable at startup, add the following line to /etc/rc.conf:
+7. Enable at startup, add the following line to /etc/rc.conf:
fossology_enable="YES"
To start now use this additional command (requires previous, at least
you use "forcestart" instead of "start"):
- %%PREFIX%%/etc/rc.d/fossology start
+ # %%PREFIX%%/etc/rc.d/fossology start
==============================================================================
More information about the p4-projects
mailing list