head 1.7; access; symbols pkgsrc-2013Q2:1.7.0.52 pkgsrc-2013Q2-base:1.7 pkgsrc-2012Q4:1.7.0.50 pkgsrc-2012Q4-base:1.7 pkgsrc-2011Q4:1.7.0.48 pkgsrc-2011Q4-base:1.7 pkgsrc-2011Q2:1.7.0.46 pkgsrc-2011Q2-base:1.7 pkgsrc-2009Q4:1.7.0.44 pkgsrc-2009Q4-base:1.7 pkgsrc-2008Q4:1.7.0.42 pkgsrc-2008Q4-base:1.7 pkgsrc-2008Q3:1.7.0.40 pkgsrc-2008Q3-base:1.7 cube-native-xorg:1.7.0.38 cube-native-xorg-base:1.7 pkgsrc-2008Q2:1.7.0.36 pkgsrc-2008Q2-base:1.7 pkgsrc-2008Q1:1.7.0.34 pkgsrc-2008Q1-base:1.7 pkgsrc-2007Q4:1.7.0.32 pkgsrc-2007Q4-base:1.7 pkgsrc-2007Q3:1.7.0.30 pkgsrc-2007Q3-base:1.7 pkgsrc-2007Q2:1.7.0.28 pkgsrc-2007Q2-base:1.7 pkgsrc-2007Q1:1.7.0.26 pkgsrc-2007Q1-base:1.7 pkgsrc-2006Q4:1.7.0.24 pkgsrc-2006Q4-base:1.7 pkgsrc-2006Q3:1.7.0.22 pkgsrc-2006Q3-base:1.7 pkgsrc-2006Q2:1.7.0.20 pkgsrc-2006Q2-base:1.7 pkgsrc-2006Q1:1.7.0.18 pkgsrc-2006Q1-base:1.7 pkgsrc-2005Q4:1.7.0.16 pkgsrc-2005Q4-base:1.7 pkgsrc-2005Q3:1.7.0.14 pkgsrc-2005Q3-base:1.7 pkgsrc-2005Q2:1.7.0.12 pkgsrc-2005Q2-base:1.7 pkgsrc-2005Q1:1.7.0.10 pkgsrc-2005Q1-base:1.7 pkgsrc-2004Q4:1.7.0.8 pkgsrc-2004Q4-base:1.7 pkgsrc-2004Q3:1.7.0.6 pkgsrc-2004Q3-base:1.7 pkgsrc-2004Q2:1.7.0.4 pkgsrc-2004Q2-base:1.7 pkgsrc-2004Q1:1.7.0.2 pkgsrc-2004Q1-base:1.7 pkgsrc-2003Q4:1.6.0.4 pkgsrc-2003Q4-base:1.6 netbsd-1-6-1:1.6.0.2 netbsd-1-6-1-base:1.6 netbsd-1-6:1.4.0.8 netbsd-1-6-RELEASE-base:1.4 pkgviews:1.4.0.4 pkgviews-base:1.4 buildlink2:1.4.0.2 buildlink2-base:1.4 netbsd-1-5-PATCH003:1.4 netbsd-1-5-PATCH001:1.4 netbsd-1-5-RELEASE:1.2 netbsd-1-4-PATCH003:1.2 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.7 date 2004.01.26.11.40.57; author jmmv; state dead; branches; next 1.6; 1.6 date 2002.12.21.11.10.00; author wiz; state Exp; branches; next 1.5; 1.5 date 2002.10.08.13.09.52; author jlam; state Exp; branches; next 1.4; 1.4 date 2001.02.17.22.04.17; author veego; state Exp; branches; next 1.3; 1.3 date 2001.02.13.21.45.07; author tron; state Exp; branches; next 1.2; 1.2 date 2000.08.23.21.27.59; author veego; state Exp; branches; next 1.1; 1.1 date 2000.05.07.20.34.13; author tron; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2000.05.07.20.34.13; author tron; state Exp; branches; next ; desc @@ 1.7 log @fxtv moved to the multimedia category. @ text @$NetBSD: patch-aa,v 1.6 2002/12/21 11:10:00 wiz Exp $ --- Makefile.orig Mon Feb 12 23:08:59 2001 +++ Makefile @@@@ -4,13 +4,10 @@@@ HAVE_XFREE86 = YES -ifneq ($(X11PREFIX),) # NetBSD -X11BASE ?= $(X11PREFIX) -else X11BASE ?= /usr/X11R6 -endif +X11BASEINST ?= $(PREFIX) -X11BASEINST ?= $(X11BASE) +PREFIX ?= /usr/local LOCALBASE ?= /usr/local DEBUG = NO OS = $(shell uname -s) @@@@ -24,15 +21,6 @@@@ override LIBDIRS = $(X11BASE)/ override SHELL = /bin/sh # -# NetBSD stuff -# -ifeq ($(OS),NetBSD) - override INC += -I/usr/pkg/include - override LIBDIRS += /usr/pkg/lib - override LD_INC += -lossaudio -lz -endif - -# # OpenBSD stuff # ifeq ($(OS),OpenBSD) @@@@ -72,6 +60,15 @@@@ endif override CFLAGS += $(C_WARN_FLAG) -DX11BASE=\"$(X11BASEINST)\" +# +# NetBSD stuff +# +ifeq ($(OS),NetBSD) + override INC += -I$(LOCALBASE)/include + override LIBDIRS += $(LOCALBASE)/lib + override LD_INC += $(LIBOSSAUDIO) -lz +endif + ifeq ($(OS), linux) override CFLAGS = $(CFLAGS) -DOLD_TUNER_IFACE endif @@@@ -81,7 +78,7 @@@@ endif # override LDFLAGS = $(LD_INC) override VIDEOLIB_LIB = $(VIDEOLIB_DIR)/libvideo.a -override LIBS = -ltiff -ljpeg -lXaw3d -lXmu -lXt -lXpm \ +override LIBS = -lpng -ltiff -ljpeg -lXaw3d -lXmu -lXt -lXpm \ -lSM -lICE -lXext -lX11 -lm ifeq ($(HAVE_XFREE86),YES) override LIBS += -lXxf86dga -lXxf86vm @ 1.6 log @Add PNG support, written by Thomas Klausner. Sent back to maintainer, but development seems to be dormant right now. Bump version to 1.03nb2. @ text @d1 1 a1 1 $NetBSD$ @ 1.5 log @buildlink1 -> buildlink2 and make this work with audio/oss. @ text @d3 1 a3 1 --- Makefile.orig Mon Feb 12 14:08:59 2001 d37 1 a37 2 @@@@ -71,6 +59,15 @@@@ override CFLAGS += -DHAVE_XFRE endif d40 1 a40 1 + d49 1 a49 1 d52 10 @ 1.4 log @X11BASEINST needs the special handling on NetBSD and not X11BASE. xpkgwedge works again. @ text @d3 3 a5 3 --- Makefile.orig Mon Feb 12 23:08:59 2001 +++ Makefile Sat Feb 17 22:47:49 2001 @@@@ -4,13 +4,14 @@@@ d9 1 a9 3 +X11BASE ?= /usr/X11R6 + ifneq ($(X11PREFIX),) # NetBSD d11 4 a14 5 +X11BASEINST ?= $(X11PREFIX) else -X11BASE ?= /usr/X11R6 +X11BASEINST ?= $(X11BASE) endif d17 1 d21 1 a21 1 @@@@ -24,15 +25,6 @@@@ d37 1 a37 1 @@@@ -71,6 +63,15 @@@@ d48 1 a48 1 + override LD_INC += -lossaudio -lz @ 1.3 log @Update "fxtv" package to version 1.03. Changes since version 1.02: - When MPEG-encoding audio, force 16-bit signed intermediate AIFFs -- PCM driver doesn't support this format for some cards like AWE32 (Andre Albsmeier ) - Added METEOR_INPUT_DEV3 support (GUI & Fxtv.defaultInput = "dev3") - Flip channel (to last channel set) feature with TVFlipStation() X action routine (Steve Reid ) - Add SOUND_MIXER_VIDEO audio input (Mike Myer) - Mouse include patch (Anonymous) - Makefile update for LOCALBASE (Alexander Langer ) - NetBSD updates (Thomas Klausner ) ftp://ftp.netbsd.org/pub/NetBSD/packages/pkgsrc/graphics/fxtv/README.html - Added 'line1', 'line2', 'line3' as valid mixerChannel values - Uncomment all remote code for NetBSD folks - Remove double-link of libvideo.a from Makefile - Support for france channelset (Daniel Dagneaux ) - Changed -aspectlock to -noaspectlock - Fix -default csvideo not working (greedy strstr matches wrong input) - Remove stray printf in YUV capture - Fixes for capturing when path doesn't contain a dot, and pcm driver sound format limitation work-around (Andre Albsmeier ) - OpenBSD changes from vedge and Matthew McNaughton @ text @d4 20 a23 2 +++ Makefile Tue Feb 13 22:42:19 2001 @@@@ -24,15 +24,6 @@@@ d39 1 a39 1 @@@@ -71,6 +62,15 @@@@ @ 1.2 log @Change a few X11BASE to X11PREFIX so it works with xpkgwedge. @ text @d3 3 a5 18 --- Makefile Fri Nov 5 01:43:51 1999 +++ Makefile Wed Aug 23 23:10:41 2000 @@@@ -3,7 +3,6 @@@@ # HAVE_XFREE86 = YES -X11BASE = /usr/X11R6 DEBUG = NO OS = $(shell uname -s) OS_MAJOR = $(shell uname -r | cut -f1 -d\.) @@@@ -11,8 +10,8 @@@@ override CF_VERS = -DVERS_STR=\"1.02\" override VIDEOLIB_DIR = ./videolib override INC = -I$(X11BASE)/include -I/usr/local/include \ - -I$(VIDEOLIB_DIR) -I. -override LIBDIRS = $(X11BASE)/lib /usr/local/lib + -I$(VIDEOLIB_DIR) -I. -I/usr/pkg/include +override LIBDIRS = $(X11BASE)/lib /usr/local/lib /usr/pkg/lib d9 13 a21 2 @@@@ -53,7 +52,7 @@@@ override CFLAGS += -DHAVE_XFREE86 d24 10 a33 2 -override CFLAGS += $(C_WARN_FLAG) -DX11BASE=\"$(X11BASE)\" +override CFLAGS += $(C_WARN_FLAG) -DX11BASE=\"$(X11PREFIX)\" a36 26 @@@@ -74,7 +73,7 @@@@ override LDFLAGS := -g $(LDFLAGS) endif -override FXTV_LIBDIR = $(X11BASE)/lib/X11/fxtv +override FXTV_LIBDIR = $(X11PREFIX)/lib/X11/fxtv override CSRC = $(wildcard *.c) override PIXMAPS = $(wildcard bitmaps/*.x?m) @@@@ -102,11 +101,11 @@@@ mkdir -p $(FXTV_LIBDIR)/bitmaps install -c -m 444 -o root $(PIXMAPS) $(FXTV_LIBDIR)/bitmaps install -c -m 444 -o root README $(FXTV_LIBDIR) - mkdir -p $(X11BASE)/lib/X11/app-defaults - install -c -m 444 -o root Fxtv $(X11BASE)/lib/X11/app-defaults - mkdir -p $(X11BASE)/bin - install -c -m 444 -o root fxtv.1 $(X11BASE)/man/man1/fxtv.1 - install -c -m 555 -o root fxtv $(X11BASE)/bin + mkdir -p $(X11PREFIX)/lib/X11/app-defaults + install -c -m 444 -o root Fxtv $(X11PREFIX)/lib/X11/app-defaults + mkdir -p $(X11PREFIX)/bin + install -c -m 444 -o root fxtv.1 $(X11PREFIX)/man/man1/fxtv.1 + install -c -m 555 -o root fxtv $(X11PREFIX)/bin install -c -m 555 -o root fxtv_cnvt.sh $(FXTV_LIBDIR) clean: @ 1.1 log @Initial revision @ text @d3 2 a4 2 --- Makefile.orig Fri Nov 5 01:43:51 1999 +++ Makefile Sun May 7 22:30:05 2000 d24 35 @ 1.1.1.1 log @Initial import of new "fxtv" package: TV display application for Brooktree 848 compatible TV cards @ text @@