[Midnightbsd-cvs] mports [15463] U trunk/sysutils/bsdstats/files: attempt to fix current support

[laffer1 at midnightbsd.org]

Revision: 15463
          http://svnweb.midnightbsd.org/mports/?rev=15463
Author:   laffer1
Date:     2013-09-17 20:17:07 -0400 (Tue, 17 Sep 2013)
Log Message:
-----------
attempt to fix current support

Modified Paths:
--------------
    trunk/sysutils/bsdstats/Makefile
    trunk/sysutils/bsdstats/files/300.statistics.in
    trunk/sysutils/bsdstats/files/bsdstats.in
    trunk/sysutils/bsdstats/files/pkg-message.in

Property Changed:
----------------
    trunk/sysutils/bsdstats/files/300.statistics.in
    trunk/sysutils/bsdstats/files/bsdstats.in
    trunk/sysutils/bsdstats/files/pkg-message.in

Modified: trunk/sysutils/bsdstats/Makefile
===================================================================
--- trunk/sysutils/bsdstats/Makefile	2013-09-17 03:15:41 UTC (rev 15462)
+++ trunk/sysutils/bsdstats/Makefile	2013-09-18 00:17:07 UTC (rev 15463)
@@ -1,19 +1,14 @@
-# New ports collection makefile for:	bsdstats
-# Date created:		5 August 2006
-# Whom:			Marc G. Fournier <scrappy at freebsd.org>
-#
-# $FreeBSD: ports/sysutils/bsdstats/Makefile,v 1.47 2006/12/09 06:06:13 scrappy Exp $
 # $MidnightBSD$ 
-#
 
 PORTNAME=	bsdstats
 PORTVERSION=	5.5
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	sysutils
 DISTFILES=
 
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	Monthly script for reporting anonymous statistics about your machine
+
 LICENSE=	unknown
 
 USE_RC_SUBR=	bsdstats

Modified: trunk/sysutils/bsdstats/files/300.statistics.in
===================================================================
--- trunk/sysutils/bsdstats/files/300.statistics.in	2013-09-17 03:15:41 UTC (rev 15462)
+++ trunk/sysutils/bsdstats/files/300.statistics.in	2013-09-18 00:17:07 UTC (rev 15463)
@@ -2,7 +2,6 @@
 #
 # $FreeBSD: ports/sysutils/bsdstats/files/300.statistics,v 1.38 2006/12/05 13:49:45 scrappy Exp $
 # $MidnightBSD: mports/sysutils/bsdstats/files/300.statistics,v 1.4 2009/09/25 02:23:53 laffer1 Exp $ 
-#
 
 # If there is a global system configuration file, suck it in.
 #
@@ -101,9 +100,9 @@
 send_ports () {
     case $(uname) in
 	MidnightBSD )
-	    for line in `/usr/sbin/pkg_info | /usr/bin/awk '{print $1}' `
+	    for line in `/usr/sbin/mport list | /usr/bin/awk '{print $1}' `
 	    do
-              category=`grep "@comment ORIGIN" /var/db/pkg/${line}/+CONTENTS | sed -E 's/^\@comment ORIGIN:(.+)\/.+/\1/g'`
+              category=`mport info ${line} | grep "origin:" | sed -E 's/^\origin:(.+)\/.+/\1/g'`
               line=$(uri_escape $line)
               category=$(uri_escape $category)
 	      query_string=$query_string`echo \&port[]=${category}:${line}`


Property changes on: trunk/sysutils/bsdstats/files/300.statistics.in
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Modified: trunk/sysutils/bsdstats/files/bsdstats.in
===================================================================
--- trunk/sysutils/bsdstats/files/bsdstats.in	2013-09-17 03:15:41 UTC (rev 15462)
+++ trunk/sysutils/bsdstats/files/bsdstats.in	2013-09-18 00:17:07 UTC (rev 15463)
@@ -1,7 +1,6 @@
 #!/bin/sh 
 #
-# $FreeBSD: ports/sysutils/bsdstats/files/bsdstats.in,v 1.4 2012/01/14 08:56:57 dougb Exp $
-#
+# $MidnightBSD$
 
 # PROVIDE: bsdstats
 # REQUIRE: LOGIN


Property changes on: trunk/sysutils/bsdstats/files/bsdstats.in
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Modified: trunk/sysutils/bsdstats/files/pkg-message.in
===================================================================
--- trunk/sysutils/bsdstats/files/pkg-message.in	2013-09-17 03:15:41 UTC (rev 15462)
+++ trunk/sysutils/bsdstats/files/pkg-message.in	2013-09-18 00:17:07 UTC (rev 15463)
@@ -1,30 +1,15 @@
-
-This script, meant to be run monthly, submits statistics anonymously
-to a central checkin server (http://bsdstats.org), in an attempt to
-generate reasonably accurate demographics of both *BSD usage, as well
-as devices in use.
-
-Steps have been taken to make eliminate security concerns brought up
-in earlier releases of this, including, but not limited to, not storing
-anything in the database that has been deemed as 'sensitive' (ie. IP of
-the reporting server, and hostname).
-
 ********************
-To enable monthly reporting, edit or create /etc/periodic.conf and add this line:
+To enable monthly reporting, add these lines to /etc/periodic.conf:
 	monthly_statistics_enable="YES"
+	monthly_statistics_report_devices="YES"
+	monthly_statistics_report_ports="YES"
 
-To enable boottime reporting, edit or create /etc/rc.conf and add this line:
+To enable reporting on bootup, add this line to /etc/rc.conf:
 	bsdstats_enable="YES"
 
-To enable device reporting, add this line:
-	monthly_statistics_report_devices="YES"
-
-To enable ports reporting, add this line:
-	monthly_statistics_report_ports="YES"
-
-To run it manually the first time, just run it as:
+To run it manually the first time:
 	%%PREFIX%%/etc/periodic/monthly/300.statistics -nodelay
 
 To view current statistics, go to:
-        http://www.bsdstats.org
+	http://www.bsdstats.org/
 ********************


Property changes on: trunk/sysutils/bsdstats/files/pkg-message.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property