10 files changed, 47 insertions, 88 deletions

diff --git a/devel/prcs/Makefile b/devel/prcs/Makefile
index ddb7f7ac28a7..7b1adc7690dc 100644
--- a/devel/prcs/Makefile
+++ b/devel/prcs/Makefile
@@ -6,16 +6,29 @@
 #
 
 PORTNAME=	prcs
-PORTVERSION=	1.2.8
+PORTVERSION=	1.3.0
 CATEGORIES=	devel
-MASTER_SITES=	ftp://ftp.xcf.berkeley.edu/pub/prcs/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	jmacd@FreeBSD.org
-
-BUILD_DEPENDS=	emacs:${PORTSDIR}/editors/emacs
+MAINTAINER=	sam@inf.enst.fr
 
 USE_GMAKE=	yes
-HAS_CONFIGURE=	yes
+GNU_CONFIGURE=	yes
 MAN1=		prcs.1
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if exists(${LOCALBASE}/bin/emacs)
+PLIST_SUB+=	EMACS=''
+.else
+PLIST_SUB+=	EMACS='@comment '
+.endif
+
+pre-configure:
+.if !exists(${LOCALBASE}/bin/emacs)
+	${PERL} -pi -e "s@^(SUBDIRS = .*) emacs (.*)@\1 \2@" \
+		${WRKSRC}/Makefile.in
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/devel/prcs/distinfo b/devel/prcs/distinfo
index 98a79662f3b1..961f458f0d72 100644
--- a/devel/prcs/distinfo
+++ b/devel/prcs/distinfo
@@ -1 +1 @@
-MD5 (prcs-1.2.8.tar.gz) = 949815545672c355ee0b05cace20e50c
+MD5 (prcs-1.3.0.tar.gz) = 1b81acce7da7121bf9095d610ff67366
diff --git a/devel/prcs/files/patch-aa b/devel/prcs/files/patch-aa
deleted file mode 100644
index fab2d9fdc2a1..000000000000
--- a/devel/prcs/files/patch-aa
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/include/prcserror.h.orig	Sun Feb 27 12:43:05 2000
-+++ src/include/prcserror.h	Sun Feb 27 12:45:35 2000
-@@ -121,7 +121,7 @@
- 
- private:
-     operator bool () const { return error(); }
--    operator!();
-+    void operator!();
- };
- 
- #ifdef PRCS_DEVEL
-@@ -183,7 +183,7 @@
- 
- private:
-     Type _val;
--    operator!();
-+    void operator!();
- };
- 
- #ifdef PRCS_DEVEL
diff --git a/devel/prcs/files/patch-ab b/devel/prcs/files/patch-ab
deleted file mode 100644
index 89e34f9cea03..000000000000
--- a/devel/prcs/files/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/include/projdesc.h.orig	Sun Feb 27 12:46:06 2000
-+++ src/include/projdesc.h	Sun Feb 27 12:46:30 2000
-@@ -347,7 +347,7 @@
- 
-     /* Illegal. */
-     ProjectDescriptor(const ProjectDescriptor&);
--    operator=(const ProjectDescriptor&);
-+    void operator=(const ProjectDescriptor&);
- 
-     /* Parsing. */
-     int prj_lookup_hash (const char *str, int len);
diff --git a/devel/prcs/files/patch-ac b/devel/prcs/files/patch-ac
deleted file mode 100644
index 97ca756b9ab6..000000000000
--- a/devel/prcs/files/patch-ac
+++ /dev/null
@@ -1,22 +0,0 @@
---- src/prcserror.tl.orig	Sun Feb 27 12:48:25 2000
-+++ src/prcserror.tl	Sun Feb 27 12:51:16 2000
-@@ -29,7 +29,9 @@
- template class PrError<QuickElim*>;
- #endif
- template class PrError<int>;
-+#if 0
- template class PrError<pid_t>;
-+#endif
- template class PrError<PrcsExitStatus>;
- template class PrError<ArgList*>;
- template class PrError<const char*>;
-@@ -68,7 +70,9 @@
- MkTemplate(PrError, const char*);
- MkTemplate(PrError, FILE*);
- MkTemplate(PrError, int);
-+#if 0
- MkTemplate(PrError, pid_t);
-+#endif
- MkTemplate(PrError, bool);
- MkTemplate(PrError, RepEntry*);
- MkTemplate(PrError, RcsDelta*);
diff --git a/devel/prcs/files/patch-ad b/devel/prcs/files/patch-ad
deleted file mode 100644
index 3838c4518fef..000000000000
--- a/devel/prcs/files/patch-ad
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/hash.cc.orig	Sun Feb 27 12:51:56 2000
-+++ src/hash.cc	Sun Feb 27 12:53:24 2000
-@@ -95,7 +95,7 @@
-     return attrs_hash (x, M);
- }
- 
--int hash(const char*& s, int M)
-+int hash(const char* const& s, int M)
-     /* a char* hash function from Aho, Sethi, and Ullman */
- {
-     const char *p;
diff --git a/devel/prcs/files/patch-ae b/devel/prcs/files/patch-ae
deleted file mode 100644
index 869bd1daac8e..000000000000
--- a/devel/prcs/files/patch-ae
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/projdesc.cc.orig	Sun Feb 27 12:58:40 2000
-+++ src/projdesc.cc	Sun Feb 27 12:58:13 2000
-@@ -1600,7 +1600,7 @@
-     return true;
- }
- 
--extern int hash(const char*& s, int M);
-+extern int hash(const char* const& s, int M);
- 
- int attrs_hash(const PrcsAttrs*const & s, int M)
- {
diff --git a/devel/prcs/files/patch-af b/devel/prcs/files/patch-af
new file mode 100644
index 000000000000..172599635f0d
--- /dev/null
+++ b/devel/prcs/files/patch-af
@@ -0,0 +1,8 @@
+--- contrib/prcs-ediff.orig	Tue Oct 30 21:21:37 2001
++++ contrib/prcs-ediff	Tue Oct 30 21:21:55 2001
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl5
++#! /usr/bin/env perl5
+ # Original author: Ulrich Pfeifer
+ # modified jglick@sig.bsh.com:
+ # $Id: prcs-ediff 1.2 Sat, 11 Apr 1998 17:54:43 -0700 jmacd $
diff --git a/devel/prcs/files/patch-ag b/devel/prcs/files/patch-ag
new file mode 100644
index 000000000000..862be51fa893
--- /dev/null
+++ b/devel/prcs/files/patch-ag
@@ -0,0 +1,8 @@
+--- contrib/prcs-emerge.orig	Tue Oct 30 21:22:28 2001
++++ contrib/prcs-emerge	Tue Oct 30 21:22:52 2001
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl
++#! /usr/bin/env perl
+ #                              -*- Mode: Perl -*-
+ # $Basename: prcs-emerge $
+ # $Revision: 1.2 $
diff --git a/devel/prcs/pkg-plist b/devel/prcs/pkg-plist
index 107d88dbffd1..a9fa71ca4fc7 100644
--- a/devel/prcs/pkg-plist
+++ b/devel/prcs/pkg-plist
@@ -1,11 +1,16 @@
 bin/prcs
-@unexec install-info --delete %D/info/prcs.info %D/info/dir
+bin/prcs-callback
+bin/prcs-ediff
+bin/prcs-emerge
 info/prcs.info
 info/prcs.info-1
 info/prcs.info-2
 info/prcs.info-3
+%%EMACS%%share/emacs/site-lisp/prcs.el
+%%EMACS%%share/emacs/site-lisp/prcs.elc
+%%EMACS%%share/emacs/site-lisp/prcs-ediff.el
+%%EMACS%%share/emacs/site-lisp/prcs-ediff.elc
+%%EMACS%%share/emacs/site-lisp/prcs-hooks.el
+%%EMACS%%share/emacs/site-lisp/prcs-hooks.elc
+@unexec install-info --delete %D/info/prcs.info %D/info/dir
 @exec install-info %D/info/prcs.info %D/info/dir
-share/emacs/site-lisp/prcs.el
-share/emacs/site-lisp/prcs.elc
-share/emacs/site-lisp/prcs-ediff.el
-share/emacs/site-lisp/prcs-ediff.elc