diff options
author | Maxim Sobolev <sobomax@FreeBSD.org> | 2002-10-21 11:12:13 +0000 |
---|---|---|
committer | Maxim Sobolev <sobomax@FreeBSD.org> | 2002-10-21 11:12:13 +0000 |
commit | 04c2078afa2840aa9e246e203714bbff5258e139 (patch) | |
tree | 8334efeee0bb5eea6d1b5d630164776b9d759291 /devel/fpp | |
parent | Unbreak on current. This should unlock another 6 packages that depend on db2. (diff) |
Unbreak on -current. This should unlock another 6 ports that depend on this one.
Submitted by: bento
Notes
Notes:
svn path=/head/; revision=68499
Diffstat (limited to 'devel/fpp')
-rw-r--r-- | devel/fpp/files/patch-ab | 60 | ||||
-rw-r--r-- | devel/fpp/files/patch-sparc::Makefile | 17 |
2 files changed, 39 insertions, 38 deletions
diff --git a/devel/fpp/files/patch-ab b/devel/fpp/files/patch-ab index 4eaa9386d03b..9ed4e15dacae 100644 --- a/devel/fpp/files/patch-ab +++ b/devel/fpp/files/patch-ab @@ -1,38 +1,22 @@ -*** src/Makefile.common.orig Wed Mar 19 04:23:18 1997 ---- src/Makefile.common Mon Sep 8 04:14:24 1997 -*************** -*** 20,26 **** - fpp: $(OBJ) $(OBJ1) $(EXTRA_LIB) - $(CC) $(COPTS) -o $@ $(OBJ) $(OBJ1) $(EXTRA_LIB) - -! $(OBJ): $$(@:%.o=$(SRC)/%.c) - $(CC) -c $(ALL_OPTS) $(@:%.o=$(SRC)/%.c) - - y.tab.o: y.tab.c ---- 20,26 ---- - fpp: $(OBJ) $(OBJ1) $(EXTRA_LIB) - $(CC) $(COPTS) -o $@ $(OBJ) $(OBJ1) $(EXTRA_LIB) - -! $(OBJ): #$$(@:%.o=$(SRC)/%.c) - $(CC) -c $(ALL_OPTS) $(@:%.o=$(SRC)/%.c) - - y.tab.o: y.tab.c -*************** -*** 34,41 **** - lint: $(LINTFILES) - $(LINT) $(LINTFILES) - -! $(LINTFILES): $$(@:%.ln=$(SRC)/%.c) -! $(LINT) $(LOPTS) $(EXTRA_DEF) $(EXTRA_INC) $(@:%.ln=$(SRC)/%.c) - - clean: - $(RM) fpp *.o y.tab.c $(LINTFILES) ---- 34,41 ---- - lint: $(LINTFILES) - $(LINT) $(LINTFILES) - -! #$(LINTFILES): $$(@:%.ln=$(SRC)/%.c) -! # $(LINT) $(LOPTS) $(EXTRA_DEF) $(EXTRA_INC) $(@:%.ln=$(SRC)/%.c) - - clean: - $(RM) fpp *.o y.tab.c $(LINTFILES) +--- src/Makefile.common.orig Tue Mar 18 21:23:18 1997 ++++ src/Makefile.common Mon Oct 21 14:08:06 2002 +@@ -20,7 +20,7 @@ + fpp: $(OBJ) $(OBJ1) $(EXTRA_LIB) + $(CC) $(COPTS) -o $@ $(OBJ) $(OBJ1) $(EXTRA_LIB) + +-$(OBJ): $$(@:%.o=$(SRC)/%.c) ++$(OBJ): #$$(@:%.o=$(SRC)/%.c) + $(CC) -c $(ALL_OPTS) $(@:%.o=$(SRC)/%.c) + + y.tab.o: y.tab.c +@@ -34,8 +34,8 @@ + lint: $(LINTFILES) + $(LINT) $(LINTFILES) + +-$(LINTFILES): $$(@:%.ln=$(SRC)/%.c) +- $(LINT) $(LOPTS) $(EXTRA_DEF) $(EXTRA_INC) $(@:%.ln=$(SRC)/%.c) ++#$(LINTFILES): $$(@:%.ln=$(SRC)/%.c) ++# $(LINT) $(LOPTS) $(EXTRA_DEF) $(EXTRA_INC) $(@:%.ln=$(SRC)/%.c) + + clean: + $(RM) fpp *.o y.tab.c $(LINTFILES) diff --git a/devel/fpp/files/patch-sparc::Makefile b/devel/fpp/files/patch-sparc::Makefile new file mode 100644 index 000000000000..f42a2962ba19 --- /dev/null +++ b/devel/fpp/files/patch-sparc::Makefile @@ -0,0 +1,17 @@ + +$FreeBSD$ + +--- sparc/Makefile.orig Tue Mar 18 21:23:25 1997 ++++ sparc/Makefile Mon Oct 21 14:10:57 2002 +@@ -1,8 +1,8 @@ + SRC = ../src + +-CC = gcc +-COPTS = -ansi -O -w +-EXTRA_DEF = "-DRELEASE=\"v1.1\"" ++CC ?= gcc ++COPTS = -ansi -w ${CFLAGS} ++EXTRA_DEF = "-DRELEASE=\"v1.1\"" -I../src + + all: fpp + |