View | Details | Raw Unified | Return to bug 191436
Collapse All | Expand All

(-)Makefile (-61 / +62 lines)
Lines 2-9 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	netdisco
4
PORTNAME=	netdisco
5
PORTVERSION=	1.3.2
5
PORTVERSION=	1.3.3
6
PORTREVISION=	1
7
CATEGORIES=	net-mgmt www
6
CATEGORIES=	net-mgmt www
8
MASTER_SITES=	SF
7
MASTER_SITES=	SF
9
8
Lines 26-48 Link Here
26
		p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \
25
		p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \
27
		p5-Parallel-ForkManager>=0:${PORTSDIR}/devel/p5-Parallel-ForkManager
26
		p5-Parallel-ForkManager>=0:${PORTSDIR}/devel/p5-Parallel-ForkManager
28
27
29
USERS=		netdisco
28
USES=		perl5 shebangfix
30
GROUPS=		netdisco
29
USE_PERL5=	run build fixpacklist
31
32
USES=		perl5
33
USE_PGSQL=	yes
30
USE_PGSQL=	yes
34
31
35
USE_RC_SUBR=	netdisco
32
USE_RC_SUBR=	netdisco
36
33
37
NO_BUILD=	yes
34
NO_BUILD=	yes
38
NO_STAGE=	yes
39
35
36
NETDISCO_USER=	netdisco
37
NETDISCO_GROUP=	netdisco
40
NETDISCO_RUNDIR=/var/run
38
NETDISCO_RUNDIR=/var/run
41
NETDISCO_DBDIR=	/var/db/netdisco
39
NETDISCO_DBDIR=	/var/db/netdisco
42
40
43
SUB_FILES=	pkg-message
41
SUB_FILES=	pkg-message
44
SUB_LIST=	NETDISCO_DBDIR=${NETDISCO_DBDIR} NETDISCO_RUNDIR=${NETDISCO_RUNDIR} NETDISCO_USER=${USERS} NETDISCO_GROUP=${GROUPS}
42
#SUB_LIST=	NETDISCO_DBDIR=${NETDISCO_DBDIR} NETDISCO_RUNDIR=${NETDISCO_RUNDIR} NETDISCO_USER=${NETDISCO_USER} NETDISCO_GROUP=${NETDISCO_GROUP}
45
PLIST_SUB=	NETDISCO_DBDIR=${NETDISCO_DBDIR} NETDISCO_RUNDIR=${NETDISCO_RUNDIR}
43
PLIST_SUB=	NETDISCO_DBDIR=${NETDISCO_DBDIR} NETDISCO_RUNDIR=${NETDISCO_RUNDIR} NETDISCO_USER=${NETDISCO_USER}
44
SHEBANG_FILES=	bin/parse_kismet_ap netdisco
46
45
47
WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
46
WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
48
47
Lines 67-72 Link Here
67
MIBINCLUDES="#please add here mibs dirs list (at least snmp and rfc ones)"
66
MIBINCLUDES="#please add here mibs dirs list (at least snmp and rfc ones)"
68
.endif
67
.endif
69
68
69
REINPLACE_EXPR=	-e 's!%%PREFIX%%!${PREFIX}!g' -e 's!%%DATADIR%%!${DATADIR}!g' \
70
	-e 's!%%DOCSDIR%%!${DOCSDIR}!g' -e 's!%%NETDISCO_RUNDIR%%!${NETDISCO_RUNDIR}!g' \
71
	-e 's!%%NETDISCO_USER%%!${NETDISCO_USER}!g' -e 's!%%NETDISCO_GROUP%%!${NETDISCO_GROUP}!g' \
72
	-e 's!%%NETDISCO_DBDIR%%!${NETDISCO_DBDIR}!g' -e 's!%%ETCDIR%%!${ETCDIR}!g' \
73
	-e 's!%%SITE_PERL%%!${SITE_PERL}!g' -e 's!%%MIBINCLUDES%%!${MIBINCLUDES}!g'
74
70
.if ${PORT_OPTIONS:MGRAPHVIZ}
75
.if ${PORT_OPTIONS:MGRAPHVIZ}
71
RUN_DEPENDS+=	p5-Graph>=0:${PORTSDIR}/math/p5-Graph	\
76
RUN_DEPENDS+=	p5-Graph>=0:${PORTSDIR}/math/p5-Graph	\
72
		p5-GraphViz>=0:${PORTSDIR}/graphics/p5-GraphViz
77
		p5-GraphViz>=0:${PORTSDIR}/graphics/p5-GraphViz
Lines 78-87 Link Here
78
		p5-libapreq2>=0:${PORTSDIR}/www/p5-libapreq2 \
83
		p5-libapreq2>=0:${PORTSDIR}/www/p5-libapreq2 \
79
		p5-MasonX-Request-WithApacheSession>=0:${PORTSDIR}/www/p5-MasonX-Request-WithApacheSession
84
		p5-MasonX-Request-WithApacheSession>=0:${PORTSDIR}/www/p5-MasonX-Request-WithApacheSession
80
USE_APACHE_RUN=	22
85
USE_APACHE_RUN=	22
86
REINPLACE_EXPR+=	-e 's!%%APACHEMODDIR%%!${APACHEMODDIR}!g' -e 's!%%APACHEETCDIR%%!${APACHEETCDIR}!g' \
87
		-e 's!%%WWWDIR%%!${WWWDIR}!g' 
88
PLIST_SUB+=	WWWOWN=${WWWOWN} WWWGRP=${WWWGRP} WEBUI=""
81
.else
89
.else
82
WWWDIR=	"@comment "
90
PLIST_SUB+=     WWWOWN="@comment " \
91
		WWWGRP="@comment " \
92
		WWWDIR="@comment " \
93
		WEBUI="@comment "
83
.endif
94
.endif
84
95
96
USERS+=		${NETDISCO_USER}
97
GROUPS+=		${NETDISCO_GROUP}
98
85
pre-install:
99
pre-install:
86
.	for i in ${ALTER_FILES}
100
.	for i in ${ALTER_FILES}
87
		@(${MV} ${WRKSRC}/${i}.bak ${WRKSRC}/${i} 2>/dev/null || ${TRUE})
101
		@(${MV} ${WRKSRC}/${i}.bak ${WRKSRC}/${i} 2>/dev/null || ${TRUE})
Lines 88-161 Link Here
88
.	endfor
102
.	endfor
89
103
90
	cd ${WRKSRC} && \
104
	cd ${WRKSRC} && \
91
	${REINPLACE_CMD} -e 's#%%WWWDIR%%#${WWWDIR}#g'		\
105
	${REINPLACE_CMD} ${REINPLACE_EXPR} ${ALTER_FILES}
92
			-e 's#%%PREFIX%%#${PREFIX}#g'		\
93
			-e 's#%%DATADIR%%#${DATADIR}#g'		\
94
			-e 's#%%DOCSDIR%%#${DOCSDIR}#g'		\
95
			-e 's#%%NETDISCO_RUNDIR%%#${NETDISCO_RUNDIR}#g'		\
96
			-e 's#%%NETDISCO_USER%%#${USERS}#g'		\
97
			-e 's#%%NETDISCO_GROUP%%#${GROUPS}#g'		\
98
			-e 's#%%NETDISCO_DBDIR%%#${NETDISCO_DBDIR}#g'		\
99
			-e 's#%%ETCDIR%%#${ETCDIR}#g'		\
100
			-e 's#%%SITE_PERL%%#${SITE_PERL}#g'	\
101
			-e 's#%%LOCALBASE%%#${LOCALBASE}#g'	\
102
			-e 's#%%APACHEMODDIR%%#${APACHEMODDIR}#g'	\
103
			-e 's#%%APACHEETCDIR%%#${APACHEETCDIR}#g'	\
104
			-e 's#%%MIBINCLUDES%%#${MIBINCLUDES}#g'	\
105
			${ALTER_FILES}
106
106
107
do-install:
107
do-install:
108
.	for i in netdisco bin/parse_mac bin/port_control bin/parse_kismet_ap
108
.	for i in netdisco bin/parse_mac bin/port_control bin/parse_kismet_ap
109
		cd ${WRKSRC} && ${INSTALL_SCRIPT} ${i} ${PREFIX}/bin
109
		cd ${WRKSRC} && ${INSTALL_SCRIPT} ${i} ${STAGEDIR}${PREFIX}/bin
110
.	endfor
110
.	endfor
111
111
112
.	if ${PORT_OPTIONS:MWEBUI}
112
.	if ${PORT_OPTIONS:MWEBUI}
113
		${MKDIR} ${WWWDIR}
113
		${MKDIR} ${STAGEDIR}${WWWDIR}
114
		cd ${WRKSRC}/html && ${INSTALL_DATA} autohandler *.* ${WWWDIR}
114
		cd ${WRKSRC}/html && ${INSTALL_DATA} autohandler *.* ${STAGEDIR}${WWWDIR}
115
115
116
		${MKDIR} ${WWWDIR}/doc
116
		${MKDIR} ${STAGEDIR}${WWWDIR}/doc
117
		cd ${WRKSRC}/html/doc && ${INSTALL_DATA} *.* ${WWWDIR}/doc
117
		cd ${WRKSRC}/html/doc && ${INSTALL_DATA} *.* ${STAGEDIR}${WWWDIR}/doc
118
119
		${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR}
120
121
		${MKDIR} ${WWWDIR}/mason
122
.	endif
118
.	endif
123
119
124
	${INSTALL_DATA} ${WRKSRC}/netdisco.pm ${SITE_PERL}
120
	${MKDIR} -m 755 -p ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}
125
	${INSTALL} -d -m 750 -o ${USERS} -g ${GROUPS} ${ETCDIR}
126
121
127
.	for i in ${CONFIG_FILES}
122
	${INSTALL_DATA} ${WRKSRC}/netdisco.pm ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}
128
		cd ${WRKSRC} && ${INSTALL_DATA} ${i} ${ETCDIR}/${i}.sample
123
	${INSTALL} -d -m 750 ${STAGEDIR}${ETCDIR}
129
		@(if [ ! -f ${ETCDIR}/${i} ]; then	\
130
			${INSTALL} -m 640 -o ${USERS} -g ${GROUPS} ${ETCDIR}/${i}.sample ${ETCDIR}/${i};	\
131
		fi)
132
.	endfor
133
124
134
	${CHOWN} -R ${USERS}:${GROUPS} ${ETCDIR}
125
	${INSTALL} -d ${STAGEDIR}${DATADIR}/sql
135
	${CHMOD} -R 660 ${ETCDIR}/*
136
126
137
	${INSTALL} -d ${DATADIR}/sql
138
139
	cd ${WRKSRC}/sql && \
127
	cd ${WRKSRC}/sql && \
140
	   ${INSTALL_DATA} *.sql pg ${DATADIR}/sql
128
	   ${INSTALL_DATA} *.sql pg ${STAGEDIR}${DATADIR}/sql
141
129
142
	${INSTALL_DATA} ${WRKSRC}/Makefile ${DATADIR}
130
	${INSTALL_DATA} ${WRKSRC}/Makefile ${STAGEDIR}${DATADIR}
143
131
132
.	for i in ${CONFIG_FILES}
133
		${INSTALL} -m 640 ${WRKSRC}/${i} ${STAGEDIR}${ETCDIR}/${i}.sample
134
.	endfor
135
136
post-install:
137
	${MKDIR} ${STAGEDIR}${DOCSDIR}
138
	(cd ${WRKSRC} && ${INSTALL_MAN} ${DOCFILES} ${STAGEDIR}${DOCSDIR})
139
.	if ${PORT_OPTIONS:MWEBUI}
140
		${ECHO_CMD} "@unexec ${RM} -rf ${WWWDIR}/mason" >> ${TMPPLIST}
141
		${ECHO_CMD} "@exec ${MKDIR} -m 750 ${WWWDIR}/mason" >> ${TMPPLIST}
142
		${ECHO_CMD} "@exec ${CHOWN} -R ${WWWOWN} ${WWWDIR}/mason" >> ${TMPPLIST}
143
		${ECHO_CMD} "@exec ${CHOWN} ${NETDISCO_USER} ${WWWDIR}" >> ${TMPPLIST}
144
.	endif
145
	${ECHO_CMD} "@exec ${CHOWN} -R ${NETDISCO_USER}:${NETDISCO_GROUP} ${ETCDIR}"
144
.	if !defined(PACKAGE_BUILDING)
146
.	if !defined(PACKAGE_BUILDING)
145
		@(if [ -d ${LOCALBASE}/${APACHEETCDIR}/Includes ] ; then							\
147
		@(if [ -d ${PREFIX}/${APACHEETCDIR}/Includes ] ; then							\
146
			${ECHO_MSG} "===> Adding config in ${LOCALBASE}/${APACHEETCDIR}/Includes...";					\
148
			${ECHO_MSG} "===> Adding config in ${PREFIX}/${APACHEETCDIR}/Includes...";					\
147
			test -L ${LOCALBASE}/${APACHEETCDIR}/Includes/netdisco_apache.conf || \
149
			test -L ${PREFIX}/${APACHEETCDIR}/Includes/netdisco_apache.conf || \
148
				${LN} -s ${ETCDIR}/netdisco_apache.conf ${LOCALBASE}/${APACHEETCDIR}/Includes/netdisco_apache.conf; \
150
				${LN} -s ${ETCDIR}/netdisco_apache.conf ${PREFIX}/${APACHEETCDIR}/Includes/netdisco_apache.conf; \
149
			test -L ${LOCALBASE}/${APACHEETCDIR}/Includes/netdisco_apache_dir.conf || \
151
			test -L ${PREFIX}/${APACHEETCDIR}/Includes/netdisco_apache_dir.conf || \
150
				${LN} -s ${ETCDIR}/netdisco_apache_dir.conf ${LOCALBASE}/${APACHEETCDIR}/Includes/netdisco_apache_dir.conf;\
152
				${LN} -s ${ETCDIR}/netdisco_apache_dir.conf ${PREFIX}/${APACHEETCDIR}/Includes/netdisco_apache_dir.conf;\
151
		fi)
153
		fi)
152
.	endif
154
.	endif
155
.	for i in ${CONFIG_FILES}
156
		cd ${WRKSRC} && ${INSTALL_DATA} ${i} ${STAGEDIR}${ETCDIR}/${i}.sample
157
		@(if [ ! -f ${STAGEDIR}${ETCDIR}/${i} ]; then	\
158
			${INSTALL} -m 640 ${STAGEDIR}${ETCDIR}/${i}.sample ${STAGEDIR}${ETCDIR}/${i};	\
159
		fi)
160
.	endfor
153
161
154
post-install:
155
.	if ${PORT_OPTIONS:MDOCS}
156
		${MKDIR} ${DOCSDIR}
157
		(cd ${WRKSRC} && ${INSTALL_MAN} ${DOCFILES} ${DOCSDIR})
158
.	endif
159
	@${CAT} ${PKGMESSAGE}
160
161
.include <bsd.port.mk>
162
.include <bsd.port.mk>
(-)distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (netdisco-1.3.2.tar.gz) = bd59472ab2efaf30a3f62a03511c91824011368d34728430e707861e44ee2aa4
1
SHA256 (netdisco-1.3.3.tar.gz) = 0b26628b411a8d8cf31b01fdc92fdbf01373cf23f124d3942052c47da2cb08e2
2
SIZE (netdisco-1.3.2.tar.gz) = 1351266
2
SIZE (netdisco-1.3.3.tar.gz) = 1351500
(-)files/patch-netdisco_apache.conf (-2 / +2 lines)
Lines 6-13 Link Here
6
 #
6
 #
7
-LoadModule perl_module  libexec/apache2/mod_perl.so
7
-LoadModule perl_module  libexec/apache2/mod_perl.so
8
-LoadModule apreq_module libexec/apache2/mod_apreq2.so
8
-LoadModule apreq_module libexec/apache2/mod_apreq2.so
9
+LoadModule perl_module  %%LOCALBASE%%/%%APACHEMODDIR%%/mod_perl.so
9
+LoadModule perl_module  %%PREFIX%%/%%APACHEMODDIR%%/mod_perl.so
10
+LoadModule apreq_module %%LOCALBASE%%/%%APACHEMODDIR%%/mod_apreq2.so
10
+LoadModule apreq_module %%PREFIX%%/%%APACHEMODDIR%%/mod_apreq2.so
11
 PerlModule Apache2::compat
11
 PerlModule Apache2::compat
12
 PerlModule Apache2::Request
12
 PerlModule Apache2::Request
13
 
13
 
(-)pkg-plist (-21 / +10 lines)
Lines 113-140 Link Here
113
%%DOCSDIR%%/README-API-BACKEND
113
%%DOCSDIR%%/README-API-BACKEND
114
%%DOCSDIR%%/README-API-SHARED
114
%%DOCSDIR%%/README-API-SHARED
115
%%DOCSDIR%%/UPGRADE
115
%%DOCSDIR%%/UPGRADE
116
@unexec d="%D/%%ETCDIR%%"; f="netdisco.conf"; if cmp -s ${d}/${f}.sample ${d}/${f}; then rm -f ${d}/${f}; fi;
116
@group %%NETDISCO_GROUP%%
117
%%ETCDIR%%/netdisco.conf.sample
117
@sample %%ETCDIR%%/netdisco.conf.sample
118
@exec if [ ! -f %%ETCDIR%%/netdisco.conf ] ; then cp -p %%ETCDIR%%/netdisco.conf.sample %%ETCDIR%%/netdisco.conf; fi
118
@sample %%ETCDIR%%/netdisco-topology.txt.sample
119
@unexec d="%D/%%ETCDIR%%"; f="netdisco-topology.txt"; if cmp -s ${d}/${f}.sample ${d}/${f}; then rm -f ${d}/${f}; fi;
119
@sample %%ETCDIR%%/netdisco.crontab.sample
120
%%ETCDIR%%/netdisco-topology.txt.sample
120
@sample %%ETCDIR%%/netdisco_apache.conf.sample
121
@exec if [ ! -f %%ETCDIR%%/netdisco-topology.txt ] ; then cp -p %%ETCDIR%%/netdisco-topology.txt.sample %%ETCDIR%%/netdisco-topology.txt; fi
121
@sample %%ETCDIR%%/netdisco_apache_dir.conf.sample
122
@unexec d="%D/%%ETCDIR%%"; f="netdisco.crontab"; if cmp -s ${d}/${f}.sample ${d}/${f}; then rm -f ${d}/${f}; fi;
122
@unexec if [ -L %%APACHEETCDIR%%/Includes/netdisco_apache_dir.conf ] ; then rm %%APACHEETCDIR%%/Includes/netdisco_apache_dir.conf; fi
123
%%ETCDIR%%/netdisco.crontab.sample
123
@unexec if [ -L %%APACHEETCDIR%%/Includes/netdisco_apache.conf ] ; then rm %%APACHEETCDIR%%/Includes/netdisco_apache.conf; fi
124
@exec if [ ! -f %%ETCDIR%%/netdisco.crontab ] ; then cp -p %%ETCDIR%%/netdisco.crontab.sample %%ETCDIR%%/netdisco.crontab; fi
124
%%WEBUI%%@dirrm %%WWWDIR%%/doc
125
@unexec d="%D/%%ETCDIR%%"; f="netdisco_apache.conf"; if cmp -s ${d}/${f}.sample ${d}/${f}; then rm -f ${d}/${f}; fi;
125
%%WEBUI%%@dirrmtry %%WWWDIR%%
126
%%ETCDIR%%/netdisco_apache.conf.sample
127
@exec if [ ! -f %%ETCDIR%%/netdisco_apache.conf ] ; then cp -p %%ETCDIR%%/netdisco_apache.conf.sample %%ETCDIR%%/netdisco_apache.conf; fi
128
@unexec d="%D/%%ETCDIR%%"; f="netdisco_apache_dir.conf"; if cmp -s ${d}/${f}.sample ${d}/${f}; then rm -f ${d}/${f}; fi;
129
%%ETCDIR%%/netdisco_apache_dir.conf.sample
130
@exec if [ ! -f %%ETCDIR%%/netdisco_apache_dir.conf ] ; then cp -p %%ETCDIR%%/netdisco_apache_dir.conf.sample %%ETCDIR%%/netdisco_apache_dir.conf; fi
131
@unexec if [ -L %%APACHEETCDIR/Includes/netdisco_apache_dir.conf ] ; then rm %%APACHEETCDIR/Includes/netdisco_apache_dir.conf; fi
132
@unexec if [ -L %%APACHEETCDIR/Includes/netdisco_apache.conf ] ; then rm %%APACHEETCDIR/Includes/netdisco_apache.conf; fi
133
@dirrmtry %%WWWDIR%%/mason
134
@dirrm %%WWWDIR%%/doc
135
@dirrmtry %%WWWDIR%%
136
@dirrm %%DATADIR%%/sql
126
@dirrm %%DATADIR%%/sql
137
@dirrmtry %%DATADIR%%
127
@dirrmtry %%DATADIR%%
138
@dirrmtry %%ETCDIR%%
128
@dirrmtry %%ETCDIR%%
139
%%PORTDOCS%%@dirrm %%DOCSDIR%%
129
%%PORTDOCS%%@dirrm %%DOCSDIR%%
140
@exec mkdir -p %D/%%WWWDIR%%/mason

Return to bug 191436