diff options
author | tron <tron> | 2001-10-12 20:39:36 +0000 |
---|---|---|
committer | tron <tron> | 2001-10-12 20:39:36 +0000 |
commit | fbff4efa89c0779488934216ce7e81305db8e51c (patch) | |
tree | f31094e02a78ea931bdd12ffce272251faa32845 | |
parent | 8d857de85f8e86f402dd7eb3f520b824071ed2b8 (diff) | |
download | pkgsrc-fbff4efa89c0779488934216ce7e81305db8e51c.tar.gz |
Fix build problem caused by incorrect include path on systems which use
"xpkwedge".
-rw-r--r-- | graphics/xanim/distinfo | 22 | ||||
-rw-r--r-- | graphics/xanim/patches/patch-ab | 4 | ||||
-rw-r--r-- | time/wmmoonclock/distinfo | 4 | ||||
-rw-r--r-- | time/wmmoonclock/patches/patch-aa | 8 |
4 files changed, 10 insertions, 28 deletions
diff --git a/graphics/xanim/distinfo b/graphics/xanim/distinfo index 8a7fe670fce..57905057b90 100644 --- a/graphics/xanim/distinfo +++ b/graphics/xanim/distinfo @@ -1,30 +1,12 @@ -$NetBSD: distinfo,v 1.3 2001/08/27 20:36:56 is Exp $ +$NetBSD: distinfo,v 1.4 2001/10/12 20:39:36 tron Exp $ SHA1 (xanim2801.tar.gz) = 1966880880c3779d02199fbcd1acb771bc57f754 Size (xanim2801.tar.gz) = 441250 bytes -SHA1 (xa2.0_cvid_netbsd386.o.Z) = eea4f7c94bd7dcfd7e592add0fa415cb1514efa0 -Size (xa2.0_cvid_netbsd386.o.Z) = 4067 bytes -SHA1 (xa2.0_iv32_netbsd386.o.Z) = e096322d85c21a8bf6afb5c8cd066c52cdd6e132 -Size (xa2.0_iv32_netbsd386.o.Z) = 46631 bytes -SHA1 (xa1.0_cyuv_netbsd386.o.Z) = 08ad405baeffb1f72b9f9d960d0c11f6d81e7c07 -Size (xa1.0_cyuv_netbsd386.o.Z) = 937 bytes SHA1 (xa2.0_cvid_linuxELF.o.Z) = 7ce0db7c2007f13294342a863a90000a5d097b4f Size (xa2.0_cvid_linuxELF.o.Z) = 4382 bytes SHA1 (xa2.0_iv32_linuxELF.o.Z) = 937368f4f90f9023955b59e54c1182804e40d7ed Size (xa2.0_iv32_linuxELF.o.Z) = 46511 bytes SHA1 (xa1.0_cyuv_linuxELF.o.Z) = 71a81709b161a48e75d05a2a612f1f62034fee15 Size (xa1.0_cyuv_linuxELF.o.Z) = 1242 bytes -SHA1 (xa2.0_cvid_netbsd68k.o.Z) = 1e56d834c6bb3a0e26e2872601dfa9082487345c -Size (xa2.0_cvid_netbsd68k.o.Z) = 3779 bytes -SHA1 (xa2.0_iv32_netbsd68k.o.Z) = 9de53c2225d0ae117c7b23fa7415017611058441 -Size (xa2.0_iv32_netbsd68k.o.Z) = 44353 bytes -SHA1 (xa1.0_cyuv_netbsd68k.o.Z) = 8478c3240581c2887dc63a7a9eac2cdb79f610a2 -Size (xa1.0_cyuv_netbsd68k.o.Z) = 942 bytes -SHA1 (xa2.0_cvid_sparcCOFF.o.Z) = 1306ee5c88415b4a67b65247d41fa03101526a64 -Size (xa2.0_cvid_sparcCOFF.o.Z) = 4535 bytes -SHA1 (xa2.0_iv32_sparcCOFF.o.Z) = 0307f18f02763b2b3229ed4b3a00eeec7bc2c56d -Size (xa2.0_iv32_sparcCOFF.o.Z) = 48525 bytes -SHA1 (xa1.0_cyuv_sparcAOUT.o.Z) = c31c60ac3a519bbdce9e4d9652f274b1194e880a -Size (xa1.0_cyuv_sparcAOUT.o.Z) = 1048 bytes -SHA1 (patch-ab) = 66ad6952534b85cc3a483ba6e50a568caee9baef +SHA1 (patch-ab) = 6ef426410b22978f7888cda84bee875ab66f810e SHA1 (patch-ae) = 230f52e95997ba72d36baa8f4d5cd5a5e5500f9a diff --git a/graphics/xanim/patches/patch-ab b/graphics/xanim/patches/patch-ab index 7227c2427e0..a14ed35e219 100644 --- a/graphics/xanim/patches/patch-ab +++ b/graphics/xanim/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.7 1999/07/07 23:11:19 tron Exp $ +$NetBSD: patch-ab,v 1.8 2001/10/12 20:39:37 tron Exp $ --- Imakefile.orig Sun Mar 21 23:36:26 1999 +++ Imakefile Thu Jul 8 00:55:07 1999 @@ -103,7 +103,7 @@ $NetBSD: patch-ab,v 1.7 1999/07/07 23:11:19 tron Exp $ PROGRAMS = $(XANIM) -INCLUDES = -I$(INCDIR) $(XA_INCS) -+INCLUDES = -I$(INCDIR)/X11 $(XA_INCS) ++INCLUDES = -I$(X11_ROOT)/include/X11 $(XA_INCS) LIBS1 = $(XA_LIBS) $(EXTENSIONLIB) $(XTOOLLIB) $(XLIB) -lm DEPLIBS1 = $(DEPEXTENSIONLIB) $(DEPXTOOLLIB) $(DEPXLIB) diff --git a/time/wmmoonclock/distinfo b/time/wmmoonclock/distinfo index b973af58fd1..970707068d9 100644 --- a/time/wmmoonclock/distinfo +++ b/time/wmmoonclock/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.2 2001/04/18 14:47:17 agc Exp $ +$NetBSD: distinfo,v 1.3 2001/10/12 20:44:51 tron Exp $ SHA1 (wmMoonClock-1.27.tar.gz) = bbc27a11ff99505fe4b872019f214f305cee6c5b Size (wmMoonClock-1.27.tar.gz) = 155197 bytes -SHA1 (patch-aa) = f0f684a82216a12397c94da55289f77769a4a746 +SHA1 (patch-aa) = ebec99603ef1590e4d42978bf759680ebf3aca70 diff --git a/time/wmmoonclock/patches/patch-aa b/time/wmmoonclock/patches/patch-aa index 4f8e20fd8ed..d8a25b8e330 100644 --- a/time/wmmoonclock/patches/patch-aa +++ b/time/wmmoonclock/patches/patch-aa @@ -1,16 +1,16 @@ -$NetBSD: patch-aa,v 1.1.1.1 2000/12/17 23:32:21 wiz Exp $ +$NetBSD: patch-aa,v 1.2 2001/10/12 20:44:52 tron Exp $ --- Makefile.orig Tue Mar 23 03:20:32 1999 -+++ Makefile Sun Jul 30 22:28:09 2000 ++++ Makefile Fri Oct 12 22:41:34 2001 @@ -1,8 +1,8 @@ CC = gcc CFLAGS = -O2 -INCDIR = -I/usr/X11R6/include/X11 -DESTDIR= /usr/X11R6 -LIBDIR = -L/usr/X11R6/lib -+INCDIR = -I${PREFIX}/include ++INCDIR = -I${PREFIX}/include -I${X11BASE}/include +DESTDIR= ${PREFIX} -+LIBDIR = -L${PREFIX}/lib -Wl,-R${PREFIX}/lib ++LIBDIR = -L${PREFIX}/lib -Wl,-R${PREFIX}/lib -L${X11BASE}/lib -Wl,-R${X11BASE}/lib # for Linux LIBS = -lXpm -lX11 -lXext |