ports/68418: [ maintainer ] devel/phptags: update to 0.2.2

[Roman Bogorodskiy]

>Number:         68418
>Category:       ports
>Synopsis:       [ maintainer ] devel/phptags: update to 0.2.2
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jun 27 12:00:45 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Roman Bogorodskiy
>Release:        FreeBSD 5.2.1-RELEASE-p8 i386
>Organization:
>Environment:
System: FreeBSD lame.novel.ru 5.2.1-RELEASE-p8 FreeBSD 5.2.1-RELEASE-p8 #5: Sat Jun 19 22:04:33 MSD 2004 root at lame.novel.ru:/usr/obj/usr/src/sys/NOV i386


>Description:
	Update to 0.2.2. Pav's patch for FreeBSD 4.x is not needed anymore 
	since it was merged into sources.
>How-To-Repeat:
>Fix:

diff -ruN phptags.orig/Makefile phptags/Makefile
--- phptags.orig/Makefile	Sun Jun 27 15:37:11 2004
+++ phptags/Makefile	Sun Jun 27 15:37:17 2004
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	phptags
-PORTVERSION=	0.2.1
+PORTVERSION=	0.2.2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff -ruN phptags.orig/distinfo phptags/distinfo
--- phptags.orig/distinfo	Sun Jun 27 15:37:11 2004
+++ phptags/distinfo	Sun Jun 27 15:38:06 2004
@@ -1,2 +1,2 @@
-MD5 (phptags-0.2.1.tar.gz) = 0e3557dae913e3e81fca7532e1684db9
-SIZE (phptags-0.2.1.tar.gz) = 149646
+MD5 (phptags-0.2.2.tar.gz) = d1f4f694195b2aeadef285f034fa46b7
+SIZE (phptags-0.2.2.tar.gz) = 149772
diff -ruN phptags.orig/files/patch-phptags.c phptags/files/patch-phptags.c
--- phptags.orig/files/patch-phptags.c	Sun Jun 27 15:37:11 2004
+++ phptags/files/patch-phptags.c	Thu Jan  1 03:00:00 1970
@@ -1,64 +0,0 @@
---- src/phptags.c.orig	Wed May 26 08:21:25 2004
-+++ src/phptags.c	Mon May 31 23:56:48 2004
-@@ -48,6 +48,9 @@
- 	int i,
- 	    ch;
- 
-+	FILE *tmp_file;
-+//	char *line = malloc(255);
-+        
- 	(void)read_config();
- 	    
- 	while ((ch = getopt(argc, argv, "cdf:hvV")) != -1) {
-@@ -84,9 +87,6 @@
- 	if (verbose && (current_conf != "none")) 
- 		printf("Using config file: %s\n", current_conf);
- 		
--	FILE *tmp_file;
--//	char *line = malloc(255);
--        
- 	tmp_file = fopen(tagsfile, "w+");
- 	
- 	if ((int)tmp_file == NULL) {
-@@ -101,8 +101,8 @@
- 	for (i = 0; i < argc; i++) {
- 		char *m = malloc(256);
- 		char *line;
--	        line = m;
- 		FILE *fd;
-+	        line = m;
- 		
- 		fd = fopen(argv[i], "r");
- 		if ((int)fd == NULL) {
-@@ -132,11 +132,13 @@
- 				if (!commented) {
- 					if (!strncmp("function ", line, 9)) {
- 						/* foo bar.c /^function foo($bar)$/; */
-+						int func_name_len;
-+						char *func_name;
- 						line+=9;
- 						line[strlen(line) - 1] = '\0';
- 						
--						int func_name_len = strlen(line) - strlen(strstr(line, "("));
--						char *func_name = malloc(func_name_len);
-+						func_name_len = strlen(line) - strlen(strstr(line, "("));
-+						func_name = malloc(func_name_len);
- 												
- 						(void)memmove(func_name, line, func_name_len);
- 						
-@@ -148,11 +150,13 @@
- 					
- 						free(func_name);
- 					} else if (!strncmp("class ", line, 6) && tag_classes == 1) {
-+						int class_name_len;
-+						char *class_name;
- 						line+=6;
- 						line[strlen(line) - 1] = '\0';
- 
--						int class_name_len = strlen(line) - strlen(strstr(line, " "));
--						char *class_name = malloc(class_name_len);
-+						class_name_len = strlen(line) - strlen(strstr(line, " "));
-+						class_name = malloc(class_name_len);
- 
- 						(void)strncpy(class_name, line, class_name_len);
- 						


>Release-Note:
>Audit-Trail:
>Unformatted: