diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-05-27 15:27:21 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-05-27 15:27:28 +0200 |
| commit | 362d88c2b19e3857576b2571722dc66c381c185a (patch) | |
| tree | 7dc706e1918e7dc1e9762573831c851be4343559 /pkgs/tools/graphics/transfig/patch-fig2dev-Imakefile.patch | |
| parent | 0367fa630d59673624d6742e2758b87eb12fff4c (diff) | |
| parent | 1b7204ab3cff3c0aeb0f0e1689b1ef2f7960bb2e (diff) | |
| download | nixlib-362d88c2b19e3857576b2571722dc66c381c185a.tar nixlib-362d88c2b19e3857576b2571722dc66c381c185a.tar.gz nixlib-362d88c2b19e3857576b2571722dc66c381c185a.tar.bz2 nixlib-362d88c2b19e3857576b2571722dc66c381c185a.tar.lz nixlib-362d88c2b19e3857576b2571722dc66c381c185a.tar.xz nixlib-362d88c2b19e3857576b2571722dc66c381c185a.tar.zst nixlib-362d88c2b19e3857576b2571722dc66c381c185a.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/tools/graphics/transfig/patch-fig2dev-Imakefile.patch')
| -rw-r--r-- | pkgs/tools/graphics/transfig/patch-fig2dev-Imakefile.patch | 75 |
1 files changed, 75 insertions, 0 deletions
diff --git a/pkgs/tools/graphics/transfig/patch-fig2dev-Imakefile.patch b/pkgs/tools/graphics/transfig/patch-fig2dev-Imakefile.patch new file mode 100644 index 000000000000..9c1895b15196 --- /dev/null +++ b/pkgs/tools/graphics/transfig/patch-fig2dev-Imakefile.patch @@ -0,0 +1,75 @@ +--- fig2dev/Imakefile.orig Thu Mar 25 22:39:10 2004 ++++ fig2dev/Imakefile Thu Mar 25 22:41:01 2004 +@@ -16,17 +16,23 @@ + XCOMM party to do so, with the only requirement being that this copyright + XCOMM notice remain intact. + ++BINDIR = __PREFIX/bin ++DESTDIR = __DESTROOT ++MKDIRHIER = mkdirhier ++MANDIR = __PREFIX/share/man/$(MANSUFFIX) ++INSTALLFLAGS = -c ++ + XCOMM ****** + XCOMM You should point XFIGLIBDIR to the same directory you did when you compiled + XCOMM and installed xfig. + +-XFIGLIBDIR = /usr/local/lib/X11/xfig ++XFIGLIBDIR = __PREFIX/lib/xfig + + XCOMM ****** + XCOMM If your system has the strerror() function (doesn't have sys_errlist) then + XCOMM comment out NEED_STRERROR with an XCOMM comment. + +-NEED_STRERROR = -DNEED_STRERROR ++XCOMM NEED_STRERROR = -DNEED_STRERROR + + 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 +@@ -39,7 +45,7 @@ + XCOMM inline functions. With the "INLINE" keyword, you should notice that + XCOMM the display will be a bit faster in complex figures + +-XCOMM USEINLINE = -DUSE_INLINE ++USEINLINE = -DUSE_INLINE + + XCOMM **************** + XCOMM Change RGB if necessary, to point to your rgb.txt color database +@@ -60,8 +66,8 @@ + XCOMM are in different places + + #ifdef USEPNG +-PNGLIBDIR = $(USRLIBDIR) +-PNGINC = -I/usr/include/X11 ++PNGLIBDIR = __PREFIX_PNG/lib ++PNGINC = -I__PREFIX_PNG/include + #endif + + XCOMM **************** +@@ -73,7 +79,7 @@ + XCOMM Change XPMINC if necessary to point to the include file for xpm (xpm.h) + XCOMM + +-XCOMM #define USEXPM ++XCOMM #define USEXPM + + #ifdef USEXPM + XPMLIBDIR = $(USRLIBDIR) +@@ -126,7 +132,7 @@ + + #ifdef I18N + I18N_DEFS = -DI18N +-FIG2DEV_LIBDIR = /usr/local/lib/fig2dev ++FIG2DEV_LIBDIR = __PREFIX/lib/fig2dev + I18N_DEV_DEFS = $(I18N_DEFS) -DFIG2DEV_LIBDIR=\\\"$(FIG2DEV_LIBDIR)\\\" + + install:: +@@ -177,7 +183,7 @@ + + IMAKE_DEFINES = $(DUSEPNG) $(DUSEXPM) + +-DEVDEFINES = $(DUSEPNG) $(DUSEXPM) $(XPMINC) $(DDNFSS) $(DDA4) \ ++DEVDEFINES = $(DUSEPNG) $(DUSEXPM) $(PNGINC) $(XPMINC) $(DDNFSS) $(DDA4) \ + $(DDLATEX2E_GRAPHICS) $(DDEPSFIG) $(DDIBMGEC) $(DDDVIPS) $(I18N_DEV_DEFS) + + #define IHaveSubdirs |