[48570] trunk/dports/net/ncid

ryandesign at macports.org ryandesign at macports.org
Wed Mar 25 04:05:38 PDT 2009


Revision: 48570
          http://trac.macports.org/changeset/48570
Author:   ryandesign at macports.org
Date:     2009-03-25 04:05:38 -0700 (Wed, 25 Mar 2009)
Log Message:
-----------
ncid: update to 0.72 and add forgotten tcl and tk dependencies; see #17835

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	2009-03-25 10:15:20 UTC (rev 48569)
+++ trunk/dports/net/ncid/Portfile	2009-03-25 11:05:38 UTC (rev 48570)
@@ -3,13 +3,13 @@
 PortSystem              1.0
 
 name                    ncid
-version                 0.70
-revision                1
+version                 0.72
 categories              net
 maintainers             ryandesign
 homepage                http://ncid.sourceforge.net/
 master_sites            sourceforge
 platforms               darwin
+distname                ${name}-${version}-src
 worksrcdir              ${name}
 use_configure           no
 build.target            local
@@ -34,10 +34,14 @@
     to each connected client.
 
 checksums \
-    md5 e179fbac6ab04ed3015fdf4e1c2a33f6 \
-    sha1 287ebd8181f94be6a252edb10bf8b3593ac50d60 \
-    rmd160 3da3269e9c8dd1da1c9ddf3b1e7be180230979a9
+    md5     a2fa193d1744d458261c2d078cd17fd1 \
+    sha1    b570ec1b10144677bde06ccd2c387a741cf8dfc9 \
+    rmd160  7d891f3ea559df6d350571d7ebc806bc56512b11
 
+depends_lib \
+    port:tcl \
+    port:tk
+
 patchfiles \
     patch-Makefile.diff \
     patch-manpages.diff
@@ -50,6 +54,7 @@
         ${worksrcpath}/man/ncidmodules.1 \
         ${worksrcpath}/man/ncidrotate.1 \
         ${worksrcpath}/man/ncidsip.8 \
+        ${worksrcpath}/man/ncidtools.1 \
         ${worksrcpath}/man/sip2ncid.8 \
         ${worksrcpath}/man/yac2ncid.1
 }

Modified: trunk/dports/net/ncid/files/patch-Makefile.diff
===================================================================
--- trunk/dports/net/ncid/files/patch-Makefile.diff	2009-03-25 10:15:20 UTC (rev 48569)
+++ trunk/dports/net/ncid/files/patch-Makefile.diff	2009-03-25 11:05:38 UTC (rev 48570)
@@ -16,8 +16,8 @@
  	$(MAKE) local settag="Macintosh OS X"
  
  mac-install:
--	$(MAKE) install-base MAN=$(prefix)/man
-+	$(MAKE) install-base \
+-	$(MAKE) install MAN=$(prefix)/man
++	$(MAKE) install \
 +            MODEMDEV=$(DEV)/cu.modem
  
  cygwin:

Modified: trunk/dports/net/ncid/files/patch-manpages.diff
===================================================================
--- trunk/dports/net/ncid/files/patch-manpages.diff	2009-03-25 10:15:20 UTC (rev 48569)
+++ trunk/dports/net/ncid/files/patch-manpages.diff	2009-03-25 11:05:38 UTC (rev 48570)
@@ -1,41 +1,127 @@
---- man/ncid.1	2008-01-27 04:21:20.000000000 -0600
-+++ man/ncid.1	2008-01-27 04:26:17.000000000 -0600
-@@ -66,10 +66,10 @@
+--- man/ncid.1	2008-12-07 19:17:03.000000000 -0600
++++ man/ncid.1	2008-12-30 20:48:24.000000000 -0600
+@@ -74,10 +74,10 @@
  test for it, and if it is not found, or if it is not executable,
  it will terminate with a error message.
  .PP
 -The configuration file for \fIncid\fR is /etc/ncid/ncid.conf.
 +The configuration file for \fIncid\fR is @PREFIX@/etc/ncid/ncid.conf.
  .PP
- The distributed output modules can be customized as needed in the
--/etc/ncid/ncidmodules.conf file:
-+ at PREFIX@/etc/ncid/ncidmodules.conf file:
- .PD 0
- .TP 12
- .B ncid-mythtv
-@@ -185,7 +185,7 @@
- # output Caller ID to output module
+ The distributed output modules are listed in the ncidmodules man page,
+-can be customized as needed in the /etc/ncid/ncidmodules.conf file:
++can be customized as needed in the @PREFIX@/etc/ncid/ncidmodules.conf file:
+ .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
+@@ -135,8 +135,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
+ a service and when using a output module.
+ There is no default.  If pidfile is not set, no pid file will be used.
+ .TP
+@@ -144,7 +144,7 @@
+ Name of the output module (program) to use.  Some output modules are
+ ncid-page, ncid-popup, and ncid-speak.
+ .br
+-Default PATH: /usr/share/ncid
++Default PATH: @PREFIX@/share/ncid
+ .br
+ Default PROGRAM: ncid-speak
+ .TP
+@@ -190,9 +190,9 @@
+ Default: 3333
+ .PD
+ .SH FILES
+-/etc/ncid/*
++ at PREFIX@/etc/ncid/*
+ .br
+-/usr/share/ncid/*
++ at PREFIX@/share/ncid/*
+ .SH EXAMPLES
+ .nf
+ # run ncid in a terminal window, server on remote host
+@@ -202,7 +202,7 @@
  ncid --no-gui --call-prog --program ncid-speak
- # output NAME & NUMBER to GUI and output module
+ 
+ # 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
- # output NAME & NUMBER to GUI and all CID info to output module
- ncid --all --call-prog --program ncid-page
- # output all CID info to output module after third ring
---- man/ncidd.8	2008-01-27 04:21:20.000000000 -0600
-+++ man/ncidd.8	2008-01-27 04:26:30.000000000 -0600
-@@ -149,7 +149,7 @@
+ 
+ # send CID output to a cell phone after third ring
+ ncid --no-gui --call-prog --program ncid-page --ring 3
+--- man/ncidd.8	2008-12-08 13:26:37.000000000 -0600
++++ man/ncidd.8	2008-12-30 20:48:24.000000000 -0600
+@@ -98,17 +98,17 @@
+ .B -A <file> | --alias <file>
+ Alias file.
+ .br
+-Default: /etc/ncid/ncidd.alias
++Default: @PREFIX@/etc/ncid/ncidd.alias
+ .TP
+ .B -C <file> | --config <file>
+ Config file.
+ .br
+-Default: /etc/ncid/ncidd.conf
++Default: @PREFIX@/etc/ncid/ncidd.conf
+ .TP
+ .B -c <file> | --cidlog <file>
+ Call log data file.
+ .br
+-Default: /var/log/cidcall.log
++Default: @PREFIX@/var/log/cidcall.log
+ .TP
+ .B -D | --debug
+ Debug mode.
+@@ -116,7 +116,7 @@
+ .B -d <file> | --datalog <file>
+ Data log data file, usually from a modem.
+ .br
+-Default: /var/log/datalog.log
++Default: @PREFIX@/var/log/datalog.log
+ .TP
+ .B -e <identifier> | --lineid <identifier>
+ The telephone line identifier can be set if the server is monitoring
+@@ -142,12 +142,12 @@
+ .B -L <file> | --logfile <file>
+ Server logfile.
+ .br
+-Default: /var/log/ncidd.log
++Default: @PREFIX@/var/log/ncidd.log
+ .TP
+ .B -l <file> | --lockfile <file>
+ Modem lockfile.
+ .br
+-Default: /var/lock/LCK..modem
++Default: @PREFIX@/var/lock/LCK..modem
+ .TP
+ .B -M <MaxBytes> | --cidlogmax <MaxBytes>
+ Set the maximum CID call log file size in bytes.
+@@ -168,7 +168,7 @@
+ .TP
  .B -P <pidfile> | --pidfile <pidfile>
- Server PID file
+ 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.
+ 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
+@@ -204,7 +204,7 @@
+ .B -t <ttyport> | --ttyport <ttyport>
+ Modem device file, or serial port that provides Caller ID information.
  .br
--Default: /var/run/ncidd.pid
-+Default: @PREFIX@/var/run/ncidd.pid
+-Default: /dev/modem
++Default: /dev/cu.modem
  .TP
- .B -p <port> | --port <port>
- Server port.
---- man/ncidmodules.1	2007-06-30 13:27:24.000000000 -0500
-+++ man/ncidmodules.1	2008-01-27 04:26:44.000000000 -0600
-@@ -32,7 +32,7 @@
+ .B -V | --version
+ Display the version number.
+--- man/ncidmodules.1	2008-12-10 08:15:15.000000000 -0600
++++ man/ncidmodules.1	2008-12-30 20:48:24.000000000 -0600
+@@ -50,7 +50,7 @@
  .B ncid-yac\^
  .SH DESCRIPTION
  These are CID output modules and are normally located in the
@@ -44,8 +130,8 @@
  directory.
  .PP
  The client,
-@@ -50,10 +50,10 @@
- .RE
+@@ -64,10 +64,10 @@
+ data to standard output.  This makes it useful for troubleshooting.
  .PP
  The Output Module configuration file is
 -.I /etc/ncid/ncidmodules.conf
@@ -58,7 +144,7 @@
  ncid.1,
  ncidmodules.conf.5,
 --- man/ncidrotate.1	2007-06-30 13:30:35.000000000 -0500
-+++ man/ncidrotate.1	2008-01-27 04:26:58.000000000 -0600
++++ man/ncidrotate.1	2008-12-30 20:48:24.000000000 -0600
 @@ -8,18 +8,18 @@
  {prerotate|postrotate}
  .SH DESCRIPTION
@@ -82,23 +168,80 @@
  .SH SEE ALSO
  ncid.1,
  ncidrotate.conf.5,
---- man/ncidsip.8	2008-01-27 04:21:20.000000000 -0600
-+++ man/ncidsip.8	2008-01-27 04:27:09.000000000 -0600
-@@ -54,7 +54,7 @@
- Specifies the pidfile name to write.  The program will still run if
- it does not have permission to write a pidfile.
- .br
--Default pidfilename: /var/run/ncidsip.pid
-+Default pidfilename: @PREFIX@/var/run/ncidsip.pid
- .TP
- .B -h | --help
- Prints this help
---- man/sip2ncid.8	2007-10-30 22:48:07.000000000 -0500
-+++ man/sip2ncid.8	2008-01-27 04:27:19.000000000 -0600
-@@ -32,13 +32,13 @@
+--- man/ncidsip.8	2008-12-08 22:37:27.000000000 -0600
++++ man/ncidsip.8	2008-12-30 20:48:24.000000000 -0600
+@@ -29,7 +29,7 @@
  the libpcap library and snoops only udp traffic on the specified SIP
  host and port.
  .PP
+-The configuration file for \fIncidsip\fR is /etc/ncid/ncidsip.conf.
++The configuration file for \fIncidsip\fR is @PREFIX@/etc/ncid/ncidsip.conf.
+ .SH "OPTIONS"
+ .TP
+ .B -s <[host][:port]> | --sip=<[host][:port]>
+@@ -52,7 +52,7 @@
+ .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.
+ 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
+@@ -84,7 +84,7 @@
+ ID line generated when a call comes in, and a CANCEL line if cancel
+ was generated.
+ .SH FILES
+-/etc/ncid/ncidsip.conf
++ at PREFIX@/etc/ncid/ncidsip.conf
+ .SH CID MESSAGE FORMAT
+ .nf
+ CID: ###DATEmmddhhss...LINEidentifier...NMBRnumber...NAMEwords+++
+--- man/ncidtools.1	2008-08-16 22:28:41.000000000 -0500
++++ man/ncidtools.1	2008-12-30 20:48:24.000000000 -0600
+@@ -41,12 +41,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
+ .br
+-Default: /var/log/cidcall.log
++Default: @PREFIX@/var/log/cidcall.log
+ .PD
+ .SS "Arguments"
+ .PD 0
+@@ -54,12 +54,12 @@
+ .B cidlog
+ The CID call file.
+ .br
+-Default: /var/log/cidcall.log
++Default: @PREFIX@/var/log/cidcall.log
+ .TP
+ .B configfile
+ The ncidd configuration file.
+ .br
+-Default: /etc/ncid/ncidd.conf
++Default: @PREFIX@/etc/ncid/ncidd.conf
+ .TP
+ .B newcidlog
+ The updated CID log file.
+--- man/sip2ncid.8	2008-12-08 22:36:55.000000000 -0600
++++ man/sip2ncid.8	2008-12-30 20:48:24.000000000 -0600
+@@ -32,18 +32,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.
+ .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
+ a pid file used to store the process ID.
+ .PP
 -The configuration file for \fIsip2ncid\fR is /etc/ncid/sip2ncid.conf.
 +The configuration file for \fIsip2ncid\fR is @PREFIX@/etc/ncid/sip2ncid.conf.
  .SH "OPTIONS"
@@ -111,16 +254,25 @@
  .TP
  .B -D | --debug
  Debug mode, \fIsip2ncid\fR stays attached to the terminal.
-@@ -64,7 +64,7 @@
- Specifies the pidfile name to write.  The program will still run if
- it does not have permission to write a pidfile.
+@@ -62,7 +62,7 @@
+ .B -L <filename> | --logfile=<filename>
+ Specifies the logfile name to use.  The logfile must exist before it is used.
  .br
--Default PID filename: /var/run/sip2ncid.pid
-+Default PID filename: @PREFIX@/var/run/sip2ncid.pid
+-Default log filename: /var/log/sip2ncid.log
++Default log filename: @PREFIX@/var/log/sip2ncid.log
  .TP
- .B -r <dumpfile> | --readfile <dumpfile>
- Read packets from a libpcap capture file instead of the network.
-@@ -111,7 +111,7 @@
+ .B -n <[host][:port]> | --ncid=<[host][:port]>
+ Specifies the NCID server to connect to.  Port may be specified by
+@@ -72,7 +72,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.
+ 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 @@
  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
@@ -130,7 +282,16 @@
  .nf
  CID: ###DATE<MMDDHHMM>...LINE<####>...NMBR<###########>...NAME<words>+++
 --- man/yac2ncid.1	2007-09-16 12:49:56.000000000 -0500
-+++ man/yac2ncid.1	2008-01-27 04:27:45.000000000 -0600
++++ man/yac2ncid.1	2008-12-30 20:48:24.000000000 -0600
+@@ -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.
+ 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 @@
  .SH REQUIRED PROGRAMS
  netcat: /usr/bin/nc
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090325/7551597c/attachment.html>


More information about the macports-changes mailing list