Date: Tue, 1 Jul 2014 22:29:52 +0000 (UTC) From: Raphael Kubo da Costa <rakuco@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r360106 - in head/net-mgmt: netdisco netdisco-mibs netdisco/files Message-ID: <201407012229.s61MTq6a040212@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rakuco Date: Tue Jul 1 22:29:52 2014 New Revision: 360106 URL: http://svnweb.freebsd.org/changeset/ports/360106 QAT: https://qat.redports.org/buildarchive/r360106/ Log: - Update netdisco to 1.3.3 and netdisco-mibs to 1.5. - Support staging. PR: 191435 PR: 191436 Submitted by: dgeo@centrale-marseille.fr (maintainer) Modified: head/net-mgmt/netdisco-mibs/Makefile head/net-mgmt/netdisco-mibs/bsd.port.netdisco.mk head/net-mgmt/netdisco-mibs/distinfo head/net-mgmt/netdisco-mibs/pkg-plist head/net-mgmt/netdisco/Makefile head/net-mgmt/netdisco/distinfo head/net-mgmt/netdisco/files/patch-netdisco_apache.conf head/net-mgmt/netdisco/pkg-plist Modified: head/net-mgmt/netdisco-mibs/Makefile ============================================================================== --- head/net-mgmt/netdisco-mibs/Makefile Tue Jul 1 22:16:23 2014 (r360105) +++ head/net-mgmt/netdisco-mibs/Makefile Tue Jul 1 22:29:52 2014 (r360106) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= netdisco-mibs -PORTVERSION= 1.4 -PORTREVISION= 1 +PORTVERSION= 1.5 CATEGORIES= net-mgmt MASTER_SITES= SF/netdisco/netdisco-mibs/${PORTVERSION} @@ -12,15 +11,14 @@ COMMENT= Mibs for use with ports-mgmt/ne NO_BUILD= yes -NO_STAGE= yes .include "bsd.port.netdisco.mk" do-install: - ${MKDIR} ${DATADIR} - (cd ${WRKSRC} && ${COPYTREE_SHARE} \* ${DATADIR}) + ${MKDIR} ${STAGEDIR}${DATADIR} + (cd ${WRKSRC} && ${COPYTREE_SHARE} \* ${STAGEDIR}${DATADIR}) . for mibdir in ${MIBDIRS} - (cd ${DATADIR}/${mibdir} && ${GREP} 'DEFINITIONS ::= BEGIN' *.* | ${SED} 's/\(.*\..*\):[[:space:]]*\(.*\) DEFINITIONS.*$$/\2 \1/' > .index) + (cd ${STAGEDIR}${DATADIR}/${mibdir} && ${GREP} 'DEFINITIONS ::= BEGIN' *.* | ${SED} 's/\(.*\..*\):[[:space:]]*\(.*\) DEFINITIONS.*$$/\2 \1/' > .index) . endfor - (cd ${DATADIR} && ${SH} ./mkindex) + (cd ${STAGEDIR}${DATADIR} && ${CHMOD} 644 mib_index.txt && ${SH} ./mkindex) .include <bsd.port.mk> Modified: head/net-mgmt/netdisco-mibs/bsd.port.netdisco.mk ============================================================================== --- head/net-mgmt/netdisco-mibs/bsd.port.netdisco.mk Tue Jul 1 22:16:23 2014 (r360105) +++ head/net-mgmt/netdisco-mibs/bsd.port.netdisco.mk Tue Jul 1 22:29:52 2014 (r360106) @@ -3,6 +3,7 @@ MIBDIRS= allied \ arista \ aruba \ asante \ + avaya \ cabletron \ cisco \ cyclades \ @@ -11,6 +12,7 @@ MIBDIRS= allied \ extreme \ foundry \ hp \ + ibm \ juniper \ mikrotik \ net-snmp \ @@ -18,4 +20,5 @@ MIBDIRS= allied \ netscreen \ nortel \ packetfront \ + pica8 \ rfc Modified: head/net-mgmt/netdisco-mibs/distinfo ============================================================================== --- head/net-mgmt/netdisco-mibs/distinfo Tue Jul 1 22:16:23 2014 (r360105) +++ head/net-mgmt/netdisco-mibs/distinfo Tue Jul 1 22:29:52 2014 (r360106) @@ -1,2 +1,2 @@ -SHA256 (netdisco-mibs-1.4.tar.gz) = 45f040525a9c17d02cdd93bd9588d371ef9ddbb40189db6621ba35f775d7932f -SIZE (netdisco-mibs-1.4.tar.gz) = 19359305 +SHA256 (netdisco-mibs-1.5.tar.gz) = f236890af601fb82493f17c3044ffb4b016b74e6d858f43f46a1de9cb3f9288e +SIZE (netdisco-mibs-1.5.tar.gz) = 19825098 Modified: head/net-mgmt/netdisco-mibs/pkg-plist ============================================================================== --- head/net-mgmt/netdisco-mibs/pkg-plist Tue Jul 1 22:16:23 2014 (r360105) +++ head/net-mgmt/netdisco-mibs/pkg-plist Tue Jul 1 22:29:52 2014 (r360106) @@ -296,7 +296,14 @@ %%DATADIR%%/alcatel/timetra-port-mib.mib %%DATADIR%%/alcatel/.index %%DATADIR%%/apc/powernet.mib +%%DATADIR%%/arista/ARISTA-CONFIG-COPY-MIB.txt +%%DATADIR%%/arista/ARISTA-CONFIG-MAN-MIB.txt +%%DATADIR%%/arista/ARISTA-ENTITY-SENSOR-MIB.txt %%DATADIR%%/arista/ARISTA-MAU-MIB.txt +%%DATADIR%%/arista/ARISTA-PFC-MIB.txt +%%DATADIR%%/arista/ARISTA-QOS-MIB.txt +%%DATADIR%%/arista/ARISTA-QUEUE-MIB.txt +%%DATADIR%%/arista/ARISTA-REDUNDANCY-MIB.txt %%DATADIR%%/arista/ARISTA-SW-IP-FORWARDING-MIB.txt %%DATADIR%%/arista/ARISTA-TEST-MIB.txt %%DATADIR%%/arista/ARISTA-ACL-MIB.txt @@ -334,6 +341,9 @@ %%DATADIR%%/asante/AsanteSwitchMIB.txt %%DATADIR%%/asante/ASANTE-AH1012-MIB.txt %%DATADIR%%/asante/.index +%%DATADIR%%/avaya/46xxmib28.txt +%%DATADIR%%/avaya/96xxmib31.txt +%%DATADIR%%/avaya/.index %%DATADIR%%/bluecoat/BLUECOAT-SG-USAGE-MIB.txt %%DATADIR%%/bluecoat/BLUECOAT-SG-DISK-MIB.txt %%DATADIR%%/bluecoat/BLUECOAT-MIB.txt @@ -562,6 +572,24 @@ %%DATADIR%%/cisco/CISCO-VOICE-IF-MIB.my %%DATADIR%%/cisco/CISCO-VPDN-MGMT-EXT-MIB.my %%DATADIR%%/cisco/CISCO-ATM-SWITCH-FR-IWF-MIB.my +%%DATADIR%%/cisco/CISCO-CBP-TC-MIB.my +%%DATADIR%%/cisco/CISCO-DSG-IF-EXT-MIB.my +%%DATADIR%%/cisco/CISCO-FABRICPATH-TOPOLOGY-MIB.my +%%DATADIR%%/cisco/CISCO-HARDWARE-IP-VERIFY-MIB.my +%%DATADIR%%/cisco/CISCO-IETF-MPLS-ID-STD-03-MIB.my +%%DATADIR%%/cisco/CISCO-IETF-MPLS-TE-EXT-STD-03-MIB.my +%%DATADIR%%/cisco/CISCO-LIVEDATA-MIB.my +%%DATADIR%%/cisco/CISCO-MEDIATRACE-MIB.my +%%DATADIR%%/cisco/CISCO-MPLS-LSR-EXT-STD-MIB.my +%%DATADIR%%/cisco/CISCO-MPLS-TC-EXT-STD-MIB.my +%%DATADIR%%/cisco/CISCO-NETFLOW-LITE-MIB.my +%%DATADIR%%/cisco/CISCO-OTV-MIB.my +%%DATADIR%%/cisco/CISCO-SWITCH-CEF-MIB.my +%%DATADIR%%/cisco/CISCO-SWITCH-FABRIC-MIB.my +%%DATADIR%%/cisco/CISCO-VDC-MIB.my +%%DATADIR%%/cisco/CISCO-VPC-MIB.my +%%DATADIR%%/cisco/DSG-IF-MIB.my +%%DATADIR%%/cisco/IEEE8021-SECY-MIB.my %%DATADIR%%/cisco/CISCO-LWAPP-DOT11-CCX-CLIENT-MIB.my %%DATADIR%%/cisco/CISCO-ATM-ACCESS-LIST-MIB.my %%DATADIR%%/cisco/CISCO-WAN-CES-RSRC-PART-MIB.my @@ -1993,7 +2021,6 @@ %%DATADIR%%/hp/hpicfipv6raguard.mib %%DATADIR%%/hp/hpacmxlmemproc.mib %%DATADIR%%/hp/hptunnel.mib -%%DATADIR%%/hp/ipx.mib %%DATADIR%%/hp/hpicfdcpower.mib %%DATADIR%%/hp/hpicflayer3vlan.mib %%DATADIR%%/hp/hpicfreload.mib @@ -2246,6 +2273,8 @@ %%DATADIR%%/huawei/h3c-nqa.mib %%DATADIR%%/huawei/huawei-cbqos.mib %%DATADIR%%/ianalist +%%DATADIR%%/ibm/GbTOR-10G-L2L3.mib +%%DATADIR%%/ibm/.index %%DATADIR%%/juniper/mib-jnx-vpls-ldp.txt %%DATADIR%%/juniper/mib-jnx-exp.txt %%DATADIR%%/juniper/mib-jnx-lsys-sp-flowgate.txt @@ -2624,6 +2653,8 @@ %%DATADIR%%/packetfront/PACKETFRONT-COPY-MIB.mib %%DATADIR%%/packetfront/PACKETFRONT-PRODUCTS-MIB.mib %%DATADIR%%/packetfront/.index +%%DATADIR%%/pica8/pica_private_mib.my +%%DATADIR%%/pica8/.index %%DATADIR%%/rad/ipmux24.mib %%DATADIR%%/rfc/BRIDGE-MIB.txt %%DATADIR%%/rfc/TN3270E-MIB.txt @@ -2971,6 +3002,7 @@ %%DATADIR%%/rfc/PPP-BRIDGE-NCP-MIB.txt %%DATADIR%%/rfc/RMON2-MIB.txt %%DATADIR%%/rfc/CLNS-MIB.txt +%%DATADIR%%/rfc/ipx.mib %%DATADIR%%/rfc/savi.mib %%DATADIR%%/riverbed/RBT-MIB.txt %%DATADIR%%/riverbed/STEELHEAD-MIB.txt @@ -3044,6 +3076,7 @@ @dirrmtry %%DATADIR%%/arista @dirrmtry %%DATADIR%%/aruba @dirrmtry %%DATADIR%%/asante +@dirrmtry %%DATADIR%%/avaya @dirrmtry %%DATADIR%%/bluecoat @dirrmtry %%DATADIR%%/bluesocket @dirrmtry %%DATADIR%%/cabletron @@ -3063,6 +3096,7 @@ @dirrmtry %%DATADIR%%/huawei @dirrmtry %%DATADIR%%/h3c @dirrmtry %%DATADIR%%/hp +@dirrmtry %%DATADIR%%/ibm @dirrmtry %%DATADIR%%/juniper @dirrmtry %%DATADIR%%/lantronix @dirrmtry %%DATADIR%%/mikrotik @@ -3071,6 +3105,7 @@ @dirrmtry %%DATADIR%%/netscreen @dirrmtry %%DATADIR%%/nortel @dirrmtry %%DATADIR%%/packetfront +@dirrmtry %%DATADIR%%/pica8 @dirrmtry %%DATADIR%%/rad @dirrmtry %%DATADIR%%/rfc @dirrmtry %%DATADIR%%/riverbed Modified: head/net-mgmt/netdisco/Makefile ============================================================================== --- head/net-mgmt/netdisco/Makefile Tue Jul 1 22:16:23 2014 (r360105) +++ head/net-mgmt/netdisco/Makefile Tue Jul 1 22:29:52 2014 (r360106) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= netdisco -PORTVERSION= 1.3.2 -PORTREVISION= 1 +PORTVERSION= 1.3.3 CATEGORIES= net-mgmt www MASTER_SITES= SF @@ -26,23 +25,23 @@ RUN_DEPENDS+= p5-Net-SNMP>=0:${PORTSDIR} p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \ p5-Parallel-ForkManager>=0:${PORTSDIR}/devel/p5-Parallel-ForkManager -USERS= netdisco -GROUPS= netdisco - -USES= perl5 +USES= perl5 shebangfix +USE_PERL5= run build fixpacklist USE_PGSQL= yes USE_RC_SUBR= netdisco NO_BUILD= yes -NO_STAGE= yes +NETDISCO_USER= netdisco +NETDISCO_GROUP= netdisco NETDISCO_RUNDIR=/var/run NETDISCO_DBDIR= /var/db/netdisco SUB_FILES= pkg-message -SUB_LIST= NETDISCO_DBDIR=${NETDISCO_DBDIR} NETDISCO_RUNDIR=${NETDISCO_RUNDIR} NETDISCO_USER=${USERS} NETDISCO_GROUP=${GROUPS} -PLIST_SUB= NETDISCO_DBDIR=${NETDISCO_DBDIR} NETDISCO_RUNDIR=${NETDISCO_RUNDIR} +#SUB_LIST= NETDISCO_DBDIR=${NETDISCO_DBDIR} NETDISCO_RUNDIR=${NETDISCO_RUNDIR} NETDISCO_USER=${NETDISCO_USER} NETDISCO_GROUP=${NETDISCO_GROUP} +PLIST_SUB= NETDISCO_DBDIR=${NETDISCO_DBDIR} NETDISCO_RUNDIR=${NETDISCO_RUNDIR} NETDISCO_USER=${NETDISCO_USER} +SHEBANG_FILES= bin/parse_kismet_ap netdisco WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} @@ -67,6 +66,12 @@ MIBINCLUDES:=${MIBINCLUDES:S/ /:/g:S/"// MIBINCLUDES="#please add here mibs dirs list (at least snmp and rfc ones)" .endif +REINPLACE_EXPR= -e 's!%%PREFIX%%!${PREFIX}!g' -e 's!%%DATADIR%%!${DATADIR}!g' \ + -e 's!%%DOCSDIR%%!${DOCSDIR}!g' -e 's!%%NETDISCO_RUNDIR%%!${NETDISCO_RUNDIR}!g' \ + -e 's!%%NETDISCO_USER%%!${NETDISCO_USER}!g' -e 's!%%NETDISCO_GROUP%%!${NETDISCO_GROUP}!g' \ + -e 's!%%NETDISCO_DBDIR%%!${NETDISCO_DBDIR}!g' -e 's!%%ETCDIR%%!${ETCDIR}!g' \ + -e 's!%%SITE_PERL%%!${SITE_PERL}!g' -e 's!%%MIBINCLUDES%%!${MIBINCLUDES}!g' + .if ${PORT_OPTIONS:MGRAPHVIZ} RUN_DEPENDS+= p5-Graph>=0:${PORTSDIR}/math/p5-Graph \ p5-GraphViz>=0:${PORTSDIR}/graphics/p5-GraphViz @@ -78,84 +83,80 @@ RUN_DEPENDS+= ${APACHE_PKGNAMEPREFIX}mod p5-libapreq2>=0:${PORTSDIR}/www/p5-libapreq2 \ p5-MasonX-Request-WithApacheSession>=0:${PORTSDIR}/www/p5-MasonX-Request-WithApacheSession USE_APACHE_RUN= 22 +REINPLACE_EXPR+= -e 's!%%APACHEMODDIR%%!${APACHEMODDIR}!g' -e 's!%%APACHEETCDIR%%!${APACHEETCDIR}!g' \ + -e 's!%%WWWDIR%%!${WWWDIR}!g' +PLIST_SUB+= WWWOWN=${WWWOWN} WWWGRP=${WWWGRP} WEBUI="" .else -WWWDIR= "@comment " +PLIST_SUB+= WWWOWN="@comment " \ + WWWGRP="@comment " \ + WWWDIR="@comment " \ + WEBUI="@comment " .endif +USERS+= ${NETDISCO_USER} +GROUPS+= ${NETDISCO_GROUP} + pre-install: . for i in ${ALTER_FILES} @(${MV} ${WRKSRC}/${i}.bak ${WRKSRC}/${i} 2>/dev/null || ${TRUE}) . endfor cd ${WRKSRC} && \ - ${REINPLACE_CMD} -e 's#%%WWWDIR%%#${WWWDIR}#g' \ - -e 's#%%PREFIX%%#${PREFIX}#g' \ - -e 's#%%DATADIR%%#${DATADIR}#g' \ - -e 's#%%DOCSDIR%%#${DOCSDIR}#g' \ - -e 's#%%NETDISCO_RUNDIR%%#${NETDISCO_RUNDIR}#g' \ - -e 's#%%NETDISCO_USER%%#${USERS}#g' \ - -e 's#%%NETDISCO_GROUP%%#${GROUPS}#g' \ - -e 's#%%NETDISCO_DBDIR%%#${NETDISCO_DBDIR}#g' \ - -e 's#%%ETCDIR%%#${ETCDIR}#g' \ - -e 's#%%SITE_PERL%%#${SITE_PERL}#g' \ - -e 's#%%LOCALBASE%%#${LOCALBASE}#g' \ - -e 's#%%APACHEMODDIR%%#${APACHEMODDIR}#g' \ - -e 's#%%APACHEETCDIR%%#${APACHEETCDIR}#g' \ - -e 's#%%MIBINCLUDES%%#${MIBINCLUDES}#g' \ - ${ALTER_FILES} + ${REINPLACE_CMD} ${REINPLACE_EXPR} ${ALTER_FILES} do-install: . for i in netdisco bin/parse_mac bin/port_control bin/parse_kismet_ap - cd ${WRKSRC} && ${INSTALL_SCRIPT} ${i} ${PREFIX}/bin + cd ${WRKSRC} && ${INSTALL_SCRIPT} ${i} ${STAGEDIR}${PREFIX}/bin . endfor . if ${PORT_OPTIONS:MWEBUI} - ${MKDIR} ${WWWDIR} - cd ${WRKSRC}/html && ${INSTALL_DATA} autohandler *.* ${WWWDIR} + ${MKDIR} ${STAGEDIR}${WWWDIR} + cd ${WRKSRC}/html && ${INSTALL_DATA} autohandler *.* ${STAGEDIR}${WWWDIR} - ${MKDIR} ${WWWDIR}/doc - cd ${WRKSRC}/html/doc && ${INSTALL_DATA} *.* ${WWWDIR}/doc - - ${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR} - - ${MKDIR} ${WWWDIR}/mason + ${MKDIR} ${STAGEDIR}${WWWDIR}/doc + cd ${WRKSRC}/html/doc && ${INSTALL_DATA} *.* ${STAGEDIR}${WWWDIR}/doc . endif - ${INSTALL_DATA} ${WRKSRC}/netdisco.pm ${SITE_PERL} - ${INSTALL} -d -m 750 -o ${USERS} -g ${GROUPS} ${ETCDIR} + ${MKDIR} -m 755 -p ${STAGEDIR}${PREFIX}/${SITE_PERL_REL} -. for i in ${CONFIG_FILES} - cd ${WRKSRC} && ${INSTALL_DATA} ${i} ${ETCDIR}/${i}.sample - @(if [ ! -f ${ETCDIR}/${i} ]; then \ - ${INSTALL} -m 640 -o ${USERS} -g ${GROUPS} ${ETCDIR}/${i}.sample ${ETCDIR}/${i}; \ - fi) -. endfor - - ${CHOWN} -R ${USERS}:${GROUPS} ${ETCDIR} - ${CHMOD} -R 660 ${ETCDIR}/* + ${INSTALL_DATA} ${WRKSRC}/netdisco.pm ${STAGEDIR}${PREFIX}/${SITE_PERL_REL} + ${INSTALL} -d -m 750 ${STAGEDIR}${ETCDIR} - ${INSTALL} -d ${DATADIR}/sql + ${INSTALL} -d ${STAGEDIR}${DATADIR}/sql cd ${WRKSRC}/sql && \ - ${INSTALL_DATA} *.sql pg ${DATADIR}/sql + ${INSTALL_DATA} *.sql pg ${STAGEDIR}${DATADIR}/sql - ${INSTALL_DATA} ${WRKSRC}/Makefile ${DATADIR} + ${INSTALL_DATA} ${WRKSRC}/Makefile ${STAGEDIR}${DATADIR} -. if !defined(PACKAGE_BUILDING) - @(if [ -d ${LOCALBASE}/${APACHEETCDIR}/Includes ] ; then \ - ${ECHO_MSG} "===> Adding config in ${LOCALBASE}/${APACHEETCDIR}/Includes..."; \ - test -L ${LOCALBASE}/${APACHEETCDIR}/Includes/netdisco_apache.conf || \ - ${LN} -s ${ETCDIR}/netdisco_apache.conf ${LOCALBASE}/${APACHEETCDIR}/Includes/netdisco_apache.conf; \ - test -L ${LOCALBASE}/${APACHEETCDIR}/Includes/netdisco_apache_dir.conf || \ - ${LN} -s ${ETCDIR}/netdisco_apache_dir.conf ${LOCALBASE}/${APACHEETCDIR}/Includes/netdisco_apache_dir.conf;\ - fi) -. endif +. for i in ${CONFIG_FILES} + ${INSTALL} -m 640 ${WRKSRC}/${i} ${STAGEDIR}${ETCDIR}/${i}.sample +. endfor post-install: -. if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR} - (cd ${WRKSRC} && ${INSTALL_MAN} ${DOCFILES} ${DOCSDIR}) + ${MKDIR} ${STAGEDIR}${DOCSDIR} + (cd ${WRKSRC} && ${INSTALL_MAN} ${DOCFILES} ${STAGEDIR}${DOCSDIR}) +. if ${PORT_OPTIONS:MWEBUI} + ${ECHO_CMD} "@unexec ${RM} -rf ${WWWDIR}/mason" >> ${TMPPLIST} + ${ECHO_CMD} "@exec ${MKDIR} -m 750 ${WWWDIR}/mason" >> ${TMPPLIST} + ${ECHO_CMD} "@exec ${CHOWN} -R ${WWWOWN} ${WWWDIR}/mason" >> ${TMPPLIST} + ${ECHO_CMD} "@exec ${CHOWN} ${NETDISCO_USER} ${WWWDIR}" >> ${TMPPLIST} +. endif + ${ECHO_CMD} "@exec ${CHOWN} -R ${NETDISCO_USER}:${NETDISCO_GROUP} ${ETCDIR}" +. if !defined(PACKAGE_BUILDING) + @(if [ -d ${PREFIX}/${APACHEETCDIR}/Includes ] ; then \ + ${ECHO_MSG} "===> Adding config in ${PREFIX}/${APACHEETCDIR}/Includes..."; \ + test -L ${PREFIX}/${APACHEETCDIR}/Includes/netdisco_apache.conf || \ + ${LN} -s ${ETCDIR}/netdisco_apache.conf ${PREFIX}/${APACHEETCDIR}/Includes/netdisco_apache.conf; \ + test -L ${PREFIX}/${APACHEETCDIR}/Includes/netdisco_apache_dir.conf || \ + ${LN} -s ${ETCDIR}/netdisco_apache_dir.conf ${PREFIX}/${APACHEETCDIR}/Includes/netdisco_apache_dir.conf;\ + fi) . endif - @${CAT} ${PKGMESSAGE} +. for i in ${CONFIG_FILES} + cd ${WRKSRC} && ${INSTALL_DATA} ${i} ${STAGEDIR}${ETCDIR}/${i}.sample + @(if [ ! -f ${STAGEDIR}${ETCDIR}/${i} ]; then \ + ${INSTALL} -m 640 ${STAGEDIR}${ETCDIR}/${i}.sample ${STAGEDIR}${ETCDIR}/${i}; \ + fi) +. endfor .include <bsd.port.mk> Modified: head/net-mgmt/netdisco/distinfo ============================================================================== --- head/net-mgmt/netdisco/distinfo Tue Jul 1 22:16:23 2014 (r360105) +++ head/net-mgmt/netdisco/distinfo Tue Jul 1 22:29:52 2014 (r360106) @@ -1,2 +1,2 @@ -SHA256 (netdisco-1.3.2.tar.gz) = bd59472ab2efaf30a3f62a03511c91824011368d34728430e707861e44ee2aa4 -SIZE (netdisco-1.3.2.tar.gz) = 1351266 +SHA256 (netdisco-1.3.3.tar.gz) = 0b26628b411a8d8cf31b01fdc92fdbf01373cf23f124d3942052c47da2cb08e2 +SIZE (netdisco-1.3.3.tar.gz) = 1351500 Modified: head/net-mgmt/netdisco/files/patch-netdisco_apache.conf ============================================================================== --- head/net-mgmt/netdisco/files/patch-netdisco_apache.conf Tue Jul 1 22:16:23 2014 (r360105) +++ head/net-mgmt/netdisco/files/patch-netdisco_apache.conf Tue Jul 1 22:29:52 2014 (r360106) @@ -6,8 +6,8 @@ # -LoadModule perl_module libexec/apache2/mod_perl.so -LoadModule apreq_module libexec/apache2/mod_apreq2.so -+LoadModule perl_module %%LOCALBASE%%/%%APACHEMODDIR%%/mod_perl.so -+LoadModule apreq_module %%LOCALBASE%%/%%APACHEMODDIR%%/mod_apreq2.so ++LoadModule perl_module %%PREFIX%%/%%APACHEMODDIR%%/mod_perl.so ++LoadModule apreq_module %%PREFIX%%/%%APACHEMODDIR%%/mod_apreq2.so PerlModule Apache2::compat PerlModule Apache2::Request Modified: head/net-mgmt/netdisco/pkg-plist ============================================================================== --- head/net-mgmt/netdisco/pkg-plist Tue Jul 1 22:16:23 2014 (r360105) +++ head/net-mgmt/netdisco/pkg-plist Tue Jul 1 22:29:52 2014 (r360106) @@ -113,28 +113,17 @@ bin/port_control %%DOCSDIR%%/README-API-BACKEND %%DOCSDIR%%/README-API-SHARED %%DOCSDIR%%/UPGRADE -@unexec d="%D/%%ETCDIR%%"; f="netdisco.conf"; if cmp -s ${d}/${f}.sample ${d}/${f}; then rm -f ${d}/${f}; fi; -%%ETCDIR%%/netdisco.conf.sample -@exec if [ ! -f %%ETCDIR%%/netdisco.conf ] ; then cp -p %%ETCDIR%%/netdisco.conf.sample %%ETCDIR%%/netdisco.conf; fi -@unexec d="%D/%%ETCDIR%%"; f="netdisco-topology.txt"; if cmp -s ${d}/${f}.sample ${d}/${f}; then rm -f ${d}/${f}; fi; -%%ETCDIR%%/netdisco-topology.txt.sample -@exec if [ ! -f %%ETCDIR%%/netdisco-topology.txt ] ; then cp -p %%ETCDIR%%/netdisco-topology.txt.sample %%ETCDIR%%/netdisco-topology.txt; fi -@unexec d="%D/%%ETCDIR%%"; f="netdisco.crontab"; if cmp -s ${d}/${f}.sample ${d}/${f}; then rm -f ${d}/${f}; fi; -%%ETCDIR%%/netdisco.crontab.sample -@exec if [ ! -f %%ETCDIR%%/netdisco.crontab ] ; then cp -p %%ETCDIR%%/netdisco.crontab.sample %%ETCDIR%%/netdisco.crontab; fi -@unexec d="%D/%%ETCDIR%%"; f="netdisco_apache.conf"; if cmp -s ${d}/${f}.sample ${d}/${f}; then rm -f ${d}/${f}; fi; -%%ETCDIR%%/netdisco_apache.conf.sample -@exec if [ ! -f %%ETCDIR%%/netdisco_apache.conf ] ; then cp -p %%ETCDIR%%/netdisco_apache.conf.sample %%ETCDIR%%/netdisco_apache.conf; fi -@unexec d="%D/%%ETCDIR%%"; f="netdisco_apache_dir.conf"; if cmp -s ${d}/${f}.sample ${d}/${f}; then rm -f ${d}/${f}; fi; -%%ETCDIR%%/netdisco_apache_dir.conf.sample -@exec if [ ! -f %%ETCDIR%%/netdisco_apache_dir.conf ] ; then cp -p %%ETCDIR%%/netdisco_apache_dir.conf.sample %%ETCDIR%%/netdisco_apache_dir.conf; fi -@unexec if [ -L %%APACHEETCDIR/Includes/netdisco_apache_dir.conf ] ; then rm %%APACHEETCDIR/Includes/netdisco_apache_dir.conf; fi -@unexec if [ -L %%APACHEETCDIR/Includes/netdisco_apache.conf ] ; then rm %%APACHEETCDIR/Includes/netdisco_apache.conf; fi -@dirrmtry %%WWWDIR%%/mason -@dirrm %%WWWDIR%%/doc -@dirrmtry %%WWWDIR%% +@group %%NETDISCO_GROUP%% +@sample %%ETCDIR%%/netdisco.conf.sample +@sample %%ETCDIR%%/netdisco-topology.txt.sample +@sample %%ETCDIR%%/netdisco.crontab.sample +@sample %%ETCDIR%%/netdisco_apache.conf.sample +@sample %%ETCDIR%%/netdisco_apache_dir.conf.sample +@unexec if [ -L %%APACHEETCDIR%%/Includes/netdisco_apache_dir.conf ] ; then rm %%APACHEETCDIR%%/Includes/netdisco_apache_dir.conf; fi +@unexec if [ -L %%APACHEETCDIR%%/Includes/netdisco_apache.conf ] ; then rm %%APACHEETCDIR%%/Includes/netdisco_apache.conf; fi +%%WEBUI%%@dirrm %%WWWDIR%%/doc +%%WEBUI%%@dirrmtry %%WWWDIR%% @dirrm %%DATADIR%%/sql @dirrmtry %%DATADIR%% @dirrmtry %%ETCDIR%% %%PORTDOCS%%@dirrm %%DOCSDIR%% -@exec mkdir -p %D/%%WWWDIR%%/mason
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407012229.s61MTq6a040212>