Use editline readline emulation when available. Move example files to

${PREFIX}/share/examples/cdecl.  Also patch sources to rename instances
of setprogname() to mysetprogname(), as setprogname() is part of the
standard library in NetBSD>1.5.

5 files changed, 74 insertions, 34 deletions

diff --git a/devel/cdecl/Makefile b/devel/cdecl/Makefile
index 2741fdb556b..e095c7a4039 100644
--- a/devel/cdecl/Makefile
+++ b/devel/cdecl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/02/25 04:17:40 hubertf Exp $
+# $NetBSD: Makefile,v 1.5 2001/05/22 05:48:14 jlam Exp $
 #
 
 DISTNAME=	cdecl-2.5
@@ -10,13 +10,19 @@ MASTER_SITES=	ftp://ftp.netsw.org/netsw/SoftEng/Lang/C/Tools/cdecl/  \
 		ftp://ftp.uakom.sk/pub/linux/devel/lang/c/
 
 MAINTAINER=     packages@netbsd.org
-#HOMEPAGE=
 COMMENT=	utility to explain and compose C and C++ declarations
 
-DEPENDS+=	readline>=4.0:../../devel/readline
+ALL_TARGET=	cdecl
+
+.include "../../devel/readline/Makefile.readline"
+
+CFLAGS+=	-I${WRKINCDIR}
+LDFLAGS+=	-L${WRKINCDIR}
+
+EGDIR=		${PREFIX}/share/examples/cdecl
 
 post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/cdecl
-	${INSTALL_DATA} ${WRKSRC}/testset* ${PREFIX}/share/doc/cdecl
+	${INSTALL_DATA_DIR} ${EGDIR}
+	${INSTALL_DATA} ${WRKSRC}/testset* ${EGDIR}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/cdecl/distinfo b/devel/cdecl/distinfo
index 598ebafc673..99342acb82a 100644
--- a/devel/cdecl/distinfo
+++ b/devel/cdecl/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2001/04/21 00:44:12 wiz Exp $
+$NetBSD: distinfo,v 1.3 2001/05/22 05:48:14 jlam Exp $
 
 SHA1 (cdecl-2.5.tar.gz) = b955a0b95b635090360b19de888cb29d5c005296
 Size (cdecl-2.5.tar.gz) = 21435 bytes
-SHA1 (patch-aa) = d9208717f3529894ecb4b8339d39b0f222f03a0e
-SHA1 (patch-ab) = 98757157a7be5f6fc83ec0bf7401f70da38311b5
+SHA1 (patch-aa) = 48cd50b6c1aee3286c9dabe2e21fbeccc1a03e3b
+SHA1 (patch-ab) = e8c9f70894ed5613234ed17b8c1c95c9b12afd7b
diff --git a/devel/cdecl/patches/patch-aa b/devel/cdecl/patches/patch-aa
index 36bb4a61d83..b4d318fa82f 100644
--- a/devel/cdecl/patches/patch-aa
+++ b/devel/cdecl/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.2 1999/11/26 13:58:33 hubertf Exp $
+$NetBSD: patch-aa,v 1.3 2001/05/22 05:48:15 jlam Exp $
 
---- cdecl.c.orig	Tue Jan 16 04:54:46 1996
-+++ cdecl.c	Fri Nov 26 15:02:00 1999
+--- cdecl.c.orig	Mon Jan 15 22:54:46 1996
++++ cdecl.c	Tue May 22 01:41:35 2001
 @@ -59,7 +59,9 @@
   */
  
@@ -48,3 +48,39 @@ $NetBSD: patch-aa,v 1.2 1999/11/26 13:58:33 hubertf Exp $
    int main(int, char **);
    int yywrap(void);
    int dostdin(void);
+@@ -138,7 +147,7 @@
+   void docast(char*, char*, char*, char*);
+   void dodexplain(char*, char*, char*, char*);
+   void docexplain(char*, char*, char*, char*);
+-  void setprogname(char *);
++  void mysetprogname(char *);
+   int dotmpfile(int, char**), dofileargs(int, char**);
+ #else
+   char *ds(), *cat(), *visible();
+@@ -148,7 +157,7 @@
+   void unsupp(), notsupported();
+   void yyerror();
+   void doset(), dodeclare(), docast(), dodexplain(), docexplain();
+-  void setprogname();
++  void mysetprogname();
+   int dotmpfile(), dofileargs();
+ #endif /* __STDC__ */
+   FILE *tmpfile();
+@@ -803,7 +812,7 @@
+ }
+ 
+ /* Save away the name of the program from argv[0] */
+-void setprogname(argv0)
++void mysetprogname(argv0)
+ char *argv0;
+ {
+ #ifdef DOS
+@@ -1255,7 +1264,7 @@
+     rl_completion_entry_function = (Function *)keyword_completion;
+ #endif
+ 
+-    setprogname(argv[0]);
++    mysetprogname(argv[0]);
+ #ifdef DOS
+     if (strcmp(progname, "cppdecl") == 0)
+ #else
diff --git a/devel/cdecl/patches/patch-ab b/devel/cdecl/patches/patch-ab
index ff51b5438ed..4dad9a21cd5 100644
--- a/devel/cdecl/patches/patch-ab
+++ b/devel/cdecl/patches/patch-ab
@@ -1,15 +1,16 @@
-$NetBSD: patch-ab,v 1.4 2000/06/23 16:33:22 hubertf Exp $
---- Makefile.orig	Tue Jan 16 06:36:38 1996
-+++ Makefile	Fri Nov 26 15:04:05 1999
-@@ -15,15 +15,17 @@
+$NetBSD: patch-ab,v 1.5 2001/05/22 05:48:15 jlam Exp $
+
+--- Makefile.orig	Tue Jan 16 00:36:38 1996
++++ Makefile	Tue May 22 01:33:10 2001
+@@ -15,21 +15,21 @@
  #
  # add -DUSE_READLINE	To compile in support for the GNU readline library.
  
 -CFLAGS= -s -O2 -DUSE_READLINE
-+CFLAGS+= -I${LOCALBASE}/include -DUSE_READLINE
- CC= gcc
--LIBS= -lreadline -ltermcap
-+LIBS= -L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib -lreadline -ltermcap
+-CC= gcc
++CFLAGS+= -DUSE_READLINE
++#CC= gcc
+ LIBS= -lreadline -ltermcap
  ALLFILES= makefile cdgram.y cdlex.l cdecl.c cdecl.1 testset testset++
 -BINDIR= /usr/bin
 -MANDIR= /usr/man/man1
@@ -19,18 +20,15 @@ $NetBSD: patch-ab,v 1.4 2000/06/23 16:33:22 hubertf Exp $
 +BINDIR= ${PREFIX}/bin
 +MANDIR= ${PREFIX}/man/man1
 +CATDIR= ${PREFIX}/man/cat1
-+#INSTALL= install -c
-+INSTALL_DATA= ${BSD_INSTALL_DATA}
-+
-+all: cdecl
++INSTALL= ${BSD_INSTALL_PROGRAM}
++INSTALL_DATA= ${BSD_INSTALL_MAN}
  
  cdecl: c++decl
  	ln c++decl cdecl
-@@ -44,6 +46,7 @@
  
- install: cdecl
- 	$(INSTALL) cdecl $(BINDIR)
-+	rm -f ${BINDIR}/c++decl
- 	ln $(BINDIR)/cdecl $(BINDIR)/c++decl
- 	$(INSTALL_DATA) cdecl.1 $(MANDIR)
- 	$(INSTALL_DATA) c++decl.1 $(MANDIR)
+ c++decl: cdgram.c cdlex.c cdecl.c
+-	$(CC) $(CFLAGS) -o c++decl cdecl.c $(LIBS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o c++decl cdecl.c $(LIBS)
+ 	rm -f cdecl
+ 
+ cdlex.c: cdlex.l
diff --git a/devel/cdecl/pkg/PLIST b/devel/cdecl/pkg/PLIST
index b261a3aa590..4e2db796df8 100644
--- a/devel/cdecl/pkg/PLIST
+++ b/devel/cdecl/pkg/PLIST
@@ -1,8 +1,8 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 1999/11/11 12:53:17 agc Exp $
+@comment $NetBSD: PLIST,v 1.2 2001/05/22 05:48:16 jlam Exp $
 bin/cdecl
 bin/c++decl
 man/man1/cdecl.1
 man/man1/c++decl.1
-share/doc/cdecl/testset
-share/doc/cdecl/testset++
-@dirrm share/doc/cdecl
+share/examples/cdecl/testset
+share/examples/cdecl/testset++
+@dirrm share/examples/cdecl