Tue Dec 9 13:19:44 2014 UTC ()
Pass rpath as linker option.


(joerg)
diff -r1.1.1.1 -r1.2 pkgsrc/audio/alacconvert/distinfo
diff -r1.1.1.1 -r1.2 pkgsrc/audio/alacconvert/patches/patch-makefile
cvs diff -r1.1.1.1 -r1.2 pkgsrc/audio/alacconvert/distinfo (expand / switch to unified diff)

--- pkgsrc/audio/alacconvert/distinfo 2011/11/14 19:43:21 1.1.1.1
+++ pkgsrc/audio/alacconvert/distinfo 2014/12/09 13:19:44 1.2
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.1.1.1 2011/11/14 19:43:21 ryoon Exp $ 1$NetBSD: distinfo,v 1.2 2014/12/09 13:19:44 joerg Exp $
2 2
3SHA1 (libalac-r3.tar.bz2) = d633e538a1d1395614346ef32292f8c16b48b2b2 3SHA1 (libalac-r3.tar.bz2) = d633e538a1d1395614346ef32292f8c16b48b2b2
4RMD160 (libalac-r3.tar.bz2) = b55bd6d8eaf5d1d8ef5bea441cfd206c95ae68ee 4RMD160 (libalac-r3.tar.bz2) = b55bd6d8eaf5d1d8ef5bea441cfd206c95ae68ee
5Size (libalac-r3.tar.bz2) = 65558 bytes 5Size (libalac-r3.tar.bz2) = 65558 bytes
6SHA1 (patch-makefile) = 7ccc64459e36b961b18323cb428ff48be99c1008 6SHA1 (patch-makefile) = f9cd2ed79e03ddfc34fac86c9f847dfbbb10b8b8
cvs diff -r1.1.1.1 -r1.2 pkgsrc/audio/alacconvert/patches/patch-makefile (expand / switch to unified diff)

--- pkgsrc/audio/alacconvert/patches/patch-makefile 2011/11/14 19:43:21 1.1.1.1
+++ pkgsrc/audio/alacconvert/patches/patch-makefile 2014/12/09 13:19:44 1.2
@@ -1,39 +1,39 @@ @@ -1,39 +1,39 @@
1$NetBSD: patch-makefile,v 1.1.1.1 2011/11/14 19:43:21 ryoon Exp $ 1$NetBSD: patch-makefile,v 1.2 2014/12/09 13:19:44 joerg Exp $
2 2
3* Dynamically linked to libalac 3* Dynamically linked to libalac
4* Add install target 4* Add install target
5 5
6--- makefile.orig 2011-11-13 08:20:10.000000000 +0000 6--- makefile.orig 2011-11-13 08:20:10.000000000 +0000
7+++ makefile 7+++ makefile
8@@ -5,9 +5,9 @@ LFLAGS = -Wall -L$(CODECDIR) -lalac 8@@ -5,9 +5,9 @@ LFLAGS = -Wall -L$(CODECDIR) -lalac
9 CC = g++ 9 CC = g++
10  10
11 SRCDIR = . 11 SRCDIR = .
12-CODECDIR = ../codec 12-CODECDIR = ../codec
13+CODECDIR = ${PREFIX}/lib 13+CODECDIR = ${PREFIX}/lib
14 OBJDIR = ./obj 14 OBJDIR = ./obj
15-INCLUDES = ../codec 15-INCLUDES = ../codec
16+INCLUDES = ${PREFIX}/include 16+INCLUDES = ${PREFIX}/include
17  17
18 HEADERS = \ 18 HEADERS = \
19 $(SRCDIR)/CAFFileALAC.h \ 19 $(SRCDIR)/CAFFileALAC.h \
20@@ -29,8 +29,7 @@ main.o \ 20@@ -29,8 +29,7 @@ main.o \
21 CAFFileALAC.o  21 CAFFileALAC.o
22  22
23 alacconvert: $(OBJS) 23 alacconvert: $(OBJS)
24- (cd $(CODECDIR); $(MAKE)) 24- (cd $(CODECDIR); $(MAKE))
25- $(CC) $(LFLAGS) $(OBJS) -o alacconvert 25- $(CC) $(LFLAGS) $(OBJS) -o alacconvert
26+ $(CC) -Wl,-R ${PREFIX}/lib $(LFLAGS) $(OBJS) -o alacconvert 26+ $(CC) -Wl,-R${PREFIX}/lib $(LFLAGS) $(OBJS) -o alacconvert
27  27
28 main.o : main.cpp 28 main.o : main.cpp
29 $(CC) -I $(INCLUDES) $(CFLAGS) main.cpp 29 $(CC) -I $(INCLUDES) $(CFLAGS) main.cpp
30@@ -41,6 +40,9 @@ CAFFileALAC.o : CAFFileALAC.cpp 30@@ -41,6 +40,9 @@ CAFFileALAC.o : CAFFileALAC.cpp
31 clean: 31 clean:
32 -rm $(OBJS) alacconvert 32 -rm $(OBJS) alacconvert
33  33
34+install: 34+install:
35+ ${BSD_INSTALL_LIB_DIR} ${DESTDIR}${PREFIX}/bin 35+ ${BSD_INSTALL_LIB_DIR} ${DESTDIR}${PREFIX}/bin
36+ ${BSD_INSTALL_PROGRAM} alacconvert ${DESTDIR}${PREFIX}/bin 36+ ${BSD_INSTALL_PROGRAM} alacconvert ${DESTDIR}${PREFIX}/bin
37  37
38  38
39  39