diff options
| author | joerg <joerg> | 2013-10-20 18:10:11 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2013-10-20 18:10:11 +0000 |
| commit | f3b593097c52eb16d7f0a7255a0aef75da464f49 (patch) | |
| tree | f7e07a7467e2bae0e2891d45da0446060087cc10 | |
| parent | ef27532e0d3933582064aa3569c1d4e47152cff5 (diff) | |
| download | pkgsrc-f3b593097c52eb16d7f0a7255a0aef75da464f49.tar.gz | |
Fix rpath option to have -Wl prefix.
| -rw-r--r-- | fonts/xmbdfed/distinfo | 4 | ||||
| -rw-r--r-- | fonts/xmbdfed/patches/patch-aa | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/fonts/xmbdfed/distinfo b/fonts/xmbdfed/distinfo index cc4608624e0..19fee31a8c4 100644 --- a/fonts/xmbdfed/distinfo +++ b/fonts/xmbdfed/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.5 2013/01/17 15:53:10 joerg Exp $ +$NetBSD: distinfo,v 1.6 2013/10/20 18:10:11 joerg Exp $ SHA1 (xmbdfed-4.5.tar.gz) = 325f2f3a8ae68b3f5d22ff9bdd115d30cdd743db RMD160 (xmbdfed-4.5.tar.gz) = a6c1d9202e6d978dbc0aaa1fb6389a3d14b16c26 Size (xmbdfed-4.5.tar.gz) = 282055 bytes -SHA1 (patch-aa) = a7eaacef7135ea315b6951fd8793e266baceb20e +SHA1 (patch-aa) = 9c01eb9c4d160e8747fe2f9d68bb16a2b6afc197 SHA1 (patch-ab) = eb5c46e723988cf9febf65f64e0b142ce8dccde3 SHA1 (patch-ac) = c62140d171ea96418d48ee4b236cde8bb87b545d diff --git a/fonts/xmbdfed/patches/patch-aa b/fonts/xmbdfed/patches/patch-aa index 400526c5cab..998058b4097 100644 --- a/fonts/xmbdfed/patches/patch-aa +++ b/fonts/xmbdfed/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.2 2013/01/17 15:53:11 joerg Exp $ +$NetBSD: patch-aa,v 1.3 2013/10/20 18:10:11 joerg Exp $ --- Makefile.orig Fri Mar 17 05:08:49 2000 +++ Makefile Wed Mar 20 00:37:53 2002 @@ -15,7 +15,7 @@ $NetBSD: patch-aa,v 1.2 2013/01/17 15:53:11 joerg Exp $ -#FTYPE_LIBS = -L/user/local/lib -lttf -#FTYPE_DEFS = -DHAVE_FREETYPE +FTYPE_INCS = -I${X11PREFIX}/include/freetype -+FTYPE_LIBS = -L${X11PREFIX}/lib -Wl,-rpath,${X11PREFIX}/lib -lttf ++FTYPE_LIBS = -L${X11PREFIX}/lib ${COMPILER_RPATH_FLAG}${X11PREFIX}/lib -lttf +FTYPE_DEFS = -DHAVE_FREETYPE @@ -66,3 +66,3 @@ @@ -25,8 +25,8 @@ $NetBSD: patch-aa,v 1.2 2013/01/17 15:53:11 joerg Exp $ @@ -73,2 +73,6 @@ -+INCS = -I${X11BASE}/include -I${LOCALBASE}/include ${FTYPE_INCS} -+LIBS = -L${X11BASE}/lib -R${X11BASE}/lib -L${LOCALBASE}/lib -R${LOCALBASE}/lib \ ++INCS = -I${X11PREFIX}/include -I${PREFIX}/include ${FTYPE_INCS} ++LIBS = -L${X11PREFIX}/lib ${COMPILER_RPATH_FLAG}${X11PREFIX}/lib -L${PREFIX}/lib ${COMPILER_RPATH_FLAG}${PREFIX}/lib \ + -lXm -lXmu -lXt -lXext -lX11 ${FTYPE_LIBS} + # |