[33430] trunk/dports/net/ncid

ryandesign at macports.org ryandesign at macports.org
Sun Jan 27 02:43:27 PST 2008 

Revision: 33430
          http://trac.macosforge.org/projects/macports/changeset/33430
Author:   ryandesign at macports.org
Date:     2008-01-27 02:43:26 -0800 (Sun, 27 Jan 2008)

Log Message:
-----------
ncid: update to 0.69

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	2008-01-27 10:43:17 UTC (rev 33429)
+++ trunk/dports/net/ncid/Portfile	2008-01-27 10:43:26 UTC (rev 33430)
@@ -3,7 +3,7 @@
 PortSystem          1.0
 
 name                ncid
-version             0.68
+version             0.69
 categories          net
 maintainers         ryandesign
 homepage            http://ncid.sourceforge.net/
@@ -12,7 +12,7 @@
 worksrcdir          ${name}
 use_configure       no
 build.target        mac
-destroot.target     install-mac
+destroot.target     mac-install
 destroot.destdir    prefix=${destroot}${prefix}
 universal_variant   no
 
@@ -31,9 +31,9 @@
 	to each connected client.
 
 checksums \
-	md5 215de135571aa33132af1f02d80a4dc2 \
-	sha1 d4d86eac9e3f78ca6fd35753ab2e328dd3be13ee \
-	rmd160 ed11ff41763e238a8dd7e9de8c2f1e22f36aa10e
+	md5 04522b4356c91bf1332ee2826a251ffa \
+	sha1 2f9a40f80ea57593c2187137b951ca21775e7655 \
+	rmd160 d2f3074d88be757a7058a483040aa07947c68be1
 
 patchfiles \
 	patch-Makefile.diff \
@@ -44,9 +44,11 @@
 		${worksrcpath}/Makefile \
 		${worksrcpath}/man/ncid.1 \
 		${worksrcpath}/man/ncidd.8 \
-		${worksrcpath}/man/ncidscripts.1 \
+		${worksrcpath}/man/ncidmodules.1 \
+		${worksrcpath}/man/ncidrotate.1 \
 		${worksrcpath}/man/ncidsip.8 \
-		${worksrcpath}/man/ncidtools.1
+		${worksrcpath}/man/sip2ncid.8 \
+		${worksrcpath}/man/yac2ncid.1
 }
 
 # TODO: add a startup item / LaunchDaemon plist for the server process.

Modified: trunk/dports/net/ncid/files/patch-Makefile.diff
===================================================================
--- trunk/dports/net/ncid/files/patch-Makefile.diff	2008-01-27 10:43:17 UTC (rev 33429)
+++ trunk/dports/net/ncid/files/patch-Makefile.diff	2008-01-27 10:43:26 UTC (rev 33430)
@@ -1,30 +1,24 @@
---- Makefile.orig	2007-04-20 19:53:00.000000000 -0500
-+++ Makefile	2007-04-20 19:53:47.000000000 -0500
-@@ -35,7 +35,7 @@
- FILES       = Makefile $(DIST) $(HEADER) $(SOURCE) \
-               $(DOCFILE) $(ETCFILE)
+--- Makefile	2007-11-04 11:29:28.000000000 -0600
++++ Makefile	2008-01-27 04:20:16.000000000 -0600
+@@ -54,9 +54,9 @@
  
--prefix      = /usr/local
-+prefix      = @PREFIX@
- prefix2     = $(prefix)
- settag      = NONE
- setname     = NONE
-@@ -48,7 +48,7 @@
- INIT        = $(ETC)/rc.d/init.d
- CONFDIR     = $(ETC)/ncid
- DEV         = /dev
--LOG         = /var/log
-+LOG         = $(prefix)/var/log
- MAN         = $(prefix)/share/man
+ # prefix and prefix2 are used on a make, install, and making a package
+ # prefix3 is used on install to make a package
+-prefix       = /usr/local
++prefix       = @PREFIX@
+ prefix2      = $(prefix)
+-prefix3      =
++prefix3      = $(prefix)
  
- CONF        = $(CONFDIR)/ncidd.conf
-@@ -147,7 +147,8 @@
+ OS           = host
+ 
+@@ -233,7 +233,8 @@
  	$(MAKE) local settag="Macintosh OS X"
  
- install-mac:
+ mac-install:
 -	$(MAKE) install-base MAN=$(prefix)/man
 +	$(MAKE) install-base \
 +            MODEMDEV=$(DEV)/cu.modem
  
  cygwin:
- 	$(MAKE) local \
+ 	$(MAKE) local OS=cygwin \

Modified: trunk/dports/net/ncid/files/patch-manpages.diff
===================================================================
--- trunk/dports/net/ncid/files/patch-manpages.diff	2008-01-27 10:43:17 UTC (rev 33429)
+++ trunk/dports/net/ncid/files/patch-manpages.diff	2008-01-27 10:43:26 UTC (rev 33430)
@@ -1,6 +1,5 @@
-diff -ru man-orig/ncid.1 man/ncid.1
---- man-orig/ncid.1	2006-07-28 09:18:33.000000000 -0500
-+++ man/ncid.1	2007-04-20 23:37:16.000000000 -0500
+--- 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 @@
  test for it, and if it is not found, or if it is not executable,
  it will terminate with a error message.
@@ -8,97 +7,62 @@
 -The configuration file for \fIncid\fR is /etc/ncid/ncid.conf.
 +The configuration file for \fIncid\fR is @PREFIX@/etc/ncid/ncid.conf.
  .PP
- Four output modules are provided, customize as needed in the
--/etc/ncid/ncidscript.conf file:
-+ at PREFIX@/etc/ncid/ncidscript.conf file:
+ 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
-@@ -138,7 +138,7 @@
- .B --prog PROGRAM | -P PROGRAM
- the display or helper program to use
+@@ -185,7 +185,7 @@
+ # output Caller ID to output module
+ ncid --no-gui --call-prog --program ncid-speak
+ # output NAME & NUMBER to GUI and output module
+-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 @@
+ .B -P <pidfile> | --pidfile <pidfile>
+ Server PID file
  .br
--Default PATH: /usr/share/ncid
-+Default PATH: @PREFIX@/share/ncid
- .br
- Default PROGRAM: ncid-speak
+-Default: /var/run/ncidd.pid
++Default: @PREFIX@/var/run/ncidd.pid
  .TP
-@@ -175,9 +175,9 @@
- Default: 3333
+ .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 ncid-yac\^
+ .SH DESCRIPTION
+ These are CID output modules and are normally located in the
+-.BR /usr/share/ncid
++.BR @PREFIX@/share/ncid
+ directory.
+ .PP
+ The client,
+@@ -50,10 +50,10 @@
+ .RE
+ .PP
+ The Output Module configuration file is
+-.I /etc/ncid/ncidmodules.conf
++.I @PREFIX@/etc/ncid/ncidmodules.conf
  .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
-diff -ru man-orig/ncidd.8 man/ncidd.8
---- man-orig/ncidd.8	2006-06-28 14:09:40.000000000 -0500
-+++ man/ncidd.8	2007-04-20 23:38:09.000000000 -0500
-@@ -82,17 +82,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.
-@@ -100,7 +100,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 -h | --help
- Display a help message.
-@@ -120,12 +120,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 -N 0/1 | --noserial 0/1
- serial device (0) or no serial device (1)
-@@ -169,7 +169,7 @@
- .B -t <ttyport> | --ttyport <ttyport>
- Modem device file, or serial port that provides Caller ID information.
- .br
--Default: /dev/modem
-+Default: /dev/cu.modem
- .TP
- .B -V | --version
- Display the version number.
-diff -ru man-orig/ncidscripts.1 man/ncidscripts.1
---- man-orig/ncidscripts.1	2006-07-03 14:00:38.000000000 -0500
-+++ man/ncidscripts.1	2007-04-20 23:40:33.000000000 -0500
-@@ -38,16 +38,16 @@
- CIDdate CIDtime CIDnumber CIDname CIDline
+-/etc/ncid/ncidmodules.conf
++ at PREFIX@/etc/ncid/ncidmodules.conf
+ .SH SEE ALSO
+ 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
+@@ -8,18 +8,18 @@
+ {prerotate|postrotate}
  .SH DESCRIPTION
- These are CID output modules and are normally located in the
+ The NCID log rotation module is normally found in
 -.BR /usr/share/ncid
 +.BR @PREFIX@/share/ncid
  directory.
@@ -112,76 +76,66 @@
  logrotate is
 -.I /etc/ncid/ncidrotate.conf
 +.I @PREFIX@/etc/ncid/ncidrotate.conf
- .PP
- The client,
- .BR ncid ,
-@@ -58,12 +58,12 @@
- or
- .BR ncid-mythtv .
- The configuration file for the scripts is
--.I /etc/ncid/ncidscript.conf
-+.I @PREFIX@/etc/ncid/ncidscript.conf
- .PD
  .SH FILES
 -/etc/ncid/ncidrotate.conf
 + at PREFIX@/etc/ncid/ncidrotate.conf
- .br
--/etc/ncid/ncidscript.conf
-+ at PREFIX@/etc/ncid/ncidscript.conf
  .SH SEE ALSO
  ncid.1,
- ncidscript.conf.5,
-diff -ru man-orig/ncidsip.8 man/ncidsip.8
---- man-orig/ncidsip.8	2006-11-14 20:45:24.000000000 -0600
-+++ man/ncidsip.8	2007-04-20 23:40:53.000000000 -0500
-@@ -22,7 +22,7 @@
+ 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 @@
  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.
+-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"
  .TP
- .B -s, --sip=<[host][:port]>
-@@ -71,7 +71,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
- MSG: CID: ###DATEmmddhhss...LINEidentifier...NMBRnumber...NAMEwords+++
-diff -ru man-orig/ncidtools.1 man/ncidtools.1
---- man-orig/ncidtools.1	2006-05-31 22:12:59.000000000 -0500
-+++ man/ncidtools.1	2007-04-20 23:41:12.000000000 -0500
-@@ -41,12 +41,12 @@
- .B -a aliasfile
- Set the alias file to \fIaliasfile\fR
+ .B -C <filename> | --config <filename>
+ Configuration file.
  .br
--Default: /etc/ncid/ncidd.alias
-+Default: @PREFIX@/etc/ncid/ncidd.alias
+-Default: /etc/ncid/sip2ncid.conf
++Default: @PREFIX@/etc/ncid/sip2ncid.conf
  .TP
- .B -c cidlog
- Set the CID call file to \fIcidlog\fR
+ .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.
  .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
+-Default PID filename: /var/run/sip2ncid.pid
++Default PID filename: @PREFIX@/var/run/sip2ncid.pid
  .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.
+ .B -r <dumpfile> | --readfile <dumpfile>
+ Read packets from a libpcap capture file instead of the network.
+@@ -111,7 +111,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
+-/etc/ncid/sip2ncid.conf
++ at PREFIX@/etc/ncid/sip2ncid.conf
+ .SH MESSAGES FORMAT
+ .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
+@@ -48,6 +48,6 @@
+ .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

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080127/6fb6eba1/attachment.html

More information about the macports-changes mailing list