Mon Feb 1 01:50:04 2010 UTC ()
DESTDIR support


(joerg)
diff -r1.10 -r1.11 pkgsrc/audio/trm/Makefile
diff -r1.3 -r1.4 pkgsrc/audio/trm/distinfo
diff -r1.1 -r1.2 pkgsrc/audio/trm/patches/patch-ac

cvs diff -r1.10 -r1.11 pkgsrc/audio/trm/Makefile (expand / switch to unified diff)

--- pkgsrc/audio/trm/Makefile 2007/07/01 11:59:01 1.10
+++ pkgsrc/audio/trm/Makefile 2010/02/01 01:50:04 1.11
@@ -1,34 +1,38 @@ @@ -1,34 +1,38 @@
1# $NetBSD: Makefile,v 1.10 2007/07/01 11:59:01 chris Exp $ 1# $NetBSD: Makefile,v 1.11 2010/02/01 01:50:04 joerg Exp $
2# 2#
3 3
4DISTNAME= trm-0.2.1 4DISTNAME= trm-0.2.1
5PKGREVISION= 4 5PKGREVISION= 4
6CATEGORIES= audio 6CATEGORIES= audio
7MASTER_SITES= ftp://ftp.musicbrainz.org/pub/musicbrainz/ 7MASTER_SITES= ftp://ftp.musicbrainz.org/pub/musicbrainz/
8 8
9MAINTAINER= chris@NetBSD.org 9MAINTAINER= chris@NetBSD.org
10HOMEPAGE= http://www.musicbrainz.org/products/trmgen/download.html 10HOMEPAGE= http://www.musicbrainz.org/products/trmgen/download.html
11COMMENT= Acoustic signature generator 11COMMENT= Acoustic signature generator
12 12
 13PKG_DESTDIR_SUPPORT= user-destdir
 14
13CONFLICTS= tunepimp-[0-9]* 15CONFLICTS= tunepimp-[0-9]*
14 16
15PKG_INSTALLATION_TYPES= overwrite pkgviews 17PKG_INSTALLATION_TYPES= overwrite pkgviews
16 18
17GNU_CONFIGURE= YES 19GNU_CONFIGURE= YES
18USE_LANGUAGES= c c++ 20USE_LANGUAGES= c c++
19 21
20AUTOMAKE_REQD= 1.6.3 22AUTOMAKE_REQD= 1.6.3
21USE_TOOLS+= automake aclocal autoheader autoconf 23USE_TOOLS+= automake aclocal autoheader autoconf
22 24
 25INSTALLATION_DIRS+= bin
 26
23pre-configure: 27pre-configure:
24 set -e; cd ${WRKSRC}; \ 28 set -e; cd ${WRKSRC}; \
25 aclocal; autoheader; automake -a --foreign -i; autoconf 29 aclocal; autoheader; automake -a --foreign -i; autoconf
26 30
27.include "../../audio/id3lib/buildlink3.mk" 31.include "../../audio/id3lib/buildlink3.mk"
28.include "../../audio/libmad/buildlink3.mk" 32.include "../../audio/libmad/buildlink3.mk"
29.include "../../audio/libvorbis/buildlink3.mk" 33.include "../../audio/libvorbis/buildlink3.mk"
30.include "../../audio/musicbrainz/buildlink3.mk" 34.include "../../audio/musicbrainz/buildlink3.mk"
31.include "../../multimedia/libogg/buildlink3.mk" 35.include "../../multimedia/libogg/buildlink3.mk"
32 36
33.include "../../mk/bsd.prefs.mk" 37.include "../../mk/bsd.prefs.mk"
34.include "../../mk/bsd.pkg.mk" 38.include "../../mk/bsd.pkg.mk"

cvs diff -r1.3 -r1.4 pkgsrc/audio/trm/distinfo (expand / switch to unified diff)

--- pkgsrc/audio/trm/distinfo 2007/07/01 11:59:01 1.3
+++ pkgsrc/audio/trm/distinfo 2010/02/01 01:50:04 1.4
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
1$NetBSD: distinfo,v 1.3 2007/07/01 11:59:01 chris Exp $ 1$NetBSD: distinfo,v 1.4 2010/02/01 01:50:04 joerg Exp $
2 2
3SHA1 (trm-0.2.1.tar.gz) = ea032c38ca83266026e0c10919749814282994e9 3SHA1 (trm-0.2.1.tar.gz) = ea032c38ca83266026e0c10919749814282994e9
4RMD160 (trm-0.2.1.tar.gz) = fb74d692920af62a7fcbbacfb32cd0e277e56126 4RMD160 (trm-0.2.1.tar.gz) = fb74d692920af62a7fcbbacfb32cd0e277e56126
5Size (trm-0.2.1.tar.gz) = 131349 bytes 5Size (trm-0.2.1.tar.gz) = 131349 bytes
6SHA1 (patch-aa) = 152a7b8503ca887c641aeedfdd78f2520b88763b 6SHA1 (patch-aa) = 152a7b8503ca887c641aeedfdd78f2520b88763b
7SHA1 (patch-ab) = 909c55da818a72b687c88c69a4e8d682f5a02df5 7SHA1 (patch-ab) = 909c55da818a72b687c88c69a4e8d682f5a02df5
8SHA1 (patch-ac) = 980651e3f8b196575c09aa99cf33e9ce008a708f 8SHA1 (patch-ac) = a189db1a7b5b85baa0cd813e10869146045303c7

cvs diff -r1.1 -r1.2 pkgsrc/audio/trm/patches/patch-ac (expand / switch to unified diff)

--- pkgsrc/audio/trm/patches/patch-ac 2007/07/01 11:59:01 1.1
+++ pkgsrc/audio/trm/patches/patch-ac 2010/02/01 01:50:04 1.2
@@ -1,10 +1,10 @@ @@ -1,10 +1,10 @@
1$NetBSD: patch-ac,v 1.1 2007/07/01 11:59:01 chris Exp $ 1$NetBSD: patch-ac,v 1.2 2010/02/01 01:50:04 joerg Exp $
2 2
3--- ./Makefile.am.orig 2007-07-01 12:27:37.000000000 +0100 3--- ./Makefile.am.orig 2007-07-01 12:27:37.000000000 +0100
4+++ ./Makefile.am 4+++ ./Makefile.am
5@@ -15,4 +15,4 @@ cvsclean: distclean 5@@ -15,4 +15,4 @@ cvsclean: distclean
6 rm -f configure Makefile.in install-sh missing mkinstalldirs 6 rm -f configure Makefile.in install-sh missing mkinstalldirs
7  7
8 install: 8 install:
9- $(INSTALL) -s -m 0655 trm $(prefix)/bin  9- $(INSTALL) -s -m 0655 trm $(prefix)/bin
10+ $(INSTALL) -s -m 0755 trm $(prefix)/bin  10+ $(INSTALL) -s -m 0755 trm ${DESTDIR}$(prefix)/bin