diff options
| author | naddy <naddy@FreeBSD.org> | 2002-11-26 08:34:06 +0800 |
|---|---|---|
| committer | naddy <naddy@FreeBSD.org> | 2002-11-26 08:34:06 +0800 |
| commit | 5216dc165b36cab1f999c83a6fcc742aeeee8542 (patch) | |
| tree | 835049606ad937982a0adac911b6e498b593d948 /misc | |
| parent | 44e909eb02d0e541f41f10c62bded045e078ab00 (diff) | |
| download | freebsd-ports-gnome-5216dc165b36cab1f999c83a6fcc742aeeee8542.tar.gz freebsd-ports-gnome-5216dc165b36cab1f999c83a6fcc742aeeee8542.tar.zst freebsd-ports-gnome-5216dc165b36cab1f999c83a6fcc742aeeee8542.zip | |
Fix build on -CURRENT.
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/colortail/Makefile | 7 | ||||
| -rw-r--r-- | misc/colortail/files/patch-CfgFileParser.cc | 19 | ||||
| -rw-r--r-- | misc/colortail/files/patch-Colorizer.cc | 14 | ||||
| -rw-r--r-- | misc/colortail/files/patch-aa | 18 |
4 files changed, 35 insertions, 23 deletions
diff --git a/misc/colortail/Makefile b/misc/colortail/Makefile index a7d6a2d9d707..9b44fcb61144 100644 --- a/misc/colortail/Makefile +++ b/misc/colortail/Makefile @@ -14,12 +14,9 @@ MAINTAINER= ports@FreeBSD.org LIB_DEPENDS= gnugetopt.1:${PORTSDIR}/devel/libgnugetopt -USE_REINPLACE= yes GNU_CONFIGURE= yes - -pre-patch: - @${REINPLACE_CMD} -e "s@malloc.h@stdlib.h@g" \ - ${WRKSRC}/CfgFileParser.cc +CONFIGURE_ENV= CPPFLAGS="-DHAVE_DECL_GETOPT=1 -I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" post-install: @ ${MKDIR} ${PREFIX}/share/colortail diff --git a/misc/colortail/files/patch-CfgFileParser.cc b/misc/colortail/files/patch-CfgFileParser.cc new file mode 100644 index 000000000000..0dc19f1072a1 --- /dev/null +++ b/misc/colortail/files/patch-CfgFileParser.cc @@ -0,0 +1,19 @@ + +$FreeBSD$ + +--- CfgFileParser.cc.orig Tue Aug 3 21:40:44 1999 ++++ CfgFileParser.cc Tue Nov 26 01:08:21 2002 +@@ -20,11 +20,10 @@ + #include "CfgFileParser.h" + + #include <stdio.h> +-#include <fstream.h> ++#include <iostream.h> + #include <assert.h> + #include <string.h> +-#include <malloc.h> +- ++#include <stdlib.h> + + // ## class SearchData ## + diff --git a/misc/colortail/files/patch-Colorizer.cc b/misc/colortail/files/patch-Colorizer.cc new file mode 100644 index 000000000000..3977f71bdfcc --- /dev/null +++ b/misc/colortail/files/patch-Colorizer.cc @@ -0,0 +1,14 @@ + +$FreeBSD$ + +--- Colorizer.cc.orig Tue Nov 26 01:12:35 2002 ++++ Colorizer.cc Tue Nov 26 01:12:49 2002 +@@ -23,7 +23,7 @@ + + #include <assert.h> + #include <stdio.h> +-#include <strstream.h> ++#include <iostream.h> + + + Colorizer::Colorizer() diff --git a/misc/colortail/files/patch-aa b/misc/colortail/files/patch-aa deleted file mode 100644 index c46e952ab2b5..000000000000 --- a/misc/colortail/files/patch-aa +++ /dev/null @@ -1,18 +0,0 @@ ---- Makefile.in.old Wed Jun 21 13:11:39 2000 -+++ Makefile.in Wed Jun 21 13:12:43 2000 -@@ -79,13 +79,13 @@ - PROGRAMS = $(bin_PROGRAMS) - - --DEFS = @DEFS@ -I. -I$(srcdir) -I. -+DEFS = @DEFS@ -I. -I$(srcdir) -I. -I$(LOCALBASE)/include - CPPFLAGS = @CPPFLAGS@ - LDFLAGS = @LDFLAGS@ - LIBS = @LIBS@ - colortail_OBJECTS = CfgFileParser.o ColorTail.o Colorizer.o Info.o \ - OptionsParser.o TailFile.o Usage.o main.o --colortail_LDADD = $(LDADD) -+colortail_LDADD = -L$(LOCALBASE)/lib -lgnugetopt $(LDADD) - colortail_DEPENDENCIES = - colortail_LDFLAGS = - CXXFLAGS = @CXXFLAGS@ |