svn commit: r320414 - head/devel/cdecl/files
Eitan Adler
eadler at FreeBSD.org
Sun Jun 9 22:08:23 UTC 2013
Author: eadler
Date: Sun Jun 9 22:08:22 2013
New Revision: 320414
URL: http://svnweb.freebsd.org/changeset/ports/320414
Log:
Recreate patches with additional changes that should allow building on 10-current
Added:
head/devel/cdecl/files/patch-Makefile (contents, props changed)
head/devel/cdecl/files/patch-cdecl.c (contents, props changed)
Deleted:
head/devel/cdecl/files/patch-01
head/devel/cdecl/files/patch-02
Added: head/devel/cdecl/files/patch-Makefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/cdecl/files/patch-Makefile Sun Jun 9 22:08:22 2013 (r320414)
@@ -0,0 +1,35 @@
+--- ./Makefile.orig 1996-01-16 06:36:38.000000000 +0100
++++ ./Makefile 2013-06-10 00:05:02.101069622 +0200
+@@ -15,13 +15,13 @@
+ #
+ # add -DUSE_READLINE To compile in support for the GNU readline library.
+
+-CFLAGS= -s -O2 -DUSE_READLINE
+-CC= gcc
++CFLAGS+= -s -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
+-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 @@
+ ./c++decl < testset++
+
+ install: cdecl
+- $(INSTALL) cdecl $(BINDIR)
++ ${BSD_INSTALL_PROGRAM} cdecl $(BINDIR)
+ ln $(BINDIR)/cdecl $(BINDIR)/c++decl
+- $(INSTALL_DATA) cdecl.1 $(MANDIR)
+- $(INSTALL_DATA) c++decl.1 $(MANDIR)
++ ${BSD_INSTALL_MAN} cdecl.1 $(MANDIR)
++ ${BSD_INSTALL_MAN} c++decl.1 $(MANDIR)
+
+ clean:
+ rm -f cdgram.c cdlex.c cdecl y.output c++decl
Added: head/devel/cdecl/files/patch-cdecl.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/cdecl/files/patch-cdecl.c Sun Jun 9 22:08:22 2013 (r320414)
@@ -0,0 +1,70 @@
+--- ./cdecl.c.orig 1996-01-16 04:54:46.000000000 +0100
++++ ./cdecl.c 2013-06-10 00:06:29.231069167 +0200
+@@ -59,14 +59,22 @@
+ */
+
+ char cdeclsccsid[] = "@(#)cdecl.c 2.5 1/15/96";
+-
++
+ #include <stdio.h>
+ #include <ctype.h>
++#include <unistd.h>
++
+ #if __STDC__ || defined(DOS)
++# if (defined(__unix__) || defined(unix)) && !defined(USG)
++# include <sys/param.h>
++# endif
+ # include <stdlib.h>
+ # include <stddef.h>
+ # include <string.h>
+ # include <stdarg.h>
++# ifndef DOS
++# include <errno.h> /* only M$-DOS environments have ``errno'' in stdlib.h */
++# endif /* ndef DOS */
+ #else
+ # ifndef NOVARARGS
+ # include <varargs.h>
+@@ -124,7 +132,6 @@
+
+ #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 @@
+ void docast(char*, char*, char*, char*);
+ void dodexplain(char*, char*, char*, char*);
+ void docexplain(char*, char*, char*, char*);
++#if __FreeBSD_version < 430001 || (__FreeBSD_version >= 500000 && __FreeBSD_version < 500019)
+ void setprogname(char *);
++#endif
+ int dotmpfile(int, char**), dofileargs(int, char**);
+ #else
+ char *ds(), *cat(), *visible();
+@@ -148,7 +157,9 @@
+ void unsupp(), notsupported();
+ void yyerror();
+ void doset(), dodeclare(), docast(), dodexplain(), docexplain();
++#if __FreeBSD_version < 430001 || (__FreeBSD_version >= 500000 && __FreeBSD_version < 500019)
+ void setprogname();
++#endif
+ int dotmpfile(), dofileargs();
+ #endif /* __STDC__ */
+ FILE *tmpfile();
+@@ -802,6 +813,7 @@
+ #endif
+ }
+
++#if __FreeBSD_version < 430001 || (__FreeBSD_version >= 500000 && __FreeBSD_version < 500019)
+ /* Save away the name of the program from argv[0] */
+ void setprogname(argv0)
+ char *argv0;
+@@ -841,6 +853,7 @@
+ 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 */
More information about the svn-ports-head
mailing list