diff options
Diffstat (limited to 'print/transfig/patches/patch-aa')
| -rw-r--r-- | print/transfig/patches/patch-aa | 48 |
1 files changed, 14 insertions, 34 deletions
diff --git a/print/transfig/patches/patch-aa b/print/transfig/patches/patch-aa index 06592d59b40..cced14a1b7a 100644 --- a/print/transfig/patches/patch-aa +++ b/print/transfig/patches/patch-aa @@ -1,10 +1,10 @@ -$NetBSD: patch-aa,v 1.8 2002/10/08 13:14:02 jlam Exp $ +$NetBSD: patch-aa,v 1.9 2003/01/07 06:19:06 rh Exp $ ---- fig2dev/Imakefile.orig Thu Apr 19 19:19:38 2001 +--- fig2dev/Imakefile.orig Thu Dec 19 10:33:44 2002 +++ fig2dev/Imakefile -@@ -28,13 +28,13 @@ +@@ -20,13 +20,13 @@ XCOMM You should point XFIGLIBDIR to the same directory you did when you compiled - XCOMM and installed xfig. This will be made automatic in the future. + XCOMM and installed xfig. -XFIGLIBDIR = /usr/local/lib/X11/xfig +XFIGLIBDIR = $(PROJECTROOT)/lib/X11/xfig @@ -18,7 +18,7 @@ $NetBSD: patch-aa,v 1.8 2002/10/08 13:14:02 jlam Exp $ XCOMM The following probably only applies to Windows 9x/NT: XCOMM If your system can open files in text and binary modes and has the -@@ -47,7 +47,7 @@ +@@ -39,7 +39,7 @@ XCOMM inline functions. With the "INLINE" keyword, you should notice that XCOMM the display will be a bit faster in complex figures @@ -27,7 +27,7 @@ $NetBSD: patch-aa,v 1.8 2002/10/08 13:14:02 jlam Exp $ XCOMM **************** XCOMM Change RGB if necessary, to point to your rgb.txt color database -@@ -66,7 +66,7 @@ +@@ -61,7 +61,7 @@ #ifdef USEPNG PNGLIBDIR = $(USRLIBDIR) @@ -36,7 +36,7 @@ $NetBSD: patch-aa,v 1.8 2002/10/08 13:14:02 jlam Exp $ #endif XCOMM **************** -@@ -78,11 +78,11 @@ +@@ -73,11 +73,11 @@ XCOMM Change XPMINC if necessary to point to the include file for xpm (xpm.h) XCOMM @@ -50,18 +50,7 @@ $NetBSD: patch-aa,v 1.8 2002/10/08 13:14:02 jlam Exp $ #endif XCOMM **************** -@@ -104,8 +104,8 @@ - - #ifdef USEJPEG - #ifdef USEINSTALLEDJPEG --JPEGLIBDIR = /usr/local/lib --JPEGINCDIR = /usr/include/X11 -+JPEGLIBDIR = $(LOCALBASE)/lib -+JPEGINCDIR = $(LOCALBASE)/include - #else - JPEGLIBDIR = ../jpeg - JPEGINCDIR = $(JPEGLIBDIR) -@@ -158,7 +158,7 @@ +@@ -126,7 +126,7 @@ #ifdef I18N I18N_DEFS = -DI18N @@ -70,7 +59,7 @@ $NetBSD: patch-aa,v 1.8 2002/10/08 13:14:02 jlam Exp $ I18N_DEV_DEFS = $(I18N_DEFS) -DFIG2DEV_LIBDIR=\\\"$(FIG2DEV_LIBDIR)\\\" install:: -@@ -189,12 +189,12 @@ +@@ -158,12 +158,12 @@ #ifdef USEPNG DUSEPNG = -DUSE_PNG @@ -82,24 +71,15 @@ $NetBSD: patch-aa,v 1.8 2002/10/08 13:14:02 jlam Exp $ DUSEXPM = -DUSE_XPM -XPMLIBS = -L$(XPMLIBDIR) -lXpm -lX11 +XPMLIBS = -Wl,-R$(XPMLIBDIR) -L$(XPMLIBDIR) -lXpm -lX11 - #endif + #endif /* USEXPM */ #if defined(NOSTRSTR) -@@ -207,7 +207,7 @@ - JPEGINC = -I$(JPEGINCDIR) - - #ifdef USEINSTALLEDJPEG --JPEGLIB = -L$(JPEGLIBDIR) -ljpeg -+JPEGLIB = -Wl,-R$(LOCALBASE)/lib -L$(JPEGLIBDIR) -ljpeg - #else - JPEGCONF = configure - JPEGLIB = $(JPEGLIBDIR)/libjpeg.a -@@ -218,7 +218,7 @@ +@@ -177,7 +177,7 @@ - IMAKE_DEFINES = $(DUSEPNG) $(DUSEJPEG) $(DUSEXPM) + IMAKE_DEFINES = $(DUSEPNG) $(DUSEXPM) --DEVDEFINES = $(DUSEPNG) $(DUSEJPEG) $(DUSEXPM) $(XPMINC) $(JPEGINC) $(DDNFSS) $(DDA4) \ -+DEVDEFINES = $(DUSEPNG) $(DUSEJPEG) $(DUSEXPM) $(PNGINC) $(XPMINC) $(JPEGINC) $(DDNFSS) $(DDA4) \ +-DEVDEFINES = $(DUSEPNG) $(DUSEXPM) $(XPMINC) $(DDNFSS) $(DDA4) \ ++DEVDEFINES = $(DUSEPNG) $(DUSEXPM) $(PNGINC) $(XPMINC) $(DDNFSS) $(DDA4) \ $(DDLATEX2E_GRAPHICS) $(DDEPSFIG) $(DDIBMGEC) $(DDDVIPS) $(I18N_DEV_DEFS) #define IHaveSubdirs |