From 29e5addad295b9eeeb8d1dd2e6cc7f90e20a8ecf Mon Sep 17 00:00:00 2001 From: is Date: Wed, 3 Mar 2010 14:30:13 +0000 Subject: DESTDIR support. --- mbone/vic/Makefile | 5 ++++- mbone/vic/distinfo | 4 ++-- mbone/vic/patches/patch-aj | 14 +++++++------- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/mbone/vic/Makefile b/mbone/vic/Makefile index 6e5bb455f9e..ad3552be00b 100644 --- a/mbone/vic/Makefile +++ b/mbone/vic/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.39 2010/01/25 21:14:45 is Exp $ +# $NetBSD: Makefile,v 1.40 2010/03/03 14:30:13 is Exp $ DISTNAME= vicsrc-2.8 PKGNAME= ${DISTNAME:S/src//} @@ -8,6 +8,8 @@ MASTER_SITES= ftp://ftp.ee.lbl.gov/conferencing/vic/ MAKE_JOBS_SAFE= no +PKG_DESTDIR_SUPPORT= user-destdir + .include "../../mk/bsd.prefs.mk" .if !empty(MACHINE_PLATFORM:MNetBSD-1.6*) || !empty(MACHINE_PLATFORM:MNetBSD-[2-9]*) @@ -23,6 +25,7 @@ WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} GNU_CONFIGURE= yes USE_LANGUAGES= c c++ +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 CONFIGURE_ARGS+= --with-tcl=${BUILDLINK_PREFIX.tcl} CONFIGURE_ARGS+= --with-tk=${BUILDLINK_PREFIX.tk} diff --git a/mbone/vic/distinfo b/mbone/vic/distinfo index 7082a1d4f25..0d9bc844807 100644 --- a/mbone/vic/distinfo +++ b/mbone/vic/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.13 2010/02/03 21:14:22 is Exp $ +$NetBSD: distinfo,v 1.14 2010/03/03 14:30:13 is Exp $ SHA1 (vic-2.8_ov511p0.diff.gz) = 780116733fb52058429ca7d006667e13623d008e RMD160 (vic-2.8_ov511p0.diff.gz) = 26a9c80697f3fe2650b2ed76875b9a51dd1a01d9 @@ -15,7 +15,7 @@ SHA1 (patch-af) = 4a82bb5322d16c8269923cd65c0e776a2570de90 SHA1 (patch-ag) = 75fdeba7082c220cd105250f72e7899047c0d28a SHA1 (patch-ah) = 15a00276ea8758f6f3ca96324a5596eb60399c92 SHA1 (patch-ai) = 439cc24d945d72c447bd4285fafea50cccd558d2 -SHA1 (patch-aj) = 148d183345c159e4f02a0ea10648406eb733545a +SHA1 (patch-aj) = 31b068f5c8aa4ad7346f1ec41a5179dd1c6ff1e6 SHA1 (patch-ak) = 764766b60d93e3525bea01b65a43b6b9092e55d1 SHA1 (patch-al) = ae870102e3badc8705ff517189b24766f5e13737 SHA1 (patch-am) = b9a9e31d58eaddd57394dd7b4546f3668076333c diff --git a/mbone/vic/patches/patch-aj b/mbone/vic/patches/patch-aj index 70a7aafbc4c..f17341b6ce9 100644 --- a/mbone/vic/patches/patch-aj +++ b/mbone/vic/patches/patch-aj @@ -1,8 +1,8 @@ -$NetBSD: patch-aj,v 1.1 2000/01/26 23:15:19 jlam Exp $ +$NetBSD: patch-aj,v 1.2 2010/03/03 14:30:13 is Exp $ ---- Makefile.in.orig Mon Jul 22 12:32:53 1996 -+++ Makefile.in Wed Jan 26 17:54:13 2000 -@@ -299,15 +299,9 @@ +--- Makefile.in.orig 1996-07-22 18:32:53.000000000 +0200 ++++ Makefile.in +@@ -299,15 +299,9 @@ ppmtolut: ppmtolut.c $(CC) -o $@ $(CFLAGS) ppmtolut.c -lm $(STATIC) install: force @@ -15,9 +15,9 @@ $NetBSD: patch-aj,v 1.1 2000/01/26 23:15:19 jlam Exp $ - chown bin @prefix@/bin/histtolut - chgrp bin @prefix@/bin/histtolut - chmod 555 @prefix@/bin/histtolut -+ ${BSD_INSTALL_PROGRAM} vic @prefix@/bin -+ ${BSD_INSTALL_MAN} vic.1 @prefix@/man/man1 -+ ${BSD_INSTALL_PROGRAM} histtolut @prefix@/bin ++ ${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 jpeg/*.o p64/*.o core tcl2c++ mkbv bv.c mkhuff huffcode.c \ -- cgit v1.2.3