- Update to 2.26.

PR:		ports/138314
Submitted by:	Sylvio Cesar <scjamorim@bsd.com.br>
Approved by:	maintainer timeout (more than 2 weeks)

5 files changed, 14 insertions, 83 deletions

diff --git a/misc/sloccount/Makefile b/misc/sloccount/Makefile
index c056e09a380c..5c7bedc50a0b 100644
--- a/misc/sloccount/Makefile
+++ b/misc/sloccount/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	sloccount
-PORTVERSION=	2.22
+PORTVERSION=	2.26
 CATEGORIES=	misc
 MASTER_SITES=	http://www.dwheeler.com/sloccount/
 
@@ -19,7 +19,10 @@ USE_PERL5=	yes
 MAKEFILE=	makefile
 INSTALL_TARGET=	install_programs install_man
 
+PORTDOCS=	ChangeLog README TODO sloccount.html
+
 MAN1=		sloccount.1
+MANCOMPRESSED=	yes
 
 post-install:
 .for file in lexcount1 c_count java_count php_count
@@ -27,8 +30,8 @@ post-install:
 .endfor
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-.for file in ChangeLog README TODO sloccount.html
-	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
+.for docs in ${PORTDOCS}
+	${INSTALL_DATA} ${WRKSRC}/${docs} ${DOCSDIR}
 .endfor
 .endif
 
diff --git a/misc/sloccount/distinfo b/misc/sloccount/distinfo
index 261f447185e1..3e8cc99d9406 100644
--- a/misc/sloccount/distinfo
+++ b/misc/sloccount/distinfo
@@ -1,3 +1,3 @@
-MD5 (sloccount-2.22.tar.gz) = 0ff88727cd76d83e7ca2071763cf1ad6
-SHA256 (sloccount-2.22.tar.gz) = 1928181813ec771e175dad0d821171e15d3ab5e9d6fdf5cdb4c0a0f70c154d02
-SIZE (sloccount-2.22.tar.gz) = 186990
+MD5 (sloccount-2.26.tar.gz) = 09abd6e2a016ebaf7552068a1dba1249
+SHA256 (sloccount-2.26.tar.gz) = fa7fa2bbf2f627dd2d0fdb958bd8ec4527231254c120a8b4322405d8a4e3d12b
+SIZE (sloccount-2.26.tar.gz) = 190948
diff --git a/misc/sloccount/files/patch-break_filelist b/misc/sloccount/files/patch-break_filelist
deleted file mode 100644
index b00f646b653c..000000000000
--- a/misc/sloccount/files/patch-break_filelist
+++ /dev/null
@@ -1,11 +0,0 @@
---- break_filelist.orig	Wed Jul 24 22:41:24 2002
-+++ break_filelist	Sat Jul 27 10:04:36 2002
-@@ -607,7 +607,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.
diff --git a/misc/sloccount/files/patch-makefile b/misc/sloccount/files/patch-makefile
index 6c6e8d22a861..a275791075e1 100644
--- a/misc/sloccount/files/patch-makefile
+++ b/misc/sloccount/files/patch-makefile
@@ -1,6 +1,6 @@
---- makefile.orig	Fri May 31 05:31:34 2002
-+++ makefile	Sat Jun  1 13:33:20 2002
-@@ -10,7 +10,6 @@
+--- makefile.orig	2009-08-29 15:28:59.000000000 -0300
++++ makefile	2009-08-29 15:30:34.000000000 -0300
+@@ -28,7 +28,6 @@
  # 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":
@@ -8,7 +8,7 @@
  
  # Set "EXE_SUFFIX" to ".exe" if you're running on Windows, like this:
  # EXE_SUFFIX=.exe
-@@ -19,7 +18,6 @@
+@@ -37,7 +36,6 @@
  # Set this to your C compiler, if it's not "gcc"; a likely alternative is "cc".
  # The "-Wall" option turns on warnings in gcc.  gcc users might also want
  # to consider using "-Werror", which turns warnings into errors.
@@ -16,7 +16,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),
-@@ -47,7 +45,7 @@
+@@ -70,7 +68,7 @@
  ARCH=i386
  VERSIONEDNAME=$(NAME)-$(VERSION)
  INSTALL_DIR=$(PREFIX)/bin
@@ -25,59 +25,3 @@
  MAN_DIR_MAN1=$(MAN_DIR)/man1
  DOC_DIR=$(PREFIX)/share/doc/$(VERSIONEDNAME)-$(RPM_VERSION)
  POSTED_DIR=/home/dwheeler/dwheeler.com/sloccount
-@@ -92,7 +90,7 @@
-    sql_count \
-    tcl_count
- 
--MANPAGES=sloccount.1.gz
-+MANPAGES=sloccount.1
- 
- MYDOCS=sloccount.html README TODO ChangeLog
- 
-@@ -100,13 +98,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)
-+	$(CC) ${CFLAGS} lexcount1.c -o lexcount1$(EXE_SUFFIX)
- 
- c_count$(EXE_SUFFIX): c_count.c
--	$(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
-@@ -117,25 +115,23 @@
- 
- # This is USC's code counter, not built by default:
- c_lines: C_LINES.C
--	$(CC) C_LINES.C -o c_lines$(EXE_SUFFIX)
-+	$(CC) ${CFLAGS} C_LINES.C -o c_lines$(EXE_SUFFIX)
- 
- 
- install_programs: all
--	$(INSTALL) $(EXECUTABLES) $(INSTALL_DIR)
-+	${BSD_INSTALL_SCRIPT} $(EXECUTABLES) $(INSTALL_DIR)
- 
- uninstall_programs:
- 	cd $(INSTALL_DIR) && rm -f $(EXECUTABLES)
- 
- install_man:
--	$(INSTALL_A_DIR) $(MAN_DIR_MAN1)
--	$(INSTALL) $(MANPAGES) $(MAN_DIR_MAN1)
-+	${BSD_INSTALL_MAN} $(MANPAGES) $(MAN_DIR_MAN1)
- 
- uninstall_man:
- 	cd $(MAN_DIR_MAN1) && rm -f $(MANPAGES)
- 
- install_docs: install_man
--	$(INSTALL_A_DIR) $(DOC_DIR)
--	$(INSTALL) $(MYDOCS) $(DOC_DIR)
-+	${BSD_INSTALL_DATA} $(MYDOCS) $(DOC_DIR)
- 
- uninstall_docs:
- 	cd $(DOC_DIR) && rm -f $(MYDOCS) && rmdir $(DOC_DIR)
diff --git a/misc/sloccount/pkg-plist b/misc/sloccount/pkg-plist
index a974cb5184ff..919e3d2dceef 100644
--- a/misc/sloccount/pkg-plist
+++ b/misc/sloccount/pkg-plist
@@ -38,8 +38,3 @@ bin/show_filecount
 bin/sloccount
 bin/sql_count
 bin/tcl_count
-%%PORTDOCS%%share/doc/sloccount/ChangeLog
-%%PORTDOCS%%share/doc/sloccount/README
-%%PORTDOCS%%share/doc/sloccount/TODO
-%%PORTDOCS%%share/doc/sloccount/sloccount.html
-%%PORTDOCS%%@dirrm share/doc/sloccount