Attachment #99262 for bug #138314

View | Details | Raw Unified | Return to bug 138314
Collapse All | Expand All

Lines 7-13 Link Here

(-)Makefile (-3 / +6 lines)
7	#	7	#
8		8
9	PORTNAME= sloccount	9	PORTNAME= sloccount
10	PORTVERSION= 2.22	10	PORTVERSION= 2.26
11	CATEGORIES= misc	11	CATEGORIES= misc
12	MASTER_SITES= http://www.dwheeler.com/sloccount/	12	MASTER_SITES= http://www.dwheeler.com/sloccount/
13		13
Lines 19-25 Link Here
19	MAKEFILE= makefile	19	MAKEFILE= makefile
20	INSTALL_TARGET= install_programs install_man	20	INSTALL_TARGET= install_programs install_man
21		21
		22	PORTDOCS= ChangeLog README TODO sloccount.html
		23
22	MAN1= sloccount.1	24	MAN1= sloccount.1
		25	MANCOMPRESSED= yes
23		26
24	post-install:	27	post-install:
25	.for file in lexcount1 c_count java_count php_count	28	.for file in lexcount1 c_count java_count php_count
Lines 27-34 Link Here
27	.endfor	30	.endfor
28	.if !defined(NOPORTDOCS)	31	.if !defined(NOPORTDOCS)
29	@${MKDIR} ${DOCSDIR}	32	@${MKDIR} ${DOCSDIR}
30	.for file in ChangeLog README TODO sloccount.html	33	.for docs in ${PORTDOCS}
31	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}	34	${INSTALL_DATA} ${WRKSRC}/${docs} ${DOCSDIR}
32	.endfor	35	.endfor
33	.endif	36	.endif
34		37

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	MD5 (sloccount-2.22.tar.gz) = 0ff88727cd76d83e7ca2071763cf1ad6	1	MD5 (sloccount-2.26.tar.gz) = 09abd6e2a016ebaf7552068a1dba1249
2	SHA256 (sloccount-2.22.tar.gz) = 1928181813ec771e175dad0d821171e15d3ab5e9d6fdf5cdb4c0a0f70c154d02	2	SHA256 (sloccount-2.26.tar.gz) = fa7fa2bbf2f627dd2d0fdb958bd8ec4527231254c120a8b4322405d8a4e3d12b
3	SIZE (sloccount-2.22.tar.gz) = 186990	3	SIZE (sloccount-2.26.tar.gz) = 190948

Lines 38-45 Link Here

(-)pkg-plist (-5 lines)
38	bin/sloccount	38	bin/sloccount
39	bin/sql_count	39	bin/sql_count
40	bin/tcl_count	40	bin/tcl_count
41	%%PORTDOCS%%share/doc/sloccount/ChangeLog
42	%%PORTDOCS%%share/doc/sloccount/README
43	%%PORTDOCS%%share/doc/sloccount/TODO
44	%%PORTDOCS%%share/doc/sloccount/sloccount.html
45	%%PORTDOCS%%@dirrm share/doc/sloccount

Removed Link Here

(-)files/patch-break_filelist (-11 lines)
1	--- break_filelist.orig Wed Jul 24 22:41:24 2002
2	+++ break_filelist Sat Jul 27 10:04:36 2002
3	@@ -607,7 +607,7 @@
4	return $cached_digest; # We did, so here's what it was.
5	}
6
7	- my $results = `md5sum "$filename"`;
8	+ my $results = `md5 -q "$filename"`;
9	chomp($results);
10	$results =~ s/^\s*//; # Not needed for GNU Textutils.
11	$results =~ s/[^a-fA-F0-9].*//; # Strip away end.




--- 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":

 
 # Set "EXE_SUFFIX" to ".exe" if you're running on Windows, like this:
 # EXE_SUFFIX=.exe
@@ -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.

 
 # Set this to the name of your "install" program.  On some systems,
 # "install -C" would be useful (so unchanged files won't be modified),
@@ -70,7 +68,7 @@
 ARCH=i386
 VERSIONEDNAME=$(NAME)-$(VERSION)
 INSTALL_DIR=$(PREFIX)/bin

 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)

Return to bug 138314

Lines 1-6 Link Here

(-)files/patch-makefile (-61 / +5 lines)
1	--- makefile.orig Fri May 31 05:31:34 2002	1	--- makefile.orig 2009-08-29 15:28:59.000000000 -0300
2	+++ makefile Sat Jun 1 13:33:20 2002	2	+++ makefile 2009-08-29 15:30:34.000000000 -0300
3	@@ -10,7 +10,6 @@	3	@@ -28,7 +28,6 @@
4	# Set this for where to store the man pages and executables.	4	# Set this for where to store the man pages and executables.
5	# If you want to store this as part of an official distribution,	5	# If you want to store this as part of an official distribution,
6	# change this to "/usr":	6	# change this to "/usr":
Lines 8-14 Link Here
8		8
9	# Set "EXE_SUFFIX" to ".exe" if you're running on Windows, like this:	9	# Set "EXE_SUFFIX" to ".exe" if you're running on Windows, like this:
10	# EXE_SUFFIX=.exe	10	# EXE_SUFFIX=.exe
11	@@ -19,7 +18,6 @@	11	@@ -37,7 +36,6 @@
12	# Set this to your C compiler, if it's not "gcc"; a likely alternative is "cc".	12	# Set this to your C compiler, if it's not "gcc"; a likely alternative is "cc".
13	# The "-Wall" option turns on warnings in gcc. gcc users might also want	13	# The "-Wall" option turns on warnings in gcc. gcc users might also want
14	# to consider using "-Werror", which turns warnings into errors.	14	# to consider using "-Werror", which turns warnings into errors.
Lines 16-22 Link Here
16		16
17	# Set this to the name of your "install" program. On some systems,	17	# Set this to the name of your "install" program. On some systems,
18	# "install -C" would be useful (so unchanged files won't be modified),	18	# "install -C" would be useful (so unchanged files won't be modified),
19	@@ -47,7 +45,7 @@	19	@@ -70,7 +68,7 @@
20	ARCH=i386	20	ARCH=i386
21	VERSIONEDNAME=$(NAME)-$(VERSION)	21	VERSIONEDNAME=$(NAME)-$(VERSION)
22	INSTALL_DIR=$(PREFIX)/bin	22	INSTALL_DIR=$(PREFIX)/bin
Lines 25-83 Link Here
25	MAN_DIR_MAN1=$(MAN_DIR)/man1	25	MAN_DIR_MAN1=$(MAN_DIR)/man1
26	DOC_DIR=$(PREFIX)/share/doc/$(VERSIONEDNAME)-$(RPM_VERSION)	26	DOC_DIR=$(PREFIX)/share/doc/$(VERSIONEDNAME)-$(RPM_VERSION)
27	POSTED_DIR=/home/dwheeler/dwheeler.com/sloccount	27	POSTED_DIR=/home/dwheeler/dwheeler.com/sloccount
28	@@ -92,7 +90,7 @@
29	sql_count \
30	tcl_count
31
32	-MANPAGES=sloccount.1.gz
33	+MANPAGES=sloccount.1
34
35	MYDOCS=sloccount.html README TODO ChangeLog
36
37	@@ -100,13 +98,13 @@
38	all: lexcount1$(EXE_SUFFIX) c_count$(EXE_SUFFIX) java_count$(EXE_SUFFIX) php_count$(EXE_SUFFIX)
39
40	lexcount1$(EXE_SUFFIX): lexcount1.c
41	- $(CC) lexcount1.c -o lexcount1$(EXE_SUFFIX)
42	+ $(CC) ${CFLAGS} lexcount1.c -o lexcount1$(EXE_SUFFIX)
43
44	c_count$(EXE_SUFFIX): c_count.c
45	- $(CC) c_count.c -o c_count$(EXE_SUFFIX)
46	+ $(CC) ${CFLAGS} c_count.c -o c_count$(EXE_SUFFIX)
47
48	php_count$(EXE_SUFFIX): php_count.c
49	- $(CC) php_count.c -o php_count$(EXE_SUFFIX)
50	+ $(CC) ${CFLAGS} php_count.c -o php_count$(EXE_SUFFIX)
51
52	sloccount.1.gz: sloccount.1
53	gzip -c sloccount.1 > sloccount.1.gz
54	@@ -117,25 +115,23 @@
55
56	# This is USC's code counter, not built by default:
57	c_lines: C_LINES.C
58	- $(CC) C_LINES.C -o c_lines$(EXE_SUFFIX)
59	+ $(CC) ${CFLAGS} C_LINES.C -o c_lines$(EXE_SUFFIX)
60
61
62	install_programs: all
63	- $(INSTALL) $(EXECUTABLES) $(INSTALL_DIR)
64	+ ${BSD_INSTALL_SCRIPT} $(EXECUTABLES) $(INSTALL_DIR)
65
66	uninstall_programs:
67	cd $(INSTALL_DIR) && rm -f $(EXECUTABLES)
68
69	install_man:
70	- $(INSTALL_A_DIR) $(MAN_DIR_MAN1)
71	- $(INSTALL) $(MANPAGES) $(MAN_DIR_MAN1)
72	+ ${BSD_INSTALL_MAN} $(MANPAGES) $(MAN_DIR_MAN1)
73
74	uninstall_man:
75	cd $(MAN_DIR_MAN1) && rm -f $(MANPAGES)
76
77	install_docs: install_man
78	- $(INSTALL_A_DIR) $(DOC_DIR)
79	- $(INSTALL) $(MYDOCS) $(DOC_DIR)
80	+ ${BSD_INSTALL_DATA} $(MYDOCS) $(DOC_DIR)
81
82	uninstall_docs:
83	cd $(DOC_DIR) && rm -f $(MYDOCS) && rmdir $(DOC_DIR)