pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/www/chimera Remove hard coded /usr/lib/libz.a as depen...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/19b5bd0d42e2
branches:  trunk
changeset: 540250:19b5bd0d42e2
user:      obache <obache%pkgsrc.org@localhost>
date:      Fri Apr 04 13:45:02 2008 +0000

description:
Remove hard coded /usr/lib/libz.a as depending libraries.
Should fix build problem on none builtin libz platforms reported by PR 33600.

diffstat:

 www/chimera/distinfo         |   4 ++--
 www/chimera/patches/patch-aa |  10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diffs (51 lines):

diff -r 9c4b8c4ceefd -r 19b5bd0d42e2 www/chimera/distinfo
--- a/www/chimera/distinfo      Fri Apr 04 13:39:52 2008 +0000
+++ b/www/chimera/distinfo      Fri Apr 04 13:45:02 2008 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.5 2006/01/10 18:07:04 joerg Exp $
+$NetBSD: distinfo,v 1.6 2008/04/04 13:45:02 obache Exp $
 
 SHA1 (chimera-2.0a19.tar.gz) = c69b70b11cf12837e260eaa20e548bf9eb9ce309
 RMD160 (chimera-2.0a19.tar.gz) = d3f4d2ff3328c3bf5020490ed851b281e0492fe2
 Size (chimera-2.0a19.tar.gz) = 248431 bytes
-SHA1 (patch-aa) = 3734a158b9d52ec21187cb6946be01bfadbad68a
+SHA1 (patch-aa) = 8e1f95a295f67f7357b2eb367e24492fd2d4d467
 SHA1 (patch-ab) = 1fc2f5f97f46403359a00e42cc25f4cbf9bc5331
 SHA1 (patch-ac) = 5f18afd9a1452bfba010fe3eb4e773f5395789c6
 SHA1 (patch-ad) = 400a047e978ccb0c4ebcf69a93117b4c7ecfdddb
diff -r 9c4b8c4ceefd -r 19b5bd0d42e2 www/chimera/patches/patch-aa
--- a/www/chimera/patches/patch-aa      Fri Apr 04 13:39:52 2008 +0000
+++ b/www/chimera/patches/patch-aa      Fri Apr 04 13:45:02 2008 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.3 2006/01/10 18:07:04 joerg Exp $
+$NetBSD: patch-aa,v 1.4 2008/04/04 13:45:02 obache Exp $
 
---- Common.tmpl.dist.orig      Sun May 30 22:43:52 1999
+--- Common.tmpl.dist.orig      1999-05-30 21:43:52.000000000 +0000
 +++ Common.tmpl.dist
 @@ -9,12 +9,12 @@
   * CHIMERA_LIBDIR  - configuration files.  someday.
@@ -20,7 +20,7 @@
  
  #if !defined(__QNX__)
  LIBPRE=lib
-@@ -35,22 +35,22 @@
+@@ -35,22 +35,22 @@ IMGLEXT = _local
  */
  
  /* Uncomment and modify if you have the JPEG 6 library */
@@ -47,12 +47,12 @@
 -PNGDEPLIB = $(PNGDIR)/lib/libpng$(IMGLEXT).a $(PNGDIR)/lib/libz$(IMGLEXT).a
 -*/
 +PNGLIB = -L$(PNGDIR)/lib -lpng$(IMGLEXT) -lz$(IMGLEXT) -Wl,-R$(PNGDIR)/lib
-+PNGDEPLIB = $(PNGDIR)/lib/libpng$(IMGLEXT).a /usr/lib/libz$(IMGLEXT).a
++PNGDEPLIB = $(PNGDIR)/lib/libpng$(IMGLEXT).a
 +
  
  /* Tells Imakefile to set the flags for debugging.  Comment for -O. */
  #define CDebugging 1
-@@ -119,6 +119,7 @@
+@@ -119,6 +119,7 @@ OS_DEFINES = -DHAVE_STDLIB_H -DHAVE_STRI
               -DHAVE_UNAME -DHAVE_MKTIME -DHAVE_SIZE_T -DHAVE_SSIZE_T \
               -DHAVE_STDARG_H -DHAVE_SNPRINTF
  OS_LIBS =



Home | Main Index | Thread Index | Old Index