[67108] trunk/dports/sysutils/compare

29 Apr 2010

Revision: 67108
          http://trac.macports.org/changeset/67108
Author:   mww@macports.org
Date:     2010-04-29 00:37:43 -0700 (Thu, 29 Apr 2010)
Log Message:
-----------
rename executable to 'scompare' to avoid a conflict with ImageMagick;
increase revision;
add openmaintainer and license;

Modified Paths:
--------------
    trunk/dports/sysutils/compare/Portfile

Added Paths:
-----------
    trunk/dports/sysutils/compare/files/patch-compare-compare.1.diff
    trunk/dports/sysutils/compare/files/patch-compare-compare.c.diff

Modified: trunk/dports/sysutils/compare/Portfile
===================================================================

--- trunk/dports/sysutils/compare/Portfile	2010-04-29 07:24:50 UTC (rev 67107)
+++ trunk/dports/sysutils/compare/Portfile	2010-04-29 07:37:43 UTC (rev 67108)
@@ -3,12 +3,12 @@
 PortSystem 1.0
 
 name			compare
-conflicts		ImageMagick
 version			1.16
-revision		1
+revision		2
 categories		sysutils
 platforms		darwin
-maintainers		mww
+maintainers		mww openmaintainer
+license             GPLv2
 description		fast replacement for cmp
 long_description	compare is similar to cmp but faster and with better \
 				readable output. compare examines one file and standard in, or \
@@ -21,11 +21,12 @@
 master_sites	${homepage}
 checksums		md5 b4fdc2ad3c07e6df23cfe02e923bd775 \
 				sha1 0e76cfa606ecb358c693f160ad56b820545922b5
-patchfiles		patch-RULES-rules.prg
+patchfiles		patch-RULES-rules.prg patch-compare-compare.1.diff patch-compare-compare.c.diff
 
 depends_build	port:smake
 
 use_configure	no
+use_parallel_build no
 
 build.cmd		${prefix}/bin/smake
 build.target
@@ -33,6 +34,11 @@
 destroot.destdir	INS_BASE=${destroot}${prefix} \
 				MANDIR=share/man
 post-destroot {
-	file delete -force ${destroot}${prefix}/share/man/man5 ${destroot}${prefix}/lib ${destroot}${prefix}/include
+    file delete -force ${destroot}${prefix}/share/man/man5 \
+        ${destroot}${prefix}/lib ${destroot}${prefix}/include
+    file rename ${destroot}${prefix}/bin/compare \
+        ${destroot}${prefix}/bin/scompare
+    file rename ${destroot}${prefix}/share/man/man1/compare.1 \
+        ${destroot}${prefix}/share/man/man1/scompare.1
 }
 

Added: trunk/dports/sysutils/compare/files/patch-compare-compare.1.diff
===================================================================
--- trunk/dports/sysutils/compare/files/patch-compare-compare.1.diff	                        (rev 0)
+++ trunk/dports/sysutils/compare/files/patch-compare-compare.1.diff	2010-04-29 07:37:43 UTC (rev 67108)
@@ -0,0 +1,32 @@
+--- compare/compare.1	2001-04-29 00:04:16.000000000 +0200
++++ compare/compare.1	2010-04-29 09:25:39.000000000 +0200
+@@ -13,11 +13,11 @@
+ .if n .ds o oe
+ .if n .ds u ue
+ .if n .ds s sz
+-.TH COMPARE 1L "01/04/29" "J\*org Schilling" "Schily\'s USER COMMANDS"
++.TH SCOMPARE 1L "01/04/29" "J\*org Schilling" "Schily\'s USER COMMANDS"
+ .SH NAME
+-compare \- fast binary comparison of two files
++scompare \- fast binary comparison of two files
+ .SH SYNOPSIS
+-.B compare
++.B scompare
+ [
+ .I options
+ ] 
+@@ -60,12 +60,12 @@
+ .TP
+ .B \-help
+ Prints a short summary of the 
+-.B compare
++.B scompare
+ options and exists.
+ .TP
+ .B \-version
+ Prints the 
+-.B compare
++.B scompare
+ version number string and exists.
+ .SH NOTES
+ numbers in the options begin=# and count=# are assumed to be

Added: trunk/dports/sysutils/compare/files/patch-compare-compare.c.diff
===================================================================
--- trunk/dports/sysutils/compare/files/patch-compare-compare.c.diff	                        (rev 0)
+++ trunk/dports/sysutils/compare/files/patch-compare-compare.c.diff	2010-04-29 07:37:43 UTC (rev 67108)
@@ -0,0 +1,11 @@
+--- compare/compare.c	2004-07-12 00:00:00.000000000 +0200
++++ compare/compare.c	2010-04-29 08:51:36.000000000 +0200
+@@ -77,7 +77,7 @@
+ usage(exitcode)
+ 	int	exitcode;
+ {
+-	error("Usage:	compare [options] file1 [file2]\n");
++	error("Usage:	scompare [options] file1 [file2]\n");
+ 	error("Options:\n");
+ 	error("\t-silent \tbe silent\n");
+ 	error("\tbegin=# \toffset for both files\n");

    

mww＠macports.org

tags

participants (1)