From 73041fc4413664308eb84af5911c2e5a5c700877 Mon Sep 17 00:00:00 2001
From: adam <adam>
Date: Sat, 17 Nov 2007 21:20:49 +0000
Subject: Changes 20071110: * Bug fixes * Improvements

---
 fonts/fontforge/Makefile         |  6 +++---
 fonts/fontforge/PLIST            |  5 ++++-
 fonts/fontforge/distinfo         | 12 ++++++------
 fonts/fontforge/patches/patch-aa |  8 ++++----
 fonts/fontforge/patches/patch-ae | 20 ++++++++++----------
 5 files changed, 27 insertions(+), 24 deletions(-)

(limited to 'fonts')

diff --git a/fonts/fontforge/Makefile b/fonts/fontforge/Makefile
index 7200923ecf6..c59ff342c3c 100644
--- a/fonts/fontforge/Makefile
+++ b/fonts/fontforge/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2007/08/18 13:29:30 adam Exp $
+# $NetBSD: Makefile,v 1.37 2007/11/17 21:20:49 adam Exp $
 
 DISTNAME=	fontforge_full-${VERSION}
 PKGNAME=	fontforge-${VERSION}
@@ -10,9 +10,9 @@ MAINTAINER=	adam@NetBSD.org
 HOMEPAGE=	http://fontforge.sourceforge.net/
 COMMENT=	Postscript font editor
 
-VERSION=	20070808
+VERSION=	20071110
 
-MAKE_ENV+=	PKGLOCALEDIR=${PKGLOCALEDIR:Q}
+MAKE_ENV+=	PKGLOCALEDIR=${PKGLOCALEDIR}
 
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
diff --git a/fonts/fontforge/PLIST b/fonts/fontforge/PLIST
index 4161abe374c..bbf01f31cfe 100644
--- a/fonts/fontforge/PLIST
+++ b/fonts/fontforge/PLIST
@@ -1,12 +1,15 @@
-@comment $NetBSD: PLIST,v 1.15 2007/04/13 21:04:24 adam Exp $
+@comment $NetBSD: PLIST,v 1.16 2007/11/17 21:20:49 adam Exp $
 bin/fontforge
 bin/fontimage
+bin/fontlint
 bin/sfddiff
+lib/libfontforge.la
 lib/libgdraw.la
 lib/libgunicode.la
 lib/pkgconfig/fontforge.pc
 man/man1/fontforge.1
 man/man1/fontimage.1
+man/man1/fontlint.1
 man/man1/sfddiff.1
 share/locale/de/LC_MESSAGES/FontForge.mo
 share/locale/el/LC_MESSAGES/FontForge.mo
diff --git a/fonts/fontforge/distinfo b/fonts/fontforge/distinfo
index 76362c91448..479a4756d04 100644
--- a/fonts/fontforge/distinfo
+++ b/fonts/fontforge/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.33 2007/08/18 13:29:30 adam Exp $
+$NetBSD: distinfo,v 1.34 2007/11/17 21:20:49 adam Exp $
 
-SHA1 (fontforge_full-20070808.tar.bz2) = f41fc665ab503e02c3e31f3c9e80ce333b18f380
-RMD160 (fontforge_full-20070808.tar.bz2) = 35ae515c63c8ee1b12da4499c53c943217245497
-Size (fontforge_full-20070808.tar.bz2) = 3913821 bytes
-SHA1 (patch-aa) = 7f7a11310fc5050b58e901e08c182dc5025874c6
+SHA1 (fontforge_full-20071110.tar.bz2) = 9675da83b9ccc0ef8591509bedf7071b8f303a43
+RMD160 (fontforge_full-20071110.tar.bz2) = 41260e5a0164689c14f20f52e500c8f64a371b5b
+Size (fontforge_full-20071110.tar.bz2) = 4261638 bytes
+SHA1 (patch-aa) = 269a8aaf439539fceb3eb31b771af631988b5070
 SHA1 (patch-ab) = ec93a47051186bcb901fd145edffad7c457c33fd
-SHA1 (patch-ae) = 3bccdb7712d9d71527bbade6ccfa6ad49d1af199
+SHA1 (patch-ae) = 8c9b71ce299be0ee9bf2bb1f2083065cfa938cdc
diff --git a/fonts/fontforge/patches/patch-aa b/fonts/fontforge/patches/patch-aa
index 3fd7ba0ae80..b7bcfcac78e 100644
--- a/fonts/fontforge/patches/patch-aa
+++ b/fonts/fontforge/patches/patch-aa
@@ -1,9 +1,9 @@
-$NetBSD: patch-aa,v 1.5 2006/04/05 07:03:25 adam Exp $
+$NetBSD: patch-aa,v 1.6 2007/11/17 21:20:49 adam Exp $
 
---- fontforge/Makefile.dynamic.in.orig	2006-02-01 23:28:03.000000000 +0100
+--- fontforge/Makefile.dynamic.in.orig	2007-10-28 05:06:05.000000000 +0100
 +++ fontforge/Makefile.dynamic.in
-@@ -14,7 +14,7 @@ LIBTOOL = @LIBTOOL@
- CC = @CC@
+@@ -15,7 +15,7 @@ CC = @CC@
+ O = @O_EXTENSION@
  
  X_CFLAGS = @X_CFLAGS@
 -X_LIBS = @X_LIBS@
diff --git a/fonts/fontforge/patches/patch-ae b/fonts/fontforge/patches/patch-ae
index 7b33b36baea..b5de45fc070 100644
--- a/fonts/fontforge/patches/patch-ae
+++ b/fonts/fontforge/patches/patch-ae
@@ -1,13 +1,13 @@
-$NetBSD: patch-ae,v 1.7 2007/08/18 13:29:30 adam Exp $
+$NetBSD: patch-ae,v 1.8 2007/11/17 21:20:50 adam Exp $
 
---- configure.orig	2007-08-06 23:17:20.000000000 +0200
+--- configure.orig	2007-10-28 23:19:03.000000000 +0100
 +++ configure
-@@ -24457,7 +24457,7 @@ if test "$gww_has_gettext" = "yes" >/dev
+@@ -25012,7 +25012,7 @@ if test "$gww_has_gettext" = "yes" >/dev
  
-  cat </dev/null >po/Makefile.in
-  echo 'prefix = @prefix@' >> po/Makefile.in
-- echo 'localedir = $(prefix)/share/locale' >> po/Makefile.in
-+ echo 'localedir = ${PREFIX}/${PKGLOCALEDIR}/locale' >> po/Makefile.in
-  echo 'INSTALL = @INSTALL@' >> po/Makefile.in
-  echo 'INSTALL_DATA = @INSTALL_DATA@' >> po/Makefile.in
-  echo '' >> po/Makefile.in
+  cat </dev/null >$ac_confdir/po/Makefile.in
+  echo 'prefix = @prefix@' >> $ac_confdir/po/Makefile.in
+- echo 'localedir = $(prefix)/share/locale' >> $ac_confdir/po/Makefile.in
++ echo 'localedir = ${PREFIX}/${PKGLOCALEDIR}/locale' >> $ac_confdir/po/Makefile.in
+  echo 'INSTALL = @INSTALL@' >> $ac_confdir/po/Makefile.in
+  echo 'INSTALL_DATA = @INSTALL_DATA@' >> $ac_confdir/po/Makefile.in
+  echo '' >> $ac_confdir/po/Makefile.in
-- 
cgit v1.2.3