Attachment 111839 Details for Bug 153162 – file.diff

[patch] file.diff

file.diff (text/plain), 2.40 KB, created by corsmith on 2010-12-15 02:20:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: corsmith

Created: 2010-12-15 02:20:08 UTC

Size: 2.40 KB

patch

obsolete

>diff -urN torrus-1.0.9/Makefile torrus/Makefile
>--- torrus-1.0.9/Makefile	2010-11-26 06:16:34.000000000 -0500
>+++ torrus/Makefile	2010-12-14 13:49:50.270310278 -0500
>@@ -7,6 +7,7 @@
> 
> PORTNAME=	torrus
> PORTVERSION=	1.0.9
>+PORTREVISION=	1
> CATEGORIES=	net-mgmt
> MASTER_SITES=	SF
> 
>@@ -42,8 +43,7 @@
> 		pkgdocdir=${DOCSDIR} \
> 		exmpdir=${EXAMPLESDIR} \
> 		perllibdir=${SITE_PERL} \
>-		scriptsdir=${PREFIX}/libexec/torrus/scripts \
>-		--enable-pkgonly
>+		scriptsdir=${PREFIX}/libexec/torrus/scripts
> 
> MAN1=		torrus.1 torrus_acledit.1 torrus_buildsearchdb.1 \
> 		torrus_cleanup.1 torrus_clearcache.1 torrus_collector.1 \
>@@ -60,13 +60,13 @@
> 
> .include <bsd.port.pre.mk>
> 
>-pre-install:
>-	@if ! pw groupshow ${TORRUS_USER}; then \
>+pre-configure:
>+	@if ! pw groupshow ${TORRUS_USER} >/dev/null 2>&1; then \
> 		pw groupadd ${TORRUS_USER}; \
> 	fi
>-	@if ! pw usershow ${TORRUS_USER}; then \
>+	@if ! pw usershow ${TORRUS_USER} >/dev/null 2>&1; then \
> 		pw useradd ${TORRUS_USER} -g ${TORRUS_USER} \
>-			-h - -d ${PREFIX}/torrus -c "torrus daemon"; \
>+			-h - -d /var/torrus -c "torrus daemon"; \
> 		pw usermod www -G ${TORRUS_USER}; \
> 	fi
> 
>diff -urN torrus-1.0.9/pkg-plist torrus/pkg-plist
>--- torrus-1.0.9/pkg-plist	2010-11-26 06:16:34.000000000 -0500
>+++ torrus/pkg-plist	2010-12-14 16:47:23.777743071 -0500
>@@ -269,6 +269,11 @@
> %%SITE_PERL%%/Torrus/SQL/SrvExport.pm
> %%SITE_PERL%%/Torrus/SQL.pm
> %%SITE_PERL%%/Torrus/TimeStamp.pm
>+@exec if ! pw groupshow %%TORRUS_USER%% >/dev/null 2>&1; then pw groupadd %%TORRUS_USER%%; fi
>+@exec if ! pw usershow %%TORRUS_USER%% >/dev/null 2>&1; then pw useradd %%TORRUS_USER%% -g %%TORRUS_USER%% -h - -d /var/torrus -c "torrus daemon"; pw usermod www -G %%TORRUS_USER%%; fi
>+@unexec if pw groupshow %%TORRUS_USER%% >/dev/null 2>&1; then pw groupdel %%TORRUS_USER%%; fi
>+@unexec if pw usershow %%TORRUS_USER%% >/dev/null 2>&1; then pw userdel %%TORRUS_USER%%; fi
>+@exec install -d -g %%TORRUS_USER%% -o %%TORRUS_USER%% -m 2775 /var/log/torrus 2>/dev/null || true
> @exec install -d -g %%TORRUS_USER%% -o %%TORRUS_USER%% -m 755 /var/torrus 2>/dev/null || true
> @exec install -d -g %%TORRUS_USER%% -o %%TORRUS_USER%% -m 2775 /var/torrus/cache 2>/dev/null || true
> @exec install -d -g %%TORRUS_USER%% -o %%TORRUS_USER%% -m 2775 /var/torrus/collector_rrd 2>/dev/null || true
>@@ -321,4 +326,3 @@
> @dirrm %%SITE_PERL%%/Torrus/Collector
> @dirrm %%SITE_PERL%%/Torrus/ACL
> @dirrm %%SITE_PERL%%/Torrus
>-@exec mkdir -p /var/log/torrus

Actions: View | Diff

Attachments on bug 153162: 111839