Add DESTDIR support (and fix man path at same time).

Bump PKGREVISION

4 files changed, 31 insertions, 11 deletions

diff --git a/mbone/vic-devel/Makefile b/mbone/vic-devel/Makefile
index bcfc14e8d07..51c3fbf7495 100644
--- a/mbone/vic-devel/Makefile
+++ b/mbone/vic-devel/Makefile
@@ -1,13 +1,15 @@
-# $NetBSD: Makefile,v 1.3 2009/10/07 16:03:00 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2010/03/08 12:10:06 sborrill Exp $
 
 DISTNAME=	vic-2.8ucl1.4.0beta-4337
 PKGNAME=	vic-devel-2.8.1.4.0beta.4337
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	mbone tk
 MASTER_SITES=	http://www.NetBSD.org/~sborrill/snapshots/
 
 MAKE_JOBS_SAFE=	no
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 .include "../../mk/bsd.prefs.mk"
 .include "options.mk"
 
@@ -25,6 +27,7 @@ WRKSRC=		${WRKDIR}/vic-mpeg4
 GNU_CONFIGURE=	yes
 
 USE_LANGUAGES=	c c++
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 CONFIGURE_ARGS+=	--with-tcl=${BUILDLINK_PREFIX.tcl}/lib
 CONFIGURE_ARGS+=	--with-tk=${BUILDLINK_PREFIX.tk}/lib
diff --git a/mbone/vic-devel/PLIST b/mbone/vic-devel/PLIST
index 45f9c5e8d4e..0fad5f1f2f6 100644
--- a/mbone/vic-devel/PLIST
+++ b/mbone/vic-devel/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2008/12/16 19:35:45 sborrill Exp $
+@comment $NetBSD: PLIST,v 1.2 2010/03/08 12:10:06 sborrill Exp $
 bin/histtolut
 bin/vic
-man/vic.1
+man/man1/vic.1
diff --git a/mbone/vic-devel/distinfo b/mbone/vic-devel/distinfo
index 16851736cb6..f20618fad26 100644
--- a/mbone/vic-devel/distinfo
+++ b/mbone/vic-devel/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2009/07/01 13:51:47 sborrill Exp $
+$NetBSD: distinfo,v 1.3 2010/03/08 12:10:06 sborrill Exp $
 
 SHA1 (vic-2.8ucl1.4.0_ov511.diff.gz) = 46faceb1d926820e41ffda71228f63959747a73e
 RMD160 (vic-2.8ucl1.4.0_ov511.diff.gz) = b60a9d3f5764cc4528dffbf5e9465301d71723de
@@ -6,7 +6,7 @@ Size (vic-2.8ucl1.4.0_ov511.diff.gz) = 8646 bytes
 SHA1 (vic-2.8ucl1.4.0beta-4337.tgz) = 6c15491fa5bdfaedf94731094f8952ed3ff027bb
 RMD160 (vic-2.8ucl1.4.0beta-4337.tgz) = 631b18fe036c289e5622722e521af2c9735c63da
 Size (vic-2.8ucl1.4.0beta-4337.tgz) = 9345775 bytes
-SHA1 (patch-Makefile.in) = f908c984d9bd9c216ceda0eba99987904eea4dfd
+SHA1 (patch-Makefile.in) = 417c540eb903ace3c5859f21d92556494d52c30d
 SHA1 (patch-color-swscale.cpp) = 0796262c5db74cc354ce7f55ae246c489f5c9b33
 SHA1 (patch-configure) = 509e31f0e0c1037701d7f012569ac5e5e1e4c033
 SHA1 (patch-crypt-rijndael.cpp) = 5dfda8c17c91fa5f6b2df24d4e1ed93bc4ae5b87
diff --git a/mbone/vic-devel/patches/patch-Makefile.in b/mbone/vic-devel/patches/patch-Makefile.in
index 5945b6e916d..36cb572d9ba 100644
--- a/mbone/vic-devel/patches/patch-Makefile.in
+++ b/mbone/vic-devel/patches/patch-Makefile.in
@@ -1,9 +1,7 @@
-$NetBSD: patch-Makefile.in,v 1.1.1.1 2008/12/16 19:35:46 sborrill Exp $
+$NetBSD: patch-Makefile.in,v 1.2 2010/03/08 12:10:07 sborrill Exp $
 
-Dynamically link common mml library
-
---- Makefile.in.orig	2008-12-10 21:06:38.000000000 +0000
-+++ Makefile.in	2008-12-10 21:06:52.000000000 +0000
+--- Makefile.in.orig	2008-12-10 19:24:48.000000000 +0000
++++ Makefile.in	2010-03-08 11:54:16.000000000 +0000
 @@ -92,7 +92,7 @@
  CODEC_LIB = @V_CODEC_LIB@ codec/tmndec/libh263.a codec/tmn-x/libh263coder.a
  
@@ -13,3 +11,22 @@ Dynamically link common mml library
  
  
  INCLUDE = $(INCLUDE_MISC) $(INCLUDE_GRABBER) $(INCLUDE_TK) $(INCLUDE_TCL) \
+@@ -349,15 +349,9 @@
+ 	$(CC) -o $@ $(CFLAGS) render/ppmtolut/ppmtolut.c -lm $(STATIC)
+ 
+ install: force
+-	 cp vic @prefix@/bin/vic
+-	 chown bin @prefix@/bin/vic
+-	 chgrp bin @prefix@/bin/vic
+-	 chmod 555 @prefix@/bin/vic
+-	 cp vic.1 @prefix@/man/vic.1
+-	 cp histtolut @prefix@/bin/histtolut
+-	 chown bin @prefix@/bin/histtolut
+-	 chgrp bin @prefix@/bin/histtolut
+-	 chmod 555 @prefix@/bin/histtolut
++	${BSD_INSTALL_PROGRAM} vic ${DESTDIR}@prefix@/bin
++	${BSD_INSTALL_MAN} vic.1 ${DESTDIR}@prefix@/man/man1
++	${BSD_INSTALL_PROGRAM} histtolut ${DESTDIR}@prefix@/bin
+ 
+ clean:
+ 	rm -f *.o codec/jpeg/*.o codec/p64/*.o codec/h263/*.o \