From 19ec93808aa822cc840ff02a3656226e5d58565f Mon Sep 17 00:00:00 2001 From: obache Date: Sat, 9 Aug 2008 09:28:19 +0000 Subject: Change installation to BSD_INSTALL_*. Part of honor INSTALL_UNSTRIPPED, PR 15107. While here, add DESTDIR support. --- audio/tracker/Makefile | 13 ++++++------- audio/tracker/distinfo | 4 ++-- audio/tracker/patches/patch-aa | 16 ++++++++++------ 3 files changed, 18 insertions(+), 15 deletions(-) (limited to 'audio') diff --git a/audio/tracker/Makefile b/audio/tracker/Makefile index d62afe39985..a7e068c5a72 100644 --- a/audio/tracker/Makefile +++ b/audio/tracker/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.42 2006/04/13 23:31:19 rillig Exp $ +# $NetBSD: Makefile,v 1.43 2008/08/09 09:28:19 obache Exp $ DISTNAME= tracker-5.3 PKGREVISION= 1 @@ -15,11 +15,10 @@ NO_BIN_ON_CDROM= ${RESTRICTED} NO_SRC_ON_CDROM= ${RESTRICTED} PKG_INSTALLATION_TYPES= overwrite pkgviews +PKG_DESTDIR_SUPPORT= user-destdir WRKSRC= ${WRKDIR}/tracker MAKE_FLAGS+= MACHINE=${LOWER_OPSYS:Q} INSTALL=${INSTALL:Q} \ - INST_BIN_OPT="-c -s -m ${BINMODE} -o ${BINOWN} -g ${BINGRP}" \ - INST_MAN_OPT="-c -m 644 -o ${BINOWN} -g ${BINGRP}" \ COMPRESSION_FILE=${PKG_SYSCONFDIR}/compression_methods \ COMPRESSION_FILE_EG=${EGDIR}/compression_methods @@ -27,7 +26,7 @@ EGDIR= ${PREFIX}/share/examples/tracker CONF_FILES= ${EGDIR}/compression_methods ${PKG_SYSCONFDIR}/compression_methods USE_TOOLS+= makeinfo -INFO_FILES= # PLIST +INFO_FILES= YES INSTALLATION_DIRS= bin ${PKGINFODIR} ${EGDIR} @@ -40,8 +39,8 @@ post-build: ${RM} *.orig post-install: - ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/tracker - ${CP} -R ${WRKSRC}/Docs/* ${PREFIX}/share/doc/tracker - ${INSTALL_DATA} ${WRKDIR}/tracker.info* ${PREFIX}/${PKGINFODIR} + ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/tracker + ${CP} -R ${WRKSRC}/Docs/* ${DESTDIR}${PREFIX}/share/doc/tracker + ${INSTALL_DATA} ${WRKDIR}/tracker.info* ${DESTDIR}${PREFIX}/${PKGINFODIR} .include "../../mk/bsd.pkg.mk" diff --git a/audio/tracker/distinfo b/audio/tracker/distinfo index ae21ac5ee5d..790eff984a0 100644 --- a/audio/tracker/distinfo +++ b/audio/tracker/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.9 2006/03/17 08:04:15 jlam Exp $ +$NetBSD: distinfo,v 1.10 2008/08/09 09:28:19 obache Exp $ SHA1 (tracker-5.3.tgz) = b0973d6a9c363caebd3a71547412f42b0681f323 RMD160 (tracker-5.3.tgz) = d089f514ace6f64dcb90866542121b51ab5f154c Size (tracker-5.3.tgz) = 454803 bytes -SHA1 (patch-aa) = da8fa5ecf7ec2a1981e642963d147c8e293d4ad8 +SHA1 (patch-aa) = fbd80c50ac7882b3879934b5596803e21c98470d SHA1 (patch-ab) = 4acd7c74548754b4d640be784aa904e24066568d SHA1 (patch-ac) = 76ec86b6132e4f954acefa71be30b2c702114a5c SHA1 (patch-ae) = 85a1d61b5adedcf378fbed90f5337610b30c365b diff --git a/audio/tracker/patches/patch-aa b/audio/tracker/patches/patch-aa index c9f1ee394e5..99fac853f21 100644 --- a/audio/tracker/patches/patch-aa +++ b/audio/tracker/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.6 2005/11/10 20:07:17 joerg Exp $ +$NetBSD: patch-aa,v 1.7 2008/08/09 09:28:19 obache Exp $ --- Makefile.orig 1996-05-07 15:20:50.000000000 +0000 +++ Makefile @@ -66,15 +66,19 @@ $NetBSD: patch-aa,v 1.6 2005/11/10 20:07:17 joerg Exp $ config.h: $(CONFIG)config.h rm -f config.h -@@ -272,9 +290,8 @@ version.c: Makefile +@@ -270,11 +288,10 @@ version.c: Makefile + echo >version.c char \*VERSION=\"${VERSION}\"\; + install: - $(INSTALL) $(INST_BIN_OPT) tracker $(BIN_DIR) - $(INSTALL) $(INST_BIN_OPT) randomize $(BIN_DIR) +- $(INSTALL) $(INST_BIN_OPT) tracker $(BIN_DIR) +- $(INSTALL) $(INST_BIN_OPT) randomize $(BIN_DIR) - $(INSTALL) $(INST_BIN_OPT) splitmod $(BIN_DIR) - [ -f ${COMPRESSION_FILE} ] || \ - $(INSTALL) $(INST_MAN_OPT) compression_methods ${COMPRESSION_FILE} -+ [ -f ${COMPRESSION_FILE_EG} ] || \ -+ $(INSTALL) $(INST_MAN_OPT) Lib/compression_methods ${COMPRESSION_FILE_EG} ++ $(BSD_INSTALL_PROGRAM) tracker $(DESTDIR)$(BIN_DIR) ++ $(BSD_INSTALL_PROGRAM) randomize $(DESTDIR)$(BIN_DIR) ++ [ -f $(DESTDIR)${COMPRESSION_FILE_EG} ] || \ ++ $(BSD_INSTALL_MAN) Lib/compression_methods $(DESTDIR)${COMPRESSION_FILE_EG} # no manpage available, use the texinfo manual. install.man: -- cgit v1.2.3