From 7ae7b018ccf7760013f368fcb83aad9ecd8982a8 Mon Sep 17 00:00:00 2001 From: Mathieu Arnold Date: Mon, 20 Jun 2016 16:23:28 +0000 Subject: With the power of USES=dos2unix, get rid of most patches and files with CRLF. While there, run make makepatch, rename patches to use the new scheme, and various fixes. With hat: portmgr Sponsored by: Absolight --- math/spar/Makefile | 3 ++- math/spar/files/patch-calculator_Makefile.in | 11 +++++++++++ math/spar/files/patch-calculator__Makefile.in | 11 ----------- math/spar/files/patch-configure | 6 +++--- math/spar/files/patch-lib__randist__rand.c | 10 ---------- math/spar/files/patch-lib_randist_rand.c | 10 ++++++++++ 6 files changed, 26 insertions(+), 25 deletions(-) create mode 100644 math/spar/files/patch-calculator_Makefile.in delete mode 100644 math/spar/files/patch-calculator__Makefile.in delete mode 100644 math/spar/files/patch-lib__randist__rand.c create mode 100644 math/spar/files/patch-lib_randist_rand.c (limited to 'math') diff --git a/math/spar/Makefile b/math/spar/Makefile index 85fa78567cdc..80454151df0d 100644 --- a/math/spar/Makefile +++ b/math/spar/Makefile @@ -10,7 +10,8 @@ MASTER_SITES= SF/${PORTNAME}/Spar/${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Modular math parser -USES= libtool ncurses readline +USES= dos2unix libtool ncurses readline +DOS2UNIX_FILES= lib/randist/rand.c GNU_CONFIGURE= yes USE_CSTD= gnu89 USE_LDCONFIG= yes diff --git a/math/spar/files/patch-calculator_Makefile.in b/math/spar/files/patch-calculator_Makefile.in new file mode 100644 index 000000000000..e4515e87a212 --- /dev/null +++ b/math/spar/files/patch-calculator_Makefile.in @@ -0,0 +1,11 @@ +--- calculator/Makefile.in.orig 2001-06-26 13:32:25 UTC ++++ calculator/Makefile.in +@@ -91,7 +91,7 @@ PROGRAMS = $(bin_PROGRAMS) + DEFS = @DEFS@ -I. -I$(srcdir) -I.. + CPPFLAGS = @CPPFLAGS@ + LDFLAGS = @LDFLAGS@ +-LIBS = @LIBS@ ++LIBS = @LIBS@ -lcompat + spar_OBJECTS = commands.o commands_table.o shell.o spar.o + spar_DEPENDENCIES = ../lib/.libs/libspar.so + spar_LDFLAGS = diff --git a/math/spar/files/patch-calculator__Makefile.in b/math/spar/files/patch-calculator__Makefile.in deleted file mode 100644 index 725ba36e31f9..000000000000 --- a/math/spar/files/patch-calculator__Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- calculator/Makefile.in.orig Sun Jul 1 02:55:42 2001 -+++ calculator/Makefile.in Sun Jul 1 02:55:56 2001 -@@ -91,7 +91,7 @@ - DEFS = @DEFS@ -I. -I$(srcdir) -I.. - CPPFLAGS = @CPPFLAGS@ - LDFLAGS = @LDFLAGS@ --LIBS = @LIBS@ -+LIBS = @LIBS@ -lcompat - spar_OBJECTS = commands.o commands_table.o shell.o spar.o - spar_DEPENDENCIES = ../lib/.libs/libspar.so - spar_LDFLAGS = diff --git a/math/spar/files/patch-configure b/math/spar/files/patch-configure index ce43259d9db6..6e1a2e8f0c2c 100644 --- a/math/spar/files/patch-configure +++ b/math/spar/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig Tue Jun 26 05:46:47 2001 -+++ configure Sun Sep 8 15:42:06 2002 -@@ -1580,7 +1563,6 @@ +--- configure.orig 2001-06-26 12:46:47 UTC ++++ configure +@@ -1580,7 +1580,6 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtoo exec 5>>./config.log diff --git a/math/spar/files/patch-lib__randist__rand.c b/math/spar/files/patch-lib__randist__rand.c deleted file mode 100644 index 792b9fa2ae9a..000000000000 --- a/math/spar/files/patch-lib__randist__rand.c +++ /dev/null @@ -1,10 +0,0 @@ ---- lib/randist/rand.c.orig Sun Jul 1 02:45:44 2001 -+++ lib/randist/rand.c Sun Jul 1 02:46:03 2001 -@@ -64,6 +64,7 @@ - * struct timeb to be defined. They can be - * found in timeb.h. - */ -+#include - #include - void - sl_randomize (void) diff --git a/math/spar/files/patch-lib_randist_rand.c b/math/spar/files/patch-lib_randist_rand.c new file mode 100644 index 000000000000..836d51c16ea0 --- /dev/null +++ b/math/spar/files/patch-lib_randist_rand.c @@ -0,0 +1,10 @@ +--- lib/randist/rand.c.orig 2016-06-20 13:16:43 UTC ++++ lib/randist/rand.c +@@ -64,6 +64,7 @@ + * struct timeb to be defined. They can be + * found in timeb.h. + */ ++#include + #include + void + sl_randomize (void) -- cgit v1.2.3