Attachment #103729 for bug #143728

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





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

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

USERS=		mrtg
GROUPS=		mrtg

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
SUB_FILES=	pkg-deinstall pkg-install pkg-message
SUB_LIST=	PERL=${PERL} \
		MRTG_RUNDIR=${MRTG_RUNDIR} \
		USERS=${USERS} \
		GROUPS=${GROUPS}
PKGINSTALL=	${WRKDIR}/pkg-install
PKGDEINSTALL=	${WRKDIR}/pkg-deinstall

GNU_CONFIGURE=	YES
CONFIGURE_ENV=	PERL=${PERL}

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

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

do-install:
.if !defined(NOPORTDOCS)
	@${MKDIR} ${DOCSDIR}
	@${INSTALL_DATA} ${DOCS:S,^,${WRKSRC}/,} ${DOCSDIR}/
.endif
.if !defined(NOPORTEXAMPLES)
	@${MKDIR} ${EXAMPLESDIR}/doc ${EXAMPLESDIR}/images
	@${INSTALL_DATA} ${EXAMPLES:S,^,${WRKSRC}/doc/,} ${EXAMPLESDIR}/doc/
	@${INSTALL_DATA} ${IMAGES:S,^,${WRKSRC}/images/,} ${EXAMPLESDIR}/images/

Line 0 Link Here

(-)files/patch-aa (+11 lines)
	1	--- bin/mrtg.orig 2010-01-15 17:02:33.000000000 +0300
	2	+++ bin/mrtg 2010-01-15 16:38:33.000000000 +0300
	3	@@ -1608,7 +1608,7 @@
	4	print HTML "
	5	<!-- Begin $sample{$peri} -->
	6	<div class=\"graph\">
	7	- <h2>".&$LOC("$sample{$peri}")." ".&$LOC("Average)")."</h2>
	8	+ <h2>".&$LOC("$sample{$peri}").&$LOC(" Average\)")."</h2>
	9	<img src=\"$imagepath$router-$full{$peri}.${main::GRAPHFMT}\" title=\"$full{$peri}\" alt=\"$full{$peri}\" />
	10	<table>
	11	<tr>

Line 0 Link Here

(-)files/patch-ab (+32 lines)
	1	--- lib/mrtg2/locales_mrtg.pm.orig 2008-05-16 18:45:41.000000000 +0400
	2	+++ lib/mrtg2/locales_mrtg.pm 2010-01-15 16:33:33.000000000 +0300
	3	@@ -4137,10 +4137,10 @@
	4	'Max' => 'íÁËÓ.',
	5	'Current' => 'ôÅËÕÝÉÊ',
	6	'version' => '×ÅÒÓÉÑ',
	7	- '`Daily\' Graph \((.*) Minute' => 'óÕÔÏÞÎÙÊ ÔÒÁÆÉË (ÓÒÅÄÎÅÅ ÚÁ $1 ÍÉÎÕÔ',
	8	- '`Weekly\' Graph \(30 Minute' => 'îÅÄÅÌØÎÙÊ ÔÒÁÆÉË (ÓÒÅÄÎÅÅ ÚÁ 30 ÍÉÎÕÔ' ,
	9	- '`Monthly\' Graph \(2 Hour' => 'íÅÓÑÞÎÙÊ ÔÒÁÆÉË (ÓÒÅÄÎÅÅ ÚÁ 2 ÞÁÓÁ',
	10	- '`Yearly\' Graph \(1 Day' => 'çÏÄÏ×ÏÊ ÔÒÁÆÉË (ÓÒÅÄÎÅÅ ÚÁ 1 ÄÅÎØ',
	11	+ '`Daily\' Graph \((.*) Minute' => 'óÕÔÏÞÎÙÊ ÇÒÁÆÉË (ÓÒÅÄÎÅÅ ÚÁ $1 ÍÉÎÕÔ',
	12	+ '`Weekly\' Graph \(30 Minute' => 'îÅÄÅÌØÎÙÊ ÇÒÁÆÉË (ÓÒÅÄÎÅÅ ÚÁ 30 ÍÉÎÕÔ' ,
	13	+ '`Monthly\' Graph \(2 Hour' => 'íÅÓÑÞÎÙÊ ÇÒÁÆÉË (ÓÒÅÄÎÅÅ ÚÁ 2 ÞÁÓÁ',
	14	+ '`Yearly\' Graph \(1 Day' => 'çÏÄÏ×ÏÊ ÇÒÁÆÉË (ÓÒÅÄÎÅÅ ÚÁ 1 ÄÅÎØ',
	15	'Incoming Traffic in (\S+) per Second' => '÷ÈÏÄÑÝÉÊ ÔÒÁÆÉË × $1 × ÓÅËÕÎÄÕ',
	16	'Outgoing Traffic in (\S+) per Second' => 'éÓÈÏÄÑÝÉÊ ÔÒÁÆÉË × $1 × ÓÅËÕÎÄÕ',
	17	'at which time (.) had been up for(.)' => '× ÜÔÏ ×ÒÅÍÑ $1 ÂÙÌÁ ×ËÌÀÞÅÎÁ $2',
	18	@@ -4245,10 +4245,10 @@
	19	'Max' => 'Ìàêñèìàëüíî',
	20	'Current' => 'Ñåé÷àñ',
	21	'version' => 'âåðñèÿ',
	22	- '`Daily\' Graph \((.*) Minute' => 'Ñóòî÷íûé òðàôèê (ñðåäíåå çà $1 ìèíóò',
	23	- '`Weekly\' Graph \(30 Minute' => 'Íåäåëüíûé òðàôèê (ñðåäíåå çà 30 ìèíóò' ,
	24	- '`Monthly\' Graph \(2 Hour' => 'Ìåñÿ÷íûé òðàôèê (ñðåäíåå çà 2 ÷àñà',
	25	- '`Yearly\' Graph \(1 Day' => 'Ãîäîâîé òðàôèê (ñðåäíåå çà 1 äåíü',
	26	+ '`Daily\' Graph \((.*) Minute' => 'Ñóòî÷íûé ãðàôèê (ñðåäíåå çà $1 ìèíóò',
	27	+ '`Weekly\' Graph \(30 Minute' => 'Íåäåëüíûé ãðàôèê (ñðåäíåå çà 30 ìèíóò' ,
	28	+ '`Monthly\' Graph \(2 Hour' => 'Ìåñÿ÷íûé ãðàôèê (ñðåäíåå çà 2 ÷àñà',
	29	+ '`Yearly\' Graph \(1 Day' => 'Ãîäîâîé ãðàôèê (ñðåäíåå çà 1 äåíü',
	30	'Incoming Traffic in (\S+) per Second' => 'Âõîäÿùèé òðàôèê â $1 â ñåêóíäó',
	31	'Outgoing Traffic in (\S+) per Second' => 'Èñõîäÿùèé òðàôèê â $1 â ñåêóíäó',
	32	'at which time <strong>(\S+)</strong> had been up for <strong>(\S+)</strong>' => 'âðåìÿ ïîñëå èíèöèàëèçàöèè óñòðîéñòâà <strong>$1</strong>: <strong>$2</strong>.',

Line 0 Link Here

(-)files/pkg-deinstall.in (+2 lines)
	1	#!/bin/sh
	2	rm -rf %%MRTG_RUNDIR%%




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 %%USERS%%:%%GROUPS%% ${MRTG_RUNDIR}
	${CHMOD} 0700 ${MRTG_RUNDIR}
	;;
esac

Lines 61-67 Link Here

(-)pkg-plist (-1 lines)
61	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/images/mrtg-r.png	61	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/images/mrtg-r.png
62	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/images/mrtg-ti.gif	62	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/images/mrtg-ti.gif
63	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/images/mrtg-ti.png	63	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/images/mrtg-ti.png
64	@dirrmtry /var/run/mrtg
65	@dirrmtry %%ETCDIR%%	64	@dirrmtry %%ETCDIR%%
66	%%PORTDOCS%%@dirrm %%DOCSDIR%%	65	%%PORTDOCS%%@dirrm %%DOCSDIR%%
67	%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/images	66	%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/images

Return to bug 143728

Lines 7-13 Link Here

(-)Makefile (-21 / +12 lines)
7		7
8	PORTNAME= mrtg	8	PORTNAME= mrtg
9	PORTVERSION= 2.16.2	9	PORTVERSION= 2.16.2
10	PORTREVISION= 4	10	PORTREVISION= 5
11	PORTEPOCH= 1	11	PORTEPOCH= 1
12	CATEGORIES= net-mgmt ipv6	12	CATEGORIES= net-mgmt ipv6
13	MASTER_SITES= http://oss.oetiker.ch/mrtg/pub/ \	13	MASTER_SITES= http://oss.oetiker.ch/mrtg/pub/ \
Lines 24-45 Link Here
24	CONFIGURE_ARGS= --with-gd-lib=${LOCALBASE}/lib \	24	CONFIGURE_ARGS= --with-gd-lib=${LOCALBASE}/lib \
25	--with-gd-inc=${LOCALBASE}/include	25	--with-gd-inc=${LOCALBASE}/include
26		26
		27	USERS= mrtg
		28	GROUPS= mrtg
		29
27	USE_PERL5= YES	30	USE_PERL5= YES
28	MAKE_ENV+= PERL=${PERL}	31	MAKE_ENV+= PERL=${PERL}
29	MRTG_USER?= mrtg
30	MRTG_GROUP?= mrtg
31	MRTG_UID?= 279
32	MRTG_GID?= 279
33	MRTG_RUNDIR?= /var/run/mrtg	32	MRTG_RUNDIR?= /var/run/mrtg
34		33
35	USE_RC_SUBR= mrtg_daemon	34	USE_RC_SUBR= mrtg_daemon
36	SUB_FILES= pkg-install pkg-message	35	SUB_FILES= pkg-deinstall pkg-install pkg-message
37	SUB_LIST= PERL=${PERL} \	36	SUB_LIST= PERL=${PERL} \
38	MRTG_USER=${MRTG_USER} \	37	MRTG_RUNDIR=${MRTG_RUNDIR} \
39	MRTG_GROUP=${MRTG_GROUP} \	38	USERS=${USERS} \
40	MRTG_UID=${MRTG_UID} \	39	GROUPS=${GROUPS}
41	MRTG_GID=${MRTG_GID} \	40	PKGINSTALL= ${WRKDIR}/pkg-install
42	MRTG_RUNDIR=${MRTG_RUNDIR}	41	PKGDEINSTALL= ${WRKDIR}/pkg-deinstall
43		42
44	GNU_CONFIGURE= YES	43	GNU_CONFIGURE= YES
45	CONFIGURE_ENV= PERL=${PERL}	44	CONFIGURE_ENV= PERL=${PERL}
Lines 80-99 Link Here
80	post-patch:	79	post-patch:
81	@${RM} ${WRKSRC}/lib/mrtg2/BER.pm ${WRKSRC}/lib/mrtg2/SNMP_*.pm	80	@${RM} ${WRKSRC}/lib/mrtg2/BER.pm ${WRKSRC}/lib/mrtg2/SNMP_*.pm
82		81
83	pre-configure:
84	@${SED} -e 's,%%MRTG_USER%%,${MRTG_USER},g;' \
85	-e 's,%%MRTG_GROUP%%,${MRTG_GROUP},g;' \
86	-e 's,%%MRTG_UID%%,${MRTG_UID},g;' \
87	-e 's,%%MRTG_GID%%,${MRTG_GID},g;' \
88	-e 's,%%MRTG_RUNDIR%%,${MRTG_RUNDIR},g;' \
89	< ${FILESDIR}/pkg-install.in > ${PKGINSTALL}
90	@${SETENV} @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} \
91	PRE-INSTALL
92
93	do-install:	82	do-install:
94	.if !defined(NOPORTDOCS)	83	.if !defined(NOPORTDOCS)
95	@${MKDIR} ${DOCSDIR}	84	@${MKDIR} ${DOCSDIR}
96	@${INSTALL_DATA} ${DOCS:S,^,${WRKSRC}/,} ${DOCSDIR}/	85	@${INSTALL_DATA} ${DOCS:S,^,${WRKSRC}/,} ${DOCSDIR}/
		86	.endif
		87	.if !defined(NOPORTEXAMPLES)
97	@${MKDIR} ${EXAMPLESDIR}/doc ${EXAMPLESDIR}/images	88	@${MKDIR} ${EXAMPLESDIR}/doc ${EXAMPLESDIR}/images
98	@${INSTALL_DATA} ${EXAMPLES:S,^,${WRKSRC}/doc/,} ${EXAMPLESDIR}/doc/	89	@${INSTALL_DATA} ${EXAMPLES:S,^,${WRKSRC}/doc/,} ${EXAMPLESDIR}/doc/
99	@${INSTALL_DATA} ${IMAGES:S,^,${WRKSRC}/images/,} ${EXAMPLESDIR}/images/	90	@${INSTALL_DATA} ${IMAGES:S,^,${WRKSRC}/images/,} ${EXAMPLESDIR}/images/

Lines 8-34 Link Here

(-)files/pkg-install.in (-12 / +1 lines)
8	MKDIR="/bin/mkdir -p"	8	MKDIR="/bin/mkdir -p"
9	NOLOGIN="/usr/sbin/nologin"	9	NOLOGIN="/usr/sbin/nologin"
10		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%%	11	MRTG_RUNDIR=%%MRTG_RUNDIR%%
16		12
17	case "$2" in	13	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		14
26	POST-INSTALL)	15	POST-INSTALL)
27	if [ ! -d "$MRTG_RUNDIR" ]; then	16	if [ ! -d "$MRTG_RUNDIR" ]; then
28	${MKDIR} $MRTG_RUNDIR	17	${MKDIR} $MRTG_RUNDIR
29	fi	18	fi
30		19
31	${CHOWN} -R ${MRTG_USER}:${MRTG_USER} ${MRTG_RUNDIR}	20	${CHOWN} -R %%USERS%%:%%GROUPS%% ${MRTG_RUNDIR}
32	${CHMOD} 0700 ${MRTG_RUNDIR}	21	${CHMOD} 0700 ${MRTG_RUNDIR}
33	;;	22	;;
34	esac	23	esac