5 files changed, 23 insertions, 17 deletions

diff --git a/misc/sloccount/Makefile b/misc/sloccount/Makefile
index 15418c4a2253..d22b7eaf6f26 100644
--- a/misc/sloccount/Makefile
+++ b/misc/sloccount/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	sloccount
-PORTVERSION=	1.9
+PORTVERSION=	2.09
 CATEGORIES=	misc
 MASTER_SITES=	http://www.dwheeler.com/sloccount/
 
@@ -19,7 +19,7 @@ INSTALL_TARGET=	install_programs install_man
 MAN1=		sloccount.1
 
 post-install:
-.for file in lexcount1 c_count java_count
+.for file in lexcount1 c_count java_count php_count
 	@strip ${PREFIX}/bin/${file}
 .endfor
 .if !defined(NOPORTDOCS)
diff --git a/misc/sloccount/distinfo b/misc/sloccount/distinfo
index 1183ce872cb0..0a96126a69a6 100644
--- a/misc/sloccount/distinfo
+++ b/misc/sloccount/distinfo
@@ -1 +1 @@
-MD5 (sloccount-1.9.tar.gz) = d4b45492cf77e344e43ceaa4287c5255
+MD5 (sloccount-2.09.tar.gz) = fe915e1eda358983e4b2d65bbaf7cf5a
diff --git a/misc/sloccount/files/patch-break_filelist b/misc/sloccount/files/patch-break_filelist
index b47a24418477..01b55be261d3 100644
--- a/misc/sloccount/files/patch-break_filelist
+++ b/misc/sloccount/files/patch-break_filelist
@@ -1,11 +1,11 @@
---- break_filelist.orig	Mon May 21 02:34:00 2001
-+++ break_filelist	Mon May 21 02:34:13 2001
-@@ -460,7 +460,7 @@
+--- break_filelist.org	Sat Jan 19 22:42:44 2002
++++ break_filelist	Sat Jan 19 22:42:20 2002
+@@ -558,7 +558,7 @@
     return $cached_digest;  # We did, so here's what it was.
   }
  
 - my $results = `md5sum "$filename"`;
 + my $results = `md5 -q "$filename"`;
+  chomp($results);
   $results =~ s/^\s*//;  # Not needed for GNU Textutils.
   $results =~ s/[^a-fA-F0-9].*//; # Strip away end.
-  $cached_digest = $results;           # Store in cache.
diff --git a/misc/sloccount/files/patch-makefile b/misc/sloccount/files/patch-makefile
index d3bbf09cf4bd..668f554f7531 100644
--- a/misc/sloccount/files/patch-makefile
+++ b/misc/sloccount/files/patch-makefile
@@ -1,6 +1,6 @@
---- makefile.orig	Tue Jun 12 20:55:23 2001
-+++ makefile	Fri Aug 24 22:29:56 2001
-@@ -7,14 +7,12 @@
+--- makefile.orig	Wed Jan  9 21:38:33 2002
++++ makefile	Sat Jan 19 22:40:15 2002
+@@ -10,14 +10,12 @@
  # Set this for where to store the man pages and executables.
  # If you want to store this as part of an official distribution,
  # change this to "/usr":
@@ -15,7 +15,7 @@
  
  # Set this to the name of your "install" program.  On some systems,
  # "install -C" would be useful (so unchanged files won't be modified),
-@@ -37,7 +35,7 @@
+@@ -41,7 +39,7 @@
  ARCH=i386
  VERSIONEDNAME=$(NAME)-$(VERSION)
  INSTALL_DIR=$(PREFIX)/bin
@@ -24,7 +24,7 @@
  MAN_DIR_MAN1=$(MAN_DIR)/man1
  DOC_DIR=$(PREFIX)/share/doc/$(VERSIONEDNAME)-$(RPM_VERSION)
  POSTED_DIR=/home/dwheeler/dwheeler.com/sloccount
-@@ -78,7 +76,7 @@
+@@ -84,7 +82,7 @@
     sql_count \
     tcl_count
  
@@ -33,8 +33,8 @@
  
  MYDOCS=sloccount.html README TODO ChangeLog
  
-@@ -86,10 +84,10 @@
- all: lexcount1$(EXE_SUFFIX) c_count$(EXE_SUFFIX) java_count$(EXE_SUFFIX) sloccount.1.gz
+@@ -92,13 +90,13 @@
+ all: lexcount1$(EXE_SUFFIX) c_count$(EXE_SUFFIX) java_count$(EXE_SUFFIX) php_count$(EXE_SUFFIX)
  
  lexcount1$(EXE_SUFFIX): lexcount1.c
 -	$(CC) lexcount1.c -o lexcount1$(EXE_SUFFIX)
@@ -44,9 +44,13 @@
 -	$(CC) c_count.c -o c_count$(EXE_SUFFIX)
 +	$(CC) ${CFLAGS} c_count.c -o c_count$(EXE_SUFFIX)
  
+ php_count$(EXE_SUFFIX): php_count.c
+-	$(CC) php_count.c -o php_count$(EXE_SUFFIX)
++	$(CC) ${CFLAGS} php_count.c -o php_count$(EXE_SUFFIX)
+ 
  sloccount.1.gz: sloccount.1
  	gzip -c sloccount.1 > sloccount.1.gz
-@@ -100,18 +98,17 @@
+@@ -109,18 +107,17 @@
  
  # This is USC's code counter, not built by default:
  c_lines: C_LINES.C
diff --git a/misc/sloccount/pkg-plist b/misc/sloccount/pkg-plist
index 14af89fc5ca8..a0ef4c916506 100644
--- a/misc/sloccount/pkg-plist
+++ b/misc/sloccount/pkg-plist
@@ -3,8 +3,7 @@ bin/asm_count
 bin/awk_count
 bin/break_filelist
 bin/c_count
-bin/compute_filecount
-bin/compute_sloc
+bin/compute_all
 bin/compute_sloc_lang
 bin/count_extensions
 bin/count_unknown_ext
@@ -20,11 +19,14 @@ bin/lexcount1
 bin/lisp_count
 bin/make_filelists
 bin/makefile_count
+bin/modula3_count
 bin/objc_count
 bin/pascal_count
 bin/perl_count
+bin/php_count
 bin/print_sum
 bin/python_count
+bin/ruby_count
 bin/sed_count
 bin/sh_count
 bin/show_filecount