Index: head/devel/cdecl/files/patch-cdecl.c =================================================================== --- head/devel/cdecl/files/patch-cdecl.c (revision 439854) +++ head/devel/cdecl/files/patch-cdecl.c (nonexistent) @@ -1,97 +0,0 @@ ---- cdecl.c.orig 1996-01-16 03:54:46 UTC -+++ cdecl.c -@@ -59,14 +59,22 @@ - */ - - char cdeclsccsid[] = "@(#)cdecl.c 2.5 1/15/96"; -- -+ - #include - #include -+#include -+ - #if __STDC__ || defined(DOS) -+# if (defined(__unix__) || defined(unix)) && !defined(USG) -+# include -+# endif - # include - # include - # include - # include -+# ifndef DOS -+# include /* only M$-DOS environments have ``errno'' in stdlib.h */ -+# endif /* ndef DOS */ - #else - # ifndef NOVARARGS - # include -@@ -90,7 +98,7 @@ void free(), exit(), perror(); - #ifdef USE_READLINE - # include - /* prototypes for functions related to readline() */ -- char * getline(); -+ char * get_line(); - char ** attempt_completion(char *, int, int); - char * keyword_completion(char *, int); - char * command_completion(char *, int); -@@ -124,7 +132,6 @@ char real_prompt[MAX_NAME+3]; - - #if __STDC__ - char *ds(char *), *cat(char *, ...), *visible(int); -- int getopt(int,char **,char *); - int main(int, char **); - int yywrap(void); - int dostdin(void); -@@ -138,7 +145,9 @@ char real_prompt[MAX_NAME+3]; - void docast(char*, char*, char*, char*); - void dodexplain(char*, char*, char*, char*); - void docexplain(char*, char*, char*, char*); -+#if !defined __FreeBSD__ && !defined __DragonFly__ - void setprogname(char *); -+#endif - int dotmpfile(int, char**), dofileargs(int, char**); - #else - char *ds(), *cat(), *visible(); -@@ -148,7 +157,9 @@ char real_prompt[MAX_NAME+3]; - void unsupp(), notsupported(); - void yyerror(); - void doset(), dodeclare(), docast(), dodexplain(), docexplain(); -+#if !defined __FreeBSD__ && !defined __DragonFly__ - void setprogname(); -+#endif - int dotmpfile(), dofileargs(); - #endif /* __STDC__ */ - FILE *tmpfile(); -@@ -375,7 +386,7 @@ char *options[] = { - static char *line_read = NULL; - - /* Read a string, and return a pointer to it. Returns NULL on EOF. */ --char * getline () -+char * get_line () - { - /* If the buffer has already been allocated, return the memory - to the free pool. */ -@@ -802,6 +813,7 @@ void prompt() - #endif - } - -+#if !defined __FreeBSD__ && !defined __DragonFly__ - /* Save away the name of the program from argv[0] */ - void setprogname(argv0) - char *argv0; -@@ -841,6 +853,7 @@ char *argv0; - real_prompt[len+2] = '\0'; - } - } -+#endif - - /* Run down the list of keywords to see if the */ - /* program is being called named as one of them */ -@@ -887,7 +900,7 @@ int dostdin() - - if (!quiet) (void) printf("Type `help' or `?' for help\n"); - ret = 0; -- while ((line = getline())) { -+ while ((line = get_line())) { - if (!strcmp(line, "quit") || !strcmp(line, "exit")) { - free(line); - return ret; Property changes on: head/devel/cdecl/files/patch-cdecl.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/cdecl/files/patch-Makefile =================================================================== --- head/devel/cdecl/files/patch-Makefile (revision 439854) +++ head/devel/cdecl/files/patch-Makefile (nonexistent) @@ -1,37 +0,0 @@ ---- Makefile.orig 1996-01-16 05:36:38 UTC -+++ Makefile -@@ -15,13 +15,13 @@ - # - # add -DUSE_READLINE To compile in support for the GNU readline library. - --CFLAGS= -s -O2 -DUSE_READLINE --CC= gcc --LIBS= -lreadline -ltermcap -+CFLAGS+= -s -DUSE_READLINE ${CPPFLAGS} -+CC?= gcc -+LIBS= -lreadline -lncurses ${LDFLAGS} - ALLFILES= makefile cdgram.y cdlex.l cdecl.c cdecl.1 testset testset++ --BINDIR= /usr/bin --MANDIR= /usr/man/man1 --CATDIR= /usr/man/cat1 -+BINDIR= $(PREFIX)/bin -+MANDIR= $(PREFIX)/man/man1 -+CATDIR= $(PREFIX)/man/cat1 - INSTALL= install -c - INSTALL_DATA= install -c -m 644 - -@@ -43,10 +43,10 @@ test: - ./c++decl < testset++ - - install: cdecl -- $(INSTALL) cdecl $(BINDIR) -- ln $(BINDIR)/cdecl $(BINDIR)/c++decl -- $(INSTALL_DATA) cdecl.1 $(MANDIR) -- $(INSTALL_DATA) c++decl.1 $(MANDIR) -+ ${BSD_INSTALL_PROGRAM} cdecl $(STAGEDIR)$(BINDIR) -+ ln -s $(BINDIR)/cdecl $(STAGEDIR)$(BINDIR)/c++decl -+ ${BSD_INSTALL_MAN} cdecl.1 $(STAGEDIR)$(MANDIR) -+ ln -s $(MANDIR)/cdecl.1 $(STAGEDIR)$(MANDIR)/c++decl.1 - - clean: - rm -f cdgram.c cdlex.c cdecl y.output c++decl Property changes on: head/devel/cdecl/files/patch-Makefile ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/cdecl/Makefile =================================================================== --- head/devel/cdecl/Makefile (revision 439854) +++ head/devel/cdecl/Makefile (revision 439855) @@ -1,29 +1,29 @@ # Created by: David O'Brien (obrien@NUXI.com) # $FreeBSD$ PORTNAME= cdecl -PORTVERSION= 2.5 -PORTREVISION= 1 +PORTVERSION= 3.1 CATEGORIES= devel -MASTER_SITES= SUNSITE/devel/lang/c -MAINTAINER= ports@FreeBSD.org +MAINTAINER= ler@FreeBSD.org COMMENT= Explains complicated C/C++ declarations in plain English +LICENSE= GPLv3 + +BUILD_DEPENDS= flex:textproc/flex + CONFLICTS= cutils-[0-9]* -USES= ncurses readline -USE_CSTD= c89 -ALL_TARGET= ${PORTNAME} -MAKE_ENV+= STAGEDIR=${STAGEDIR} +USES= autoreconf bison ncurses readline -PLIST_FILES= bin/cdecl bin/c++decl man/man1/cdecl.1.gz man/man1/c++decl.1.gz -PORTDOCS= testset testset++ +USE_GITHUB= yes -OPTIONS_DEFINE= DOCS +GH_ACCOUNT= paul-j-lucas +GH_PROJECT= cdecl +GH_TAGNAME= ${PORTNAME}-${PORTVERSION} -post-install-DOCS-on: - ${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/testset* ${STAGEDIR}${DOCSDIR} +MAKE_JOBS_UNSAFE= yes +GNU_CONFIGURE= yes +PLIST_FILES= bin/cdecl bin/c++decl man/man1/cdecl.1.gz man/man1/c++decl.1.gz .include Index: head/devel/cdecl/distinfo =================================================================== --- head/devel/cdecl/distinfo (revision 439854) +++ head/devel/cdecl/distinfo (revision 439855) @@ -1,2 +1,3 @@ -SHA256 (cdecl-2.5.tar.gz) = b74caef08407a2195d6f1facf103e5af29253f67d599486164241b14ee42a936 -SIZE (cdecl-2.5.tar.gz) = 21435 +TIMESTAMP = 1493597720 +SHA256 (paul-j-lucas-cdecl-3.1-cdecl-3.1_GH0.tar.gz) = 270ce7b3e49680e5a386b78d91b5cc0238c5293579f28f06412ad7de608ff13d +SIZE (paul-j-lucas-cdecl-3.1-cdecl-3.1_GH0.tar.gz) = 235505 Index: head/devel/cdecl/pkg-descr =================================================================== --- head/devel/cdecl/pkg-descr (revision 439854) +++ head/devel/cdecl/pkg-descr (revision 439855) @@ -1,4 +1,6 @@ Cdecl composes compilable C declarations and typecasts from descriptive English phrases, and can also explain a complicated typecast or declaration. It handles ANSI C, C++, pre-ANSI C, and K&R C, and has TAB completion of keywords and line editing and history (provided by the GNU readline library). + +WWW: https://github.com/paul-j-lucas/cdecl