- Update to 20060413

- USE_GCC=3.2+ to fix compiling on 4.x

PR:		ports/96968
Submitted by:	maintainer
Approved by:	lawrance (mentor, implicit)

5 files changed, 29 insertions, 26 deletions

diff --git a/print/fontforge/Makefile b/print/fontforge/Makefile
index 71ac80e23b08..c169fb9dc6b6 100644
--- a/print/fontforge/Makefile
+++ b/print/fontforge/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	fontforge
-PORTVERSION=	20060406
+PORTVERSION=	20060413
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	fontforge
@@ -28,7 +28,7 @@ LIB_DEPENDS=	uninameslist.0:${PORTSDIR}/textproc/libuninameslist \
 		freetype.9:${PORTSDIR}/print/freetype2 \
 		xml2.5:${PORTSDIR}/textproc/libxml2
 
-DOC_VERSION=	${PORTVERSION}
+DOC_VERSION=	20060406
 DOCFILES=	${PORTNAME}_htdocs-${DOC_VERSION}.tar.bz2
 .if !defined(NOPORTDOCS)
 DOCFILES+=	${PORTNAME}_ja_htdocs-${DOC_VERSION}.tar.bz2
@@ -59,6 +59,7 @@ CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib" CFLAGS="${CFLAGS} \
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
+USE_GCC=	3.2+
 
 MAN1=		fontforge.1 sfddiff.1
 
diff --git a/print/fontforge/distinfo b/print/fontforge/distinfo
index 44b166633586..5c2cc53e2ea8 100644
--- a/print/fontforge/distinfo
+++ b/print/fontforge/distinfo
@@ -1,6 +1,6 @@
-MD5 (fontforge_full-20060406.tar.bz2) = 33aabad96a007b90679c392807e6eb7d
-SHA256 (fontforge_full-20060406.tar.bz2) = 2dd9083bd7c3044e24595a272434919ed2f150b773a31fdac08d747c331703b0
-SIZE (fontforge_full-20060406.tar.bz2) = 3168350
+MD5 (fontforge_full-20060413.tar.bz2) = 5058e33dbbd5c0ca344dc73c6ff7a428
+SHA256 (fontforge_full-20060413.tar.bz2) = ce1c8a7299d001967b26f9fae002024a190ea5b5092d431dc924888db9adc721
+SIZE (fontforge_full-20060413.tar.bz2) = 3226436
 MD5 (freetype-2.1.10.tar.bz2) = a4012e7d1f6400df44a16743b11b8423
 SHA256 (freetype-2.1.10.tar.bz2) = fed2ed148d7d105b95493c5e95561c8b05ee7909e00f828f036d8ed1be6a5e53
 SIZE (freetype-2.1.10.tar.bz2) = 1037107
diff --git a/print/fontforge/files/patch-Makefile.dynamic.in b/print/fontforge/files/patch-Makefile.dynamic.in
index 0cc2c8e8ad75..33621dea0a45 100644
--- a/print/fontforge/files/patch-Makefile.dynamic.in
+++ b/print/fontforge/files/patch-Makefile.dynamic.in
@@ -1,5 +1,5 @@
---- Makefile.dynamic.in.orig	Fri Apr  7 22:22:55 2006
-+++ Makefile.dynamic.in	Sun Apr  9 02:07:36 2006
+--- Makefile.dynamic.in.orig	Sun Apr  9 04:24:14 2006
++++ Makefile.dynamic.in	Thu Apr 27 16:43:18 2006
 @@ -54,8 +54,8 @@
  	$(LIBTOOL) --mode=install $(INSTALL) -c libgunicode.la $(libdir)/libgunicode.la
  	#cp .libs/*.so.*.* $(libdir)
@@ -11,21 +11,19 @@
  
  install_docs:
  	mkdir -p $(docdir)
-@@ -75,7 +75,7 @@
- 	mkdir -p $(mandir)/man1
+@@ -76,6 +76,7 @@
  	mkdir -p $(sharedir)
  	$(LIBTOOL) --mode=install $(INSTALL) -c fontforge/fontforge $(bindir)
--#	-$(LIBTOOL) --mode=install $(INSTALL) -c fontforge/sfddiff $(bindir)
-+	$(LIBTOOL) --mode=install $(INSTALL) -c fontforge/sfddiff $(bindir)
+ 	$(LIBTOOL) --mode=install $(INSTALL) -c fontforge/sfddiff $(bindir)
++	$(LIBTOOL) --mode=install $(INSTALL) -c fontforge/acorn2sfd $(bindir)
  #	-rm -f $(bindir)/pfaedit
  #	(cd $(bindir) ; ln -s fontforge pfaedit)
  #	$(INSTALL_DATA) fontforge/pfaedit-*.ui $(sharedir)
-@@ -84,7 +84,7 @@
- # if you are editing CID keyed files (and even then you can live without them
- 	-$(INSTALL_DATA) $(srcdir)/cidmap/*.cidmap $(sharedir) >/dev/null 2>&1
- 	$(INSTALL_DATA) $(srcdir)/fontforge/fontforge.1 $(mandir)/man1
--#	-$(INSTALL_DATA) $(srcdir)/fontforge/sfddiff.1 $(mandir)/man1
-+	$(INSTALL_DATA) $(srcdir)/fontforge/sfddiff.1 $(mandir)/man1
- #explicit use of sh to make sure we don't invoke csh with different "if" syntax
- 	sh -c "if test -d $(srcdir)/htdocs >/dev/null ; then $(MAKE) install_docs ; fi"
- 	sh < systemspecific
+@@ -92,6 +93,7 @@
+ uninstall:
+ 	-rm $(bindir)/fontforge
+ 	-rm $(bindir)/sfddiff
++	-rm $(bindir)/acorn2sfd
+ 	-rm $(sharedir)/pfaedit-*.ui
+ 	-rm $(localedir)/*/LC_MESSAGES/FontForge.mo
+ 	-rm $(mandir)/man1/fontforge.1
diff --git a/print/fontforge/files/patch-fontforge::Makefile.dynamic.in b/print/fontforge/files/patch-fontforge::Makefile.dynamic.in
index 680d9f665289..d146c1f0ce7b 100644
--- a/print/fontforge/files/patch-fontforge::Makefile.dynamic.in
+++ b/print/fontforge/files/patch-fontforge::Makefile.dynamic.in
@@ -1,8 +1,11 @@
---- fontforge/Makefile.dynamic.in.orig	Tue Mar 14 09:30:39 2006
-+++ fontforge/Makefile.dynamic.in	Tue Mar 14 15:59:46 2006
-@@ -45,17 +45,17 @@
+--- fontforge/Makefile.dynamic.in.orig	Fri Apr 14 02:59:01 2006
++++ fontforge/Makefile.dynamic.in	Thu Apr 27 16:21:35 2006
+@@ -43,19 +43,19 @@
+  cvdgloss.o groups.o parsepdf.o plugins.o bdfinfo.o \
+  glyphcomp.o @FF_EXTRA_FILES@
  DIFFOBJS = sfddiff.o sfd.o diffstubs.o stamp.o namelist.o pua.o
- ACORNOBJS = acorn2sfd.o sfd.o diffstubs.o psunicodenames.o stamp.o
+-ACORNOBJS = acorn2sfd.o sfd.o diffstubs.o psunicodenames.o stamp.o
++ACORNOBJS = acorn2sfd.o sfd.o diffstubs.o stamp.o namelist.o pua.o
  
 -_CFLAGS = -I$(top_srcdir)/inc -I$(srcdir) -I. @WFLAGS@ $(X_CFLAGS) \
 +_CFLAGS = -I$(LOCALBASE)/include -I$(top_srcdir)/inc -I$(srcdir) -I. @WFLAGS@ $(X_CFLAGS) \
@@ -17,8 +20,8 @@
 +    $(X_PRE_LIBS) $(X_11LIB) $(X_EXTRA_LIBS) @LIBS@ $(STATIC_LIBS) -lm -lintl
 +DLIBS = -rpath $(libdir) ../libgunicode.la @LIBS@ $(STATIC_LIBS) -lm -lintl
  
--all: fontforge
-+all: fontforge sfddiff
+-all: fontforge sfddiff
++all: fontforge sfddiff acorn2sfd
  
  fontforge: main.o $(fontforge_LIBOBJECTS)
  	$(LIBTOOL) --mode=link $(CC) -export-dynamic -o fontforge main.o $(fontforge_LIBOBJECTS) $(LIBS)
diff --git a/print/fontforge/pkg-plist b/print/fontforge/pkg-plist
index b113b45771aa..555a40e80c6d 100644
--- a/print/fontforge/pkg-plist
+++ b/print/fontforge/pkg-plist
@@ -1,5 +1,6 @@
 bin/fontforge
 bin/sfddiff
+bin/acorn2sfd
 lib/libgdraw.la
 lib/libgdraw.so
 lib/libgdraw.so.1