PERFORCE change 166489 for review

[Alejandro Pulver]

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

Change 166489 by alepulver at alepulver_deimos on 2009/07/24 06:19:18

	- Add entries to UIDs/GIDs.
	- Add missing @dirrmtry etc/fossology to pkg-plist.
	- Avoid installing 2 files in /etc (for Linux only).
	- Use USE_CDRTOOLS instead of direct dependency.

Affected files ...

.. //depot/projects/soc2008/alepulver-portslicense/ports/GIDs#5 edit
.. //depot/projects/soc2008/alepulver-portslicense/ports/UIDs#5 edit
.. //depot/projects/soc2008/alepulver-portslicense/ports/devel/fossology/Makefile#6 edit
.. //depot/projects/soc2008/alepulver-portslicense/ports/devel/fossology/files/patch-db__Makefile#1 add
.. //depot/projects/soc2008/alepulver-portslicense/ports/devel/fossology/pkg-plist#5 edit

Differences ...

==== //depot/projects/soc2008/alepulver-portslicense/ports/GIDs#5 (text+ko) ====

@@ -132,6 +132,7 @@
 openacs:*:820:
 dotlrn:*:821:
 netdisco:*:840:
+fossy:*:901:www
 bacula:*:910:
 iserv:*:911:
 _relayd:*:913:

==== //depot/projects/soc2008/alepulver-portslicense/ports/UIDs#5 (text+ko) ====

@@ -142,6 +142,7 @@
 openacs:*:820:820::0:0:OpenACS Daemon User:/nonexistent:/usr/sbin/nologin
 dotlrn:*:821:821::0:0:.LRN Daemon User:/nonexistent:/usr/sbin/nologin
 netdisco:*:840:840::0:0:netdisco daemon:/nonexistent:/usr/sbin/nologin
+fossy:*:901:901::0:0:FOSSology user:/usr/local/share/fossology:/usr/local/bin/bash
 bacula:*:910:910::0:0:Bacula Daemon:/var/db/bacula:/usr/sbin/nologin
 iserv:*:911:911::0:0:Iserv Daemon:/nonexistent:/usr/sbin/nologin
 _sj3:*:912:912::0:0:SJ3 Daemon:/nonexistent:/usr/sbin/nologin

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

@@ -14,6 +14,7 @@
 # - Add status command to rc.d script (run through "daemon -p ...").
 # - Make it shm_open in /var/tmp from lockfs.c rather than changing
 #   current directory.
+# - Add crontab entry for postgres db optimizations?
 #
 
 PORTNAME=	fossology
@@ -30,7 +31,6 @@
 LIB_DEPENDS=	extractor.2:${PORTSDIR}/textproc/libextractor
 RUN_DEPENDS=	cabextract:${PORTSDIR}/archivers/cabextract \
 		icat:${PORTSDIR}/sysutils/sleuthkit \
-		isoinfo:${PORTSDIR}/sysutils/cdrtools \
 		pdftotext:${PORTSDIR}/graphics/xpdf \
 		rpm2cpio:${PORTSDIR}/archivers/rpm4 \
 		upx:${PORTSDIR}/archivers/upx \
@@ -40,6 +40,7 @@
 		wget:${PORTSDIR}/ftp/wget
 
 USE_APACHE=	2.0+
+USE_CDRTOOLS=	yes
 USE_GMAKE=	yes
 USE_GNOME=	libxml2
 USE_PERL5=	yes
@@ -99,6 +100,9 @@
 	@${REINPLACE_CMD} -e 's|daemon(0,|daemon(1,|' \
 		${WRKSRC}/scheduler/scheduler.c \
 		${WRKSRC}/scheduler/fo_watchdog.c
+# Do not install init.d script (we use our own)
+	@${REINPLACE_CMD} -Ee 's|^(install: all) install-init|\1|' \
+		${WRKSRC}/scheduler/Makefile
 
 pre-install:
 	@${MKDIR} ${PREFIX}/lib/fossology/agents ${DATADIR}/php

==== //depot/projects/soc2008/alepulver-portslicense/ports/devel/fossology/pkg-plist#5 (text+ko) ====

@@ -966,3 +966,4 @@
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm lib/fossology/agents
 @dirrm lib/fossology
+ at dirrmtry etc/fossology