Montage @ Arch Linux

freetype.patch

diff --git a/MontageLib/Viewer/Makefile.LINUX b/MontageLib/Viewer/Makefile.LINUX
index e13fa06..994cf02 100644
--- a/MontageLib/Viewer/Makefile.LINUX
+++ b/MontageLib/Viewer/Makefile.LINUX
@@ -8,13 +8,14 @@
 .SUFFIXES: .c .o
 
 DATA_DIR = $(shell cd ../../data; pwd)
+FREETYPE = $(shell freetype-config --cflags)
 
 CC     =        gcc -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -std=c99 -fPIC \
                 -DFONT_DIR='"$(DATA_DIR)/fonts/"'
-CFLAGS =	-g -I. -I.. -I../../lib/include -I../../lib/freetype/include \
-		-I../../lib/freetype/include/freetype2 -I../../Montage -Wall
+CFLAGS =        -g -I. -I.. -I../../lib/include \
+                $(FREETYPE) -I../../Montage -Wall
 LIBS   =        -L../../lib -lwcs -lcoord -lcfitsio -ljpeg -llodepng -lmtbl -ljson -lcmd \
-                -L../../lib/freetype/lib -lfreetype -lnsl -lm
+                -lfreetype -lnsl -lm
 
 .c.o:
 		$(CC) $(CFLAGS)  -c  $*.c
diff --git a/MontageLib/Viewer/mViewer_graphics.c b/MontageLib/Viewer/mViewer_graphics.c
index 932ca5f..f3a461e 100644
--- a/MontageLib/Viewer/mViewer_graphics.c
+++ b/MontageLib/Viewer/mViewer_graphics.c
@@ -1,7 +1,7 @@
 #include <stdio.h>
 #include <math.h>
-#include <freetype2/ft2build.h>
-#include <freetype.h>
+#include <ft2build.h>
+#include FT_FREETYPE_H
 
 void  mViewer_labeledCurve (char *face_path, int fontsize, int showLine,
                             double *xcurve, double *ycurve, int npt,  
diff --git a/util/Viewer/Makefile.LINUX b/util/Viewer/Makefile.LINUX
index 459664f..d09171c 100644
--- a/util/Viewer/Makefile.LINUX
+++ b/util/Viewer/Makefile.LINUX
@@ -8,13 +8,14 @@
 .SUFFIXES: .c .o
 
 DATA_DIR = $(shell cd ../../data; pwd)
+FREETYPE = $(shell freetype-config --cflags)
 
 CC     =        gcc -std=c99 -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -std=c99 \
                 -DFONT_DIR='"$(DATA_DIR)/fonts/"'
-CFLAGS =	-g -I. -I../../lib/include -I../../lib/freetype/include \
-		-I../../lib/freetype/include/freetype2 -I../../Montage
+CFLAGS =        -g -I. -I../../lib/include \
+                $(FREETYPE) -I../../Montage
 LIBS   =        -L../../lib -lwcs -lcoord -lcfitsio -ljpeg -llodepng -lmtbl -lcmd \
-                -L../../lib/freetype/lib -lfreetype -lnsl -lm
+                -lfreetype -lnsl -lm
 
 .c.o:
 		$(CC) $(CFLAGS)  -c  $*.c
diff --git a/util/Viewer/graphics.c b/util/Viewer/graphics.c
index 6bb7d8d..2b1b2b5 100644
--- a/util/Viewer/graphics.c
+++ b/util/Viewer/graphics.c
@@ -1,7 +1,7 @@
 #include <stdio.h>
 #include <math.h>
-#include <freetype2/ft2build.h>
-#include <freetype.h>
+#include <ft2build.h>
+#include FT_FREETYPE_H
 
 void labeled_curve (char *face_path, int fontsize, int showLine,
                     double *xcurve, double *ycurve, int npt,  

PKGBUILD

# Maintainer: <clu@eeviac>

pkgname=montage
pkgver=5.0
pkgrel=2
pkgdesc="An astronomical image mosaic engine"
arch=('i686' 'x86_64')
url="http://montage.ipac.caltech.edu/"
license=('custom')
depends=("freetype2")
makedepends=()
provides=()
conflicts=()
source=("http://montage.ipac.caltech.edu/download/Montage_v$pkgver.tar.gz"
        "freetype.patch")
md5sums=('9dfe2684bf8380b974e15189f05e4dbf'
         '3b48b362f1ab207b89b15edf40f1bdf9')

prepare() {
    cd $srcdir/Montage
    patch -p1 -i $srcdir/freetype.patch
}

build() {
  cd $srcdir/Montage
  make
}

package() {
  cd $srcdir/Montage
  
  # The following is used because the montage developers
  # have not included an install method in their Makefile
  mkdir -p $pkgdir/usr/bin
  install -Dm755 bin/* $pkgdir/usr/bin

  #custom license...
  mkdir -p $pkgdir/usr/share/licenses/$pkgname
  install -Dm644 $srcdir/Montage/LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE

  #Find docs at:
  #http://montage.ipac.caltech.edu/docs/
}