Thu Jan 17 15:53:11 2013 UTC ()
Add rpath for X11 location.


(joerg)
diff -r1.4 -r1.5 pkgsrc/fonts/xmbdfed/distinfo
diff -r1.1.1.1 -r1.2 pkgsrc/fonts/xmbdfed/patches/patch-aa
cvs diff -r1.4 -r1.5 pkgsrc/fonts/xmbdfed/distinfo (expand / switch to unified diff)

--- pkgsrc/fonts/xmbdfed/distinfo 2006/06/17 19:42:59 1.4
+++ pkgsrc/fonts/xmbdfed/distinfo 2013/01/17 15:53:10 1.5
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
1$NetBSD: distinfo,v 1.4 2006/06/17 19:42:59 minskim Exp $ 1$NetBSD: distinfo,v 1.5 2013/01/17 15:53:10 joerg Exp $
2 2
3SHA1 (xmbdfed-4.5.tar.gz) = 325f2f3a8ae68b3f5d22ff9bdd115d30cdd743db 3SHA1 (xmbdfed-4.5.tar.gz) = 325f2f3a8ae68b3f5d22ff9bdd115d30cdd743db
4RMD160 (xmbdfed-4.5.tar.gz) = a6c1d9202e6d978dbc0aaa1fb6389a3d14b16c26 4RMD160 (xmbdfed-4.5.tar.gz) = a6c1d9202e6d978dbc0aaa1fb6389a3d14b16c26
5Size (xmbdfed-4.5.tar.gz) = 282055 bytes 5Size (xmbdfed-4.5.tar.gz) = 282055 bytes
6SHA1 (patch-aa) = c56292901cfe776c26fc21da2b851aa2fccf2e02 6SHA1 (patch-aa) = a7eaacef7135ea315b6951fd8793e266baceb20e
7SHA1 (patch-ab) = eb5c46e723988cf9febf65f64e0b142ce8dccde3 7SHA1 (patch-ab) = eb5c46e723988cf9febf65f64e0b142ce8dccde3
8SHA1 (patch-ac) = c62140d171ea96418d48ee4b236cde8bb87b545d 8SHA1 (patch-ac) = c62140d171ea96418d48ee4b236cde8bb87b545d
cvs diff -r1.1.1.1 -r1.2 pkgsrc/fonts/xmbdfed/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/fonts/xmbdfed/patches/patch-aa 2002/10/15 12:29:19 1.1.1.1
+++ pkgsrc/fonts/xmbdfed/patches/patch-aa 2013/01/17 15:53:11 1.2
@@ -1,31 +1,31 @@ @@ -1,31 +1,31 @@
1$NetBSD: patch-aa,v 1.1.1.1 2002/10/15 12:29:19 kei Exp $ 1$NetBSD: patch-aa,v 1.2 2013/01/17 15:53:11 joerg Exp $
2 2
3--- Makefile.orig Fri Mar 17 05:08:49 2000 3--- Makefile.orig Fri Mar 17 05:08:49 2000
4+++ Makefile Wed Mar 20 00:37:53 2002 4+++ Makefile Wed Mar 20 00:37:53 2002
5@@ -24,4 +24,4 @@ 5@@ -24,4 +24,4 @@
6 # 6 #
7-CC = gcc 7-CC = gcc
8-CFLAGS = -g -Wall 8-CFLAGS = -g -Wall
9+#CC = gcc 9+#CC = gcc
10+#CFLAGS = -g -Wall 10+#CFLAGS = -g -Wall
11  11
12@@ -48,5 +48,5 @@ 12@@ -48,5 +48,5 @@
13 # 13 #
14-#FTYPE_INCS = -I/usr/local/include 14-#FTYPE_INCS = -I/usr/local/include
15-#FTYPE_LIBS = -L/user/local/lib -lttf 15-#FTYPE_LIBS = -L/user/local/lib -lttf
16-#FTYPE_DEFS = -DHAVE_FREETYPE 16-#FTYPE_DEFS = -DHAVE_FREETYPE
17+FTYPE_INCS = -I${LOCALBASE}/include/freetype 17+FTYPE_INCS = -I${X11PREFIX}/include/freetype
18+FTYPE_LIBS = -L${LOCALBASE}/lib -lttf 18+FTYPE_LIBS = -L${X11PREFIX}/lib -Wl,-rpath,${X11PREFIX}/lib -lttf
19+FTYPE_DEFS = -DHAVE_FREETYPE 19+FTYPE_DEFS = -DHAVE_FREETYPE
20  20
21@@ -66,3 +66,3 @@ 21@@ -66,3 +66,3 @@
22 # 22 #
23-HBFDEFS = -Dunix -DIN_MEMORY -DGUNZIP_CMD="\"/usr/local/bin/gunzip -c\"" 23-HBFDEFS = -Dunix -DIN_MEMORY -DGUNZIP_CMD="\"/usr/local/bin/gunzip -c\""
24+#HBFDEFS = -Dunix -DIN_MEMORY -DGUNZIP_CMD="\"${PREFIX}/bin/gunzip -c\"" 24+#HBFDEFS = -Dunix -DIN_MEMORY -DGUNZIP_CMD="\"${PREFIX}/bin/gunzip -c\""
25  25
26@@ -73,2 +73,6 @@ 26@@ -73,2 +73,6 @@
27  27
28+INCS = -I${X11BASE}/include -I${LOCALBASE}/include ${FTYPE_INCS} 28+INCS = -I${X11BASE}/include -I${LOCALBASE}/include ${FTYPE_INCS}
29+LIBS = -L${X11BASE}/lib -R${X11BASE}/lib -L${LOCALBASE}/lib -R${LOCALBASE}/lib \ 29+LIBS = -L${X11BASE}/lib -R${X11BASE}/lib -L${LOCALBASE}/lib -R${LOCALBASE}/lib \
30+ -lXm -lXmu -lXt -lXext -lX11 ${FTYPE_LIBS} 30+ -lXm -lXmu -lXt -lXext -lX11 ${FTYPE_LIBS}
31+ 31+