Attachment 144158 Details for Bug 191408 – patch generated with git-diff

[patch] patch generated with git-diff

patch (text/plain), 4.50 KB, created by Pierre DAVID on 2014-06-26 13:14:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pierre DAVID

Created: 2014-06-26 13:14:58 UTC

Size: 4.50 KB

patch

obsolete

>diff --git a/pkg/freebsd/netmagis-common/Makefile b/pkg/freebsd/netmagis-common/Makefile
>index 2db2376..3de8b3d 100644
>--- a/pkg/freebsd/netmagis-common/Makefile
>+++ b/pkg/freebsd/netmagis-common/Makefile
>@@ -11,6 +11,12 @@ PKGNAMESUFFIX?=	-common
> MAINTAINER?=	pdagog@gmail.com
> COMMENT?=	Netmagis common infrastructure
> 
>+# Portlint barfs about a MASTERDIR variable if the LICENSE block is defined (black magic?)
>+#LICENSE=	CECILL-B
>+#LICENSE_NAME=	CeCILL-B Free Software License Agreement
>+#LICENSE_FILE=	${WRKSRC}/LICENSE
>+#LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
>+
> USES=		tcl:85+
> 
> USE_PGSQL=	pgtcl
>@@ -28,13 +34,9 @@ USE_PGSQL+=	server pltcl
> .endif
> 
> .if ${PKGNAMESUFFIX} == -www
>-USE_APACHE=	22+
> USE_TEX=	tex
> RUN_DEPENDS+=	dot:${PORTSDIR}/graphics/graphviz \
>-		pwgen:${PORTSDIR}/sysutils/pwgen \
>-		${LOCALBASE}/libexec/apache22/mod_auth_pgsql.so:${PORTSDIR}/www/mod_auth_pgsql2
>-# FIXME compile apache22 with option mod_auth_ldap
>-# FIXME add ap22-mod_auth_cas
>+		pwgen:${PORTSDIR}/sysutils/pwgen
> .endif
> 
> .if ${PKGNAMESUFFIX} == -topo
>@@ -51,10 +53,13 @@ RUN_DEPENDS+=	p5-DBD-Pg>0:${PORTSDIR}/databases/p5-DBD-Pg \
> 		p5-Net-SNMP>=0:${PORTSDIR}/net-mgmt/p5-Net-SNMP \
> 		p5-SNMP_Session>=0:${PORTSDIR}/net-mgmt/p5-SNMP_Session \
> 		p5-RRDTool-OO>=0:${PORTSDIR}/devel/p5-RRDTool-OO
>+
>+USES+=		shebangfix
>+SHEBANG_FILES=	bin/metrocreatedb bin/metropoller bin/metropoller-run
> .endif
> 
> # Variables used in netmagis Makefiles
>-MAKE_ARGS+=	DESTDIR=${DESTDIR} PREFIX=${PREFIX}
>+MAKE_ARGS+=	DESTDIR=${STAGEDIR}${DESTDIR} PREFIX=${PREFIX}
> MAKE_ARGS+=	TCLSH=${TCLSH} TCLCONF=${TCL_LIBDIR}/tclConfig.sh
> 
> .if ${PKGNAMESUFFIX} == -topo || ${PKGNAMESUFFIX} == -www
>diff --git a/pkg/freebsd/netmagis-detecteq/pkg-plist b/pkg/freebsd/netmagis-detecteq/pkg-plist
>index a667b75..c33ce3d 100644
>--- a/pkg/freebsd/netmagis-detecteq/pkg-plist
>+++ b/pkg/freebsd/netmagis-detecteq/pkg-plist
>@@ -3,4 +3,4 @@ sbin/detectconfmod
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/radius/server.conf
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/radius/topo.conf
> %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/radius
>-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
>+%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%
>diff --git a/pkg/freebsd/netmagis-metro/Makefile b/pkg/freebsd/netmagis-metro/Makefile
>index 40f9739..e9163e5 100644
>--- a/pkg/freebsd/netmagis-metro/Makefile
>+++ b/pkg/freebsd/netmagis-metro/Makefile
>@@ -6,12 +6,9 @@ PKGNAMESUFFIX=	-metro
> 
> COMMENT=	Netmagis metrology module
> 
>-MANUAL_PACKAGE_BUILD=	Uses non-default version of PostgreSQL
>-
> MASTERDIR=	${.CURDIR}/../netmagis-common
> 
> PKGMESSAGE=	${.CURDIR}/pkg-message
> PLIST=		${.CURDIR}/pkg-plist
> 
>-NO_STAGE=	yes
> .include "${MASTERDIR}/Makefile"
>diff --git a/pkg/freebsd/netmagis-metro/pkg-plist b/pkg/freebsd/netmagis-metro/pkg-plist
>index 741e99e..3590ea4 100644
>--- a/pkg/freebsd/netmagis-metro/pkg-plist
>+++ b/pkg/freebsd/netmagis-metro/pkg-plist
>@@ -34,11 +34,7 @@ www/metro/gengraph
> @dirrmtry var/netmagis/metro
> @dirrmtry var/netmagis
> @dirrmtry var
>-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
>-@dirrmtry lib/netmagis/tmp/netmagis/lib/netmagis
>-@dirrmtry lib/netmagis/tmp/netmagis/lib
>-@dirrmtry lib/netmagis/tmp/netmagis
>-@dirrmtry lib/netmagis/tmp
>+%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%
> @dirrm lib/netmagis/probes
> @dirrm lib/netmagis/plugins
> @exec mkdir -p %D/var/netmagis/metro/wifi
>@@ -49,4 +45,3 @@ www/metro/gengraph
> @exec mkdir -p %D/var/netmagis/metro/graph
> @exec mkdir -p %D/var/netmagis/metro/db
> @exec mkdir -p %D/var/netmagis/metro/cache
>-@exec mkdir -p %D/lib/netmagis/tmp/netmagis/lib/netmagis
>diff --git a/pkg/freebsd/netmagis-topo/pkg-plist b/pkg/freebsd/netmagis-topo/pkg-plist
>index 1a05bbc..7d012a7 100644
>--- a/pkg/freebsd/netmagis-topo/pkg-plist
>+++ b/pkg/freebsd/netmagis-topo/pkg-plist
>@@ -31,8 +31,8 @@ sbin/toposendd
> @dirrmtry var/netmagis
> @dirrmtry var
> %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/eqvirt
>-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
>+%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%
> @dirrm lib/netmagis/topo
>-@dirrm lib/netmagis
>+@dirrmtry lib/netmagis
> @exec mkdir -p %D/var/netmagis/eqvirt
> @exec mkdir -p %D/var/netmagis/eqgen
>diff --git a/pkg/freebsd/netmagis-www/Makefile b/pkg/freebsd/netmagis-www/Makefile
>index dbc1568..6716e9f 100644
>--- a/pkg/freebsd/netmagis-www/Makefile
>+++ b/pkg/freebsd/netmagis-www/Makefile
>@@ -6,12 +6,9 @@ PKGNAMESUFFIX=	-www
> 
> COMMENT=	Netmagis web module
> 
>-MANUAL_PACKAGE_BUILD=	Requires non-default version of PostgreSQL
>-
> MASTERDIR=	${.CURDIR}/../netmagis-common
> 
> PKGMESSAGE=	${.CURDIR}/pkg-message
> PLIST=		${.CURDIR}/pkg-plist
> 
>-NO_STAGE=	yes
> .include "${MASTERDIR}/Makefile"

Actions: View | Diff

Attachments on bug 191408: 144158