Sat Aug 29 11:49:06 2009 UTC ()
Convert to user-destdir.


(wiz)
diff -r1.21 -r1.22 pkgsrc/multimedia/fxtv/Makefile
diff -r1.10 -r1.11 pkgsrc/multimedia/fxtv/distinfo
diff -r1.5 -r1.6 pkgsrc/multimedia/fxtv/patches/patch-aa
cvs diff -r1.21 -r1.22 pkgsrc/multimedia/fxtv/Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/fxtv/Makefile 2009/08/26 19:58:05 1.21
+++ pkgsrc/multimedia/fxtv/Makefile 2009/08/29 11:49:05 1.22
@@ -1,28 +1,31 @@ @@ -1,28 +1,31 @@
1# $NetBSD: Makefile,v 1.21 2009/08/26 19:58:05 sno Exp $ 1# $NetBSD: Makefile,v 1.22 2009/08/29 11:49:05 wiz Exp $
2 2
3DISTNAME= fxtv-1.03 3DISTNAME= fxtv-1.03
4PKGREVISION= 14 4PKGREVISION= 14
5CATEGORIES= multimedia 5CATEGORIES= multimedia
6MASTER_SITES= ${HOMEPAGE} 6MASTER_SITES= ${HOMEPAGE}
7EXTRACT_SUFX= .tgz 7EXTRACT_SUFX= .tgz
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://people.freebsd.org/~rhh/fxtv/ 10HOMEPAGE= http://people.freebsd.org/~rhh/fxtv/
11COMMENT= TV display application for Brooktree 848 compatible TV cards 11COMMENT= TV display application for Brooktree 848 compatible TV cards
12 12
13USE_X11BASE= YES 13PKG_DESTDIR_SUPPORT= user-destdir
 14
14USE_TOOLS+= gmake 15USE_TOOLS+= gmake
15 16
 17INSTALLATION_DIRS= ${PKGMANDIR}/man1
 18
16SUBST_CLASSES+= ossaudio 19SUBST_CLASSES+= ossaudio
17SUBST_MESSAGE.ossaudio= Fixing path to audio device. 20SUBST_MESSAGE.ossaudio= Fixing path to audio device.
18SUBST_STAGE.ossaudio= pre-configure 21SUBST_STAGE.ossaudio= pre-configure
19SUBST_FILES.ossaudio= app_rsrc.h Fxtv README 22SUBST_FILES.ossaudio= app_rsrc.h Fxtv README
20SUBST_SED.ossaudio= -e 's|/dev/dsp|${DEVOSSAUDIO}|g' 23SUBST_SED.ossaudio= -e 's|/dev/dsp|${DEVOSSAUDIO}|g'
21 24
22SUBST_CLASSES+= root 25SUBST_CLASSES+= root
23SUBST_STAGE.root= pre-configure 26SUBST_STAGE.root= pre-configure
24SUBST_FILES.root= Makefile 27SUBST_FILES.root= Makefile
25SUBST_SED.root= -e 's,-o root,-o ${ROOT_USER},' 28SUBST_SED.root= -e 's,-o root,-o ${ROOT_USER},'
26 29
27post-extract: 30post-extract:
28 @${RM} -f ${WRKSRC}/videolib/videolib.o 31 @${RM} -f ${WRKSRC}/videolib/videolib.o
cvs diff -r1.10 -r1.11 pkgsrc/multimedia/fxtv/distinfo (expand / switch to unified diff)

--- pkgsrc/multimedia/fxtv/distinfo 2008/01/16 13:54:17 1.10
+++ pkgsrc/multimedia/fxtv/distinfo 2009/08/29 11:49:05 1.11
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1$NetBSD: distinfo,v 1.10 2008/01/16 13:54:17 jmcneill Exp $ 1$NetBSD: distinfo,v 1.11 2009/08/29 11:49:05 wiz Exp $
2 2
3SHA1 (fxtv-1.03.tgz) = 2ed9f2bee879a931c7f963a4ad7d07ef9cd297f9 3SHA1 (fxtv-1.03.tgz) = 2ed9f2bee879a931c7f963a4ad7d07ef9cd297f9
4RMD160 (fxtv-1.03.tgz) = 740ddbb4e3b58028a6b8f17483bc27b82420f280 4RMD160 (fxtv-1.03.tgz) = 740ddbb4e3b58028a6b8f17483bc27b82420f280
5Size (fxtv-1.03.tgz) = 198669 bytes 5Size (fxtv-1.03.tgz) = 198669 bytes
6SHA1 (patch-aa) = 43abd48d119dc626f60c9efc666c2bca7015af11 6SHA1 (patch-aa) = fd037c3128d4a4b036d65599ca5b9580ff7e1d23
7SHA1 (patch-ab) = 80523d5cb2fcc06c2486f3be2556f5f9b1362472 7SHA1 (patch-ab) = 80523d5cb2fcc06c2486f3be2556f5f9b1362472
8SHA1 (patch-ac) = 27a825287c17d1cc957fb89ba2f665c01f998c15 8SHA1 (patch-ac) = 27a825287c17d1cc957fb89ba2f665c01f998c15
9SHA1 (patch-ad) = daea79659e2b7af142ca101601887d58239f35d7 9SHA1 (patch-ad) = daea79659e2b7af142ca101601887d58239f35d7
10SHA1 (patch-ae) = aa7689ff62388d4d50f89501f2c3084bc04409d8 10SHA1 (patch-ae) = aa7689ff62388d4d50f89501f2c3084bc04409d8
11SHA1 (patch-af) = 48a07b3407f40be23594b4957bb8a590cd9ef585 11SHA1 (patch-af) = 48a07b3407f40be23594b4957bb8a590cd9ef585
12SHA1 (patch-ag) = 13655a94cd6200d12e25d406d7c1923f89000c80 12SHA1 (patch-ag) = 13655a94cd6200d12e25d406d7c1923f89000c80
13SHA1 (patch-ah) = 896d5164b176154b398f52d5c9887210da3d1e77 13SHA1 (patch-ah) = 896d5164b176154b398f52d5c9887210da3d1e77
14SHA1 (patch-ai) = 85baa4b457dede91bf74ce0d8e4655fae9da2d96 14SHA1 (patch-ai) = 85baa4b457dede91bf74ce0d8e4655fae9da2d96
15SHA1 (patch-aj) = d614a3b8813b07eaf4c17ae20b492b008df1f5d6 15SHA1 (patch-aj) = d614a3b8813b07eaf4c17ae20b492b008df1f5d6
16SHA1 (patch-ak) = 87e4f9636aa798f9f0f5a4e27a936f800461667a 16SHA1 (patch-ak) = 87e4f9636aa798f9f0f5a4e27a936f800461667a
17SHA1 (patch-al) = d60ac498f40cd9ec833ca436708cb140856826f1 17SHA1 (patch-al) = d60ac498f40cd9ec833ca436708cb140856826f1
18SHA1 (patch-am) = f88d368bc6f1adb41b7e4160d8e9138d230e8cd8 18SHA1 (patch-am) = f88d368bc6f1adb41b7e4160d8e9138d230e8cd8
19SHA1 (patch-an) = 8e26f893efd97fbdb6f42a7a7f67347bfedb9abe 19SHA1 (patch-an) = 8e26f893efd97fbdb6f42a7a7f67347bfedb9abe
cvs diff -r1.5 -r1.6 pkgsrc/multimedia/fxtv/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/multimedia/fxtv/patches/patch-aa 2007/01/26 15:15:50 1.5
+++ pkgsrc/multimedia/fxtv/patches/patch-aa 2009/08/29 11:49:05 1.6
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-aa,v 1.5 2007/01/26 15:15:50 joerg Exp $ 1$NetBSD: patch-aa,v 1.6 2009/08/29 11:49:05 wiz Exp $
2 2
3--- Makefile.orig 2001-02-12 22:08:59.000000000 +0000 3--- Makefile.orig 2001-02-12 22:08:59.000000000 +0000
4+++ Makefile 4+++ Makefile
5@@ -4,13 +4,10 @@ 5@@ -4,13 +4,10 @@
6  6
7 HAVE_XFREE86 = YES 7 HAVE_XFREE86 = YES
8  8
9-ifneq ($(X11PREFIX),) # NetBSD 9-ifneq ($(X11PREFIX),) # NetBSD
10-X11BASE ?= $(X11PREFIX) 10-X11BASE ?= $(X11PREFIX)
11-else 11-else
12 X11BASE ?= /usr/X11R6 12 X11BASE ?= /usr/X11R6
13-endif 13-endif
14+X11BASEINST ?= $(PREFIX) 14+X11BASEINST ?= $(PREFIX)
@@ -74,13 +74,38 @@ $NetBSD: patch-aa,v 1.5 2007/01/26 15:15 @@ -74,13 +74,38 @@ $NetBSD: patch-aa,v 1.5 2007/01/26 15:15
74+ 74+
75 ifeq ($(OS), linux) 75 ifeq ($(OS), linux)
76 override CFLAGS = $(CFLAGS) -DOLD_TUNER_IFACE 76 override CFLAGS = $(CFLAGS) -DOLD_TUNER_IFACE
77 endif 77 endif
78@@ -81,7 +81,7 @@ endif 78@@ -81,7 +81,7 @@ endif
79 # 79 #
80 override LDFLAGS = $(LD_INC)  80 override LDFLAGS = $(LD_INC)
81 override VIDEOLIB_LIB = $(VIDEOLIB_DIR)/libvideo.a 81 override VIDEOLIB_LIB = $(VIDEOLIB_DIR)/libvideo.a
82-override LIBS = -ltiff -ljpeg -lXaw3d -lXmu -lXt -lXpm \ 82-override LIBS = -ltiff -ljpeg -lXaw3d -lXmu -lXt -lXpm \
83+override LIBS = -lpng -ltiff -ljpeg -lXaw -lXmu -lXt -lXpm \ 83+override LIBS = -lpng -ltiff -ljpeg -lXaw -lXmu -lXt -lXpm \
84 -lSM -lICE -lXext -lX11 -lm 84 -lSM -lICE -lXext -lX11 -lm
85 ifeq ($(HAVE_XFREE86),YES) 85 ifeq ($(HAVE_XFREE86),YES)
86 override LIBS += -lXxf86dga -lXxf86vm 86 override LIBS += -lXxf86dga -lXxf86vm
 87@@ -116,15 +116,15 @@ $(VIDEOLIB_LIB) :
 88 tv.o : tv.c app_rsrc.h
 89
 90 install : fxtv
 91- mkdir -p $(FXTV_LIBDIR)/bitmaps
 92- install -c -m 444 -o root $(PIXMAPS) $(FXTV_LIBDIR)/bitmaps
 93- install -c -m 444 -o root README $(FXTV_LIBDIR)
 94- mkdir -p $(X11BASEINST)/lib/X11/app-defaults
 95- install -c -m 444 -o root Fxtv $(X11BASEINST)/lib/X11/app-defaults
 96- mkdir -p $(X11BASEINST)/bin
 97- install -c -m 444 -o root fxtv.1 $(X11BASEINST)/man/man1/fxtv.1
 98- install -c -m 555 -o root fxtv $(X11BASEINST)/bin
 99- install -c -m 555 -o root fxtv_cnvt.sh $(FXTV_LIBDIR)
 100+ mkdir -p ${DESTDIR}$(FXTV_LIBDIR)/bitmaps
 101+ install -c -m 444 -o pbulk $(PIXMAPS) ${DESTDIR}$(FXTV_LIBDIR)/bitmaps
 102+ install -c -m 444 -o pbulk README ${DESTDIR}$(FXTV_LIBDIR)
 103+ mkdir -p ${DESTDIR}$(X11BASEINST)/lib/X11/app-defaults
 104+ install -c -m 444 -o pbulk Fxtv ${DESTDIR}$(X11BASEINST)/lib/X11/app-defaults
 105+ mkdir -p ${DESTDIR}$(X11BASEINST)/bin
 106+ install -c -m 444 -o pbulk fxtv.1 ${DESTDIR}$(X11BASEINST)/man/man1/fxtv.1
 107+ install -c -m 555 -o pbulk fxtv ${DESTDIR}$(X11BASEINST)/bin
 108+ install -c -m 555 -o pbulk fxtv_cnvt.sh ${DESTDIR}$(FXTV_LIBDIR)
 109
 110 clean:
 111 rm -f *.o fxtv *.core *~