diff options
| author | Steve Price <steve@FreeBSD.org> | 2000-08-08 02:55:15 +0000 |
|---|---|---|
| committer | Steve Price <steve@FreeBSD.org> | 2000-08-08 02:55:15 +0000 |
| commit | 9df09f5635a97cc13d0903338492fa596b4f1a62 (patch) | |
| tree | 9c8736053bc5f6355819cf8dab11b2480094ac3f /multimedia | |
| parent | Don't try to use fpresetsticky(3) on the Alpha as it doesn't exist there. (diff) | |
Remove i386 .o files in the post-extract target and respect CFLAGS.
Notes
Notes:
svn path=/head/; revision=31399
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/fxtv/Makefile | 3 | ||||
| -rw-r--r-- | multimedia/fxtv/files/patch-ab | 32 | ||||
| -rw-r--r-- | multimedia/fxtv/files/patch-ac | 11 |
3 files changed, 46 insertions, 0 deletions
diff --git a/multimedia/fxtv/Makefile b/multimedia/fxtv/Makefile index 141041d6fc17..d727e1cf02e9 100644 --- a/multimedia/fxtv/Makefile +++ b/multimedia/fxtv/Makefile @@ -30,6 +30,9 @@ USE_GMAKE= yes MAKE_FLAGS= -e MAN1= fxtv.1 +post-extract: + ${RM} ${WRKSRC}/videolib/*.o + pre-install: ${CP} ${WRKSRC}/fxtv.1 ${WRKSRC}/fxtv.man diff --git a/multimedia/fxtv/files/patch-ab b/multimedia/fxtv/files/patch-ab new file mode 100644 index 000000000000..d3fa7e282669 --- /dev/null +++ b/multimedia/fxtv/files/patch-ab @@ -0,0 +1,32 @@ +--- Makefile.orig Thu Nov 4 18:43:51 1999 ++++ Makefile Sun Aug 6 19:19:54 2000 +@@ -3,16 +3,17 @@ + # + + HAVE_XFREE86 = YES +-X11BASE = /usr/X11R6 ++X11BASE ?= /usr/X11R6 ++LOCALBASE ?= /usr/local + DEBUG = NO + OS = $(shell uname -s) + OS_MAJOR = $(shell uname -r | cut -f1 -d\.) + + override CF_VERS = -DVERS_STR=\"1.02\" + override VIDEOLIB_DIR = ./videolib +-override INC = -I$(X11BASE)/include -I/usr/local/include \ ++override INC = -I$(X11BASE)/include -I$(LOCALBASE)/include \ + -I$(VIDEOLIB_DIR) -I. +-override LIBDIRS = $(X11BASE)/lib /usr/local/lib ++override LIBDIRS = $(X11BASE)/lib $(LOCALBASE)/lib + override SHELL = /bin/sh + + # +@@ -45,7 +46,7 @@ + ifneq ($(DEBUG),NO) + override CFLAGS = -DDEBUG -g + else +- override CFLAGS = -O2 -m486 ++ override CFLAGS = #-O2 -m486 + endif + C_WARN_FLAG = -Wall + override CFLAGS += $(C_WARN_FLAG) $(INC) $(CF_VERS) diff --git a/multimedia/fxtv/files/patch-ac b/multimedia/fxtv/files/patch-ac new file mode 100644 index 000000000000..2c9d4a828154 --- /dev/null +++ b/multimedia/fxtv/files/patch-ac @@ -0,0 +1,11 @@ +--- videolib/Makefile.orig Sun Aug 6 19:24:57 2000 ++++ videolib/Makefile Sun Aug 6 19:25:09 2000 +@@ -15,7 +15,7 @@ + ifneq ($(DEBUG),NO) + override CFLAGS = -DDEBUG -g + else +- override CFLAGS = -DNDEBUG -O2 -m486 ++ override CFLAGS = -DNDEBUG #-O2 -m486 + endif + C_WARN_FLAG = -Wall + override CFLAGS += $(C_WARN_FLAG) $(INC) |