Attachment #84562 for bug #120590

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




#

PORTNAME=	mrtg
PORTVERSION=	2.16.0
PORTEPOCH=	1
CATEGORIES=	net-mgmt ipv6
MASTER_SITES=	http://oss.oetiker.ch/mrtg/pub/ \

COMMENT=	The multi-router traffic grapher

LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd
RUN_DEPENDS=	${SITE_PERL}/Pod/Usage.pm:${PORTSDIR}/textproc/p5-Pod-Parser
		${SITE_PERL}/Pod/Usage.pm:${PORTSDIR}/textproc/p5-Pod-Parser

CONFIGURE_ARGS=	--with-gd-lib=${LOCALBASE}/lib \
		--with-gd-inc=${LOCALBASE}/include

USE_PERL5=	YES
MAKE_ENV+=	PERL=${PERL}

MRTG_USER?=	mrtg
MRTG_GROUP?=	mrtg
MRTG_UID?=	279
MRTG_GID?=	279
MRTG_RUNDIR?=	/var/run/mrtg

USE_RC_SUBR=	mrtg_daemon.sh
SUB_FILES=	pkg-install pkg-message
SUB_LIST+=	ETCDIR=${ETCDIR} \
		MRTG_USER=${MRTG_USER} \
		MRTG_GROUP=${MRTG_GROUP} \
		MRTG_UID=${MRTG_UID} \
		MRTG_GID=${MRTG_GID} \
		MRTG_RUNDIR=${MRTG_RUNDIR}

GNU_CONFIGURE=	YES

CONFIGURE_ENV=	PERL=${PERL}

MAN1=		cfgmaker.1 indexmaker.1 mrtg-contrib.1 mrtg-faq.1 mrtg-forum.1 \

		mrtg-nw-guide.1 mrtg-reference.1 mrtg-rrd.1 mrtg-squid.1 \
		mrtg-unix-guide.1 mrtg-webserver.1 mrtg.1 mrtglib.1

DOCS=		CHANGES COPYRIGHT MANIFEST README
EXAMPLES=	cfgmaker.pod indexmaker.pod mrtg-contrib.pod mrtg-faq.pod \
		mrtg-forum.pod mrtg-ipv6.pod mrtg-logfile.pod mrtg-mibhelp.pod \
		mrtg-nt-guide.pod mrtg-nw-guide.pod mrtg-reference.pod \
		mrtg-rrd.pod mrtg-squid.pod mrtg-unix-guide.pod mrtg.pod \
		mrtg-webserver.pod mrtglib.pod cfgmaker.txt indexmaker.txt \
		mrtg-contrib.txt mrtg-faq.txt mrtg-forum.txt mrtg-ipv6.txt \
		mrtg-logfile.txt mrtg-mibhelp.txt mrtg-nt-guide.txt \
		mrtg-nw-guide.txt mrtg-reference.txt mrtg-rrd.txt \
		mrtg-squid.txt mrtg-unix-guide.txt mrtg-webserver.txt \
		mrtg.txt mrtglib.txt mrtg-l.png mrtg-m.png mrtg-r.png \
		mrtg-ti.png mrtg-l.gif mrtg-m.gif mrtg-r.gif
IMAGES=		favicon.ico mrtg-l.gif mrtg-l.png mrtg-m.gif mrtg-m.png \
		mrtg-r.gif mrtg-r.png mrtg-ti.gif mrtg-ti.png
SCRIPTS=	cfgmaker indexmaker mrtg

OPTIONS=	IPV6 "Enable IPv6 support" OFF \
		SNMP "Enable use of SNMPv3" OFF

.include <bsd.port.pre.mk>

.if defined(WITH_IPV6)
RUN_DEPENDS+=	${SITE_PERL}/IO/Socket/INET6.pm:${PORTSDIR}/net/p5-IO-INET6
.endif
.if defined(WITH_SNMP)
RUN_DEPENDS+=	${SITE_PERL}/Net/SNMP.pm:${PORTSDIR}/net-mgmt/p5-Net-SNMP
.else
RUN_DEPENDS+=	${SITE_PERL}/SNMP_Session.pm:${PORTSDIR}/net-mgmt/p5-SNMP_Session
.endif

post-patch:
	${RM} ${WRKSRC}/lib/mrtg2/BER.pm ${WRKSRC}/lib/mrtg2/SNMP_*.pm

pre-configure:
	@${SED} -e 's,%%MRTG_USER%%,${MRTG_USER},g; s,%%MRTG_GROUP%%,${MRTG_GROUP},g; \
		s,%%MRTG_UID%%,${MRTG_UID},g; s,%%MRTG_GID%%,${MRTG_GID},g; \
		s,%%MRTG_RUNDIR%%,${MRTG_RUNDIR},g;' ${FILESDIR}/pkg-install.in > ${PKGINSTALL}
	@${SETENV} @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL

do-install:
		${MKDIR} -m 755 ${ETCDIR}
		${MKDIR} -m 755 ${DATADIR}
.if !defined(NOPORTDOCS)
	@${MKDIR} ${DOCSDIR}
	@${INSTALL_DATA} ${DOCS:S,^,${WRKSRC}/,} ${DOCSDIR}/
	@${MKDIR} ${EXAMPLESDIR}/doc ${EXAMPLESDIR}/images
	@${INSTALL_DATA} ${EXAMPLES:S,^,${WRKSRC}/doc/,} ${EXAMPLESDIR}/doc/
	@${INSTALL_DATA} ${IMAGES:S,^,${WRKSRC}/images/,} ${EXAMPLESDIR}/images/
.endif
	@${MKDIR} ${ETCDIR}
	@${INSTALL_DATA} ${WRKSRC}/contrib/mrtgmk/cfg/mrtg.cfg ${ETCDIR}/mrtg.cfg.sample
	@${INSTALL_DATA} ${MAN1:S,^,${WRKSRC}/doc/,} ${MAN1PREFIX}/man/man1
	@${CP} -p ${WRKSRC}/lib/mrtg2/*.pm ${SITE_PERL}/
	@${INSTALL_PROGRAM} ${WRKSRC}/bin/rateup ${PREFIX}/bin
	@${INSTALL_SCRIPT} ${SCRIPTS:S,^,${WRKSRC}/bin/,} ${PREFIX}/bin
			${INSTALL_SCRIPT} ${WRKSRC}/bin/$$file ${PREFIX}/bin/; \
		done

post-install:
	@${SETENV} @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
	@${CAT} ${PKGMESSAGE}
	@${ECHO} ""
	@${ECHO} "############################################################################"
	@${ECHO} "# Please create a MRTG config file in ${ETCDIR}                  #"
	@${ECHO} "# A configuration file can be automatically generated with cfgmaker        #"
	@${ECHO} "# A sample configuration file is installed as mrtg.cfg.sample              #"
	@${ECHO} "#                                                                          #"
	@${ECHO} "# To enable MRTG in daemon mode, put the following to your /etc/rc.conf or #"
	@${ECHO} "# /etc/rc.conf.local file:                                                 #"
	@${ECHO} "#      mrtg_daemon_enable=\"YES\"                                            #"
	@${ECHO} "############################################################################"
.endif

.include <bsd.port.post.mk>

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	MD5 (mrtg-2.15.2.tar.gz) = 5827175dd5ee941c2ae894369f0c9071	1	MD5 (mrtg-2.16.0.tar.gz) = 568c8f3d7eca2d20607aa7ea7281f897
2	SHA256 (mrtg-2.15.2.tar.gz) = 3456f358c1ea5ae5182153169c3effd2cd4b071c4d12f36e03947a62372f87ab	2	SHA256 (mrtg-2.16.0.tar.gz) = 97b2788b82d67960260ee9366fc3f84794442fdb3d111480218c6b1560c50fa1
3	SIZE (mrtg-2.15.2.tar.gz) = 1070900	3	SIZE (mrtg-2.16.0.tar.gz) = 1078505




#!/bin/sh
# $FreeBSD: ports/net-mgmt/mrtg/pkg-install,v 1.1 2006/02/06 12:24:19 demon Exp $
#

case "$2" in
	
PRE-INSTALL)
	USER=mrtg
	GROUP=${USER}
	UID=279
	GID=${UID}

	if ! pw groupshow "${GROUP}" 2>/dev/null 1>&2; then
		if pw groupadd ${GROUP} -g ${GID}; then
			echo "Added group \"${GROUP}\"."
		else
			echo "Adding group \"${GROUP}\" failed..."
			exit 1
		fi
	fi

	if ! pw usershow "${USER}" 2>/dev/null 1>&2; then
		if pw useradd ${USER} -u ${UID} -g ${GROUP} -h - \
			-s "/sbin/nologin" -d "/nonexistent" \
			-c "MRTG daemon"; \
		then
			echo "Added user \"${USER}\"."
		else
			echo "Adding user \"${USER}\" failed..."
			exit 1
		fi
	fi
	;;

POST-INSTALL)
	rundir=/var/run/mrtg

	if [ ! -d "$rundir" ]; then
		mkdir -p $rundir
		echo "Created directory: ${rundir}"
	fi

	chown -R mrtg:mrtg $rundir
	chmod 0700 $rundir
	;;
	
esac

exit 0




bin/mrtg
bin/rateup
%%ETCDIR%%/mrtg.cfg.sample
%%SITE_PERL%%/MRTG_lib.pm
%%SITE_PERL%%/Net_SNMP_util.pm
%%SITE_PERL%%/locales_mrtg.pm
%%PORTDOCS%%%%DOCSDIR%%/CHANGES
%%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT
%%PORTDOCS%%%%DOCSDIR%%/MANIFEST
%%PORTDOCS%%%%DOCSDIR%%/README
%%PORTDOCS%%%%EXAMPLESDIR%%/doc/cfgmaker.pod
%%PORTDOCS%%%%EXAMPLESDIR%%/doc/cfgmaker.txt
%%PORTDOCS%%%%EXAMPLESDIR%%/doc/indexmaker.pod
%%PORTDOCS%%%%EXAMPLESDIR%%/doc/indexmaker.txt
%%PORTDOCS%%%%EXAMPLESDIR%%/doc/mrtg-contrib.pod
%%PORTDOCS%%%%EXAMPLESDIR%%/doc/mrtg-contrib.txt
%%PORTDOCS%%%%EXAMPLESDIR%%/doc/mrtg-faq.pod
%%PORTDOCS%%%%EXAMPLESDIR%%/doc/mrtg-faq.txt
%%PORTDOCS%%%%EXAMPLESDIR%%/doc/mrtg-forum.pod
%%PORTDOCS%%%%EXAMPLESDIR%%/doc/mrtg-forum.txt
%%PORTDOCS%%%%EXAMPLESDIR%%/doc/mrtg-ipv6.pod
%%PORTDOCS%%%%EXAMPLESDIR%%/doc/mrtg-ipv6.txt
%%PORTDOCS%%%%EXAMPLESDIR%%/doc/mrtg-l.png
%%PORTDOCS%%%%EXAMPLESDIR%%/doc/mrtg-logfile.pod
%%PORTDOCS%%%%EXAMPLESDIR%%/doc/mrtg-logfile.txt
%%PORTDOCS%%%%EXAMPLESDIR%%/doc/mrtg-m.png
%%PORTDOCS%%%%EXAMPLESDIR%%/doc/mrtg-mibhelp.pod
%%PORTDOCS%%%%EXAMPLESDIR%%/doc/mrtg-mibhelp.txt
%%PORTDOCS%%%%EXAMPLESDIR%%/doc/mrtg-nt-guide.pod
%%PORTDOCS%%%%EXAMPLESDIR%%/doc/mrtg-nt-guide.txt
%%PORTDOCS%%%%EXAMPLESDIR%%/doc/mrtg-nw-guide.pod
%%PORTDOCS%%%%EXAMPLESDIR%%/doc/mrtg-nw-guide.txt
%%PORTDOCS%%%%EXAMPLESDIR%%/doc/mrtg-r.png
%%PORTDOCS%%%%EXAMPLESDIR%%/doc/mrtg-reference.pod
%%PORTDOCS%%%%EXAMPLESDIR%%/doc/mrtg-reference.txt
%%PORTDOCS%%%%EXAMPLESDIR%%/doc/mrtg-rrd.pod
%%PORTDOCS%%%%EXAMPLESDIR%%/doc/mrtg-rrd.txt
%%PORTDOCS%%%%EXAMPLESDIR%%/doc/mrtg-squid.pod
%%PORTDOCS%%%%EXAMPLESDIR%%/doc/mrtg-squid.txt
%%PORTDOCS%%%%EXAMPLESDIR%%/doc/mrtg-ti.png
%%PORTDOCS%%%%EXAMPLESDIR%%/doc/mrtg-unix-guide.pod
%%PORTDOCS%%%%EXAMPLESDIR%%/doc/mrtg-unix-guide.txt
%%PORTDOCS%%%%EXAMPLESDIR%%/doc/mrtg-webserver.pod
%%PORTDOCS%%%%EXAMPLESDIR%%/doc/mrtg-webserver.txt
%%PORTDOCS%%%%EXAMPLESDIR%%/doc/mrtg.pod
%%PORTDOCS%%%%EXAMPLESDIR%%/doc/mrtg.txt
%%PORTDOCS%%%%EXAMPLESDIR%%/doc/mrtglib.pod
%%PORTDOCS%%%%EXAMPLESDIR%%/doc/mrtglib.txt
%%PORTDOCS%%%%EXAMPLESDIR%%/doc/mrtg-l.gif
%%PORTDOCS%%%%EXAMPLESDIR%%/doc/mrtg-m.gif
%%PORTDOCS%%%%EXAMPLESDIR%%/doc/mrtg-r.gif
%%PORTDOCS%%%%EXAMPLESDIR%%/images/favicon.ico
%%PORTDOCS%%%%EXAMPLESDIR%%/images/mrtg-l.gif
%%PORTDOCS%%%%EXAMPLESDIR%%/images/mrtg-l.png
%%PORTDOCS%%%%EXAMPLESDIR%%/images/mrtg-m.gif
%%PORTDOCS%%%%EXAMPLESDIR%%/images/mrtg-m.png
%%PORTDOCS%%%%EXAMPLESDIR%%/images/mrtg-r.gif
%%PORTDOCS%%%%EXAMPLESDIR%%/images/mrtg-r.png
%%PORTDOCS%%%%EXAMPLESDIR%%/images/mrtg-ti.gif
%%PORTDOCS%%%%EXAMPLESDIR%%/images/mrtg-ti.png
@dirrmtry /var/run/mrtg
@dirrmtry %%ETCDIR%%
%%PORTDOCS%%@dirrm %%DOCSDIR%%
%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/images
%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/doc
%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%




--- bin/mrtg.old	Fri Aug 18 13:02:42 2006
+++ bin/mrtg	Fri Aug 18 13:04:08 2006
@@ -174,11 +174,17 @@
     my $gid = $(;
 
     if (defined $opts{group}) {
-        $gid = getgrnam($opts{group}) or die "$NOW: ERROR: Unknown Group: $opts{group})\n";
+	$gid = getgrnam($opts{group});
+	if( $gid =~ /^$/ ) {
+		die "ERROR: Unknown Group: $opts{group}\n";
+	}
     }
 
     if (defined $opts{user}) {
-        $uid = getpwnam($opts{user}) or die "$NOW: ERROR: Unknown User: $opts{user})\n";
+	$uid = getpwnam($opts{user});
+	if( $uid =~ /^$/ ) {
+		die "ERROR: Unknown User: $opts{user}\n";
+	}
     }
 
     # If we've specified using FHS (http://www.pathname.com/fhs/) on the command line,




#!/bin/sh
# $FreeBSD$
#

PW="/usr/sbin/pw"
CHOWN="/usr/sbin/chown"
CHMOD="/bin/chmod"
MKDIR="/bin/mkdir -p"
NOLOGIN="/usr/sbin/nologin"

MRTG_USER=%%MRTG_USER%%
MRTG_GROUP=%%MRTG_GROUP%%
MRTG_UID=%%MRTG_UID%%
MRTG_GID=%%MRTG_GID%%
MRTG_RUNDIR=%%MRTG_RUNDIR%%

case "$2" in
	
PRE-INSTALL)
  ${PW} groupshow -n ${MRTG_GROUP} >/dev/null 2>&1 \
    || ${PW} groupadd -n ${MRTG_GROUP} -g ${MRTG_GID}
  ${PW} usershow -n ${MRTG_USER} >/dev/null 2>&1 \
    || ${PW} useradd ${MRTG_USER} -g ${MRTG_GROUP} -u ${MRTG_UID} -s ${NOLOGIN}
  ;;

POST-INSTALL)
	if [ ! -d "$MRTG_RUNDIR" ]; then
		${MKDIR} $MRTG_RUNDIR
	fi

	${CHOWN} -R ${MRTG_USER}:${MRTG_USER} ${MRTG_RUNDIR}
	${CHMOD} 0700 ${MRTG_RUNDIR}
	;;
esac
exit 0

Added Link Here

(-)files/pkg-message.in (+8 lines)
1	############################################################################
2	# Please create a MRTG config file in %%ETCDIR%% #
3	# A configuration file can be automatically generated with cfgmaker #
4	# A sample configuration file is installed as mrtg.cfg.sample #
5	# #
6	# To enable MRTG in daemon mode, put the following to your /etc/rc.conf: #
7	# mrtg_daemon_enable="YES" #
8	############################################################################

Return to bug 120590

Lines 6-12 Link Here

(-)Makefile (-36 / +56 lines)
6	#	6	#
7		7
8	PORTNAME= mrtg	8	PORTNAME= mrtg
9	PORTVERSION= 2.15.2	9	PORTVERSION= 2.16.0
10	PORTEPOCH= 1	10	PORTEPOCH= 1
11	CATEGORIES= net-mgmt ipv6	11	CATEGORIES= net-mgmt ipv6
12	MASTER_SITES= http://oss.oetiker.ch/mrtg/pub/ \	12	MASTER_SITES= http://oss.oetiker.ch/mrtg/pub/ \
Lines 18-25 Link Here
18	COMMENT= The multi-router traffic grapher	18	COMMENT= The multi-router traffic grapher
19		19
20	LIB_DEPENDS= gd.4:${PORTSDIR}/graphics/gd	20	LIB_DEPENDS= gd.4:${PORTSDIR}/graphics/gd
21	RUN_DEPENDS= ${SITE_PERL}/SNMP_Session.pm:${PORTSDIR}/net-mgmt/p5-SNMP_Session \	21	RUN_DEPENDS= ${SITE_PERL}/Pod/Usage.pm:${PORTSDIR}/textproc/p5-Pod-Parser
22	${SITE_PERL}/Pod/Usage.pm:${PORTSDIR}/textproc/p5-Pod-Parser
23		22
24	CONFIGURE_ARGS= --with-gd-lib=${LOCALBASE}/lib \	23	CONFIGURE_ARGS= --with-gd-lib=${LOCALBASE}/lib \
25	--with-gd-inc=${LOCALBASE}/include	24	--with-gd-inc=${LOCALBASE}/include
Lines 27-37 Link Here
27	USE_PERL5= YES	26	USE_PERL5= YES
28	MAKE_ENV+= PERL=${PERL}	27	MAKE_ENV+= PERL=${PERL}
29		28
		29	MRTG_USER?= mrtg
		30	MRTG_GROUP?= mrtg
		31	MRTG_UID?= 279
		32	MRTG_GID?= 279
		33	MRTG_RUNDIR?= /var/run/mrtg
		34
30	USE_RC_SUBR= mrtg_daemon.sh	35	USE_RC_SUBR= mrtg_daemon.sh
31	SUB_LIST+= PERL=${PERL}	36	SUB_FILES= pkg-install pkg-message
		37	SUB_LIST+= ETCDIR=${ETCDIR} \
		38	MRTG_USER=${MRTG_USER} \
		39	MRTG_GROUP=${MRTG_GROUP} \
		40	MRTG_UID=${MRTG_UID} \
		41	MRTG_GID=${MRTG_GID} \
		42	MRTG_RUNDIR=${MRTG_RUNDIR}
32		43
33	GNU_CONFIGURE= YES	44	GNU_CONFIGURE= YES
34
35	CONFIGURE_ENV= PERL=${PERL}	45	CONFIGURE_ENV= PERL=${PERL}
36		46
37	MAN1= cfgmaker.1 indexmaker.1 mrtg-contrib.1 mrtg-faq.1 mrtg-forum.1 \	47	MAN1= cfgmaker.1 indexmaker.1 mrtg-contrib.1 mrtg-faq.1 mrtg-forum.1 \
Lines 39-90 Link Here
39	mrtg-nw-guide.1 mrtg-reference.1 mrtg-rrd.1 mrtg-squid.1 \	49	mrtg-nw-guide.1 mrtg-reference.1 mrtg-rrd.1 mrtg-squid.1 \
40	mrtg-unix-guide.1 mrtg-webserver.1 mrtg.1 mrtglib.1	50	mrtg-unix-guide.1 mrtg-webserver.1 mrtg.1 mrtglib.1
41		51
42	OPTIONS= IPV6 "Enable IPv6 support" OFF	52	DOCS= CHANGES COPYRIGHT MANIFEST README
		53	EXAMPLES= cfgmaker.pod indexmaker.pod mrtg-contrib.pod mrtg-faq.pod \
		54	mrtg-forum.pod mrtg-ipv6.pod mrtg-logfile.pod mrtg-mibhelp.pod \
		55	mrtg-nt-guide.pod mrtg-nw-guide.pod mrtg-reference.pod \
		56	mrtg-rrd.pod mrtg-squid.pod mrtg-unix-guide.pod mrtg.pod \
		57	mrtg-webserver.pod mrtglib.pod cfgmaker.txt indexmaker.txt \
		58	mrtg-contrib.txt mrtg-faq.txt mrtg-forum.txt mrtg-ipv6.txt \
		59	mrtg-logfile.txt mrtg-mibhelp.txt mrtg-nt-guide.txt \
		60	mrtg-nw-guide.txt mrtg-reference.txt mrtg-rrd.txt \
		61	mrtg-squid.txt mrtg-unix-guide.txt mrtg-webserver.txt \
		62	mrtg.txt mrtglib.txt mrtg-l.png mrtg-m.png mrtg-r.png \
		63	mrtg-ti.png mrtg-l.gif mrtg-m.gif mrtg-r.gif
		64	IMAGES= favicon.ico mrtg-l.gif mrtg-l.png mrtg-m.gif mrtg-m.png \
		65	mrtg-r.gif mrtg-r.png mrtg-ti.gif mrtg-ti.png
		66	SCRIPTS= cfgmaker indexmaker mrtg
		67
		68	OPTIONS= IPV6 "Enable IPv6 support" OFF \
		69	SNMP "Enable use of SNMPv3" OFF
43		70
44	.include <bsd.port.pre.mk>	71	.include <bsd.port.pre.mk>
45		72
46	.if defined(WITH_IPV6)	73	.if defined(WITH_IPV6)
47	RUN_DEPENDS+= ${SITE_PERL}/IO/Socket/INET6.pm:${PORTSDIR}/net/p5-IO-INET6	74	RUN_DEPENDS+= ${SITE_PERL}/IO/Socket/INET6.pm:${PORTSDIR}/net/p5-IO-INET6
48	.endif	75	.endif
		76	.if defined(WITH_SNMP)
		77	RUN_DEPENDS+= ${SITE_PERL}/Net/SNMP.pm:${PORTSDIR}/net-mgmt/p5-Net-SNMP
		78	.else
		79	RUN_DEPENDS+= ${SITE_PERL}/SNMP_Session.pm:${PORTSDIR}/net-mgmt/p5-SNMP_Session
		80	.endif
49		81
50	post-patch:	82	post-patch:
51	${RM} ${WRKSRC}/lib/mrtg2/BER.pm ${WRKSRC}/lib/mrtg2/SNMP_*.pm	83	${RM} ${WRKSRC}/lib/mrtg2/BER.pm ${WRKSRC}/lib/mrtg2/SNMP_*.pm
52		84
53	pre-install:	85	pre-configure:
54	@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL	86	@${SED} -e 's,%%MRTG_USER%%,${MRTG_USER},g; s,%%MRTG_GROUP%%,${MRTG_GROUP},g; \
		87	s,%%MRTG_UID%%,${MRTG_UID},g; s,%%MRTG_GID%%,${MRTG_GID},g; \
		88	s,%%MRTG_RUNDIR%%,${MRTG_RUNDIR},g;' ${FILESDIR}/pkg-install.in > ${PKGINSTALL}
		89	@${SETENV} @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
55		90
56	do-install:	91	do-install:
57	${MKDIR} -m 755 ${ETCDIR}
58	${MKDIR} -m 755 ${DATADIR}
59	.if !defined(NOPORTDOCS)	92	.if !defined(NOPORTDOCS)
60	${MKDIR} -m 755 ${DOCSDIR}	93	@${MKDIR} ${DOCSDIR}
61	for file in CHANGES COPYRIGHT MANIFEST README \	94	@${INSTALL_DATA} ${DOCS:S,^,${WRKSRC}/,} ${DOCSDIR}/
62	doc/.pod doc/.txt doc/*.png ; do \	95	@${MKDIR} ${EXAMPLESDIR}/doc ${EXAMPLESDIR}/images
63	${INSTALL_DATA} ${WRKSRC}/$$file ${DOCSDIR}; \	96	@${INSTALL_DATA} ${EXAMPLES:S,^,${WRKSRC}/doc/,} ${EXAMPLESDIR}/doc/
64	done	97	@${INSTALL_DATA} ${IMAGES:S,^,${WRKSRC}/images/,} ${EXAMPLESDIR}/images/
65	.endif	98	.endif
66	${INSTALL_DATA} ${WRKSRC}/contrib/mrtgmk/cfg/mrtg.cfg ${ETCDIR}/mrtg.cfg.sample	99	@${MKDIR} ${ETCDIR}
67	${INSTALL_DATA} ${WRKSRC}/images/* ${DATADIR}	100	@${INSTALL_DATA} ${WRKSRC}/contrib/mrtgmk/cfg/mrtg.cfg ${ETCDIR}/mrtg.cfg.sample
68	${INSTALL_DATA} ${WRKSRC}/doc/*.1 ${PREFIX}/man/man1	101	@${INSTALL_DATA} ${MAN1:S,^,${WRKSRC}/doc/,} ${MAN1PREFIX}/man/man1
69	${INSTALL_DATA} ${WRKSRC}/lib/mrtg2/*.pm ${SITE_PERL}	102	@${CP} -p ${WRKSRC}/lib/mrtg2/*.pm ${SITE_PERL}/
70	${INSTALL_PROGRAM} ${WRKSRC}/bin/rateup ${PREFIX}/bin/	103	@${INSTALL_PROGRAM} ${WRKSRC}/bin/rateup ${PREFIX}/bin
71	for file in mrtg cfgmaker indexmaker; do \	104	@${INSTALL_SCRIPT} ${SCRIPTS:S,^,${WRKSRC}/bin/,} ${PREFIX}/bin
72	${INSTALL_SCRIPT} ${WRKSRC}/bin/$$file ${PREFIX}/bin/; \
73	done
74		105
75	post-install:	106	post-install:
76	@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL	107	@${SETENV} @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
77	.if !defined(BATCH)	108	@${CAT} ${PKGMESSAGE}
78	@${ECHO} ""
79	@${ECHO} "############################################################################"
80	@${ECHO} "# Please create a MRTG config file in ${ETCDIR} #"
81	@${ECHO} "# A configuration file can be automatically generated with cfgmaker #"
82	@${ECHO} "# A sample configuration file is installed as mrtg.cfg.sample #"
83	@${ECHO} "# #"
84	@${ECHO} "# To enable MRTG in daemon mode, put the following to your /etc/rc.conf or #"
85	@${ECHO} "# /etc/rc.conf.local file: #"
86	@${ECHO} "# mrtg_daemon_enable=\"YES\" #"
87	@${ECHO} "############################################################################"
88	.endif
89		109
90	.include <bsd.port.post.mk>	110	.include <bsd.port.post.mk>

Removed Link Here

(-)pkg-install (-49 lines)
1	#!/bin/sh
2	# $FreeBSD: ports/net-mgmt/mrtg/pkg-install,v 1.1 2006/02/06 12:24:19 demon Exp $
3	#
4
5	case "$2" in
6
7	PRE-INSTALL)
8	USER=mrtg
9	GROUP=${USER}
10	UID=279
11	GID=${UID}
12
13	if ! pw groupshow "${GROUP}" 2>/dev/null 1>&2; then
14	if pw groupadd ${GROUP} -g ${GID}; then
15	echo "Added group \"${GROUP}\"."
16	else
17	echo "Adding group \"${GROUP}\" failed..."
18	exit 1
19	fi
20	fi
21
22	if ! pw usershow "${USER}" 2>/dev/null 1>&2; then
23	if pw useradd ${USER} -u ${UID} -g ${GROUP} -h - \
24	-s "/sbin/nologin" -d "/nonexistent" \
25	-c "MRTG daemon"; \
26	then
27	echo "Added user \"${USER}\"."
28	else
29	echo "Adding user \"${USER}\" failed..."
30	exit 1
31	fi
32	fi
33	;;
34
35	POST-INSTALL)
36	rundir=/var/run/mrtg
37
38	if [ ! -d "$rundir" ]; then
39	mkdir -p $rundir
40	echo "Created directory: ${rundir}"
41	fi
42
43	chown -R mrtg:mrtg $rundir
44	chmod 0700 $rundir
45	;;
46
47	esac
48
49	exit 0

Lines 3-63 Link Here

(-)pkg-plist (-52 / +54 lines)
3	bin/mrtg	3	bin/mrtg
4	bin/rateup	4	bin/rateup
5	%%ETCDIR%%/mrtg.cfg.sample	5	%%ETCDIR%%/mrtg.cfg.sample
6	%%SITE_PERL%%/MRTG_lib.pm
7	%%SITE_PERL%%/Net_SNMP_util.pm
8	%%SITE_PERL%%/locales_mrtg.pm
9	%%PORTDOCS%%%%DOCSDIR%%/CHANGES	6	%%PORTDOCS%%%%DOCSDIR%%/CHANGES
10	%%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT	7	%%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT
11	%%PORTDOCS%%%%DOCSDIR%%/MANIFEST	8	%%PORTDOCS%%%%DOCSDIR%%/MANIFEST
12	%%PORTDOCS%%%%DOCSDIR%%/README	9	%%PORTDOCS%%%%DOCSDIR%%/README
13	%%PORTDOCS%%%%DOCSDIR%%/cfgmaker.pod	10	%%PORTDOCS%%%%EXAMPLESDIR%%/doc/cfgmaker.pod
14	%%PORTDOCS%%%%DOCSDIR%%/cfgmaker.txt	11	%%PORTDOCS%%%%EXAMPLESDIR%%/doc/cfgmaker.txt
15	%%PORTDOCS%%%%DOCSDIR%%/indexmaker.pod	12	%%PORTDOCS%%%%EXAMPLESDIR%%/doc/indexmaker.pod
16	%%PORTDOCS%%%%DOCSDIR%%/indexmaker.txt	13	%%PORTDOCS%%%%EXAMPLESDIR%%/doc/indexmaker.txt
17	%%PORTDOCS%%%%DOCSDIR%%/mrtg-contrib.pod	14	%%PORTDOCS%%%%EXAMPLESDIR%%/doc/mrtg-contrib.pod
18	%%PORTDOCS%%%%DOCSDIR%%/mrtg-contrib.txt	15	%%PORTDOCS%%%%EXAMPLESDIR%%/doc/mrtg-contrib.txt
19	%%PORTDOCS%%%%DOCSDIR%%/mrtg-faq.pod	16	%%PORTDOCS%%%%EXAMPLESDIR%%/doc/mrtg-faq.pod
20	%%PORTDOCS%%%%DOCSDIR%%/mrtg-faq.txt	17	%%PORTDOCS%%%%EXAMPLESDIR%%/doc/mrtg-faq.txt
21	%%PORTDOCS%%%%DOCSDIR%%/mrtg-forum.pod	18	%%PORTDOCS%%%%EXAMPLESDIR%%/doc/mrtg-forum.pod
22	%%PORTDOCS%%%%DOCSDIR%%/mrtg-forum.txt	19	%%PORTDOCS%%%%EXAMPLESDIR%%/doc/mrtg-forum.txt
23	%%PORTDOCS%%%%DOCSDIR%%/mrtg-ipv6.pod	20	%%PORTDOCS%%%%EXAMPLESDIR%%/doc/mrtg-ipv6.pod
24	%%PORTDOCS%%%%DOCSDIR%%/mrtg-ipv6.txt	21	%%PORTDOCS%%%%EXAMPLESDIR%%/doc/mrtg-ipv6.txt
25	%%PORTDOCS%%%%DOCSDIR%%/mrtg-l.png	22	%%PORTDOCS%%%%EXAMPLESDIR%%/doc/mrtg-l.png
26	%%PORTDOCS%%%%DOCSDIR%%/mrtg-logfile.pod	23	%%PORTDOCS%%%%EXAMPLESDIR%%/doc/mrtg-logfile.pod
27	%%PORTDOCS%%%%DOCSDIR%%/mrtg-logfile.txt	24	%%PORTDOCS%%%%EXAMPLESDIR%%/doc/mrtg-logfile.txt
28	%%PORTDOCS%%%%DOCSDIR%%/mrtg-m.png	25	%%PORTDOCS%%%%EXAMPLESDIR%%/doc/mrtg-m.png
29	%%PORTDOCS%%%%DOCSDIR%%/mrtg-mibhelp.pod	26	%%PORTDOCS%%%%EXAMPLESDIR%%/doc/mrtg-mibhelp.pod
30	%%PORTDOCS%%%%DOCSDIR%%/mrtg-mibhelp.txt	27	%%PORTDOCS%%%%EXAMPLESDIR%%/doc/mrtg-mibhelp.txt
31	%%PORTDOCS%%%%DOCSDIR%%/mrtg-nt-guide.pod	28	%%PORTDOCS%%%%EXAMPLESDIR%%/doc/mrtg-nt-guide.pod
32	%%PORTDOCS%%%%DOCSDIR%%/mrtg-nt-guide.txt	29	%%PORTDOCS%%%%EXAMPLESDIR%%/doc/mrtg-nt-guide.txt
33	%%PORTDOCS%%%%DOCSDIR%%/mrtg-nw-guide.pod	30	%%PORTDOCS%%%%EXAMPLESDIR%%/doc/mrtg-nw-guide.pod
34	%%PORTDOCS%%%%DOCSDIR%%/mrtg-nw-guide.txt	31	%%PORTDOCS%%%%EXAMPLESDIR%%/doc/mrtg-nw-guide.txt
35	%%PORTDOCS%%%%DOCSDIR%%/mrtg-r.png	32	%%PORTDOCS%%%%EXAMPLESDIR%%/doc/mrtg-r.png
36	%%PORTDOCS%%%%DOCSDIR%%/mrtg-reference.pod	33	%%PORTDOCS%%%%EXAMPLESDIR%%/doc/mrtg-reference.pod
37	%%PORTDOCS%%%%DOCSDIR%%/mrtg-reference.txt	34	%%PORTDOCS%%%%EXAMPLESDIR%%/doc/mrtg-reference.txt
38	%%PORTDOCS%%%%DOCSDIR%%/mrtg-rrd.pod	35	%%PORTDOCS%%%%EXAMPLESDIR%%/doc/mrtg-rrd.pod
39	%%PORTDOCS%%%%DOCSDIR%%/mrtg-rrd.txt	36	%%PORTDOCS%%%%EXAMPLESDIR%%/doc/mrtg-rrd.txt
40	%%PORTDOCS%%%%DOCSDIR%%/mrtg-squid.pod	37	%%PORTDOCS%%%%EXAMPLESDIR%%/doc/mrtg-squid.pod
41	%%PORTDOCS%%%%DOCSDIR%%/mrtg-squid.txt	38	%%PORTDOCS%%%%EXAMPLESDIR%%/doc/mrtg-squid.txt
42	%%PORTDOCS%%%%DOCSDIR%%/mrtg-ti.png	39	%%PORTDOCS%%%%EXAMPLESDIR%%/doc/mrtg-ti.png
43	%%PORTDOCS%%%%DOCSDIR%%/mrtg-unix-guide.pod	40	%%PORTDOCS%%%%EXAMPLESDIR%%/doc/mrtg-unix-guide.pod
44	%%PORTDOCS%%%%DOCSDIR%%/mrtg-unix-guide.txt	41	%%PORTDOCS%%%%EXAMPLESDIR%%/doc/mrtg-unix-guide.txt
45	%%PORTDOCS%%%%DOCSDIR%%/mrtg-webserver.pod	42	%%PORTDOCS%%%%EXAMPLESDIR%%/doc/mrtg-webserver.pod
46	%%PORTDOCS%%%%DOCSDIR%%/mrtg-webserver.txt	43	%%PORTDOCS%%%%EXAMPLESDIR%%/doc/mrtg-webserver.txt
47	%%PORTDOCS%%%%DOCSDIR%%/mrtg.pod	44	%%PORTDOCS%%%%EXAMPLESDIR%%/doc/mrtg.pod
48	%%PORTDOCS%%%%DOCSDIR%%/mrtg.txt	45	%%PORTDOCS%%%%EXAMPLESDIR%%/doc/mrtg.txt
49	%%PORTDOCS%%%%DOCSDIR%%/mrtglib.pod	46	%%PORTDOCS%%%%EXAMPLESDIR%%/doc/mrtglib.pod
50	%%PORTDOCS%%%%DOCSDIR%%/mrtglib.txt	47	%%PORTDOCS%%%%EXAMPLESDIR%%/doc/mrtglib.txt
51	%%DATADIR%%/favicon.ico	48	%%PORTDOCS%%%%EXAMPLESDIR%%/doc/mrtg-l.gif
52	%%DATADIR%%/mrtg-l.gif	49	%%PORTDOCS%%%%EXAMPLESDIR%%/doc/mrtg-m.gif
53	%%DATADIR%%/mrtg-l.png	50	%%PORTDOCS%%%%EXAMPLESDIR%%/doc/mrtg-r.gif
54	%%DATADIR%%/mrtg-m.gif	51	%%PORTDOCS%%%%EXAMPLESDIR%%/images/favicon.ico
55	%%DATADIR%%/mrtg-m.png	52	%%PORTDOCS%%%%EXAMPLESDIR%%/images/mrtg-l.gif
56	%%DATADIR%%/mrtg-r.gif	53	%%PORTDOCS%%%%EXAMPLESDIR%%/images/mrtg-l.png
57	%%DATADIR%%/mrtg-r.png	54	%%PORTDOCS%%%%EXAMPLESDIR%%/images/mrtg-m.gif
58	%%DATADIR%%/mrtg-ti.gif	55	%%PORTDOCS%%%%EXAMPLESDIR%%/images/mrtg-m.png
59	%%DATADIR%%/mrtg-ti.png	56	%%PORTDOCS%%%%EXAMPLESDIR%%/images/mrtg-r.gif
		57	%%PORTDOCS%%%%EXAMPLESDIR%%/images/mrtg-r.png
		58	%%PORTDOCS%%%%EXAMPLESDIR%%/images/mrtg-ti.gif
		59	%%PORTDOCS%%%%EXAMPLESDIR%%/images/mrtg-ti.png
		60	@dirrmtry /var/run/mrtg
60	@dirrmtry %%ETCDIR%%	61	@dirrmtry %%ETCDIR%%
61	%%PORTDOCS%%@dirrm %%DOCSDIR%%	62	%%PORTDOCS%%@dirrm %%DOCSDIR%%
62	@dirrm %%DATADIR%%	63	%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/images
63	@dirrmtry /var/run/mrtg	64	%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/doc
		65	%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%

Removed Link Here

(-)files/patch-bin_mrtg (-22 lines)
1	--- bin/mrtg.old Fri Aug 18 13:02:42 2006
2	+++ bin/mrtg Fri Aug 18 13:04:08 2006
3	@@ -174,11 +174,17 @@
4	my $gid = $(;
5
6	if (defined $opts{group}) {
7	- $gid = getgrnam($opts{group}) or die "$NOW: ERROR: Unknown Group: $opts{group})\n";
8	+ $gid = getgrnam($opts{group});
9	+ if( $gid =~ /^$/ ) {
10	+ die "ERROR: Unknown Group: $opts{group}\n";
11	+ }
12	}
13
14	if (defined $opts{user}) {
15	- $uid = getpwnam($opts{user}) or die "$NOW: ERROR: Unknown User: $opts{user})\n";
16	+ $uid = getpwnam($opts{user});
17	+ if( $uid =~ /^$/ ) {
18	+ die "ERROR: Unknown User: $opts{user}\n";
19	+ }
20	}
21
22	# If we've specified using FHS (http://www.pathname.com/fhs/) on the command line,

Added Link Here

(-)files/pkg-install.in (+35 lines)
1	#!/bin/sh
2	# $FreeBSD$
3	#
4
5	PW="/usr/sbin/pw"
6	CHOWN="/usr/sbin/chown"
7	CHMOD="/bin/chmod"
8	MKDIR="/bin/mkdir -p"
9	NOLOGIN="/usr/sbin/nologin"
10
11	MRTG_USER=%%MRTG_USER%%
12	MRTG_GROUP=%%MRTG_GROUP%%
13	MRTG_UID=%%MRTG_UID%%
14	MRTG_GID=%%MRTG_GID%%
15	MRTG_RUNDIR=%%MRTG_RUNDIR%%
16
17	case "$2" in
18
19	PRE-INSTALL)
20	${PW} groupshow -n ${MRTG_GROUP} >/dev/null 2>&1 \
21	\|\| ${PW} groupadd -n ${MRTG_GROUP} -g ${MRTG_GID}
22	${PW} usershow -n ${MRTG_USER} >/dev/null 2>&1 \
23	\|\| ${PW} useradd ${MRTG_USER} -g ${MRTG_GROUP} -u ${MRTG_UID} -s ${NOLOGIN}
24	;;
25
26	POST-INSTALL)
27	if [ ! -d "$MRTG_RUNDIR" ]; then
28	${MKDIR} $MRTG_RUNDIR
29	fi
30
31	${CHOWN} -R ${MRTG_USER}:${MRTG_USER} ${MRTG_RUNDIR}
32	${CHMOD} 0700 ${MRTG_RUNDIR}
33	;;
34	esac
35	exit 0