summaryrefslogtreecommitdiff
path: root/graphics/xpaint/patches/patch-ag
blob: acdc8f1f1a647dbab5001ed271a4c93cc16660c3 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
$NetBSD: patch-ag,v 1.6 2005/03/31 11:08:16 adam Exp $

--- Imakefile.orig	2005-03-20 20:15:32.000000000 +0000
+++ Imakefile
@@ -98,7 +98,7 @@ SGI_LIB = -limage
 #endif
 
 DEPLIBS = always xpaint.man XPaint.ad
-LOCAL_LIBRARIES = -Lrw -lrw $(XPM_LIB) $(TIFF_LIB) $(SGI_LIB) $(JPEG_LIB) $(PNG_LIB) -ldl -rdynamic
+LOCAL_LIBRARIES = -Lrw -lrw $(XPM_LIB) $(TIFF_LIB) $(SGI_LIB) $(JPEG_LIB) $(PNG_LIB)
 
 SUBDIRS = rw
 
@@ -151,7 +151,7 @@ xaw::
 	-$(RM) xaw_incdir ; ln -sf /usr/include/X11/Xaw xaw_incdir
 	echo "XAWLIB_DEFINES = -DXAWPLAIN" > Local.xawdefs			
 	echo "SYS_LIBRARIES = XawClientLibs -lm" >> Local.xawdefs
-	xmkmf -a ; make
+	${XMKMF} -a ; ${MAKE}
 	@echo ""
 	@echo "'xpaint' compiled with Xaw widgets (old and ugly)"
 	@echo "You should rather use Xaw3d, neXtaw or Xaw95 !!"	
@@ -191,12 +191,15 @@ nextaw::
 	@echo "Variants are 'make xaw3d' and 'make xaw95'"
 	@echo ""	
 
-xaw95::
+libXaw95.a:
+	cd ../xaw95-1.1.4 ; ${XMKMF} ; ${MAKE}
+
+xaw95:: libXaw95.a
 	-$(RM) $(XAWDEPENDS)
-	-$(RM) xaw_incdir ; ln -sf /usr/include/X11/Xaw95 xaw_incdir	
+	-$(RM) xaw_incdir ; ln -sf ${X11BASE}/include/X11/Xaw xaw_incdir	
 	echo "XAWLIB_DEFINES = -DXAW95" > Local.xawdefs
-	echo "SYS_LIBRARIES = -lXaw95 -L." >> Local.xawdefs
-	xmkmf -a ; make
+	echo "SYS_LIBRARIES = ../xaw95-1.1.4/libXaw95.a -lm -lX11 -lXt -lXmu" >> Local.xawdefs
+	${XMKMF} -a ; ${MAKE}
 	@echo ""	
 	@echo "'xpaint' compiled with Xaw95 widgets"
 	@echo "Another alternative is to use the Xaw3d widgets :"