[79503] trunk/dports/net/ncid

ryandesign at macports.org ryandesign at macports.org
Wed Jun 15 18:50:05 PDT 2011


Revision: 79503
          http://trac.macports.org/changeset/79503
Author:   ryandesign at macports.org
Date:     2011-06-15 18:50:03 -0700 (Wed, 15 Jun 2011)
Log Message:
-----------
ncid: update to 0.82.1, indicate license

Modified Paths:
--------------
    trunk/dports/net/ncid/Portfile
    trunk/dports/net/ncid/files/patch-Makefile.diff
    trunk/dports/net/ncid/files/patch-manpages.diff

Modified: trunk/dports/net/ncid/Portfile
===================================================================
--- trunk/dports/net/ncid/Portfile	2011-06-16 01:39:39 UTC (rev 79502)
+++ trunk/dports/net/ncid/Portfile	2011-06-16 01:50:03 UTC (rev 79503)
@@ -4,9 +4,10 @@
 PortSystem              1.0
 
 name                    ncid
-version                 0.74
+version                 0.82.1
 categories              net
 maintainers             davidlaporte.org:david ryandesign
+license                 GPL-2+
 homepage                http://ncid.sourceforge.net/
 master_sites            sourceforge
 platforms               darwin
@@ -34,10 +35,8 @@
     device or one or more CID clients, and then sends the information \
     to each connected client.
 
-checksums \
-    md5     18885a48bc8be40fa2423a266c6c9e40 \
-    sha1    f3df5926b35fdff7d16fd5b452d326009de17a59 \
-    rmd160  af0858e6d73c6ae78699d77ff4f107d36c61312c
+checksums               sha1    7c788a43c2b67625c6148fe9a52ac5e8daa53750 \
+                        rmd160  a9f42e23af889e669abf70d46b6346ddbe1b0e89
 
 depends_lib \
     port:tcl \

Modified: trunk/dports/net/ncid/files/patch-Makefile.diff
===================================================================
--- trunk/dports/net/ncid/files/patch-Makefile.diff	2011-06-16 01:39:39 UTC (rev 79502)
+++ trunk/dports/net/ncid/files/patch-Makefile.diff	2011-06-16 01:50:03 UTC (rev 79503)
@@ -1,6 +1,6 @@
---- Makefile	2009-02-17 23:02:28.000000000 -0600
-+++ Makefile	2009-06-16 01:06:34.000000000 -0500
-@@ -58,9 +58,9 @@
+--- Makefile.orig	2011-05-05 23:16:40.000000000 -0500
++++ Makefile	2011-06-15 20:33:46.000000000 -0500
+@@ -53,9 +53,9 @@
  
  # prefix and prefix2 are used on a make, install, and making a package
  # prefix3 is used on install to make a package
@@ -10,9 +10,9 @@
 -prefix3      =
 +prefix3      = $(prefix)
  
- OS           = host
- 
-@@ -271,7 +271,8 @@
+ settag       = NONE
+ setlock      = NONE
+@@ -262,7 +262,8 @@
              MFLAGS="-mmacosx-version-min=10.4" STRIP=
  
  mac-install:
@@ -21,4 +21,4 @@
 +            MODEMDEV=$(DEV)/cu.modem
  
  cygwin:
- 	$(MAKE) local OS=cygwin \
+ 	$(MAKE) local \

Modified: trunk/dports/net/ncid/files/patch-manpages.diff
===================================================================
--- trunk/dports/net/ncid/files/patch-manpages.diff	2011-06-16 01:39:39 UTC (rev 79502)
+++ trunk/dports/net/ncid/files/patch-manpages.diff	2011-06-16 01:50:03 UTC (rev 79503)
@@ -1,6 +1,6 @@
---- man/ncid.1	2009-03-06 09:13:11.000000000 -0600
-+++ man/ncid.1	2009-06-16 01:06:34.000000000 -0500
-@@ -74,10 +74,10 @@
+--- man/ncid.1.orig	2011-04-28 10:17:41.000000000 -0500
++++ man/ncid.1	2011-05-08 05:38:10.000000000 -0500
+@@ -69,10 +69,10 @@
  test for it, and if it is not found, or if it is not executable,
  it will terminate with a error message.
  .PP
@@ -13,27 +13,27 @@
  .PP
  Whenever the server connection is broken, \fIncid\fR will normally try
  to reconnect once a minute.  It provides a visual record of the countdown
-@@ -129,8 +129,8 @@
+@@ -122,8 +122,8 @@
  .TP
  .B --pidfile | -p
  Name of PID file to create.
--Set to \fI/var/run/ncid.pid\fB in a rc or init script when used as a service.
--Set to \fI/var/run/OUTPUTMODULE.pid\fB in a rc or init script when used as
-+Set to \fI at PREFIX@/var/run/ncid.pid\fB in a rc or init script when used as a service.
-+Set to \fI at PREFIX@/var/run/OUTPUTMODULE.pid\fB in a rc or init script when used as
+-Set to \fI/var/run/ncid.pid\fR in a rc or init script when used as a service.
+-Set to \fI/var/run/OUTPUTMODULE.pid\fR in a rc or init script when used as
++Set to \fI at PREFIX@/var/run/ncid.pid\fR in a rc or init script when used as a service.
++Set to \fI at PREFIX@/var/run/OUTPUTMODULE.pid\fR in a rc or init script when used as
  a service and when using a output module.
  There is no default.  If pidfile is not set, no pid file will be used.
  .TP
-@@ -138,7 +138,7 @@
- Name of the output module (program) to use.  Some output modules are
- ncid-kpopup, ncid-page, and ncid-speak.
+@@ -134,7 +134,7 @@
+ Outgoing call information is also sent if the call-out option is enabled.
+ A message is also sent, if the message option is enabled.
  .br
--Default PATH: /usr/share/ncid
-+Default PATH: @PREFIX@/share/ncid
- .br
- Default PROGRAM: ncid-speak
+-Default module PATH: /usr/share/ncid
++Default module PATH: @PREFIX@/share/ncid
  .TP
-@@ -192,9 +192,9 @@
+ .B --raw | -R
+ display data received from the CID Server
+@@ -186,9 +186,9 @@
  Default: 3333
  .PD
  .SH FILES
@@ -45,24 +45,30 @@
  .SH EXAMPLES
  .nf
  # run ncid in a terminal window, server on remote host
-@@ -204,7 +204,7 @@
- ncid --no-gui --call-prog --program ncid-speak
+@@ -198,7 +198,7 @@
+ ncid --no-gui --program ncid-speak
  
  # send CID output to GUI and speak it
--ncid --call-prog --program /usr/local/bin/ncid-speak
-+ncid --call-prog --program @PREFIX@/bin/ncid-speak
+-ncid --program /usr/local/bin/ncid-speak
++ncid --program @PREFIX@/bin/ncid-speak
  
  # send CID output to a cell phone after third ring
- ncid --no-gui --call-prog --program ncid-page --ring 3
---- man/ncidd.8	2009-02-23 10:54:32.000000000 -0600
-+++ man/ncidd.8	2009-06-16 01:06:34.000000000 -0500
-@@ -98,17 +98,17 @@
+ ncid --no-gui --program ncid-page --ring 3
+--- man/ncidd.8.orig	2011-04-26 01:16:28.000000000 -0500
++++ man/ncidd.8	2011-05-08 05:41:25.000000000 -0500
+@@ -122,22 +122,22 @@
  .B -A <file> | --alias <file>
  Alias file.
  .br
 -Default: /etc/ncid/ncidd.alias
 +Default: @PREFIX@/etc/ncid/ncidd.alias
  .TP
+ .B -B <file> | --blacklist <file>
+ Blacklist file.
+ .br
+-Default: /etc/ncid/ncidd.blacklist
++Default: @PREFIX@/etc/ncid/ncidd.blacklist
+ .TP
  .B -C <file> | --config <file>
  Config file.
  .br
@@ -76,8 +82,8 @@
 +Default: @PREFIX@/var/log/cidcall.log
  .TP
  .B -D | --debug
- Debug mode.
-@@ -116,7 +116,7 @@
+ Debug mode, \fIncidd\fR stays attached to the terminal and displays
+@@ -146,7 +146,7 @@
  .B -d <file> | --datalog <file>
  Data log data file, usually from a modem.
  .br
@@ -86,7 +92,7 @@
  .TP
  .B -e <identifier> | --lineid <identifier>
  The telephone line identifier is for a modem.  It is normally 1 to 4
-@@ -148,12 +148,12 @@
+@@ -191,12 +191,12 @@
  .B -L <file> | --logfile <file>
  Server logfile.
  .br
@@ -101,16 +107,16 @@
  .TP
  .B -M <MaxBytes> | --cidlogmax <MaxBytes>
  Set the maximum CID call log file size in bytes.
-@@ -174,7 +174,7 @@
+@@ -217,7 +217,7 @@
  .TP
  .B -P <pidfile> | --pidfile <pidfile>
  Server PID file.
--Set to \fI/var/run/ncidd.pid\fB in a rc or init script when used as a service.
-+Set to \fI at PREFIX@/var/run/ncidd.pid\fB in a rc or init script when used as a service.
+-Set to \fI/var/run/ncidd.pid\fR in a rc or init script when used as a service.
++Set to \fI at PREFIX@/var/run/ncidd.pid\fR in a rc or init script when used as a service.
  The program will still run if it does not have permission to write a pidfile.
  There is no default.  If pidfile is not set, no pid file will be used.
  .TP
-@@ -210,7 +210,7 @@
+@@ -253,7 +253,7 @@
  .B -t <ttyport> | --ttyport <ttyport>
  Modem device file, or serial port that provides Caller ID information.
  .br
@@ -119,10 +125,39 @@
  .TP
  .B -V | --version
  Display the version number.
---- man/ncidmodules.1	2009-03-11 23:24:11.000000000 -0500
-+++ man/ncidmodules.1	2009-06-16 01:08:29.000000000 -0500
-@@ -50,7 +50,7 @@
- .B ncid-yac\^
+@@ -317,22 +317,22 @@
+ .fi
+ .SH FILES
+ .TP
+-.B /etc/ncid/ncidd.blacklist
++.B @PREFIX@/etc/ncid/ncidd.blacklist
+ Blacklist file
+ .TP
+-.B /etc/ncid/ncidd.conf
++.B @PREFIX@/etc/ncid/ncidd.conf
+ Configuration file
+ .TP
+-.B /var/run/ncidd.pid
++.B @PREFIX@/var/run/ncidd.pid
+ PID file
+ .TP
+-.B /var/log/cidcall.log
++.B @PREFIX@/var/log/cidcall.log
+ Contains CID and MSG lines
+ .TP
+-.B /var/log/ciddata.log
++.B @PREFIX@/var/log/ciddata.log
+ Contains the output from the modem, device or gateway
+ .TP
+-.B /var/log/ncidd.log
++.B @PREFIX@/var/log/ncidd.log
+ Server log file.  Contents controlled by verbose.
+ .SH DIAGNOSTICS
+ .nf
+--- man/ncidmodules.1.orig	2011-02-27 20:51:12.000000000 -0600
++++ man/ncidmodules.1	2011-05-08 05:43:10.000000000 -0500
+@@ -56,7 +56,7 @@
+ .B ncid-yac
  .SH DESCRIPTION
  These are ncid output modules and are normally located in the
 -.BR /usr/share/ncid
@@ -130,21 +165,17 @@
  directory.
  .PP
  The client,
-@@ -64,10 +64,10 @@
- data to standard output.  This makes it useful for troubleshooting.
- .PP
- Each output module can be independently configured using
--.I /etc/ncid/ncidmodules.conf
-+.I @PREFIX@/etc/ncid/ncidmodules.conf
- .PD
+@@ -138,7 +138,7 @@
+     ncid --no-gui --message --program ncid-page --ring 4
+ .RE
  .SH FILES
 -/etc/ncid/ncidmodules.conf
 + at PREFIX@/etc/ncid/ncidmodules.conf
+ .br
+ http://en.wikipedia.org/wiki/List_of_carriers_providing_SMS_transit
  .SH SEE ALSO
- ncid.1,
- ncidmodules.conf.5,
---- man/ncidrotate.1	2009-01-20 23:15:11.000000000 -0600
-+++ man/ncidrotate.1	2009-06-16 01:07:45.000000000 -0500
+--- man/ncidrotate.1.orig	2011-02-27 20:51:15.000000000 -0600
++++ man/ncidrotate.1	2011-06-15 20:33:46.000000000 -0500
 @@ -8,18 +8,18 @@
  {prerotate|postrotate}
  .SH DESCRIPTION
@@ -167,9 +198,9 @@
 + at PREFIX@/etc/ncid/ncidrotate.conf
  .SH SEE ALSO
  ncidrotate.conf.5,
- ncidd.8, sip2ncid.8
---- man/ncidsip.8	2009-01-20 23:15:28.000000000 -0600
-+++ man/ncidsip.8	2009-06-16 01:06:34.000000000 -0500
+ ncidd.8, sip2ncid.8, ncid2ncid.1, yac2ncid.1
+--- man/ncidsip.8.orig	2011-02-27 20:51:31.000000000 -0600
++++ man/ncidsip.8	2011-06-15 20:38:48.000000000 -0500
 @@ -29,7 +29,7 @@
  the libpcap library and snoops only udp traffic on the specified SIP
  host and port.
@@ -183,8 +214,8 @@
  .TP
  .B -p <filename> | --pidfile=<filename>
  Specifies the pidfile name to write.
--Set to \fI/var/run/ncidsip.pid\fB in a rc or init script when used as a service.
-+Set to \fI at PREFIX@/var/run/ncidsip.pid\fB in a rc or init script when used as a service.
+-Set to \fI/var/run/ncidsip.pid\fR in a rc or init script when used as a service.
++Set to \fI at PREFIX@/var/run/ncidsip.pid\fR in a rc or init script when used as a service.
  The program will still run if it does not have permission to write a pidfile.
  There is no default, if pidfile is not set, no pid file will be used.
  .TP
@@ -197,49 +228,49 @@
  .SH CID MESSAGE FORMAT
  .nf
  CID: ###DATEmmddhhss...LINEidentifier...NMBRnumber...NAMEwords+++
---- man/ncidtools.1	2009-01-20 23:16:35.000000000 -0600
-+++ man/ncidtools.1	2009-06-16 01:06:34.000000000 -0500
-@@ -44,12 +44,12 @@
- .B -a aliasfile
+--- man/ncidtools.1.orig	2011-02-27 20:51:37.000000000 -0600
++++ man/ncidtools.1	2011-06-15 20:40:59.000000000 -0500
+@@ -53,12 +53,12 @@
+ .B -A aliasfile
  Set the alias file to \fIaliasfile\fR
  .br
 -Default: /etc/ncid/ncidd.alias
 +Default: @PREFIX@/etc/ncid/ncidd.alias
  .TP
- .B -c cidlog
- Set the CID call file to \fIcidlog\fR
+ .B -C callfile
+ Set the call file to \fIcallfile\fR
  .br
 -Default: /var/log/cidcall.log
 +Default: @PREFIX@/var/log/cidcall.log
  .PD
  .SS "Arguments"
  .PD 0
-@@ -57,12 +57,12 @@
- .B cidlog
- The CID call file.
+@@ -66,12 +66,12 @@
+ .B callfile
+ The NCID call file.
  .br
 -Default: /var/log/cidcall.log
 +Default: @PREFIX@/var/log/cidcall.log
  .TP
- .B configfile
- The ncidd configuration file.
+ .B aliasfile
+ The ncidd alias file.
  .br
--Default: /etc/ncid/ncidd.conf
-+Default: @PREFIX@/etc/ncid/ncidd.conf
+-Default: /etc/ncid/ncidd.alias
++Default: @PREFIX@/etc/ncid/ncidd.alias
  .TP
- .B newcidlog
- The updated CID log file.
---- man/sip2ncid.8	2009-01-20 23:16:48.000000000 -0600
-+++ man/sip2ncid.8	2009-06-16 01:06:34.000000000 -0500
-@@ -32,18 +32,18 @@
+ .B newcallfile
+ The updated call file.
+--- man/sip2ncid.8.orig	2011-02-27 20:51:48.000000000 -0600
++++ man/sip2ncid.8	2011-06-15 20:45:04.000000000 -0500
+@@ -33,18 +33,18 @@
  found to the NCID server specified.  Snoops only udp traffic on the
  specified SIP host and port.
  .PP
--If \fI/var/log/sip2ncid.log\fR exists, it is used as a log file.
-+If \fI at PREFIX@/var/log/sip2ncid.log\fR exists, it is used as a log file.
+-The log file is \fI/var/log/sip2ncid.log\fR.
++The log file is \fI at PREFIX@/var/log/sip2ncid.log\fR.
  .PP
--If a pid file is given, usually \fI/var/run/sip2ncid.pid\fB, then
-+If a pid file is given, usually \fI at PREFIX@/var/run/sip2ncid.pid\fB, then
+-If a pid file is given, usually \fI/var/run/sip2ncid.pid\fR, then
++If a pid file is given, usually \fI at PREFIX@/var/run/sip2ncid.pid\fR, then
  a pid file used to store the process ID.
  .PP
 -The configuration file for \fIsip2ncid\fR is /etc/ncid/sip2ncid.conf.
@@ -254,7 +285,7 @@
  .TP
  .B -D | --debug
  Debug mode, \fIsip2ncid\fR stays attached to the terminal.
-@@ -62,7 +62,7 @@
+@@ -63,7 +63,7 @@
  .B -L <filename> | --logfile=<filename>
  Specifies the logfile name to use.  The logfile must exist before it is used.
  .br
@@ -263,40 +294,47 @@
  .TP
  .B -n <[host][:port]> | --ncid=<[host][:port]>
  Specifies the NCID server to connect to.  Port may be specified by
-@@ -72,7 +72,7 @@
+@@ -73,7 +73,7 @@
  .TP
  .B -P <filename> | --pidfile=<filename>
  Specifies the pidfile name to write.
--Set to \fI/var/run/ncidd.pid\fB in a rc or init script when used as a service.
-+Set to \fI at PREFIX@/var/run/ncidd.pid\fB in a rc or init script when used as a service.
+-Set to \fI/var/run/ncidd.pid\fR in a rc or init script when used as a service.
++Set to \fI at PREFIX@/var/run/ncidd.pid\fR in a rc or init script when used as a service.
  The program will still run if it does not have permission to write a pidfile.
  There is no default.  If pidfile is not set, no pid file will be used.
  .TP
-@@ -121,7 +121,7 @@
+@@ -127,11 +127,11 @@
  This also sets the debug option, verbose to level 3, and no filter
  is applied.  Mostly only useful for development and debug purposes.
  .SH FILES
 -/etc/ncid/sip2ncid.conf
 + at PREFIX@/etc/ncid/sip2ncid.conf
+ .br
+-/var/run/sip2ncid.pid
++ at PREFIX@/var/run/sip2ncid.pid
+ .br
+-/var/log/sip2ncid.log
++ at PREFIX@/var/log/sip2ncid.log
  .SH MESSAGES FORMAT
  .nf
- CID: ###DATE<MMDDHHMM>...LINE<####>...NMBR<###########>...NAME<words>+++
---- man/yac2ncid.1	2009-01-20 23:17:12.000000000 -0600
-+++ man/yac2ncid.1	2009-06-16 01:06:34.000000000 -0500
+ CALL: ###DATE<MMDDHHMM>...LINE<####>...NMBR<###########>...NAME<words>+++
+--- man/yac2ncid.1.orig	2011-02-27 20:51:51.000000000 -0600
++++ man/yac2ncid.1	2011-06-15 20:46:12.000000000 -0500
 @@ -15,7 +15,7 @@
  It is important to understand that to run YAC server with NCID
  clients you must run YAC2NCID gateway as well as NCID server.
  .PP
--The configuration file for \fIncid\fR is \fI/etc/ncid/ncid.conf\fR.
-+The configuration file for \fIncid\fR is \fI at PREFIX@/etc/ncid/ncid.conf\fR.
+-The configuration file for \fIyac2ncid\fR is \fI/etc/ncid/yac2ncid.conf\fR.
++The configuration file for \fIyac2ncid\fR is \fI at PREFIX@/etc/ncid/yac2ncid.conf\fR.
  It may be located in same directory as the script, or in the
  \fIetc\fR directory, or in NCID default configuration directory.
  Read the comments in the config file for more details.
-@@ -48,6 +48,6 @@
+@@ -48,7 +48,7 @@
  .SH REQUIRED PROGRAMS
  netcat: /usr/bin/nc
  .SH FILES
 -/etc/ncid/yac2ncid.conf
 + at PREFIX@/etc/ncid/yac2ncid.conf
  .SH SEE ALSO
- yac2ncid.conf.5, ncidd.8, ncidd.conf.5, ncidd.alias.5, ncidmodules.1
+ ncidd.8, sip2ncid.8, ncid2ncid.1, yac2ncid.1,
+ ncid.1, ncidmodules.1, ncidrotate.1, ncidtools.1
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110615/c3525a3f/attachment-0001.html>


More information about the macports-changes mailing list