4 files changed, 39 insertions, 26 deletions

diff --git a/misc/sloccount/Makefile b/misc/sloccount/Makefile
index 3dd9714847b5..15418c4a2253 100644
--- a/misc/sloccount/Makefile
+++ b/misc/sloccount/Makefile
@@ -7,18 +7,26 @@
 #
 
 PORTNAME=	sloccount
-PORTVERSION=	1.8
+PORTVERSION=	1.9
 CATEGORIES=	misc
 MASTER_SITES=	http://www.dwheeler.com/sloccount/
 
 MAINTAINER=	ports@FreeBSD.org
 
 MAKEFILE=	makefile
+INSTALL_TARGET=	install_programs install_man
 
-MANCOMPRESSED=	yes
-MAN1=	sloccount.1
+MAN1=		sloccount.1
 
-pre-install:
-	@${MKDIR} ${PREFIX}/share/doc/${PORTNAME}
+post-install:
+.for file in lexcount1 c_count java_count
+	@strip ${PREFIX}/bin/${file}
+.endfor
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+.for file in ChangeLog README TODO sloccount.html
+	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
+.endfor
+.endif
 
 .include <bsd.port.mk>
diff --git a/misc/sloccount/distinfo b/misc/sloccount/distinfo
index fb84d1b34b49..1183ce872cb0 100644
--- a/misc/sloccount/distinfo
+++ b/misc/sloccount/distinfo
@@ -1 +1 @@
-MD5 (sloccount-1.8.tar.gz) = d739aed9df1dfae0d00930d707dd52c2
+MD5 (sloccount-1.9.tar.gz) = d4b45492cf77e344e43ceaa4287c5255
diff --git a/misc/sloccount/files/patch-makefile b/misc/sloccount/files/patch-makefile
index 58986e7bf2c6..d3bbf09cf4bd 100644
--- a/misc/sloccount/files/patch-makefile
+++ b/misc/sloccount/files/patch-makefile
@@ -1,5 +1,5 @@
---- makefile.orig	Mon Apr 30 21:30:22 2001
-+++ makefile	Sun May 20 20:54:36 2001
+--- makefile.orig	Tue Jun 12 20:55:23 2001
++++ makefile	Fri Aug 24 22:29:56 2001
 @@ -7,14 +7,12 @@
  # Set this for where to store the man pages and executables.
  # If you want to store this as part of an official distribution,
@@ -15,19 +15,25 @@
  
  # Set this to the name of your "install" program.  On some systems,
  # "install -C" would be useful (so unchanged files won't be modified),
-@@ -35,9 +33,9 @@
+@@ -37,7 +35,7 @@
  ARCH=i386
  VERSIONEDNAME=$(NAME)-$(VERSION)
  INSTALL_DIR=$(PREFIX)/bin
 -MAN_DIR=$(PREFIX)/share/man
 +MAN_DIR=$(PREFIX)/man
  MAN_DIR_MAN1=$(MAN_DIR)/man1
--DOC_DIR=$(PREFIX)/share/doc/$(VERSIONEDNAME)-$(RPM_VERSION)
-+DOC_DIR=$(PREFIX)/share/doc/${NAME}
+ DOC_DIR=$(PREFIX)/share/doc/$(VERSIONEDNAME)-$(RPM_VERSION)
  POSTED_DIR=/home/dwheeler/dwheeler.com/sloccount
+@@ -78,7 +76,7 @@
+    sql_count \
+    tcl_count
  
+-MANPAGES=sloccount.1.gz
++MANPAGES=sloccount.1
  
-@@ -83,10 +81,10 @@
+ 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
  
  lexcount1$(EXE_SUFFIX): lexcount1.c
@@ -40,7 +46,7 @@
  
  sloccount.1.gz: sloccount.1
  	gzip -c sloccount.1 > sloccount.1.gz
-@@ -97,7 +95,7 @@
+@@ -100,18 +98,17 @@
  
  # This is USC's code counter, not built by default:
  c_lines: C_LINES.C
@@ -49,18 +55,16 @@
  
  
  install_programs: all
-@@ -107,14 +105,12 @@
+-	$(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)
+-	$(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)
- 
- uninstall_docs:
diff --git a/misc/sloccount/pkg-plist b/misc/sloccount/pkg-plist
index 627191ff9302..14af89fc5ca8 100644
--- a/misc/sloccount/pkg-plist
+++ b/misc/sloccount/pkg-plist
@@ -29,9 +29,10 @@ bin/sed_count
 bin/sh_count
 bin/show_filecount
 bin/sloccount
+bin/sql_count
 bin/tcl_count
-share/doc/sloccount/ChangeLog
-share/doc/sloccount/README
-share/doc/sloccount/TODO
-share/doc/sloccount/sloccount.html
-@dirrm share/doc/sloccount
+%%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