Index: head/devel/cvsps-devel/Makefile
===================================================================
--- head/devel/cvsps-devel/Makefile	(revision 514478)
+++ head/devel/cvsps-devel/Makefile	(revision 514479)
@@ -1,38 +1,35 @@
 # Created by: ijliao
 # $FreeBSD$
 
 PORTNAME=	cvsps
 DISTVERSION=	2.2b1
 CATEGORIES=	devel
-MASTER_SITES=	http://www.cobite.com/cvsps/
+MASTER_SITES=	SF/${PORTNAME}/
 PKGNAMESUFFIX?=	-devel
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	garga@FreeBSD.org
 COMMENT=	Create patchset information from CVS
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BROKEN=		unfetchable
-DEPRECATED=	Unfetchable, unmaintained
-EXPIRATION_DATE=	2019-10-16
 CONFLICTS=	cvsps-[0-9]*
 
 USES=		gmake
 ALL_TARGET=	cvsps
 
 PLIST_FILES=	bin/${PORTNAME} \
 		man/man1/${PORTNAME}.1.gz
 PORTDOCS=	*
 
 OPTIONS_DEFINE=	DOCS
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
 	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}/
 
 .include <bsd.port.mk>
Index: head/devel/cvsps-devel/files/patch-cvsps.c
===================================================================
--- head/devel/cvsps-devel/files/patch-cvsps.c	(revision 514478)
+++ head/devel/cvsps-devel/files/patch-cvsps.c	(revision 514479)
@@ -1,12 +1,12 @@
---- cvsps.c.orig	2008-04-01 21:18:44.000000000 -0400
-+++ cvsps.c	2008-04-01 21:18:44.000000000 -0400
-@@ -2575,8 +2575,8 @@
+--- cvsps.c.orig	2008-04-02 01:18:44 UTC
++++ cvsps.c
+@@ -2575,8 +2575,8 @@ static void determine_branch_ancestor(PatchSet * ps, P
      for (next = ps->members.next; next != &ps->members; next = next->next) 
      {
  	PatchSetMember * psm = list_entry(next, PatchSetMember, link);
 -	rev = psm->pre_rev;
  	int d1, d2;
 +	rev = psm->pre_rev;
  
  	/* the reason this is at all complicated has to do with a 
  	 * branch off of a branch.  it is possible (and indeed