From 79e54f323653f87bfe902c788210408637ad5267 Mon Sep 17 00:00:00 2001 From: Thomas Gellekum Date: Mon, 1 Dec 1997 08:10:47 +0000 Subject: [PATCH] Use new location for tiff34 headers. This was the last commit in this series. If I broke anything, yell at me. Not that think you'd need any encouragement. ;-) --- graphics/fxtv/Makefile | 6 +++--- graphics/fxtv/files/patch-aa | 19 +++++++++++++++++++ multimedia/fxtv/Makefile | 6 +++--- multimedia/fxtv/files/patch-aa | 19 +++++++++++++++++++ 4 files changed, 44 insertions(+), 6 deletions(-) create mode 100644 graphics/fxtv/files/patch-aa create mode 100644 multimedia/fxtv/files/patch-aa diff --git a/graphics/fxtv/Makefile b/graphics/fxtv/Makefile index 2db9864045e9..79ca4660d573 100644 --- a/graphics/fxtv/Makefile +++ b/graphics/fxtv/Makefile @@ -3,17 +3,17 @@ # Date created: Sun Sep 7 17:55:07 EDT 1997 # Whom: Randall Hopper # -# $Id: Makefile,v 1.1.1.1 1997/09/28 13:21:41 markm Exp $ +# $Id: Makefile,v 1.2 1997/10/11 20:39:18 markm Exp $ # DISTNAME= fxtv-0.45 -CATEGORIES= x11 +CATEGORIES= graphics x11 MASTER_SITES= http://multiverse.com/~rhh/fxtv/ EXTRACT_SUFX= .tgz MAINTAINER= rhh@ct.picker.com -LIB_DEPENDS= tiff\\.3\\.:${PORTSDIR}/graphics/tiff \ +LIB_DEPENDS= tiff34\\.1\\.:${PORTSDIR}/graphics/tiff34 \ Xaw3d\\.6\\.:${PORTSDIR}/x11/Xaw3d \ Xpm\\.4\\.:${PORTSDIR}/graphics/xpm RUN_DEPENDS= sox:${PORTSDIR}/audio/sox \ diff --git a/graphics/fxtv/files/patch-aa b/graphics/fxtv/files/patch-aa new file mode 100644 index 000000000000..a3a37faf760d --- /dev/null +++ b/graphics/fxtv/files/patch-aa @@ -0,0 +1,19 @@ +--- Makefile.orig Sat Oct 11 02:42:57 1997 ++++ Makefile Thu Nov 27 10:42:46 1997 +@@ -5,13 +5,14 @@ + X11BASE = /usr/X11R6 + + override CF_VERS = -DVERS_STR=\"0.45\" +-override INC = -I$(X11BASE)/include -I/usr/local/include ++override INC = -I$(X11BASE)/include -I/usr/local/include \ ++ -I/usr/local/include/tiff34 + override LD_INC = -L$(X11BASE)/lib -L/usr/local/lib + override CFLAGS = -m486 $(INC) $(CF_VERS) + #override CFLAGS = -g $(INC) $(CF_VERS) + override LDFLAGS = $(LD_INC) + #override LDFLAGS = -g $(LD_INC) +-override LIBS = -ltiff -lXaw3d -lXmu -lXt -lXpm -lXxf86dga \ ++override LIBS = -ltiff34 -lXaw3d -lXmu -lXt -lXpm -lXxf86dga \ + -lXxf86vm -lSM -lICE -lXext -lX11 + + override FXTV_LIBDIR = $(X11BASE)/lib/X11/fxtv diff --git a/multimedia/fxtv/Makefile b/multimedia/fxtv/Makefile index 2db9864045e9..79ca4660d573 100644 --- a/multimedia/fxtv/Makefile +++ b/multimedia/fxtv/Makefile @@ -3,17 +3,17 @@ # Date created: Sun Sep 7 17:55:07 EDT 1997 # Whom: Randall Hopper # -# $Id: Makefile,v 1.1.1.1 1997/09/28 13:21:41 markm Exp $ +# $Id: Makefile,v 1.2 1997/10/11 20:39:18 markm Exp $ # DISTNAME= fxtv-0.45 -CATEGORIES= x11 +CATEGORIES= graphics x11 MASTER_SITES= http://multiverse.com/~rhh/fxtv/ EXTRACT_SUFX= .tgz MAINTAINER= rhh@ct.picker.com -LIB_DEPENDS= tiff\\.3\\.:${PORTSDIR}/graphics/tiff \ +LIB_DEPENDS= tiff34\\.1\\.:${PORTSDIR}/graphics/tiff34 \ Xaw3d\\.6\\.:${PORTSDIR}/x11/Xaw3d \ Xpm\\.4\\.:${PORTSDIR}/graphics/xpm RUN_DEPENDS= sox:${PORTSDIR}/audio/sox \ diff --git a/multimedia/fxtv/files/patch-aa b/multimedia/fxtv/files/patch-aa new file mode 100644 index 000000000000..a3a37faf760d --- /dev/null +++ b/multimedia/fxtv/files/patch-aa @@ -0,0 +1,19 @@ +--- Makefile.orig Sat Oct 11 02:42:57 1997 ++++ Makefile Thu Nov 27 10:42:46 1997 +@@ -5,13 +5,14 @@ + X11BASE = /usr/X11R6 + + override CF_VERS = -DVERS_STR=\"0.45\" +-override INC = -I$(X11BASE)/include -I/usr/local/include ++override INC = -I$(X11BASE)/include -I/usr/local/include \ ++ -I/usr/local/include/tiff34 + override LD_INC = -L$(X11BASE)/lib -L/usr/local/lib + override CFLAGS = -m486 $(INC) $(CF_VERS) + #override CFLAGS = -g $(INC) $(CF_VERS) + override LDFLAGS = $(LD_INC) + #override LDFLAGS = -g $(LD_INC) +-override LIBS = -ltiff -lXaw3d -lXmu -lXt -lXpm -lXxf86dga \ ++override LIBS = -ltiff34 -lXaw3d -lXmu -lXt -lXpm -lXxf86dga \ + -lXxf86vm -lSM -lICE -lXext -lX11 + + override FXTV_LIBDIR = $(X11BASE)/lib/X11/fxtv