- update to 15.3

- clean up Makefile
- take over as maintainer from ports@
- remove files/patch-input.c (it's been merged in)
- remove @comment from pkg-plist

PR:		28708
Submitted by:	Pete Fritchman <petef@databits.net>

5 files changed, 9 insertions, 141 deletions

diff --git a/devel/cscope/Makefile b/devel/cscope/Makefile
index c7fcf79f9396..9280466f9b26 100644
--- a/devel/cscope/Makefile
+++ b/devel/cscope/Makefile
@@ -7,16 +7,15 @@
 #
 
 PORTNAME=	cscope
-PORTVERSION=	15.1
-PORTREVISION=	3
+PORTVERSION=	15.3
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	petef@databits.net
 
-CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
 GNU_CONFIGURE=	yes
+
 MAN1=		cscope.1
 
 .include <bsd.port.mk>
diff --git a/devel/cscope/distinfo b/devel/cscope/distinfo
index 2a30f7045d43..1a312b6f4f20 100644
--- a/devel/cscope/distinfo
+++ b/devel/cscope/distinfo
@@ -1 +1 @@
-MD5 (cscope-15.1.tar.gz) = 4db538deb8b08e7bbc9607a680712704
+MD5 (cscope-15.3.tar.gz) = 7540514aab8c0a3737ee8dd08a5422ba
diff --git a/devel/cscope/files/patch-input.c b/devel/cscope/files/patch-input.c
deleted file mode 100644
index e007e218208e..000000000000
--- a/devel/cscope/files/patch-input.c
+++ /dev/null
@@ -1,133 +0,0 @@
-*** src/input.c.old	Mon Feb 12 14:32:17 2001
---- src/input.c	Mon Feb 12 14:51:49 2001
-***************
-*** 103,107 ****
---- 103,120 ----
-  	int	c, i = 0;
-  	int	j;
-+ 	char *sright;	/* substring to the right of the cursor */
-+ 	int ri = 0;		/* position in right-string */
-  
-+ 	/* Inserts and deletes are always performed on the left-string,
-+ 	 * but we'll also have a right-string 'sright' to hold characters
-+ 	 * which are on the right of the cursor [insertion point].
-+ 	 *
-+ 	 * Think of 'sright' as a stack -- we push chars into it when the cursor
-+ 	 * moves left, and we pop chars off it when the cursor moves right again.
-+ 	 * At the end of the function, we'll pop off any remaining characters
-+ 	 * onto the end of 's'
-+ 	 */
-+ 	sright = calloc(sizeof(char), size);
-+ 
-  	/* if a character already has been typed */
-  	if (firstchar != '\0') {
-***************
-*** 114,121 ****
-  	/* until the end of the line is reached */
-  	while ((c = mygetch()) != '\r' && c != '\n' && c != KEY_ENTER) {
-! 		if (c == erasechar() || c == KEY_BACKSPACE || c == DEL || c == ctrl('H') ) {
-  			/* erase */
-  			if (i > 0) {
-! 				addstr("\b \b");
-  				--i;
-  			}
---- 127,177 ----
-  	/* until the end of the line is reached */
-  	while ((c = mygetch()) != '\r' && c != '\n' && c != KEY_ENTER) {
-! 
-! 		if (c == KEY_LEFT || c == ctrl('B')) {	/* left */
-! 			if (i > 0) {
-! 				addch('\b');
-! 				/* move this char into the second (rhs) string */
-! 				sright[ri++] = s[--i];
-! 			}
-! 		}
-! 		else if (c == KEY_RIGHT || c == ctrl('F')) {	/* right */
-! 			if (i < size && ri > 0) {
-! 				/* move this char to the left of the cursor */
-! 				s[i++] = sright[--ri];
-! 				addch(s[i-1]);
-! 			}
-! 		}
-! 		else if (
-! 		#ifdef KEY_HOME
-! 			c == KEY_HOME ||
-! 		#endif
-! 			c == ctrl('A') ) {
-! 			while ( i > 0 ) {
-! 				sright[ri++] = s[--i];
-! 				addch('\b');
-! 				addch(s[i]);
-! 				addch('\b');
-! 			}
-! 		}
-! 		else if (
-! 		#ifdef KEY_END
-! 			c == KEY_END ||
-! 		#endif
-! 			c == ctrl('E') ) {
-! 			while ( ri > 0 ) {
-! 				s[i++] = sright[--ri];
-! 				addch(s[i-1]);
-! 			}
-! 		}
-! 		else if (c == erasechar() || c == KEY_BACKSPACE || c == DEL || c == ctrl('H') ) {
-  			/* erase */
-  			if (i > 0) {
-! 				if (ri == 0)  {
-! 					addstr("\b \b");
-! 				} else {
-! 					addch('\b');
-! 					delch();
-! 				}
-! 				s[i] = '\0';
-  				--i;
-  			}
-***************
-*** 139,144 ****
-  			/* if it will fit on the line */
-  			if (i < size) {
-- 				addch(c);	/* display it */
-  				s[i++] = c;	/* save it */
-  			}
-  		}
---- 195,205 ----
-  			/* if it will fit on the line */
-  			if (i < size) {
-  				s[i++] = c;	/* save it */
-+ 				if (ri == 0) {
-+ 					addch(c);	/* display it */
-+ 				} else {
-+ 					insch(c);	/* display it */
-+ 					addch(c);	/* advance cursor */
-+ 				}
-  			}
-  		}
-***************
-*** 155,162 ****
-  		}
-  		/* return on an empty line to allow a command to be entered */
-! 		if (firstchar != '\0' && i == 0) {
-  			break;
-  		}
-  	}
-  	s[i] = '\0';
-  	return(i);
---- 216,232 ----
-  		}
-  		/* return on an empty line to allow a command to be entered */
-! 		if (firstchar != '\0' && (i+ri) == 0) {
-  			break;
-  		}
-  	}
-+ 
-+ 	/* move any remaining chars on the rhs of the cursor
-+ 	 * onto the end of our string
-+ 	 */
-+ 	for (; ri > 0; ) {
-+ 		s[i++] = sright[--ri];
-+ 	}
-+ 	free(sright);
-+ 
-  	s[i] = '\0';
-  	return(i);
diff --git a/devel/cscope/pkg-descr b/devel/cscope/pkg-descr
index a1f25f33fe87..8e7eb46f083d 100644
--- a/devel/cscope/pkg-descr
+++ b/devel/cscope/pkg-descr
@@ -1,8 +1,11 @@
 This port of SCO / USL's 'cscope' lets one easily navigate large C programs.
 It's designed to answer questions like where symbols are defined and used,
-and where variables are assigned.
+where variables are assigned, and much more.
 
 The Santa Cruz Operation (SCO) has made this available under a very friendly,
 BSD-style Open Source License.
 
-WWW:	http://cscope.sourceforge.net/
+WWW: http://cscope.sourceforge.net/
+
+- Pete
+petef@databits.net
diff --git a/devel/cscope/pkg-plist b/devel/cscope/pkg-plist
index fb40c78ed4bb..227d970b8c77 100644
--- a/devel/cscope/pkg-plist
+++ b/devel/cscope/pkg-plist
@@ -1,3 +1,2 @@
-@comment $FreeBSD$
 bin/cscope
 bin/ocs