pkgs/tools/misc/ttf2pt1/gentoo-makefile.patch

   1 diff -Naur ttf2pt1-3.4.4-orig/Makefile ttf2pt1-3.4.4/Makefile
   2 --- ttf2pt1-3.4.4-orig/Makefile 2007-07-15 20:06:50.000000000 -0600
   3 +++ ttf2pt1-3.4.4/Makefile      2007-07-15 20:12:40.000000000 -0600
   4 @@ -9,7 +9,7 @@
   5  #
   6  # Use GNU C even if it's not the default compiler
   7  #
   8 -#CC=gcc
   9 +CC=gcc
  10  #
  11  # Use the standard ANSI C compiler on HP-UX even if it's not default
  12  #
  13 @@ -60,18 +60,18 @@
  14  # (if the include and lib directory do not match your installation,
  15  # modify them), also uncomment LIBS_FT
  16  #
  17 -#CFLAGS_FT = -DUSE_FREETYPE -I/usr/local/include/freetype2 -I/usr/local/include
  18 +CFLAGS_FT = -DUSE_FREETYPE -I/usr/include/freetype2 -I/usr/include
  19
  20  #
  21  # The FreeType-2 library flags (disabled by default)
  22
  23 -LIBS_FT=
  24 +#LIBS_FT=
  25
  26  # To enable use of the FreeType-2 library
  27  # (if the include and lib directory do not match your installation,
  28  # modify them), also uncomment CFLAGS_FT
  29  #
  30 -#LIBS_FT= -L/usr/local/lib -lfreetype
  31 +LIBS_FT= -L/usr/lib -lfreetype
  32
  33  #
  34  # The flags for C compiler for the Autotrace library (disabled by default).
  35 @@ -120,18 +120,18 @@
  36  # Installation-related stuff
  37  #
  38  # The base dir for installation and subdirs in it
  39 -INSTDIR = /usr/local
  40 +INSTDIR = /usr
  41  # for binaries
  42  BINDIR = $(INSTDIR)/bin
  43  # for binaries of little general interest
  44  LIBXDIR = $(INSTDIR)/libexec/ttf2pt1
  45  # for scripts, maps/encodings etc.
  46  SHAREDIR = $(INSTDIR)/share/ttf2pt1
  47 -MANDIR = $(INSTDIR)/man
  48 +MANDIR = $(INSTDIR)/share/man
  49
  50  # owner and group of installed files
  51  OWNER = root
  52 -GROUP = bin
  53 +GROUP = root
  54
  55  # After you have configured the Makefile, comment out the following
  56  # definition:
  57 @@ -244,17 +244,19 @@
  58         chmod -R go-w $(SHAREDIR)
  59         scripts/inst_file ttf2pt1 $(BINDIR)/ttf2pt1 $(OWNER) $(GROUP) 0755
  60         [ -f $(BINDIR)/t1asm ] || scripts/inst_file t1asm $(LIBXDIR)/t1asm $(OWNER) $(GROUP) 0755
  61 -       sed 's|^TTF2PT1_BINDIR=$$|TTF2PT1_BINDIR=$(BINDIR)|;\
  62 -               s|^TTF2PT1_LIBXDIR=$$|TTF2PT1_LIBXDIR=$(LIBXDIR)|;\
  63 -               s|^TTF2PT1_SHAREDIR=$$|TTF2PT1_SHAREDIR=$(SHAREDIR)|;' <scripts/convert >cvt.tmp
  64 +       sed -e 's|^TTF2PT1_BINDIR=$$|TTF2PT1_BINDIR=$(BINDIR)|' \
  65 +               -e 's|^TTF2PT1_LIBXDIR=$$|TTF2PT1_LIBXDIR=$(LIBXDIR)|' \
  66 +               -e 's|^TTF2PT1_SHAREDIR=$$|TTF2PT1_SHAREDIR=$(SHAREDIR)|' \
  67 +               <scripts/convert >cvt.tmp
  68         scripts/inst_file cvt.tmp $(BINDIR)/ttf2pt1_convert $(OWNER) $(GROUP) 0755
  69         scripts/inst_file cvt.tmp $(SHAREDIR)/scripts/convert $(OWNER) $(GROUP) 0755
  70         rm cvt.tmp
  71         scripts/inst_file scripts/x2gs $(BINDIR)/ttf2pt1_x2gs $(OWNER) $(GROUP) 0755
  72         for i in $(MANS1); do { \
  73 -               sed 's|TTF2PT1_BINDIR|$(BINDIR)|;\
  74 -                       s|TTF2PT1_LIBXDIR|$(LIBXDIR)|;\
  75 -                       s|TTF2PT1_SHAREDIR|$(SHAREDIR)|;' <$$i >$(MANDIR)/man1/$$i \
  76 +               sed -e 's|TTF2PT1_BINDIR|$(BINDIR)|' \
  77 +                       -e 's|TTF2PT1_LIBXDIR|$(LIBXDIR)|' \
  78 +                       -e 's|TTF2PT1_SHAREDIR|$(SHAREDIR)|' \
  79 +                       <$$i >$(MANDIR)/man1/$$i \
  80                 && chown $(OWNER) $(MANDIR)/man1/$$i \
  81                 && chgrp $(GROUP) $(MANDIR)/man1/$$i \
  82                 && chmod 0644 $(MANDIR)/man1/$$i \
  83
  84
  85
  86
  87
  88 diff -Naur ttf2pt1-3.4.4-orig/ft.c ttf2pt1-3.4.4/ft.c
  89 --- ttf2pt1-3.4.4-orig/ft.c     2007-07-15 20:23:43.000000000 -0600
  90 +++ ttf2pt1-3.4.4/ft.c  2007-07-15 20:24:02.000000000 -0600
  91 @@ -12,6 +12,7 @@
  92  #include <stdlib.h>
  93  #include <ctype.h>
  94  #include <sys/types.h>
  95 +#include <ft2build.h>
  96  #include <freetype/freetype.h>
  97  #include <freetype/ftglyph.h>
  98  #include <freetype/ftsnames.h>