diff options
| author | jlam <jlam@pkgsrc.org> | 2001-09-14 05:41:05 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2001-09-14 05:41:05 +0000 |
| commit | e6fda5ca994b2031615b0ee7c0bb7b8cd048e2f8 (patch) | |
| tree | aa5855195a5c1f3c57dc74fb32ecc245ae3a60cb | |
| parent | 71f03aac0769866c39755e2e0ea56050ca4f5908 (diff) | |
| download | pkgsrc-e6fda5ca994b2031615b0ee7c0bb7b8cd048e2f8.tar.gz | |
Fix the rpath so that ${LOCALBASE}/lib (where the graphics libraries are
installed) is included, which ${BUILDLINK_DIR}/lib (which is a temporary
directory) is not.
| -rw-r--r-- | graphics/magicpoint/distinfo | 5 | ||||
| -rw-r--r-- | graphics/magicpoint/patches/patch-aa | 13 | ||||
| -rw-r--r-- | graphics/magicpoint/patches/patch-ac | 13 |
3 files changed, 27 insertions, 4 deletions
diff --git a/graphics/magicpoint/distinfo b/graphics/magicpoint/distinfo index 9741a49c04c..8d6d6ce2599 100644 --- a/graphics/magicpoint/distinfo +++ b/graphics/magicpoint/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.5 2001/08/31 00:22:12 itojun Exp $ +$NetBSD: distinfo,v 1.6 2001/09/14 05:41:05 jlam Exp $ SHA1 (magicpoint-1.08a.tar.gz) = 4b336fff82e0d2c7d4d36b7a914f5d374b6a9343 Size (magicpoint-1.08a.tar.gz) = 815048 bytes -SHA1 (patch-aa) = 739e9597b407f6e08ac25fd190bce05d37c116ff +SHA1 (patch-aa) = 8576e5caaa9a32c769cddab1779b43b8432e658a SHA1 (patch-ab) = e64f19da3f410f6b71053c9293c66d7290e9a4a2 +SHA1 (patch-ac) = ec4a83e3d9a7f39a4a632a87d45b0cbcf761e526 diff --git a/graphics/magicpoint/patches/patch-aa b/graphics/magicpoint/patches/patch-aa index 51dd821355b..5417cbef12f 100644 --- a/graphics/magicpoint/patches/patch-aa +++ b/graphics/magicpoint/patches/patch-aa @@ -1,7 +1,7 @@ -$NetBSD: patch-aa,v 1.7 2001/07/31 05:27:31 jlam Exp $ +$NetBSD: patch-aa,v 1.8 2001/09/14 05:41:06 jlam Exp $ --- configure.orig Tue May 22 02:09:41 2001 -+++ configure ++++ configure Fri Sep 14 01:34:23 2001 @@ -1763,7 +1763,7 @@ if test "$mgp_use_freetype" = "yes"; then echo $ac_n "checking for freetype library/header""... $ac_c" 1>&6 @@ -38,6 +38,15 @@ $NetBSD: patch-aa,v 1.7 2001/07/31 05:27:31 jlam Exp $ if test -f $i/include/libmng.h; then if test -f $i/lib/libmng.a ; then DEPLIBS="$DEPLIBS $i/lib/libmng.a" +@@ -2277,7 +2277,7 @@ + fi + if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 +- LIBS="$LIBS -Wl,-rpath,$i/lib -lmng" ++ LIBS="$LIBS -lmng" + cat >> confdefs.h <<\EOF + #define MNG 1 + EOF @@ -2764,7 +2764,7 @@ echo 'FATAL: You need libungif to use gif images. pass proper LIBS to configure.' exit 1 diff --git a/graphics/magicpoint/patches/patch-ac b/graphics/magicpoint/patches/patch-ac new file mode 100644 index 00000000000..2a2421f8a8d --- /dev/null +++ b/graphics/magicpoint/patches/patch-ac @@ -0,0 +1,13 @@ +$NetBSD: patch-ac,v 1.1 2001/09/14 05:41:06 jlam Exp $ + +--- Imakefile.in.orig Sat Feb 3 13:46:49 2001 ++++ Imakefile.in Fri Sep 14 01:35:12 2001 +@@ -23,7 +23,7 @@ + DEFS= @DEFS@ -DMGPLIBDIR=\"$(LIBDIR)/mgp\" + #DEFS+= -DGLYPHEDGE + +-SYS_LIBRARIES= -L$(srcdir)/image -lmgpimage @LIBS@ ++SYS_LIBRARIES= -L$(srcdir)/image -lmgpimage @LDFLAGS@ @LIBS@ + EXTRA_DEPLIBS= @DEPLIBS@ + + #undef DefaultCDebugFlags |